From scheidell@secnap.net  Sat Jun 14 16:20:37 2008
Return-Path: <scheidell@secnap.net>
Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34])
	by hub.freebsd.org (Postfix) with ESMTP id 421031065674
	for <FreeBSD-gnats-submit@freebsd.org>; Sat, 14 Jun 2008 16:20:37 +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 EDDED8FC12
	for <FreeBSD-gnats-submit@freebsd.org>; Sat, 14 Jun 2008 16:20:36 +0000 (UTC)
	(envelope-from scheidell@secnap.net)
Received: by scanner.secnap.net (Postfix, from userid 1001)
	id ECBDB1CE7E; Sat, 14 Jun 2008 12:00:51 -0400 (EDT)
Message-Id: <20080614160051.ECBDB1CE7E@scanner.secnap.net>
Date: Sat, 14 Jun 2008 12:00:51 -0400 (EDT)
From: Michael Scheidell <scheidell@secnap.net>
To: FreeBSD-gnats-submit@freebsd.org
Subject: [MAINTAINER-UPDATE] p5-Mail-SpamAssassin 3.2.4 to 3.2.5
X-Send-Pr-Version: 3.113
X-GNATS-Notify:

>Number:         124577
>Category:       ports
>Synopsis:       [MAINTAINER-UPDATE] mail/p5-Mail-SpamAssassin 3.2.4 to 3.2.5
>Confidential:   no
>Severity:       non-critical
>Priority:       medium
>Responsible:    edwin
>State:          closed
>Quarter:        
>Keywords:       
>Date-Required:  
>Class:          maintainer-update
>Submitter-Id:   current-users
>Arrival-Date:   Sat Jun 14 16:30:01 UTC 2008
>Closed-Date:    Sun Jun 15 01:59:28 UTC 2008
>Last-Modified:  Sun Jun 15 02:00:08 UTC 2008
>Originator:     User &
>Release:        FreeBSD 5.5-RELEASE-p16 i386
>Organization:
SECNAP Network Security http://www.secnap.com
>Environment:
System: FreeBSD scanner.secnap.net 5.5-RELEASE-p16 FreeBSD 5.5-RELEASE-p16 #1: Sat Oct 20 12:34:28 EDT 2007 scheidell@scanner.secnap.net:/usr/obj/usr/src/sys/HACKERTRAP_750 i386
>Description:
Maintaniance update: SpamAssassin 3.2.4 to 3.2.5 release
>How-To-Repeat:
na
>Fix:
patch:

diff -bBru sa324_5/Makefile sa325/Makefile
--- sa324_5/Makefile    Thu Jun 12 14:23:52 2008
+++ sa325/Makefile      Thu Jun 12 14:24:28 2008
@@ -6,8 +6,7 @@
 #
 
 PORTNAME=      Mail-SpamAssassin
-PORTVERSION=   3.2.4
-PORTREVISION=  5
+PORTVERSION=   3.2.5
 CATEGORIES=    mail perl5
 MASTER_SITES=  ${MASTER_SITE_APACHE:S/$/:apache/} ${MASTER_SITE_PERL_CPAN:S/$/:cpan/}
 MASTER_SITE_SUBDIR=    spamassassin/source/:apache Mail/:cpan
diff -bBru sa324_5/distinfo sa325/distinfo
--- sa324_5/distinfo    Tue Jan 15 18:08:41 2008
+++ sa325/distinfo      Thu Jun 12 17:14:56 2008
@@ -1,3 +1,3 @@
-MD5 (Mail-SpamAssassin-3.2.4.tar.gz) = 81ec227d4d63aba08563ee868af9fbeb
-SHA256 (Mail-SpamAssassin-3.2.4.tar.gz) = 20f9c64d75210da5018d21585f6474868966cf1c09cb68d9fb0a3635aa17dccb
-SIZE (Mail-SpamAssassin-3.2.4.tar.gz) = 1219161
+MD5 (Mail-SpamAssassin-3.2.5.tar.gz) = 7fdc1651d0371c4a7f95ac9ae6f828a6
+SHA256 (Mail-SpamAssassin-3.2.5.tar.gz) = 105e18448d7ee2e576ceaca23b129da5e4a3c7dfccec73b6a3babb75d9c0b4f7
+SIZE (Mail-SpamAssassin-3.2.5.tar.gz) = 1223706
diff -bBru sa324_5/files/patch-sa-compile.raw sa325/files/patch-sa-compile.raw
--- sa324_5/files/patch-sa-compile.raw  Mon Aug 13 18:33:32 2007
+++ sa325/files/patch-sa-compile.raw    Thu Jun 12 17:29:49 2008
@@ -1,18 +1,18 @@
---- sa-compile.raw.orig        2007-08-08 05:19:47.000000000 -0800
-+++ sa-compile.raw     2007-08-11 12:31:07.000000000 -0800
-@@ -659,9 +659,9 @@
+--- sa-compile.raw.orig        Tue Jun 10 05:21:07 2008
++++ sa-compile.raw     Thu Jun 12 17:28:56 2008
+@@ -682,9 +682,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>)
+-                      (default: /var/lib/spamassassin/compiled/<perlversion>/<version>)
++                      (default: @@LOCAL_STATE_DIR@@/compiled/<perlversion>/<version>)
    --cf='config line'            Additional line of configuration
    -D, --debug [area=n,...]    Print debugging messages
    -V, --version                       Print version
-@@ -708,12 +708,12 @@
+@@ -735,12 +735,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.
diff -bBru sa324_5/pkg-message sa325/pkg-message
--- sa324_5/pkg-message Sat Jun 16 18:17:03 2007
+++ sa325/pkg-message   Thu Jun 12 17:46:46 2008
@@ -26,6 +26,11 @@
 and not the default /var/lib/spamassassin.  This is to be consistant
 with Freebsd file directory conventions
 
+If you run sa-compile, you will notice that files are in 
+/var/db/spamassassin/compiled/<perlversion>/<version> instead of
+/var/db/spamassassin/compiled/<version>.
+No attempts have been made to move old versions over. You must recompile.
+
 If you are running with spamd, you must add the following to rc.conf:
 spamd_enable="YES"
 
diff -bBru sa324_5/pkg-plist sa325/pkg-plist
--- sa324_5/pkg-plist   Thu Jan 31 09:04:06 2008
+++ sa325/pkg-plist     Thu Jun 12 17:57:54 2008
@@ -166,6 +166,7 @@
 %%DATADIR%%/60_whitelist_spf.cf
 %%DATADIR%%/60_whitelist_subject.cf
 %%DATADIR%%/72_active.cf
+%%DATADIR%%/72_removed.cf
 %%DATADIR%%/languages
 %%DATADIR%%/sa-update-pubkey.txt
 %%DATADIR%%/user_prefs.template

>Release-Note:
>Audit-Trail:
Responsible-Changed-From-To: freebsd-ports-bugs->edwin 
Responsible-Changed-By: edwin 
Responsible-Changed-When: Sun Jun 15 01:56:51 UTC 2008 
Responsible-Changed-Why:  
I've offered help 

http://www.freebsd.org/cgi/query-pr.cgi?pr=124577 
State-Changed-From-To: open->closed 
State-Changed-By: edwin 
State-Changed-When: Sun Jun 15 01:59:25 UTC 2008 
State-Changed-Why:  
Committed, thanks! 

http://www.freebsd.org/cgi/query-pr.cgi?pr=124577 

From: dfilter@FreeBSD.ORG (dfilter service)
To: bug-followup@FreeBSD.org
Cc:  
Subject: Re: ports/124577: commit references a PR
Date: Sun, 15 Jun 2008 01:59:26 +0000 (UTC)

 edwin       2008-06-15 01:59:21 UTC
 
   FreeBSD ports repository
 
   Modified files:
     mail/p5-Mail-SpamAssassin Makefile distinfo pkg-message 
                               pkg-plist 
     mail/p5-Mail-SpamAssassin/files patch-sa-compile.raw 
   Log:
   Maintaniance update: SpamAssassin 3.2.4 to 3.2.5 release
   
   PR:             ports/124577
   Submitted by:   Michael Scheidell <scheidell@secnap.net>
   
   Revision  Changes    Path
   1.119     +1 -2      ports/mail/p5-Mail-SpamAssassin/Makefile
   1.42      +3 -3      ports/mail/p5-Mail-SpamAssassin/distinfo
   1.4       +6 -6      ports/mail/p5-Mail-SpamAssassin/files/patch-sa-compile.raw
   1.7       +5 -0      ports/mail/p5-Mail-SpamAssassin/pkg-message
   1.44      +1 -0      ports/mail/p5-Mail-SpamAssassin/pkg-plist
 _______________________________________________
 cvs-all@freebsd.org mailing list
 http://lists.freebsd.org/mailman/listinfo/cvs-all
 To unsubscribe, send any mail to "cvs-all-unsubscribe@freebsd.org"
 
>Unformatted:
