From owner-svn-ports-head@FreeBSD.ORG Mon May 19 22:58:15 2014 Return-Path: Delivered-To: svn-ports-head@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) (using TLSv1 with cipher ADH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTPS id D973F3B8; Mon, 19 May 2014 22:58:15 +0000 (UTC) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:1900:2254:2068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id BB9CB2138; Mon, 19 May 2014 22:58:15 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.8/8.14.8) with ESMTP id s4JMwFEf006653; Mon, 19 May 2014 22:58:15 GMT (envelope-from mm@svn.freebsd.org) Received: (from mm@localhost) by svn.freebsd.org (8.14.8/8.14.8/Submit) id s4JMwEQM006649; Mon, 19 May 2014 22:58:14 GMT (envelope-from mm@svn.freebsd.org) Message-Id: <201405192258.s4JMwEQM006649@svn.freebsd.org> From: Martin Matuska Date: Mon, 19 May 2014 22:58:14 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r354587 - in head: ftp/proftpd ftp/proftpd-mod_geoip ftp/proftpd/files security/proftpd-mod_clamav X-SVN-Group: ports-head MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-ports-head@freebsd.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: SVN commit messages for the ports tree for head List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 19 May 2014 22:58:15 -0000 Author: mm Date: Mon May 19 22:58:14 2014 New Revision: 354587 URL: http://svnweb.freebsd.org/changeset/ports/354587 QAT: https://qat.redports.org/buildarchive/r354587/ Log: 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 Deleted: head/ftp/proftpd/files/patch-src-wtmp.c Modified: head/ftp/proftpd-mod_geoip/Makefile head/ftp/proftpd/Makefile head/ftp/proftpd/distinfo head/security/proftpd-mod_clamav/Makefile Modified: head/ftp/proftpd-mod_geoip/Makefile ============================================================================== --- head/ftp/proftpd-mod_geoip/Makefile Mon May 19 19:57:36 2014 (r354586) +++ head/ftp/proftpd-mod_geoip/Makefile Mon May 19 22:58:14 2014 (r354587) @@ -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" Modified: head/ftp/proftpd/Makefile ============================================================================== --- head/ftp/proftpd/Makefile Mon May 19 19:57:36 2014 (r354586) +++ head/ftp/proftpd/Makefile Mon May 19 22:58:14 2014 (r354587) @@ -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/proftp 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_o .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:" Modified: head/ftp/proftpd/distinfo ============================================================================== --- head/ftp/proftpd/distinfo Mon May 19 19:57:36 2014 (r354586) +++ head/ftp/proftpd/distinfo Mon May 19 22:58:14 2014 (r354587) @@ -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 + Modified: head/security/proftpd-mod_clamav/Makefile ============================================================================== --- head/security/proftpd-mod_clamav/Makefile Mon May 19 19:57:36 2014 (r354586) +++ head/security/proftpd-mod_clamav/Makefile Mon May 19 22:58:14 2014 (r354587) @@ -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