Update to version 2.61

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

7 files changed, 18 insertions, 59 deletions

diff --git a/mail/spamassassin/patches/patch-ab b/mail/spamassassin/patches/patch-ab
index 0a6493c57c0..9e82fb683ea 100644
--- a/mail/spamassassin/patches/patch-ab
+++ b/mail/spamassassin/patches/patch-ab
@@ -1,6 +1,6 @@
-$NetBSD: patch-ab,v 1.5 2003/11/03 00:56:26 heinz Exp $
+$NetBSD: patch-ab,v 1.6 2003/12/27 19:16:04 heinz Exp $
 
---- Makefile.PL.orig	Tue Sep 16 03:05:24 2003
+--- Makefile.PL.orig	Sun Nov  2 01:42:04 2003
 +++ Makefile.PL
 @@ -95,7 +95,7 @@ sub yesno {
  
@@ -11,7 +11,7 @@ $NetBSD: patch-ab,v 1.5 2003/11/03 00:56:26 heinz Exp $
    'run_razor_tests' => undef,
    'destdir'         => undef,
    '__cruft'         => undef,
-@@ -331,18 +331,20 @@ if (!defined $opt{'contact_address'}) {
+@@ -333,18 +333,20 @@ if (!defined $opt{'contact_address'}) {
  }
  $makefile{'macro'}{'CONTACT_ADDRESS'} = $opt{'contact_address'};
  
@@ -40,7 +40,7 @@ $NetBSD: patch-ab,v 1.5 2003/11/03 00:56:26 heinz Exp $
  if ($opt{'run_razor_tests'}) {
    open(FLAG, "> t/do_razor2");
    close(FLAG);
-@@ -350,7 +352,6 @@ if ($opt{'run_razor_tests'}) {
+@@ -352,7 +354,6 @@ if ($opt{'run_razor_tests'}) {
  else {
    unlink("t/do_razor2");
  }
@@ -48,16 +48,16 @@ $NetBSD: patch-ab,v 1.5 2003/11/03 00:56:26 heinz Exp $
  
  
  # Now dump the Makefile
-@@ -744,7 +745,7 @@ sub MY::libscan {
+@@ -745,7 +746,7 @@ sub MY::libscan {
+ 
    return q{} if $path =~ m{
-                   windows_install|
                    (^|/)CVS(/|$)|
 -                  [/.](orig|old|rej|diff|patch|bak|backup|my)$
 +                  [/.](orig|old|rej|diff|patch|bak|backup|my|subst.sav)$
                  }ix;
  
    clean_MY_globals($self);
-@@ -964,15 +965,16 @@ spamd/binaries.mk: spamd/configure
+@@ -965,15 +966,16 @@ spamd/binaries.mk: spamd/configure
  	cd spamd; ./configure --prefix="$(I_PREFIX)" --sysconfdir="$(I_SYSCONFDIR)" --datadir="$(I_DATADIR)" --enable-ssl="$(ENABLE_SSL)"
  
  conf__install:
diff --git a/mail/spamassassin/patches/patch-ae b/mail/spamassassin/patches/patch-ae
index 20941188540..65aa4196f85 100644
--- a/mail/spamassassin/patches/patch-ae
+++ b/mail/spamassassin/patches/patch-ae
@@ -1,8 +1,8 @@
-$NetBSD: patch-ae,v 1.7 2003/12/02 12:36:00 grant Exp $
+$NetBSD: patch-ae,v 1.8 2003/12/27 19:16:04 heinz Exp $
 
---- spamd/spamd.raw.orig	2003-09-11 11:05:22.000000000 +1000
+--- spamd/spamd.raw.orig	Sat Nov 15 03:55:31 2003
 +++ spamd/spamd.raw
-@@ -207,8 +207,8 @@ if ($opt{'auth-ident'}) {
+@@ -208,8 +208,8 @@ if ($opt{'auth-ident'}) {
  }
  
  # Check for server certs
@@ -13,7 +13,7 @@ $NetBSD: patch-ae,v 1.7 2003/12/02 12:36:00 grant Exp $
  if ($opt{'ssl'}) {
    eval { require IO::Socket::SSL };
    die "fatal: SSL encryption requested, but IO::Socket::SSL is unavailable\n" if ($@);
-@@ -1221,8 +1221,9 @@ sub restart_handler {
+@@ -1240,8 +1240,9 @@ sub restart_handler {
  use POSIX 'setsid';
  sub daemonize
  {
@@ -25,7 +25,7 @@ $NetBSD: patch-ae,v 1.7 2003/12/02 12:36:00 grant Exp $
  
      # Be a nice daemon and chdir() to the root so we don't block any unmount attempts
      chdir '/' or die "Can't chdir to /: $!\n";
-@@ -1341,7 +1342,7 @@ Options:
+@@ -1360,7 +1361,7 @@ Options:
   -a, --auto-whitelist, --whitelist  Use auto-whitelists
   -c, --create-prefs                 Create user preferences files
   -C path, --configpath=path         Path for default config files
@@ -34,7 +34,7 @@ $NetBSD: patch-ae,v 1.7 2003/12/02 12:36:00 grant Exp $
   -d, --daemonize                    Daemonize
   -h, --help                         Print usage message.
   -i ipaddr, --listen-ip=ipaddr,...  Listen on the IP ipaddr (default: 127.0.0.1)
-@@ -1416,12 +1417,12 @@ Create user preferences files if they do
+@@ -1435,12 +1436,12 @@ Create user preferences files if they do
  =item B<-C> I<path>, B<--configpath>=I<path>
  
  Use the specified path for locating the distributed configuration files.
diff --git a/mail/spamassassin/patches/patch-ak b/mail/spamassassin/patches/patch-ak
index b5052d155db..9c01ea5bfad 100644
--- a/mail/spamassassin/patches/patch-ak
+++ b/mail/spamassassin/patches/patch-ak
@@ -1,6 +1,6 @@
-$NetBSD: patch-ak,v 1.4 2003/11/03 00:56:26 heinz Exp $
+$NetBSD: patch-ak,v 1.5 2003/12/27 19:16:04 heinz Exp $
 
---- lib/Mail/SpamAssassin/DBBasedAddrList.pm.orig	Sat Mar 29 00:48:07 2003
+--- lib/Mail/SpamAssassin/DBBasedAddrList.pm.orig	Wed Nov 12 08:31:18 2003
 +++ lib/Mail/SpamAssassin/DBBasedAddrList.pm
 @@ -5,7 +5,8 @@ use bytes;
  use Fcntl;
diff --git a/mail/spamassassin/patches/patch-aq b/mail/spamassassin/patches/patch-aq
index 0abeb5488ef..e20538ff13a 100644
--- a/mail/spamassassin/patches/patch-aq
+++ b/mail/spamassassin/patches/patch-aq
@@ -1,8 +1,8 @@
-$NetBSD: patch-aq,v 1.1 2003/11/03 00:56:26 heinz Exp $
+$NetBSD: patch-aq,v 1.2 2003/12/27 19:16:04 heinz Exp $
 
---- README.orig	Sat Sep 13 03:05:21 2003
+--- README.orig	Sun Sep 28 18:21:54 2003
 +++ README
-@@ -105,30 +105,30 @@ Mail::SpamAssassin::Conf class (run the 
+@@ -116,30 +116,30 @@ Mail::SpamAssassin::Conf class (run the 
  the standard defaults that people use.  There is an explanation of all the
  default locations that SpamAssassin will look at the end.
  
diff --git a/mail/spamassassin/patches/patch-ar b/mail/spamassassin/patches/patch-ar
deleted file mode 100644
index 039542fe25b..00000000000
--- a/mail/spamassassin/patches/patch-ar
+++ /dev/null
@@ -1,12 +0,0 @@
-$NetBSD: patch-ar,v 1.1 2003/12/01 16:04:40 heinz Exp $
-
---- rules/30_text_de.cf.orig	Thu Aug 28 03:05:24 2003
-+++ rules/30_text_de.cf
-@@ -168,7 +168,6 @@ lang de describe DNS_FROM_RFCI_DSN Absen
- lang de describe HABEAS_VIOLATOR Sender verletzt das Warenzeichen der Firma Habeas
- lang de describe RCVD_IN_BSP_TRUSTED Senderechner in Liste von http://www.bondedsender.org/
- lang de describe RCVD_IN_BSP_OTHER Senderechner in Liste von http://www.bondedsender.org/
--lang de describe RCVD_IN_DYNABLOCK Senderechner nur temporär mit Internet verbunden
- lang de describe RCVD_IN_BL_SPAMCOP_NET Transportiert via Rechner in Liste von www.spamcop.net
- lang de describe RCVD_IN_MAPS_RBL Transportiert via Rechner in Liste von http://www.mail-abuse.org/rbl/
- lang de describe RCVD_IN_MAPS_DUL Transportiert via Rechner in Liste von http://www.mail-abuse.org/dul/
diff --git a/mail/spamassassin/patches/patch-as b/mail/spamassassin/patches/patch-as
deleted file mode 100644
index 202ff72ba8a..00000000000
--- a/mail/spamassassin/patches/patch-as
+++ /dev/null
@@ -1,12 +0,0 @@
-$NetBSD: patch-as,v 1.1 2003/12/01 16:04:40 heinz Exp $
-
---- rules/50_scores.cf.orig	Sat Sep 13 03:05:25 2003
-+++ rules/50_scores.cf
-@@ -936,7 +936,6 @@ score RCVD_IN_BL_SPAMCOP_NET 0 2.25 0 1.
- score RCVD_IN_BSP_OTHER 0 -0.1 0 -0.1
- score RCVD_IN_BSP_TRUSTED  0 -4.3 0 -4.3
- score RCVD_IN_DSBL 0 1.101 0 0.706
--score RCVD_IN_DYNABLOCK 0 2.546 0 2.599
- score RCVD_IN_NJABL 0 0.100 0 0.100
- score RCVD_IN_NJABL_CGI 0
- score RCVD_IN_NJABL_DIALUP 0 0.525 0 3.536
diff --git a/mail/spamassassin/patches/patch-at b/mail/spamassassin/patches/patch-at
deleted file mode 100644
index c4e7688f1e2..00000000000
--- a/mail/spamassassin/patches/patch-at
+++ /dev/null
@@ -1,17 +0,0 @@
-$NetBSD: patch-at,v 1.1 2003/12/01 16:04:40 heinz Exp $
-
---- rules/20_dnsbl_tests.cf.orig	Thu Aug 28 03:05:24 2003
-+++ rules/20_dnsbl_tests.cf
-@@ -182,12 +182,6 @@ tflags RCVD_IN_BSP_OTHER	net nice
- #header __SENDERBASE eval:check_rbl_txt('senderbase', 'sa.senderbase.org.')
- #tflags __SENDERBASE net
- 
--# DynaBlocker: block SMTP connections from dynamic dial-up IP ranges.
--# URL: http://basic.wirehub.nl/dynablocker.html
--header RCVD_IN_DYNABLOCK	eval:check_rbl_txt('dynablock-notfirsthop', 'dynablock.easynet.nl.')
--describe RCVD_IN_DYNABLOCK	Sent directly from dynamic IP address
--tflags RCVD_IN_DYNABLOCK	net
--
- # ---------------------------------------------------------------------------
- # NOTE: donation tests, see README file for details
-