Update pure-ftpd to version 1.0.35 and add script to start pure-uploadscript.

Changes since 1.0.30:

 - An old-standing bug has been fixed: when a file was renamed and overwrote an existing file, the quota wasn't properly updated.
 - SITE UTIME now supports the 2-arguments syntax in addition to the 5-arguments syntax.
 - Support for the MFMT command has been implemented.
 - A default directory can now be specified when using the LDAP backend.
 - Support SHA1 password hashing in MySQL and PostgreSQL backends
 - Support for braces expansion in directory listings has been disabled - Cf. CVE-2011-0418
 - The list of allowed ciphers for SSL/TLS connections can now be specified (--tlsciphersuite / -J).
 - Shell-like escaping is now partially handled when emulating the "ls" command in order to improve compatibility with legacy clients.
 - Linking issues with MySQL support on Fedora have been solved.

5 files changed, 58 insertions, 9 deletions

diff --git a/net/pure-ftpd/MESSAGE b/net/pure-ftpd/MESSAGE
index 9a79d2356a4..b20362da5ea 100644
--- a/net/pure-ftpd/MESSAGE
+++ b/net/pure-ftpd/MESSAGE
@@ -1,5 +1,5 @@
 ===========================================================================
-$NetBSD: MESSAGE,v 1.3 2004/10/11 22:14:51 reed Exp $
+$NetBSD: MESSAGE,v 1.4 2012/02/07 20:40:39 morr Exp $
 
 To use pure-ftpd, you will need to perform the following steps:
 
@@ -14,4 +14,17 @@ To use pure-ftpd, you will need to perform the following steps:
    command
 
 	/etc/rc.d/pure_ftpd start
+
+3. If you want to use pure-uploadscript, you should copy pure_uploadscript to 
+   /etc/rc.d, if you don't have it already, and need to add "-o" option to
+   pure_ftpd_flags, and set
+
+	 pure_uploadscript=YES
+	 pure_uploadscript_flags="-r /path/to/script"
+
+   Then you can start by
+
+	/etc/rc.d/pure_uploadscript start
+
+   For more details, read pure-uploadscript(8).
 ===========================================================================
diff --git a/net/pure-ftpd/Makefile b/net/pure-ftpd/Makefile
index 480905740d9..11cf0864189 100644
--- a/net/pure-ftpd/Makefile
+++ b/net/pure-ftpd/Makefile
@@ -1,6 +1,6 @@
-# $NetBSD: Makefile,v 1.27 2011/04/02 08:00:58 obache Exp $
+# $NetBSD: Makefile,v 1.28 2012/02/07 20:40:39 morr Exp $
 
-DISTNAME=	pure-ftpd-1.0.30
+DISTNAME=	pure-ftpd-1.0.35
 CATEGORIES=	net
 MASTER_SITES=	ftp://ftp.pureftpd.org/pub/pure-ftpd/releases/ \
 		http://download.pureftpd.org/pub/pure-ftpd/releases/ \
@@ -35,7 +35,7 @@ CONFIGURE_ARGS+=	--without-privsep
 
 .include "options.mk"
 
-RCD_SCRIPTS=		pure_ftpd
+RCD_SCRIPTS=		pure_ftpd pure_uploadscript
 INSTALLATION_DIRS=	share/doc/pure-ftpd
 
 post-install:
diff --git a/net/pure-ftpd/PLIST b/net/pure-ftpd/PLIST
index 7433acf2a2b..48b584748c1 100644
--- a/net/pure-ftpd/PLIST
+++ b/net/pure-ftpd/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.7 2009/06/14 18:09:39 joerg Exp $
+@comment $NetBSD: PLIST,v 1.8 2012/02/07 20:40:39 morr Exp $
 bin/pure-pw
 bin/pure-pwconvert
 bin/pure-statsdecode
@@ -27,3 +27,4 @@ share/doc/pure-ftpd/README.PGSQL
 share/doc/pure-ftpd/README.TLS
 share/doc/pure-ftpd/README.Virtual-Users
 share/examples/rc.d/pure_ftpd
+share/examples/rc.d/pure_uploadscript
diff --git a/net/pure-ftpd/distinfo b/net/pure-ftpd/distinfo
index 199ea88626e..ca270438d0e 100644
--- a/net/pure-ftpd/distinfo
+++ b/net/pure-ftpd/distinfo
@@ -1,5 +1,5 @@
-$NetBSD: distinfo,v 1.12 2011/04/02 08:00:58 obache Exp $
+$NetBSD: distinfo,v 1.13 2012/02/07 20:40:39 morr Exp $
 
-SHA1 (pure-ftpd-1.0.30.tar.bz2) = 0b73b80f102f2b62f97e6c7de55fa3e1eba1feaa
-RMD160 (pure-ftpd-1.0.30.tar.bz2) = 137c38d491b311e826076a85589e0ce4f1b46826
-Size (pure-ftpd-1.0.30.tar.bz2) = 475402 bytes
+SHA1 (pure-ftpd-1.0.35.tar.bz2) = e470bd886af68903ffba61832002fe90611f5756
+RMD160 (pure-ftpd-1.0.35.tar.bz2) = 525ae8c4564b7a8f29ec09b882eacaa7a025a911
+Size (pure-ftpd-1.0.35.tar.bz2) = 482387 bytes
diff --git a/net/pure-ftpd/files/pure_uploadscript.sh b/net/pure-ftpd/files/pure_uploadscript.sh
new file mode 100644
index 00000000000..260fbfbc9f9
--- /dev/null
+++ b/net/pure-ftpd/files/pure_uploadscript.sh
@@ -0,0 +1,35 @@
+#!@RCD_SCRIPTS_SHELL@
+#
+#      $NetBSD: pure_uploadscript.sh,v 1.1 2012/02/07 20:40:39 morr Exp $
+#
+# PROVIDE: pure_uploadscript
+# REQUIRE: pure_ftpd
+
+. /etc/rc.subr
+
+name="pure_uploadscript"
+help_name="pure-uploadscript"
+rcvar=$name
+required_vars="pure_ftpd"
+command="@PREFIX@/sbin/${help_name}"
+command_args="-B"
+start_precmd=pure_uploadscript_precmd
+
+pure_uploadscript_precmd()
+{
+       is_uploadscript_enabled=0
+       for opt in ${pure_ftpd_flags}
+       do
+               if [ "x${opt}" = "x-o" -o "x${opt}" = "x--uploadscript"]; then
+                       is_uploadscript_enabled=1
+               fi
+       done
+
+       if [ ${is_uploadscript_enabled} -eq 0 ]; then
+               echo "WARNING: uploadscript for pure-ftpd is not enabled"
+               return 1
+       fi
+}
+
+load_rc_config $name
+run_rc_command "$1"