Changes 1.3.3d:

* Fixed sql_prepare_where() buffer overflow.
* Fixed CPU spike when handling .ftpaccess files.
* Fixed handling of SFTP uploads when compression is used.

6 files changed, 28 insertions, 28 deletions

diff --git a/net/proftpd/Makefile b/net/proftpd/Makefile
index 250fb2ed3de..fde64366b48 100644
--- a/net/proftpd/Makefile
+++ b/net/proftpd/Makefile
@@ -1,31 +1,30 @@
-# $NetBSD: Makefile,v 1.59 2010/11/07 12:21:09 obache Exp $
+# $NetBSD: Makefile,v 1.60 2011/01/12 07:31:00 adam Exp $
 
-DISTNAME=		proftpd-1.3.3c
-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
+DISTNAME=	proftpd-1.3.3d
+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
 
-MAINTAINER=		kim@tac.nyc.ny.us
-HOMEPAGE=		http://www.proftpd.org/
-COMMENT=		FTP server with Apache like configuration
-LICENSE=		gnu-gpl-v2
+MAINTAINER=	kim@tac.nyc.ny.us
+HOMEPAGE=	http://www.proftpd.org/
+COMMENT=	FTP server with Apache like configuration
+LICENSE=	gnu-gpl-v2
 
 PKG_DESTDIR_SUPPORT=	user-destdir
 
 WRKSRC=			${WRKDIR}/${PKGNAME_NOREV}
 
-GNU_CONFIGURE=		yes
 USE_TOOLS+=		gmake intltool msgfmt
-
+GNU_CONFIGURE=		yes
 CONFIGURE_ARGS+=	--sysconfdir=${PKG_SYSCONFDIR}
 CONFIGURE_ARGS+=	--localstatedir=${VARBASE}/run
 CONFIGURE_ARGS+=	--disable-sendfile
 CONFIGURE_ARGS+=	--enable-ctrls
 CONFIGURE_ARGS+=	--enable-nls
-
-CONFIGURE_ENV+=		install_user=${ROOT_USER} install_group=${ROOT_GROUP}
+CONFIGURE_ENV+=		install_group=${ROOT_GROUP}
+CONFIGURE_ENV+=		install_user=${ROOT_USER}
 
 BUILD_DEFS+=		VARBASE
 
diff --git a/net/proftpd/PLIST b/net/proftpd/PLIST
index 8c9e62adacc..2b6656ee0ed 100644
--- a/net/proftpd/PLIST
+++ b/net/proftpd/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.22 2010/11/07 12:21:09 obache Exp $
+@comment $NetBSD: PLIST,v 1.23 2011/01/12 07:31:00 adam Exp $
 bin/ftpcount
 bin/ftpdctl
 bin/ftptop
@@ -33,6 +33,9 @@ include/proftpd/libsupp.h
 include/proftpd/log.h
 include/proftpd/mkhome.h
 include/proftpd/mod_ctrls.h
+${PLIST.quota}include/proftpd/mod_quotatab.h
+${PLIST.sql}include/proftpd/mod_sql.h
+${PLIST.tls}include/proftpd/mod_tls.h
 include/proftpd/modules.h
 include/proftpd/netacl.h
 include/proftpd/netaddr.h
diff --git a/net/proftpd/PLIST.mod_quota b/net/proftpd/PLIST.mod_quota
deleted file mode 100644
index d01aeaffe94..00000000000
--- a/net/proftpd/PLIST.mod_quota
+++ /dev/null
@@ -1,2 +0,0 @@
-@comment $NetBSD: PLIST.mod_quota,v 1.1 2007/01/24 05:22:01 martti Exp $
-include/proftpd/mod_quotatab.h
diff --git a/net/proftpd/PLIST.mod_sql b/net/proftpd/PLIST.mod_sql
deleted file mode 100644
index 733bf33c8a2..00000000000
--- a/net/proftpd/PLIST.mod_sql
+++ /dev/null
@@ -1,2 +0,0 @@
-@comment $NetBSD: PLIST.mod_sql,v 1.1 2007/01/24 05:22:01 martti Exp $
-include/proftpd/mod_sql.h
diff --git a/net/proftpd/distinfo b/net/proftpd/distinfo
index 21152c1517c..5ad7d673ec0 100644
--- a/net/proftpd/distinfo
+++ b/net/proftpd/distinfo
@@ -1,8 +1,8 @@
-$NetBSD: distinfo,v 1.34 2010/11/07 12:21:09 obache Exp $
+$NetBSD: distinfo,v 1.35 2011/01/12 07:31:00 adam Exp $
 
-SHA1 (proftpd-1.3.3c.tar.bz2) = 167d2f5f22f2bf8a5365b18adfd18a5fc750b07f
-RMD160 (proftpd-1.3.3c.tar.bz2) = 08a6fac94aa3449192e92848c6271cca33ea26cc
-Size (proftpd-1.3.3c.tar.bz2) = 4166609 bytes
+SHA1 (proftpd-1.3.3d.tar.bz2) = b2ee3ffdaa971c24327ad66412f2d71b628eddab
+RMD160 (proftpd-1.3.3d.tar.bz2) = 8aa4e1c0456c771ae77e8682bd612b1229d05f4b
+Size (proftpd-1.3.3d.tar.bz2) = 4177511 bytes
 SHA1 (patch-aa) = a684d275e0b872f9d7d57b8b4d5e97a630a48eaf
 SHA1 (patch-ab) = 9567cb34dab7feee696cddea4dba7930e500460e
 SHA1 (patch-ac) = d1ba5ec4265337c648da2f76460694a5a7a2dd10
diff --git a/net/proftpd/options.mk b/net/proftpd/options.mk
index 396025a8442..ba2ae11f712 100644
--- a/net/proftpd/options.mk
+++ b/net/proftpd/options.mk
@@ -1,5 +1,4 @@
-# $NetBSD: options.mk,v 1.9 2010/11/07 12:21:09 obache Exp $
-#
+# $NetBSD: options.mk,v 1.10 2011/01/12 07:31:00 adam Exp $
 
 PKG_OPTIONS_VAR=	PKG_OPTIONS.proftpd
 PKG_SUGGESTED_OPTIONS=	pam inet6
@@ -9,6 +8,8 @@ PKG_OPTIONS_GROUP.sql=		mysql pgsql
 
 .include "../../mk/bsd.options.mk"
 
+PLIST_VARS+=	quota sql tls
+
 .if !empty(PKG_OPTIONS:Mpam)
 CONFIGURE_ARGS+=	--enable-auth-pam
 .include "../../mk/pam.buildlink3.mk"
@@ -31,12 +32,13 @@ MODULES:=	${MODULES}:mod_wrap
 
 .if !empty(PKG_OPTIONS:Mtls)
 MODULES:=	${MODULES}:mod_tls
+PLIST.tls=	yes
 .include "../../security/openssl/buildlink3.mk"
 .endif
 
 .if !empty(PKG_OPTIONS:Mquota)
 MODULES:=	${MODULES}:mod_quotatab:mod_quotatab_file
-PLIST_SRC+=	${PKGDIR}/PLIST.mod_quota
+PLIST.quota=	yes
 .endif
 
 .if !empty(PKG_OPTIONS:Mquota) && !empty(PKG_OPTIONS:Mmysql)
@@ -58,7 +60,7 @@ MODULES:=	${MODULES}:mod_ldap
 
 .if !empty(PKG_OPTIONS:Mmysql)
 MODULES:=	${MODULES}:mod_sql:mod_sql_mysql
-PLIST_SRC+=	${PKGDIR}/PLIST.mod_sql
+PLIST.sql=	yes
 .include "../../mk/mysql.buildlink3.mk"
 .endif