cpet/freebsd-ports
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Update ftp/proftpd to 1.3.5

Browse Source 
Update ftp/proftpd-mod_geoip to 1.3.5 (now shipped with ProFTPd)
Update security/proftpd-mod_clamav to 0.13
This commit is contained in:
Martin Matuska 2014-05-19 22:58:14 +00:00
parent 4bd88d4e44
commit 89cb192015
Notes: svn2git 2021-03-31 03:12:20 +00:00 
svn path=/head/; revision=354587
5 changed files with 16 additions and 35 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
ftp/proftpd-mod_geoip/Makefile
View File

@ -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"

8
ftp/proftpd/Makefile
View File

@ -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:"

11
ftp/proftpd/distinfo
View File

@ -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

11
ftp/proftpd/files/patch-src-wtmp.c
View File

@ -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

8
security/proftpd-mod_clamav/Makefile
View File

@ -2,7 +2,7 @@
# $FreeBSD$
PORTNAME= mod_clamav
DISTVERSION= 0.13rc2
DISTVERSION= 0.13
PORTREVISION= 0
CATEGORIES= security ftp
PKGNAMEPREFIX= proftpd-
@ -18,11 +18,11 @@ LATEST_LINK= ${PKGNAMEPREFIX}-${PORTNAME}
MASTERDIR= ${.CURDIR}/../../ftp/proftpd
GH_TAGNAME= v${DISTVERSION}
GIT_REVISION= 0b524e3
GIT_REVISION= f0cad45
RUN_DEPENDS+= clamd:${PORTSDIR}/security/clamav
_PROFTPD_MODULE_DISTFILES= mod_clamav-v0.13rc2${EXTRACT_SUFX}:clamav
_PROFTPD_MODULE_EXTRACT_ONLY= mod_clamav-v0.13rc2${EXTRACT_SUFX}
_PROFTPD_MODULE_DISTFILES= mod_clamav-v0.13${EXTRACT_SUFX}:clamav
_PROFTPD_MODULE_EXTRACT_ONLY= mod_clamav-v0.13${EXTRACT_SUFX}
_PROFTPD_MODULE_MASTER_SITES= https://codeload.github.com/jbenden/mod_clamav/legacy.tar.gz/${GH_TAGNAME}?dummy=/:clamav
INCLUDEDIRS= ${LOCALBASE}/include