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

13 files changed, 91 insertions, 230 deletions

diff --git a/mail/spamassassin/MESSAGE b/mail/spamassassin/MESSAGE
index eab7c131d7c..5894eaa759e 100644
--- a/mail/spamassassin/MESSAGE
+++ b/mail/spamassassin/MESSAGE
@@ -1,7 +1,7 @@
 ===========================================================================
-$NetBSD: MESSAGE,v 1.7 2003/12/02 11:40:20 grant Exp $
+$NetBSD: MESSAGE,v 1.8 2003/12/27 19:16:04 heinz Exp $
 
-SA 2.60 uses a new format for the Bayes database. *Before* deinstalling
+SA 2.6x uses a new format for the Bayes database. *Before* deinstalling
 SA 2.5x, make sure you ran 'sa-learn --rebuild' for every Bayes database.
 
 If you're running Razor please use at least p5-razor-agents-2.22nb2
diff --git a/mail/spamassassin/Makefile b/mail/spamassassin/Makefile
index 73b5adb0c8d..7f4d94534bd 100644
--- a/mail/spamassassin/Makefile
+++ b/mail/spamassassin/Makefile
@@ -1,15 +1,15 @@
-# $NetBSD: Makefile,v 1.36 2003/12/01 16:04:40 heinz Exp $
+# $NetBSD: Makefile,v 1.37 2003/12/27 19:16:04 heinz Exp $
 
-DISTNAME=	Mail-SpamAssassin-2.60
-PKGNAME=	spamassassin-2.60
-PKGREVISION=	2
+DISTNAME=	Mail-SpamAssassin-${PKGVERSION}
+PKGNAME=	spamassassin-2.61
+PKGREVISION=	# empty
 SVR4_PKGNAME=	sa
 CATEGORIES=	mail
 MASTER_SITES=	${MASTER_SITE_PERL_CPAN:=Mail/}			\
 		http://www.spamassassin.org/released/		\
 		http://eu.spamassassin.org/released/
 
-MAINTAINER=	heinz-sa@NetBSD.org
+MAINTAINER=	heinz@NetBSD.org
 HOMEPAGE=	http://www.spamassassin.org/
 COMMENT=	Mail filter to identify spam
 
@@ -150,7 +150,7 @@ 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}/2.60_change_summary ${DOCDIR}/
+	@${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 8ca1f6d45b9..cbaf7cda078 100644
--- a/mail/spamassassin/PLIST
+++ b/mail/spamassassin/PLIST
@@ -1,9 +1,9 @@
-@comment $NetBSD: PLIST,v 1.11 2003/11/03 00:56:26 heinz Exp $
+@comment $NetBSD: PLIST,v 1.12 2003/12/27 19:16:04 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/2.60_change_summary
+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 7eff3d19c46..7158b976e14 100644
--- a/mail/spamassassin/distinfo
+++ b/mail/spamassassin/distinfo
@@ -1,12 +1,9 @@
-$NetBSD: distinfo,v 1.19 2003/12/02 12:36:00 grant Exp $
+$NetBSD: distinfo,v 1.20 2003/12/27 19:16:04 heinz Exp $
 
-SHA1 (Mail-SpamAssassin-2.60.tar.gz) = 5d42b39430da13443dd94e78a2dad6c2b1c7cb5a
-Size (Mail-SpamAssassin-2.60.tar.gz) = 963215 bytes
-SHA1 (patch-ab) = 9f9d17bd2416584a693ef4757b2211968581983e
-SHA1 (patch-ae) = 4067380489f19fcbe76da56aa53fe2c9cdd396ee
-SHA1 (patch-ak) = 1b4669ec7ba136234c7d4be73e7ddfedab523be8
+SHA1 (Mail-SpamAssassin-2.61.tar.gz) = da8f10c1c7eb91f2fced05366f4d792bcb6255ec
+Size (Mail-SpamAssassin-2.61.tar.gz) = 828154 bytes
+SHA1 (patch-ab) = ce949ca9247bd98a0f991e10ad35ac6ae7bf93b2
+SHA1 (patch-ae) = 681f777fb9967d61b9886e10046258657f4f492a
+SHA1 (patch-ak) = 815602ef71c8e01e4cfc2b51a7ac3f2676bc0ecc
 SHA1 (patch-al) = 75c22289726d3c7e39834cd164ca9f2220969e9e
-SHA1 (patch-aq) = c8401a1e609707754b781a98358b2dd93638840e
-SHA1 (patch-ar) = afbe3fa1c9c6ce4fe6df1f006d784d90de67ff13
-SHA1 (patch-as) = 80363811bd1b2a8cba6d579e1a5534c001fdd238
-SHA1 (patch-at) = d0c2f35536c5b66c9d5de688d104209176249c41
+SHA1 (patch-aq) = fc6d8c0040d0cb5eb4ddcfd8232ae69acadecdbe
diff --git a/mail/spamassassin/files/2.60_change_summary b/mail/spamassassin/files/2.60_change_summary
deleted file mode 100644
index d722d5c6786..00000000000
--- a/mail/spamassassin/files/2.60_change_summary
+++ /dev/null
@@ -1,151 +0,0 @@
-SpamAssassin 2.60 is released!  SpamAssassin 2.60 is the first major
-update of SpamAssassin since February 2003 (when the 2.50 series was
-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.60.tar.gz
-  http://SpamAssassin.org/released/Mail-SpamAssassin-2.60.tar.bz2
-  http://SpamAssassin.org/released/Mail-SpamAssassin-2.60.zip
-
-md5sum:
-  bd1607d8fa52ef3f5fdda5e05f971e9d  Mail-SpamAssassin-2.60.tar.bz2
-  46d1db67ed1d860ddb136e0beb5f6ac3  Mail-SpamAssassin-2.60.tar.gz
-  f35b1b558c846a4e7fd7a50a7986cc26  Mail-SpamAssassin-2.60.zip
-
-sha1sum:
-  2b2ee745c4964f27005f2a791f4f4880b13795fa  Mail-SpamAssassin-2.60.tar.bz2
-  5d42b39430da13443dd94e78a2dad6c2b1c7cb5a  Mail-SpamAssassin-2.60.tar.gz
-  7e88af2cb92acb899d772752c1236d50991e80ee  Mail-SpamAssassin-2.60.zip
-
-
-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 = 26C9 00A4 6DD4 0CD5 AD24  F6D7 DEE0 1987 265F A05B
-
-The release will also be available via CPAN within a few days.
-
-
-Important installation notes
-----------------------------
-
-- Bayes FYI: 2.60 has a new Bayes backend and database format.  Your old
-  database(s) will automatically be upgraded the first time 2.60 tries to
-  write to the DB, and any journal, if it exists, will be wiped out without
-  being synced.
-
-  In addition, we have had to drop support for Bayes databases in formats
-  other than DB_File, due to a large number of serious issues (including
-  crash and concurrency bugs) with those formats.
-
-  So, what you want to do is something like this:
-
-  - stop running spamassassin/spamd (ie: you don't want it to be running
-    during the upgrade)
-  - run "sa-learn --rebuild", this will sync your journal.
-  - upgrade SA to 2.60
-  - install DB_File module if necessary
-  - if you were using another database module, run "sa-learn --import"
-    to migrate the data into new DB_File files
-  - run "sa-learn --rebuild", this will cause the db format to be upgraded
-  - start running spamassassin/spamd again
-
-  Obviously the steps will be different depending on your environment,
-  but you get the idea. :)
-
-- Bayes FYI 2: Because of the new database format, "check_bayes_db" will
-  no longer function properly.  The functionality from that script was
-  added to sa-learn via the "--dump" parameter.  Please see the sa-learn
-  man/pod documentation for more info.
-
-- SpamAssassin 2.6x will be the last release supporting perl 5.005,
-  so it's suggested to upgrade to at least perl 5.6.1
-
-- Razor2 isn't fully taint safe.  So since SpamAssassin 2.60 enables
-  taint mode by default, there's a Razor2.patch file which needs to be
-  applied to Razor2.  Documentation exists in the patch file.
-
-
-Summary of major changes since 2.5x
------------------------------------
-
-spamd improvements
-
-  - spamd now supports UNIX-domain sockets for low-overhead scanning, thanks
-    to Steve Friedl for this.  This is strongly recommended if you're running
-    spamc on the same host as the spamd server
-
-Bayes improvements
-
-  - new tweaks to the Bayes engine: it now breaks down email addresses and URI
-    elements while learning to use as additional features when testing email
-
-  - new bayes backend, including new database format, ability to learn messages
-    to the journal, etc.  Improved expiration mechanism
-
-HTML parser improvements
-
-  - HTML::Parser 3.24 or higher is now required
-
-  - major improvements to the HTML engine, including better support for
-    detecting 'invisible text' and similar obfuscation techniques used in
-    spam
-
-DNS blacklist and network testing improvements
-
-  - DNS blacklists (RBLs) overhauled; lots of new lists, including SORBS and
-    SpamCop; dropped Osirusoft due to their retirement (brought on by a DDOS)
-
-  - RBL timeouts are now handled much more efficiently; if one RBL is taking
-    much longer than all the others, it will be cut short and ignored
-
-  - the RBL engine improves the extraction and selection of IP addresses
-    queried by inferring trust relationships between Received headers; trust
-    can also be manually specified using the new "trusted_networks" option
-
-  - a generalised Received-header parser to more easily detect HELO string
-    forgery and faked relay lines
-
-  - support for domain-based blacklists and TXT record queries
-
-  - dccifd support added
-
-  - Razor 1 support dropped
-
-Report improvements
-
-  - to reduce confusion, the default report now includes the hostname of the
-    machine where SpamAssassin is running and the installer also asks for an
-    administrative address or URL
-
-  - more flexible header and report rewriting including a simple template
-    system
-
-Other changes
-
-  - workaround for red hat kernel with NPTL reporting "application bug" in
-    spamd due to use of waitpid() when SIGCHLD is set to SIG_IGN
-
-  - taint mode is now enabled by default (for perl versions 5.6.0 and
-    higher) for extra security
-
-  - Makefile variables were changed to use DESTDIR instead of the various
-    INST_* variables.  Please read the PACKAGING file for more information.
-
-  - Lots of bugs fixed and new rules added. ;)
-
-  - timelog code has been removed
-
diff --git a/mail/spamassassin/files/change_summary.txt b/mail/spamassassin/files/change_summary.txt
new file mode 100644
index 00000000000..8dea4da0299
--- /dev/null
+++ b/mail/spamassassin/files/change_summary.txt
@@ -0,0 +1,56 @@
+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 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
-