Fix building with GLIBC 2.10+ wrt #273856, thanks to Arttu Valo for patch.

Package-Manager: portage-2.2_rc36/cvs/Linux x86_64

4 files changed, 39 insertions, 18 deletions

diff --git a/net-p2p/mutella/ChangeLog b/net-p2p/mutella/ChangeLog
index cae0e352a54d..4ef239e812e2 100644
--- a/net-p2p/mutella/ChangeLog
+++ b/net-p2p/mutella/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for net-p2p/mutella
-# Copyright 2002-2009 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-p2p/mutella/ChangeLog,v 1.25 2009/02/24 02:21:11 dirtyepic Exp $
+# Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/net-p2p/mutella/ChangeLog,v 1.26 2009/08/09 15:28:56 ssuominen Exp $
+
+  09 Aug 2009; Samuli Suominen <ssuominen@gentoo.org> mutella-0.4.5.ebuild,
+  +files/mutella-0.4.5-glibc-2.10.patch:
+  Fix building with GLIBC 2.10+ wrt #273856, thanks to Arttu Valo for patch.
 
   24 Feb 2009; Ryan Hill <dirtyepic@gentoo.org>
   +files/mutella-0.4.5-gcc43.patch, mutella-0.4.5.ebuild:
diff --git a/net-p2p/mutella/Manifest b/net-p2p/mutella/Manifest
index 1b3a4bf156c9..10f230bf1948 100644
--- a/net-p2p/mutella/Manifest
+++ b/net-p2p/mutella/Manifest
@@ -1,16 +1,7 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
-
 AUX mutella-0.4.5-gcc41.patch 259 RMD160 2b0db76de35594e31bf33a8278e14cee81092725 SHA1 7b256dfb1e519572aa5d12464cb82a966fb5a06c SHA256 ab18e4fde6e8687de9bf81d994b661e7d6b6e71b43dd9db29ae8f66609406d57
 AUX mutella-0.4.5-gcc43.patch 2050 RMD160 b0665376349edadeeed876bba1a900ff3e9e3592 SHA1 7673396bb8568e1688bb4463193c54674a009166 SHA256 91219265c6bf898fbb9ecef5699108a6564da8ee54bc0c7943f864a84c612be7
+AUX mutella-0.4.5-glibc-2.10.patch 1080 RMD160 e572226e2973ec3e9c22b752354d9895a04fc3e5 SHA1 6213e8ffea07ed7ef621836fbf3eeb37dac149f6 SHA256 afacf836457bd4da4837196390338c5a5c1dc3b1ab8931946df2ce0a8f62b4e0
 DIST mutella-0.4.5.tar.gz 471839 RMD160 f870ba5ed5c3bf7b852fca49ef358a69bad4da74 SHA1 83a788d06eb24805605c46ff9ce14a5202ae38b8 SHA256 db99dd1fa52fae87290e367862cb051ee1072c88249e73fe25a933ea73030cc4
-EBUILD mutella-0.4.5.ebuild 819 RMD160 ce4ab7f3bb23b1e370260d2ffb018c839b88ef12 SHA1 6182238259e928b5ab17ec0136d697e0e99a97b2 SHA256 75b706bcd7dfc81ddc54018729ba546a7e22aecd2b0ebbc61549b2881c5020ff
-MISC ChangeLog 3385 RMD160 3e8e563ae79e38e66749b5cf8d4684c8fa068ba4 SHA1 cb2b35f85639fd43c88fcc27a78ee0a52d6571a2 SHA256 c200425b06ef346ccf993b07db561bb9770349870cd78fceb41e6f98b1c12f2f
+EBUILD mutella-0.4.5.ebuild 838 RMD160 0ff2c4970a5da6c118920cef0cbb21c102412c93 SHA1 01814e44d388eb61ea962e2bfe5b5a5ccff20082 SHA256 76b8180173be271090ab601366d7c0cd237aae124ad369ae50e538fb20efcf08
+MISC ChangeLog 3580 RMD160 92862bbdc860208f2a48cbbbc63257214b3f5289 SHA1 b96e7c6b05370085f905933aed48dc38733ba21b SHA256 8325923f8737a740a2cc0053153829eeb285d53bf3e4899c1acc03690fe74899
 MISC metadata.xml 160 RMD160 828887200387b28c37fc97111fc6bc3a0a2fcccd SHA1 813ef5bc57f6a8d95e7cab7a745a2a824858f49c SHA256 fe06593409e7f28665c032001005e94cb650299711a0af7f1a558bdb56c4004f
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.10 (GNU/Linux)
-
-iEYEARECAAYFAkmjWe8ACgkQiqiDRvmkBmIqHQCfdaF0pDTNiKhGwK3r9oOO3unE
-JSoAn0qq/3psP1msZWxrY2/V+4oJNGGs
-=Eqz8
------END PGP SIGNATURE-----
diff --git a/net-p2p/mutella/files/mutella-0.4.5-glibc-2.10.patch b/net-p2p/mutella/files/mutella-0.4.5-glibc-2.10.patch
new file mode 100644
index 000000000000..0ef88b6470e2
--- /dev/null
+++ b/net-p2p/mutella/files/mutella-0.4.5-glibc-2.10.patch
@@ -0,0 +1,26 @@
+diff -ur mutella-0.4.5.old/mutella/uiremote.cpp mutella-0.4.5/mutella/uiremote.cpp
+--- mutella-0.4.5.old/mutella/uiremote.cpp	2009-07-09 04:38:28.583840188 +0300
++++ mutella-0.4.5/mutella/uiremote.cpp	2009-07-09 04:40:48.955839846 +0300
+@@ -575,11 +575,11 @@
+ 	{
+ 		// login -- HTTP-Basic so far
+ 		bool bLoginOK = false;
+-		char * pszAuth = NULL;
++		const char * pszAuth = NULL;
+ 		if ( (pszAuth = strstr(szHandshake, "Authorization:")) )
+ 		{
+ 			// extract authorization line
+-			char * pRN = strstr(pszAuth, "\r\n");
++			const char * pRN = strstr(pszAuth, "\r\n");
+ 			CString sAuthLine(pszAuth + strlen("Authorization:"), pRN-pszAuth-strlen("Authorization:"));
+ 			int nPos = sAuthLine.find("Basic");
+ 			if (nPos>=0)
+@@ -616,7 +616,7 @@
+ 	const char* pszCookie;
+ 	if( (pszCookie = strstr(szHandshake, "Cookie:")) )
+ 	{
+-		char * pRN = strstr(pszCookie, "\r\n");
++		const char * pRN = strstr(pszCookie, "\r\n");
+ 		CString sCookieLine(pszCookie + strlen("Cookie:"), pRN-pszCookie-strlen("Cookie:"));
+ 		// we will split the line by "; " combination
+ 		list<CString> Cookies;
diff --git a/net-p2p/mutella/mutella-0.4.5.ebuild b/net-p2p/mutella/mutella-0.4.5.ebuild
index 1a2dc9bd6f7d..706c25607809 100644
--- a/net-p2p/mutella/mutella-0.4.5.ebuild
+++ b/net-p2p/mutella/mutella-0.4.5.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/net-p2p/mutella/mutella-0.4.5.ebuild,v 1.8 2009/02/24 02:21:11 dirtyepic Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-p2p/mutella/mutella-0.4.5.ebuild,v 1.9 2009/08/09 15:28:56 ssuominen Exp $
 
 inherit eutils
 
@@ -16,9 +16,9 @@ DEPEND="sys-libs/readline"
 src_unpack() {
 	unpack ${A}
 	cd "${S}"
-
-	epatch "${FILESDIR}/${P}-gcc41.patch"
+	epatch "${FILESDIR}"/${P}-gcc41.patch
 	epatch "${FILESDIR}"/${P}-gcc43.patch
+	epatch "${FILESDIR}"/${P}-glibc-2.10.patch
 }
 
 src_compile() {
@@ -29,5 +29,5 @@ src_compile() {
 
 src_install() {
 	emake DESTDIR="${D}" install || die
-	dodoc AUTHORS ChangeLog COPYING INSTALL LICENSE KNOWN-BUGS README TODO
+	dodoc AUTHORS ChangeLog KNOWN-BUGS README TODO
 }