Update ftp/proftpd to 1.3.5

Update ftp/proftpd-mod_geoip to 1.3.5 (now shipped with ProFTPd)
Update security/proftpd-mod_clamav to 0.13

4 files changed, 12 insertions, 31 deletions

diff --git a/ftp/proftpd-mod_geoip/Makefile b/ftp/proftpd-mod_geoip/Makefile
index 8ed9bfd86436..3033e60192c8 100644
--- a/ftp/proftpd-mod_geoip/Makefile
+++ b/ftp/proftpd-mod_geoip/Makefile
@@ -2,8 +2,6 @@
 # $FreeBSD$
 
 PORTNAME=	mod_geoip
-DISTVERSION=	0.3
-PORTREVISION=	0
 CATEGORIES=	ftp
 PKGNAMEPREFIX=	proftpd-
 
@@ -12,23 +10,16 @@ COMMENT=	GeoIP ProFTPD module
 
 LICENSE=	GPLv2
 
+LIB_DEPENDS=	libGeoIP.so:${PORTSDIR}/net/GeoIP
+
 DESCR=		${.CURDIR}/pkg-descr
 
 LATEST_LINK=	${PKGNAMEPREFIX}-${PORTNAME}
 MASTERDIR=	${.CURDIR}/../../ftp/proftpd
 
-LIB_DEPENDS=	GeoIP.5:${PORTSDIR}/net/GeoIP
-
-_PROFTPD_MODULE_DISTFILES=	proftpd-mod-geoip-${DISTVERSION}${EXTRACT_SUFX}:mod_geoip
-_PROFTPD_MODULE_EXTRACT_ONLY=   proftpd-mod-geoip-${DISTVERSION}${EXTRACT_SUFX}
-_PROFTPD_MODULE_MASTER_SITES=   http://www.castaglia.org/proftpd/modules/:mod_geoip
-
 INCLUDEDIRS=	${LOCALBASE}/include
 LIBDIRS=	${LOCALBASE}/lib
 
 _BUILDING_PROFTPD_MODULE=	${PORTNAME}
 
-post-extract:
-	@${CP} ${WRKDIR}/mod_geoip/mod_geoip.c ${WRKSRC}/contrib
-
 .include "${MASTERDIR}/Makefile"
diff --git a/ftp/proftpd/Makefile b/ftp/proftpd/Makefile
index 2d487e626d13..993865741930 100644
--- a/ftp/proftpd/Makefile
+++ b/ftp/proftpd/Makefile
@@ -5,7 +5,7 @@ PORTNAME?=	proftpd
 .if !defined(DISTVERSION)
 PORTVERSION?=	${PROFTPD_VERSION}
 .endif
-PORTREVISION?=	6
+PORTREVISION?=	0	
 CATEGORIES?=	ftp
 MASTER_SITES=	ftp://ftp.proftpd.org/distrib/source/ \
 		https://github.com/downloads/proftpd/proftpd.github.com/ \
@@ -26,7 +26,7 @@ BUILD_DEPENDS+=	${LOCALBASE}/sbin/proftpd:${PORTSDIR}/ftp/proftpd
 RUN_DEPENDS+=	${LOCALBASE}/sbin/proftpd:${PORTSDIR}/ftp/proftpd
 .endif
 
-PROFTPD_VERSION=	1.3.4d
+PROFTPD_VERSION=	1.3.5
 
 .if defined(_BUILDING_PROFTPD_MODULE)
 DISTFILES+=	${DISTNAME}${EXTRACT_SUFX}
@@ -111,6 +111,7 @@ MODULES+=	mod_ban \
 		mod_copy \
 		mod_ctrls_admin \
 		mod_deflate \
+		mod_dnsbl \
 		mod_dynmasq \
 		mod_exec \
 		mod_ifsession \
@@ -129,6 +130,7 @@ MODULES+=	mod_ban \
 		mod_sftp_sql \
 		mod_shaper \
 		mod_site_misc \
+		mod_snmp \
 		mod_sql \
 		mod_sql_passwd \
 		mod_tls \
@@ -207,7 +209,7 @@ CONFIGURE_ARGS+=	ac_cv_lib_iconv_iconv_open=no \
 .endif
 
 post-patch:
-	@${REINPLACE_CMD} -e 's|proftpd\.conf|proftpd.conf.sample|g' ${WRKSRC}/Makefile.in
+	@${REINPLACE_CMD} -e 's|proftpd\.conf |proftpd.conf.sample |g' ${WRKSRC}/Makefile.in
 
 pre-configure:
 	@${ECHO_MSG} "==> Configuring with following modules:"
diff --git a/ftp/proftpd/distinfo b/ftp/proftpd/distinfo
index ea49f33d868e..44cde006ab1c 100644
--- a/ftp/proftpd/distinfo
+++ b/ftp/proftpd/distinfo
@@ -1,8 +1,7 @@
-SHA256 (proftpd-1.3.4d.tar.gz) = c198b53991ce641eae6b3237e856e59f0bfe8330794145b49cae33f85b6f5370
-SIZE (proftpd-1.3.4d.tar.gz) = 7697046
-SHA256 (mod_clamav-v0.13rc2.tar.gz) = 06b49e0042fdd86d198ad1b1cf33f2c296cb2b6dcbdd2010df392ec37b670457
-SIZE (mod_clamav-v0.13rc2.tar.gz) = 10841
-SHA256 (proftpd-mod-geoip-0.3.tar.gz) = a69c5def3761f5ba00bc95f6c633c7cfb68fb31fcadc3185ed476410fd8ec3aa
-SIZE (proftpd-mod-geoip-0.3.tar.gz) = 11356
+SHA256 (proftpd-1.3.5.tar.gz) = c10316fb003bd25eccbc08c77dd9057e053693e6527ffa2ea2cc4e08ccb87715
+SIZE (proftpd-1.3.5.tar.gz) = 7594509
+SHA256 (mod_clamav-v0.13.tar.gz) = 7f60bebbb58836319bf249be77540efc6667a55caca8aaba164e6a61cd0c3db7
+SIZE (mod_clamav-v0.13.tar.gz) = 11683
 SHA256 (mod_sql_tds-4.13.tar.gz) = 9d9fb6c4b9a952739a84e166ed8b0d93f539c7bcf73e32923318e00cbd7eea08
 SIZE (mod_sql_tds-4.13.tar.gz) = 11688
+
diff --git a/ftp/proftpd/files/patch-src-wtmp.c b/ftp/proftpd/files/patch-src-wtmp.c
deleted file mode 100644
index a73ecf1f7fe5..000000000000
--- a/ftp/proftpd/files/patch-src-wtmp.c
+++ /dev/null
@@ -1,11 +0,0 @@
---- src/wtmp.c.orig	2012-08-04 08:45:32.292505678 +0200
-+++ src/wtmp.c	2012-08-04 08:45:35.508505108 +0200
-@@ -97,7 +97,7 @@
- #else /* SVR4 */
-     utx.ut_syslen = strlen(utx.ut_host)+1;
- 
--#  ifdef __sparcv9
-+#  ifdef __sparcv9 && !defined(__FreeBSD__)
-     time(&t);
-     utx.ut_tv.tv_sec = (time32_t)t;
- #  else