From 917d30786b140e81b6add216118b5fa26c83e444 Mon Sep 17 00:00:00 2001 From: heinz Date: Sun, 26 Aug 2007 17:26:50 +0000 Subject: Updated to version 3.2.3. Pkgsrc changes: - Added security/gnupg as a required package. Without it, sa-update does not work. - Added requirement for p5-INET6 which may be needed for IPv6 nameservers. Until now, this only worked because p5-Net-DNS already pulled in this package. - New option "inet6" (enabled by default) for switching off the requirement for p5-INET6. - Got rid of some backslashes in options.mk - patch-ba and patch-bc correct discrepancies between the man page and the code. Additionally, they adapt hard-coded paths to the actual installation. Submitted upstream. Relevant changes since version 3.2.1: ===================================== 3.2.3 is a major bug-fix release. Summary of changes: - bug 5574: fix new setuid code to work with perl 5.6.1, and to support DCC and Pyzor in all releases of perl - bug 5107: change default 'user_scores_ldap_username' to be the null string, allowing anonymous binding; fix 'schema' syntax error in LDAP config support - zeroing an 'eval' rule's score did not stop it running. fix, thanks to Richard Birkett - bug 5571: allow for new message ID format we have seen from Vista or Windows 2003 Server MAPI to avoid false positives - bug 5397: RDNS_DYNAMIC should never fire on a PTR with 'static' in it; thanks to Martin Blapp . bug 5563: RDNS_DYNAMIC rules use order-dependent fields where it is unsafe to depend on this, fix. bug 5564: __RDNS_DYNAMIC_IPADDR does not hit all of its test patterns, fix. - bug 5475: fix FORGED_MUA_AOL_FROM to allow <*@{aol,cs}.*> addresses instead of just <*@{aol,cs}.com> 3.2.2 is a minor bug-fix release. Summary of changes: - bug 5548: Certain mail input can take a long time to scan with 100% CPU utilisation, due to backtracking in a rule's regexp. fix - bugs 5510, 5518, 5529: fix 'make test' when running as root, needed for CPAN - bug 5419: kill -HUP of pidof spamd causes the ps name to change from spamd to perl. fixed - bug 5535: 'make test' errors in Windows caused by nonportable use of getpwuid - bug 5462: multiple DNS records for a host name should allow use of spamd -H for load balancing installs to work - bugs 5509, 5511: fix network lookup timeouts, where lookups were being lost once a timeout was hit; also fix code to match documentation on rbl_timeout's scaling and minimum duration of 1 second; and attempt to collect already-received DNS responses when the timeout is reached; improve related debugging output. Thanks to Mark Martinec - bugs 5412, 5478, 5522: Fix problems using the spamc -x option with certain other options; 'spamc -x -R' always returned 0, instead of the exit code, on error. Bug 5478: in addition, 'spamc -x -e /command' would still run the command, even if errors meant that the filtered text would be unavailable, which contradicted -x. - bug 5445: body eval tests defined in user_rules cause ugly 'Subroutine _eval_tests_type11_prineg400_set3 redefined' warnings - bug 5355: add in new entries for RegistrarBoundaries - bug 5515: libsslspamc.so & libsslspamc.so can not build without -fPIC, but we were picking up the wrong CFLAGS to do this. - bug 5501: zero score for FH_HAS_XID - bug 5449: allow_user_rules causes sa-compile / Rule2XSBody plugin to emit spurious warnings; fix. also, add a new 'user_conf_parsing_end' plugin hook, which is called after the per-user configuration is parsed - bug 5182: update the sa-learn doc to mention that -u is only usable w/ sql - bug 5534: fix harmless-but-ugly C compiler warning in sa-compile --- mail/spamassassin/Makefile | 7 +++--- mail/spamassassin/distinfo | 10 +++++---- mail/spamassassin/options.mk | 45 ++++++++++++++++++++++---------------- mail/spamassassin/patches/patch-ba | 26 ++++++++++++++++++++++ mail/spamassassin/patches/patch-bc | 32 +++++++++++++++++++++++++++ 5 files changed, 94 insertions(+), 26 deletions(-) create mode 100644 mail/spamassassin/patches/patch-ba create mode 100644 mail/spamassassin/patches/patch-bc diff --git a/mail/spamassassin/Makefile b/mail/spamassassin/Makefile index 87f08428395..e2846517089 100644 --- a/mail/spamassassin/Makefile +++ b/mail/spamassassin/Makefile @@ -1,7 +1,7 @@ -# $NetBSD: Makefile,v 1.82 2007/08/23 12:39:17 joerg Exp $ +# $NetBSD: Makefile,v 1.83 2007/08/26 17:26:50 heinz Exp $ -DISTNAME= Mail-SpamAssassin-3.2.1 -PKGNAME= spamassassin-3.2.1 +DISTNAME= Mail-SpamAssassin-3.2.3 +PKGNAME= spamassassin-3.2.3 SVR4_PKGNAME= sa CATEGORIES= mail perl5 MASTER_SITES= ${MASTER_SITE_APACHE:=spamassassin/source/} @@ -23,6 +23,7 @@ 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 +DEPENDS+= gnupg-[0-9]*:../../security/gnupg USE_TOOLS+= perl diff --git a/mail/spamassassin/distinfo b/mail/spamassassin/distinfo index ebbf6b197f6..1ac55ded150 100644 --- a/mail/spamassassin/distinfo +++ b/mail/spamassassin/distinfo @@ -1,9 +1,11 @@ -$NetBSD: distinfo,v 1.45 2007/06/12 21:43:30 heinz Exp $ +$NetBSD: distinfo,v 1.46 2007/08/26 17:26:51 heinz Exp $ -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 (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 (patch-ab) = 9872b4c3e6d34cb58f84081554eff49efcfc6a6a SHA1 (patch-ae) = d46b1d8f56c8c61936c307f74b39a49da1b1f353 SHA1 (patch-aq) = 3a273c7742275647c2334382fed29c0ea33dfbd8 SHA1 (patch-ay) = 7d805e7ef86e279a19e7d3d2f03e2227624317f8 +SHA1 (patch-ba) = 62c2b8f4d9a7e54dd405910f5bd04659d159f65d +SHA1 (patch-bc) = 190cc25eb0e91c660e08448b2667b675df835d60 diff --git a/mail/spamassassin/options.mk b/mail/spamassassin/options.mk index 0d204359497..d8fb43cfa09 100644 --- a/mail/spamassassin/options.mk +++ b/mail/spamassassin/options.mk @@ -1,28 +1,28 @@ -# $NetBSD: options.mk,v 1.6 2006/05/26 20:53:00 heinz Exp $ +# $NetBSD: options.mk,v 1.7 2007/08/26 17:26:51 heinz Exp $ PKG_OPTIONS_VAR= PKG_OPTIONS.spamassassin -PKG_SUPPORTED_OPTIONS= \ - online-tests \ - spamassassin-perl-warnings \ - spamassassin-taint-checks \ - spamassassin-test-awl-sql \ - spamassassin-test-bayes-sql \ - spamassassin-test-prefork \ - ssl -PKG_OPTIONS_LEGACY_OPTS+= \ - awl-sql-tests:spamassassin-test-awl-sql \ - bayes-sql-tests:spamassassin-test-bayes-sql \ - net-tests:online-tests \ - perl-taint-checks:spamassassin-taint-checks \ - perl-warnings:spamassassin-perl-warnings \ - spamassassin-test-net:online-tests +PKG_SUPPORTED_OPTIONS= inet6 +PKG_SUPPORTED_OPTIONS+= online-tests +PKG_SUPPORTED_OPTIONS+= spamassassin-perl-warnings +PKG_SUPPORTED_OPTIONS+= spamassassin-taint-checks +PKG_SUPPORTED_OPTIONS+= spamassassin-test-awl-sql +PKG_SUPPORTED_OPTIONS+= spamassassin-test-bayes-sql +PKG_SUPPORTED_OPTIONS+= spamassassin-test-prefork +PKG_SUPPORTED_OPTIONS+= ssl + +PKG_OPTIONS_LEGACY_OPTS+= awl-sql-tests:spamassassin-test-awl-sql +PKG_OPTIONS_LEGACY_OPTS+= bayes-sql-tests:spamassassin-test-bayes-sql +PKG_OPTIONS_LEGACY_OPTS+= net-tests:online-tests +PKG_OPTIONS_LEGACY_OPTS+= perl-taint-checks:spamassassin-taint-checks +PKG_OPTIONS_LEGACY_OPTS+= perl-warnings:spamassassin-perl-warnings +PKG_OPTIONS_LEGACY_OPTS+= spamassassin-test-net:online-tests # # Default options # -PKG_SUGGESTED_OPTIONS= spamassassin-taint-checks \ - spamassassin-perl-warnings \ - ssl +PKG_SUGGESTED_OPTIONS= inet6 spamassassin-taint-checks +PKG_SUGGESTED_OPTIONS+= spamassassin-perl-warnings ssl + .include "../../mk/bsd.options.mk" # @@ -107,3 +107,10 @@ MAKE_PARAMS+= ENABLE_SSL=yes CONFIGURE_ARGS+= --disable-ssl MAKE_PARAMS+= ENABLE_SSL=no .endif + +# +# Be prepared for IPv6 nameservers +# +.if !empty(PKG_OPTIONS:Minet6) +DEPENDS+= p5-INET6-[0-9]*:../../net/p5-INET6 +.endif diff --git a/mail/spamassassin/patches/patch-ba b/mail/spamassassin/patches/patch-ba new file mode 100644 index 00000000000..a07ecad3e6e --- /dev/null +++ b/mail/spamassassin/patches/patch-ba @@ -0,0 +1,26 @@ +$NetBSD: patch-ba,v 1.1 2007/08/26 17:26:51 heinz Exp $ + + Both submitted upstream: + - no need for a hard-coded path, the appropriate variables already exist + - the documentation conflicts with the code + +--- sa-update.raw.orig 2007-08-08 15:19:47.000000000 +0200 ++++ sa-update.raw +@@ -1322,7 +1322,7 @@ Options: + keyring. Use multiple times for multiple files + --updatedir path Directory to place updates, defaults to the + SpamAssassin site rules directory +- (default: /var/lib/spamassassin/) ++ (default: @@LOCAL_STATE_DIR@@/@@VERSION@@) + -D, --debug [area=n,...] Print debugging messages + -V, --version Print version + -h, --help Print usage message +@@ -1441,7 +1441,7 @@ Note: use of this option automatically e + + By default, C will use the system-wide rules update directory: + +- @@LOCAL_STATE_DIR@@/spamassassin/@@VERSION@@ ++ @@LOCAL_STATE_DIR@@/@@VERSION@@ + + If the updates should be stored in another location, specify it here. + diff --git a/mail/spamassassin/patches/patch-bc b/mail/spamassassin/patches/patch-bc new file mode 100644 index 00000000000..023f87adafd --- /dev/null +++ b/mail/spamassassin/patches/patch-bc @@ -0,0 +1,32 @@ +$NetBSD: patch-bc,v 1.1 2007/08/26 17:26:51 heinz Exp $ + + Both submitted upstream: + - no need for a hard-coded path, the appropriate variables already exist + - the documentation conflicts with the code + +--- sa-compile.raw.orig 2007-08-08 15:19:47.000000000 +0200 ++++ sa-compile.raw +@@ -661,7 +661,7 @@ Options: + --siteconfigpath=path Path for site configs + (default: /etc/mail/spamassassin) + --updatedir=path Directory to place updates +- (default: /var/lib/spamassassin/compiled/) ++ (default: @@LOCAL_STATE_DIR@@/compiled/@@VERSION@@) + --cf='config line' Additional line of configuration + -D, --debug [area=n,...] Print debugging messages + -V, --version Print version +@@ -719,12 +719,12 @@ the default directories (usually C will use the system-wide rules update directory: + +- @@LOCAL_STATE_DIR@@/spamassassin/compiled/@@VERSION@@ ++ @@LOCAL_STATE_DIR@@/compiled/@@VERSION@@ + + If the updates should be stored in another location, specify it here. + + Note that use of this option is not recommended; if sa-compile is placing the +-compiled rules the wrong directory, you probably need to rebuild SpamAssassin ++compiled rules in the wrong directory, you probably need to rebuild SpamAssassin + with different C arguments, instead of overriding sa-compile's + runtime behaviour. + -- cgit v1.2.3