From 8fe4344e74a70a88e1bbc79d2c6f93255df9e7be Mon Sep 17 00:00:00 2001 From: Khem Raj Date: Tue, 3 Jul 2012 23:53:16 -0700 Subject: 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 Signed-off-by: Saul Wold Signed-off-by: Richard Purdie Resolved merge conflicts with denzil branch and backported gnutls patch. Signed-off-by: Scott Garman Signed-off-by: Richard Purdie --- .../gnutls/gnutls/remove-gets.patch | 42 ++++++++++++++++++++++ meta/recipes-support/gnutls/gnutls_2.12.17.bb | 3 +- 2 files changed, 44 insertions(+), 1 deletion(-) create mode 100644 meta/recipes-support/gnutls/gnutls/remove-gets.patch (limited to 'meta/recipes-support') 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 @@ +eglibc 2.16 has removed gets completely + +Signed-off-by: Khem Raj + +Backported to gnutls 2.12.17 by Scott Garman + +Upstream-Status: Pending + +diff -urN gnutls-2.12.17.orig/gl/stdio.in.h gnutls-2.12.17/gl/stdio.in.h +--- gnutls-2.12.17.orig/gl/stdio.in.h 2012-03-01 07:47:48.000000000 -0800 ++++ gnutls-2.12.17/gl/stdio.in.h 2012-12-12 20:27:54.833297791 -0800 +@@ -710,11 +710,13 @@ + _GL_CXXALIAS_SYS (gets, char *, (char *s)); + # undef gets + # endif ++# if defined gets + _GL_CXXALIASWARN (gets); + /* It is very rare that the developer ever has full control of stdin, + so any use of gets warrants an unconditional warning. Assume it is + always declared, since it is required by C89. */ + _GL_WARN_ON_USE (gets, "gets is a security hole - use fgets instead"); ++# endif + #endif + + +diff -urN gnutls-2.12.17.orig/lib/gl/stdio.in.h gnutls-2.12.17/lib/gl/stdio.in.h +--- gnutls-2.12.17.orig/lib/gl/stdio.in.h 2012-03-01 07:53:13.000000000 -0800 ++++ gnutls-2.12.17/lib/gl/stdio.in.h 2012-12-12 20:29:09.669295717 -0800 +@@ -710,11 +710,13 @@ + _GL_CXXALIAS_SYS (gets, char *, (char *s)); + # undef gets + # endif ++# if defined gets + _GL_CXXALIASWARN (gets); + /* It is very rare that the developer ever has full control of stdin, + so any use of gets warrants an unconditional warning. Assume it is + always declared, since it is required by C89. */ + _GL_WARN_ON_USE (gets, "gets is a security hole - use fgets instead"); ++# endif + #endif + + 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 @@ require gnutls.inc -PR = "${INC_PR}.0" +PR = "${INC_PR}.2" SRC_URI += "file://gnutls-openssl.patch \ file://correct_rpl_gettimeofday_signature.patch \ file://configure-fix.patch \ + file://remove-gets.patch \ " SRC_URI[md5sum] = "f08990f1afa4e1d0ee13e64e537c7854" -- cgit v1.2.3-54-g00ecf