3 files changed, 27 insertions, 60 deletions

diff --git a/mail/assp/Makefile b/mail/assp/Makefile
index 7fac14ad5fbf..cfa3b564dea6 100644
--- a/mail/assp/Makefile
+++ b/mail/assp/Makefile
@@ -6,12 +6,11 @@
 #
 
 PORTNAME=	assp
-PORTVERSION=	1.2.5.2
+PORTVERSION=	1.2.6
 CATEGORIES=	mail
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
 MASTER_SITE_SUBDIR=	${PORTNAME}
-DISTFILES=	${PORTNAME:U}_1.2.5-Install${EXTRACT_SUFX} \
-		${PORTNAME:U}_1.2.5_Rev.2-Update${EXTRACT_SUFX}
+DISTNAME=	${PORTNAME:U}_${PORTVERSION}-Install
 
 MAINTAINER=	fbsd@opal.com
 COMMENT=	Anti-Spam SMTP Proxy
@@ -60,7 +59,8 @@ OPTIONS=	EMVALID	"RFC822 recipient address validator" 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
+		DNSBL	"DNS block list checking" on \
+		MYSQL	"Use MySQL db to store white/red/delaylists" off
 
 WRKSRC=		${WRKDIR}/${PORTNAME}-${PORTVERSION}/${PORTNAME:U}
 
@@ -108,12 +108,11 @@ PLIST_SUB+=	ASSP_CLAMAV="@comment "
 RUN_DEPENDS+=	${SITE_PERL}/${PERL_ARCH}/Net/DNS.pm:${PORTSDIR}/dns/p5-Net-DNS
 .endif
 
-EXTRACT_AFTER_ARGS=	-d ${PORTNAME}-${PORTVERSION}
+.if !defined(WITHOUT_MYSQL)
+RUN_DEPENDS+=	${SITE_PERL}/Tie/RDBM.pm:${PORTSDIR}/databases/p5-Tie-DBI
+.endif
 
-do-extract:
-	${MKDIR} ${WRKSRC}
-	cd ${WRKDIR}/${PORTNAME}-${PORTVERSION};		${UNZIP_CMD} -q  ${DISTDIR}/${PORTNAME:U}_1.2.5-Install${EXTRACT_SUFX}
-	cd ${WRKDIR}/${PORTNAME}-${PORTVERSION}/${PORTNAME:U};	${UNZIP_CMD} -oq ${DISTDIR}/${PORTNAME:U}_1.2.5_Rev.2-Update${EXTRACT_SUFX}
+EXTRACT_AFTER_ARGS=	-d ${PORTNAME}-${PORTVERSION}
 
 post-patch:
 	@${REINPLACE_CMD} -e 's|/usr/bin/perl|${PERL}|' ${WRKSRC}/*.pl
diff --git a/mail/assp/distinfo b/mail/assp/distinfo
index 02a9a81ed298..335baa5ee662 100644
--- a/mail/assp/distinfo
+++ b/mail/assp/distinfo
@@ -1,6 +1,3 @@
-MD5 (ASSP_1.2.5-Install.zip) = ffbb815b24ea5073000dd50143edc311
-SHA256 (ASSP_1.2.5-Install.zip) = 282325e0434ef8554fe281a2b25267fde99254ea83bc7073c2acfbc47c2d31af
-SIZE (ASSP_1.2.5-Install.zip) = 244225
-MD5 (ASSP_1.2.5_Rev.2-Update.zip) = 6ad6641b88fe4e261432ee47da432540
-SHA256 (ASSP_1.2.5_Rev.2-Update.zip) = 86e837609712e1c033a59e112eb3f22bff2e3617c1f7f87f88a7da9438d3bbf8
-SIZE (ASSP_1.2.5_Rev.2-Update.zip) = 96722
+MD5 (ASSP_1.2.6-Install.zip) = 94c22168b5013d3869136dccbd1c283c
+SHA256 (ASSP_1.2.6-Install.zip) = 0eea1a645305c16916593fb3e2580401122de5f7c36534e2200df36766aca3fd
+SIZE (ASSP_1.2.6-Install.zip) = 245745
diff --git a/mail/assp/files/patch-assp.pl b/mail/assp/files/patch-assp.pl
index 3a39412c811a..d2215fbe6598 100644
--- a/mail/assp/files/patch-assp.pl
+++ b/mail/assp/files/patch-assp.pl
@@ -1,58 +1,29 @@
---- assp.pl.orig	Thu Nov 30 16:33:20 2006
-+++ assp.pl	Thu Nov 30 16:34:18 2006
-@@ -69,7 +69,7 @@
- loadConfig();
- 
- sub loadConfig {
-- print "loading config -- base='$base'\n";
-+ # print "loading config -- base='$base'\n";
-  @Config=(
- 
- 
-@@ -91,7 +91,7 @@
-   'The address:port of your message handling system\'s smtp server(s). Secondary servers possible, will try the next if the first doesn\'t respond.<br />If only the port is entered, or the keyword <b>__INBOUND__</b>:<i>port</i> is used, then the connection will be established to the same IP where the connection was received. This is usefull when you have several IPs with different domains/profiles in your MTA.<br /> Examples: "127.0.0.1:125","127.0.0.1:125|127.0.0.5:125", "10.0.1.3", "10.0.1.3:1025", "__INBOUND__:125", "125", etc.'],
+--- assp.pl.orig	Wed Dec 13 11:53:29 2006
++++ assp.pl	Wed Dec 13 11:58:31 2006
+@@ -86,7 +86,7 @@
+   'The address:port of your message handling system\'s smtp server. If only the port is entered, or the keyword <b>__INBOUND__</b>:<i>port</i> is used, then the connection will be established to the same IP where the connection was received. This is usefull when you have several IPs with different domains/profiles in your MTA.<br /> Examples: "127.0.0.1:125","127.0.0.1:125|127.0.0.5:125", "10.0.1.3", "10.0.1.3:1025", "__INBOUND__:125", "125", etc.'],
  [AsAService,'As a Service',0,checkbox,0,'(.*)',undef,
    'In Windows 2000 / NT you can run it as a service; requires <a href="http://www.roth.net/perl/Daemon/" rel="external">win32::daemon</a>. Requires start from the service control panel.'],
-- [AsADaemon,'As a Daemon',0,checkbox,0,'(.*)',undef,
-+ [AsADaemon,'As a Daemon',0,checkbox,1,'(.*)',undef,
+-[AsADaemon,'As a Daemon',0,checkbox,0,'(.*)',undef,
++[AsADaemon,'As a Daemon',0,checkbox,1,'(.*)',undef,
   'In Linux/BSD/Unix/OSX fork and close file handles, kinda like "perl assp.pl &amp;" but better. Requires restart.'],
-  [myName,'My Name',40,textinput,'ASSP.nospam','(\S+)',undef,
+ [myName,'My Name',40,textinput,'ASSP.nospam','(\S+)',undef,
    'What the program calls itself in the email "received by" header. Usually ASSP.nospam.'],
-@@ -666,7 +666,7 @@
+@@ -692,7 +692,7 @@
    'SMTP error message to reject attachments.'],
  [UseAvClamd,'Use Av Clamd',0,checkbox,1,'(.*)',undef,
- 'If activated, the message is checked by Av Clamd, this requires an installed <a href="http://search.cpan.org/~cfaber/File-Scan-ClamAV-1.06/lib/File/Scan/ClamAV.pm" rel="external">File::Scan::ClamAV</a> Perl module. '],
+   'If activated, the message is checked by Av Clamd, this requires an installed <a href="http://search.cpan.org/~cfaber/File-Scan-ClamAV-1.06/lib/File/Scan/ClamAV.pm" rel="external">File::Scan::ClamAV</a> Perl module. '],
 -[AvClamdPort,'Port or file socket for local Av Clamd',20,textinput,'3310','(\S+)',undef,
 +[AvClamdPort,'Port or file socket for local Av Clamd',20,textinput,'/var/run/clamav/clamd','(\S+)',undef,
- 'A port or socket to connect to. If the socket has been setup as a TCP/IP socket (see the TCPSocket option in the clamav.conf file), then specifying in a number will cause File::Scan::ClamAV to use a TCP socket. For example 3310 or /tmp/clamd '],
+   'A port or socket to connect to. If the socket has been setup as a TCP/IP socket (see the TCPSocket option in the clamav.conf file), then specifying in a number will cause File::Scan::ClamAV to use a TCP socket. For example 3310 or /tmp/clamd '],
  [AvClamdBufSize,'Size of buffer for Av Clamd',7,textinput,'512','(\d+)',undef,
- 'Buffer size for stream check, must be more than max length of virus signature'],
-@@ -839,7 +839,7 @@
+   'Buffer size for stream check, must be more than max length of virus signature'],
+@@ -862,7 +862,7 @@
    '<span class="negative"> 0 = no report, 1 = to user, 2 = to TO address, 3 = both</span>'],
  [EmailRedlistTo,'To Address for Redlist-Reports',40,textinput,'','(.+)',undef,
    'Email sent from ASSP acknowledging your submissions will be sent to this address. For example: admin@domain.com'],
-- [EmailFrom,'From Address for Reports',40,textinput,'<>','(.+)',undef,
-+ [EmailFrom,'From Address for Reports',40,textinput,'<postmaster@yourdomain.com>','(.+)',undef,
+-[EmailFrom,'From Address for Reports',40,textinput,'<spammaster@yourdomain.com>','(.+)',undef,
++[EmailFrom,'From Address for Reports',40,textinput,'<postmaster@yourdomain.com>','(.+)',undef,
    'Email sent from ASSP acknowledging your submissions will be sent from this address.<br />
-   Some mailers don\'t like the default setting. For example: ASSP &lt;&gt; or Mail Administrator
-   &lt;mailadmin@mydomain.com&gt;
-@@ -943,9 +943,9 @@
-   '],
- 
- [0,0,0,'heading','Security'],
-- [runAsUser,'Run as UID',20,textinput,'','(\S*)',undef,
-+ [runAsUser,'Run as UID',20,textinput,'nobody','(\S*)',undef,
-   'The *nix user name to assume after startup: assp or nobody -- requires ASSP restart.'],
-- [runAsGroup,'Run as GID',20,textinput,'','(\S*)',undef,
-+ [runAsGroup,'Run as GID',20,textinput,'nobody','(\S*)',undef,
-   'The *nix group to assume after startup: assp or nogroup -- requires ASSP restart.'],
-  [ChangeRoot,'Change Root',40,textinput,'','(.*)',undef,
-   'Non-blank means to run in chroot jail in *nix. You need an etc/protocols file to make this work<br />
-@@ -8328,6 +8328,7 @@
-  @PossibleOptionFiles2=();
-  foreach (@Config) {
-   if($_->[6] eq 'ConfigMakeRe') {
-+   $silent=1 if($AsADaemon);
-    ${$_->[0]}=optionList(${$_->[0]},$_->[0]);
-    push(@PossibleOptionFiles,$_->[0]);
-   } elsif($_->[6] eq 'ConfigCompileRe') {
+ For example: &lt;&gt; or mailadmin@mydomain.com.'],
+ [NoHaiku,'Don\'t reply to messages to the Email Interface',0,checkbox,0,'(.*)',undef,