summaryrefslogtreecommitdiffstats
path: root/meta/recipes-support/gnutls
diff options
context:
space:
mode:
authorKhem Raj <raj.khem@gmail.com>2012-07-03 23:53:16 -0700
committerRichard Purdie <richard.purdie@linuxfoundation.org>2013-01-03 12:34:22 +0000
commit8fe4344e74a70a88e1bbc79d2c6f93255df9e7be (patch)
tree3d9cb59ae4c05bd25531036013c00a91960ef420 /meta/recipes-support/gnutls
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-support/gnutls')
-rw-r--r--meta/recipes-support/gnutls/gnutls/remove-gets.patch42
-rw-r--r--meta/recipes-support/gnutls/gnutls_2.12.17.bb3
2 files changed, 44 insertions, 1 deletions
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..d694a3d95c
--- /dev/null
+++ b/meta/recipes-support/gnutls/gnutls/remove-gets.patch
@@ -0,0 +1,42 @@
1eglibc 2.16 has removed gets completely
2
3Signed-off-by: Khem Raj <raj.khem@gmail.com>
4
5Backported to gnutls 2.12.17 by Scott Garman <scott.a.garman@intel.com>
6
7Upstream-Status: Pending
8
9diff -urN gnutls-2.12.17.orig/gl/stdio.in.h gnutls-2.12.17/gl/stdio.in.h
10--- gnutls-2.12.17.orig/gl/stdio.in.h 2012-03-01 07:47:48.000000000 -0800
11+++ gnutls-2.12.17/gl/stdio.in.h 2012-12-12 20:27:54.833297791 -0800
12@@ -710,11 +710,13 @@
13 _GL_CXXALIAS_SYS (gets, char *, (char *s));
14 # undef gets
15 # endif
16+# if defined gets
17 _GL_CXXALIASWARN (gets);
18 /* It is very rare that the developer ever has full control of stdin,
19 so any use of gets warrants an unconditional warning. Assume it is
20 always declared, since it is required by C89. */
21 _GL_WARN_ON_USE (gets, "gets is a security hole - use fgets instead");
22+# endif
23 #endif
24
25
26diff -urN gnutls-2.12.17.orig/lib/gl/stdio.in.h gnutls-2.12.17/lib/gl/stdio.in.h
27--- gnutls-2.12.17.orig/lib/gl/stdio.in.h 2012-03-01 07:53:13.000000000 -0800
28+++ gnutls-2.12.17/lib/gl/stdio.in.h 2012-12-12 20:29:09.669295717 -0800
29@@ -710,11 +710,13 @@
30 _GL_CXXALIAS_SYS (gets, char *, (char *s));
31 # undef gets
32 # endif
33+# if defined gets
34 _GL_CXXALIASWARN (gets);
35 /* It is very rare that the developer ever has full control of stdin,
36 so any use of gets warrants an unconditional warning. Assume it is
37 always declared, since it is required by C89. */
38 _GL_WARN_ON_USE (gets, "gets is a security hole - use fgets instead");
39+# endif
40 #endif
41
42
diff --git a/meta/recipes-support/gnutls/gnutls_2.12.17.bb b/meta/recipes-support/gnutls/gnutls_2.12.17.bb
index 7a33ec2cf0..ebcbea3c60 100644
--- a/meta/recipes-support/gnutls/gnutls_2.12.17.bb
+++ b/meta/recipes-support/gnutls/gnutls_2.12.17.bb
@@ -1,10 +1,11 @@
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://remove-gets.patch \
8 " 9 "
9 10
10SRC_URI[md5sum] = "f08990f1afa4e1d0ee13e64e537c7854" 11SRC_URI[md5sum] = "f08990f1afa4e1d0ee13e64e537c7854"