rpms/ncftp/devel ncftp-3.1.8-epsv.patch, NONE, 1.1 .cvsignore, 1.2, 1.3 ncftp.spec, 1.4, 1.5 sources, 1.2, 1.3

[Matthias Saou (thias)]

Author: thias

Update of /cvs/extras/rpms/ncftp/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv13332

Modified Files:
	.cvsignore ncftp.spec sources 
Added Files:
	ncftp-3.1.8-epsv.patch 
Log Message:
Update to 3.1.8 and fix for non-IPv6 EPSV/LPSV commands.


ncftp-3.1.8-epsv.patch:

--- NEW FILE ncftp-3.1.8-epsv.patch ---
--- ncftp-3.1.8/libncftp/ftp.c.org	2005-02-23 18:00:45.000000000 +0100
+++ ncftp-3.1.8/libncftp/ftp.c	2005-02-23 18:02:34.000000000 +0100
@@ -702,6 +702,7 @@
 #endif
 	unsigned short port;
 
+#ifdef ENABLE_IPV6
 	rp = InitResponse();
 	if (rp == NULL) {
 		FTPLogError(cip, kDontPerror, "Malloc failed.\n");
@@ -709,43 +710,37 @@
 		return (cip->errNo);
 	}
 
-	result = RCmd(cip, rp, "EPSV");
-	if (result != 2)
-		goto next;
-
-	if (rp->codeType != 2)
-		goto next;
-
-	for (cp = rp->msg.first->line; ; cp++) {
-		if (*cp == '\0') {
-			FTPLogError(cip, kDontPerror, "Cannot parse EPSV response: %s\n", rp->msg.first->line);
-			goto next;
-		}
-		if (isdigit((int) *cp))
-			break;
-	}
-	if (sscanf(cp, "%hd|", &port) != 1) {
-		FTPLogError(cip, kDontPerror, "Cannot parse EPSV response: %s\n", rp->msg.first->line);
-		goto next;
-	}
-
-
-#ifdef ENABLE_IPV6
-	if (saddr->sa_family == AF_INET6) {
-		saddr6->sin6_addr =
-			((struct sockaddr_in6 *)&cip->servCtlAddr)->sin6_addr;
-		saddr6->sin6_port = htons(port);
-	} else {
-#endif
-		saddr4->sin_addr =
-			((struct sockaddr_in *)&cip->servCtlAddr)->sin_addr;
-		saddr4->sin_port = htons(port);
-#ifdef ENABLE_IPV6
+	if(saddr->sa_family == AF_INET6) {
+	  result = RCmd(cip, rp, "EPSV");
+	  if (result != 2)
+	    goto next;
+
+	  if (rp->codeType != 2)
+	    goto next;
+
+	  for (cp = rp->msg.first->line; ; cp++) {
+	    if (*cp == '\0') {
+	      FTPLogError(cip, kDontPerror, "Cannot parse EPSV response: %s\n", rp->msg.first->line);
+	      goto next;
+	    }
+	    if (isdigit((int) *cp))
+	      break;
+	  }
+	
+	  if (sscanf(cp, "%hd|", &port) != 1) {
+	    FTPLogError(cip, kDontPerror, "Cannot parse EPSV response: %s\n", rp->msg.first->line);
+	    goto next;
+	  }
+
+	  saddr6->sin6_addr =
+	    ((struct sockaddr_in6 *)&cip->servCtlAddr)->sin6_addr;
+	  saddr6->sin6_port = htons(port);
+	
+	  goto done;
 	}
-#endif
-	goto done;
 
  next:
+#endif
 	rp = InitResponse();
 	if (rp == NULL) {
 		FTPLogError(cip, kDontPerror, "Malloc failed.\n");


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/ncftp/devel/.cvsignore,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- .cvsignore	5 Mar 2005 22:28:24 -0000	1.2
+++ .cvsignore	2 May 2005 18:56:41 -0000	1.3
@@ -1,2 +1,2 @@
-ncftp-3.1.8-src.tar.bz2
-ncftp-3181-v6-20040826.diff.gz
+ncftp-3.1.9-src.tar.bz2
+ncftp-319-v6-20050419.diff.gz


Index: ncftp.spec
===================================================================
RCS file: /cvs/extras/rpms/ncftp/devel/ncftp.spec,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- ncftp.spec	18 Apr 2005 18:51:25 -0000	1.4
+++ ncftp.spec	2 May 2005 18:56:41 -0000	1.5
@@ -1,7 +1,7 @@
 Summary: Improved console FTP client
 Name: ncftp
-Version: 3.1.8
-Release: 5
+Version: 3.1.9
+Release: 1
 Epoch: 2
 License: Distributable
 Group: Applications/Internet
@@ -9,11 +9,12 @@
 Source: ftp://ftp.ncftp.com/ncftp/ncftp-%{version}-src.tar.bz2
 Patch1: ncftp-3.0.1-pref.patch
 Patch2: ncftp-3.1.7-shell.patch
-Patch3: ftp://ftp.kame.net/pub/kame/misc/ncftp-3181-v6-20040826.diff.gz
+Patch3: ftp://ftp.kame.net/pub/kame/misc/ncftp-319-v6-20050419.diff.gz
 Patch4: ncftp-3.0.3-resume.patch
 Patch5: ncftp-3.1.5-pmeter.patch
 Patch6: ncftp-3.1.5-ncursesw.patch
 Patch7: ncftp-3.1.6-rh1.patch
+Patch8: ncftp-3.1.8-epsv.patch
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root
 BuildRequires: ncurses-devel
 
@@ -31,7 +32,8 @@
 %patch4 -p1 -b .res
 %patch5 -p1 -b .pmeter
 %patch6 -p1 -b .ncursesw
-#%patch7 -p1 -b .ask_save
+#patch7 -p1 -b .ask_save
+%patch8 -p1 -b .epsv
 
 
 %build
@@ -69,6 +71,11 @@
 
 
 %changelog
+* Thu Apr 21 2005 Matthias Saou <http://freshrpms.net/> 2:3.1.9-1
+- Update to 3.1.9.
+- Update IPv6 KAME patch to ncftp-319-v6-20050419.diff.
+- Add EPSV/LPSV IPv6 patch (#149494).
+
 * Sat Mar  5 2005 Matthias Saou <http://freshrpms.net/> 2:3.1.8-5
 - Spec file cleanup.
 - Remove man pages from docs.


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/ncftp/devel/sources,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- sources	5 Mar 2005 22:28:24 -0000	1.2
+++ sources	2 May 2005 18:56:41 -0000	1.3
@@ -1,2 +1,2 @@
-dd5f47c72b6958fdb652355fb9bdb70c  ncftp-3.1.8-src.tar.bz2
-ade187726693f5c6c6415e41832f514d  ncftp-3181-v6-20040826.diff.gz
+66cf8dacec848eb11a70632fe9f21807  ncftp-3.1.9-src.tar.bz2
+8a696bf0e2dcd4e04309da630e993dfd  ncftp-319-v6-20050419.diff.gz