Bump to 2.0.18-r6

	Fix for issues in bug #188252

Package-Manager: portage-2.1.3.9

5 files changed, 152 insertions, 9 deletions

diff --git a/net-ftp/gftp/ChangeLog b/net-ftp/gftp/ChangeLog
index 62f219c217e5..acd954c33436 100644
--- a/net-ftp/gftp/ChangeLog
+++ b/net-ftp/gftp/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for net-ftp/gftp
 # Copyright 2002-2007 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-ftp/gftp/ChangeLog,v 1.57 2007/01/14 20:05:42 leio Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-ftp/gftp/ChangeLog,v 1.58 2007/09/21 20:08:54 dang Exp $
+
+*gftp-2.0.18-r6 (21 Sep 2007)
+
+  21 Sep 2007; Daniel Gryniewicz <dang@gentoo.org>
+  +files/gftp-2.0.18-188252.patch, +gftp-2.0.18-r6.ebuild:
+  Bump to 2.0.18-r6
+  	Fix for issues in bug #188252
 
 *gftp-2.0.18-r5 (14 Jan 2007)
 
diff --git a/net-ftp/gftp/Manifest b/net-ftp/gftp/Manifest
index 8a004a4a7c00..795920c6a138 100644
--- a/net-ftp/gftp/Manifest
+++ b/net-ftp/gftp/Manifest
@@ -1,6 +1,10 @@
 -----BEGIN PGP SIGNED MESSAGE-----
 Hash: SHA1
 
+AUX gftp-2.0.18-188252.patch 2499 RMD160 c62486bb65aa0cebec5a7aa051715f796448e872 SHA1 225d30f18d4b3ee052056ed8eb90247b147713ea SHA256 2804e400d6052873a0d5fcf24536febc96eb8bda14cac536e5979f5467fed1a6
+MD5 d51f5f8cc08ae11ff2cced366deb43c8 files/gftp-2.0.18-188252.patch 2499
+RMD160 c62486bb65aa0cebec5a7aa051715f796448e872 files/gftp-2.0.18-188252.patch 2499
+SHA256 2804e400d6052873a0d5fcf24536febc96eb8bda14cac536e5979f5467fed1a6 files/gftp-2.0.18-188252.patch 2499
 AUX gftp-2.0.18-ipv6.patch 1227 RMD160 b6a88043177ecc3535249fc6527a8716c4c76fee SHA1 c758a847c3d794955ad802e5634b9f25ced8add1 SHA256 97d047539828f9a6512c920a24915978bfa003daeb8046e49c6a380b403ab307
 MD5 7977530d87ccfe32b023776c4050dedd files/gftp-2.0.18-ipv6.patch 1227
 RMD160 b6a88043177ecc3535249fc6527a8716c4c76fee files/gftp-2.0.18-ipv6.patch 1227
@@ -22,10 +26,14 @@ EBUILD gftp-2.0.18-r5.ebuild 1301 RMD160 003d0bccfdeb611dbc2b22c9ef34d70c0cd1388
 MD5 80f73ccb41e932aebbf279df4daeb4cc gftp-2.0.18-r5.ebuild 1301
 RMD160 003d0bccfdeb611dbc2b22c9ef34d70c0cd13885 gftp-2.0.18-r5.ebuild 1301
 SHA256 cece6998a686b6ea86519b33f6153632b390a4d75b9f299e1341029ba339672b gftp-2.0.18-r5.ebuild 1301
-MISC ChangeLog 7954 RMD160 a54091fcf9fd699604c1a1538fd76249cfd0c532 SHA1 5ae0599b52881f6a18e7e91fd9b88509497251a7 SHA256 ca5bea66cd2409b15975772577178fe6dd6593e687c5ffc3b3535c9875a5dea1
-MD5 d5cf9bd2d2d0cee7cc14083fb4e41ac6 ChangeLog 7954
-RMD160 a54091fcf9fd699604c1a1538fd76249cfd0c532 ChangeLog 7954
-SHA256 ca5bea66cd2409b15975772577178fe6dd6593e687c5ffc3b3535c9875a5dea1 ChangeLog 7954
+EBUILD gftp-2.0.18-r6.ebuild 1370 RMD160 71eae2569adbc319d11353cc080eda593645efff SHA1 c6c4b69b10f07fe32c31fa002b25410b409fa024 SHA256 323fe5e18c667ef96ed9fe05d516a768bee571df5b0d09fc7a5d7f4039fcb8f7
+MD5 083b6f972fb5f7fd894c23d1e4253dab gftp-2.0.18-r6.ebuild 1370
+RMD160 71eae2569adbc319d11353cc080eda593645efff gftp-2.0.18-r6.ebuild 1370
+SHA256 323fe5e18c667ef96ed9fe05d516a768bee571df5b0d09fc7a5d7f4039fcb8f7 gftp-2.0.18-r6.ebuild 1370
+MISC ChangeLog 8149 RMD160 a508d0c6c0e1a3175671fbad0d4d37b76342ed87 SHA1 3531964d4847a9399d5d57d3118623797fbbaa83 SHA256 524f720fc690c5b6a2e62e842286ed02ad4ba71ec07ebc241d942d9f8d4e0428
+MD5 d68bd882c57fcb415e06af713c63a69c ChangeLog 8149
+RMD160 a508d0c6c0e1a3175671fbad0d4d37b76342ed87 ChangeLog 8149
+SHA256 524f720fc690c5b6a2e62e842286ed02ad4ba71ec07ebc241d942d9f8d4e0428 ChangeLog 8149
 MISC metadata.xml 158 RMD160 c0e2bae8e91bb6be8922bac5e4f597302e06587e SHA1 38f78e9790bcd4382b4a49aa226aa6dda1d3a3d7 SHA256 3a7dbca0fdc557de69783e0663e2d76ddab129ea8a19b2d0ef6d3e5d1b947ce1
 MD5 03ad2e6c4ab41244af1015a8bbb0b39f metadata.xml 158
 RMD160 c0e2bae8e91bb6be8922bac5e4f597302e06587e metadata.xml 158
@@ -36,10 +44,13 @@ SHA256 4e1cf658c5915e1add1219ac8f1c03911008aea592dc06d53cff9ef99239f4dc files/di
 MD5 4e32cb8ee1e0ef76ba34db43896f5cfc files/digest-gftp-2.0.18-r5 241
 RMD160 a2507ad1c36cd4ac08bbfd6d3ecea87d0f6c2958 files/digest-gftp-2.0.18-r5 241
 SHA256 4e1cf658c5915e1add1219ac8f1c03911008aea592dc06d53cff9ef99239f4dc files/digest-gftp-2.0.18-r5 241
+MD5 4e32cb8ee1e0ef76ba34db43896f5cfc files/digest-gftp-2.0.18-r6 241
+RMD160 a2507ad1c36cd4ac08bbfd6d3ecea87d0f6c2958 files/digest-gftp-2.0.18-r6 241
+SHA256 4e1cf658c5915e1add1219ac8f1c03911008aea592dc06d53cff9ef99239f4dc files/digest-gftp-2.0.18-r6 241
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v1.4.6 (GNU/Linux)
+Version: GnuPG v2.0.7 (GNU/Linux)
 
-iD8DBQFFqo0RkeYb6olFHJcRAlzfAJ99uV3Z0As5iwoI9p6N83t5TNwdXQCgr93r
-uXwkdxRuG5pzvFNQX+/tZxk=
-=eEPW
+iD8DBQFG9CUgomPajV0RnrERAoKMAJ4gb3qtI/E6OHfXLnf2BaSqKrem9wCdEcz9
+51U/FxCofbELytKUbTYNXSM=
+=NwlL
 -----END PGP SIGNATURE-----
diff --git a/net-ftp/gftp/files/digest-gftp-2.0.18-r6 b/net-ftp/gftp/files/digest-gftp-2.0.18-r6
new file mode 100644
index 000000000000..a5e7dd4f3967
--- /dev/null
+++ b/net-ftp/gftp/files/digest-gftp-2.0.18-r6
@@ -0,0 +1,3 @@
+MD5 44b19442d06f6dc68c7211d66029d826 gftp-2.0.18.tar.bz2 1374850
+RMD160 0e0daea8543ae822b25635647360193362a2648d gftp-2.0.18.tar.bz2 1374850
+SHA256 8145e18d1edf13e8cb6cd7a69bb69de5c46307086997755654488fb8282d38a2 gftp-2.0.18.tar.bz2 1374850
diff --git a/net-ftp/gftp/files/gftp-2.0.18-188252.patch b/net-ftp/gftp/files/gftp-2.0.18-188252.patch
new file mode 100644
index 000000000000..760462b60c18
--- /dev/null
+++ b/net-ftp/gftp/files/gftp-2.0.18-188252.patch
@@ -0,0 +1,73 @@
+diff --exclude-from=/home/dang/.scripts/diffrc -up -bruN gftp-2.0.18.orig/lib/fsplib/fsplib.c gftp-2.0.18/lib/fsplib/fsplib.c
+--- gftp-2.0.18.orig/lib/fsplib/fsplib.c	2005-01-18 21:03:45.000000000 -0500
++++ gftp-2.0.18/lib/fsplib/fsplib.c	2007-09-21 16:03:01.000000000 -0400
+@@ -612,7 +612,7 @@ int fsp_readdir_r(FSP_DIR *dir,struct di
+     entry->d_reclen = fentry.reclen;
+     strncpy(entry->d_name,fentry.name,MAXNAMLEN);
+ 
+-    if (fentry.namlen > MAXNAMLEN)
++    if (fentry.namlen >= MAXNAMLEN)
+     {
+ 	entry->d_name[MAXNAMLEN + 1 ] = '\0';
+ #ifdef HAVE_NAMLEN
+@@ -680,9 +680,19 @@ int fsp_readdir_native(FSP_DIR *dir,FSP_
+        /* skip file date and file size */
+        dir->dirpos += 9;
+        /* read file name */
+-       entry->name[255 + 1] = '\0';
++       entry->name[255] = '\0';
+        strncpy(entry->name,(char *)( dir->data + dir->dirpos ),MAXNAMLEN);
++       /* check for ASCIIZ encoded filename */
++       if (memchr(dir->data + dir->dirpos,0,dir->datasize - dir->dirpos) != NULL)
++       {
+        namelen = strlen( (char *) dir->data+dir->dirpos);
++       }
++       else
++       {
++            /* \0 terminator not found at end of filename */
++            *result = NULL;
++            return 0;
++       }
+        /* skip over file name */
+        dir->dirpos += namelen +1;
+ 
+@@ -709,12 +719,12 @@ int fsp_readdir_native(FSP_DIR *dir,FSP_
+ 
+ struct dirent * fsp_readdir(FSP_DIR *dirp)
+ {
+-    static struct dirent entry;
++    static dirent_workaround entry;
+     struct dirent *result;
+     
+     
+     if (dirp == NULL) return NULL;
+-    if ( fsp_readdir_r(dirp,&entry,&result) )
++    if ( fsp_readdir_r(dirp,&entry.dirent,&result) )
+         return NULL;
+     else
+         return result;
+diff --exclude-from=/home/dang/.scripts/diffrc -up -bruN gftp-2.0.18.orig/lib/fsplib/fsplib.h gftp-2.0.18/lib/fsplib/fsplib.h
+--- gftp-2.0.18.orig/lib/fsplib/fsplib.h	2005-01-18 21:04:02.000000000 -0500
++++ gftp-2.0.18/lib/fsplib/fsplib.h	2007-09-21 15:56:37.000000000 -0400
+@@ -1,6 +1,8 @@
+ #ifndef _FSPLIB_H
+ #define _FSPLIB_H 1
+ #include <time.h>
++#include <stddef.h>
++
+ /* The FSP v2 protocol support library - public interface */
+ 
+ /*
+@@ -138,6 +140,12 @@ typedef struct FSP_FILE {
+ 		      unsigned int pos;          /* position of next packet */
+ } FSP_FILE;
+ 
++
++typedef union dirent_workaround {
++      struct dirent dirent;
++      char fill[offsetof (struct dirent, d_name) + MAXNAMLEN + 1];
++} dirent_workaround;
++ 
+ /* function prototypes */
+ 
+ /* session management */
diff --git a/net-ftp/gftp/gftp-2.0.18-r6.ebuild b/net-ftp/gftp/gftp-2.0.18-r6.ebuild
new file mode 100644
index 000000000000..72b218b962af
--- /dev/null
+++ b/net-ftp/gftp/gftp-2.0.18-r6.ebuild
@@ -0,0 +1,49 @@
+# Copyright 1999-2007 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/net-ftp/gftp/gftp-2.0.18-r6.ebuild,v 1.1 2007/09/21 20:08:54 dang Exp $
+
+inherit eutils
+
+DESCRIPTION="Gnome based FTP Client"
+SRC_URI="http://www.gftp.org/${P}.tar.bz2"
+HOMEPAGE="http://www.gftp.org"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~ppc ~ppc64 ~sparc ~x86"
+IUSE="gtk ssl"
+
+RDEPEND=">=dev-libs/glib-2
+		 sys-devel/gettext
+		 sys-libs/ncurses
+		 sys-libs/readline
+		 gtk? ( >=x11-libs/gtk+-2 )
+		 ssl? ( dev-libs/openssl )"
+DEPEND="${RDEPEND}
+		>=dev-util/pkgconfig-0.9"
+
+src_unpack() {
+	unpack ${A}
+	cd ${S}
+
+	# patch to allow fetching of ssh2 files
+	# that are read-only, see bug #91269 and upstream link.
+	epatch "${FILESDIR}/${P}-ssh2-read.patch"
+	# patch to allow for wildcard SSL certificates
+	epatch "${FILESDIR}/${P}-ssl-wildcardcert.patch"
+	# patch to not crash on IPv6 enabled hosts or on IPv4 transfer with the "ignore PASV address" function
+	epatch "${FILESDIR}/${P}-ipv6.patch"
+	# Fix issues in bug #188252
+	epatch "${FILESDIR}"/${P}-188252.patch
+
+}
+
+src_compile() {
+	econf $(use_enable gtk gtkport) $(use_enable ssl) || die "configure failed"
+	emake || die "make failed"
+}
+
+src_install() {
+	make DESTDIR=${D} install || die "install failed"
+	dodoc ChangeLog* README* THANKS TODO docs/USERS-GUIDE
+}