Updated proftpd to 1.3.0rc3

A lot of changes and bug fixes, including fix for the following
security problem:

http://security.lss.hr/index.php?page=details&ID=LSS-2004-10-02

7 files changed, 34 insertions, 80 deletions

diff --git a/net/proftpd/Makefile b/net/proftpd/Makefile
index 3aa7f577b8e..2b835133899 100644
--- a/net/proftpd/Makefile
+++ b/net/proftpd/Makefile
@@ -1,7 +1,7 @@
-# $NetBSD: Makefile,v 1.25 2005/11/03 14:53:22 rillig Exp $
+# $NetBSD: Makefile,v 1.26 2005/11/03 19:09:46 martti Exp $
 
-DISTNAME=	proftpd-1.2.10
-PKGREVISION=	4
+DISTNAME=	proftpd-1.3.0rc3
+#PKGREVISION=	1
 CATEGORIES=	net
 MASTER_SITES=	ftp://ftp.proftpd.org/distrib/source/ \
 		ftp://ftp.servus.at/ProFTPD/distrib/source/ \
@@ -39,7 +39,8 @@ SUBST_SED.man=		-e s,@LOCALSTATEDIR@/run/proftpd,${VARBASE}/run,
 
 post-install:
 	${INSTALL_DATA_DIR} ${PREFIX}/share/doc/proftpd
-.for i in NEWS README README.IPv6 README.LDAP README.PAM README.modules
+.for i in NEWS README README.IPv6 README.LDAP README.PAM README.capabilities \
+          README.classes README.controls README.facl README.modules
 	${INSTALL_DATA} ${WRKSRC}/${i} ${PREFIX}/share/doc/proftpd
 .endfor
 .for i in Configuration.html faq.html license.txt
diff --git a/net/proftpd/PLIST b/net/proftpd/PLIST
index 2445b7e8ecd..df682301a59 100644
--- a/net/proftpd/PLIST
+++ b/net/proftpd/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.9 2005/06/22 22:43:37 salo Exp $
+@comment $NetBSD: PLIST,v 1.10 2005/11/03 19:09:46 martti Exp $
 bin/ftpcount
 bin/ftpdctl
 bin/ftptop
@@ -19,6 +19,10 @@ share/doc/proftpd/README
 share/doc/proftpd/README.IPv6
 share/doc/proftpd/README.LDAP
 share/doc/proftpd/README.PAM
+share/doc/proftpd/README.capabilities
+share/doc/proftpd/README.classes
+share/doc/proftpd/README.controls
+share/doc/proftpd/README.facl
 share/doc/proftpd/README.modules
 share/doc/proftpd/faq.html
 share/doc/proftpd/license.txt
diff --git a/net/proftpd/distinfo b/net/proftpd/distinfo
index bb133c8a615..59bf4c399cc 100644
--- a/net/proftpd/distinfo
+++ b/net/proftpd/distinfo
@@ -1,10 +1,8 @@
-$NetBSD: distinfo,v 1.13 2005/08/06 12:29:25 adrianp Exp $
+$NetBSD: distinfo,v 1.14 2005/11/03 19:09:46 martti Exp $
 
-SHA1 (proftpd-1.2.10.tar.gz) = ea12d139b8b47168cabcd993b137b2360bba1465
-RMD160 (proftpd-1.2.10.tar.gz) = c96cadc6bfef0f77f2d44ed901b55474c6f6a464
-Size (proftpd-1.2.10.tar.gz) = 1182176 bytes
-SHA1 (patch-aa) = 3784f6aed87b327741685d45d453aa2ac98dd98b
-SHA1 (patch-ab) = cc760fc91846a0fc595e2e76d5a1ef582915034d
+SHA1 (proftpd-1.3.0rc3.tar.bz2) = 558578f93865dd722367c70a4efdbc4bfe0f7c25
+RMD160 (proftpd-1.3.0rc3.tar.bz2) = be8acd952662f4a0d465e1d3e62a098e67ec682e
+Size (proftpd-1.3.0rc3.tar.bz2) = 1377481 bytes
+SHA1 (patch-aa) = 5ebfe97a0edb8ecee7495fd5d487eff3cf32d1fe
+SHA1 (patch-ab) = cda29d691e36ea590ea735ee98677e434201f74c
 SHA1 (patch-ac) = 5c05fb0c21288af6cd718f8792cc829bc348dd47
-SHA1 (patch-ad) = 5afd166f210589a4d985451840d2eec44f96bac9
-SHA1 (patch-ae) = 5bd9ec77732bc9821a0e723d00778fe03f296da1
diff --git a/net/proftpd/patches/patch-aa b/net/proftpd/patches/patch-aa
index 4fdc45aa9de..ae5c6fecc3d 100644
--- a/net/proftpd/patches/patch-aa
+++ b/net/proftpd/patches/patch-aa
@@ -1,13 +1,13 @@
-$NetBSD: patch-aa,v 1.6 2003/12/07 13:53:34 martti Exp $
+$NetBSD: patch-aa,v 1.7 2005/11/03 19:09:46 martti Exp $
 
---- Makefile.in.orig	Fri Oct  3 20:44:21 2003
-+++ Makefile.in	Sun Dec  7 15:43:50 2003
-@@ -102,7 +102,7 @@
+--- Makefile.in.orig	2005-05-07 22:19:49.000000000 +0300
++++ Makefile.in	2005-11-03 18:43:25.000000000 +0200
+@@ -112,7 +112,7 @@
  	$(INSTALL_MAN) $(top_srcdir)/utils/ftpwho.1   $(DESTDIR)$(mandir)/man1
  	$(INSTALL_MAN) $(top_srcdir)/src/xferlog.5    $(DESTDIR)$(mandir)/man5
  
--install-all: install-proftpd install-utils install-conf install-man
-+install-all: install-proftpd install-utils install-man
+-install-all: install-proftpd install-modules install-utils install-conf install-man $(INSTALL_DEPS)
++install-all: install-proftpd install-modules install-utils install-man $(INSTALL_DEPS)
  
  install: all install-all
  
diff --git a/net/proftpd/patches/patch-ab b/net/proftpd/patches/patch-ab
index 597213bdb79..37a5bc9cb5b 100644
--- a/net/proftpd/patches/patch-ab
+++ b/net/proftpd/patches/patch-ab
@@ -1,18 +1,22 @@
-$NetBSD: patch-ab,v 1.1 2005/06/22 22:43:37 salo Exp $
+$NetBSD: patch-ab,v 1.2 2005/11/03 19:09:46 martti Exp $
 
---- configure.orig	2004-05-26 04:17:24.000000000 +0200
-+++ configure	2005-06-23 00:25:54.000000000 +0200
-@@ -16809,11 +16809,11 @@
+--- configure.orig	2005-10-20 02:33:37.000000000 +0300
++++ configure	2005-11-03 18:44:50.000000000 +0200
+@@ -35808,7 +35808,7 @@
  _ACEOF
  
  cat >>confdefs.h <<_ACEOF
--#define PID_FILE_PATH "`eval echo "${localstatedir}/proftpd.pid"`"
-+#define PID_FILE_PATH "`eval echo "${localstatedir}/run/proftpd.pid"`"
+-#define PR_RUN_DIR "`eval echo "${localstatedir}/proftpd"`"
++#define PR_RUN_DIR "`eval echo "${localstatedir}/run"`"
  _ACEOF
  
  cat >>confdefs.h <<_ACEOF
--#define RUN_DIR "`eval echo "${localstatedir}/proftpd"`"
-+#define RUN_DIR "`eval echo "${localstatedir}/run"`"
+@@ -35816,7 +35816,7 @@
+ _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-ad b/net/proftpd/patches/patch-ad
deleted file mode 100644
index 055c20e0a0a..00000000000
--- a/net/proftpd/patches/patch-ad
+++ /dev/null
@@ -1,13 +0,0 @@
-$NetBSD: patch-ad,v 1.1 2005/08/06 11:51:18 adrianp Exp $
-
---- src/response.c.orig	2005-08-06 12:20:27.000000000 +0100
-+++ src/response.c
-@@ -169,7 +169,7 @@ void pr_response_send_async(const char *
-   buf[sizeof(buf) - 1] = '\0';
-   sstrcat(buf, "\r\n", sizeof(buf));
- 
--  RESPONSE_WRITE_STR_ASYNC(session.c->outstrm, buf, strlen(buf))
-+  RESPONSE_WRITE_STR_ASYNC(session.c->outstrm, "%s", buf)
- }
- 
- void pr_response_send(const char *resp_numeric, const char *fmt, ...) {
diff --git a/net/proftpd/patches/patch-ae b/net/proftpd/patches/patch-ae
deleted file mode 100644
index 7c403dde31a..00000000000
--- a/net/proftpd/patches/patch-ae
+++ /dev/null
@@ -1,40 +0,0 @@
-$NetBSD: patch-ae,v 1.1 2005/08/06 11:51:18 adrianp Exp $
-
---- contrib/mod_sql.c.orig	2004-08-03 01:44:31.000000000 +0100
-+++ contrib/mod_sql.c
-@@ -2036,7 +2036,7 @@ MODRET info_master(cmd_rec *cmd) {
-       *outsp++ = 0;
- 
-       /* add the response */
--      pr_response_add( c->argv[0], outs);
-+      pr_response_add(c->argv[0], "%s", outs);
- 
-     } while((c = find_config_next(c, c->next, CONF_PARAM, name, FALSE)) != NULL);
- 
-@@ -2110,7 +2110,7 @@ MODRET info_master(cmd_rec *cmd) {
-       *outsp++ = 0;
- 
-       /* add the response */
--      pr_response_add( c->argv[0], outs);
-+      pr_response_add(c->argv[0], "%s", outs);
- 
-     } while((c = find_config_next(c, c->next, CONF_PARAM, name, FALSE)) != NULL);
- 
-@@ -2201,7 +2201,7 @@ MODRET errinfo_master(cmd_rec *cmd) {
-       *outsp++ = 0;
- 
-       /* add the response */
--      pr_response_add_err( c->argv[0], outs);
-+      pr_response_add_err(c->argv[0], "%s", outs);
- 
-     } while((c = find_config_next(c, c->next, CONF_PARAM, name, FALSE)) != NULL);
- 
-@@ -2275,7 +2275,7 @@ MODRET errinfo_master(cmd_rec *cmd) {
-       *outsp++ = 0;
- 
-       /* add the response */
--      pr_response_add( c->argv[0], outs);
-+      pr_response_add(c->argv[0], "%s", outs);
- 
-     } while((c = find_config_next(c, c->next, CONF_PARAM, name, FALSE)) != NULL);
-