Fixing build against glibc 2.10. Bug #279911

Package-Manager: portage-2.1.6.13/cvs/Linux i686

6 files changed, 41 insertions, 21 deletions

diff --git a/app-arch/upx-ucl/ChangeLog b/app-arch/upx-ucl/ChangeLog
index 0c693bb20366..c01a025cd25c 100644
--- a/app-arch/upx-ucl/ChangeLog
+++ b/app-arch/upx-ucl/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for app-arch/upx-ucl
-# Copyright 2000-2009 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-arch/upx-ucl/ChangeLog,v 1.16 2009/02/25 12:17:26 drizzt Exp $
+# Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/app-arch/upx-ucl/ChangeLog,v 1.17 2009/08/03 00:02:55 vostorga Exp $
+
+  02 Aug 2009; Víctor Ostorga <vostorga@gentoo.org>
+  +files/upx-ucl-glibc210.patch, upx-ucl-3.00.ebuild, upx-ucl-3.02.ebuild,
+  upx-ucl-3.03.ebuild:
+  Fixing build against glibc 2.10. Bug #279911
 
   25 Feb 2009; Timothy Redaelli <drizzt@gentoo.org> upx-ucl-3.03.ebuild:
   Add ~x86-fbsd keyword to upx-ucl (and deps)
diff --git a/app-arch/upx-ucl/Manifest b/app-arch/upx-ucl/Manifest
index be31b837f7cd..b44b67bfb15c 100644
--- a/app-arch/upx-ucl/Manifest
+++ b/app-arch/upx-ucl/Manifest
@@ -1,7 +1,5 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
-
 AUX upx-ucl-1.25-pie.patch 782 RMD160 c35d0c3b015586c8b4472e33be790f722daa5046 SHA1 b07360b0192162d99ca138870cb9e600b6b27ef5 SHA256 edbb4eb5888822b6b70fd8b1e058c5315832811e815c8753fd90e9b1430f6d20
+AUX upx-ucl-glibc210.patch 615 RMD160 ef57557e5808bbb1ce3fdebbbcee3eb2e065acf2 SHA1 e0ddf87f6d688004051537378da443bbc1aa83ae SHA256 4023d95c80273e8f7e8613e5cc39d2bf31b29c910e851b1a7be60b1424e04a39
 DIST lzma443.tar.bz2 178493 RMD160 f4f19c9f9bd8ded26318208e75ac14c8869c4ef8 SHA1 1667abfb40da82d53fa2690f3cd58a0e7e751e55 SHA256 ba85f63243f1f530882cadae401e6f42f624ebb07829e467ea6177e303fa64b2
 DIST lzma457.tar.bz2 298927 RMD160 9a3b8577e99f4ae4e62e75e1f3bbd3f1626e140f SHA1 bd1b46ba42fe1ad7351a39c131e8b7657e909001 SHA256 e1d07b372d9748eba715354bfd540ae2cb0e2c7e83ce630439420ab7df13f2e0
 DIST upx-1.25-src.tar.gz 250849 RMD160 1c73a1eb8d98d32ef63ed351ca494526f895a9de SHA1 7ce05370efe969832d841a73dd165e6a4292f9d4 SHA256 c0bf0b2eccd5766a1171733323ab79c9e4d21d66f4ef2ad8ea7387c72adeb6ed
@@ -13,15 +11,8 @@ DIST upx-3.03-src.tar.bz2 735160 RMD160 224f7d93e829b66d1786155522a7a43c0f11f3ce
 EBUILD upx-ucl-1.25-r1.ebuild 1228 RMD160 ca95006eb325b23278d777a919dc5b833865a65a SHA1 3e61e4142c57ac85497165f66ea130eaf909d158 SHA256 25b939437bb72a0be29474f47ef56f8ac9d391d69c5385c42b68cb0eb68bb627
 EBUILD upx-ucl-2.02.ebuild 824 RMD160 3fd4615f2576ab5d0b008d6f5bbcfe140ecc5c6c SHA1 0017efbe99f31758811ab707944b18143c300a28 SHA256 b9d8f11af5a7579b477b2df455a163866493c2f8d23499ffc6c49863a42e44c8
 EBUILD upx-ucl-2.03.ebuild 850 RMD160 69c338694e2823a210f71c29eed6c58e46fd6cf2 SHA1 27a0ec72e46013e4b04ff36d3f7c9ee9be89d504 SHA256 41016249ff7436fe07fcc34a033fd4e018dd1a390743d4b16ca466e0bddd9abd
-EBUILD upx-ucl-3.00.ebuild 1055 RMD160 609208584552d8d09d89378329fb49ecd76ec39f SHA1 37e1be8549ebc823056b1b1fcc97deaa43595091 SHA256 a25a6bc39856c1da8cf9622c8a05dd34c2fddd0b63ad1e5185c3a8233deca819
-EBUILD upx-ucl-3.02.ebuild 1116 RMD160 8399a6bd78b956e3f3660d0112822bbb5c7d3957 SHA1 78ad438d197ac829b01bb12eff9ba03142752c9b SHA256 5def444137d78bccb9a1e89105d4a5d53ddd693d6a6d722f8a35259c5ea2d280
-EBUILD upx-ucl-3.03.ebuild 1125 RMD160 78a6bbe017f6d7746eed989eabc5f545c10b26a0 SHA1 3ef3e09a4c3bb897c5335659bacf779bb38a64e0 SHA256 de5b4a3d6f349373f5e01ec0fdddd4c59ccd56269b6a818c21b433190c5fbe60
-MISC ChangeLog 2466 RMD160 f6579ac7efaf3ebf5f3a812b9eb2ce73c1ec6c05 SHA1 aac09402d2a8bd41b2e678de3798d58c2fc5906a SHA256 ee96884534ca8a7a8eb7cbbb45cf84e133b2ded160b3390d612c76d13d3467e2
+EBUILD upx-ucl-3.00.ebuild 1111 RMD160 48efa4999f67259152baf13050c5d1057e89fb6e SHA1 6fdcc3739cbd5846be770926541b4c7382daa3b0 SHA256 ae61550b07da6949fddfeb3b43aca5bf82440d8bdd9e8551c456583830b08d5d
+EBUILD upx-ucl-3.02.ebuild 1171 RMD160 11fea8f26b898f15603d79c52c30835332808b66 SHA1 242eb774aee0f6757ce5a9dc87cbbb11bb6e38ce SHA256 eba729d1409cfdd50fe4106396d4930c6f7f6ac44fcd77fc27a2db56f15869b1
+EBUILD upx-ucl-3.03.ebuild 1181 RMD160 5c091d06ea9cec0cad985b1a0ad369e195375aef SHA1 c0a6f94bf10a770db26968d80ce0cdeead6a480e SHA256 f6f3b821687f1c8946cc81a6f26e52834ef04d21d5f5f1e9257928c0c4ec6a73
+MISC ChangeLog 2667 RMD160 488469f3fded564e08b857960f399becaa5959f9 SHA1 4732668071252f4f76fb0a959dc8da7c32bab166 SHA256 6b527b920e1b2c60be0df76bc461fef6c4c416a6497ab8a40947528b21b85479
 MISC metadata.xml 332 RMD160 51646c7f9268e1f838fdfc28926a1475350591fa SHA1 1839d0bea5faeb7b114c4601672c493d880b5e38 SHA256 295aaf52bf304b41d2cea63a5eb2b5831c48df073c5ce72997aa82ca68dbad4d
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.10 (GNU/Linux)
-
-iEYEARECAAYFAkmlNt4ACgkQl4DfQEcjpw2IHgCdGpesdeEE2gvqRLjhcAzNlypy
-I00AoJiT7+Nj8XiKT0v06TQPN9AgnsVd
-=nd9D
------END PGP SIGNATURE-----
diff --git a/app-arch/upx-ucl/files/upx-ucl-glibc210.patch b/app-arch/upx-ucl/files/upx-ucl-glibc210.patch
new file mode 100644
index 000000000000..38540bc64a01
--- /dev/null
+++ b/app-arch/upx-ucl/files/upx-ucl-glibc210.patch
@@ -0,0 +1,18 @@
+diff -NrU5 src.original/pefile.cpp src/pefile.cpp
+--- src.original/pefile.cpp	2009-08-02 23:54:36.000000000 -0600
++++ src/pefile.cpp	2009-08-02 23:54:18.000000000 -0600
+@@ -1347,12 +1347,12 @@
+     };
+ 
+     // FIXME this comparison is not too exact
+     while (1)
+     {
+-        char *delim1 = strchr(keep, '/');
+-        char *delim2 = strchr(keep, ',');
++        const char *delim1 = strchr(keep, '/');
++        const char *delim2 = strchr(keep, ',');
+         if (helper::match(itype, ntype, keep))
+         {
+             if (!delim1)
+                 return true;
+             if (delim2 && delim2 < delim1)
diff --git a/app-arch/upx-ucl/upx-ucl-3.00.ebuild b/app-arch/upx-ucl/upx-ucl-3.00.ebuild
index 78445378074f..96d9bae3f48c 100644
--- a/app-arch/upx-ucl/upx-ucl-3.00.ebuild
+++ b/app-arch/upx-ucl/upx-ucl-3.00.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2007 Gentoo Foundation
+# Copyright 1999-2009 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-arch/upx-ucl/upx-ucl-3.00.ebuild,v 1.1 2007/06/21 16:34:08 drizzt Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-arch/upx-ucl/upx-ucl-3.00.ebuild,v 1.2 2009/08/03 00:02:55 vostorga Exp $
 
 inherit eutils toolchain-funcs
 
@@ -25,6 +25,8 @@ S="${WORKDIR}/${MY_P}"
 
 src_unpack() {
 	unpack ${MY_P}.tar.bz2
+	cd "${S}"
+	epatch "${FILESDIR}"/${PN}-glibc210.patch
 	mkdir "${WORKDIR}"/lzma-${LZMA_VER}
 	cd "${WORKDIR}"/lzma-${LZMA_VER}
 	unpack lzma${LZMA_VER/.}.tar.bz2
diff --git a/app-arch/upx-ucl/upx-ucl-3.02.ebuild b/app-arch/upx-ucl/upx-ucl-3.02.ebuild
index ac9c4c1b469d..faf975bcb24f 100644
--- a/app-arch/upx-ucl/upx-ucl-3.02.ebuild
+++ b/app-arch/upx-ucl/upx-ucl-3.02.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2008 Gentoo Foundation
+# Copyright 1999-2009 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-arch/upx-ucl/upx-ucl-3.02.ebuild,v 1.2 2008/05/16 09:43:44 armin76 Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-arch/upx-ucl/upx-ucl-3.02.ebuild,v 1.3 2009/08/03 00:02:55 vostorga Exp $
 
 inherit eutils toolchain-funcs flag-o-matic
 
@@ -25,6 +25,8 @@ S="${WORKDIR}/${MY_P}"
 
 src_unpack() {
 	unpack ${MY_P}.tar.bz2
+	cd "${S}"
+	epatch "${FILESDIR}"/${PN}-glibc210.patch
 	mkdir "${WORKDIR}"/lzma-${LZMA_VER}
 	cd "${WORKDIR}"/lzma-${LZMA_VER}
 	unpack lzma${LZMA_VER/.}.tar.bz2
diff --git a/app-arch/upx-ucl/upx-ucl-3.03.ebuild b/app-arch/upx-ucl/upx-ucl-3.03.ebuild
index 1c0352b39b3e..35e1c1134fc9 100644
--- a/app-arch/upx-ucl/upx-ucl-3.03.ebuild
+++ b/app-arch/upx-ucl/upx-ucl-3.03.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2009 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-arch/upx-ucl/upx-ucl-3.03.ebuild,v 1.2 2009/02/25 12:17:26 drizzt Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-arch/upx-ucl/upx-ucl-3.03.ebuild,v 1.3 2009/08/03 00:02:55 vostorga Exp $
 
 inherit eutils toolchain-funcs flag-o-matic
 
@@ -25,6 +25,8 @@ S="${WORKDIR}/${MY_P}"
 
 src_unpack() {
 	unpack ${MY_P}.tar.bz2
+	cd "${S}"
+	epatch "${FILESDIR}"/${PN}-glibc210.patch
 	mkdir "${WORKDIR}"/lzma-${LZMA_VER}
 	cd "${WORKDIR}"/lzma-${LZMA_VER}
 	unpack lzma${LZMA_VER/.}.tar.bz2