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 2022/04/23 12:18:24 UTC
svn commit: r1900215 [3/3] - in /spamassassin/trunk: ./ lib/ lib/Mail/ lib/Mail/SpamAssassin/ lib/Mail/SpamAssassin/Conf/ lib/Mail/SpamAssassin/Plugin/ lib/Mail/SpamAssassin/Util/ rules/ spamc/ spamd/ t/ t/data/ t/data/welcomelists/ t/data/whitelists/ ...
Modified: spamassassin/trunk/rules/30_text_pt_br.cf
URL: http://svn.apache.org/viewvc/spamassassin/trunk/rules/30_text_pt_br.cf?rev=1900215&r1=1900214&r2=1900215&view=diff
==============================================================================
--- spamassassin/trunk/rules/30_text_pt_br.cf (original)
+++ spamassassin/trunk/rules/30_text_pt_br.cf Sat Apr 23 12:18:23 2022
@@ -50,16 +50,16 @@ lang pt_BR unsafe_report ou confirmar qu
lang pt_BR unsafe_report Se quiser visualizar a mensagem, pode ser mais seguro salvá-la em um arquivo
lang pt_BR unsafe_report e abrí-la com um editor.
-lang pt_BR describe USER_IN_BLACKLIST Endereço do From: está na blacklist do usuário
-lang pt_BR describe USER_IN_WHITELIST Endereço do From: está na whitelist do usuário
-lang pt_BR describe USER_IN_DEF_WHITELIST Endereço do From: está na whitelist padrão
-lang pt_BR describe USER_IN_BLACKLIST_TO Usuário está listado na 'blacklist_to'
-lang pt_BR describe USER_IN_WELCOMELIST_TO Usuário está listado na 'whitelist_to'
+lang pt_BR describe USER_IN_BLOCKLIST Endereço do From: está na blocklist do usuário
+lang pt_BR describe USER_IN_WELCOMELIST Endereço do From: está na welcomelist do usuário
+lang pt_BR describe USER_IN_DEF_WELCOMELIST Endereço do From: está na welcomelist padrão
+lang pt_BR describe USER_IN_BLOCKLIST_TO Usuário está listado na 'blocklist_to'
+lang pt_BR describe USER_IN_WELCOMELIST_TO Usuário está listado na 'welcomelist_to'
lang pt_BR describe USER_IN_MORE_SPAM_TO Usuário está listado na 'more_spam_to'
lang pt_BR describe USER_IN_ALL_SPAM_TO Usuário está listado na 'all_spam_to'
ifplugin Mail::SpamAssassin::Plugin::AWL
-lang pt_BR describe AWL Endereço do From: está na auto whitelist
+lang pt_BR describe AWL Endereço do From: está na auto welcomelist
endif
# 20_advance_fee.cf - These are removed and will break lint
@@ -357,7 +357,7 @@ lang pt_BR describe EMPTY_MESSAGE Mensag
lang pt_BR describe NO_HEADERS_MESSAGE Mensagem parece não conter grande parte dos cabeçalhos RFC-822
# 20_net_tests.cf
-lang pt_BR describe DIGEST_MULTIPLE Remetente está listado em mais de uma blacklist
+lang pt_BR describe DIGEST_MULTIPLE Remetente está listado em mais de uma blocklist
lang pt_BR describe NO_DNS_FOR_FROM Remetente não possui registros MX ou A no DNS
# 20_phrases.cf
@@ -579,17 +579,17 @@ lang pt_BR describe BODY_8BITS Body cont
endif
# 25_uribl.cf
-lang pt_BR describe URIBL_SBL Contém uma URL listada na blacklist SBL
-lang pt_BR describe URIBL_DBL_SPAM Contém uma URL listada na blacklist DBL blocklist
+lang pt_BR describe URIBL_SBL Contém uma URL listada na blocklist SBL
+lang pt_BR describe URIBL_DBL_SPAM Contém uma URL listada na blocklist DBL blocklist
lang pt_BR describe URIBL_DBL_ERROR Erro: Consultou a DBL por um IP
-#lang pt_BR describe URIBL_SC_SURBL Contém uma URL listada na blacklist SC SURBL - removed bug 7279
-lang pt_BR describe URIBL_WS_SURBL Contém uma URL listada na blacklist WS SURBL
-lang pt_BR describe URIBL_PH_SURBL Contém uma URL listada na blacklist PH SURBL
-#lang pt_BR describe URIBL_OB_SURBL Contém uma URL listada na blacklist OB SURBL - REMOVED BUG 6853
-#lang pt_BR describe URIBL_AB_SURBL Contém uma URL listada na blacklist AB SURBL - removed bug 7279
+#lang pt_BR describe URIBL_SC_SURBL Contém uma URL listada na blocklist SC SURBL - removed bug 7279
+lang pt_BR describe URIBL_WS_SURBL Contém uma URL listada na blocklist WS SURBL
+lang pt_BR describe URIBL_PH_SURBL Contém uma URL listada na blocklist PH SURBL
+#lang pt_BR describe URIBL_OB_SURBL Contém uma URL listada na blocklist OB SURBL - REMOVED BUG 6853
+#lang pt_BR describe URIBL_AB_SURBL Contém uma URL listada na blocklist AB SURBL - removed bug 7279
#Changed from JP to ABUSE per bug 7279
-lang pt_BR describe URIBL_ABUSE_SURBL Contém uma URL listada na blacklist ABUSE SURBL
-lang pt_BR describe URIBL_BLACK Contém uma URL listada na blacklist URIBL
+lang pt_BR describe URIBL_ABUSE_SURBL Contém uma URL listada na blocklist ABUSE SURBL
+lang pt_BR describe URIBL_BLACK Contém uma URL listada na blocklist URIBL
lang pt_BR describe URIBL_GREY Contém uma URL listada na greylist URIBL
lang pt_BR describe URIBL_RED Contém uma URL listada na redlist URIBL
@@ -598,16 +598,12 @@ ifplugin Mail::SpamAssassin::Plugin::Sho
lang pt_BR describe SHORTCIRCUIT Nem todas as regras foram executadas por causa de um problema em uma delas
endif
-# 60_whitelist_dkim.cf
-lang pt_BR describe USER_IN_DKIM_WHITELIST Endereço do From: está na whitelist de DKIM do usuário
-lang pt_BR describe USER_IN_DEF_DKIM_WL Endereço do From: está na whitelist de DKIM padrão
-
-# 60_whitelist_spf.cf
-lang pt_BR describe USER_IN_SPF_WHITELIST Endereço do From: está na whitelist de SPF do usuário
-lang pt_BR describe USER_IN_DEF_SPF_WL Endereço do From: está na whitelist de SPF padrão
-lang pt_BR describe ENV_AND_HDR_SPF_MATCH Endereço do From: confere com Envelope From e está na whitelist de SPF
-
-# 60_whitelist_subject.cf
-lang pt_BR describe SUBJECT_IN_WHITELIST Assunto contém palavra que está na whitelist do usuário
-lang pt_BR describe SUBJECT_IN_BLACKLIST Assunto contém palavra que está na blacklist do usuário
+# 60_welcomelist_dkim.cf
+lang pt_BR describe USER_IN_DKIM_WELCOMELIST Endereço do From: está na welcomelist de DKIM do usuário
+lang pt_BR describe USER_IN_DEF_DKIM_WL Endereço do From: está na welcomelist de DKIM padrão
+
+# 60_welcomelist_spf.cf
+lang pt_BR describe USER_IN_SPF_WELCOMELIST Endereço do From: está na welcomelist de SPF do usuário
+lang pt_BR describe USER_IN_DEF_SPF_WL Endereço do From: está na welcomelist de SPF padrão
+lang pt_BR describe ENV_AND_HDR_SPF_MATCH Endereço do From: confere com Envelope From e está na welcomelist de SPF
Modified: spamassassin/trunk/rules/50_scores.cf
URL: http://svn.apache.org/viewvc/spamassassin/trunk/rules/50_scores.cf?rev=1900215&r1=1900214&r2=1900215&view=diff
==============================================================================
--- spamassassin/trunk/rules/50_scores.cf (original)
+++ spamassassin/trunk/rules/50_scores.cf Sat Apr 23 12:18:23 2022
@@ -702,38 +702,34 @@ score NO_HEADERS_MESSAGE 0.001
score HTML_CHARSET_FARAWAY 0.500
score MIME_CHARSET_FARAWAY 2.450
-# rescore never changes the whitelist/blacklist scores
+# rescore never changes the welcomelist/blocklist scores
ifplugin Mail::SpamAssassin::Plugin::WLBLEval
-#score USER_IN_BLACKLIST 100.000 - Moved to 60_whitelist.cf
-#score USER_IN_WHITELIST -100.000 - Moved to 60_whitelist.cf
-#score USER_IN_DEF_WHITELIST -15.000 - Moved to 60_whitelist.cf
-#score USER_IN_BLACKLIST_TO 10.000 - Moved to 60_whitelist.cf
-#score URI_HOST_IN_BLACKLIST 100.0 - Moved to 60_whitelist.cf
-#score URI_HOST_IN_WHITELIST -100.0 - Moved to 60_whitelist.cf
+#score USER_IN_BLOCKLIST 100.000 - Moved to 60_welcomelist.cf
+#score USER_IN_WELCOMELIST -100.000 - Moved to 60_welcomelist.cf
+#score USER_IN_DEF_WELCOMELIST -15.000 - Moved to 60_welcomelist.cf
+#score USER_IN_BLOCKLIST_TO 10.000 - Moved to 60_welcomelist.cf
+#score URI_HOST_IN_BLOCKLIST 100.0 - Moved to 60_welcomelist.cf
+#score URI_HOST_IN_WELCOMELIST -100.0 - Moved to 60_welcomelist.cf
#Removed in bug 7256
-#score HEADER_HOST_IN_BLACKLIST 100.0
-#score HEADER_HOST_IN_WHITELIST -100.0
+#score HEADER_HOST_IN_BLOCKLIST 100.0
+#score HEADER_HOST_IN_WELCOMELIST -100.0
# not really false positives but the user wants spam!
-#score USER_IN_WHITELIST_TO -6.000 - Moved to 60_whitelist.cf
+#score USER_IN_WELCOMELIST_TO -6.000 - Moved to 60_welcomelist.cf
score USER_IN_MORE_SPAM_TO -20.000
score USER_IN_ALL_SPAM_TO -100.000
endif
-ifplugin Mail::SpamAssassin::Plugin::WhiteListSubject
-score SUBJECT_IN_WHITELIST -100
-score SUBJECT_IN_BLACKLIST 100
-endif # Mail::SpamAssassin::Plugin::WhiteListSubject
-
ifplugin Mail::SpamAssassin::Plugin::SPF
-score USER_IN_SPF_WHITELIST -100.000
+#score USER_IN_SPF_WELCOMELIST -0.01 - Moved to 60_welcomelist_spf.cf
+#score USER_IN_SPF_WHITELIST -100.000 - Moved to 60_welcomelist_spf.cf
score USER_IN_DEF_SPF_WL -7.500
score ENV_AND_HDR_SPF_MATCH -0.5
endif # Mail::SpamAssassin::Plugin::SPF
# DKIM
ifplugin Mail::SpamAssassin::Plugin::DKIM
-#score USER_IN_DKIM_WHITELIST -100.000 - Moved to 60_whitelist_dkim.cf
+#score USER_IN_DKIM_WELCOMELIST -100.000 - Moved to 60_welcomelist_dkim.cf
score USER_IN_DEF_DKIM_WL -7.500
score DKIM_SIGNED 0.1
score DKIM_VALID -0.1
Modified: spamassassin/trunk/rules/60_awl.cf
URL: http://svn.apache.org/viewvc/spamassassin/trunk/rules/60_awl.cf?rev=1900215&r1=1900214&r2=1900215&view=diff
==============================================================================
--- spamassassin/trunk/rules/60_awl.cf (original)
+++ spamassassin/trunk/rules/60_awl.cf Sat Apr 23 12:18:23 2022
@@ -1,4 +1,4 @@
-# SpamAssassin rules file: auto-whitelist
+# SpamAssassin rules file: auto-welcomelist
#
# Please don't modify this file as your changes will be overwritten with
# the next update. Use @@LOCAL_RULES_DIR@@/local.cf instead.
@@ -23,7 +23,13 @@
ifplugin Mail::SpamAssassin::Plugin::AWL
+if can(Mail::SpamAssassin::Conf::feature_welcomelist_blocklist)
+header AWL eval:check_from_in_auto_welcomelist()
+endif
+if !can(Mail::SpamAssassin::Conf::feature_welcomelist_blocklist)
header AWL eval:check_from_in_auto_whitelist()
+endif
+
describe AWL Adjusted score from AWL reputation of From: address
tflags AWL userconf noautolearn
priority AWL 1000
Modified: spamassassin/trunk/rules/60_shortcircuit.cf
URL: http://svn.apache.org/viewvc/spamassassin/trunk/rules/60_shortcircuit.cf?rev=1900215&r1=1900214&r2=1900215&view=diff
==============================================================================
--- spamassassin/trunk/rules/60_shortcircuit.cf (original)
+++ spamassassin/trunk/rules/60_shortcircuit.cf Sat Apr 23 12:18:23 2022
@@ -27,16 +27,18 @@
###########################################################################
-priority USER_IN_WHITELIST -1000
-priority USER_IN_DEF_WHITELIST -1000
-priority USER_IN_ALL_SPAM_TO -1000
-priority SUBJECT_IN_WHITELIST -1000
-
-priority ALL_TRUSTED -950
-
-priority SUBJECT_IN_BLACKLIST -900
-priority USER_IN_BLACKLIST_TO -900
-priority USER_IN_BLACKLIST -900
+priority USER_IN_WELCOMELIST -1000
+priority USER_IN_WHITELIST -1000
+priority USER_IN_DEF_WELCOMELIST -1000
+priority USER_IN_DEF_WHITELIST -1000
+priority USER_IN_ALL_SPAM_TO -1000
+
+priority ALL_TRUSTED -950
+
+priority USER_IN_BLOCKLIST_TO -900
+priority USER_IN_BLOCKLIST -900
+priority USER_IN_BLACKLIST_TO -900
+priority USER_IN_BLACKLIST -900
###########################################################################
Modified: spamassassin/trunk/rules/init.pre
URL: http://svn.apache.org/viewvc/spamassassin/trunk/rules/init.pre?rev=1900215&r1=1900214&r2=1900215&view=diff
==============================================================================
--- spamassassin/trunk/rules/init.pre (original)
+++ spamassassin/trunk/rules/init.pre Sat Apr 23 12:18:23 2022
@@ -14,6 +14,15 @@
# added to new files, named according to the release they're added in.
###########################################################################
+# Version compatibility - Welcomelist/Blocklist
+# In SpamAssassin 4.0, rules containing "whitelist" or "blacklist" have been
+# renamed to contain more racially neutral "welcomelist" and "blocklist"
+# terms. When this compatibility flag is enabled, old rule names from stock
+# rules will not hit anymore alongside the new ones. For more information,
+# see: https://wiki.apache.org/spamassassin/WelcomelistBlocklist
+#
+enable_compat welcomelist_blocklist
+
# RelayCountry - add metadata for Bayes learning, marking the countries
# a message was relayed through
#
Modified: spamassassin/trunk/rules/local.cf
URL: http://svn.apache.org/viewvc/spamassassin/trunk/rules/local.cf?rev=1900215&r1=1900214&r2=1900215&view=diff
==============================================================================
--- spamassassin/trunk/rules/local.cf (original)
+++ spamassassin/trunk/rules/local.cf Sat Apr 23 12:18:23 2022
@@ -82,24 +82,22 @@
#
ifplugin Mail::SpamAssassin::Plugin::Shortcircuit
#
-# default: strongly-whitelisted mails are *really* whitelisted now, if the
-# shortcircuiting plugin is active, causing early exit to save CPU load.
-# Uncomment to turn this on
+# default: strongly-welcomelisted mails are *really* welcomelisted now, if
+# the shortcircuiting plugin is active, causing early exit to save CPU
+# load. Uncomment to turn this on
#
# SpamAssassin tries hard not to launch DNS queries before priority -100.
# If you want to shortcircuit without launching unneeded queries, make
# sure such rule priority is below -100. These examples are already:
#
-# shortcircuit USER_IN_WHITELIST on
-# shortcircuit USER_IN_DEF_WHITELIST on
+# shortcircuit USER_IN_WELCOMELIST on
+# shortcircuit USER_IN_DEF_WELCOMELIST on
# shortcircuit USER_IN_ALL_SPAM_TO on
-# shortcircuit SUBJECT_IN_WHITELIST on
# the opposite; blacklisted mails can also save CPU
#
# shortcircuit USER_IN_BLACKLIST on
# shortcircuit USER_IN_BLACKLIST_TO on
-# shortcircuit SUBJECT_IN_BLACKLIST on
# if you have taken the time to correctly specify your "trusted_networks",
# this is another good way to save CPU
Modified: spamassassin/trunk/rules/v310.pre
URL: http://svn.apache.org/viewvc/spamassassin/trunk/rules/v310.pre?rev=1900215&r1=1900214&r2=1900215&view=diff
==============================================================================
--- spamassassin/trunk/rules/v310.pre (original)
+++ spamassassin/trunk/rules/v310.pre Sat Apr 23 12:18:23 2022
@@ -40,7 +40,7 @@ loadplugin Mail::SpamAssassin::Plugin::S
#
#loadplugin Mail::SpamAssassin::Plugin::AntiVirus
-# AWL - do auto-whitelist checks
+# AWL - do auto-welcomelist checks
#
#loadplugin Mail::SpamAssassin::Plugin::AWL
@@ -56,9 +56,9 @@ loadplugin Mail::SpamAssassin::Plugin::A
#
#loadplugin Mail::SpamAssassin::Plugin::AccessDB
-# WhitelistSubject - Whitelist/Blacklist certain subject regular expressions
+# WelcomelistSubject - Welcomelist/Blocklist certain subject regular expressions
#
-loadplugin Mail::SpamAssassin::Plugin::WhiteListSubject
+loadplugin Mail::SpamAssassin::Plugin::WelcomeListSubject
###########################################################################
# experimental plugins
Modified: spamassassin/trunk/rules/v400.pre
URL: http://svn.apache.org/viewvc/spamassassin/trunk/rules/v400.pre?rev=1900215&r1=1900214&r2=1900215&view=diff
==============================================================================
--- spamassassin/trunk/rules/v400.pre (original)
+++ spamassassin/trunk/rules/v400.pre Sat Apr 23 12:18:23 2022
@@ -16,11 +16,6 @@
# added to new files, named according to the release they're added in.
###########################################################################
-# RaciallyCharged - Enables racially charged configuration options for
-# backwards compatibility
-#
-# loadplugin Mail::SpamAssassin::Plugin::RaciallyCharged
-
# Esp - Checks for spam coming from some Esp providers
#
# loadplugin Mail::SpamAssassin::Plugin::Esp
Modified: spamassassin/trunk/sa-awl.raw
URL: http://svn.apache.org/viewvc/spamassassin/trunk/sa-awl.raw?rev=1900215&r1=1900214&r2=1900215&view=diff
==============================================================================
--- spamassassin/trunk/sa-awl.raw (original)
+++ spamassassin/trunk/sa-awl.raw Sat Apr 23 12:18:23 2022
@@ -67,7 +67,13 @@ use AnyDBM_File ;
my $db;
if ($#ARGV == -1) {
- $db = $ENV{HOME}."/.spamassassin/auto-whitelist";
+ # Check for existing file from <4.0, compatibility to be removed in 4.1
+ if (!-e $ENV{HOME}."/.spamassassin/auto-welcomelist" &&
+ -e $ENV{HOME}."/.spamassassin/auto-whitelist") {
+ $db = $ENV{HOME}."/.spamassassin/auto-whitelist";
+ } else {
+ $db = $ENV{HOME}."/.spamassassin/auto-welcomelist";
+ }
} else {
$db = $ARGV[0];
}
@@ -120,7 +126,7 @@ untie %h;
=head1 NAME
-sa-awl - examine and manipulate SpamAssassin's auto-whitelist db
+sa-awl - examine and manipulate SpamAssassin's auto-welcomelist db
=head1 SYNOPSIS
@@ -128,10 +134,10 @@ B<sa-awl> [--clean] [--min n] [dbfile]
=head1 DESCRIPTION
-Check or clean a SpamAssassin auto-whitelist (AWL) database file.
+Check or clean a SpamAssassin auto-welcomelist (AWL) database file.
The name of the file is specified after any options, as C<dbfile>.
-The default is C<$HOME/.spamassassin/auto-whitelist>.
+The default is C<$HOME/.spamassassin/auto-welcomelist>.
=head1 OPTIONS
Modified: spamassassin/trunk/sa-learn.raw
URL: http://svn.apache.org/viewvc/spamassassin/trunk/sa-learn.raw?rev=1900215&r1=1900214&r2=1900215&view=diff
==============================================================================
--- spamassassin/trunk/sa-learn.raw (original)
+++ spamassassin/trunk/sa-learn.raw Sat Apr 23 12:18:23 2022
@@ -998,7 +998,7 @@ With Bayesian analysis, it's all probabi
it is likely as this falls into a probabilistic distribution common to past
spam in your systems". Tell that to your users! Tell that to the client
when he asks "what can I do to change this". (By the way, the answer in
-this case is "use whitelisting".)
+this case is "use welcomelisting".)
=item It will take disk space and memory.
Modified: spamassassin/trunk/spamassassin.raw
URL: http://svn.apache.org/viewvc/spamassassin/trunk/spamassassin.raw?rev=1900215&r1=1900214&r2=1900215&view=diff
==============================================================================
--- spamassassin/trunk/spamassassin.raw (original)
+++ spamassassin/trunk/spamassassin.raw Sat Apr 23 12:18:23 2022
@@ -160,7 +160,7 @@ if ($Mail::SpamAssassin::VERSION ne '@@V
#
my %opt = ( 'create-prefs' => 1, 'format' => 'detect', pre => [], cf => [] );
-my $doing_whitelist_operation = 0;
+my $doing_welcomelist_operation = 0;
my $count = 0;
my @targets = ();
my $exitvalue;
@@ -174,10 +174,14 @@ my $total_messages = 0;
Getopt::Long::Configure(
qw(bundling no_getopt_compat no_auto_abbrev no_ignore_case));
GetOptions(
- 'add-addr-to-blacklist=s' => \$opt{'add-addr-to-blacklist'},
- 'add-addr-to-whitelist=s' => \$opt{'add-addr-to-whitelist'},
- 'add-to-blacklist' => \$opt{'add-to-blacklist'},
- 'add-to-whitelist|W' => \$opt{'add-to-whitelist'},
+ 'add-addr-to-blocklist=s' => \$opt{'add-addr-to-blocklist'},
+ 'add-addr-to-welcomelist=s' => \$opt{'add-addr-to-welcomelist'},
+ 'add-addr-to-blacklist=s' => \$opt{'add-addr-to-blocklist'}, # removed in 4.1
+ 'add-addr-to-whitelist=s' => \$opt{'add-addr-to-welcomelist'}, # removed in 4.1
+ 'add-to-blocklist' => \$opt{'add-to-blocklist'},
+ 'add-to-welcomelist|W' => \$opt{'add-to-welcomelist'},
+ 'add-to-blacklist' => \$opt{'add-to-blocklist'}, # removed in 4.1
+ 'add-to-whitelist' => \$opt{'add-to-welcomelist'}, # removed in 4.1
'configpath|config-file|config-dir|c|C=s' => \$opt{'configpath'},
'create-prefs!' => \$opt{'create-prefs'},
'pre=s' => \@{$opt{'pre'}},
@@ -195,8 +199,10 @@ GetOptions(
'mbox' => sub { $opt{'format'} = 'mbox'; },
'mbx' => sub { $opt{'format'} = 'mbx'; },
'prefspath|prefs-file|p=s' => \$opt{'prefspath'},
- 'remove-addr-from-whitelist=s' => \$opt{'remove-addr-from-whitelist'},
- 'remove-from-whitelist|R' => \$opt{'remove-from-whitelist'},
+ 'remove-addr-from-welcomelist=s' => \$opt{'remove-addr-from-welcomelist'},
+ 'remove-from-welcomelist|R' => \$opt{'remove-from-welcomelist'},
+ 'remove-addr-from-whitelist=s' => \$opt{'remove-addr-from-welcomelist'}, # removed in 4.1
+ 'remove-from-whitelist' => \$opt{'remove-from-welcomelist'}, # removed in 4.1
'remove-markup|despamassassinify|d' => \$opt{'remove-markup'},
'report|r' => \$opt{'report'},
'revoke|k' => \$opt{'revoke'},
@@ -285,23 +291,23 @@ if ($opt{'lint'}) {
exit $res ? 1 : 0;
}
-if ($opt{'remove-addr-from-whitelist'} ||
- $opt{'add-addr-to-whitelist'} ||
- $opt{'add-addr-to-blacklist'})
+if ($opt{'remove-addr-from-welcomelist'} ||
+ $opt{'add-addr-to-welcomelist'} ||
+ $opt{'add-addr-to-blocklist'})
{
$spamtest->init(1);
- if ( $opt{'add-addr-to-whitelist'} ) {
- $spamtest->add_address_to_whitelist($opt{'add-addr-to-whitelist'}, 1);
+ if ( $opt{'add-addr-to-welcomelist'} ) {
+ $spamtest->add_address_to_welcomelist($opt{'add-addr-to-welcomelist'}, 1);
}
- elsif ( $opt{'remove-addr-from-whitelist'} ) {
- $spamtest->remove_address_from_whitelist($opt{'remove-addr-from-whitelist'}, 1);
+ elsif ( $opt{'remove-addr-from-welcomelist'} ) {
+ $spamtest->remove_address_from_welcomelist($opt{'remove-addr-from-welcomelist'}, 1);
}
- elsif ( $opt{'add-addr-to-blacklist'} ) {
- $spamtest->add_address_to_blacklist($opt{'add-addr-to-blacklist'}, 1);
+ elsif ( $opt{'add-addr-to-blocklist'} ) {
+ $spamtest->add_address_to_blocklist($opt{'add-addr-to-blocklist'}, 1);
}
else {
- die "spamassassin: oops! unhandled whitelist operation";
+ die "spamassassin: oops! unhandled welcomelist operation";
}
$spamtest->finish();
@@ -311,21 +317,21 @@ if ($opt{'remove-addr-from-whitelist'} |
exit(0);
}
-# if we're going to do white/black-listing, let's prep now...
-if ( $opt{'remove-from-whitelist'}
- or $opt{'add-to-whitelist'}
- or $opt{'add-to-blacklist'} )
+# if we're going to do welcome/block-listing, let's prep now...
+if ( $opt{'remove-from-welcomelist'}
+ or $opt{'add-to-welcomelist'}
+ or $opt{'add-to-blocklist'} )
{
- $doing_whitelist_operation = 1;
+ $doing_welcomelist_operation = 1;
$spamtest->init(1);
}
# if we're doing things in test mode, force disable long-term memory
-# functions like autowhitelist and bayes autolearn.
+# functions like autowelcomelist and bayes autolearn.
# XXX - feels like we need a plugin hook here so plugins can be made
# aware and take appropriate action.
if ($opt{'test-mode'}) {
- $spamtest->{'conf'}->{'use_auto_whitelist'} = 0;
+ $spamtest->{'conf'}->{'use_auto_welcomelist'} = 0;
$spamtest->{'conf'}->{'bayes_auto_learn'} = 0;
}
@@ -411,7 +417,7 @@ if (defined $tempfile) {
# Let folks know how many messages were handled, as long as the handling
# didn't produce output (ala: check, test, or remove_markup ...)
-if ( $opt{'report'} || $opt{'revoke'} || $doing_whitelist_operation ) {
+if ( $opt{'report'} || $opt{'revoke'} || $doing_welcomelist_operation ) {
print "$count message(s) examined.\n" or die "error writing: $!";
}
@@ -460,19 +466,19 @@ sub wanted {
$mail = $spamtest->parse($dataref);
$count++;
- # This is a short cut -- doing white/black-list? Do it and return quickly.
- if ($doing_whitelist_operation) {
- if ( $opt{'add-to-whitelist'} ) {
- $spamtest->add_all_addresses_to_whitelist($mail, 1);
+ # This is a short cut -- doing welcome/block-list? Do it and return quickly.
+ if ($doing_welcomelist_operation) {
+ if ( $opt{'add-to-welcomelist'} ) {
+ $spamtest->add_all_addresses_to_welcomelist($mail, 1);
}
- elsif ( $opt{'remove-from-whitelist'} ) {
- $spamtest->remove_all_addresses_from_whitelist($mail, 1);
+ elsif ( $opt{'remove-from-welcomelist'} ) {
+ $spamtest->remove_all_addresses_from_welcomelist($mail, 1);
}
- elsif ( $opt{'add-to-blacklist'} ) {
- $spamtest->add_all_addresses_to_blacklist($mail, 1);
+ elsif ( $opt{'add-to-blocklist'} ) {
+ $spamtest->add_all_addresses_to_blocklist($mail, 1);
}
else {
- warn "spamassassin: oops! unhandled whitelist operation";
+ warn "spamassassin: oops! unhandled welcomelist operation";
}
$mail->finish();
@@ -832,8 +838,8 @@ from the SpamAssassin distribution.
Mail::SpamAssassin::ArchiveIterator
find and process messages one at a time
- Mail::SpamAssassin::AutoWhitelist
- auto-whitelist handler for SpamAssassin
+ Mail::SpamAssassin::AutoWelcomelist
+ auto-welcomelist handler for SpamAssassin
Mail::SpamAssassin::Bayes
determine spammishness using a Bayesian classifier
@@ -884,7 +890,7 @@ from the SpamAssassin distribution.
look up URLs against DNS blocklists
Mail::SpamAssassin::SQLBasedAddrList
- SpamAssassin SQL Based Auto Whitelist
+ SpamAssassin SQL Based Auto Welcomelist
=head1 BUGS
Modified: spamassassin/trunk/spamc/spamc.c
URL: http://svn.apache.org/viewvc/spamassassin/trunk/spamc/spamc.c?rev=1900215&r1=1900214&r2=1900215&view=diff
==============================================================================
--- spamassassin/trunk/spamc/spamc.c (original)
+++ spamassassin/trunk/spamc/spamc.c Sat Apr 23 12:18:23 2022
@@ -776,7 +776,7 @@ get_output_fd(int *fd)
* If the program's caller didn't identify the user to run as, use the
* current user for this. Note that we're not talking about UNIX perm-
* issions, but giving SpamAssassin a username so it can do per-user
- * configuration (whitelists & the like).
+ * configuration (welcomelists & the like).
*
* Allocates memory for the username, returns EX_OK if successful.
*/
Modified: spamassassin/trunk/spamd/README
URL: http://svn.apache.org/viewvc/spamassassin/trunk/spamd/README?rev=1900215&r1=1900214&r2=1900215&view=diff
==============================================================================
--- spamassassin/trunk/spamd/README (original)
+++ spamassassin/trunk/spamd/README Sat Apr 23 12:18:23 2022
@@ -83,9 +83,9 @@ use mysql or LDAP for per-user configura
to run as root, and this remains fully functional.
If you do not need to let your users define their own rules, maintain
-their own whitelists, or have non-world-readable home and ~/.spamassassin
+their own welcomelists, or have non-world-readable home and ~/.spamassassin
directories, then just set spamd up to run with the "-u username" option.
-Since spamd can use auto-whitelisting, which requires it maintain a
+Since spamd can use auto-welcomelisting, which requires it maintain a
database of email addresses on-disk, you should use a non-"root" but
non-"nobody" user: "mailnull" or "mail" are good choices, or even create a
"spamd" user.
@@ -129,7 +129,7 @@ spamc, it is easily possible for malicio
spamc clients to make spamd:
(1.) read (and hence determine) the contents of other users configurations
- (2.) change the contents of other users configurations (whitelisting)
+ (2.) change the contents of other users configurations (welcomelisting)
(3.) grab CPU time as that user -- this is an issue on ulimit'd systems
If users do not have the opportunity to invoke spamc themselves, and
Modified: spamassassin/trunk/spamd/spamd.raw
URL: http://svn.apache.org/viewvc/spamassassin/trunk/spamd/spamd.raw?rev=1900215&r1=1900214&r2=1900215&view=diff
==============================================================================
--- spamassassin/trunk/spamd/spamd.raw (original)
+++ spamassassin/trunk/spamd/spamd.raw Sat Apr 23 12:18:23 2022
@@ -743,7 +743,7 @@ if ( defined $ENV{'HOME'} ) {
delete $ENV{'HOME'}; # we do not want to use this when running spamd
}
-# Do whitelist later in tmp dir. Side effect: this will be done as -u user.
+# Do welcomelist later in tmp dir. Side effect: this will be done as -u user.
# Initialize SSL options
Modified: spamassassin/trunk/t/SATest.pm
URL: http://svn.apache.org/viewvc/spamassassin/trunk/t/SATest.pm?rev=1900215&r1=1900214&r2=1900215&view=diff
==============================================================================
--- spamassassin/trunk/t/SATest.pm (original)
+++ spamassassin/trunk/t/SATest.pm Sat Apr 23 12:18:23 2022
@@ -197,7 +197,7 @@ sub sa_t_init {
$set_user_prefs = 0;
$default_cf_lines = "
bayes_path ./$userstate/bayes
- auto_whitelist_path ./$userstate/auto-whitelist
+ auto_welcomelist_path ./$userstate/auto-welcomelist
";
read_config();
@@ -344,6 +344,21 @@ sub tstpre {
print OUT $lines; close OUT;
}
+# remove default compatibility option
+sub disable_compat {
+ my $compat = shift;
+ return unless defined $compat;
+ open (IN, "$siterules/init.pre") or die;
+ open (OUT, ">$siterules/init.pre.new") or die;
+ while (<IN>) {
+ next if $_ =~ /^\s*enable_compat\s+\Q$compat\E(?:\s|$)/i;
+ print OUT $_;
+ }
+ close OUT or die;
+ close IN or die;
+ rename("$siterules/init.pre.new", "$siterules/init.pre");
+}
+
# Run spamassassin. Calls back with the output.
# in $args: arguments to run with
# in $read_sub: callback for the output (should read from <IN>).
Modified: spamassassin/trunk/t/all_modules.t
URL: http://svn.apache.org/viewvc/spamassassin/trunk/t/all_modules.t?rev=1900215&r1=1900214&r2=1900215&view=diff
==============================================================================
--- spamassassin/trunk/t/all_modules.t (original)
+++ spamassassin/trunk/t/all_modules.t Sat Apr 23 12:18:23 2022
@@ -22,7 +22,7 @@ tstpre ("
loadplugin Mail::SpamAssassin::Plugin::AutoLearnThreshold
loadplugin Mail::SpamAssassin::Plugin::TextCat
loadplugin Mail::SpamAssassin::Plugin::AccessDB
- loadplugin Mail::SpamAssassin::Plugin::WhiteListSubject
+ loadplugin Mail::SpamAssassin::Plugin::WelcomeListSubject
loadplugin Mail::SpamAssassin::Plugin::MIMEHeader
loadplugin Mail::SpamAssassin::Plugin::ReplaceTags
loadplugin Mail::SpamAssassin::Plugin::DKIM
Modified: spamassassin/trunk/t/bayesbdb.t
URL: http://svn.apache.org/viewvc/spamassassin/trunk/t/bayesbdb.t?rev=1900215&r1=1900214&r2=1900215&view=diff
==============================================================================
--- spamassassin/trunk/t/bayesbdb.t (original)
+++ spamassassin/trunk/t/bayesbdb.t Sat Apr 23 12:18:23 2022
@@ -163,8 +163,8 @@ $wanted_examined = count_files("data/nic
ok(salearnrun("--ham data/nice", \&check_examined));
ok_all_patterns();
-$wanted_examined = count_files("data/whitelists");
-ok(salearnrun("--ham data/whitelists", \&check_examined));
+$wanted_examined = count_files("data/welcomelists");
+ok(salearnrun("--ham data/welcomelists", \&check_examined));
ok_all_patterns();
$wanted_examined = 3;
Modified: spamassassin/trunk/t/bayesdbm.t
URL: http://svn.apache.org/viewvc/spamassassin/trunk/t/bayesdbm.t?rev=1900215&r1=1900214&r2=1900215&view=diff
==============================================================================
--- spamassassin/trunk/t/bayesdbm.t (original)
+++ spamassassin/trunk/t/bayesdbm.t Sat Apr 23 12:18:23 2022
@@ -183,8 +183,8 @@ $wanted_examined = count_files("data/nic
ok(salearnrun("--ham data/nice", \&check_examined));
ok_all_patterns();
-$wanted_examined = count_files("data/whitelists");
-ok(salearnrun("--ham data/whitelists", \&check_examined));
+$wanted_examined = count_files("data/welcomelists");
+ok(salearnrun("--ham data/welcomelists", \&check_examined));
ok_all_patterns();
$wanted_examined = 3;
Modified: spamassassin/trunk/t/bayesdbm_flock.t
URL: http://svn.apache.org/viewvc/spamassassin/trunk/t/bayesdbm_flock.t?rev=1900215&r1=1900214&r2=1900215&view=diff
==============================================================================
--- spamassassin/trunk/t/bayesdbm_flock.t (original)
+++ spamassassin/trunk/t/bayesdbm_flock.t Sat Apr 23 12:18:23 2022
@@ -191,7 +191,7 @@ ok_all_patterns();
ok(salearnrun("--ham data/nice", \&check_examined));
ok_all_patterns();
-ok(salearnrun("--ham data/whitelists", \&check_examined));
+ok(salearnrun("--ham data/welcomelists", \&check_examined));
ok_all_patterns();
%patterns = ( 'non-token data: bayes db version' => 'db version' );
Modified: spamassassin/trunk/t/bayessdbm.t
URL: http://svn.apache.org/viewvc/spamassassin/trunk/t/bayessdbm.t?rev=1900215&r1=1900214&r2=1900215&view=diff
==============================================================================
--- spamassassin/trunk/t/bayessdbm.t (original)
+++ spamassassin/trunk/t/bayessdbm.t Sat Apr 23 12:18:23 2022
@@ -186,7 +186,7 @@ ok_all_patterns();
ok(salearnrun("--ham data/nice", \&check_examined));
ok_all_patterns();
-ok(salearnrun("--ham data/whitelists", \&check_examined));
+ok(salearnrun("--ham data/welcomelists", \&check_examined));
ok_all_patterns();
%patterns = ( 'non-token data: bayes db version' => 'db version' );
Modified: spamassassin/trunk/t/bayessdbm_seen_delete.t
URL: http://svn.apache.org/viewvc/spamassassin/trunk/t/bayessdbm_seen_delete.t?rev=1900215&r1=1900214&r2=1900215&view=diff
==============================================================================
--- spamassassin/trunk/t/bayessdbm_seen_delete.t (original)
+++ spamassassin/trunk/t/bayessdbm_seen_delete.t Sat Apr 23 12:18:23 2022
@@ -185,7 +185,7 @@ ok_all_patterns();
ok(salearnrun("--ham data/nice", \&check_examined));
ok_all_patterns();
-ok(salearnrun("--ham data/whitelists", \&check_examined));
+ok(salearnrun("--ham data/welcomelists", \&check_examined));
ok_all_patterns();
%patterns = ( 'non-token data: bayes db version' => 'db version' );
Modified: spamassassin/trunk/t/bayessql.t
URL: http://svn.apache.org/viewvc/spamassassin/trunk/t/bayessql.t?rev=1900215&r1=1900214&r2=1900215&view=diff
==============================================================================
--- spamassassin/trunk/t/bayessql.t (original)
+++ spamassassin/trunk/t/bayessql.t Sat Apr 23 12:18:23 2022
@@ -348,8 +348,8 @@ $wanted_examined = count_files("data/nic
ok(salearnrun("--ham data/nice", \&check_examined));
ok_all_patterns();
-$wanted_examined = count_files("data/whitelists");
-ok(salearnrun("--ham data/whitelists", \&check_examined));
+$wanted_examined = count_files("data/welcomelists");
+ok(salearnrun("--ham data/welcomelists", \&check_examined));
ok_all_patterns();
$wanted_examined = 3;
Modified: spamassassin/trunk/t/blacklist_autolearn.t
URL: http://svn.apache.org/viewvc/spamassassin/trunk/t/blacklist_autolearn.t?rev=1900215&r1=1900214&r2=1900215&view=diff
==============================================================================
--- spamassassin/trunk/t/blacklist_autolearn.t (original)
+++ spamassassin/trunk/t/blacklist_autolearn.t Sat Apr 23 12:18:23 2022
@@ -6,6 +6,8 @@ use Test::More tests => 3;
# ---------------------------------------------------------------------------
+disable_compat "welcomelist_blocklist";
+
%patterns = (
q{ USER_IN_BLACKLIST }, 'blacklisted',
);
Modified: spamassassin/trunk/t/data/01_test_rules.pre
URL: http://svn.apache.org/viewvc/spamassassin/trunk/t/data/01_test_rules.pre?rev=1900215&r1=1900214&r2=1900215&view=diff
==============================================================================
--- spamassassin/trunk/t/data/01_test_rules.pre (original)
+++ spamassassin/trunk/t/data/01_test_rules.pre Sat Apr 23 12:18:23 2022
@@ -17,7 +17,6 @@ loadplugin Mail::SpamAssassin::Plugin::H
loadplugin Mail::SpamAssassin::Plugin::FromNameSpoof
loadplugin Mail::SpamAssassin::Plugin::Phishing
loadplugin Mail::SpamAssassin::Plugin::OLEVBMacro
-loadplugin Mail::SpamAssassin::Plugin::RaciallyCharged
loadplugin Mail::SpamAssassin::Plugin::Esp
loadplugin Mail::SpamAssassin::Plugin::ExtractText
Modified: spamassassin/trunk/t/debug.t
URL: http://svn.apache.org/viewvc/spamassassin/trunk/t/debug.t?rev=1900215&r1=1900214&r2=1900215&view=diff
==============================================================================
--- spamassassin/trunk/t/debug.t (original)
+++ spamassassin/trunk/t/debug.t Sat Apr 23 12:18:23 2022
@@ -11,12 +11,12 @@ plan tests => 3;
# list of known debug facilities
my %facility = map( ($_, 1),
- qw( accessdb archive-iterator async auto-whitelist bayes check config daemon
+ qw( accessdb archive-iterator async auto-welcomelist bayes check config daemon
dcc dkim askdns dns dnseval eval generic https_http_mismatch facility FreeMail
ident ignore info ldap learn locker log logger markup HashBL
message metadata mimeheader netset plugin prefork progress pyzor razor2
received-header replacetags reporter rules rules-all spamd spf textcat
- timing TxRep uri uridnsbl util pdfinfo asn geodb RaciallyCharged
+ timing TxRep uri uridnsbl util pdfinfo asn geodb
PHISHTAG resourcelimits https_http_mismatch DMARC ));
my $fh = IO::File->new_tmpfile();
Modified: spamassassin/trunk/t/header_utf8.t
URL: http://svn.apache.org/viewvc/spamassassin/trunk/t/header_utf8.t?rev=1900215&r1=1900214&r2=1900215&view=diff
==============================================================================
--- spamassassin/trunk/t/header_utf8.t [UTF-8] (original)
+++ spamassassin/trunk/t/header_utf8.t [UTF-8] Sat Apr 23 12:18:23 2022
@@ -47,7 +47,7 @@ plan tests => $tests;
q{/ LT_NOTE /} => 'LT_NOTE',
q{/ LT_UTF8SMTP_ANY /} => 'LT_UTF8SMTP_ANY',
q{/ LT_SPLIT_UTF8_SUBJ /} => 'LT_SPLIT_UTF8_SUBJ',
- q{/ USER_IN_BLACKLIST /} => 'USER_IN_BLACKLIST',
+ q{/ USER_IN_BLOCKLIST /} => 'USER_IN_BLOCKLIST',
);
%mypatterns_utf8 = ( # as it appears in a report body
Modified: spamassassin/trunk/t/priorities.t
URL: http://svn.apache.org/viewvc/spamassassin/trunk/t/priorities.t?rev=1900215&r1=1900214&r2=1900215&view=diff
==============================================================================
--- spamassassin/trunk/t/priorities.t (original)
+++ spamassassin/trunk/t/priorities.t Sat Apr 23 12:18:23 2022
@@ -7,6 +7,8 @@ use Test::More tests => 10;
use Mail::SpamAssassin;
+disable_compat "welcomelist_blocklist";
+
tstlocalrules (q{
priority USER_IN_WHITELIST -1000
Modified: spamassassin/trunk/t/spamd_welcomelist_leak.t
URL: http://svn.apache.org/viewvc/spamassassin/trunk/t/spamd_welcomelist_leak.t?rev=1900215&r1=1900214&r2=1900215&view=diff
==============================================================================
--- spamassassin/trunk/t/spamd_welcomelist_leak.t (original)
+++ spamassassin/trunk/t/spamd_welcomelist_leak.t Sat Apr 23 12:18:23 2022
@@ -33,7 +33,7 @@ close OUT;
%patterns = (
q{ 99 MYBODY }, 'MYBODY',
- q{-0.0 USER_IN_WELCOMELIST }, 'USER_IN_WELCOMELIST',
+ q{-100 USER_IN_WELCOMELIST }, 'USER_IN_WELCOMELIST',
);
%anti_patterns = (
);
@@ -48,7 +48,7 @@ clear_pattern_counters();
q{ 99 MYBODY }, 'MYBODY',
);
%anti_patterns = (
- q{-0.0 USER_IN_WELCOMELIST }, 'USER_IN_WELCOMELIST',
+ q{ 0 USER_IN_WELCOMELIST }, 'USER_IN_WELCOMELIST',
);
ok (spamcrun ("-u testuser2 < data/spam/001", \&patterns_run_cb));
checkfile ($spamd_stderr, \&patterns_run_cb);
Modified: spamassassin/trunk/t/spamd_whitelist_leak.t
URL: http://svn.apache.org/viewvc/spamassassin/trunk/t/spamd_whitelist_leak.t?rev=1900215&r1=1900214&r2=1900215&view=diff
==============================================================================
--- spamassassin/trunk/t/spamd_whitelist_leak.t (original)
+++ spamassassin/trunk/t/spamd_whitelist_leak.t Sat Apr 23 12:18:23 2022
@@ -11,6 +11,8 @@ plan tests => 8;
# ---------------------------------------------------------------------------
# bug 6003
+disable_compat "welcomelist_blocklist";
+
tstlocalrules (q{
body MYBODY /LOSE WEIGHT/
score MYBODY 99
@@ -48,7 +50,7 @@ clear_pattern_counters();
q{ 99 MYBODY }, 'MYBODY',
);
%anti_patterns = (
- q{-100 USER_IN_WHITELIST }, 'USER_IN_WHITELIST',
+ q{ 0 USER_IN_WHITELIST }, 'USER_IN_WHITELIST',
);
ok (spamcrun ("-u testuser2 < data/spam/001", \&patterns_run_cb));
checkfile ($spamd_stderr, \&patterns_run_cb);
Modified: spamassassin/trunk/t/spf.t
URL: http://svn.apache.org/viewvc/spamassassin/trunk/t/spf.t?rev=1900215&r1=1900214&r2=1900215&view=diff
==============================================================================
--- spamassassin/trunk/t/spf.t (original)
+++ spamassassin/trunk/t/spf.t Sat Apr 23 12:18:23 2022
@@ -15,6 +15,8 @@ plan tests => 72;
# ---------------------------------------------------------------------------
+disable_compat "welcomelist_blocklist";
+
# ensure all rules will fire
tstlocalrules ("
score SPF_FAIL 0.001
Modified: spamassassin/trunk/t/spf_welcome_block.t
URL: http://svn.apache.org/viewvc/spamassassin/trunk/t/spf_welcome_block.t?rev=1900215&r1=1900214&r2=1900215&view=diff
==============================================================================
--- spamassassin/trunk/t/spf_welcome_block.t (original)
+++ spamassassin/trunk/t/spf_welcome_block.t Sat Apr 23 12:18:23 2022
@@ -26,7 +26,7 @@ tstlocalrules ("
score SPF_PASS -0.001
score SPF_HELO_PASS -0.001
score USER_IN_DEF_SPF_WL -0.001
- score USER_IN_SPF_WHITELIST -0.001
+ score USER_IN_SPF_WELCOMELIST -0.001
");
%patterns = (
@@ -307,7 +307,7 @@ tstprefs("
%patterns = (
q{ SPF_HELO_PASS }, 'helo_pass',
q{ SPF_PASS }, 'pass',
- q{ USER_IN_SPF_WHITELIST }, 'spf_whitelist',
+ q{ USER_IN_SPF_WELCOMELIST }, 'spf_whitelist',
q{ USER_IN_DEF_SPF_WL }, 'default_spf_whitelist',
);
@@ -328,7 +328,7 @@ tstprefs("
);
%anti_patterns = (
- q{ USER_IN_SPF_WHITELIST }, 'spf_whitelist',
+ q{ USER_IN_SPF_WELCOMELIST }, 'spf_whitelist',
q{ USER_IN_DEF_SPF_WL }, 'default_spf_whitelist',
);
@@ -350,7 +350,7 @@ tstprefs("
%patterns = (
q{ SPF_HELO_PASS }, 'helo_pass',
q{ SPF_PASS }, 'pass',
- q{ USER_IN_SPF_WHITELIST }, 'spf_whitelist',
+ q{ USER_IN_SPF_WELCOMELIST }, 'spf_whitelist',
q{ USER_IN_DEF_SPF_WL }, 'default_spf_whitelist',
);
@@ -480,7 +480,7 @@ tstprefs("
);
%anti_patterns = (
- q{ USER_IN_SPF_WHITELIST }, 'spf_whitelist',
+ q{ USER_IN_SPF_WELCOMELIST }, 'spf_whitelist',
q{ USER_IN_DEF_SPF_WL }, 'default_spf_whitelist',
);
Modified: spamassassin/trunk/t/sql_based_whitelist.t
URL: http://svn.apache.org/viewvc/spamassassin/trunk/t/sql_based_whitelist.t?rev=1900215&r1=1900214&r2=1900215&view=diff
==============================================================================
--- spamassassin/trunk/t/sql_based_whitelist.t (original)
+++ spamassassin/trunk/t/sql_based_whitelist.t Sat Apr 23 12:18:23 2022
@@ -87,31 +87,31 @@ ok(sarun ("--remove-addr-from-whitelist
# 3 times, to get into the whitelist:
%patterns = (%is_nonspam_patterns, (q{'144.137 scores 0, msgcount 0'} => 'scores'));
-ok(sarun ("-L -t -D auto-whitelist < data/nice/002 2>&1", \&patterns_run_cb));
+ok(sarun ("-L -t -D auto-welcomelist < data/nice/002 2>&1", \&patterns_run_cb));
ok_all_patterns();
%patterns = (%is_nonspam_patterns, (q{'144.137 scores -2, msgcount 1'} => 'scores'));
-ok(sarun ("-L -t -D auto-whitelist < data/nice/002 2>&1", \&patterns_run_cb));
+ok(sarun ("-L -t -D auto-welcomelist < data/nice/002 2>&1", \&patterns_run_cb));
ok_all_patterns();
%patterns = (%is_nonspam_patterns, (q{'144.137 scores -4, msgcount 2'} => 'scores'));
-ok(sarun ("-L -t -D auto-whitelist < data/nice/002 2>&1", \&patterns_run_cb));
+ok(sarun ("-L -t -D auto-welcomelist < data/nice/002 2>&1", \&patterns_run_cb));
ok_all_patterns();
# Now check
%patterns = (%is_nonspam_patterns, (q{'144.137 scores -6, msgcount 3'} => 'scores'));
-ok(sarun ("-L -t -D auto-whitelist < data/nice/002 2>&1", \&patterns_run_cb));
+ok(sarun ("-L -t -D auto-welcomelist < data/nice/002 2>&1", \&patterns_run_cb));
ok_all_patterns();
%patterns = (%is_spam_patterns, (q{'144.137 scores -8, msgcount 4'} => 'scores'));;
-ok(sarun ("-L -t -D auto-whitelist < data/spam/004 2>&1", \&patterns_run_cb));
+ok(sarun ("-L -t -D auto-welcomelist < data/spam/004 2>&1", \&patterns_run_cb));
ok_all_patterns();
# Should be raised after last spam
%patterns = (%is_spam_patterns, (q{'144.137 scores 9.837, msgcount 5'} => 'scores'));;
-ok(sarun ("-L -t -D auto-whitelist < data/spam/004 2>&1", \&patterns_run_cb));
+ok(sarun ("-L -t -D auto-welcomelist < data/spam/004 2>&1", \&patterns_run_cb));
ok_all_patterns();
%patterns = (%is_spam_patterns2, (q{'210.73 scores 0, msgcount 0'} => 'scores'));;
-ok(sarun ("-L -t -D auto-whitelist < data/spam/007 2>&1", \&patterns_run_cb));
+ok(sarun ("-L -t -D auto-welcomelist < data/spam/007 2>&1", \&patterns_run_cb));
ok_all_patterns();
ok(sarun ("--remove-addr-from-whitelist whitelist_test\@whitelist.spamassassin.taint.org", \&patterns_run_cb));
Modified: spamassassin/trunk/t/welcomelist_from.t
URL: http://svn.apache.org/viewvc/spamassassin/trunk/t/welcomelist_from.t?rev=1900215&r1=1900214&r2=1900215&view=diff
==============================================================================
--- spamassassin/trunk/t/welcomelist_from.t (original)
+++ spamassassin/trunk/t/welcomelist_from.t Sat Apr 23 12:18:23 2022
@@ -16,22 +16,22 @@ tstprefs ("
welcomelist_from_rcvd foo\@example.com spamassassin.org
welcomelist_from_rcvd foo\@example.com example.com
welcomelist_from_rcvd bar\@example.com example.com
- whitelist_allows_relays bar\@example.com
+ welcomelist_allows_relays bar\@example.com
welcomelist_from baz\@example.com
welcomelist_from bam\@example.com
- unwhitelist_from bam\@example.com
+ unwelcomelist_from bam\@example.com
unwelcomelist_from_rcvd mumble\@example.com
");
-# tests 1 - 4 does welcomelist_from (previously whitelist_from) work?
+# tests 1 - 4 does welcomelist_from work?
%patterns = (
q{ USER_IN_WELCOMELIST }, 'w1'
);
%anti_patterns = (
- q{ FORGED_IN_WHITELIST }, 'a2',
- q{ USER_IN_DEF_WHITELIST }, 'a3',
- q{ FORGED_IN_DEF_WHITELIST }, 'a4'
+ q{ FORGED_IN_WELCOMELIST }, 'a2',
+ q{ USER_IN_DEF_WELCOMELIST }, 'a3',
+ q{ FORGED_IN_DEF_WELCOMELIST }, 'a4'
);
sarun ("-L -t < data/nice/008", \&patterns_run_cb);
ok_all_patterns();
@@ -45,13 +45,13 @@ sarun ("-L -t < data/nice/010", \&patter
ok_all_patterns();
%patterns = (
- q{ USER_IN_DEF_WHITELIST }, 'w5'
+ q{ USER_IN_DEF_WELCOMELIST }, 'w5'
);
%anti_patterns = (
- q{ USER_IN_WHITELIST }, 'a6',
- q{ FORGED_IN_WHITELIST }, 'a7',
- q{ FORGED_IN_DEF_WHITELIST }, 'a8'
+ q{ 0 USER_IN_WELCOMELIST }, 'a6',
+ q{ FORGED_IN_WELCOMELIST }, 'a7',
+ q{ FORGED_IN_DEF_WELCOMELIST }, 'a8'
);
# tests 13 - 16 does def_welcomelist_from_rcvd work?
@@ -65,17 +65,17 @@ ok_all_patterns();
%patterns = ();
%anti_patterns = (
- q{ USER_IN_WHITELIST }, 'a9',
- q{ FORGED_IN_WHITELIST }, 'a10',
- q{ USER_IN_DEF_WHITELIST }, 'a11',
- q{ FORGED_IN_DEF_WHITELIST }, 'a12'
+ q{ 0 USER_IN_WELCOMELIST }, 'a9',
+ q{ FORGED_IN_WELCOMELIST }, 'a10',
+ q{ USER_IN_DEF_WELCOMELIST }, 'a11',
+ q{ FORGED_IN_DEF_WELCOMELIST }, 'a12'
);
-# tests 21 - 24 does whitelist_allows_relays suppress the forged rule without
-# putting the address on the whitelist?
+# tests 21 - 24 does welcomelist_allows_relays suppress the forged rule without
+# putting the address on the welcomelist?
sarun ("-L -t < data/nice/013", \&patterns_run_cb);
ok_all_patterns();
-# tests 25 - 28 does unwhitelist_from work?
+# tests 25 - 28 does unwelcomelist_from work?
sarun ("-L -t < data/nice/014", \&patterns_run_cb);
ok_all_patterns();
Modified: spamassassin/trunk/t/whitelist_addrs.t
URL: http://svn.apache.org/viewvc/spamassassin/trunk/t/whitelist_addrs.t?rev=1900215&r1=1900214&r2=1900215&view=diff
==============================================================================
--- spamassassin/trunk/t/whitelist_addrs.t (original)
+++ spamassassin/trunk/t/whitelist_addrs.t Sat Apr 23 12:18:23 2022
@@ -14,13 +14,13 @@ plan tests => 35;
# ---------------------------------------------------------------------------
%added_address_whitelist_patterns = (
- q{SpamAssassin auto-whitelist: adding address to whitelist:}, 'added address to whitelist',
+ q{SpamAssassin auto-welcomelist: adding address to welcomelist:}, 'added address to welcomelist',
);
%added_address_blacklist_patterns = (
- q{SpamAssassin auto-whitelist: adding address to blacklist:}, 'added address to blacklist',
+ q{SpamAssassin auto-welcomelist: adding address to blocklist:}, 'added address to blocklist',
);
%removed_address_patterns = (
- q{SpamAssassin auto-whitelist: removing address:}, 'removed address',
+ q{SpamAssassin auto-welcomelist: removing address:}, 'removed address',
);
%is_nonspam_patterns = (
q{X-Spam-Status: No}, 'spamno',
@@ -86,7 +86,7 @@ open STDOUT, ">&".fileno($oldout) || die
select STDOUT; $| = 1;
#warn "# $error\n";
-ok($error !~ /SpamAssassin auto-whitelist: /);
+ok($error !~ /SpamAssassin auto-welcomelist: /);
%patterns = %is_nonspam_patterns;
ok (sarun ("-L < data/nice/002", \&patterns_run_cb));
@@ -113,7 +113,7 @@ open STDOUT, ">&".fileno($oldout) || die
select STDOUT; $| = 1;
#warn "# $error\n";
-ok($error !~ /SpamAssassin auto-whitelist: /);
+ok($error !~ /SpamAssassin auto-welcomelist: /);
%patterns = %is_spam_patterns;
sarun ("-L < data/spam/004", \&patterns_run_cb);
@@ -137,7 +137,7 @@ open STDOUT, ">&".fileno($oldout) || die
select STDOUT; $| = 1;
#warn "# $error\n";
-ok($error !~ /SpamAssassin auto-whitelist: /);
+ok($error !~ /SpamAssassin auto-welcomelist: /);
%patterns = %is_spam_patterns;
sarun ("-L < data/nice/002", \&patterns_run_cb);
@@ -177,7 +177,7 @@ open STDOUT, ">&".fileno($oldout) || die
select STDOUT; $| = 1;
#warn "# $error\n";
-ok($error !~ /SpamAssassin auto-whitelist: /);
+ok($error !~ /SpamAssassin auto-welcomelist: /);
%patterns = %is_nonspam_patterns;
ok (sarun ("-L < data/nice/002", \&patterns_run_cb));
@@ -204,7 +204,7 @@ open STDOUT, ">&".fileno($oldout) || die
select STDOUT; $| = 1;
#warn "# $error\n";
-ok($error !~ /SpamAssassin auto-whitelist: /);
+ok($error !~ /SpamAssassin auto-welcomelist: /);
%patterns = %is_spam_patterns;
sarun ("-L < data/spam/004", \&patterns_run_cb);
@@ -228,7 +228,7 @@ open STDOUT, ">&".fileno($oldout) || die
select STDOUT; $| = 1;
#warn "# $error\n";
-ok($error !~ /SpamAssassin auto-whitelist: /);
+ok($error !~ /SpamAssassin auto-welcomelist: /);
%patterns = %is_spam_patterns;
sarun ("-L < data/nice/002", \&patterns_run_cb);
Modified: spamassassin/trunk/t/whitelist_from.t
URL: http://svn.apache.org/viewvc/spamassassin/trunk/t/whitelist_from.t?rev=1900215&r1=1900214&r2=1900215&view=diff
==============================================================================
--- spamassassin/trunk/t/whitelist_from.t (original)
+++ spamassassin/trunk/t/whitelist_from.t Sat Apr 23 12:18:23 2022
@@ -9,6 +9,8 @@ plan tests => 32;
# ---------------------------------------------------------------------------
+disable_compat "welcomelist_blocklist";
+
tstprefs ("
def_whitelist_from_rcvd *\@paypal.com paypal.com
def_whitelist_from_rcvd *\@paypal.com ebay.com
Modified: spamassassin/trunk/t/whitelist_subject.t
URL: http://svn.apache.org/viewvc/spamassassin/trunk/t/whitelist_subject.t?rev=1900215&r1=1900214&r2=1900215&view=diff
==============================================================================
--- spamassassin/trunk/t/whitelist_subject.t (original)
+++ spamassassin/trunk/t/whitelist_subject.t Sat Apr 23 12:18:23 2022
@@ -6,6 +6,8 @@ use Test::More tests => 4;
# ---------------------------------------------------------------------------
+disable_compat "welcomelist_blocklist";
+
%is_whitelist_patterns = (
q{ SUBJECT_IN_WHITELIST }, 'whitelist-subject'
);
Modified: spamassassin/trunk/tools/convert_awl_dbm_to_sql
URL: http://svn.apache.org/viewvc/spamassassin/trunk/tools/convert_awl_dbm_to_sql?rev=1900215&r1=1900214&r2=1900215&view=diff
==============================================================================
--- spamassassin/trunk/tools/convert_awl_dbm_to_sql (original)
+++ spamassassin/trunk/tools/convert_awl_dbm_to_sql Sat Apr 23 12:18:23 2022
@@ -1,7 +1,7 @@
#!/usr/bin/perl
# WARNING: This script is VERY rough and provided only as a template
-# for moving a DB based autowhitelist to a SQL based one. You should
+# for moving a DB based autowelcomelist to a SQL based one. You should
# do backups and that sort of thing before attempting to use this
# script.
@@ -17,7 +17,7 @@ my ( %h $k $v );
sub usage {
print "This program takes the following required arguments:\n";
- print "--username <username> - This is who's whitelist you are loading.\n";
+ print "--username <username> - This is who's welcomelist you are loading.\n";
print " It should match exactly what spassassin or\n";
print " spamd will be using.\n";
print "--dsn <dsn> - This is the database DSN. It should be in the form:\n";
@@ -26,9 +26,9 @@ sub usage {
print "--ok - Basically a sanity check that you understand how dangerous this script is.\n";
print "\n";
print "This program take the following optional arguments:\n";
- print "--dbautowhitelist <path> - path to the auto-whitelist you wish to\n";
+ print "--dbautowelcomelist <path> - path to the auto-welcomelist you wish to\n";
print " convert. Default is to use \n";
- print " \$ENV{HOME}/.spamassassin/auto-whitelist\n";
+ print " \$ENV{HOME}/.spamassassin/auto-welcomelist\n";
print "--sqlusername <username> - Needed if your DBI driver requires a username.\n";
print "--sqlpassword <password> - Needed if your DBI driver requires a password.\n";
print "\n\n";
@@ -45,7 +45,7 @@ my %opt;
GetOptions('dsn=s' => \$opt{'dsn'},
'sqlusername=s' => \$opt{'sqlusername'},
'sqlpassword=s' => \$opt{'sqlpassword'},
- 'dbautowhitelist=s' => \$opt{'dbautowhitelist'},
+ 'dbautowelcomelist=s' => \$opt{'dbautowelcomelist'},
'username=s' => \$opt{'username'},
'help' => \$opt{'help'},
'ok' => \$opt{'ok'},
@@ -65,11 +65,11 @@ if (!$opt{'username'} || !$opt{'dsn'}) {
}
my $db;
-if ($opt{'dbautowhitelist'}) {
- $db = $opt{'dbautowhitelist'};
+if ($opt{'dbautowelcomelist'}) {
+ $db = $opt{'dbautowelcomelist'};
}
else {
- $db = $ENV{HOME}."/.spamassassin/auto-whitelist";
+ $db = $ENV{HOME}."/.spamassassin/auto-welcomelist";
}
tie %h, "DB_File",$db, O_RDONLY,0600