Skip site navigation (1)Skip section navigation (2)
Date:      Mon,  7 May 2007 17:12:37 -0400 (EDT)
From:      Michael Scheidell <scheidell@secnap.net>
To:        FreeBSD-gnats-submit@FreeBSD.org
Subject:   ports/112502: Update SpamAssassin to 3.2.0
Message-ID:  <20070507211237.394201CCD3@scanner.secnap.net>
Resent-Message-ID: <200705072120.l47LK945016680@freefall.freebsd.org>

next in thread | raw e-mail | index | archive | help

>Number:         112502
>Category:       ports
>Synopsis:       Update SpamAssassin to 3.2.0
>Confidential:   no
>Severity:       non-critical
>Priority:       low
>Responsible:    freebsd-ports-bugs
>State:          open
>Quarter:        
>Keywords:       
>Date-Required:
>Class:          maintainer-update
>Submitter-Id:   current-users
>Arrival-Date:   Mon May 07 21:20:09 GMT 2007
>Closed-Date:
>Last-Modified:
>Originator:     Michael Scheidell
>Release:        FreeBSD 5.5-RELEASE-p8 i386
>Organization:
SECNAP Network Security
>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:
   SpamAssassin has been updated to 3.2.0
See http://spamassassin.apache.org
This is mostly a maintenance and features update.

There are however a couple of FreeBsd specific issues:

1) sa-update now puts files into /var/db/spamassassin/{version} where it 
belongs rather than in the non-standard /var/lib/spamassassin.
  Thanks to uhlar@fantomas.sk (see PR: ports/108934 
2) security, version minimum updates:
  Compress-Zlib needs to be minimum 1.04, HTML-Parser, 3.3.1, Tar.pm, 
1.2.3, gnupg >=1.4.7 (gnupg 2.x preferred)
3) additional files needed: Detect.pm for encoding, p5-Mail-SPF replaces 
p5-Mail-SPF-Query, newer DKIM replaces DomainKeys
4) sa-compile is broken (need re2c >=.11.3 or it segfaults)
5) tools directory removed (find it in SVN if you need it)
6) patch files added: patch-ImageInfo.pm and patch-sa-compile.raw
7) patch files REMOVED (ports, please note:
   don't need patch-sa-learn-raw anymore!

>How-To-Repeat:
make.
>Fix:

if this patch is too long, you can get the whole tarball here:
don't forget to remove patch-sa-learn-raw

http://www.secnap.com/downloads/sa320.tgz

diff -bBru /var/tmp/p5-Mail-SpamAssassin/Makefile ./Makefile
--- /var/tmp/p5-Mail-SpamAssassin/Makefile      Sat Feb 24 04:01:03 2007
+++ ./Makefile  Thu May  3 17:24:59 2007
@@ -6,8 +6,7 @@
 #
 
 PORTNAME=      Mail-SpamAssassin
-PORTVERSION=   3.1.8
-PORTREVISION=  1
+PORTVERSION=   3.2.0
 CATEGORIES=    mail perl5
 MASTER_SITES=  ${MASTER_SITE_APACHE:S/$/:apache/} 
${MASTER_SITE_PERL_CPAN:S/$/:cpan/}
 MASTER_SITE_SUBDIR=    spamassassin/source/:apache Mail/:cpan
@@ -18,36 +17,47 @@
 COMMENT=       A highly efficient mail filter for identifying spam
 
 BUILD_DEPENDS= p5-Net-DNS>=0.53:${PORTSDIR}/dns/p5-Net-DNS \
-               
${SITE_PERL}/${PERL_ARCH}/HTML/Parser.pm:${PORTSDIR}/www/p5-HTML-Parser 
\
+               
p5-Compress-Zlib>=1.04:${PORTSDIR}/archivers/p5-Compress-Zlib \
+               p5-HTML-Parser>=3.31:${PORTSDIR}/www/p5-HTML-Parser \
                
${SITE_PERL}/Mail/Internet.pm:${PORTSDIR}/mail/p5-Mail-Tools
+
 RUN_DEPENDS=   ${BUILD_DEPENDS} \
                ${SITE_PERL}/Bundle/LWP.pm:${PORTSDIR}/www/p5-libwww \
-               
${SITE_PERL}/Archive/Tar.pm:${PORTSDIR}/archivers/p5-Archive-Tar
+               
p5-Archive-Tar>=1.23:${PORTSDIR}/archivers/p5-Archive-Tar \
+               
${SITE_PERL}/mach/Encode/Detect.pm:${PORTSDIR}/converters/p5-Encode-Detect
 
 PERL_CONFIGURE=        yes
 CONFIGURE_ARGS=        SYSCONFDIR="${PREFIX}/etc" \
                CONTACT_ADDRESS="${CONTACT_ADDRESS}" \
-               BUILD_SPAMC=yes
+               LOCALSTATEDIR="/var/db/spamassassin"
 
 # You can override it if you like
 CONTACT_ADDRESS?=      The administrator of that system
 
 OPTIONS=       AS_ROOT "Run spamd as root (recommended)" on \
-               DOMAINKEYS "DomainKeys support" off \
-               DKIM "DomainKeys Identified Mail" off \
+               SPAMC "Build spamd/spamc (not for amavisd)" on \
+               SACOMPILE "sa-compile broken" off \
+               DKIM "DKIM/DomainKeys Identified Mail" off \
                SSL "Build with SSL support for spamd/spamc" on \
                GNUPG "Install GnuPG (for sa-update)" on \
                MYSQL "Add MySQL support" off \
                PGSQL "Add PostreSQL support" off \
                RAZOR "Add Vipul's Razor support" on \
                SPF_QUERY "Add SPF query support" off \
-               RELAY_COUNTRY "Relay country support" off \
-               TOOLS "Install SpamAssassin tools" off
+               RELAY_COUNTRY "Relay country support" off
 
 .include <bsd.port.pre.mk>
 
+.if defined (WITH_SPAMC)
+CONFIGURE_ARGS+=       BUILD_SPAMC=yes
+.else
+CONFIGURE_ARGS+=       BUILD_SPAMC=no
+WITH_AS_ROOT=
+WITHOUT_SSL=1
+.endif
+
 .if defined(WITH_SPF_QUERY)
-RUN_DEPENDS+=  
${SITE_PERL}/Mail/SPF/Query.pm:${PORTSDIR}/mail/p5-Mail-SPF-Query
+RUN_DEPENDS+=  ${SITE_PERL}/Mail/SPF.pm:${PORTSDIR}/mail/p5-Mail-SPF
 .endif
 
 .if !defined(WITHOUT_SSL)
@@ -62,7 +72,7 @@
 .endif
 
 .if !defined(WITHOUT_GNUPG)
-RUN_DEPENDS+=  gnupg>=1.4.1:${PORTSDIR}/security/gnupg
+RUN_DEPENDS+=  gnupg>=1.4.7:${PORTSDIR}/security/gnupg
 .endif
 
 .if defined(WITH_MYSQL)
@@ -81,26 +91,25 @@
 RUN_DEPENDS+=  ${SITE_PERL}/Mail/DKIM.pm:${PORTSDIR}/mail/p5-Mail-DKIM
 .endif
 
-.if defined(WITH_DOMAINKEYS)
-RUN_DEPENDS+=  
p5-Mail-DomainKeys>=0.80:${PORTSDIR}/mail/p5-Mail-DomainKeys
+.if defined(WITH_SACOMPILE)
+IGNORE= sa-compile doesn't work on FREEBSD or Solaris
+# also sed # loadplugin Rule2XSBody in v320.pre once fixed
+# error:
+#/libexec/ld-elf.so.1: 
/var/db/spamassassin/compiled/3.002000/auto/Mail/SpamAssassin/CompiledRegexps/body_0/body_0.so: 
Undefined symbol "Mail_SpamAssassin_CompiledRegexps_body_0_scan1"
+#rumor has it re2c version .11.3 fixes it but as of this port, only v 
.11.1 was in ports
+# http://issues.apache.org/SpamAssassin/show_bug.cgi?id=5435
+# if you are brave, remove the IGNORE line and make again
+RUN_DEPENDS+=  re2c>=.11.3:${PORTSDIR}/devel/re2c
 .endif
 
 .if defined(WITH_RELAY_COUNTRY)
 RUN_DEPENDS+=  
${SITE_PERL}/IP/Country/Fast.pm:${PORTSDIR}/net/p5-IP-Country
 .endif
 
-.if defined(WITH_TOOLS)
-RUN_DEPENDS+=  
${SITE_PERL}/Parse/Syslog.pm:${PORTSDIR}/textproc/p5-Parse-Syslog \
-               
${SITE_PERL}/Date/Manip.pm:${PORTSDIR}/devel/p5-Date-Manip \
-               
${SITE_PERL}/Net/CIDR/Lite.pm:${PORTSDIR}/net/p5-Net-CIDR-Lite
-TOOLS=         ""
-.else
-TOOLS=         "@comment "
-.endif
-
 MAN3=          Mail::SpamAssassin.3 \
                Mail::SpamAssassin::AICache.3 \
                Mail::SpamAssassin::ArchiveIterator.3 \
+               Mail::SpamAssassin::AsyncLoop.3 \
                Mail::SpamAssassin::AutoWhitelist.3 \
                Mail::SpamAssassin::Bayes.3 \
                Mail::SpamAssassin::BayesStore.3 \
@@ -124,24 +133,32 @@
                Mail::SpamAssassin::PerMsgStatus.3 \
                Mail::SpamAssassin::PersistentAddrList.3 \
                Mail::SpamAssassin::Plugin.3 \
+               Mail::SpamAssassin::Plugin::ASN.3 \
                Mail::SpamAssassin::Plugin::AWL.3 \
                Mail::SpamAssassin::Plugin::AccessDB.3 \
                Mail::SpamAssassin::Plugin::AntiVirus.3 \
                Mail::SpamAssassin::Plugin::AutoLearnThreshold.3 \
+               Mail::SpamAssassin::Plugin::BodyRuleBaseExtractor.3 \
+               Mail::SpamAssassin::Plugin::Check.3 \
                Mail::SpamAssassin::Plugin::DCC.3 \
                Mail::SpamAssassin::Plugin::DKIM.3 \
                Mail::SpamAssassin::Plugin::DomainKeys.3 \
                Mail::SpamAssassin::Plugin::Hashcash.3 \
                Mail::SpamAssassin::Plugin::MIMEHeader.3 \
+               Mail::SpamAssassin::Plugin::OneLineBodyRuleType.3 \
                Mail::SpamAssassin::Plugin::Pyzor.3 \
                Mail::SpamAssassin::Plugin::Razor2.3 \
                Mail::SpamAssassin::Plugin::RelayCountry.3 \
                Mail::SpamAssassin::Plugin::ReplaceTags.3 \
+               Mail::SpamAssassin::Plugin::Rule2XSBody.3 \
                Mail::SpamAssassin::Plugin::SPF.3 \
+               Mail::SpamAssassin::Plugin::Shortcircuit.3 \
                Mail::SpamAssassin::Plugin::SpamCop.3 \
                Mail::SpamAssassin::Plugin::Test.3 \
                Mail::SpamAssassin::Plugin::TextCat.3 \
                Mail::SpamAssassin::Plugin::URIDNSBL.3 \
+               Mail::SpamAssassin::Plugin::URIDetail.3 \
+               Mail::SpamAssassin::Plugin::VBounce.3 \
                Mail::SpamAssassin::Plugin::WhiteListSubject.3 \
                Mail::SpamAssassin::PluginHandler.3 \
                Mail::SpamAssassin::SQLBasedAddrList.3 \
@@ -152,17 +169,15 @@
                spamassassin-run.3
 
 MAN1=          spamd.1 spamassassin.1 spamc.1 sa-learn.1 sa-update.1 \
-               spamassassin-run.1
-
-PLIST_SUB+=    TOOLS=${TOOLS}
+               spamassassin-run.1 sa-compile.1
 
 DOCSDIR=       ${PREFIX}/share/doc/${PKGNAMEPREFIX}${PORTNAME}
 DATADIR=       ${PREFIX}/share/spamassassin
 DOCS=          BUGS CREDITS Changes INSTALL LICENSE NOTICE PACKAGING 
README STATUS TRADEMARK UPGRADE USAGE procmailrc.example
+DOCS=          CREDITS Changes INSTALL LICENSE NOTICE PACKAGING README 
TRADEMARK UPGRADE USAGE procmailrc.example
 DOCSSQL=       README README.awl README.bayes awl_mysql.sql awl_pg.sql 
bayes_mysql.sql bayes_pg.sql userpref_mysql.sql userpref_pg.sql
-DOCSCONTRIB=   mbox-to-check run-corpora run-masses
 DOCSLDAP=      README README.testing sa_test.ldif
-PORTDOCS=      ${DOCS} sql contrib ldap
+PORTDOCS=      ${DOCS} sql ldap
 
 USE_RC_SUBR=   sa-spamd.sh
 
@@ -183,15 +198,13 @@
                -e 's#B_CONFDIR)/init.pre#B_CONFDIR)/init.pre.sample#g' 
\
                -e 's#B_CONFDIR)/v310.pre#B_CONFDIR)/v310.pre.sample#g' 
\
                -e 's#B_CONFDIR)/v312.pre#B_CONFDIR)/v312.pre.sample#g' 
\
+               -e 's#B_CONFDIR)/v320.pre#B_CONFDIR)/v320.pre.sample#g' 
\
                -e 's/require DBI/0/' \
                ${WRKSRC}/Makefile.PL
-# I cant' seem to get these to work, patches or suggestions welcome
+
 .if defined(WITH_RAZOR)
        ${REINPLACE_CMD} -e '/Razor2/s/^#loadplugin/loadplugin/' 
${WRKSRC}/rules/v312.pre
 .endif
-.if defined(WITH_DOMAINKEYS)
-       ${REINPLACE_CMD} -e '/DomainKeys/s/^#loadplugin/loadplugin/' 
${WRKSRC}/rules/v310.pre
-.endif
 .if defined(WITH_RELAY_COUNTRY)
        ${REINPLACE_CMD} -e '/RelayCountry/s/^# ?loadplugin/loadplugin/' 
${WRKSRC}/rules/init.pre
 .endif
@@ -204,6 +217,9 @@
 .if defined(WITH_DCC)
        ${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/v310.pre
+.endif
 
 pre-install:
        @${SH} ${PKGINSTALL} ${PKGNAME} PRE-INSTALL
@@ -219,17 +235,14 @@
        @[ -f ${PREFIX}/etc/mail/spamassassin/v312.pre ] || \
                ${CP} ${PREFIX}/etc/mail/spamassassin/v312.pre.sample \
                        ${PREFIX}/etc/mail/spamassassin/v312.pre
-.if defined(WITH_TOOLS)
-       @${MKDIR} ${DATADIR}/tools
-       @for f in ${WRKSRC}/tools/*; do \
-               ${INSTALL} $${f} ${DATADIR}/tools; \
-       done
-.endif
+       @[ -f ${PREFIX}/etc/mail/spamassassin/v320.pre ] || \
+               ${CP} ${PREFIX}/etc/mail/spamassassin/v320.pre.sample \
+                       ${PREFIX}/etc/mail/spamassassin/v320.pre
+
 .if !defined(NOPORTDOCS)
-       @${MKDIR} ${DOCSDIR} ${DOCSDIR}/sql ${DOCSDIR}/contrib 
${DOCSDIR}/ldap
+       @${MKDIR} ${DOCSDIR} ${DOCSDIR}/sql ${DOCSDIR}/ldap
        @${INSTALL_DATA} ${DOCS:S|^|${WRKSRC}/|} ${DOCSDIR}
        @${INSTALL_DATA} ${DOCSSQL:S|^|${WRKSRC}/sql/|} ${DOCSDIR}/sql
-       @${INSTALL_DATA} ${DOCSCONTRIB:S|^|${WRKSRC}/contrib/|} 
${DOCSDIR}/contrib
        @${INSTALL_DATA} ${DOCSLDAP:S|^|${WRKSRC}/ldap/|} 
${DOCSDIR}/ldap
 
 .endif
diff -bBru /var/tmp/p5-Mail-SpamAssassin/distinfo ./distinfo
--- /var/tmp/p5-Mail-SpamAssassin/distinfo      Fri Feb 16 03:53:07 2007
+++ ./distinfo  Thu May  3 11:14:37 2007
@@ -1,3 +1,3 @@
-MD5 (Mail-SpamAssassin-3.1.8.tar.gz) = 20a3a6b651a89dcc70634715ca833996
-SHA256 (Mail-SpamAssassin-3.1.8.tar.gz) = 
01e5b0d78969cfb0580efb14a7a7212ed3af9f382829afcd61b97a91938831dd
-SIZE (Mail-SpamAssassin-3.1.8.tar.gz) = 1173847
+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
Only in ./files: patch-ImageInfo.pm
Only in ./files: patch-sa-compile.raw
Only in /var/tmp/p5-Mail-SpamAssassin/files: patch-sa-learn-raw
diff -bBru /var/tmp/p5-Mail-SpamAssassin/pkg-message ./pkg-message
--- /var/tmp/p5-Mail-SpamAssassin/pkg-message   Sat Jan  7 06:13:05 2006
+++ ./pkg-message       Tue Apr 24 14:04:43 2007
@@ -19,3 +19,9 @@
 *      files listed above.                                             
*
 *                                                                      
*
 
*************************************************************************
+You may wish to run sa-update now to obtain the latest rules.
+
+NOTE:  FREEBSD users: If you are updating to 3.20 you will find
+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
diff -bBru /var/tmp/p5-Mail-SpamAssassin/pkg-plist ./pkg-plist
--- /var/tmp/p5-Mail-SpamAssassin/pkg-plist     Wed Sep  6 11:19:51 2006
+++ ./pkg-plist Mon May  7 09:18:17 2007
@@ -5,6 +5,7 @@
 bin/spamassassin
 bin/spamc
 bin/spamd
+@unexec rm -rf %D/etc/mail/spamassassin/sa-update-keys || true
 etc/mail/spamassassin/local.cf.sample
 @unexec if cmp -s %B/init.pre.sample %B/init.pre; then rm -f 
%B/init.pre; fi
 etc/mail/spamassassin/init.pre.sample
@@ -15,9 +16,13 @@
 @unexec if cmp -s %B/v312.pre.sample %B/v312.pre; then rm -f 
%B/v312.pre; fi
 etc/mail/spamassassin/v312.pre.sample
 @exec [ -f %B/v312.pre ] || cp %B/%f %B/v312.pre
+@unexec if cmp -s %B/v320.pre.sample %B/v320.pre; then rm -f 
%B/v320.pre; fi
+etc/mail/spamassassin/v320.pre.sample
+@exec [ -f %B/v320.pre ] || cp %B/%f %B/v320.pre
 %%SITE_PERL%%/Mail/SpamAssassin.pm
 %%SITE_PERL%%/Mail/SpamAssassin/AICache.pm
 %%SITE_PERL%%/Mail/SpamAssassin/ArchiveIterator.pm
+%%SITE_PERL%%/Mail/SpamAssassin/AsyncLoop.pm
 %%SITE_PERL%%/Mail/SpamAssassin/AutoWhitelist.pm
 %%SITE_PERL%%/Mail/SpamAssassin/Bayes.pm
 %%SITE_PERL%%/Mail/SpamAssassin/Bayes/CombineChi.pm
@@ -37,7 +42,6 @@
 %%SITE_PERL%%/Mail/SpamAssassin/DBBasedAddrList.pm
 %%SITE_PERL%%/Mail/SpamAssassin/Dns.pm
 %%SITE_PERL%%/Mail/SpamAssassin/DnsResolver.pm
-%%SITE_PERL%%/Mail/SpamAssassin/EvalTests.pm
 %%SITE_PERL%%/Mail/SpamAssassin/HTML.pm
 %%SITE_PERL%%/Mail/SpamAssassin/Locales.pm
 %%SITE_PERL%%/Mail/SpamAssassin/Locker.pm
@@ -59,23 +63,42 @@
 %%SITE_PERL%%/Mail/SpamAssassin/PersistentAddrList.pm
 %%SITE_PERL%%/Mail/SpamAssassin/Plugin.pm
 %%SITE_PERL%%/Mail/SpamAssassin/Plugin/AWL.pm
+%%SITE_PERL%%/Mail/SpamAssassin/Plugin/ASN.pm
 %%SITE_PERL%%/Mail/SpamAssassin/Plugin/AccessDB.pm
 %%SITE_PERL%%/Mail/SpamAssassin/Plugin/AntiVirus.pm
 %%SITE_PERL%%/Mail/SpamAssassin/Plugin/AutoLearnThreshold.pm
+%%SITE_PERL%%/Mail/SpamAssassin/Plugin/Bayes.pm
+%%SITE_PERL%%/Mail/SpamAssassin/Plugin/BodyEval.pm
+%%SITE_PERL%%/Mail/SpamAssassin/Plugin/BodyRuleBaseExtractor.pm
+%%SITE_PERL%%/Mail/SpamAssassin/Plugin/Check.pm
 %%SITE_PERL%%/Mail/SpamAssassin/Plugin/DCC.pm
 %%SITE_PERL%%/Mail/SpamAssassin/Plugin/DKIM.pm
+%%SITE_PERL%%/Mail/SpamAssassin/Plugin/DNSEval.pm
 %%SITE_PERL%%/Mail/SpamAssassin/Plugin/DomainKeys.pm
+%%SITE_PERL%%/Mail/SpamAssassin/Plugin/HTMLEval.pm
+%%SITE_PERL%%/Mail/SpamAssassin/Plugin/HTTPSMismatch.pm
 %%SITE_PERL%%/Mail/SpamAssassin/Plugin/Hashcash.pm
+%%SITE_PERL%%/Mail/SpamAssassin/Plugin/HeaderEval.pm
+%%SITE_PERL%%/Mail/SpamAssassin/Plugin/ImageInfo.pm
+%%SITE_PERL%%/Mail/SpamAssassin/Plugin/MIMEEval.pm
 %%SITE_PERL%%/Mail/SpamAssassin/Plugin/MIMEHeader.pm
+%%SITE_PERL%%/Mail/SpamAssassin/Plugin/OneLineBodyRuleType.pm
 %%SITE_PERL%%/Mail/SpamAssassin/Plugin/Pyzor.pm
 %%SITE_PERL%%/Mail/SpamAssassin/Plugin/Razor2.pm
+%%SITE_PERL%%/Mail/SpamAssassin/Plugin/RelayEval.pm
 %%SITE_PERL%%/Mail/SpamAssassin/Plugin/RelayCountry.pm
 %%SITE_PERL%%/Mail/SpamAssassin/Plugin/ReplaceTags.pm
+%%SITE_PERL%%/Mail/SpamAssassin/Plugin/Rule2XSBody.pm
 %%SITE_PERL%%/Mail/SpamAssassin/Plugin/SPF.pm
+%%SITE_PERL%%/Mail/SpamAssassin/Plugin/Shortcircuit.pm
 %%SITE_PERL%%/Mail/SpamAssassin/Plugin/SpamCop.pm
 %%SITE_PERL%%/Mail/SpamAssassin/Plugin/Test.pm
 %%SITE_PERL%%/Mail/SpamAssassin/Plugin/TextCat.pm
 %%SITE_PERL%%/Mail/SpamAssassin/Plugin/URIDNSBL.pm
+%%SITE_PERL%%/Mail/SpamAssassin/Plugin/URIDetail.pm
+%%SITE_PERL%%/Mail/SpamAssassin/Plugin/URIEval.pm
+%%SITE_PERL%%/Mail/SpamAssassin/Plugin/VBounce.pm
+%%SITE_PERL%%/Mail/SpamAssassin/Plugin/WLBLEval.pm
 %%SITE_PERL%%/Mail/SpamAssassin/Plugin/WhiteListSubject.pm
 %%SITE_PERL%%/Mail/SpamAssassin/PluginHandler.pm
 %%SITE_PERL%%/Mail/SpamAssassin/Reporter.pm
@@ -87,29 +110,31 @@
 %%SITE_PERL%%/Mail/SpamAssassin/Util/DependencyInfo.pm
 %%SITE_PERL%%/Mail/SpamAssassin/Util/Progress.pm
 %%SITE_PERL%%/Mail/SpamAssassin/Util/RegistrarBoundaries.pm
+%%SITE_PERL%%/Mail/SpamAssassin/Util/TieOneStringHash.pm
 %%SITE_PERL%%/%%PERL_ARCH%%/auto/Mail/SpamAssassin/.packlist
 %%SITE_PERL%%/spamassassin-run.pod
-%%DATADIR%%/10_misc.cf
+%%DATADIR%%/10_default_prefs.cf
 %%DATADIR%%/20_advance_fee.cf
-%%DATADIR%%/20_anti_ratware.cf
 %%DATADIR%%/20_body_tests.cf
 %%DATADIR%%/20_compensate.cf
 %%DATADIR%%/20_dnsbl_tests.cf
 %%DATADIR%%/20_drugs.cf
+%%DATADIR%%/20_dynrdns.cf
 %%DATADIR%%/20_fake_helo_tests.cf
 %%DATADIR%%/20_head_tests.cf
 %%DATADIR%%/20_html_tests.cf
+%%DATADIR%%/20_imageinfo.cf
 %%DATADIR%%/20_meta_tests.cf
 %%DATADIR%%/20_net_tests.cf
 %%DATADIR%%/20_phrases.cf
 %%DATADIR%%/20_porn.cf
 %%DATADIR%%/20_ratware.cf
 %%DATADIR%%/20_uri_tests.cf
+%%DATADIR%%/20_vbounce.cf
 %%DATADIR%%/23_bayes.cf
 %%DATADIR%%/25_accessdb.cf
 %%DATADIR%%/25_antivirus.cf
-%%DATADIR%%/25_body_tests_es.cf
-%%DATADIR%%/25_body_tests_pl.cf
+%%DATADIR%%/25_asn.cf
 %%DATADIR%%/25_dcc.cf
 %%DATADIR%%/25_dkim.cf
 %%DATADIR%%/25_domainkeys.cf
@@ -128,27 +153,19 @@
 %%DATADIR%%/30_text_pt_br.cf
 %%DATADIR%%/50_scores.cf
 %%DATADIR%%/60_awl.cf
+%%DATADIR%%/60_shortcircuit.cf
 %%DATADIR%%/60_whitelist.cf
 %%DATADIR%%/60_whitelist_dk.cf
 %%DATADIR%%/60_whitelist_dkim.cf
 %%DATADIR%%/60_whitelist_spf.cf
 %%DATADIR%%/60_whitelist_subject.cf
+%%DATADIR%%/72_active.cf
 %%DATADIR%%/languages
-%%DATADIR%%/triplets.txt
 %%DATADIR%%/sa-update-pubkey.txt
 %%DATADIR%%/user_prefs.template
-%%TOOLS%%%%DATADIR%%/tools/README.speedtest
-%%TOOLS%%%%DATADIR%%/tools/check_whitelist
-%%TOOLS%%%%DATADIR%%/tools/convert_awl_dbm_to_sql
-%%TOOLS%%%%DATADIR%%/tools/desc_length.pl
-%%TOOLS%%%%DATADIR%%/tools/mboxsplit
-%%TOOLS%%%%DATADIR%%/tools/sa-stats.pl
-%%TOOLS%%%%DATADIR%%/tools/speedtest
-%%TOOLS%%%%DATADIR%%/tools/split_corpora
-%%TOOLS%%%%DATADIR%%/tools/sysreport
-%%TOOLS%%%%DATADIR%%/tools/test_extract
-%%TOOLS%%%%DATADIR%%/tools/triplets.pl
-%%TOOLS%%@dirrm %%DATADIR%%/tools
+@unexec rm -rf %D/libdata/spamassassin || true
+@unexec rm -rf /var/lib/spamassassin || true
+@unexec rm -rf /var/lib || true
 @dirrm %%DATADIR%%
 @dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/Mail/SpamAssassin
 @dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Mail

>Release-Note:
>Audit-Trail:
>Unformatted:



Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?20070507211237.394201CCD3>