Update to version 1.2.10. From PR 27012 by pancake at phreaker dot net.

1.2.10 - Released 04-Sep-2004
--------------------------------
- Bug 2440 - Unable to use PAM authentication properly.  Use a "*" after
  the module name in an AuthOrder directive to indicate that an auth
  module is authoritative.
- Bug 2441 - AIX5 portability bug with mod_auth_unix, mod_auth_file.
- Bug 2442 - Segfault in FreeBSD PAM library with long login names.
- Bug 2445 - AuthUserFile in <Global> context overrides <VirtualHost> setting.
- Bug 2444 - Use of sendfile() does not interoperate well with RFC2228
  security mechanisms.  Using sendfile(2) to send data bypasses the handling
  of the data by RFC2228 security mechanisms (such as those provided by
  mod_tls).  So if security mechanisms are detected, do not use sendfile().
- Scrub the ScoreboardFile for stale sessions in inetd mode.
- Bug 2427 - proftpd gets a memory fault when run from ssh batch mode.

1.2.10rc3 - Released 13-Jul-2004
--------------------------------
- Fixed typo that prevented 1.2.10rc2 from compiling.

1.2.10rc2 - Released 13-Jul-2004
---------------------------------
- Bug 2396 - NLST command doesn't understand options.  This was caused by
  the solution for Bug 2322.  However, it is not a popular solution, so
  NLST will once again handle options, but only the relevant options.
- Bug 2034 - Add support for a "graceful shutdown" signal. See
  contrib/mod_ctrls_admin.html#shutdown for details.
- Bug 2400 - <Class> search order is wrong.  The documentation correctly
  stated that <Class> sections are matched in order of definition, but the
  code has the match order in the reverse order of definition.
- Bug 2401 - MaxClientsPerClass only checks first directive in config file.
- Bug 2399 - Rename start/stop control actions to up/down.
- Bug 2082 - Add mod_rewrite "replaceall" builtin function.  See the
  RewriteMap documentation for more details.
- Bug 2403 - Sending SIGHUP to proftpd stops it when using Classes.  The fix
  for Bug #2400 could result in an infinite loop during a SIGHUP.
- Bug 2405 - "LIST *" should not list dotfiles.
- Bug 2366 - Add support for -h list option.
- Bug 2332 - SO_OOBINLINE error after upgrading proftpd from 1.2.6 to 1.2.9.
  This is due mostly to a change in the logging; a check for error values
  and logging of them was added.  The setting of this particular socket option
  has been moved earlier in the session, as it was found that short-lived
  TCP connections, as from monitoring systems, would cause this error.
- Bug 2407 - mod_auth_file does not allow for proper cascading of "end" and
  "set" auth requests.
- Bug 2410 - CreateHome always copies skel directory.
- Bug 2336 - Use of /dev/log on Solaris leads to kernel memory leak.
  ProFTPD's use of the /dev/log device on Solaris was tickling a Solaris
  kernel bug that caused the Solaris kernel to leak memory.
- Added a TimeoutLinger directive to complement the --enable-timeout-linger
  configure option.
- Bug 2125 - -vv command line switch should list versions of modules.
- Bug 2420 - Name field is not escaped before querying database.
  The mod_quotatab module was not properly escaping the name string it
  used when looking up records from SQL databases.
- Bug 2424 - SQLDefaultHomedir overrides column value.
- Bug 2411 - Caching effects cause RNTO to fail if AllowOverwrite is off and
  target path does not exist.
- Bug 2422 - %v not working in SQLNamedQuery.
- Bug 2418 - chmod returns 550 with filename containing multiple spaces.
- Bug 2431 - mod_sql does not use UID/GID properly in cache lookups.
- Bug 2303 - Problem evaluating multiple <Class> rules.
- Bug 2419 - Ability to disable TLSRequired on per-user basis (e.g. for
  anonymous logins).
- Bug 2438 - Display variable %z not expanded properly.
- Bug 2439 - <Limit CWD> doesn't work.

1.2.10rc1 - Released 28-Apr-2004
---------------------------------
- Bug 2135 - Add ability to handle passphrase-protected server keys.  mod_tls
  can now properly prompt for passphrases for protected server certificate
  keys when the daemon is starting up.
- Bug 2086 - Add limits for PORT, PASV.  This means that now one can use
  <Limit> to place access controls on the PORT and PASV commands.  This
  applies to the EPRT and EPSV commands as well.
- Bug 2174 - mod_auth_unix should not act authoritatively.  This was causing
  problems when using mod_auth_unix.c and the AuthOrder configuration
  directive.
- Bug 2098 - Added SetEnv and UnsetEnv configuration directives.
- Bug 2271 - Improper autoconf check for getaddrinfo() on Tru64 UNIX 5.1.
  The getaddrinfo symbol is a macro, not a function, on that platform.
- Bug 2255 - RADIUS Service-Type should reflect attribute expectations.
- Added Event API.
- Bug 2272 - Address/port collision check needs to handle DefaultAddress.
- Bug 2072 - Add Controls API.
  This API includes a new program, ftpdctl, that is used to communicate
  directly with the proftpd daemon via a new core module, mod_ctrls.  For
  this new functionality to be used, proftpd must be configured using the
  added --enable-ctrls option.
- Bug 2015 - Add AND, OR keywords to Allow/DenyUser directives.
  The AllowUser, DenyUser, AllowGroup, and DenyGroup directives now take
  an optional keyword that indicates what type of expression they are:
  AND, OR, or regex.  By default, AllowUser and DenyUser are OR expressions,
  and AllowGroup and DenyGroup are AND expressions.  For example:

    AllowUser regex ^ftp
    DenyUser AND dave,bob
    AllowGroup OR web,doc

  These demonstrate that the optional keyword modifier must be the first
  parameter in the configuration directive.
- Bug 2046 - Change RFNR and RNTO logging class to WRITE.  This means that
  ExtendedLogs that use the WRITE logging class will now include the
  RNFR and RNTO commands.
- Mac OS X 10.3 portability fixes.
- Bug 2274 - Default server only binds to one IP address of host if
  the --enable-ipv6 configure option is used.  ProFTPD will now properly
  bind to all addresses for the default "server config" server.
- Bug 2048 - Add ability to get configuration file values from environment.
  For example, you can now have the following in your proftpd.conf:

    DefaultAddress %{env:PR_DEFAULT_ADDR}

  which indicates to ProFTPD's configuration parser to get the value of
  the PR_DEFAULT_ADDR environment variable, and substitute it in, e.g.:

    PR_DEFAULT_ADDR=1.2.3.4 ./proftpd ...

  If the indicated environment variable is not present, the value is
  substituted with the empty string.
- Bug 1635 - Older systems' chown(1) does not support -h option.  The solution
  is to prevent this error from stopping the 'make install' process, as it
  is a harmless error on such systems.
- Bug 2290 - gmtime() static storage may be overwritten by modules.
- Bug 2288 - ServerFQDN set to 255.255.255.255 and not hostname.
- Added mod_quotatab to the contrib area.
- Bug 2300 - poll() returns 1 and read returns 0, resulting in an inifinite
  loop.  The actual bug was caused by a goto that was being inappropriately
  used; a return value was not being checked to see if it was an error value.
- Bug 2305 - Compile Problems since > 1.2.9
  Fix the build under Solaris - ftpdctl needs to be linked against libsocket
  and libnsl.
- Bug 2267 - Broken IP subnet matching. Added new ACL parsing/matching code.
- Bug 2307 - MySQL 4.1.1 API change causes mod_sql_mysql compilation failure.
- Bug 2319 - Build scripts have owner-only execute permission.  This was
  causing problems whenever a user other than the owner of the files
  attempted to build proftpd.
- Bug 2320 - autoconf check for socklen_t doesn't work on FreeBSD 4.8-RELEASE.
  The fix is to include <sys/types.h>, if present, sooner in the check.
- Bug 1925 - Clean up of Class code.  The Class and Classes directives are
  now deprecated.  See README.classes for more details.
- Bug 2295 - mod_tls returns multiline response to AUTH commands.
- Bug 2322 - NLST -a returns listing formatted for LIST -a.  RFC959 does not
  explicitly allow dash-style options for LIST or NLST, although many clients
  attempt to use them.  De facto FTP server behaviors handle options for LIST;
  options for NLST will be explicitly rejected.
- Bug 2315 - Overlapping virtual server causes error.  If a <VirtualHost>
  was configured to handle the same IP address and port as the "server config"
  server, the wrong server configuration was being removed.
- Bug 2324 - Directories whose names contain whitespace are inaccessible.
- Bug 2306 - ftpcount output should handle case of no users.  When no clients
  are connected, ftpcount now displays "0 users".
- Bug 2337 - TLSRenegotiate parameters not processed correctly.
- Bug 2340 - Problem with parallel builds.  Proper dependencies added when
  building ftpwho and ftptop.
- Bug 2327 - SQLNegativeCache causes unnecessary errors in server logging.
- Bug 2237 - HiddenStores does not check for existing file in edge case.
- Bug 2171 - Add delete options to ftpasswd.  The ftpasswd script now
  supports the --delete-user and --delete-group options.
- Bug 2105 - Remove Authoritative directives.  The AuthPAMAuthoritative
  directive, and the "*" syntax of SQLAuthenticate, have been deprecated.
- Bug 1696 - Include directive should support directories.  The Include
  directive now functions just like Apache's Include directive, including
  handling glob characters.
- Bug 2311 - MaxClients counts unauthenticated users.  According to the
  documentation, the MaxClients configuration directive should only count
  authenticated clients.
- Bug 2339 - STAT command doesn't follow RFC959.  Previously, ProFTPD did
  not support use of the STAT command during file transfers.  This
  functionality is now implemented.  Sites wishing to prevent this can
  limit use of the STAT command by using <Limit STAT>.
- Bug 2257 - Add SITE SYMLINK command to mod_site.  Rather than adding
  this command to the mod_site module, a new module, mod_site_misc, has
  been added to the contrib area.  The mod_site_misc module implements
  SITE SYMLINK, and a few other SITE commands.  See contrib/mod_site_misc.html
  for details.
- Bug 2355 - Send error message to client when 'TLSRequired on' is in effect.
  Previously, if SSL/TLS was configured to be required for both control
  and data channels, if the client did not perform the SSL/TLS handshake for
  a data transfer, the connection would hang.  Now, an error message is sent
  to the client if no handshake is done.
- Bug 2353 - REST doesn't handle offsets greater than 2 GB.
- Bug 2357 - ftptop should use COLS for determining display width.
- Bug 2321 - FTP permission checks inconsistent for DELE and RMD/XRMD when
  symlink is in directory path.  This bug affected the RNFR command as well.
- Bug 2361 - Second USER command causes problems with chrooted session.
- Bug 2363 - ABOR response RFC 959 compliance.  The 226 response was being
  sent before closing the data connection; RFC 959 implies that the data
  connection is closed first.
- Bug 2369 - EPSV should not send network address when MasqueradeAddress is
  used.  RFC 2428 does not address the case where a server may wish to
  return an address in the EPSV response that differs from the control
  connection address, as is done in a PASV response for forwarding devices
  (e.g. NAT, firewall).  Until the proper behavior can be determined,
  do not honor MasqueradeAddress for EPSV.
- Bug 2367 - LIST *.* strange behaviour.  The builtin listing mechanism
  was inadvertently recursing into globbed directories when recursion was
  not actually requested.
- Bug 2371 - ftpasswd should have option to compare password against value
  in passwd file.  ftpasswd now supports a --not-previous-password option.
- Added a `howto' directory under `doc/', for mini-HOWTOs.
- Bug 2221 - proftpd on hp-ux 11.22.  The default data type of socklen_t
  on HP-UX 11 is problematic; many system calls expect an int, and the
  default type is a size_t.  This mismatch causes problems for 64-bit
  builds.
- Bug 2385 - Renames fail with error "Invalid cross-device link".
- Bug 2383 - mod_ctrls.c: ctrls_listen(): Invalid size in bind() argument.
  The size of struct sockaddr_un is not consistent across platforms.
- Bug 2387 - PRIVS_USER macro should set effective GID to user's primary GID.
- Added a `modules/' directory under `doc/', for core module documentation.
  Currently there are HTML docs for mod_auth_file, mod_cap, and mod_ctrls.
- Bug 2317 - Wrong order of privs calls on HP generates "unable to setregid()"
  error.

3 files changed, 13 insertions, 10 deletions

diff --git a/net/proftpd/Makefile b/net/proftpd/Makefile
index 672fd3633cf..b84c109928f 100644
--- a/net/proftpd/Makefile
+++ b/net/proftpd/Makefile
@@ -1,9 +1,11 @@
-# $NetBSD: Makefile,v 1.13 2004/08/30 18:13:18 martti Exp $
+# $NetBSD: Makefile,v 1.14 2004/09/21 13:10:18 cube Exp $
 
-PKGNAME=	proftpd-1.2.9
-DISTNAME=	proftpd-1.2.9
+DISTNAME=	proftpd-1.2.10
 CATEGORIES=	net
-MASTER_SITES=	ftp://ftp.proftpd.org/distrib/source/
+MASTER_SITES=	ftp://ftp.proftpd.org/distrib/source/ \
+		ftp://ftp.servus.at/ProFTPD/distrib/source/ \
+		ftp://ftp.fsn.hu/pub/proftpd/distrib/source/ \
+		ftp://ftp.middle-earth.it/proftpd/ \
 EXTRACT_SUFX=	.tar.bz2
 
 MAINTAINER=	martti@NetBSD.org
@@ -74,7 +76,7 @@ CONFIGURE_ARGS+=--with-modules=${MODULES}
 post-install:
 	# documentation
 	${INSTALL_DATA_DIR} ${PREFIX}/share/doc/proftpd
-.for i in NEWS README README.IPv6 README.LDAP README.PAM README.mod_sql README.modules
+.for i in NEWS README README.IPv6 README.LDAP README.PAM README.modules
 	${INSTALL_DATA} ${WRKSRC}/${i} ${PREFIX}/share/doc/proftpd
 .endfor
 .for i in Configuration.html faq.html license.txt
diff --git a/net/proftpd/PLIST b/net/proftpd/PLIST
index fc8c3848dbb..86e46436471 100644
--- a/net/proftpd/PLIST
+++ b/net/proftpd/PLIST
@@ -1,11 +1,13 @@
-@comment $NetBSD: PLIST,v 1.6 2004/04/23 22:07:57 reed Exp $
+@comment $NetBSD: PLIST,v 1.7 2004/09/21 13:10:18 cube Exp $
 bin/ftpcount
 bin/ftpwho
+bin/ftpdctl
 bin/ftptop
 man/man1/ftpcount.1
 man/man1/ftptop.1
 man/man1/ftpwho.1
 man/man5/xferlog.5
+man/man8/ftpdctl.8
 man/man8/ftpshut.8
 man/man8/proftpd.8
 sbin/ftpshut
@@ -17,7 +19,6 @@ share/doc/proftpd/README
 share/doc/proftpd/README.IPv6
 share/doc/proftpd/README.LDAP
 share/doc/proftpd/README.PAM
-share/doc/proftpd/README.mod_sql
 share/doc/proftpd/README.modules
 share/doc/proftpd/faq.html
 share/doc/proftpd/license.txt
diff --git a/net/proftpd/distinfo b/net/proftpd/distinfo
index 4da3f5cf751..85740619899 100644
--- a/net/proftpd/distinfo
+++ b/net/proftpd/distinfo
@@ -1,5 +1,5 @@
-$NetBSD: distinfo,v 1.7 2003/12/07 13:53:34 martti Exp $
+$NetBSD: distinfo,v 1.8 2004/09/21 13:10:18 cube Exp $
 
-SHA1 (proftpd-1.2.9.tar.bz2) = 37763933d9edc929e55609c3eb30b06aa71f9ba0
-Size (proftpd-1.2.9.tar.bz2) = 778953 bytes
+SHA1 (proftpd-1.2.10.tar.gz) = ea12d139b8b47168cabcd993b137b2360bba1465
+Size (proftpd-1.2.10.tar.gz) = 1182176 bytes
 SHA1 (patch-aa) = 3784f6aed87b327741685d45d453aa2ac98dd98b