Updated to version 3.2.4.

Pkgsrc changes:
  - Due to "user-destdir" mode not working yet switched to "destdir" mode
    for the time being.
  - Explicitly listed licence information.
  - Listed submitted bug identifiers for patch-ba and patch-bc.

Changes since version 3.2.3:
============================
3.2.4 is a major bug-fix release, with a few minor new features. Summary of
changes:

- bug 5599: allow load distribution of SA nameserver queries across all
  nameservers listed in resolv.conf, using 'dns_options rotate'. thanks
  to Pawel Sasin <hannibal /at/ wp-sa.pl>

- bug 5673: 'ALL' header was including spurious extra spaces between header
  names and values.  fix

- bug 5594: several major sa-compile fixes.  major increase in overall speed;
  cache results between runs to further increase speed; and fix a danger of
  massive memory usage

- bug 5556: fix a variety of sa-compile portability issues, and support for
  5.6.x perls

- bug 5514: make 'score set for a non-existent rule' a debug message, instead
  of a lint warning, since it's a very frequent FAQ

- bug 5493: sa-compile fails to correctly deal with escaped backslashes.  fix

- bug 5672: remove DNS_FROM_SECURITYSAGE (DNSBL lookups against
  securitysage.com) due to unreliability

- bug 5476: update Bonded Sender (now Sender Score Certified) rules, and add
  a rule for their strictly-confirmed-opt-in-required zone

- bug 5538: remove FORGED_MUA_AOL_FROM and FORGED_AOL_TAGS entirely; they're
  obsolete, given the current capabilities of AOL mail user agents

- bug 5632: remove all completewhois.com DNSBL lookups, site seems to have
  disappeared without warning

- bug 5715: allow for more than one sa-update MIRRORED.BY file host in DNS,
  for redundancy

- bug 5662: DKIM changes: recognize author signature and multiple signatures
  for whitelisting (with Mail::DKIM 0.29); disable useless
  "check_dkim_signsome"; new eval rules "check_dkim_valid_author_sig" and
  "check_dkim_valid" (an alias for a "check_dkim_verified" misnomer); new
  tags _DKIMIDENTITY_ and _DKIMDOMAIN_; updated terminology; verification
  speedup with Mail::DKIM 0.30 (or its pre-releases)

- bug 5696: sa-compile: cut regexp base strings at Unicode high codepoints,
  to avoid corruption of patterns containing UTF-8

- bug 5637: bayes_file_mode is handled incorrectly when creating bayes.mutex,
  resulting in incorrect permissions on that file; fix by Mihaly Barasz

- bug 5612: DB_File version 4.2.x has a bug that loops infinitely if files
  named '__db.{filename}' are present; work around.  thanks to J. Nick
  Koston for the report and fix

- bug 5606: too-early init_learner() call causes root's user prefs file to
  be read when spamd is started; this is inappropriate. fix

- bug 4179: if allow_user_rules is 1, user rules are not unique to each
  user; one user's user rules can appear in later scans for other users
  that are run using the same spamd process. fix

- bug 5680: ALL_TRUSTED can fire if a trusted MSA or webmail system receives
  the message from an untrusted X-Originating-IP: header. fix

- bug 5626: in the 'spamassassin' script, install a signal handler for SIGHUP,
  SIGINT, SIGTERM and SIGPIPE to ensure that temporary files are removed

- bug 5557: some temporary files are left not cleaned up on Windows; fix

- bug 5661: speed up Bayes SQL queries by allowing the use of indexes when
  expiring

- bug 5611: support 'spamd --nouser-config -u username', which setuids to
  'username' but does not read user_prefs files from anywhere

- bug 5665: spamd may fail to notice that a child has completed exiting,
  and keeps in the child list in state 'K', eventually filling up the
  child list with 'ghost' children.  fix

- bug 5735: spamc should allow retry_sleep 0

- bug 5728: spamd: require -u with --sql-config or --ldap-config

- bug 5682: remove FH_HOST_ALMOST_IP, FH_HOST_EQ_D_D_D_D, due to false
  positives and redundancy with RDNS_DYNAMIC; remove FH_HOST_EQ_D_D_D_DB
  due to no hits

- bug 5681: look up IP addresses found in 'X-Yahoo-Post-IP' and
  'X-SenderIP' headers, too, thanks to Martin Blapp

- Bug 5589: Refined async events handling and DNS lookup completions

- bug 5586: RDNS_NONE has false positives if the MTA doesn't put the hostname
  in the Received header, like Communigate Pro. add an exception for this

- bug 5748: fix locale problem with use of external sort in sa-compile

4 files changed, 16 insertions, 14 deletions

diff --git a/mail/spamassassin/Makefile b/mail/spamassassin/Makefile
index e2846517089..b8b4cb3b837 100644
--- a/mail/spamassassin/Makefile
+++ b/mail/spamassassin/Makefile
@@ -1,7 +1,7 @@
-# $NetBSD: Makefile,v 1.83 2007/08/26 17:26:50 heinz Exp $
+# $NetBSD: Makefile,v 1.84 2008/01/09 15:55:51 heinz Exp $
 
-DISTNAME=	Mail-SpamAssassin-3.2.3
-PKGNAME=	spamassassin-3.2.3
+DISTNAME=	Mail-SpamAssassin-3.2.4
+PKGNAME=	spamassassin-3.2.4
 SVR4_PKGNAME=	sa
 CATEGORIES=	mail perl5
 MASTER_SITES=	${MASTER_SITE_APACHE:=spamassassin/source/}
@@ -10,7 +10,9 @@ MAINTAINER=	heinz@NetBSD.org
 HOMEPAGE=	http://spamassassin.apache.org/
 COMMENT=	Mail filter to identify spam
 
-PKG_DESTDIR_SUPPORT=	user-destdir
+#LICENSE=	apache-license-2.0
+
+PKG_DESTDIR_SUPPORT=	destdir
 PKG_INSTALLATION_TYPES=	overwrite pkgviews
 
 .include "../../mk/bsd.prefs.mk"
diff --git a/mail/spamassassin/distinfo b/mail/spamassassin/distinfo
index 1ac55ded150..52515374f28 100644
--- a/mail/spamassassin/distinfo
+++ b/mail/spamassassin/distinfo
@@ -1,11 +1,11 @@
-$NetBSD: distinfo,v 1.46 2007/08/26 17:26:51 heinz Exp $
+$NetBSD: distinfo,v 1.47 2008/01/09 15:55:51 heinz Exp $
 
-SHA1 (Mail-SpamAssassin-3.2.3.tar.gz) = 93337a5cf6cc6f4980307c08ad65575fa08d1f54
-RMD160 (Mail-SpamAssassin-3.2.3.tar.gz) = 776ad00e8e23d31e9f5d563649d65c8e16a2de89
-Size (Mail-SpamAssassin-3.2.3.tar.gz) = 1202082 bytes
+SHA1 (Mail-SpamAssassin-3.2.4.tar.gz) = 5c0e01831256518b27139507a4ded38e582d8649
+RMD160 (Mail-SpamAssassin-3.2.4.tar.gz) = 00ebd0dfa544079524bbb0918cc21b644b26ecff
+Size (Mail-SpamAssassin-3.2.4.tar.gz) = 1219161 bytes
 SHA1 (patch-ab) = 9872b4c3e6d34cb58f84081554eff49efcfc6a6a
 SHA1 (patch-ae) = d46b1d8f56c8c61936c307f74b39a49da1b1f353
 SHA1 (patch-aq) = 3a273c7742275647c2334382fed29c0ea33dfbd8
 SHA1 (patch-ay) = 7d805e7ef86e279a19e7d3d2f03e2227624317f8
-SHA1 (patch-ba) = 62c2b8f4d9a7e54dd405910f5bd04659d159f65d
-SHA1 (patch-bc) = 190cc25eb0e91c660e08448b2667b675df835d60
+SHA1 (patch-ba) = ea6b8eac3d9475641725dc4aa1e7a4d31912a044
+SHA1 (patch-bc) = d12de1f4d4cf3b475275d15b3b8edc37e3b05405
diff --git a/mail/spamassassin/patches/patch-ba b/mail/spamassassin/patches/patch-ba
index a07ecad3e6e..2636b502c5a 100644
--- a/mail/spamassassin/patches/patch-ba
+++ b/mail/spamassassin/patches/patch-ba
@@ -1,6 +1,6 @@
-$NetBSD: patch-ba,v 1.1 2007/08/26 17:26:51 heinz Exp $
+$NetBSD: patch-ba,v 1.2 2008/01/09 15:55:52 heinz Exp $
 
- Both submitted upstream:
+ Both submitted upstream (bug id 5628/5630):
  - no need for a hard-coded path, the appropriate variables already exist
  - the documentation conflicts with the code
 
diff --git a/mail/spamassassin/patches/patch-bc b/mail/spamassassin/patches/patch-bc
index 023f87adafd..b5d66eae40d 100644
--- a/mail/spamassassin/patches/patch-bc
+++ b/mail/spamassassin/patches/patch-bc
@@ -1,6 +1,6 @@
-$NetBSD: patch-bc,v 1.1 2007/08/26 17:26:51 heinz Exp $
+$NetBSD: patch-bc,v 1.2 2008/01/09 15:55:52 heinz Exp $
 
- Both submitted upstream:
+ Both submitted upstream (bug id 5628/5630):
  - no need for a hard-coded path, the appropriate variables already exist
  - the documentation conflicts with the code