Update to 3.1.6, provided by Hiramatsu Yoshifumi in PR 22979.

3.1.6, 2003-08-25
  + Fixed an important bug that was causing socket leaks on Windows.
  + Added support for GCC 3.4 precompiled headers.
  + Aborting transfers is now more robust.
  + Re-fixed a problem where high ASCII characters at the NcFTP prompt
    could cause it to exit.
  + Bug fixed where timeouts may not have worked.
  + To the improved ASCII handling from 3.1.5, added another case where we
    workaround files sent by a buggy FTP server implementation whose
    files have CR+CR+LF end-of-lines.
  + More fixes related to the above, as well as few other fixes from
    Martin StorsjÃ.
  + Bug fixed where an upload filename could have been limited to 127
    characters.
  + Firewall exception hosts are no longer case sensitive.
  + Bug fixed in ncftpput's "-c" option so it works with the "-f" option
    (Thanks, ITO Tsuyoshi).
  + Ncftpbatch will now try to temporarily skip a failing host in the
  current run (Thanks, Eric Engstrom).
  + Bug fixed where a several minute delay would be incurred if you
    tried to transfer a file that did not exist.
  + For the malicious server problem that was addressed in 3.1.5, enhanced
    the fix for better compatibility with Serv-U and WS_FTP servers.

3.1.5, 2002-10-13
  + Problem fixed where a malicious or trojaned FTP server could send back
    pathnames with directories different from the directory requested.
    For example, if you did:
      cd /pub
      get *.zip
    the malicious server could
    send back a pathname like ../../../some/other/dir/filename.here
    rather than pathnames such as filename.zip and trick NcFTP into writing
    into a different local pathname if your user privileges had permission
    to write it.
    For details, see the CERT Vulnerability Note, at
      http://www.kb.cert.org/vuls/id/210409
 + Bug fixed where cd messages from remote server were not being displayed.
 + It's now possible to capture the output of the progress reports from
   ncftpget/put by redirecting descriptor(s) to a file.  Previous releases
   required a "tty" to enable progress reports.
 + Compatibility fixes for AIX, Linux, Mac OS X, IRIX 6.2 and SunOS 4.
 + Be less pedantic about incorrectly formatted multi-line responses.
 + Bug fixed where NcFTP could hang at exit.
 + For ASCII transfers, try harder to handle non-native end-of-line formats.

3.1.4, 2002-07-02
 + Bug fixed in Win32 port which could cause NcFTP to mis-parse output
   from Roxen FTP servers.
 + We now try to have ncftpbatch leave a core file for debugging if it
   exits with SIGSEGV, SIGBUS, or SIGILL.
 + Fixed(?) an elusive bug which had been present for the past few versions
   which could cause ncftpbatch to infinite loop or sleep too long.
 + New configure flag, --disable-ccdv.
 + Compatibility fixes for C++ and Linux.
 + Fixed a socket leak and a crash on Win32.
 + A few minor fixes for firewall logins (Thanks, Jochen Schnapka).
 + By default, proxy connections for PORT are no longer allowed.  This is
   mostly an extra security precaution, to eliminate cases where someone
   could hijack a data connection by connecting to us after we issue PORT
   but before the server could connect to us.
 + ncftpls now accepts a "-R" flag which is equivalent to "-x -lR".
 + Bugs fixed in configure script for our "--with-*" arguments
   (Thanks, David Kaelbling).
 + A few new firewalls (permutations of type 1).  (Thanks, Felix Buenemann)

3.1.3, 2002-03-27
 + Bug fixed on Solaris where a socket could be left in non-blocking mode.
 + Ls parsing is now more forgiving of weird /bin/ls implementations (AIX).
 + Be more lenient on broken server implementations which include extra
   blank lines in the control connection conversation.
 + Fix for ncftpget which was exiting with code 3 if URL mode was used
   and the file already existed.
 + Fix for resume prompts which in some cases was printing dates in the
   format like "Sun Feb 20:02:15 CST 2002" instead of
   "Sun Feb 24 20:02:15 CST 2002".  (I.e. the day of the month was
   missing.)
 + Compatibility fixes for IRIX 5.x and AIX 4.2.x.
 + Compatibility fixes for Cygwin
   (Thanks, Charles Wilson <cwilson AT ece.gatech.edu>).
 + Some extra debugging information is now logged to the trace logs.
 + When running the Windows bookmark editor in standalone mode, the
   program may not have launched NcFTP correctly with the selected
   bookmark (Thanks, Jochen.Erwied AT mbs-software.de).

3.1.2, 2002-01-30:
 + A fix for the local hostname detection code which could result with only
   the first character of the domain appended, rather than the entire domain
   (Thanks, Bernhard Sadlowski <sadlowsk AT mathematik.uni-bielefeld.de>).
 + Another bug fixed in local hostname detection where looking up the host
   by IP address was not done correctly.
 + Fixed a few portability problems on HP-UX 10.20 which were introduced
   in 3.1.0.
 + Fixed bug with readdir_r usage on Solaris, which could cause crashes
   when doing "put -R", among other things.
 + On Linux, use gethostbyname2_r() to specify that we only want IPv4
   addresses returned.
 + Reversing behavior from 3.1.0 where we did a shutdown() on the half
   of the socket that wasn't used.  We suspect this was causing some
   firewalls and routers to panic and assume the whole connection was
   to be closed.
 + Bug fixed where an unresolvable hostname caused a pointless connection
   attempt which would fail.
 + Shell utilities now print an error message when incompatible flags
   are used in conjunction with "-b" or "-c".
 + A few fixes for ncftpbatch.
 + Numerous fixes for SOCKS5.

3.1.1, 2001-12-23:
 + Fixed bugs with our use of gethostbyname_r/addr_r on Linux.
 + Fixed bugs with our implementation of stat64() on Windows, which caused
   problems when querying information about local directories.
 + Source distributions now include install-sh again.
 + Bug fixed with Win32 version of ncftpbookmarks, which could look
   in $HOME/.ncftp rather than $HOME/ncftp.  Many Win32 users weren't
   affected, since the HOME environment variable is not always set.

3.1.0, 2001-12-17:
+ ACCT is now always sent if the server requests it and you're going
  through the firewall.
+ Bug fixed where puts could delay a few seconds unnecessarily after
  the file had been sent.
+ Bug fixed where passwords were saved if you chose to autosave bookmarks.
  NcFTP also makes an effort to avoid saving passwords in the history
  and trace files if you foolishly use passwords on your command lines.
+ Bug fixed on Win32 port where putting a file that did not exist could
  cause a crash.
+ The "-r" (recursive) flag is back for "bgget" and "bgput".  We now spool
  the directory by creating individual spool files for each file in the
  directory, which should increase reliability and usability of this feature.
+ The binary packages should be a bit leaner, since ncftpls wasn't getting
  stripped.
+ Library optimizations should result in less unneeded code included with
  programs that use the libraries.  The binaries should be smaller as a
  result.
+ Recursive uploading has been substantially reworked.  "put -R" should now
  work better, especially on the Win32 port.  Arbitrary pathname sizes have
  also been removed, so directory trees should only be limited by available
  memory and stack space.
+ Huge number of lint fixes.  NcFTP now compiles cleanly on several
  platforms even with extra warning options enabled.
+ Large number of internal changes to the configure scripts.
+ Using my cool hack, "ccdv", in Makefiles.  Originally this became a
  necessity since some platforms could have $CFLAGS 4 or 5 lines long!
  Besides streamlining the build process so that lint warnings can
  easily be spotted, the builds are pleasing to the eye with ANSI color
  if your $TERM supports it.
+ Fixed bug where Win32 $HOME bug fixed for 3.0.4 wasn't fixed for
  ncftpbookmarks.
+ Fixes for large file support for the Win32 port.
+ Bugs fixed in Win32 port of ncftpbatch.
+ A few bug fixes for getline.
+ The default ASCII extensions list no longer include ".sh", since Sun
  apparently distributes the JDK as a shell script with binary data
  appended.

3.0.4, 2001-10-24:
+ Workaround new "feature" of glibc which defines printf as a macro if
  gcc is version 2.97 or later.
+ Bug fixed from 3.0.3 that caused ^Z (suspend) to quit ncftp when it
  was brought back to the foreground.
+ Bug fixed where large file support (LFS) was disabled on most systems.
+ New "ncftpspooler" utility program (actually a hard link to
  "ncftpbatch") serves as a "Global batch FTP job processor daemon."
+ The utility program ncftpget now has a "-c" flag like ncftpput has.
+ Utility programs can now accept more than one -W/-X/-Y option, if
  multiple commands are needed.
+ When changing directories, programs will try to change to the full path
  first, then fall back to using "change one subdir at a time" mode.
+ Bug fixed where using the "delete local file after upload" option
  and the "upload into temp file, then rename" option, the local file
  would get deleted anyway if the rename failed.
+ Compatibility fixes for HP-UX.
+ Internal limits increased to handle longer command lines and more parameters.
+ Improvement to the reliability of the Win32 version by using the
  _snprintf and _vsnprintf functions rather than sprintf and vsprintf.
+ A few more tweaks for MS-DOS pathname compatibility.
+ A tweak for better compatibility with Microsoft IIS.
+ A few tweaks for Cygwin support.
+ Fixes for --sysconfdir configure option courtesy of Christian Wiesgerber.
+ SOCKS5 is back in, but we don't support it.
+ Improved Y2K bug detection in remote servers.
+ Changed naming format for bgget/put spool files.  The contents are now
  documented; see the ncftpspooler man page.
+ Bug fixed in Win32 port which used $HOME rather than $HOME/ncftp as the
  UNIX equivalent of the $HOME/.ncftp directory.  Since most folks won't
  have a $HOME environment variable on Win32, you'll probably not notice
  the change.

5 files changed, 24 insertions, 37 deletions

diff --git a/net/ncftp3/Makefile b/net/ncftp3/Makefile
index 7660ff26843..c27e2f278ad 100644
--- a/net/ncftp3/Makefile
+++ b/net/ncftp3/Makefile
@@ -1,8 +1,7 @@
-# $NetBSD: Makefile,v 1.11 2003/09/27 17:07:37 grant Exp $
+# $NetBSD: Makefile,v 1.12 2003/09/27 22:57:32 wiz Exp $
 
-DISTNAME=	ncftp-3.0.3-src
-PKGNAME=	ncftp3-3.0.3
-PKGREVISION=			1
+DISTNAME=	ncftp-3.1.6-src
+PKGNAME=	ncftp3-3.1.6
 WRKSRC=		${WRKDIR}/${DISTNAME:S/-src//}
 CATEGORIES=	net
 MASTER_SITES=	ftp://ftp.ncftp.com/ncftp/
diff --git a/net/ncftp3/PLIST b/net/ncftp3/PLIST
index eea54a97ccb..3ad9a383661 100644
--- a/net/ncftp3/PLIST
+++ b/net/ncftp3/PLIST
@@ -1,12 +1,14 @@
-@comment $NetBSD: PLIST,v 1.1 2001/10/31 22:56:27 zuntum Exp $
-man/man1/ncftp.1
-man/man1/ncftpget.1
-man/man1/ncftpput.1
-man/man1/ncftpbatch.1
-man/man1/ncftpls.1
+@comment $NetBSD: PLIST,v 1.2 2003/09/27 22:57:32 wiz Exp $
 bin/ncftp3
-bin/ncftpget
-bin/ncftpput
 bin/ncftpbatch
-bin/ncftpls
 bin/ncftpbookmarks
+bin/ncftpget
+bin/ncftpls
+bin/ncftpput
+bin/ncftpspooler
+man/man1/ncftp.1
+man/man1/ncftpbatch.1
+man/man1/ncftpget.1
+man/man1/ncftpls.1
+man/man1/ncftpput.1
+man/man1/ncftpspooler.1
diff --git a/net/ncftp3/distinfo b/net/ncftp3/distinfo
index a62034b76a3..f1287cda65c 100644
--- a/net/ncftp3/distinfo
+++ b/net/ncftp3/distinfo
@@ -1,6 +1,5 @@
-$NetBSD: distinfo,v 1.4 2001/12/25 20:38:00 wiz Exp $
+$NetBSD: distinfo,v 1.5 2003/09/27 22:57:32 wiz Exp $
 
-SHA1 (ncftp-3.0.3-src.tar.gz) = d118481dde2572b5f1ff94f08b12a79937742298
-Size (ncftp-3.0.3-src.tar.gz) = 413124 bytes
-SHA1 (patch-aa) = 141f5e50818712da0400496b7ce226ff7b6fe317
-SHA1 (patch-ab) = 3843b0d89d26b11cd24422c23341d0792d965ffa
+SHA1 (ncftp-3.1.6-src.tar.gz) = 1282c889e11f883e1ea5314ed5f8898eb31ea62d
+Size (ncftp-3.1.6-src.tar.gz) = 503887 bytes
+SHA1 (patch-aa) = 38d3b7d1796424bf40b07a1e7e8627ad8d01ea8c
diff --git a/net/ncftp3/patches/patch-aa b/net/ncftp3/patches/patch-aa
index 489a71f61fa..9c20024dbe3 100644
--- a/net/ncftp3/patches/patch-aa
+++ b/net/ncftp3/patches/patch-aa
@@ -1,10 +1,10 @@
-$NetBSD: patch-aa,v 1.2 2001/04/24 20:39:38 zuntum Exp $
+$NetBSD: patch-aa,v 1.3 2003/09/27 22:57:32 wiz Exp $
 
---- Makefile.in.orig	Sun Apr  8 18:27:34 2001
-+++ Makefile.in
-@@ -38,7 +38,7 @@
- 	( cd vis ; $(MAKE) "CC=$(CC)" "CFLAGS=$(CFLAGS)" )
- 	-mkdir "$(prefix)" "$(BINDIR)" "$(mandir)" "$(mandir)/man1" 2>/dev/null
+--- Makefile.in.orig	2003-09-28 01:18:31.000000000 +0900
++++ Makefile.in	2003-09-28 01:18:33.000000000 +0900
+@@ -45,7 +45,7 @@
+ 	@( cd vis ; $(MAKE) "CC=$(CC)" "CFLAGS=$(CFLAGS)" )
+ 	-mkdir "$(prefix)" "$(BINDIR)" "$(SYSCONFDIR)" "$(mandir)" "$(mandir)/man1" 2>/dev/null
  	-@echo '..... Installing the programs .....'
 -	$(INSTALL_PROGRAM) bin/ncftp@EXEEXT@ "$(BINDIR)/ncftp@EXEEXT@"
 +	$(INSTALL_PROGRAM) bin/ncftp@EXEEXT@ "$(BINDIR)/ncftp3@EXEEXT@"
diff --git a/net/ncftp3/patches/patch-ab b/net/ncftp3/patches/patch-ab
deleted file mode 100644
index 089c433d138..00000000000
--- a/net/ncftp3/patches/patch-ab
+++ /dev/null
@@ -1,13 +0,0 @@
-$NetBSD: patch-ab,v 1.1 2001/12/25 20:38:01 wiz Exp $
-
---- configure.orig	Tue Dec 25 21:10:50 2001
-+++ configure
-@@ -1598,7 +1598,7 @@
- echo "$ac_t""" 1>&6
- b1=`cd .. ; pwd`
- b2=`cd ../.. ; pwd`
--exdirs="$HOME $j $b1 $b2 $prefix /usr/local /usr/ccs"
-+exdirs="$HOME $j $b1 $b2 /usr/ccs"
- if test -x "$HOME/bin/OS" ; then
- 	b3=`$HOME/bin/OS`
- 	b3="$HOME/$b3"