Since osirusoft is dead now, we should remove all reference to it from

spamassassin.  These patches remove all references to osirusoft from
the rules files (perhaps leaving some of the comments a tad stale),
but leaving information about them in the stats files.

This bumps us to 2.55nb2.

1 files changed, 66 insertions, 0 deletions

diff --git a/mail/spamassassin/patches/patch-ah b/mail/spamassassin/patches/patch-ah
new file mode 100644
index 00000000000..59f81c0708b
--- /dev/null
+++ b/mail/spamassassin/patches/patch-ah
@@ -0,0 +1,66 @@
+$NetBSD: patch-ah,v 1.5 2003/09/03 13:08:05 atatat Exp $
+
+--- lib/Mail/SpamAssassin/Conf.pm.orig	2003-09-02 21:35:05.000000000 -0400
++++ lib/Mail/SpamAssassin/Conf.pm
+@@ -115,7 +115,6 @@ sub new {
+ 			    "dialups.mail-abuse.org." => "127.0.0.3",
+ 			   # For DUL + other codes, we ignore that it's on DUL
+ 			    "rbl-plus.mail-abuse.org." => "127.0.0.2",
+-			    "relays.osirusoft.com." => "127.0.0.3",
+ 			  };
+ 
+   $self->{num_check_received} = 2;
+@@ -1950,7 +1949,7 @@ Default:
+   { "dialups.mail-abuse.org." => "127.0.0.3", 
+   # For DUL + other codes, we ignore that it's on DUL
+     "rbl-plus.mail-abuse.org." => "127.0.0.2",
+-    "relays.osirusoft.com." => "127.0.0.3" };
++  };
+ 
+ WARNING!!! When passing a reference to a hash, you need to put the whole hash
+ in one line for the parser to read it correctly (you can check with
+@@ -1966,8 +1965,8 @@ on the originating hop
+ The idea is to not penalize (or penalize less) people who properly relayed
+ through their ISP's mail server
+ 
+-Here's an example showing the use of Osirusoft and MAPS DUL, as well as the use
+-of check_two_rbl_results to compensate for a match in both RBLs:
++Here's an example showing the use of MAPS DUL, as well as the use
++of check_two_rbl_results to compensate for a match in RBLs:
+ 
+  header RCVD_IN_DUL		rbleval:check_rbl('dialup', 'dialups.mail-abuse.org.')
+  describe RCVD_IN_DUL		Received from dialup, see http://www.mail-abuse.org/dul/
+@@ -1977,33 +1976,6 @@ of check_two_rbl_results to compensate f
+  describe X_RCVD_IN_DUL_FH	Received from first hop dialup, see http://www.mail-abuse.org/dul/
+  score X_RCVD_IN_DUL_FH		-3
+ 
+- header RCVD_IN_OSIRUSOFT_COM   rbleval:check_rbl('osirusoft', 'relays.osirusoft.com.')
+- describe RCVD_IN_OSIRUSOFT_COM Received via an IP flagged in relays.osirusoft.com
+-
+- header X_OSIRU_SPAM_SRC        rbleval:check_rbl_results_for('osirusoft', '127.0.0.4')
+- describe X_OSIRU_SPAM_SRC      DNSBL: sender is Confirmed Spam Source, penalizing further
+- score X_OSIRU_SPAM_SRC         3.0
+-
+- header X_OSIRU_SPAMWARE_SITE   rbleval:check_rbl_results_for('osirusoft', '127.0.0.6')
+- describe X_OSIRU_SPAMWARE_SITE DNSBL: sender is a Spamware site or vendor, penalizing further
+- score X_OSIRU_SPAMWARE_SITE    5.0
+-
+- header X_OSIRU_DUL_FH		rbleval:check_rbl('osirusoft-dul-firsthop', 'relays.osirusoft.com.')
+- describe X_OSIRU_DUL_FH	Received from first hop dialup listed in relays.osirusoft.com
+- score X_OSIRU_DUL_FH		-1.5
+-
+- header Z_FUDGE_DUL_MAPS_OSIRU	rblreseval:check_two_rbl_results('osirusoft', "127.0.0.3", 'dialup', "127.0.0.3")
+- describe Z_FUDGE_DUL_MAPS_OSIRU Do not double penalize for MAPS DUL and Osirusoft DUL
+- score Z_FUDGE_DUL_MAPS_OSIRU	-2
+-
+- header Z_FUDGE_RELAY_OSIRU	rblreseval:check_two_rbl_results('osirusoft', "127.0.0.2", 'relay', "127.0.0.2")
+- describe Z_FUDGE_RELAY_OSIRU	Do not double penalize for being an open relay on Osirusoft and another DNSBL
+- score Z_FUDGE_RELAY_OSIRU	-2
+- 
+- header Z_FUDGE_DUL_OSIRU_FH	rblreseval:check_two_rbl_results('osirusoft-dul-firsthop', "127.0.0.3", 'dialup-firsthop', "127.0.0.3")
+- describe Z_FUDGE_DUL_OSIRU_FH	Do not double compensate for MAPS DUL and Osirusoft DUL first hop dialup
+- score Z_FUDGE_DUL_OSIRU_FH	1.5
+- 
+ =cut
+ 
+     if (/^dialup_codes\s+(.*)$/) {