Remove DNSBL rules using *.easynet.nl (shut down today, see http://abuse.easynet.nl/dynablocker.html

5 files changed, 47 insertions, 3 deletions

diff --git a/mail/spamassassin/Makefile b/mail/spamassassin/Makefile
index 70345b3a2cb..73b5adb0c8d 100644
--- a/mail/spamassassin/Makefile
+++ b/mail/spamassassin/Makefile
@@ -1,8 +1,8 @@
-# $NetBSD: Makefile,v 1.35 2003/11/12 03:39:41 jschauma Exp $
+# $NetBSD: Makefile,v 1.36 2003/12/01 16:04:40 heinz Exp $
 
 DISTNAME=	Mail-SpamAssassin-2.60
 PKGNAME=	spamassassin-2.60
-PKGREVISION=	1
+PKGREVISION=	2
 SVR4_PKGNAME=	sa
 CATEGORIES=	mail
 MASTER_SITES=	${MASTER_SITE_PERL_CPAN:=Mail/}			\
diff --git a/mail/spamassassin/distinfo b/mail/spamassassin/distinfo
index 8696f863c3e..db8e247992c 100644
--- a/mail/spamassassin/distinfo
+++ b/mail/spamassassin/distinfo
@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.17 2003/11/03 00:56:26 heinz Exp $
+$NetBSD: distinfo,v 1.18 2003/12/01 16:04:40 heinz Exp $
 
 SHA1 (Mail-SpamAssassin-2.60.tar.gz) = 5d42b39430da13443dd94e78a2dad6c2b1c7cb5a
 Size (Mail-SpamAssassin-2.60.tar.gz) = 963215 bytes
@@ -7,3 +7,6 @@ SHA1 (patch-ae) = e87cdced71467baccdc1b6b837a350c6fa7e596f
 SHA1 (patch-ak) = 1b4669ec7ba136234c7d4be73e7ddfedab523be8
 SHA1 (patch-al) = 75c22289726d3c7e39834cd164ca9f2220969e9e
 SHA1 (patch-aq) = c8401a1e609707754b781a98358b2dd93638840e
+SHA1 (patch-ar) = afbe3fa1c9c6ce4fe6df1f006d784d90de67ff13
+SHA1 (patch-as) = 80363811bd1b2a8cba6d579e1a5534c001fdd238
+SHA1 (patch-at) = d0c2f35536c5b66c9d5de688d104209176249c41
diff --git a/mail/spamassassin/patches/patch-ar b/mail/spamassassin/patches/patch-ar
new file mode 100644
index 00000000000..039542fe25b
--- /dev/null
+++ b/mail/spamassassin/patches/patch-ar
@@ -0,0 +1,12 @@
+$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
new file mode 100644
index 00000000000..202ff72ba8a
--- /dev/null
+++ b/mail/spamassassin/patches/patch-as
@@ -0,0 +1,12 @@
+$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
new file mode 100644
index 00000000000..c4e7688f1e2
--- /dev/null
+++ b/mail/spamassassin/patches/patch-at
@@ -0,0 +1,17 @@
+$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
+