Skip site navigation (1)Skip section navigation (2)
Date:      Wed, 29 Apr 2015 18:46:30 +0000 (UTC)
From:      Adam Weinberger <adamw@FreeBSD.org>
To:        ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org
Subject:   svn commit: r385003 - in head: japanese/spamassassin mail/spamassassin mail/spamassassin/files
Message-ID:  <201504291846.t3TIkUBH064975@svn.freebsd.org>

next in thread | raw e-mail | index | archive | help
Author: adamw
Date: Wed Apr 29 18:46:29 2015
New Revision: 385003
URL: https://svnweb.freebsd.org/changeset/ports/385003

Log:
  Update spamassassin to 3.4.1.
  
  Changes:
    * improved automation to help combat spammers that are abusing new top level
      domains;
    * tweaks to the SPF support to block more spoofed emails;
    * increased character set normalization to make rules easier to develop and
      stop spammers from using alternate character sets to bypass tests;
    * continued refinement to the native IPv6 support; and
    * improved Bayesian classification with better debugging and attachment
      hashing.
  
  Full ChangeLog at https://metacpan.org/changes/distribution/Mail-SpamAssassin
  
  The japanese/spamassassin port is broken until it's updated for 3.4.1.

Deleted:
  head/mail/spamassassin/files/3.4.0-RELEASE-NOTES.txt
  head/mail/spamassassin/files/patch-UPGRADE
  head/mail/spamassassin/files/patch-bug7018
  head/mail/spamassassin/files/patch-bug7057
  head/mail/spamassassin/files/patch-bug7065
  head/mail/spamassassin/files/patch-bug7107
  head/mail/spamassassin/files/patch-sa-learn.raw
Modified:
  head/japanese/spamassassin/Makefile
  head/mail/spamassassin/Makefile
  head/mail/spamassassin/distinfo
  head/mail/spamassassin/pkg-plist

Modified: head/japanese/spamassassin/Makefile
==============================================================================
--- head/japanese/spamassassin/Makefile	Wed Apr 29 18:28:23 2015	(r385002)
+++ head/japanese/spamassassin/Makefile	Wed Apr 29 18:46:29 2015	(r385003)
@@ -1,7 +1,7 @@
 # Created by: TAOKA Fumiyoshi
 # $FreeBSD$
 
-PORTREVISION=	14
+PORTREVISION=	0
 CATEGORIES=	japanese mail perl5
 PKGNAMEPREFIX=	ja-
 
@@ -25,6 +25,8 @@ TOKENIZER_PRE=	tokenizer.pre
 
 PLIST_SUB+=	TOKENIZER_PRE=${TOKENIZER_PRE}
 
+BROKEN=		Requires update for 3.4.1
+
 pre-install:
 	@${CAT} ${EXTRA_PATCHES:S/.patch/.plist/} > ${PLIST}
 	@${CAT} ${PKGDIR}/pkg-plist >> ${PLIST}

Modified: head/mail/spamassassin/Makefile
==============================================================================
--- head/mail/spamassassin/Makefile	Wed Apr 29 18:28:23 2015	(r385002)
+++ head/mail/spamassassin/Makefile	Wed Apr 29 18:46:29 2015	(r385003)
@@ -2,8 +2,8 @@
 # $FreeBSD$
 
 PORTNAME=	spamassassin
-PORTVERSION=	3.4.0
-PORTREVISION?=	17	# also bump japanese/spamassassin
+PORTVERSION=	3.4.1
+PORTREVISION?=	0	# also bump japanese/spamassassin
 CATEGORIES?=	mail perl5
 MASTER_SITES=	${MASTER_SITE_APACHE:S/$/:apache/} ${MASTER_SITE_PERL_CPAN:S/$/:cpan/}
 MASTER_SITE_SUBDIR=	spamassassin/source/:apache Mail/:cpan
@@ -15,14 +15,13 @@ COMMENT?=	Highly efficient mail filter f
 
 LICENSE=	APACHE20
 
-ALL_DEPENDS=	p5-Encode-Detect>=0:${PORTSDIR}/converters/p5-Encode-Detect \
+BUILD_DEPENDS=	p5-Encode-Detect>=0:${PORTSDIR}/converters/p5-Encode-Detect \
 		p5-HTML-Parser>=3.46:${PORTSDIR}/www/p5-HTML-Parser \
 		p5-HTTP-Date>=0:${PORTSDIR}/www/p5-HTTP-Date \
 		p5-IO-Socket-IP>=0:${PORTSDIR}/net/p5-IO-Socket-IP \
 		p5-Net-DNS>=0.63:${PORTSDIR}/dns/p5-Net-DNS \
 		p5-NetAddr-IP>=4.010:${PORTSDIR}/net-mgmt/p5-NetAddr-IP
-BUILD_DEPENDS=	${ALL_DEPENDS}
-RUN_DEPENDS=	${ALL_DEPENDS} \
+RUN_DEPENDS:=	${BUILD_DEPENDS} \
 		re2c>=.12.0:${PORTSDIR}/devel/re2c
 
 CONFLICTS?=	ja-spamassassin-[0-9]*
@@ -105,7 +104,7 @@ RELAY_COUNTRY_INITVAR=	RelayCountry
 SPF_QUERY_INITVAR=	SPF
 UPDATE_AND_COMPILE_INITVAR=	Rule2XSBody
 
-DOCS=		CREDITS Changes INSTALL NOTICE PACKAGING README TRADEMARK UPGRADE USAGE procmailrc.example 3.4.0-RELEASE-NOTES.txt
+DOCS=		CREDITS Changes INSTALL 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
 DOCSLDAP=	README README.testing sa_test.ldif
 PORTDOCS=	${DOCS} sql ldap
@@ -141,10 +140,6 @@ PLIST_SUB+=	UPDATE_ON_INSTALL="no"
 .endif
 
 post-patch::
-	# The 3.4.0 release notes never made it into the tarball
-	${INSTALL_DATA} ${FILESDIR}/3.4.0-RELEASE-NOTES.txt ${WRKSRC}
-	${REINPLACE_CMD} -e 's,%%DOCSDIR%%,${DOCSDIR},' ${WRKSRC}/UPGRADE
-
 	${REINPLACE_CMD} -e 's,B_CONFDIR)/local.cf,B_CONFDIR)/local.cf.sample,g' \
 		-e 's,B_CONFDIR)/init.pre,B_CONFDIR)/init.pre.sample,g' \
 		-e 's,B_CONFDIR)/v310.pre,B_CONFDIR)/v310.pre.sample,g' \
@@ -152,6 +147,7 @@ post-patch::
 		-e 's,B_CONFDIR)/v320.pre,B_CONFDIR)/v320.pre.sample,g' \
 		-e 's,B_CONFDIR)/v330.pre,B_CONFDIR)/v330.pre.sample,g' \
 		-e 's,B_CONFDIR)/v340.pre,B_CONFDIR)/v340.pre.sample,g' \
+		-e 's,B_CONFDIR)/v341.pre,B_CONFDIR)/v341.pre.sample,g' \
 		-e 's/require DBI/0/' \
 		${WRKSRC}/Makefile.PL
 	${REINPLACE_CMD} -e '/^CC =/d; \
@@ -165,7 +161,7 @@ post-patch::
 .  endif
 .endfor
 
-	${FIND} ${WRKSRC} -name '*.orig' -or -name '*.bak' | ${XARGS} ${RM}
+	${FIND} ${WRKSRC} -name '*.orig' -or -name '*.bak' -delete
 
 pre-su-install:
 	@${MKDIR} ${STAGEDIR}${DATADIR}

Modified: head/mail/spamassassin/distinfo
==============================================================================
--- head/mail/spamassassin/distinfo	Wed Apr 29 18:28:23 2015	(r385002)
+++ head/mail/spamassassin/distinfo	Wed Apr 29 18:46:29 2015	(r385003)
@@ -1,2 +1,2 @@
-SHA256 (Mail-SpamAssassin-3.4.0.tar.gz) = 244914c30976844878a7f129fd503eb40986c68a3800f416c3a68b14507c0a64
-SIZE (Mail-SpamAssassin-3.4.0.tar.gz) = 1269753
+SHA256 (Mail-SpamAssassin-3.4.1.tar.gz) = 9b7a95a594cdca4f265707364478b57813b82a0ec7e520d9bc818bfbcafdd726
+SIZE (Mail-SpamAssassin-3.4.1.tar.gz) = 3174888

Modified: head/mail/spamassassin/pkg-plist
==============================================================================
--- head/mail/spamassassin/pkg-plist	Wed Apr 29 18:28:23 2015	(r385002)
+++ head/mail/spamassassin/pkg-plist	Wed Apr 29 18:46:29 2015	(r385003)
@@ -15,88 +15,12 @@ bin/spamd
 @sample %%ETCDIR%%/v320.pre.sample
 @sample %%ETCDIR%%/v330.pre.sample
 @sample %%ETCDIR%%/v340.pre.sample
+@sample %%ETCDIR%%/v341.pre.sample
 include/libspamc.h
 lib/libspamc.so
 lib/libspamc.so.0
 %%SSL%%lib/libsslspamc.so
 %%SSL%%lib/libsslspamc.so.0
-%%PERL5_MAN3%%/Mail::SpamAssassin.3.gz
-%%PERL5_MAN3%%/Mail::SpamAssassin::AICache.3.gz
-%%PERL5_MAN3%%/Mail::SpamAssassin::ArchiveIterator.3.gz
-%%PERL5_MAN3%%/Mail::SpamAssassin::AsyncLoop.3.gz
-%%PERL5_MAN3%%/Mail::SpamAssassin::AutoWhitelist.3.gz
-%%PERL5_MAN3%%/Mail::SpamAssassin::Bayes.3.gz
-%%PERL5_MAN3%%/Mail::SpamAssassin::BayesStore.3.gz
-%%PERL5_MAN3%%/Mail::SpamAssassin::BayesStore::BDB.3.gz
-%%PERL5_MAN3%%/Mail::SpamAssassin::BayesStore::MySQL.3.gz
-%%PERL5_MAN3%%/Mail::SpamAssassin::BayesStore::PgSQL.3.gz
-%%PERL5_MAN3%%/Mail::SpamAssassin::BayesStore::Redis.3.gz
-%%PERL5_MAN3%%/Mail::SpamAssassin::BayesStore::SQL.3.gz
-%%PERL5_MAN3%%/Mail::SpamAssassin::Client.3.gz
-%%PERL5_MAN3%%/Mail::SpamAssassin::Conf.3.gz
-%%PERL5_MAN3%%/Mail::SpamAssassin::Conf::LDAP.3.gz
-%%PERL5_MAN3%%/Mail::SpamAssassin::Conf::Parser.3.gz
-%%PERL5_MAN3%%/Mail::SpamAssassin::Conf::SQL.3.gz
-%%PERL5_MAN3%%/Mail::SpamAssassin::DnsResolver.3.gz
-%%PERL5_MAN3%%/Mail::SpamAssassin::Logger.3.gz
-%%PERL5_MAN3%%/Mail::SpamAssassin::Logger::File.3.gz
-%%PERL5_MAN3%%/Mail::SpamAssassin::Logger::Stderr.3.gz
-%%PERL5_MAN3%%/Mail::SpamAssassin::Logger::Syslog.3.gz
-%%PERL5_MAN3%%/Mail::SpamAssassin::Message.3.gz
-%%PERL5_MAN3%%/Mail::SpamAssassin::Message::Metadata.3.gz
-%%PERL5_MAN3%%/Mail::SpamAssassin::Message::Node.3.gz
-%%PERL5_MAN3%%/Mail::SpamAssassin::PerMsgLearner.3.gz
-%%PERL5_MAN3%%/Mail::SpamAssassin::PerMsgStatus.3.gz
-%%PERL5_MAN3%%/Mail::SpamAssassin::PersistentAddrList.3.gz
-%%PERL5_MAN3%%/Mail::SpamAssassin::Plugin.3.gz
-%%PERL5_MAN3%%/Mail::SpamAssassin::Plugin::ASN.3.gz
-%%PERL5_MAN3%%/Mail::SpamAssassin::Plugin::AWL.3.gz
-%%PERL5_MAN3%%/Mail::SpamAssassin::Plugin::AccessDB.3.gz
-%%PERL5_MAN3%%/Mail::SpamAssassin::Plugin::AntiVirus.3.gz
-%%PERL5_MAN3%%/Mail::SpamAssassin::Plugin::AskDNS.3.gz
-%%PERL5_MAN3%%/Mail::SpamAssassin::Plugin::AutoLearnThreshold.3.gz
-%%PERL5_MAN3%%/Mail::SpamAssassin::Plugin::Bayes.3.gz
-%%PERL5_MAN3%%/Mail::SpamAssassin::Plugin::BodyRuleBaseExtractor.3.gz
-%%PERL5_MAN3%%/Mail::SpamAssassin::Plugin::Check.3.gz
-%%PERL5_MAN3%%/Mail::SpamAssassin::Plugin::DCC.3.gz
-%%PERL5_MAN3%%/Mail::SpamAssassin::Plugin::DKIM.3.gz
-%%PERL5_MAN3%%/Mail::SpamAssassin::Plugin::DNSEval.3.gz
-%%PERL5_MAN3%%/Mail::SpamAssassin::Plugin::Hashcash.3.gz
-%%PERL5_MAN3%%/Mail::SpamAssassin::Plugin::MIMEHeader.3.gz
-%%PERL5_MAN3%%/Mail::SpamAssassin::Plugin::OneLineBodyRuleType.3.gz
-%%PERL5_MAN3%%/Mail::SpamAssassin::Plugin::PhishTag.3.gz
-%%PERL5_MAN3%%/Mail::SpamAssassin::Plugin::Pyzor.3.gz
-%%PERL5_MAN3%%/Mail::SpamAssassin::Plugin::Razor2.3.gz
-%%PERL5_MAN3%%/Mail::SpamAssassin::Plugin::RelayCountry.3.gz
-%%PERL5_MAN3%%/Mail::SpamAssassin::Plugin::ReplaceTags.3.gz
-%%PERL5_MAN3%%/Mail::SpamAssassin::Plugin::Reuse.3.gz
-%%PERL5_MAN3%%/Mail::SpamAssassin::Plugin::Rule2XSBody.3.gz
-%%PERL5_MAN3%%/Mail::SpamAssassin::Plugin::SPF.3.gz
-%%PERL5_MAN3%%/Mail::SpamAssassin::Plugin::Shortcircuit.3.gz
-%%PERL5_MAN3%%/Mail::SpamAssassin::Plugin::SpamCop.3.gz
-%%PERL5_MAN3%%/Mail::SpamAssassin::Plugin::Test.3.gz
-%%PERL5_MAN3%%/Mail::SpamAssassin::Plugin::TextCat.3.gz
-%%PERL5_MAN3%%/Mail::SpamAssassin::Plugin::URIDNSBL.3.gz
-%%PERL5_MAN3%%/Mail::SpamAssassin::Plugin::URIDetail.3.gz
-%%PERL5_MAN3%%/Mail::SpamAssassin::Plugin::VBounce.3.gz
-%%PERL5_MAN3%%/Mail::SpamAssassin::Plugin::WhiteListSubject.3.gz
-%%PERL5_MAN3%%/Mail::SpamAssassin::PluginHandler.3.gz
-%%PERL5_MAN3%%/Mail::SpamAssassin::SQLBasedAddrList.3.gz
-%%PERL5_MAN3%%/Mail::SpamAssassin::SubProcBackChannel.3.gz
-%%PERL5_MAN3%%/Mail::SpamAssassin::Timeout.3.gz
-%%PERL5_MAN3%%/Mail::SpamAssassin::Util.3.gz
-%%PERL5_MAN3%%/Mail::SpamAssassin::Util::DependencyInfo.3.gz
-%%PERL5_MAN3%%/Mail::SpamAssassin::Util::Progress.3.gz
-%%PERL5_MAN3%%/Mail::SpamAssassin::Util::RegistrarBoundaries.3.gz
-%%PERL5_MAN3%%/spamassassin-run.3.gz
-man/man1/sa-awl.1.gz
-man/man1/sa-compile.1.gz
-man/man1/sa-learn.1.gz
-man/man1/sa-update.1.gz
-man/man1/spamassassin-run.1.gz
-man/man1/spamassassin.1.gz
-man/man1/spamc.1.gz
-man/man1/spamd.1.gz
 %%SITE_PERL%%/Mail/SpamAssassin.pm
 %%SITE_PERL%%/Mail/SpamAssassin/AICache.pm
 %%SITE_PERL%%/Mail/SpamAssassin/ArchiveIterator.pm
@@ -164,6 +88,7 @@ man/man1/spamd.1.gz
 %%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/PDFInfo.pm
 %%SITE_PERL%%/Mail/SpamAssassin/Plugin/PhishTag.pm
 %%SITE_PERL%%/Mail/SpamAssassin/Plugin/Pyzor.pm
 %%SITE_PERL%%/Mail/SpamAssassin/Plugin/Razor2.pm
@@ -177,13 +102,16 @@ man/man1/spamd.1.gz
 %%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/TxRep.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/URILocalBL.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/RegistryBoundaries.pm
 %%SITE_PERL%%/Mail/SpamAssassin/Reporter.pm
 %%SITE_PERL%%/Mail/SpamAssassin/SQLBasedAddrList.pm
 %%SITE_PERL%%/Mail/SpamAssassin/SpamdForkScaling.pm
@@ -197,24 +125,101 @@ man/man1/spamd.1.gz
 %%SITE_PERL%%/Mail/SpamAssassin/Util/TieOneStringHash.pm
 %%SITE_PERL%%/Mail/SpamAssassin/Util/TinyRedis.pm
 %%SITE_PERL%%/spamassassin-run.pod
+%%PERL5_MAN3%%/Mail::SpamAssassin.3.gz
+%%PERL5_MAN3%%/Mail::SpamAssassin::AICache.3.gz
+%%PERL5_MAN3%%/Mail::SpamAssassin::ArchiveIterator.3.gz
+%%PERL5_MAN3%%/Mail::SpamAssassin::AsyncLoop.3.gz
+%%PERL5_MAN3%%/Mail::SpamAssassin::AutoWhitelist.3.gz
+%%PERL5_MAN3%%/Mail::SpamAssassin::Bayes.3.gz
+%%PERL5_MAN3%%/Mail::SpamAssassin::BayesStore.3.gz
+%%PERL5_MAN3%%/Mail::SpamAssassin::BayesStore::BDB.3.gz
+%%PERL5_MAN3%%/Mail::SpamAssassin::BayesStore::MySQL.3.gz
+%%PERL5_MAN3%%/Mail::SpamAssassin::BayesStore::PgSQL.3.gz
+%%PERL5_MAN3%%/Mail::SpamAssassin::BayesStore::Redis.3.gz
+%%PERL5_MAN3%%/Mail::SpamAssassin::BayesStore::SQL.3.gz
+%%PERL5_MAN3%%/Mail::SpamAssassin::Client.3.gz
+%%PERL5_MAN3%%/Mail::SpamAssassin::Conf.3.gz
+%%PERL5_MAN3%%/Mail::SpamAssassin::Conf::LDAP.3.gz
+%%PERL5_MAN3%%/Mail::SpamAssassin::Conf::Parser.3.gz
+%%PERL5_MAN3%%/Mail::SpamAssassin::Conf::SQL.3.gz
+%%PERL5_MAN3%%/Mail::SpamAssassin::DnsResolver.3.gz
+%%PERL5_MAN3%%/Mail::SpamAssassin::Logger.3.gz
+%%PERL5_MAN3%%/Mail::SpamAssassin::Logger::File.3.gz
+%%PERL5_MAN3%%/Mail::SpamAssassin::Logger::Stderr.3.gz
+%%PERL5_MAN3%%/Mail::SpamAssassin::Logger::Syslog.3.gz
+%%PERL5_MAN3%%/Mail::SpamAssassin::Message.3.gz
+%%PERL5_MAN3%%/Mail::SpamAssassin::Message::Metadata.3.gz
+%%PERL5_MAN3%%/Mail::SpamAssassin::Message::Node.3.gz
+%%PERL5_MAN3%%/Mail::SpamAssassin::PerMsgLearner.3.gz
+%%PERL5_MAN3%%/Mail::SpamAssassin::PerMsgStatus.3.gz
+%%PERL5_MAN3%%/Mail::SpamAssassin::PersistentAddrList.3.gz
+%%PERL5_MAN3%%/Mail::SpamAssassin::Plugin.3.gz
+%%PERL5_MAN3%%/Mail::SpamAssassin::Plugin::ASN.3.gz
+%%PERL5_MAN3%%/Mail::SpamAssassin::Plugin::AWL.3.gz
+%%PERL5_MAN3%%/Mail::SpamAssassin::Plugin::AccessDB.3.gz
+%%PERL5_MAN3%%/Mail::SpamAssassin::Plugin::AntiVirus.3.gz
+%%PERL5_MAN3%%/Mail::SpamAssassin::Plugin::AskDNS.3.gz
+%%PERL5_MAN3%%/Mail::SpamAssassin::Plugin::AutoLearnThreshold.3.gz
+%%PERL5_MAN3%%/Mail::SpamAssassin::Plugin::Bayes.3.gz
+%%PERL5_MAN3%%/Mail::SpamAssassin::Plugin::BodyRuleBaseExtractor.3.gz
+%%PERL5_MAN3%%/Mail::SpamAssassin::Plugin::Check.3.gz
+%%PERL5_MAN3%%/Mail::SpamAssassin::Plugin::DCC.3.gz
+%%PERL5_MAN3%%/Mail::SpamAssassin::Plugin::DKIM.3.gz
+%%PERL5_MAN3%%/Mail::SpamAssassin::Plugin::DNSEval.3.gz
+%%PERL5_MAN3%%/Mail::SpamAssassin::Plugin::Hashcash.3.gz
+%%PERL5_MAN3%%/Mail::SpamAssassin::Plugin::MIMEEval.3.gz
+%%PERL5_MAN3%%/Mail::SpamAssassin::Plugin::MIMEHeader.3.gz
+%%PERL5_MAN3%%/Mail::SpamAssassin::Plugin::OneLineBodyRuleType.3.gz
+%%PERL5_MAN3%%/Mail::SpamAssassin::Plugin::PDFInfo.3.gz
+%%PERL5_MAN3%%/Mail::SpamAssassin::Plugin::PhishTag.3.gz
+%%PERL5_MAN3%%/Mail::SpamAssassin::Plugin::Pyzor.3.gz
+%%PERL5_MAN3%%/Mail::SpamAssassin::Plugin::Razor2.3.gz
+%%PERL5_MAN3%%/Mail::SpamAssassin::Plugin::RelayCountry.3.gz
+%%PERL5_MAN3%%/Mail::SpamAssassin::Plugin::ReplaceTags.3.gz
+%%PERL5_MAN3%%/Mail::SpamAssassin::Plugin::Reuse.3.gz
+%%PERL5_MAN3%%/Mail::SpamAssassin::Plugin::Rule2XSBody.3.gz
+%%PERL5_MAN3%%/Mail::SpamAssassin::Plugin::SPF.3.gz
+%%PERL5_MAN3%%/Mail::SpamAssassin::Plugin::Shortcircuit.3.gz
+%%PERL5_MAN3%%/Mail::SpamAssassin::Plugin::SpamCop.3.gz
+%%PERL5_MAN3%%/Mail::SpamAssassin::Plugin::Test.3.gz
+%%PERL5_MAN3%%/Mail::SpamAssassin::Plugin::TextCat.3.gz
+%%PERL5_MAN3%%/Mail::SpamAssassin::Plugin::TxRep.3.gz
+%%PERL5_MAN3%%/Mail::SpamAssassin::Plugin::URIDNSBL.3.gz
+%%PERL5_MAN3%%/Mail::SpamAssassin::Plugin::URIDetail.3.gz
+%%PERL5_MAN3%%/Mail::SpamAssassin::Plugin::URILocalBL.3.gz
+%%PERL5_MAN3%%/Mail::SpamAssassin::Plugin::VBounce.3.gz
+%%PERL5_MAN3%%/Mail::SpamAssassin::Plugin::WhiteListSubject.3.gz
+%%PERL5_MAN3%%/Mail::SpamAssassin::PluginHandler.3.gz
+%%PERL5_MAN3%%/Mail::SpamAssassin::RegistryBoundaries.3.gz
+%%PERL5_MAN3%%/Mail::SpamAssassin::SQLBasedAddrList.3.gz
+%%PERL5_MAN3%%/Mail::SpamAssassin::SubProcBackChannel.3.gz
+%%PERL5_MAN3%%/Mail::SpamAssassin::Timeout.3.gz
+%%PERL5_MAN3%%/Mail::SpamAssassin::Util.3.gz
+%%PERL5_MAN3%%/Mail::SpamAssassin::Util::DependencyInfo.3.gz
+%%PERL5_MAN3%%/Mail::SpamAssassin::Util::Progress.3.gz
+%%PERL5_MAN3%%/Mail::SpamAssassin::Util::RegistrarBoundaries.3.gz
+%%PERL5_MAN3%%/spamassassin-run.3.gz
+man/man1/sa-awl.1.gz
+man/man1/sa-compile.1.gz
+man/man1/sa-learn.1.gz
+man/man1/sa-update.1.gz
+man/man1/spamassassin-run.1.gz
+man/man1/spamassassin.1.gz
+man/man1/spamc.1.gz
+man/man1/spamd.1.gz
 %%DATADIR%%/languages
 %%DATADIR%%/sa-update-pubkey.txt
 %%DATADIR%%/user_prefs.template
-
+@comment ##################################################################
 @unexec rm -rf /var/lib/spamassassin/2* 2>&1 >/dev/null || true
 @dir /var/lib/spamassassin
 @dir /var/lib
 @dir /var/db/spamassassin
-
+@dir(%%USER%%,%%GROUP,) /var/run/spamd
+@comment ##################################################################
 @unexec [ -d /var/db/spamassassin ] && echo "If you are no longer using SpamAssassin, remove /var/db/spamassassin"
 @unexec pw usershow "%%USER%%" 2>/dev/null 1>&2 && echo "To delete %%USER%% permanently, 'rmuser %%USER%%'"
 @unexec pw usershow "%%USER%%" 2>/dev/null 1>&2 && [ -d /var/spool/spamd ] && echo "    Note that this will remove /var/spool/spamd"
-
-@owner %%USER%%
-@group %%GROUP%%
-@dir /var/run/spamd
-@group
-@owner
-
+@comment ##################################################################
 @exec if [ "%%UPDATE_ON_INSTALL%%" = "yes" ]; then echo "====> Downloading SpamAssassin rulesets"; %%PREFIX%%/bin/spamassassin -x -L --lint; %%PREFIX%%/bin/sa-update || true; fi
 @exec if [ "%%UPDATE_ON_INSTALL%%" = "yes" ]; then echo "====> Compiling SpamAssassin rulesets"; %%PREFIX%%/bin/spamassassin -x -L --lint; %%PREFIX%%/bin/sa-compile || true; fi



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