Fix building with GLIBC 2.10+ wrt #273836.

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

4 files changed, 39 insertions, 7 deletions

diff --git a/net-ftp/kftpgrabber/ChangeLog b/net-ftp/kftpgrabber/ChangeLog
index c18b241ca8f2..a675588fda47 100644
--- a/net-ftp/kftpgrabber/ChangeLog
+++ b/net-ftp/kftpgrabber/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for net-ftp/kftpgrabber
-# Copyright 1999-2008 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-ftp/kftpgrabber/ChangeLog,v 1.27 2008/01/21 20:29:05 philantrop Exp $
+# Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/net-ftp/kftpgrabber/ChangeLog,v 1.28 2009/08/09 13:21:45 ssuominen Exp $
+
+  09 Aug 2009; Samuli Suominen <ssuominen@gentoo.org>
+  kftpgrabber-0.8.1-r1.ebuild, +files/kftpgrabber-0.8.1-glibc-2.10.patch:
+  Fix building with GLIBC 2.10+ wrt #273836.
 
   21 Jan 2008; Wulf C. Krueger <philantrop@gentoo.org>
   -files/kftpgrabber-0.6.0-gcc4.patch, -files/kftpgrabber-0.6.0-gcc41.patch,
diff --git a/net-ftp/kftpgrabber/Manifest b/net-ftp/kftpgrabber/Manifest
index 00a2c9c51696..4026119decd0 100644
--- a/net-ftp/kftpgrabber/Manifest
+++ b/net-ftp/kftpgrabber/Manifest
@@ -1,5 +1,6 @@
+AUX kftpgrabber-0.8.1-glibc-2.10.patch 1405 RMD160 1bc4c6a74f4136ee0fd76b9f5c3a24539df96dda SHA1 875a835740377cc97d2715ac0d79cbdf42653e9b SHA256 f514093dca9fa7be3bd983125b06a217c481892401fb5738549c659e3748559c
 AUX kftpgrabber-0.8.1-inf-recursion-fix.diff 1644 RMD160 8ec1ccc4a1799f6b951cb17ca907689701c58f4c SHA1 1e68b4d450cad43130492be6ae6bafb7e6dacec6 SHA256 794763a13659265e630e40fb8077c36f7673fe814f2e236f77714dd1b3ad74d4
 DIST kftpgrabber-0.8.1.tar.bz2 1350423 RMD160 04cd1ee6f98e3795598cf9cff991d568c23a7cd8 SHA1 5f1915ea2c92a9822ccf07226ab20f46742cfec6 SHA256 d0c4e412e0ea27bf35cfd3fea44802649e358ac80742cdb550546eb83d51f2c3
-EBUILD kftpgrabber-0.8.1-r1.ebuild 1021 RMD160 094c52521e539a0e37d054e3a4b51f7041ba5504 SHA1 11f711c67df45337619351ee07ef532ca4603f32 SHA256 34355e1cdfb9264587f6ef5468f993070c17758164c088aadf61e7ab928b1bbc
-MISC ChangeLog 4848 RMD160 966acf79f64372a292c224f3d82f85ea51e5e6d5 SHA1 c8099e982c7e01db3bd5adfc2c20b09d6fe6483c SHA256 9495184a971468b2765b95e76994790327d996baaeed246361121bb7f471c1af
+EBUILD kftpgrabber-0.8.1-r1.ebuild 1064 RMD160 85f20a6fd29f9039a52c9e7fad9ca17bf3aedb20 SHA1 5cd5c4f87eb6623e726c099cbe4850373881066c SHA256 f7c3444244c7510431a5110f9c1c02845b9bd6895b9dc79234c12d22f35c9a4f
+MISC ChangeLog 5021 RMD160 6d834730f54903238ea804ec9341aefed22d9b5e SHA1 24df71ae6afeef0163195b80912df1d72ade649e SHA256 6c7332ce30130fb9cedb0da0cd5d5703aac74cbfef599424d17f87d73c8cad92
 MISC metadata.xml 156 RMD160 ecce3b981f150c45ae1e84e2d208e678d6124259 SHA1 b64f7c0b4e5db816d82ad19848f72118af129d35 SHA256 2f4da28506b9d4185f320f67a6191d30c7a921217ed4447ed46ea0bc4aefc79a
diff --git a/net-ftp/kftpgrabber/files/kftpgrabber-0.8.1-glibc-2.10.patch b/net-ftp/kftpgrabber/files/kftpgrabber-0.8.1-glibc-2.10.patch
new file mode 100644
index 000000000000..c9946462d1e7
--- /dev/null
+++ b/net-ftp/kftpgrabber/files/kftpgrabber-0.8.1-glibc-2.10.patch
@@ -0,0 +1,26 @@
+diff -ur kftpgrabber-0.8.1.old/kftpgrabber/src/engine/ftpsocket.cpp kftpgrabber-0.8.1/kftpgrabber/src/engine/ftpsocket.cpp
+--- kftpgrabber-0.8.1.old/kftpgrabber/src/engine/ftpsocket.cpp	2009-08-06 04:12:45.938977940 +0300
++++ kftpgrabber-0.8.1/kftpgrabber/src/engine/ftpsocket.cpp	2009-08-06 04:13:52.117078262 +0300
+@@ -758,7 +758,7 @@
+         }
+         
+         // 229 Entering Extended Passive Mode (|||55016|)
+-        char *begin = strchr(socket()->getResponse().ascii(), '(');
++        const char *begin = strchr(socket()->getResponse().ascii(), '(');
+         int port;
+       
+         if (!begin || sscanf(begin, "(|||%d|)", &port) != 1) {
+@@ -793,11 +793,11 @@
+         
+         // Ok PASV command successfull - let's parse the result
+         int ip[6];
+-        char *begin = strchr(socket()->getResponse().ascii(), '(');
++        const char *begin = strchr(socket()->getResponse().ascii(), '(');
+       
+         // Some stinky servers don't respect RFC and do it on their own
+         if (!begin)
+-          begin = strchr(socket()->getResponse().ascii(), '=');
++          begin = const_cast<char*> (strchr(socket()->getResponse().ascii(), '='));
+       
+         if (!begin || (sscanf(begin, "(%d,%d,%d,%d,%d,%d)",&ip[0], &ip[1], &ip[2], &ip[3], &ip[4], &ip[5]) != 6 &&
+                        sscanf(begin, "=%d,%d,%d,%d,%d,%d",&ip[0], &ip[1], &ip[2], &ip[3], &ip[4], &ip[5]) != 6)) {
diff --git a/net-ftp/kftpgrabber/kftpgrabber-0.8.1-r1.ebuild b/net-ftp/kftpgrabber/kftpgrabber-0.8.1-r1.ebuild
index 6a345991425c..2283e5caa683 100644
--- a/net-ftp/kftpgrabber/kftpgrabber-0.8.1-r1.ebuild
+++ b/net-ftp/kftpgrabber/kftpgrabber-0.8.1-r1.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/net-ftp/kftpgrabber/kftpgrabber-0.8.1-r1.ebuild,v 1.7 2007/09/25 18:29:24 armin76 Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-ftp/kftpgrabber/kftpgrabber-0.8.1-r1.ebuild,v 1.8 2009/08/09 13:21:45 ssuominen Exp $
 
 inherit kde
 
@@ -25,7 +25,8 @@ DEPEND="${RDEPEND}
 
 need-kde 3.5
 
-PATCHES="${FILESDIR}/kftpgrabber-0.8.1-inf-recursion-fix.diff"
+PATCHES=( "${FILESDIR}/kftpgrabber-0.8.1-inf-recursion-fix.diff"
+	"${FILESDIR}/${P}-glibc-2.10.patch" )
 
 src_unpack() {
 	kde_src_unpack