Fix building with glibc-2.16 #424978 by Stevan Bajić.

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

4 files changed, 54 insertions, 4 deletions

diff --git a/sys-devel/m4/ChangeLog b/sys-devel/m4/ChangeLog
index 790791b175cb..f8ec6f63e4d8 100644
--- a/sys-devel/m4/ChangeLog
+++ b/sys-devel/m4/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for sys-devel/m4
 # Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sys-devel/m4/ChangeLog,v 1.158 2012/06/28 12:43:25 ranger Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-devel/m4/ChangeLog,v 1.159 2012/07/06 04:22:53 vapier Exp $
+
+  06 Jul 2012; Mike Frysinger <vapier@gentoo.org>
+  +files/m4-1.4.16-no-gets.patch, m4-1.4.16.ebuild:
+  Fix building with glibc-2.16 #424978 by Stevan Bajić.
 
   28 Jun 2012; Brent Baude <ranger@gentoo.org> m4-1.4.16.ebuild:
   Marking m4-1.4.16 ppc for bug 423239
diff --git a/sys-devel/m4/Manifest b/sys-devel/m4/Manifest
index ecbdd641a1c9..a91d42b7e47e 100644
--- a/sys-devel/m4/Manifest
+++ b/sys-devel/m4/Manifest
@@ -1,9 +1,30 @@
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
 AUX m4-1.4.15-git-version-gen.patch 1275 RMD160 8a0660c118ab584f6a91691318d0415f7a46daaa SHA1 7b9371299803afefdbe8d8beca0c7e3e0c1aa4ed SHA256 42cfd406e5508768987b916b46bcbc7e81ef8ed57f65428fc9a462439eba0896
 AUX m4-1.4.15-uclibc-sched_param-def.patch 580 RMD160 2bcea0eb33aaef5ae5f9046a36385af7a9194865 SHA1 e3c94913eaaf8a280e598353f89ef46119dd3f94 SHA256 b111051eaaa15ce6e53ae168d06e0fb9688c70141060abfe0a15c5d1400fbaf9
 AUX m4-1.4.16-fix-test-readlink.patch 326 RMD160 ca8e772f02039b0fcf43e7ee96715a7afd208ab0 SHA1 6ad56ee3bcbf18c0f86d5e9ada0b00f13c654412 SHA256 5d036a2aab097de8c0b83b6562732235e9863542478d302f5b96d58ee1fe9717
+AUX m4-1.4.16-no-gets.patch 809 RMD160 2b60eab6a6e82966b2f6f1dcd19608a4f8fa8a58 SHA1 2f232fe4e42473e40d4be697164901111e1b8064 SHA256 6059410a6ed64f68a07aa28cc65bc1c7ee6c6528f2750f1c5ba966d82eb521b3
 DIST m4-1.4.15.tar.xz 947068 RMD160 a51516c6e22d3518eabb934083a6d450d85190e2 SHA1 d4c7fe695ddf93c0f05c6435d892520b65f4c0d7 SHA256 ec26b4ef8037286b36bc5af9893f0da63bf8615bbf478a587aa6cab927b0349d
 DIST m4-1.4.16.tar.xz 1005264 RMD160 179325c371810db9489d8c2c65d5ab3a38ba84e0 SHA1 d8688d1d84e058366134301e018e57bbbdc33463 SHA256 d5b5d51cf8f5b18f3bac39bc2f6b1e61f34d400136ae1a87d075e26a38028d5d
 EBUILD m4-1.4.15.ebuild 1282 RMD160 59f1072471225fe0f7e5334250e802f5c3177bf5 SHA1 5abe7f09506d99cb9bf8ba6709d86d0f1334cf3f SHA256 e472ea03a5e23e7bd1b38f499d6c3cfc9a99354c653fd14b7c5eed40b7647190
-EBUILD m4-1.4.16.ebuild 1651 RMD160 91577811e4a5abd6893af8edb319573d5499072c SHA1 080ea4757fc2ab2fe2a50bb042e3e28aaa5dea60 SHA256 49740231b91c30f0dec05fa25c5ef682c1d7527e648ed8be6e8418dc3ff0afee
-MISC ChangeLog 17801 RMD160 260d93afd916368f603a97a37a5aa759068dee81 SHA1 0742ccf3aff0fa6b0d315673dbd491da3363c86a SHA256 87a4af654ad283f1fd91bb1f18286e7538e884622fc9f678fa9f139366fdd026
+EBUILD m4-1.4.16.ebuild 1700 RMD160 d3d50dd3332f82c55e02fcda6804e42440a3d97b SHA1 1a4b5f5ec0e04db08cc2f2988a39b574e5f278be SHA256 c2b2982bf3277e2febec30c669ca6b56d20a924d8bc973f718dc17653c1123e1
+MISC ChangeLog 17961 RMD160 3ca32d20ba7ad509fae5b543fdab0715a1f00ce0 SHA1 3f9b7074c174ca9a16ad0bdafe27ee8bde912c21 SHA256 0ef641b8215a3a1f14d14e49fdcbe128040e8914e3b49b56896e11749c2e9ff8
 MISC metadata.xml 164 RMD160 f43cbec30b7074319087c9acffdb9354b17b0db3 SHA1 9c213f5803676c56439df3716be07d6692588856 SHA256 f5f2891f2a4791cd31350bb2bb572131ad7235cd0eeb124c9912c187ac10ce92
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v2.0.19 (GNU/Linux)
+
+iQIcBAEBAgAGBQJP9mg2AAoJELEHsLL7fEFWiHAQALmcmoZeOkx6GhAIsrNo8TVR
+4PTaqssHklTjDpCeQEd/d3mEtsOYsl4mhFkztzn6W8uw0MFsgmts0mhFFxUF6gek
+/ZboKWqLLx5/cR8eHT1KLu5//BJDnUrwO16TQfpkrArDDw1AbztHpJElYrEX4+7F
+US8z4giKi1ieuo8jeY0aNr+TWkNNW+aHoEs983LUrYcOpq7F3gv+YrrN4J/kApHk
+mp07vk8BuJHNnyzLxkY5RhA3AQQo/UoM8+Er/sLOYhe94JfB2j+n2dnAEYYuHqmQ
+0nq8cDyWHQHT2Wz1p+4e6nH9Bi8eLnGLO8RL1B1jqUzp1rPnoVOfCWYN/zphtGUq
+0gswOzdRKx7ZbX5iLHvQiD5xlG8qbnAkDGga8zC787oUl2m7elr60lphwm+mHHQq
+LX9BFFQG734hsg8BjIXSX8+dEBGUzZJ1hLgulQIpLKb0V58XytuDA72OzRt+V6JC
+ICEgQ0/wtKWx1IIwlXeNI6A6VZK4b8rkX8HSbGK7Fnw5x+OmGjIhcIKj84Smq7om
+dGkwJwn/xAvWFKT/8FP7eErKDI7YU7p7BUkKHhnag4AUNxhPPxuUUMzHvGdZa4+a
+Pzi8rv0dKSVryfIOQZUruBBQBjULfx332G9bfzSUQLIVXS96xz9k061rYN0zELQu
+oWgIyYx8WUYvQyh5h4un
+=WdXS
+-----END PGP SIGNATURE-----
diff --git a/sys-devel/m4/files/m4-1.4.16-no-gets.patch b/sys-devel/m4/files/m4-1.4.16-no-gets.patch
new file mode 100644
index 000000000000..bb8069b8e766
--- /dev/null
+++ b/sys-devel/m4/files/m4-1.4.16-no-gets.patch
@@ -0,0 +1,24 @@
+https://bugs.gentoo.org/424978
+
+hack until m4 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/lib/stdio.in.h
++++ b/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/m4/m4-1.4.16.ebuild b/sys-devel/m4/m4-1.4.16.ebuild
index eee1197b819e..de41fdb5bc62 100644
--- a/sys-devel/m4/m4-1.4.16.ebuild
+++ b/sys-devel/m4/m4-1.4.16.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/m4/m4-1.4.16.ebuild,v 1.8 2012/06/28 12:43:25 ranger Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-devel/m4/m4-1.4.16.ebuild,v 1.9 2012/07/06 04:22:53 vapier Exp $
 
 EAPI="3"
 
@@ -21,6 +21,7 @@ RDEPEND=""
 
 src_prepare() {
 	epatch "${FILESDIR}"/${P}-fix-test-readlink.patch #376639
+	epatch "${FILESDIR}"/${P}-no-gets.patch #424978
 }
 
 src_configure() {