rpms/ftp/FC-5 netkit-ftp-0.17-multiipv6.patch, NONE, 1.1 ftp.spec, 1.27, 1.28

[fedora-cvs-commits at redhat.com]

Author: mmaslano

Update of /cvs/dist/rpms/ftp/FC-5
In directory cvs.devel.redhat.com:/tmp/cvs-serv16995

Modified Files:
	ftp.spec 
Added Files:
	netkit-ftp-0.17-multiipv6.patch 
Log Message:
Add update for fc5 - support for IPv6 for multihome.


netkit-ftp-0.17-multiipv6.patch:
 ftp.c |   28 +++++++++++++++++-----------
 1 files changed, 17 insertions(+), 11 deletions(-)

--- NEW FILE netkit-ftp-0.17-multiipv6.patch ---
--- netkit-ftp-0.17/ftp/ftp.c.multiipv6	2006-08-02 15:03:26.000000000 +0200
+++ netkit-ftp-0.17/ftp/ftp.c	2006-08-02 15:06:19.000000000 +0200
@@ -78,9 +78,7 @@
 #include <netinet/in.h>
 #include <netinet/ip.h>
 #include <arpa/ftp.h>
-#include <arpa/inet.h>
 #include <arpa/telnet.h>
-
 #include <stdio.h>
 #include <signal.h>
 #include <string.h>
@@ -132,7 +130,7 @@
 static sigjmp_buf ptabort;
 static int ptabflg = 0;
 static int abrtflag = 0;
-struct sockaddr_in source;
+struct sockaddr_storage source;
 
 void lostpeer(int);
 extern int connected;
@@ -154,8 +152,8 @@
 char *
 hookup(const char *host, const char *port)
 {
-	int s, tos, error, alen;
-	socklen_t len;
+	int s, tos, error;
+	socklen_t len, alen;
 	static char hostnamebuf[256];
 	struct addrinfo hints, *res, *res0;
 	char hbuf[MAXHOSTNAMELEN], pbuf[NI_MAXSERV];
@@ -281,7 +279,15 @@
 		printf("Connected to %s (%s).\n", hostname, hbuf);
 	alen = sizeof(source);
 	getsockname(s,(struct sockaddr*)&source, &alen);
-	source.sin_port = 0;    /* We just want the addr, not the port */
+	switch (source.ss_family) {
+	    /* We just want the addr, not the port */
+	    case AF_INET:
+		((struct sockaddr_in *) &source)->sin_port = 0;
+	        break;
+	    case AF_INET6:
+		((struct sockaddr_in6 *) &source)->sin6_port = 0;
+	        break;
+	}
 
 	if (getreply(0) > 2) { 	/* read startup message from server    */
 		if (cin)
@@ -1260,11 +1266,11 @@
 			return(1);
 		}
 		if((multihome) &&
-			bind(data, (struct sockaddr*)&source, sizeof(source)) == -1) {
-			close(data);
-			data = -1;
-			perror("ftp multihome bind");
-			return(1);
+                       bind(data, (struct sockaddr *)&source, sizeof(source)) == -1) {
+                       close(data);
+                       data = -1;
+                       perror("ftp multihome bind");
+                       return(1);
                 }
 		if (options & SO_DEBUG &&
 		    setsockopt(data, SOL_SOCKET, SO_DEBUG, (char *)&on,


Index: ftp.spec
===================================================================
RCS file: /cvs/dist/rpms/ftp/FC-5/ftp.spec,v
retrieving revision 1.27
retrieving revision 1.28
diff -u -r1.27 -r1.28
--- ftp.spec	4 Aug 2006 07:05:55 -0000	1.27
+++ ftp.spec	17 Aug 2006 12:08:49 -0000	1.28
@@ -1,7 +1,7 @@
 Summary: The standard UNIX FTP (File Transfer Protocol) client.
 Name: ftp
 Version: 0.17
-Release: 32.1.2.fc5
+Release: 32.1.3.fc5
 License: BSD
 Group: Applications/Internet
 Source0: ftp://ftp.uk.linux.org/pub/linux/Networking/netkit-devel/netkit-ftp-%{version}.tar.bz2
@@ -19,6 +19,7 @@
 Patch12: netkit-ftp-0.17-data.patch
 Patch13: netkit-ftp-0.17-multihome.patch
 Patch14: netkit-ftp-0.17-longnames.patch
+Patch15: netkit-ftp-0.17-multiipv6.patch
 BuildRoot: /var/tmp/%{name}-root
 BuildRequires: gcc, glibc-devel, readline-devel, ncurses-devel, perl
 
@@ -46,7 +47,7 @@
 %patch12 -p1 -b .data
 %patch13 -p1 -b .multihome
 %patch14 -p1 -b .longnames
-
+%patch15 -p1 -b .multiipv6
 %build
 sh configure --with-c-compiler=gcc --enable-ipv6
 perl -pi -e '
@@ -79,6 +80,9 @@
 %{_mandir}/man5/netrc.*
 
 %changelog
+* Thu Aug 17 2006 Marcela Maslanova <mmaslano at redhat.com> - 0.17-32.1.3.fc5
+- update - support multihome for IPv6
+
 * Fri Aug 4 2006 Marcela Maslanova <mmaslano at redhat.com> - 0.17-32.1.2.fc5
 - fix (#196103) patch for long filenames