Fix building with glibc-2.16+.

Package-Manager: portage-2.2.0_alpha102/cvs/Linux x86_64

4 files changed, 65 insertions, 7 deletions

diff --git a/sys-devel/gettext/ChangeLog b/sys-devel/gettext/ChangeLog
index 3341808a7653..f0fcbb9a82c8 100644
--- a/sys-devel/gettext/ChangeLog
+++ b/sys-devel/gettext/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for sys-devel/gettext
 # Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sys-devel/gettext/ChangeLog,v 1.198 2012/04/26 13:32:00 aballier Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-devel/gettext/ChangeLog,v 1.199 2012/05/23 02:12:54 vapier Exp $
+
+  23 May 2012; Mike Frysinger <vapier@gentoo.org>
+  +files/gettext-0.18.1.1-no-gets.patch, gettext-0.18.1.1-r3.ebuild:
+  Fix building with glibc-2.16+.
 
   26 Apr 2012; Alexis Ballier <aballier@gentoo.org> gettext-0.18.1.1-r3.ebuild:
   keyword ~amd64-fbsd
diff --git a/sys-devel/gettext/Manifest b/sys-devel/gettext/Manifest
index 9af3a9b9f7c1..6c8549b7e16d 100644
--- a/sys-devel/gettext/Manifest
+++ b/sys-devel/gettext/Manifest
@@ -7,17 +7,28 @@ AUX gettext-0.15-expat-no-dlopen.patch 585 RMD160 7e41b0b5b1f9a8eb220a445fde835c
 AUX gettext-0.17-gnuinfo.patch 634 RMD160 09ee57c6b9426bf0781fcd424a00b0ad389b7d89 SHA1 b0ad8cfe31752db56d8eaa82f2c55e6a81994677 SHA256 f38fb566eb1398a46ed93994d6576cd98d025d02e2ecde1f778d26956fe098a1
 AUX gettext-0.17-open-args.patch 1015 RMD160 11e344dcfa926fefe8045a08e97933722f47da31 SHA1 357ebe671577c4a78b2abee5228866e01dd804f8 SHA256 6409b1adbddbdb96d682ddb973e54f37d5e253b5b226e74b50b8d0874b553638
 AUX gettext-0.17-x-python.patch 1054 RMD160 5de4646fe872d6cea8ec843fa6e2c519cde20cc7 SHA1 7b374fbd566a78265d1d930bf29d1da9782e9dc3 SHA256 d0b959a7d094f2d51fcd5a2472db5b657d5feeb7e0fdec1f33db728e2d82d38b
+AUX gettext-0.18.1.1-no-gets.patch 1547 RMD160 638dad555dcebaf6a0e1abdaf795b83c5106ded2 SHA1 a86db41420e778a5f93b111f242c6b1864241a26 SHA256 014e8d8ed06cc2eba664ca9559b2a4f5a2a396474df2ce9bb3647e20316adaf3
 AUX gettext-0.18.1.1-uclibc-sched_param-def.patch 648 RMD160 2083b28d495f377e2075732df46bef89208e9fe7 SHA1 bed00c6cc3d0f2116f8905dad5b28feb7ff8b506 SHA256 9793f511543a09cfb3454fa2ad1fd3a565c207152d020b35d62ae9460550c47f
 DIST gettext-0.18.1.1.tar.gz 15139737 RMD160 0ca0b6bf0219440404a86f0c16cbac3d1a2ecd37 SHA1 5009deb02f67fc3c59c8ce6b82408d1d35d4e38f SHA256 93ac71a7afa5b70c1b1032516663658c51e653087f42a3fc8044752c026443e9
 EBUILD gettext-0.18.1.1-r1.ebuild 2945 RMD160 449c59e124af3a0b080237e4229b6e0a5f1a2e8e SHA1 422ec4b106475a9b8315afd4e829255144746255 SHA256 17f1f4fe0c7cdbef245c145357fcc299e3bb87f0c281af2690d3535d3ee77d1f
 EBUILD gettext-0.18.1.1-r2.ebuild 3440 RMD160 ca92117d2e83d442665af8c9b268ebc0cf02fb87 SHA1 d7138c1de8bc39e25e1d8ddcb01cb8a978e21b5b SHA256 65c6c50276e854efe88e260876b53879647785c64a7c98422a6a5a7a93c3dc9d
-EBUILD gettext-0.18.1.1-r3.ebuild 3550 RMD160 688ab347d011f590637c759abb5bb8a837cdc8fb SHA1 c5e25a4d8df26f2bcc0c63a0313a5d4dca729cea SHA256 a7f7d6c3bae1a8d608933d3e8d8909a95c0cff2f84f8fde3f3744eaab284368a
-MISC ChangeLog 25847 RMD160 acd7969894e2a631138d4909c1172b9544c143d2 SHA1 3b0f105f438631696b5fd26f22a63c1785e4c103 SHA256 c28c477859e2755018f370e854bc7a3ccc13fe38af65ce22f25d62b3022e55c6
+EBUILD gettext-0.18.1.1-r3.ebuild 3589 RMD160 66b87999bb89c4518ded9138e034285d54e33eef SHA1 1984bfce32249aa5ca21cf55c5751887a24de731 SHA256 c9b35918567921aa8785c48ca76023bee24d509cd9ec454328b0a9aa8132b3d4
+MISC ChangeLog 25998 RMD160 c980ffa7839d6a453173063b57e92029404e9971 SHA1 c353c6bc0e2f4d56a7fe671057277635ba866be0 SHA256 dede986f9864ca6122473dabcbee5cf350f2cec69bd6cc1d0308633d22a59ffc
 MISC metadata.xml 370 RMD160 d4affadca5919e8b349259ec245da6bb9164d735 SHA1 52bde5b27f373b5ce42d98346e8c8366cc7c22ee SHA256 75e6b478fb79e4575d24b15c4a5963c4f7a00fda1816d3993527887b3cdfde66
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.19 (GNU/Linux)
 
-iEYEARECAAYFAk+ZTlUACgkQvFcC4BYPU0rtNACfdNkXL15c4Fd15SANnDB6gs/x
-5eIAnj+iW3NVDiPX8TZGw/VXwyjg/Xb8
-=F1tY
+iQIcBAEBAgAGBQJPvEfwAAoJELEHsLL7fEFWn5wQAL33mzuyVxU7IaNEk4CAwLSy
+V9aai5KYoOuVkQGBj33AJb0eu0A2fBDfHaJqzznDhEty8EiqZ9xuLVkAMS+vGe2I
+Jt48jUSJAEk1mbdUEXte9Bu/ruSRTiF7FOl+OCLQ0A8vEJ/gMOV+ZF1Q3T9KJfrI
+Amn3DYVW+QkgxHPxZtm3J5I4OWYnEZjlkvusbw0diL4D21rxOrF/4ihUY6ZQqMV6
+7GiazlvD5mnbkZg+wbmylfgE12ATDe0la4escxcbDMMOeC8TM1jrJVhII+lK/hCi
+IEcUjaiabTfvcLZUGrdIr0+i+03r5+L/MeXNlusv6flkAE2hIIN1ye6kMB27iHjq
+gk0P2R6mLNj4sKe7u0yv24fL1EZNBJg5DUZAcltI/Zt04bck8YVKHUMQ6lcJVyrF
+YflcgT/GxbKF4Ji3IkPm0rBLdBUWZChhvXRqsoYeDoYcKEwWgYgaw3XQZyUW/v4U
+q7nc/Nh/mQF4wZ2Cbo9Eq/uXPDDz6xHGnVTYsFbWLStWquHwpPlUmB8pUvGseYM3
+ZhcOHXTV50LRrBK58UR6/nfuf448EK5BagAuTdxWsQc36TWx039V2TGhQoVFkUMt
+Zluu7qYyR7Jwqx6lcB4hSp4IIJO+YIaHZCIAgxZx+20WiyNNVRxV0gx7oQODR/os
+KGy1ZxbMVzkrD+qX72Zp
+=MZ+i
 -----END PGP SIGNATURE-----
diff --git a/sys-devel/gettext/files/gettext-0.18.1.1-no-gets.patch b/sys-devel/gettext/files/gettext-0.18.1.1-no-gets.patch
new file mode 100644
index 000000000000..9daa48eae649
--- /dev/null
+++ b/sys-devel/gettext/files/gettext-0.18.1.1-no-gets.patch
@@ -0,0 +1,42 @@
+hack until gzip pulls a newer gnulib version
+
+From 66712c23388e93e5c518ebc8515140fa0c807348 Mon Sep 17 00:00:00 2001
+From: Eric Blake <eblake@redhat.com>
+Date: Thu, 29 Mar 2012 13:30:41 -0600
+Subject: [PATCH] stdio: don't assume gets any more
+
+Gnulib intentionally does not have a gets module, and now that C11
+and glibc have dropped it, we should be more proactive about warning
+any user on a platform that still has a declaration of this dangerous
+interface.
+
+--- a/gettext-tools/libgettextpo/stdio.in.h
++++ b/gettext-tools/libgettextpo/stdio.in.h
+@@ -125,7 +125,6 @@
+    so any use of gets warrants an unconditional warning.  Assume it is
+    always declared, since it is required by C89.  */
+ #undef gets
+-_GL_WARN_ON_USE (gets, "gets is a security hole - use fgets instead");
+ 
+ #if @GNULIB_FOPEN@
+ # if @REPLACE_FOPEN@
+--- a/gettext-tools/gnulib-lib/stdio.in.h
++++ b/gettext-tools/gnulib-lib/stdio.in.h
+@@ -125,7 +125,6 @@
+    so any use of gets warrants an unconditional warning.  Assume it is
+    always declared, since it is required by C89.  */
+ #undef gets
+-_GL_WARN_ON_USE (gets, "gets is a security hole - use fgets instead");
+ 
+ #if @GNULIB_FOPEN@
+ # if @REPLACE_FOPEN@
+--- a/gettext-runtime/gnulib-lib/stdio.in.h
++++ b/gettext-runtime/gnulib-lib/stdio.in.h
+@@ -125,7 +125,6 @@
+    so any use of gets warrants an unconditional warning.  Assume it is
+    always declared, since it is required by C89.  */
+ #undef gets
+-_GL_WARN_ON_USE (gets, "gets is a security hole - use fgets instead");
+ 
+ #if @GNULIB_FOPEN@
+ # if @REPLACE_FOPEN@
diff --git a/sys-devel/gettext/gettext-0.18.1.1-r3.ebuild b/sys-devel/gettext/gettext-0.18.1.1-r3.ebuild
index 7ad1fc4a8ac2..37037e3df4bd 100644
--- a/sys-devel/gettext/gettext-0.18.1.1-r3.ebuild
+++ b/sys-devel/gettext/gettext-0.18.1.1-r3.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-devel/gettext/gettext-0.18.1.1-r3.ebuild,v 1.3 2012/04/26 13:32:00 aballier Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-devel/gettext/gettext-0.18.1.1-r3.ebuild,v 1.4 2012/05/23 02:12:54 vapier Exp $
 
 EAPI="2"
 
@@ -31,6 +31,7 @@ src_prepare() {
 	epunt_cxx
 	elibtoolize
 	epatch "${FILESDIR}"/${P}-uclibc-sched_param-def.patch
+	epatch "${FILESDIR}"/${P}-no-gets.patch
 }
 
 src_configure() {