summaryrefslogtreecommitdiffstats
path: root/meta/recipes-extended
diff options
context:
space:
mode:
authorKhem Raj <raj.khem@gmail.com>2012-07-04 06:53:16 (GMT)
committerRichard Purdie <richard.purdie@linuxfoundation.org>2013-01-03 12:34:22 (GMT)
commit8fe4344e74a70a88e1bbc79d2c6f93255df9e7be (patch)
tree3d9cb59ae4c05bd25531036013c00a91960ef420 /meta/recipes-extended
parent3c57cb356e94bd0b2016e9625fef1178cae1100d (diff)
downloadpoky-8fe4344e74a70a88e1bbc79d2c6f93255df9e7be.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: b955f1a7bc716055c78ed575eccac6f611dc2395) 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> Resolved merge conflicts with denzil branch and backported gnutls patch. Signed-off-by: Scott Garman <scott.a.garman@intel.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta/recipes-extended')
-rw-r--r--meta/recipes-extended/augeas/augeas/remove-gets.patch20
-rw-r--r--meta/recipes-extended/augeas/augeas_0.10.0.bb4
2 files changed, 23 insertions, 1 deletions
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 0000000..bd6e92c
--- /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 00921aa..06ef494 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 = "r1" 3PR = "r2"
4SRC_URI += "file://remove-gets.patch \
5 "
4 6
5SRC_URI[md5sum] = "fe1834e90a066c3208ac0214622c7352" 7SRC_URI[md5sum] = "fe1834e90a066c3208ac0214622c7352"
6SRC_URI[sha256sum] = "ec111af06186216930176ebe5ecccdf7bf528528aee9acde1d5d70088484afca" 8SRC_URI[sha256sum] = "ec111af06186216930176ebe5ecccdf7bf528528aee9acde1d5d70088484afca"