Fix building against glibc-2.16 (#429656 by Mario Fetka (geos_one) and Christian Hagau)

Package-Manager: portage-2.2.7/cvs/Linux x86_64
Manifest-Sign-Key: 0xA188FBD4

4 files changed, 69 insertions, 23 deletions

diff --git a/sys-libs/libxcrypt/ChangeLog b/sys-libs/libxcrypt/ChangeLog
index 29a950e4a752..40954dada636 100644
--- a/sys-libs/libxcrypt/ChangeLog
+++ b/sys-libs/libxcrypt/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for sys-libs/libxcrypt
-# Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sys-libs/libxcrypt/ChangeLog,v 1.9 2010/04/26 11:25:53 flameeyes Exp $
+# Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/sys-libs/libxcrypt/ChangeLog,v 1.10 2013/11/25 20:48:27 pacho Exp $
+
+  25 Nov 2013; Pacho Ramos <pacho@gentoo.org>
+  +files/libxcrypt-2.4-glibc-2.16.patch, libxcrypt-2.4.ebuild:
+  Fix building against glibc-2.16 (#429656 by Mario Fetka (geos_one) and
+  Christian Hagau)
 
   26 Apr 2010; Diego E. Pettenò <flameeyes@gentoo.org>
   libxcrypt-2.4.ebuild:
@@ -33,4 +38,3 @@
 
   20 Jan 2004; Joshua Brindle <method@gentoo.org> libxcrypt-2.0.ebuild:
   initial import
-
diff --git a/sys-libs/libxcrypt/Manifest b/sys-libs/libxcrypt/Manifest
index 32460ff967f9..1be5e4ced748 100644
--- a/sys-libs/libxcrypt/Manifest
+++ b/sys-libs/libxcrypt/Manifest
@@ -1,16 +1,17 @@
 -----BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
+Hash: SHA256
 
-DIST libxcrypt-2.0.tar.bz2 255228 RMD160 8aa759fa698c8e086fce3fb854ff6f8f1de03328 SHA1 8325fcb3c0e784d3c9ea8a04a4b1e1cc8d3b67d3 SHA256 176ed37cfdd3b1fe6f9e01cb75c5f864287906bb5741d22fa586d6239ad672a8
-DIST libxcrypt_2.4.orig.tar.gz 361503 RMD160 930e4f7fab248ef973d16ffcdbae325559e65acf SHA1 397f4dc3f092cd19b8145e3905d3e85e7469dd53 SHA256 4207aee39c4454c1955b26a3d77f33e730eae94c20406976b6de80c3a3cfb1cd
-EBUILD libxcrypt-2.0.ebuild 553 RMD160 d703d4c7e1d8f366733eaf6cedf093e5d1912ff6 SHA1 ecd2ef5487b095fd12ea74b8b2b40a64c5031725 SHA256 38d78e78bafbe3d016614c806d44e22d7ef4a282a9e15d8b6f8f9f42a42412d7
-EBUILD libxcrypt-2.4.ebuild 800 RMD160 122972897f62e7cde298672e9ed5af6c192b1a71 SHA1 946ab513b2c6dfe55a69f2ad53b55ae92df054e2 SHA256 9b6134b5490db9f4093c18ba8b9b14f0097f633c99d081ff444f3b5ffebd4eaa
-MISC ChangeLog 1241 RMD160 7c1ebb16e6aaff45c452afcce1dc878f03032a25 SHA1 3762bcac8ba9ebb88d4dc629d8dd9582c0a3f10d SHA256 cc1eb8deacc2c7f8479cb44937026417b2dc7fe112ca3496aea870c78f11fe9e
-MISC metadata.xml 394 RMD160 cb419578f639b8f677b9f551eb18c57287d9ca38 SHA1 d751ff8b3c893f8884dc74ce762692149725f256 SHA256 2811fce43c6930f68c07ad316c789ca848cc6086725801dd9230c5848ac663f5
+AUX libxcrypt-2.4-glibc-2.16.patch 1024 SHA256 015041d4a9ee23eacc9b3c18216fedb2a6ac12d43c53e946695737de9212e746 SHA512 72dc3944ea6ad600887d99ba0a9b3c0acb9d107f6591a139f863032a45a5efa516ec8b08a06e564552694d14febed0a1e065b96dc4aef06cd274aebf98baedcd WHIRLPOOL 7cf000a35ad37af82b469310cc47e3c916240e8c89088c078ad5fd1707de370d98a6cee17115efd9c8c068b271e35b331bf85dfbb8fee6ee75caac2f60248b5e
+DIST libxcrypt-2.0.tar.bz2 255228 SHA256 176ed37cfdd3b1fe6f9e01cb75c5f864287906bb5741d22fa586d6239ad672a8
+DIST libxcrypt_2.4.orig.tar.gz 361503 SHA256 4207aee39c4454c1955b26a3d77f33e730eae94c20406976b6de80c3a3cfb1cd SHA512 7171ce1b5b7f949232c4db94cf98bdd6396c3e2a8f2f483c041cab92d752e3a2fa93d564ede7efece57c069df129e6cc03049cf3e3f07bd3556031a7c4197cbf WHIRLPOOL 7f23673dacf2d3c6b7f8967aaeb3c2e23039a8f61149372df0dfb700ef5a316ea661be0a76a2caf63e32007a505626c13d8667885935693454bd44c7fc1849c8
+EBUILD libxcrypt-2.0.ebuild 553 SHA256 38d78e78bafbe3d016614c806d44e22d7ef4a282a9e15d8b6f8f9f42a42412d7 SHA512 dc3b6df4e29c3ddfbbe4fb58e202b07c712077059be4c0164f529ffb621d5506850c824917bc050498ac528a4a8b7ecb44bafd52d75382c30d1e38ab815631c1 WHIRLPOOL b2097ee85245c6505fab6da0b8ee66a4a84bf6f85bb2c91ed08c319921fd9e9754266e9d5f2f93c1ca2ad3a2ad8867c4b309e76bfa2bc95a9722b810322e4c9b
+EBUILD libxcrypt-2.4.ebuild 757 SHA256 2a8db0479f1d402be55e76a9f713bebf266cdf2d83b3e4f6cd19729c9a518a11 SHA512 e1acf2424555fc9b83173dbaca4717a3289df5a63955f6920c86ae4a95273c2a6b5ffa46e024276a6cb1ca00d7036414dd4ceaec53f6c6fa1d30e07a907ce69a WHIRLPOOL eb875fe86442b54d1596a13162953ec74b09cb116464bef609d3e2e35b233956b3d76e02d51c7673686dbaded801fa2aec93e6e8e12ed1ada7c35354987425e5
+MISC ChangeLog 1439 SHA256 df5a0246b454413ece623eb8463f9fc185ae7d71b0be6ac138cb38b73e9fb754 SHA512 1234ad2019bdc0d294898366d0842cbd44cc5178dfcaf1e9bdce5354313b0edc9afe4d5aaba51a3b480f0aaabc0983b04acd38d2068f3b3dc5f08cbe3c015d57 WHIRLPOOL 7982987ae22831857147e388133b5fb7f316b3707419a7c488a099e154020c1dcb075f269873e79388044aad318abf183ae56361671649f7c3c52caeef0f11f1
+MISC metadata.xml 394 SHA256 2811fce43c6930f68c07ad316c789ca848cc6086725801dd9230c5848ac663f5 SHA512 4e48ac0a6893a36043ba54bdc096b79ae7469866b82abb7d92d3fb90bbb950528c74d383e41bfaa235f5f314af6b34ccc994a43a374452f735727faecf60496e WHIRLPOOL fda0ceb10826a40b884c341dd662b39d5ff170ba8935b8693fc1a0ea9b46486aac8515b5f7c83f85f4ba9e4457e1823ccd18e3219f99b7c58f9b3c2d6abd569f
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.15 (GNU/Linux)
+Version: GnuPG v2.0.22 (GNU/Linux)
 
-iEYEARECAAYFAkvVeE0ACgkQAiZjviIA2Xi79ACgmY9ldjWULQLxKlbtyEggI4E/
-JfwAoNTRG0WkiJhm4szNfsKwIu3eOUgp
-=CmMJ
+iEYEAREIAAYFAlKTt5wACgkQCaWpQKGI+9Q8bwCfVpz+6BbquEJ+9XE4/MyxcilH
+FwkAnRvPnyeQkpNSKc7gljwy0dNdf9g9
+=Tl15
 -----END PGP SIGNATURE-----
diff --git a/sys-libs/libxcrypt/files/libxcrypt-2.4-glibc-2.16.patch b/sys-libs/libxcrypt/files/libxcrypt-2.4-glibc-2.16.patch
new file mode 100644
index 000000000000..150ff99ab2f9
--- /dev/null
+++ b/sys-libs/libxcrypt/files/libxcrypt-2.4-glibc-2.16.patch
@@ -0,0 +1,40 @@
+diff -urN libxcrypt-3.0.2/src/crypt_util.c libxcrypt-3.0.2.new/src/crypt_util.c
+--- libxcrypt-3.0.2/src/crypt_util.c	2007-10-25 15:17:46.000000000 +0200
++++ libxcrypt-3.0.2.new/src/crypt_util.c	2013-02-04 12:45:20.560191479 +0100
+@@ -30,8 +30,7 @@
+ #endif
+ #include <string.h>
+ 
+-#include <bits/libc-lock.h>
+-#define __libc_lock_t pthread_mutex_t
++#include <pthread.h>
+ 
+ #ifndef STATIC
+ #define STATIC static
+@@ -265,7 +264,7 @@
+  */
+ struct crypt_data _ufc_foobar;
+ 
+-__libc_lock_define_initialized (static, _ufc_tables_lock)
++static pthread_mutex_t _ufc_tables_lock = PTHREAD_MUTEX_INITIALIZER;
+ 
+ #ifdef DEBUG
+ 
+@@ -362,7 +361,7 @@
+ #endif
+ 
+   if(small_tables_initialized == 0) {
+-    __libc_lock_lock (_ufc_tables_lock);
++    pthread_mutex_lock (&_ufc_tables_lock);
+     if(small_tables_initialized)
+       goto small_tables_done;
+ 
+@@ -471,7 +470,7 @@
+     }
+     small_tables_initialized = 1;
+ small_tables_done:
+-    __libc_lock_unlock(_ufc_tables_lock);
++    pthread_mutex_unlock (&_ufc_tables_lock);
+   }
+ 
+   /*
diff --git a/sys-libs/libxcrypt/libxcrypt-2.4.ebuild b/sys-libs/libxcrypt/libxcrypt-2.4.ebuild
index 8308b9c7835d..62e302a67b1a 100644
--- a/sys-libs/libxcrypt/libxcrypt-2.4.ebuild
+++ b/sys-libs/libxcrypt/libxcrypt-2.4.ebuild
@@ -1,10 +1,9 @@
-# Copyright 1999-2010 Gentoo Foundation
+# Copyright 1999-2013 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-libs/libxcrypt/libxcrypt-2.4.ebuild,v 1.2 2010/04/26 11:25:53 flameeyes Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-libs/libxcrypt/libxcrypt-2.4.ebuild,v 1.3 2013/11/25 20:48:27 pacho Exp $
 
-EAPI=2
-
-inherit multilib
+EAPI=5
+inherit eutils multilib
 
 DESCRIPTION="A replacement for libcrypt with DES, MD5 and blowfish support"
 SRC_URI="mirror://debian/pool/main/libx/${PN}/${PN}_${PV}.orig.tar.gz"
@@ -15,14 +14,16 @@ SLOT="0"
 KEYWORDS="~amd64 ~x86"
 IUSE=""
 
+src_prepare() {
+	epatch "${FILESDIR}/${PN}-2.4-glibc-2.16.patch"
+}
+
 src_configure() {
 	# Do not install into /usr so that tcb and pam can use us.
 	econf --libdir=/$(get_libdir) --disable-static
 }
 
 src_install() {
-	emake DESTDIR="${D}" install || die "emake failed"
-
-	# Remove unneeded files from /
-	rm -f "${D}"/$(get_libdir)/"${PN}".la || die "rm failed"
+	default
+	prune_libtool_files
 }