Pullup ticket #2693 - requested by kim

proftpd: security update

Revisions pulled up:
- net/proftpd/Makefile				1.53-1.54
- net/proftpd/PLIST				1.15-1.16
- net/proftpd/distinfo				1.30
- net/proftpd/files/proftpd.sh			1.3
---
Module Name:	pkgsrc
Committed By:	shattered
Date:		Sun Jan 11 22:47:54 UTC 2009

Modified Files:
	pkgsrc/net/proftpd: Makefile PLIST
	pkgsrc/net/proftpd/files: proftpd.sh

Log Message:
- rc.d script: replace interpreter, add 'reload' command
- install 'ftpasswd' script from contrib

OK by kim@.
---
Module Name:    pkgsrc
Committed By:   kim
Date:           Sun Feb  8 07:28:44 UTC 2009

Modified Files:
        pkgsrc/net/proftpd: Makefile PLIST distinfo

Log Message:
Upgrade proftpd to 1.3.2

4 files changed, 15 insertions, 9 deletions

diff --git a/net/proftpd/Makefile b/net/proftpd/Makefile
index 72f6f4c09a1..0262929616f 100644
--- a/net/proftpd/Makefile
+++ b/net/proftpd/Makefile
@@ -1,6 +1,6 @@
-# $NetBSD: Makefile,v 1.52 2008/12/28 08:56:59 kim Exp $
+# $NetBSD: Makefile,v 1.52.2.1 2009/02/09 11:28:54 tron Exp $
 
-DISTNAME=		proftpd-1.3.2rc3
+DISTNAME=		proftpd-1.3.2
 #PKGREVISION=		1
 CATEGORIES=		net
 MASTER_SITES=		ftp://ftp.proftpd.org/distrib/source/ \
@@ -31,6 +31,7 @@ CONFIGURE_ENV+=		install_user=${ROOT_USER} install_group=${ROOT_GROUP}
 BUILD_DEFS+=		VARBASE
 
 RCD_SCRIPTS=		proftpd
+REPLACE_PERL+=		contrib/ftpasswd
 
 CONF_FILES=		${PREFIX}/share/examples/proftpd/basic.conf \
 			${PKG_SYSCONFDIR}/proftpd.conf
@@ -64,6 +65,8 @@ post-install:
 .endfor
 	${INSTALL_DATA} ${WRKSRC}/sample-configurations/*.conf \
 		${DESTDIR}${PREFIX}/share/examples/proftpd
+	${INSTALL_SCRIPT} ${WRKSRC}/contrib/ftpasswd \
+		${DESTDIR}${PREFIX}/share/examples/proftpd
 
 .include "../../devel/gettext-lib/buildlink3.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/net/proftpd/PLIST b/net/proftpd/PLIST
index e4bcfe77bfc..c55fa19ff2c 100644
--- a/net/proftpd/PLIST
+++ b/net/proftpd/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.14 2008/10/03 06:52:03 martti Exp $
+@comment $NetBSD: PLIST,v 1.14.4.1 2009/02/09 11:28:55 tron Exp $
 bin/ftpcount
 bin/ftpdctl
 bin/ftptop
@@ -83,11 +83,13 @@ share/doc/proftpd/license.txt
 share/examples/proftpd/anonymous.conf
 share/examples/proftpd/basic.conf
 share/examples/proftpd/complex-virtual.conf
+share/examples/proftpd/ftpasswd
 share/examples/proftpd/mod_sql.conf
 share/examples/proftpd/virtual.conf
 share/examples/rc.d/proftpd
 share/locale/en_US/LC_MESSAGES/proftpd.mo
 share/locale/it_IT/LC_MESSAGES/proftpd.mo
+share/locale/ru_RU/LC_MESSAGES/proftpd.mo
 share/locale/zh_CN/LC_MESSAGES/proftpd.mo
 @dirrm share/examples/proftpd
 @dirrm share/doc/proftpd
diff --git a/net/proftpd/distinfo b/net/proftpd/distinfo
index 4ce810a075b..9531b0febc1 100644
--- a/net/proftpd/distinfo
+++ b/net/proftpd/distinfo
@@ -1,8 +1,8 @@
-$NetBSD: distinfo,v 1.29 2008/12/28 08:56:59 kim Exp $
+$NetBSD: distinfo,v 1.29.2.1 2009/02/09 11:28:55 tron Exp $
 
-SHA1 (proftpd-1.3.2rc3.tar.bz2) = 941e283d04e63d14f62556330b3fce75436af0b2
-RMD160 (proftpd-1.3.2rc3.tar.bz2) = 20e26b46baa42419cd0ad86899c7c3cb60dcb5e1
-Size (proftpd-1.3.2rc3.tar.bz2) = 2407996 bytes
+SHA1 (proftpd-1.3.2.tar.bz2) = b48bfb0acde11bd2a2f7a7c74a1d72d497cca46a
+RMD160 (proftpd-1.3.2.tar.bz2) = cefc52ad19bd633a24b28438a2cde12fd99c2a56
+Size (proftpd-1.3.2.tar.bz2) = 2457498 bytes
 SHA1 (patch-aa) = 09b842233ba545a2354c4e141ddd7a5478237774
 SHA1 (patch-ab) = 08f1f4be777c3af2ce63d94d4797b4f818270306
 SHA1 (patch-ac) = 9e17ad4085860575964adbbaf956350acf39e785
diff --git a/net/proftpd/files/proftpd.sh b/net/proftpd/files/proftpd.sh
index 0d24dcfe199..fde9290c6c5 100644
--- a/net/proftpd/files/proftpd.sh
+++ b/net/proftpd/files/proftpd.sh
@@ -1,6 +1,6 @@
-#!/bin/sh
+#!@RCD_SCRIPTS_SHELL@
 #
-# $NetBSD: proftpd.sh,v 1.2 2005/06/22 22:43:37 salo Exp $
+# $NetBSD: proftpd.sh,v 1.2.32.1 2009/02/09 11:28:55 tron Exp $
 #
 
 # PROVIDE: proftpd
@@ -14,6 +14,7 @@ rcvar=$name
 command="@PREFIX@/sbin/${name}"
 pidfile="@VARBASE@/run/${name}.pid"
 required_files="@PKG_SYSCONFDIR@/proftpd.conf"
+extra_commands="reload"
 
 load_rc_config $name
 run_rc_command "$1"