Clean up old revisions.

(Portage version: 2.2_rc91/cvs/Linux x86_64)

7 files changed, 8 insertions, 225 deletions

diff --git a/net-ftp/gftp/ChangeLog b/net-ftp/gftp/ChangeLog
index b2dee1627888..bef50556112c 100644
--- a/net-ftp/gftp/ChangeLog
+++ b/net-ftp/gftp/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for net-ftp/gftp
-# Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-ftp/gftp/ChangeLog,v 1.82 2009/08/09 12:45:36 nixnut Exp $
+# Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/net-ftp/gftp/ChangeLog,v 1.83 2010/10/08 23:21:35 eva Exp $
+
+  08 Oct 2010; Gilles Dartiguelongue <eva@gentoo.org>
+  -gftp-2.0.18-r6.ebuild, -files/gftp-2.0.18-188252.patch,
+  -files/gftp-2.0.18-ipv6.patch, -files/gftp-2.0.18-ssh2-read.patch,
+  -files/gftp-2.0.18-ssl-wildcardcert.patch, -gftp-2.0.19.ebuild:
+  Clean up old revisions.
 
   09 Aug 2009; nixnut <nixnut@gentoo.org> gftp-2.0.19-r1.ebuild:
   ppc stable #276468
diff --git a/net-ftp/gftp/files/gftp-2.0.18-188252.patch b/net-ftp/gftp/files/gftp-2.0.18-188252.patch
deleted file mode 100644
index 760462b60c18..000000000000
--- a/net-ftp/gftp/files/gftp-2.0.18-188252.patch
+++ /dev/null
@@ -1,73 +0,0 @@
-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/files/gftp-2.0.18-ipv6.patch b/net-ftp/gftp/files/gftp-2.0.18-ipv6.patch
deleted file mode 100644
index 05454211b8fd..000000000000
--- a/net-ftp/gftp/files/gftp-2.0.18-ipv6.patch
+++ /dev/null
@@ -1,33 +0,0 @@
-2006-7-19 Brian Masney <masneyb@gftp.org>
-	* lib/misc.c (gftp_copy_request) - fixes when doing an IPv6 transfer or
-	using ignore PASV address (from (from Aurelien Jarno) (closes GNOME bugzilla #169671)
-
---- a/trunk/lib/misc.c	2006/07/20 02:32:58	784
-+++ b/trunk/lib/misc.c	2006/07/20 02:37:45	785
-@@ -568,8 +568,24 @@
-   newreq->use_proxy = req->use_proxy;
-   newreq->logging_function = req->logging_function;
-   newreq->ai_family = req->ai_family;
--  newreq->free_hostp = 0;
--  newreq->hostp = NULL;
-+
-+  if (req->hostp)
-+    {
-+#if defined (HAVE_GETADDRINFO) && defined (HAVE_GAI_STRERROR)
-+      newreq->hostp = g_malloc (sizeof(struct addrinfo));
-+      memcpy(newreq->hostp, req->hostp, sizeof(struct addrinfo));
-+      if (req->current_hostp)
-+        newreq->current_hostp = newreq->hostp + (req->current_hostp - req->hostp);
-+#else
-+      newreq->hostp = g_malloc (sizeof(struct hostent));
-+      memcpy(newreq->hostp, req->hostp, sizeof(struct hostent));
-+      newreq->host = req->host;
-+      newreq->curhost = req->curhost;
-+#endif
-+    }
-+  else
-+    newreq->hostp = NULL;
-+  newreq->free_hostp = 1;
- 
-   gftp_copy_local_options (&newreq->local_options_vars, 
-                            &newreq->local_options_hash,
diff --git a/net-ftp/gftp/files/gftp-2.0.18-ssh2-read.patch b/net-ftp/gftp/files/gftp-2.0.18-ssh2-read.patch
deleted file mode 100644
index 765741be7b02..000000000000
--- a/net-ftp/gftp/files/gftp-2.0.18-ssh2-read.patch
+++ /dev/null
@@ -1,13 +0,0 @@
---- gftp-2.0.18.orig/lib/sshv2.c
-+++ gftp-2.0.18/lib/sshv2.c
-@@ -1841,7 +1841,7 @@
- {
-   int ret;
- 
--  if ((ret = sshv2_open_file (request, file, startsize, SSH_FXP_OPEN)) < 0)
-+  if ((ret = sshv2_open_file (request, file, startsize, SSH_FXF_READ)) < 0)
-     return (ret);
- 
-   return (sshv2_get_file_size (request, file));
-
-
diff --git a/net-ftp/gftp/files/gftp-2.0.18-ssl-wildcardcert.patch b/net-ftp/gftp/files/gftp-2.0.18-ssl-wildcardcert.patch
deleted file mode 100644
index 202b2931c958..000000000000
--- a/net-ftp/gftp/files/gftp-2.0.18-ssl-wildcardcert.patch
+++ /dev/null
@@ -1,22 +0,0 @@
---- lib/sslcommon.c	2005-01-04 14:32:11.000000000 +0100
-+++ lib/sslcommon.c	2006-06-19 15:23:13.000000000 +0200
-@@ -182,7 +182,18 @@
-       X509_NAME_get_text_by_NID (subj, NID_commonName, data, 256) > 0)
-     {
-       data[sizeof (data) - 1] = '\0';
--      if (strcasecmp (data, request->hostname) != 0)
-+      /* Check for wildcard CN (must begin with *.) */
-+      if (strncmp(data, "*.", 2) == 0)
-+        {
-+          int hostname_len = strlen(data) - 1;
-+          if (strlen(request->hostname) > hostname_len &&
-+              strcasecmp (&(data[1]), &(request->hostname[strlen(request->hostname) - hostname_len])) == 0)
-+              ok = 1;
-+        }
-+      else if (strcasecmp (data, request->hostname) == 0)
-+          ok = 1;
-+      
-+      if (!ok)
-         {
-           request->logging_function (gftp_logging_error, request,
-                                      _("ERROR: The host in the SSL certificate (%s) does not match the host that we connected to (%s). Aborting connection.\n"),
diff --git a/net-ftp/gftp/gftp-2.0.18-r6.ebuild b/net-ftp/gftp/gftp-2.0.18-r6.ebuild
deleted file mode 100644
index f9c4377ccb0b..000000000000
--- a/net-ftp/gftp/gftp-2.0.18-r6.ebuild
+++ /dev/null
@@ -1,49 +0,0 @@
-# Copyright 1999-2008 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.9 2008/09/24 08:42:48 aballier 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 ~x86-fbsd"
-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
-}
diff --git a/net-ftp/gftp/gftp-2.0.19.ebuild b/net-ftp/gftp/gftp-2.0.19.ebuild
deleted file mode 100644
index e0d25cb53a8a..000000000000
--- a/net-ftp/gftp/gftp-2.0.19.ebuild
+++ /dev/null
@@ -1,33 +0,0 @@
-# Copyright 1999-2009 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-ftp/gftp/gftp-2.0.19.ebuild,v 1.7 2009/02/07 21:12:17 armin76 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 ~x86-fbsd"
-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_compile() {
-	econf $(use_enable gtk gtkport) $(use_enable ssl) || die "configure failed"
-	emake || die "make failed"
-}
-
-src_install() {
-	emake DESTDIR="${D}" install || die "install failed"
-	dodoc ChangeLog* README* THANKS TODO docs/USERS-GUIDE
-}