Date: Sun, 6 Jul 2014 15:32:47 +0000 (UTC) From: Guido Falsi <madpilot@FreeBSD.org> To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r360926 - in head/mail/assp: . files Message-ID: <201407061532.s66FWlea059898@svn.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: madpilot Date: Sun Jul 6 15:32:47 2014 New Revision: 360926 URL: http://svnweb.freebsd.org/changeset/ports/360926 QAT: https://qat.redports.org/buildarchive/r360926/ Log: - Update to 1.9.9.14158 - Stagify - Add missing dependency when MYSQL option is enabled - Assign maintainership to submitter PR: 191635 Sumitted by: rnejdl@ringofsaturn.com Deleted: head/mail/assp/files/pkg-install.in Modified: head/mail/assp/Makefile head/mail/assp/distinfo head/mail/assp/files/patch-assp.pl head/mail/assp/pkg-plist Modified: head/mail/assp/Makefile ============================================================================== --- head/mail/assp/Makefile Sun Jul 6 15:32:06 2014 (r360925) +++ head/mail/assp/Makefile Sun Jul 6 15:32:47 2014 (r360926) @@ -2,21 +2,23 @@ # $FreeBSD$ PORTNAME= assp -PORTVERSION= 1.9.9.13257 +PORTVERSION= 1.9.9.14158 PORTEPOCH= 1 CATEGORIES= mail MASTER_SITES= http://www.ringofsaturn.com/distfiles/ DISTNAME= ${PORTNAME:tu}_${PORTVERSION}_Install -MAINTAINER= ports@FreeBSD.org +MAINTAINER= rnejdl@ringofsaturn.com COMMENT= Anti-Spam SMTP Proxy -USES= perl5 zip +RUN_DEPENDS= p5-Net-DNS>=0.68:${PORTSDIR}/dns/p5-Net-DNS \ + p5-libwww>=6.04:${PORTSDIR}/www/p5-libwww \ + p5-HTML-Parser>=3.69:${PORTSDIR}/www/p5-HTML-Parser + +USES= perl5 zip:infozip NO_BUILD= yes USE_PERL5= run -MAN8= assp.8 assplog.8 - ASSP_USER= assp ASSP_GROUP= assp USERS= ${ASSP_USER} @@ -24,9 +26,10 @@ GROUPS= ${ASSP_GROUP} ASSP_HOME= /var/db/assp ASSP_LOG= /var/log/assp -PLIST_SUB= ASSP_HOME="${ASSP_HOME}" ASSP_LOG="${ASSP_LOG}" +PLIST_SUB= ASSP_HOME="${ASSP_HOME}" ASSP_LOG="${ASSP_LOG}" \ + ASSP_USER="${ASSP_USER}" ASSP_GROUP="${ASSP_GROUP}" -SUB_FILES= 510.assp assp.8 assplog.8 assplog.pl pkg-install +SUB_FILES= 510.assp assp.8 assplog.8 assplog.pl SUB_LIST= ASSP_USER="${ASSP_USER}" ASSP_GROUP="${ASSP_GROUP}" \ ASSP_HOME="${ASSP_HOME}" ASSP_LOG="${ASSP_LOG}" \ DATADIR="${DATADIR}" PERL="${PERL}" @@ -53,14 +56,9 @@ IPV6_DESC= IPv6 sockets support OPTIONS_DEFAULT= EMVALID SPF SRS SEND FBACKW CLAMAV DNSBL MATCHRE SENDERB MIMEMOD SSL IPV6 -WRKSRC= ${WRKDIR}/${PORTNAME}-${PORTVERSION}/ASSP_1.9.9_13227_install/${PORTNAME:tu} +WRKSRC= ${WRKDIR}/${PORTNAME}-${PORTVERSION}/ASSP_1.9.9_14158_install/${PORTNAME:tu} -NO_STAGE= yes -.include <bsd.port.pre.mk> - -RUN_DEPENDS+= p5-Net-DNS>=0.68:${PORTSDIR}/dns/p5-Net-DNS \ - p5-libwww>=6.04:${PORTSDIR}/www/p5-libwww \ - p5-HTML-Parser>=3.69:${PORTSDIR}/www/p5-HTML-Parser +.include <bsd.port.options.mk> .if ${PORT_OPTIONS:MEMVALID} RUN_DEPENDS+= p5-Email-Valid>=0.190:${PORTSDIR}/mail/p5-Email-Valid @@ -99,6 +97,7 @@ RUN_DEPENDS+= p5-Net-DNS>=0.68:${PORTSDI .if ${PORT_OPTIONS:MMYSQL} RUN_DEPENDS+= p5-Tie-DBI>=1.05:${PORTSDIR}/databases/p5-Tie-DBI +RUN_DEPENDS+= p5-DBD-mysql>=0:${PORTSDIR}/databases/p5-DBD-mysql .endif .if ${PORT_OPTIONS:MMATCHRE} @@ -127,28 +126,28 @@ post-patch: @${REINPLACE_CMD} -e 's|/usr/bin/perl|${PERL}|' ${WRKSRC}/*.pl do-install: - ${MKDIR} ${DATADIR} - ${INSTALL_SCRIPT} ${WRKSRC}/assp.pl ${DATADIR} - ${INSTALL_SCRIPT} ${WRKSRC}/rebuildspamdb.pl ${DATADIR} - ${INSTALL_SCRIPT} ${WRKSRC}/stat.pl ${DATADIR} + ${MKDIR} ${STAGEDIR}${DATADIR}/images \ + ${STAGEDIR}${DATADIR}/logs ${STAGEDIR}${DATADIR}/reports + ${INSTALL_SCRIPT} ${WRKSRC}/assp.pl ${STAGEDIR}${DATADIR} + (cd ${STAGEDIR} && ${LN} -sf ${DATADIR}/assp.pl ${STAGEDIR}${PREFIX}/sbin/assp) + ${INSTALL_SCRIPT} ${WRKSRC}/rebuildspamdb.pl ${STAGEDIR}${DATADIR} + ${INSTALL_SCRIPT} ${WRKSRC}/stat.pl ${STAGEDIR}${DATADIR} ( cd ${WRKSRC} && ${COPYTREE_SHARE} "files images reports" \ - ${DATADIR}/ "! -name '*.orig' ! -name '*.bak'" ) + ${STAGEDIR}${DATADIR}/ "! -name '*.orig' ! -name '*.bak'" ) - ${INSTALL_SCRIPT} ${WRKDIR}/assplog.pl ${PREFIX}/sbin/assplog + ${INSTALL_SCRIPT} ${WRKDIR}/assplog.pl ${STAGEDIR}${PREFIX}/sbin/assplog - ${INSTALL_MAN} ${WRKDIR}/assp.8 ${MAN8PREFIX}/man/man8 - ${INSTALL_MAN} ${WRKDIR}/assplog.8 ${MAN8PREFIX}/man/man8 - - ${MKDIR} ${PREFIX}/etc/periodic/daily - ${INSTALL_SCRIPT} ${WRKDIR}/510.assp ${PREFIX}/etc/periodic/daily/ + ${INSTALL_MAN} ${WRKDIR}/assp.8 ${STAGEDIR}${MAN8PREFIX}/man/man8 + ${INSTALL_MAN} ${WRKDIR}/assplog.8 ${STAGEDIR}${MAN8PREFIX}/man/man8 + ${MKDIR} ${STAGEDIR}${PREFIX}/etc/periodic/daily + ${INSTALL_SCRIPT} ${WRKDIR}/510.assp ${STAGEDIR}${PREFIX}/etc/periodic/daily/ + ${MKDIR} ${STAGEDIR}${ASSP_HOME} + ${MKDIR} ${STAGEDIR}${ASSP_LOG} .if ${PORT_OPTIONS:MDOCS} - ${MKDIR} ${DOCSDIR} - ${INSTALL_DATA} ${WRKSRC}/docs/*.htm ${DOCSDIR} + ${MKDIR} ${STAGEDIR}${DOCSDIR} + ${INSTALL_DATA} ${WRKSRC}/docs/*.htm ${STAGEDIR}${DOCSDIR} .endif -post-install: - @PKG_PREFIX=${PREFIX} ${SH} ${PKGINSTALL} ${PKGNAME} POST-INSTALL - -.include <bsd.port.post.mk> +.include <bsd.port.mk> Modified: head/mail/assp/distinfo ============================================================================== --- head/mail/assp/distinfo Sun Jul 6 15:32:06 2014 (r360925) +++ head/mail/assp/distinfo Sun Jul 6 15:32:47 2014 (r360926) @@ -1,2 +1,2 @@ -SHA256 (ASSP_1.9.9.13257_Install.zip) = 657106e254baf1a9da182ed89c0d8a1b342110b0f01686cc7582e6b9e2f19a1c -SIZE (ASSP_1.9.9.13257_Install.zip) = 1741147 +SHA256 (ASSP_1.9.9.14158_Install.zip) = 1237a965ca3475a5cdabf786d470d295ce70ff030307d903b979b8c7ac80e186 +SIZE (ASSP_1.9.9.14158_Install.zip) = 1347031 Modified: head/mail/assp/files/patch-assp.pl ============================================================================== --- head/mail/assp/files/patch-assp.pl Sun Jul 6 15:32:06 2014 (r360925) +++ head/mail/assp/files/patch-assp.pl Sun Jul 6 15:32:47 2014 (r360926) @@ -1,16 +1,12 @@ ---- assp.pl.orig 2013-08-12 14:12:11.000000000 -0500 -+++ assp.pl 2013-08-12 14:15:10.000000000 -0500 -@@ -2758,15 +2758,15 @@ +--- assp.pl.orig 2014-07-02 16:55:36.000000000 -0500 ++++ assp.pl 2014-07-02 16:56:22.000000000 -0500 +@@ -2767,11 +2767,11 @@ 'Set the characterset/codepage for the maillog output to your local needs. Best on non Windows systems is "utf8" if available or "System Default" - no conversion. On Windows systems set it to your local codepage or UTF-8 (chcp 65001). To display nonASCII characters in the subject line and maillog files names setup decodeMIME2UTF8 .'], ['decodeMIME2UTF8','Decode MIME Words To UTF-8',1,\&checkbox,'1','(.*)',undef,'If selected, ASSP decodes MIME encoded words to UTF8. This enables support for national languages to be used in Bombs , Scripts , Spamdb , Logging. If not selected, only US-ASCII characters will be used for this functions. This requires an installed Email::MIME module in PERL.'], ['AsAService','Run ASSP as a Windows Service',0,\&checkbox,'','(.*)',undef,'In Windows NT/2000/XP/2003 ASSP can be installed as a service. This setting tells ASSP that this has been done -- it does not install the Windows service for you. Installing ASSP as a service requires several steps which are detailed in the <a href="http://apps.sourceforge.net/mediawiki/assp/index.php?title=Win32">Quick Start for Win32</a> doku page.<br /> Information about the Win32::Daemon module which which is necessary can be found here: <a href="http://www.roth.net/perl/Daemon/">The Official Win32::Daemon Home Page</a><br /><span class="negative"> requires ASSP restart</span>'], --['AsADaemon','Run ASSP as a Daemon','0:No|1:Yes - externaly controlled|2:Yes - run AutoRestartCmd on restart and wait|3:Yes - run AutoRestartCmd on restart and exit',\&listbox,'0','(.*)',undef,'In Linux/BSD/Unix/OSX fork and close file handles. <br /> -+['AsADaemon','Run ASSP as a Daemon','0:No|1:Yes - externaly controlled|2:Yes - run AutoRestartCmd on restart and wait|3:Yes - run AutoRestartCmd on restart and exit',\&listbox,'1','(.*)',undef,'In Linux/BSD/Unix/OSX fork and close file handles. <br /> - Similar to the command "perl assp.pl &", but better.<br /> - If "externaly controlled" is selected, ASSP simply ends and you have to restart assp from your daemon or watchdog script<br /> - If "run AutoRestartCmd on restart and wait" is selected, assp starts the OS command defined in AutoRestartCmd - assp will <b>NOT !</b> automaticaly terminate - the started command has to terminate/kill and to (re)start assp - like "service assp restart"!<br /> - If "run AutoRestartCmd on restart and exit" is selected, assp starts the OS command defined in AutoRestartCmd and terminates immediatly!<br /> - <span class="negative"> requires ASSP restart</span>',undef,undef,'msg007440','msg007441'], +-['AsADaemon','Run ASSP as a Daemon',0,\&checkbox,'','(.*)',undef,'In Linux/BSD/Unix/OSX fork and exit. Similar to the command "perl assp.pl &", but better.<br /> ++['AsADaemon','Run ASSP as a Daemon',0,\&checkbox,'1','(.*)',undef,'In Linux/BSD/Unix/OSX fork and exit. Similar to the command "perl assp.pl &", but better.<br /> + <span class="negative"> Changing this requires a restart of ASSP.</span>'], -['runAsUser','Run as UID',20,\&textinput,'','(\S*)',undef,'The *nix user name to assume after startup (*nix only).<p><small><i>Examples:</i> assp, nobody</small></p> +['runAsUser','Run as UID',20,\&textinput,'assp','(\S*)',undef,'The *nix user name to assume after startup (*nix only).<p><small><i>Examples:</i> assp, nobody</small></p> <span class="negative"> Changing this requires a restart of ASSP.</span>'], Modified: head/mail/assp/pkg-plist ============================================================================== --- head/mail/assp/pkg-plist Sun Jul 6 15:32:06 2014 (r360925) +++ head/mail/assp/pkg-plist Sun Jul 6 15:32:47 2014 (r360926) @@ -2,10 +2,13 @@ etc/periodic/daily/510.assp sbin/assp sbin/assplog %%DATADIR%%/assp.pl +@owner %%ASSP_USER%% +@group %%ASSP_GROUP%% %%DATADIR%%/files/URIBLCCTLDS.txt %%DATADIR%%/files/blackaddresses.txt %%DATADIR%%/files/blackdomains.txt %%DATADIR%%/files/blackre.txt +%%DATADIR%%/files/blacksenderbase.txt %%DATADIR%%/files/blockreportlist.txt %%DATADIR%%/files/bombdatare.txt %%DATADIR%%/files/bombheaderre.txt @@ -17,11 +20,13 @@ sbin/assplog %%DATADIR%%/files/deny.txt %%DATADIR%%/files/denyalways.txt %%DATADIR%%/files/dnsbls.txt +%%DATADIR%%/files/dnsrws.txt %%DATADIR%%/files/droplist.txt %%DATADIR%%/files/groups.txt %%DATADIR%%/files/invalidhelo.txt %%DATADIR%%/files/invalidptr.txt %%DATADIR%%/files/ipnp.txt +%%DATADIR%%/files/ipnpexclude.txt %%DATADIR%%/files/noblocking.txt %%DATADIR%%/files/nodelay.txt %%DATADIR%%/files/nodelayhelosre.txt @@ -34,16 +39,20 @@ sbin/assplog %%DATADIR%%/files/preheaderre.txt %%DATADIR%%/files/rcptreplrules.txt %%DATADIR%%/files/redre.txt +%%DATADIR%%/files/samesubjectskip.txt %%DATADIR%%/files/strictspf.txt %%DATADIR%%/files/subjectre.txt %%DATADIR%%/files/suspiciousre.txt %%DATADIR%%/files/suspiciousvirus.txt %%DATADIR%%/files/tlds-alpha-by-domain.txt -%%DATADIR%%/files/uriblwhite.txt %%DATADIR%%/files/uriblserviceprovider.txt +%%DATADIR%%/files/uriblwhite.txt +%%DATADIR%%/files/validhelo.txt %%DATADIR%%/files/validptr.txt %%DATADIR%%/files/whiteptr.txt -%%DATADIR%%/files/whiteorg.txt +%%DATADIR%%/files/whitesenderbase.txt +@owner +@group %%DATADIR%%/images/assp.css %%DATADIR%%/images/blockreport.css %%DATADIR%%/images/blockreport.gif @@ -77,6 +86,7 @@ sbin/assplog %%DATADIR%%/reports/notspamreport.txt %%DATADIR%%/reports/npremovereport.txt %%DATADIR%%/reports/npreport.txt +%%DATADIR%%/reports/persblackreport.txt %%DATADIR%%/reports/redremovereport.txt %%DATADIR%%/reports/redreport.txt %%DATADIR%%/reports/slremovereport.txt @@ -89,18 +99,31 @@ sbin/assplog %%PORTDOCS%%%%DOCSDIR%%/Legacy - ASSP Documentation.htm %%PORTDOCS%%%%DOCSDIR%%/Regular Expression Tutorial.htm %%PORTDOCS%%@dirrm %%DOCSDIR%% -@dirrm %%DATADIR%%/reports -@dirrm %%DATADIR%%/images -@dirrm %%DATADIR%%/files -@dirrm %%DATADIR%% +man/man8/assp.8.gz +man/man8/assplog.8.gz +@dirrmtry %%DATADIR%%/reports +@dirrmtry %%DATADIR%%/logs +@dirrmtry %%DATADIR%%/images +@dirrmtry %%DATADIR%%/files +@dirrmtry %%DATADIR%% @dirrmtry etc/periodic/daily @dirrmtry etc/periodic -@unexec rm -f %%ASSP_HOME%%/logs -@unexec rm -f %%ASSP_HOME%%/reports -@unexec rm -f %%ASSP_HOME%%/images +@exec ln -sf %D/%%DATADIR%%/files %%ASSP_HOME%%/ @unexec rm -f %%ASSP_HOME%%/files -@unexec rmdir %%ASSP_HOME%% 2>/dev/null || true +@exec ln -sf %D/%%DATADIR%%/images %%ASSP_HOME%%/ +@unexec rm -f %%ASSP_HOME%%/images +@exec ln -sf %D/%%DATADIR%%/rebuildspamdb.pl %%ASSP_HOME%%/ +@unexec rm -f %%ASSP_HOME%%/rebuildspamdb.pl +@exec ln -sf %D/%%DATADIR%%/reports %%ASSP_HOME%%/ +@unexec rm -f %%ASSP_HOME%%/reports +@exec ln -sf %%ASSP_LOG%% %%ASSP_HOME%%/logs +@unexec rm -f %%ASSP_HOME%%/logs +@cwd / +@owner %%ASSP_USER%% +@group %%ASSP_GROUP%% +@mode 750 +@dirrmtry %%ASSP_LOG%% +@dirrmtry %%ASSP_HOME%% @unexec if [ -d %%ASSP_HOME%% ]; then echo "If you are deinstalling ASSP completely, remove the %%ASSP_HOME%% directory."; fi -@unexec rmdir %%ASSP_LOG%% 2>/dev/null || true @unexec if [ -d %%ASSP_LOG%% ]; then echo "If you are deinstalling ASSP completely, remove the %%ASSP_LOG%% directory."; fi @unexec echo "If you are deinstalling ASSP completely, delete the ASSP user and group."
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201407061532.s66FWlea059898>