summaryrefslogtreecommitdiffstats
path: root/meta/recipes-core
diff options
context:
space:
mode:
authorKhem Raj <raj.khem@gmail.com>2012-07-03 23:53:16 -0700
committerRichard Purdie <richard.purdie@linuxfoundation.org>2012-07-17 10:54:00 +0100
commit19875a0f71b79bc3f3bb85c925ad103e6fe30641 (patch)
tree144f2376d424b1cb8c585670308c257b4955b240 /meta/recipes-core
parent734e1a9197ba09a1039272fa1670ac118c93e9c0 (diff)
downloadpoky-19875a0f71b79bc3f3bb85c925ad103e6fe30641.tar.gz
gettext,m4,augeas,gnutls: Account for removal of gets in eglibc 2.16
These recipes use gnulib which needs this change to use gets when its defined and not otherwise. Until that change goes into gnulib and then all these package upgrade gnulib in their sourcebase we patch them (From OE-Core rev: 3148460575b65cb681065e5850b8afb96056d712) Signed-off-by: Khem Raj <raj.khem@gmail.com> Signed-off-by: Saul Wold <sgw@linux.intel.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta/recipes-core')
-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
2 files changed, 60 insertions, 1 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 \