You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@spamassassin.apache.org by km...@apache.org on 2020/12/30 23:58:10 UTC
svn commit: r1884976 - in /spamassassin/trunk/rules: 20_vbounce.cf
60_whitelist.cf
Author: kmcgrail
Date: Wed Dec 30 23:58:10 2020
New Revision: 1884976
URL: http://svn.apache.org/viewvc?rev=1884976&view=rev
Log:
added logic for vbounce rules for 3.4 vs 4.0 with the new code changes and fixed two meta rule misspellings as well as cleaned up a lot of whitespace for bug 7826
Modified:
spamassassin/trunk/rules/20_vbounce.cf
spamassassin/trunk/rules/60_whitelist.cf
Modified: spamassassin/trunk/rules/20_vbounce.cf
URL: http://svn.apache.org/viewvc/spamassassin/trunk/rules/20_vbounce.cf?rev=1884976&r1=1884975&r2=1884976&view=diff
==============================================================================
--- spamassassin/trunk/rules/20_vbounce.cf (original)
+++ spamassassin/trunk/rules/20_vbounce.cf Wed Dec 30 23:58:10 2020
@@ -50,7 +50,12 @@
ifplugin Mail::SpamAssassin::Plugin::VBounce
-body __MY_SERVERS_FOUND eval:check_welcomelist_bounce_relays()
+if can(Mail::SpamAssassin::Conf::feature_blocklist_welcomelist)
+ body __MY_SERVERS_FOUND eval:check_welcomelist_bounce_relays()
+else
+ body __MY_SERVERS_FOUND eval:check_whitelist_bounce_relays()
+endif
+
body __HAVE_BOUNCE_RELAYS eval:have_any_bounce_relays()
endif
Modified: spamassassin/trunk/rules/60_whitelist.cf
URL: http://svn.apache.org/viewvc/spamassassin/trunk/rules/60_whitelist.cf?rev=1884976&r1=1884975&r2=1884976&view=diff
==============================================================================
--- spamassassin/trunk/rules/60_whitelist.cf (original)
+++ spamassassin/trunk/rules/60_whitelist.cf Wed Dec 30 23:58:10 2020
@@ -53,7 +53,7 @@ else
tflags USER_IN_BLOCKLIST userconf nice noautolearn
score USER_IN_BLOCKLIST 0.01
- meta USER_IN_BLACKLIST (USER_IN_BLACKLIST)
+ meta USER_IN_BLACKLIST (USER_IN_BLOCKLIST)
describe USER_IN_BLACKLIST DEPRECATED: See USER_IN_BLOCKLIST
tflags USER_IN_BLACKLIST userconf nice noautolearn
score USER_IN_BLACKLIST 100.0
@@ -96,14 +96,14 @@ if can(Mail::SpamAssassin::Conf::feature
header USER_IN_DEF_WELCOMELIST eval:check_from_in_default_welcomelist()
describe USER_IN_DEF_WELCOMELIST From: address is in the default welcome-list
tflags USER_IN_DEF_WELCOMELIST userconf nice noautolearn
- score USER_IN_DEF_WELCOMELIST -15.0
+ score USER_IN_DEF_WELCOMELIST -15.0
ifplugin Mail::SpamAssassin::Plugin::RaciallyCharged
- meta USER_IN_DEF_WHITELIST (USER_IN_DEF_WELCOMELIST)
+ meta USER_IN_DEF_WHITELIST (USER_IN_DEF_WELCOMELIST)
describe USER_IN_DEF_WHITELIST DEPRECATED: See USER_IN_WELCOMELIST
tflags USER_IN_DEF_WHITELIST userconf nice noautolearn
- score USER_IN_DEF_WELCOMELIST -0.01
- score USER_IN_DEF_WHITELIST -15.0
+ score USER_IN_DEF_WELCOMELIST -0.01
+ score USER_IN_DEF_WHITELIST -15.0
endif
endif
else
@@ -111,7 +111,7 @@ else
header USER_IN_DEF_WELCOMELIST eval:check_from_in_default_whitelist()
describe USER_IN_DEF_WELCOMELIST From: address is in the default welcome-list
tflags USER_IN_DEF_WELCOMELIST userconf nice noautolearn
- score USER_IN_DEF_WELCOMELIST -0.01
+ score USER_IN_DEF_WELCOMELIST -0.01
meta USER_IN_DEF_WHITELIST (USER_IN_DEF_WELCOMELIST)
describe USER_IN_DEF_WHITELIST DEPRECATED: See USER_IN_DEF_WELCOMELIST
@@ -124,26 +124,26 @@ if can(Mail::SpamAssassin::Conf::feature
ifplugin Mail::SpamAssassin::Plugin::WLBLEval
#bz7826 renames blacklist to blocklist
header USER_IN_BLOCKLIST_TO eval:check_to_in_blocklist()
- describe USER_IN_BLOCKLIST_TO User is listed in 'blocklist_to'
+ describe USER_IN_BLOCKLIST_TO User is listed in 'blocklist_to'
tflags USER_IN_BLOCKLIST_TO userconf nice noautolearn
- score USER_IN_BLOCKLIST 10.0
+ score USER_IN_BLOCKLIST 10.0
ifplugin Mail::SpamAssassin::Plugin::RaciallyCharged
meta USER_IN_BLACKLIST_TO (USER_IN_BLOCKLIST_TO)
describe USER_IN_BLACKLIST_TO DEPRECATED: See USER_IN_BLOCKLIST_TO
tflags USER_IN_BLACKLIST_TO userconf nice noautolearn
- score USER_IN_BLOCKLIST_TO 0.01
- score USER_IN_BLACKLIST_TO 10.0
+ score USER_IN_BLOCKLIST_TO 0.01
+ score USER_IN_BLACKLIST_TO 10.0
endif
endif
else
ifplugin Mail::SpamAssassin::Plugin::WLBLEval
- header USER_IN_BLOCKLIST_TO eval:check_from_in_blacklist_to()
+ header USER_IN_BLOCKLIST_TO eval:check_to_in_blacklist()
describe USER_IN_BLOCKLIST_TO User is listed in 'blocklist_to'
tflags USER_IN_BLOCKLIST_TO userconf nice noautolearn
score USER_IN_BLOCKLIST_TO 0.01
- meta USER_IN_BLACKLIST_TO (USER_IN_BLACKLIST_TO)
+ meta USER_IN_BLACKLIST_TO (USER_IN_BLOCKLIST_TO)
describe USER_IN_BLACKLIST_TO DEPRECATED: See USER_IN_BLOCKLIST_TO
tflags USER_IN_BLACKLIST_TO userconf nice noautolearn
score USER_IN_BLACKLIST_TO 10.0
@@ -153,28 +153,28 @@ endif
if can(Mail::SpamAssassin::Conf::feature_blocklist_welcomelist)
ifplugin Mail::SpamAssassin::Plugin::WLBLEval
#bz7826 renames whitelist to welcomelist
- header USER_IN_WELCOMELIST_TO eval:check_to_in_welcomelist()
+ header USER_IN_WELCOMELIST_TO eval:check_to_in_welcomelist()
describe USER_IN_WELCOMELIST_TO User is listed in 'welcomelist_to'
- tflags USER_IN_WELCOMELIST_TO userconf nice noautolearn
- score USER_IN_WELCOMELIST_TO -6.0
+ tflags USER_IN_WELCOMELIST_TO userconf nice noautolearn
+ score USER_IN_WELCOMELIST_TO -6.0
ifplugin Mail::SpamAssassin::Plugin::RaciallyCharged
- meta USER_IN_WHITELIST_TO (USER_IN_WELCOMELIST_TO)
- describe USER_IN_WHITELIST_TO DEPRECATED: See USER_IN_WELCOMELIST_TO
- tflags USER_IN_WHITELIST_TO userconf nice noautolearn
- score USER_IN_WELCOMELIST_TO -0.01
- score USER_IN_WHITELIST_TO -6.0
+ meta USER_IN_WHITELIST_TO (USER_IN_WELCOMELIST_TO)
+ describe USER_IN_WHITELIST_TO DEPRECATED: See USER_IN_WELCOMELIST_TO
+ tflags USER_IN_WHITELIST_TO userconf nice noautolearn
+ score USER_IN_WELCOMELIST_TO -0.01
+ score USER_IN_WHITELIST_TO -6.0
endif
endif
else
ifplugin Mail::SpamAssassin::Plugin::WLBLEval
- header USER_IN_WELCOMELIST_TO eval:check_to_in_whitelist()
+ header USER_IN_WELCOMELIST_TO eval:check_to_in_whitelist()
describe USER_IN_WELCOMELIST_TO User is listed in 'welcomelist_to'
- tflags USER_IN_WELCOMELIST_TO userconf nice noautolearn
- score USER_IN_WELCOMELIST_TO -0.01
+ tflags USER_IN_WELCOMELIST_TO userconf nice noautolearn
+ score USER_IN_WELCOMELIST_TO -0.01
meta USER_IN_WHITELIST_TO (USER_IN_WELCOMELIST_TO)
- describe USER_IN_WHITELIST_TO DEPRECATED: See USER_IN_WELCOMELIST_TO
+ describe USER_IN_WHITELIST_TO DEPRECATED: See USER_IN_WELCOMELIST_TO
tflags USER_IN_WHITELIST_TO userconf nice noautolearn
score USER_IN_WHITELIST_TO -6.0
endif