Update proftpd to 1.3.3c.

pksrc changes:
* Instead of patch&subst to change layout of statedir, pass it to configure
  instead (and subst for manpages are fixed).
* Convert custom mod_wrap library modification to SUBST.
* Need to buildlink with security/tcp_wappers for mod_wrap.

NEWS:
1.3.3c - Released 29-Oct-2010
--------------------------------
- Bug 3511 - SQLAuthType Backend not properly rejected by mod_sql_sqlite.
- Bug 3513 - EPERM error logged unnecessarily for SFTP logins on Linux.
- Bug 3517 - mod_quotatab decrements file tally improperly for failed DELE
  commands.
- Bug 3518 - Support SiteMiscEngine directive, for disabling mod_site_misc
  functionality via proftpd.conf.
- Bug 3519 - Inappropriate directory traversal allowed by mod_site_misc.
- Bug 3521 - Telnet IAC processing stack overflow.

1.3.3b - Released 09-Sep-2010
--------------------------------
- Bug 3481 - Problem with SFTP directory listings.
- Bug 3483 - NULL pointer dereference handling SITE command in mod_quotatab.
- Bug 3485 - Disabling IPv6 via -4 or --ipv4 command-line options does not work.
- Bug 3487 - Null pointer dereference with EPRT/EPSV/PASV/PORT command during
  data transfer.
- Bug 3482 - ProFTPD corrupts utmpx log files on FreeBSD 9.0/HEAD.
- Bug 3491 - Directory pattern not matching as expected.
- Bug 3492 - Null pointer dereference during data transfer due to RNFR/RNTO.
- Bug 3494 - Null pointer dereference for IPv6-enabled proftpd when no
  DefaultServer configured.
- Bug 3501 - <Anonymous> logins with "AuthAliasOnly on" still handled as
  anonymous logins.

1.3.3a - Released 01-Jul-2010
--------------------------------
- Bug 3400 - Add Japanese translation.
- Bug 3401 - mod_sftp does not compile with pre-0.9.7 OpenSSL.
- Bug 3402 - mod_tls does not compile with pre-0.9.7 OpenSSL due to Bug#3349.
- Bug 3403 - File upload followed by MLSD leads to wrong file size entries in
  TransferLog.
- Bug 3405 - Multiple SFTPAuthorizedUserKeys stores causes segfault on 64-bit
  platforms.
- Bug 3354 - Renaming a file across mount points to a full disk does not fail
  as expected.
- Bug 3408 - Use <termios.h> instead of <sys/termios.h> where possible.
- Bug 3412 - Include files not included after restart due to permissions.
- Bug 3409 - Build failure on newer FreeBSD due to utmp/utmpx system changes.
- Bug 3417 - Unsafe use of pointer when scanning config for ScoreboardFile.
- Bug 3418 - %U sometimes showing up as "(none)" in ExtendedLog.
- Bug 3421 - RewriteHome does not work properly for SFTP connections.
- Bug 3419 - SSL_shutdown() errors with openssl-0.9.8m.
- Bug 3423 - Last line of multiline DisplayLogin file improperly handled.
- Bug 3426 - mod_sftp does not log to TransferLog by default.
- Bug 3425 - Improperly constructed destination paths for SCP uploads.
- Bug 3427 - mod_sftp does not handle recursive SCP uploads properly.
- Bug 3432 - ExecBeforeCommand does not interpolate the %F/%f variables
  properly.
- Bug 3434 - TraceLog contains messages even with "Trace DEFAULT:0" configured.
- Bug 3435 - Encoding/decoding conversion can cause CPU spike.
- Bug 3436 - Support build-time option to disable use of nonblocking open of
  log files.  Use --disable-nonblocking-log-open to get the pre-1.3.3 behavior
  of opening log files.
- Bug 3437 - UseImplicitSSL TLSOption causes PBSZ/PROT commands to fail.
- Bug 3439 - Encoding fails if an NLS-enabled proftpd starts in a UTF8 locale.
- Bug 3446 - .ftpaccess ignored in some cases.
- Bug 3447 - mod_sftp can become confused during large recursive SCP uploads.
- Bug 3448 - Ensure that STAT/LSTAT/FSTAT SFTP requests do not use cached/stale
  data.
- Bug 3449 - mod_sftp does not properly handle the O_TRUNC flag in a SFTP OPEN
  request.
- Bug 3450 - mod_sftp does not properly handle the O_APPEND flag in a SFTP OPEN
  request.
- Bug 3451 - WinSCP can't upload files using protocol version 5 with mod_sftp.
- Bug 3452 - mod_sftp does not advertise its supported SFTP extensions for
  protocol version 5.
- Bug 3454 - msgfmt(1) options used for generating NLS files are not compatible
  with Solaris' msgfmt.
- Bug 3456 - Problem attempting to recursively download a directory via SCP.
- Bug 3458 - mod_sftp incorrectly performs OpenSSL cleanup.
- Bug 3459 - mod_radius segfaults during incorrect login due to stale data.
- Bug 3460 - REALPATH SFTP request can cause improperly cached directory
  configuration.
- Bug 3462 - ftpasswd script's --delete-user option does not work.
- Bug 3463 - ftpasswd script's --delete-group option does not work.
- Bug 3465 - SIGSEGV at LIST after CCC.
- Bug 3470 - Deferred resolution <Directory> paths not handled properly by
  mod_sftp.
- Bug 3469 - ExtendedLog's %f variable not properly expanded for DELE if path
  begins with tilde ('~').
- Bug 3467 - mod_ifsession does not merge <Directory> blocks properly.
- Bug 3471 - Null values in allow/deny rules causes mod_wrap2 to segfault.
- Bug 3472 - mod_sftp publickey authentication fails for large keys.
- Bug 3424 - Bad LDAP lookup can cause mod_ldap segfault under some conditions.
- Bug 3476 - LIST/NLST of path starting with "-" fails.
- Bug 3475 - Add new 'noGetgrouplist' AuthUnixOption to work around buggy
  libc code.
- Bug 3474 - Using SQLite database and SQLLog directive can lead to problems
  under load.

8 files changed, 40 insertions, 82 deletions

diff --git a/net/proftpd/Makefile b/net/proftpd/Makefile
index 718d364188c..250fb2ed3de 100644
--- a/net/proftpd/Makefile
+++ b/net/proftpd/Makefile
@@ -1,6 +1,6 @@
-# $NetBSD: Makefile,v 1.58 2010/03/21 21:24:25 kim Exp $
+# $NetBSD: Makefile,v 1.59 2010/11/07 12:21:09 obache Exp $
 
-DISTNAME=		proftpd-1.3.3
+DISTNAME=		proftpd-1.3.3c
 CATEGORIES=		net
 MASTER_SITES=		ftp://ftp.proftpd.org/distrib/source/ \
 			ftp://ftp.servus.at/ProFTPD/distrib/source/ \
@@ -20,7 +20,7 @@ GNU_CONFIGURE=		yes
 USE_TOOLS+=		gmake intltool msgfmt
 
 CONFIGURE_ARGS+=	--sysconfdir=${PKG_SYSCONFDIR}
-CONFIGURE_ARGS+=	--localstatedir=${VARBASE}
+CONFIGURE_ARGS+=	--localstatedir=${VARBASE}/run
 CONFIGURE_ARGS+=	--disable-sendfile
 CONFIGURE_ARGS+=	--enable-ctrls
 CONFIGURE_ARGS+=	--enable-nls
@@ -35,12 +35,6 @@ REPLACE_PERL+=		contrib/ftpasswd
 CONF_FILES=		${PREFIX}/share/examples/proftpd/basic.conf \
 			${PKG_SYSCONFDIR}/proftpd.conf
 
-SUBST_CLASSES+=		man
-SUBST_MESSAGE.man=	Fixing paths in manual pages.
-SUBST_STAGE.man=	pre-configure
-SUBST_FILES.man=	utils/ftpcount.1.in utils/ftptop.1.in utils/ftpwho.1.in
-SUBST_SED.man=		-e s,@LOCALSTATEDIR@/run/proftpd,${VARBASE}/run,
-
 INSTALLATION_DIRS+=	lib/proftpd
 INSTALLATION_DIRS+=	share/doc/proftpd
 INSTALLATION_DIRS+=	share/examples/proftpd
@@ -49,11 +43,10 @@ PLIST_SRC+=		${PKGDIR}/PLIST
 
 .include "options.mk"
 
-post-patch:
-	cd ${WRKSRC}/contrib \
-	&& ${CP} -p mod_wrap.c mod_wrap.c.orig \
-	&& ${SED} -e '/^...\$$Libraries: /s/ -lnsl\$$$$/$$/' \
-	    mod_wrap.c.orig > mod_wrap.c
+SUBST_CLASSES+=		libwrap
+SUBST_STAGE.libwrap=	post-patch
+SUBST_FILES.libwrap=	contrib/mod_wrap.c
+SUBST_SED.libwrap=	-e '/^...\$$Libraries: /s/ -lnsl\$$$$/$$/'
 
 post-install:
 .for i in NEWS README README.IPv6 README.LDAP README.PAM README.capabilities \
diff --git a/net/proftpd/PLIST b/net/proftpd/PLIST
index 86a53734b52..8c9e62adacc 100644
--- a/net/proftpd/PLIST
+++ b/net/proftpd/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.21 2010/03/21 21:24:25 kim Exp $
+@comment $NetBSD: PLIST,v 1.22 2010/11/07 12:21:09 obache Exp $
 bin/ftpcount
 bin/ftpdctl
 bin/ftptop
@@ -96,6 +96,7 @@ share/locale/bg_BG/LC_MESSAGES/proftpd.mo
 share/locale/en_US/LC_MESSAGES/proftpd.mo
 share/locale/fr_FR/LC_MESSAGES/proftpd.mo
 share/locale/it_IT/LC_MESSAGES/proftpd.mo
+share/locale/ja_JP/LC_MESSAGES/proftpd.mo
 share/locale/ko_KR/LC_MESSAGES/proftpd.mo
 share/locale/ru_RU/LC_MESSAGES/proftpd.mo
 share/locale/zh_CN/LC_MESSAGES/proftpd.mo
diff --git a/net/proftpd/distinfo b/net/proftpd/distinfo
index c73629942e6..21152c1517c 100644
--- a/net/proftpd/distinfo
+++ b/net/proftpd/distinfo
@@ -1,9 +1,8 @@
-$NetBSD: distinfo,v 1.33 2010/03/23 13:45:28 wiz Exp $
+$NetBSD: distinfo,v 1.34 2010/11/07 12:21:09 obache Exp $
 
-SHA1 (proftpd-1.3.3.tar.bz2) = ce7c1f96648f94e32d5d104cd1405e6778aae045
-RMD160 (proftpd-1.3.3.tar.bz2) = 01c9226f694129561dd35a03631c6a2b8bd593dc
-Size (proftpd-1.3.3.tar.bz2) = 4132650 bytes
-SHA1 (patch-aa) = d6060f8a0ccba634983dffeccf4b2e31ae19e7ff
-SHA1 (patch-ab) = f66a80b0db92844f25e290d82d2eea3ada06a822
-SHA1 (patch-ac) = e24c3d85acb80e0b46b9c83dc399d5569c5ca9d5
-SHA1 (patch-ae) = 0bf4d13e9a6c2a2c1c73ffc9fb7e6e3c3e57a8a8
+SHA1 (proftpd-1.3.3c.tar.bz2) = 167d2f5f22f2bf8a5365b18adfd18a5fc750b07f
+RMD160 (proftpd-1.3.3c.tar.bz2) = 08a6fac94aa3449192e92848c6271cca33ea26cc
+Size (proftpd-1.3.3c.tar.bz2) = 4166609 bytes
+SHA1 (patch-aa) = a684d275e0b872f9d7d57b8b4d5e97a630a48eaf
+SHA1 (patch-ab) = 9567cb34dab7feee696cddea4dba7930e500460e
+SHA1 (patch-ac) = d1ba5ec4265337c648da2f76460694a5a7a2dd10
diff --git a/net/proftpd/options.mk b/net/proftpd/options.mk
index 886662bae8d..396025a8442 100644
--- a/net/proftpd/options.mk
+++ b/net/proftpd/options.mk
@@ -1,4 +1,4 @@
-# $NetBSD: options.mk,v 1.8 2008/12/28 08:42:01 kim Exp $
+# $NetBSD: options.mk,v 1.9 2010/11/07 12:21:09 obache Exp $
 #
 
 PKG_OPTIONS_VAR=	PKG_OPTIONS.proftpd
@@ -26,6 +26,7 @@ MODULES=	# empty
 
 .if !empty(PKG_OPTIONS:Mwrap)
 MODULES:=	${MODULES}:mod_wrap
+.include "../../security/tcp_wrappers/buildlink3.mk"
 .endif
 
 .if !empty(PKG_OPTIONS:Mtls)
diff --git a/net/proftpd/patches/patch-aa b/net/proftpd/patches/patch-aa
index d8b1c6dd917..10dab6e465c 100644
--- a/net/proftpd/patches/patch-aa
+++ b/net/proftpd/patches/patch-aa
@@ -1,13 +1,13 @@
-$NetBSD: patch-aa,v 1.12 2010/03/21 21:24:25 kim Exp $
+$NetBSD: patch-aa,v 1.13 2010/11/07 12:21:09 obache Exp $
 
 Make this pkgsrc friendly.
 
 Linking ftpdctl does not (seem to) require all the libraries needed for
 various proftpd modules.  It definitely cannot include -lwrap.
 
---- Makefile.in.orig	2009-12-15 18:24:42.000000000 -0500
-+++ Makefile.in	2010-03-21 16:33:03.000000000 -0400
-@@ -58,7 +58,7 @@
+--- Makefile.in.orig	2009-12-15 23:24:42.000000000 +0000
++++ Makefile.in
+@@ -58,7 +58,7 @@ ftpcount$(EXEEXT): lib utils
  	$(CC) $(LDFLAGS) -o $@ $(BUILD_FTPCOUNT_OBJS) $(UTILS_LIBS)
  
  ftpdctl$(EXEEXT): lib src
@@ -16,7 +16,7 @@ various proftpd modules.  It definitely cannot include -lwrap.
  
  ftpscrub$(EXEEXT): lib utils
  	$(CC) $(LDFLAGS) -o $@ $(BUILD_FTPSCRUB_OBJS) $(UTILS_LIBS)
-@@ -147,7 +147,7 @@
+@@ -147,7 +147,7 @@ install-man: $(DESTDIR)$(mandir) $(DESTD
  	$(INSTALL_MAN) $(top_srcdir)/utils/ftpwho.1   $(DESTDIR)$(mandir)/man1
  	$(INSTALL_MAN) $(top_srcdir)/src/xferlog.5    $(DESTDIR)$(mandir)/man5
  
diff --git a/net/proftpd/patches/patch-ab b/net/proftpd/patches/patch-ab
index fbd36c2b62a..6ab9e8ae206 100644
--- a/net/proftpd/patches/patch-ab
+++ b/net/proftpd/patches/patch-ab
@@ -1,10 +1,10 @@
-$NetBSD: patch-ab,v 1.11 2010/03/23 13:45:28 wiz Exp $
+$NetBSD: patch-ab,v 1.12 2010/11/07 12:21:09 obache Exp $
 
-Make this pkgsrc friendly.
+Portability fix.
 
---- configure.orig	2010-02-15 19:32:24.000000000 +0000
+--- configure.orig	2010-04-13 22:01:35.000000000 +0000
 +++ configure
-@@ -12862,7 +12862,7 @@ if test "${with_modules+set}" = set; the
+@@ -12866,7 +12866,7 @@ if test "${with_modules+set}" = set; the
      if test x"$withval" != x; then
        modules_list=`echo "$withval" | sed -e 's/:/ /g'`;
        for amodule in $modules_list; do
@@ -13,21 +13,3 @@ Make this pkgsrc friendly.
            { { echo "$as_me:$LINENO: error: use --enable-dso instead of --with-modules=mod_dso for DSO support" >&5
  echo "$as_me: error: use --enable-dso instead of --with-modules=mod_dso for DSO support" >&2;}
     { (exit 1); exit 1; }; }
-@@ -31715,7 +31715,7 @@ _ACEOF
- 
- 
- cat >>confdefs.h <<_ACEOF
--#define PR_RUN_DIR "`eval echo "${localstatedir}"`"
-+#define PR_RUN_DIR "`eval echo "${localstatedir}/run"`"
- _ACEOF
- 
- cat >>confdefs.h <<_ACEOF
-@@ -31723,7 +31723,7 @@ cat >>confdefs.h <<_ACEOF
- _ACEOF
- 
- cat >>confdefs.h <<_ACEOF
--#define PR_PID_FILE_PATH "`eval echo "${localstatedir}/proftpd.pid"`"
-+#define PR_PID_FILE_PATH "`eval echo "${localstatedir}/run/proftpd.pid"`"
- _ACEOF
- 
- 
diff --git a/net/proftpd/patches/patch-ac b/net/proftpd/patches/patch-ac
index 7b4666f5dff..3d417d5237c 100644
--- a/net/proftpd/patches/patch-ac
+++ b/net/proftpd/patches/patch-ac
@@ -1,18 +1,15 @@
-$NetBSD: patch-ac,v 1.12 2010/03/21 21:24:25 kim Exp $
+$NetBSD: patch-ac,v 1.13 2010/11/07 12:21:10 obache Exp $
 
-Make this pkgsrc friendly.
+portability fix.
 
---- configure.in.orig	2010-02-15 14:22:26.000000000 -0500
-+++ configure.in	2010-03-21 16:38:07.000000000 -0400
-@@ -2266,9 +2266,9 @@
- locale_dir="`eval echo ${locale_dir}`"
- AC_DEFINE_UNQUOTED(PR_LOCALE_DIR, "`eval echo "${locale_dir}"`")
- 
--AC_DEFINE_UNQUOTED(PR_RUN_DIR, "`eval echo "${localstatedir}"`")
-+AC_DEFINE_UNQUOTED(PR_RUN_DIR, "`eval echo "${localstatedir}/run"`")
- AC_DEFINE_UNQUOTED(PR_CONFIG_FILE_PATH, "`eval echo "${sysconfdir}/proftpd.conf"`")
--AC_DEFINE_UNQUOTED(PR_PID_FILE_PATH, "`eval echo "${localstatedir}/proftpd.pid"`")
-+AC_DEFINE_UNQUOTED(PR_PID_FILE_PATH, "`eval echo "${localstatedir}/run/proftpd.pid"`")
- 
- prefix="$pr_saved_prefix"
- exec_prefix="$pr_saved_exec_prefix"
+--- configure.in.orig	2010-04-13 21:57:34.000000000 +0000
++++ configure.in
+@@ -331,7 +331,7 @@ AC_ARG_WITH(modules,
+     if test x"$withval" != x; then
+       modules_list=`echo "$withval" | sed -e 's/:/ /g'`;
+       for amodule in $modules_list; do
+-        if test x"$amodule" == xmod_dso ; then
++        if test x"$amodule" = xmod_dso ; then
+           AC_MSG_ERROR([use --enable-dso instead of --with-modules=mod_dso for DSO support])
+         fi
+       done
diff --git a/net/proftpd/patches/patch-ae b/net/proftpd/patches/patch-ae
deleted file mode 100644
index cf98bfc1a03..00000000000
--- a/net/proftpd/patches/patch-ae
+++ /dev/null
@@ -1,15 +0,0 @@
-$NetBSD: patch-ae,v 1.7 2008/12/28 08:42:01 kim Exp $
-
-Old versions of msgfmt don't know about --check-format.
-
---- locale/Makefile.in.orig	2008-11-19 05:51:38.000000000 +0200
-+++ locale/Makefile.in	2008-12-26 12:27:18.000000000 +0200
-@@ -26,7 +26,7 @@
- # gettext utilities.  Note that this assumes gettext is installed and
- # available on the system.
- MSGCMP=msgcmp
--MSGFMT=msgfmt --check-format
-+MSGFMT=msgfmt
- MSGINIT=msginit
- XGETTEXT=xgettext
-