PRET patch as per bug #77756

(Portage version: 2.0.51-r15)

5 files changed, 151 insertions, 12 deletions

diff --git a/net-ftp/pftpfxp/ChangeLog b/net-ftp/pftpfxp/ChangeLog
index 3b356ebec70e..43830f9b4913 100644
--- a/net-ftp/pftpfxp/ChangeLog
+++ b/net-ftp/pftpfxp/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for net-ftp/pftpfxp
-# Copyright 1999-2004 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-ftp/pftpfxp/ChangeLog,v 1.2 2004/11/26 14:27:14 dragonheart Exp $
+# Copyright 1999-2005 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/net-ftp/pftpfxp/ChangeLog,v 1.3 2005/02/01 07:49:25 dragonheart Exp $
+
+*pftpfxp-0.11.4.6-r1 (01 Feb 2005)
+
+  01 Feb 2005; Daniel Black <dragonheart@gentoo.org>
+  +files/pftpfxp-v0.11.4mew6-pret.patch, +pftpfxp-0.11.4.6-r1.ebuild:
+  PRET patch as per bug #77756. Thanks to Peter <pstlpete@gmail.com>
 
   26 Nov 2004; Daniel Black <dragonheart@gentoo.org> pftpfxp-0.11.4.6.ebuild:
   Replaced $DOCDESTTREE with /usr/share/doc/${PF}
diff --git a/net-ftp/pftpfxp/Manifest b/net-ftp/pftpfxp/Manifest
index f291e69daa99..2ff31f7cc5d8 100644
--- a/net-ftp/pftpfxp/Manifest
+++ b/net-ftp/pftpfxp/Manifest
@@ -1,15 +1,8 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
-
 MD5 f6cd2d33dcdbc01eb11a9ca67baed0be pftpfxp-0.11.4.6.ebuild 1260
 MD5 6d796b061ed1c1337ef157a5f74dab35 metadata.xml 403
 MD5 73eb1e2640550076ac62a3abf604d197 ChangeLog 593
+MD5 3f89e7b021580d2aa520025755e9db8b pftpfxp-0.11.4.6-r1.ebuild 1356
 MD5 5c7f9305285e6c7efdbc232f737d533e files/digest-pftpfxp-0.11.4.6 68
 MD5 e5a814afb2d03338d5f2e0c69fb75f69 files/0.11.4.6-gcc3.4.fix 505
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v1.2.6 (GNU/Linux)
-
-iD8DBQFBpz1ImdTrptrqvGERAh5kAJ0ZhMJV8iK6mu3yGkhDxCj/kTXrmACeJ/ml
-KYNg1GWLbd1CRJQTXpKzArA=
-=AbPI
------END PGP SIGNATURE-----
+MD5 fd3271b459d87ed5fce0e0fd47f72cff files/pftpfxp-v0.11.4mew6-pret.patch 3559
+MD5 5c7f9305285e6c7efdbc232f737d533e files/digest-pftpfxp-0.11.4.6-r1 68
diff --git a/net-ftp/pftpfxp/files/digest-pftpfxp-0.11.4.6-r1 b/net-ftp/pftpfxp/files/digest-pftpfxp-0.11.4.6-r1
new file mode 100644
index 000000000000..66deec50372c
--- /dev/null
+++ b/net-ftp/pftpfxp/files/digest-pftpfxp-0.11.4.6-r1
@@ -0,0 +1 @@
+MD5 22528192327488a372a6de1f5d2709dc pftpfxp-v0.11.4mew6.tgz 137093
diff --git a/net-ftp/pftpfxp/files/pftpfxp-v0.11.4mew6-pret.patch b/net-ftp/pftpfxp/files/pftpfxp-v0.11.4mew6-pret.patch
new file mode 100644
index 000000000000..161b929c55a4
--- /dev/null
+++ b/net-ftp/pftpfxp/files/pftpfxp-v0.11.4mew6-pret.patch
@@ -0,0 +1,93 @@
+--- pftpfxp-mew.orig/src/server.cc	Sun Nov  9 20:51:19 2003
++++ pftpfxp-mew/src/server.cc	Wed Jun  9 10:59:21 2004
+@@ -3277,7 +3277,14 @@
+             return (FALSE);
+         }
+     } else {
+-        if (!this->tcp.SendData("PASV\r\n")) {
++        sprintf(this->temp_string, "PRET RETR %s\r\n", file);
++	if (!this->tcp.SendData(this->temp_string)) {
++		this->error = E_CONTROL_RESET;
++		this->PostBusy(NULL);
++		return (FALSE);
++		}
++	this->tcp.WaitForMessage();
++	if (!this->tcp.SendData("PASV\r\n")) {
+             this->error = E_CONTROL_RESET;
+             this->PostBusy(NULL);
+             return (FALSE);
+@@ -3687,7 +3694,15 @@
+     }
+ 
+     if (fxpmethod == 0) {
+-        if (nossl != 1 && dest->nossl != 1 && prefs.use_ssl_fxp && dest->prefs.use_ssl_fxp) {
++    	sprintf(this->temp_string, "PRET RETR %s\r\n", file);
++    	if (!this->tcp.SendData(this->temp_string)) {
++		this->error = E_CONTROL_RESET;
++		this->PostBusy(NULL);
++		dest->PostBusy(NULL);
++		return (FALSE);
++		}
++	this->tcp.WaitForMessage();
++	if (nossl != 1 && dest->nossl != 1 && prefs.use_ssl_fxp && dest->prefs.use_ssl_fxp) {
+             // dest & src support ssl and want ssl_fxp
+             // send CPSV, extract PORT info and post file, then wait (until DEST sent PORT and then STOR)
+             if (!this->tcp.SendData("CPSV\r\n")) {
+@@ -3909,7 +3924,15 @@
+ fxpmeth1:
+     if (fxpmethod == 1) {
+         debuglog("normal fxp rejected trying alternative method");
+-        if (nossl != 1 && dest->nossl != 1 && prefs.use_ssl_fxp && dest->prefs.use_ssl_fxp) {
++        	sprintf(this->temp_string, "PRET STOR %s\r\n", file);
++		if (!dest->tcp.SendData(this->temp_string)) {
++			this->error = E_CONTROL_RESET;
++			this->PostBusy(NULL);
++			dest->PostBusy(NULL);
++			return (FALSE);
++			}
++		dest->tcp.WaitForMessage();
++	if (nossl != 1 && dest->nossl != 1 && prefs.use_ssl_fxp && dest->prefs.use_ssl_fxp) {
+             // dest & src support ssl and want ssl_fxp
+             // send CPSV, extract PORT info and post file, then wait (until DEST sent PORT and then RETR)
+             if (!dest->tcp.SendData("CPSV\r\n")) {
+@@ -3920,8 +3943,15 @@
+                 return (FALSE);
+             }
+         } else {
+-            // send PASV, extract PORT info and post file, then wait (until DEST sent PORT and then RETR)
+-            if (!dest->tcp.SendData("PASV\r\n")) {
++        	sprintf(this->temp_string, "PRET STOR %s\r\n", file);
++		if (!this->tcp.SendData(this->temp_string)) {
++			this->error = E_CONTROL_RESET;
++			this->PostBusy(NULL);
++			return (FALSE);
++			}
++		this->tcp.WaitForMessage();
++		// send PASV, extract PORT info and post file, then wait (until DEST sent PORT and then RETR)
++        	if (!dest->tcp.SendData("PASV\r\n")) {
+                 this->error = E_CONTROL_RESET;
+                 this->PostBusy(NULL);
+                 dest->PostBusy(NULL);
+@@ -4080,7 +4110,7 @@
+             }
+         }
+         //this->PostStatusFile(file, "RETR_OK", port_msg); // notify dest and GO!
+-        this->PostBusy("FXP>");
++        	this->PostBusy("FXP>");
+         dest->PostBusy("FXP<");
+         this->StartTime();
+         dest->StartTime();
+@@ -4491,6 +4521,13 @@
+                 return (FALSE);
+             }
+         } else { /* PASV MODE */
++	    if(!this->tcp.SendData("PRET LIST\r\n")) {
++		this->error = E_CONTROL_RESET;
++		this->PostBusy(NULL);
++		return (FALSE);
++		}
++	    this->tcp.WaitForMessage();
++					
+             if (!this->tcp.SendData("PASV\r\n")) {
+                 this->error = E_CONTROL_RESET;
+                 this->PostBusy(NULL);
diff --git a/net-ftp/pftpfxp/pftpfxp-0.11.4.6-r1.ebuild b/net-ftp/pftpfxp/pftpfxp-0.11.4.6-r1.ebuild
new file mode 100644
index 000000000000..3f43519bb47c
--- /dev/null
+++ b/net-ftp/pftpfxp/pftpfxp-0.11.4.6-r1.ebuild
@@ -0,0 +1,46 @@
+# Copyright 1999-2005 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/net-ftp/pftpfxp/pftpfxp-0.11.4.6-r1.ebuild,v 1.1 2005/02/01 07:49:25 dragonheart Exp $
+
+inherit eutils toolchain-funcs
+
+DESCRIPTION="The powerful curses-based ftp/fxp client, mew edition"
+HOMEPAGE="http://pftpmew.tanesha.net"
+SRC_URI="http://tanesha.net/bigmess/pftpfxp-v0.11.4mew6.tgz"
+LICENSE="as-is"
+SLOT="0"
+KEYWORDS="~x86"
+IUSE="crypt"
+DEPEND="ssl? ( >=dev-libs/openssl-0.9.6c )"
+S=${WORKDIR}/pftpfxp-mew
+
+src_unpack() {
+	unpack ${A}
+	cd ${S}
+	epatch ${FILESDIR}/${PV}-gcc3.4.fix || die "patch failed"
+	epatch ${FILESDIR}/pftpfxp-v0.11.4mew6-pret.patch || die "patch failed"
+	sed -i -e "s/^CPP=.*/CPP=$(tc-getCXX)/" \
+		-e "s:^CPPF=.*:CPPF=\"-Wall -D_REENTRANT -I../include ${CFLAGS}\":" \
+		configure
+}
+
+src_compile() {
+	cd ${S}
+	#note: not a propper autoconf
+	./configure || die "configure failed"
+	emake || die "emake failed"
+}
+
+src_install() {
+	dobin pftp
+	dodoc .pftp/config .pftp/keymap README.MEW old/*
+	cd ${WORKDIR}
+	mv irssi  mIRC-mew  pftpfxp-autoconnect ${D}/usr/share/doc/${PF}
+}
+
+pkg_postinst() {
+	einfo "In order to use pftp-mew you need to create these files:"
+	einfo "    ~/.pftp/config"
+	einfo "    ~/.pftp/keymap"
+	einfo "Refer to the examples in /usr/share/doc/${PF} for more information."
+}