Date: Sun, 24 Jul 2011 11:11:09 -0500 (CDT) From: Rusty Nejdl <rnejdl@ringofsaturn.com> To: FreeBSD-gnats-submit@FreeBSD.org Subject: ports/159163: Update ports mail/assp due to distfile reroll Message-ID: <assp.0186e16fe8.201107241611.p6OGB9Z2048550@tethys.ringofsaturn.com> Resent-Message-ID: <201107241620.p6OGK8TD054178@freefall.freebsd.org>
next in thread | raw e-mail | index | archive | help
>Number: 159163 >Category: ports >Synopsis: Update ports mail/assp due to distfile reroll >Confidential: no >Severity: non-critical >Priority: low >Responsible: freebsd-ports-bugs >State: open >Quarter: >Keywords: >Date-Required: >Class: maintainer-update >Submitter-Id: current-users >Arrival-Date: Sun Jul 24 16:20:08 UTC 2011 >Closed-Date: >Last-Modified: >Originator: Rusty Nejdl >Release: FreeBSD 8.2-STABLE amd64 >Organization: >Environment: System: FreeBSD tethys.ringofsaturn.com 8.2-STABLE FreeBSD 8.2-STABLE #0: Mon Jul 18 19:01:15 CDT 2011 root@tethys.ringofsaturn.com:/usr/obj/usr/src/sys/GENERIC amd64 >Description: The assp distfile was rerolled without a version bump. Also, at least one bug exists in this that I am hoping is fixed in this reroll. >How-To-Repeat: >Fix: --- assp-1.9.1.3.patch begins here --- diff -ruN assp/Makefile assp.new/Makefile --- assp/Makefile 2011-07-22 17:51:52.000000000 -0500 +++ assp.new/Makefile 2011-07-24 11:08:48.000000000 -0500 @@ -7,6 +7,7 @@ PORTNAME= assp PORTVERSION= 1.9.1.3 +PORTREVISION= 1 CATEGORIES= mail MASTER_SITES= http://www.ringofsaturn.com/distfiles/ DISTNAME= ${PORTNAME:U}_${PORTVERSION}-Install diff -ruN assp/Makefile.orig assp.new/Makefile.orig --- assp/Makefile.orig 1969-12-31 18:00:00.000000000 -0600 +++ assp.new/Makefile.orig 2011-07-06 15:28:22.000000000 -0500 @@ -0,0 +1,160 @@ +# New ports collection makefile for: assp +# Date created: 16 May 2005 +# Whom: J.R. Oldroyd <fbsd@opal.com> +# +# $FreeBSD: ports/mail/assp/Makefile,v 1.37 2011/07/06 18:36:22 culot Exp $ +# + +PORTNAME= assp +PORTVERSION= 1.9.1.1 +CATEGORIES= mail +MASTER_SITES= http://www.ringofsaturn.com/distfiles/ +DISTNAME= ${PORTNAME:U}_${PORTVERSION}-Install + +MAINTAINER= rnejdl@ringofsaturn.com +COMMENT= Anti-Spam SMTP Proxy + +USE_ZIP= yes +NO_BUILD= yes +USE_PERL5_RUN= yes + +MAN8= assp.8 assplog.8 + +ASSP_USER= assp +ASSP_GROUP= assp +USERS= ${ASSP_USER} +GROUPS= ${ASSP_GROUP} +ASSP_HOME= /var/db/assp +ASSP_LOG= /var/log/assp + +PLIST_SUB= ASSP_HOME="${ASSP_HOME}" ASSP_LOG="${ASSP_LOG}" + +SUB_FILES= 510.assp assp.8 assplog.8 assplog.pl pkg-install +SUB_LIST= ASSP_USER="${ASSP_USER}" ASSP_GROUP="${ASSP_GROUP}" \ + ASSP_HOME="${ASSP_HOME}" ASSP_LOG="${ASSP_LOG}" \ + DATADIR="${DATADIR}" PERL="${PERL}" + +USE_RC_SUBR= ${PORTNAME} +RC_SCRIPT= ${PREFIX}/etc/rc.d/${PORTNAME} + +OPTIONS= EMVALID "RFC822 recipient address validator" on \ + LDAP "LDAP validation of recipient addresses" off \ + SPF "SPF validation of client IP" on \ + SRS "Sender Rewriting Scheme" on \ + SEND "Resending .eml files" on \ + FBACKW "File Reading Backwards" on \ + ZLIB "HTTP Header Compression on Admin Interface" on \ + CLAMAV "ClamAV virus scanner" on \ + DNSBL "DNS block list checking" on \ + MYSQL "Use MySQL db to store white/red/delaylists" off \ + MATCHRE "Match IP ranges and CIDR blocks in lists" on \ + SENDERB "Country Code checks" on \ + MIMEMOD "Multiple Attachement detection" on \ + SSL "SSL secure sockets support" on \ + IPV6 "IPv6 sockets support" on + +WRKSRC= ${WRKDIR}/${PORTNAME}-${PORTVERSION}/${DISTNAME}/${PORTNAME:U} + +.include <bsd.port.pre.mk> + +SUB_LIST+= RC_SCRIPT=${RC_SCRIPT} + +RUN_DEPENDS+= ${SITE_PERL}/${PERL_ARCH}/Net/DNS.pm:${PORTSDIR}/dns/p5-Net-DNS +RUN_DEPENDS+= ${SITE_PERL}/LWP/Simple.pm:${PORTSDIR}/www/p5-libwww + +.if !defined(WITHOUT_EMVALID) +RUN_DEPENDS+= ${SITE_PERL}/Email/Valid.pm:${PORTSDIR}/mail/p5-Email-Valid +.endif + +.if !defined(WITHOUT_LDAP) +RUN_DEPENDS+= ${SITE_PERL}/Net/LDAP.pm:${PORTSDIR}/net/p5-perl-ldap +.endif + +.if !defined(WITHOUT_SPF) +RUN_DEPENDS+= ${SITE_PERL}/Mail/SPF.pm:${PORTSDIR}/mail/p5-Mail-SPF +.endif + +.if !defined(WITHOUT_SRS) +RUN_DEPENDS+= ${SITE_PERL}/Mail/SRS.pm:${PORTSDIR}/mail/p5-Mail-SRS +.endif + +.if !defined(WITHOUT_SEND) +RUN_DEPENDS+= ${SITE_PERL}/Email/Send.pm:${PORTSDIR}/mail/p5-Email-Send +.endif + +.if !defined(WITHOUT_FBACKW) +RUN_DEPENDS+= ${SITE_PERL}/File/ReadBackwards.pm:${PORTSDIR}/devel/p5-File-ReadBackwards +.endif + +.if !defined(WITHOUT_ZLIB) +. if ${PERL_LEVEL} < 500903 +RUN_DEPENDS+= ${SITE_PERL}/Compress/Zlib.pm:${PORTSDIR}/archivers/p5-IO-Compress +.endif +.endif + +.if !defined(WITHOUT_CLAMAV) +RUN_DEPENDS+= ${SITE_PERL}/File/Scan/ClamAV.pm:${PORTSDIR}/security/p5-File-Scan-ClamAV +PLIST_SUB+= ASSP_CLAMAV="" +.else +PLIST_SUB+= ASSP_CLAMAV="@comment " +.endif + +.if !defined(WITHOUT_DNSBL) +RUN_DEPENDS+= ${SITE_PERL}/${PERL_ARCH}/Net/DNS.pm:${PORTSDIR}/dns/p5-Net-DNS +.endif + +.if !defined(WITHOUT_MYSQL) +RUN_DEPENDS+= ${SITE_PERL}/Tie/RDBM.pm:${PORTSDIR}/databases/p5-Tie-DBI +.endif + +.if !defined(WITHOUT_MATCHRE) +RUN_DEPENDS+= ${SITE_PERL}/Net/IP/Match/Regexp.pm:${PORTSDIR}/net-mgmt/p5-Net-IP-Match-Regexp +.endif + +.if !defined(WITHOUT_SENDERB) +RUN_DEPENDS+= ${SITE_PERL}/Net/SenderBase.pm:${PORTSDIR}/mail/p5-Net-SenderBase +.endif + +.if !defined(WITHOUT_MIMEMOD) +RUN_DEPENDS+= ${SITE_PERL}/Email/MIME/Modifier.pm:${PORTSDIR}/mail/p5-Email-MIME +.endif + +.if !defined(WITHOUT_SSL) +RUN_DEPENDS+= ${SITE_PERL}/IO/Socket/SSL.pm:${PORTSDIR}/security/p5-IO-Socket-SSL +.endif + +.if !defined(WITHOUT_IPV6) +RUN_DEPENDS+= ${SITE_PERL}/IO/Socket/INET6.pm:${PORTSDIR}/net/p5-IO-Socket-INET6 +.endif + +EXTRACT_AFTER_ARGS= -d ${PORTNAME}-${PORTVERSION} + +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} + + ( cd ${WRKSRC} && ${COPYTREE_SHARE} "files images reports" \ + ${DATADIR}/ "! -name '*.orig' ! -name '*.bak'" ) + + ${INSTALL_SCRIPT} ${WRKDIR}/assplog.pl ${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/ + +.if !defined(NOPORTDOCS) + ${MKDIR} ${DOCSDIR} + ${INSTALL_DATA} ${WRKSRC}/docs/*.htm ${DOCSDIR} +.endif + +post-install: + @PKG_PREFIX=${PREFIX} ${SH} ${PKGINSTALL} ${PKGNAME} POST-INSTALL + +.include <bsd.port.post.mk> diff -ruN assp/distinfo assp.new/distinfo --- assp/distinfo 2011-07-22 17:51:52.000000000 -0500 +++ assp.new/distinfo 2011-07-24 11:03:02.000000000 -0500 @@ -1,2 +1,2 @@ -SHA256 (ASSP_1.9.1.3-Install.zip) = 0d1ddd4ed8680837aa8893323032f1536b1774e77252d70322b55ed91f9e0504 -SIZE (ASSP_1.9.1.3-Install.zip) = 763492 +SHA256 (ASSP_1.9.1.3-Install.zip) = cd436cd72b6886e9e6c86e7dc5cdaf708d8ff0e40cf4c06f57827b27b683ce02 +SIZE (ASSP_1.9.1.3-Install.zip) = 763977 diff -ruN assp/distinfo.orig assp.new/distinfo.orig --- assp/distinfo.orig 1969-12-31 18:00:00.000000000 -0600 +++ assp.new/distinfo.orig 2011-07-06 15:28:22.000000000 -0500 @@ -0,0 +1,2 @@ +SHA256 (ASSP_1.9.1.1-Install.zip) = 6fb485c87ca1db9d5d0a6ecdd5cb702771aa1a5e4b0f3ba57d407f77f641f5c3 +SIZE (ASSP_1.9.1.1-Install.zip) = 759829 diff -ruN assp/files/patch-assp.pl.orig assp.new/files/patch-assp.pl.orig --- assp/files/patch-assp.pl.orig 1969-12-31 18:00:00.000000000 -0600 +++ assp.new/files/patch-assp.pl.orig 2011-06-14 17:12:01.000000000 -0500 @@ -0,0 +1,17 @@ +--- assp.pl.orig 2011-05-29 13:27:11.672116773 -0500 ++++ assp.pl 2011-05-29 13:29:43.102794974 -0500 +@@ -2533,11 +2533,11 @@ + 'Set the characterset/codepage for the maillog output to your local needs. Default (and best) on non Windows systems is "UTF-8" 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 . <span class=\'negative\'>Restart is required!</span>'], + ['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 <a href="http://search.cpan.org/search?query=Email::MIME::Modifier" rel="external">Email::MIME::Modifier</a> 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,\&checkbox,'','(.*)',undef,'In Linux/BSD/Unix/OSX fork and close file handles. 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 close file handles. 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>'], +-['runAsGroup','Run as GID',20,\&textinput,'','(\S*)',undef,'The *nix group to assume after startup (*nix only).<p><small><i>Examples:</i> assp, nobody</small></p> ++['runAsGroup','Run as GID',20,\&textinput,'assp','(\S*)',undef,'The *nix group 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>'], + ['ChangeRoot','Change Root',40,\&textinput,'','(.*)',undef,'The new root directory to which ASSP should chroot (*nix only). If blank, no chroot jail will be used. Note: if you use this feature, be sure to copy or link the etc/protocols file in your chroot jail.<br /> + <span class="negative"> Changing this requires a restart of ASSP.</span>'], diff -ruN assp/pkg-plist assp.new/pkg-plist --- assp/pkg-plist 2011-07-22 17:51:52.000000000 -0500 +++ assp.new/pkg-plist 2011-07-24 11:04:22.000000000 -0500 @@ -3,6 +3,8 @@ sbin/assplog %%DATADIR%%/assp.pl %%DATADIR%%/files/URIBLCCTLDS.txt +%%DATADIR%%/files/URIBLCCTLDS-L2.txt +%%DATADIR%%/files/URIBLCCTLDS-L3.txt %%DATADIR%%/files/blackaddresses.txt %%DATADIR%%/files/blackdomains.txt %%DATADIR%%/files/blackre.txt @@ -39,6 +41,7 @@ %%DATADIR%%/files/tlds-alpha-by-domain.txt %%DATADIR%%/files/uriblwhite.txt %%DATADIR%%/files/validptr.txt +%%DATADIR%%/files/vrfydomains.txt %%DATADIR%%/files/whiteorg.txt %%DATADIR%%/images/assp.css %%DATADIR%%/images/blockreport.css diff -ruN assp/pkg-plist.orig assp.new/pkg-plist.orig --- assp/pkg-plist.orig 1969-12-31 18:00:00.000000000 -0600 +++ assp.new/pkg-plist.orig 2011-07-06 15:28:22.000000000 -0500 @@ -0,0 +1,100 @@ +etc/periodic/daily/510.assp +sbin/assp +sbin/assplog +%%DATADIR%%/assp.pl +%%DATADIR%%/files/URIBLCCTLDS.txt +%%DATADIR%%/files/blackaddresses.txt +%%DATADIR%%/files/blackdomains.txt +%%DATADIR%%/files/blackre.txt +%%DATADIR%%/files/blockreportlist.txt +%%DATADIR%%/files/bombdatare.txt +%%DATADIR%%/files/bombheaderre.txt +%%DATADIR%%/files/bombre.txt +%%DATADIR%%/files/bombsenderre.txt +%%DATADIR%%/files/bombsubjectre.txt +%%DATADIR%%/files/charsets.txt +%%DATADIR%%/files/checkdomains.txt +%%DATADIR%%/files/deny.txt +%%DATADIR%%/files/denyalways.txt +%%DATADIR%%/files/dnsbls.txt +%%DATADIR%%/files/droplist.txt +%%DATADIR%%/files/invalidhelo.txt +%%DATADIR%%/files/invalidptr.txt +%%DATADIR%%/files/ipnp.txt +%%DATADIR%%/files/nodelay.txt +%%DATADIR%%/files/nodelayhelosre.txt +%%DATADIR%%/files/nogrip.txt +%%DATADIR%%/files/nookcaching.txt +%%DATADIR%%/files/nopbwhite.txt +%%DATADIR%%/files/notls.txt +%%DATADIR%%/files/nowhite.txt +%%DATADIR%%/files/npre.txt +%%DATADIR%%/files/preheaderre.txt +%%DATADIR%%/files/rcptreplrules.txt +%%DATADIR%%/files/redre.txt +%%DATADIR%%/files/strictspf.txt +%%DATADIR%%/files/suspiciousre.txt +%%DATADIR%%/files/suspiciousvirus.txt +%%DATADIR%%/files/tlds-alpha-by-domain.txt +%%DATADIR%%/files/uriblwhite.txt +%%DATADIR%%/files/validptr.txt +%%DATADIR%%/files/whiteorg.txt +%%DATADIR%%/images/assp.css +%%DATADIR%%/images/blockreport.css +%%DATADIR%%/images/blockreport.gif +%%DATADIR%%/images/blockreporticon.gif +%%DATADIR%%/images/dropShadow.gif +%%DATADIR%%/images/editor.css +%%DATADIR%%/images/favicon.ico +%%DATADIR%%/images/info.png +%%DATADIR%%/images/logo.gif +%%DATADIR%%/images/logo.jpg +%%DATADIR%%/images/minusIcon.png +%%DATADIR%%/images/noIcon.png +%%DATADIR%%/images/opensource-logo.gif +%%DATADIR%%/images/plusIcon.png +%%DATADIR%%/images/project-support.jpg +%%DATADIR%%/images/shutdown.css +%%DATADIR%%/images/sourceforge-logo.gif +%%DATADIR%%/images/valid-xhtml10.gif +%%DATADIR%%/images/village.gif +%%DATADIR%%/images/xml-pill.gif +%%DATADIR%%/rebuildspamdb.pl +%%DATADIR%%/reports/analyzereport.txt +%%DATADIR%%/reports/blackremovereport.txt +%%DATADIR%%/reports/blackreport.txt +%%DATADIR%%/reports/blockreport_html.txt +%%DATADIR%%/reports/blockreport_sub.txt +%%DATADIR%%/reports/blockreport_text.txt +%%DATADIR%%/reports/blockreportfile.txt +%%DATADIR%%/reports/helpreport.txt +%%DATADIR%%/reports/notspamreport.txt +%%DATADIR%%/reports/npremovereport.txt +%%DATADIR%%/reports/npreport.txt +%%DATADIR%%/reports/redremovereport.txt +%%DATADIR%%/reports/redreport.txt +%%DATADIR%%/reports/slremovereport.txt +%%DATADIR%%/reports/slreport.txt +%%DATADIR%%/reports/spamreport.txt +%%DATADIR%%/reports/virusreport.txt +%%DATADIR%%/reports/whiteremovereport.txt +%%DATADIR%%/reports/whitereport.txt +%%DATADIR%%/stat.pl +%%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%% +@dirrmtry etc/periodic/daily +@dirrmtry etc/periodic +@unexec rm %%ASSP_HOME%%/logs +@unexec rm %%ASSP_HOME%%/reports +@unexec rm %%ASSP_HOME%%/images +@unexec rm %%ASSP_HOME%%/files +@unexec rmdir %%ASSP_HOME%% 2>/dev/null || true +@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." --- assp-1.9.1.3.patch ends here --- >Release-Note: >Audit-Trail: >Unformatted:
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?assp.0186e16fe8.201107241611.p6OGB9Z2048550>