Update to 3.0.1.

This is a minor maintenance release to 3.0.0 and the old
archive was no longer available on the primary sites.

5 files changed, 5 insertions, 80 deletions

diff --git a/mail/spamassassin/Makefile b/mail/spamassassin/Makefile
index 89b2c9d4a1e..9971fd91038 100644
--- a/mail/spamassassin/Makefile
+++ b/mail/spamassassin/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.49 2004/10/12 00:11:10 heinz Exp $
+# $NetBSD: Makefile,v 1.50 2004/11/08 17:07:23 mjl Exp $
 
 DISTNAME=	Mail-SpamAssassin-${SPAMASSASSIN_VERSION}
 PKGNAME=	spamassassin-${SPAMASSASSIN_VERSION}
@@ -27,7 +27,7 @@ CONFLICTS=	p5-Mail-SpamAssassin-[1-9]*
 
 PKG_INSTALLATION_TYPES=	overwrite pkgviews
 
-SPAMASSASSIN_VERSION=	3.0.0
+SPAMASSASSIN_VERSION=	3.0.1
 
 WRKSRC=			${WRKDIR}/${DISTNAME}
 
diff --git a/mail/spamassassin/distinfo b/mail/spamassassin/distinfo
index 157611094c4..4e48c7c07b6 100644
--- a/mail/spamassassin/distinfo
+++ b/mail/spamassassin/distinfo
@@ -1,10 +1,7 @@
-$NetBSD: distinfo,v 1.24 2004/10/12 00:11:10 heinz Exp $
+$NetBSD: distinfo,v 1.25 2004/11/08 17:07:23 mjl Exp $
 
-SHA1 (Mail-SpamAssassin-3.0.0.tar.gz) = d52c317483483874f2b7e5dd544094249bedbdad
-Size (Mail-SpamAssassin-3.0.0.tar.gz) = 1072046 bytes
+SHA1 (Mail-SpamAssassin-3.0.1.tar.gz) = a3aebae1bf3c97830e540c42dc64791787d966c9
+Size (Mail-SpamAssassin-3.0.1.tar.gz) = 991250 bytes
 SHA1 (patch-ab) = 09c57aa31e4f82c90cbbaac637fcbed1c730f0aa
 SHA1 (patch-ae) = 26c0589002413030bbfbb31069c82007b8fd0cf5
 SHA1 (patch-aq) = 04c46e41dc008bc3bde5bebef33174305fcf7b89
-SHA1 (patch-au) = bc3f794596ef9d9608f7bf9646c572ce5a2a4ff8
-SHA1 (patch-av) = 4b19e112ec572543d5ac6ceacdf8c2af0a4f4e44
-SHA1 (patch-aw) = b08f22607ce805e5e04718979f6cf57fce43e70f
diff --git a/mail/spamassassin/patches/patch-au b/mail/spamassassin/patches/patch-au
deleted file mode 100644
index a832c78ecf5..00000000000
--- a/mail/spamassassin/patches/patch-au
+++ /dev/null
@@ -1,29 +0,0 @@
-$NetBSD: patch-au,v 1.1 2004/10/12 00:11:10 heinz Exp $
-
---- t/dnsbl.t.orig	Fri Aug 27 18:37:42 2004
-+++ t/dnsbl.t
-@@ -5,14 +5,22 @@ use SATest; sa_t_init("dns");
- 
- use constant TEST_ENABLED => (-e 't/do_net' || -e 'do_net');
- use constant HAS_NET_DNS => eval { require Net::DNS; };
-+# Do not run this test on non-Linux unices as root, due to a bug
-+# in Sys::Hostname::Long (which Net::DNS uses.)
-+# See <http://bugzilla.spamassassin.org/show_bug.cgi?id=3806>
-+use constant IS_LINUX   => $^O eq 'linux';
-+use constant AM_ROOT    => $< == 0;
-+
-+use constant DO_RUN     => TEST_ENABLED && HAS_NET_DNS &&
-+                                        !(AM_ROOT && !IS_LINUX);
- 
- use Test;
- 
- BEGIN {
--  plan tests => ((TEST_ENABLED && HAS_NET_DNS) ? 22 : 0),
-+  plan tests => (DO_RUN ? 22 : 0),
- };
- 
--exit unless (TEST_ENABLED && HAS_NET_DNS);
-+exit unless (DO_RUN);
- 
- # ---------------------------------------------------------------------------
- # bind configuration currently used to support this test
diff --git a/mail/spamassassin/patches/patch-av b/mail/spamassassin/patches/patch-av
deleted file mode 100644
index 0830758769b..00000000000
--- a/mail/spamassassin/patches/patch-av
+++ /dev/null
@@ -1,29 +0,0 @@
-$NetBSD: patch-av,v 1.1 2004/10/12 00:11:10 heinz Exp $
-
---- t/spf.t.orig	Thu Sep  9 20:29:21 2004
-+++ t/spf.t
-@@ -6,14 +6,22 @@ use Test;
- 
- use constant TEST_ENABLED => (-e 't/do_net');
- use constant HAS_SPFQUERY => eval { require Mail::SPF::Query; };
-+# Do not run this test on non-Linux unices as root, due to a bug
-+# in Sys::Hostname::Long (which Mail::Query::SPF uses.)
-+use constant IS_LINUX   => $^O eq 'linux';
-+use constant AM_ROOT    => $< == 0;
-+
-+use constant DO_RUN     => TEST_ENABLED && HAS_SPFQUERY &&
-+					!(AM_ROOT && !IS_LINUX);
-+
- 
- BEGIN {
-   
--  plan tests => ((TEST_ENABLED && HAS_SPFQUERY) ? 2 : 0);
-+  plan tests => (DO_RUN ? 2 : 0);
- 
- };
- 
--exit unless (TEST_ENABLED && HAS_SPFQUERY);
-+exit unless (DO_RUN);
- 
- # ---------------------------------------------------------------------------
- 
diff --git a/mail/spamassassin/patches/patch-aw b/mail/spamassassin/patches/patch-aw
deleted file mode 100644
index 20954e9955d..00000000000
--- a/mail/spamassassin/patches/patch-aw
+++ /dev/null
@@ -1,14 +0,0 @@
-$NetBSD: patch-aw,v 1.1 2004/10/12 00:11:10 heinz Exp $
-
---- t/spamc_l.t.orig	Fri Aug 27 18:37:38 2004
-+++ t/spamc_l.t
-@@ -18,6 +18,8 @@ q{ spamc: connect(AF_INET) to spamd at 1
- );
- 
- # connect on port 9 (discard): should always fail
--ok (scrunwithstderr ("-l -p 9 < data/etc/hello.txt", \&patterns_run_cb));
-+# pkgsrc: port 8 is 'unassigned' according to IANA
-+# see also http://bugzilla.spamassassin.org/show_bug.cgi?id=3747
-+ok (scrunwithstderr ("-l -p 8 < data/etc/hello.txt", \&patterns_run_cb));
- ok_all_patterns();
-