Index: MANIFEST =================================================================== --- MANIFEST (revision 122935) +++ MANIFEST (working copy) @@ -279,6 +279,7 @@ t/data/spam/bsmtp t/data/spam/dnsbl.eml t/data/spam/gtube.eml +t/data/spam/spf1 t/data/testplugin.pm t/data/whitelists/action.eff.org t/data/whitelists/amazon_co_uk_ship Index: rules/50_scores.cf =================================================================== --- rules/50_scores.cf (revision 122935) +++ rules/50_scores.cf (working copy) @@ -683,7 +683,7 @@ # otherwise. The penalties for an *incorrect* record, however, are large. ;) ifplugin Mail::SpamAssassin::Plugin::SPF score SPF_PASS -0.001 -score SPF_FAIL 0 0 0 0.875 +score SPF_FAIL 0 0.001 0 0.875 score SPF_SOFTFAIL 0.500 0.842 0.500 0.500 score SPF_HELO_PASS -0.001 score SPF_HELO_FAIL 0 0.405 0 0.001 Index: t/spf.t =================================================================== --- t/spf.t (revision 122935) +++ t/spf.t (working copy) @@ -16,7 +16,7 @@ BEGIN { - plan tests => (DO_RUN ? 2 : 0); + plan tests => (DO_RUN ? 4 : 0); }; @@ -32,3 +32,10 @@ sarun ("-t < data/nice/spf1", \&patterns_run_cb); ok_all_patterns(); +%patterns = ( + q{ SPF_HELO_FAIL }, 'helo_fail', + q{ SPF_FAIL }, 'fail', +); + +sarun ("-t < data/spam/spf1", \&patterns_run_cb); +ok_all_patterns(); Index: t/data/spam/spf1 =================================================================== --- t/data/spam/spf1 (revision 0) +++ t/data/spam/spf1 (revision 0) @@ -0,0 +1,22 @@ +Return-Path: +Received: from bugzilla.spamassassin.org (bugzilla.spamassassin.org [65.214.43.155]) by amgod.boxhost.net (Postfix) with SMTP id B9B2931016D for ; Tue, 10 Feb 2004 18:18:49 +0000 (GMT) +Received: by proxy.google.com with SMTP id so1951389 for ; Tue, 10 Feb 2004 10:14:01 -0800 (PST) +Received: by abbulk2 with SMTP id mr733125; Tue, 10 Feb 2004 10:14:01 -0800 (PST) +Message-ID: <1076436841.67074.8fa05ccdc458abe5.1446041b@persist.google.com> +Date: Tue, 10 Feb 2004 10:14:01 -0800 (PST) +From: newsalerts-noreply@dnsbltest.spamassassin.org +To: jm-google-news-alerts@jmason.org +Subject: Google News Alert - spamassassin +MIME-Version: 1.0 +Content-Type: text/plain; charset="ISO-8859-1"; + +SWSOFT Unveils Plesk 7, Deployed by 1&1 +Web Host Industry Review - USA +... The software also features a newly designed Windows XP-like user interface, +is equipped SpamAssassin, an open source anti-spam tool, and includes +"Application ... + +See all stories on this topic: + + Index: t/data/nice/spf1 =================================================================== --- t/data/nice/spf1 (revision 122935) +++ t/data/nice/spf1 (working copy) @@ -1,10 +1,10 @@ -Return-Path: -Received: from proxy.google.com (proxy.google.com [216.239.51.5]) by amgod.boxhost.net (Postfix) with SMTP id B9B2931016D for ; Tue, 10 Feb 2004 18:18:49 +0000 (GMT) +Return-Path: +Received: from bugzilla.spamassassin.org (bugzilla.spamassassin.org [64.142.3.173]) by amgod.boxhost.net (Postfix) with SMTP id B9B2931016D for ; Tue, 10 Feb 2004 18:18:49 +0000 (GMT) Received: by proxy.google.com with SMTP id so1951389 for ; Tue, 10 Feb 2004 10:14:01 -0800 (PST) Received: by abbulk2 with SMTP id mr733125; Tue, 10 Feb 2004 10:14:01 -0800 (PST) Message-ID: <1076436841.67074.8fa05ccdc458abe5.1446041b@persist.google.com> Date: Tue, 10 Feb 2004 10:14:01 -0800 (PST) -From: newsalerts-noreply@google.com +From: newsalerts-noreply@dnsbltest.spamassassin.org To: jm-google-news-alerts@jmason.org Subject: Google News Alert - spamassassin MIME-Version: 1.0