Upgrade proftpd to 1.3.3 (bug fixes, see the NEWS file for a full list).

6 files changed, 33 insertions, 28 deletions

diff --git a/net/proftpd/Makefile b/net/proftpd/Makefile
index b15dd000cd7..718d364188c 100644
--- a/net/proftpd/Makefile
+++ b/net/proftpd/Makefile
@@ -1,6 +1,6 @@
-# $NetBSD: Makefile,v 1.57 2009/12/21 00:41:43 tonnerre Exp $
+# $NetBSD: Makefile,v 1.58 2010/03/21 21:24:25 kim Exp $
 
-DISTNAME=		proftpd-1.3.2c
+DISTNAME=		proftpd-1.3.3
 CATEGORIES=		net
 MASTER_SITES=		ftp://ftp.proftpd.org/distrib/source/ \
 			ftp://ftp.servus.at/ProFTPD/distrib/source/ \
diff --git a/net/proftpd/PLIST b/net/proftpd/PLIST
index e26ed61c2eb..86a53734b52 100644
--- a/net/proftpd/PLIST
+++ b/net/proftpd/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.20 2009/12/21 00:41:43 tonnerre Exp $
+@comment $NetBSD: PLIST,v 1.21 2010/03/21 21:24:25 kim Exp $
 bin/ftpcount
 bin/ftpdctl
 bin/ftptop
@@ -9,6 +9,7 @@ include/proftpd/bindings.h
 include/proftpd/buildstamp.h
 include/proftpd/child.h
 include/proftpd/class.h
+include/proftpd/cmd.h
 include/proftpd/compat.h
 include/proftpd/conf.h
 include/proftpd/config.h
@@ -22,6 +23,7 @@ include/proftpd/env.h
 include/proftpd/event.h
 include/proftpd/expr.h
 include/proftpd/feat.h
+include/proftpd/filter.h
 include/proftpd/fsio.h
 include/proftpd/ftp.h
 include/proftpd/glibc-glob.h
@@ -46,6 +48,7 @@ include/proftpd/proftpd.h
 include/proftpd/regexp.h
 include/proftpd/response.h
 include/proftpd/scoreboard.h
+include/proftpd/session.h
 include/proftpd/sets.h
 include/proftpd/str.h
 include/proftpd/support.h
@@ -62,8 +65,10 @@ man/man1/ftptop.1
 man/man1/ftpwho.1
 man/man5/xferlog.5
 man/man8/ftpdctl.8
+man/man8/ftpscrub.8
 man/man8/ftpshut.8
 man/man8/proftpd.8
+sbin/ftpscrub
 sbin/ftpshut
 sbin/in.proftpd
 sbin/proftpd
diff --git a/net/proftpd/distinfo b/net/proftpd/distinfo
index fcae5815769..41e32e81eea 100644
--- a/net/proftpd/distinfo
+++ b/net/proftpd/distinfo
@@ -1,9 +1,9 @@
-$NetBSD: distinfo,v 1.31 2009/12/21 00:41:43 tonnerre Exp $
+$NetBSD: distinfo,v 1.32 2010/03/21 21:24:25 kim Exp $
 
-SHA1 (proftpd-1.3.2c.tar.bz2) = d81c4b988fc70109a82804852378bfd6f28602a6
-RMD160 (proftpd-1.3.2c.tar.bz2) = 0754e3e9a6915ca497924448899238d60226ca63
-Size (proftpd-1.3.2c.tar.bz2) = 2536105 bytes
-SHA1 (patch-aa) = 09b842233ba545a2354c4e141ddd7a5478237774
-SHA1 (patch-ab) = 08f1f4be777c3af2ce63d94d4797b4f818270306
-SHA1 (patch-ac) = 9e17ad4085860575964adbbaf956350acf39e785
+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) = afc419c23aed22a374b5bfab9ceede7c80b433f3
+SHA1 (patch-ac) = e24c3d85acb80e0b46b9c83dc399d5569c5ca9d5
 SHA1 (patch-ae) = 0bf4d13e9a6c2a2c1c73ffc9fb7e6e3c3e57a8a8
diff --git a/net/proftpd/patches/patch-aa b/net/proftpd/patches/patch-aa
index c809fd293f4..d8b1c6dd917 100644
--- a/net/proftpd/patches/patch-aa
+++ b/net/proftpd/patches/patch-aa
@@ -1,22 +1,22 @@
-$NetBSD: patch-aa,v 1.11 2008/12/28 08:42:01 kim Exp $
+$NetBSD: patch-aa,v 1.12 2010/03/21 21:24:25 kim 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	2008-11-19 05:51:38.000000000 +0200
-+++ Makefile.in	2008-12-26 12:04:57.000000000 +0200
+--- 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 @@
  	$(CC) $(LDFLAGS) -o $@ $(BUILD_FTPCOUNT_OBJS) $(UTILS_LIBS)
  
- ftpdctl$(EXEEXT): src
+ ftpdctl$(EXEEXT): lib src
 -	$(CC) $(LDFLAGS) -o $@ $(BUILD_FTPDCTL_OBJS) $(LIBS)
 +	$(CC) $(LDFLAGS) -o $@ $(BUILD_FTPDCTL_OBJS) $(UTILS_LIBS)
  
- ftpshut$(EXEEXT): utils
- 	$(CC) $(LDFLAGS) -o $@ $(BUILD_FTPSHUT_OBJS) $(UTILS_LIBS)
-@@ -142,7 +142,7 @@
+ ftpscrub$(EXEEXT): lib utils
+ 	$(CC) $(LDFLAGS) -o $@ $(BUILD_FTPSCRUB_OBJS) $(UTILS_LIBS)
+@@ -147,7 +147,7 @@
  	$(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 3317195bf7e..5b7de97be6e 100644
--- a/net/proftpd/patches/patch-ab
+++ b/net/proftpd/patches/patch-ab
@@ -1,19 +1,19 @@
-$NetBSD: patch-ab,v 1.9 2008/11/21 08:00:36 martti Exp $
+$NetBSD: patch-ab,v 1.10 2010/03/21 21:24:25 kim Exp $
 
 Make this pkgsrc friendly.
 
---- configure.orig	2008-11-19 05:54:50.000000000 +0200
-+++ configure	2008-11-21 09:55:06.000000000 +0200
-@@ -37222,7 +37222,7 @@
+--- configure.orig	2010-02-15 14:32:24.000000000 -0500
++++ configure	2010-03-21 16:35:31.000000000 -0400
+@@ -31715,7 +31715,7 @@
  
  
  cat >>confdefs.h <<_ACEOF
--#define PR_RUN_DIR "`eval echo "${localstatedir}/proftpd"`"
+-#define PR_RUN_DIR "`eval echo "${localstatedir}"`"
 +#define PR_RUN_DIR "`eval echo "${localstatedir}/run"`"
  _ACEOF
  
  cat >>confdefs.h <<_ACEOF
-@@ -37230,7 +37230,7 @@
+@@ -31723,7 +31723,7 @@
  _ACEOF
  
  cat >>confdefs.h <<_ACEOF
diff --git a/net/proftpd/patches/patch-ac b/net/proftpd/patches/patch-ac
index 87ab6744d95..7b4666f5dff 100644
--- a/net/proftpd/patches/patch-ac
+++ b/net/proftpd/patches/patch-ac
@@ -1,14 +1,14 @@
-$NetBSD: patch-ac,v 1.11 2008/11/21 08:00:36 martti Exp $
+$NetBSD: patch-ac,v 1.12 2010/03/21 21:24:25 kim Exp $
 
 Make this pkgsrc friendly.
 
---- configure.in.orig	2008-11-19 05:51:38.000000000 +0200
-+++ configure.in	2008-11-21 09:55:26.000000000 +0200
-@@ -2111,9 +2111,9 @@
+--- 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}/proftpd"`")
+-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"`")