- Update to 1.7.5.7

- Move maintainership to submitter

PR:		ports/149445
Submitted by:	Rusty Nejdl <rnejdl@ringofsaturn.com>
Approved by:	J.R. Oldroyd <fbsd@opal.com> (old maintainer)

4 files changed, 33 insertions, 30 deletions

diff --git a/mail/assp/Makefile b/mail/assp/Makefile
index 02ff64d2f297..0a67d18057da 100644
--- a/mail/assp/Makefile
+++ b/mail/assp/Makefile
@@ -6,13 +6,12 @@
 #
 
 PORTNAME=	assp
-PORTVERSION=	1.5.1.2
-PORTREVISION=	4
+PORTVERSION=	1.7.5.7
 CATEGORIES=	mail
-MASTER_SITES=	SF/${PORTNAME}/OldFiles
+MASTER_SITES=	SF/${PORTNAME}/ASSP%20Installation/${PORTNAME:U}%20${PORTVERSION}/
 DISTNAME=	${PORTNAME:U}_${PORTVERSION}-Install
 
-MAINTAINER=	fbsd@opal.com
+MAINTAINER=	rnejdl@ringofsaturn.com
 COMMENT=	Anti-Spam SMTP Proxy
 
 USE_ZIP=	yes
diff --git a/mail/assp/distinfo b/mail/assp/distinfo
index b3280cd35034..726088b36ff8 100644
--- a/mail/assp/distinfo
+++ b/mail/assp/distinfo
@@ -1,3 +1,3 @@
-MD5 (ASSP_1.5.1.2-Install.zip) = fce32ceb7d440316e12e8e75e8772fad
-SHA256 (ASSP_1.5.1.2-Install.zip) = a41eba9c503a1aabf67223937ef6806188be48f37cfb8db1c311ef608db75fbe
-SIZE (ASSP_1.5.1.2-Install.zip) = 488512
+MD5 (ASSP_1.7.5.7-Install.zip) = ccd6973a5a038c6cef5401d4ac94c810
+SHA256 (ASSP_1.7.5.7-Install.zip) = 66d901904dcdbca26d857c90dc5355c03e0faaf5b121bda45af90094e932d9a7
+SIZE (ASSP_1.7.5.7-Install.zip) = 627537
diff --git a/mail/assp/files/patch-assp.pl b/mail/assp/files/patch-assp.pl
index 9a986f92dfe3..381ba4279c46 100644
--- a/mail/assp/files/patch-assp.pl
+++ b/mail/assp/files/patch-assp.pl
@@ -1,25 +1,9 @@
---- assp.pl.orig	2009-05-22 03:05:20.000000000 -0400
-+++ assp.pl	2009-08-06 11:44:01.000000000 -0400
-@@ -1,4 +1,4 @@
--#!/usr/bin/perl --
-+#!/usr/local/bin/perl --
- #use lib 'path/to/my/perlmods';
- # anti spam smtp proxy
- # (c) John Hanna, John Calvi, Robert Orso, AJ 2004 under the terms of the GPL
-@@ -1016,8 +1016,7 @@
- ['ScanNP','Scan NoProcessing Messages',0,\&checkbox,'','(.*)',undef,''],
- ['ScanLocal','Scan Local Senders',0,\&checkbox,'','(.*)',undef,''],
- ['ScanCC','Scan Copied Spam Mails',0,\&checkbox,'','(.*)',undef,''],
--['AvError','Reply Code to Refuse Infected Messages',80,\&textinput,'554
--5.7.1 Mail appears infected with INFECTION.','([25]\d\d .*)',undef,'Reply
-+['AvError','Reply Code to Refuse Infected Messages',80,\&textinput,'554 5.7.1 Mail appears infected with INFECTION.','([25]\d\d .*)',undef,'Reply
- code to refuse infected messages. The string $infection is replaced with
- the name of the detected virus.<br />  For example: 554 5.7.1 Mail appears
- infected with INFECTION -- disinfect and resend.'],
-@@ -1654,11 +1653,11 @@
- 
- [0,0,0,'heading','Server Setup'],
- ['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 /> <span class="negative"> requires ASSP restart</span>'],
+--- assp.pl.orig	2010-08-08 14:29:19.000000000 -0500
++++ assp.pl	2010-08-08 14:30:13.000000000 -0500
+@@ -2029,11 +2029,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 &amp;", 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 &amp;", but better.<br />
    <span class="negative"> requires ASSP restart</span>'],
diff --git a/mail/assp/pkg-plist b/mail/assp/pkg-plist
index 1d2ad07d15e7..f3a13049245d 100644
--- a/mail/assp/pkg-plist
+++ b/mail/assp/pkg-plist
@@ -3,17 +3,30 @@ etc/periodic/daily/510.assp
 @dirrmtry etc/periodic
 %%DATADIR%%/assp.pl
 %%DATADIR%%/files/URIBLCCTLDS.txt
+%%DATADIR%%/files/blackaddresses.txt
+%%DATADIR%%/files/blackdomains.txt
 %%DATADIR%%/files/blackre.txt 
-%%DATADIR%%/files/blockreportuser.txt
+%%DATADIR%%/files/blockreportlist.txt
+%%DATADIR%%/files/bombheaderre.txt
 %%DATADIR%%/files/bombre.txt
+%%DATADIR%%/files/charsets.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/nogrip.txt
+%%DATADIR%%/files/notls.txt
+%%DATADIR%%/files/nowhite.txt
 %%DATADIR%%/files/redre.txt
 %%DATADIR%%/files/strictspf.txt
+%%DATADIR%%/files/subjectre.txt
+%%DATADIR%%/files/suspiciousre.txt
+%%DATADIR%%/files/suspiciousvirus.txt
+%%DATADIR%%/files/uriblwhite.txt
 %%DATADIR%%/files/validptr.txt
 %%DATADIR%%/files/whiteorg.txt
 %%DATADIR%%/images/assp.css
@@ -35,13 +48,20 @@ etc/periodic/daily/510.assp
 %%DATADIR%%/move2num.pl
 %%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