Update to 2.42.

Uses buildlink2 and module.mk. Some perl scripts for rule developers
(in PREFIX/share/doc/spamassassin/{masses,tools}/) and a small SpamAssassin
logo (PREFIX/share/doc/spamassassin/html/) are now included.
New netbsd_lists.cf file to reduce false positives on NetBSD lists (so
far, only some rules for netbsd-bugs).

Changes:
- bug fixes
- new, better scores (intensive testing was done to improve on 2.40 and
  2.41)
- netbsd rc.d script works now with NetBSD 1.5 and 1.6
- management of addresses in the automatic whitlist now easier with
  dedicated options (--add-addr-to-whitelist, --remove-addr-from-whitelist)

2 files changed, 30 insertions, 18 deletions

diff --git a/mail/spamassassin/files/netbsd_lists.cf b/mail/spamassassin/files/netbsd_lists.cf
new file mode 100644
index 00000000000..15e9d3befc0
--- /dev/null
+++ b/mail/spamassassin/files/netbsd_lists.cf
@@ -0,0 +1,30 @@
+# $NetBSD: netbsd_lists.cf,v 1.1 2002/10/08 00:49:20 heinz Exp $
+
+#
+# Rules to minimize false positives of NetBSD related emails
+#
+# This file is not meant to be modified by the user/admin. 
+# If you want to add rules for a site, please use local.cf.
+#
+# Any rules which might be appropriate for this file can be contributed
+# with send-pr(1), category 'pkg'.
+#
+
+#
+# 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_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
+
diff --git a/mail/spamassassin/files/spamd.sh b/mail/spamassassin/files/spamd.sh
deleted file mode 100755
index 47f9fe698f7..00000000000
--- a/mail/spamassassin/files/spamd.sh
+++ /dev/null
@@ -1,18 +0,0 @@
-#!@RCD_SCRIPTS_SHELL@
-#
-#	$NetBSD: spamd.sh,v 1.5 2002/09/20 02:01:57 grant Exp $
-#
-# PROVIDE: spamd
-# REQUIRE: DAEMON
-
-. /etc/rc.subr
-
-name="spamd"                      
-rcvar=$name         
-command="@PREFIX@/bin/${name}"
-command_args="-d -r /var/run/${name}.pid"
-command_interpreter="@PREFIX@/bin/perl"
-pidfile="/var/run/${name}.pid"
-              
-load_rc_config $name
-run_rc_command "$1"