Fix building with glibc-2.16+ #426632 by Christian Hagau.

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

4 files changed, 54 insertions, 4 deletions

diff --git a/app-admin/metalog/ChangeLog b/app-admin/metalog/ChangeLog
index aeb783fb6f79..47b3db326c8e 100644
--- a/app-admin/metalog/ChangeLog
+++ b/app-admin/metalog/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for app-admin/metalog
 # Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-admin/metalog/ChangeLog,v 1.102 2012/05/06 16:27:27 armin76 Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-admin/metalog/ChangeLog,v 1.103 2012/07/15 22:21:32 vapier Exp $
+
+  15 Jul 2012; Mike Frysinger <vapier@gentoo.org>
+  +files/metalog-2-no-gets.patch, metalog-2.ebuild:
+  Fix building with glibc-2.16+ #426632 by Christian Hagau.
 
   06 May 2012; Raúl Porcel <armin76@gentoo.org> metalog-2.ebuild:
   ia64/s390/sh/sparc stable wrt #390033
diff --git a/app-admin/metalog/Manifest b/app-admin/metalog/Manifest
index 8d8fb9ef7922..43904b5bc155 100644
--- a/app-admin/metalog/Manifest
+++ b/app-admin/metalog/Manifest
@@ -1,10 +1,31 @@
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
 AUX consolelog.sh 269 SHA256 b076ed8329052c8ec6d61722c15c589dbf53487cc3e7dbc0c54af6965c54048e SHA512 4cbf2145480d67b46db8a291137f5d953ce07d5d35b7c011e3dec13e4e5ab729f81666884c23db568065cb0b16fddba7178570c04777428861107aeb7c48f332 WHIRLPOOL 0d07497cbf1889b07911972e7bb681c98f8d9b9a1cda0569e182f553f6fd676366c8dc574d3283186f101ab8bfc1bf058f3c058290b398a576d59a1812d7d1cf
 AUX metalog-0.9-metalog-conf.patch 265 SHA256 a18bbb8c05608a8919937be37b0dfc5640c2981986ad67ed75c5ee56831c2d42 SHA512 569a145384c4c117f82995b8d2970be73e240c74922ec694c4129af80512441745a00a65f77bdfb58125a6e291df97bb7a5d5a8106ef1c86735838cc1ef424f9 WHIRLPOOL 11849feb5ca53f4ade72f3f304a03858fa1e967b5f81fc6f16275ccfca91c3e99505cda62a8b6febd04091bc8f9b44584810076002fedcb19d215d91ba72b608
+AUX metalog-2-no-gets.patch 851 SHA256 a40369db00c69b42ecdb3a1be8115767277c1ff40a8d646b8d1a825a775f7261 SHA512 876b8b7063ee6769a9c5cd940d953ab3c5a0f1eb56886015ee784a72c53eece2a34511e1c38ca6da2903466eeedf97b175c15d32e57c48d08fe7b8f7bd27c6fd WHIRLPOOL 9482ec64b764f810c97c2ca9b76f8792fda263be1befb05f3ddf4b5f5128113d72caa26cfc0655e876da1df2442480f7ca03c52cd3743c9b3e0d0c8a6d4014c5
 AUX metalog.confd 505 SHA256 ec9f05b386a06a4b2d5398cc0c33f34eba3f5e74ad46ae203d682f8ebc593f99 SHA512 413ffd8ee9f34c18fc12f78d4d16f932e8bbadb5fde25e194cbf0a9cc26bcaffdc8d202f4ac50e508f3dfcaf9ea6bfc29a323e71a016f853b6e5180fa5047598 WHIRLPOOL f0aba94fd71cd5c4513af861dca872b5937975876f5fd0bda9fa24dcd3fa29371278f8586623c50dd881d7fca5bf613fa6378a3d745f4c6f997dd88d530844f6
 AUX metalog.initd 812 SHA256 906c31e0817517dc6c141a7a10565140ea272d3c958a065f520a0ecb6f81912f SHA512 190669fe9c415e683e0baebf3dca7d87d54539531bc9d628e216b53e3ee5f101000db3ab45b25520e2fdec07e0e583aec4dc6415f09925df719e55f86ce7dee3 WHIRLPOOL ccd54071bf1708a03a5d4c35a5bab28e4465ecca1e8f489ebeb674ccb022fd75be654215870a9b44ded01d1ae4410e3cd639270ea1c4c808f3290043d913fb2e
 DIST metalog-1.tar.lzma 276450 SHA256 4f27a64e7abb1a1ecb078147db8db4e1edf2bcb72723ec5d9456af09255ff167 SHA512 f5aa1f10440e01ccf76fb50eba7612a18df93a9821cc5c97302647dbd7be6bb7382e08193063d9d37b1760b52ba7dc82d9b1612c287159d84f9326a351063ea1 WHIRLPOOL 7435ee8e0cf1add1191d042aa349ceca4a42eadf6e8478661f263672f49da82dfeee59cb4dc6f4009cfbad578800ba594558fe543445ee6d7fd0c4de4f3c1feb
 DIST metalog-2.tar.xz 342848 SHA256 4c7e6a6aae6b38d3e03bf34bb9256fcba68888a58c4dbbb1c7d14ba73f8d8f42 SHA512 194d9ca0c5bc8addd1970362cfa7bf1a368f50a9aa7370e2c4d63eb9d9819df08df001a3a85595a74e7b16fdd78c94ffde3cd9a63962ebc9f6ed71b1a574d7cf WHIRLPOOL 23dafa1944808f40e41aee5fe6254222cebaa647e63ac503783fd07445cdc222c0724823676d5a5fe8b63496228d2629301c0dc5d88cd87e74f84841e9cef41b
 EBUILD metalog-1.ebuild 1573 SHA256 d1c6689a1315df1d010f27f2ec63208ea456fc9efae0585fe53f515fecae1556 SHA512 6df475ed5b9105b5e7d0121b705d14f2441d1f061a057d0e6099aecf43ec615ace7a40d168c5dd5e6c29d1c1fef07cab1d4e41edb4cd325eda5a00d5cb1be4b3 WHIRLPOOL da7bfd13a26dc82abff2c96affb48abe10eaf3a5175d9b02dbd8e637548e0c14342417364380a31fa4732314e81f75021abdc2f3eaaa891a4f99c276a43fe4c0
-EBUILD metalog-2.ebuild 1542 SHA256 35efd9c5dcd38a335cc8f8a8b79db459b905d04d5a2d08238d49486fe1dd87e3 SHA512 9f430d2ce1109320528609a917480e1f7047dcbd487f99d96310d09f1cdf4f7ec055909dba2b1bb5345d06b044a415f380ae42abb9ccd5d507129bfc5f6e3151 WHIRLPOOL a85ac91ede1d9f81be36a87497eb1294aaa99c7bbea9ea80f4361e6a03d6262dc58587dfa04ae6dd580dd6a492139d0fa672f6bb9f0a02ee5f66e449700a4482
-MISC ChangeLog 12755 SHA256 5eb2f0e3bc5d6af427fc1c89140c608ff8edb67699a53e9b2ca16efc1f51b06f SHA512 7dd7dd7c95138911bf12b001dd5d5c804f946ca4a039262f742417fedf01c1bd66b56731f5bf2f0c8e9d319678ea0b8e515e4f1e2f17ca0c18c9209003592ca3 WHIRLPOOL d437195e04cfac152898e884e9180ba475df1f92a02252f22956fba1fa68b81e0404a530abfc6d7390d2d6a9acb85d308dd85a84a8a2c46b426ade154c3c27be
+EBUILD metalog-2.ebuild 1591 SHA256 3c27446cac8f64c663e99f5239c9e1013f2467fa1736412d02122e060d6d484d SHA512 ffd4e9a6f9f09327397ed1176fc8668f481108ff74a1f1a5baea5b742eb4654a8ed4378e17c86d158749349a1f8f81ff0a59745a462df1e51f3e3b2296f2d19a WHIRLPOOL 9f6b08ca12c1580db3dd1b2347d62714bd0505dcdbdc0de6601dd3bc47bccd425e63b9bf22ad44d8816ed14dd07643aa2584cebcdaa7ba86f6eeb5df81f824ca
+MISC ChangeLog 12917 SHA256 3dadd2f905920dd2c6ffd5d905d281df48adac0f0a35d3bf5f55fd7a2d1a019a SHA512 738b457ed555c79d56ac379d6ff3fa37405d94c337a15ad6cc709b03a9338eea217b4c75c7e0d2484e7a62c52c545405923c2e90b11dbbbd0e90b9f12dec148a WHIRLPOOL 440de66d10a9b8223ac211d6831169cf18423e814db48cf88562eae1618bc626bee4957645a5425a43922aa2601f67376e5c6b01780910c9a4ea1dee98c95628
 MISC metadata.xml 225 SHA256 8c13ed9cb8e178d0e1af782bee862350146dc46765dedd79e6f531211ef52a68 SHA512 cc3813208491b7c9d8ac589c24dfc7d535e493ea78fe7359ee31b012a8ade3051d868dc46479b8199a7eaf3f1bd8d4d931108a431eafaec24b6ec7b82633f15a WHIRLPOOL 209ea6cafd06674591067dd9bd91ae6283411aaecf639f48e934df32ec00de4d0d711f0987fa28f684fba4f62bf7a5122f1ee314c9a650eb820042a4379ab974
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v2.0.19 (GNU/Linux)
+
+iQIcBAEBAgAGBQJQA0JyAAoJELEHsLL7fEFW8X8P/3n2Vh2SehC4b4/fug5+PnnS
+vlwWzLcnNSQjKRHi1ecf0CjuodHb9dOIv5VPePZ2NnYFJ9+RZwD0nP1V7AUJhC1R
+RYEcPoXvgpeXwXJfKOjx3sBwvLP1m1idGii0iwLeFjVcMN/mumUF7yWdseWGY1W2
+PupFL/GPu7zjbZ2zDeaDYPPABpTMKzwMTDZGY2C8evueH8Rvq8b4mnVwNGQinrb4
+X/NPbxafyglaT9vEyg3658RLYAe9mfVtUYvyS34mgXgWPqci8PLzVWDRjYXof1ZQ
+DL35Xr/dGPUEmhqg3CtLntMYOffnm9+kKRVDOu0bkgJ5IESC8eQXiKLbcAVMlP4R
+cbhXLa0fnC9bHVucM0AiOSD9sgWUspqXm+hsVPXquYyGs+LW7SK+dpsJkHVuXIgt
+DM98nort9Oy6C5A16Mss0e1YB/67fdJ4/mVHeE1hpdzO3MXJIZE8U47iWDUplP+0
+GUKruK3Knu6CiAKmhNP2zM8uGRQPHu3lMu/rVMWcJAIjg6F5JbqFLKyHRdgqANgF
+ab6ZM5v7TzYLkYbNWiPCQjDECTOnTPnQvpxGGmEk67B9j+B25JLuonqnbphhFRHT
+hPgz8k7i0WXZPf4VZ1HEMxeULgfKJpOcv689nZpC/tZIt1Sn8wQCo2So++tjom0E
+FsrQZiZlRhlfaigQ5/1h
+=P5Gr
+-----END PGP SIGNATURE-----
diff --git a/app-admin/metalog/files/metalog-2-no-gets.patch b/app-admin/metalog/files/metalog-2-no-gets.patch
new file mode 100644
index 000000000000..24d457611b3b
--- /dev/null
+++ b/app-admin/metalog/files/metalog-2-no-gets.patch
@@ -0,0 +1,24 @@
+https://bugs.gentoo.org/426632
+
+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/gnulib/lib/stdio.in.h
++++ b/gnulib/lib/stdio.in.h
+@@ -125,7 +125,6 @@
+ /* 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
+ 
+ 
diff --git a/app-admin/metalog/metalog-2.ebuild b/app-admin/metalog/metalog-2.ebuild
index 38b1c9bfde0d..3622317399e4 100644
--- a/app-admin/metalog/metalog-2.ebuild
+++ b/app-admin/metalog/metalog-2.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/app-admin/metalog/metalog-2.ebuild,v 1.9 2012/05/06 16:27:27 armin76 Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-admin/metalog/metalog-2.ebuild,v 1.10 2012/07/15 22:21:32 vapier Exp $
 
 EAPI="3"
 
@@ -21,6 +21,7 @@ DEPEND="${RDEPEND}
 
 src_prepare() {
 	epatch "${FILESDIR}"/${PN}-0.9-metalog-conf.patch
+	epatch "${FILESDIR}"/${P}-no-gets.patch #426632
 }
 
 src_configure() {