pkgsrc-Changes-HG archive
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]
[pkgsrc/trunk]: pkgsrc/mail/spamassassin Since osirusoft is dead now, we shou...
details: https://anonhg.NetBSD.org/pkgsrc/rev/488c72e2b03f
branches: trunk
changeset: 460719:488c72e2b03f
user: atatat <atatat%pkgsrc.org@localhost>
date: Wed Sep 03 13:08:04 2003 +0000
description:
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.
diffstat:
mail/spamassassin/Makefile | 4 +-
mail/spamassassin/distinfo | 10 +++++-
mail/spamassassin/patches/patch-ah | 66 ++++++++++++++++++++++++++++++++++++++
mail/spamassassin/patches/patch-ai | 41 +++++++++++++++++++++++
mail/spamassassin/patches/patch-aj | 16 +++++++++
mail/spamassassin/patches/patch-ak | 14 ++++++++
mail/spamassassin/patches/patch-al | 21 ++++++++++++
mail/spamassassin/patches/patch-am | 21 ++++++++++++
mail/spamassassin/patches/patch-an | 14 ++++++++
mail/spamassassin/patches/patch-ao | 17 +++++++++
10 files changed, 221 insertions(+), 3 deletions(-)
diffs (278 lines):
diff -r ca34d53eac3a -r 488c72e2b03f mail/spamassassin/Makefile
--- a/mail/spamassassin/Makefile Wed Sep 03 12:36:55 2003 +0000
+++ b/mail/spamassassin/Makefile Wed Sep 03 13:08:04 2003 +0000
@@ -1,8 +1,8 @@
-# $NetBSD: Makefile,v 1.24 2003/07/21 16:56:56 martti Exp $
+# $NetBSD: Makefile,v 1.25 2003/09/03 13:08:04 atatat Exp $
DISTNAME= Mail-SpamAssassin-2.55
PKGNAME= spamassassin-2.55
-PKGREVISION= 1
+PKGREVISION= 2
SVR4_PKGNAME= sa
CATEGORIES= mail
MASTER_SITES= ${MASTER_SITE_PERL_CPAN:=Mail/} \
diff -r ca34d53eac3a -r 488c72e2b03f mail/spamassassin/distinfo
--- a/mail/spamassassin/distinfo Wed Sep 03 12:36:55 2003 +0000
+++ b/mail/spamassassin/distinfo Wed Sep 03 13:08:04 2003 +0000
@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.15 2003/06/08 01:11:38 heinz Exp $
+$NetBSD: distinfo,v 1.16 2003/09/03 13:08:05 atatat Exp $
SHA1 (Mail-SpamAssassin-2.55.tar.gz) = 35aa4f2264694b656154ed5732e4ffecde08c76a
Size (Mail-SpamAssassin-2.55.tar.gz) = 700610 bytes
@@ -9,4 +9,12 @@
SHA1 (patch-ae) = d0f709a8c664481023be93a874afa4033ed4736c
SHA1 (patch-af) = 1c7a1c1490515c8d9c34c8dfddc3b11d87f4c700
SHA1 (patch-ag) = 89d0459d2234ed9333ef2e1a31a619a184250f29
+SHA1 (patch-ah) = 810e0eb865774d63181a29ccc031d4c15924b750
+SHA1 (patch-ai) = 736bff61ab2b9a87d36bc69acbc86f33fa4edf0d
+SHA1 (patch-aj) = 56f47fc996636114e319e62672cbdd5fa3d6a04d
+SHA1 (patch-ak) = b27761cc977c17eb64da216c7927d75fe3f86459
+SHA1 (patch-al) = a5d0512e60e31778d7c93cc6167102eb0ee6cc1d
+SHA1 (patch-am) = 77414a49041b8b4763c7789be3a28ce7415ec008
+SHA1 (patch-an) = 2d3fea38aa8fa04aff24b1eed0c61ee16072cd0a
+SHA1 (patch-ao) = 6bde456f5fddefc60d4f4e9b61b86d7e7eb3a96f
SHA1 (patch-ap) = 97837a522b94cd365b23ce731d49c4f0aaecbdf2
diff -r ca34d53eac3a -r 488c72e2b03f mail/spamassassin/patches/patch-ah
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/mail/spamassassin/patches/patch-ah Wed Sep 03 13:08:04 2003 +0000
@@ -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+(.*)$/) {
diff -r ca34d53eac3a -r 488c72e2b03f mail/spamassassin/patches/patch-ai
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/mail/spamassassin/patches/patch-ai Wed Sep 03 13:08:04 2003 +0000
@@ -0,0 +1,41 @@
+$NetBSD: patch-ai,v 1.3 2003/09/03 13:08:06 atatat Exp $
+
+--- rules/20_head_tests.cf.orig 2003-05-12 15:15:34.000000000 -0400
++++ rules/20_head_tests.cf
+@@ -230,36 +230,6 @@ describe FAKED_IP_IN_RCVD Received: cont
+ header SMTPD_IN_RCVD Received =~ /\(SMTPD32-\d+\..+\)/
+ describe SMTPD_IN_RCVD Received via SMTPD32 server (SMTPD32-n.n)
+
+-# 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 -r ca34d53eac3a -r 488c72e2b03f mail/spamassassin/patches/patch-aj
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/mail/spamassassin/patches/patch-aj Wed Sep 03 13:08:04 2003 +0000
@@ -0,0 +1,16 @@
+$NetBSD: patch-aj,v 1.3 2003/09/03 13:08:06 atatat Exp $
+
+--- rules/30_text_de.cf.orig 2003-05-12 15:15:34.000000000 -0400
++++ rules/30_text_de.cf
+@@ -67,11 +67,8 @@ lang de describe FAKED_IP_IN_RCVD
+ 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 -r ca34d53eac3a -r 488c72e2b03f mail/spamassassin/patches/patch-ak
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/mail/spamassassin/patches/patch-ak Wed Sep 03 13:08:04 2003 +0000
@@ -0,0 +1,14 @@
+$NetBSD: patch-ak,v 1.3 2003/09/03 13:08:06 atatat Exp $
+
+--- rules/30_text_es.cf.orig 2003-03-17 18:56:57.000000000 -0500
++++ rules/30_text_es.cf
+@@ -55,9 +55,6 @@ lang es describe MDAEMON_2_7_4 Received
+ 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 -r ca34d53eac3a -r 488c72e2b03f mail/spamassassin/patches/patch-al
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/mail/spamassassin/patches/patch-al Wed Sep 03 13:08:04 2003 +0000
@@ -0,0 +1,21 @@
+$NetBSD: patch-al,v 1.3 2003/09/03 13:08:07 atatat Exp $
+
+--- rules/30_text_fr.cf.orig 2003-05-12 15:15:34.000000000 -0400
++++ rules/30_text_fr.cf
+@@ -282,7 +282,6 @@ lang fr describe RCVD_IN_BL_SPAMCOP_NET
+ 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 WORK_AT_HOME Contient
+ 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 -r ca34d53eac3a -r 488c72e2b03f mail/spamassassin/patches/patch-am
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/mail/spamassassin/patches/patch-am Wed Sep 03 13:08:04 2003 +0000
@@ -0,0 +1,21 @@
+$NetBSD: patch-am,v 1.3 2003/09/03 13:08:07 atatat Exp $
+
+--- rules/30_text_it.cf.orig 2003-05-12 15:15:34.000000000 -0400
++++ rules/30_text_it.cf
+@@ -150,7 +150,6 @@ lang it describe RAZOR_CHECK Email pr
+ 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 WORK_AT_HOME Contiene
+ 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 -r ca34d53eac3a -r 488c72e2b03f mail/spamassassin/patches/patch-an
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/mail/spamassassin/patches/patch-an Wed Sep 03 13:08:04 2003 +0000
@@ -0,0 +1,14 @@
+$NetBSD: patch-an,v 1.3 2003/09/03 13:08:07 atatat Exp $
+
+--- rules/30_text_pl.cf.orig 2003-03-17 18:56:57.000000000 -0500
++++ rules/30_text_pl.cf
+@@ -57,9 +57,6 @@ lang pl describe MDAEMON_2_7_4 Odebrano
+ 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 -r ca34d53eac3a -r 488c72e2b03f mail/spamassassin/patches/patch-ao
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/mail/spamassassin/patches/patch-ao Wed Sep 03 13:08:04 2003 +0000
@@ -0,0 +1,17 @@
+$NetBSD: patch-ao,v 1.3 2003/09/03 13:08:08 atatat Exp $
+
+--- rules/50_scores.cf.orig 2003-05-12 15:15:36.000000000 -0400
++++ rules/50_scores.cf
+@@ -923,12 +923,6 @@ score PYZOR_CHECK 0.0 4.400 0.0 1.211
+ #
+
+ 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
Home |
Main Index |
Thread Index |
Old Index