Fix for infinite recursion in CWD command.

Package-Manager: portage-2.1.2.7

6 files changed, 112 insertions, 12 deletions

diff --git a/net-ftp/kftpgrabber/ChangeLog b/net-ftp/kftpgrabber/ChangeLog
index e1d8d478edfc..fcec63f0e247 100644
--- a/net-ftp/kftpgrabber/ChangeLog
+++ b/net-ftp/kftpgrabber/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for net-ftp/kftpgrabber
 # Copyright 1999-2007 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-ftp/kftpgrabber/ChangeLog,v 1.18 2007/04/28 13:06:11 carlo Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-ftp/kftpgrabber/ChangeLog,v 1.19 2007/05/08 19:32:56 carlo Exp $
+
+*kftpgrabber-0.8.1-r1 (08 May 2007)
+
+  08 May 2007; Carsten Lohrke <carlo@gentoo.org>
+  +files/kftpgrabber-0.8.1-inf-recursion-fix.diff,
+  +kftpgrabber-0.8.1-r1.ebuild:
+  Fix for infinite recursion in CWD command.
 
 *kftpgrabber-0.8.1 (28 Apr 2007)
 
diff --git a/net-ftp/kftpgrabber/Manifest b/net-ftp/kftpgrabber/Manifest
index 91de6e828b74..936411587745 100644
--- a/net-ftp/kftpgrabber/Manifest
+++ b/net-ftp/kftpgrabber/Manifest
@@ -10,7 +10,11 @@ AUX kftpgrabber-0.6.0-uic.patch 1049 RMD160 72d0ef24890aee9f15ae978c624933f5204a
 MD5 225f4b81821c40c533b31665a32de321 files/kftpgrabber-0.6.0-uic.patch 1049
 RMD160 72d0ef24890aee9f15ae978c624933f5204ac162 files/kftpgrabber-0.6.0-uic.patch 1049
 SHA256 58c0dabdf5d4cc6aec88f8bfd3bbfa30bb5732dfb9a89592a735806389287199 files/kftpgrabber-0.6.0-uic.patch 1049
-DIST kftpgrabber-0.6.0.tar.bz2 1127926 RMD160 d036f000dcfe7d189384c850ff8be3d91eb82669 SHA1 c6d4819c6dcc3271ef27f24aa3e086e64fb77010 SHA256 6f717053dbf138cccd73041814e5c0865cfd40bfb03402107fa5b3fcf3e43da1
+AUX kftpgrabber-0.8.1-inf-recursion-fix.diff 1644 RMD160 8ec1ccc4a1799f6b951cb17ca907689701c58f4c SHA1 1e68b4d450cad43130492be6ae6bafb7e6dacec6 SHA256 794763a13659265e630e40fb8077c36f7673fe814f2e236f77714dd1b3ad74d4
+MD5 6ca65489e0c4a9a35252d5918d5be00c files/kftpgrabber-0.8.1-inf-recursion-fix.diff 1644
+RMD160 8ec1ccc4a1799f6b951cb17ca907689701c58f4c files/kftpgrabber-0.8.1-inf-recursion-fix.diff 1644
+SHA256 794763a13659265e630e40fb8077c36f7673fe814f2e236f77714dd1b3ad74d4 files/kftpgrabber-0.8.1-inf-recursion-fix.diff 1644
+DIST kftpgrabber-0.6.0.tar.bz2 1123848 RMD160 5fd005406cd89b3048f27285ffc85baaa05a0791 SHA1 6e2dc7752447d9238c5c8fe9056224057dfceb00 SHA256 0e9aa586aec1b116bd8c90112d8a763ee5f4b1b74711fc1fa6628e9422eccdcf
 DIST kftpgrabber-0.8.0.tar.bz2 1348836 RMD160 d76614b7536b067d975079c2bd5393be246f4fa4 SHA1 a813163a5beedfece8a1022e3794ff8cd0843d20 SHA256 98ffcceeb2a6bf8701850e3caab978809aa07aad57713b4a89cf2d818c442e2e
 DIST kftpgrabber-0.8.1.tar.bz2 1350423 RMD160 04cd1ee6f98e3795598cf9cff991d568c23a7cd8 SHA1 5f1915ea2c92a9822ccf07226ab20f46742cfec6 SHA256 d0c4e412e0ea27bf35cfd3fea44802649e358ac80742cdb550546eb83d51f2c3
 EBUILD kftpgrabber-0.6.0.ebuild 699 RMD160 276bd0968745f3e07241fce991928d43ada5cde9 SHA1 ce91f8580874da9a75849f075e5b4e4c9abdd8f5 SHA256 474a3e900ab5b3c25e7e84aa49b1f96caf5353182082940c45271f55e32096ea
@@ -21,24 +25,31 @@ EBUILD kftpgrabber-0.8.0.ebuild 944 RMD160 11a606f387c2acf62dd26218bab2752785687
 MD5 0b82691741dce4583f37390e7883ce29 kftpgrabber-0.8.0.ebuild 944
 RMD160 11a606f387c2acf62dd26218bab2752785687a28 kftpgrabber-0.8.0.ebuild 944
 SHA256 f02f2988b48a4eb0eccf443a9d48d6237829dbc719cd500392bb2ae9ee136aba kftpgrabber-0.8.0.ebuild 944
+EBUILD kftpgrabber-0.8.1-r1.ebuild 1011 RMD160 2efab720a81a6050a2b937f69473a32a115bb838 SHA1 533900268f796af713beccafc59052026bf68d95 SHA256 d11d4c3f684ca3a6e1d0c7df9a8945a80532793ca5dd89ed8f608498495d45f3
+MD5 6d7fce023857a57a4f627c3d292e11c3 kftpgrabber-0.8.1-r1.ebuild 1011
+RMD160 2efab720a81a6050a2b937f69473a32a115bb838 kftpgrabber-0.8.1-r1.ebuild 1011
+SHA256 d11d4c3f684ca3a6e1d0c7df9a8945a80532793ca5dd89ed8f608498495d45f3 kftpgrabber-0.8.1-r1.ebuild 1011
 EBUILD kftpgrabber-0.8.1.ebuild 944 RMD160 29b29f5983c57074194cf284044aa6b5e24c7401 SHA1 f10e242d8c05888ecb5ebe9a667cc72b78c59ddf SHA256 fff006270f04d251d59160a5db9d952a27ec565160b4dcce17530ed5de3b379c
 MD5 ecd9fee2c3d989338759e357894f0230 kftpgrabber-0.8.1.ebuild 944
 RMD160 29b29f5983c57074194cf284044aa6b5e24c7401 kftpgrabber-0.8.1.ebuild 944
 SHA256 fff006270f04d251d59160a5db9d952a27ec565160b4dcce17530ed5de3b379c kftpgrabber-0.8.1.ebuild 944
-MISC ChangeLog 3564 RMD160 d0142e77a2a0e4e1d387dce5c41202a09a544b44 SHA1 2aca8d54dcadb9ec447057ca307826c8e364da2d SHA256 c219f66bb518840cd4c60161fe7820e874ae2edba62eef392fa425d6f6111a12
-MD5 acebab9ab9c76a5a6a6aa984a71e5bb4 ChangeLog 3564
-RMD160 d0142e77a2a0e4e1d387dce5c41202a09a544b44 ChangeLog 3564
-SHA256 c219f66bb518840cd4c60161fe7820e874ae2edba62eef392fa425d6f6111a12 ChangeLog 3564
+MISC ChangeLog 3779 RMD160 2761a6c3e2f51404f445439ece1ac5d68a0463cf SHA1 18e774228efc6f4bfb025108a40b8bd67e14f3f5 SHA256 477af4bffe1cac58450831d1cabe000af5ab030af50f4c4320998ebb4721a7b1
+MD5 913157e69a317b31bdfe7313e096a72c ChangeLog 3779
+RMD160 2761a6c3e2f51404f445439ece1ac5d68a0463cf ChangeLog 3779
+SHA256 477af4bffe1cac58450831d1cabe000af5ab030af50f4c4320998ebb4721a7b1 ChangeLog 3779
 MISC metadata.xml 157 RMD160 9258d9691830e58ee00ca89f0a6df9ce077f2439 SHA1 b2ca0d856f38a09bf6d2e58ee77b344552585862 SHA256 e0e268ca18fef286617fcfe97773d5df5b8fbdb5fbcb9a29adc5e8b0baea4292
 MD5 02039d51ca4a42817775fd436dfaa956 metadata.xml 157
 RMD160 9258d9691830e58ee00ca89f0a6df9ce077f2439 metadata.xml 157
 SHA256 e0e268ca18fef286617fcfe97773d5df5b8fbdb5fbcb9a29adc5e8b0baea4292 metadata.xml 157
-MD5 8562b360765db17dccec14b2de8801df files/digest-kftpgrabber-0.6.0 259
-RMD160 6537f7dd162cc82f6a3d4f49a51ec664ef492c22 files/digest-kftpgrabber-0.6.0 259
-SHA256 598d5145d8176f39545b013b47342e5a8793be635804ed39e6002cb2d39a5cb6 files/digest-kftpgrabber-0.6.0 259
+MD5 a8b298c36821ec5057e560a54d08f664 files/digest-kftpgrabber-0.6.0 259
+RMD160 b0870ba0b565c554842414ae858f8d905fe9fe4e files/digest-kftpgrabber-0.6.0 259
+SHA256 d982ca6677fd4af045b513fe6579b916a90c7c81ad8d54a835e715fd1fe64b15 files/digest-kftpgrabber-0.6.0 259
 MD5 0044648de2073b86508fd5dab3abe3a4 files/digest-kftpgrabber-0.8.0 259
 RMD160 0bc883b7ab2091b3c75a58864f52d1e17e64aa7b files/digest-kftpgrabber-0.8.0 259
 SHA256 35b76e190a627afa6f70bdfb952c634b5d63df767dc387d51b5d2718c04aa182 files/digest-kftpgrabber-0.8.0 259
 MD5 d2d643f959c249e7b7ccd3ebb840e9ab files/digest-kftpgrabber-0.8.1 259
 RMD160 81b91a7a8cce99a38c517206353d95563562aeec files/digest-kftpgrabber-0.8.1 259
 SHA256 2ec1012f56cb5d8c24503b36d3ad7da5c93a8e270258e0301c03983433682867 files/digest-kftpgrabber-0.8.1 259
+MD5 d2d643f959c249e7b7ccd3ebb840e9ab files/digest-kftpgrabber-0.8.1-r1 259
+RMD160 81b91a7a8cce99a38c517206353d95563562aeec files/digest-kftpgrabber-0.8.1-r1 259
+SHA256 2ec1012f56cb5d8c24503b36d3ad7da5c93a8e270258e0301c03983433682867 files/digest-kftpgrabber-0.8.1-r1 259
diff --git a/net-ftp/kftpgrabber/files/digest-kftpgrabber-0.6.0 b/net-ftp/kftpgrabber/files/digest-kftpgrabber-0.6.0
index f30abb41279d..4d21c01bc06e 100644
--- a/net-ftp/kftpgrabber/files/digest-kftpgrabber-0.6.0
+++ b/net-ftp/kftpgrabber/files/digest-kftpgrabber-0.6.0
@@ -1,3 +1,3 @@
-MD5 549d4575fc0240c3ef9f249a7587d902 kftpgrabber-0.6.0.tar.bz2 1127926
-RMD160 d036f000dcfe7d189384c850ff8be3d91eb82669 kftpgrabber-0.6.0.tar.bz2 1127926
-SHA256 6f717053dbf138cccd73041814e5c0865cfd40bfb03402107fa5b3fcf3e43da1 kftpgrabber-0.6.0.tar.bz2 1127926
+MD5 734c0c49d37b9258235c235c2b14f3c6 kftpgrabber-0.6.0.tar.bz2 1123848
+RMD160 5fd005406cd89b3048f27285ffc85baaa05a0791 kftpgrabber-0.6.0.tar.bz2 1123848
+SHA256 0e9aa586aec1b116bd8c90112d8a763ee5f4b1b74711fc1fa6628e9422eccdcf kftpgrabber-0.6.0.tar.bz2 1123848
diff --git a/net-ftp/kftpgrabber/files/digest-kftpgrabber-0.8.1-r1 b/net-ftp/kftpgrabber/files/digest-kftpgrabber-0.8.1-r1
new file mode 100644
index 000000000000..9f097df4ad4f
--- /dev/null
+++ b/net-ftp/kftpgrabber/files/digest-kftpgrabber-0.8.1-r1
@@ -0,0 +1,3 @@
+MD5 77eb3ed5fa3a1c8c067fc50edd3e3302 kftpgrabber-0.8.1.tar.bz2 1350423
+RMD160 04cd1ee6f98e3795598cf9cff991d568c23a7cd8 kftpgrabber-0.8.1.tar.bz2 1350423
+SHA256 d0c4e412e0ea27bf35cfd3fea44802649e358ac80742cdb550546eb83d51f2c3 kftpgrabber-0.8.1.tar.bz2 1350423
diff --git a/net-ftp/kftpgrabber/files/kftpgrabber-0.8.1-inf-recursion-fix.diff b/net-ftp/kftpgrabber/files/kftpgrabber-0.8.1-inf-recursion-fix.diff
new file mode 100644
index 000000000000..be19480ea522
--- /dev/null
+++ b/net-ftp/kftpgrabber/files/kftpgrabber-0.8.1-inf-recursion-fix.diff
@@ -0,0 +1,39 @@
+--- kftpgrabber/src/engine/ftpsocket.cpp	2007/04/29 10:50:17	659051
++++ kftpgrabber/src/engine/ftpsocket.cpp	2007/05/03 15:56:28	660745
+@@ -1247,6 +1247,12 @@
+           break;
+         }
+         case SentCwd: {
++          if (!socket()->getConfigInt("status.cwd")) {
++            // Change directory has failed and we should be silent (=error reporting is off)
++            socket()->resetCommandClass();
++            return;
++          }
++          
+           // Check the directory listing cache
+           DirectoryListing cached = Cache::self()->findCached(socket(), socket()->getCurrentDirectory());
+           if (cached.isValid()) {
+@@ -1560,6 +1566,7 @@
+       switch (currentState) {
+         case None: {
+           targetDirectory = socket()->getConfig("params.cwd.path");
++          socket()->setConfig("status.cwd", 1);
+           
+           // If we are already there, no need to CWD
+           if (socket()->getCurrentDirectory() == targetDirectory) {
+@@ -1608,6 +1615,7 @@
+               socket()->emitError(socket()->getPreviousCommand() == Commands::CmdList ? ListFailed : FileNotFound);
+               socket()->resetCommandClass(Failed);
+             } else {
++              socket()->setConfig("status.cwd", 0);
+               socket()->resetCommandClass();
+             }
+           }
+@@ -1629,6 +1637,7 @@
+             socket()->emitError(socket()->getPreviousCommand() == Commands::CmdList ? ListFailed : FileNotFound);
+             socket()->resetCommandClass(Failed);
+           } else {
++            socket()->setConfig("status.cwd", 0);
+             socket()->resetCommandClass();
+           }
+           break;
diff --git a/net-ftp/kftpgrabber/kftpgrabber-0.8.1-r1.ebuild b/net-ftp/kftpgrabber/kftpgrabber-0.8.1-r1.ebuild
new file mode 100644
index 000000000000..063d845cd634
--- /dev/null
+++ b/net-ftp/kftpgrabber/kftpgrabber-0.8.1-r1.ebuild
@@ -0,0 +1,40 @@
+# Copyright 1999-2007 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.1 2007/05/08 19:32:56 carlo Exp $
+
+inherit kde
+
+IUSE=""
+LANGS="bg br cs cy da de el en_GB es et fr ga gl hu it ja ka lt nl pl pt rw sk
+sr sr@Latn sv tr zh_CN"
+for X in ${LANGS} ; do
+	IUSE="${IUSE} linguas_${X}"
+done
+
+DESCRIPTION="A graphical FTP client for KDE."
+HOMEPAGE="http://kftpgrabber.sourceforge.net/"
+SRC_URI="http://www.kftp.org/uploads/files/${P}.tar.bz2"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+
+RDEPEND="dev-libs/openssl"
+DEPEND="${RDEPEND}
+	>=sys-apps/sed-4"
+
+need-kde 3.5
+
+PATCHES="${FILESDIR}/kftpgrabber-0.8.1-inf-recursion-fix.diff"
+
+src_unpack() {
+	kde_src_unpack
+
+	local MAKE_LANGS
+	cd "${WORKDIR}/${P}/translations"
+	for X in ${LANGS} ; do
+		use linguas_${X} && MAKE_LANGS="${MAKE_LANGS} ${X}"
+	done
+	rm -f "${S}/configure"
+	sed -i -e "s:SUBDIRS=.*:SUBDIRS=${MAKE_LANGS}:" Makefile.am
+}