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.

1 files changed, 9 insertions, 5 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