Pullup ticket #4099 - requested by kim

net/proftpd: security update

Revisions pulled up:
- net/proftpd/Makefile                                          1.72
- net/proftpd/PLIST                                             1.24
- net/proftpd/distinfo                                          1.40
- net/proftpd/patches/patch-ab                                  deleted
- net/proftpd/patches/patch-ac                                  deleted

---
   Module Name:    pkgsrc
   Committed By:   kim
   Date:           Fri Mar 15 13:34:32 UTC 2013

   Modified Files:
           pkgsrc/net/proftpd: Makefile PLIST distinfo
   Removed Files:
           pkgsrc/net/proftpd/patches: patch-ab patch-ac

   Log Message:
   Updated net/proftpd to 1.3.4c:
   - addresses CVE-2012-6095 <http://bugs.proftpd.org/show_bug.cgi?id=3841>

5 files changed, 20 insertions, 41 deletions

diff --git a/net/proftpd/Makefile b/net/proftpd/Makefile
index fa04c3adb0d..78927222b62 100644
--- a/net/proftpd/Makefile
+++ b/net/proftpd/Makefile
@@ -1,12 +1,11 @@
-# $NetBSD: Makefile,v 1.69 2012/12/16 01:52:30 obache Exp $
+# $NetBSD: Makefile,v 1.69.2.1 2013/03/17 11:45:23 tron Exp $
 
-DISTNAME=	proftpd-1.3.3g
-PKGREVISION=	3
+DISTNAME=	proftpd-1.3.4c
 CATEGORIES=	net
 MASTER_SITES=	ftp://ftp.proftpd.org/distrib/source/ \
 		ftp://ftp.servus.at/ProFTPD/distrib/source/ \
 		ftp://ftp.fsn.hu/pub/proftpd/distrib/source/
-EXTRACT_SUFX=	.tar.bz2
+EXTRACT_SUFX=	.tar.gz
 
 MAINTAINER=	kim@tac.nyc.ny.us
 HOMEPAGE=	http://www.proftpd.org/
@@ -29,6 +28,8 @@ BUILD_DEFS+=		VARBASE
 
 RCD_SCRIPTS=		proftpd
 REPLACE_PERL+=		contrib/ftpasswd
+REPLACE_PERL+=		contrib/ftpmail
+REPLACE_PERL+=		contrib/ftpquota
 REPLACE_PERL+=		src/prxs.in
 
 CONF_FILES=		${PREFIX}/share/examples/proftpd/basic.conf \
diff --git a/net/proftpd/PLIST b/net/proftpd/PLIST
index 2b6656ee0ed..c733935015e 100644
--- a/net/proftpd/PLIST
+++ b/net/proftpd/PLIST
@@ -1,6 +1,9 @@
-@comment $NetBSD: PLIST,v 1.23 2011/01/12 07:31:00 adam Exp $
+@comment $NetBSD: PLIST,v 1.23.16.1 2013/03/17 11:45:23 tron Exp $
+bin/ftpasswd
 bin/ftpcount
 bin/ftpdctl
+bin/ftpmail
+bin/ftpquota
 bin/ftptop
 bin/ftpwho
 bin/prxs
@@ -31,6 +34,7 @@ include/proftpd/help.h
 include/proftpd/inet.h
 include/proftpd/libsupp.h
 include/proftpd/log.h
+include/proftpd/memcache.h
 include/proftpd/mkhome.h
 include/proftpd/mod_ctrls.h
 ${PLIST.quota}include/proftpd/mod_quotatab.h
@@ -53,17 +57,22 @@ include/proftpd/response.h
 include/proftpd/scoreboard.h
 include/proftpd/session.h
 include/proftpd/sets.h
+include/proftpd/stash.h
 include/proftpd/str.h
 include/proftpd/support.h
 include/proftpd/table.h
 include/proftpd/throttle.h
 include/proftpd/timers.h
+include/proftpd/tpl.h
 include/proftpd/trace.h
 include/proftpd/var.h
 include/proftpd/version.h
 include/proftpd/xferlog.h
 lib/pkgconfig/proftpd.pc
+man/man1/ftpasswd.1
 man/man1/ftpcount.1
+man/man1/ftpmail.1
+man/man1/ftpquota.1
 man/man1/ftptop.1
 man/man1/ftpwho.1
 man/man5/xferlog.5
@@ -97,6 +106,7 @@ share/examples/proftpd/virtual.conf
 share/examples/rc.d/proftpd
 share/locale/bg_BG/LC_MESSAGES/proftpd.mo
 share/locale/en_US/LC_MESSAGES/proftpd.mo
+share/locale/es_ES/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
diff --git a/net/proftpd/distinfo b/net/proftpd/distinfo
index 08e9020948b..4681f281628 100644
--- a/net/proftpd/distinfo
+++ b/net/proftpd/distinfo
@@ -1,9 +1,7 @@
-$NetBSD: distinfo,v 1.39 2011/11/16 09:05:03 obache Exp $
+$NetBSD: distinfo,v 1.39.10.1 2013/03/17 11:45:24 tron Exp $
 
-SHA1 (proftpd-1.3.3g.tar.bz2) = 70489c2b32c87b3637fd0cf2520773c5229f4ae3
-RMD160 (proftpd-1.3.3g.tar.bz2) = 29bdade06f63ace05811e809b0a3600ea6ed61fe
-Size (proftpd-1.3.3g.tar.bz2) = 4204504 bytes
+SHA1 (proftpd-1.3.4c.tar.gz) = 1ccb6f3db804dd22f5e8aa7f88f4caa63adfa478
+RMD160 (proftpd-1.3.4c.tar.gz) = b4aa9505733cf2b6a04dbb2c807e3161141d0155
+Size (proftpd-1.3.4c.tar.gz) = 7689622 bytes
 SHA1 (patch-aa) = a684d275e0b872f9d7d57b8b4d5e97a630a48eaf
-SHA1 (patch-ab) = 322b94a3c327da55891fbe2590f24c1d3bd751bc
-SHA1 (patch-ac) = d1727a21411f4c2947f0a482ad407fe05ac20b53
 SHA1 (patch-contrib_mod_tls.c) = d82a58fa51572787679a17d1d1c56a219eefcb77
diff --git a/net/proftpd/patches/patch-ab b/net/proftpd/patches/patch-ab
deleted file mode 100644
index 45e7ccbb8dc..00000000000
--- a/net/proftpd/patches/patch-ab
+++ /dev/null
@@ -1,15 +0,0 @@
-$NetBSD: patch-ab,v 1.13 2011/10/03 11:23:31 adam Exp $
-
-Portability fix.
-
---- configure.orig	2010-04-13 22:01:35.000000000 +0000
-+++ configure
-@@ -12892,7 +12892,7 @@ echo "$as_me: error: --with-modules para
-       if test x"$withval" != xno; 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
-             { { 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; }; }
diff --git a/net/proftpd/patches/patch-ac b/net/proftpd/patches/patch-ac
deleted file mode 100644
index 2f649c2c992..00000000000
--- a/net/proftpd/patches/patch-ac
+++ /dev/null
@@ -1,15 +0,0 @@
-$NetBSD: patch-ac,v 1.14 2011/10/03 11:23:31 adam Exp $
-
-portability fix.
-
---- configure.in.orig	2010-04-13 21:57:34.000000000 +0000
-+++ configure.in
-@@ -348,7 +348,7 @@ AC_ARG_WITH(modules,
-       if test x"$withval" != xno; 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