Updated to version 3.1.2.

Pkgsrc changes:
  - The updates for rule files go into $VARBASE/spamassassin/.
  - This above directory and the directory sa-update-keys for the GPG keys
    are now handled automatically by OWN_DIRS.
  - The growing number of *.pre files are managed in a loop in the Makefile.
    They are no longer contained in the static PLIST.
  - Removed some unnecessary trailing slashes.
  - Patching init.pre in order to disable the SPF plugin broke the spf.t
    test. This is now fixed, although in a rather ugly way :-/.
  - patch-ab no longer needs to use BSD_INSTALL_DATA_DIR because we create
    the directories through INSTALLATION_DIRS.
  - patch-ad and patch-az were removed (changes integrated upstream).
  - patch-bb fixes a small documentation error.
  - Fixed some warnings by pkglint about the SUBST framework in Makefile
    and options.mk.

Relevant changes since version 3.1.1:
=====================================

- bug 4802: implement DKIM plugin, including whitelist_from_dkim support
- bug 3838: work around Perl bug causing captured RE variables to become
  tainted -- thanks to Mark Martinec for pointing out the bug with
  Perl itself
- bug 4850: re-enable the Razor2 plugin by default due to a service
  policy change
- bug 4826: Razor2 plugin needs to load Mail::SpamAssassin::Timeout module
- bug 4827: M::SA::first_existing_path() would return the last array
  entry passed in if none of the paths were found.  Now return undef
  instead and handle the error when it happens.
- bug 4813: generally open RE causes sendmail received header get read
  in as qmail in error
- bug 4839: Logger.pm converts control chars including tab into
  underscores which confuses a bunch of users when checking debug output.
  Convert tab into space instead, etc.
- bug 4884: if a null message is passed in, there are several variables
  which end up undefined causing warnings.  fake an empty message if no
  input is given.
- bug 4793: when replacing tags in a message (_TAG_), leave the tags
  that don't exist alone instead of just removing them
- bug 4861, 4760: handle dccifd and dccproc failover properly, backport
  relays_internal and relays_external code, backport bug 4760 fix so
  that it's not possible to be in internal_networks without being in
  trusted_networks as well
- bug 4901: deal more properly with failures in bgsend().  also, use
  the proper variable to show when errors occur.
- bug 4867: fetchmail changed header formats at some point making Received
  parsing fail in certain conditions
- bug 4699: use M::SA::Timeout for spamd copy_config call and allow for
  empty $@ values
- bug 3754: if there's a problem opening a file via sa-learn or
  spamassassin, return an error exit value.

1 files changed, 5 insertions, 6 deletions

diff --git a/mail/spamassassin/options.mk b/mail/spamassassin/options.mk
index c37695c9172..0d204359497 100644
--- a/mail/spamassassin/options.mk
+++ b/mail/spamassassin/options.mk
@@ -1,4 +1,4 @@
-# $NetBSD: options.mk,v 1.5 2006/03/13 21:11:57 heinz Exp $
+# $NetBSD: options.mk,v 1.6 2006/05/26 20:53:00 heinz Exp $
 
 PKG_OPTIONS_VAR=	PKG_OPTIONS.spamassassin
 PKG_SUPPORTED_OPTIONS=	\
@@ -31,11 +31,10 @@ PKG_SUGGESTED_OPTIONS=	spamassassin-taint-checks \
 SUBST_CLASSES+=		satests
 SUBST_STAGE.satests=	post-configure
 SUBST_FILES.satests=	t/config
-SUBST_SED.satests=	\
-	-e s!awl_sql_tests=n!awl_sql_tests=${AWL_SQL_TEST}! \
-	-e s!bayes_sql_tests=n!bayes_sql_tests=${BAYES_SQL_TEST}! \
-	-e s!run_net_tests=n!run_net_tests=${NET_TEST}! \
-	-e s!prefork_stress_test=n!prefork_stress_test=${PREFORK_TEST}!
+SUBST_SED.satests=	-e s!awl_sql_tests=n!awl_sql_tests=${AWL_SQL_TEST}!
+SUBST_SED.satests+=	-e s!bayes_sql_tests=n!bayes_sql_tests=${BAYES_SQL_TEST}!
+SUBST_SED.satests+=	-e s!run_net_tests=n!run_net_tests=${NET_TEST}!
+SUBST_SED.satests+=	-e s!prefork_stress_test=n!prefork_stress_test=${PREFORK_TEST}!
 
 #
 # Enable tests of the SQL storage module for the automatic whitelist