summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--meta/recipes-core/gettext/gettext-0.18.1.1/remove_gets.patch58
-rw-r--r--meta/recipes-core/gettext/gettext_0.18.1.1.bb3
-rw-r--r--meta/recipes-devtools/m4/m4-1.4.16.inc6
-rw-r--r--meta/recipes-devtools/m4/m4/remove-gets.patch21
-rw-r--r--meta/recipes-extended/augeas/augeas/remove-gets.patch20
-rw-r--r--meta/recipes-extended/augeas/augeas_0.10.0.bb4
-rw-r--r--meta/recipes-support/gnutls/gnutls/remove-gets.patch41
-rw-r--r--meta/recipes-support/gnutls/gnutls_2.12.20.bb3
8 files changed, 151 insertions, 5 deletions
diff --git a/meta/recipes-core/gettext/gettext-0.18.1.1/remove_gets.patch b/meta/recipes-core/gettext/gettext-0.18.1.1/remove_gets.patch
new file mode 100644
index 0000000000..3d3c400e0d
--- /dev/null
+++ b/meta/recipes-core/gettext/gettext-0.18.1.1/remove_gets.patch
@@ -0,0 +1,58 @@
1eglibc 2.16 has removed gets so we need to check for it
2being there before using it.
3
4
5From glibc stdio.h
6
7The function has been officially removed in ISO C11. This opportunity
8 is used to also remove it from the GNU feature list. It is now only
9 available when explicitly using an old ISO C, Unix, or POSIX standard.
10
11Signed-off-by: Khem Raj <raj.khem@gmail.com>
12
13Upstream-Status: Pending
14Index: gettext-0.18.1.1/gettext-runtime/gnulib-lib/stdio.in.h
15===================================================================
16--- gettext-0.18.1.1.orig/gettext-runtime/gnulib-lib/stdio.in.h 2010-05-17 12:56:12.000000000 -0700
17+++ gettext-0.18.1.1/gettext-runtime/gnulib-lib/stdio.in.h 2012-07-02 22:42:21.292223316 -0700
18@@ -140,8 +140,10 @@
19 /* It is very rare that the developer ever has full control of stdin,
20 so any use of gets warrants an unconditional warning. Assume it is
21 always declared, since it is required by C89. */
22+#if defined gets
23 #undef gets
24 _GL_WARN_ON_USE (gets, "gets is a security hole - use fgets instead");
25+#endif
26
27 #if @GNULIB_FOPEN@
28 # if @REPLACE_FOPEN@
29Index: gettext-0.18.1.1/gettext-tools/gnulib-lib/stdio.in.h
30===================================================================
31--- gettext-0.18.1.1.orig/gettext-tools/gnulib-lib/stdio.in.h 2010-05-24 02:42:46.000000000 -0700
32+++ gettext-0.18.1.1/gettext-tools/gnulib-lib/stdio.in.h 2012-07-02 23:02:33.476281979 -0700
33@@ -140,8 +140,10 @@
34 /* It is very rare that the developer ever has full control of stdin,
35 so any use of gets warrants an unconditional warning. Assume it is
36 always declared, since it is required by C89. */
37+#if defined gets
38 #undef gets
39 _GL_WARN_ON_USE (gets, "gets is a security hole - use fgets instead");
40+#endif
41
42 #if @GNULIB_FOPEN@
43 # if @REPLACE_FOPEN@
44Index: gettext-0.18.1.1/gettext-tools/libgettextpo/stdio.in.h
45===================================================================
46--- gettext-0.18.1.1.orig/gettext-tools/libgettextpo/stdio.in.h 2010-05-17 12:58:03.000000000 -0700
47+++ gettext-0.18.1.1/gettext-tools/libgettextpo/stdio.in.h 2012-07-02 23:01:57.440280253 -0700
48@@ -140,8 +140,10 @@
49 /* It is very rare that the developer ever has full control of stdin,
50 so any use of gets warrants an unconditional warning. Assume it is
51 always declared, since it is required by C89. */
52+#if defined gets
53 #undef gets
54 _GL_WARN_ON_USE (gets, "gets is a security hole - use fgets instead");
55+#endif
56
57 #if @GNULIB_FOPEN@
58 # if @REPLACE_FOPEN@
diff --git a/meta/recipes-core/gettext/gettext_0.18.1.1.bb b/meta/recipes-core/gettext/gettext_0.18.1.1.bb
index d9512fe61d..09a9465142 100644
--- a/meta/recipes-core/gettext/gettext_0.18.1.1.bb
+++ b/meta/recipes-core/gettext/gettext_0.18.1.1.bb
@@ -5,7 +5,7 @@ SECTION = "libs"
5LICENSE = "GPLv3+ & LGPL-2.1+" 5LICENSE = "GPLv3+ & LGPL-2.1+"
6LIC_FILES_CHKSUM = "file://COPYING;md5=d32239bcb673463ab874e80d47fae504" 6LIC_FILES_CHKSUM = "file://COPYING;md5=d32239bcb673463ab874e80d47fae504"
7 7
8PR = "r14" 8PR = "r15"
9DEPENDS = "libxml2-native gettext-native virtual/libiconv ncurses expat" 9DEPENDS = "libxml2-native gettext-native virtual/libiconv ncurses expat"
10DEPENDS_virtclass-native = "libxml2-native gettext-minimal-native" 10DEPENDS_virtclass-native = "libxml2-native gettext-minimal-native"
11PROVIDES = "virtual/libintl virtual/gettext" 11PROVIDES = "virtual/libintl virtual/gettext"
@@ -13,6 +13,7 @@ PROVIDES_virtclass-native = "virtual/gettext-native"
13RCONFLICTS_${PN} = "proxy-libintl" 13RCONFLICTS_${PN} = "proxy-libintl"
14SRC_URI = "${GNU_MIRROR}/gettext/gettext-${PV}.tar.gz \ 14SRC_URI = "${GNU_MIRROR}/gettext/gettext-${PV}.tar.gz \
15 file://parallel.patch \ 15 file://parallel.patch \
16 file://remove_gets.patch \
16 " 17 "
17 18
18SRC_URI_append_libc-uclibc = " file://wchar-uclibc.patch \ 19SRC_URI_append_libc-uclibc = " file://wchar-uclibc.patch \
diff --git a/meta/recipes-devtools/m4/m4-1.4.16.inc b/meta/recipes-devtools/m4/m4-1.4.16.inc
index 1669775c74..01016d643b 100644
--- a/meta/recipes-devtools/m4/m4-1.4.16.inc
+++ b/meta/recipes-devtools/m4/m4-1.4.16.inc
@@ -5,8 +5,10 @@ LICENSE = "GPLv3"
5LIC_FILES_CHKSUM = "file://COPYING;md5=d32239bcb673463ab874e80d47fae504\ 5LIC_FILES_CHKSUM = "file://COPYING;md5=d32239bcb673463ab874e80d47fae504\
6 file://examples/COPYING;md5=fbc986d45b3dae6725c29870dd6b669d" 6 file://examples/COPYING;md5=fbc986d45b3dae6725c29870dd6b669d"
7 7
8PR = "r3" 8PR = "r4"
9SRC_URI += "file://ac_config_links.patch" 9SRC_URI += "file://ac_config_links.patch \
10 file://remove-gets.patch \
11 "
10 12
11SRC_URI[md5sum] = "a5dfb4f2b7370e9d34293d23fd09b280" 13SRC_URI[md5sum] = "a5dfb4f2b7370e9d34293d23fd09b280"
12SRC_URI[sha256sum] = "e9176a35bb13a1b08482359aa554ee8072794f58f00e4827bf0e06b570c827da" 14SRC_URI[sha256sum] = "e9176a35bb13a1b08482359aa554ee8072794f58f00e4827bf0e06b570c827da"
diff --git a/meta/recipes-devtools/m4/m4/remove-gets.patch b/meta/recipes-devtools/m4/m4/remove-gets.patch
new file mode 100644
index 0000000000..9c396d94f0
--- /dev/null
+++ b/meta/recipes-devtools/m4/m4/remove-gets.patch
@@ -0,0 +1,21 @@
1eglibc has remove gets starting 2.16
2therefore check for its being there before
3undefining it.
4
5Upstream-Status: Pending
6Signed-off-by: Khem Raj <raj.khem@gmail.com>
7Index: m4-1.4.16/lib/stdio.in.h
8===================================================================
9--- m4-1.4.16.orig/lib/stdio.in.h 2011-03-01 08:39:29.000000000 -0800
10+++ m4-1.4.16/lib/stdio.in.h 2012-07-03 08:32:08.145935928 -0700
11@@ -161,8 +161,10 @@
12 /* It is very rare that the developer ever has full control of stdin,
13 so any use of gets warrants an unconditional warning. Assume it is
14 always declared, since it is required by C89. */
15+#if defined gets
16 #undef gets
17 _GL_WARN_ON_USE (gets, "gets is a security hole - use fgets instead");
18+#endif
19
20 #if @GNULIB_FOPEN@
21 # if @REPLACE_FOPEN@
diff --git a/meta/recipes-extended/augeas/augeas/remove-gets.patch b/meta/recipes-extended/augeas/augeas/remove-gets.patch
new file mode 100644
index 0000000000..bd6e92cc66
--- /dev/null
+++ b/meta/recipes-extended/augeas/augeas/remove-gets.patch
@@ -0,0 +1,20 @@
1eglibc 2.16 has remove gets so check for it to be there before using it
2
3Signed-off-by: Khem Raj <raj.khem@gmail.com>
4
5Upstream-Status: Pending
6Index: augeas-0.10.0/gnulib/lib/stdio.in.h
7===================================================================
8--- augeas-0.10.0.orig/gnulib/lib/stdio.in.h 2011-03-03 17:07:59.000000000 -0800
9+++ augeas-0.10.0/gnulib/lib/stdio.in.h 2012-07-03 19:46:42.871894833 -0700
10@@ -161,8 +161,10 @@
11 /* It is very rare that the developer ever has full control of stdin,
12 so any use of gets warrants an unconditional warning. Assume it is
13 always declared, since it is required by C89. */
14+#if defined gets
15 #undef gets
16 _GL_WARN_ON_USE (gets, "gets is a security hole - use fgets instead");
17+#endif
18
19 #if @GNULIB_FOPEN@
20 # if @REPLACE_FOPEN@
diff --git a/meta/recipes-extended/augeas/augeas_0.10.0.bb b/meta/recipes-extended/augeas/augeas_0.10.0.bb
index 1a087070aa..0840428c04 100644
--- a/meta/recipes-extended/augeas/augeas_0.10.0.bb
+++ b/meta/recipes-extended/augeas/augeas_0.10.0.bb
@@ -1,6 +1,8 @@
1require augeas.inc 1require augeas.inc
2 2
3PR = "r2" 3SRC_URI += "file://remove-gets.patch \
4 "
5PR = "r3"
4 6
5SRC_URI[md5sum] = "fe1834e90a066c3208ac0214622c7352" 7SRC_URI[md5sum] = "fe1834e90a066c3208ac0214622c7352"
6SRC_URI[sha256sum] = "ec111af06186216930176ebe5ecccdf7bf528528aee9acde1d5d70088484afca" 8SRC_URI[sha256sum] = "ec111af06186216930176ebe5ecccdf7bf528528aee9acde1d5d70088484afca"
diff --git a/meta/recipes-support/gnutls/gnutls/remove-gets.patch b/meta/recipes-support/gnutls/gnutls/remove-gets.patch
new file mode 100644
index 0000000000..8b7df6286a
--- /dev/null
+++ b/meta/recipes-support/gnutls/gnutls/remove-gets.patch
@@ -0,0 +1,41 @@
1eglibc 2.16 has removed gets completely
2
3Signed-off-by: Khem Raj <raj.khem@gmail.com>
4
5Upstream-Status: Pending
6Index: gnutls-2.12.20/gl/stdio.in.h
7===================================================================
8--- gnutls-2.12.20.orig/gl/stdio.in.h 2012-03-01 07:47:48.000000000 -0800
9+++ gnutls-2.12.20/gl/stdio.in.h 2012-07-03 18:17:57.191637189 -0700
10@@ -710,11 +710,13 @@
11 _GL_CXXALIAS_SYS (gets, char *, (char *s));
12 # undef gets
13 # endif
14+# if defined gets
15 _GL_CXXALIASWARN (gets);
16 /* It is very rare that the developer ever has full control of stdin,
17 so any use of gets warrants an unconditional warning. Assume it is
18 always declared, since it is required by C89. */
19 _GL_WARN_ON_USE (gets, "gets is a security hole - use fgets instead");
20+# endif
21 #endif
22
23
24Index: gnutls-2.12.20/lib/gl/stdio.in.h
25===================================================================
26--- gnutls-2.12.20.orig/lib/gl/stdio.in.h 2012-03-01 07:53:13.000000000 -0800
27+++ gnutls-2.12.20/lib/gl/stdio.in.h 2012-07-03 18:18:56.351639640 -0700
28@@ -710,11 +710,13 @@
29 _GL_CXXALIAS_SYS (gets, char *, (char *s));
30 # undef gets
31 # endif
32+# if defined gets
33 _GL_CXXALIASWARN (gets);
34 /* It is very rare that the developer ever has full control of stdin,
35 so any use of gets warrants an unconditional warning. Assume it is
36 always declared, since it is required by C89. */
37 _GL_WARN_ON_USE (gets, "gets is a security hole - use fgets instead");
38+# endif
39 #endif
40
41
diff --git a/meta/recipes-support/gnutls/gnutls_2.12.20.bb b/meta/recipes-support/gnutls/gnutls_2.12.20.bb
index 010f179b9f..3a10dbf924 100644
--- a/meta/recipes-support/gnutls/gnutls_2.12.20.bb
+++ b/meta/recipes-support/gnutls/gnutls_2.12.20.bb
@@ -1,11 +1,12 @@
1require gnutls.inc 1require gnutls.inc
2 2
3PR = "${INC_PR}.0" 3PR = "${INC_PR}.2"
4 4
5SRC_URI += "file://gnutls-openssl.patch \ 5SRC_URI += "file://gnutls-openssl.patch \
6 file://correct_rpl_gettimeofday_signature.patch \ 6 file://correct_rpl_gettimeofday_signature.patch \
7 file://configure-fix.patch \ 7 file://configure-fix.patch \
8 ${@['', 'file://fix-gettext-version.patch'][bb.data.inherits_class('native', d) or (not ((d.getVar("INCOMPATIBLE_LICENSE", True) or "").find("GPLv3") != -1))]} \ 8 ${@['', 'file://fix-gettext-version.patch'][bb.data.inherits_class('native', d) or (not ((d.getVar("INCOMPATIBLE_LICENSE", True) or "").find("GPLv3") != -1))]} \
9 file://remove-gets.patch \
9 " 10 "
10 11
11SRC_URI[md5sum] = "f1dea97da5d4dcdbc675720c9aad9ee3" 12SRC_URI[md5sum] = "f1dea97da5d4dcdbc675720c9aad9ee3"