summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat
-rw-r--r--mail/spamassassin/Makefile7
-rw-r--r--mail/spamassassin/distinfo10
-rw-r--r--mail/spamassassin/options.mk45
-rw-r--r--mail/spamassassin/patches/patch-ba26
-rw-r--r--mail/spamassassin/patches/patch-bc32
5 files changed, 94 insertions, 26 deletions
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/<version>)
++ (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<sa-update> 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/<version>)
++ (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</etc/
+
+ By default, C<sa-compile> 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<Makefile.PL> arguments, instead of overriding sa-compile's
+ runtime behaviour.
+
generated by cgit v1.2.3 (git 2.39.1) at 2024-08-08 00:37:32 +0000