Date: Tue, 24 Feb 2015 15:26:20 +0000 (UTC) From: Gabor Kovesdan <gabor@FreeBSD.org> To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r379807 - in head/security/amavisd-new: . files Message-ID: <201502241526.t1OFQKnn069720@svn.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: gabor Date: Tue Feb 24 15:26:20 2015 New Revision: 379807 URL: https://svnweb.freebsd.org/changeset/ports/379807 QAT: https://qat.redports.org/buildarchive/r379807/ Log: - Update to 2.10.1 - Add p0f-analyzer.pl to SHEBANG_FILES [1] - Remove reference to deprecated virus scanners [2] - Use conventional sample file naming [2] PR: 195870 [1], 194412 [2] Submitted by: me@nileshgr.com [1], takefu@airport.fm [2] Modified: head/security/amavisd-new/Makefile head/security/amavisd-new/distinfo head/security/amavisd-new/files/pkg-message.in head/security/amavisd-new/pkg-plist Modified: head/security/amavisd-new/Makefile ============================================================================== --- head/security/amavisd-new/Makefile Tue Feb 24 15:26:11 2015 (r379806) +++ head/security/amavisd-new/Makefile Tue Feb 24 15:26:20 2015 (r379807) @@ -1,8 +1,7 @@ # $FreeBSD$ PORTNAME= amavisd-new -PORTVERSION= 2.9.1 -PORTREVISION= 1 +PORTVERSION= 2.10.1 PORTEPOCH= 1 CATEGORIES= security MASTER_SITES= http://www.ijs.si/software/amavisd/ \ @@ -24,7 +23,7 @@ RUN_DEPENDS= p5-Unix-Syslog>=0:${PORTSDI USES= perl5 shebangfix tar:xz USE_PERL5= run -SHEBANG_FILES= amavisd-agent amavisd-nanny amavisd-release +SHEBANG_FILES= amavisd-agent amavisd-nanny amavisd-release p0f-analyzer.pl NO_BUILD= yes @@ -245,11 +244,9 @@ do-install: .for i in amavisd amavisd-agent amavisd-nanny amavisd-release amavisd-snmp-subagent ${INSTALL_SCRIPT} ${WRKSRC}/${i} ${STAGEDIR}${PREFIX}/sbin .endfor - ${INSTALL_SCRIPT} ${WRKSRC}/amavisd.conf ${STAGEDIR}${PREFIX}/etc/amavisd.conf-dist - @${ECHO_CMD} "@exec if [ ! -f %D/etc/amavisd.conf ]; then ${INSTALL_SCRIPT} %D/etc/amavisd.conf-dist %D/etc/amavisd.conf; fi" >> ${TMPPLIST} + ${INSTALL_SCRIPT} ${WRKSRC}/amavisd.conf ${STAGEDIR}${PREFIX}/etc/amavisd.conf.sample ${INSTALL_SCRIPT} ${WRKSRC}/amavisd.conf-default ${STAGEDIR}${PREFIX}/etc/amavisd.conf-default - ${INSTALL_SCRIPT} ${WRKSRC}/amavisd-custom.conf ${STAGEDIR}${PREFIX}/etc/amavisd-custom.conf-dist - @${ECHO_CMD} "@exec if [ ! -f %D/etc/amavisd-custom.conf ]; then ${INSTALL_SCRIPT} %D/etc/amavisd-custom.conf-dist %D/etc/amavisd-custom.conf; fi" >> ${TMPPLIST} + ${INSTALL_SCRIPT} ${WRKSRC}/amavisd-custom.conf ${STAGEDIR}${PREFIX}/etc/amavisd-custom.conf.sample .if ${PORT_OPTIONS:MDOCS} @${MKDIR} ${STAGEDIR}${DOCSDIR}/images .for i in ${DOCS} Modified: head/security/amavisd-new/distinfo ============================================================================== --- head/security/amavisd-new/distinfo Tue Feb 24 15:26:11 2015 (r379806) +++ head/security/amavisd-new/distinfo Tue Feb 24 15:26:20 2015 (r379807) @@ -1,2 +1,2 @@ -SHA256 (amavisd-new-2.9.1.tar.xz) = 442d6c185c19fd1d3288ee7eb2ac102a7d541c4d6e1724cdaf369df6ca629ba0 -SIZE (amavisd-new-2.9.1.tar.xz) = 753076 +SHA256 (amavisd-new-2.10.1.tar.xz) = 1d3d3f372d0888018b950ee19704c298b5d02e2c287ca2d5f1a785a078b6038f +SIZE (amavisd-new-2.10.1.tar.xz) = 767716 Modified: head/security/amavisd-new/files/pkg-message.in ============================================================================== --- head/security/amavisd-new/files/pkg-message.in Tue Feb 24 15:26:11 2015 (r379806) +++ head/security/amavisd-new/files/pkg-message.in Tue Feb 24 15:26:20 2015 (r379807) @@ -4,10 +4,8 @@ The following virus scanners are available in the FreeBSD ports collection: - /usr/ports/security/vscan McAfee VirusScan /usr/ports/security/clamav Clam Antivirus /usr/ports/security/f-prot F-Prot Antivirus - /usr/ports/security/drweb DrWeb antivirus suite Enable amavisd-new in /etc/rc.conf with the following line: @@ -38,8 +36,7 @@ amavis_p0fanalyzer_flags. Configuration templates are available in %%PREFIX%%/etc - as amavisd.conf-dist, amavisd.conf-sample, amavisd.conf-default - and amavisd-custom.conf-dist. + as amavisd.conf.sample, amavisd.conf-default and amavisd-custom.conf.sample Documentation is available in %%DOCSDIR%%. ******************************************************************* Modified: head/security/amavisd-new/pkg-plist ============================================================================== --- head/security/amavisd-new/pkg-plist Tue Feb 24 15:26:11 2015 (r379806) +++ head/security/amavisd-new/pkg-plist Tue Feb 24 15:26:20 2015 (r379807) @@ -1,4 +1,3 @@ -@unexec if cmp -s %%PREFIX%%/etc/amavisd-custom.conf %%PREFIX%%/etc/amavisd-custom.conf-dist; then rm %%PREFIX%%/etc/amavisd-custom.conf; fi %%PORTDOCS%%%%DOCSDIR%%/AAAREADME.first %%PORTDOCS%%%%DOCSDIR%%/AMAVIS-MIB.txt %%PORTDOCS%%%%DOCSDIR%%/INSTALL @@ -62,14 +61,12 @@ %%PORTDOCS%%%%DOCSDIR%%/images/toc-plus.png %%PORTDOCS%%%%DOCSDIR%%/images/up.png %%PORTDOCS%%%%DOCSDIR%%/images/warning.png -%%PORTDOCS%%@dirrm %%DOCSDIR%%/images/callouts -%%PORTDOCS%%@dirrm %%DOCSDIR%%/images -%%PORTDOCS%%@dirrm %%DOCSDIR%% -etc/amavisd-custom.conf-dist +%%PORTDOCS%%@dir %%DOCSDIR%%/images/callouts +%%PORTDOCS%%@dir %%DOCSDIR%%/images +%%PORTDOCS%%@dir %%DOCSDIR%% +@sample etc/amavisd-custom.conf.sample etc/amavisd.conf-default -@unexec if cmp -s %D/etc/amavisd.conf %D/etc/amavisd.conf-dist; then rm -f %D/etc/amavisd.conf; fi -etc/amavisd.conf-dist -@exec [ ! -f %B/amavisd.conf ] && cp %B/%f %B/amavisd.conf +@sample etc/amavisd.conf.sample %%AMAVIS_NOP0F%%sbin/p0f-analyzer.pl sbin/amavisd sbin/amavisd-agent
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201502241526.t1OFQKnn069720>