Clean up old revisions.

Package-Manager: portage-2.2_rc91/cvs/Linux x86_64

9 files changed, 22 insertions, 234 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/Manifest b/net-ftp/gftp/Manifest
index ca367ab8e662..e92dcaed748b 100644
--- a/net-ftp/gftp/Manifest
+++ b/net-ftp/gftp/Manifest
@@ -1,13 +1,16 @@
-AUX gftp-2.0.18-188252.patch 2499 RMD160 c62486bb65aa0cebec5a7aa051715f796448e872 SHA1 225d30f18d4b3ee052056ed8eb90247b147713ea SHA256 2804e400d6052873a0d5fcf24536febc96eb8bda14cac536e5979f5467fed1a6
-AUX gftp-2.0.18-ipv6.patch 1230 RMD160 069d90a5bba600c2aa36ab8a4338234221157137 SHA1 789275d36b6061e8eba3c5fd905080c8b8d2706b SHA256 b65b31580e9be9ba04e4435919c6e53de7bd8f830b4e382129cb74ee9ad77e33
-AUX gftp-2.0.18-ssh2-read.patch 326 RMD160 512c6ffb7b31588a63c8efa48c15f70c33854862 SHA1 78d2d8e1a7921a8cfb456f8e414b11a6a04d11f3 SHA256 3ae9e62999aef08911dcc374433fa1797d277494cb86fdbb54e969098230582d
-AUX gftp-2.0.18-ssl-wildcardcert.patch 1004 RMD160 10a192946d56d6c830e7afc1172892f544c44fad SHA1 838669715273a265c3207b825386b281c41b2d4a SHA256 9f7c483ad83f7e12b492c9227ba548e089a4af455af3e8ea2ceff2b8e515e0c9
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
 AUX gftp-2.0.19-gftp-expand-path-sigsegv.patch 640 RMD160 b763dd908273ad5ef13237b783a7f60da99a0adb SHA1 0f70c5f1be7f135c7bbb5aac90c6f5b0278c0bdb SHA256 79bbc67cf428dc323d6aedd8b047d8f8fdad42cf11a1e75fa5c118d358f85def
-DIST gftp-2.0.18.tar.bz2 1374850 RMD160 0e0daea8543ae822b25635647360193362a2648d SHA1 c2468f1ff1fe978a5fab3a198e513558f3b48f5a SHA256 8145e18d1edf13e8cb6cd7a69bb69de5c46307086997755654488fb8282d38a2
 DIST gftp-2.0.19.tar.bz2 1687167 RMD160 74c272b8cb2dfa6561bb9e0dc9ef0b81d079dc07 SHA1 a5516403edf199e31194806478d4d8ac00daf828 SHA256 5306a46be96d6f4d23906cb1836fb3d732039621a6c7fcfa921acc21ac110bfd
-EBUILD gftp-2.0.18-r6.ebuild 1382 RMD160 636c87a0ae1be0814ce05a1ef564a6cd97abc5dd SHA1 7e8751af8157d7875f5584d8dc5241f1bb40d936 SHA256 8f3ab1dd368b841087870acebf33a0140f0c47cd8edf02f6e2688859775b2038
 EBUILD gftp-2.0.19-r1.ebuild 1056 RMD160 9638249e76daff2600d582fa077ded0335eca807 SHA1 93ce6825cbf4040245ebca804358d0506f885b49 SHA256 be54ea752b033946473dd60d4882b744f89d6dc8deec39e84c5483e2552e2346
-EBUILD gftp-2.0.19.ebuild 885 RMD160 2871f370f0de63d30b2edda07ad8299448d195f6 SHA1 ace1189795c11c41337e4a6ef364370f71f3d6e0 SHA256 9dd3947cb74d477d4bda142cfcf7f7e59eee07d8e33fc5dc9fa18a7bca01b70d
 EBUILD gftp-9999.ebuild 1604 RMD160 4912b5dbac117d156d594e905a8104ede59b2552 SHA1 dc6e59e40c3f185a91f3a2881602fe05da07cd4f SHA256 43d2bf2a8ffb9282de555c290fdf11a9cf5c095a1e8d9c8d8bc87b5cc4aa8987
-MISC ChangeLog 10744 RMD160 e5ab93b688c8b4308c0620f6a7e4b451fdfd1a1c SHA1 62dcb9c918de547825243ab445b463985b53ee18 SHA256 ac21b3a1cdb535b5eab3e380734decb0c2426b08999c417d12bfd0c92d8f82ce
+MISC ChangeLog 11016 RMD160 75f59f99230ceebc0f3c7226e369a0368c336a47 SHA1 eea6d61b165c0e5ceb0ddd050b082f33dd54b67e SHA256 2e0b057f0d4bc4452cdf122f75e2fc88776704c31013860df9c1fe2c52bce21a
 MISC metadata.xml 158 RMD160 c0e2bae8e91bb6be8922bac5e4f597302e06587e SHA1 38f78e9790bcd4382b4a49aa226aa6dda1d3a3d7 SHA256 3a7dbca0fdc557de69783e0663e2d76ddab129ea8a19b2d0ef6d3e5d1b947ce1
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v2.0.16 (GNU/Linux)
+
+iEYEARECAAYFAkyvp4QACgkQ1fmVwcYIWAaDWgCdH0wHCEP4xFt3qBCXTTJ891qY
+DNkAoOoMILBPPyKLVeNsxtNvIUG1ic+2
+=lzTs
+-----END PGP SIGNATURE-----
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
-}
diff --git a/net-ftp/proftpd/Manifest b/net-ftp/proftpd/Manifest
index c49e29d181ca..9826431ac62f 100644
--- a/net-ftp/proftpd/Manifest
+++ b/net-ftp/proftpd/Manifest
@@ -15,6 +15,7 @@ DIST proftpd-1.3.2d.tar.bz2 2545428 RMD160 878f830b3dc1af9f630a8c527c8d132252daa
 DIST proftpd-1.3.2e.tar.bz2 2545499 RMD160 31e814b7d009251bfa1a459066574c741309da4c SHA1 6e9bcb9d413e8c59c15de230346eada63399b2a3 SHA256 23fbb10b0f85a6141987dfd52010f7efdd723b84068964cb085cdfb97c0effdf
 DIST proftpd-1.3.3.tar.bz2 4132650 RMD160 01c9226f694129561dd35a03631c6a2b8bd593dc SHA1 ce7c1f96648f94e32d5d104cd1405e6778aae045 SHA256 793f2bde2ab5aeb86a68349118d87bb151ba1278987612b7a12872110f9d759c
 DIST proftpd-1.3.3a.tar.bz2 4157983 RMD160 a900502b02518fcad7595d19bb14bbd74c6690ba SHA1 89b6f42b6d14b53b1e35f365ed60aa3f06d116b8 SHA256 c1f73e7b189c22fe2f33a0cd6f9d3f3ad10ee73c23a1347cd13daf87fea729f7
+DIST proftpd-1.3.3b.tar.bz2 4162969 RMD160 643a154af5f7bdc3325256065dc2d6bc3d703109 SHA1 5ecc934389d5022d3f7e1246b53c0f6bf09e642c SHA256 28d235cf312df19d03762ef106ba9371741646f0fc36127db0482a8861d46794
 DIST proftpd-mod-case-0.3.tar.gz 4781 RMD160 99f46a2cfb88ec2f3070d632dbc17d89d12ec30b SHA1 c8ea2c4604ab2ffa5853284d0696b1dfe518ae84 SHA256 a9affd47558020b2b3f369c9a945ac91d22b45368734d839404b76e0fbdaaf7c
 DIST proftpd-mod-case-0.4.tar.gz 4849 RMD160 fdf579587461c0ad2136f6cc1e3064efe31f2eb6 SHA1 01631d4545d9a4995d452278caa2ef94b84e6a1f SHA256 5c724a2a57a00048529bfab6c5672e16c7c0ecb2eb4e2bedd05bb3a1a5bf97fa
 DIST proftpd-mod-deflate-0.4.tar.gz 2779844 RMD160 e6c7689b281ef015ceefa1d2939f5cf0a6fffc72 SHA1 2f42c3761445657e032739ea67c1cf359e527a98 SHA256 4451d9af02900aabe769f0d8a5efa80bdf2973efc4db2d138623b01b3ef72b69
@@ -27,5 +28,6 @@ EBUILD proftpd-1.3.2e.ebuild 8246 RMD160 3e5d405db4d2da8daeed31e7853abda8a03dc03
 EBUILD proftpd-1.3.3-r1.ebuild 7276 RMD160 d8a9357e896df752923fcf8d637f10632c510e94 SHA1 35f2ed96824739a475ea6690f6b31f0508d75ad8 SHA256 adc301d288ea9ce7a4c4960598f5fdd2e915fb6eea674a53a4755210721c0bfd
 EBUILD proftpd-1.3.3.ebuild 7087 RMD160 1f93876a995e5caf2145f8a03047de839ba8b507 SHA1 d03bf525d997c485226186f3a4cb901165c73723 SHA256 54eb92d72aaea49232ce31da936c14cd80cdec8de64201fe03b671b7478f93d8
 EBUILD proftpd-1.3.3a.ebuild 7182 RMD160 b5a5c218c723e1aada1cdcfd4a1b414aebca45e8 SHA1 2094ea71d15f966f666a700fd8cece782d49fe5a SHA256 2cc1406ffdc93ae4ac5fbc0fac985193d505636401d6b57f3ca14d6220821951
-MISC ChangeLog 40101 RMD160 8b965b492f73a3eb68bd87a7d237299e7ff09ed4 SHA1 22dd067b56e21fbfeb96501623826268a386a769 SHA256 3652586fcdd5836eabdb29f85d99314de76e783e441d452ff63b2cf3bb0c7ece
+EBUILD proftpd-1.3.3b.ebuild 7185 RMD160 5df871f80938efee49ee42f1e93cc3e1291bdb89 SHA1 48ed5607609cd6a1c9ee6797e886dcb5dff8c982 SHA256 2cc45e574d5f9cddd66f6d9c2b771cb1b6895f74115f467aa8d82e45845a1917
+MISC ChangeLog 40250 RMD160 4493eb65212461c899e3d92b3c08d8172a523ac6 SHA1 a6c9329cc6d89753b25d4d585bb8eecfdc9967e6 SHA256 aeda9773235d9ab7873db3fa36ae45c8e862680a353417852a5d17046d4d5d95
 MISC metadata.xml 1812 RMD160 79f9109e0364ddcff30da3f86af3c889f4ea1cee SHA1 dacd8d433d5f42e4dd7b6cb33ec9131f07abd98b SHA256 313c3786f11cc6311966be048d4290cf363e46c5e7dc31b5ed6890c7071efdbf