added patch to respect $HOME - inspired by Daniel Persson bug #140143

Package-Manager: portage-2.1.1_pre2-r6

6 files changed, 187 insertions, 17 deletions

diff --git a/net-ftp/pftpfxp/ChangeLog b/net-ftp/pftpfxp/ChangeLog
index be76010ebcb3..e8097fe1c86b 100644
--- a/net-ftp/pftpfxp/ChangeLog
+++ b/net-ftp/pftpfxp/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for net-ftp/pftpfxp
 # Copyright 1999-2006 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-ftp/pftpfxp/ChangeLog,v 1.7 2006/02/24 21:48:03 dragonheart Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-ftp/pftpfxp/ChangeLog,v 1.8 2006/07/13 03:05:57 dragonheart Exp $
+
+*pftpfxp-0.11.4.6-r2 (13 Jul 2006)
+
+  13 Jul 2006; Daniel Black <dragonheart@gentoo.org>
+  +files/0.11.4.6-correct_config_fix.patch, +pftpfxp-0.11.4.6-r2.ebuild:
+  added patch to respect $HOME - inspired by Daniel Persson bug #140143
 
   24 Feb 2006; Daniel Black <dragonheart@gentoo.org>
   pftpfxp-0.11.4.6.ebuild, pftpfxp-0.11.4.6-r1.ebuild:
diff --git a/net-ftp/pftpfxp/Manifest b/net-ftp/pftpfxp/Manifest
index a1186ab0e40a..ad12b13ff2d6 100644
--- a/net-ftp/pftpfxp/Manifest
+++ b/net-ftp/pftpfxp/Manifest
@@ -1,34 +1,52 @@
 -----BEGIN PGP SIGNED MESSAGE-----
 Hash: SHA1
 
-MD5 ad870554e7d933793ed65e1b0d817657 ChangeLog 1307
-RMD160 c38e6ccd16b4d43f20bab091cc932332edbf5eae ChangeLog 1307
-SHA256 2f527646f8ad5327aae3c425b9878285db03a1bfae3bc0cc01995a8e9bffc220 ChangeLog 1307
+AUX 0.11.4.6-correct_config_fix.patch 3627 RMD160 abdc33a659ca21b73fdede3ceb5d851c2dc20617 SHA1 a6863c2e625ded0b7f79868752aa28e773dfde2a SHA256 1ff39aedb3b7bba0fb3e76b9786dde4b24dd7ae8d28d588206012abe9ec17fa9
+MD5 65ca1062a877b4542ebbccda0623fe81 files/0.11.4.6-correct_config_fix.patch 3627
+RMD160 abdc33a659ca21b73fdede3ceb5d851c2dc20617 files/0.11.4.6-correct_config_fix.patch 3627
+SHA256 1ff39aedb3b7bba0fb3e76b9786dde4b24dd7ae8d28d588206012abe9ec17fa9 files/0.11.4.6-correct_config_fix.patch 3627
+AUX 0.11.4.6-gcc3.4.fix 505 RMD160 594f4126145c4ac2cdaeb0668e6ed038542b2654 SHA1 45797d787d09d10f428ec8bada32375d403d6d25 SHA256 e38b89ec2484a5dc3c39947b5daac9751f2ee1ab4b5bb84d56a1e34aeaebe4d9
 MD5 e5a814afb2d03338d5f2e0c69fb75f69 files/0.11.4.6-gcc3.4.fix 505
 RMD160 594f4126145c4ac2cdaeb0668e6ed038542b2654 files/0.11.4.6-gcc3.4.fix 505
 SHA256 e38b89ec2484a5dc3c39947b5daac9751f2ee1ab4b5bb84d56a1e34aeaebe4d9 files/0.11.4.6-gcc3.4.fix 505
-MD5 5c7f9305285e6c7efdbc232f737d533e files/digest-pftpfxp-0.11.4.6 68
-RMD160 416da1bd8fe11923a9b6d51c54e8e83e97a7b36f files/digest-pftpfxp-0.11.4.6 68
-SHA256 d36134087e0bb63fb1e394a6a7e67cda9f9241f4752444bfbb362aea8da56b11 files/digest-pftpfxp-0.11.4.6 68
-MD5 a06304b7f4b3c212deebbec5caeb862d files/digest-pftpfxp-0.11.4.6-r1 250
-RMD160 bdacbfbb203505fee89a4a1be3f8a226c896214a files/digest-pftpfxp-0.11.4.6-r1 250
-SHA256 0d729a713a6fc776933856a041d2c928a319392ff2a3fedc09e4f59870250150 files/digest-pftpfxp-0.11.4.6-r1 250
+AUX pftpfxp-v0.11.4mew6-pret.patch 3559 RMD160 b4321eadfb2f1283ee9b99a234fbb635829aea02 SHA1 85dd4918600438b155ea4c1dd264614ee46cb0fb SHA256 ba74c7a64c3904961a3ed47e711f1bd6960315b2b3b8ecf83a3480d500ed9309
 MD5 fd3271b459d87ed5fce0e0fd47f72cff files/pftpfxp-v0.11.4mew6-pret.patch 3559
 RMD160 b4321eadfb2f1283ee9b99a234fbb635829aea02 files/pftpfxp-v0.11.4mew6-pret.patch 3559
 SHA256 ba74c7a64c3904961a3ed47e711f1bd6960315b2b3b8ecf83a3480d500ed9309 files/pftpfxp-v0.11.4mew6-pret.patch 3559
-MD5 6d796b061ed1c1337ef157a5f74dab35 metadata.xml 403
-RMD160 48afb924f8ddebfd4ea31a43eca3b277a30b62b6 metadata.xml 403
-SHA256 148b8bb5514a7787fab372ad8a71c93c67db9ce84ed2aa5953691c2104ca788a metadata.xml 403
+DIST pftpfxp-v0.11.4mew6.tgz 137093 RMD160 7d60f8cb2469d7bb95561631c05a5692dccde995 SHA1 b64483097be88218a9238a4050155e22342541d4 SHA256 c119435cd844eda76631dde77104e2d0daeef44923158776927d3b51dd5b1e9b
+EBUILD pftpfxp-0.11.4.6-r1.ebuild 1369 RMD160 207cb0f9452f9323d4a2fde98343ffa9500b96ad SHA1 cb9c824367dcc09a92633210f77ceb5e6d527a23 SHA256 7e5756b63cbaebb426ff60391e0b4c0dca0cc597aaa0b0de71883cf1b49009b2
 MD5 0355df25e259fbc105afb460c842f4dc pftpfxp-0.11.4.6-r1.ebuild 1369
 RMD160 207cb0f9452f9323d4a2fde98343ffa9500b96ad pftpfxp-0.11.4.6-r1.ebuild 1369
 SHA256 7e5756b63cbaebb426ff60391e0b4c0dca0cc597aaa0b0de71883cf1b49009b2 pftpfxp-0.11.4.6-r1.ebuild 1369
+EBUILD pftpfxp-0.11.4.6-r2.ebuild 1445 RMD160 a17748a5c774dcab271b202e4b42367f1d42c43f SHA1 1a00caa25c3f401224bf4d93474da533e36ad040 SHA256 3916ecb450a7863b37ecadd4b36d93ca801214609bf9f2e5ebf9dea75d7559fb
+MD5 bbed1252fc21860082cec00738288d06 pftpfxp-0.11.4.6-r2.ebuild 1445
+RMD160 a17748a5c774dcab271b202e4b42367f1d42c43f pftpfxp-0.11.4.6-r2.ebuild 1445
+SHA256 3916ecb450a7863b37ecadd4b36d93ca801214609bf9f2e5ebf9dea75d7559fb pftpfxp-0.11.4.6-r2.ebuild 1445
+EBUILD pftpfxp-0.11.4.6.ebuild 1258 RMD160 a6c9e96369028ce32d5447dea9b17e37ad2c15ac SHA1 86dc6212789079f3815f03dc70f54752c3df5059 SHA256 7c802d1f4eff5ccc00f17a3ab0e962038d2929e9017c7545e1a9555a0f3042d9
 MD5 89c3b02b1209866e2e9ff6e80ece28fa pftpfxp-0.11.4.6.ebuild 1258
 RMD160 a6c9e96369028ce32d5447dea9b17e37ad2c15ac pftpfxp-0.11.4.6.ebuild 1258
 SHA256 7c802d1f4eff5ccc00f17a3ab0e962038d2929e9017c7545e1a9555a0f3042d9 pftpfxp-0.11.4.6.ebuild 1258
+MISC ChangeLog 1542 RMD160 71a629b66581f29e8b685b8ee0080573951d5b20 SHA1 da341ce63bd845d204c2804b43d224096c08c4fa SHA256 27ecdd304669e09006ff16b8cd7ae2fe38c0d22bb86e12c83452f57a2f7808a6
+MD5 221c99b805d2313da6792bb609f10f7a ChangeLog 1542
+RMD160 71a629b66581f29e8b685b8ee0080573951d5b20 ChangeLog 1542
+SHA256 27ecdd304669e09006ff16b8cd7ae2fe38c0d22bb86e12c83452f57a2f7808a6 ChangeLog 1542
+MISC metadata.xml 403 RMD160 48afb924f8ddebfd4ea31a43eca3b277a30b62b6 SHA1 ec604212b5eb7dde6256c827184a228eaa8161d5 SHA256 148b8bb5514a7787fab372ad8a71c93c67db9ce84ed2aa5953691c2104ca788a
+MD5 6d796b061ed1c1337ef157a5f74dab35 metadata.xml 403
+RMD160 48afb924f8ddebfd4ea31a43eca3b277a30b62b6 metadata.xml 403
+SHA256 148b8bb5514a7787fab372ad8a71c93c67db9ce84ed2aa5953691c2104ca788a metadata.xml 403
+MD5 a06304b7f4b3c212deebbec5caeb862d files/digest-pftpfxp-0.11.4.6 250
+RMD160 bdacbfbb203505fee89a4a1be3f8a226c896214a files/digest-pftpfxp-0.11.4.6 250
+SHA256 0d729a713a6fc776933856a041d2c928a319392ff2a3fedc09e4f59870250150 files/digest-pftpfxp-0.11.4.6 250
+MD5 a06304b7f4b3c212deebbec5caeb862d files/digest-pftpfxp-0.11.4.6-r1 250
+RMD160 bdacbfbb203505fee89a4a1be3f8a226c896214a files/digest-pftpfxp-0.11.4.6-r1 250
+SHA256 0d729a713a6fc776933856a041d2c928a319392ff2a3fedc09e4f59870250150 files/digest-pftpfxp-0.11.4.6-r1 250
+MD5 a06304b7f4b3c212deebbec5caeb862d files/digest-pftpfxp-0.11.4.6-r2 250
+RMD160 bdacbfbb203505fee89a4a1be3f8a226c896214a files/digest-pftpfxp-0.11.4.6-r2 250
+SHA256 0d729a713a6fc776933856a041d2c928a319392ff2a3fedc09e4f59870250150 files/digest-pftpfxp-0.11.4.6-r2 250
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v1.4.2-ecc0.1.6 (GNU/Linux)
+Version: GnuPG v1.4.4-ecc0.1.6 (GNU/Linux)
 
-iD8DBQFD/4DWmdTrptrqvGERAmmdAJ9m6ZY2qc+ueCl11DetEjVf4YkuDwCdEM9I
-BRmN7xXQLfV7SDF8CY2XG2Q=
-=DiC5
+iD8DBQFEtbtHmdTrptrqvGERAo+5AKCW/Dfo8Zgl/JtTjBw5zagCCAF5TwCfdTk7
+rZsZTJilXZ5MdEj3MG9scVc=
+=EymU
 -----END PGP SIGNATURE-----
diff --git a/net-ftp/pftpfxp/files/0.11.4.6-correct_config_fix.patch b/net-ftp/pftpfxp/files/0.11.4.6-correct_config_fix.patch
new file mode 100644
index 000000000000..c5d4b6a589f8
--- /dev/null
+++ b/net-ftp/pftpfxp/files/0.11.4.6-correct_config_fix.patch
@@ -0,0 +1,94 @@
+--- pftpfxp-mew/src/main.cc.orig	2006-07-13 13:04:55.000000000 +1000
++++ pftpfxp-mew/src/main.cc	2006-07-13 13:07:35.000000000 +1000
+@@ -547,7 +547,7 @@
+                 if ((*label != '\0') && (strlen(value) > 0)) {
+                     if (!strcasecmp(label, "DEVICE")) {
+                         if (!DetermineOwnIP(value)) {
+-                            printf("unknown network device '%s', sorry.\n",
++                            fprintf(stderr,"unknown network device '%s', sorry.\n",
+                                    value);
+                             fclose(in_file);
+                             return (FALSE);
+@@ -705,7 +705,7 @@
+                         strcpy(sectionlabels[21], value);
+                         //debuglog("section22: %s", sectionlabels[21]);
+                     } else {
+-                        printf("unknown label '%s' in configfile.\n", label);
++                        fprintf(stderr,"unknown label '%s' in configfile.\n", label);
+                         fclose(in_file);
+                         return (FALSE);
+                     }
+@@ -1096,9 +1096,26 @@
+ }
+ 
+ int main(int argc, char **argv) {
+-    char msg[256], config_file[] = {".pftp/config"}, keymap_file[] = {".pftp/keymap"};
++    char msg[256];
++    char *home_directory;
++    char *config_file;
++    char *keymap_file;
+     int n;
+ 
++    home_directory = getenv("HOME");
++	n = strlen(home_directory) + sizeof("/.pftp/config") + 1;
++    if ((config_file=(char*)malloc(n))==NULL) {
++        fprintf(stderr,"error allocating memory\n");
++        exit( -1);
++    }
++    if ((keymap_file=(char*)malloc(n))==NULL) {
++        free(config_file);
++        fprintf(stderr,"error allocating memory\n");
++        exit( -1);
++    }
++    sprintf(config_file, "%s/.pftp/config", home_directory);
++    sprintf(keymap_file, "%s/.pftp/keymap", home_directory);
++    
+     pthread_mutex_init(&syscall_lock, NULL);
+     pthread_mutex_init(&sigwinch_lock, NULL);
+ 
+@@ -1137,35 +1154,39 @@
+     getcwd(startcwd, SERVER_WORKINGDIR_SIZE);
+ 
+     if (!ReadConfig(config_file)) {
+-        printf("error reading/parsing configfile '%s', bailing out.\n", config_file);
++        fprintf(stderr,"error reading/parsing configfile '%s', bailing out.\n", config_file);
++        free(config_file);
+         exit( -1);
+     }
++    free(config_file);
+ 
+     unlinklog();
+ 
+     if (!ReadKeymap(keymap_file)) {
+-        printf("error reading/parsing keymapfile '%s', bailing out.\n", keymap_file);
++        fprintf(stderr,"error reading/parsing keymapfile '%s', bailing out.\n", keymap_file);
++        free(keymap_file);
+         exit( -1);
+     }
++    free(keymap_file);
+     debuglog("after keymap");
+ 
+     if (display->ProbeBookmarkRC() == 1) {
+-        printf("unknown or invalid bookmark file found, delete it\n");
++        fprintf(stderr,"unknown or invalid bookmark file found, delete it\n");
+         exit( -1);
+     }
+ 
+     if (chdir(localdir) != 0) {
+-        printf("please specify a valid dir for the LOCALDIR label or comment it out\n");
++        fprintf(stderr,"please specify a valid dir for the LOCALDIR label or comment it out\n");
+         exit ( -1);
+     }
+ 
+     if (!use_own_ip) {
+-        printf("you need to specify a network-device in the configfile.\n");
++        fprintf(stderr,"you need to specify a network-device in the configfile.\n");
+         exit( -1);
+     }
+ 
+     if (!use_okay_dir) {
+-        printf("you need to specify a dir for the .okay and .error files in the configfile.\n");
++        fprintf(stderr,"you need to specify a dir for the .okay and .error files in the configfile.\n");
+         exit( -1);
+     }
+ 
diff --git a/net-ftp/pftpfxp/files/digest-pftpfxp-0.11.4.6 b/net-ftp/pftpfxp/files/digest-pftpfxp-0.11.4.6
index 66deec50372c..923a4fd4b307 100644
--- a/net-ftp/pftpfxp/files/digest-pftpfxp-0.11.4.6
+++ b/net-ftp/pftpfxp/files/digest-pftpfxp-0.11.4.6
@@ -1 +1,3 @@
 MD5 22528192327488a372a6de1f5d2709dc pftpfxp-v0.11.4mew6.tgz 137093
+RMD160 7d60f8cb2469d7bb95561631c05a5692dccde995 pftpfxp-v0.11.4mew6.tgz 137093
+SHA256 c119435cd844eda76631dde77104e2d0daeef44923158776927d3b51dd5b1e9b pftpfxp-v0.11.4mew6.tgz 137093
diff --git a/net-ftp/pftpfxp/files/digest-pftpfxp-0.11.4.6-r2 b/net-ftp/pftpfxp/files/digest-pftpfxp-0.11.4.6-r2
new file mode 100644
index 000000000000..923a4fd4b307
--- /dev/null
+++ b/net-ftp/pftpfxp/files/digest-pftpfxp-0.11.4.6-r2
@@ -0,0 +1,3 @@
+MD5 22528192327488a372a6de1f5d2709dc pftpfxp-v0.11.4mew6.tgz 137093
+RMD160 7d60f8cb2469d7bb95561631c05a5692dccde995 pftpfxp-v0.11.4mew6.tgz 137093
+SHA256 c119435cd844eda76631dde77104e2d0daeef44923158776927d3b51dd5b1e9b pftpfxp-v0.11.4mew6.tgz 137093
diff --git a/net-ftp/pftpfxp/pftpfxp-0.11.4.6-r2.ebuild b/net-ftp/pftpfxp/pftpfxp-0.11.4.6-r2.ebuild
new file mode 100644
index 000000000000..85133d6b9e88
--- /dev/null
+++ b/net-ftp/pftpfxp/pftpfxp-0.11.4.6-r2.ebuild
@@ -0,0 +1,47 @@
+# Copyright 1999-2006 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-r2.ebuild,v 1.1 2006/07/13 03:05:57 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="~amd64 ~ppc ~x86"
+IUSE="ssl"
+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"
+	epatch ${FILESDIR}/0.11.4.6-correct_config_fix.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."
+}