Updated to version 3.0.3.

Merged the two rules in netbsd_lists.cf into one because problem reports
mostly do not contain "x-send-pr" anymore.

Disabled installation of netbsd_lists.cf in PKGSYSCONFDIR (it is still
included in the "examples" directory).

Changes since 3.0.2
===================

 - Fixed possible memory bloat from large AutoWhitelist db files

 - Fixed where user defined rules scores became ignored

 - Updated parsing code for several Received: header formats

 - Increased some BAYES_* scores for the network+bayes score set

 - Document set_tag for Plugin API and added get_tag

 - Additional bug fixes.

3 files changed, 12 insertions, 21 deletions

diff --git a/mail/spamassassin/Makefile b/mail/spamassassin/Makefile
index f94c3bc26e9..2082e06816c 100644
--- a/mail/spamassassin/Makefile
+++ b/mail/spamassassin/Makefile
@@ -1,8 +1,8 @@
-# $NetBSD: Makefile,v 1.54 2005/04/11 21:46:27 tv Exp $
+# $NetBSD: Makefile,v 1.55 2005/04/29 08:48:40 heinz Exp $
 
 DISTNAME=	Mail-SpamAssassin-${SPAMASSASSIN_VERSION}
 PKGNAME=	spamassassin-${SPAMASSASSIN_VERSION}
-PKGREVISION=	1
+PKGREVISION=	# empty
 SVR4_PKGNAME=	sa
 CATEGORIES=	mail perl5
 MASTER_SITES=	${MASTER_SITE_APACHE:=spamassassin/} \
@@ -27,7 +27,7 @@ CONFLICTS=	p5-Mail-SpamAssassin-[1-9]*
 
 PKG_INSTALLATION_TYPES=	overwrite pkgviews
 
-SPAMASSASSIN_VERSION=	3.0.2
+SPAMASSASSIN_VERSION=	3.0.3
 
 WRKSRC=			${WRKDIR}/${DISTNAME}
 
@@ -73,9 +73,6 @@ CONF_FILES+=		${EGDIR}/local.cf  ${PKG_SYSCONFDIR}/local.cf	\
 			${EGDIR}/init.pre  ${PKG_SYSCONFDIR}/init.pre	\
 			${RULESDIR}/user_prefs.template			\
 		 	${PKG_SYSCONFDIR}/user_prefs.template
-SUPPORT_FILES_PERMS+=	${EGDIR}/netbsd_lists.cf			\
-			${PKG_SYSCONFDIR}/netbsd_lists.cf ${SHAREOWN}	\
-			${SHAREGRP} ${SHAREMODE}
 
 INSTALLATION_DIRS+=	${EG_SUBDIR} ${DOC_SUBDIR} ${DOC_SUBDIR}/spamc	\
 			${DOC_SUBDIR}/spamd
diff --git a/mail/spamassassin/distinfo b/mail/spamassassin/distinfo
index 3c3ef66e86e..1e5acd81303 100644
--- a/mail/spamassassin/distinfo
+++ b/mail/spamassassin/distinfo
@@ -1,8 +1,8 @@
-$NetBSD: distinfo,v 1.28 2005/02/24 09:59:29 agc Exp $
+$NetBSD: distinfo,v 1.29 2005/04/29 08:48:40 heinz Exp $
 
-SHA1 (Mail-SpamAssassin-3.0.2.tar.gz) = be69e72c7351df46de3eeed811219adf35b2964d
-RMD160 (Mail-SpamAssassin-3.0.2.tar.gz) = 8570a849b78a2f83cb02b9cdcc2c0e92ad066b1b
-Size (Mail-SpamAssassin-3.0.2.tar.gz) = 996164 bytes
+SHA1 (Mail-SpamAssassin-3.0.3.tar.gz) = e31407b68bf362dfe53814c0af867e8134c9808b
+RMD160 (Mail-SpamAssassin-3.0.3.tar.gz) = 2791749672268bd9f8fc3c992a829032d24243f3
+Size (Mail-SpamAssassin-3.0.3.tar.gz) = 999558 bytes
 SHA1 (patch-ab) = 36280764366900829205be94466a77662c422524
 SHA1 (patch-ae) = 7d57eb154af72ea82cb8fdafd7277823e33b7dd5
 SHA1 (patch-aq) = c918a738e0c7048183f5efbb0b7265d355ded7b3
diff --git a/mail/spamassassin/files/netbsd_lists.cf b/mail/spamassassin/files/netbsd_lists.cf
index 15e9d3befc0..5d618fea705 100644
--- a/mail/spamassassin/files/netbsd_lists.cf
+++ b/mail/spamassassin/files/netbsd_lists.cf
@@ -1,4 +1,4 @@
-# $NetBSD: netbsd_lists.cf,v 1.1 2002/10/08 00:49:20 heinz Exp $
+# $NetBSD: netbsd_lists.cf,v 1.2 2005/04/29 08:48:40 heinz Exp $
 
 #
 # Rules to minimize false positives of NetBSD related emails
@@ -14,17 +14,11 @@
 # netbsd-bugs@netbsd.org
 # compensate for problem reports with confusing content for SpamAssassin
 
-header	__NETBSD_PR_SUBJECT	Subject =~ /\b(?:admin|bin|install|kern|lib|misc|pkg|port-[a-z][a-z0-9]{1,15}|security|standards|toolchain|xsrc|y2k)\/\d{4,6}\b/i
+header	__NETBSD_PR_SUBJECT	Subject =~ /\b(?:bin|install|kern|lib|misc|pkg|port-[a-z][a-z0-9]{1,15}|pr|security|standards|toolchain|xsrc|y2k)\/\d{4,6}\b/i
 header	__NETBSD_BUGS_SENDER	Sender =~ /\bnetbsd-bugs-owner\@netbsd\.org\b/i
 header	__NETBSD_RCVD		Received =~ /\bby\s+(?:mail|narn)\.netbsd\.org\b/i
 header	__NETBSD_BUGS_DELIVERED	Delivered-To =~ /\bnetbsd-bugs\@netbsd\.org\b/i
-header	__NETBSD_SEND_PR	exists:X-Send-Pr-Version
-
-meta NETBSD_PR		(__NETBSD_SEND_PR && __NETBSD_PR_SUBJECT && __NETBSD_BUGS_SENDER && __NETBSD_RCVD && __NETBSD_BUGS_DELIVERED)
-describe NETBSD_PR	Message is a problem report from netbsd-bugs
-score NETBSD_PR		-5
-
-meta NETBSD_PR_COMMENT	(! __NETBSD_SEND_PR && __NETBSD_PR_SUBJECT && __NETBSD_BUGS_SENDER && __NETBSD_RCVD && __NETBSD_BUGS_DELIVERED)
-describe NETBSD_PR_COMMENT   Message concerns a problem report from netbsd-bugs
-score NETBSD_PR_COMMENT	-2.5
 
+meta NETBSD_PR		(__NETBSD_PR_SUBJECT && __NETBSD_BUGS_SENDER && __NETBSD_RCVD && __NETBSD_BUGS_DELIVERED)
+describe NETBSD_PR	Problem report or comment on the netbsd-bugs list
+score NETBSD_PR		-2.5