You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@spamassassin.apache.org by mm...@apache.org on 2008/02/14 02:05:45 UTC

svn commit: r627628 - in /spamassassin/rules/trunk/sandbox/mmartinec: 20_rpvalid.cf 25_dcc.cf 25_dkim.cf 25_yg.cf 60_whitelist_dkim.cf

Author: mmartinec
Date: Wed Feb 13 17:05:44 2008
New Revision: 627628

URL: http://svn.apache.org/viewvc?rev=627628&view=rev
Log:
update rulesrc/sandbox/mmartinec/

Modified:
    spamassassin/rules/trunk/sandbox/mmartinec/20_rpvalid.cf
    spamassassin/rules/trunk/sandbox/mmartinec/25_dcc.cf
    spamassassin/rules/trunk/sandbox/mmartinec/25_dkim.cf
    spamassassin/rules/trunk/sandbox/mmartinec/25_yg.cf
    spamassassin/rules/trunk/sandbox/mmartinec/60_whitelist_dkim.cf

Modified: spamassassin/rules/trunk/sandbox/mmartinec/20_rpvalid.cf
URL: http://svn.apache.org/viewvc/spamassassin/rules/trunk/sandbox/mmartinec/20_rpvalid.cf?rev=627628&r1=627627&r2=627628&view=diff
==============================================================================
--- spamassassin/rules/trunk/sandbox/mmartinec/20_rpvalid.cf (original)
+++ spamassassin/rules/trunk/sandbox/mmartinec/20_rpvalid.cf Wed Feb 13 17:05:44 2008
@@ -1,13 +1,13 @@
 # SpamAssassin rules file: trustworthiness of a Return-Path (MailFrom)
 
+if version >= 3.003000
 ifplugin Mail::SpamAssassin::Plugin::WLBLEval
 
-if (version >= 3.003000)
 header   RP_MATCHES_RCVD  eval:check_mailfrom_matches_rcvd()
 describe RP_MATCHES_RCVD  Envelope sender domain matches handover relay domain
 tflags   RP_MATCHES_RCVD  nice
-endif
 
 #score   RP_MATCHES_RCVD  -0.1
 
+endif
 endif

Modified: spamassassin/rules/trunk/sandbox/mmartinec/25_dcc.cf
URL: http://svn.apache.org/viewvc/spamassassin/rules/trunk/sandbox/mmartinec/25_dcc.cf?rev=627628&r1=627627&r2=627628&view=diff
==============================================================================
--- spamassassin/rules/trunk/sandbox/mmartinec/25_dcc.cf (original)
+++ spamassassin/rules/trunk/sandbox/mmartinec/25_dcc.cf Wed Feb 13 17:05:44 2008
@@ -1,9 +1,9 @@
 # SpamAssassin rules file: dcc tests
 #
 
+if version >= 3.003000
 ifplugin Mail::SpamAssassin::Plugin::DCC
 
-if (version >= 3.003000)
 # to receive reputation data from DCC servers requires a commercial license
 
 full     DCC_REPUT_00_12  eval:check_dcc_reputation_range(00,12)
@@ -26,8 +26,6 @@
 describe DCC_REPUT_99_100 DCC reputation between 99 % or higher (spam)
 tflags   DCC_REPUT_99_100 net
 
-endif
-
 
 #score    DCC_REPUT_00_12  -0.5
 #score    DCC_REPUT_70_89   0.5
@@ -35,4 +33,5 @@
 #score    DCC_REPUT_95_98   1.2
 #score    DCC_REPUT_99_100  1.8
 
+endif
 endif

Modified: spamassassin/rules/trunk/sandbox/mmartinec/25_dkim.cf
URL: http://svn.apache.org/viewvc/spamassassin/rules/trunk/sandbox/mmartinec/25_dkim.cf?rev=627628&r1=627627&r2=627628&view=diff
==============================================================================
--- spamassassin/rules/trunk/sandbox/mmartinec/25_dkim.cf (original)
+++ spamassassin/rules/trunk/sandbox/mmartinec/25_dkim.cf Wed Feb 13 17:05:44 2008
@@ -1,8 +1,8 @@
 # SpamAssassin rules file: DKIM
 
+if version >= 3.002004
 ifplugin Mail::SpamAssassin::Plugin::DKIM
 
-if (version >= 3.002004)
 # alias to a misnomer DKIM_VERIFIED
 full     DKIM_VALID	eval:check_dkim_valid()
 tflags   DKIM_VALID	net nice
@@ -11,8 +11,6 @@
 full     DKIM_VALID_AU	eval:check_dkim_valid_author_sig()
 tflags   DKIM_VALID_AU	net nice
 describe DKIM_VALID_AU	Has a valid first-party DKIM or DK signature (i.e. author signature)
-endif
-
 
 #score   DKIM_VALID	     -0.1
 #score   DKIM_VALID_AU	     -0.05
@@ -22,4 +20,5 @@
 #score   DKIM_POLICY_SIGNSOME 0
 #score   DKIM_POLICY_TESTING  0
 
+endif
 endif

Modified: spamassassin/rules/trunk/sandbox/mmartinec/25_yg.cf
URL: http://svn.apache.org/viewvc/spamassassin/rules/trunk/sandbox/mmartinec/25_yg.cf?rev=627628&r1=627627&r2=627628&view=diff
==============================================================================
--- spamassassin/rules/trunk/sandbox/mmartinec/25_yg.cf (original)
+++ spamassassin/rules/trunk/sandbox/mmartinec/25_yg.cf Wed Feb 13 17:05:44 2008
@@ -1,9 +1,8 @@
 # SpamAssassin rules file: Gmail, Yahoo! and similar providers
 
+if version >= 3.002004
 ifplugin Mail::SpamAssassin::Plugin::DKIM
 
-if (version >= 3.002004)
-
 header   __ML1		Precedence =~ m{\b(list|bulk)\b}i
 header   __ML2		exists:List-Id
 header   __ML3		exists:List-Post
@@ -20,7 +19,7 @@
 describe __AUTH_YAHOO	Author claims to be from Yahoo
 
 header   __AUTH_GMAIL	From:addr =~ m{\@gmail\.com$}mi
-describe __AUTH_YAHOO	Author claims to be from gmail.com
+describe __AUTH_GMAIL	Author claims to be from gmail.com
 
 header   __AUTH_PAYPAL	From:addr =~ /[\@.]paypal\.com$/mi
 describe __AUTH_PAYPAL	Author claims to be from paypal.com
@@ -40,11 +39,10 @@
 priority NOTVALID_PAY	500
 describe NOTVALID_PAY	Claims to be from PayPal or eBay, but is not
 
-endif
-
 
 #score   NOTVALID_YAHOO  2.8
 #score   NOTVALID_GMAIL  2.8
 #score   NOTVALID_PAY    6
 
+endif
 endif

Modified: spamassassin/rules/trunk/sandbox/mmartinec/60_whitelist_dkim.cf
URL: http://svn.apache.org/viewvc/spamassassin/rules/trunk/sandbox/mmartinec/60_whitelist_dkim.cf?rev=627628&r1=627627&r2=627628&view=diff
==============================================================================
--- spamassassin/rules/trunk/sandbox/mmartinec/60_whitelist_dkim.cf (original)
+++ spamassassin/rules/trunk/sandbox/mmartinec/60_whitelist_dkim.cf Wed Feb 13 17:05:44 2008
@@ -1,9 +1,8 @@
 # SpamAssassin rules file: default DKIM whitelists
 
+if version >= 3.002004
 ifplugin Mail::SpamAssassin::Plugin::DKIM
 
-if (version >= 3.002004)
-
 def_whitelist_from_dkim  *@ebay.com
 def_whitelist_from_dkim  *@*.ebay.com
 def_whitelist_from_dkim  *@ebay.co.uk
@@ -28,5 +27,4 @@
 def_whitelist_from_dkim  *@cc.yahoo-inc.com
 
 endif
-
 endif