ports/117940: port update: mail/assp from 1.3.3.1 to 1.3.3.8

J.R. Oldroyd fbsd at opal.com
Fri Nov 9 14:00:03 UTC 2007


The following reply was made to PR ports/117940; it has been noted by GNATS.

From: "J.R. Oldroyd" <fbsd at opal.com>
To: FreeBSD-gnats-submit at FreeBSD.org, freebsd-ports-bugs at FreeBSD.org
Cc:  
Subject: Re: ports/117940: port update: mail/assp from 1.3.3.1 to 1.3.3.8
Date: Fri, 9 Nov 2007 08:40:47 -0500

 --Sig_/ckFXpOb9a9Y_8vPPyilcnAk
 Content-Type: text/plain; charset=US-ASCII
 Content-Transfer-Encoding: quoted-printable
 
 There's a missed change in the pkg-plist in the original port update
 email.  Please use this diff instead.
 
 
 
 
 
 diff -ruN /usr/ports/mail/assp/Makefile mail/assp/Makefile
 --- /usr/ports/mail/assp/Makefile	Thu Oct 11 20:32:21 2007
 +++ mail/assp/Makefile	Thu Nov  1 16:44:37 2007
 @@ -2,11 +2,11 @@
  # Date created:				16 May 2005
  # Whom:					J.R. Oldroyd <fbsd at opal.com>
  #
 -# $FreeBSD: ports/mail/assp/Makefile,v 1.12 2007/10/12 00:32:21 tabthorpe =
 Exp $
 +# $FreeBSD: ports/mail/assp/Makefile,v 1.11 2007/01/31 16:45:06 rafan Exp $
  #
 =20
  PORTNAME=3D	assp
 -PORTVERSION=3D	1.3.3.1
 +PORTVERSION=3D	1.3.3.8
  CATEGORIES=3D	mail
  MASTER_SITES=3D	${MASTER_SITE_SOURCEFORGE}
  MASTER_SITE_SUBDIR=3D	${PORTNAME}
 @@ -19,9 +19,11 @@
  NO_BUILD=3D	yes
  USE_PERL5_RUN=3D	yes
 =20
 -USE_DOS2UNIX=3D	addservice.pl \
 +USE_DOS2UNIX=3D \
 +		../Install.txt \
 +		../changelog.txt \
 +		addservice.pl \
  		assp.pl \
 -		changelog.txt \
  		files/URIBLCCTLDS.txt \
  		files/blackdomains.txt \
  		files/bombre.txt \
 @@ -33,6 +35,7 @@
  		files/redre.txt \
  		files/whitedomains.txt \
  		move2num.pl \
 +		rc/readme.txt \
  		rebuildspamdb.pl \
  		repair.pl \
  		reports/helpreport.txt \
 diff -ruN /usr/ports/mail/assp/distinfo mail/assp/distinfo
 --- /usr/ports/mail/assp/distinfo	Thu Oct 11 20:32:21 2007
 +++ mail/assp/distinfo	Thu Nov  1 16:34:30 2007
 @@ -1,3 +1,3 @@
 -MD5 (ASSP_1.3.3.1-Install.zip) =3D 9ce0cc17ee9c8d8cb03d258b69812a11
 -SHA256 (ASSP_1.3.3.1-Install.zip) =3D 810bebed2f48a480c7e7458fb9b6e2fbe3f3=
 9c441d74aa8471b458aa0e33e47b
 -SIZE (ASSP_1.3.3.1-Install.zip) =3D 362975
 +MD5 (ASSP_1.3.3.8-Install.zip) =3D fad56889a74acc10769789bdc887f620
 +SHA256 (ASSP_1.3.3.8-Install.zip) =3D 48a84aa63cbcff99833710c7ccbef6993355=
 8e98368982456f5ec8d201fad3ba
 +SIZE (ASSP_1.3.3.8-Install.zip) =3D 332926
 diff -ruN /usr/ports/mail/assp/files/patch-assp.pl mail/assp/files/patch-as=
 sp.pl
 --- /usr/ports/mail/assp/files/patch-assp.pl	Thu Oct 11 20:32:21 2007
 +++ mail/assp/files/patch-assp.pl	Thu Nov  1 16:40:54 2007
 @@ -1,15 +1,15 @@
 ---- assp.pl.orig	Fri Aug  3 14:10:49 2007
 -+++ assp.pl	Fri Aug  3 14:12:21 2007
 +--- assp.pl.orig	Thu Nov  1 16:37:53 2007
 ++++ assp.pl	Thu Nov  1 16:40:38 2007
  @@ -1,4 +1,4 @@
  -#!/usr/bin/perl
  +#!/usr/local/bin/perl
  =20
   use File::Copy;
   use Encode;
 -@@ -803,8 +803,8 @@
 - [ScanWL,'Scan Whitelisted Senders',0,checkbox,'1','(.*)',undef,''],
 - [ScanNP,'Scan No Processing Senders',0,checkbox,'','(.*)',undef,''],
 - [ScanLocal,'Scan Local Senders',0,checkbox,'','(.*)',undef,''],
 +@@ -844,8 +844,8 @@
 + [ScanWL,'Scan Whitelisted Senders',0,checkbox,0,'([01]?)',undef,''],
 + [ScanNP,'Scan No Processing Senders',0,checkbox,0,'([01]?)',undef,''],
 + [ScanLocal,'Scan Local Senders',0,checkbox,0,'([01]?)',undef,''],
  -[AvClamdPort,'Port or file socket for ClamAV',20,textinput,'/tmp/clamd','=
 (\S+)',undef,
  -  'A socket specified in the clamav.conf file - LocalSocket. For example =
 /tmp/clamd. If the socket has been setup as a TCP/IP socket (see the TCPSoc=
 ket option in the clamav.conf file), then specify the TCP socket. For examp=
 le 3310 '],
  +[AvClamdPort,'Port or file socket for ClamAV',20,textinput,'/var/run/clam=
 av/clamd','(\S+)',undef,
 @@ -17,21 +17,21 @@
   [AvError,'Reply Message to Refuse Infected E<!--get rid of google autofil=
 l-->mail',80,textinput,'554 5.7.1 Mail appears infected with \'$infection\'=
 .','(5\d\d .*)',undef,
     'Reply message to refuse infected mail. The string $infection is replac=
 ed with the name of the detected virus.<br />
     For example: 554 5.7.1 Mail appears infected with \'$infection\' -- dis=
 infect and resend.'],
 -@@ -959,7 +959,7 @@
 +@@ -1003,7 +1003,7 @@
     '<span class=3D"negative"> 0 =3D no report, 1 =3D to SENDER, 2 =3D to T=
 O address (below), 3 =3D BOTH</span>'],
   [EmailRedlistTo,'To Address for Redlist-Reports',40,textinput,'','(.+)',u=
 ndef,
     'Email sent from ASSP acknowledging your submissions will be sent to th=
 is address. For example: admin at domain.com'],
  -[EmailFrom,'From Address for Reports',40,textinput,'<spammaster at yourdomai=
 n.com>','(.+)',undef,
  +[EmailFrom,'From Address for Reports',40,textinput,'<postmaster at yourdomai=
 n.com>','(.+)',undef,
     'Email sent from ASSP acknowledging your submissions will be sent from =
 this address.'],
 - [NoHaiku,'Legacy: Don\'t reply to messages to the Email Interface',0,chec=
 kbox,0,'([01]?)',undef,
 -   'Check this option to suppress email reports for spam and not-spam repo=
 rts, whitelist and redlist additions/deletions via the email interface.<br =
 /><hr />
 -@@ -1168,7 +1168,7 @@
 +=20
 +=20
 +@@ -1214,7 +1214,7 @@
   [0,0,0,'heading','Server Setup'],
   [AsAService,'Run ASSP as a Windows Service**',0,checkbox,0,'([01]?)',unde=
 f,
 -   'In Windows NT/2000/XP/2003 ASSP can be installed as a service. This se=
 tting 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=3D"http://www.asspsmtp.org/wiki/Quick_Start_fo=
 r_Win32">Quick Start for Win32</a> wiki page.','Basic'],
 +   'In Windows NT/2000/XP/2003 ASSP can be installed as a service. This se=
 tting 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=3D"http://www.asspsmtp.org/wiki/Quick_Start_fo=
 r_Win32">Quick Start for Win32</a> wiki page.'],
  -[AsADaemon,'Run ASSP as a Daemon**',0,checkbox,0,'([01]?)',undef,
  +[AsADaemon,'Run ASSP as a Daemon**',0,checkbox,1,'([01]?)',undef,
 -  'In Linux/BSD/Unix/OSX fork and close file handles. Similar to the comma=
 nd "perl assp.pl &", but better.','Basic'],
 +  'In Linux/BSD/Unix/OSX fork and close file handles. Similar to the comma=
 nd "perl assp.pl &", but better.'],
   [runAsUser,'Run as UID**',20,textinput,'','(\S*)',undef,
 -   'The *nix user name to assume after startup (*nix only).<p><small><i>Ex=
 amples:</i> assp, nobody</small>','Basic'],
 +   'The *nix user name to assume after startup (*nix only).<p><small><i>Ex=
 amples:</i> assp, nobody</small></p>'],
 diff -ruN /usr/ports/mail/assp/files/patch-stats.sh mail/assp/files/patch-s=
 tats.sh
 --- /usr/ports/mail/assp/files/patch-stats.sh	Thu Oct 11 20:32:21 2007
 +++ mail/assp/files/patch-stats.sh	Thu Nov  8 10:43:58 2007
 @@ -1,5 +1,5 @@
 ---- stats.sh.orig	Fri Aug  3 23:48:56 2007
 -+++ stats.sh	Fri Aug  3 23:49:15 2007
 +--- stats.sh.orig	Thu Nov  8 10:30:36 2007
 ++++ stats.sh	Thu Nov  8 10:43:14 2007
  @@ -1,15 +1,23 @@
   #!/bin/sh
  =20
 @@ -43,7 +43,7 @@
   #
   # I got the idea for this script from Mark Constable. He submitted
   #  a similar script to follow the Courier-MTA /var/log/maillog
 -@@ -46,91 +47,279 @@
 +@@ -46,91 +47,283 @@
   # Some fields are truncated (with a hard-coded length value, usually 40)
   #   to keep each line more or less intact on your screen as things scroll=
  by
   # Colors are coded with ANSI Color coding, your mileage may vary ...
 @@ -241,7 +241,7 @@
  +        $(p+8) )
  +    next
  +  }
 -+  /Unknown Sender with Local Domain/ {
 ++  /Unknown Sender (with|from) Local Domain/ {
  +    printf("%s %s \033[1;34m%-15s IS  %s\033[0m\n",
  +        $1,
  +        $2,
 @@ -253,11 +253,11 @@
  +    # suppress
  +    next
  +  }
 -+  /((DNS|URI)BL )?Received-(R|DNS|URI)BL: (pass|neutral|fail)/ {
 ++  /((DNS|URI)BL )?Received-(R|DNS|URI)BL: (pass|neutral|fail)|URIBL fail|=
 Bayesian Check URIBL/ {
  +    # suppress
  +    next
  +  }
 -+  /failed DNSBL|failed (R|URI)BL checks|Received-RBL: fail|\[DNSBL].* rej=
 ected by / {
 ++  /failed (DNS|URI)BL|failed (R|URI)BL checks|Received-RBL: fail|\[DNSBL]=
 .* rejected by / {
  +    printf("%s %s \033[1;35m%-15s BL  %s -> %s\033[0m\n",
  +        $1,
  +        $2,
 @@ -266,7 +266,7 @@
  +        $(p+7) )
  +    next
  +  }
 -+  /Received-SPF: (pass|neutral)| SPF: fail/ {
 ++  /Received-SPF: (pass|neutral)| SPF: (soft)?fail|SPFstrict/ {
  +    # suppress
  +    next
  +  }
 @@ -376,6 +376,10 @@
  +	$(p+4),
  +	$(p+8), $(p+9), $(p+10), $(p+11),
  +	substr($(p+12),8,40) )
 ++    next
 ++  }
 ++  /PBextreme:monitoring|([ValidHelo]|[InvalidHelo]|[PTRmissing])[scoring]=
 / {
 ++    # suppress
  +    next
  +  }
  +  /Message Limit/ {
 diff -ruN /usr/ports/mail/assp/pkg-plist mail/assp/pkg-plist
 --- /usr/ports/mail/assp/pkg-plist	Thu Oct 11 20:32:21 2007
 +++ mail/assp/pkg-plist	Fri Nov  9 08:34:34 2007
 @@ -13,6 +13,7 @@
  lib/assp/files/rbl-service.txt
  lib/assp/files/redre.txt
  lib/assp/files/whitedomains.txt
 +lib/assp/images/Thumbs.db
  lib/assp/images/assp.css
  lib/assp/images/dropShadow.gif
  lib/assp/images/editor.css
 @@ -28,7 +29,6 @@
  lib/assp/images/valid-xhtml10.gif
  lib/assp/images/village.gif
  lib/assp/images/xml-pill.gif
 -lib/assp/images/Thumbs.db
  lib/assp/move2num.pl
  lib/assp/rebuildspamdb.pl
  lib/assp/repair.pl
 @@ -47,7 +47,7 @@
  @dirrm lib/assp
  sbin/assp
  sbin/assplog
 -%%PORTDOCS%%%%DOCSDIR%%/ASSP Documentation.htm
 +%%PORTDOCS%%%%DOCSDIR%%/Legacy - ASSP Documentation.htm
  %%PORTDOCS%%%%DOCSDIR%%/Regular Expression Tutorial.htm
  %%PORTDOCS%%@dirrm %%DOCSDIR%%
  @unexec rm -f %%ASSP_HOME%%/reports 2>/dev/null || true
 
 --Sig_/ckFXpOb9a9Y_8vPPyilcnAk
 Content-Type: application/pgp-signature; name=signature.asc
 Content-Disposition: attachment; filename=signature.asc
 
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v1.4.7 (FreeBSD)
 
 iD8DBQFHNGNfls33urr0k4kRAuNRAJ4ixLmBcPLEM07AbDtH24CXVCds1wCfUGdi
 50H9V7W0rUyqwfWJ+oMqw+w=
 =2Zpx
 -----END PGP SIGNATURE-----
 
 --Sig_/ckFXpOb9a9Y_8vPPyilcnAk--



More information about the freebsd-ports-bugs mailing list