add patch, bump rev

4 files changed, 106 insertions, 5 deletions

diff --git a/net-ftp/gftp/Manifest b/net-ftp/gftp/Manifest
index ea301f1fbe48..1f20746a20b3 100644
--- a/net-ftp/gftp/Manifest
+++ b/net-ftp/gftp/Manifest
@@ -1,10 +1,9 @@
 MD5 4965cb3d7d47ce48a9fa674ae66c4b86 gftp-2.0.14.ebuild 998
-MD5 40a6985bd0f35ea24452339b31eb7e9c gftp-2.0.16-r1.ebuild 1425
+MD5 302947e44af02a06d9a756a2b9416bc5 gftp-2.0.16-r1.ebuild 1432
 MD5 a9c8c333bdef866c90644e926fc06470 gftp-2.0.15.ebuild 1333
-MD5 8c4b878e17db47be44d71ac09176aa8d ChangeLog 2997
+MD5 c96ab3681c02d8ccdc16d7958c1c0f64 ChangeLog 3202
 MD5 03ad2e6c4ab41244af1015a8bbb0b39f metadata.xml 158
 MD5 4a567cc97f7b5318979193135b98eafd files/digest-gftp-2.0.14 64
 MD5 f016b30f08a26f30a03721cff7a19ac9 files/digest-gftp-2.0.15 65
-MD5 77ce85d4218034ac35a17bf59af5b790 files/digest-gftp-2.0.16 65
 MD5 77ce85d4218034ac35a17bf59af5b790 files/digest-gftp-2.0.16-r1 65
 MD5 23e7696a3f6f2c368d11ca9aaadb7797 files/gftp-2.0.16-ipv6_fix.patch 3279
diff --git a/net-ftp/gftp/files/digest-gftp-2.0.16 b/net-ftp/gftp/files/digest-gftp-2.0.16-r1
index 9ea9117b1698..9ea9117b1698 100644
--- a/net-ftp/gftp/files/digest-gftp-2.0.16
+++ b/net-ftp/gftp/files/digest-gftp-2.0.16-r1
diff --git a/net-ftp/gftp/files/gftp-2.0.16-ipv6_fix.patch b/net-ftp/gftp/files/gftp-2.0.16-ipv6_fix.patch
new file mode 100644
index 000000000000..bcc3f28ab66b
--- /dev/null
+++ b/net-ftp/gftp/files/gftp-2.0.16-ipv6_fix.patch
@@ -0,0 +1,92 @@
+? Makefile
+? Makefile.in
+Index: options.h
+===================================================================
+RCS file: /cvs/gnome/gftp/lib/options.h,v
+retrieving revision 1.20
+diff -u -r1.20 options.h
+--- options.h	21 Jul 2003 00:26:41 -0000	1.20
++++ options.h	10 Nov 2003 01:55:49 -0000
+@@ -111,6 +111,12 @@
+   {"default_protocol", N_("Default Protocol:"),
+    gftp_option_type_textcombo, "FTP", NULL, 0,
+    N_("This specifies the default protocol to use"), GFTP_PORT_ALL, NULL},
++#if defined (HAVE_GETADDRINFO) && defined (HAVE_GAI_STRERROR)
++  {"enable_ipv6", N_("Enable IPv6"), 
++   gftp_option_type_checkbox, GINT_TO_POINTER(1), NULL, 
++   GFTP_CVARS_FLAGS_SHOW_BOOKMARK,
++   N_("Enable IPv6 support"), GFTP_PORT_ALL, NULL},
++#endif
+ 
+   {"list_dblclk_action", "", 
+    gftp_option_type_int, GINT_TO_POINTER(0), NULL, 0,
+Index: protocols.c
+===================================================================
+RCS file: /cvs/gnome/gftp/lib/protocols.c,v
+retrieving revision 1.70
+diff -u -r1.70 protocols.c
+--- protocols.c	8 Nov 2003 12:23:20 -0000	1.70
++++ protocols.c	10 Nov 2003 01:55:54 -0000
+@@ -1826,8 +1826,8 @@
+   int port, sock;
+ #if defined (HAVE_GETADDRINFO) && defined (HAVE_GAI_STRERROR)
+   struct addrinfo hints, *res;
++  int errnum, enable_ipv6;
+   char serv[8];
+-  int errnum;
+ 
+   if ((request->use_proxy = gftp_need_proxy (request, service,
+                                              proxy_hostname, proxy_port)) < 0)
+@@ -1835,10 +1835,17 @@
+   else if (request->use_proxy == 1)
+     request->hostp = NULL;
+ 
++  gftp_lookup_request_option (request, "enable_ipv6", &enable_ipv6);
++
+   request->free_hostp = 1;
+   memset (&hints, 0, sizeof (hints));
+   hints.ai_flags = AI_CANONNAME;
+-  hints.ai_family = PF_UNSPEC;
++
++  if (enable_ipv6)
++    hints.ai_family = PF_UNSPEC;
++  else
++    hints.ai_family = AF_INET;
++
+   hints.ai_socktype = SOCK_STREAM;
+ 
+   if (request->use_proxy)
+@@ -1926,7 +1933,7 @@
+   if ((sock = socket (AF_INET, SOCK_STREAM, IPPROTO_TCP)) < 0)
+     {
+       request->logging_function (gftp_logging_error, request,
+-                                 _("Failed to create a socket: %s\n"),
++                                 _("Failed to create a IPv4 socket: %s\n"),
+                                  g_strerror (errno));
+       return (GFTP_ERETRYABLE);
+     }
+Index: rfc959.c
+===================================================================
+RCS file: /cvs/gnome/gftp/lib/rfc959.c,v
+retrieving revision 1.47
+diff -u -r1.47 rfc959.c
+--- rfc959.c	8 Nov 2003 12:23:20 -0000	1.47
++++ rfc959.c	10 Nov 2003 01:55:57 -0000
+@@ -620,7 +620,7 @@
+   if ((parms->data_connection = socket (AF_INET, SOCK_STREAM, IPPROTO_TCP)) < 0)
+     {
+       request->logging_function (gftp_logging_error, request,
+-				 _("Failed to create a socket: %s\n"),
++				 _("Failed to create a IPv4 socket: %s\n"),
+ 				 g_strerror (errno));
+       gftp_disconnect (request);
+       return (GFTP_ERETRYABLE);
+@@ -767,7 +767,7 @@
+   if ((parms->data_connection = socket (AF_INET6, SOCK_STREAM, IPPROTO_TCP)) < 0)
+     {
+       request->logging_function (gftp_logging_error, request,
+-				 _("Failed to create a socket: %s\n"),
++				 _("Failed to create a IPv6 socket: %s\n"),
+ 				 g_strerror (errno));
+       gftp_disconnect (request);
+       return (GFTP_ERETRYABLE);
diff --git a/net-ftp/gftp/gftp-2.0.16.ebuild b/net-ftp/gftp/gftp-2.0.16-r1.ebuild
index 15b52f759e4c..4428a9b81fc6 100644
--- a/net-ftp/gftp/gftp-2.0.16.ebuild
+++ b/net-ftp/gftp/gftp-2.0.16-r1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2003 Gentoo Technologies, Inc.
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-ftp/gftp/gftp-2.0.16.ebuild,v 1.2 2003/11/10 21:12:04 foser Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-ftp/gftp/gftp-2.0.16-r1.ebuild,v 1.1 2003/11/27 13:10:06 foser Exp $
 
 DESCRIPTION="Gnome based FTP Client"
 SRC_URI="http://www.gftp.org/${P}.tar.bz2"
@@ -19,7 +19,17 @@ DEPEND="virtual/x11
 		sys-libs/ncurses
 		=dev-libs/glib-1.2* )"
 
-RDEPEND="nls? ( sys-devel/gettext )"
+#RDEPEND="nls? ( sys-devel/gettext )"
+
+src_unpack() {
+
+	unpack ${A}
+
+	cd ${S}/lib
+	# fix problem in #34475
+	epatch ${FILESDIR}/${P}-ipv6_fix.patch
+
+}
 
 src_compile() {
 	local myconf