From scheidell@secnap.net  Wed Jun  6 00:03:40 2007
Return-Path: <scheidell@secnap.net>
Received: from mx1.freebsd.org (mx1.freebsd.org [69.147.83.52])
	by hub.freebsd.org (Postfix) with ESMTP id 1A1DC16A479
	for <FreeBSD-gnats-submit@freebsd.org>; Wed,  6 Jun 2007 00:03:40 +0000 (UTC)
	(envelope-from scheidell@secnap.net)
Received: from scanner.secnap.net (corp.secnap.com [204.89.241.135])
	by mx1.freebsd.org (Postfix) with ESMTP id AA98F13C448
	for <FreeBSD-gnats-submit@freebsd.org>; Wed,  6 Jun 2007 00:01:47 +0000 (UTC)
	(envelope-from scheidell@secnap.net)
Received: by scanner.secnap.net (Postfix, from userid 1001)
	id 3B6561CD3A; Tue,  5 Jun 2007 20:01:47 -0400 (EDT)
Message-Id: <20070606000147.3B6561CD3A@scanner.secnap.net>
Date: Tue,  5 Jun 2007 20:01:47 -0400 (EDT)
From: Michael Scheidell <scheidell@secnap.net>
To: FreeBSD-gnats-submit@freebsd.org
Cc: bri@sonicboom.org
Subject: [maintainer update] p5-Mail-SpamAssassin to 3.2.0_1
X-Send-Pr-Version: 3.113
X-GNATS-Notify:

>Number:         113394
>Category:       ports
>Synopsis:       [maintainer update] mail/p5-Mail-SpamAssassin to 3.2.0_1
>Confidential:   no
>Severity:       non-critical
>Priority:       low
>Responsible:    clsung
>State:          closed
>Quarter:        
>Keywords:       
>Date-Required:  
>Class:          maintainer-update
>Submitter-Id:   current-users
>Arrival-Date:   Wed Jun 06 00:10:03 GMT 2007
>Closed-Date:    Sat Jun 16 19:04:51 GMT 2007
>Last-Modified:  Sat Jun 16 19:04:51 GMT 2007
>Originator:     Michael Scheidell
>Release:        FreeBSD 5.5-RELEASE-p8 i386
>Organization:
SECNAP Network Security Corp
>Environment:
System: FreeBSD scanner.secnap.net 5.5-RELEASE-p8 FreeBSD 5.5-RELEASE-p8 #2: Fri Dec 29 22:23:34 EST 2006 scheidell@scanner.secnap.net:/usr/obj/usr/src/sys/HACKERTRAP_750 i386

>Description:
#1 pkg-message does not mention need for enable flags for RC.SUBR
 (thanks Bruce)
#2 Typo in sed regex prevented sa-compile plugin in 320.pre
>How-To-Repeat:
na
>Fix:

Patches against 3.2.0:

diff -bBru /var/tmp/p5-Mail-SpamAssassin-3.20/Makefile ./Makefile
--- /var/tmp/p5-Mail-SpamAssassin-3.20/Makefile Sat Jun  2 03:09:46 2007
+++ ./Makefile  Tue Jun  5 19:31:44 2007
@@ -7,6 +7,7 @@
 
 PORTNAME=      Mail-SpamAssassin
 PORTVERSION=   3.2.0
+PORTREVISION=  1
 CATEGORIES=    mail perl5
 MASTER_SITES=  ${MASTER_SITE_APACHE:S/$/:apache/} ${MASTER_SITE_PERL_CPAN:S/$/:cpan/}
 MASTER_SITE_SUBDIR=    spamassassin/source/:apache Mail/:cpan
@@ -217,7 +218,7 @@
        ${REINPLACE_CMD} -e '/DCC/s/^#loadplugin/loadplugin/' ${WRKSRC}/rules/v310.pre
 .endif
 .if defined(WITH_SACOMPILE)
-       ${REINPLACE_CMD} -e '/Rule2XSBody/s/^#loadplugin/loadplugin/' ${WRKSRC}/rules/v320.pre
+       ${REINPLACE_CMD} -e '/Rule2XSBody/s/^# loadplugin/loadplugin/' ${WRKSRC}/rules/v320.pre
 .endif
 
 pre-install:
diff -bBru /var/tmp/p5-Mail-SpamAssassin-3.20/pkg-message ./pkg-message
--- /var/tmp/p5-Mail-SpamAssassin-3.20/pkg-message      Sat Jun  2 03:09:46 2007
+++ ./pkg-message       Tue Jun  5 19:38:30 2007
@@ -25,3 +25,10 @@
 that sa-update now places state files in /var/db/spamassassin
 and not the default /var/lib/spamassassin.  This is to be consistant
 with Freebsd file directory conventions
+
+If you are running with spamd, you must add the following to rc.conf:
+spamd_enable="YES"
+
+Security Note:  If you did NOT deselected AS_ROOT, spamd will be running
+as root. To change this, also add this to rc.conf:
+spamd_flags="-u spamd -H /var/spool/spamd"



>Release-Note:
>Audit-Trail:

From: "Michael Scheidell" <scheidell@secnap.net>
To: <bug-followup@FreeBSD.org>
Cc:  
Subject: Re: ports/113394: [maintainer update] mail/p5-Mail-SpamAssassin to 3.2.0_1
Date: Tue, 12 Jun 2007 22:46:51 -0400

 This is a multi-part message in MIME format.
 
 ------=_NextPart_000_0002_01C7AD43.90FB4970
 Content-Type: text/plain;
 	charset="iso-8859-1"
 Content-Transfer-Encoding: quoted-printable
 
 Please wait, I am submitting SA 3.2.1 with all the above fixes, patches, =
 and some others by Friday.
 
 (will life every slow down?)
 
 
 ------=_NextPart_000_0002_01C7AD43.90FB4970
 Content-Type: text/html;
 	charset="iso-8859-1"
 Content-Transfer-Encoding: quoted-printable
 
 <!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0 Transitional//EN">
 <HTML><HEAD>
 <META http-equiv=3DContent-Type content=3D"text/html; =
 charset=3Diso-8859-1">
 <META content=3D"MSHTML 6.00.2900.3086" name=3DGENERATOR>
 <STYLE></STYLE>
 </HEAD>
 <BODY bgColor=3D#ffffff>
 <DIV><FONT face=3DArial size=3D2>Please wait, I am submitting SA 3.2.1 =
 with all the=20
 above fixes, patches, and some others by Friday.</FONT></DIV>
 <DIV><FONT face=3DArial size=3D2></FONT>&nbsp;</DIV>
 <DIV><FONT face=3DArial size=3D2>(will life every slow =
 down?)</FONT></DIV>
 <DIV><FONT face=3DArial size=3D2></FONT>&nbsp;</DIV>
 <DIV>&nbsp;</DIV></BODY></HTML>
 
 ------=_NextPart_000_0002_01C7AD43.90FB4970--
 

From: Michael Scheidell <scheidell@secnap.net>
To: Angelo Turetta <aturetta@bestunion.it>
Cc: bug-followup@FreeBSD.org
Subject: Re: ports/113394: [maintainer update] mail/p5-Mail-SpamAssassin to
 3.2.0_1
Date: Wed, 13 Jun 2007 11:04:55 -0400

 Angelo Turetta wrote:
 > Here is my try at the upgrade.
 > Only minimally tested (it installs/packages/deinstalls on my server)
 >
 > Hope this helps,
 > Angelo.
 Thanks, but I have one ready:
 
 http://www.secnap.com/downloads/sa321.tgz   Checks some additional 
 (required) dependencies.
 
 I will publish it Friday if I don't have any more problems.
 
 
 _________________________________________________________________________
 This email has been scanned and certified safe by SpammerTrap(tm). 
 For Information please see http://www.spammertrap.com
 _________________________________________________________________________

From: Angelo Turetta <aturetta@bestunion.it>
To: bug-followup@FreeBSD.org, scheidell@secnap.net
Cc:  
Subject: Re: ports/113394: [maintainer update] mail/p5-Mail-SpamAssassin to
 3.2.0_1
Date: Wed, 13 Jun 2007 17:01:52 +0200

 This is a multi-part message in MIME format.
 --------------070604060006080805070005
 Content-Type: text/plain; charset=ISO-8859-1; format=flowed
 Content-Transfer-Encoding: 7bit
 
 Here is my try at the upgrade.
 Only minimally tested (it installs/packages/deinstalls on my server)
 
 Hope this helps,
 Angelo.
 
 --------------070604060006080805070005
 Content-Type: text/plain;
  name="sa-321-port.diff"
 Content-Transfer-Encoding: 7bit
 Content-Disposition: inline;
  filename="sa-321-port.diff"
 
 Index: Makefile
 ===================================================================
 RCS file: /home/ncvs/ports/mail/p5-Mail-SpamAssassin/Makefile,v
 retrieving revision 1.106
 diff -u -r1.106 Makefile
 --- Makefile	2 Jun 2007 07:09:46 -0000	1.106
 +++ Makefile	13 Jun 2007 14:20:24 -0000
 @@ -6,7 +6,7 @@
  #
  
  PORTNAME=	Mail-SpamAssassin
 -PORTVERSION=	3.2.0
 +PORTVERSION=	3.2.1
  CATEGORIES=	mail perl5
  MASTER_SITES=	${MASTER_SITE_APACHE:S/$/:apache/} ${MASTER_SITE_PERL_CPAN:S/$/:cpan/}
  MASTER_SITE_SUBDIR=	spamassassin/source/:apache Mail/:cpan
 @@ -217,7 +217,7 @@
  	${REINPLACE_CMD} -e '/DCC/s/^#loadplugin/loadplugin/' ${WRKSRC}/rules/v310.pre
  .endif
  .if defined(WITH_SACOMPILE)
 -	${REINPLACE_CMD} -e '/Rule2XSBody/s/^#loadplugin/loadplugin/' ${WRKSRC}/rules/v320.pre
 +	${REINPLACE_CMD} -e '/Rule2XSBody/s/^# loadplugin/loadplugin/' ${WRKSRC}/rules/v320.pre
  .endif
  
  pre-install:
 Index: distinfo
 ===================================================================
 RCS file: /home/ncvs/ports/mail/p5-Mail-SpamAssassin/distinfo,v
 retrieving revision 1.38
 diff -u -r1.38 distinfo
 --- distinfo	2 Jun 2007 07:09:46 -0000	1.38
 +++ distinfo	13 Jun 2007 14:21:17 -0000
 @@ -1,3 +1,3 @@
 -MD5 (Mail-SpamAssassin-3.2.0.tar.gz) = aed988bb6cf463afc868a64d4cd771a3
 -SHA256 (Mail-SpamAssassin-3.2.0.tar.gz) = 4690d2639075dfd376acb3540697861e167a917fd6332bf62b2e754d26ee99be
 -SIZE (Mail-SpamAssassin-3.2.0.tar.gz) = 1290995
 +MD5 (Mail-SpamAssassin-3.2.1.tar.gz) = a7d51294c565999da01f212e5ad2a031
 +SHA256 (Mail-SpamAssassin-3.2.1.tar.gz) = e0925d9c490bb8f1e56c3b850b50b12b124536dfe581b23d3c25715b1ce9ebf7
 +SIZE (Mail-SpamAssassin-3.2.1.tar.gz) = 1193561
 Index: pkg-message
 ===================================================================
 RCS file: /home/ncvs/ports/mail/p5-Mail-SpamAssassin/pkg-message,v
 retrieving revision 1.5
 diff -u -r1.5 pkg-message
 --- pkg-message	2 Jun 2007 07:09:46 -0000	1.5
 +++ pkg-message	13 Jun 2007 14:18:28 -0000
 @@ -25,3 +25,10 @@
  that sa-update now places state files in /var/db/spamassassin
  and not the default /var/lib/spamassassin.  This is to be consistant
  with Freebsd file directory conventions
 +
 +If you are running with spamd, you must add the following to rc.conf:
 +spamd_enable="YES"
 +
 +Security Note:  If you did NOT deselected AS_ROOT, spamd will be running
 +as root. To change this, also add this to rc.conf:
 +spamd_flags="-u spamd -H /var/spool/spamd"
 Index: files/patch-sa-compile.raw
 ===================================================================
 RCS file: /home/ncvs/ports/mail/p5-Mail-SpamAssassin/files/patch-sa-compile.raw,v
 retrieving revision 1.1
 diff -u -r1.1 patch-sa-compile.raw
 --- files/patch-sa-compile.raw	2 Jun 2007 07:09:46 -0000	1.1
 +++ files/patch-sa-compile.raw	13 Jun 2007 14:52:07 -0000
 @@ -1,20 +1,23 @@
 ---- sa-compile.raw.orig	Tue May  1 09:54:33 2007
 -+++ sa-compile.raw	Thu May  3 13:35:23 2007
 -@@ -636,7 +636,7 @@
 +--- sa-compile.raw.orig	Fri Jun  8 14:56:25 2007
 ++++ sa-compile.raw	Wed Jun 13 16:49:20 2007
 +@@ -643,9 +643,9 @@
     -p prefs, --prefspath=file, --prefs-file=file
                                   Set user preferences file
     --siteconfigpath=path         Path for site configs
  -                                (default: /etc/mail/spamassassin)
  +                                (default: @@LOCAL_RULES_DIR@@)
 +   --updatedir=path              Directory to place updates
 +-                      (default: /var/lib/spamassassin/compiled/<version>)
 ++                      (default: @@LOCAL_STATE_DIR@@/compiled/<version>)
     --cf='config line'            Additional line of configuration
     -D, --debug [area=n,...]	Print debugging messages
     -V, --version			Print version
 -@@ -683,12 +683,12 @@
 +@@ -692,12 +692,12 @@
   =item B<-C> I<path>, B<--configpath>=I<path>, B<--config-file>=I<path>
   
   Use the specified path for locating the distributed configuration files.
  -Ignore the default directories (usually C</usr/share/spamassassin> or similar).
 -+Ignore the default directories (usually <@@DEF_RULES_DIR@@> or similar).
 ++Ignore the default directories (usually C<@@DEF_RULES_DIR@@> or similar).
   
   =item B<--siteconfigpath>=I<path>
   
 @@ -22,5 +25,5 @@
  -the default directories (usually C</etc/mail/spamassassin> or similar).
  +the default directories (usually C<@@LOCAL_RULES_DIR@@> or similar).
   
 - =item B<--cf='config line'>
 + =item B<--updatedir>
   
 
 --------------070604060006080805070005--

From: Angelo Turetta <aturetta@bestunion.it>
To: Michael Scheidell <scheidell@secnap.net>
Cc: bug-followup@FreeBSD.org
Subject: Re: ports/113394: [maintainer update] mail/p5-Mail-SpamAssassin to
 3.2.0_1
Date: Wed, 13 Jun 2007 17:14:27 +0200

 Michael Scheidell wrote:
 > I will publish it Friday if I don't have any more problems.
 
 I'm glad it's identical to my version (except for the dependency 
 update): only, I think your patch to sa-compile.raw unintentionally 
 removes a formatting code 'C' (also in current 3.2.0 port):
 
 @@ -692,12 +692,12 @@
   =item B<-C> I<path>, B<--configpath>=I<path>, B<--config-file>=I<path>
 
   Use the specified path for locating the distributed configuration files.
 -Ignore the default directories (usually C</usr/share/spamassassin> or 
 similar).
 +Ignore the default directories (usually <@@DEF_RULES_DIR@@> or similar).
 
 Thanks,
 Angelo.

From: Michael Scheidell <scheidell@secnap.net>
To: Angelo Turetta <aturetta@bestunion.it>
Cc: bug-followup@FreeBSD.org
Subject: Re: ports/113394: [maintainer update] mail/p5-Mail-SpamAssassin to
 3.2.0_1
Date: Wed, 13 Jun 2007 11:26:15 -0400

 Angelo Turetta wrote:
 > Michael Scheidell wrote:
 >> I will publish it Friday if I don't have any more problems.
 >
 > I'm glad it's identical to my version (except for the dependency 
 > update): only, I think your patch to sa-compile.raw unintentionally 
 > removes a formatting code 'C' (also in current 3.2.0 port):
 
 good catch.  will put it back in.
 (and one reason to get lots of great help from the FreeBsd crowd before 
 ports is committed :-)
 
 done, http://www.secnap.com/downloads/sa321.tgz updated, and I expect 
 some more by Friday.
 
 
 _________________________________________________________________________
 This email has been scanned and certified safe by SpammerTrap(tm). 
 For Information please see http://www.spammertrap.com
 _________________________________________________________________________
Responsible-Changed-From-To: freebsd-ports-bugs->clsung 
Responsible-Changed-By: clsung 
Responsible-Changed-When: Thu Jun 14 03:02:42 UTC 2007 
Responsible-Changed-Why:  
I'll take it. 

http://www.freebsd.org/cgi/query-pr.cgi?pr=113394 
State-Changed-From-To: open->closed 
State-Changed-By: sat 
State-Changed-When: Sat Jun 16 19:04:31 UTC 2007 
State-Changed-Why:  
Superceded by ports/113719 

http://www.freebsd.org/cgi/query-pr.cgi?pr=113394 
>Unformatted:
