mirror of
git://git.openembedded.org/meta-openembedded
synced 2026-01-04 16:10:10 +00:00
libgxim: Fix build with security flags turned on
Signed-off-by: Khem Raj <raj.khem@gmail.com>
This commit is contained in:
parent
6061558819
commit
50c14d2535
|
|
@ -0,0 +1,53 @@
|
|||
From d2ccba90186e2affbb3d146ada341ea2ae6fab2c Mon Sep 17 00:00:00 2001
|
||||
From: Akira TAGOH <akira@tagoh.org>
|
||||
Date: Mon, 13 May 2013 16:05:32 +0900
|
||||
Subject: [PATCH 1/3] Use AM_CPPFLAGS instead of INCLUDES
|
||||
|
||||
---
|
||||
docs/reference/Makefile.am | 2 +-
|
||||
libgxim/Makefile.am | 2 +-
|
||||
tests/Makefile.am | 2 +-
|
||||
3 files changed, 3 insertions(+), 3 deletions(-)
|
||||
|
||||
diff --git a/docs/reference/Makefile.am b/docs/reference/Makefile.am
|
||||
index 24986e1..f785735 100644
|
||||
--- a/docs/reference/Makefile.am
|
||||
+++ b/docs/reference/Makefile.am
|
||||
@@ -84,7 +84,7 @@ expand_content_files=
|
||||
# signals and properties.
|
||||
# e.g. INCLUDES=-I$(top_srcdir) -I$(top_builddir) $(GTK_DEBUG_FLAGS)
|
||||
# e.g. GTKDOC_LIBS=$(top_builddir)/gtk/$(gtktargetlib)
|
||||
-INCLUDES= \
|
||||
+AM_CPPFLAGS= \
|
||||
$(GXIM_CFLAGS) \
|
||||
-I$(top_srcdir) \
|
||||
$(NULL)
|
||||
diff --git a/libgxim/Makefile.am b/libgxim/Makefile.am
|
||||
index 572bdb5..ae1ba32 100644
|
||||
--- a/libgxim/Makefile.am
|
||||
+++ b/libgxim/Makefile.am
|
||||
@@ -1,7 +1,7 @@
|
||||
##
|
||||
# Global definitions
|
||||
NULL =
|
||||
-INCLUDES = \
|
||||
+AM_CPPFLAGS = \
|
||||
$(GXIM_CFLAGS) \
|
||||
-I$(top_srcdir) \
|
||||
$(NULL)
|
||||
diff --git a/tests/Makefile.am b/tests/Makefile.am
|
||||
index 2926829..919ccc8 100644
|
||||
--- a/tests/Makefile.am
|
||||
+++ b/tests/Makefile.am
|
||||
@@ -1,7 +1,7 @@
|
||||
##
|
||||
# Global definitions
|
||||
NULL =
|
||||
-INCLUDES = \
|
||||
+AM_CPPFLAGS = \
|
||||
-I$(top_srcdir)/libgxim \
|
||||
-I$(top_srcdir) \
|
||||
$(GXIM_CFLAGS) \
|
||||
--
|
||||
2.12.1
|
||||
|
||||
|
|
@ -0,0 +1,31 @@
|
|||
From 3215783732b147723e3613cc3c3f83cdcf2ae832 Mon Sep 17 00:00:00 2001
|
||||
From: Akira TAGOH <akira@tagoh.org>
|
||||
Date: Wed, 22 Jan 2014 18:59:32 +0900
|
||||
Subject: [PATCH 2/3] Update autotools macro
|
||||
|
||||
---
|
||||
configure.ac | 6 ++++--
|
||||
1 file changed, 4 insertions(+), 2 deletions(-)
|
||||
|
||||
diff --git a/configure.ac b/configure.ac
|
||||
index d559491..8b846a6 100644
|
||||
--- a/configure.ac
|
||||
+++ b/configure.ac
|
||||
@@ -11,10 +11,12 @@ dnl V=0 to make.
|
||||
m4_ifdef([AM_SILENT_RULES], [AM_SILENT_RULES([yes])])
|
||||
|
||||
AM_MAINTAINER_MODE
|
||||
-AM_CONFIG_HEADER([config.h])
|
||||
+AC_CONFIG_HEADERS([config.h])
|
||||
AC_CONFIG_MACRO_DIR([m4macros])
|
||||
|
||||
-AC_PROG_LIBTOOL
|
||||
+LT_PREREQ([2.2])
|
||||
+LT_INIT([disable-static])
|
||||
+
|
||||
AC_PROG_INTLTOOL
|
||||
|
||||
AC_PROG_CC
|
||||
--
|
||||
2.12.1
|
||||
|
||||
|
|
@ -0,0 +1,30 @@
|
|||
From d05d7fa24ee128f1f33a2e905fc3601955dd27d4 Mon Sep 17 00:00:00 2001
|
||||
From: Khem Raj <raj.khem@gmail.com>
|
||||
Date: Wed, 29 Mar 2017 18:06:02 -0700
|
||||
Subject: [PATCH 3/3] Add format string qualifier to fix potential security
|
||||
risk
|
||||
|
||||
Fixes
|
||||
libgxim/gximprotocol10.c:2076:66: error: format string is not a string literal (potentially insecure) [-Werror,-Wformat-security]
|
||||
|
||||
Signed-off-by: Khem Raj <raj.khem@gmail.com>
|
||||
---
|
||||
libgxim/gximprotocol10.c | 2 +-
|
||||
1 file changed, 1 insertion(+), 1 deletion(-)
|
||||
|
||||
diff --git a/libgxim/gximprotocol10.c b/libgxim/gximprotocol10.c
|
||||
index 04887a5..65bd4df 100644
|
||||
--- a/libgxim/gximprotocol10.c
|
||||
+++ b/libgxim/gximprotocol10.c
|
||||
@@ -2073,7 +2073,7 @@ g_xim_protocol10_closure_real_parser_error(GXimProtocol *proto,
|
||||
msg = g_strdup_printf("Unable to parse the protocol %s properly",
|
||||
g_xim_protocol_name(major_opcode));
|
||||
|
||||
- g_xim_messages_error(G_XIM_PROTOCOL_GET_IFACE (proto)->message, msg);
|
||||
+ g_xim_messages_error(G_XIM_PROTOCOL_GET_IFACE (proto)->message, "%s", msg);
|
||||
switch (major_opcode) {
|
||||
case G_XIM_CONNECT:
|
||||
case G_XIM_AUTH_REQUIRED:
|
||||
--
|
||||
2.12.1
|
||||
|
||||
|
|
@ -10,7 +10,11 @@ HOMEPAGE = "http://code.google.com/p/libgxim/"
|
|||
SECTION = "System Environment/Libraries"
|
||||
|
||||
SRC_URI = "https://bitbucket.org/tagoh/libgxim/downloads/${BPN}-${PV}.tar.bz2 \
|
||||
file://multi-line-ACLOCAL_AMFLAGS-isnot-supported-by-autoreconf.patch"
|
||||
file://multi-line-ACLOCAL_AMFLAGS-isnot-supported-by-autoreconf.patch \
|
||||
file://0001-Use-AM_CPPFLAGS-instead-of-INCLUDES.patch \
|
||||
file://0002-Update-autotools-macro.patch \
|
||||
file://0003-Add-format-string-qualifier-to-fix-potential-securit.patch \
|
||||
"
|
||||
|
||||
SRC_URI[md5sum] = "4bb1fa63d00eb224439d413591c29a6a"
|
||||
SRC_URI[sha256sum] = "75e20d1744139644f9951b78ea3910b162d3380302315cb4b3d0640f23694c79"
|
||||
|
|
|
|||
Loading…
Reference in New Issue
Block a user