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/19 08:44:02 UTC
svn commit: r1900022 [1/2] - in /spamassassin/branches/trunk-welcomelist: ./ build/mkupdates/ lib/Mail/SpamAssassin/ masses/rule-update-score-gen/ rules/ rulesrc/scores/
Author: hege
Date: Tue Apr 19 08:44:01 2022
New Revision: 1900022
URL: http://svn.apache.org/viewvc?rev=1900022&view=rev
Log:
Merge from trunk r1900021 to trunk-welcomelist
Modified:
spamassassin/branches/trunk-welcomelist/ (props changed)
spamassassin/branches/trunk-welcomelist/build/mkupdates/mkupdate-with-scores
spamassassin/branches/trunk-welcomelist/build/mkupdates/run_nightly
spamassassin/branches/trunk-welcomelist/lib/Mail/SpamAssassin/DnsResolver.pm
spamassassin/branches/trunk-welcomelist/lib/Mail/SpamAssassin/Message.pm
spamassassin/branches/trunk-welcomelist/masses/rule-update-score-gen/do-nightly-rescore-example.sh
spamassassin/branches/trunk-welcomelist/rules/active.list
spamassassin/branches/trunk-welcomelist/rulesrc/scores/72_scores.cf
spamassassin/branches/trunk-welcomelist/rulesrc/scores/scores-set0
spamassassin/branches/trunk-welcomelist/rulesrc/scores/scores-set1
spamassassin/branches/trunk-welcomelist/rulesrc/scores/scores-set2
spamassassin/branches/trunk-welcomelist/rulesrc/scores/scores-set3
spamassassin/branches/trunk-welcomelist/rulesrc/scores/stats-set0
spamassassin/branches/trunk-welcomelist/rulesrc/scores/stats-set1
Propchange: spamassassin/branches/trunk-welcomelist/
------------------------------------------------------------------------------
Merged /spamassassin/trunk:r1899985-1900021
Modified: spamassassin/branches/trunk-welcomelist/build/mkupdates/mkupdate-with-scores
URL: http://svn.apache.org/viewvc/spamassassin/branches/trunk-welcomelist/build/mkupdates/mkupdate-with-scores?rev=1900022&r1=1900021&r2=1900022&view=diff
==============================================================================
--- spamassassin/branches/trunk-welcomelist/build/mkupdates/mkupdate-with-scores (original)
+++ spamassassin/branches/trunk-welcomelist/build/mkupdates/mkupdate-with-scores Tue Apr 19 08:44:01 2022
@@ -44,6 +44,7 @@ PROGDIR=`dirname $0`
PROGNAME=`basename $0 .sh`
HOST=`hostname -f`
+SVN_BASEURL="https://svn.apache.org/repos/asf/spamassassin"
TMPDIR="/usr/local/spamassassin/automc/tmp/${PROGNAME}"
UPDATEDIR="/var/www/automc.spamassassin.org/updates"
KEYDIR="/usr/local/spamassassin/automc/key"
@@ -80,13 +81,13 @@ echo "REVERT_REVISION=$REVERT_REVISION"
test_version() {
SA_VERSION=$1
- SA_SVN_TAG=$2
+ SA_SVN_PATH=$2
# to heck with dealing with svn update failures
rm -rf release_$SA_VERSION
# test the release on the version(s) of spamassassin the update is meant for
- svn co https://svn.apache.org/repos/asf/spamassassin/$SA_SVN_TAG release_$SA_VERSION
+ svn co $SVN_BASEURL/$SA_SVN_PATH release_$SA_VERSION
cd release_$SA_VERSION
@@ -99,18 +100,19 @@ test_version() {
# need rules directory or build won't work
if [ ! -e rules ]; then cp -a ../trunk/rules .; fi
+ rm -rf $TMPDIR/release_$SA_VERSION
perl Makefile.PL PREFIX=$TMPDIR/release_$SA_VERSION < /dev/null
make
make install
- set +e
- ./sa-update -D --install $TMPDIR/${REVISION}.tar.gz
- STATUS=$?
- set -e
+ ./sa-update -D --install $TMPDIR/${REVISION}.tar.gz || {
+ echo "FATAL: sa-update test failed for version $SA_VERSION (r$REVISION)" >&2
+ exit $?
+ }
cd ..
rm -rf release_$SA_VERSION $TMPDIR/release_$SA_VERSION
- return $STATUS
+ return 0
}
make_rule_update_from_trunk() {
@@ -118,14 +120,14 @@ make_rule_update_from_trunk() {
rm -rf trunk trunk-rulesrc-scores
# get the latest scores for new rules
- svn co https://svn.apache.org/repos/asf/spamassassin/trunk/rulesrc/scores trunk-rulesrc-scores
+ svn co $SVN_BASEURL/trunk/rulesrc/scores trunk-rulesrc-scores
# get the revision number of the rules
# TODO: have the script that make 72_scores.cf include a revision number
#REVISION=`head -1 trunk-rulesrc-scores/72_scores.cf | cut -d" " -f6`
REVISION=`head -1 trunk-rulesrc-scores/scores-set* | cut -d" " -f9 | sort -rn | head -1`
- svn co --revision=$REVISION https://svn.apache.org/repos/asf/spamassassin/trunk trunk
+ svn co --revision=$REVISION $SVN_BASEURL/trunk trunk
cd trunk
@@ -133,8 +135,10 @@ make_rule_update_from_trunk() {
svn up build
fi
+ rm -rf $TMPDIR/trunk
perl Makefile.PL PREFIX=$TMPDIR/trunk < /dev/null
make
+ make test TEST_FILES="t/basic_lint.t t/basic_lint_without_sandbox.t t/basic_meta.t"
cd ..
@@ -153,9 +157,7 @@ make_rule_update_from_trunk() {
# remove files we don't want to ship in updates
# remember that 3KB == 1GB of traffic on the mirrors as of Jan 1, 2010
- set +e
rm -f 70_sandbox.cf 70_inactive.cf STATISTICS-set?.txt
- set -e
mkdir -p $TMPDIR/trunk/etc/mail/spamassassin
#cp *.pre *.cf *.txt languages user_prefs.template $TMPDIR/trunk/etc/mail/spamassassin/.
@@ -174,42 +176,17 @@ make_rule_update_from_trunk() {
tar -ztvf $TMPDIR/${REVISION}.tar.gz
}
-copy_update_paranoid() {
- SRC=$1
- DST=$2
-
- set +e
- cp $SRC $DST
- diff -u $SRC $DST
- if [ $? -ne 0 ]; then
- set -e
- return 1
- fi
- set -e
- return 0
-}
-
copy_existing_update_for_reversion_testing() {
- EXIT=0
- (
- copy_update_paranoid "$UPDATEDIR/$REVERT_REVISION.tar.gz" "$TMPDIR/$REVISION.tar.gz" &&
- copy_update_paranoid "$UPDATEDIR/$REVERT_REVISION.tar.gz.asc" "$TMPDIR/$REVISION.tar.gz.asc" &&
- copy_update_paranoid "$UPDATEDIR/$REVERT_REVISION.tar.gz.sha1" "$TMPDIR/$REVISION.tar.gz.sha1" &&
- copy_update_paranoid "$UPDATEDIR/$REVERT_REVISION.tar.gz.sha256" "$TMPDIR/$REVISION.tar.gz.sha256" &&
- copy_update_paranoid "$UPDATEDIR/$REVERT_REVISION.tar.gz.sha512" "$TMPDIR/$REVISION.tar.gz.sha512"
- ) || EXIT=6
-
- # copying the update files went wrong exit
- if [ $EXIT -gt 0 ]; then
+ cp "$UPDATEDIR/$REVERT_REVISION.tar.gz"* "$TMPDIR/" || {
echo "Could not copy existing revision $REVERT_REVISION, to temporary testing directory, aborting!"
exit $EXIT
- fi
+ }
}
check_for_disable-automatic-update_file_in_svn() {
rm -rf $TMPDIR/svn-scores-latest
# checkout the latest scores directory
- svn co https://svn.apache.org/repos/asf/spamassassin/trunk/rulesrc/scores/ $TMPDIR/svn-scores-latest
+ svn co $SVN_BASEURL/trunk/rulesrc/scores/ $TMPDIR/svn-scores-latest
AUTOUPDATESDISABLED=0
@@ -248,6 +225,18 @@ disable_auto_update_publishing_and_get_n
echo "New update version/revision will be $REVISION"
}
+svn_path_exists() {
+ SVNINFO=`svn info $1 2>&1 || true`
+ # W170000 == non-existent revision
+ if [[ $SVNINFO =~ W170000: ]]; then return 1; fi
+ # Hardfail on any other error
+ if [[ ! $SVNINFO =~ Revision: ]]; then
+ echo "svn info failed: $SVNINFO" >&2
+ exit 1
+ fi
+ return 0
+}
+
rm -rf $TMPDIR
mkdir $TMPDIR
cd $TMPDIR
@@ -279,19 +268,38 @@ fi
# test to make sure it works with sa-update --install
TESTED_VERSIONS=""
+# Iterate through all 3.4 versions (3.4.1 - 3.4.x, and the 3.4 HEAD)
MAJOR_VERS=3
for (( MINOR_VERS=4; 1; MINOR_VERS++ )); do
for (( UPDATE_VERS=1; 1; UPDATE_VERS++ )); do
- svn info https://svn.apache.org/repos/asf/spamassassin/tags/spamassassin_release_${MAJOR_VERS}_${MINOR_VERS}_${UPDATE_VERS} || break
- test_version ${MAJOR_VERS}.${MINOR_VERS}.${UPDATE_VERS} tags/spamassassin_release_${MAJOR_VERS}_${MINOR_VERS}_${UPDATE_VERS} &&
- TESTED_VERSIONS="$TESTED_VERSIONS ${MAJOR_VERS}.${MINOR_VERS}.${UPDATE_VERS}"
+ REL=${MAJOR_VERS}_${MINOR_VERS}_${UPDATE_VERS}
+ if svn_path_exists $SVN_BASEURL/tags/spamassassin_release_${REL}; then
+ test_version ${REL} tags/spamassassin_release_${REL} &&
+ TESTED_VERSIONS="$TESTED_VERSIONS ${REL}"
+ fi
done
- # we just assume that the next stable version is the branch's current version
- set +e
- svn info https://svn.apache.org/repos/asf/spamassassin/branches_${MAJOR_VERS}.${MINOR_VERS}.${UPDATE_VERS} || break
- test_version ${MAJOR_VERS}.${MINOR_VERS}.${UPDATE_VERS} branches/${MAJOR_VERS}.${MINOR_VERS}.${UPDATE_VERS} &&
- TESTED_VERSIONS="$TESTED_VERSIONS ${MAJOR_VERS}.${MINOR_VERS}.${UPDATE_VERS}"
- set -e
+ # we just assume that the next stable version is the branch's current version (HEAD)
+ if svn_path_exists $SVN_BASEURL/branches/${MAJOR_VERS}.${MINOR_VERS}; then
+ test_version ${MAJOR_VERS}_${MINOR_VERS}_HEAD branches/${MAJOR_VERS}.${MINOR_VERS} &&
+ TESTED_VERSIONS="$TESTED_VERSIONS ${MAJOR_VERS}_${MINOR_VERS}_HEAD"
+ fi
+done
+
+# Iterate through all 4.0 versions (4.0.0 - 4.0.x, and the 4.0 HEAD)
+MAJOR_VERS=4
+for (( MINOR_VERS=0; 1; MINOR_VERS++ )); do
+ for (( UPDATE_VERS=0; 1; UPDATE_VERS++ )); do
+ REL=${MAJOR_VERS}_${MINOR_VERS}_${UPDATE_VERS}
+ if svn_path_exists $SVN_BASEURL/tags/spamassassin_release_${REL}; then
+ test_version ${REL} tags/spamassassin_release_${REL} &&
+ TESTED_VERSIONS="$TESTED_VERSIONS ${REL}"
+ fi
+ done
+ # we just assume that the next stable version is the branch's current version (HEAD)
+ if svn_path_exists $SVN_BASEURL/branches/${MAJOR_VERS}.${MINOR_VERS}; then
+ test_version ${MAJOR_VERS}_${MINOR_VERS}_HEAD branches/${MAJOR_VERS}.${MINOR_VERS} &&
+ TESTED_VERSIONS="$TESTED_VERSIONS ${MAJOR_VERS}_${MINOR_VERS}_HEAD"
+ fi
done
echo "VERSIONS UPDATE PASSED ON: $TESTED_VERSIONS"
@@ -300,7 +308,8 @@ echo "VERSIONS UPDATE PASSED ON: $TESTED
if [[ ! -z "$TESTED_VERSIONS" ]]; then
(
chmod 644 $TMPDIR/$REVISION.tar.gz* &&
- cp -a $TMPDIR/$REVISION.tar.gz* $UPDATEDIR/
+ # Atomic copy
+ rsync -a $TMPDIR/$REVISION.tar.gz* $UPDATEDIR/
) || exit 5
if [ $AUTOUPDATESDISABLED -eq 1 -a $REVERT_REVISION -eq 0 ]; then
Modified: spamassassin/branches/trunk-welcomelist/build/mkupdates/run_nightly
URL: http://svn.apache.org/viewvc/spamassassin/branches/trunk-welcomelist/build/mkupdates/run_nightly?rev=1900022&r1=1900021&r2=1900022&view=diff
==============================================================================
--- spamassassin/branches/trunk-welcomelist/build/mkupdates/run_nightly (original)
+++ spamassassin/branches/trunk-welcomelist/build/mkupdates/run_nightly Tue Apr 19 08:44:01 2022
@@ -6,7 +6,8 @@ LOGDIR="/var/www/automc.spamassassin.org
REPDIR="/var/www/ruleqa.spamassassin.org/reports"
UPDDIR="/var/www/automc.spamassassin.org/updates"
-VERSIONS="3.4.4"
+# Tarball creation disabled, see comment near make_tarball_for_version call
+#VERSIONS="3.4.4"
cd /usr/local/spamassassin/automc/svn/trunk
@@ -267,9 +268,13 @@ set -x
promote_active_rules
-for VER in $VERSIONS; do
- make_tarball_for_version $VER
-done
+### Disabled update.tar.gz creation in run_nightly, not sure what the purpose
+### was, as mkupdate-with-scores already creates much more thoroughly tested
+### tarball - if that failed, probably not a good idea to make one here
+### 19.4.2022 -hk
+#for VER in $VERSIONS; do
+# make_tarball_for_version $VER
+#done
set +x
Modified: spamassassin/branches/trunk-welcomelist/lib/Mail/SpamAssassin/DnsResolver.pm
URL: http://svn.apache.org/viewvc/spamassassin/branches/trunk-welcomelist/lib/Mail/SpamAssassin/DnsResolver.pm?rev=1900022&r1=1900021&r2=1900022&view=diff
==============================================================================
--- spamassassin/branches/trunk-welcomelist/lib/Mail/SpamAssassin/DnsResolver.pm (original)
+++ spamassassin/branches/trunk-welcomelist/lib/Mail/SpamAssassin/DnsResolver.pm Tue Apr 19 08:44:01 2022
@@ -786,7 +786,9 @@ sub poll_responses {
for (;;) {
my ($nfound, $timeleft, $eval_stat);
- eval { # use eval to catch alarm signal
+ # if a restartable signal is caught, retry 3 times before aborting
+ my $eintrcount = 3;
+ eval { # use eval to caught alarm signal
my $timer; # collects timestamp when variable goes out of scope
if (!defined($timeout) || $timeout > 0)
{ $timer = $self->{main}->time_method("poll_dns_idle") }
@@ -802,6 +804,10 @@ sub poll_responses {
warn "dns: select aborted: $eval_stat\n";
last;
} elsif (!defined $nfound || $nfound < 0) {
+ if ($!{EINTR} and $eintrcount > 0) {
+ $eintrcount--;
+ next;
+ }
if ($!) { warn "dns: select failed: $!\n" }
else { info("dns: select interrupted") } # shouldn't happen
last;
Modified: spamassassin/branches/trunk-welcomelist/lib/Mail/SpamAssassin/Message.pm
URL: http://svn.apache.org/viewvc/spamassassin/branches/trunk-welcomelist/lib/Mail/SpamAssassin/Message.pm?rev=1900022&r1=1900021&r2=1900022&view=diff
==============================================================================
--- spamassassin/branches/trunk-welcomelist/lib/Mail/SpamAssassin/Message.pm (original)
+++ spamassassin/branches/trunk-welcomelist/lib/Mail/SpamAssassin/Message.pm Tue Apr 19 08:44:01 2022
@@ -933,6 +933,7 @@ sub _parse_multipart {
my($self, $toparse) = @_;
my ($msg, $boundary, $body, $subparse) = @{$toparse};
+ my $nested_boundary = 0;
# we're not supposed to be a leaf, so prep ourselves
$msg->{'body_parts'} = [];
@@ -983,6 +984,7 @@ sub _parse_multipart {
my $header;
my $part_array;
my $found_end_boundary;
+ my $found_last_end_boundary;
my $partcnt = 0;
my $line_count = @{$body};
@@ -991,7 +993,12 @@ sub _parse_multipart {
# deal with the mime part;
# a triage before an unlikely-to-match regexp avoids a CPU hotspot
$found_end_boundary = defined $boundary && substr($_,0,2) eq '--'
- && /^--\Q$boundary\E(?:--)?\s*$/;
+ && /^--\Q$boundary\E(--)?\s*$/;
+ $found_last_end_boundary = $found_end_boundary && $1;
+ if ($found_end_boundary && $nested_boundary) {
+ $found_end_boundary = 0;
+ $nested_boundary = 0 if ($found_last_end_boundary); # bug 7358 - handle one level of non-unique boundary string
+ }
if ( --$line_count == 0 || $found_end_boundary ) {
my $line = $_; # remember the last line
@@ -1050,12 +1057,8 @@ sub _parse_multipart {
push(@{$self->{'parse_queue'}}, [ $part_msg, $p_boundary, $part_array, $subparse ]);
$msg->add_body_part($part_msg);
- # rfc 1521 says /^--boundary--$/, some MUAs may just require /^--boundary--/
- # but this causes problems with horizontal lines when the boundary is
- # made up of dashes as well, etc.
if (defined $boundary) {
- # no re "strict"; # since perl 5.21.8: Ranges of ASCII printables...
- if ($line =~ /^--\Q${boundary}\E--\s*$/) {
+ if ($found_last_end_boundary) {
# Make a note that we've seen the end boundary
$self->{mime_boundary_state}->{$boundary}--;
last;
@@ -1104,6 +1107,12 @@ sub _parse_multipart {
if ($header) {
my ( $key, $value ) = split ( /:\s*/, $header, 2 );
$part_msg->header( $key, $value );
+ if (defined $boundary && lc $key eq 'content-type') {
+ my (undef, $nested_bound) = Mail::SpamAssassin::Util::parse_content_type($part_msg->header('content-type'));
+ if (defined $nested_bound && $nested_bound eq $boundary) {
+ $nested_boundary = 1;
+ }
+ }
}
$in_body = 1;
Modified: spamassassin/branches/trunk-welcomelist/masses/rule-update-score-gen/do-nightly-rescore-example.sh
URL: http://svn.apache.org/viewvc/spamassassin/branches/trunk-welcomelist/masses/rule-update-score-gen/do-nightly-rescore-example.sh?rev=1900022&r1=1900021&r2=1900022&view=diff
==============================================================================
--- spamassassin/branches/trunk-welcomelist/masses/rule-update-score-gen/do-nightly-rescore-example.sh (original)
+++ spamassassin/branches/trunk-welcomelist/masses/rule-update-score-gen/do-nightly-rescore-example.sh Tue Apr 19 08:44:01 2022
@@ -30,7 +30,7 @@ TMP="/usr/local/spamassassin/automc/tmp/
rm -rf $TMP
mkdir -p $TMP
-cd $TMP
+cd $TMP || exit 1
set -e
@@ -54,8 +54,8 @@ echo "Finished generating new scores"
pwd
# 20101106 - temporarily s/0.000/0.001/g scores - bug 6510
-sed -i -e 's/0.000/0.001 # force non-zero/g' scores-set0
-sed -i -e 's/0.000/0.001 # force non-zero/g' scores-set1
+sed -i -e 's/\b0\.000/0.001 # force non-zero/g' scores-set0
+sed -i -e 's/\b0\.000/0.001 # force non-zero/g' scores-set1
cp scores-set0 scores-set2
cp scores-set1 scores-set3
Modified: spamassassin/branches/trunk-welcomelist/rules/active.list
URL: http://svn.apache.org/viewvc/spamassassin/branches/trunk-welcomelist/rules/active.list?rev=1900022&r1=1900021&r2=1900022&view=diff
==============================================================================
--- spamassassin/branches/trunk-welcomelist/rules/active.list (original)
+++ spamassassin/branches/trunk-welcomelist/rules/active.list Tue Apr 19 08:44:01 2022
@@ -1,6 +1,6 @@
# DO NOT EDIT: file generated by build/mkupdates/listpromotable
# active ruleset list, automatically generated from https://ruleqa.spamassassin.org/
-# with results from: last-net: net-darxus net-ena-week0 net-ena-week1 net-ena-week2 net-ena-week3 net-ena-week4 net-giovanni-ham net-giovanni-spam net-giovanni-spammy net-hege net-llanga net-mmiroslaw-mails-ham net-mmiroslaw-mails-spam net-pds net-spamsponge net-thendrikx; day 1: darxus ena-week0 ena-week1 ena-week2 ena-week3 ena-week4 giovanni-ham giovanni-spam giovanni-spammy hege llanga mmiroslaw-mails-ham mmiroslaw-mails-spam pds spamsponge thendrikx; day 2: darxus ena-week0 ena-week1 ena-week2 ena-week3 ena-week4 giovanni-ham giovanni-spam giovanni-spammy hege llanga mmiroslaw-mails-ham mmiroslaw-mails-spam pds spamsponge thendrikx; day 3: darxus ena-week0 ena-week1 ena-week2 ena-week3 ena-week4 giovanni-ham giovanni-spam giovanni-spammy grenier hege jhardin llanga mmiroslaw-mails-ham mmiroslaw-mails-spam pds spamsponge thendrikx; day 4: darxus ena-week0 ena-week1 ena-week2 ena-week3 ena-week4 giovanni-ham giovanni-spam giovanni-spammy grenier hege jhardin llanga mmiroslaw-mail
s-ham mmiroslaw-mails-spam pds spamsponge thendrikx; day 5: darxus ena-week0 ena-week1 ena-week2 ena-week3 ena-week4 giovanni-ham giovanni-spam giovanni-spammy grenier hege jhardin llanga mmiroslaw-mails-ham mmiroslaw-mails-spam pds spamsponge thendrikx
+# with results from: last-net: net-darxus net-ena-week0 net-ena-week1 net-ena-week2 net-ena-week3 net-ena-week4 net-giovanni-ham net-giovanni-spam net-giovanni-spammy net-hege net-llanga net-mmiroslaw-mails-ham net-mmiroslaw-mails-spam net-pds net-spamsponge net-thendrikx; day 1: darxus ena-week0 ena-week1 ena-week2 ena-week3 ena-week4 giovanni-ham giovanni-spam giovanni-spammy hege llanga mmiroslaw-mails-ham mmiroslaw-mails-spam spamsponge thendrikx; day 2: darxus ena-week0 ena-week1 ena-week2 ena-week3 ena-week4 giovanni-ham giovanni-spam giovanni-spammy hege llanga mmiroslaw-mails-ham mmiroslaw-mails-spam pds spamsponge thendrikx; day 3: darxus ena-week0 ena-week1 ena-week2 ena-week3 ena-week4 giovanni-ham giovanni-spam giovanni-spammy hege llanga mmiroslaw-mails-ham mmiroslaw-mails-spam pds spamsponge thendrikx; day 4: darxus ena-week0 ena-week1 ena-week2 ena-week3 ena-week4 giovanni-ham giovanni-spam giovanni-spammy grenier hege jhardin llanga mmiroslaw-mails-ham mmiroslaw-mail
s-spam pds spamsponge thendrikx; day 5: darxus ena-week0 ena-week1 ena-week2 ena-week3 ena-week4 giovanni-ham giovanni-spam giovanni-spammy grenier hege jhardin llanga mmiroslaw-mails-ham mmiroslaw-mails-spam pds spamsponge thendrikx
# tflags publish
AC_BR_BONANZA
@@ -296,9 +296,6 @@ CN_B2B_SPAMMER
# tflags publish
COMMENT_GIBBERISH
-# tflags net
-COMPENSATION
-
# tflags publish
CONTENT_AFTER_HTML
@@ -467,16 +464,13 @@ FONT_INVIS_NORDNS
# tflags publish
FONT_INVIS_POSTEXTRAS
-# good enough
-FORGED_RELAY_MUA_TO_MX
-
# tflags net
FORGED_SPF_HELO
-# tflags net
+# tflags publish
FORM_FRAUD
-# tflags net
+# tflags publish
FORM_FRAUD_3
# tflags publish
@@ -561,9 +555,6 @@ FROM_MISSP_MSFT
FROM_MISSP_PHISH
# tflags net
-FROM_MISSP_REPLYTO
-
-# tflags net
FROM_MISSP_SPF_FAIL
# good enough
@@ -573,9 +564,6 @@ FROM_MISSP_TO_UNDISC
FROM_MISSP_USER
# good enough
-FROM_MISSP_XPRIO
-
-# good enough
FROM_MULTI_NORDNS
# tflags net
@@ -767,9 +755,6 @@ HAS_X_NO_RELAY
# tflags publish
HAS_X_OUTGOING_SPAM_STAT
-# tflags net
-HDRS_LCASE
-
# good enough
HDRS_LCASE_IMGONLY
@@ -807,9 +792,6 @@ HK_LOTTO
HK_NAME_DRUGS
# good enough
-HK_NAME_FM_MR_MRS
-
-# good enough
HK_NAME_FROM
# good enough
@@ -866,7 +848,7 @@ HTML_OFF_PAGE
# tflags publish
HTML_SHRT_CMNT_OBFU_MANY
-# tflags net
+# tflags publish
HTML_SINGLET_MANY
# good enough
@@ -891,9 +873,6 @@ JH_SPAMMY_PATTERN01
JH_SPAMMY_PATTERN02
# tflags net
-KHOP_FAKE_EBAY
-
-# tflags net
KHOP_HELO_FCRDNS
# tflags publish
@@ -941,9 +920,6 @@ MALWARE_PASSWORD
# tflags publish
MALW_ATTACH
-# tflags net
-MANY_HDRS_LCASE
-
# tflags publish
MANY_SPAN_IN_TEXT
@@ -996,9 +972,15 @@ MONERO_MALWARE
MONERO_PAY_ME
# good enough
+MONEY_12LTRDOM
+
+# good enough
MONEY_ATM_CARD
# good enough
+MONEY_BARRISTER
+
+# good enough
MONEY_FORM
# good enough
@@ -1052,9 +1034,6 @@ NEW_PRODUCTS
# good enough
NICE_REPLY_A
-# good enough
-NICE_REPLY_B
-
# tflags net
NML_ADSP_CUSTOM_HIGH
@@ -1491,9 +1470,6 @@ REPTO_419_FRAUD_YJ
REPTO_419_FRAUD_YN
# good enough
-SCC_BODY_URI_ONLY
-
-# good enough
SCC_CANSPAM_2
# tflags publish
@@ -1631,13 +1607,13 @@ TAGSTAT_IMG_NOT_RCVD_TGST
# tflags publish
TARINGANET_IMG_NOT_RCVD_TN
-# tflags net
+# tflags publish
TEQF_USR_IMAGE
# tflags publish
TEQF_USR_MSGID_HEX
-# tflags net
+# tflags publish
TEQF_USR_MSGID_MALF
# tflags publish
@@ -1653,15 +1629,9 @@ TONLINE_FAKE_DKIM
TO_EQ_FM_DIRECT_MX
# tflags net
-TO_EQ_FM_DOM_HTML_IMG
-
-# tflags net
TO_EQ_FM_DOM_SPF_FAIL
# tflags net
-TO_EQ_FM_HTML_ONLY
-
-# tflags net
TO_EQ_FM_SPF_FAIL
# tflags publish
@@ -1697,15 +1667,6 @@ TUMBLR_IMG_NOT_RCVD_TUMB
# good enough
TVD_PH_BODY_META
-# tflags net
-TVD_SPACE_ENCODED
-
-# tflags net
-TVD_SPACE_RATIO_MINFP
-
-# tflags net
-TVD_SUBJ_NUM_OBFU_MINFP
-
# good enough
TVD_VISIT_PHARMA
@@ -1904,7 +1865,7 @@ URI_WPADMIN
# tflags publish
URI_WP_DIRINDEX
-# tflags net
+# tflags publish
URI_WP_HACKED
# tflags publish
@@ -1946,6 +1907,9 @@ USER_IN_WELCOMELIST
# tflags userconf
USER_IN_WELCOMELIST_TO
+# good enough
+US_DOLLARS_3
+
# tflags publish
VFY_ACCT_NORDNS
@@ -1955,9 +1919,6 @@ VPS_NO_NTLD
# tflags publish
WALMART_IMG_NOT_RCVD_WAL
-# good enough
-WANT_TO_ORDER
-
# tflags publish
WORD_INVIS
Modified: spamassassin/branches/trunk-welcomelist/rulesrc/scores/72_scores.cf
URL: http://svn.apache.org/viewvc/spamassassin/branches/trunk-welcomelist/rulesrc/scores/72_scores.cf?rev=1900022&r1=1900021&r2=1900022&view=diff
==============================================================================
--- spamassassin/branches/trunk-welcomelist/rulesrc/scores/72_scores.cf (original)
+++ spamassassin/branches/trunk-welcomelist/rulesrc/scores/72_scores.cf Tue Apr 19 08:44:01 2022
@@ -1,6 +1,6 @@
score AC_BR_BONANZA 0.001 0.001 0.001 0.001
score AC_DIV_BONANZA 0.001 0.001 0.001 0.001
-score AC_FROM_MANY_DOTS 2.999 2.996 2.999 2.996
+score AC_FROM_MANY_DOTS 3.000 2.997 3.000 2.997
score AC_HTML_NONSENSE_TAGS 1.999 1.997 1.999 1.997
score AC_POST_EXTRAS 1.000 1.000 1.000 1.000
score AC_SPAMMY_URI_PATTERNS1 1.000 1.000 1.000 1.000
@@ -15,43 +15,43 @@ score AC_SPAMMY_URI_PATTERNS9
score ADMITS_SPAM 3.799 3.595 3.799 3.595
score ADULT_DATING_COMPANY 10.001 10.001 10.001 10.001
score ADVANCE_FEE_2_NEW_FORM 1.000 1.000 1.000 1.000
-score ADVANCE_FEE_2_NEW_FRM_MNY 2.107 2.497 2.107 2.497
+score ADVANCE_FEE_2_NEW_FRM_MNY 1.073 2.430 1.073 2.430
score ADVANCE_FEE_2_NEW_MONEY 1.999 1.997 1.999 1.997
-score ADVANCE_FEE_3_NEW 3.499 3.176 3.499 3.176
-score ADVANCE_FEE_3_NEW_FRM_MNY 0.271 0.033 0.271 0.033
+score ADVANCE_FEE_3_NEW 3.499 2.752 3.499 2.752
+score ADVANCE_FEE_3_NEW_FRM_MNY 1.568 1.710 1.568 1.710
score ADVANCE_FEE_3_NEW_MONEY 2.999 2.896 2.999 2.896
score ADVANCE_FEE_4_NEW 2.499 2.397 2.499 2.397
score ADVANCE_FEE_4_NEW_FRM_MNY 0.001 0.001 0.001 0.001
-score ADVANCE_FEE_4_NEW_MONEY 1.705 0.049 1.705 0.049
-score ADVANCE_FEE_5_NEW 2.399 2.210 2.399 2.210
+score ADVANCE_FEE_4_NEW_MONEY 1.610 0.055 1.610 0.055
+score ADVANCE_FEE_5_NEW 2.399 2.283 2.399 2.283
score ADVANCE_FEE_5_NEW_FRM_MNY 0.001 0.001 0.001 0.001
-score ADVANCE_FEE_5_NEW_MONEY 0.001 3.096 0.001 3.096
-score AD_PREFS 0.001 0.499 0.001 0.499
+score ADVANCE_FEE_5_NEW_MONEY 0.001 2.539 0.001 2.539
+score AD_PREFS 0.118 0.435 0.118 0.435
score ALIBABA_IMG_NOT_RCVD_ALI 1.000 1.000 1.000 1.000
score AMAZON_IMG_NOT_RCVD_AMZN 2.499 2.497 2.499 2.497
score APP_DEVELOPMENT_FREEM 1.000 1.000 1.000 1.000
-score APP_DEVELOPMENT_NORDNS 1.999 0.228 1.999 0.228
+score APP_DEVELOPMENT_NORDNS 1.999 1.168 1.999 1.168
score AXB_XMAILER_MIMEOLE_OL_024C2 0.001 0.001 0.001 0.001
-score AXB_XMAILER_MIMEOLE_OL_1ECD5 2.080 1.099 2.080 1.099
+score AXB_XMAILER_MIMEOLE_OL_1ECD5 0.972 0.143 0.972 0.143
score BEBEE_IMG_NOT_RCVD_BB 1.000 1.000 1.000 1.000
-score BIGNUM_EMAILS_FREEM 1.669 2.808 1.669 2.808
-score BIGNUM_EMAILS_MANY 3.000 2.996 3.000 2.996
-score BILLION_OVERLAP -0.702 -0.870 -0.702 -0.870
+score BIGNUM_EMAILS_FREEM 2.214 2.557 2.214 2.557
+score BIGNUM_EMAILS_MANY 2.999 2.996 2.999 2.996
+score BILLION_OVERLAP -0.689 -0.421 -0.689 -0.421
score BITCOIN_BOMB 1.000 1.000 1.000 1.000
-score BITCOIN_DEADLINE 2.210 2.242 2.210 2.242
-score BITCOIN_EXTORT_01 4.514 4.879 4.514 4.879
+score BITCOIN_DEADLINE 2.053 1.270 2.053 1.270
+score BITCOIN_EXTORT_01 4.999 4.801 4.999 4.801
score BITCOIN_EXTORT_02 1.000 1.000 1.000 1.000
score BITCOIN_IMGUR 1.000 1.000 1.000 1.000
-score BITCOIN_MALF_HTML 3.499 2.603 3.499 2.603
-score BITCOIN_MALWARE 1.000 1.275 1.000 1.275
-score BITCOIN_OBFU_SUBJ 2.157 0.459 2.157 0.459
+score BITCOIN_MALF_HTML 3.499 2.858 3.499 2.858
+score BITCOIN_MALWARE 1.000 1.271 1.000 1.271
+score BITCOIN_OBFU_SUBJ 3.030 1.485 3.030 1.485
score BITCOIN_ONAN 1.000 1.000 1.000 1.000
score BITCOIN_PAY_ME 1.000 1.000 1.000 1.000
score BITCOIN_SPAM_01 1.000 1.000 1.000 1.000
score BITCOIN_SPAM_02 2.499 2.497 2.499 2.497
score BITCOIN_SPAM_03 1.000 1.000 1.000 1.000
score BITCOIN_SPAM_04 1.499 1.499 1.499 1.499
-score BITCOIN_SPAM_05 0.001 0.062 0.001 0.062
+score BITCOIN_SPAM_05 0.001 0.445 0.001 0.445
score BITCOIN_SPAM_06 1.000 1.000 1.000 1.000
score BITCOIN_SPAM_07 1.000 1.000 1.000 1.000
score BITCOIN_SPAM_08 1.000 1.000 1.000 1.000
@@ -61,102 +61,102 @@ score BITCOIN_SPAM_11
score BITCOIN_SPAM_12 1.000 1.000 1.000 1.000
score BITCOIN_SPF_ONLYALL 0.001 1.000 0.001 1.000
score BITCOIN_XPRIO 2.499 2.497 2.499 2.497
-score BITCOIN_YOUR_INFO 3.000 2.763 3.000 2.763
-score BODY_EMPTY 1.148 0.254 1.148 0.254
-score BODY_SINGLE_URI 2.210 0.537 2.210 0.537
+score BITCOIN_YOUR_INFO 2.999 2.762 2.999 2.762
+score BODY_EMPTY 1.152 0.244 1.152 0.244
+score BODY_SINGLE_URI 2.202 0.527 2.202 0.527
score BODY_URI_ONLY 1.000 2.996 1.000 2.996
-score BOGUS_MIME_VERSION 3.499 3.263 3.499 3.263
-score BOGUS_MSM_HDRS 2.015 2.402 2.015 2.402
+score BOGUS_MIME_VERSION 3.499 3.266 3.499 3.266
+score BOGUS_MSM_HDRS 1.889 0.832 1.889 0.832
score BOMB_FREEM 1.000 1.000 1.000 1.000
score BOMB_MONEY 1.000 1.000 1.000 1.000
score BTC_ORG 1.000 1.000 1.000 1.000
score BULK_RE_SUSP_NTLD 1.000 1.000 1.000 1.000
-score CANT_SEE_AD 1.000 1.941 1.000 1.941
+score CANT_SEE_AD 1.000 1.165 1.000 1.165
score CK_HELO_GENERIC 0.249 0.001 0.249 0.001
score COMMENT_GIBBERISH 1.000 1.000 1.000 1.000
-score CONTENT_AFTER_HTML 2.499 2.497 2.499 2.497
+score CONTENT_AFTER_HTML 2.500 2.497 2.500 2.497
score CONTENT_AFTER_HTML_WEAK 1.499 1.498 1.499 1.498
-score CTE_8BIT_MISMATCH 1.000 0.001 1.000 0.001
+score CTE_8BIT_MISMATCH 0.999 0.001 0.999 0.001
score DAY_I_EARNED 1.000 1.000 1.000 1.000
score DEAR_BENEFICIARY 0.001 0.001 0.001 0.001
score DKIMWL_BL 0.001 2.996 0.001 2.996
score DKIMWL_BLOCKED 0.001 0.001 0.001 0.001
-score DKIMWL_WL_HIGH 0.001 -0.575 0.001 -0.575
+score DKIMWL_WL_HIGH 0.001 -0.571 0.001 -0.571
score DKIMWL_WL_MED 0.001 -0.001 0.001 -0.001
-score DKIMWL_WL_MEDHI 0.001 -0.839 0.001 -0.839
+score DKIMWL_WL_MEDHI 0.001 -0.872 0.001 -0.872
score DOS_RCVD_IP_TWICE_B 2.000 1.997 2.000 1.997
score DOTGOV_IMAGE 1.000 1.000 1.000 1.000
score DYNAMIC_IMGUR 1.000 1.000 1.000 1.000
score EBAY_IMG_NOT_RCVD_EBAY 1.000 1.000 1.000 1.000
score ENCRYPTED_MESSAGE -1.000 -1.000 -1.000 -1.000
-score END_FUTURE_EMAILS 1.000 2.187 1.000 2.187
+score END_FUTURE_EMAILS 1.000 2.191 1.000 2.191
score ENVFROM_GOOG_TRIX 1.000 1.000 1.000 1.000
score FACEBOOK_IMG_NOT_RCVD_FB 1.000 1.000 1.000 1.000
-score FAKE_REPLY_A1 2.430 1.754 2.430 1.754
-score FAKE_REPLY_B 2.699 0.197 2.699 0.197
+score FAKE_REPLY_A1 0.001 0.399 0.001 0.399
+score FAKE_REPLY_B 2.699 1.887 2.699 1.887
score FBI_MONEY 1.000 1.000 1.000 1.000
score FBI_SPOOF 1.000 1.000 1.000 1.000
-score FILL_THIS_FORM 1.799 0.076 1.799 0.076
-score FONT_INVIS_DIRECT 0.189 0.001 0.189 0.001
+score FILL_THIS_FORM 1.799 0.073 1.799 0.073
+score FONT_INVIS_DIRECT 0.001 0.001 0.001 0.001
score FONT_INVIS_DOTGOV 1.000 1.000 1.000 1.000
-score FONT_INVIS_HTML_NOHTML 2.999 2.996 2.999 2.996
-score FONT_INVIS_LONG_LINE 1.668 1.097 1.668 1.097
-score FONT_INVIS_MSGID 0.001 1.168 0.001 1.168
-score FONT_INVIS_NORDNS 1.969 1.866 1.969 1.866
-score FONT_INVIS_POSTEXTRAS 2.897 1.000 2.897 1.000
+score FONT_INVIS_HTML_NOHTML 3.000 2.996 3.000 2.996
+score FONT_INVIS_LONG_LINE 1.545 1.182 1.545 1.182
+score FONT_INVIS_MSGID 0.001 1.206 0.001 1.206
+score FONT_INVIS_NORDNS 0.612 0.805 0.612 0.805
+score FONT_INVIS_POSTEXTRAS 2.896 1.000 2.896 1.000
score FORGED_RELAY_MUA_TO_MX 2.034 0.001 2.034 0.001
-score FORM_FRAUD 1.000 0.958 1.000 0.958
+score FORM_FRAUD 1.000 0.907 1.000 0.907
score FORM_FRAUD_5 0.001 0.001 0.001 0.001
score FOUND_YOU 3.249 3.246 3.249 3.246
-score FREEMAIL_FORGED_FROMDOMAIN 0.249 0.249 0.249 0.249
+score FREEMAIL_FORGED_FROMDOMAIN 0.250 0.248 0.250 0.248
score FREEM_FRNUM_UNICD_EMPTY 1.000 1.000 1.000 1.000
score FRNAME_IN_MSG_XPRIO_NO_SUB 1.000 1.000 1.000 1.000
score FROMSPACE 3.499 3.396 3.499 3.396
-score FROM_2_EMAILS_SHORT 1.500 1.500 1.500 1.500
+score FROM_2_EMAILS_SHORT 1.495 1.182 1.495 1.182
score FROM_ADDR_WS 2.999 2.996 2.999 2.996
score FROM_BANK_NOAUTH 0.001 1.000 0.001 1.000
score FROM_FMBLA_NDBLOCKED 0.001 0.001 0.001 0.001
-score FROM_FMBLA_NEWDOM 0.001 1.499 0.001 1.499
+score FROM_FMBLA_NEWDOM 0.001 1.498 0.001 1.498
score FROM_FMBLA_NEWDOM14 0.001 0.998 0.001 0.998
-score FROM_FMBLA_NEWDOM28 0.001 0.799 0.001 0.799
-score FROM_GOV_DKIM_AU 0.001 -0.001 0.001 -0.001
+score FROM_FMBLA_NEWDOM28 0.001 0.798 0.001 0.798
+score FROM_GOV_DKIM_AU 0.001 -0.058 0.001 -0.058
score FROM_GOV_REPLYTO_FREEMAIL 0.001 1.000 0.001 1.000
score FROM_GOV_SPOOF 0.001 1.000 0.001 1.000
-score FROM_MISSPACED 1.999 1.169 1.999 1.169
-score FROM_MISSP_DYNIP 1.461 1.200 1.461 1.200
+score FROM_MISSPACED 1.999 1.168 1.999 1.168
+score FROM_MISSP_DYNIP 1.411 1.502 1.411 1.502
score FROM_MISSP_EH_MATCH 1.999 0.001 1.999 0.001
-score FROM_MISSP_FREEMAIL 3.200 0.001 3.200 0.001
+score FROM_MISSP_FREEMAIL 3.199 0.001 3.199 0.001
score FROM_MISSP_MSFT 0.001 0.001 0.001 0.001
-score FROM_MISSP_PHISH 3.266 2.174 3.266 2.174
+score FROM_MISSP_PHISH 2.837 2.417 2.837 2.417
score FROM_MISSP_REPLYTO 1.000 2.497 1.000 2.497
score FROM_MISSP_SPF_FAIL 0.001 1.997 0.001 1.997
-score FROM_MISSP_TO_UNDISC 0.219 0.816 0.219 0.816
+score FROM_MISSP_TO_UNDISC 0.631 1.527 0.631 1.527
score FROM_MISSP_USER 0.001 0.001 0.001 0.001
score FROM_MISSP_XPRIO 0.001 0.001 0.001 0.001
-score FROM_MULTI_NORDNS 1.399 1.015 1.399 1.015
+score FROM_MULTI_NORDNS 1.396 1.010 1.396 1.010
score FROM_NEWDOM_BTC 0.001 1.000 0.001 1.000
score FROM_NTLD_LINKBAIT 1.000 1.000 1.000 1.000
-score FROM_NTLD_REPLY_FREEMAIL 1.483 1.000 1.483 1.000
+score FROM_NTLD_REPLY_FREEMAIL 1.930 1.000 1.930 1.000
score FROM_NUMBERO_NEWDOMAIN 0.001 1.000 0.001 1.000
score FROM_NUMERIC_TLD 1.000 1.000 1.000 1.000
score FROM_PAYPAL_SPOOF 0.001 1.597 0.001 1.597
-score FROM_SUSPICIOUS_NTLD 0.500 0.498 0.500 0.498
+score FROM_SUSPICIOUS_NTLD 0.499 0.498 0.499 0.498
score FROM_SUSPICIOUS_NTLD_FP 1.999 0.001 1.999 0.001
-score FROM_UNBAL1 2.105 2.297 2.105 2.297
-score FROM_UNBAL2 2.199 2.197 2.199 2.197
-score FROM_WSP_TRAIL 2.300 1.312 2.300 1.312
-score FSL_BULK_SIG 0.001 1.399 0.001 1.399
+score FROM_UNBAL1 2.075 2.297 2.075 2.297
+score FROM_UNBAL2 2.199 2.198 2.199 2.198
+score FROM_WSP_TRAIL 2.299 1.339 2.299 1.339
+score FSL_BULK_SIG 0.001 1.435 0.001 1.435
score FSL_CTYPE_WIN1251 0.001 0.001 0.001 0.001
score FSL_NEW_HELO_USER 0.001 0.001 0.001 0.001
-score FUZZY_AMAZON 2.199 2.223 2.199 2.223
-score FUZZY_CLICK_HERE 2.300 2.297 2.300 2.297
-score FUZZY_WALLET 3.199 1.233 3.199 1.233
-score GAPPY_GENITALIA 1.856 1.531 1.856 1.531
+score FUZZY_AMAZON 2.199 1.964 2.199 1.964
+score FUZZY_CLICK_HERE 2.299 2.297 2.299 2.297
+score FUZZY_WALLET 3.199 1.238 3.199 1.238
+score GAPPY_GENITALIA 2.240 1.088 2.240 1.088
score GAPPY_SALES_LEADS_FREEM 1.000 1.000 1.000 1.000
-score GB_BITCOIN_CP 1.000 1.383 1.000 1.383
-score GB_FAKE_RF_SHORT 2.000 1.997 2.000 1.997
+score GB_BITCOIN_CP 1.000 2.149 1.000 2.149
+score GB_FAKE_RF_SHORT 1.999 1.997 1.999 1.997
score GB_FORGED_MUA_POSTFIX 1.000 1.000 1.000 1.000
-score GB_FREEMAIL_DISPTO 0.500 0.498 0.500 0.498
+score GB_FREEMAIL_DISPTO 0.499 0.498 0.499 0.498
score GB_FREEMAIL_DISPTO_NOTFREEM 0.499 0.498 0.499 0.498
score GB_GOOGLE_OBFUR 0.750 0.750 0.750 0.750
score GOOGLE_DOCS_PHISH 1.000 1.000 1.000 1.000
@@ -165,141 +165,140 @@ score GOOGLE_DOC_SUSP
score GOOGLE_DRIVE_REPLY_BAD_NTLD 1.000 1.000 1.000 1.000
score GOOG_MALWARE_DNLD 1.000 1.000 1.000 1.000
score GOOG_REDIR_HTML_ONLY 1.999 1.997 1.999 1.997
-score GOOG_REDIR_NORDNS 2.600 3.124 2.600 3.124
-score GOOG_STO_EMAIL_PHISH 2.999 2.208 2.999 2.208
-score GOOG_STO_HTML_PHISH 2.051 1.648 2.051 1.648
+score GOOG_REDIR_NORDNS 2.603 3.125 2.603 3.125
+score GOOG_STO_EMAIL_PHISH 2.598 2.544 2.598 2.544
+score GOOG_STO_HTML_PHISH 2.553 1.467 2.553 1.467
score GOOG_STO_HTML_PHISH_MANY 1.000 1.000 1.000 1.000
score GOOG_STO_IMG_HTML 1.000 1.000 1.000 1.000
-score GOOG_STO_IMG_NOHTML 2.440 1.802 2.440 1.802
+score GOOG_STO_IMG_NOHTML 2.422 0.980 2.422 0.980
score GOOG_STO_NOIMG_HTML 2.999 2.996 2.999 2.996
-score HAS_X_NO_RELAY 2.499 2.319 2.499 2.319
-score HAS_X_OUTGOING_SPAM_STAT 1.999 0.418 1.999 0.418
+score HAS_X_NO_RELAY 2.499 2.172 2.499 2.172
+score HAS_X_OUTGOING_SPAM_STAT 1.999 0.414 1.999 0.414
score HDRS_LCASE 0.100 0.100 0.100 0.100
score HDRS_LCASE_IMGONLY 0.099 0.098 0.099 0.098
-score HDRS_MISSP 2.499 2.335 2.499 2.335
-score HDR_ORDER_FTSDMCXX_DIRECT 1.999 1.901 1.999 1.901
-score HDR_ORDER_FTSDMCXX_NORDNS 2.316 2.994 2.316 2.994
+score HDRS_MISSP 2.500 2.146 2.500 2.146
+score HDR_ORDER_FTSDMCXX_DIRECT 2.000 0.372 2.000 0.372
+score HDR_ORDER_FTSDMCXX_NORDNS 3.013 2.983 3.013 2.983
score HEADER_FROM_DIFFERENT_DOMAINS 0.249 0.248 0.249 0.248
score HELO_NO_DOMAIN 0.001 0.001 0.001 0.001
score HEXHASH_WORD 1.000 1.000 1.000 1.000
score HK_CTE_RAW 1.000 1.000 1.000 1.000
-score HK_LOTTO 0.999 0.277 0.999 0.277
-score HK_NAME_FM_MR_MRS 0.054 1.472 0.054 1.472
-score HK_NAME_FROM 0.999 0.998 0.999 0.998
-score HK_NAME_MR_MRS 0.999 0.998 0.999 0.998
-score HK_RANDOM_ENVFROM 0.999 0.998 0.999 0.998
-score HK_RANDOM_FROM 1.000 0.998 1.000 0.998
-score HK_RANDOM_REPLYTO 0.999 0.998 0.999 0.998
+score HK_LOTTO 0.935 0.806 0.935 0.806
+score HK_NAME_FM_MR_MRS 0.050 1.498 0.050 1.498
+score HK_NAME_FROM 1.000 0.998 1.000 0.998
+score HK_NAME_MR_MRS 1.000 0.998 1.000 0.998
+score HK_RANDOM_ENVFROM 1.000 0.998 1.000 0.998
+score HK_RANDOM_FROM 0.999 0.998 0.999 0.998
+score HK_RANDOM_REPLYTO 0.999 0.999 0.999 0.999
score HK_RCVD_IP_MULTICAST 1.000 1.000 1.000 1.000
-score HK_SCAM 1.056 1.648 1.056 1.648
-score HK_WIN 0.999 0.255 0.999 0.255
-score HOSTED_IMG_DIRECT_MX 3.499 1.522 3.499 1.522
+score HK_SCAM 1.056 1.906 1.056 1.906
+score HK_WIN 0.459 0.999 0.459 0.999
+score HOSTED_IMG_DIRECT_MX 3.499 2.977 3.499 2.977
score HOSTED_IMG_DQ_UNSUB 1.000 1.000 1.000 1.000
-score HOSTED_IMG_FREEM 3.499 2.422 3.499 2.422
+score HOSTED_IMG_FREEM 3.499 2.425 3.499 2.425
score HOSTED_IMG_MULTI 1.000 1.000 1.000 1.000
score HOSTED_IMG_MULTI_PUB_01 2.999 2.996 2.999 2.996
-score HTML_ENTITY_ASCII 1.257 0.285 1.257 0.285
+score HTML_ENTITY_ASCII 0.908 0.001 0.908 0.001
score HTML_ENTITY_ASCII_TINY 1.000 1.000 1.000 1.000
-score HTML_FONT_TINY_NORDNS 2.000 1.574 2.000 1.574
-score HTML_OFF_PAGE 2.999 2.146 2.999 2.146
+score HTML_FONT_TINY_NORDNS 1.999 1.643 1.999 1.643
+score HTML_OFF_PAGE 2.999 1.914 2.999 1.914
score HTML_SHRT_CMNT_OBFU_MANY 1.000 1.000 1.000 1.000
-score HTML_SINGLET_MANY 1.000 1.606 1.000 1.606
-score HTML_TAG_BALANCE_CENTER 2.159 2.416 2.159 2.416
-score HTML_TEXT_INVISIBLE_FONT 1.000 0.952 1.000 0.952
-score HTML_TEXT_INVISIBLE_STYLE 1.787 2.358 1.787 2.358
-score IMG_ONLY_FM_DOM_INFO 1.627 0.053 1.627 0.053
-score JH_SPAMMY_HEADERS 3.499 3.496 3.499 3.496
+score HTML_SINGLET_MANY 1.000 1.604 1.000 1.604
+score HTML_TAG_BALANCE_CENTER 2.149 2.395 2.149 2.395
+score HTML_TEXT_INVISIBLE_FONT 1.000 0.794 1.000 0.794
+score HTML_TEXT_INVISIBLE_STYLE 1.786 2.279 1.786 2.279
+score IMG_ONLY_FM_DOM_INFO 1.631 0.078 1.631 0.078
+score JH_SPAMMY_HEADERS 3.500 3.496 3.500 3.496
score JH_SPAMMY_PATTERN01 1.000 1.000 1.000 1.000
score JH_SPAMMY_PATTERN02 1.000 1.000 1.000 1.000
-score KHOP_HELO_FCRDNS 0.400 0.037 0.400 0.037
+score KHOP_HELO_FCRDNS 0.400 0.001 0.400 0.001
score LINKEDIN_IMG_NOT_RCVD_LNKN 1.000 1.000 1.000 1.000
score LIST_PRTL_PUMPDUMP 1.000 1.000 1.000 1.000
score LIST_PRTL_SAME_USER 1.000 1.000 1.000 1.000
-score LONGLN_LOW_CONTRAST 2.499 2.497 2.499 2.497
+score LONGLN_LOW_CONTRAST 2.499 2.404 2.499 2.404
score LONG_HEX_URI 2.999 0.001 2.999 0.001
-score LONG_IMG_URI 1.682 0.933 1.682 0.933
-score LONG_INVISIBLE_TEXT 1.687 1.849 1.687 1.849
+score LONG_IMG_URI 1.691 0.932 1.691 0.932
+score LONG_INVISIBLE_TEXT 1.687 1.944 1.687 1.944
score LOTS_OF_MONEY 0.010 0.010 0.010 0.010
-score LOTTO_AGENT 0.909 1.499 0.909 1.499
-score LOTTO_DEPT 0.001 1.387 0.001 1.387
+score LOTTO_AGENT 0.639 1.155 0.639 1.155
+score LOTTO_DEPT 0.001 1.388 0.001 1.388
score LUCRATIVE 1.000 1.000 1.000 1.000
score MALF_HTML_B64 1.000 1.000 1.000 1.000
score MALWARE_NORDNS 0.001 0.001 0.001 0.001
score MALWARE_PASSWORD 1.000 1.000 1.000 1.000
-score MALW_ATTACH 2.500 2.397 2.500 2.397
-score MANY_SPAN_IN_TEXT 2.500 1.131 2.500 1.131
-score MILLION_HUNDRED 0.005 0.981 0.005 0.981
-score MILLION_USD 0.012 0.001 0.012 0.001
+score MALW_ATTACH 2.499 2.397 2.499 2.397
+score MANY_SPAN_IN_TEXT 2.499 1.212 2.499 1.212
+score MILLION_HUNDRED 0.001 1.289 0.001 1.289
+score MILLION_USD 0.001 0.001 0.001 0.001
score MIMEOLE_DIRECT_TO_MX 1.999 1.997 1.999 1.997
score MIME_NO_TEXT 1.000 1.000 1.000 1.000
-score MIXED_AREA_CASE 1.921 1.274 1.921 1.274
-score MIXED_CENTER_CASE 2.499 1.812 2.499 1.812
-score MIXED_ES 2.699 1.070 2.699 1.070
-score MIXED_FONT_CASE 0.536 1.770 0.536 1.770
-score MIXED_HREF_CASE 1.999 1.673 1.999 1.673
-score MIXED_IMG_CASE 2.316 2.146 2.316 2.146
+score MIXED_AREA_CASE 0.001 0.764 0.001 0.764
+score MIXED_CENTER_CASE 2.499 1.735 2.499 1.735
+score MIXED_ES 2.699 1.098 2.699 1.098
+score MIXED_FONT_CASE 0.690 2.081 0.690 2.081
+score MIXED_HREF_CASE 1.999 0.001 1.999 0.001
+score MIXED_IMG_CASE 1.646 2.067 1.646 2.067
score MONERO_DEADLINE 1.000 1.000 1.000 1.000
score MONERO_EXTORT_01 1.000 1.000 1.000 1.000
score MONERO_MALWARE 1.000 1.000 1.000 1.000
score MONERO_PAY_ME 1.000 1.000 1.000 1.000
score MONEY_ATM_CARD 0.001 0.001 0.001 0.001
score MONEY_FORM 0.001 0.001 0.001 0.001
-score MONEY_FORM_SHORT 0.931 0.001 0.931 0.001
-score MONEY_FRAUD_3 0.203 1.958 0.203 1.958
-score MONEY_FRAUD_5 0.001 0.101 0.001 0.101
-score MONEY_FRAUD_8 1.027 0.001 1.027 0.001
-score MONEY_FREEMAIL_REPTO 2.923 0.001 2.923 0.001
-score MONEY_FROM_41 1.999 1.999 1.999 1.999
+score MONEY_FORM_SHORT 0.934 0.001 0.934 0.001
+score MONEY_FRAUD_3 0.107 2.044 0.107 2.044
+score MONEY_FRAUD_5 0.001 0.001 0.001 0.001
+score MONEY_FRAUD_8 1.038 0.001 1.038 0.001
+score MONEY_FREEMAIL_REPTO 2.948 0.001 2.948 0.001
+score MONEY_FROM_41 1.999 1.948 1.999 1.948
score MONEY_FROM_MISSP 0.001 0.001 0.001 0.001
score MSGID_DOLLARS_URI_IMG 1.000 1.000 1.000 1.000
score MSGID_HDR_MALF 1.000 1.000 1.000 1.000
score MSM_PRIO_REPTO 1.000 1.000 1.000 1.000
-score NAME_EMAIL_DIFF 3.500 3.396 3.500 3.396
-score NA_DOLLARS 0.319 1.410 0.319 1.410
+score NAME_EMAIL_DIFF 3.499 3.396 3.499 3.396
+score NA_DOLLARS 0.292 1.499 0.292 1.499
score NEWEGG_IMG_NOT_RCVD_NEGG 1.000 1.000 1.000 1.000
score NEW_PRODUCTS 1.000 1.000 1.000 1.000
-score NICE_REPLY_A -2.634 -3.247 -2.634 -3.247
-score NICE_REPLY_B -0.254 -0.001 -0.254 -0.001
-score NORDNS_LOW_CONTRAST 1.887 0.799 1.887 0.799
+score NICE_REPLY_A -2.421 -3.610 -2.421 -3.610
+score NICE_REPLY_B -0.237 -0.001 -0.237 -0.001
+score NORDNS_LOW_CONTRAST 1.887 0.724 1.887 0.724
score NO_FM_NAME_IP_HOSTN 0.001 0.001 0.001 0.001
score NSL_RCVD_FROM_USER 0.001 0.001 0.001 0.001
-score NSL_RCVD_HELO_USER 2.268 1.838 2.268 1.838
+score NSL_RCVD_HELO_USER 1.418 1.875 1.418 1.875
score OBFU_BITCOIN 1.000 1.000 1.000 1.000
-score OBFU_TEXT_ATTACH 0.580 1.698 0.580 1.698
-score ODD_FREEM_REPTO 2.999 2.546 2.999 2.546
-score PDS_BTC_ID 0.500 0.498 0.500 0.498
-score PDS_BTC_MSGID 1.000 0.667 1.000 0.667
-score PDS_BTC_NTLD 1.999 1.248 1.999 1.248
-score PDS_DBL_URL_TNB_RUNON 1.999 1.997 1.999 1.997
-score PDS_FROM_2_EMAILS 1.000 0.001 1.000 0.001
+score OBFU_TEXT_ATTACH 1.326 1.697 1.326 1.697
+score ODD_FREEM_REPTO 2.999 2.735 2.999 2.735
+score PDS_BTC_ID 0.499 0.498 0.499 0.498
+score PDS_BTC_MSGID 0.999 0.121 0.999 0.121
+score PDS_BTC_NTLD 0.001 1.341 0.001 1.341
+score PDS_DBL_URL_TNB_RUNON 1.999 1.998 1.999 1.998
score PDS_HELO_SPF_FAIL 0.001 1.000 0.001 1.000
-score PDS_HP_HELO_NORDNS 0.999 0.999 0.999 0.999
-score PDS_OTHER_BAD_TLD 2.000 1.998 2.000 1.998
+score PDS_HP_HELO_NORDNS 1.000 0.998 1.000 0.998
+score PDS_OTHER_BAD_TLD 1.999 1.997 1.999 1.997
score PDS_PHPEXP_BOT 1.499 1.498 1.499 1.498
score PDS_PHP_EVAL 1.499 1.498 1.499 1.498
score PDS_PHP_RUNTIME_FUNC 1.000 1.000 1.000 1.000
-score PDS_PRO_TLD 1.000 0.998 1.000 0.998
+score PDS_PRO_TLD 0.999 0.998 0.999 0.998
score PDS_RDNS_DYNAMIC_FP 0.001 0.001 0.001 0.001
score PDS_TONAME_EQ_TOLOCAL_FREEM_FORGE 1.999 1.997 1.999 1.997
-score PHISH_ATTACH 2.299 2.297 2.299 2.297
+score PHISH_ATTACH 2.300 2.297 2.300 2.297
score PHISH_AZURE_CLOUDAPP 3.500 3.500 3.500 3.500
score PHISH_FBASEAPP 1.000 1.000 1.000 1.000
score PHOTO_EDITING_DIRECT 1.000 1.000 1.000 1.000
score PHOTO_EDITING_FREEM 1.000 1.000 1.000 1.000
score PHP_NOVER_MUA 1.000 1.000 1.000 1.000
-score PHP_ORIG_SCRIPT 2.499 2.036 2.499 2.036
+score PHP_ORIG_SCRIPT 2.500 2.047 2.500 2.047
score PHP_ORIG_SCRIPT_EVAL 2.999 2.996 2.999 2.996
-score PHP_SCRIPT 2.500 2.497 2.500 2.497
+score PHP_SCRIPT 2.499 2.497 2.499 2.497
score PHP_SCRIPT_MUA 1.000 1.000 1.000 1.000
score PP_MIME_FAKE_ASCII_TEXT 0.999 0.001 0.999 0.001
score PP_TOO_MUCH_UNICODE02 0.500 0.500 0.500 0.500
score PP_TOO_MUCH_UNICODE05 1.000 1.000 1.000 1.000
score PUMPDUMP 1.000 1.000 1.000 1.000
score PUMPDUMP_MULTI 1.000 1.000 1.000 1.000
-score RAND_HEADER_LIST_SPOOF 2.999 2.879 2.999 2.879
+score RAND_HEADER_LIST_SPOOF 3.000 2.812 3.000 2.812
score RAND_HEADER_MANY 2.999 1.000 2.999 1.000
-score RAND_MKTG_HEADER 1.999 1.526 1.999 1.526
-score RATWARE_NO_RDNS 2.999 2.996 2.999 2.996
+score RAND_MKTG_HEADER 1.999 1.494 1.999 1.494
+score RATWARE_NO_RDNS 2.735 2.996 2.735 2.996
score RCVD_DOTEDU_SHORT 1.000 1.000 1.000 1.000
score RCVD_DOTEDU_SUSP_URI 1.000 1.000 1.000 1.000
score RCVD_IN_MSPIKE_BL 0.001 0.001 0.001 0.001
@@ -314,9 +313,8 @@ score RCVD_IN_MSPIKE_L5
score RCVD_IN_MSPIKE_WL 0.001 0.001 0.001 0.001
score RCVD_IN_MSPIKE_ZBI 0.001 0.001 0.001 0.001
score RDNS_NUM_TLD_ATCHNX 1.000 1.000 1.000 1.000
-score RDNS_NUM_TLD_XM 2.124 0.916 2.124 0.916
-score READY_TO_SHIP 1.000 1.000 1.000 1.000
-score REPLYTO_EMPTY 2.154 2.696 2.154 2.696
+score RDNS_NUM_TLD_XM 2.868 1.586 2.868 1.586
+score REPLYTO_EMPTY 2.152 2.696 2.152 2.696
score REPTO_419_FRAUD 1.000 1.000 1.000 1.000
score REPTO_419_FRAUD_AOL 1.000 1.000 1.000 1.000
score REPTO_419_FRAUD_AOL_LOOSE 1.000 1.000 1.000 1.000
@@ -331,17 +329,17 @@ score REPTO_419_FRAUD_YH
score REPTO_419_FRAUD_YH_LOOSE 1.000 1.000 1.000 1.000
score REPTO_419_FRAUD_YJ 1.000 1.000 1.000 1.000
score REPTO_419_FRAUD_YN 1.000 1.000 1.000 1.000
-score SCC_BODY_URI_ONLY 2.799 0.137 2.799 0.137
-score SCC_CANSPAM_2 2.899 2.657 2.899 2.657
-score SCC_ISEMM_LID_1 1.672 1.222 1.672 1.222
-score SCC_SPAMMER_ADDR_2 1.793 2.499 1.793 2.499
+score SCC_BODY_URI_ONLY 2.799 0.148 2.799 0.148
+score SCC_CANSPAM_2 2.899 2.057 2.899 2.057
+score SCC_ISEMM_LID_1 3.499 1.905 3.499 1.905
+score SCC_SPAMMER_ADDR_2 2.084 0.804 2.084 0.804
score SCRIPT_GIBBERISH 2.699 2.696 2.699 2.696
score SENDGRID_REDIR 1.488 0.001 1.488 0.001
score SENDGRID_REDIR_PHISH 1.000 1.000 1.000 1.000
score SEO_SUSP_NTLD 1.000 1.000 1.000 1.000
-score SERGIO_SUBJECT_VIAGRA01 3.182 1.670 3.182 1.670
+score SERGIO_SUBJECT_VIAGRA01 4.099 1.469 4.099 1.469
score SHOPIFY_IMG_NOT_RCVD_SFY 1.548 2.497 1.548 2.497
-score SHORTENER_SHORT_IMG 0.001 1.286 0.001 1.286
+score SHORTENER_SHORT_IMG 0.001 1.281 0.001 1.281
score SHORT_IMG_SUSP_NTLD 1.000 1.000 1.000 1.000
score SHORT_SHORTNER 1.999 1.997 1.999 1.997
score SPOOFED_FREEMAIL 0.001 1.997 0.001 1.997
@@ -349,44 +347,42 @@ score SPOOFED_FREEMAIL_NO_RDNS
score SPOOFED_FREEM_REPTO 0.001 2.497 0.001 2.497
score SPOOFED_FREEM_REPTO_CHN 0.001 1.000 0.001 1.000
score SPOOFED_FREEM_REPTO_RUS 0.001 1.000 0.001 1.000
-score SPOOF_GMAIL_MID 1.000 0.638 1.000 0.638
+score SPOOF_GMAIL_MID 1.000 0.723 1.000 0.723
score STATIC_XPRIO_OLE 0.001 0.001 0.001 0.001
score STOCK_TIP 1.000 1.000 1.000 1.000
-score STOX_BOUND_090909_B 2.367 1.155 2.367 1.155
+score STOX_BOUND_090909_B 0.769 1.420 0.769 1.420
score STY_INVIS_DIRECT 2.499 2.497 2.499 2.497
-score SUBJ_ATTENTION 0.500 0.499 0.500 0.499
+score SUBJ_ATTENTION 0.499 0.499 0.499 0.499
score SUBJ_BRKN_WORDNUMS 1.000 1.000 1.000 1.000
score SURBL_BLOCKED 0.001 0.001 0.001 0.001
score SUSPNTLD_EXPIRATION_EXTORT 1.000 1.000 1.000 1.000
-score SUSP_UTF8_WORD_FROM 1.999 0.653 1.999 0.653
+score SUSP_UTF8_WORD_FROM 1.999 1.999 1.999 1.999
score SUSP_UTF8_WORD_SUBJ 1.999 1.997 1.999 1.997
score SYSADMIN 1.000 1.000 1.000 1.000
score TAGSTAT_IMG_NOT_RCVD_TGST 1.000 1.000 1.000 1.000
score TARINGANET_IMG_NOT_RCVD_TN 1.000 1.000 1.000 1.000
score THIS_AD 1.599 1.266 1.599 1.266
-score THIS_IS_ADV_SUSP_NTLD 0.348 1.000 0.348 1.000
+score THIS_IS_ADV_SUSP_NTLD 1.141 1.000 1.141 1.000
score TONLINE_FAKE_DKIM 1.000 1.000 1.000 1.000
score TO_EQ_FM_DIRECT_MX 1.000 1.000 1.000 1.000
score TO_EQ_FM_DOM_SPF_FAIL 0.001 0.001 0.001 0.001
score TO_EQ_FM_SPF_FAIL 0.001 0.001 0.001 0.001
score TO_IN_SUBJ 0.100 0.100 0.100 0.100
-score TO_NAME_SUBJ_NO_RDNS 2.594 1.000 2.594 1.000
-score TO_NO_BRKTS_FROM_MSSP 2.499 2.498 2.499 2.498
-score TO_NO_BRKTS_HTML_IMG 1.999 0.792 1.999 0.792
-score TO_NO_BRKTS_HTML_ONLY 1.999 1.997 1.999 1.997
-score TO_NO_BRKTS_MSFT 1.000 0.001 1.000 0.001
-score TO_NO_BRKTS_NORDNS_HTML 1.999 1.204 1.999 1.204
+score TO_NAME_SUBJ_NO_RDNS 2.537 1.786 2.537 1.786
+score TO_NO_BRKTS_FROM_MSSP 2.499 2.497 2.499 2.497
+score TO_NO_BRKTS_HTML_IMG 1.999 0.774 1.999 0.774
+score TO_NO_BRKTS_HTML_ONLY 2.000 1.997 2.000 1.997
+score TO_NO_BRKTS_NORDNS_HTML 1.999 1.203 1.999 1.203
score TO_NO_BRKTS_PCNT 2.499 2.497 2.499 2.497
score TRANSFORM_LIFE 2.499 2.497 2.499 2.497
score TUMBLR_IMG_NOT_RCVD_TUMB 1.000 1.000 1.000 1.000
-score TVD_DOLLARS_US 2.399 1.404 2.399 1.404
-score TVD_PH_BODY_META 2.999 0.872 2.999 0.872
+score TVD_PH_BODY_META 2.999 0.591 2.999 0.591
score TVD_SPACE_ENCODED 1.000 0.001 1.000 0.001
score TW_GIBBERISH_MANY 1.000 1.000 1.000 1.000
score UC_GIBBERISH_OBFU 1.000 1.000 1.000 1.000
score UNDISC_FREEM 3.699 3.595 3.699 3.595
-score UNDISC_MONEY 3.699 2.147 3.699 2.147
-score UNICODE_OBFU_ASC 2.499 2.497 2.499 2.497
+score UNDISC_MONEY 3.699 2.197 3.699 2.197
+score UNICODE_OBFU_ASC 2.499 2.498 2.499 2.498
score UNICODE_OBFU_ZW 1.000 1.000 1.000 1.000
score UNSUB_GOOG_FORM 2.499 2.497 2.499 2.497
score URI_ADOBESPARK 1.000 1.000 1.000 1.000
@@ -397,35 +393,35 @@ score URI_DOTEDU
score URI_DOTEDU_ENTITY 1.000 1.000 1.000 1.000
score URI_FIREBASEAPP 2.999 2.996 2.999 2.996
score URI_GOOGLE_PROXY 2.899 2.796 2.899 2.796
-score URI_GOOG_STO_SPAMMY 2.892 2.525 2.892 2.525
+score URI_GOOG_STO_SPAMMY 2.893 1.083 2.893 1.083
score URI_HEX_IP 1.000 1.000 1.000 1.000
score URI_IMG_WP_REDIR 1.000 1.000 1.000 1.000
-score URI_IN_URI_10 3.699 2.878 3.699 2.878
+score URI_IN_URI_10 3.699 2.877 3.699 2.877
score URI_LONG_REPEAT 1.000 1.000 1.000 1.000
score URI_OBFU_DOM 2.199 2.297 2.199 2.297
-score URI_ONLY_MSGID_MALF 1.000 1.751 1.000 1.751
+score URI_ONLY_MSGID_MALF 1.000 1.134 1.000 1.134
score URI_OPTOUT_3LD 1.000 1.000 1.000 1.000
-score URI_PHISH 3.999 3.784 3.999 3.784
-score URI_PHP_REDIR 3.499 3.130 3.499 3.130
-score URI_TRY_3LD 1.577 1.997 1.577 1.997
+score URI_PHISH 3.999 3.790 3.999 3.790
+score URI_PHP_REDIR 3.499 3.169 3.499 3.169
+score URI_TRY_3LD 1.581 1.997 1.581 1.997
score URI_TRY_USME 1.000 1.000 1.000 1.000
score URI_WPADMIN 2.699 2.696 2.699 2.696
score URI_WP_DIRINDEX 1.000 1.000 1.000 1.000
score URI_WP_HACKED 1.000 3.496 1.000 3.496
-score URI_WP_HACKED_2 2.499 0.956 2.499 0.956
+score URI_WP_HACKED_2 2.499 0.872 2.499 0.872
score USB_DRIVES 1.000 1.000 1.000 1.000
score USER_IN_DKIM_WELCOMELIST 0.001 0.001 0.001 0.001
-score VFY_ACCT_NORDNS 2.725 2.931 2.725 2.931
+score VFY_ACCT_NORDNS 2.932 2.781 2.932 2.781
score VPS_NO_NTLD 1.000 1.000 1.000 1.000
score WALMART_IMG_NOT_RCVD_WAL 1.000 1.000 1.000 1.000
score WANT_TO_ORDER 1.000 1.000 1.000 1.000
-score WORD_INVIS 1.794 0.626 1.794 0.626
-score WORD_INVIS_MANY 2.999 2.249 2.999 2.249
-score XFER_LOTSA_MONEY 0.687 0.001 0.687 0.001
+score WORD_INVIS 1.989 0.584 1.989 0.584
+score WORD_INVIS_MANY 3.000 2.815 3.000 2.815
+score XFER_LOTSA_MONEY 0.781 0.157 0.781 0.157
score XM_DIGITS_ONLY 1.000 1.000 1.000 1.000
-score XM_LIGHT_HEAVY 2.499 2.497 2.499 2.497
+score XM_LIGHT_HEAVY 2.500 2.497 2.500 2.497
score XM_RANDOM 2.499 2.497 2.499 2.497
score XM_RECPTID 2.999 2.996 2.999 2.996
-score XPRIO 1.000 1.793 1.000 1.793
+score XPRIO 1.000 1.311 1.000 1.311
score XPRIO_SHORT_SUBJ 1.000 1.000 1.000 1.000
-score YOU_INHERIT 2.599 2.124 2.599 2.124
+score YOU_INHERIT 2.599 2.391 2.599 2.391
Modified: spamassassin/branches/trunk-welcomelist/rulesrc/scores/scores-set0
URL: http://svn.apache.org/viewvc/spamassassin/branches/trunk-welcomelist/rulesrc/scores/scores-set0?rev=1900022&r1=1900021&r2=1900022&view=diff
==============================================================================
--- spamassassin/branches/trunk-welcomelist/rulesrc/scores/scores-set0 (original)
+++ spamassassin/branches/trunk-welcomelist/rulesrc/scores/scores-set0 Tue Apr 19 08:44:01 2022
@@ -3,208 +3,207 @@
score AC_BR_BONANZA 0.001
score AC_DIV_BONANZA 0.001
-score AC_FROM_MANY_DOTS 2.999
+score AC_FROM_MANY_DOTS 3.000
score AC_HTML_NONSENSE_TAGS 1.999
score ADMITS_SPAM 3.799
-score ADVANCE_FEE_2_NEW_FRM_MNY 2.107
+score ADVANCE_FEE_2_NEW_FRM_MNY 1.073
score ADVANCE_FEE_2_NEW_MONEY 1.999
score ADVANCE_FEE_3_NEW 3.499
-score ADVANCE_FEE_3_NEW_FRM_MNY 0.271
+score ADVANCE_FEE_3_NEW_FRM_MNY 1.568
score ADVANCE_FEE_3_NEW_MONEY 2.999
score ADVANCE_FEE_4_NEW 2.499
score ADVANCE_FEE_4_NEW_FRM_MNY 0.001
-score ADVANCE_FEE_4_NEW_MONEY 1.705
+score ADVANCE_FEE_4_NEW_MONEY 1.610
score ADVANCE_FEE_5_NEW 2.399
score ADVANCE_FEE_5_NEW_FRM_MNY 0.001
score ADVANCE_FEE_5_NEW_MONEY 0.001
-score AD_PREFS 0.001
+score AD_PREFS 0.118
score AMAZON_IMG_NOT_RCVD_AMZN 2.499
score APP_DEVELOPMENT_NORDNS 1.999
score AXB_XMAILER_MIMEOLE_OL_024C2 0.001
-score AXB_XMAILER_MIMEOLE_OL_1ECD5 2.080
-score BIGNUM_EMAILS_FREEM 1.669
-score BIGNUM_EMAILS_MANY 3.000
-score BILLION_OVERLAP -0.702
-score BITCOIN_DEADLINE 2.210
-score BITCOIN_EXTORT_01 4.514
+score AXB_XMAILER_MIMEOLE_OL_1ECD5 0.972
+score BIGNUM_EMAILS_FREEM 2.214
+score BIGNUM_EMAILS_MANY 2.999
+score BILLION_OVERLAP -0.689
+score BITCOIN_DEADLINE 2.053
+score BITCOIN_EXTORT_01 4.999
score BITCOIN_MALF_HTML 3.499
-score BITCOIN_OBFU_SUBJ 2.157
+score BITCOIN_OBFU_SUBJ 3.030
score BITCOIN_SPAM_02 2.499
score BITCOIN_SPAM_04 1.499
score BITCOIN_SPAM_09 1.499
score BITCOIN_XPRIO 2.499
-score BITCOIN_YOUR_INFO 3.000
-score BODY_EMPTY 1.148
-score BODY_SINGLE_URI 2.210
+score BITCOIN_YOUR_INFO 2.999
+score BODY_EMPTY 1.152
+score BODY_SINGLE_URI 2.202
score BOGUS_MIME_VERSION 3.499
-score BOGUS_MSM_HDRS 2.015
+score BOGUS_MSM_HDRS 1.889
score CK_HELO_GENERIC 0.249
-score CONTENT_AFTER_HTML 2.499
+score CONTENT_AFTER_HTML 2.500
score CONTENT_AFTER_HTML_WEAK 1.499
-score CTE_8BIT_MISMATCH 1.000
-score DEAR_BENEFICIARY 0.001 # force non-zero
+score CTE_8BIT_MISMATCH 0.999
+score DEAR_BENEFICIARY 0.001
score DOS_RCVD_IP_TWICE_B 2.000
-score FAKE_REPLY_A1 2.430
+score FAKE_REPLY_A1 0.001
score FAKE_REPLY_B 2.699
score FILL_THIS_FORM 1.799
-score FONT_INVIS_DIRECT 0.189
-score FONT_INVIS_HTML_NOHTML 2.999
-score FONT_INVIS_LONG_LINE 1.668
+score FONT_INVIS_DIRECT 0.001
+score FONT_INVIS_HTML_NOHTML 3.000
+score FONT_INVIS_LONG_LINE 1.545
score FONT_INVIS_MSGID 0.001 # force non-zero
-score FONT_INVIS_NORDNS 1.969
-score FONT_INVIS_POSTEXTRAS 2.897
+score FONT_INVIS_NORDNS 0.612
+score FONT_INVIS_POSTEXTRAS 2.896
score FORGED_RELAY_MUA_TO_MX 2.034
score FORM_FRAUD_5 0.001
score FOUND_YOU 3.249
-score FREEMAIL_FORGED_FROMDOMAIN 0.249
+score FREEMAIL_FORGED_FROMDOMAIN 0.250
score FROMSPACE 3.499
-score FROM_2_EMAILS_SHORT 1.500
+score FROM_2_EMAILS_SHORT 1.495
score FROM_ADDR_WS 2.999
score FROM_MISSPACED 1.999
-score FROM_MISSP_DYNIP 1.461
+score FROM_MISSP_DYNIP 1.411
score FROM_MISSP_EH_MATCH 1.999
-score FROM_MISSP_FREEMAIL 3.200
+score FROM_MISSP_FREEMAIL 3.199
score FROM_MISSP_MSFT 0.001
-score FROM_MISSP_PHISH 3.266
-score FROM_MISSP_TO_UNDISC 0.219
+score FROM_MISSP_PHISH 2.837
+score FROM_MISSP_TO_UNDISC 0.631
score FROM_MISSP_USER 0.001
score FROM_MISSP_XPRIO 0.001
-score FROM_MULTI_NORDNS 1.399
-score FROM_NTLD_REPLY_FREEMAIL 1.483
-score FROM_SUSPICIOUS_NTLD 0.500
+score FROM_MULTI_NORDNS 1.396
+score FROM_NTLD_REPLY_FREEMAIL 1.930
+score FROM_SUSPICIOUS_NTLD 0.499
score FROM_SUSPICIOUS_NTLD_FP 1.999
-score FROM_UNBAL1 2.105
+score FROM_UNBAL1 2.075
score FROM_UNBAL2 2.199
-score FROM_WSP_TRAIL 2.300
+score FROM_WSP_TRAIL 2.299
score FSL_CTYPE_WIN1251 0.001
score FSL_NEW_HELO_USER 0.001
score FUZZY_AMAZON 2.199
-score FUZZY_CLICK_HERE 2.300
+score FUZZY_CLICK_HERE 2.299
score FUZZY_WALLET 3.199
-score GAPPY_GENITALIA 1.856
-score GB_FAKE_RF_SHORT 2.000
-score GB_FREEMAIL_DISPTO 0.500
+score GAPPY_GENITALIA 2.240
+score GB_FAKE_RF_SHORT 1.999
+score GB_FREEMAIL_DISPTO 0.499
score GB_FREEMAIL_DISPTO_NOTFREEM 0.499
score GOOG_REDIR_HTML_ONLY 1.999
-score GOOG_REDIR_NORDNS 2.600
-score GOOG_STO_EMAIL_PHISH 2.999
-score GOOG_STO_HTML_PHISH 2.051
-score GOOG_STO_IMG_NOHTML 2.440
+score GOOG_REDIR_NORDNS 2.603
+score GOOG_STO_EMAIL_PHISH 2.598
+score GOOG_STO_HTML_PHISH 2.553
+score GOOG_STO_IMG_NOHTML 2.422
score GOOG_STO_NOIMG_HTML 2.999
score HAS_X_NO_RELAY 2.499
score HAS_X_OUTGOING_SPAM_STAT 1.999
score HDRS_LCASE_IMGONLY 0.099
-score HDRS_MISSP 2.499
-score HDR_ORDER_FTSDMCXX_DIRECT 1.999
-score HDR_ORDER_FTSDMCXX_NORDNS 2.316
+score HDRS_MISSP 2.500
+score HDR_ORDER_FTSDMCXX_DIRECT 2.000
+score HDR_ORDER_FTSDMCXX_NORDNS 3.013
score HEADER_FROM_DIFFERENT_DOMAINS 0.249
score HELO_NO_DOMAIN 0.001
-score HK_LOTTO 0.999
-score HK_NAME_FM_MR_MRS 0.054
-score HK_NAME_FROM 0.999
-score HK_NAME_MR_MRS 0.999
-score HK_RANDOM_ENVFROM 0.999
-score HK_RANDOM_FROM 1.000
+score HK_LOTTO 0.935
+score HK_NAME_FM_MR_MRS 0.050
+score HK_NAME_FROM 1.000
+score HK_NAME_MR_MRS 1.000
+score HK_RANDOM_ENVFROM 1.000
+score HK_RANDOM_FROM 0.999
score HK_RANDOM_REPLYTO 0.999
score HK_SCAM 1.056
-score HK_WIN 0.999
+score HK_WIN 0.459
score HOSTED_IMG_DIRECT_MX 3.499
score HOSTED_IMG_FREEM 3.499
score HOSTED_IMG_MULTI_PUB_01 2.999
-score HTML_ENTITY_ASCII 1.257
-score HTML_FONT_TINY_NORDNS 2.000
+score HTML_ENTITY_ASCII 0.908
+score HTML_FONT_TINY_NORDNS 1.999
score HTML_OFF_PAGE 2.999
-score HTML_TAG_BALANCE_CENTER 2.159
-score HTML_TEXT_INVISIBLE_STYLE 1.787
-score IMG_ONLY_FM_DOM_INFO 1.627
-score JH_SPAMMY_HEADERS 3.499
+score HTML_TAG_BALANCE_CENTER 2.149
+score HTML_TEXT_INVISIBLE_STYLE 1.786
+score IMG_ONLY_FM_DOM_INFO 1.631
+score JH_SPAMMY_HEADERS 3.500
score LONGLN_LOW_CONTRAST 2.499
score LONG_HEX_URI 2.999
-score LONG_IMG_URI 1.682
+score LONG_IMG_URI 1.691
score LONG_INVISIBLE_TEXT 1.687
score LOTS_OF_MONEY 0.010
-score LOTTO_AGENT 0.909
+score LOTTO_AGENT 0.639
score LOTTO_DEPT 0.001 # force non-zero
score MALWARE_NORDNS 0.001
-score MALW_ATTACH 2.500
-score MANY_SPAN_IN_TEXT 2.500
-score MILLION_HUNDRED 0.005
-score MILLION_USD 0.012
+score MALW_ATTACH 2.499
+score MANY_SPAN_IN_TEXT 2.499
+score MILLION_HUNDRED 0.001
+score MILLION_USD 0.001
score MIMEOLE_DIRECT_TO_MX 1.999
-score MIXED_AREA_CASE 1.921
+score MIXED_AREA_CASE 0.001
score MIXED_CENTER_CASE 2.499
score MIXED_ES 2.699
-score MIXED_FONT_CASE 0.536
+score MIXED_FONT_CASE 0.690
score MIXED_HREF_CASE 1.999
-score MIXED_IMG_CASE 2.316
+score MIXED_IMG_CASE 1.646
score MONEY_ATM_CARD 0.001
-score MONEY_FORM 0.001
-score MONEY_FORM_SHORT 0.931
-score MONEY_FRAUD_3 0.203
-score MONEY_FRAUD_5 0.001
-score MONEY_FRAUD_8 1.027
-score MONEY_FREEMAIL_REPTO 2.923
+score MONEY_FORM 0.001 # force non-zero
+score MONEY_FORM_SHORT 0.934
+score MONEY_FRAUD_3 0.107
+score MONEY_FRAUD_5 0.001 # force non-zero
+score MONEY_FRAUD_8 1.038
+score MONEY_FREEMAIL_REPTO 2.948
score MONEY_FROM_41 1.999
score MONEY_FROM_MISSP 0.001
-score NAME_EMAIL_DIFF 3.500
-score NA_DOLLARS 0.319
-score NICE_REPLY_A -2.634
-score NICE_REPLY_B -0.254
+score NAME_EMAIL_DIFF 3.499
+score NA_DOLLARS 0.292
+score NICE_REPLY_A -2.421
+score NICE_REPLY_B -0.237
score NORDNS_LOW_CONTRAST 1.887
score NO_FM_NAME_IP_HOSTN 0.001
score NSL_RCVD_FROM_USER 0.001
-score NSL_RCVD_HELO_USER 2.268
-score OBFU_TEXT_ATTACH 0.580
+score NSL_RCVD_HELO_USER 1.418
+score OBFU_TEXT_ATTACH 1.326
score ODD_FREEM_REPTO 2.999
-score PDS_BTC_ID 0.500
-score PDS_BTC_MSGID 1.000
-score PDS_BTC_NTLD 1.999
+score PDS_BTC_ID 0.499
+score PDS_BTC_MSGID 0.999
+score PDS_BTC_NTLD 0.001
score PDS_DBL_URL_TNB_RUNON 1.999
-score PDS_HP_HELO_NORDNS 0.999
-score PDS_OTHER_BAD_TLD 2.000
+score PDS_HP_HELO_NORDNS 1.000
+score PDS_OTHER_BAD_TLD 1.999
score PDS_PHPEXP_BOT 1.499
score PDS_PHP_EVAL 1.499
-score PDS_PRO_TLD 1.000
+score PDS_PRO_TLD 0.999
score PDS_RDNS_DYNAMIC_FP 0.001 # force non-zero
score PDS_TONAME_EQ_TOLOCAL_FREEM_FORGE 1.999
-score PHISH_ATTACH 2.299
-score PHP_ORIG_SCRIPT 2.499
+score PHISH_ATTACH 2.300
+score PHP_ORIG_SCRIPT 2.500
score PHP_ORIG_SCRIPT_EVAL 2.999
-score PHP_SCRIPT 2.500
+score PHP_SCRIPT 2.499
score PP_MIME_FAKE_ASCII_TEXT 0.999
-score RAND_HEADER_LIST_SPOOF 2.999
+score RAND_HEADER_LIST_SPOOF 3.000
score RAND_HEADER_MANY 2.999
score RAND_MKTG_HEADER 1.999
-score RATWARE_NO_RDNS 2.999
-score RDNS_NUM_TLD_XM 2.124
-score REPLYTO_EMPTY 2.154
+score RATWARE_NO_RDNS 2.735
+score RDNS_NUM_TLD_XM 2.868
+score REPLYTO_EMPTY 2.152
score REPTO_419_FRAUD_GM 2.999
score SCC_BODY_URI_ONLY 2.799
score SCC_CANSPAM_2 2.899
-score SCC_ISEMM_LID_1 1.672
-score SCC_SPAMMER_ADDR_2 1.793
+score SCC_ISEMM_LID_1 3.499
+score SCC_SPAMMER_ADDR_2 2.084
score SCRIPT_GIBBERISH 2.699
score SENDGRID_REDIR 1.488
-score SERGIO_SUBJECT_VIAGRA01 3.182
+score SERGIO_SUBJECT_VIAGRA01 4.099
score SHOPIFY_IMG_NOT_RCVD_SFY 1.548
score SHORTENER_SHORT_IMG 0.001
score SHORT_SHORTNER 1.999
score STATIC_XPRIO_OLE 0.001
-score STOX_BOUND_090909_B 2.367
+score STOX_BOUND_090909_B 0.769
score STY_INVIS_DIRECT 2.499
-score SUBJ_ATTENTION 0.500
+score SUBJ_ATTENTION 0.499
score SUSP_UTF8_WORD_FROM 1.999
score SUSP_UTF8_WORD_SUBJ 1.999
score THIS_AD 1.599
-score THIS_IS_ADV_SUSP_NTLD 0.348
-score TO_NAME_SUBJ_NO_RDNS 2.594
+score THIS_IS_ADV_SUSP_NTLD 1.141
+score TO_NAME_SUBJ_NO_RDNS 2.537
score TO_NO_BRKTS_FROM_MSSP 2.499
score TO_NO_BRKTS_HTML_IMG 1.999
-score TO_NO_BRKTS_HTML_ONLY 1.999
+score TO_NO_BRKTS_HTML_ONLY 2.000
score TO_NO_BRKTS_NORDNS_HTML 1.999
score TO_NO_BRKTS_PCNT 2.499
score TRANSFORM_LIFE 2.499
-score TVD_DOLLARS_US 2.399
score TVD_PH_BODY_META 2.999
score UNDISC_FREEM 3.699
score UNDISC_MONEY 3.699
@@ -212,19 +211,19 @@ score UNICODE_OBFU_ASC 2.4
score UNSUB_GOOG_FORM 2.499
score URI_FIREBASEAPP 2.999
score URI_GOOGLE_PROXY 2.899
-score URI_GOOG_STO_SPAMMY 2.892
+score URI_GOOG_STO_SPAMMY 2.893
score URI_IN_URI_10 3.699
score URI_OBFU_DOM 2.199
score URI_PHISH 3.999
score URI_PHP_REDIR 3.499
-score URI_TRY_3LD 1.577
+score URI_TRY_3LD 1.581
score URI_WPADMIN 2.699
score URI_WP_HACKED_2 2.499
-score VFY_ACCT_NORDNS 2.725
-score WORD_INVIS 1.794
-score WORD_INVIS_MANY 2.999
-score XFER_LOTSA_MONEY 0.687
-score XM_LIGHT_HEAVY 2.499
+score VFY_ACCT_NORDNS 2.932
+score WORD_INVIS 1.989
+score WORD_INVIS_MANY 3.000
+score XFER_LOTSA_MONEY 0.781
+score XM_LIGHT_HEAVY 2.500
score XM_RANDOM 2.499
score XM_RECPTID 2.999
score YOU_INHERIT 2.599
@@ -322,7 +321,6 @@ score MSM_PRIO_REPTO 1.0
score NEWEGG_IMG_NOT_RCVD_NEGG 1.000
score NEW_PRODUCTS 1.000
score OBFU_BITCOIN 1.000
-score PDS_FROM_2_EMAILS 1.000
score PDS_PHP_RUNTIME_FUNC 1.000
score PHISH_AZURE_CLOUDAPP 3.500
score PHISH_FBASEAPP 1.000
@@ -337,7 +335,6 @@ score PUMPDUMP_MULTI 1.0
score RCVD_DOTEDU_SHORT 1.000
score RCVD_DOTEDU_SUSP_URI 1.000
score RDNS_NUM_TLD_ATCHNX 1.000
-score READY_TO_SHIP 1.000
score REPTO_419_FRAUD 1.000
score REPTO_419_FRAUD_AOL 1.000
score REPTO_419_FRAUD_AOL_LOOSE 1.000
@@ -365,7 +362,6 @@ score TARINGANET_IMG_NOT_RCVD_TN 1.0
score TONLINE_FAKE_DKIM 1.000
score TO_EQ_FM_DIRECT_MX 1.000
score TO_IN_SUBJ 0.100
-score TO_NO_BRKTS_MSFT 1.000
score TUMBLR_IMG_NOT_RCVD_TUMB 1.000
score TVD_SPACE_ENCODED 1.000
score TW_GIBBERISH_MANY 1.000