4 files changed, 33 insertions, 39 deletions

diff --git a/ftp/proftpd-devel/Makefile b/ftp/proftpd-devel/Makefile
index 072b4df6e615..6a6be333e203 100644
--- a/ftp/proftpd-devel/Makefile
+++ b/ftp/proftpd-devel/Makefile
@@ -6,14 +6,12 @@
 #
 
 PORTNAME=	proftpd
-DISTVERSION=	1.3.20080920
+DISTVERSION=	1.3.20080922
 CATEGORIES=	ftp
 MASTER_SITES=	http://www.alaskaparadise.com/freebsd/ \
 		LOCAL/beech \
 		LOCAL/beech:clam \
-		LOCAL/beech:digest \
-		LOCAL/beech:comb \
-		LOCAL/beech:sql_tds
+		LOCAL/beech:digest
 PKGNAMESUFFIX=	-devel
 DISTFILES=	${DISTNAME}${EXTRACT_SUFX}
 EXTRACT_ONLY=	${DISTNAME}${EXTRACT_SUFX}
@@ -66,7 +64,6 @@ OPTIONS=	IPV6 "Use IPv6" off \
 		PGSQL "Postgres auth (Can be combined)" off \
 		SQLITE "SQLite auth (Can be combined)" off \
 		ODBC "ODBC (Can be combined)" off \
-		TDS "FreeTDS - Sybase & MS-SQL auth (Exclusive)" off \
 		OPENSSL "Include mod_tls" on \
 		QUOTA "Include mod_quota" off \
 		IFSESSION "Include mod_ifsession" on \
@@ -83,8 +80,7 @@ OPTIONS=	IPV6 "Use IPv6" off \
 		NLS "Use nls (builds mod_lang)" off \
 		UNIQUE "Include mod_unique_id" off \
 		CLAMAV "Include mod_clamav" off \
-		DIGEST "Include mod_digest" off \
-		COMB "Include mod_comb (multistream upload)" off
+		DIGEST "Include mod_digest" off
 
 MODULES?=
 LIBDIRS?=
@@ -256,26 +252,6 @@ DISTFILES+=	mod_digest.c:digest
 MODULES:=${MODULES}:mod_digest
 .endif
 
-.if defined(WITH_COMB)
-COMB_VERSION=	0.1
-DISTFILES+=	mod_comb-${COMB_VERSION}.tar.bz2:comb
-EXTRACT_ONLY+=	mod_comb-${COMB_VERSION}.tar.bz2
-MODULES:=${MODULES}:mod_comb
-PORTDOCScontrib+=mod_comb.html
-PORTDOCSreadme+=README.mod_comb
-.endif
-
-.if defined(WITH_TDS)
-DISTFILES+=	mod_sql_tds-4.5.tar.bz2:sql_tds
-EXTRACT_ONLY+=	mod_sql_tds-4.5.tar.bz2
-MODULES:=${MODULES}:mod_sql_tds
-MODULES:=mod_sql${MODULES}
-PLIST_FILES+=	include/proftpd/mod_sql.h
-INCLUDEDIRS:=${INCLUDEDIRS}:${LOCALBASE}/include
-LIBDIRS:=${LIBDIRS}:${LOCALBASE}/lib
-LIB_DEPENDS+=	sybdb.5:${PORTSDIR}/databases/freetds
-.endif
-
 # mod_ifsession should be the last item in the modules list
 .if !defined(WITHOUT_IFSESSION)
 MODULES:=${MODULES}:mod_ifsession
@@ -305,15 +281,6 @@ post-extract:
 .if defined(WITH_DIGEST)
 	@${CP} ${DISTDIR}/${DIST_SUBDIR}/mod_digest.c ${WRKSRC}/modules/
 .endif
-.if defined(WITH_COMB)
-	@${MV} ${WRKDIR}/mod_comb-${COMB_VERSION}/mod_comb.c ${WRKSRC}/contrib/
-	@${MV} ${WRKDIR}/mod_comb-${COMB_VERSION}/README ${WRKSRC}/README.mod_comb
-	@${MV} ${WRKDIR}/mod_comb-${COMB_VERSION}/mod_comb.html ${WRKSRC}/doc/contrib/
-.endif
-
-.if defined(WITH_TDS)
-	 @${MV} ${WRKDIR}/mod_sql_tds.c ${WRKSRC}/contrib/
-.endif
 
 post-patch:
 .if defined(WITH_NLS)
diff --git a/ftp/proftpd-devel/distinfo b/ftp/proftpd-devel/distinfo
index 368d4ca38fd6..342bca346f64 100644
--- a/ftp/proftpd-devel/distinfo
+++ b/ftp/proftpd-devel/distinfo
@@ -1,6 +1,9 @@
-MD5 (proftpd-1.3.20080920.tar.bz2) = 71fcf129c941ee12219a7c1f3aa8257b
-SHA256 (proftpd-1.3.20080920.tar.bz2) = d67189b56d959854e678321eeb851453027d293b0d3d3de8781a883a2bf34837
-SIZE (proftpd-1.3.20080920.tar.bz2) = 2345333
+MD5 (proftpd-1.3.20080922.tar.bz2) = 5ee6eda1ef2beaacc01449b290e74461
+SHA256 (proftpd-1.3.20080922.tar.bz2) = 0da28a00ac939929150e99c65a2303389889fa80ace6c169b0ff5196ed2a3e3a
+SIZE (proftpd-1.3.20080922.tar.bz2) = 2330925
 MD5 (mod_clamav-0.10.tar.bz2) = 7150cde88f6c692711c007f6312bd495
 SHA256 (mod_clamav-0.10.tar.bz2) = 4f6d09979514a8b3f120890753dcf7c6247dfce0aa09d340edf8a359b031a1f4
 SIZE (mod_clamav-0.10.tar.bz2) = 5435
+MD5 (mod_digest.c) = e706e66fa4d82cf7875a1a5d6767fe00
+SHA256 (mod_digest.c) = 18174e3d3c1d61367d78c228e6510b0a21c11458f389630df281bb84d467d399
+SIZE (mod_digest.c) = 39073
diff --git a/ftp/proftpd-devel/files/extra-patch-modules_mod_xfer.c b/ftp/proftpd-devel/files/extra-patch-modules_mod_xfer.c
new file mode 100644
index 000000000000..36f7ca90c2b5
--- /dev/null
+++ b/ftp/proftpd-devel/files/extra-patch-modules_mod_xfer.c
@@ -0,0 +1,23 @@
+--- modules/mod_xfer.c.org	Tue Jan  1 12:31:32 2008
++++ modules/mod_xfer.c	Tue Jan  1 16:45:20 2008
+@@ -42,6 +42,8 @@
+ #include <regex.h>
+ #endif
+ 
++#include "mod_clamav.h"
++
+ extern module auth_module;
+ extern pid_t mpid;
+ 
+@@ -1582,6 +1584,11 @@
+       return PR_ERROR(cmd);
+     }
+ 
++	if (clamav_scan(cmd)) {
++		pr_data_close(FALSE);
++		return PR_ERROR(cmd);
++	}
++	
+     if (session.xfer.path &&
+         session.xfer.path_hidden) {
+       if (pr_fsio_rename(session.xfer.path_hidden, session.xfer.path) != 0) {
diff --git a/ftp/proftpd-devel/pkg-plist b/ftp/proftpd-devel/pkg-plist
index 71ccaee85b00..1a3779a97dd3 100644
--- a/ftp/proftpd-devel/pkg-plist
+++ b/ftp/proftpd-devel/pkg-plist
@@ -64,3 +64,4 @@ sbin/ftpshut
 sbin/in.proftpd
 sbin/proftpd
 @dirrm include/proftpd
+@dirrm lib/proftpd