Update wu-ftpd to 2.6.0.

Changes in 2.6.0:
 o  On sigpipe, always log a lost connection.
 o  Added a log message on attempts to download files marked unretrievable.
 o  The SITE NEWER feature has been disabled.  A compile-time option has been
    added to re-enable it.  See config.h.noac for more information on this.
 o  With restricted-uid/gid, CWD to a non-existant directory would display the
    full pathname rather than just relative to the user's home.  Actually, the
    fix catches most cases where this could occur, not just the CWD verb.
 o  Fixed a bug in the restricted-uid/gid feature which could allow access
    outside the user's home directory in some cases.
 o  Bumped MAXHST (max. hosts allowed on a line) for ftphosts from 10 to 12.
    Fixed a bug related to this which can cause the server to crash checking
    host access.
 o  The internal ls (see below) was judged to be unready.  It has been disabled
    by default but can be enabled with a compile-time option for those who wish
    to attempt to debug it (be warned, it has a lot of problems).
 o  Split the "bad shell or user not in ftpusers" syslog message into two
    messages to prevent confusion.
 o  Filename globs for LIST, NLST and SITE EXEC, as well as a few internal
    uses, are cleaned up before processing.  For example: */./../* becomes
    just *.  This prevents certain memory starvation DoS attacks.
 o  Corrections for RFC compliance can break some clients.  If possible, the
    broken client should be updated, but a compile-time option has been
    added.  See the config.h.noac for more information on this.
 o  Created doc/HOWTO directory and moved VIRTUAL.FTP.SUPPORT and
    upload.configuration.HOWTO there.
 o  Add a README.AUTOCONF file describing the autoconf build in detail.
 o  UC, Berkeley, has removed the requirement that all advertising material
    must include credit to them.  Removed the clause from the LICENSE and
    the historical licenses in the COPYRIGHT file.
 o  Added the email-on-upload feature from BeroFTPD.  See the ftpaccess man
    page for defaults on these added ftpaccess clauses:
        mailserver <hostname>
        incmail <emailaddress>
        mailfrom <emailaddress>
        virtual <address> incmail <emailaddress>
        virtual <address> mailfrom <emailaddress>
        defaultserver incmail <emailaddress>
        defaultserver mailfrom <emailaddress>
 o  Redhat added the -I option to disable RFC931 (AUTH/ident).  Added to
    the baseline so Redhat users don't see a loss of a feature.  Setting
    the timeout for rfc931 to zero will do the same thing in the ftpaccess
    file.
 o  The test for whether restricted-uid/restricted-gid applied should have
    been done before the chroot so it used the system /etc/passwd and
    /etc/group files.
 o  CDUP when you were already at the home directory, would complain about
    you being restricted (if you were).  Instead it should give a positive
    reply, and do nothing.  This makes it behave more like CDUP when you're
    not restricted to your home directory.
 o  deny-uid and deny-gid were being tested for anonymous users.  Bad move,
    it's too easy to forget to allow them.  Use 'defaultserver private' to
    keep anonymous users away.
 o  Correct the operation of the NLST command.  Finally.  mget should now
    work as users expect it to.
 o  Prevent buffer overruns when processing message files.
 o  Correct a reference through a NULL pointer when doing S/Key
    authentication and the user is not in the passwd file.
 o  Check the return code from select() when setting up a data connection.
    Under some rare conditions it is possible that the select was called
    for an fd_set which has no members, hanging the daemon.
 o  Ensure a pattern of "*" matches everything.  The new path_compare (used
    on upload and throughput clauses in the ftpaccess file) sets the option
    FNM_PATHNAME, so:
        *    matches everything
        /*   matches everything
        /*/* matches /dogs/toto and /dogs/toto/photos but not /dogs
 o  setproctitle() support added for UnixWare.
 o  Removed all FIXES files.  Merged their contents into this CHANGES file
    (the one you're reading now).  The old doc/FIXES directory has been
    tar'd and will be placed in the attic when 2.6.0 releases.
 o  Corrected an error in the MAPPING_CHDIR feature which could be used to
    gain root privileges on the server.
 o  Added -V command-line option to View the copyright and exit.
 o  Added the privatepw command and documentation.
 o  Port for FreeBSD corrected.
 o  Adding the LICENSE file to the baseline.
 o  Added print_copyright function so our copyright is embedded in the
    executables.
 o  WU-FTPD Development Group copyright headers added.  Original Copyright
    headers moved into the COPYRIGHT file.
 o  RCS Ids from 2.4.x removed and new templates added for wu-ftpd.org
    usage.
 o  Make sure the signal context is restored when jumping out of signal
    handlers.  This was causing signal 11 on some systems.
 o  Cleaned up the how-to of setting up virtual hosting support.
 o  Corrected header file dependencies.
 o  Changed NLST to nlst, necessary as ftpcmd.c #defines NLST.
 o  Tidied up virtual variables.
 o  Changed so compiles cleanly on SCO OpenServer 5, UnixWare 2 and
    UnixWare 7.
 o  Anonymous users could get in even though no class was defined for them.
 o  Support for non-ANSI/ISO compilers has been removed.  You MUST have and
    ANSI/ISO C compiler.  This has been true for some time, all that has
    changed is the (incomplete) support for older (K&R) compilers has been
    removed.
 o  Added Kent Landfield's NEWVIRT scheme for extensive virutal hosting.
    See the updated documentation on virtual hosting for details.
 o  ftprestart has been added to the base daemon kit.
 o  A buffer overrun in the ftpshut command has been corrected.  Since, on
    most sites, the ftpshut command is only usable by the superuser, this
    is not considered a security issue.  If you have installed ftpshut with
    suid-root permissions (not the default), then there is the possibility
    this overrun could be used to leverage root permissions.
 o  Several new ftpaccess clauses have been added.  These allow control of
    the various timeouts used within the daemon.  The new clauses are:
        timeout accept <seconds>
        timeout connect <seconds>
        timeout data <seconds>
        timeout idle <seconds>
        timeout maxidle <seconds>
        timeout RFC931 <seconds>
 o  Myriad places where inactivity timeouts were not being properly
    detected or handled have been corrected.
        The built-in directory listings, both the original NLST and the
        build-in LIST (ls), now detect inactivity.  The original NLST did
        not which could lead to hanging daemons.
        C FILE handles for data connections are now always flushed, then
        the socket is shutdown cleanly before being closed.
        As a side effect, the daemon now more often properly detects
        incomplete transfers.  This can lead, though, to the xferlog
        showing the correct byte count (meaning the daemon read or wrote
        that many bytes over the data connection), but still log the
        transfer as incomplete (meaning the socket did not properly
        shutdown so the client probably missed some data).
 o  The daemon no longer attempts to replace the system's <arpa/ftp.h>
    header when compiling.  Instead, it uses its own local copy at all
    times.
 o  The daemon will now wait for the transfer to complete before sending
    'Transfer complete' or similar messages.  This improves the daemon's
    reliability for poorly written clients which take recipt of the message
    as indication the transfer has completed rather than reading until the
    connection closes.
 o  Guest and anonymous logout was not recorded on Linux.  Removed call to
    updwtmp and returned to old method of updating the lastlog.
 o  Script "vr.sh" is no longer needed.  The Development Group will not be
    releasing patches to upgrade; they can be obtained from CVS if needed.
 o  "realpath_on_steroids" is no longer needed.  Removed.
 o  Use a custom version of fnmatch() which changes the rules for matching
    file and directory names.  The most visible result of this is
    noretrieve and allow-retrieve are now much more flexible.  See the
    ftpaccess manpage for examples.
 o  Use the correct SPT_TYPE for FreeBSD 2.0 or later.
 o  Correct the class= logic on the allow-retrieve clause.
 o  Enhanced DNS extensions.  This adds three ftpaccess clauses:
        dns refuse_mismatch <filename> [override]
        dns refuse_no_reverse <filename> [override]
        dns resolveroptions [options]
 o  Corrected a reference in the manpage for ftpconversions to ftpd.
 o  The string 'path-filter' is now used in the system logs to describe
    problems resulting from failing a path-filter check.  The daemon used
    to just say 'bad filename' which was misleading to some people.
 o  Added instruction on how to support PAM on Solaris.  Right now this
    means hand editing src/config/config.sol and
    src/makefiles/Makefile.sol.
 o  Checking that all platforms use config.h, src/config/config.isc was
    found to have forgotten to include the file.
 o  A security deficency on SunOS 4.1, not having a working getcwd()
    function, has been corrected by using the provided function.
    Compilation bugs in the portable getcwd() function have been corrected.
 o  The daemon will no longer hang attempting to close the RFC931 socket
    when the remote end is firewalled and does not respond to traffic for
    this protocol.  This was determined to be inappropriate handling of
    SIGALRM; handling for this signal has been cleaned up throughout the
    daemon.
 o  The daemon may now be built using GNU autoconf.  This is in the early
    stages and not all platforms may be supported.  The old build system
    will be maintained for at least the 2.6.0 release; until the major
    platforms are all known to be supported.
 o  Two new ftpaccess clauses have been added.  These allows the site admin
    to selectively allow PORT and PASV data connections where the remote IP
    address does not match the remote IP address on the control connection.
    The new clauses are:
        port-allow <class> [<addrglob> ...]
        pasv-allow <class> [<addrglob> ...]
 o  The daemon now includes an internal 'ls' command.
 o  Ported to Mac OS/X.
 0  Added (limited) support for AFS and DCE user authentication.  This is
    only know to work on AIX, and needs porting to other platforms.  For
    now, this requires hand work to enable.
 o  Added an ftpaccess clause to enable TCP keepalives.  This clause is:
        keepalive <yes|no>
 o  You can now specify the xferlog filename for the default server just as
    you can for the virtual hosts; in the ftpaccess file.  The new clause
    is:
        xferlog <absolute path>
 o  ftpaccess manpage cleaned up.  Many typos corrected, some techincal
    changes.  Indentation should now be correct.
 o  Apache's .indent.pro to the src and support directories.  Ran all *.c
    and *.h files through it.  ftpcmd.y has been indented by hand.  The
    code is now a lot more readable!
 o  A bug in the parsing for the deny !nameserved ftpaccess clause has been
    corrected.
 o  Technical corrections in the ftpd manpage.
 o  Add util/recompress.c as a more generic version of gzip2cmp.c

###########################################################################

Changes in 2.5.0:
 o  Change the handling of wtmp for GNU libc to use the Os-provided
    function updwtmp().
 o  Prevent some buffer overruns.
 o  Fix permissions on some files installed by RPM, add the log rotation
    control file.
 o  Change the seteuid() calls for fchown() and chown() for POSIXLY_CORRECT
    systems.
 o  pid file locking in ftpcount (ftpwho) is now consistent with the way
    the daemon locks these files.
 o  Cancel any pending alarm request to stop acl_remove() from being
    interrupted then called again via the SIGALRM handler, this should fix
    the flock on a bad file descriptor looping problem.
 o  Use %m in syslog format strings in place of %s and strerror(), this
    simplifies #ifdefs.
 o  For SCO, link ftpcount with libsocket, necessary as it now calls
    syslog().
 o  Added Redhat's RPM SPEC file for building RPMs.
 o  English corrections in ftpaccess manpage.  Technical correction: the
    noretrieve/allow-retrieve clauses do NOT support regular expressions.
 o  Move where ftpglob stuff is defined to avoid compilation errors on some
    systems.
 o  Port to SGI Irix version 4 corrected.
 o  Overwrite behavior on uploads has been made consistent with shell
    usage.  The daemon does not change ownership or permissions on
    overwrite.
 o  Corrected the PASV command to bind to the correct interface (local IP
    address).
 o  Removed the OVERWRITE and UPLOAD defines from platform config files;
    they are defined in the main config.h header.
 o  Issuing CWD without any parameters caused a signal 11, crashing the
    daemon.
 o  Port to HP/UX corrected.
 o  Added ERRATA file to discuss problems with getcwd().
 o  Added a portable version of the getcwd() function for systems which do
    not have it or imcorrectly implement it.  NextStep 3 uses this new
    function.
 o  OPIE support was being disabled even though the proper command-line
    switches were being set.  Corrected the use of opieverify().
 o  The fatal() function was not declared void; this was causing problems
    with some compilers.
 o  Port to Hitachi HI-UX corrected.
 o  Some calls to fnmatch() were missing parameters.
 o  Corrected the 'restricted' user feature.  It now works well with most
    FTP clients.
 o  Correct usage of -d vs -e in the install Makefile for a number of
    platforms.
 o  You can now use negated hostnames/addresses on the class ftpaccess
    clause.
 o  Added an ftpaccess clause to specify random text for the initial
    greeting:
        greeting text <message>
 o  Corrected password encryption/checking for Digital Unix with C2
    security (SECUREOSF).
 o  Merged the TODO file from the VR series with Stan's TODO file for the
    Academ betas.
 o  Changed the various permission denial messages sent by the daemon to
    the client to make it clear the message originated from the server.
 o  Ports to SCO, Solaris, uxw, ptx and isc corrected.
 o  Use the newer SEEK_ defines in place of the old BSD L_ defines and
    removed the global definition of entry, each function should define it
    locally.
 o  Removed an unnecessary lseek(L_SET) in ftpcount (ftpwho).
 o  Link ftpcount and ftpshut with ${XXLIBS}.
 o  Made strsep() definition consistent with BSD and Linux.  Add strsep()
    definition to conversions.c.
 o  Added #include <string.h> to ckconfig.c.
 o  Replaced the _PATH_DEVNULL define with a #include of "pathnames.h" in
    popen.c.
 o  Support long group access passwords if SecureWare or HPUX_10_TRUSTED
    are defined (using bigcrypt()).
 o  Fixed a memory leak in restrict.c.
 o  Digital Unix version 4 has a working getcwd(); use it instead of
    getwd().
 o  Stop restrict_list_check() from walking off the end of name.
 o  Added -x command-line option to mean 'log syslog+xferlog'.
 o  Changed the log ftpaccess clause to allow logging transfers to both the
    syslog and xferlog.  The log ftpaccess clauses now include:
        log syslog
        log xferlog
        log syslog+xferlog
 o  Formation of the WU-FTPD Development Group on 1 April, 1999.
    2.4.2-VR17 chosen as initial baseline for the daemon.

###########################################################################

Changes in 2.4.2-VR17:
 o  Gregory A Lundberg resigns as the de-facto maintainer of WU-FTPD.  "And
    you thought I was joking."
 o  VIRTUAL is now the default for Solaris; all Solaris systems support
    multiple interfaces (IP addresses).
 o  Fixed complaints involving virtual_len reported by several beta
    testers.
 o  Some of the 'C' source code in ftpcmd.y depended upon a particular
    behavior when ANSI/ISO does not define it.  Corrected so all compilers
    will properly interpret the code.
 o  Corrected the support for QUOTA on Solaris.
 o  The GNU EGCS 'C' compiler is broken.  A quick check and we can avoid
    the brokenness.
 o  Port to Ultrix corrected.
 o  The default shell on NextStep wants -d instead of -e.  Changed to test
    instead of [] since that's more portable; will probably do the same to
    other systems in a future release.
 o  MNTMAXSTR was possibly undefined on Digital Unix 4.0 even when not
    using QUOTA_DEVICE, causing compilation errors.
 o  Added daemonaddress to the ftpaccess manpage.
 o  Added a note from Chad Price <cprice@molbio.unmc.edu> in src/logwtmp.c
    about the brokenness of Solaris' last command.
 o  It turns out that not all SunOS 4.1 boxes actually have a getcwd()
    function.
 o  The labels unix and __unix__ are depricated on BSD, effecting the logic
    for the reponse to the SYST command.
 o  Added an appnote about OPIE.  See src/makefiles/Makefile.lnx for a way
    to automatically have the daemon use OPIE.  Send your Makefile if you
    do something similar for your system.
 o  Added an appnote about a problem experienced with Trusted Solaris.
 o  Added doc/misc directory to start collecting interesting tidbits which
    may help people get their servers going.
 o  The FIXES files were really cluttering up the base directory.  Moved
    them to a directory under doc.
 o  The 'log security' ftpaccess clause covered all but a few messages
    about filesystem operations.  It now covers the few it missed.
 o  Under some conditions _PATH_WTMP was not being set in pathnames.h
 o  QUOTA is now supported for Solaris.
 o  Trusted Solaris needed additional functionality in ftpcount (ftpwho).
 o  File locking in ftpcount (ftpwho) was never completed.
 o  Port to HP/UX corrected.
 o  'make install' now accepts DESTDIR to install into a directory
    structure other than the root file system.  A number of other optional
    parameters are available to override the default ownership of the
    installed files.  Missing directories are automatically created.  File
    permisssions were reduced to the minimum necessary.
 o  Dead code removed.
 o  The Makefile for Linux now automatically detects if PAM is installed
    and compiles the daemon to use it.
 o  Fix an uninitialized variable in ftpshut which could effect the way the
    command works with default values.
 o  Suppress trailing blanks from the output of a wide 'ps' in the ftpcount
    (ftpwho) command.  Just making things pretty.
 o  Updated upload.configuration.HOWTO to describe more of the
    configuration having to do with class= rules and overwrite, delete and
    rename clauses.
 o  Added vers.c and edit to 'make cleandir' in the src directory.  These
    files are automatically created during the build process.
 o  Added a restrict_check(".") in the LIST command for consistency with
    the remainder of the code in ftpcmd.y.
 o  Corrected the 'restricted' users feature so it would play nicely with
    web clients and the way some of them mis-interpret FTP URLs.

16 files changed, 89 insertions, 283 deletions

diff --git a/net/wu-ftpd/Makefile b/net/wu-ftpd/Makefile
index eb33f061a14..c7343c1d281 100644
--- a/net/wu-ftpd/Makefile
+++ b/net/wu-ftpd/Makefile
@@ -1,27 +1,40 @@
-# $NetBSD: Makefile,v 1.10 1999/03/07 16:31:59 rh Exp $
+# $NetBSD: Makefile,v 1.11 1999/12/27 12:13:04 rh Exp $
 # FreeBSD Id: Makefile,v 1.16 1997/12/24 17:45:28 ache Exp
 #
-# REMINDER: to use ftpaccess(5) you need to specify -a in command line,
-# it is changed from previous versions
 
-DISTNAME=       wu-ftpd-2.4.2
+DISTNAME=       wu-ftpd-2.6.0
 CATEGORIES=	net
-# AUSCERT recommendation
-MASTER_SITES=   ftp://ftp.academ.com/pub/wu-ftpd/ \
-		ftp://ftp.cp.in-berlin.de/pub/ftpsrc/
-EXTRACT_SUFX=   .tar.Z
+MASTER_SITES=   ftp://ftp.wu-ftpd.org/pub/wu-ftpd/ \
+		ftp://ftp.landfield.com/wu-ftpd/wu-ftpd.org/wu-ftpd/ \
+		ftp://ftp.academy.rpi.edu/pub/wu-ftpd/wu-ftpd/ \
+		ftp://ftp.auscert.org.au/pub/mirrors/ftp.wu-ftpd.org/wu-ftpd/ \
+		ftp://mirror.aarnet.edu.au/pub/wu-ftpd/wu-ftpd/ \
+		http://mirror.aarnet.edu.au/pub/wu-ftpd/wu-ftpd/ \
+		ftp://ftp.tuwien.ac.at/infosys/servers/ftp/wu-ftpd/wu-ftpd/ \
+		http://gd.tuwien.ac.at/infosys/servers/ftp/wu-ftpd/wu-ftpd/ \
+		ftp://ftp.crc.ca/pub/packages/ftp/servers/wuarchive-ftpd-dg/wu-ftpd/ \
+		ftp://ftp.dpn.de/pub/mirrors/wu-ftpd/wu-ftpd/ \
+		ftp://ftp.tu-clausthal.de/pub/mirror/wu-ftpd/wu-ftpd/ \
+		ftp://ftp.freenet.de/pub/ftp.wu-ftpd.org/pub/wu-ftpd/ \
+		ftp://ftp.hol.gr/pub/packages/wu-ftpd/wu-ftpd/ \
+		ftp://ftp.kfki.hu/pub/infosystems/wu-ftpd/wu-ftpd/ \
+		ftp://ftp.ring.gr.jp/pub/net/wu-ftpd/wu-ftpd/ \
+		ftp://ftp.win.ne.jp/pub/network/wu-ftpd/wu-ftpd/ \
+		ftp://ftp.bitcon.no/pub/unix/networking/wu-ftpd/wu-ftpd/ \
+		ftp://ftp.sunet.se/pub/nir/ftp/servers/wuarchive-ftpd/wu-ftpd/ \
+		ftp://sunsite.cnlab-switch.ch/mirror/wu-ftpd/wu-ftpd/ \
+		ftp://ftp.ox.ac.uk/pub/comp/security/COAST/mirrors/ftp.vr.net/wu-ftpd/
 
 MAINTAINER=     rh@netbsd.org
-HOMEPAGE=	http://www.academ.com/academ/wu-ftpd/
+HOMEPAGE=	http://www.wu-ftpd.org/
 
 CONFLICTS+=	wu-ftpd-vr-* beroftpd-*
 
+GNU_CONFIGURE=	YES
+CONFIGURE_ARGS+=--enable-quota --enable-noop --enable-skey
 MAKE_ENV+=	INSTALL="${INSTALL}"
 MAKE_ENV+=	INSTALL_PROGRAM="${INSTALL_PROGRAM}"
 MAKE_ENV+=	INSTALL_DATA="${INSTALL_DATA}"
 MAKE_ENV+=	INSTALL_MAN="${INSTALL_MAN}"
 
-do-build:
-	cd ${WRKSRC} && ./build nbs PREFIX=${PREFIX}
-
 .include "../../mk/bsd.pkg.mk"
diff --git a/net/wu-ftpd/files/md5 b/net/wu-ftpd/files/md5
index 34e452cfcaa..e6c835052a1 100644
--- a/net/wu-ftpd/files/md5
+++ b/net/wu-ftpd/files/md5
@@ -1,3 +1,3 @@
-$NetBSD: md5,v 1.4 1999/03/07 16:32:00 rh Exp $
+$NetBSD: md5,v 1.5 1999/12/27 12:13:05 rh Exp $
 
-MD5 (wu-ftpd-2.4.2.tar.Z) = d0a26079cfdc42e3e981c2bef428f9f4
+MD5 (wu-ftpd-2.6.0.tar.gz) = 652cfe4b59e0468eded736e7c281d16f
diff --git a/net/wu-ftpd/files/patch-sum b/net/wu-ftpd/files/patch-sum
index c628245ab95..fe65a17e915 100644
--- a/net/wu-ftpd/files/patch-sum
+++ b/net/wu-ftpd/files/patch-sum
@@ -1,16 +1,9 @@
-$NetBSD: patch-sum,v 1.2 1999/11/12 15:08:48 rh Exp $
+$NetBSD: patch-sum,v 1.3 1999/12/27 12:13:06 rh Exp $
 
-MD5 (patch-aa) = 9173360a1a2e94bab228bb29bb17a657
-MD5 (patch-ab) = f9bc45da4066692b292e33be3cef19ba
+MD5 (patch-aa) = 4365668d156c10867e9ca700b4fdb8b7
+MD5 (patch-ab) = 972bad15ee6b2487196d6c86c2fa0081
 MD5 (patch-ac) = 25f0b246d679a3139896e7d29e2073be
 MD5 (patch-ad) = 1c030b87e02b0636892f2f63dba516b6
-MD5 (patch-ae) = e9e7e33bda7eaa2d205b1d7a0a8c28b3
-MD5 (patch-af) = d7005e6e95a5e657347f3065499a83ce
-MD5 (patch-ag) = 903ae257d2f6c336c98531cbb2ba5ac8
-MD5 (patch-ah) = c3700e5f83b230a0f565277737efc736
-MD5 (patch-ai) = 4a41e611a04216080abb09cd42ef1bec
-MD5 (patch-aj) = c03eb221fa4f1f04f167f5aa7a69b67f
-MD5 (patch-ak) = 146c5aa516ee7b089e42f27166760f3f
-MD5 (patch-al) = 05f3a41257d2efee1ea556f00caf9684
-MD5 (patch-am) = d324c3949c8cddde229eb07f7167037f
-MD5 (patch-an) = 36c68cfbfdd4d7a061f30133c17938b0
+MD5 (patch-af) = 2d21677acf70f895a9fcb6327f6fae78
+MD5 (patch-ag) = 0cc37eeffd18e73ee0cfb888fba5f2b6
+MD5 (patch-ai) = e17e8aab45aa2af1b0c3b6211356b509
diff --git a/net/wu-ftpd/patches/patch-aa b/net/wu-ftpd/patches/patch-aa
index c55e60feb91..0346c83d3b1 100644
--- a/net/wu-ftpd/patches/patch-aa
+++ b/net/wu-ftpd/patches/patch-aa
@@ -1,64 +1,13 @@
-$NetBSD: patch-aa,v 1.5 1999/11/12 15:08:49 rh Exp $
+$NetBSD: patch-aa,v 1.6 1999/12/27 12:13:06 rh Exp $
 
---- makefiles/Makefile.nbs.orig	Fri Nov 12 16:02:51 1999
-+++ makefiles/Makefile.nbs	Fri Nov 12 16:02:52 1999
-@@ -2,32 +2,42 @@
- # Makefile for NetBSD 1.2
- # $Id: patch-aa,v 1.5 1999/11/12 15:08:49 rh Exp $
+--- makefiles/Makefile.nbs.orig	Mon Dec 27 10:43:57 1999
++++ makefiles/Makefile.nbs	Mon Dec 27 10:47:06 1999
+@@ -24,7 +24,7 @@
  #
--BINDIR=		/usr/local/bin
--ETCDIR=		/usr/local/libexec
--MANDIR=		/usr/local/man
-+PREFIX?=	/usr/pkg
-+BINDIR=		${PREFIX}/bin
-+ETCDIR=		${PREFIX}/etc
-+MANDIR=		${PREFIX}/man
-+LIBEXECDIR=	${PREFIX}/libexec
- MANEXT=		8
--INSTALL=	install
-+INSTALL?=	install
-+INSTALL_PROGRAM?= ${INSTALL} -c -o bin -g bin -m 555
-+INSTALL_DATA?=	${INSTALL} -c -o root -g wheel -m 444
-+INSTALL_MAN?=	${INSTALL} -c -o root -g wheel -m 444
- 
- all:
- 	@ echo 'Use the "build" command (shell script) to make ftpd.'
- 	@ echo 'You can say "build help" for details on how it works.'
- 
- install: bin/ftpd bin/ftpcount bin/ftpshut
--	-mv -f ${ETCDIR}/ftpd ${ETCDIR}/ftpd-old
-+	-mv -f ${LIBEXECDIR}/ftpd ${LIBEXECDIR}/ftpd-old
- 	@echo installing binaries.
--	${INSTALL} -c -o bin -g bin -m 755 bin/ftpd ${ETCDIR}/ftpd
--	${INSTALL} -c -o bin -g bin -m 755 bin/ftpshut ${BINDIR}/ftpshut
--	${INSTALL} -c -o bin -g bin -m 755 bin/ftpcount ${BINDIR}/ftpcount
--	${INSTALL} -c -o bin -g bin -m 755 bin/ftpwho ${BINDIR}/ftpwho
-+	${INSTALL_PROGRAM} bin/ftpd ${LIBEXECDIR}/ftpd
-+	${INSTALL_PROGRAM} bin/ftpshut ${BINDIR}/ftpshut
-+	${INSTALL_PROGRAM} bin/ftpcount ${BINDIR}/ftpcount
-+	${INSTALL_PROGRAM} bin/ftpwho ${BINDIR}/ftpwho
-+	${INSTALL_PROGRAM} bin/ckconfig ${BINDIR}/ftpckconfig
-+	@echo Installing basic configuration
-+	${INSTALL_DATA} doc/examples/ftpaccess ${ETCDIR}/ftpaccess.example
-+	${INSTALL_DATA} doc/examples/ftpusers ${ETCDIR}/ftpusers.example
-+	${INSTALL_DATA} doc/examples/ftpconversions ${ETCDIR}/ftpconversions.example
- 	@echo installing manpages.
--	${INSTALL} -c -o bin -g bin -m 644 doc/ftpd.8 ${MANDIR}/man8/ftpd.8
--	${INSTALL} -c -o bin -g bin -m 644 doc/ftpcount.1 ${MANDIR}/man1/ftpcount.1
--	${INSTALL} -c -o bin -g bin -m 644 doc/ftpwho.1 ${MANDIR}/man1/ftpwho.1
--	${INSTALL} -c -o bin -g bin -m 644 doc/ftpshut.8 ${MANDIR}/man8/ftpshut.8
--	${INSTALL} -c -o bin -g bin -m 644 doc/ftpaccess.5 ${MANDIR}/man5/ftpaccess.5
--	${INSTALL} -c -o bin -g bin -m 644 doc/ftphosts.5 ${MANDIR}/man5/ftphosts.5
--	${INSTALL} -c -o bin -g bin -m 644 doc/ftpconversions.5 ${MANDIR}/man5/ftpconversions.5
--	${INSTALL} -c -o bin -g bin -m 644 doc/xferlog.5 ${MANDIR}/man5/xferlog.5
-+	${INSTALL_MAN} doc/ftpd.8 ${MANDIR}/man8/ftpd.8
-+	${INSTALL_MAN} doc/ftpcount.1 ${MANDIR}/man1/ftpcount.1
-+	${INSTALL_MAN} doc/ftpwho.1 ${MANDIR}/man1/ftpwho.1
-+	${INSTALL_MAN} doc/ftpshut.8 ${MANDIR}/man8/ftpshut.8
-+	${INSTALL_MAN} doc/ftpaccess.5 ${MANDIR}/man5/ftpaccess.5
-+	${INSTALL_MAN} doc/ftphosts.5 ${MANDIR}/man5/ftphosts.5
-+	${INSTALL_MAN} doc/ftpconversions.5 ${MANDIR}/man5/ftpconversions.5
-+	${INSTALL_MAN} doc/xferlog.5 ${MANDIR}/man5/xferlog.5
- 
  
+ DESTDIR=
+-PREFIX=		/usr/local
++PREFIX?=	/usr/pkg
  
+ BINDIR=		${DESTDIR}${PREFIX}/bin
+ BINOWN=		bin
diff --git a/net/wu-ftpd/patches/patch-ab b/net/wu-ftpd/patches/patch-ab
deleted file mode 100644
index d280af7b7ee..00000000000
--- a/net/wu-ftpd/patches/patch-ab
+++ /dev/null
@@ -1,41 +0,0 @@
-$NetBSD: patch-ab,v 1.5 1999/02/13 09:05:02 rh Exp $
-
---- src/pathnames.h.orig	Mon Jul  6 11:14:35 1998
-+++ src/pathnames.h	Sat Feb 13 00:32:11 1999
-@@ -68,10 +68,10 @@
- #define _PATH_CVT       "/opt/ftpd/lib/ftpconversions"
- #define _PATH_PRIVATE   "/opt/ftpd/lib/ftpgroups"
- #else
--#define _PATH_FTPUSERS  "/usr/local/lib/ftpd/ftpusers"
--#define _PATH_FTPACCESS "/usr/local/lib/ftpd/ftpaccess"
--#define _PATH_CVT       "/usr/local/lib/ftpd/ftpconversions"
--#define _PATH_PRIVATE   "/usr/local/lib/ftpd/ftpgroups"
-+#define _PATH_FTPUSERS  PREFIX "/etc/ftpusers"
-+#define _PATH_FTPACCESS PREFIX "/etc/ftpaccess"
-+#define _PATH_CVT       PREFIX "/etc/ftpconversions"
-+#define _PATH_PRIVATE   PREFIX "/etc/ftpgroups"
- #endif
- #endif
- #endif
-@@ -94,10 +94,10 @@
- #endif
- #else
- #ifndef _PATH_PIDNAMES
--#define _PATH_PIDNAMES  "/usr/local/lib/ftpd/pids/%s"
-+#define _PATH_PIDNAMES  "/var/run/%s"
- #endif
- #ifndef _PATH_XFERLOG
--#define _PATH_XFERLOG   "/usr/local/logs/xferlog"
-+#define _PATH_XFERLOG   "/var/log/xferlog"
- #endif
- #endif
- 
-@@ -144,7 +144,7 @@
- #ifdef USE_OPT_FTPD
- #define _PATH_FTPHOSTS  "/opt/ftpd/lib/ftphosts"
- #else
--#define _PATH_FTPHOSTS  "/usr/local/lib/ftpd/ftphosts"
-+#define _PATH_FTPHOSTS  PREFIX "/etc/ftphosts"
- #endif
- #endif
- #endif
diff --git a/net/wu-ftpd/patches/patch-ae b/net/wu-ftpd/patches/patch-ae
deleted file mode 100644
index d662084510b..00000000000
--- a/net/wu-ftpd/patches/patch-ae
+++ /dev/null
@@ -1,13 +0,0 @@
-$NetBSD: patch-ae,v 1.3 1999/02/13 09:05:02 rh Exp $
-
---- config.h.orig	Mon Jul  6 11:16:49 1998
-+++ config.h	Sat Feb 13 00:18:06 1999
-@@ -72,7 +72,7 @@
-  * See FIXES-2.4-HOBBIT for more information on this option.
-  */
- 
--#undef SKEY
-+/* #undef SKEY */
- 
- /*
-  * ALTERNATE_CD
diff --git a/net/wu-ftpd/patches/patch-af b/net/wu-ftpd/patches/patch-af
index a330d37e7c3..b43f0ab3193 100644
--- a/net/wu-ftpd/patches/patch-af
+++ b/net/wu-ftpd/patches/patch-af
@@ -1,13 +1,13 @@
-$NetBSD: patch-af,v 1.3 1999/02/13 09:05:02 rh Exp $
+$NetBSD: patch-af,v 1.4 1999/12/27 12:13:07 rh Exp $
 
---- support/makefiles/Makefile.nbs.orig	Mon Jul  6 10:57:39 1998
-+++ support/makefiles/Makefile.nbs	Sat Feb 13 00:43:35 1999
-@@ -8,7 +8,7 @@
+--- support/makefiles/Makefile.nbs.orig	Mon Oct  4 15:44:08 1999
++++ support/makefiles/Makefile.nbs	Mon Dec 27 11:03:06 1999
+@@ -33,7 +33,7 @@
  LIBC   = /usr/lib/libc.a
  IFLAGS = 
  LFLAGS = 
--CFLAGS = -O ${IFLAGS} ${LFLAGS} -DNO_MALLOC_PROTO
-+CFLAGS+= ${IFLAGS} ${LFLAGS} -DNO_MALLOC_PROTO
+-CFLAGS = -O ${IFLAGS} ${LFLAGS}
++CFLAGS+= ${IFLAGS} ${LFLAGS}
  
  SRCS   = strcasestr.c authuser.c ftw.c
  OBJS   = strcasestr.o authuser.o ftw.o
diff --git a/net/wu-ftpd/patches/patch-ag b/net/wu-ftpd/patches/patch-ag
index 61c3377f294..2dc4aa4900c 100644
--- a/net/wu-ftpd/patches/patch-ag
+++ b/net/wu-ftpd/patches/patch-ag
@@ -1,13 +1,13 @@
-$NetBSD: patch-ag,v 1.5 1999/02/13 09:05:02 rh Exp $
+$NetBSD: patch-ag,v 1.6 1999/12/27 12:13:07 rh Exp $
 
---- src/makefiles/Makefile.nbs.orig	Mon Jul  6 11:13:22 1998
-+++ src/makefiles/Makefile.nbs	Sat Feb 13 00:21:08 1999
-@@ -5,7 +5,7 @@
+--- src/makefiles/Makefile.nbs.orig	Mon Aug 30 20:55:26 1999
++++ src/makefiles/Makefile.nbs	Mon Dec 27 11:04:06 1999
+@@ -30,7 +30,7 @@
  CC       = cc -g
  IFLAGS   = -I.. -I../support
  LFLAGS   = -L../support
 -CFLAGS   = -O ${IFLAGS} ${LFLAGS}
-+CFLAGS   += ${IFLAGS} ${LFLAGS} -DPREFIX=\"${PREFIX}\"
- LIBES    = ${LSKEY} -lsupport -lcrypt
++CFLAGS  += ${IFLAGS} ${LFLAGS}
+ XOBJS    = 
+ LIBES    = ${LSKEY} -lsupport -lcrypt -lresolv
  LIBC     = /usr/lib/libc.a
- LINTFLAGS=	
diff --git a/net/wu-ftpd/patches/patch-ah b/net/wu-ftpd/patches/patch-ah
deleted file mode 100644
index f17113696f1..00000000000
--- a/net/wu-ftpd/patches/patch-ah
+++ /dev/null
@@ -1,12 +0,0 @@
-$NetBSD: patch-ah,v 1.4 1999/02/13 09:05:02 rh Exp $
-
---- support/authuser.c.orig	Mon Jul  6 11:14:52 1998
-+++ support/authuser.c	Sat Feb 13 00:43:35 1999
-@@ -9,6 +9,7 @@
- #else
- #include <sys/types.h>
- #endif
-+#include <string.h>
- #include <stdio.h>
- #include <ctype.h>
- #include <errno.h>
diff --git a/net/wu-ftpd/patches/patch-ai b/net/wu-ftpd/patches/patch-ai
index ade640100bc..aa0c3cd8d20 100644
--- a/net/wu-ftpd/patches/patch-ai
+++ b/net/wu-ftpd/patches/patch-ai
@@ -1,14 +1,24 @@
-$NetBSD: patch-ai,v 1.4 1999/02/13 09:05:02 rh Exp $
+$NetBSD: patch-ai,v 1.5 1999/12/27 12:13:13 rh Exp $
 
---- src/ftpd.c.orig	Mon Jul  6 11:14:25 1998
-+++ src/ftpd.c	Sat Feb 13 00:50:35 1999
-@@ -2930,7 +2930,9 @@
- 	*p = '\0';
+--- src/ftpd.c.orig	Thu Oct 14 16:41:47 1999
++++ src/ftpd.c	Mon Dec 27 11:57:37 1999
+@@ -88,6 +88,9 @@
+ #ifdef HAVE_SYS_FS_UFS_QUOTA_H
+ #include <sys/fs/ufs_quota.h>
+ #endif
++#ifdef HAVE_UFS_UFS_QUOTA_H
++#include <ufs/ufs/quota.h>
++#endif
  
-       /* send a line...(note that this overrides dolreplies!) */
-+      VA_START(fmt);
-       vreply(USE_REPLY_LONG | USE_REPLY_NOTFMT, n, ptr, ap);
-+      VA_END; /* *NEVER* send a 0 as an ap, some machines use a *struct* for a va_list! */
+ #ifdef HAVE_SYS_SYSLOG_H
+ #include <sys/syslog.h>
+@@ -5317,7 +5320,9 @@
+ 		*p = '\0';
  
-       if (p)
- 	ptr = p + 1; /* set to the next line... (\0 is handled in the while) */
+ 	    /* send a line...(note that this overrides dolreplies!) */
++	    VA_START(fmt);
+ 	    vreply(USE_REPLY_LONG | USE_REPLY_NOTFMT, n, ptr, ap);
++	    VA_END; /* *NEVER* send a 0 as an ap, some machines use a *struct* for a va_list! */
+ 
+ 	    if (p)
+ 		ptr = p + 1;	/* set to the next line... (\0 is handled in the while) */
diff --git a/net/wu-ftpd/patches/patch-aj b/net/wu-ftpd/patches/patch-aj
deleted file mode 100644
index 9999216af5b..00000000000
--- a/net/wu-ftpd/patches/patch-aj
+++ /dev/null
@@ -1,12 +0,0 @@
-$NetBSD: patch-aj,v 1.2 1999/02/13 09:05:02 rh Exp $
-
---- support/ftw.c.orig	Mon Jul  6 10:56:21 1998
-+++ support/ftw.c	Sat Feb 13 00:54:09 1999
-@@ -30,6 +30,7 @@
- 
- #include <errno.h>
- 
-+#include <string.h>
- #include <sys/param.h>
- #include <sys/stat.h>
- #include <sys/stat.h>
diff --git a/net/wu-ftpd/patches/patch-ak b/net/wu-ftpd/patches/patch-ak
deleted file mode 100644
index 5c9b51cb376..00000000000
--- a/net/wu-ftpd/patches/patch-ak
+++ /dev/null
@@ -1,13 +0,0 @@
-$NetBSD: patch-ak,v 1.2 1999/02/13 09:05:02 rh Exp $
-
---- src/ckconfig.c.orig	Mon Jul  6 11:14:14 1998
-+++ src/ckconfig.c	Sat Feb 13 00:54:09 1999
-@@ -33,6 +33,8 @@
- #ifndef HOST_ACCESS
- #define  HOST_ACCESS  1
- #endif
-+
-+#include <string.h>
- #include <stdio.h>
- #include <sys/types.h>
- #include <sys/stat.h>
diff --git a/net/wu-ftpd/patches/patch-al b/net/wu-ftpd/patches/patch-al
deleted file mode 100644
index f32e52de439..00000000000
--- a/net/wu-ftpd/patches/patch-al
+++ /dev/null
@@ -1,31 +0,0 @@
-$NetBSD: patch-al,v 1.5 1999/03/07 16:32:00 rh Exp $
-
---- src/realpath.c.orig	Fri Feb 26 09:08:54 1999
-+++ src/realpath.c	Sun Mar  7 15:53:38 1999
-@@ -70,7 +70,8 @@
-     if (result == NULL) /* result must not be null! */
-       return(NULL);
- 
--    if(pathname == NULL){ /* if pathname is null, there is nothing to do */
-+    if(pathname == NULL || /* if pathname is null, there is nothing to do */
-+       strlen (pathname) >= sizeof curpath) { /* pathname too long: bail out */
-       *result = '\0'; 
-       return(NULL);
-     }
-@@ -145,8 +146,15 @@
- 
-         for (last = namebuf; *last; last++)
-             continue;
--        if ((last == namebuf) || (*--last != '/'))
-+        if ((last == namebuf) || (*--last != '/')) {
-+            if (strlen (namebuf) + 1 < sizeof (namebuf)) {
-             strcat(namebuf, "/");
-+            } else {
-+                /* path too long: bail out */
-+                *result = '\0';
-+                return (NULL);
-+            }
-+        }
- 
-         if (strlen(namebuf) + strlen(where) + 1 < MAXPATHLEN)
- 	  strcat(namebuf, where);
diff --git a/net/wu-ftpd/patches/patch-am b/net/wu-ftpd/patches/patch-am
deleted file mode 100644
index 4fd88763c47..00000000000
--- a/net/wu-ftpd/patches/patch-am
+++ /dev/null
@@ -1,16 +0,0 @@
-$NetBSD: patch-am,v 1.4 1999/03/07 16:32:00 rh Exp $
-
---- src/extensions.c.orig	Fri Feb 26 09:08:46 1999
-+++ src/extensions.c	Sun Mar  7 15:54:53 1999
-@@ -1064,6 +1064,11 @@
- 
-       /* what's our current directory? */
- 
-+      if (strlen (name) >= sizeof path) { /* path too long? --> bail out */
-+          perror_reply(550, "Could not determine cwdir");
-+          return(-1);
-+      }
-+
-       strcpy(path, name);
-       if (sp = strrchr(path, '/'))  *sp = '\0';
-       else strcpy(path, ".");
diff --git a/net/wu-ftpd/patches/patch-an b/net/wu-ftpd/patches/patch-an
deleted file mode 100644
index a8f7144e6ce..00000000000
--- a/net/wu-ftpd/patches/patch-an
+++ /dev/null
@@ -1,23 +0,0 @@
-$NetBSD: patch-an,v 1.2 1999/03/07 16:32:00 rh Exp $
-
---- src/ftpcmd.y.orig	Fri Feb 26 09:08:47 1999
-+++ src/ftpcmd.y	Sun Mar  7 15:58:17 1999
-@@ -642,16 +642,16 @@
-     |   SYST CRLF
-         = {
-             if (log_commands) syslog(LOG_INFO, "SYST");
--#ifdef unix
- #ifdef BSD
-             reply(215, "UNIX Type: L%d Version: BSD-%d",
-                 NBBY, BSD);
- #else  /* BSD */
-+#ifdef unix
-             reply(215, "UNIX Type: L%d", NBBY);
--#endif /* BSD */
- #else  /* unix */
-             reply(215, "UNKNOWN Type: L%d", NBBY);
- #endif /* unix */
-+#endif /* BSD */
-         }
- 
-         /*
diff --git a/net/wu-ftpd/pkg/PLIST b/net/wu-ftpd/pkg/PLIST
index c6b66026b7c..7091e9509ae 100644
--- a/net/wu-ftpd/pkg/PLIST
+++ b/net/wu-ftpd/pkg/PLIST
@@ -1,17 +1,19 @@
-@comment $NetBSD: PLIST,v 1.2 1998/03/29 21:45:27 tron Exp $
+@comment $NetBSD: PLIST,v 1.3 1999/12/27 12:13:16 rh Exp $
 etc/ftpaccess.example
 etc/ftpconversions.example
 etc/ftpusers.example
 libexec/ftpd
-man/man1/ftpcount.1.gz
-man/man1/ftpwho.1.gz
-man/man5/ftpaccess.5.gz
-man/man5/ftphosts.5.gz
-man/man5/ftpconversions.5.gz
-man/man5/xferlog.5.gz
-man/man8/ftpd.8.gz
-man/man8/ftpshut.8.gz
-bin/ftpshut
+man/man1/ftpcount.1
+man/man1/ftpwho.1
+man/man5/ftpaccess.5
+man/man5/ftphosts.5
+man/man5/ftpconversions.5
+man/man5/xferlog.5
+man/man8/ftpd.8
+man/man8/ftpshut.8
+man/man8/ftprestart.8
+sbin/ftpshut
+sbin/ftpckconfig
+sbin/ftprestart
 bin/ftpcount
 bin/ftpwho
-bin/ftpckconfig