From commits-return-eellis@example.org Wed Feb 02 06:04:17 2005 Return-Path: <commits-return-eellis@example.org> Delivered-To: eellis@example.org Received: (qmail 37558 invoked from network); 2 Feb 2005 06:04:17 -0000 Received: from hermes.apache.org (HELO mail.apache.org) (83.161.120.155) by minotaur-2.apache.org with SMTP; 2 Feb 2005 06:04:17 -0000 Received: (qmail 3345 invoked by uid 500); 2 Feb 2005 06:04:16 -0000 Delivered-To: eellis@example.org Received: (qmail 3315 invoked by uid 500); 2 Feb 2005 06:04:16 -0000 Mailing-List: contact eellis@example.org; run by ezmlm Precedence: bulk list-help: <mailto:eellis@example.org> list-unsubscribe: <mailto:eellis@example.org> list-post: <mailto:eellis@example.org> Reply-To: "SpamAssassin Dev" <eellis@example.org> List-Id: <commits.spamassassin.apache.org> Delivered-To: mailing list eellis@example.org Received: (qmail 3300 invoked by uid 99); 2 Feb 2005 06:04:16 -0000 X-ASF-Spam-Status: No, hits=-9.8 required=10.0 tests=ALL_TRUSTED,NO_REAL_NAME X-Spam-Check-By: apache.org Received: from minotaur.apache.org (HELO minotaur.apache.org) (83.161.120.155) by apache.org (qpsmtpd/0.28) with SMTP; Tue, 01 Feb 2005 22:04:16 -0800 Received: (qmail 37532 invoked by uid 65534); 2 Feb 2005 06:04:15 -0000 Message-ID: <eellis@example.org> Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable X-Mailer: svnmailer-1.0.0-dev Date: Wed, 02 Feb 2005 06:04:14 -0000 Subject: svn commit: r149489 - spamassassin/trunk/lib/Mail/SpamAssassin/Plugin/DCC.pm To: eellis@example.org From: eellis@example.org X-Virus-Checked: Checked X-Spam-Rating: minotaur-2.apache.org 1.6.2 0/1000/N Author: quinlan Date: Tue Feb 1 22:04:13 2005 New Revision: 149489 URL: http://svn.apache.org/viewcvs?view=3Drev&rev=3D149489 Log: fix possible undef value, slight code simplification Modified: spamassassin/trunk/lib/Mail/SpamAssassin/Plugin/DCC.pm Modified: spamassassin/trunk/lib/Mail/SpamAssassin/Plugin/DCC.pm URL: http://svn.apache.org/viewcvs/spamassassin/trunk/lib/Mail/SpamAssassin= /Plugin/DCC.pm?view=3Ddiff&r1=3D149488&r2=3D149489 =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D --- spamassassin/trunk/lib/Mail/SpamAssassin/Plugin/DCC.pm (original) +++ spamassassin/trunk/lib/Mail/SpamAssassin/Plugin/DCC.pm Tue Feb 1 22:04= :13 2005 @@ -63,12 +63,12 @@ =20 # are network tests enabled? if ($mailsaobject->{local_tests_only}) { - $self->{dcc_available} =3D 0; + $self->{dcc_disabled} =3D 1; dbg("dcc: local tests only, disabling DCC"); } else { - $self->{dcc_available} =3D 1; - dbg("dcc: network tests on, attempting DCC"); + $self->{dcc_disabled} =3D 0; + dbg("dcc: network tests on, registering DCC"); } =20 $self->register_eval_rule("check_dcc"); @@ -269,8 +269,7 @@ =20 if (!$self->{main}->{conf}->{use_dcc}) { dbg("dcc: use_dcc option not enabled, disabling DCC"); - $self->{dcc_interface} =3D "disabled"; - $self->{dcc_available} =3D 0; + $self->{dcc_disabled} =3D 1; } elsif ($self->is_dccifd_available()) { $self->{dcc_interface} =3D "dccifd"; @@ -280,16 +279,15 @@ } else { dbg("dcc: no dccifd or dccproc found, disabling DCC"); - $self->{dcc_interface} =3D "none"; - $self->{dcc_available} =3D 0; + $self->{dcc_disabled} =3D 1; } } =20 sub check_dcc { my ($self, $permsgstatus, $full) =3D @_; =20 + return 0 if $self->{dcc_disabled}; $self->get_dcc_interface() unless $self->{dcc_interface}; - return 0 unless $self->{dcc_available}; =20 # First check if there's already a X-DCC header with value of "bulk" # and short-circuit if there is -- someone upstream might already have @@ -552,8 +550,7 @@ sub plugin_report { my ($self, $options) =3D @_; =20 - return unless $self->{dcc_available}; - return unless $self->{main}->{conf}->{use_dcc}; + return if $self->{dcc_disabled}; =20 if (!$self->{options}->{dont_report_to_dcc} && $self->is_dccproc_availab= le()) { From commits-return-eellis@example.org Wed Feb 02 08:04:59 2005 Return-Path: <commits-return-eellis@example.org> Delivered-To: eellis@example.org Received: (qmail 82993 invoked from network); 2 Feb 2005 08:04:58 -0000 Received: from hermes.apache.org (HELO mail.apache.org) (83.161.120.155) by minotaur-2.apache.org with SMTP; 2 Feb 2005 08:04:58 -0000 Received: (qmail 43864 invoked by uid 500); 2 Feb 2005 08:04:58 -0000 Delivered-To: eellis@example.org Received: (qmail 43836 invoked by uid 500); 2 Feb 2005 08:04:58 -0000 Mailing-List: contact eellis@example.org; run by ezmlm Precedence: bulk list-help: <mailto:eellis@example.org> list-unsubscribe: <mailto:eellis@example.org> list-post: <mailto:eellis@example.org> Reply-To: "SpamAssassin Dev" <eellis@example.org> List-Id: <commits.spamassassin.apache.org> Delivered-To: mailing list eellis@example.org Received: (qmail 43822 invoked by uid 99); 2 Feb 2005 08:04:58 -0000 X-ASF-Spam-Status: No, hits=-9.8 required=10.0 tests=ALL_TRUSTED,NO_REAL_NAME X-Spam-Check-By: apache.org Received: from minotaur.apache.org (HELO minotaur.apache.org) (83.161.120.155) by apache.org (qpsmtpd/0.28) with SMTP; Wed, 02 Feb 2005 00:04:57 -0800 Received: (qmail 82951 invoked by uid 65534); 2 Feb 2005 08:04:56 -0000 Message-ID: <eellis@example.org> Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable X-Mailer: svnmailer-1.0.0-dev Date: Wed, 02 Feb 2005 08:04:56 -0000 Subject: svn commit: r149495 - spamassassin/trunk/lib/Mail/SpamAssassin/Plugin/DCC.pm To: eellis@example.org From: eellis@example.org X-Virus-Checked: Checked X-Spam-Rating: minotaur-2.apache.org 1.6.2 0/1000/N Author: quinlan Date: Wed Feb 2 00:04:55 2005 New Revision: 149495 URL: http://svn.apache.org/viewcvs?view=3Drev&rev=3D149495 Log: some more cleanup Modified: spamassassin/trunk/lib/Mail/SpamAssassin/Plugin/DCC.pm Modified: spamassassin/trunk/lib/Mail/SpamAssassin/Plugin/DCC.pm URL: http://svn.apache.org/viewcvs/spamassassin/trunk/lib/Mail/SpamAssassin= /Plugin/DCC.pm?view=3Ddiff&r1=3D149494&r2=3D149495 =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D --- spamassassin/trunk/lib/Mail/SpamAssassin/Plugin/DCC.pm (original) +++ spamassassin/trunk/lib/Mail/SpamAssassin/Plugin/DCC.pm Wed Feb 2 00:04= :55 2005 @@ -67,7 +67,6 @@ dbg("dcc: local tests only, disabling DCC"); } else { - $self->{dcc_disabled} =3D 0; dbg("dcc: network tests on, registering DCC"); } =20 @@ -220,6 +219,11 @@ sub is_dccifd_available { my ($self) =3D @_; =20 + $self->{dccifd_available} =3D 0; + if ($self->{main}->{conf}->{use_dcc} =3D=3D 0) { + dbg("dcc: dccifd is not available: use_dcc is set to 0"); + return 0; + } my $dcchome =3D $self->{main}->{conf}->{dcc_home} || ''; my $dccifd =3D $self->{main}->{conf}->{dcc_dccifd_path} || ''; =20 @@ -236,12 +240,18 @@ $self->{main}->{conf}->{dcc_dccifd_path} =3D $dccifd; =20 dbg("dcc: dccifd is available: " . $self->{main}->{conf}->{dcc_dccifd_pa= th}); + $self->{dccifd_available} =3D 1; return 1; } =20 sub is_dccproc_available { my ($self) =3D @_; =20 + $self->{dccproc_available} =3D 0; + if ($self->{main}->{conf}->{use_dcc} =3D=3D 0) { + dbg("dcc: dccproc is not available: use_dcc is set to 0"); + return 0; + } my $dcchome =3D $self->{main}->{conf}->{dcc_home} || ''; my $dccproc =3D $self->{main}->{conf}->{dcc_path} || ''; =20 @@ -261,17 +271,14 @@ $self->{main}->{conf}->{dcc_path} =3D $dccproc; =20 dbg("dcc: dccproc is available: " . $self->{main}->{conf}->{dcc_path}); + $self->{dccproc_available} =3D 1; return 1; } =20 sub get_dcc_interface { my ($self) =3D @_; =20 - if (!$self->{main}->{conf}->{use_dcc}) { - dbg("dcc: use_dcc option not enabled, disabling DCC"); - $self->{dcc_disabled} =3D 1; - } - elsif ($self->is_dccifd_available()) { + if ($self->is_dccifd_available()) { $self->{dcc_interface} =3D "dccifd"; } elsif ($self->is_dccproc_available()) { @@ -286,20 +293,21 @@ sub check_dcc { my ($self, $permsgstatus, $full) =3D @_; =20 + # short-circuit if there's already a X-DCC header with value of + # "bulk" from an upstream DCC check + if ($permsgstatus->get('ALL') =3D~ /^X-DCC-(?:[^:]{1,80}-)?Metrics:.*bul= k/m) { + return 1; + } + return 0 if $self->{dcc_disabled}; $self->get_dcc_interface() unless $self->{dcc_interface}; =20 - # First check if there's already a X-DCC header with value of "bulk" - # and short-circuit if there is -- someone upstream might already have - # checked DCC for us. - return 1 if (grep(/^X-DCC-(?:[^:]{1,80}-)?Metrics:.*bulk/m, $permsgstatu= s->get('ALL'))); - if ($$full eq '') { dbg("dcc: empty message, skipping dcc check"); return 0; } =20 - if ($self->{dcc_interface} eq "dccifd") { + if ($self->{dccifd_available}) { return $self->dccifd_lookup($permsgstatus, $full); } else { @@ -552,8 +560,11 @@ =20 return if $self->{dcc_disabled}; =20 - if (!$self->{options}->{dont_report_to_dcc} && $self->is_dccproc_availab= le()) - { + if (!defined $self->{dccproc_available}) { + $self->is_dccproc_available(); + } + + if ($self->{dccproc_available} && !$self->{options}->{dont_report_to_dcc= }) { # use temporary file: open2() is unreliable due to buffering under spa= md my $tmpf =3D $options->{report}->create_fulltext_tmpfile($options->{te= xt}); if ($self->dcc_report($options, $tmpf)) { From commits-return-eellis@example.org Thu Feb 03 04:19:26 2005 Return-Path: <commits-return-eellis@example.org> Delivered-To: eellis@example.org Received: (qmail 72380 invoked from network); 3 Feb 2005 04:19:26 -0000 Received: from hermes.apache.org (HELO mail.apache.org) (83.161.120.155) by minotaur-2.apache.org with SMTP; 3 Feb 2005 04:19:26 -0000 Received: (qmail 84172 invoked by uid 500); 3 Feb 2005 04:19:26 -0000 Delivered-To: eellis@example.org Received: (qmail 84145 invoked by uid 500); 3 Feb 2005 04:19:26 -0000 Mailing-List: contact eellis@example.org; run by ezmlm Precedence: bulk list-help: <mailto:eellis@example.org> list-unsubscribe: <mailto:eellis@example.org> list-post: <mailto:eellis@example.org> Reply-To: "SpamAssassin Dev" <eellis@example.org> List-Id: <commits.spamassassin.apache.org> Delivered-To: mailing list eellis@example.org Received: (qmail 84129 invoked by uid 99); 3 Feb 2005 04:19:25 -0000 X-ASF-Spam-Status: No, hits=-9.8 required=10.0 tests=ALL_TRUSTED,NO_REAL_NAME X-Spam-Check-By: apache.org Received: from minotaur.apache.org (HELO minotaur.apache.org) (83.161.120.155) by apache.org (qpsmtpd/0.28) with SMTP; Wed, 02 Feb 2005 20:19:25 -0800 Received: (qmail 72359 invoked by uid 65534); 3 Feb 2005 04:19:24 -0000 Message-ID: <eellis@example.org> Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable X-Mailer: svnmailer-1.0.0-dev Date: Thu, 03 Feb 2005 04:19:24 -0000 Subject: svn commit: r151119 - spamassassin/trunk/lib/Mail/SpamAssassin/Plugin/DCC.pm To: eellis@example.org From: eellis@example.org X-Virus-Checked: Checked X-Spam-Rating: minotaur-2.apache.org 1.6.2 0/1000/N Author: quinlan Date: Wed Feb 2 20:19:22 2005 New Revision: 151119 URL: http://svn.apache.org/viewcvs?view=3Drev&rev=3D151119 Log: fix possible undefined warning Modified: spamassassin/trunk/lib/Mail/SpamAssassin/Plugin/DCC.pm Modified: spamassassin/trunk/lib/Mail/SpamAssassin/Plugin/DCC.pm URL: http://svn.apache.org/viewcvs/spamassassin/trunk/lib/Mail/SpamAssassin= /Plugin/DCC.pm?view=3Ddiff&r1=3D151118&r2=3D151119 =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D --- spamassassin/trunk/lib/Mail/SpamAssassin/Plugin/DCC.pm (original) +++ spamassassin/trunk/lib/Mail/SpamAssassin/Plugin/DCC.pm Wed Feb 2 20:19= :22 2005 @@ -285,7 +285,8 @@ $self->{dcc_interface} =3D "dccproc"; } else { - dbg("dcc: no dccifd or dccproc found, disabling DCC"); + dbg("dcc: dccifd and dccproc are not available, disabling DCC"); + $self->{dcc_interface} =3D "none"; $self->{dcc_disabled} =3D 1; } } @@ -299,8 +300,8 @@ return 1; } =20 - return 0 if $self->{dcc_disabled}; $self->get_dcc_interface() unless $self->{dcc_interface}; + return 0 if $self->{dcc_disabled}; =20 if ($$full eq '') { dbg("dcc: empty message, skipping dcc check"); From commits-return-eellis@example.org Thu Feb 03 05:12:37 2005 Return-Path: <commits-return-eellis@example.org> Delivered-To: eellis@example.org Received: (qmail 90856 invoked from network); 3 Feb 2005 05:12:36 -0000 Received: from hermes.apache.org (HELO mail.apache.org) (83.161.120.155) by minotaur-2.apache.org with SMTP; 3 Feb 2005 05:12:36 -0000 Received: (qmail 38917 invoked by uid 500); 3 Feb 2005 05:12:36 -0000 Delivered-To: eellis@example.org Received: (qmail 38880 invoked by uid 500); 3 Feb 2005 05:12:36 -0000 Mailing-List: contact eellis@example.org; run by ezmlm Precedence: bulk list-help: <mailto:eellis@example.org> list-unsubscribe: <mailto:eellis@example.org> list-post: <mailto:eellis@example.org> Reply-To: "SpamAssassin Dev" <eellis@example.org> List-Id: <commits.spamassassin.apache.org> Delivered-To: mailing list eellis@example.org Received: (qmail 38864 invoked by uid 99); 3 Feb 2005 05:12:36 -0000 X-ASF-Spam-Status: No, hits=-9.8 required=10.0 tests=ALL_TRUSTED,NO_REAL_NAME X-Spam-Check-By: apache.org Received: from minotaur.apache.org (HELO minotaur.apache.org) (83.161.120.155) by apache.org (qpsmtpd/0.28) with SMTP; Wed, 02 Feb 2005 21:12:36 -0800 Received: (qmail 90832 invoked by uid 65534); 3 Feb 2005 05:12:34 -0000 Message-ID: <eellis@example.org> Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable X-Mailer: svnmailer-1.0.0-dev Date: Thu, 03 Feb 2005 05:12:34 -0000 Subject: svn commit: r151120 - spamassassin/trunk/lib/Mail/SpamAssassin/Plugin/Pyzor.pm To: eellis@example.org From: eellis@example.org X-Virus-Checked: Checked X-Spam-Rating: minotaur-2.apache.org 1.6.2 0/1000/N Author: quinlan Date: Wed Feb 2 21:12:32 2005 New Revision: 151120 URL: http://svn.apache.org/viewcvs?view=3Drev&rev=3D151120 Log: lower timeout from 10 to 5 seconds (seems high enough after some more testi= ng) Modified: spamassassin/trunk/lib/Mail/SpamAssassin/Plugin/Pyzor.pm Modified: spamassassin/trunk/lib/Mail/SpamAssassin/Plugin/Pyzor.pm URL: http://svn.apache.org/viewcvs/spamassassin/trunk/lib/Mail/SpamAssassin= /Plugin/Pyzor.pm?view=3Ddiff&r1=3D151119&r2=3D151120 =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D --- spamassassin/trunk/lib/Mail/SpamAssassin/Plugin/Pyzor.pm (original) +++ spamassassin/trunk/lib/Mail/SpamAssassin/Plugin/Pyzor.pm Wed Feb 2 21:= 12:32 2005 @@ -89,7 +89,7 @@ type =3D> $Mail888a:dbb7:2d49:b3f6:8605:bf4e:caed:e5a4SpamAssassin888a:dbb7:2d49:b3f6:8605:bf4e:caed:e5a4on888a:dbb7:2d49:b3f6:8605:bf4e:caed:e5a4CONF_TYPE_BOOL }); =20 -=3Ditem pyzor_timeout n (default: 10) +=3Ditem pyzor_timeout n (default: 5) =20 How many seconds you wait for Pyzor to complete, before scanning continues without the Pyzor results. @@ -98,7 +98,7 @@ =20 push (@cmds, { setting =3D> 'pyzor_timeout', - default =3D> 10, + default =3D> 5, type =3D> $Mail888a:dbb7:2d49:b3f6:8605:bf4e:caed:e5a4SpamAssassin888a:dbb7:2d49:b3f6:8605:bf4e:caed:e5a4on888a:dbb7:2d49:b3f6:8605:bf4e:caed:e5a4CONF_TYPE_NUMERIC }); =20 From commits-return-eellis@example.org Thu Feb 03 05:21:14 2005 Return-Path: <commits-return-eellis@example.org> Delivered-To: eellis@example.org Received: (qmail 93266 invoked from network); 3 Feb 2005 05:21:14 -0000 Received: from hermes.apache.org (HELO mail.apache.org) (83.161.120.155) by minotaur-2.apache.org with SMTP; 3 Feb 2005 05:21:14 -0000 Received: (qmail 43391 invoked by uid 500); 3 Feb 2005 05:21:14 -0000 Delivered-To: eellis@example.org Received: (qmail 43355 invoked by uid 500); 3 Feb 2005 05:21:14 -0000 Mailing-List: contact eellis@example.org; run by ezmlm Precedence: bulk list-help: <mailto:eellis@example.org> list-unsubscribe: <mailto:eellis@example.org> list-post: <mailto:eellis@example.org> Reply-To: "SpamAssassin Dev" <eellis@example.org> List-Id: <commits.spamassassin.apache.org> Delivered-To: mailing list eellis@example.org Received: (qmail 43342 invoked by uid 99); 3 Feb 2005 05:21:13 -0000 X-ASF-Spam-Status: No, hits=-9.6 required=10.0 tests=ALL_TRUSTED,NO_REAL_NAME,UPPERCASE_25_50 X-Spam-Check-By: apache.org Received: from minotaur.apache.org (HELO minotaur.apache.org) (83.161.120.155) by apache.org (qpsmtpd/0.28) with SMTP; Wed, 02 Feb 2005 21:21:13 -0800 Received: (qmail 93244 invoked by uid 65534); 3 Feb 2005 05:21:12 -0000 Message-ID: <eellis@example.org> Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable X-Mailer: svnmailer-1.0.0-dev Date: Thu, 03 Feb 2005 05:21:12 -0000 Subject: svn commit: r151121 - spamassassin/trunk/rules/70_testing.cf To: eellis@example.org From: eellis@example.org X-Virus-Checked: Checked X-Spam-Rating: minotaur-2.apache.org 1.6.2 0/1000/N Author: quinlan Date: Wed Feb 2 21:21:09 2005 New Revision: 151121 URL: http://svn.apache.org/viewcvs?view=3Drev&rev=3D151121 Log: fix some FPs in T_SCHEME_MIXED_CASE* Modified: spamassassin/trunk/rules/70_testing.cf Modified: spamassassin/trunk/rules/70_testing.cf URL: http://svn.apache.org/viewcvs/spamassassin/trunk/rules/70_testing.cf?v= iew=3Ddiff&r1=3D151120&r2=3D151121 =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D --- spamassassin/trunk/rules/70_testing.cf (original) +++ spamassassin/trunk/rules/70_testing.cf Wed Feb 2 21:21:09 2005 @@ -276,5 +276,7 @@ header __NO_RCVD exists:Received meta T_NO_RCVD (!__NO_RCVD) =20 -uri T_SCHEME_MIXED_CASE_1 /^(?![a-z]{3,6}:)[A-Za-z]{3,6}:/ -uri T_SCHEME_MIXED_CASE_2 /^(?![a-z]{3,6}:|[A-Z]{3,6})[A-Za-z]{3,6}:/ +uri T_SCHEME_MIXED_CASE_1 /^(?![a-z]{3,6}:)[A-Za-z]{3,6}:(?!:)/ +uri T_SCHEME_MIXED_CASE_2 /^(?![a-z]{3,6}:|[A-Z]{3,6})[A-Za-z]{3,6}:(?!:)/ +uri T_SCHEME_MIXED_CASE_3 /^(?![a-z]{3,6}:)[A-Za-z]{3,6}:\// +uri T_SCHEME_MIXED_CASE_4 /^(?![a-z]{3,6}:|[A-Z]{3,6})[A-Za-z]{3,6}:\// From commits-return-eellis@example.org Fri Feb 04 03:01:38 2005 Return-Path: <commits-return-eellis@example.org> Delivered-To: eellis@example.org Received: (qmail 26979 invoked from network); 4 Feb 2005 03:01:38 -0000 Received: from hermes.apache.org (HELO mail.apache.org) (83.161.120.155) by minotaur-2.apache.org with SMTP; 4 Feb 2005 03:01:38 -0000 Received: (qmail 34968 invoked by uid 500); 4 Feb 2005 03:01:38 -0000 Delivered-To: eellis@example.org Received: (qmail 34921 invoked by uid 500); 4 Feb 2005 03:01:37 -0000 Mailing-List: contact eellis@example.org; run by ezmlm Precedence: bulk list-help: <mailto:eellis@example.org> list-unsubscribe: <mailto:eellis@example.org> list-post: <mailto:eellis@example.org> Reply-To: "SpamAssassin Dev" <eellis@example.org> List-Id: <commits.spamassassin.apache.org> Delivered-To: mailing list eellis@example.org Received: (qmail 34907 invoked by uid 99); 4 Feb 2005 03:01:37 -0000 X-ASF-Spam-Status: No, hits=-9.8 required=10.0 tests=ALL_TRUSTED,NO_REAL_NAME X-Spam-Check-By: apache.org Received: from minotaur.apache.org (HELO minotaur.apache.org) (83.161.120.155) by apache.org (qpsmtpd/0.28) with SMTP; Thu, 03 Feb 2005 19:01:37 -0800 Received: (qmail 26959 invoked by uid 65534); 4 Feb 2005 03:01:36 -0000 Message-ID: <eellis@example.org> Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable X-Mailer: svnmailer-1.0.0-dev Date: Fri, 04 Feb 2005 03:01:36 -0000 Subject: svn commit: r151302 - in spamassassin/trunk/rules: 20_uri_tests.cf 70_testing.cf To: eellis@example.org From: eellis@example.org X-Virus-Checked: Checked X-Spam-Rating: minotaur-2.apache.org 1.6.2 0/1000/N Author: quinlan Date: Thu Feb 3 19:01:35 2005 New Revision: 151302 URL: http://svn.apache.org/viewcvs?view=3Drev&rev=3D151302 Log: promote T_SCHEME_MIXED_CASE_4 to URI_SCHEME_MIXED_CASE Modified: spamassassin/trunk/rules/20_uri_tests.cf spamassassin/trunk/rules/70_testing.cf Modified: spamassassin/trunk/rules/20_uri_tests.cf URL: http://svn.apache.org/viewcvs/spamassassin/trunk/rules/20_uri_tests.cf= ?view=3Ddiff&r1=3D151301&r2=3D151302 =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D --- spamassassin/trunk/rules/20_uri_tests.cf (original) +++ spamassassin/trunk/rules/20_uri_tests.cf Thu Feb 3 19:01:35 2005 @@ -158,3 +158,6 @@ =20 uri URI_NO_WWW_ANY_CGI /^(?:https?:\/\/)?[^\/]+(?<!\/www)\.[^.]{3,}\.[^.]{= 3,}\.(?!biz|info)[a-z]{2,4}\/\?\S{14,}/i describe URI_NO_WWW_ANY_CGI CGI with long hostname other fourth-level "www" + +uri URI_SCHEME_MIXED_CASE /^(?![a-z]{3,6}:|[A-Z]{3,6})[A-Za-z]{3,6}:\// +describe URI_SCHEME_MIXED_CASE URI scheme has mixed uppercase and lowercase Modified: spamassassin/trunk/rules/70_testing.cf URL: http://svn.apache.org/viewcvs/spamassassin/trunk/rules/70_testing.cf?v= iew=3Ddiff&r1=3D151301&r2=3D151302 =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D --- spamassassin/trunk/rules/70_testing.cf (original) +++ spamassassin/trunk/rules/70_testing.cf Thu Feb 3 19:01:35 2005 @@ -275,8 +275,3 @@ # header __NO_RCVD exists:Received meta T_NO_RCVD (!__NO_RCVD) - -uri T_SCHEME_MIXED_CASE_1 /^(?![a-z]{3,6}:)[A-Za-z]{3,6}:(?!:)/ -uri T_SCHEME_MIXED_CASE_2 /^(?![a-z]{3,6}:|[A-Z]{3,6})[A-Za-z]{3,6}:(?!:)/ -uri T_SCHEME_MIXED_CASE_3 /^(?![a-z]{3,6}:)[A-Za-z]{3,6}:\// -uri T_SCHEME_MIXED_CASE_4 /^(?![a-z]{3,6}:|[A-Z]{3,6})[A-Za-z]{3,6}:\// From commits-return-eellis@example.org Fri Feb 04 03:02:31 2005 Return-Path: <commits-return-eellis@example.org> Delivered-To: eellis@example.org Received: (qmail 27294 invoked from network); 4 Feb 2005 03:02:31 -0000 Received: from hermes.apache.org (HELO mail.apache.org) (83.161.120.155) by minotaur-2.apache.org with SMTP; 4 Feb 2005 03:02:31 -0000 Received: (qmail 35401 invoked by uid 500); 4 Feb 2005 03:02:31 -0000 Delivered-To: eellis@example.org Received: (qmail 35354 invoked by uid 500); 4 Feb 2005 03:02:31 -0000 Mailing-List: contact eellis@example.org; run by ezmlm Precedence: bulk list-help: <mailto:eellis@example.org> list-unsubscribe: <mailto:eellis@example.org> list-post: <mailto:eellis@example.org> Reply-To: "SpamAssassin Dev" <eellis@example.org> List-Id: <commits.spamassassin.apache.org> Delivered-To: mailing list eellis@example.org Received: (qmail 35340 invoked by uid 99); 4 Feb 2005 03:02:30 -0000 X-ASF-Spam-Status: No, hits=-9.6 required=10.0 tests=ALL_TRUSTED,NO_REAL_NAME,UPPERCASE_25_50 X-Spam-Check-By: apache.org Received: from minotaur.apache.org (HELO minotaur.apache.org) (83.161.120.155) by apache.org (qpsmtpd/0.28) with SMTP; Thu, 03 Feb 2005 19:02:30 -0800 Received: (qmail 27275 invoked by uid 65534); 4 Feb 2005 03:02:29 -0000 Message-ID: <eellis@example.org> Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable X-Mailer: svnmailer-1.0.0-dev Date: Fri, 04 Feb 2005 03:02:29 -0000 Subject: svn commit: r151303 - spamassassin/trunk/rules/70_testing.cf To: eellis@example.org From: eellis@example.org X-Virus-Checked: Checked X-Spam-Rating: minotaur-2.apache.org 1.6.2 0/1000/N Author: quinlan Date: Thu Feb 3 19:02:29 2005 New Revision: 151303 URL: http://svn.apache.org/viewcvs?view=3Drev&rev=3D151303 Log: perhaps last attempt at Florida rules Modified: spamassassin/trunk/rules/70_testing.cf Modified: spamassassin/trunk/rules/70_testing.cf URL: http://svn.apache.org/viewcvs/spamassassin/trunk/rules/70_testing.cf?v= iew=3Ddiff&r1=3D151302&r2=3D151303 =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D --- spamassassin/trunk/rules/70_testing.cf (original) +++ spamassassin/trunk/rules/70_testing.cf Thu Feb 3 19:02:29 2005 @@ -251,10 +251,14 @@ # just a test... body T_ORANGES_AND_SPAM_POST /[a-z]{3,},? Fl(?:orida)? (?:33|32|34)\d{3}\b= /i body T_ORANGES_AND_SPAM_TELE /\b1?\D{0,2}(?:239|305|321|352|386|407|561|72= 7|754|772|786|813|850|863|904|941|954)\D{0,2}\d{3}\D{0,2}\d{4}\b/ +body T_TOLL_FREE_TELE /\b1?\D{0,2}(?:8(?:00|55|66|77|88))\D{0,2}\d{3}\D{0= ,2}\d{4}\b/ meta T_ORANGES_AND_SPAM_1 T_ORANGES_AND_SPAM_POST && T_ORANGES_AND_SPAM_TE= LE meta T_ORANGES_AND_SPAM_2 T_ORANGES_AND_SPAM_POST + T_ORANGES_AND_SPAM_TEL= E =3D=3D 1 meta T_ORANGES_AND_SPAM_3 T_ORANGES_AND_SPAM_POST && !T_ORANGES_AND_SPAM_T= ELE meta T_ORANGES_AND_SPAM_4 !T_ORANGES_AND_SPAM_POST && T_ORANGES_AND_SPAM_T= ELE +meta T_FLORIDA_TOLL_FREE_1 T_ORANGES_AND_SPAM_POST && T_TOLL_FREE_TELE +meta T_FLORIDA_TOLL_FREE_2 T_ORANGES_AND_SPAM_POST + T_TOLL_FREE_TELE =3D= =3D 1 +meta T_FLORIDA_TOLL_FREE_3 T_ORANGES_AND_SPAM_POST && !T_TOLL_FREE_TELE =20 ######################################################################## =20 From commits-return-eellis@example.org Fri Feb 04 03:07:59 2005 Return-Path: <commits-return-eellis@example.org> Delivered-To: eellis@example.org Received: (qmail 29560 invoked from network); 4 Feb 2005 03:07:59 -0000 Received: from hermes.apache.org (HELO mail.apache.org) (83.161.120.155) by minotaur-2.apache.org with SMTP; 4 Feb 2005 03:07:59 -0000 Received: (qmail 42762 invoked by uid 500); 4 Feb 2005 03:07:59 -0000 Delivered-To: eellis@example.org Received: (qmail 42737 invoked by uid 500); 4 Feb 2005 03:07:58 -0000 Mailing-List: contact eellis@example.org; run by ezmlm Precedence: bulk list-help: <mailto:eellis@example.org> list-unsubscribe: <mailto:eellis@example.org> list-post: <mailto:eellis@example.org> Reply-To: "SpamAssassin Dev" <eellis@example.org> List-Id: <commits.spamassassin.apache.org> Delivered-To: mailing list eellis@example.org Received: (qmail 42721 invoked by uid 99); 4 Feb 2005 03:07:58 -0000 X-ASF-Spam-Status: No, hits=-9.8 required=10.0 tests=ALL_TRUSTED,NO_REAL_NAME X-Spam-Check-By: apache.org Received: from minotaur.apache.org (HELO minotaur.apache.org) (83.161.120.155) by apache.org (qpsmtpd/0.28) with SMTP; Thu, 03 Feb 2005 19:07:58 -0800 Received: (qmail 29483 invoked by uid 65534); 4 Feb 2005 03:07:57 -0000 Message-ID: <eellis@example.org> Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable X-Mailer: svnmailer-1.0.0-dev Date: Fri, 04 Feb 2005 03:07:56 -0000 Subject: svn commit: r151306 - spamassassin/trunk/masses/rule-qa/automc/scrape-bugzilla To: eellis@example.org From: eellis@example.org X-Virus-Checked: Checked X-Spam-Rating: minotaur-2.apache.org 1.6.2 0/1000/N Author: jm Date: Thu Feb 3 19:07:54 2005 New Revision: 151306 URL: http://svn.apache.org/viewcvs?view=3Drev&rev=3D151306 Log: fix some bugs in automc; allow MCing of comment 0 in bugs, and ignore descs= to avoid lint failures Modified: spamassassin/trunk/masses/rule-qa/automc/scrape-bugzilla Modified: spamassassin/trunk/masses/rule-qa/automc/scrape-bugzilla URL: http://svn.apache.org/viewcvs/spamassassin/trunk/masses/rule-qa/automc= /scrape-bugzilla?view=3Ddiff&r1=3D151305&r2=3D151306 =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D --- spamassassin/trunk/masses/rule-qa/automc/scrape-bugzilla (original) +++ spamassassin/trunk/masses/rule-qa/automc/scrape-bugzilla Thu Feb 3 19:= 07:54 2005 @@ -109,7 +109,7 @@ cmts_by_num =3D> { }, cmts =3D> [ ], rulenames =3D> [ ], - default_needsmc_start =3D> 1 + default_needsmc_start =3D> 0 }; =20 # parse all the comments @@ -376,6 +376,10 @@ my $type =3D $1; my $name =3D $2; my $code =3D $3; + + # ignore describe lines, they can cause lint failures + next if ($type =3D~ /^describe$/i); + $cmt->{mcrules} .=3D "$type $name $code\n"; $lastwasrule =3D 1; if (!$seenrules) { From commits-return-eellis@example.org Fri Feb 04 07:16:35 2005 Return-Path: <commits-return-eellis@example.org> Delivered-To: eellis@example.org Received: (qmail 10454 invoked from network); 4 Feb 2005 07:16:35 -0000 Received: from hermes.apache.org (HELO mail.apache.org) (83.161.120.155) by minotaur-2.apache.org with SMTP; 4 Feb 2005 07:16:35 -0000 Received: (qmail 57796 invoked by uid 500); 4 Feb 2005 07:16:35 -0000 Delivered-To: eellis@example.org Received: (qmail 57745 invoked by uid 500); 4 Feb 2005 07:16:35 -0000 Mailing-List: contact eellis@example.org; run by ezmlm Precedence: bulk list-help: <mailto:eellis@example.org> list-unsubscribe: <mailto:eellis@example.org> list-post: <mailto:eellis@example.org> Reply-To: "SpamAssassin Dev" <eellis@example.org> List-Id: <commits.spamassassin.apache.org> Delivered-To: mailing list eellis@example.org Received: (qmail 57731 invoked by uid 99); 4 Feb 2005 07:16:34 -0000 X-ASF-Spam-Status: No, hits=-9.8 required=10.0 tests=ALL_TRUSTED,NO_REAL_NAME X-Spam-Check-By: apache.org Received: from minotaur.apache.org (HELO minotaur.apache.org) (83.161.120.155) by apache.org (qpsmtpd/0.28) with SMTP; Thu, 03 Feb 2005 23:16:34 -0800 Received: (qmail 10415 invoked by uid 65534); 4 Feb 2005 07:16:33 -0000 Message-ID: <eellis@example.org> Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable X-Mailer: svnmailer-1.0.0-dev Date: Fri, 04 Feb 2005 07:16:33 -0000 Subject: svn commit: r151328 - spamassassin/trunk/lib/Mail/SpamAssassin/Conf.pm To: eellis@example.org From: eellis@example.org X-Virus-Checked: Checked X-Spam-Rating: minotaur-2.apache.org 1.6.2 0/1000/N Author: quinlan Date: Thu Feb 3 23:16:31 2005 New Revision: 151328 URL: http://svn.apache.org/viewcvs?view=3Drev&rev=3D151328 Log: bug 4117: note that _STARS(*)_ is rounded down Modified: spamassassin/trunk/lib/Mail/SpamAssassin/Conf.pm Modified: spamassassin/trunk/lib/Mail/SpamAssassin/Conf.pm URL: http://svn.apache.org/viewcvs/spamassassin/trunk/lib/Mail/SpamAssassin= /Conf.pm?view=3Ddiff&r1=3D151327&r2=3D151328 =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D --- spamassassin/trunk/lib/Mail/SpamAssassin/Conf.pm (original) +++ spamassassin/trunk/lib/Mail/SpamAssassin/Conf.pm Thu Feb 3 23:16:31 20= 05 @@ -2907,13 +2907,13 @@ _AWLCOUNT_ Number of messages on which AWL modification is based _AWLPRESCORE_ Score before AWL _DATE_ rfc-2822 date of scan - _STARS(*)_ one * (use any character) for each score point (note: t= his - is limited to 50 'stars' to stay on the right side of t= he RFCs) + _STARS(*)_ one "*" (use any character) for each full score point + (note: limited to 50 'stars') _RELAYSTRUSTED_ relays used and deemed to be trusted _RELAYSUNTRUSTED_ relays used that can not be trusted _AUTOLEARN_ autolearn status ("ham", "no", "spam", "disabled", "failed", "unavailable") - _TESTS(,)_ tests hit separated by , (or other separator) + _TESTS(,)_ tests hit separated by "," (or other separator) _TESTSSCORES(,)_ as above, except with scores appended (eg. AWL=3D-3.0,.= .=2E) _DCCB_ DCC's "Brand" _DCCR_ DCC's results From commits-return-eellis@example.org Fri Feb 04 08:41:04 2005 Return-Path: <commits-return-eellis@example.org> Delivered-To: eellis@example.org Received: (qmail 78286 invoked from network); 4 Feb 2005 08:41:04 -0000 Received: from hermes.apache.org (HELO mail.apache.org) (83.161.120.155) by minotaur-2.apache.org with SMTP; 4 Feb 2005 08:41:04 -0000 Received: (qmail 80360 invoked by uid 500); 4 Feb 2005 08:41:04 -0000 Delivered-To: eellis@example.org Received: (qmail 80332 invoked by uid 500); 4 Feb 2005 08:41:04 -0000 Mailing-List: contact eellis@example.org; run by ezmlm Precedence: bulk list-help: <mailto:eellis@example.org> list-unsubscribe: <mailto:eellis@example.org> list-post: <mailto:eellis@example.org> Reply-To: "SpamAssassin Dev" <eellis@example.org> List-Id: <commits.spamassassin.apache.org> Delivered-To: mailing list eellis@example.org Received: (qmail 80317 invoked by uid 99); 4 Feb 2005 08:41:04 -0000 X-ASF-Spam-Status: No, hits=-2.3 required=10.0 tests=ALL_TRUSTED,DRUGS_ERECTILE,DRUGS_MANYKINDS,DRUGS_MUSCLE,DRUGS_PAIN,DRUGS_SLEEP,DRUGS_SLEEP_EREC,DRUG_ED_CAPS,NO_REAL_NAME,UPPERCASE_25_50 X-Spam-Check-By: apache.org Received: from minotaur.apache.org (HELO minotaur.apache.org) (83.161.120.155) by apache.org (qpsmtpd/0.28) with SMTP; Fri, 04 Feb 2005 00:41:03 -0800 Received: (qmail 78273 invoked by uid 65534); 4 Feb 2005 08:41:02 -0000 Message-ID: <eellis@example.org> Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable X-Mailer: svnmailer-1.0.0-dev Date: Fri, 04 Feb 2005 08:41:02 -0000 Subject: svn commit: r151331 - spamassassin/trunk/rules/70_scraped.cf To: eellis@example.org From: eellis@example.org X-Virus-Checked: Checked X-Spam-Rating: minotaur-2.apache.org 1.6.2 0/1000/N Author: jm Date: Fri Feb 4 00:41:00 2005 New Revision: 151331 URL: http://svn.apache.org/viewcvs?view=3Drev&rev=3D151331 Log: auto-mass-checks: bug 2403: __EXCESSIVE_HTML_ENTITIES_3x_b2403_c0 __EXCESSIVE_HTML_ENTITIES_7= x_b2403_c0 __EXCESSIVE_HTML_ENTITIES_8x_b2403_c0 __EXCESSIVE_HTML_ENTITIES_= 10x_b2403_c0 __EXCESSIVE_HTML_ENTITIES_11x_b2403_c0 T_MC_EXCESSIVE_HTML_ENT= ITIES_b2403_c0 bug 2886: T_MC_VIAGRA_COMBO_02_b2886_c0 bug 2999: T_MC_EMPTY_TEXTPLAINALT_b2999_c0 T_MC_BODY_TEXTAFTERHTML_b2999_c0 bug 3789: T_MC_SARE_URI_PILLS_b3789_c0 bug 4116: T_MC_SARE_HTML_EHTML2_b4116_c0 Modified: spamassassin/trunk/rules/70_scraped.cf Modified: spamassassin/trunk/rules/70_scraped.cf URL: http://svn.apache.org/viewcvs/spamassassin/trunk/rules/70_scraped.cf?v= iew=3Ddiff&r1=3D151330&r2=3D151331 =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D --- spamassassin/trunk/rules/70_scraped.cf (original) +++ spamassassin/trunk/rules/70_scraped.cf Fri Feb 4 00:41:00 2005 @@ -1,2 +1,30 @@ # SpamAssassin rules file: bugzilla-scraped needs-mc rules =20 +## MC: bug 2403 cmt 0: start +rawbody __EXCESSIVE_HTML_ENTITIES_3x_b2403_c0 /\&\#3[2-6];/ +rawbody __EXCESSIVE_HTML_ENTITIES_7x_b2403_c0 /\&\#7[0-9];/ +rawbody __EXCESSIVE_HTML_ENTITIES_8x_b2403_c0 /\&\#8[0-9];/ +rawbody __EXCESSIVE_HTML_ENTITIES_10x_b2403_c0 /\&\#10[0-9];/ +rawbody __EXCESSIVE_HTML_ENTITIES_11x_b2403_c0 /\&\#11[0-9];/ +meta T_MC_EXCESSIVE_HTML_ENTITIES_b2403_c0 ( __EXCESSIVE_HTML_ENTITIES_3x_= b2403_c0 +__EXCESSIVE_HTML_ENTITIES_7x_b2403_c0 + __EXCESSIVE_HTML_ENTITIES= _8x_b2403_c0 +__EXCESSIVE_HTML_ENTITIES_10x_b2403_c0 + __EXCESSIVE_HTML_ENT= ITIES_11x_b2403_c0 ) > 2 +## MC: bug 2403 cmt 0: end + +## MC: bug 2886 cmt 0: start +body T_MC_VIAGRA_COMBO_02_b2886_c0 /\bviagra,.{0,15}(?:pherentermine|levit= ra|soma|ambien|tramadol)\b/i +## MC: bug 2886 cmt 0: end + +## MC: bug 2999 cmt 0: start +full T_MC_EMPTY_TEXTPLAINALT_b2999_c0 /Content-Type:text\/plain;\s+charset= =3D"iso-8859-1"\s+Content-Transfer-Encoding:quoted-printable\s+------/ +full T_MC_BODY_TEXTAFTERHTML_b2999_c0 /<\/HTML>[a-z\s']+\s<br>[a-z\s']+\s<= br>/si +## MC: bug 2999 cmt 0: end + +## MC: bug 3789 cmt 0: start +uri T_MC_SARE_URI_PILLS_b3789_c0 /pills/i +score T_MC_SARE_URI_PILLS_b3789_c0 2.222 +## MC: bug 3789 cmt 0: end + +## MC: bug 4116 cmt 0: start +rawbody T_MC_SARE_HTML_EHTML2_b4116_c0 m'</html></html>'i +score T_MC_SARE_HTML_EHTML2_b4116_c0 2.222 +## MC: bug 4116 cmt 0: end + From commits-return-eellis@example.org Fri Feb 04 09:28:42 2005 Return-Path: <commits-return-eellis@example.org> Delivered-To: eellis@example.org Received: (qmail 99666 invoked from network); 4 Feb 2005 09:28:42 -0000 Received: from hermes.apache.org (HELO mail.apache.org) (83.161.120.155) by minotaur-2.apache.org with SMTP; 4 Feb 2005 09:28:42 -0000 Received: (qmail 46143 invoked by uid 500); 4 Feb 2005 09:28:41 -0000 Delivered-To: eellis@example.org Received: (qmail 46119 invoked by uid 500); 4 Feb 2005 09:28:41 -0000 Mailing-List: contact eellis@example.org; run by ezmlm Precedence: bulk list-help: <mailto:eellis@example.org> list-unsubscribe: <mailto:eellis@example.org> list-post: <mailto:eellis@example.org> Reply-To: "SpamAssassin Dev" <eellis@example.org> List-Id: <commits.spamassassin.apache.org> Delivered-To: mailing list eellis@example.org Received: (qmail 46105 invoked by uid 99); 4 Feb 2005 09:28:41 -0000 X-ASF-Spam-Status: No, hits=-9.8 required=10.0 tests=ALL_TRUSTED,NO_REAL_NAME X-Spam-Check-By: apache.org Received: from minotaur.apache.org (HELO minotaur.apache.org) (83.161.120.155) by apache.org (qpsmtpd/0.28) with SMTP; Fri, 04 Feb 2005 01:28:40 -0800 Received: (qmail 99651 invoked by uid 65534); 4 Feb 2005 09:28:39 -0000 Message-ID: <eellis@example.org> Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable X-Mailer: svnmailer-1.0.0-dev Date: Fri, 04 Feb 2005 09:28:39 -0000 Subject: svn commit: r151335 - spamassassin/trunk/lib/Mail/SpamAssassin/BayesStore/DBM.pm To: eellis@example.org From: eellis@example.org X-Virus-Checked: Checked X-Spam-Rating: minotaur-2.apache.org 1.6.2 0/1000/N Author: quinlan Date: Fri Feb 4 01:28:38 2005 New Revision: 151335 URL: http://svn.apache.org/viewcvs?view=3Drev&rev=3D151335 Log: perlstyle Modified: spamassassin/trunk/lib/Mail/SpamAssassin/BayesStore/DBM.pm Modified: spamassassin/trunk/lib/Mail/SpamAssassin/BayesStore/DBM.pm URL: http://svn.apache.org/viewcvs/spamassassin/trunk/lib/Mail/SpamAssassin= /BayesStore/DBM.pm?view=3Ddiff&r1=3D151334&r2=3D151335 =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D --- spamassassin/trunk/lib/Mail/SpamAssassin/BayesStore/DBM.pm (original) +++ spamassassin/trunk/lib/Mail/SpamAssassin/BayesStore/DBM.pm Fri Feb 4 0= 1:28:38 2005 @@ -136,10 +136,15 @@ =20 $self->read_db_configs(); =20 - my $path =3D $main->sed_path ($main->{conf}->{bayes_path}); + my $path =3D $main->sed_path($main->{conf}->{bayes_path}); =20 - my $found=3D0; - for my $ext (@DB_EXTENSIONS) { if (-f $path.'_toks'.$ext) { $found=3D1; = last; } } + my $found =3D 0; + for my $ext (@DB_EXTENSIONS) { + if (-f $path.'_toks'.$ext) { + $found =3D 1; + last; + } + } =20 if (!$found) { dbg("bayes: no dbs present, cannot tie DB R/O: ${path}_toks"); @@ -152,7 +157,7 @@ dbg("bayes: $$ tie-ing to DB file R/O $name"); # untie %{$self->{$db_var}} if (tied %{$self->{$db_var}}); tie %{$self->{$db_var}},"DB_File",$name, O_RDONLY, - (oct ($main->{conf}->{bayes_file_mode}) & 0666) + (oct($main->{conf}->{bayes_file_mode}) & 0666) or goto failed_to_tie; } =20 @@ -160,7 +165,7 @@ dbg("bayes: found bayes db version ".$self->{db_version}); =20 # If the DB version is one we don't understand, abort! - if ( $self->_check_db_version() !=3D 0 ) { + if ($self->_check_db_version() !=3D 0) { warn("bayes: bayes db version ".$self->{db_version}." is not able to b= e used, aborting!"); $self->untie_db(); return 0; @@ -198,7 +203,7 @@ # if we've already tied the db's using the same mode # (locked/unlocked) as we want now, freshen the lock and return. if ($self->{already_tied} && $self->{is_locked} =3D=3D 1) { - $main->{locker}->refresh_lock ($self->{locked_file}); + $main->{locker}->refresh_lock($self->{locked_file}); return 1; } =20 @@ -209,16 +214,21 @@ =20 $self->read_db_configs(); =20 - my $path =3D $main->sed_path ($main->{conf}->{bayes_path}); + my $path =3D $main->sed_path($main->{conf}->{bayes_path}); =20 - my $found=3D0; - for my $ext (@DB_EXTENSIONS) { if (-f $path.'_toks'.$ext) { $found=3D1; = last; } } + my $found =3D 0; + for my $ext (@DB_EXTENSIONS) { + if (-f $path.'_toks'.$ext) { + $found =3D 1; + last; + } + } =20 - my $parentdir =3D dirname ($path); + my $parentdir =3D dirname($path); if (!-d $parentdir) { # run in an eval(); if mkpath has no perms, it calls die() eval { - mkpath ($parentdir, 0, (oct ($main->{conf}->{bayes_file_mode}) & 077= 7)); + mkpath($parentdir, 0, (oct($main->{conf}->{bayes_file_mode}) & 0777)= ); }; } =20 @@ -228,7 +238,7 @@ } else { $tout =3D 10; } - if ($main->{locker}->safe_lock ($path, $tout)) { + if ($main->{locker}->safe_lock($path, $tout)) { $self->{locked_file} =3D $path; $self->{is_locked} =3D 1; } else { @@ -242,7 +252,7 @@ my $db_var =3D 'db_'.$dbname; dbg("bayes: $$ tie-ing to DB file R/W $name"); tie %{$self->{$db_var}},"DB_File",$name, O_RDWR|O_CREAT, - (oct ($main->{conf}->{bayes_file_mode}) & 0666) + (oct($main->{conf}->{bayes_file_mode}) & 0666) or goto failed_to_tie; } umask $umask; @@ -255,11 +265,11 @@ # DB version update and do it if necessary if either has a problem, # fail immediately # - if ( $found && !$self->_upgrade_db() ) { + if ($found && !$self->_upgrade_db()) { $self->untie_db(); return 0; } - elsif ( !$found ) { # new DB, make sure we know that ... + elsif (!$found) { # new DB, make sure we know that ... $self->{db_version} =3D $self->{db_toks}->{$DB_VERSION_MAGIC_TOKEN} = =3D $self->DB_VERSION; $self->{db_toks}->{$NTOKENS_MAGIC_TOKEN} =3D 0; # no tokens in the db = .=2E. dbg("bayes: new db, set db version ".$self->{db_version}." and 0 token= s"); @@ -280,7 +290,7 @@ } =20 =20 if ($self->{is_locked}) { - $self->{bayes}->{main}->{locker}->safe_unlock ($self->{locked_file}); + $self->{bayes}->{main}->{locker}->safe_unlock($self->{locked_file}); $self->{is_locked} =3D 0; } warn "bayes: cannot open bayes databases ${path}_* R/W: tie failed: $err= \n"; @@ -304,10 +314,10 @@ my $umask; # used later for umask modifications =20 # If the DB is the latest version, no problem. - return 1 if ( $verschk =3D=3D 0 ); + return 1 if ($verschk =3D=3D 0); =20 # If the DB is a newer version that we know what to do with ... abort! - if ( $verschk =3D=3D 1 ) { + if ($verschk =3D=3D 1) { warn("bayes: bayes db version ".$self->{db_version}." is newer than we= understand, aborting!"); return 0; } @@ -321,25 +331,25 @@ # since DB_File will not shrink a database (!!), we need to *create* # a new one instead. my $main =3D $self->{bayes}->{main}; - my $path =3D $main->sed_path ($main->{conf}->{bayes_path}); + my $path =3D $main->sed_path($main->{conf}->{bayes_path}); my $name =3D $path.'_toks'; =20 # older version's journal files are likely not in the same format as the= new ones, so remove it. my $jpath =3D $self->_get_journal_filename(); - if ( -f $jpath ) { + if (-f $jpath) { dbg("bayes: old journal file found, removing"); - warn "bayes: couldn't remove $jpath: $!" if ( !unlink $jpath ); + warn "bayes: couldn't remove $jpath: $!" if (!unlink $jpath); } =20 - if ( $self->{db_version} < 2 ) { + if ($self->{db_version} < 2) { dbg("bayes: upgrading database format from v".$self->{db_version}." to= v2"); $self->set_running_expire_tok(); =20 - my($DB_NSPAM_MAGIC_TOKEN, $DB_NHAM_MAGIC_TOKEN, $DB_NTOKENS_MAGIC_TOKE= N); - my($DB_OLDEST_TOKEN_AGE_MAGIC_TOKEN, $DB_LAST_EXPIRE_MAGIC_TOKEN); + my ($DB_NSPAM_MAGIC_TOKEN, $DB_NHAM_MAGIC_TOKEN, $DB_NTOKENS_MAGIC_TOK= EN); + my ($DB_OLDEST_TOKEN_AGE_MAGIC_TOKEN, $DB_LAST_EXPIRE_MAGIC_TOKEN); =20 # Magic tokens for version 0, defined as '**[A-Z]+' - if ( $self->{db_version} =3D=3D 0 ) { + if ($self->{db_version} =3D=3D 0) { $DB_NSPAM_MAGIC_TOKEN =3D '**NSPAM'; $DB_NHAM_MAGIC_TOKEN =3D '**NHAM'; $DB_NTOKENS_MAGIC_TOKEN =3D '**NTOKENS'; @@ -367,7 +377,7 @@ my %new_toks; $umask =3D umask 0; $res =3D tie %new_toks, "DB_File", "${name}.new", O_RDWR|O_CREAT|O_EXC= L, - (oct ($main->{conf}->{bayes_file_mode}) & 0666); + (oct($main->{conf}->{bayes_file_mode}) & 0666); umask $umask; return 0 unless $res; undef $res; @@ -390,8 +400,8 @@ while (($tok, $packed) =3D each %{$self->{db_toks}}) { next if ($tok =3D~ /^(?:\*\*[A-Z]+$|\015\001\007\011\003)/); # skip = magic tokens =20 - my ($ts, $th, $atime) =3D $self->tok_unpack ($packed); - $new_toks{$tok} =3D $self->tok_pack ($ts, $th, $newatime); + my ($ts, $th, $atime) =3D $self->tok_unpack($packed); + $new_toks{$tok} =3D $self->tok_pack($ts, $th, $newatime); =20 # Refresh the lock every so often... if (($count++ % 1000) =3D=3D 0) { @@ -412,9 +422,9 @@ =20 # older versions used scancount, so kill the stupid little file ... my $msgc =3D $path.'_msgcount'; - if ( -f $msgc ) { + if (-f $msgc) { dbg("bayes: old msgcount file found, removing"); - if ( !unlink $msgc ) { + if (!unlink $msgc) { warn "bayes: couldn't remove $msgc: $!"; } } @@ -433,7 +443,7 @@ # re-tie to the new db in read-write mode ... $umask =3D umask 0; $res =3D tie %{$self->{db_toks}},"DB_File", $name, O_RDWR|O_CREAT, - (oct ($main->{conf}->{bayes_file_mode}) & 0666); + (oct($main->{conf}->{bayes_file_mode}) & 0666); umask $umask; return 0 unless $res; undef $res; @@ -443,7 +453,7 @@ } =20 # Version 3 of the database converts all existing tokens to SHA1 hashes - if ( $self->{db_version} =3D=3D 2 ) { + if ($self->{db_version} =3D=3D 2) { dbg("bayes: upgrading database format from v".$self->{db_version}." to= v3"); $self->set_running_expire_tok(); =20 @@ -465,7 +475,7 @@ my %new_toks; $umask =3D umask 0; $res =3D tie %new_toks, "DB_File", "${name}.new", O_RDWR|O_CREAT|O_EXC= L, - (oct ($main->{conf}->{bayes_file_mode}) & 0666); + (oct($main->{conf}->{bayes_file_mode}) & 0666); umask $umask; return 0 unless $res; undef $res; @@ -510,7 +520,7 @@ my $newf =3D $name.'.new'.$ext; my $oldf =3D $name.$ext; next unless (-f $newf); - if (!rename ($newf, $oldf)) { + if (!rename($newf, $oldf)) { warn "bayes: rename $newf to $oldf failed: $!\n"; return 0; } @@ -529,7 +539,7 @@ $self->{db_version} =3D 3; # need this for other functions which check } =20 - # if ( $self->{db_version} =3D=3D 3 ) { + # if ($self->{db_version} =3D=3D 3) { # ... # $self->{db_version} =3D 4; # need this for other functions which che= ck # } @@ -581,10 +591,11 @@ =20 my ($ts, $th, $atime) =3D $self->tok_unpack ($packed); =20 - # Go through from $start * 1 to $start * 512, mark how many tokens we = would expire + # Go through from $start * 1 to $start * 512, mark how many tokens + # we would expire my $token_age =3D $newest_atime - $atime; - for( my $i =3D 1; $i <=3D $max_expire_mult; $i<<=3D1 ) { - if ( $token_age >=3D $start * $i ) { + for (my $i =3D 1; $i <=3D $max_expire_mult; $i<<=3D1) { + if ($token_age >=3D $start * $i) { $delta{$i}++; } else { @@ -610,7 +621,7 @@ # since DB_File will not shrink a database (!!), we need to *create* # a new one instead. my $main =3D $self->{bayes}->{main}; - my $path =3D $main->sed_path ($main->{conf}->{bayes_path}); + my $path =3D $main->sed_path($main->{conf}->{bayes_path}); =20 # use a temporary PID-based suffix just in case another one was # created previously by an interrupted expire @@ -632,7 +643,8 @@ my $showdots =3D $opts->{showdots}; if ($showdots) { print STDERR "\n"; } =20 - # We've chosen a new atime delta if we've gotten here, so record it for = posterity. + # We've chosen a new atime delta if we've gotten here, so record it + # for posterity. $new_toks{$LAST_ATIME_DELTA_MAGIC_TOKEN} =3D $newdelta; =20 # Figure out how old is too old... @@ -647,9 +659,10 @@ =20 if ($atime < $too_old) { $deleted++; - } else { + } + else { # if token atime > newest, reset to newest ... - if ( $atime > $vars[10] ) { + if ($atime > $vars[10]) { $atime =3D $vars[10]; } =20 @@ -739,17 +752,19 @@ sub sync_due { my ($self) =3D @_; =20 - return 0 if ( $self->{db_version} < $self->DB_VERSION ); # don't bother = doing old db versions + # don't bother doing old db versions + return 0 if ($self->{db_version} < $self->DB_VERSION); =20 my $conf =3D $self->{bayes}->{main}->{conf}; - return 0 if ( $conf->{bayes_journal_max_size} =3D=3D 0 ); + return 0 if ($conf->{bayes_journal_max_size} =3D=3D 0); =20 my @vars =3D $self->get_storage_variables(); dbg("bayes: DB journal sync: last sync: ".$vars[7],'bayes','-1'); =20 ## Ok, should we do a sync? =20 - # Not if the journal file doesn't exist, it's not a file, or it's 0 byte= s long. + # Not if the journal file doesn't exist, it's not a file, or it's 0 + # bytes long. return 0 unless (stat($self->_get_journal_filename()) && -f _); =20 # Yes if the file size is larger than the specified maximum size. @@ -839,9 +854,9 @@ =20 my $db_ver =3D $self->{db_toks}->{$DB_VERSION_MAGIC_TOKEN}; =20 - if ( !$db_ver || $db_ver =3D~ /\D/ ) { $db_ver =3D 0; } + if (!$db_ver || $db_ver =3D~ /\D/) { $db_ver =3D 0; } =20 - if ( $db_ver >=3D 2 ) { + if ($db_ver >=3D 2) { my $DB2_LAST_ATIME_DELTA_MAGIC_TOKEN =3D "\015\001\007\011\003LASTATIM= EDELTA"; my $DB2_LAST_EXPIRE_MAGIC_TOKEN =3D "\015\001\007\011\003LASTEXPIRE"; my $DB2_LAST_EXPIRE_REDUCE_MAGIC_TOKEN =3D "\015\001\007\011\003LASTEX= PIREREDUCE"; @@ -867,7 +882,7 @@ $self->{db_toks}->{$DB2_NEWEST_TOKEN_AGE_MAGIC_TOKEN}, ); } - elsif ( $db_ver =3D=3D 0 ) { + elsif ($db_ver =3D=3D 0) { my $DB0_NSPAM_MAGIC_TOKEN =3D '**NSPAM'; my $DB0_NHAM_MAGIC_TOKEN =3D '**NHAM'; my $DB0_OLDEST_TOKEN_AGE_MAGIC_TOKEN =3D '**OLDESTAGE'; @@ -889,7 +904,7 @@ 0, ); } - elsif ( $db_ver =3D=3D 1 ) { + elsif ($db_ver =3D=3D 1) { my $DB1_NSPAM_MAGIC_TOKEN =3D "\015\001\007\011\003NSPAM"; my $DB1_NHAM_MAGIC_TOKEN =3D "\015\001\007\011\003NHAM"; my $DB1_OLDEST_TOKEN_AGE_MAGIC_TOKEN =3D "\015\001\007\011\003OLDESTAG= E"; @@ -912,8 +927,10 @@ ); } =20 - foreach ( @values ) { - if ( !$_ || $_ =3D~ /\D/ ) { $_ =3D 0; } + foreach (@values) { + if (!$_ || $_ =3D~ /\D/) { + $_ =3D 0; + } } =20 return @values; @@ -922,7 +939,7 @@ sub dump_db_toks { my ($self, $template, $regex, @vars) =3D @_; =20 - while( my($tok, $tokvalue) =3D each %{$self->{db_toks}}) { + while (my ($tok, $tokvalue) =3D each %{$self->{db_toks}}) { next if ($tok =3D~ MAGIC_RE); # skip magic tokens next if (defined $regex && ($tok !~ /$regex/o)); =20 @@ -1060,7 +1077,7 @@ =20 # argh, write failure, give up if (!defined $len || $len < 0) { - $len =3D 0 unless ( defined $len ); + $len =3D 0 unless (defined $len); warn "bayes: write failed to Bayes journal $path ($len of $nbytes)!\= n"; last; } @@ -1093,7 +1110,7 @@ sub get_magic_re { my ($self) =3D @_; =20 - if ( !defined $self->{db_version} || $self->{db_version} >=3D 1 ) { + if (!defined $self->{db_version} || $self->{db_version} >=3D 1) { return MAGIC_RE; } =20 @@ -1120,7 +1137,9 @@ my $path =3D $self->_get_journal_filename(); =20 # if $path doesn't exist, or it's not a file, or is 0 bytes in length, r= eturn - if ( !stat($path) || !-f _ || -z _ ) { return 0; } + if (!stat($path) || !-f _ || -z _) { + return 0; + } =20 eval { local $SIG{'__DIE__'}; # do not run user die() traps in here @@ -1157,9 +1176,12 @@ my $showdots =3D $opts->{showdots}; my $retirepath =3D $path.".old"; =20 - # if $path doesn't exist, or it's not a file, or is 0 bytes in length, r= eturn - # we have to check again since the file may have been removed by a recen= t bayes db upgrade ... - if ( !stat($path) || !-f _ || -z _ ) { return 0; } + # if $path doesn't exist, or it's not a file, or is 0 bytes in length, + # return we have to check again since the file may have been removed + # by a recent bayes db upgrade ... + if (!stat($path) || !-f _ || -z _) { + return 0; + } =20 if (!-r $path) { # will we be able to read the file? warn "bayes: bad permissions on journal, can't read: $path\n"; @@ -1193,7 +1215,7 @@ =20 if (/^t (\d+) (.+)$/) { # Token timestamp update, cache resultant en= tries my $tok =3D pack("H*",$2); - $tokens{$tok} =3D $1+0 if ( !exists $tokens{$tok} || $1+0 > $tokens{$tok}= ); + $tokens{$tok} =3D $1+0 if (!exists $tokens{$tok} || $1+0 > $tokens{$tok}); } elsif (/^c (-?\d+) (-?\d+) (\d+) (.+)$/) { # Add/full token update my $tok =3D pack("H*",$4); $self->tok_sync_counters ($1+0, $2+0, $3+0, $tok); @@ -1202,7 +1224,7 @@ $self->tok_sync_nspam_nham ($1+0, $2+0); $count++; } elsif (/^m ([hsf]) (.+)$/) { # update msgid seen database - if ( $1 eq "f" ) { + if ($1 eq "f") { $self->_seen_delete_direct($2); } else { @@ -1218,7 +1240,7 @@ # Now that we've determined what tokens we need to update and their # final values, update the DB. Should be much smaller than the full # journal entries. - while( my($k,$v) =3D each %tokens ) { + while (my ($k,$v) =3D each %tokens) { $self->tok_touch_token ($v, $k); =20 if ((++$count % 1000) =3D=3D 0) { @@ -1257,7 +1279,7 @@ # If the new atime is < the old atime, ignore the update # We figure that we'll never want to lower a token atime, so abort if # we try. (journal out of sync, etc.) - return if ( $oldatime >=3D $atime ); + return if ($oldatime >=3D $atime); =20 $self->tok_put ($tok, $ts, $th, $atime); } @@ -1269,7 +1291,7 @@ $th +=3D $dh; if ($th < 0) { $th =3D 0; } =20 # Don't roll the atime of tokens backwards ... - $atime =3D $oldatime if ( $oldatime > $atime ); + $atime =3D $oldatime if ($oldatime > $atime); =20 $self->tok_put ($tok, $ts, $th, $atime); } @@ -1327,7 +1349,7 @@ my ($self) =3D @_; =20 my $main =3D $self->{bayes}->{main}; - return $main->sed_path ($main->{conf}->{bayes_path}."_journal"); + return $main->sed_path($main->{conf}->{bayes_path}."_journal"); } =20 ########################################################################### @@ -1437,7 +1459,7 @@ =20 return 0 unless ($self->tie_db_writable()); =20 - my $path =3D $self->{bayes}->{main}->sed_path ($self->{bayes}->{main}->{= conf}->{bayes_path}); + my $path =3D $self->{bayes}->{main}->sed_path($self->{bayes}->{main}->{c= onf}->{bayes_path}); =20 foreach my $dbname (@DBNAMES, 'journal') { my $name =3D $path.'_'.$dbname; @@ -1493,7 +1515,7 @@ } =20 my $main =3D $self->{bayes}->{main}; - my $path =3D $main->sed_path ($main->{conf}->{bayes_path}); + my $path =3D $main->sed_path($main->{conf}->{bayes_path}); =20 # use a temporary PID-based suffix just in case another one was # created previously by an interrupted expire @@ -1760,10 +1782,10 @@ $value ||=3D 0; =20 my ($packed, $atime); - if ( $self->{db_version} >=3D 1 ) { + if ($self->{db_version} >=3D 1) { ($packed, $atime) =3D unpack("CV", $value); } - elsif ( $self->{db_version} =3D=3D 0 ) { + elsif ($self->{db_version} =3D=3D 0) { ($packed, $atime) =3D unpack("CS", $value); } =20 @@ -1774,10 +1796,10 @@ } elsif (($packed & FORMAT_FLAG) =3D=3D TWO_LONGS_FORMAT) { my ($packed, $ts, $th, $atime); - if ( $self->{db_version} >=3D 1 ) { + if ($self->{db_version} >=3D 1) { ($packed, $ts, $th, $atime) =3D unpack("CVVV", $value); } - elsif ( $self->{db_version} =3D=3D 0 ) { + elsif ($self->{db_version} =3D=3D 0) { ($packed, $ts, $th, $atime) =3D unpack("CLLS", $value); } return ($ts || 0, $th || 0, $atime || 0); @@ -1802,12 +1824,12 @@ ########################################################################### =20 sub db_readable { - my($self) =3D @_; + my ($self) =3D @_; return $self->{already_tied}; } =20 sub db_writable { - my($self) =3D @_; + my ($self) =3D @_; return $self->{already_tied} && $self->{is_locked}; } =20 From commits-return-eellis@example.org Sat Feb 05 01:23:32 2005 Return-Path: <commits-return-eellis@example.org> Delivered-To: eellis@example.org Received: (qmail 54125 invoked from network); 5 Feb 2005 01:23:32 -0000 Received: from hermes.apache.org (HELO mail.apache.org) (83.161.120.155) by minotaur-2.apache.org with SMTP; 5 Feb 2005 01:23:32 -0000 Received: (qmail 72269 invoked by uid 500); 5 Feb 2005 01:23:32 -0000 Delivered-To: eellis@example.org Received: (qmail 72219 invoked by uid 500); 5 Feb 2005 01:23:31 -0000 Mailing-List: contact eellis@example.org; run by ezmlm Precedence: bulk list-help: <mailto:eellis@example.org> list-unsubscribe: <mailto:eellis@example.org> list-post: <mailto:eellis@example.org> Reply-To: "SpamAssassin Dev" <eellis@example.org> List-Id: <commits.spamassassin.apache.org> Delivered-To: mailing list eellis@example.org Received: (qmail 72206 invoked by uid 99); 5 Feb 2005 01:23:31 -0000 X-ASF-Spam-Status: No, hits=-9.6 required=10.0 tests=ALL_TRUSTED,NO_REAL_NAME,UPPERCASE_25_50 X-Spam-Check-By: apache.org Received: from minotaur.apache.org (HELO minotaur.apache.org) (83.161.120.155) by apache.org (qpsmtpd/0.28) with SMTP; Fri, 04 Feb 2005 17:23:31 -0800 Received: (qmail 54113 invoked by uid 65534); 5 Feb 2005 01:23:30 -0000 Message-ID: <eellis@example.org> Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable X-Mailer: svnmailer-1.0.0-dev Date: Sat, 05 Feb 2005 01:23:29 -0000 Subject: svn commit: r151458 - spamassassin/trunk/rules/70_testing.cf To: eellis@example.org From: eellis@example.org X-Virus-Checked: Checked X-Spam-Rating: minotaur-2.apache.org 1.6.2 0/1000/N Author: quinlan Date: Fri Feb 4 17:23:28 2005 New Revision: 151458 URL: http://svn.apache.org/viewcvs?view=3Drev&rev=3D151458 Log: damning, but not quite good enough to use, unfortunately Modified: spamassassin/trunk/rules/70_testing.cf Modified: spamassassin/trunk/rules/70_testing.cf URL: http://svn.apache.org/viewcvs/spamassassin/trunk/rules/70_testing.cf?v= iew=3Ddiff&r1=3D151457&r2=3D151458 =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D --- spamassassin/trunk/rules/70_testing.cf (original) +++ spamassassin/trunk/rules/70_testing.cf Fri Feb 4 17:23:28 2005 @@ -248,20 +248,6 @@ =20 ######################################################################## =20 -# just a test... -body T_ORANGES_AND_SPAM_POST /[a-z]{3,},? Fl(?:orida)? (?:33|32|34)\d{3}\b= /i -body T_ORANGES_AND_SPAM_TELE /\b1?\D{0,2}(?:239|305|321|352|386|407|561|72= 7|754|772|786|813|850|863|904|941|954)\D{0,2}\d{3}\D{0,2}\d{4}\b/ -body T_TOLL_FREE_TELE /\b1?\D{0,2}(?:8(?:00|55|66|77|88))\D{0,2}\d{3}\D{0= ,2}\d{4}\b/ -meta T_ORANGES_AND_SPAM_1 T_ORANGES_AND_SPAM_POST && T_ORANGES_AND_SPAM_TE= LE -meta T_ORANGES_AND_SPAM_2 T_ORANGES_AND_SPAM_POST + T_ORANGES_AND_SPAM_TEL= E =3D=3D 1 -meta T_ORANGES_AND_SPAM_3 T_ORANGES_AND_SPAM_POST && !T_ORANGES_AND_SPAM_T= ELE -meta T_ORANGES_AND_SPAM_4 !T_ORANGES_AND_SPAM_POST && T_ORANGES_AND_SPAM_T= ELE -meta T_FLORIDA_TOLL_FREE_1 T_ORANGES_AND_SPAM_POST && T_TOLL_FREE_TELE -meta T_FLORIDA_TOLL_FREE_2 T_ORANGES_AND_SPAM_POST + T_TOLL_FREE_TELE =3D= =3D 1 -meta T_FLORIDA_TOLL_FREE_3 T_ORANGES_AND_SPAM_POST && !T_TOLL_FREE_TELE - -######################################################################## - # bug 3999 header __HAS_REFERENCES exists:References meta T_PRIORITY_NO_NAME_BOTH ((__HAS_X_PRIORITY && __HAS_MSMAIL_PRI) && != __HAS_X_MAILER && !__IS_EXCH && !__USER_AGENT) From commits-return-eellis@example.org Sat Feb 05 02:55:35 2005 Return-Path: <commits-return-eellis@example.org> Delivered-To: eellis@example.org Received: (qmail 91542 invoked from network); 5 Feb 2005 02:55:35 -0000 Received: from hermes.apache.org (HELO mail.apache.org) (83.161.120.155) by minotaur-2.apache.org with SMTP; 5 Feb 2005 02:55:35 -0000 Received: (qmail 26435 invoked by uid 500); 5 Feb 2005 02:55:34 -0000 Delivered-To: eellis@example.org Received: (qmail 26386 invoked by uid 500); 5 Feb 2005 02:55:34 -0000 Mailing-List: contact eellis@example.org; run by ezmlm Precedence: bulk list-help: <mailto:eellis@example.org> list-unsubscribe: <mailto:eellis@example.org> list-post: <mailto:eellis@example.org> Reply-To: "SpamAssassin Dev" <eellis@example.org> List-Id: <commits.spamassassin.apache.org> Delivered-To: mailing list eellis@example.org Received: (qmail 26373 invoked by uid 99); 5 Feb 2005 02:55:34 -0000 X-ASF-Spam-Status: No, hits=-9.8 required=10.0 tests=ALL_TRUSTED,NO_REAL_NAME X-Spam-Check-By: apache.org Received: from minotaur.apache.org (HELO minotaur.apache.org) (83.161.120.155) by apache.org (qpsmtpd/0.28) with SMTP; Fri, 04 Feb 2005 18:55:34 -0800 Received: (qmail 91522 invoked by uid 65534); 5 Feb 2005 02:55:33 -0000 Message-ID: <eellis@example.org> Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable X-Mailer: svnmailer-1.0.0-dev Date: Sat, 05 Feb 2005 02:55:33 -0000 Subject: svn commit: r151470 - spamassassin/trunk/rules/70_testing.cf To: eellis@example.org From: eellis@example.org X-Virus-Checked: Checked X-Spam-Rating: minotaur-2.apache.org 1.6.2 0/1000/N Author: quinlan Date: Fri Feb 4 18:55:31 2005 New Revision: 151470 URL: http://svn.apache.org/viewcvs?view=3Drev&rev=3D151470 Log: some test rules Modified: spamassassin/trunk/rules/70_testing.cf Modified: spamassassin/trunk/rules/70_testing.cf URL: http://svn.apache.org/viewcvs/spamassassin/trunk/rules/70_testing.cf?v= iew=3Ddiff&r1=3D151469&r2=3D151470 =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D --- spamassassin/trunk/rules/70_testing.cf (original) +++ spamassassin/trunk/rules/70_testing.cf Fri Feb 4 18:55:31 2005 @@ -265,3 +265,28 @@ # header __NO_RCVD exists:Received meta T_NO_RCVD (!__NO_RCVD) + +# header order +header T_HEAD_01 ALL =3D~ /\nX-Priority:[^\n]{0,80}\nCC:/s +header T_HEAD_02 ALL =3D~ /\nMessage-ID:[^\n]{0,80}\nFrom:[^\n]{0,80}\nSub= ject:/s +header T_HEAD_03 ALL =3D~ /\nContent-Transfer-Encoding:[^\n]{0,80}\nX-MSMa= il-Priority:[^\n]{0,80}\nX-Mailer/s +header T_HEAD_04 ALL =3D~ /\nContent-Type:[^\n]{0,80}\nContent-Transfer-En= coding:[^\n]{0,80}\nX-MSMail-Priority/s +header T_HEAD_05 ALL =3D~ /\nMIME-Version:[^\n]{0,80}\nX-MessageOrder:[^\n= ]{0,80}/s +header T_HEAD_06 ALL =3D~ /\nX-MessageOrder:[^\n]{0,80}\nContent-Type:[^\n= ]{0,80}/s +header T_HEAD_06 ALL =3D~ /\nContent-Transfer-Encoding:[^\n]{0,80}\nX-MSMa= il-Priority:[^\n]{0,80}/s +header T_HEAD_07 ALL =3D~ /\nDate:[^\n]{0,80}\nMIME-Version:[^\n]{0,80}\nX= -MessageOrder/s +header T_HEAD_09 ALL =3D~ /\nMIME-Version:[^\n]{0,80}\nX-MessageOrder:[^\n= ]{0,80}\nContent-Type/s +header T_HEAD_10 ALL =3D~ /\nReply-To:[^\n]{0,80}\nDate:[^\n]{0,80}\nMIME-= Version/s +header T_HEAD_11 ALL =3D~ /\nSubject:[^\n]{0,160}\nReply-To:[^\n]{0,80}\nD= ate/s +header T_HEAD_12 ALL =3D~ /\nX-MessageOrder:[^\n]{0,80}\nContent-Type:[^\n= ]{0,80}\nContent-Transfer-Encoding/s +header T_HEADI_01 ALL =3D~ /\nX-Priority:[^\n]{0,80}\nCC:/si +header T_HEADI_02 ALL =3D~ /\nX-MessageOrder:[^\n]{0,80}\nContent-Type:[^\= n]{0,80}\nContent-Transfer-Encoding:/si +header T_HEADI_03 ALL =3D~ /\nContent-Transfer-Encoding:[^\n]{0,80}\nX-MSM= ail-Priority:[^\n]{0,80}/si +header T_HEADI_04 ALL =3D~ /\nContent-Transfer-Encoding:[^\n]{0,80}\nX-MSM= ail-Priority:[^\n]{0,80}\nX-Mailer_/si +header T_HEADI_05 ALL =3D~ /\nContent-Type:[^\n]{0,80}\nContent-Transfer-E= ncoding:[^\n]{0,80}\nX-MSMail-Priority:/si +header T_HEADI_06 ALL =3D~ /\nDate:[^\n]{0,80}\nMIME-Version:[^\n]{0,80}\n= X-MessageOrder:/si +header T_HEADI_07 ALL =3D~ /\nMIME-Version:[^\n]{0,80}\nX-MessageOrder:[^\= n]{0,80}/si +header T_HEADI_08 ALL =3D~ /\nMIME-Version:[^\n]{0,80}\nX-MessageOrder:[^\= n]{0,80}\nContent-Type:/si +header T_HEADI_09 ALL =3D~ /\nReply-To:[^\n]{0,80}\nDate:[^\n]{0,80}\nMIME= -Version:/si +header T_HEADI_10 ALL =3D~ /\nSubject:[^\n]{0,160}\nReply-To:[^\n]{0,80}\n= Date:/si +header T_HEADI_11 ALL =3D~ /\nX-MessageOrder:[^\n]{0,80}\nContent-Type:[^\= n]{0,80}/si From commits-return-eellis@example.org Sat Feb 05 08:40:49 2005 Return-Path: <commits-return-eellis@example.org> Delivered-To: eellis@example.org Received: (qmail 98800 invoked from network); 5 Feb 2005 08:40:49 -0000 Received: from hermes.apache.org (HELO mail.apache.org) (83.161.120.155) by minotaur-2.apache.org with SMTP; 5 Feb 2005 08:40:49 -0000 Received: (qmail 20366 invoked by uid 500); 5 Feb 2005 08:40:49 -0000 Delivered-To: eellis@example.org Received: (qmail 20331 invoked by uid 500); 5 Feb 2005 08:40:48 -0000 Mailing-List: contact eellis@example.org; run by ezmlm Precedence: bulk list-help: <mailto:eellis@example.org> list-unsubscribe: <mailto:eellis@example.org> list-post: <mailto:eellis@example.org> Reply-To: "SpamAssassin Dev" <eellis@example.org> List-Id: <commits.spamassassin.apache.org> Delivered-To: mailing list eellis@example.org Received: (qmail 20317 invoked by uid 99); 5 Feb 2005 08:40:48 -0000 X-ASF-Spam-Status: No, hits=-2.3 required=10.0 tests=ALL_TRUSTED,DRUGS_ERECTILE,DRUGS_MANYKINDS,DRUGS_MUSCLE,DRUGS_PAIN,DRUGS_SLEEP,DRUGS_SLEEP_EREC,DRUG_ED_CAPS,NO_REAL_NAME,UPPERCASE_25_50 X-Spam-Check-By: apache.org Received: from minotaur.apache.org (HELO minotaur.apache.org) (83.161.120.155) by apache.org (qpsmtpd/0.28) with SMTP; Sat, 05 Feb 2005 00:40:48 -0800 Received: (qmail 98786 invoked by uid 65534); 5 Feb 2005 08:40:47 -0000 Message-ID: <eellis@example.org> Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable X-Mailer: svnmailer-1.0.0-dev Date: Sat, 05 Feb 2005 08:40:47 -0000 Subject: svn commit: r151486 - spamassassin/trunk/rules/70_scraped.cf To: eellis@example.org From: eellis@example.org X-Virus-Checked: Checked X-Spam-Rating: minotaur-2.apache.org 1.6.2 0/1000/N Author: jm Date: Sat Feb 5 00:40:45 2005 New Revision: 151486 URL: http://svn.apache.org/viewcvs?view=3Drev&rev=3D151486 Log: auto-mass-checks: Modified: spamassassin/trunk/rules/70_scraped.cf Modified: spamassassin/trunk/rules/70_scraped.cf URL: http://svn.apache.org/viewcvs/spamassassin/trunk/rules/70_scraped.cf?v= iew=3Ddiff&r1=3D151485&r2=3D151486 =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D --- spamassassin/trunk/rules/70_scraped.cf (original) +++ spamassassin/trunk/rules/70_scraped.cf Sat Feb 5 00:40:45 2005 @@ -1,30 +1,2 @@ # SpamAssassin rules file: bugzilla-scraped needs-mc rules =20 -## MC: bug 2403 cmt 0: start -rawbody __EXCESSIVE_HTML_ENTITIES_3x_b2403_c0 /\&\#3[2-6];/ -rawbody __EXCESSIVE_HTML_ENTITIES_7x_b2403_c0 /\&\#7[0-9];/ -rawbody __EXCESSIVE_HTML_ENTITIES_8x_b2403_c0 /\&\#8[0-9];/ -rawbody __EXCESSIVE_HTML_ENTITIES_10x_b2403_c0 /\&\#10[0-9];/ -rawbody __EXCESSIVE_HTML_ENTITIES_11x_b2403_c0 /\&\#11[0-9];/ -meta T_MC_EXCESSIVE_HTML_ENTITIES_b2403_c0 ( __EXCESSIVE_HTML_ENTITIES_3x_= b2403_c0 +__EXCESSIVE_HTML_ENTITIES_7x_b2403_c0 + __EXCESSIVE_HTML_ENTITIES= _8x_b2403_c0 +__EXCESSIVE_HTML_ENTITIES_10x_b2403_c0 + __EXCESSIVE_HTML_ENT= ITIES_11x_b2403_c0 ) > 2 -## MC: bug 2403 cmt 0: end - -## MC: bug 2886 cmt 0: start -body T_MC_VIAGRA_COMBO_02_b2886_c0 /\bviagra,.{0,15}(?:pherentermine|levit= ra|soma|ambien|tramadol)\b/i -## MC: bug 2886 cmt 0: end - -## MC: bug 2999 cmt 0: start -full T_MC_EMPTY_TEXTPLAINALT_b2999_c0 /Content-Type:text\/plain;\s+charset= =3D"iso-8859-1"\s+Content-Transfer-Encoding:quoted-printable\s+------/ -full T_MC_BODY_TEXTAFTERHTML_b2999_c0 /<\/HTML>[a-z\s']+\s<br>[a-z\s']+\s<= br>/si -## MC: bug 2999 cmt 0: end - -## MC: bug 3789 cmt 0: start -uri T_MC_SARE_URI_PILLS_b3789_c0 /pills/i -score T_MC_SARE_URI_PILLS_b3789_c0 2.222 -## MC: bug 3789 cmt 0: end - -## MC: bug 4116 cmt 0: start -rawbody T_MC_SARE_HTML_EHTML2_b4116_c0 m'</html></html>'i -score T_MC_SARE_HTML_EHTML2_b4116_c0 2.222 -## MC: bug 4116 cmt 0: end - From commits-return-eellis@example.org Sat Feb 05 21:13:46 2005 Return-Path: <commits-return-eellis@example.org> Delivered-To: eellis@example.org Received: (qmail 9637 invoked from network); 5 Feb 2005 21:13:46 -0000 Received: from hermes.apache.org (HELO mail.apache.org) (83.161.120.155) by minotaur-2.apache.org with SMTP; 5 Feb 2005 21:13:46 -0000 Received: (qmail 2637 invoked by uid 500); 5 Feb 2005 21:13:46 -0000 Delivered-To: eellis@example.org Received: (qmail 2587 invoked by uid 500); 5 Feb 2005 21:13:46 -0000 Mailing-List: contact eellis@example.org; run by ezmlm Precedence: bulk list-help: <mailto:eellis@example.org> list-unsubscribe: <mailto:eellis@example.org> list-post: <mailto:eellis@example.org> Reply-To: "SpamAssassin Dev" <eellis@example.org> List-Id: <commits.spamassassin.apache.org> Delivered-To: mailing list eellis@example.org Received: (qmail 2574 invoked by uid 99); 5 Feb 2005 21:13:45 -0000 X-ASF-Spam-Status: No, hits=-9.8 required=10.0 tests=ALL_TRUSTED,NO_REAL_NAME X-Spam-Check-By: apache.org Received: from minotaur.apache.org (HELO minotaur.apache.org) (83.161.120.155) by apache.org (qpsmtpd/0.28) with SMTP; Sat, 05 Feb 2005 13:13:45 -0800 Received: (qmail 9621 invoked by uid 65534); 5 Feb 2005 21:13:44 -0000 Message-ID: <eellis@example.org> Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable X-Mailer: svnmailer-1.0.0-dev Date: Sat, 05 Feb 2005 21:13:44 -0000 Subject: svn commit: r151528 - spamassassin/trunk/rules/70_testing.cf To: eellis@example.org From: eellis@example.org X-Virus-Checked: Checked X-Spam-Rating: minotaur-2.apache.org 1.6.2 0/1000/N Author: quinlan Date: Sat Feb 5 13:13:43 2005 New Revision: 151528 URL: http://svn.apache.org/viewcvs?view=3Drev&rev=3D151528 Log: some quick tests Modified: spamassassin/trunk/rules/70_testing.cf Modified: spamassassin/trunk/rules/70_testing.cf URL: http://svn.apache.org/viewcvs/spamassassin/trunk/rules/70_testing.cf?v= iew=3Ddiff&r1=3D151527&r2=3D151528 =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D --- spamassassin/trunk/rules/70_testing.cf (original) +++ spamassassin/trunk/rules/70_testing.cf Sat Feb 5 13:13:43 2005 @@ -290,3 +290,11 @@ header T_HEADI_09 ALL =3D~ /\nReply-To:[^\n]{0,80}\nDate:[^\n]{0,80}\nMIME= -Version:/si header T_HEADI_10 ALL =3D~ /\nSubject:[^\n]{0,160}\nReply-To:[^\n]{0,80}\n= Date:/si header T_HEADI_11 ALL =3D~ /\nX-MessageOrder:[^\n]{0,80}\nContent-Type:[^\= n]{0,80}/si + +# I have a feeling these are well-caught already, better tests may exist +header T_MID_DM_15 Message-ID =3D~ /<[0-9a-f]{4}01c4[0-9a-f]{4}\$[0-9a-f]{= 8}\$[0-9a-f]{8}@\S+>/ +meta T_RATWARE_DM_15 T_MID_DM_15 && !__HAS_X_MAILER + +# simple enough to test +meta T_RATWARE_SOMETHING __MSGID_DOLLARS_OK && !__HAS_X_MAILER +meta T_RATWARE_WHATEVER __OUTLOOK_DOLLARS_MSGID && !__HAS_X_MAILER From commits-return-eellis@example.org Sun Feb 06 09:43:30 2005 Return-Path: <commits-return-eellis@example.org> Delivered-To: eellis@example.org Received: (qmail 86553 invoked from network); 6 Feb 2005 09:43:29 -0000 Received: from hermes.apache.org (HELO mail.apache.org) (83.161.120.155) by minotaur-2.apache.org with SMTP; 6 Feb 2005 09:43:29 -0000 Received: (qmail 28225 invoked by uid 500); 6 Feb 2005 09:43:29 -0000 Delivered-To: eellis@example.org Received: (qmail 28176 invoked by uid 500); 6 Feb 2005 09:43:29 -0000 Mailing-List: contact eellis@example.org; run by ezmlm Precedence: bulk list-help: <mailto:eellis@example.org> list-unsubscribe: <mailto:eellis@example.org> list-post: <mailto:eellis@example.org> Reply-To: "SpamAssassin Dev" <eellis@example.org> List-Id: <commits.spamassassin.apache.org> Delivered-To: mailing list eellis@example.org Received: (qmail 28163 invoked by uid 99); 6 Feb 2005 09:43:29 -0000 X-ASF-Spam-Status: No, hits=-9.6 required=10.0 tests=ALL_TRUSTED,NO_REAL_NAME,UPPERCASE_25_50 X-Spam-Check-By: apache.org Received: from minotaur.apache.org (HELO minotaur.apache.org) (83.161.120.155) by apache.org (qpsmtpd/0.28) with SMTP; Sun, 06 Feb 2005 01:43:28 -0800 Received: (qmail 86523 invoked by uid 65534); 6 Feb 2005 09:43:27 -0000 Message-ID: <eellis@example.org> Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable X-Mailer: svnmailer-1.0.0-dev Date: Sun, 06 Feb 2005 09:43:27 -0000 Subject: svn commit: r151561 - spamassassin/trunk/rules/70_testing.cf To: eellis@example.org From: eellis@example.org X-Virus-Checked: Checked X-Spam-Rating: minotaur-2.apache.org 1.6.2 0/1000/N Author: quinlan Date: Sun Feb 6 01:43:25 2005 New Revision: 151561 URL: http://svn.apache.org/viewcvs?view=3Drev&rev=3D151561 Log: tweaking rules for this ratware Modified: spamassassin/trunk/rules/70_testing.cf Modified: spamassassin/trunk/rules/70_testing.cf URL: http://svn.apache.org/viewcvs/spamassassin/trunk/rules/70_testing.cf?v= iew=3Ddiff&r1=3D151560&r2=3D151561 =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D --- spamassassin/trunk/rules/70_testing.cf (original) +++ spamassassin/trunk/rules/70_testing.cf Sun Feb 6 01:43:25 2005 @@ -292,8 +292,13 @@ header T_HEADI_11 ALL =3D~ /\nX-MessageOrder:[^\n]{0,80}\nContent-Type:[^\= n]{0,80}/si =20 # I have a feeling these are well-caught already, better tests may exist -header T_MID_DM_15 Message-ID =3D~ /<[0-9a-f]{4}01c4[0-9a-f]{4}\$[0-9a-f]{= 8}\$[0-9a-f]{8}@\S+>/ -meta T_RATWARE_DM_15 T_MID_DM_15 && !__HAS_X_MAILER +header T_DM15_MID1 Message-ID =3D~ /<[0-9a-f]{4}01c4[0-9a-f]{4}\$[0-9a-f]{= 8}\$[0-9a-f]{8}@\S+>/ +header T_DM15_MID2 MESSAGEID =3D~ /<[0-9a-f]{4}01c4[0-9a-f]{4}\$[0-9a-f]{8= }\$[0-9a-f]{8}@\S+>/ +header T_DM15_BOUND Content-Type =3D~ /----=3D_NextPart_000_/ +meta T_RATWARE_DM15_1 T_DM15_MID1 && !__HAS_X_MAILER +meta T_RATWARE_DM15_2 T_DM15_MID2 && !__HAS_X_MAILER +meta T_RATWARE_DM15_3 T_DM15_MID1 && T_DM15_BOUND +meta T_RATWARE_DM15_4 T_DM15_MID2 && T_DM15_BOUND =20 # simple enough to test meta T_RATWARE_SOMETHING __MSGID_DOLLARS_OK && !__HAS_X_MAILER From commits-return-eellis@example.org Sun Feb 06 23:00:11 2005 Return-Path: <commits-return-eellis@example.org> Delivered-To: eellis@example.org Received: (qmail 77826 invoked from network); 6 Feb 2005 23:00:11 -0000 Received: from hermes.apache.org (HELO mail.apache.org) (83.161.120.155) by minotaur-2.apache.org with SMTP; 6 Feb 2005 23:00:11 -0000 Received: (qmail 16415 invoked by uid 500); 6 Feb 2005 23:00:11 -0000 Delivered-To: eellis@example.org Received: (qmail 16367 invoked by uid 500); 6 Feb 2005 23:00:10 -0000 Mailing-List: contact eellis@example.org; run by ezmlm Precedence: bulk list-help: <mailto:eellis@example.org> list-unsubscribe: <mailto:eellis@example.org> list-post: <mailto:eellis@example.org> Reply-To: "SpamAssassin Dev" <eellis@example.org> List-Id: <commits.spamassassin.apache.org> Delivered-To: mailing list eellis@example.org Received: (qmail 16354 invoked by uid 99); 6 Feb 2005 23:00:10 -0000 X-ASF-Spam-Status: No, hits=-9.8 required=10.0 tests=ALL_TRUSTED,NO_REAL_NAME X-Spam-Check-By: apache.org Received: from minotaur.apache.org (HELO minotaur.apache.org) (83.161.120.155) by apache.org (qpsmtpd/0.28) with SMTP; Sun, 06 Feb 2005 15:00:09 -0800 Received: (qmail 77806 invoked from network); 6 Feb 2005 23:00:08 -0000 Received: from localhost.hyperreal.org (HELO minotaur.apache.org) (83.161.120.155) by localhost.hyperreal.org with SMTP; 6 Feb 2005 23:00:08 -0000 Content-Type: text/plain; charset="iso-8859-1" MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable From: eellis@example.org To: eellis@example.org Subject: =?iso-8859-1?q?=5BSpamAssassin_Wiki=5D_Updated=3A__PressContacts?= Date: Sun, 06 Feb 2005 23:00:08 -0000 Message-ID: <eellis@example.org> X-Spam-Rating: localhost.hyperreal.org 1.6.2 0/1000/N X-Virus-Checked: Checked X-Spam-Rating: minotaur-2.apache.org 1.6.2 0/1000/N Date: 2005-02-06T15:00:07 Editor: DanielQuinlan Wiki: SpamAssassin Wiki Page: PressContacts URL: http://wiki.apache.org/spamassassin/PressContacts no comment Change Log: ---------------------------------------------------------------------------= --- @@ -1,5 +1,6 @@ List of people and their availability for publicity around the 3.0 launch.= Please create your own section and maintain the information there. Inclu= de your name, brief bio, contact info (email and phone), and what areas you= 'd be happy to talk to people about, as well as what timezone you're locate= d in, etc. - +---- +The official press contact address for Apache is the Apache Public Relatio= ns Committee at eellis@example.org. You can also contact the SpamAssassin Proj= ect Management Committee at eellis@example.org. ---- CraigHughes is available to discuss the SpamAssassin project, its history,= the general spam landscape. Craig started working on the SpamAssassin pro= ject in 2001, and founded Deersoft, which produced commercial products on t= op of the SpamAssassin engine. Deersoft was acquired by Network Associates= in 2002, and now forms the core of Network Associate's commercial anti-spa= m solutions. Craig left NAI in March 2004 to pursue other projects, but re= mains involved in the open source project. ---- From commits-return-eellis@example.org Mon Feb 07 07:48:01 2005 Return-Path: <commits-return-eellis@example.org> Delivered-To: eellis@example.org Received: (qmail 44785 invoked from network); 7 Feb 2005
{'source': 'Apache Software Foundation Public Mail Archives'}