Update to 2.63. Tested on NetBSD and Solaris 8.

Summary of major changes since 2.62
-----------------------------------

  - Fixed bug related to perl 5.005 which stopped SpamAssassin from being
    runnable
  - Fixed bug where "spamassassin -l" parameter wouldn't be untainted before
    being used
  - Added caching of body rendering results so that the message wouldn't
    be rendered the same way multiple times unnecessarily.

Summary of major changes since 2.61
-----------------------------------

  - Fixed two bugs related to Received line generation and parsing.
  - Modified two rules to reduce false positives.
  - Fixed bug where spamd temporary init directory wasn't removed in some
    situations.
  - Modified HABEAS_SWE to function even if the Habeas headers were out of
    their normal order.
  - Fixed bug where reporting wouldn't remove message markup before being
    learned by Bayes.
  - Fixed bug where report_safe_copy_headers would reverse the order of the
    Received headers.
  - Fixed several bugs in the Bayes system caused by DB_File oddities.

5 files changed, 9 insertions, 67 deletions

diff --git a/mail/spamassassin/Makefile b/mail/spamassassin/Makefile
index c766a379f05..19becd665bf 100644
--- a/mail/spamassassin/Makefile
+++ b/mail/spamassassin/Makefile
@@ -1,7 +1,7 @@
-# $NetBSD: Makefile,v 1.38 2004/01/06 07:08:13 jlam Exp $
+# $NetBSD: Makefile,v 1.39 2004/01/21 22:19:30 heinz Exp $
 
 DISTNAME=	Mail-SpamAssassin-${PKGVERSION}
-PKGNAME=	spamassassin-2.61
+PKGNAME=	spamassassin-2.63
 PKGREVISION=	# empty
 SVR4_PKGNAME=	sa
 CATEGORIES=	mail
@@ -152,7 +152,6 @@ post-install:
 	@${TEST} -r ${PLIST_ADD} && ${RM} ${PLIST_ADD} ; :
 	@ # ninja image is in the static PLIST
 	@${INSTALL_DATA} ${WRKSRC}/ninjabutton.png ${HTMLDIR}/
-	@${INSTALL_DATA} ${FILESDIR}/change_summary.txt ${DOCDIR}/
 .for f in CONTRIB_CERT COPYRIGHT INSTALL License README TRADEMARK USAGE	\
 		sample-nonspam.txt sample-spam.txt spamd/README.spamd	\
 		spamd/README.spamd-vpopmail
diff --git a/mail/spamassassin/PLIST b/mail/spamassassin/PLIST
index cbaf7cda078..94540b49722 100644
--- a/mail/spamassassin/PLIST
+++ b/mail/spamassassin/PLIST
@@ -1,9 +1,8 @@
-@comment $NetBSD: PLIST,v 1.12 2003/12/27 19:16:04 heinz Exp $
+@comment $NetBSD: PLIST,v 1.13 2004/01/21 22:19:30 heinz Exp $
 @comment Most of this PLIST is auto-generated; see Makefile.
 etc/rc.d/spamd
 share/doc/html/spamassassin/ninjabutton.png
 @comment @dirrm share/doc/html/spamassassin
-share/doc/spamassassin/change_summary.txt
 share/examples/spamassassin/local.cf
 share/examples/spamassassin/netbsd_lists.cf
 share/examples/spamassassin/procmailrc.example
diff --git a/mail/spamassassin/distinfo b/mail/spamassassin/distinfo
index 7158b976e14..6116705ecbe 100644
--- a/mail/spamassassin/distinfo
+++ b/mail/spamassassin/distinfo
@@ -1,8 +1,8 @@
-$NetBSD: distinfo,v 1.20 2003/12/27 19:16:04 heinz Exp $
+$NetBSD: distinfo,v 1.21 2004/01/21 22:19:30 heinz Exp $
 
-SHA1 (Mail-SpamAssassin-2.61.tar.gz) = da8f10c1c7eb91f2fced05366f4d792bcb6255ec
-Size (Mail-SpamAssassin-2.61.tar.gz) = 828154 bytes
-SHA1 (patch-ab) = ce949ca9247bd98a0f991e10ad35ac6ae7bf93b2
+SHA1 (Mail-SpamAssassin-2.63.tar.gz) = 6bab68dfd6a5238fc84360ce08249657bed4bab3
+Size (Mail-SpamAssassin-2.63.tar.gz) = 828596 bytes
+SHA1 (patch-ab) = 655f860a71fd6a1b7adb2cb5194fc9563ead9529
 SHA1 (patch-ae) = 681f777fb9967d61b9886e10046258657f4f492a
 SHA1 (patch-ak) = 815602ef71c8e01e4cfc2b51a7ac3f2676bc0ecc
 SHA1 (patch-al) = 75c22289726d3c7e39834cd164ca9f2220969e9e
diff --git a/mail/spamassassin/files/change_summary.txt b/mail/spamassassin/files/change_summary.txt
deleted file mode 100644
index 8dea4da0299..00000000000
--- a/mail/spamassassin/files/change_summary.txt
+++ /dev/null
@@ -1,56 +0,0 @@
-Subject: SpamAssassin 2.61 is released!
-
-SpamAssassin is a mail filter which uses advanced statistical
-and heuristic tests to identify spam (also known as unsolicited
-commercial/bulk email).
-
-Downloading
------------
-
-Pick it up from:
-
-  http://SpamAssassin.org/released/Mail-SpamAssassin-2.61.tar.gz
-  http://SpamAssassin.org/released/Mail-SpamAssassin-2.61.tar.bz2
-  http://SpamAssassin.org/released/Mail-SpamAssassin-2.61.zip
-
-md5sum:
-  6521ad3e6ed5a2eba35476c43c1697b7  Mail-SpamAssassin-2.61.tar.gz
-  25a87ca67c1550360e1378c816301b53  Mail-SpamAssassin-2.61.tar.bz2
-  8ab5e24ddb64f8a7d9d0299a72b3ea0b  Mail-SpamAssassin-2.61.zip
-
-sha1sum:
-  da8f10c1c7eb91f2fced05366f4d792bcb6255ec  Mail-SpamAssassin-2.61.tar.gz
-  bf161bc92f33bdad298daefc279e2b85efa34f7d  Mail-SpamAssassin-2.61.tar.bz2
-  050cd37240b34b7d0f1bf31df7cb46fb0ad50678  Mail-SpamAssassin-2.61.zip
-
-Or on CPAN shortly, once the mirrors update.
-
-The release files also have a .asc accompanying them.  The file serves
-as an external GPG signature for the given release file.  The signing
-key is available via the wwwkeys.pgp.net keyserver, as well as
-http://www.spamassassin.org/released/GPG-SIGNING-KEY
-
-The key information is:
-
-pub  1024D/265FA05B 2003-06-09 SpamAssassin Signing Key <release@spamassassin.org>
-     Key fingerprint =3D 26C9 00A4 6DD4 0CD5 AD24  F6D7 DEE0 1987 265F A05B
-
-
-Summary of major changes since 2.60
------------------------------------
-
-  - Dramatically reduced memory usage of Bayes expiry.
-
-  - avoid false positives on Outlook 2003 messages, mails from Mac, Palm, and
-    localized versions of Eudora, several AOL MUAs, and newer versions of The
-    Bat!
-
-  - new set of French translations from Michel Bouissou
-
-  - updated to reflect new Dynablock DNSBL location
-
-  - avoids a possible hole that was giving AWL bonuses to
-    spammer forgeries on some networks
-
-  - miscellaneous bug fixes
-
diff --git a/mail/spamassassin/patches/patch-ab b/mail/spamassassin/patches/patch-ab
index 9e82fb683ea..6627324731c 100644
--- a/mail/spamassassin/patches/patch-ab
+++ b/mail/spamassassin/patches/patch-ab
@@ -1,4 +1,4 @@
-$NetBSD: patch-ab,v 1.6 2003/12/27 19:16:04 heinz Exp $
+$NetBSD: patch-ab,v 1.7 2004/01/21 22:19:30 heinz Exp $
 
 --- Makefile.PL.orig	Sun Nov  2 01:42:04 2003
 +++ Makefile.PL
@@ -51,7 +51,7 @@ $NetBSD: patch-ab,v 1.6 2003/12/27 19:16:04 heinz Exp $
 @@ -745,7 +746,7 @@ sub MY::libscan {
  
    return q{} if $path =~ m{
-                   (^|/)CVS(/|$)|
+                   (^|/)(\.svn|CVS)(/|$)|
 -                  [/.](orig|old|rej|diff|patch|bak|backup|my)$
 +                  [/.](orig|old|rej|diff|patch|bak|backup|my|subst.sav)$
                  }ix;