update to 0.12:

   preliminary support for sftp (requires ssh protocol version 2)
   print estimated remaining time for down- and uploads

4 files changed, 10 insertions, 98 deletions

diff --git a/net/cftp/DESCR b/net/cftp/DESCR
index 4bc4bb60069..9852f447655 100644
--- a/net/cftp/DESCR
+++ b/net/cftp/DESCR
@@ -1,4 +1,5 @@
-CFTP is used to transfer files from one computer to another via the
-FTP protocol.  It's advantages over most standard ftp clients is its
-termcap-based fullscreen representation of the remote directory tree,
-providing a compact overview of the remote server's contents.
+CFTP is used to transfer files from one computer to another via
+the FTP or SFTP (via ssh) protocol.  It's advantages over most
+standard ftp clients is its termcap-based fullscreen representation
+of the remote directory tree, providing a compact overview of the
+remote server's contents.
diff --git a/net/cftp/Makefile b/net/cftp/Makefile
index d0ab40a8b20..94a80454964 100644
--- a/net/cftp/Makefile
+++ b/net/cftp/Makefile
@@ -1,8 +1,7 @@
-# $NetBSD: Makefile,v 1.7 2002/02/18 15:14:36 seb Exp $
+# $NetBSD: Makefile,v 1.8 2002/09/17 15:33:04 dillo Exp $
 #
 
-DISTNAME=	cftp-0.11
-PKGREVISION=	1
+DISTNAME=	cftp-0.12
 CATEGORIES=	net
 MASTER_SITES=	ftp://sunsite.csd.smc.univie.ac.at/pub/nih/cftp/ \
 		ftp://ftp.giga.or.at/pub/nih/cftp/
diff --git a/net/cftp/distinfo b/net/cftp/distinfo
index 241e20ee441..a1367d9b042 100644
--- a/net/cftp/distinfo
+++ b/net/cftp/distinfo
@@ -1,5 +1,4 @@
-$NetBSD: distinfo,v 1.4 2001/12/10 16:05:26 dillo Exp $
+$NetBSD: distinfo,v 1.5 2002/09/17 15:33:04 dillo Exp $
 
-SHA1 (cftp-0.11.tar.gz) = 5b76f43f8af3fc6bcbd744798c4f57c88087b1df
-Size (cftp-0.11.tar.gz) = 163869 bytes
-SHA1 (patch-aa) = 67712743d700c036baa81676413c63c0eecb6291
+SHA1 (cftp-0.12.tar.gz) = ba583541be4bce2125849a677054d290140d0880
+Size (cftp-0.12.tar.gz) = 182043 bytes
diff --git a/net/cftp/patches/patch-aa b/net/cftp/patches/patch-aa
deleted file mode 100644
index 534f568e12c..00000000000
--- a/net/cftp/patches/patch-aa
+++ /dev/null
@@ -1,87 +0,0 @@
-$NetBSD: patch-aa,v 1.1 2001/12/10 16:05:27 dillo Exp $
-
---- ftp.c	2001/09/11 18:13:09	1.57
-+++ ftp.c	2001/10/05 13:13:49	1.58
-@@ -956,7 +956,8 @@
- ftp_cat(FILE *fin, FILE *fout, long start, long size, int upload)
- {
-     char buf[4096], buf2[8192], *p;
--    int nread, nwritten, err, trail_cr;
-+    int nread, nwritten, err, trail_cr, errno_copy;
-+    enum { ERR_NONE, ERR_FIN, ERR_FOUT } error_cause;
-     int old_alarm;
-     long got;
-     struct itimerval itv;
-@@ -983,6 +984,7 @@
- 	ret=fcntl(fileno(fout), F_SETFL, flags);
-     }
- 
-+    error_cause = ERR_NONE;
-     trail_cr = 0;
-     do_read = 1;
-     for (;;) {
-@@ -993,7 +995,6 @@
- 	    ret=select(fileno(fin)+1, &fds, NULL, NULL, NULL);
- 	    
- 	    if (ret != -1 && FD_ISSET(fileno(fin), &fds)) {
--		errno = 0;
- 		if ((nread=fread(buf, 1, 4096, fin)) > 0) {
- 		    do_read = 0;
- 		    nwritten = 0;
-@@ -1009,8 +1010,13 @@
- 						    &trail_cr);
- 		    }
- 		}
--		else if (errno != EAGAIN)
-+		else {
-+		    if (nread < 0 && errno != EAGAIN) {
-+			errno_copy = errno;
-+			error_cause = ERR_FIN;
-+		    }
- 		    break;
-+		}
- 	    }
- 	}
- 	else {
-@@ -1018,10 +1024,12 @@
- 	    ret=select(fileno(fin)+1, &fds, NULL, NULL, NULL);
- 	    
- 	    if (ret != -1 && FD_ISSET(fileno(fin), &fds)) {
--		errno = 0;
- 		if ((err=fwrite(p+nwritten, 1, nread-nwritten,
--				fout)) < 0 && errno != EAGAIN)
-+				fout)) < 0 && errno != EAGAIN) {
-+		    errno_copy = errno;
-+		    error_cause = ERR_FOUT;
- 		    break;
-+		}
- 		nwritten += err;
- 		got += err;
- 		
-@@ -1046,17 +1054,17 @@
- 
-     _ftp_transfer_stats_cleanup(&trstat);
- 
--    if (ferror(fin) || sig_intr) {
--	errno = 0;
-+    if (error_cause || sig_intr) {
- 	sig_intr = 0;
--	ftp_abort(fin);
--	return -1;
--    }
--    else if (ferror(fout)) {
--	err = errno;
--	errno = 0;
- 	ftp_abort(fin);
--	disp_status("write error: %s", strerror(err));
-+	switch (error_cause) {
-+	case ERR_FIN:
-+	    disp_status("read error: %s", strerror(errno_copy));
-+	    break;
-+	case ERR_FOUT:
-+	    disp_status("write error: %s", strerror(errno_copy));
-+	    break;
-+	}
- 	return -1;
-     }
-