diff -urN Mail-SpamAssassin-2.55-orig/lib/Mail/SpamAssassin/Conf.pm Mail-SpamAssassin-2.55/lib/Mail/SpamAssassin/Conf.pm --- Mail-SpamAssassin-2.55-orig/lib/Mail/SpamAssassin/Conf.pm 2003-05-20 08:06:17.000000000 +0200 +++ Mail-SpamAssassin-2.55/lib/Mail/SpamAssassin/Conf.pm 2003-08-28 20:12:20.000000000 +0200 @@ -1949,8 +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" }; + "rbl-plus.mail-abuse.org." => "127.0.0.2" }; 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 @@ -2004,6 +2003,7 @@ 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 + Please note that Osirusoft quit the maintenance of their RBLs so the above serves only as an example. =cut if (/^dialup_codes\s+(.*)$/) { diff -urN Mail-SpamAssassin-2.55-orig/rules/20_head_tests.cf Mail-SpamAssassin-2.55/rules/20_head_tests.cf --- Mail-SpamAssassin-2.55-orig/rules/20_head_tests.cf 2003-05-12 21:15:34.000000000 +0200 +++ Mail-SpamAssassin-2.55/rules/20_head_tests.cf 2003-08-28 20:14:50.000000000 +0200 @@ -232,34 +232,6 @@ # Multizone / Multi meaning BLs first -# Osirusoft, like MAPS RBL+ is a multi-meaning BL, so it is treated separately -header RCVD_IN_OSIRUSOFT_COM rbleval:check_rbl('osirusoft', 'relays.osirusoft.com.') -describe RCVD_IN_OSIRUSOFT_COM Received via a relay in relays.osirusoft.com -tflags RCVD_IN_OSIRUSOFT_COM net - -# X prefix was used to insure that it was run at the end, but it's not needed -# anymore since we run the rule with rblreseval -- Marc -header X_OSIRU_OPEN_RELAY rbleval:check_rbl_results_for('osirusoft', '127.0.0.2') -describe X_OSIRU_OPEN_RELAY DNSBL: sender is Confirmed Open Relay -tflags X_OSIRU_OPEN_RELAY net - -header X_OSIRU_DUL rbleval:check_rbl_results_for('osirusoft', '127.0.0.3') -describe X_OSIRU_DUL DNSBL: sender ip address in in a dialup block -tflags X_OSIRU_DUL net - -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 -tflags X_OSIRU_SPAM_SRC net - -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 -tflags X_OSIRU_SPAMWARE_SITE net - -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 -tflags X_OSIRU_DUL_FH net nice - - # Now, single zone BLs follow: # the new first arg for check_rbl() indicates what type of check it is; # each type of check is stored in a separate set, and if an IP has already diff -urN Mail-SpamAssassin-2.55-orig/rules/30_text_de.cf Mail-SpamAssassin-2.55/rules/30_text_de.cf --- Mail-SpamAssassin-2.55-orig/rules/30_text_de.cf 2003-05-12 21:15:34.000000000 +0200 +++ Mail-SpamAssassin-2.55/rules/30_text_de.cf 2003-08-28 20:15:27.000000000 +0200 @@ -67,11 +67,8 @@ lang de describe SMTPD_IN_RCVD Empfangen von einem SMTPD32 Server (SMTPD32-n.n) lang de describe POST_IN_RCVD Empfangen von einem Relais mit gefaelschtem 'Post.cz' Hostname lang de describe RCVD_IN_RELAYS_ORDB_ORG Empfangen von einem Relais in der relays.ordb.org Liste -lang de describe RCVD_IN_OSIRUSOFT_COM Empfangen von einem Relais in der relays.osirusoft.com Liste lang de describe RCVD_IN_RFCI Empfangen von einem Relais in der ipwhois.rfc-ignorant.org Liste lang de describe RCVD_IN_ORBS Empfangen von einem Relais in der orbs.dorkslayers.com Liste -lang de describe X_OSIRU_SPAM_SRC Sender ist als Spammer bekannt -lang de describe X_OSIRU_SPAMWARE_SITE DNSBL: Sender ist eine Spamware-Site oder -Hersteller lang de describe RCVD_IN_RBL Empfangen von einem RBL-Relais, siehe http://www.mail-abuse.org/rbl/ lang de describe RCVD_IN_RSS Empfangen von einem RSS-Relais, siehe http://www.mail-abuse.org/rss/ lang de describe RCVD_IN_DUL Empfangen von einem Spam-Dialup, siehe http://www.mail-abuse.org/dul/ diff -urN Mail-SpamAssassin-2.55-orig/rules/30_text_es.cf Mail-SpamAssassin-2.55/rules/30_text_es.cf --- Mail-SpamAssassin-2.55-orig/rules/30_text_es.cf 2003-03-18 00:56:57.000000000 +0100 +++ Mail-SpamAssassin-2.55/rules/30_text_es.cf 2003-08-28 20:15:15.000000000 +0200 @@ -55,9 +55,6 @@ lang es describe SMTPD_IN_RCVD Received del servidor SMTPD32 (SMTPD32-n.n) lang es describe POST_IN_RCVD Received contene el nombre falso 'Post.cz' lang es describe RCVD_IN_RELAYS_ORDB_ORG Recibido de un relay en relays.ordb.org -lang es describe RCVD_IN_OSIRUSOFT_COM Recibido de un relay en relays.osirusoft.com -lang es describe X_OSIRU_SPAM_SRC Osirusoft.com: el remitente es Confirmada Fuente de Spam -lang es describe X_OSIRU_SPAMWARE_SITE Osirusoft.com: el remitente es un sitio afin al Spame o vendedor lang es describe RCVD_IN_RBL Recibido desde un RBLed relay, visite http://www.mail-abuse.org/rbl/ lang es describe RCVD_IN_RSS Recibido desde RSSed relay, visite http://www.mail-abuse.org/rss/ lang es describe RCVD_IN_DUL Recibido desde dialup, visite http://www.mail-abuse.org/dul/ diff -urN Mail-SpamAssassin-2.55-orig/rules/30_text_fr.cf Mail-SpamAssassin-2.55/rules/30_text_fr.cf --- Mail-SpamAssassin-2.55-orig/rules/30_text_fr.cf 2003-05-12 21:15:34.000000000 +0200 +++ Mail-SpamAssassin-2.55/rules/30_text_fr.cf 2003-08-28 20:13:41.000000000 +0200 @@ -282,7 +282,6 @@ lang fr describe RCVD_IN_DUL Ce mèl a été reçu par l'intermédiaire d'un relai qui figure dans la liste dialup, voir http://www.mail-abuse.org/ lang fr describe RCVD_IN_ORBS Ce mèl a été reçu par l'intermédiaire d'un relai qui figure dans la liste orbs.dorkslayers.com # lang fr describe RCVD_IN_ORBZ -lang fr describe RCVD_IN_OSIRUSOFT_COM Ce mèl a été reçu par l'intermédiaire d'un relai qui figure dans la liste relays.osirusoft.com lang fr describe RCVD_IN_RBL Ce mèl a été reçu par l'intermédiaire d'un relai qui figure dans la liste RBL, voir http://www.mail-abuse.org/ lang fr describe RCVD_IN_RELAYS_ORDB_ORG Ce mèl a été reçu par l'intermédiaire d'un relai qui figure dans la liste rrelays.ordb.com lang fr describe RCVD_IN_RFCI Ce mèl a été reçu par l'intermédiaire d'un relai qui figure dans la liste ipwhois.rfc-ignorant.org @@ -344,8 +343,6 @@ lang fr describe WWW_CLIK4YOU_COM Expression fréquement trouvée dans du spam lang fr describe X_MAILER_GIBBERISH L'entête X-Mailer: contient des informations incompréhensibles lang fr describe X_MSMAIL_PRIORITY_HIGH L'entête X-Msmail-Priority: défini une priorité élevée -lang fr describe X_OSIRU_SPAMWARE_SITE L'expéditeur est un spameur selon DNSBL -lang fr describe X_OSIRU_SPAM_SRC L'expéditeur est décidément un spameur selon DNSBL lang fr describe X_PMFLAGS_PRESENT Contient l'entête X-PMFLAGS: en majuscules lang fr describe X_PRIORITY_HIGH L'entête X-Priority: défini une priorité élevée lang fr describe YAHOO_MSGID_ADDED L'entête message-Id: a été ajouté par Yahoo, c'est bon diff -urN Mail-SpamAssassin-2.55-orig/rules/30_text_it.cf Mail-SpamAssassin-2.55/rules/30_text_it.cf --- Mail-SpamAssassin-2.55-orig/rules/30_text_it.cf 2003-05-12 21:15:34.000000000 +0200 +++ Mail-SpamAssassin-2.55/rules/30_text_it.cf 2003-08-28 20:14:28.000000000 +0200 @@ -150,7 +150,6 @@ lang it describe RCVD_IN_BL_SPAMCOP_NET Ricevuto tramite un relay presente in bl.spamcom.net lang it describe RCVD_IN_DUL Ricevuto tramite un dialup spammer, visitare http://www.mail-abuse.org/dul/ lang it describe RCVD_IN_ORBS Ricevuto tramite un relay presente in orbs.dorkslayers.com -lang it describe RCVD_IN_OSIRUSOFT_COM Ricevuto tramite un relay presente in relays.osirusoft.com lang it describe RCVD_IN_RBL Ricevuto tramite un relay RBL, visitare http://www.mail-abuse.org/rbl/ lang it describe RCVD_IN_RELAYS_ORDB_ORG Ricevuto tramite un relay presente in relays.ordb.org lang it describe RCVD_IN_RFCI Ricevuto tramite un relay presente in ipwhois.rfc-ignorant.org @@ -210,8 +209,6 @@ lang it describe WWW_CLIK4YOU_COM Contiene frase usata nello spam lang it describe X_MAILER_GIBBERISH L'header X-Mailer: contiene caratteri senza senso lang it describe X_MSMAIL_PRIORITY_HIGH L'header X-Msmail-Priority: definisce una priorità elevata -lang it describe X_OSIRU_SPAMWARE_SITE Il mittente è un sito Spamware -lang it describe X_OSIRU_SPAM_SRC Il mittente è indicato da DNSBL come spammer lang it describe X_PMFLAGS_PRESENT Presente l'header X-PMFLAGS: (maiuscolo) lang it describe X_PRIORITY_HIGH Messaggio ad alta priorità lang it describe YAHOO_MSGID_ADDED Il Message-Id è stato aggiunto da Yahoo!, e ciò è cosa buona diff -urN Mail-SpamAssassin-2.55-orig/rules/30_text_pl.cf Mail-SpamAssassin-2.55/rules/30_text_pl.cf --- Mail-SpamAssassin-2.55-orig/rules/30_text_pl.cf 2003-03-18 00:56:57.000000000 +0100 +++ Mail-SpamAssassin-2.55/rules/30_text_pl.cf 2003-08-28 20:13:58.000000000 +0200 @@ -57,9 +57,6 @@ lang pl describe SMTPD_IN_RCVD Odebrano od serwera SMTPD32 (SMTPD32-n.n) lang pl describe POST_IN_RCVD Received zawiera oszukan± domene: 'Post.cz' lang pl describe RCVD_IN_RELAYS_ORDB_ORG Odebrane od zablokowanego nadawcy w/g: relays.ordb.org -lang pl describe RCVD_IN_OSIRUSOFT_COM Odebrane od zablokowanego nadawcy w/g: relays.osirusoft.com -lang pl describe X_OSIRU_SPAM_SRC Osirusoft.com: nadawca jest potwierdzonym Spamerem. -lang pl describe X_OSIRU_SPAMWARE_SITE Osirusoft.com: nadawca jest Spamerem lub producentem. lang pl describe RCVD_IN_RBL Odebrane od zablokowanego systemu, w/g http://www.mail-abuse.org/rbl/ lang pl describe RCVD_IN_RSS Odebrane od zablokowanego systemu, w/g http://www.mail-abuse.org/rss/ lang pl describe RCVD_IN_DUL Odebrane od dial-up'a, w/g http://www.mail-abuse.org/dul/ diff -urN Mail-SpamAssassin-2.55-orig/rules/50_scores.cf Mail-SpamAssassin-2.55/rules/50_scores.cf --- Mail-SpamAssassin-2.55-orig/rules/50_scores.cf 2003-05-12 21:15:36.000000000 +0200 +++ Mail-SpamAssassin-2.55/rules/50_scores.cf 2003-08-28 20:13:01.000000000 +0200 @@ -923,12 +923,6 @@ # score RCVD_IN_RELAYS_ORDB_ORG 0.0 -score RCVD_IN_OSIRUSOFT_COM 0.0 0.552 0.0 0.864 -score X_OSIRU_DUL 0.0 -score X_OSIRU_DUL_FH 0.0 -score X_OSIRU_OPEN_RELAY 0.0 2.900 0.0 0.0 -score X_OSIRU_SPAMWARE_SITE 0.0 1.101 0.0 0.0 -score X_OSIRU_SPAM_SRC 0.0 score RCVD_IN_RFCI 0.0 1.448 0.0 1.092 score RCVD_IN_ORBS 0.0 0.499 0.0 0.114 score RCVD_IN_DSBL 0.0 2.574 0.0 4.295 diff -urN Mail-SpamAssassin-2.55-orig/rules/STATISTICS-set1.txt Mail-SpamAssassin-2.55/rules/STATISTICS-set1.txt --- Mail-SpamAssassin-2.55-orig/rules/STATISTICS-set1.txt 2003-05-12 21:15:36.000000000 +0200 +++ Mail-SpamAssassin-2.55/rules/STATISTICS-set1.txt 2003-08-28 20:13:23.000000000 +0200 @@ -160,7 +160,6 @@ 7.353 13.7696 0.0000 1.000 0.96 4.40 MSGID_SPAMSIGN_6LETTER 6.304 11.8054 0.0000 1.000 0.95 4.30 MIME_ODD_CASE 5.071 0.0000 10.8823 0.000 0.95 -2.49 USER_AGENT_MUTT - 7.398 13.8354 0.0210 0.998 0.95 0.00 X_OSIRU_SPAMWARE_SITE 4.964 9.2949 0.0012 1.000 0.95 4.30 SUBJ_FULL_OF_8BITS 4.783 8.9558 0.0000 1.000 0.95 4.30 MSGID_SPAMSIGN_ZEROES 4.988 0.0140 10.6880 0.001 0.95 0.00 USER_AGENT_KMAIL @@ -233,7 +232,6 @@ 0.257 0.4816 0.0000 1.000 0.94 2.90 NOT_INTENDED 0.254 0.4751 0.0000 1.000 0.94 2.90 HTML_SHOUTING6 0.804 0.0011 1.7250 0.001 0.94 0.00 DEBIAN_BTS_BUG - 0.248 0.4643 0.0000 1.000 0.94 0.00 X_OSIRU_OPEN_RELAY 0.230 0.4298 0.0000 1.000 0.94 2.90 FROM_NUM_AT_WEBMAIL 0.962 1.8011 0.0012 0.999 0.94 2.65 FORGED_MUA_AOL 0.227 0.4244 0.0000 1.000 0.94 2.90 MIME_BOUND_OPTIN @@ -866,7 +864,6 @@ 3.342 5.5372 0.8266 0.870 0.63 0.29 DATE_IN_PAST_03_06 0.031 0.0508 0.0074 0.872 0.62 2.20 DATE_IN_FUTURE_48_96 3.817 6.2941 0.9776 0.866 0.62 0.00 UNSUB_PAGE - 32.620 51.8022 10.6361 0.830 0.61 0.55 RCVD_IN_OSIRUSOFT_COM 0.212 0.0605 0.3849 0.136 0.61 0.00 HTML_COMMENT_EGP 0.569 0.9329 0.1510 0.861 0.60 0.00 ASCII_FORM_ENTRY 0.204 0.3337 0.0544 0.860 0.60 0.15 URGENT_BIZ @@ -899,7 +896,6 @@ 2.881 4.3905 1.1521 0.792 0.47 1.24 UPPERCASE_25_50 0.903 1.3703 0.3675 0.789 0.46 0.00 GREAT_OFFER 0.528 0.7990 0.2178 0.786 0.46 0.00 EARN_PER_WEEK - 2.981 1.3789 4.8175 0.223 0.45 0.00 X_OSIRU_DUL_FH 0.081 0.1220 0.0346 0.779 0.44 0.00 INCREASE_SOMETHING 0.006 0.0086 0.0025 0.777 0.44 0.00 CONFIDENTIAL_ORDER 0.003 0.0043 0.0012 0.777 0.44 0.00 AUTO_EMAIL_REMOVAL @@ -929,7 +925,6 @@ 0.250 0.3153 0.1757 0.642 0.25 0.00 DATE_IN_FUTURE_96_XX 0.002 0.0022 0.0012 0.636 0.24 0.00 IN_ACCORDANCE_WITH_LAWS 0.684 0.7883 0.5655 0.582 0.19 0.00 US_DOLLARS_2 - 1.138 1.2666 0.9912 0.561 0.17 0.00 X_OSIRU_DUL 0.338 0.3661 0.3069 0.544 0.15 0.00 DATE_IN_PAST_48_96 0.000 0.0000 0.0000 0.500 0.12 0.00 RAZOR2_CF_RANGE_51_60 0.000 0.0000 0.0000 0.500 0.12 0.00 RCVD_IN_RBL @@ -948,7 +943,6 @@ 0.000 0.0000 0.0000 0.500 0.12 0.00 SMIME_SIGNATURE 0.000 0.0000 0.0000 0.500 0.12 0.00 INTL_EXEC_GUILD 0.000 0.0000 0.0000 0.500 0.12 0.00 BAYES_56 - 0.000 0.0000 0.0000 0.500 0.12 0.00 X_OSIRU_SPAM_SRC 0.000 0.0000 0.0000 0.500 0.12 0.00 BAYES_50 0.000 0.0000 0.0000 0.500 0.12 0.00 BAYES_99 0.000 0.0000 0.0000 0.500 0.12 0.00 RAZOR2_CF_RANGE_31_40 diff -urN Mail-SpamAssassin-2.55-orig/rules/STATISTICS-set3.txt Mail-SpamAssassin-2.55/rules/STATISTICS-set3.txt --- Mail-SpamAssassin-2.55-orig/rules/STATISTICS-set3.txt 2003-05-12 21:15:36.000000000 +0200 +++ Mail-SpamAssassin-2.55/rules/STATISTICS-set3.txt 2003-08-28 20:14:15.000000000 +0200 @@ -734,7 +734,6 @@ 1.194 2.5755 0.1478 0.946 0.79 0.00 FOR_JUST_SOME_AMT 4.389 9.4141 0.5831 0.942 0.79 0.32 HTML_FONT_FACE_ODD 5.820 12.4519 0.7987 0.940 0.79 0.10 HTML_FONT_COLOR_GRAY - 0.676 1.4574 0.0839 0.946 0.79 0.00 X_OSIRU_OPEN_RELAY 1.376 2.9622 0.1744 0.944 0.79 0.00 WEIRD_PORT 7.953 16.9330 1.1528 0.936 0.79 0.10 HTML_60_70 1.755 0.1776 2.9487 0.057 0.79 -0.40 X_AUTH_WARNING @@ -841,7 +840,6 @@ 0.758 1.4925 0.2023 0.881 0.64 0.56 DATE_IN_PAST_96_XX 2.608 5.1087 0.7149 0.877 0.64 0.06 DATE_IN_PAST_06_12 0.233 0.4571 0.0626 0.880 0.64 0.52 SEE_FOR_YOURSELF - 4.467 8.6915 1.2687 0.873 0.63 0.00 X_OSIRU_SPAMWARE_SITE 2.043 3.9819 0.5751 0.874 0.63 0.00 HTML_TITLE_EMPTY 0.689 1.3466 0.1917 0.875 0.63 0.00 HTML_IMAGE_RATIO_10 1.991 3.8711 0.5671 0.872 0.63 0.00 EXCUSE_16 @@ -863,7 +861,6 @@ 2.237 4.2350 0.7242 0.854 0.59 0.00 LINES_OF_YELLING_3 0.087 0.0229 0.1358 0.144 0.59 -0.14 USER_AGENT_GNUS_XM 0.042 0.0791 0.0133 0.856 0.59 0.00 HTML_IMAGE_AREA_07 - 29.719 53.1952 11.9424 0.817 0.58 0.86 RCVD_IN_OSIRUSOFT_COM 1.873 3.5195 0.6257 0.849 0.58 0.00 MISSING_HEADERS 2.974 5.5711 1.0077 0.847 0.58 0.27 DATE_IN_PAST_03_06 0.341 0.0932 0.5285 0.150 0.57 0.00 HTML_COMMENT_EGP @@ -898,7 +895,6 @@ 0.133 0.0563 0.1917 0.227 0.43 0.00 RESENT_TO 0.011 0.0176 0.0053 0.768 0.42 0.00 NEW_CUSTOMER 20.664 32.6741 11.5696 0.739 0.42 1.15 NO_REAL_NAME - 3.268 1.4750 4.6260 0.242 0.41 0.00 X_OSIRU_DUL_FH 0.398 0.6487 0.2077 0.757 0.41 0.34 MSGID_CHARS_SPAM 0.064 0.1037 0.0333 0.757 0.41 1.80 X_GCMULTI 0.099 0.1617 0.0519 0.757 0.41 0.00 INCREASE_SOMETHING @@ -955,7 +951,6 @@ 0.000 0.0000 0.0000 0.500 0.12 0.00 WWW_CLIK4YOU_COM 0.000 0.0000 0.0000 0.500 0.12 0.00 DISCONTINUE 0.000 0.0000 0.0000 0.500 0.12 4.50 TOO_MANY_MUA - 0.000 0.0000 0.0000 0.500 0.12 0.00 X_OSIRU_SPAM_SRC 0.000 0.0000 0.0000 0.500 0.12 0.00 SUBJ_RIPPED 0.000 0.0000 0.0000 0.500 0.12 0.00 HTML_IMAGE_AREA_09 0.000 0.0000 0.0000 0.500 0.12 0.00 RATWARE_DIFFOND @@ -974,7 +969,6 @@ 0.000 0.0000 0.0000 0.500 0.12 0.00 INTL_EXEC_GUILD 0.000 0.0000 0.0000 0.500 0.12 0.00 HOTMAIL_FOOTER2 0.000 0.0000 0.0000 0.500 0.12 0.00 HOTMAIL_FOOTER3 - 1.528 1.4257 1.6055 0.470 0.10 0.00 X_OSIRU_DUL 6.557 3.2101 9.0922 0.261 0.02 0.00 RCVD_IN_MULTIHOP_DSBL 0.070 0.0352 0.0972 0.266 0.02 0.00 BAD_HELO_WARNING 0.001 0.0000 0.0013 0.000 0.00 0.00 IN_ACCORDANCE_WITH_LAWS