Updated to version 3.2.1.

Pkgsrc changes:
  - Added some comments to patch files.
  - Adapting patch-aq to changes in the README file.
  - Added forgotten direct requirement for p5-Compress-Zlib.
  - Since 3.2.0 at least version 3.43 of p5-HTML-Parser is needed.
  - Installation to DESTDIR is possible as root.
  - Substituted correct paths in spamc.pod (source file for spamc.1).
  - Added VARBASE to BUILD_DEFS to silence pkglint warnings.

Changes since version 3.2.0:
============================
3.2.1 is a major bug-fix release, including a potential local DoS.  The
major highlights are:

- bug 5480: fix for CVE-2007-2873: a local user symlink-attack DoS
  vulnerability. It only affects systems where spamd is run as root, is used
  with vpopmail or virtual users via the "-v"/"--vpopmail" OR
  "--virtual-config-dir" switch, AND with the "-x"/"--no-user-config AND
  WITHOUT the "-u"/"--username" switch AND with the "-l"/"--allow-tell" switch.
  This is not default on any distro package, and is not a common configuration.
  More details of the vulnerability can be read at
  <http://spamassassin.apache.org/advisories/cve-2007-2873.txt>.

- bug 5488: zero some rules causing false positives: FH_HOST_EQ_D_D_D_DB and
  FH_HOST_EQ_D_D_D_D.

- bug 5257: re-raise autolearn ham threshold to 1.0; the lower value
  used in 3.2.0 was creating problems.

- bug 5422: in spamd, deleting hash entries from the SIGCHLD signal handler is
  unsafe, causes corruption of the data structure, and results in 'prefork:
  ordered child N to accept, but they reported state '1', killing rogue'
  errors.  fix.

- bug 5102: tighten up regexp for FORGED_HOTMAIL_RCVD to avoid some FPs.

- bug 5457: spamc build and test should handle not having zlib available.

- bug 5379: spamd could crash at startup if its preloading temporary directory
  already exists. fix.

- bug 4616: spamc config can cause command line options to be ignored. fix.

- bug 5485: zero score DK/DKIM_POLICY_SIGNSOME rules since they'll always fire
  due to defaults (unless there's an explicit SIGNALL policy).

- bug 5492: VBounce rule was looking in header instead of body for whitelisted
  relays. fix.

- bug 5487: prevent multiple "urirhssub"s using the same zone from overwriting
  each other.

- bug 5432 - Change default in Win32 build to not build spamc.

- bug 5446: add --updatedir option to sa-compile and remove inaccurate re2c
  required version info from pod.

- bug 5436: add omitted "ifplugin" statements to the configuration, which would
  otherwise cause lint errors if the default plugins were disabled.

- bug 5477: prevent Rule2XSBody info message from appearing on stderr during
  spamd startup.

5 files changed, 58 insertions, 22 deletions

diff --git a/mail/spamassassin/Makefile b/mail/spamassassin/Makefile
index 0b2a51b130e..239c4585536 100644
--- a/mail/spamassassin/Makefile
+++ b/mail/spamassassin/Makefile
@@ -1,7 +1,7 @@
-# $NetBSD: Makefile,v 1.80 2007/05/02 15:20:45 heinz Exp $
+# $NetBSD: Makefile,v 1.81 2007/06/12 21:43:30 heinz Exp $
 
-DISTNAME=	Mail-SpamAssassin-3.2.0
-PKGNAME=	spamassassin-3.2.0
+DISTNAME=	Mail-SpamAssassin-3.2.1
+PKGNAME=	spamassassin-3.2.1
 SVR4_PKGNAME=	sa
 CATEGORIES=	mail perl5
 MASTER_SITES=	${MASTER_SITE_APACHE:=spamassassin/source/}
@@ -10,16 +10,18 @@ MAINTAINER=	heinz@NetBSD.org
 HOMEPAGE=	http://spamassassin.apache.org/
 COMMENT=	Mail filter to identify spam
 
+PKG_DESTDIR_SUPPORT=	destdir
 PKG_INSTALLATION_TYPES=	overwrite pkgviews
 
 .include "../../mk/bsd.prefs.mk"
 
 DEPENDS+=	p5-Net-DNS>=0.34:../../net/p5-Net-DNS
-DEPENDS+=	p5-HTML-Parser>=3.31:../../www/p5-HTML-Parser
+DEPENDS+=	p5-HTML-Parser>=3.43:../../www/p5-HTML-Parser
 DEPENDS+=	p5-Digest-SHA1-[0-9]*:../../security/p5-Digest-SHA1
 DEPENDS+=	{p5-MIME-Base64>=2.11,perl>=5.8.0}:../../converters/p5-MIME-Base64
 DEPENDS+=	p5-libwww-[0-9]*:../../www/p5-libwww
 DEPENDS+=	p5-Archive-Tar>=1.23:../../archivers/p5-Archive-Tar
+DEPENDS+=	p5-Compress-Zlib-[0-9]*:../../devel/p5-Compress-Zlib
 DEPENDS+=	p5-IO-Zlib>=1.04:../../devel/p5-IO-Zlib
 
 USE_TOOLS+=	perl
@@ -41,6 +43,7 @@ SPAMASSASSIN_CONTACT_ADDRESS?=	postmaster
 .include "options.mk"
 
 BUILD_DEFS+=		SPAMASSASSIN_CONTACT_ADDRESS
+BUILD_DEFS+=		VARBASE
 
 PLIST_ADD=		${WRKSRC}/.PLIST_ADD
 PLIST_SRC=		${PKGDIR}/PLIST ${PLIST_ADD}
@@ -106,11 +109,12 @@ SUBST_STAGE.sa2=	pre-configure
 SUBST_FILES.sa2=	README spamd/spamd.raw
 SUBST_SED.sa2=		-e s!@@PREFIX@@!${PREFIX}!g
 SUBST_SED.sa2+=		-e s!@PKG_SYSCONFDIR@!${PKG_SYSCONFDIR}!g
+SUBST_SED.sa2+=		-e s!@VARBASE@!${VARBASE}!g
 
 SUBST_CLASSES+=		sa3
 SUBST_STAGE.sa3=	pre-configure
 SUBST_FILES.sa3=	INSTALL UPGRADE USAGE ldap/README
-SUBST_FILES.sa3+=	spamc/README.qmail
+SUBST_FILES.sa3+=	spamc/README.qmail spamc/spamc.pod
 SUBST_FILES.sa3+=	lib/Mail/SpamAssassin/Conf.pm
 SUBST_FILES.sa3+=	lib/Mail/SpamAssassin/Plugin/Test.pm
 SUBST_FILES.sa3+=	spamd/README spamd/README.vpopmail sql/README
diff --git a/mail/spamassassin/distinfo b/mail/spamassassin/distinfo
index 82be2e9b2bc..ebbf6b197f6 100644
--- a/mail/spamassassin/distinfo
+++ b/mail/spamassassin/distinfo
@@ -1,9 +1,9 @@
-$NetBSD: distinfo,v 1.44 2007/05/02 15:20:45 heinz Exp $
+$NetBSD: distinfo,v 1.45 2007/06/12 21:43:30 heinz Exp $
 
-SHA1 (Mail-SpamAssassin-3.2.0.tar.gz) = af3941ab4f9548107d06966780ba71f751ab0216
-RMD160 (Mail-SpamAssassin-3.2.0.tar.gz) = b696fb16cf736c239328e009c686d9684a1d76f0
-Size (Mail-SpamAssassin-3.2.0.tar.gz) = 1290995 bytes
-SHA1 (patch-ab) = 07bfa923f603a0cbc38f9a5d1538ce6126e788c9
-SHA1 (patch-ae) = a75a2fa44a314bb01bf2accbab119c399767bbf6
-SHA1 (patch-aq) = 495a3ac94a05129520e5d7018fdd56b6dad3c951
+SHA1 (Mail-SpamAssassin-3.2.1.tar.gz) = fbb5f538238e188f985c8e6672dad531fa035eea
+RMD160 (Mail-SpamAssassin-3.2.1.tar.gz) = bec56e47aabfd16e5c537a83ca79ed5ccf006445
+Size (Mail-SpamAssassin-3.2.1.tar.gz) = 1193561 bytes
+SHA1 (patch-ab) = 9872b4c3e6d34cb58f84081554eff49efcfc6a6a
+SHA1 (patch-ae) = d46b1d8f56c8c61936c307f74b39a49da1b1f353
+SHA1 (patch-aq) = 3a273c7742275647c2334382fed29c0ea33dfbd8
 SHA1 (patch-ay) = 7d805e7ef86e279a19e7d3d2f03e2227624317f8
diff --git a/mail/spamassassin/patches/patch-ab b/mail/spamassassin/patches/patch-ab
index a35a109fc15..077be6b8d38 100644
--- a/mail/spamassassin/patches/patch-ab
+++ b/mail/spamassassin/patches/patch-ab
@@ -1,4 +1,9 @@
-$NetBSD: patch-ab,v 1.13 2007/05/02 15:20:45 heinz Exp $
+$NetBSD: patch-ab,v 1.14 2007/06/12 21:43:30 heinz Exp $
+
+  - enable build of qmail-spamc
+  - some files (local.cf, *.pre) are managed by pkgsrc, disable
+    their installation.
+  - pkgsrc creates B_DATADIR, so there is no need to re-set permissions
 
 --- Makefile.PL.orig	2007-04-23 14:15:49.000000000 +0200
 +++ Makefile.PL
diff --git a/mail/spamassassin/patches/patch-ae b/mail/spamassassin/patches/patch-ae
index 47f1b2c3f44..f553a0a19b1 100644
--- a/mail/spamassassin/patches/patch-ae
+++ b/mail/spamassassin/patches/patch-ae
@@ -1,4 +1,6 @@
-$NetBSD: patch-ae,v 1.12 2007/05/02 15:20:45 heinz Exp $
+$NetBSD: patch-ae,v 1.13 2007/06/12 21:43:30 heinz Exp $
+
+  - pkgsrc sets default paths for rules and configuration data
 
 --- spamd/spamd.raw.orig	2007-04-23 14:15:48.000000000 +0200
 +++ spamd/spamd.raw
diff --git a/mail/spamassassin/patches/patch-aq b/mail/spamassassin/patches/patch-aq
index c1a5d7761f5..0d38ac27865 100644
--- a/mail/spamassassin/patches/patch-aq
+++ b/mail/spamassassin/patches/patch-aq
@@ -1,8 +1,13 @@
-$NetBSD: patch-aq,v 1.6 2005/11/13 22:48:32 heinz Exp $
+$NetBSD: patch-aq,v 1.7 2007/06/12 21:43:30 heinz Exp $
 
---- README.orig	Wed Sep 14 04:07:32 2005
+  Purely changes for pkgsrc:
+
+	- Change paths to those used by pkgsrc
+	- Notes about search paths set by pkgsrc
+
+--- README.orig	2007-06-08 14:56:25.000000000 +0200
 +++ README
-@@ -99,18 +99,18 @@ Mail::SpamAssassin::Conf class (run the 
+@@ -99,25 +99,25 @@ Mail::SpamAssassin::Conf class (run the 
  the standard defaults that people use.  There is an explanation of all the
  default locations that SpamAssassin will look at the end.
  
@@ -12,6 +17,14 @@ $NetBSD: patch-aq,v 1.6 2005/11/13 22:48:32 heinz Exp $
  	Distributed configuration files, with all defaults.  Do not modify
  	these, as they are overwritten when you upgrade.
  
+-  - /var/lib/spamassassin/*/*.cf:
++  - @VARBASE@/spamassassin/*/*.cf:
+ 
+         Local state directory; updated rulesets, overriding the
+         distributed configuration files, downloaded using "sa-update". Do
+         not modify these, as they are overwritten when you run
+         "sa-update".
+ 
 -  - /etc/mail/spamassassin/*.cf:
 +  - @PKG_SYSCONFDIR@/*.cf:
  
@@ -24,7 +37,7 @@ $NetBSD: patch-aq,v 1.6 2005/11/13 22:48:32 heinz Exp $
  
          Plugin control files, installed from the distribution. These are
          used to control what plugins are loaded.  Modifications here will
-@@ -119,22 +119,22 @@ default locations that SpamAssassin will
+@@ -126,22 +126,22 @@ default locations that SpamAssassin will
          
          You want to modify these files if you want to load additional
          plugins, or inhibit loading a plugin that is enabled by default.
@@ -51,16 +64,28 @@ $NetBSD: patch-aq,v 1.6 2005/11/13 22:48:32 heinz Exp $
          just a template, which will be copied to a user's home directory
          for them to change.
  
-@@ -187,6 +187,12 @@ These are:
-   /usr/local    /usr/local/share/spamassassin  /etc/mail/spamassassin
+@@ -195,6 +195,12 @@ These are:
    /opt/$DIR     /opt/$DIR/share/spamassassin   /etc/opt/mail/spamassassin
    $DIR          $DIR/share/spamassassin        $DIR/etc/mail/spamassassin
-+
+ 
 +(Pkgsrc note: the pkgsrc build process used the following path names
 +  __prefix__:          @@PREFIX@@
 +  __def_rules_dir__:   @@PREFIX@@/share/spamassassin
 +  __local_rules_dir__: @PKG_SYSCONFDIR@
 +)
- 
++
  The files themselves are then looked for in these paths:
  
+   - Distributed Configuration Files
+@@ -234,6 +240,11 @@ ruleset:
+   /opt/$DIR     /var/opt/spamassassin/__version__
+   $DIR          $DIR/var/spamassassin/__version__
+ 
++(Pkgsrc note: the pkgsrc build process used the following path names
++  __prefix__:          @@PREFIX@@
++  __local_state_dir__: @VARBASE@/spamassassin/__version__
++)
++
+ This is normally written to by the "sa-update" script.  "__version__" is
+ replaced by a representation of the version number, so that multiple
+ versions of SpamAssassin will not interfere with each other's rulesets.