You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@spamassassin.apache.org by he...@apache.org on 2018/10/28 08:41:11 UTC
svn commit: r1844998 - in /spamassassin/trunk: rules/
rulesrc/sandbox/khopesh/ rulesrc/sandbox/mmartinec/
Author: hege
Date: Sun Oct 28 08:41:11 2018
New Revision: 1844998
URL: http://svn.apache.org/viewvc?rev=1844998&view=rev
Log:
Make some conditionals more uniform
Modified:
spamassassin/trunk/rules/10_default_prefs.cf
spamassassin/trunk/rules/20_aux_tlds.cf
spamassassin/trunk/rules/60_whitelist_auth.cf
spamassassin/trunk/rulesrc/sandbox/khopesh/20_khop_blessed.cf
spamassassin/trunk/rulesrc/sandbox/khopesh/20_khop_experimental.cf
spamassassin/trunk/rulesrc/sandbox/khopesh/20_trust.cf
spamassassin/trunk/rulesrc/sandbox/mmartinec/20_rpvalid.cf
Modified: spamassassin/trunk/rules/10_default_prefs.cf
URL: http://svn.apache.org/viewvc/spamassassin/trunk/rules/10_default_prefs.cf?rev=1844998&r1=1844997&r2=1844998&view=diff
==============================================================================
--- spamassassin/trunk/rules/10_default_prefs.cf (original)
+++ spamassassin/trunk/rules/10_default_prefs.cf Sun Oct 28 08:41:11 2018
@@ -134,13 +134,13 @@ bayes_auto_learn
report_safe 1
# Headers to parse for originating IP address
-if (can(Mail::SpamAssassin::Conf::feature_originating_ip_headers))
+if can(Mail::SpamAssassin::Conf::feature_originating_ip_headers)
clear_originating_ip_headers
originating_ip_headers X-Yahoo-Post-IP X-Originating-IP X-Apparently-From
originating_ip_headers X-SenderIP X-AOL-IP
endif
-if (can(Mail::SpamAssassin::Conf::feature_dns_local_ports_permit_avoid))
+if can(Mail::SpamAssassin::Conf::feature_dns_local_ports_permit_avoid)
# leave out the more densely populated port number ranges
dns_local_ports_avoid 0-11000
# leave out some ephemeral ports, making them available to other programs
Modified: spamassassin/trunk/rules/20_aux_tlds.cf
URL: http://svn.apache.org/viewvc/spamassassin/trunk/rules/20_aux_tlds.cf?rev=1844998&r1=1844997&r2=1844998&view=diff
==============================================================================
--- spamassassin/trunk/rules/20_aux_tlds.cf (original)
+++ spamassassin/trunk/rules/20_aux_tlds.cf Sun Oct 28 08:41:11 2018
@@ -33,7 +33,7 @@
# Let's clear the internal TLD list, we only want to read from this config
# file and ignore possible old hardcoded lists.
-if (can(Mail::SpamAssassin::Conf::feature_registryboundaries))
+if can(Mail::SpamAssassin::Conf::feature_registryboundaries)
clear_util_rb
endif
@@ -55,7 +55,7 @@ endif
# Since version 4.0 the util_rb_tld also accepts Unicode IDN labels (encoded as UTF-8), e.g.:
# wget http://data.iana.org/TLD/tlds-alpha-by-domain.txt -q -O - | grep -i '^xn--' | idn -u | tr '\n' ' ' | fold -w 80 -s | perl -pe 'chomp; s/.*/util_rb_tld \L$_\n/'
-if (can(Mail::SpamAssassin::Conf::feature_registryboundaries))
+if can(Mail::SpamAssassin::Conf::feature_registryboundaries)
util_rb_tld xn--11b4c3d xn--1ck2e1b xn--1qqw23a xn--2scrj9c xn--30rr7y xn--3bst00m
util_rb_tld xn--3ds443g xn--3e0b707e xn--3hcrj9c xn--3oq18vl8pn36a xn--3pxu8k xn--42c2d9a
util_rb_tld xn--45br5cyl xn--45brj9c xn--45q11c xn--4gbrim xn--54b7fta0cc xn--55qw42g
Modified: spamassassin/trunk/rules/60_whitelist_auth.cf
URL: http://svn.apache.org/viewvc/spamassassin/trunk/rules/60_whitelist_auth.cf?rev=1844998&r1=1844997&r2=1844998&view=diff
==============================================================================
--- spamassassin/trunk/rules/60_whitelist_auth.cf (original)
+++ spamassassin/trunk/rules/60_whitelist_auth.cf Sun Oct 28 08:41:11 2018
@@ -24,7 +24,7 @@
###########################################################################
# SPF and DKIM whitelist rules
-if (version >= 3.0030000)
+if (version >= 3.003000)
ifplugin Mail::SpamAssassin::Plugin::SPF
Modified: spamassassin/trunk/rulesrc/sandbox/khopesh/20_khop_blessed.cf
URL: http://svn.apache.org/viewvc/spamassassin/trunk/rulesrc/sandbox/khopesh/20_khop_blessed.cf?rev=1844998&r1=1844997&r2=1844998&view=diff
==============================================================================
--- spamassassin/trunk/rulesrc/sandbox/khopesh/20_khop_blessed.cf (original)
+++ spamassassin/trunk/rulesrc/sandbox/khopesh/20_khop_blessed.cf Sun Oct 28 08:41:11 2018
@@ -30,7 +30,7 @@
## Note, encrypted pgp/mime data will trigger EMPTY_MESSAGE
#
## 2007/02/27 - Syntax taken from the OpenPGP standard, RFC 2440 section 6.2
-#if ! plugin (Mail::SpamAssassin::Plugin::OpenPGP)
+#if !plugin(Mail::SpamAssassin::Plugin::OpenPGP)
# # moved from rawbody to body 20091021
# body __KHOP_PGP_I1 /-----BEGIN PGP (?:SIGNATURE|MESSAGE|PUBLIC|PRIVATE)(?:, PART [0-9]{1,4}\/[0-9]{1,4}| KEY BLOCK)?-----/
# tflags __KHOP_PGP_I1 nice
Modified: spamassassin/trunk/rulesrc/sandbox/khopesh/20_khop_experimental.cf
URL: http://svn.apache.org/viewvc/spamassassin/trunk/rulesrc/sandbox/khopesh/20_khop_experimental.cf?rev=1844998&r1=1844997&r2=1844998&view=diff
==============================================================================
--- spamassassin/trunk/rulesrc/sandbox/khopesh/20_khop_experimental.cf (original)
+++ spamassassin/trunk/rulesrc/sandbox/khopesh/20_khop_experimental.cf Sun Oct 28 08:41:11 2018
@@ -28,7 +28,7 @@ describe KHOP_FAKE_EBAY Sender falsely
# 0.0095/0.0246 spam/ham, 0.278 s/o @ 20100517
# masscheck doesn't cover ifplugin lines. It takes the first hit anyway.
-#if ! plugin (Mail::SpamAssassin::Plugin::URIDetail)
+#if !plugin(Mail::SpamAssassin::Plugin::URIDetail)
# rawbody KHOP_FOREIGN_CLICK m{\bhref=[^>]{9,199}>[^<]{0,80}(?:<(?!/a\b)[^>]{0,299}>[^<]{0,80}){0,9}[^<]{0,80}\b(?:cli(?:quez\W|ck\Wa)ici\b|cli(?:cca\W|c\Wa|que\Wa)qu[^<.,a ]|klie?k(?:\Whi?er|ni(?:j|nite)\Wtu[tk]aj)\b)}si
#else
# uri_detail doesn't support m{foo}i notation
Modified: spamassassin/trunk/rulesrc/sandbox/khopesh/20_trust.cf
URL: http://svn.apache.org/viewvc/spamassassin/trunk/rulesrc/sandbox/khopesh/20_trust.cf?rev=1844998&r1=1844997&r2=1844998&view=diff
==============================================================================
--- spamassassin/trunk/rulesrc/sandbox/khopesh/20_trust.cf (original)
+++ spamassassin/trunk/rulesrc/sandbox/khopesh/20_trust.cf Sun Oct 28 08:41:11 2018
@@ -25,7 +25,7 @@ tflags __DKIM_EXISTS nice
# leaving the below block intact. I'll try using its own syntax...
##{ __NOT_SPOOFED
-if ! plugin (Mail::SpamAssassin::Plugin::DKIM)
+if !plugin(Mail::SpamAssassin::Plugin::DKIM)
ifplugin Mail::SpamAssassin::Plugin::SPF
meta __NOT_SPOOFED SPF_PASS || __DKIM_EXISTS || !__LAST_EXTERNAL_RELAY_NO_AUTH || ALL_TRUSTED # no DKIM, yes SPF
else
Modified: spamassassin/trunk/rulesrc/sandbox/mmartinec/20_rpvalid.cf
URL: http://svn.apache.org/viewvc/spamassassin/trunk/rulesrc/sandbox/mmartinec/20_rpvalid.cf?rev=1844998&r1=1844997&r2=1844998&view=diff
==============================================================================
--- spamassassin/trunk/rulesrc/sandbox/mmartinec/20_rpvalid.cf (original)
+++ spamassassin/trunk/rulesrc/sandbox/mmartinec/20_rpvalid.cf Sun Oct 28 08:41:11 2018
@@ -1,7 +1,7 @@
# SpamAssassin rules file: trustworthiness of a Return-Path (MailFrom)
# subrule version for metas
-if version >= 3.003000
+if (version >= 3.003000)
ifplugin Mail::SpamAssassin::Plugin::WLBLEval
header __RP_MATCHES_RCVD eval:check_mailfrom_matches_rcvd()
else