diff -Nru spamassassin-3.4.0/build/md5sum.pl spamassassin-3.4.2/build/md5sum.pl
--- spamassassin-3.4.0/build/md5sum.pl	2014-02-07 03:36:34.000000000 -0500
+++ spamassassin-3.4.2/build/md5sum.pl	1969-12-31 19:00:00.000000000 -0500
@@ -1,8 +0,0 @@
-#!/usr/bin/perl
-use Digest::MD5 qw/md5_hex/;
-
-$/=undef;
-
-while(<>) {
-  print md5_hex($_),"  $ARGV\n";
-}
diff -Nru spamassassin-3.4.0/build/mkrules spamassassin-3.4.2/build/mkrules
--- spamassassin-3.4.0/build/mkrules	2014-02-07 03:36:34.000000000 -0500
+++ spamassassin-3.4.2/build/mkrules	2018-09-13 21:27:52.000000000 -0400
@@ -47,12 +47,11 @@
 use lib 'lib';
 use Mail::SpamAssassin;
 
-use vars qw(
-    @opt_srcs $opt_out $opt_sandboxout $opt_manifest
-    $opt_manifestskip $opt_listpromotable $opt_active
-    $opt_activeout $default_file_header
-    $opt_rulemetadata $opt_exit_on_no_src
-);
+our ( @opt_srcs, $opt_out, $opt_sandboxout, $opt_manifest,
+    $opt_manifestskip, $opt_listpromotable, $opt_active,
+    $opt_activeout, $default_file_header,
+    $opt_rulemetadata, $opt_exit_on_no_src);
+
 GetOptions("src=s" => \@opt_srcs,
     "out=s",
     "sandboxout=s",
@@ -115,7 +114,7 @@
 my $newest_src_mtime = 0;
 my $newest_out_mtime = 0;
 
-my $default_file_header = join('', <DATA>);
+$default_file_header = join('', <DATA>);
 compile_utf8ify_function();
 
 foreach my $src (@opt_srcs) {
diff -Nru spamassassin-3.4.0/build/parse-rules-for-masses spamassassin-3.4.2/build/parse-rules-for-masses
--- spamassassin-3.4.0/build/parse-rules-for-masses	2014-02-07 03:36:34.000000000 -0500
+++ spamassassin-3.4.2/build/parse-rules-for-masses	2018-09-13 21:27:52.000000000 -0400
@@ -36,7 +36,7 @@
 use Getopt::Long;
 use Data::Dumper;
 
-use vars qw(@rulesdirs $outputfile $scoreset $skip_test_rules);
+our (@rulesdirs, $outputfile, $scoreset, $skip_test_rules);
 GetOptions (
                 "d=s" => \@rulesdirs,
                 "o=s" => \$outputfile,
diff -Nru spamassassin-3.4.0/build/preprocessor spamassassin-3.4.2/build/preprocessor
--- spamassassin-3.4.0/build/preprocessor	2014-02-07 03:36:34.000000000 -0500
+++ spamassassin-3.4.2/build/preprocessor	2018-09-13 21:27:52.000000000 -0400
@@ -69,7 +69,7 @@
 
 foreach (@ARGV) {
   if    (/^-M([a-z]+)$/)       { $modules{$1} = 1; }
-  elsif (/^-D([A-Z_]+)=(.*)$/) { $defines{$1} = $2; }
+  elsif (/^-D([A-Z0-9_]+)=(.*)$/) { $defines{$1} = $2; }
   elsif (/^-D([^=]+)$/)        { read_defs($1); } 
   elsif (/^-i(.+)$/)           { $infile = $1; }
   elsif (/^-o(.+)$/)           { $outfile = $1; }
diff -Nru spamassassin-3.4.0/build/sha1sum.pl spamassassin-3.4.2/build/sha1sum.pl
--- spamassassin-3.4.0/build/sha1sum.pl	2014-02-07 03:36:34.000000000 -0500
+++ spamassassin-3.4.2/build/sha1sum.pl	1969-12-31 19:00:00.000000000 -0500
@@ -1,12 +0,0 @@
-#!/usr/bin/perl
-
-BEGIN {
-  eval { require Digest::SHA; import Digest::SHA qw(sha1_hex); 1 }
-  or do { require Digest::SHA1; import Digest::SHA1 qw(sha1_hex) }
-}
-
-$/=undef;
-
-while(<>) {
-  print sha1_hex($_),"  $ARGV\n";
-}
diff -Nru spamassassin-3.4.0/build/sha256sum.pl spamassassin-3.4.2/build/sha256sum.pl
--- spamassassin-3.4.0/build/sha256sum.pl	1969-12-31 19:00:00.000000000 -0500
+++ spamassassin-3.4.2/build/sha256sum.pl	2018-09-13 21:27:52.000000000 -0400
@@ -0,0 +1,11 @@
+#!/usr/bin/perl
+
+BEGIN {
+  require Digest::SHA; import Digest::SHA qw(sha256_hex sha512_hex);
+}
+
+$/=undef;
+
+while(<>) {
+  print sha256_hex($_),"  $ARGV\n";
+}
diff -Nru spamassassin-3.4.0/build/sha512sum.pl spamassassin-3.4.2/build/sha512sum.pl
--- spamassassin-3.4.0/build/sha512sum.pl	1969-12-31 19:00:00.000000000 -0500
+++ spamassassin-3.4.2/build/sha512sum.pl	2018-09-13 21:27:52.000000000 -0400
@@ -0,0 +1,11 @@
+#!/usr/bin/perl
+
+BEGIN {
+  require Digest::SHA; import Digest::SHA qw(sha256_hex sha512_hex);
+}
+
+$/=undef;
+
+while(<>) {
+  print sha512_hex($_),"  $ARGV\n";
+}
diff -Nru spamassassin-3.4.0/Changes spamassassin-3.4.2/Changes
--- spamassassin-3.4.0/Changes	2014-02-07 03:36:38.000000000 -0500
+++ spamassassin-3.4.2/Changes	2018-09-13 21:27:51.000000000 -0400
@@ -1,8220 +1,1609 @@
 ------------------------------------------------------------------------
-r1565570 | kmcgrail | 2014-02-07 08:10:37 +0000 (Fri, 07 Feb 2014) | 1 
-line
+r1840662 | sidney | 2018-09-12 11:35:41 +0000 (Wed, 12 Sep 2018) | 1 line
  
- Fixing KB
+ Add Paul Stead as committer
 ------------------------------------------------------------------------
-r1565566 | kmcgrail | 2014-02-07 07:54:52 +0000 (Fri, 07 Feb 2014) | 1 
+r1840385 | kmcgrail | 2018-09-08 21:37:32 +0000 (Sat, 08 Sep 2018) | 1 
 line
  
- cleanup of emeritus/inactive list, logo credits, prep for 3.40 for 
-version
-------------------------------------------------------------------------
-r1565522 | spamassassin_role | 2014-02-07 03:05:47 +0000 (Fri, 07 Feb 
-2014) | 1 line
- 
- updated scores for revision 1565117 active rules added since last 
-mass-check
-------------------------------------------------------------------------
-r1565380 | jhardin | 2014-02-06 18:10:53 +0000 (Thu, 06 Feb 2014) | 1 line
- 
- Tuning LOTTO_AGENT FP avoidance and score limit
-------------------------------------------------------------------------
-r1565378 | jhardin | 2014-02-06 18:09:18 +0000 (Thu, 06 Feb 2014) | 1 line
- 
- Fixing cross-sandbox dependencies per bug#6999
-------------------------------------------------------------------------
-r1565371 | axb | 2014-02-06 17:35:20 +0000 (Thu, 06 Feb 2014) | 2 lines
- 
- disabled 
- tflags	 KHOP_DYNAMIC2	nopublish
-------------------------------------------------------------------------
-r1565368 | axb | 2014-02-06 17:33:34 +0000 (Thu, 06 Feb 2014) | 1 line
- 
- disabled nopublish rules
-------------------------------------------------------------------------
-r1565311 | axb | 2014-02-06 15:45:56 +0000 (Thu, 06 Feb 2014) | 1 line
- 
- re-enabled __BUGGED_IMG co J.Harding is using it  <HMPF!>
-------------------------------------------------------------------------
-r1565264 | axb | 2014-02-06 14:17:31 +0000 (Thu, 06 Feb 2014) | 1 line
- 
- PLEASE KEEP THIS TIDY
-------------------------------------------------------------------------
-r1565231 | axb | 2014-02-06 13:28:48 +0000 (Thu, 06 Feb 2014) | 2 lines
- 
- disabled
- tflags   URIBL_META_SURBL_ANY       net nopublish
-------------------------------------------------------------------------
-r1565213 | axb | 2014-02-06 12:50:06 +0000 (Thu, 06 Feb 2014) | 2 lines
- 
- disabled ancient bloat -need to speed up masscheckers to handle larger 
-corpus
- 
-------------------------------------------------------------------------
-r1565199 | axb | 2014-02-06 12:22:11 +0000 (Thu, 06 Feb 2014) | 1 line
- 
- Disabled expensive, ancient, experimental rules
+ more build updates and new rc1 sums for announcement
 ------------------------------------------------------------------------
-r1565159 | axb | 2014-02-06 10:49:47 +0000 (Thu, 06 Feb 2014) | 1 line
- 
- cleanup 
-------------------------------------------------------------------------
-r1565095 | axb | 2014-02-06 07:23:15 +0000 (Thu, 06 Feb 2014) | 1 line
- 
- added __HAS_ORGANIZATION
-------------------------------------------------------------------------
-r1565063 | spamassassin_role | 2014-02-06 03:15:04 +0000 (Thu, 06 Feb 
-2014) | 1 line
- 
- updated scores for revision 1564672 active rules added since last 
-mass-check
-------------------------------------------------------------------------
-r1564982 | kmcgrail | 2014-02-05 23:02:07 +0000 (Wed, 05 Feb 2014) | 1 
+r1840380 | kmcgrail | 2018-09-08 21:08:05 +0000 (Sat, 08 Sep 2018) | 1 
 line
  
- missed one bogus version per bug 6422
+ preparing to release 3.4.2-rc1 again with new sa-update
 ------------------------------------------------------------------------
-r1564676 | kmcgrail | 2014-02-05 08:53:06 +0000 (Wed, 05 Feb 2014) | 1 
+r1840377 | kmcgrail | 2018-09-08 20:40:12 +0000 (Sat, 08 Sep 2018) | 1 
 line
  
- Tweaks on announcement and build instructions while prepping rc6
+ Removing sha-1 sig support from sa-update - bug 7614
 ------------------------------------------------------------------------
-r1564636 | kmcgrail | 2014-02-05 05:05:04 +0000 (Wed, 05 Feb 2014) | 1 
+r1840330 | kmcgrail | 2018-09-08 01:05:14 +0000 (Sat, 08 Sep 2018) | 1 
 line
  
- preparing to release 3.4.0-rc6
+ changing to 3.3.3 to 3.3.2
 ------------------------------------------------------------------------
-r1564626 | kmcgrail | 2014-02-05 04:10:03 +0000 (Wed, 05 Feb 2014) | 1 
+r1840329 | kmcgrail | 2018-09-08 01:03:42 +0000 (Sat, 08 Sep 2018) | 1 
 line
  
- Removed tests for FM_FRM_RN_L_BRACK
+ fixing a small typo in the announcement
 ------------------------------------------------------------------------
-r1564613 | kmcgrail | 2014-02-05 03:20:26 +0000 (Wed, 05 Feb 2014) | 1 
+r1840233 | kmcgrail | 2018-09-06 16:07:14 +0000 (Thu, 06 Sep 2018) | 1 
 line
  
- Fixing CREDITS to include Daniel Lemke and Henrik Krohns
+ updating the hash sigs for the announcement
 ------------------------------------------------------------------------
-r1564612 | spamassassin_role | 2014-02-05 03:07:34 +0000 (Wed, 05 Feb 
-2014) | 1 line
- 
- updated scores for revision 1564230 active rules added since last 
-mass-check
-------------------------------------------------------------------------
-r1564604 | mmartinec | 2014-02-05 01:33:28 +0000 (Wed, 05 Feb 2014) | 1 
+r1840230 | kmcgrail | 2018-09-06 15:47:47 +0000 (Thu, 06 Sep 2018) | 1 
 line
  
- Bug 6996 #11: spamd to honour --min-children
+ preparing to release 3.4.2-rc1
 ------------------------------------------------------------------------
-r1564329 | mmartinec | 2014-02-04 15:00:15 +0000 (Tue, 04 Feb 2014) | 1 
+r1840219 | kmcgrail | 2018-09-06 13:02:56 +0000 (Thu, 06 Sep 2018) | 1 
 line
  
- added a missing "use Time::HiRes" to TinyRedis.pm (not a bug, just a 
-"right thing" to do)
+ more cleanup of branding and build process
 ------------------------------------------------------------------------
-r1564256 | axb | 2014-02-04 11:28:30 +0000 (Tue, 04 Feb 2014) | 1 line
- 
- added util_rb_2tld biz.ua
-------------------------------------------------------------------------
-r1564194 | kmcgrail | 2014-02-04 04:44:52 +0000 (Tue, 04 Feb 2014) | 1 
+r1840213 | kmcgrail | 2018-09-06 12:04:10 +0000 (Thu, 06 Sep 2018) | 1 
 line
  
- reversal of r1557309 for bayes_store_module_additional conf option
+ fix for Util wrap pre Perl 5.14 - bug 7616
 ------------------------------------------------------------------------
-r1564168 | spamassassin_role | 2014-02-04 03:06:04 +0000 (Tue, 04 Feb 
-2014) | 1 line
- 
- updated scores for revision 1563802 active rules added since last 
-mass-check
-------------------------------------------------------------------------
-r1564078 | kmcgrail | 2014-02-03 21:45:42 +0000 (Mon, 03 Feb 2014) | 1 
+r1840170 | kmcgrail | 2018-09-05 23:46:20 +0000 (Wed, 05 Sep 2018) | 1 
 line
  
- adding tflag publish per 
-http://wiki.apache.org/spamassassin/SaUpdateBackend
-------------------------------------------------------------------------
-r1563762 | spamassassin_role | 2014-02-03 03:00:47 +0000 (Mon, 03 Feb 
-2014) | 1 line
- 
- updated scores for revision 1563579 active rules added since last 
-mass-check
-------------------------------------------------------------------------
-r1563559 | spamassassin_role | 2014-02-02 03:09:12 +0000 (Sun, 02 Feb 
-2014) | 1 line
- 
- updated scores for revision 1563382 active rules added since last 
-mass-check
+ updating the readme and announcement text
 ------------------------------------------------------------------------
-r1563367 | spamassassin_role | 2014-02-01 03:06:58 +0000 (Sat, 01 Feb 
-2014) | 1 line
- 
- updated scores for revision 1563086 active rules added since last 
-mass-check
-------------------------------------------------------------------------
-r1563172 | mmartinec | 2014-01-31 16:54:36 +0000 (Fri, 31 Jan 2014) | 1 
+r1840128 | kmcgrail | 2018-09-05 12:15:57 +0000 (Wed, 05 Sep 2018) | 1 
 line
  
- Bug 6996 - spamd --round-robin conflicts with multiple listen sockets
+ sa-update version work - bug 7006
 ------------------------------------------------------------------------
-r1563162 | kmcgrail | 2014-01-31 16:22:28 +0000 (Fri, 31 Jan 2014) | 1 
+r1840072 | billcole | 2018-09-04 22:27:55 +0000 (Tue, 04 Sep 2018) | 1 
 line
  
- optimized the gibberish rule
+ Make leading space/zero for one-digit dates in mbox separator optional 
+Bug 7445
 ------------------------------------------------------------------------
-r1563039 | spamassassin_role | 2014-01-31 03:18:11 +0000 (Fri, 31 Jan 
-2014) | 1 line
- 
- updated scores for revision 1562725 active rules added since last 
-mass-check
-------------------------------------------------------------------------
-r1562916 | kmcgrail | 2014-01-30 18:42:29 +0000 (Thu, 30 Jan 2014) | 1 
+r1840053 | kmcgrail | 2018-09-04 17:32:36 +0000 (Tue, 04 Sep 2018) | 1 
 line
  
- Adding html tag gibberish tag rule for testing from Amir Caspi on the 
-mailing list
+ Fixing the docs bug 7042
 ------------------------------------------------------------------------
-r1562908 | kmcgrail | 2014-01-30 18:04:41 +0000 (Thu, 30 Jan 2014) | 1 
+r1840050 | billcole | 2018-09-04 16:39:43 +0000 (Tue, 04 Sep 2018) | 1 
 line
  
- Small debug enabled in rbl server lookup
+ document %x token foe Exim-like virtual config dirs
 ------------------------------------------------------------------------
-r1562705 | axb | 2014-01-30 07:17:05 +0000 (Thu, 30 Jan 2014) | 1 line
+r1839962 | hege | 2018-09-03 13:21:42 +0000 (Mon, 03 Sep 2018) | 2 lines
  
- nailed URIBL_MW_SURBL
-------------------------------------------------------------------------
-r1562704 | axb | 2014-01-30 07:16:49 +0000 (Thu, 30 Jan 2014) | 1 line
+ Optimize loop, run hits only once
  
- set fixed score for URIBL_MW_SURBL
 ------------------------------------------------------------------------
-r1562681 | spamassassin_role | 2014-01-30 03:16:01 +0000 (Thu, 30 Jan 
-2014) | 1 line
+r1839883 | hege | 2018-09-02 13:50:12 +0000 (Sun, 02 Sep 2018) | 2 lines
  
- updated scores for revision 1562377 active rules added since last 
-mass-check
-------------------------------------------------------------------------
-r1562345 | spamassassin_role | 2014-01-29 03:11:17 +0000 (Wed, 29 Jan 
-2014) | 1 line
- 
- updated scores for revision 1562007 active rules added since last 
-mass-check
-------------------------------------------------------------------------
-r1561929 | spamassassin_role | 2014-01-28 03:08:10 +0000 (Tue, 28 Jan 
-2014) | 1 line
- 
- updated scores for revision 1561610 active rules added since last 
-mass-check
-------------------------------------------------------------------------
-r1561584 | spamassassin_role | 2014-01-27 03:05:14 +0000 (Mon, 27 Jan 
-2014) | 1 line
- 
- updated scores for revision 1561463 active rules added since last 
-mass-check
-------------------------------------------------------------------------
-r1561436 | spamassassin_role | 2014-01-26 03:11:59 +0000 (Sun, 26 Jan 
-2014) | 1 line
- 
- updated scores for revision 1561274 active rules added since last 
-mass-check
-------------------------------------------------------------------------
-r1561249 | spamassassin_role | 2014-01-25 03:03:21 +0000 (Sat, 25 Jan 
-2014) | 1 line
- 
- updated scores for revision 1560920 active rules added since last 
-mass-check
-------------------------------------------------------------------------
-r1560916 | axb | 2014-01-24 08:19:12 +0000 (Fri, 24 Jan 2014) | 3 lines
- 
- Jan 24 09:16:42.734 [9302] dbg: config: warning: score set for 
-non-existent rule FH_HAS_XID
- 
- removed score
-------------------------------------------------------------------------
-r1560894 | spamassassin_role | 2014-01-24 03:12:15 +0000 (Fri, 24 Jan 
-2014) | 1 line
- 
- updated scores for revision 1560608 active rules added since last 
-mass-check
-------------------------------------------------------------------------
-r1560576 | spamassassin_role | 2014-01-23 03:13:05 +0000 (Thu, 23 Jan 
-2014) | 1 line
- 
- updated scores for revision 1560283 active rules added since last 
-mass-check
-------------------------------------------------------------------------
-r1560289 | axb | 2014-01-22 09:13:23 +0000 (Wed, 22 Jan 2014) | 1 line
- 
- removed bad & no hits rules
-------------------------------------------------------------------------
-r1560282 | axb | 2014-01-22 08:46:08 +0000 (Wed, 22 Jan 2014) | 1 line
- 
-  Disabled - "no hits at all" ancient rules  - Axb 2014-01-22
-------------------------------------------------------------------------
-r1560243 | spamassassin_role | 2014-01-22 03:18:39 +0000 (Wed, 22 Jan 
-2014) | 1 line
- 
- updated scores for revision 1559940 active rules added since last 
-mass-check
-------------------------------------------------------------------------
-r1559968 | axb | 2014-01-21 10:40:11 +0000 (Tue, 21 Jan 2014) | 1 line
- 
- we need  __THREADED for metas (will move to 10_hasbase.cf)
-------------------------------------------------------------------------
-r1559962 | axb | 2014-01-21 10:18:48 +0000 (Tue, 21 Jan 2014) | 1 line
- 
- disabled old nopublish rules - seems like pointless masscheck overhead
-------------------------------------------------------------------------
-r1559956 | axb | 2014-01-21 10:01:26 +0000 (Tue, 21 Jan 2014) | 1 line
- 
- disabled nopublish rules - seems like pointless masscheck overhead
-------------------------------------------------------------------------
-r1559955 | axb | 2014-01-21 09:57:08 +0000 (Tue, 21 Jan 2014) | 1 line
- 
- disabled "forgotten" RCVD_IN_SPAMCOP	net nopublish
-------------------------------------------------------------------------
-r1559954 | axb | 2014-01-21 09:36:26 +0000 (Tue, 21 Jan 2014) | 1 line
- 
- disabled "nopublish"
-------------------------------------------------------------------------
-r1559949 | axb | 2014-01-21 09:04:38 +0000 (Tue, 21 Jan 2014) | 1 line
- 
- disabled nopublish rules
-------------------------------------------------------------------------
-r1559948 | axb | 2014-01-21 09:03:21 +0000 (Tue, 21 Jan 2014) | 1 line
- 
- disabled nopublish rules 
-------------------------------------------------------------------------
-r1559940 | axb | 2014-01-21 08:49:23 +0000 (Tue, 21 Jan 2014) | 2 lines
- 
- removed more fixed scores for  00_FVGT_File001.cf rules
- let ruleqa autopromote
-------------------------------------------------------------------------
-r1559938 | axb | 2014-01-21 08:32:03 +0000 (Tue, 21 Jan 2014) | 2 lines
- 
- removed fixed scores for 00_FVGT_File001.cf rules
- let ruleqa decide
-------------------------------------------------------------------------
-r1559932 | axb | 2014-01-21 08:11:56 +0000 (Tue, 21 Jan 2014) | 4 lines
+ Fix SHA512 verification
  
- removed 
- score FR_ALMOST_VIAG2 2.299 1.594 2.299 1.531 # n=2
- score FR_CANTSEETEXT 0 # n=0 n=1 n=2 n=3
- let ruleqa decide
 ------------------------------------------------------------------------
-r1559931 | axb | 2014-01-21 08:10:23 +0000 (Tue, 21 Jan 2014) | 4 lines
- 
- removed
- publish FR_ALMOST_VIAG2
- publish FR_CANTSEETEXT
- let ruleqa autopromote
-------------------------------------------------------------------------
-r1559913 | spamassassin_role | 2014-01-21 03:06:25 +0000 (Tue, 21 Jan 
-2014) | 1 line
- 
- updated scores for revision 1559645 active rules added since last 
-mass-check
-------------------------------------------------------------------------
-r1559639 | axb | 2014-01-20 08:06:41 +0000 (Mon, 20 Jan 2014) | 3 lines
- 
- removed fixed scores for rules in 00_FVGT_File001.cf
- seems these were assigned before ruleqa autopromoted rules
- 
-------------------------------------------------------------------------
-r1559622 | spamassassin_role | 2014-01-20 03:22:09 +0000 (Mon, 20 Jan 
-2014) | 1 line
- 
- updated scores for revision 1559481 active rules added since last 
-mass-check
-------------------------------------------------------------------------
-r1559593 | kmcgrail | 2014-01-19 22:52:03 +0000 (Sun, 19 Jan 2014) | 1 
-line
- 
- Fixing lang_pl_test rule disable condition
-------------------------------------------------------------------------
-r1559456 | spamassassin_role | 2014-01-19 03:16:52 +0000 (Sun, 19 Jan 
-2014) | 1 line
- 
- updated scores for revision 1559330 active rules added since last 
-mass-check
-------------------------------------------------------------------------
-r1559446 | jhardin | 2014-01-19 02:16:25 +0000 (Sun, 19 Jan 2014) | 1 line
- 
- Disable Jimdo phishing rule, add WordPress phishing rule
-------------------------------------------------------------------------
-r1559431 | jhardin | 2014-01-18 22:15:24 +0000 (Sat, 18 Jan 2014) | 1 line
- 
- Migrate some subrules from emailed/FVGT sandbox prior to dropping old 
-rules file entirely
-------------------------------------------------------------------------
-r1559309 | spamassassin_role | 2014-01-18 03:10:09 +0000 (Sat, 18 Jan 
-2014) | 1 line
- 
- updated scores for revision 1559048 active rules added since last 
-mass-check
-------------------------------------------------------------------------
-r1558999 | spamassassin_role | 2014-01-17 03:06:21 +0000 (Fri, 17 Jan 
-2014) | 1 line
- 
- updated scores for revision 1558716 active rules added since last 
-mass-check
-------------------------------------------------------------------------
-r1558958 | kmcgrail | 2014-01-16 23:15:24 +0000 (Thu, 16 Jan 2014) | 1 
-line
- 
- set score ceiling for FH_RANDOM_SURE rule of 0.5
-------------------------------------------------------------------------
-r1558682 | spamassassin_role | 2014-01-16 03:12:08 +0000 (Thu, 16 Jan 
-2014) | 1 line
- 
- updated scores for revision 1558319 active rules added since last 
-mass-check
-------------------------------------------------------------------------
-r1558475 | jhardin | 2014-01-15 17:23:56 +0000 (Wed, 15 Jan 2014) | 1 line
- 
- add URI_WPADMIN rule for evaluation, possible phishing sign
-------------------------------------------------------------------------
-r1558457 | hstern | 2014-01-15 16:43:28 +0000 (Wed, 15 Jan 2014) | 2 lines
- 
- sandbox/hstern/*: Removed my old garbage
- 
-------------------------------------------------------------------------
-r1558271 | spamassassin_role | 2014-01-15 03:09:46 +0000 (Wed, 15 Jan 
-2014) | 1 line
- 
- updated scores for revision 1557976 active rules added since last 
-mass-check
-------------------------------------------------------------------------
-r1558190 | kmcgrail | 2014-01-14 21:00:22 +0000 (Tue, 14 Jan 2014) | 1 
-line
- 
- cleaned up PHW to PCCC references in Credits
-------------------------------------------------------------------------
-r1558095 | kmcgrail | 2014-01-14 16:17:40 +0000 (Tue, 14 Jan 2014) | 1 
-line
- 
- disabled lang_pl_tests.t by default - see bug 6992
-------------------------------------------------------------------------
-r1557912 | spamassassin_role | 2014-01-14 03:15:40 +0000 (Tue, 14 Jan 
-2014) | 1 line
- 
- updated scores for revision 1557663 active rules added since last 
-mass-check
-------------------------------------------------------------------------
-r1557645 | spamassassin_role | 2014-01-13 03:14:55 +0000 (Mon, 13 Jan 
-2014) | 1 line
- 
- updated scores for revision 1557499 active rules added since last 
-mass-check
-------------------------------------------------------------------------
-r1557490 | spamassassin_role | 2014-01-12 03:04:58 +0000 (Sun, 12 Jan 
-2014) | 1 line
- 
- updated scores for revision 1557327 active rules added since last 
-mass-check
-------------------------------------------------------------------------
-r1557425 | kmcgrail | 2014-01-11 17:19:21 +0000 (Sat, 11 Jan 2014) | 1 
+r1839865 | billcole | 2018-09-02 00:44:43 +0000 (Sun, 02 Sep 2018) | 1 
 line
  
-  updated proposed txt with the sha1/md5sum of the rc5 build and more 
-tweaks to build README
+ Add SHA512 support to build/mkupdates/* scripts and sa-update
 ------------------------------------------------------------------------
-r1557421 | kmcgrail | 2014-01-11 17:12:00 +0000 (Sat, 11 Jan 2014) | 1 
+r1839854 | kmcgrail | 2018-09-01 21:23:41 +0000 (Sat, 01 Sep 2018) | 1 
 line
  
- preparing to release 3.4.0 rc5
+ More SHA256/512issues identified
 ------------------------------------------------------------------------
-r1557419 | kmcgrail | 2014-01-11 16:43:51 +0000 (Sat, 11 Jan 2014) | 1 
+r1839851 | kmcgrail | 2018-09-01 21:11:42 +0000 (Sat, 01 Sep 2018) | 1 
 line
  
- Fixed MANIFEST for TinyRedis.pm move to Util
+ preparing to release 3.4.2-pre5
 ------------------------------------------------------------------------
-r1557418 | kmcgrail | 2014-01-11 16:33:32 +0000 (Sat, 11 Jan 2014) | 1 
+r1839848 | kmcgrail | 2018-09-01 21:05:17 +0000 (Sat, 01 Sep 2018) | 1 
 line
  
- Add documentation for Redis Bayes backend to Redis.pm, moved TinyRedis 
-to Util.pm, updated example config for Redis and changed all TinyRedis 
-references to Util::TinyRedis
+ Preparing 3.4.2-pre4
 ------------------------------------------------------------------------
-r1557372 | mmartinec | 2014-01-11 12:40:47 +0000 (Sat, 11 Jan 2014) | 1 
+r1839835 | kmcgrail | 2018-09-01 18:03:57 +0000 (Sat, 01 Sep 2018) | 1 
 line
  
- added a missing "use Mail::SpamAssassin::BayesStore::TinyRedis"
+ Minor MANIFEST fix
 ------------------------------------------------------------------------
-r1557316 | kmcgrail | 2014-01-11 06:04:33 +0000 (Sat, 11 Jan 2014) | 1 
+r1839834 | kmcgrail | 2018-09-01 18:01:46 +0000 (Sat, 01 Sep 2018) | 1 
 line
  
- a few more small tweaks to the build/README
+ Streamlining the build process, Updating the build process for new 
+infrastructure and switching to sha256/512 - bug 7596
 ------------------------------------------------------------------------
-r1557315 | kmcgrail | 2014-01-11 05:55:31 +0000 (Sat, 11 Jan 2014) | 1 
+r1839832 | billcole | 2018-09-01 17:46:01 +0000 (Sat, 01 Sep 2018) | 1 
 line
  
- updated proposed txt with the sha1/md5sum of the rc4 build
+ remove pointless and incompatible  modifier from recent patch
 ------------------------------------------------------------------------
-r1557312 | kmcgrail | 2014-01-11 05:46:37 +0000 (Sat, 11 Jan 2014) | 1 
+r1839826 | kmcgrail | 2018-09-01 14:55:44 +0000 (Sat, 01 Sep 2018) | 1 
 line
  
- preparing to release 3.4.0-rc4
+ Cleanup on README file
 ------------------------------------------------------------------------
-r1557311 | kmcgrail | 2014-01-11 04:46:45 +0000 (Sat, 11 Jan 2014) | 1 
+r1839824 | kmcgrail | 2018-09-01 14:21:36 +0000 (Sat, 01 Sep 2018) | 1 
 line
  
- Adding TinyRedis.pm
+ Placeholder for Upgrade info
 ------------------------------------------------------------------------
-r1557310 | kmcgrail | 2014-01-11 04:46:11 +0000 (Sat, 11 Jan 2014) | 1 
+r1839807 | kmcgrail | 2018-09-01 05:39:30 +0000 (Sat, 01 Sep 2018) | 1 
 line
  
- Added autolearn_force debugging and logging - bug 5503
+ Preparing to release 3.4.2-pre4
 ------------------------------------------------------------------------
-r1557309 | kmcgrail | 2014-01-11 04:45:35 +0000 (Sat, 11 Jan 2014) | 1 
+r1839806 | kmcgrail | 2018-09-01 05:37:42 +0000 (Sat, 01 Sep 2018) | 1 
 line
  
- Split Redis.pm into two files including TinyRedis.pm, added 
-configuration option to load a second module bug 6990 - and documented 
-autolearn_force better for bug 5503 as well as documented the multiple 
-and maxhits tflags better
-------------------------------------------------------------------------
-r1557303 | spamassassin_role | 2014-01-11 03:01:00 +0000 (Sat, 11 Jan 
-2014) | 1 line
- 
- updated scores for revision 1557056 active rules added since last 
-mass-check
+ Fixing minor logic issue on HAS_DSA
 ------------------------------------------------------------------------
-r1557256 | kmcgrail | 2014-01-10 21:00:38 +0000 (Fri, 10 Jan 2014) | 1 
+r1839797 | billcole | 2018-08-31 23:43:25 +0000 (Fri, 31 Aug 2018) | 1 
 line
  
- renamed Redis Package to match filename to pass xt test - Bug 6990
+ skip unparseable Cyrus LMTPA over unix socket Received header 
 ------------------------------------------------------------------------
-r1557018 | spamassassin_role | 2014-01-10 03:08:28 +0000 (Fri, 10 Jan 
-2014) | 1 line
- 
- updated scores for revision 1556762 active rules added since last 
-mass-check
-------------------------------------------------------------------------
-r1556959 | kmcgrail | 2014-01-09 21:39:16 +0000 (Thu, 09 Jan 2014) | 1 
+r1839792 | billcole | 2018-08-31 22:04:32 +0000 (Fri, 31 Aug 2018) | 1 
 line
  
- Changed Credits for Duncan
+ Actually implementing use_bayes_rules distinct from use_bayes. Bug #7110
 ------------------------------------------------------------------------
-r1556764 | axb | 2014-01-09 09:27:41 +0000 (Thu, 09 Jan 2014) | 1 line
- 
- added AXB_XM_MYECLNT
-------------------------------------------------------------------------
-r1556705 | spamassassin_role | 2014-01-09 03:04:44 +0000 (Thu, 09 Jan 
-2014) | 1 line
- 
- updated scores for revision 1556465 active rules added since last 
-mass-check
-------------------------------------------------------------------------
-r1556598 | jhardin | 2014-01-08 18:24:07 +0000 (Wed, 08 Jan 2014) | 1 line
- 
- tune CN_B2B_SPAMMER
-------------------------------------------------------------------------
-r1556457 | axb | 2014-01-08 07:34:47 +0000 (Wed, 08 Jan 2014) | 1 line
- 
- removed util_rb_2tld firm.in  - already in RB
-------------------------------------------------------------------------
-r1556452 | axb | 2014-01-08 07:19:14 +0000 (Wed, 08 Jan 2014) | 1 line
- 
- added util_rb_2tld firm.in
-------------------------------------------------------------------------
-r1556431 | spamassassin_role | 2014-01-08 03:12:29 +0000 (Wed, 08 Jan 
-2014) | 1 line
- 
- updated scores for revision 1556147 active rules added since last 
-mass-check
-------------------------------------------------------------------------
-r1556355 | kmcgrail | 2014-01-07 21:01:28 +0000 (Tue, 07 Jan 2014) | 1 
+r1839684 | kmcgrail | 2018-08-30 15:26:34 +0000 (Thu, 30 Aug 2018) | 1 
 line
  
- moved Duncan to previous committers
-------------------------------------------------------------------------
-r1556113 | spamassassin_role | 2014-01-07 03:06:46 +0000 (Tue, 07 Jan 
-2014) | 1 line
- 
- updated scores for revision 1555697 active rules added since last 
-mass-check
-------------------------------------------------------------------------
-r1555649 | spamassassin_role | 2014-01-06 02:59:50 +0000 (Mon, 06 Jan 
-2014) | 1 line
- 
- updated scores for revision 1555471 active rules added since last 
-mass-check
-------------------------------------------------------------------------
-r1555450 | spamassassin_role | 2014-01-05 03:08:27 +0000 (Sun, 05 Jan 
-2014) | 1 line
- 
- updated scores for revision 1555333 active rules added since last 
-mass-check
-------------------------------------------------------------------------
-r1555311 | spamassassin_role | 2014-01-04 03:00:01 +0000 (Sat, 04 Jan 
-2014) | 1 line
- 
- updated scores for revision 1555032 active rules added since last 
-mass-check
-------------------------------------------------------------------------
-r1555003 | spamassassin_role | 2014-01-03 03:01:31 +0000 (Fri, 03 Jan 
-2014) | 1 line
- 
- updated scores for revision 1554768 active rules added since last 
-mass-check
-------------------------------------------------------------------------
-r1554725 | spamassassin_role | 2014-01-02 03:00:52 +0000 (Thu, 02 Jan 
-2014) | 1 line
- 
- updated scores for revision 1554602 active rules added since last 
-mass-check
-------------------------------------------------------------------------
-r1554697 | duncf | 2014-01-01 23:16:48 +0000 (Wed, 01 Jan 2014) | 1 line
- 
- Move me to "inactive committers".
-------------------------------------------------------------------------
-r1554598 | spamassassin_role | 2014-01-01 02:58:34 +0000 (Wed, 01 Jan 
-2014) | 1 line
- 
- updated scores for revision 1554386 active rules added since last 
-mass-check
-------------------------------------------------------------------------
-r1554362 | spamassassin_role | 2013-12-31 03:00:29 +0000 (Tue, 31 Dec 
-2013) | 1 line
- 
- updated scores for revision 1554166 active rules added since last 
-mass-check
-------------------------------------------------------------------------
-r1554308 | jhardin | 2013-12-30 20:17:16 +0000 (Mon, 30 Dec 2013) | 1 line
- 
- bug#6988: __HAS_MIMEOLE overlaps __MIMEOLE_MS, may hit non-MSFT MUA, 
-don't use __HAS_MIMEOLE in MSFT-only message rules
-------------------------------------------------------------------------
-r1554125 | spamassassin_role | 2013-12-30 03:02:08 +0000 (Mon, 30 Dec 
-2013) | 1 line
- 
- updated scores for revision 1554003 active rules added since last 
-mass-check
-------------------------------------------------------------------------
-r1553988 | spamassassin_role | 2013-12-29 03:03:46 +0000 (Sun, 29 Dec 
-2013) | 1 line
- 
- updated scores for revision 1553799 active rules added since last 
-mass-check
-------------------------------------------------------------------------
-r1553783 | spamassassin_role | 2013-12-28 02:59:18 +0000 (Sat, 28 Dec 
-2013) | 1 line
- 
- updated scores for revision 1553646 active rules added since last 
-mass-check
-------------------------------------------------------------------------
-r1553615 | spamassassin_role | 2013-12-27 03:01:44 +0000 (Fri, 27 Dec 
-2013) | 1 line
- 
- updated scores for revision 1553460 active rules added since last 
-mass-check
-------------------------------------------------------------------------
-r1553440 | spamassassin_role | 2013-12-26 03:00:10 +0000 (Thu, 26 Dec 
-2013) | 1 line
- 
- updated scores for revision 1553361 active rules added since last 
-mass-check
-------------------------------------------------------------------------
-r1553348 | spamassassin_role | 2013-12-25 03:03:40 +0000 (Wed, 25 Dec 
-2013) | 1 line
- 
- updated scores for revision 1553256 active rules added since last 
-mass-check
-------------------------------------------------------------------------
-r1553242 | spamassassin_role | 2013-12-24 03:04:49 +0000 (Tue, 24 Dec 
-2013) | 1 line
- 
- updated scores for revision 1553083 active rules added since last 
-mass-check
-------------------------------------------------------------------------
-r1553063 | spamassassin_role | 2013-12-23 03:11:25 +0000 (Mon, 23 Dec 
-2013) | 1 line
- 
- updated scores for revision 1552973 active rules added since last 
-mass-check
-------------------------------------------------------------------------
-r1552962 | spamassassin_role | 2013-12-22 03:15:55 +0000 (Sun, 22 Dec 
-2013) | 1 line
- 
- updated scores for revision 1552888 active rules added since last 
-mass-check
-------------------------------------------------------------------------
-r1552870 | spamassassin_role | 2013-12-21 03:12:02 +0000 (Sat, 21 Dec 
-2013) | 1 line
- 
- updated scores for revision 1552541 active rules added since last 
-mass-check
-------------------------------------------------------------------------
-r1552484 | spamassassin_role | 2013-12-20 03:02:57 +0000 (Fri, 20 Dec 
-2013) | 1 line
- 
- updated scores for revision 1552250 active rules added since last 
-mass-check
-------------------------------------------------------------------------
-r1552216 | spamassassin_role | 2013-12-19 03:12:12 +0000 (Thu, 19 Dec 
-2013) | 1 line
- 
- updated scores for revision 1551881 active rules added since last 
-mass-check
-------------------------------------------------------------------------
-r1551815 | spamassassin_role | 2013-12-18 03:05:44 +0000 (Wed, 18 Dec 
-2013) | 1 line
- 
- updated scores for revision 1551487 active rules added since last 
-mass-check
-------------------------------------------------------------------------
-r1551451 | spamassassin_role | 2013-12-17 02:56:08 +0000 (Tue, 17 Dec 
-2013) | 1 line
- 
- updated scores for revision 1551131 active rules added since last 
-mass-check
-------------------------------------------------------------------------
-r1551106 | spamassassin_role | 2013-12-16 02:57:07 +0000 (Mon, 16 Dec 
-2013) | 1 line
- 
- updated scores for revision 1551006 active rules added since last 
-mass-check
-------------------------------------------------------------------------
-r1550995 | spamassassin_role | 2013-12-15 02:58:43 +0000 (Sun, 15 Dec 
-2013) | 1 line
- 
- updated scores for revision 1550902 active rules added since last 
-mass-check
-------------------------------------------------------------------------
-r1550872 | spamassassin_role | 2013-12-14 03:01:33 +0000 (Sat, 14 Dec 
-2013) | 1 line
- 
- updated scores for revision 1550663 active rules added since last 
-mass-check
-------------------------------------------------------------------------
-r1550622 | spamassassin_role | 2013-12-13 02:54:59 +0000 (Fri, 13 Dec 
-2013) | 1 line
- 
- updated scores for revision 1550373 active rules added since last 
-mass-check
-------------------------------------------------------------------------
-r1550343 | spamassassin_role | 2013-12-12 03:56:55 +0000 (Thu, 12 Dec 
-2013) | 1 line
- 
- updated scores for revision 1550073 active rules added since last 
-mass-check
-------------------------------------------------------------------------
-r1550036 | spamassassin_role | 2013-12-11 02:57:18 +0000 (Wed, 11 Dec 
-2013) | 1 line
- 
- updated scores for revision 1549785 active rules added since last 
-mass-check
-------------------------------------------------------------------------
-r1549751 | spamassassin_role | 2013-12-10 03:04:21 +0000 (Tue, 10 Dec 
-2013) | 1 line
- 
- updated scores for revision 1549514 active rules added since last 
-mass-check
-------------------------------------------------------------------------
-r1549373 | spamassassin_role | 2013-12-09 02:59:24 +0000 (Mon, 09 Dec 
-2013) | 1 line
- 
- updated scores for revision 1549009 active rules added since last 
-mass-check
-------------------------------------------------------------------------
-r1549047 | jhardin | 2013-12-08 15:59:23 +0000 (Sun, 08 Dec 2013) | 1 line
- 
- GA score limit apparently not working for FILL_THIS_FORM_LONG, broken by 
-#ifplugin? Set manual score.
-------------------------------------------------------------------------
-r1548980 | spamassassin_role | 2013-12-08 03:00:00 +0000 (Sun, 08 Dec 
-2013) | 1 line
- 
- updated scores for revision 1548817 active rules added since last 
-mass-check
-------------------------------------------------------------------------
-r1548788 | spamassassin_role | 2013-12-07 02:55:57 +0000 (Sat, 07 Dec 
-2013) | 1 line
- 
- updated scores for revision 1548435 active rules added since last 
-mass-check
-------------------------------------------------------------------------
-r1548375 | spamassassin_role | 2013-12-06 02:54:18 +0000 (Fri, 06 Dec 
-2013) | 1 line
- 
- updated scores for revision 1548039 active rules added since last 
-mass-check
-------------------------------------------------------------------------
-r1547998 | spamassassin_role | 2013-12-05 02:51:28 +0000 (Thu, 05 Dec 
-2013) | 1 line
- 
- updated scores for revision 1547729 active rules added since last 
-mass-check
-------------------------------------------------------------------------
-r1547863 | jhardin | 2013-12-04 18:01:58 +0000 (Wed, 04 Dec 2013) | 1 line
- 
- Tweak BODY_SINGLE_WORD and FILL_THIS_FORM_LONG
-------------------------------------------------------------------------
-r1547695 | spamassassin_role | 2013-12-04 02:54:27 +0000 (Wed, 04 Dec 
-2013) | 1 line
- 
- updated scores for revision 1547315 active rules added since last 
-mass-check
-------------------------------------------------------------------------
-r1547264 | spamassassin_role | 2013-12-03 02:52:15 +0000 (Tue, 03 Dec 
-2013) | 1 line
- 
- updated scores for revision 1546929 active rules added since last 
-mass-check
-------------------------------------------------------------------------
-r1546879 | spamassassin_role | 2013-12-02 02:52:17 +0000 (Mon, 02 Dec 
-2013) | 1 line
- 
- updated scores for revision 1546791 active rules added since last 
-mass-check
-------------------------------------------------------------------------
-r1546775 | spamassassin_role | 2013-12-01 02:48:18 +0000 (Sun, 01 Dec 
-2013) | 1 line
- 
- updated scores for revision 1546700 active rules added since last 
-mass-check
-------------------------------------------------------------------------
-r1546681 | spamassassin_role | 2013-11-30 02:50:07 +0000 (Sat, 30 Nov 
-2013) | 1 line
- 
- updated scores for revision 1546520 active rules added since last 
-mass-check
-------------------------------------------------------------------------
-r1546494 | spamassassin_role | 2013-11-29 02:46:19 +0000 (Fri, 29 Nov 
-2013) | 1 line
- 
- updated scores for revision 1546311 active rules added since last 
-mass-check
-------------------------------------------------------------------------
-r1546259 | spamassassin_role | 2013-11-28 02:51:37 +0000 (Thu, 28 Nov 
-2013) | 1 line
- 
- updated scores for revision 1545965 active rules added since last 
-mass-check
-------------------------------------------------------------------------
-r1545914 | spamassassin_role | 2013-11-27 02:49:03 +0000 (Wed, 27 Nov 
-2013) | 1 line
- 
- updated scores for revision 1545569 active rules added since last 
-mass-check
-------------------------------------------------------------------------
-r1545516 | spamassassin_role | 2013-11-26 02:48:01 +0000 (Tue, 26 Nov 
-2013) | 1 line
- 
- updated scores for revision 1545174 active rules added since last 
-mass-check
-------------------------------------------------------------------------
-r1545138 | spamassassin_role | 2013-11-25 02:46:10 +0000 (Mon, 25 Nov 
-2013) | 1 line
- 
- updated scores for revision 1544945 active rules added since last 
-mass-check
-------------------------------------------------------------------------
-r1544903 | spamassassin_role | 2013-11-24 02:47:10 +0000 (Sun, 24 Nov 
-2013) | 1 line
- 
- updated scores for revision 1544761 active rules added since last 
-mass-check
-------------------------------------------------------------------------
-r1544738 | spamassassin_role | 2013-11-23 02:48:06 +0000 (Sat, 23 Nov 
-2013) | 1 line
- 
- updated scores for revision 1544436 active rules added since last 
-mass-check
-------------------------------------------------------------------------
-r1544397 | spamassassin_role | 2013-11-22 02:48:28 +0000 (Fri, 22 Nov 
-2013) | 1 line
- 
- updated scores for revision 1544065 active rules added since last 
-mass-check
-------------------------------------------------------------------------
-r1544010 | spamassassin_role | 2013-11-21 02:47:50 +0000 (Thu, 21 Nov 
-2013) | 1 line
- 
- updated scores for revision 1543736 active rules added since last 
-mass-check
-------------------------------------------------------------------------
-r1543698 | spamassassin_role | 2013-11-20 02:51:07 +0000 (Wed, 20 Nov 
-2013) | 1 line
- 
- updated scores for revision 1543347 active rules added since last 
-mass-check
-------------------------------------------------------------------------
-r1543295 | spamassassin_role | 2013-11-19 02:49:20 +0000 (Tue, 19 Nov 
-2013) | 1 line
- 
- updated scores for revision 1542949 active rules added since last 
-mass-check
-------------------------------------------------------------------------
-r1542882 | spamassassin_role | 2013-11-18 02:50:04 +0000 (Mon, 18 Nov 
-2013) | 1 line
- 
- updated scores for revision 1542661 active rules added since last 
-mass-check
-------------------------------------------------------------------------
-r1542636 | spamassassin_role | 2013-11-17 02:53:21 +0000 (Sun, 17 Nov 
-2013) | 1 line
- 
- updated scores for revision 1542483 active rules added since last 
-mass-check
-------------------------------------------------------------------------
-r1542453 | spamassassin_role | 2013-11-16 02:48:13 +0000 (Sat, 16 Nov 
-2013) | 1 line
- 
- updated scores for revision 1542202 active rules added since last 
-mass-check
-------------------------------------------------------------------------
-r1542160 | spamassassin_role | 2013-11-15 02:48:03 +0000 (Fri, 15 Nov 
-2013) | 1 line
- 
- updated scores for revision 1541849 active rules added since last 
-mass-check
-------------------------------------------------------------------------
-r1541789 | spamassassin_role | 2013-11-14 02:48:57 +0000 (Thu, 14 Nov 
-2013) | 1 line
- 
- updated scores for revision 1541424 active rules added since last 
-mass-check
-------------------------------------------------------------------------
-r1541479 | smf | 2013-11-13 11:41:58 +0000 (Wed, 13 Nov 2013) | 1 line
- 
- FP avoidance
-------------------------------------------------------------------------
-r1541365 | spamassassin_role | 2013-11-13 02:48:26 +0000 (Wed, 13 Nov 
-2013) | 1 line
- 
- updated scores for revision 1540972 active rules added since last 
-mass-check
-------------------------------------------------------------------------
-r1540990 | axb | 2013-11-12 10:04:35 +0000 (Tue, 12 Nov 2013) | 1 line
- 
- piggy tweak
-------------------------------------------------------------------------
-r1540928 | spamassassin_role | 2013-11-12 02:50:07 +0000 (Tue, 12 Nov 
-2013) | 1 line
- 
- updated scores for revision 1540636 active rules added since last 
-mass-check
-------------------------------------------------------------------------
-r1540791 | mmartinec | 2013-11-11 17:58:55 +0000 (Mon, 11 Nov 2013) | 1 
-line
- 
- Adjusted docs regarding EDNS0 dns option to refer to RFC 6891 instead of 
-RFC 2671bis draft, refine text, reduce conservative default from 1240 to 
-1220 bytes
-------------------------------------------------------------------------
-r1540588 | spamassassin_role | 2013-11-11 02:52:21 +0000 (Mon, 11 Nov 
-2013) | 1 line
- 
- updated scores for revision 1540453 active rules added since last 
-mass-check
-------------------------------------------------------------------------
-r1540435 | spamassassin_role | 2013-11-10 02:44:02 +0000 (Sun, 10 Nov 
-2013) | 1 line
- 
- updated scores for revision 1540279 active rules added since last 
-mass-check
-------------------------------------------------------------------------
-r1540246 | spamassassin_role | 2013-11-09 02:47:57 +0000 (Sat, 09 Nov 
-2013) | 1 line
- 
- updated scores for revision 1539950 active rules added since last 
-mass-check
-------------------------------------------------------------------------
-r1540110 | jhardin | 2013-11-08 16:35:48 +0000 (Fri, 08 Nov 2013) | 1 line
- 
- FROM_OFFERS: defer to nightly GA rescorer per bug 6580
-------------------------------------------------------------------------
-r1539514 | spamassassin_role | 2013-11-07 02:45:51 +0000 (Thu, 07 Nov 
-2013) | 1 line
- 
- updated scores for revision 1539273 active rules added since last 
-mass-check
-------------------------------------------------------------------------
-r1539217 | spamassassin_role | 2013-11-06 02:45:54 +0000 (Wed, 06 Nov 
-2013) | 1 line
- 
- updated scores for revision 1538906 active rules added since last 
-mass-check
-------------------------------------------------------------------------
-r1538858 | spamassassin_role | 2013-11-05 02:47:00 +0000 (Tue, 05 Nov 
-2013) | 1 line
- 
- updated scores for revision 1538529 active rules added since last 
-mass-check
-------------------------------------------------------------------------
-r1538498 | spamassassin_role | 2013-11-04 02:47:25 +0000 (Mon, 04 Nov 
-2013) | 1 line
- 
- updated scores for revision 1538327 active rules added since last 
-mass-check
-------------------------------------------------------------------------
-r1538310 | spamassassin_role | 2013-11-03 02:56:00 +0000 (Sun, 03 Nov 
-2013) | 1 line
- 
- updated scores for revision 1538154 active rules added since last 
-mass-check
-------------------------------------------------------------------------
-r1538132 | spamassassin_role | 2013-11-02 02:45:53 +0000 (Sat, 02 Nov 
-2013) | 1 line
- 
- updated scores for revision 1537852 active rules added since last 
-mass-check
-------------------------------------------------------------------------
-r1537808 | spamassassin_role | 2013-11-01 02:50:17 +0000 (Fri, 01 Nov 
-2013) | 1 line
- 
- updated scores for revision 1537405 active rules added since last 
-mass-check
-------------------------------------------------------------------------
-r1537471 | axb | 2013-10-31 12:44:57 +0000 (Thu, 31 Oct 2013) | 1 line
- 
- added AXB_X_ORIG_OMNIMS
-------------------------------------------------------------------------
-r1537367 | spamassassin_role | 2013-10-31 02:45:12 +0000 (Thu, 31 Oct 
-2013) | 1 line
- 
- updated scores for revision 1537009 active rules added since last 
-mass-check
-------------------------------------------------------------------------
-r1537303 | axb | 2013-10-30 21:02:34 +0000 (Wed, 30 Oct 2013) | 1 line
- 
- added util_rb_2tld com.de
-------------------------------------------------------------------------
-r1537189 | mmartinec | 2013-10-30 17:24:05 +0000 (Wed, 30 Oct 2013) | 1 
-line
- 
- Bug 6983: Uninitialized value in lc in t/dnsbl_subtests - perl bug, 
-fixed in 5.8.9
-------------------------------------------------------------------------
-r1536956 | spamassassin_role | 2013-10-30 02:48:58 +0000 (Wed, 30 Oct 
-2013) | 1 line
- 
- updated scores for revision 1536612 active rules added since last 
-mass-check
-------------------------------------------------------------------------
-r1536864 | mmartinec | 2013-10-29 19:44:28 +0000 (Tue, 29 Oct 2013) | 1 
-line
- 
- Bug 6984: r1531991 breaks perl.req script
-------------------------------------------------------------------------
-r1536582 | spamassassin_role | 2013-10-29 02:46:58 +0000 (Tue, 29 Oct 
-2013) | 1 line
- 
- updated scores for revision 1536284 active rules added since last 
-mass-check
-------------------------------------------------------------------------
-r1536408 | axb | 2013-10-28 16:58:22 +0000 (Mon, 28 Oct 2013) | 1 line
- 
- tflags 		AXB_X_ORIG_OMNIMS	nopublish
-------------------------------------------------------------------------
-r1536236 | spamassassin_role | 2013-10-28 02:50:15 +0000 (Mon, 28 Oct 
-2013) | 1 line
- 
- updated scores for revision 1536066 active rules added since last 
-mass-check
-------------------------------------------------------------------------
-r1536046 | spamassassin_role | 2013-10-27 02:46:33 +0000 (Sun, 27 Oct 
-2013) | 1 line
- 
- updated scores for revision 1535946 active rules added since last 
-mass-check
-------------------------------------------------------------------------
-r1535990 | kmcgrail | 2013-10-26 13:33:00 +0000 (Sat, 26 Oct 2013) | 1 
-line
- 
- A few small rule description updates
-------------------------------------------------------------------------
-r1535910 | jhardin | 2013-10-26 02:00:02 +0000 (Sat, 26 Oct 2013) | 1 line
- 
- Add jimdo.com phishing webform rule
-------------------------------------------------------------------------
-r1534966 | axb | 2013-10-23 09:40:11 +0000 (Wed, 23 Oct 2013) | 1 line
- 
- fixed typo
-------------------------------------------------------------------------
-r1533992 | jhardin | 2013-10-20 21:27:18 +0000 (Sun, 20 Oct 2013) | 1 line
- 
- More FP avoidance
-------------------------------------------------------------------------
-r1533681 | spamassassin_role | 2013-10-19 02:55:22 +0000 (Sat, 19 Oct 
-2013) | 1 line
- 
- updated scores for revision 1533363 active rules added since last 
-mass-check
-------------------------------------------------------------------------
-r1533678 | khopesh | 2013-10-19 02:18:58 +0000 (Sat, 19 Oct 2013) | 1 line
- 
- lots of new freemail domains
-------------------------------------------------------------------------
-r1533672 | jhardin | 2013-10-19 00:51:26 +0000 (Sat, 19 Oct 2013) | 1 line
- 
- Standardize minimal-body rule names, add BODY_SINGLE_WORD
-------------------------------------------------------------------------
-r1533492 | axb | 2013-10-18 15:15:24 +0000 (Fri, 18 Oct 2013) | 3 lines
- 
- removed "publish FB_CIALIS_LEO3"
- low S/O - FP prone
- let autopromotion decide
-------------------------------------------------------------------------
-r1533481 | axb | 2013-10-18 15:05:24 +0000 (Fri, 18 Oct 2013) | 4 lines
- 
- removed forced score for ancient FB_CIALIS_LEO3
- was way too high (3.1) -  see ruleqa for SO info
- autopromotion can take care of it.
- Seee list thread *False positive in FB_CIALIS_LEO3 rule"
-------------------------------------------------------------------------
-r1533352 | axb | 2013-10-18 07:57:48 +0000 (Fri, 18 Oct 2013) | 1 line
- 
- added util_rb_2tld in.net
-------------------------------------------------------------------------
-r1533317 | spamassassin_role | 2013-10-18 02:55:07 +0000 (Fri, 18 Oct 
-2013) | 1 line
- 
- updated scores for revision 1533008 active rules added since last 
-mass-check
-------------------------------------------------------------------------
-r1533234 | jhardin | 2013-10-17 19:57:48 +0000 (Thu, 17 Oct 2013) | 1 line
- 
- minimal-body rules should not hit on S/MIME messages (bug#6979)
-------------------------------------------------------------------------
-r1533093 | axb | 2013-10-17 14:48:14 +0000 (Thu, 17 Oct 2013) | 2 lines
- 
- changed URIBL_SBL description
- Note: changes  in rule name may break metas - leave as is.
-------------------------------------------------------------------------
-r1532955 | spamassassin_role | 2013-10-17 02:57:28 +0000 (Thu, 17 Oct 
-2013) | 1 line
- 
- updated scores for revision 1532689 active rules added since last 
-mass-check
-------------------------------------------------------------------------
-r1532709 | axb | 2013-10-16 10:34:24 +0000 (Wed, 16 Oct 2013) | 1 line
- 
- added AXB_X_ORIG_OMNIMS (Microsoft's outbound  419 spew engines)
-------------------------------------------------------------------------
-r1532635 | spamassassin_role | 2013-10-16 02:53:02 +0000 (Wed, 16 Oct 
-2013) | 1 line
- 
- updated scores for revision 1532248 active rules added since last 
-mass-check
-------------------------------------------------------------------------
-r1532171 | spamassassin_role | 2013-10-15 02:53:04 +0000 (Tue, 15 Oct 
-2013) | 1 line
- 
- updated scores for revision 1531815 active rules added since last 
-mass-check
-------------------------------------------------------------------------
-r1532100 | axb | 2013-10-14 21:12:33 +0000 (Mon, 14 Oct 2013) | 4 lines
- 
- added
- 
- jpn.com
- yolasite.com  
-------------------------------------------------------------------------
-r1532010 | jhardin | 2013-10-14 18:12:43 +0000 (Mon, 14 Oct 2013) | 1 line
- 
- tweak UNSUBSCRIBE_ES
-------------------------------------------------------------------------
-r1532009 | jhardin | 2013-10-14 18:11:55 +0000 (Mon, 14 Oct 2013) | 1 line
- 
- FSL_FROM_INFO_DOM performing poorly as scored rule, converted to subrule 
-and relocated
-------------------------------------------------------------------------
-r1531995 | mmartinec | 2013-10-14 17:43:19 +0000 (Mon, 14 Oct 2013) | 1 
-line
- 
- Redis.pm: ignore error if an old redis server (e.g. 2.4) does not 
-recognize a CLIENT SETNAME command
-------------------------------------------------------------------------
-r1531991 | kmcgrail | 2013-10-14 17:38:18 +0000 (Mon, 14 Oct 2013) | 1 
-line
- 
- small tweak to dependency output for wget/curl/fetch
-------------------------------------------------------------------------
-r1531973 | mmartinec | 2013-10-14 16:41:22 +0000 (Mon, 14 Oct 2013) | 1 
-line
- 
- docs: change a very long title in the tflags description, avoiding a 
-warning in a man page resulting from the POD; reported by Andreas Schulze
-------------------------------------------------------------------------
-r1531966 | mmartinec | 2013-10-14 16:21:18 +0000 (Mon, 14 Oct 2013) | 1 
-line
- 
- docs: fix two POD errors, reported by Andreas Schulze
-------------------------------------------------------------------------
-r1531783 | spamassassin_role | 2013-10-14 02:59:58 +0000 (Mon, 14 Oct 
-2013) | 1 line
- 
- updated scores for revision 1531636 active rules added since last 
-mass-check
-------------------------------------------------------------------------
-r1531755 | kmcgrail | 2013-10-13 21:28:06 +0000 (Sun, 13 Oct 2013) | 1 
-line
- 
- added has capability function for check_rbl_from_domain
-------------------------------------------------------------------------
-r1531614 | spamassassin_role | 2013-10-13 02:51:15 +0000 (Sun, 13 Oct 
-2013) | 1 line
- 
- updated scores for revision 1531518 active rules added since last 
-mass-check
-------------------------------------------------------------------------
-r1531613 | jhardin | 2013-10-13 02:40:17 +0000 (Sun, 13 Oct 2013) | 1 line
- 
- FSL_HELO_BARE_IP_2 FP avoidance per reports on users list 10/12/2013
-------------------------------------------------------------------------
-r1531487 | spamassassin_role | 2013-10-12 02:43:05 +0000 (Sat, 12 Oct 
-2013) | 1 line
- 
- updated scores for revision 1531229 active rules added since last 
-mass-check
-------------------------------------------------------------------------
-r1531481 | jhardin | 2013-10-12 02:00:47 +0000 (Sat, 12 Oct 2013) | 1 line
- 
- Tweak some rules
-------------------------------------------------------------------------
-r1531372 | mmartinec | 2013-10-11 17:43:42 +0000 (Fri, 11 Oct 2013) | 1 
-line
- 
- some tweaks on PROPOSED-3.4.0.txt announcements
-------------------------------------------------------------------------
-r1531192 | kmcgrail | 2013-10-11 04:20:05 +0000 (Fri, 11 Oct 2013) | 1 
-line
- 
- updates to proposed 3.4.0.txt announcement and build/README
-------------------------------------------------------------------------
-r1531189 | kmcgrail | 2013-10-11 03:59:49 +0000 (Fri, 11 Oct 2013) | 1 
-line
- 
- preparing to release 3.4.0-rc3
-------------------------------------------------------------------------
-r1531183 | kmcgrail | 2013-10-11 03:24:27 +0000 (Fri, 11 Oct 2013) | 1 
-line
- 
- added check_rbl_from_domain function to allow checking all the from 
-headers but querying just the domain instead of the full address used 
-previously.  So bob@test.microsoft.com will query for bob@microsoft.com.
-------------------------------------------------------------------------
-r1531175 | spamassassin_role | 2013-10-11 02:42:46 +0000 (Fri, 11 Oct 
-2013) | 1 line
- 
- updated scores for revision 1530876 active rules added since last 
-mass-check
-------------------------------------------------------------------------
-r1531169 | jhardin | 2013-10-11 01:53:47 +0000 (Fri, 11 Oct 2013) | 1 line
- 
- Spanish unsub tuning, add rule for Spanish "Lic. Whoever" spams
-------------------------------------------------------------------------
-r1531168 | jhardin | 2013-10-11 01:52:05 +0000 (Fri, 11 Oct 2013) | 1 line
- 
- Clean up some duped rules
-------------------------------------------------------------------------
-r1530843 | spamassassin_role | 2013-10-10 02:43:57 +0000 (Thu, 10 Oct 
-2013) | 1 line
- 
- updated scores for revision 1530532 active rules added since last 
-mass-check
-------------------------------------------------------------------------
-r1530486 | spamassassin_role | 2013-10-09 02:43:50 +0000 (Wed, 09 Oct 
-2013) | 1 line
- 
- updated scores for revision 1530186 active rules added since last 
-mass-check
-------------------------------------------------------------------------
-r1530137 | spamassassin_role | 2013-10-08 02:46:38 +0000 (Tue, 08 Oct 
-2013) | 1 line
- 
- updated scores for revision 1529793 active rules added since last 
-mass-check
-------------------------------------------------------------------------
-r1529728 | spamassassin_role | 2013-10-07 02:50:31 +0000 (Mon, 07 Oct 
-2013) | 1 line
- 
- updated scores for revision 1529602 active rules added since last 
-mass-check
-------------------------------------------------------------------------
-r1529561 | spamassassin_role | 2013-10-06 02:54:02 +0000 (Sun, 06 Oct 
-2013) | 1 line
- 
- updated scores for revision 1529413 active rules added since last 
-mass-check
-------------------------------------------------------------------------
-r1529380 | spamassassin_role | 2013-10-05 03:03:35 +0000 (Sat, 05 Oct 
-2013) | 1 line
- 
- updated scores for revision 1529102 active rules added since last 
-mass-check
-------------------------------------------------------------------------
-r1529073 | spamassassin_role | 2013-10-04 03:04:50 +0000 (Fri, 04 Oct 
-2013) | 1 line
- 
- updated scores for revision 1528751 active rules added since last 
-mass-check
-------------------------------------------------------------------------
-r1528708 | spamassassin_role | 2013-10-03 03:01:45 +0000 (Thu, 03 Oct 
-2013) | 1 line
- 
- updated scores for revision 1528373 active rules added since last 
-mass-check
-------------------------------------------------------------------------
-r1528509 | jhardin | 2013-10-02 14:59:51 +0000 (Wed, 02 Oct 2013) | 1 line
- 
- tweak too many to & cc subrules
-------------------------------------------------------------------------
-r1528297 | spamassassin_role | 2013-10-02 03:00:25 +0000 (Wed, 02 Oct 
-2013) | 1 line
- 
- updated scores for revision 1527972 active rules added since last 
-mass-check
-------------------------------------------------------------------------
-r1527857 | spamassassin_role | 2013-10-01 02:59:28 +0000 (Tue, 01 Oct 
-2013) | 1 line
- 
- updated scores for revision 1527487 active rules added since last 
-mass-check
-------------------------------------------------------------------------
-r1527433 | spamassassin_role | 2013-09-30 03:01:29 +0000 (Mon, 30 Sep 
-2013) | 1 line
- 
- updated scores for revision 1527286 active rules added since last 
-mass-check
-------------------------------------------------------------------------
-r1527265 | spamassassin_role | 2013-09-29 02:54:33 +0000 (Sun, 29 Sep 
-2013) | 1 line
- 
- updated scores for revision 1527166 active rules added since last 
-mass-check
-------------------------------------------------------------------------
-r1527146 | spamassassin_role | 2013-09-28 03:01:21 +0000 (Sat, 28 Sep 
-2013) | 1 line
- 
- updated scores for revision 1526833 active rules added since last 
-mass-check
-------------------------------------------------------------------------
-r1526779 | spamassassin_role | 2013-09-27 02:59:14 +0000 (Fri, 27 Sep 
-2013) | 1 line
- 
- updated scores for revision 1526417 active rules added since last 
-mass-check
-------------------------------------------------------------------------
-r1526397 | axb | 2013-09-26 06:30:06 +0000 (Thu, 26 Sep 2013) | 1 line
- 
- added addthis.com
-------------------------------------------------------------------------
-r1526361 | spamassassin_role | 2013-09-26 03:00:18 +0000 (Thu, 26 Sep 
-2013) | 1 line
- 
- updated scores for revision 1526135 active rules added since last 
-mass-check
-------------------------------------------------------------------------
-r1526093 | spamassassin_role | 2013-09-25 03:02:43 +0000 (Wed, 25 Sep 
-2013) | 1 line
- 
- updated scores for revision 1525816 active rules added since last 
-mass-check
-------------------------------------------------------------------------
-r1525765 | spamassassin_role | 2013-09-24 03:00:55 +0000 (Tue, 24 Sep 
-2013) | 1 line
- 
- updated scores for revision 1525536 active rules added since last 
-mass-check
-------------------------------------------------------------------------
-r1525493 | spamassassin_role | 2013-09-23 02:57:32 +0000 (Mon, 23 Sep 
-2013) | 1 line
- 
- updated scores for revision 1525332 active rules added since last 
-mass-check
-------------------------------------------------------------------------
-r1525319 | spamassassin_role | 2013-09-22 03:00:30 +0000 (Sun, 22 Sep 
-2013) | 1 line
- 
- updated scores for revision 1525204 active rules added since last 
-mass-check
-------------------------------------------------------------------------
-r1525191 | spamassassin_role | 2013-09-21 02:54:18 +0000 (Sat, 21 Sep 
-2013) | 1 line
- 
- updated scores for revision 1524946 active rules added since last 
-mass-check
-------------------------------------------------------------------------
-r1524892 | spamassassin_role | 2013-09-20 03:06:16 +0000 (Fri, 20 Sep 
-2013) | 1 line
- 
- updated scores for revision 1524658 active rules added since last 
-mass-check
-------------------------------------------------------------------------
-r1524619 | spamassassin_role | 2013-09-19 03:00:36 +0000 (Thu, 19 Sep 
-2013) | 1 line
- 
- updated scores for revision 1524337 active rules added since last 
-mass-check
-------------------------------------------------------------------------
-r1524281 | spamassassin_role | 2013-09-18 02:57:15 +0000 (Wed, 18 Sep 
-2013) | 1 line
- 
- updated scores for revision 1523956 active rules added since last 
-mass-check
-------------------------------------------------------------------------
-r1523879 | spamassassin_role | 2013-09-17 03:04:39 +0000 (Tue, 17 Sep 
-2013) | 1 line
- 
- updated scores for revision 1523560 active rules added since last 
-mass-check
-------------------------------------------------------------------------
-r1523537 | spamassassin_role | 2013-09-16 03:00:41 +0000 (Mon, 16 Sep 
-2013) | 1 line
- 
- updated scores for revision 1523416 active rules added since last 
-mass-check
-------------------------------------------------------------------------
-r1523390 | spamassassin_role | 2013-09-15 02:57:02 +0000 (Sun, 15 Sep 
-2013) | 1 line
- 
- updated scores for revision 1523192 active rules added since last 
-mass-check
-------------------------------------------------------------------------
-r1523181 | spamassassin_role | 2013-09-14 03:08:47 +0000 (Sat, 14 Sep 
-2013) | 1 line
- 
- updated scores for revision 1522816 active rules added since last 
-mass-check
-------------------------------------------------------------------------
-r1522765 | spamassassin_role | 2013-09-13 03:08:39 +0000 (Fri, 13 Sep 
-2013) | 1 line
- 
- updated scores for revision 1522488 active rules added since last 
-mass-check
-------------------------------------------------------------------------
-r1522174 | spamassassin_role | 2013-09-12 03:13:30 +0000 (Thu, 12 Sep 
-2013) | 1 line
- 
- updated scores for revision 1521760 active rules added since last 
-mass-check
-------------------------------------------------------------------------
-r1521722 | spamassassin_role | 2013-09-11 03:09:19 +0000 (Wed, 11 Sep 
-2013) | 1 line
- 
- updated scores for revision 1521372 active rules added since last 
-mass-check
-------------------------------------------------------------------------
-r1521352 | spamassassin_role | 2013-09-10 03:11:00 +0000 (Tue, 10 Sep 
-2013) | 1 line
- 
- updated scores for revision 1520997 active rules added since last 
-mass-check
-------------------------------------------------------------------------
-r1520955 | spamassassin_role | 2013-09-09 03:15:06 +0000 (Mon, 09 Sep 
-2013) | 1 line
- 
- updated scores for revision 1520845 active rules added since last 
-mass-check
-------------------------------------------------------------------------
-r1520834 | spamassassin_role | 2013-09-08 03:15:17 +0000 (Sun, 08 Sep 
-2013) | 1 line
- 
- updated scores for revision 1520742 active rules added since last 
-mass-check
-------------------------------------------------------------------------
-r1520722 | spamassassin_role | 2013-09-07 03:24:51 +0000 (Sat, 07 Sep 
-2013) | 1 line
- 
- updated scores for revision 1520514 active rules added since last 
-mass-check
-------------------------------------------------------------------------
-r1520513 | mmartinec | 2013-09-06 08:39:30 +0000 (Fri, 06 Sep 2013) | 1 
-line
- 
- DependencyInfo.pm: dropped dependency on module Redis, updated 
-PROPOSED-3.4.0.txt accordingly
-------------------------------------------------------------------------
-r1520508 | mmartinec | 2013-09-06 08:22:53 +0000 (Fri, 06 Sep 2013) | 1 
-line
- 
- add "b_count_change" entry to the timing report (Bayes learn elapsed 
-time)
-------------------------------------------------------------------------
-r1520486 | spamassassin_role | 2013-09-06 03:30:34 +0000 (Fri, 06 Sep 
-2013) | 1 line
- 
- updated scores for revision 1520253 active rules added since last 
-mass-check
-------------------------------------------------------------------------
-r1520380 | mmartinec | 2013-09-05 18:32:32 +0000 (Thu, 05 Sep 2013) | 1 
-line
- 
- Bug 6972: BayesStore/Redis.pm: ditching CPAN module Redis gains speed, 
-avoids its bugs, works on IPv6
-------------------------------------------------------------------------
-r1520203 | spamassassin_role | 2013-09-05 03:31:33 +0000 (Thu, 05 Sep 
-2013) | 1 line
- 
- updated scores for revision 1519943 active rules added since last 
-mass-check
-------------------------------------------------------------------------
-r1520091 | mmartinec | 2013-09-04 18:25:50 +0000 (Wed, 04 Sep 2013) | 1 
-line
- 
- Bug 6698#26: DCC dcc_raw_x_dcc fixed
-------------------------------------------------------------------------
-r1519912 | spamassassin_role | 2013-09-04 03:33:42 +0000 (Wed, 04 Sep 
-2013) | 1 line
- 
- updated scores for revision 1519602 active rules added since last 
-mass-check
-------------------------------------------------------------------------
-r1519543 | spamassassin_role | 2013-09-03 03:29:32 +0000 (Tue, 03 Sep 
-2013) | 1 line
- 
- updated scores for revision 1519366 active rules added since last 
-mass-check
-------------------------------------------------------------------------
-r1519336 | spamassassin_role | 2013-09-02 03:31:57 +0000 (Mon, 02 Sep 
-2013) | 1 line
- 
- updated scores for revision 1519251 active rules added since last 
-mass-check
-------------------------------------------------------------------------
-r1519238 | spamassassin_role | 2013-09-01 03:26:31 +0000 (Sun, 01 Sep 
-2013) | 1 line
- 
- updated scores for revision 1519160 active rules added since last 
-mass-check
-------------------------------------------------------------------------
-r1519133 | spamassassin_role | 2013-08-31 03:15:04 +0000 (Sat, 31 Aug 
-2013) | 1 line
- 
- updated scores for revision 1518915 active rules added since last 
-mass-check
-------------------------------------------------------------------------
-r1518969 | axb | 2013-08-30 13:46:59 +0000 (Fri, 30 Aug 2013) | 1 line
- 
- added eco.br
-------------------------------------------------------------------------
-r1518885 | spamassassin_role | 2013-08-30 03:09:25 +0000 (Fri, 30 Aug 
-2013) | 1 line
- 
- updated scores for revision 1518538 active rules added since last 
-mass-check
-------------------------------------------------------------------------
-r1518457 | spamassassin_role | 2013-08-29 03:12:51 +0000 (Thu, 29 Aug 
-2013) | 1 line
- 
- updated scores for revision 1518106 active rules added since last 
-mass-check
-------------------------------------------------------------------------
-r1518057 | spamassassin_role | 2013-08-28 03:05:23 +0000 (Wed, 28 Aug 
-2013) | 1 line
- 
- updated scores for revision 1517764 active rules added since last 
-mass-check
-------------------------------------------------------------------------
-r1517741 | spamassassin_role | 2013-08-27 03:07:10 +0000 (Tue, 27 Aug 
-2013) | 1 line
- 
- updated scores for revision 1517463 active rules added since last 
-mass-check
-------------------------------------------------------------------------
-r1517411 | spamassassin_role | 2013-08-26 03:02:58 +0000 (Mon, 26 Aug 
-2013) | 1 line
- 
- updated scores for revision 1517252 active rules added since last 
-mass-check
-------------------------------------------------------------------------
-r1517219 | spamassassin_role | 2013-08-25 03:02:03 +0000 (Sun, 25 Aug 
-2013) | 1 line
- 
- updated scores for revision 1517116 active rules added since last 
-mass-check
-------------------------------------------------------------------------
-r1517104 | spamassassin_role | 2013-08-24 03:06:10 +0000 (Sat, 24 Aug 
-2013) | 1 line
- 
- updated scores for revision 1516750 active rules added since last 
-mass-check
-------------------------------------------------------------------------
-r1516685 | spamassassin_role | 2013-08-23 03:05:17 +0000 (Fri, 23 Aug 
-2013) | 1 line
- 
- updated scores for revision 1516387 active rules added since last 
-mass-check
-------------------------------------------------------------------------
-r1516366 | spamassassin_role | 2013-08-22 03:07:40 +0000 (Thu, 22 Aug 
-2013) | 1 line
- 
- updated scores for revision 1516113 active rules added since last 
-mass-check
-------------------------------------------------------------------------
-r1516178 | jhardin | 2013-08-21 14:44:39 +0000 (Wed, 21 Aug 2013) | 1 line
- 
- tweak EXECUTABLE_URI
-------------------------------------------------------------------------
-r1516064 | spamassassin_role | 2013-08-21 03:08:05 +0000 (Wed, 21 Aug 
-2013) | 1 line
- 
- updated scores for revision 1515745 active rules added since last 
-mass-check
-------------------------------------------------------------------------
-r1515692 | spamassassin_role | 2013-08-20 03:08:05 +0000 (Tue, 20 Aug 
-2013) | 1 line
- 
- updated scores for revision 1515319 active rules added since last 
-mass-check
-------------------------------------------------------------------------
-r1515682 | jhardin | 2013-08-20 01:14:24 +0000 (Tue, 20 Aug 2013) | 1 line
- 
- Tweak lotsa_money
-------------------------------------------------------------------------
-r1515265 | spamassassin_role | 2013-08-19 03:11:12 +0000 (Mon, 19 Aug 
-2013) | 1 line
- 
- updated scores for revision 1515077 active rules added since last 
-mass-check
-------------------------------------------------------------------------
-r1515062 | spamassassin_role | 2013-08-18 03:15:13 +0000 (Sun, 18 Aug 
-2013) | 1 line
- 
- updated scores for revision 1514960 active rules added since last 
-mass-check
-------------------------------------------------------------------------
-r1515045 | jhardin | 2013-08-17 22:55:45 +0000 (Sat, 17 Aug 2013) | 1 line
- 
- Tweak lotsa_money - add more French and German variants
-------------------------------------------------------------------------
-r1514938 | spamassassin_role | 2013-08-17 03:14:00 +0000 (Sat, 17 Aug 
-2013) | 1 line
- 
- updated scores for revision 1514621 active rules added since last 
-mass-check
-------------------------------------------------------------------------
-r1514937 | jhardin | 2013-08-17 02:30:00 +0000 (Sat, 17 Aug 2013) | 1 line
- 
- tune TO_NO_BRKTS_PCNT
-------------------------------------------------------------------------
-r1514563 | spamassassin_role | 2013-08-16 03:18:55 +0000 (Fri, 16 Aug 
-2013) | 1 line
- 
- updated scores for revision 1514202 active rules added since last 
-mass-check
-------------------------------------------------------------------------
-r1514524 | mmartinec | 2013-08-15 22:52:12 +0000 (Thu, 15 Aug 2013) | 1 
-line
- 
- Bug 6968: quote a $ within a character class (Bleadperl 
-v5.19.2-257-gc30fc27 fixes a bug in perl which 
-Mail/SpamAssassin/Plugin/FreeMail.pm relies)
-------------------------------------------------------------------------
-r1514145 | spamassassin_role | 2013-08-15 03:18:51 +0000 (Thu, 15 Aug 
-2013) | 1 line
- 
- updated scores for revision 1513768 active rules added since last 
-mass-check
-------------------------------------------------------------------------
-r1513723 | jhardin | 2013-08-14 04:02:45 +0000 (Wed, 14 Aug 2013) | 1 line
- 
- Tweak COMMENT_GIBBERISH
-------------------------------------------------------------------------
-r1513718 | spamassassin_role | 2013-08-14 03:16:29 +0000 (Wed, 14 Aug 
-2013) | 1 line
- 
- updated scores for revision 1513388 active rules added since last 
-mass-check
-------------------------------------------------------------------------
-r1513680 | kmcgrail | 2013-08-13 22:42:29 +0000 (Tue, 13 Aug 2013) | 1 
-line
- 
- fixed license missing on experimental file and added a test rule for 
-David F. Skoll from Mailing list
-------------------------------------------------------------------------
-r1513679 | kmcgrail | 2013-08-13 22:42:13 +0000 (Tue, 13 Aug 2013) | 1 
-line
- 
- fixed license missing on experimental file and added a test rule for 
-David F. Skoll from Mailing list
-------------------------------------------------------------------------
-r1513331 | spamassassin_role | 2013-08-13 03:20:35 +0000 (Tue, 13 Aug 
-2013) | 1 line
- 
- updated scores for revision 1513081 active rules added since last 
-mass-check
-------------------------------------------------------------------------
-r1513033 | spamassassin_role | 2013-08-12 03:15:34 +0000 (Mon, 12 Aug 
-2013) | 1 line
- 
- updated scores for revision 1512893 active rules added since last 
-mass-check
-------------------------------------------------------------------------
-r1513027 | jhardin | 2013-08-12 01:55:21 +0000 (Mon, 12 Aug 2013) | 1 line
- 
- Tweak COMMENT_GIBBERISH
-------------------------------------------------------------------------
-r1512863 | spamassassin_role | 2013-08-11 03:16:37 +0000 (Sun, 11 Aug 
-2013) | 1 line
- 
- updated scores for revision 1512578 active rules added since last 
-mass-check
-------------------------------------------------------------------------
-r1512562 | jhardin | 2013-08-10 04:47:18 +0000 (Sat, 10 Aug 2013) | 1 line
- 
- Add LUCRATIVE
-------------------------------------------------------------------------
-r1512555 | spamassassin_role | 2013-08-10 02:57:21 +0000 (Sat, 10 Aug 
-2013) | 1 line
- 
- updated scores for revision 1512204 active rules added since last 
-mass-check
-------------------------------------------------------------------------
-r1512131 | spamassassin_role | 2013-08-09 03:01:27 +0000 (Fri, 09 Aug 
-2013) | 1 line
- 
- updated scores for revision 1511618 active rules added since last 
-mass-check
-------------------------------------------------------------------------
-r1512123 | jhardin | 2013-08-09 01:42:59 +0000 (Fri, 09 Aug 2013) | 1 line
- 
- More FP avoidance
-------------------------------------------------------------------------
-r1511563 | spamassassin_role | 2013-08-08 02:58:40 +0000 (Thu, 08 Aug 
-2013) | 1 line
- 
- updated scores for revision 1511213 active rules added since last 
-mass-check
-------------------------------------------------------------------------
-r1511296 | mmartinec | 2013-08-07 13:10:06 +0000 (Wed, 07 Aug 2013) | 1 
-line
- 
- avoid a potential "Insecure dependency in sprintf" in a call to dbg()
-------------------------------------------------------------------------
-r1511229 | mmartinec | 2013-08-07 09:47:13 +0000 (Wed, 07 Aug 2013) | 1 
-line
- 
- Bug 6963: Anybody cares for a saved millisecond or two in computing 
-bayes probabilities for tokens?
-------------------------------------------------------------------------
-r1511228 | mmartinec | 2013-08-07 09:42:12 +0000 (Wed, 07 Aug 2013) | 1 
-line
- 
- Bug 6965: BayesStore/Redis: dealing with server restarts and 
-out-of-lockstep protocol
-------------------------------------------------------------------------
-r1511161 | spamassassin_role | 2013-08-07 02:58:08 +0000 (Wed, 07 Aug 
-2013) | 1 line
- 
- updated scores for revision 1510884 active rules added since last 
-mass-check
-------------------------------------------------------------------------
-r1510849 | spamassassin_role | 2013-08-06 02:57:58 +0000 (Tue, 06 Aug 
-2013) | 1 line
- 
- updated scores for revision 1510387 active rules added since last 
-mass-check
-------------------------------------------------------------------------
-r1510367 | spamassassin_role | 2013-08-05 02:56:39 +0000 (Mon, 05 Aug 
-2013) | 1 line
- 
- updated scores for revision 1510112 active rules added since last 
-mass-check
-------------------------------------------------------------------------
-r1510092 | spamassassin_role | 2013-08-04 02:55:12 +0000 (Sun, 04 Aug 
-2013) | 1 line
- 
- updated scores for revision 1509942 active rules added since last 
-mass-check
-------------------------------------------------------------------------
-r1510081 | jhardin | 2013-08-03 23:49:58 +0000 (Sat, 03 Aug 2013) | 1 line
- 
- Add REMOVE_YEAHNET
-------------------------------------------------------------------------
-r1509936 | spamassassin_role | 2013-08-03 03:37:56 +0000 (Sat, 03 Aug 
-2013) | 1 line
- 
- updated scores for revision 1509581 active rules added since last 
-mass-check
-------------------------------------------------------------------------
-r1509526 | spamassassin_role | 2013-08-02 03:32:41 +0000 (Fri, 02 Aug 
-2013) | 1 line
- 
- updated scores for revision 1509123 active rules added since last 
-mass-check
-------------------------------------------------------------------------
-r1509074 | spamassassin_role | 2013-08-01 03:25:29 +0000 (Thu, 01 Aug 
-2013) | 1 line
- 
- updated scores for revision 1508773 active rules added since last 
-mass-check
-------------------------------------------------------------------------
-r1508715 | spamassassin_role | 2013-07-31 03:24:30 +0000 (Wed, 31 Jul 
-2013) | 1 line
- 
- updated scores for revision 1508341 active rules added since last 
-mass-check
-------------------------------------------------------------------------
-r1508562 | mmartinec | 2013-07-30 18:05:45 +0000 (Tue, 30 Jul 2013) | 1 
-line
- 
- Bug 6962: Implement the missing dump_db_toks() to Redis bayes backend 
-(used by sa-learn --dump)
-------------------------------------------------------------------------
-r1508283 | spamassassin_role | 2013-07-30 03:19:47 +0000 (Tue, 30 Jul 
-2013) | 1 line
- 
- updated scores for revision 1507974 active rules added since last 
-mass-check
-------------------------------------------------------------------------
-r1507887 | spamassassin_role | 2013-07-29 03:21:33 +0000 (Mon, 29 Jul 
-2013) | 1 line
- 
- updated scores for revision 1507771 active rules added since last 
-mass-check
-------------------------------------------------------------------------
-r1507886 | kmcgrail | 2013-07-29 02:54:55 +0000 (Mon, 29 Jul 2013) | 1 
-line
- 
- ASF Rules for the Sober Worm in 2005.  Added to Sandbox to memorialize 
-and check with auto-promote if they have any merit.
-------------------------------------------------------------------------
-r1507755 | spamassassin_role | 2013-07-28 03:34:19 +0000 (Sun, 28 Jul 
-2013) | 1 line
- 
- updated scores for revision 1507597 active rules added since last 
-mass-check
-------------------------------------------------------------------------
-r1507568 | spamassassin_role | 2013-07-27 03:16:34 +0000 (Sat, 27 Jul 
-2013) | 1 line
- 
- updated scores for revision 1507218 active rules added since last 
-mass-check
-------------------------------------------------------------------------
-r1507538 | mmartinec | 2013-07-27 00:26:35 +0000 (Sat, 27 Jul 2013) | 1 
-line
- 
- Plugin/ImageInfo.pm: avoid warnings: Use of uninitialized value in lc at 
-/usr/local/lib/perl5/site_perl/5.18.0/Mail/SpamAssassin/Plugin/ImageInfo.p
-m line 231.
-------------------------------------------------------------------------
-r1507375 | mmartinec | 2013-07-26 17:21:53 +0000 (Fri, 26 Jul 2013) | 1 
-line
- 
- timing report: increase display format to 1 decimal place for times 
-between 2 and 5 ms
-------------------------------------------------------------------------
-r1507298 | mmartinec | 2013-07-26 12:47:06 +0000 (Fri, 26 Jul 2013) | 1 
-line
- 
- Redis.pm documentation touch
-------------------------------------------------------------------------
-r1507183 | spamassassin_role | 2013-07-26 03:12:11 +0000 (Fri, 26 Jul 
-2013) | 1 line
- 
- updated scores for revision 1506846 active rules added since last 
-mass-check
-------------------------------------------------------------------------
-r1507148 | mmartinec | 2013-07-25 22:51:46 +0000 (Thu, 25 Jul 2013) | 1 
-line
- 
- Bug 6959 - Malformed UTF-8 character in transliteration at DnsResolver.pm
-------------------------------------------------------------------------
-r1505887 | spamassassin_role | 2013-07-23 02:58:56 +0000 (Tue, 23 Jul 
-2013) | 1 line
- 
- updated scores for revision 1505627 active rules added since last 
-mass-check
-------------------------------------------------------------------------
-r1505585 | spamassassin_role | 2013-07-22 03:07:36 +0000 (Mon, 22 Jul 
-2013) | 1 line
- 
- updated scores for revision 1505312 active rules added since last 
-mass-check
-------------------------------------------------------------------------
-r1505254 | spamassassin_role | 2013-07-21 03:02:55 +0000 (Sun, 21 Jul 
-2013) | 1 line
- 
- updated scores for revision 1505109 active rules added since last 
-mass-check
-------------------------------------------------------------------------
-r1505080 | spamassassin_role | 2013-07-20 03:00:07 +0000 (Sat, 20 Jul 
-2013) | 1 line
- 
- updated scores for revision 1504803 active rules added since last 
-mass-check
-------------------------------------------------------------------------
-r1504752 | spamassassin_role | 2013-07-19 03:02:48 +0000 (Fri, 19 Jul 
-2013) | 1 line
- 
- updated scores for revision 1504391 active rules added since last 
-mass-check
-------------------------------------------------------------------------
-r1504390 | axb | 2013-07-18 08:46:38 +0000 (Thu, 18 Jul 2013) | 1 line
- 
- added util_rb_3tld en.alibaba.com
-------------------------------------------------------------------------
-r1504348 | spamassassin_role | 2013-07-18 03:00:55 +0000 (Thu, 18 Jul 
-2013) | 1 line
- 
- updated scores for revision 1504054 active rules added since last 
-mass-check
-------------------------------------------------------------------------
-r1504135 | axb | 2013-07-17 13:47:21 +0000 (Wed, 17 Jul 2013) | 1 line
- 
- uridnsbl_skip_domain local.cf 
-------------------------------------------------------------------------
-r1503981 | spamassassin_role | 2013-07-17 03:14:45 +0000 (Wed, 17 Jul 
-2013) | 1 line
- 
- updated scores for revision 1503617 active rules added since last 
-mass-check
-------------------------------------------------------------------------
-r1503547 | spamassassin_role | 2013-07-16 02:56:24 +0000 (Tue, 16 Jul 
-2013) | 1 line
- 
- updated scores for revision 1503139 active rules added since last 
-mass-check
-------------------------------------------------------------------------
-r1503105 | spamassassin_role | 2013-07-15 03:10:43 +0000 (Mon, 15 Jul 
-2013) | 1 line
- 
- updated scores for revision 1502947 active rules added since last 
-mass-check
-------------------------------------------------------------------------
-r1502931 | spamassassin_role | 2013-07-14 03:03:58 +0000 (Sun, 14 Jul 
-2013) | 1 line
- 
- updated scores for revision 1502764 active rules added since last 
-mass-check
-------------------------------------------------------------------------
-r1502738 | spamassassin_role | 2013-07-13 02:55:43 +0000 (Sat, 13 Jul 
-2013) | 1 line
- 
- updated scores for revision 1501677 active rules added since last 
-mass-check
-------------------------------------------------------------------------
-r1502236 | jhardin | 2013-07-11 14:35:47 +0000 (Thu, 11 Jul 2013) | 1 line
- 
- More FP avoidance & score limits
-------------------------------------------------------------------------
-r1502140 | axb | 2013-07-11 07:59:36 +0000 (Thu, 11 Jul 2013) | 1 line
- 
- added if/endif for DNSEval
-------------------------------------------------------------------------
-r1502139 | axb | 2013-07-11 07:57:43 +0000 (Thu, 11 Jul 2013) | 2 lines
- 
- removed obsolete rule publish entries - Bug 6958
- 
-------------------------------------------------------------------------
-r1501225 | mmartinec | 2013-07-09 12:40:15 +0000 (Tue, 09 Jul 2013) | 1 
-line
- 
- Bug 6956: Bayes/Redis/Lua buglet and speedup
-------------------------------------------------------------------------
-r1500360 | spamassassin_role | 2013-07-07 02:54:55 +0000 (Sun, 07 Jul 
-2013) | 1 line
- 
- updated scores for revision 1500228 active rules added since last 
-mass-check
-------------------------------------------------------------------------
-r1500193 | spamassassin_role | 2013-07-06 02:55:10 +0000 (Sat, 06 Jul 
-2013) | 1 line
- 
- updated scores for revision 1499946 active rules added since last 
-mass-check
-------------------------------------------------------------------------
-r1500141 | khopesh | 2013-07-05 21:45:24 +0000 (Fri, 05 Jul 2013) | 1 line
- 
- finally removing
+ Fix warnings on Windows platform in 3.4 - bug 7259
 ------------------------------------------------------------------------
-r1499625 | spamassassin_role | 2013-07-04 02:55:39 +0000 (Thu, 04 Jul 
-2013) | 1 line
- 
- updated scores for revision 1499267 active rules added since last 
-mass-check
-------------------------------------------------------------------------
-r1499184 | spamassassin_role | 2013-07-03 02:55:08 +0000 (Wed, 03 Jul 
-2013) | 1 line
- 
- updated scores for revision 1498840 active rules added since last 
-mass-check
-------------------------------------------------------------------------
-r1498762 | spamassassin_role | 2013-07-02 02:58:43 +0000 (Tue, 02 Jul 
-2013) | 1 line
- 
- updated scores for revision 1498303 active rules added since last 
-mass-check
-------------------------------------------------------------------------
-r1498211 | spamassassin_role | 2013-07-01 02:59:53 +0000 (Mon, 01 Jul 
-2013) | 1 line
- 
- updated scores for revision 1498070 active rules added since last 
-mass-check
-------------------------------------------------------------------------
-r1498204 | mmartinec | 2013-07-01 01:43:59 +0000 (Mon, 01 Jul 2013) | 1 
-line
- 
- heavy editing on PROPOSED-3.4.0.txt, please re-edit as you see fit
-------------------------------------------------------------------------
-r1498053 | spamassassin_role | 2013-06-30 03:00:08 +0000 (Sun, 30 Jun 
-2013) | 1 line
- 
- updated scores for revision 1497991 active rules added since last 
-mass-check
-------------------------------------------------------------------------
-r1497979 | spamassassin_role | 2013-06-29 02:59:08 +0000 (Sat, 29 Jun 
-2013) | 1 line
- 
- updated scores for revision 1497685 active rules added since last 
-mass-check
-------------------------------------------------------------------------
-r1497974 | jhardin | 2013-06-29 01:54:12 +0000 (Sat, 29 Jun 2013) | 1 line
- 
- Add SEO_REGISTER
-------------------------------------------------------------------------
-r1497634 | spamassassin_role | 2013-06-28 02:55:29 +0000 (Fri, 28 Jun 
-2013) | 1 line
- 
- updated scores for revision 1497245 active rules added since last 
-mass-check
-------------------------------------------------------------------------
-r1497196 | spamassassin_role | 2013-06-27 02:55:20 +0000 (Thu, 27 Jun 
-2013) | 1 line
- 
- updated scores for revision 1496832 active rules added since last 
-mass-check
-------------------------------------------------------------------------
-r1497083 | mmartinec | 2013-06-26 20:37:10 +0000 (Wed, 26 Jun 2013) | 1 
-line
- 
- Bug 6949: BSD/OS failures: fix t/bayesdbm_flock.t: learner leaves timer 
-running, which can abort sa-learn test runs longer than 10 seconds, 
-resulting in a test failure
-------------------------------------------------------------------------
-r1497026 | mmartinec | 2013-06-26 17:54:58 +0000 (Wed, 26 Jun 2013) | 1 
-line
- 
- Bug 6949: BSD/OS failures: work around a missing support for 
-AI_ADDRCONFIG flag and peerhostname() method
-------------------------------------------------------------------------
-r1496720 | spamassassin_role | 2013-06-26 03:02:49 +0000 (Wed, 26 Jun 
-2013) | 1 line
- 
- updated scores for revision 1496382 active rules added since last 
-mass-check
-------------------------------------------------------------------------
-r1496674 | jhardin | 2013-06-25 23:40:48 +0000 (Tue, 25 Jun 2013) | 1 line
- 
- Add BODY_URI_ONLY
-------------------------------------------------------------------------
-r1496342 | spamassassin_role | 2013-06-25 03:00:28 +0000 (Tue, 25 Jun 
-2013) | 1 line
- 
- updated scores for revision 1495960 active rules added since last 
-mass-check
-------------------------------------------------------------------------
-r1495910 | spamassassin_role | 2013-06-24 02:58:14 +0000 (Mon, 24 Jun 
-2013) | 1 line
- 
- updated scores for revision 1495800 active rules added since last 
-mass-check
-------------------------------------------------------------------------
-r1495790 | spamassassin_role | 2013-06-23 02:58:25 +0000 (Sun, 23 Jun 
-2013) | 1 line
- 
- updated scores for revision 1495693 active rules added since last 
-mass-check
-------------------------------------------------------------------------
-r1495785 | mmartinec | 2013-06-23 00:16:35 +0000 (Sun, 23 Jun 2013) | 1 
-line
- 
- Bug 6948: t/sa_compile.t test on OpenBSD 5.3 fails due to a wrong option 
-to gunzip
-------------------------------------------------------------------------
-r1495659 | spamassassin_role | 2013-06-22 02:57:51 +0000 (Sat, 22 Jun 
-2013) | 1 line
- 
- updated scores for revision 1495333 active rules added since last 
-mass-check
-------------------------------------------------------------------------
-r1495638 | mmartinec | 2013-06-21 23:39:19 +0000 (Fri, 21 Jun 2013) | 1 
-line
- 
- Bug 6945: sa-learn dies on non-ASCII characters in Message-ID
-------------------------------------------------------------------------
-r1495637 | mmartinec | 2013-06-21 23:38:19 +0000 (Fri, 21 Jun 2013) | 1 
-line
- 
- Bug 6945 - fix a taint bug in dbg() call
-------------------------------------------------------------------------
-r1495521 | mmartinec | 2013-06-21 17:54:50 +0000 (Fri, 21 Jun 2013) | 1 
-line
- 
- folded-in unfinished additional text into PROPOSED-3.4.0.txt, limit line 
-length to 75 chars
-------------------------------------------------------------------------
-r1495509 | kmcgrail | 2013-06-21 16:54:50 +0000 (Fri, 21 Jun 2013) | 1 
-line
- 
- Added note re: Sendmail bug with DKIM
-------------------------------------------------------------------------
-r1495507 | mmartinec | 2013-06-21 16:49:48 +0000 (Fri, 21 Jun 2013) | 1 
-line
- 
- Bug 6947: test t/dcc.t fails because of old DCC_CHECK rule description 
-in t/data/01_test_rules.cf
-------------------------------------------------------------------------
-r1495486 | kmcgrail | 2013-06-21 15:55:56 +0000 (Fri, 21 Jun 2013) | 1 
-line
- 
- Removed VERSION string from several pm files per bug 6422
-------------------------------------------------------------------------
-r1495485 | kmcgrail | 2013-06-21 15:54:43 +0000 (Fri, 21 Jun 2013) | 1 
-line
- 
- Small formatting change
-------------------------------------------------------------------------
-r1495274 | spamassassin_role | 2013-06-21 02:56:24 +0000 (Fri, 21 Jun 
-2013) | 1 line
- 
- updated scores for revision 1494891 active rules added since last 
-mass-check
-------------------------------------------------------------------------
-r1495148 | kmcgrail | 2013-06-20 19:42:12 +0000 (Thu, 20 Jun 2013) | 1 
-line
- 
- Added new md5 and sha1 signs to announcement
-------------------------------------------------------------------------
-r1495133 | kmcgrail | 2013-06-20 19:06:12 +0000 (Thu, 20 Jun 2013) | 1 
-line
- 
- preparing to release 3.4.0-rc2
-------------------------------------------------------------------------
-r1494842 | spamassassin_role | 2013-06-20 03:06:23 +0000 (Thu, 20 Jun 
-2013) | 1 line
- 
- updated scores for revision 1494509 active rules added since last 
-mass-check
-------------------------------------------------------------------------
-r1494756 | kmcgrail | 2013-06-19 19:50:04 +0000 (Wed, 19 Jun 2013) | 1 
-line
- 
- Small nitpicks on announcement
-------------------------------------------------------------------------
-r1494741 | axb | 2013-06-19 19:13:54 +0000 (Wed, 19 Jun 2013) | 1 line
- 
- added link to http://redis.io/
-------------------------------------------------------------------------
-r1494740 | axb | 2013-06-19 19:12:47 +0000 (Wed, 19 Jun 2013) | 1 line
- 
- capitalized some "redis"
-------------------------------------------------------------------------
-r1494692 | kmcgrail | 2013-06-19 16:50:46 +0000 (Wed, 19 Jun 2013) | 1 
-line
- 
- more Bayes msg_id clarification
-------------------------------------------------------------------------
-r1494688 | mmartinec | 2013-06-19 16:43:03 +0000 (Wed, 19 Jun 2013) | 1 
-line
- 
- edits on PROPOSED-3.4.0.txt
-------------------------------------------------------------------------
-r1494626 | kmcgrail | 2013-06-19 13:56:35 +0000 (Wed, 19 Jun 2013) | 1 
-line
- 
- Added note about Bayes msg_id calculation to proposed announcement
-------------------------------------------------------------------------
-r1494424 | spamassassin_role | 2013-06-19 02:56:41 +0000 (Wed, 19 Jun 
-2013) | 1 line
- 
- updated scores for revision 1494068 active rules added since last 
-mass-check
-------------------------------------------------------------------------
-r1494371 | mmartinec | 2013-06-18 23:20:40 +0000 (Tue, 18 Jun 2013) | 1 
-line
- 
- Bug 6942 - Redis bayes storage module - robustness: treat as 
-disconnected on failure;  get_storage_variables: only fetch variables 
-which are actually needed
-------------------------------------------------------------------------
-r1494210 | jhardin | 2013-06-18 17:12:10 +0000 (Tue, 18 Jun 2013) | 1 line
- 
- Tune HTML gibberish rules, add score limits
-------------------------------------------------------------------------
-r1494159 | mmartinec | 2013-06-18 14:57:39 +0000 (Tue, 18 Jun 2013) | 1 
-line
- 
- Bug 6942 - Redis bayes storage module - fix database restore/init
-------------------------------------------------------------------------
-r1494155 | mmartinec | 2013-06-18 14:25:49 +0000 (Tue, 18 Jun 2013) | 1 
-line
- 
- Bug 6942: Redis bayes storage - fix a non-Lua compatibility case
-------------------------------------------------------------------------
-r1494138 | mmartinec | 2013-06-18 14:05:39 +0000 (Tue, 18 Jun 2013) | 1 
-line
- 
- updated a comment
-------------------------------------------------------------------------
-r1494137 | mmartinec | 2013-06-18 13:55:21 +0000 (Tue, 18 Jun 2013) | 1 
-line
- 
- Bug 6942: Redis bayes storage - replace packed s/h counts with redis 
-hashes
-------------------------------------------------------------------------
-r1494013 | kmcgrail | 2013-06-18 03:19:54 +0000 (Tue, 18 Jun 2013) | 1 
-line
- 
- Proposed 3.4.0 announcement
-------------------------------------------------------------------------
-r1494007 | kmcgrail | 2013-06-18 03:17:34 +0000 (Tue, 18 Jun 2013) | 1 
-line
- 
- more cleanup on build process
-------------------------------------------------------------------------
-r1493990 | kmcgrail | 2013-06-18 03:00:43 +0000 (Tue, 18 Jun 2013) | 1 
-line
- 
- preparing to release 3.4.0-rc1
-------------------------------------------------------------------------
-r1493989 | spamassassin_role | 2013-06-18 02:58:43 +0000 (Tue, 18 Jun 
-2013) | 1 line
- 
- updated scores for revision 1493684 active rules added since last 
-mass-check
-------------------------------------------------------------------------
-r1493662 | axb | 2013-06-17 07:22:23 +0000 (Mon, 17 Jun 2013) | 1 line
- 
- added AXB_XM_OL_122
-------------------------------------------------------------------------
-r1493629 | spamassassin_role | 2013-06-17 02:58:02 +0000 (Mon, 17 Jun 
-2013) | 1 line
- 
- updated scores for revision 1493476 active rules added since last 
-mass-check
-------------------------------------------------------------------------
-r1493444 | spamassassin_role | 2013-06-16 03:05:34 +0000 (Sun, 16 Jun 
-2013) | 1 line
- 
- updated scores for revision 1493328 active rules added since last 
-mass-check
-------------------------------------------------------------------------
-r1493443 | jhardin | 2013-06-16 02:24:47 +0000 (Sun, 16 Jun 2013) | 1 line
- 
- Tweak STYLE_GIBBERISH
-------------------------------------------------------------------------
-r1493297 | spamassassin_role | 2013-06-15 03:00:30 +0000 (Sat, 15 Jun 
-2013) | 1 line
- 
- updated scores for revision 1492999 active rules added since last 
-mass-check
-------------------------------------------------------------------------
-r1492936 | spamassassin_role | 2013-06-14 02:52:24 +0000 (Fri, 14 Jun 
-2013) | 1 line
- 
- updated scores for revision 1492572 active rules added since last 
-mass-check
-------------------------------------------------------------------------
-r1492519 | spamassassin_role | 2013-06-13 02:54:58 +0000 (Thu, 13 Jun 
-2013) | 1 line
- 
- updated scores for revision 1492119 active rules added since last 
-mass-check
-------------------------------------------------------------------------
-r1492036 | spamassassin_role | 2013-06-12 02:52:51 +0000 (Wed, 12 Jun 
-2013) | 1 line
- 
- updated scores for revision 1491705 active rules added since last 
-mass-check
-------------------------------------------------------------------------
-r1491679 | spamassassin_role | 2013-06-11 02:58:30 +0000 (Tue, 11 Jun 
-2013) | 1 line
- 
- updated scores for revision 1491379 active rules added since last 
-mass-check
-------------------------------------------------------------------------
-r1491330 | spamassassin_role | 2013-06-10 02:48:57 +0000 (Mon, 10 Jun 
-2013) | 1 line
- 
- updated scores for revision 1491157 active rules added since last 
-mass-check
-------------------------------------------------------------------------
-r1491131 | jhardin | 2013-06-09 03:17:57 +0000 (Sun, 09 Jun 2013) | 1 line
- 
- Add "many one-word font changes" rule
-------------------------------------------------------------------------
-r1491129 | spamassassin_role | 2013-06-09 02:53:38 +0000 (Sun, 09 Jun 
-2013) | 1 line
- 
- updated scores for revision 1490936 active rules added since last 
-mass-check
-------------------------------------------------------------------------
-r1490908 | spamassassin_role | 2013-06-08 02:54:59 +0000 (Sat, 08 Jun 
-2013) | 1 line
- 
- updated scores for revision 1490545 active rules added since last 
-mass-check
-------------------------------------------------------------------------
-r1490499 | spamassassin_role | 2013-06-07 02:56:29 +0000 (Fri, 07 Jun 
-2013) | 1 line
- 
- updated scores for revision 1490200 active rules added since last 
-mass-check
-------------------------------------------------------------------------
-r1490496 | jhardin | 2013-06-07 02:10:57 +0000 (Fri, 07 Jun 2013) | 1 line
- 
- Reduce score to reduce FPs if rDNS fails
-------------------------------------------------------------------------
-r1490223 | mmartinec | 2013-06-06 10:11:48 +0000 (Thu, 06 Jun 2013) | 1 
-line
- 
- use common style in comments: backwards compatible -> backward 
-compatible; see Wikipedia and 
-http://itknowledgeexchange.techtarget.com/writing-for-business/backward-co
-mpatible-or-backwards-compatible/
-------------------------------------------------------------------------
-r1490113 | spamassassin_role | 2013-06-06 02:52:54 +0000 (Thu, 06 Jun 
-2013) | 1 line
- 
- updated scores for revision 1489743 active rules added since last 
-mass-check
-------------------------------------------------------------------------
-r1489870 | mmartinec | 2013-06-05 13:48:07 +0000 (Wed, 05 Jun 2013) | 1 
-line
- 
- docs fix / update
-------------------------------------------------------------------------
-r1489688 | spamassassin_role | 2013-06-05 02:56:52 +0000 (Wed, 05 Jun 
-2013) | 1 line
- 
- updated scores for revision 1489338 active rules added since last 
-mass-check
-------------------------------------------------------------------------
-r1489277 | spamassassin_role | 2013-06-04 02:56:30 +0000 (Tue, 04 Jun 
-2013) | 1 line
- 
- updated scores for revision 1488897 active rules added since last 
-mass-check
-------------------------------------------------------------------------
-r1489055 | mmartinec | 2013-06-03 16:30:33 +0000 (Mon, 03 Jun 2013) | 1 
-line
- 
- Bug 6943: Introducing CONF_TYPE_DURATION data type
-------------------------------------------------------------------------
-r1488831 | spamassassin_role | 2013-06-03 02:58:56 +0000 (Mon, 03 Jun 
-2013) | 1 line
- 
- updated scores for revision 1488650 active rules added since last 
-mass-check
-------------------------------------------------------------------------
-r1488760 | jhardin | 2013-06-02 18:38:33 +0000 (Sun, 02 Jun 2013) | 1 line
- 
- More FP avoidance
-------------------------------------------------------------------------
-r1488696 | sidney | 2013-06-02 12:39:27 +0000 (Sun, 02 Jun 2013) | 1 line
- 
- Bug 6939 - Clarify error log message
-------------------------------------------------------------------------
-r1488641 | spamassassin_role | 2013-06-02 02:56:02 +0000 (Sun, 02 Jun 
-2013) | 1 line
- 
- updated scores for revision 1488494 active rules added since last 
-mass-check
-------------------------------------------------------------------------
-r1488555 | jhardin | 2013-06-01 18:42:29 +0000 (Sat, 01 Jun 2013) | 1 line
- 
- Tweak CN_B2B_SPAMMER
-------------------------------------------------------------------------
-r1488550 | hege | 2013-06-01 17:28:16 +0000 (Sat, 01 Jun 2013) | 3 lines
- 
- Bug 6942: Fix bayes_seen_ttl option
- 
- 
-------------------------------------------------------------------------
-r1488285 | hege | 2013-05-31 15:55:46 +0000 (Fri, 31 May 2013) | 3 lines
- 
- Bug 6942: Fix things when bayes_auto_expire not set
- 
- 
-------------------------------------------------------------------------
-r1488251 | mmartinec | 2013-05-31 14:32:37 +0000 (Fri, 31 May 2013) | 1 
-line
- 
- Bug 6942: Redis bayes storage module fixes and updates (part 2)
-------------------------------------------------------------------------
-r1488244 | mmartinec | 2013-05-31 14:17:49 +0000 (Fri, 31 May 2013) | 1 
-line
- 
- Bug 6942: Redis bayes storage module fixes and updates
-------------------------------------------------------------------------
-r1487968 | mmartinec | 2013-05-30 18:49:17 +0000 (Thu, 30 May 2013) | 1 
-line
- 
- mostly cosmetics: comments, quoting, unnecessary time() call
-------------------------------------------------------------------------
-r1487178 | mmartinec | 2013-05-29 00:51:58 +0000 (Wed, 29 May 2013) | 1 
-line
- 
- Bug 6937: 3.3.2 and Perl 5.18.0: Altering hash requires restarting loop 
-else UNDEFINED behavior
-------------------------------------------------------------------------
-r1486468 | jhardin | 2013-05-26 20:28:24 +0000 (Sun, 26 May 2013) | 1 line
- 
- More FP avoidance
-------------------------------------------------------------------------
-r1486279 | spamassassin_role | 2013-05-25 02:54:47 +0000 (Sat, 25 May 
-2013) | 1 line
- 
- updated scores for revision 1485974 active rules added since last 
-mass-check
-------------------------------------------------------------------------
-r1485926 | spamassassin_role | 2013-05-24 03:00:26 +0000 (Fri, 24 May 
-2013) | 1 line
- 
- updated scores for revision 1485615 active rules added since last 
-mass-check
-------------------------------------------------------------------------
-r1485550 | spamassassin_role | 2013-05-23 02:55:53 +0000 (Thu, 23 May 
-2013) | 1 line
- 
- updated scores for revision 1485119 active rules added since last 
-mass-check
-------------------------------------------------------------------------
-r1485035 | spamassassin_role | 2013-05-22 02:57:25 +0000 (Wed, 22 May 
-2013) | 1 line
- 
- updated scores for revision 1484700 active rules added since last 
-mass-check
-------------------------------------------------------------------------
-r1484487 | mmartinec | 2013-05-20 14:26:28 +0000 (Mon, 20 May 2013) | 1 
-line
- 
- compatibility: only specify socket option V6Only with IO::Socket modules 
-which support it
-------------------------------------------------------------------------
-r1484471 | axb | 2013-05-20 13:16:24 +0000 (Mon, 20 May 2013) | 6 lines
- 
- added 
- util_rb_3tld mobile.web.tr
- 
- util_rb_2tld ucoz.com
- util_rb_2tld ucoz.net
- 
-------------------------------------------------------------------------
-r1484372 | spamassassin_role | 2013-05-20 03:01:53 +0000 (Mon, 20 May 
-2013) | 1 line
- 
- updated scores for revision 1484242 active rules added since last 
-mass-check
-------------------------------------------------------------------------
-r1484219 | spamassassin_role | 2013-05-19 03:03:33 +0000 (Sun, 19 May 
-2013) | 1 line
- 
- updated scores for revision 1484071 active rules added since last 
-mass-check
-------------------------------------------------------------------------
-r1484048 | spamassassin_role | 2013-05-18 03:04:59 +0000 (Sat, 18 May 
-2013) | 1 line
- 
- updated scores for revision 1483693 active rules added since last 
-mass-check
-------------------------------------------------------------------------
-r1483832 | kmcgrail | 2013-05-17 14:48:41 +0000 (Fri, 17 May 2013) | 1 
-line
- 
- adding ceiling on TVD_FROM_1 score
-------------------------------------------------------------------------
-r1483638 | spamassassin_role | 2013-05-17 03:05:15 +0000 (Fri, 17 May 
-2013) | 1 line
- 
- updated scores for revision 1483252 active rules added since last 
-mass-check
-------------------------------------------------------------------------
-r1483175 | spamassassin_role | 2013-05-16 03:04:17 +0000 (Thu, 16 May 
-2013) | 1 line
- 
- updated scores for revision 1482727 active rules added since last 
-mass-check
-------------------------------------------------------------------------
-r1482664 | spamassassin_role | 2013-05-15 03:01:37 +0000 (Wed, 15 May 
-2013) | 1 line
- 
- updated scores for revision 1482254 active rules added since last 
-mass-check
-------------------------------------------------------------------------
-r1482178 | spamassassin_role | 2013-05-14 03:05:09 +0000 (Tue, 14 May 
-2013) | 1 line
- 
- updated scores for revision 1481731 active rules added since last 
-mass-check
-------------------------------------------------------------------------
-r1481692 | spamassassin_role | 2013-05-13 03:04:25 +0000 (Mon, 13 May 
-2013) | 1 line
- 
- updated scores for revision 1481494 active rules added since last 
-mass-check
-------------------------------------------------------------------------
-r1481467 | spamassassin_role | 2013-05-12 03:01:33 +0000 (Sun, 12 May 
-2013) | 1 line
- 
- updated scores for revision 1481272 active rules added since last 
-mass-check
-------------------------------------------------------------------------
-r1481252 | spamassassin_role | 2013-05-11 03:10:19 +0000 (Sat, 11 May 
-2013) | 1 line
- 
- updated scores for revision 1480936 active rules added since last 
-mass-check
-------------------------------------------------------------------------
-r1480866 | spamassassin_role | 2013-05-10 03:09:00 +0000 (Fri, 10 May 
-2013) | 1 line
- 
- updated scores for revision 1480571 active rules added since last 
-mass-check
-------------------------------------------------------------------------
-r1480521 | spamassassin_role | 2013-05-09 03:07:39 +0000 (Thu, 09 May 
-2013) | 1 line
- 
- updated scores for revision 1480184 active rules added since last 
-mass-check
-------------------------------------------------------------------------
-r1480150 | spamassassin_role | 2013-05-08 03:04:06 +0000 (Wed, 08 May 
-2013) | 1 line
- 
- updated scores for revision 1479814 active rules added since last 
-mass-check
-------------------------------------------------------------------------
-r1480148 | kmcgrail | 2013-05-08 01:27:31 +0000 (Wed, 08 May 2013) | 1 
-line
- 
- Uncommented the MW_SURBL rules for bug 6853
-------------------------------------------------------------------------
-r1479755 | spamassassin_role | 2013-05-07 03:06:43 +0000 (Tue, 07 May 
-2013) | 1 line
- 
- updated scores for revision 1479498 active rules added since last 
-mass-check
-------------------------------------------------------------------------
-r1479461 | spamassassin_role | 2013-05-06 03:03:11 +0000 (Mon, 06 May 
-2013) | 1 line
- 
- updated scores for revision 1479264 active rules added since last 
-mass-check
-------------------------------------------------------------------------
-r1479231 | spamassassin_role | 2013-05-05 03:07:25 +0000 (Sun, 05 May 
-2013) | 1 line
- 
- updated scores for revision 1479059 active rules added since last 
-mass-check
-------------------------------------------------------------------------
-r1479033 | spamassassin_role | 2013-05-04 03:08:25 +0000 (Sat, 04 May 
-2013) | 1 line
- 
- updated scores for revision 1478671 active rules added since last 
-mass-check
-------------------------------------------------------------------------
-r1478630 | spamassassin_role | 2013-05-03 03:11:50 +0000 (Fri, 03 May 
-2013) | 1 line
- 
- updated scores for revision 1478301 active rules added since last 
-mass-check
-------------------------------------------------------------------------
-r1478255 | spamassassin_role | 2013-05-02 03:09:16 +0000 (Thu, 02 May 
-2013) | 1 line
- 
- updated scores for revision 1477933 active rules added since last 
-mass-check
-------------------------------------------------------------------------
-r1477902 | spamassassin_role | 2013-05-01 03:07:39 +0000 (Wed, 01 May 
-2013) | 1 line
- 
- updated scores for revision 1477509 active rules added since last 
-mass-check
-------------------------------------------------------------------------
-r1477459 | spamassassin_role | 2013-04-30 03:06:26 +0000 (Tue, 30 Apr 
-2013) | 1 line
- 
- updated scores for revision 1476922 active rules added since last 
-mass-check
-------------------------------------------------------------------------
-r1476882 | spamassassin_role | 2013-04-29 03:11:43 +0000 (Mon, 29 Apr 
-2013) | 1 line
- 
- updated scores for revision 1476734 active rules added since last 
-mass-check
-------------------------------------------------------------------------
-r1476711 | spamassassin_role | 2013-04-28 03:05:31 +0000 (Sun, 28 Apr 
-2013) | 1 line
- 
- updated scores for revision 1476532 active rules added since last 
-mass-check
-------------------------------------------------------------------------
-r1476471 | spamassassin_role | 2013-04-27 03:01:30 +0000 (Sat, 27 Apr 
-2013) | 1 line
- 
- updated scores for revision 1476108 active rules added since last 
-mass-check
-------------------------------------------------------------------------
-r1476031 | spamassassin_role | 2013-04-26 03:01:34 +0000 (Fri, 26 Apr 
-2013) | 1 line
- 
- updated scores for revision 1475675 active rules added since last 
-mass-check
-------------------------------------------------------------------------
-r1475932 | mmartinec | 2013-04-25 19:56:34 +0000 (Thu, 25 Apr 2013) | 1 
-line
- 
- Bug 6930: sa-update unable to deal with a previous failure (empty 
-mirrors file)
-------------------------------------------------------------------------
-r1471818 | spamassassin_role | 2013-04-25 02:55:54 +0000 (Thu, 25 Apr 
-2013) | 1 line
- 
- updated scores for revision 1471296 active rules added since last 
-mass-check
-------------------------------------------------------------------------
-r1471605 | mmartinec | 2013-04-24 19:22:30 +0000 (Wed, 24 Apr 2013) | 6 
+r1839641 | gbechis | 2018-08-30 07:32:41 +0000 (Thu, 30 Aug 2018) | 2 
 lines
  
- sa-update: use the same decision logic as in spamd for choosing 
-IO::Socket::IP vs
-   IO::Socket::INET6, prefer the former for consistency, let the 
-underlying module
-   pick the right address family instead of forcing it through 
-local_address();
-   added some debugging and cosmetics
- 
- 
-------------------------------------------------------------------------
-r1471231 | spamassassin_role | 2013-04-24 02:53:42 +0000 (Wed, 24 Apr 
-2013) | 1 line
- 
- updated scores for revision 1470853 active rules added since last 
-mass-check
-------------------------------------------------------------------------
-r1470796 | spamassassin_role | 2013-04-23 03:00:27 +0000 (Tue, 23 Apr 
-2013) | 1 line
- 
- updated scores for revision 1470411 active rules added since last 
-mass-check
-------------------------------------------------------------------------
-r1470257 | spamassassin_role | 2013-04-21 02:55:53 +0000 (Sun, 21 Apr 
-2013) | 1 line
- 
- updated scores for revision 1470125 active rules added since last 
-mass-check
-------------------------------------------------------------------------
-r1470099 | spamassassin_role | 2013-04-20 02:51:48 +0000 (Sat, 20 Apr 
-2013) | 1 line
- 
- updated scores for revision 1469745 active rules added since last 
-mass-check
-------------------------------------------------------------------------
-r1469670 | spamassassin_role | 2013-04-19 02:52:59 +0000 (Fri, 19 Apr 
-2013) | 1 line
- 
- updated scores for revision 1469227 active rules added since last 
-mass-check
-------------------------------------------------------------------------
-r1469142 | spamassassin_role | 2013-04-18 02:50:45 +0000 (Thu, 18 Apr 
-2013) | 1 line
- 
- updated scores for revision 1468800 active rules added since last 
-mass-check
-------------------------------------------------------------------------
-r1468853 | mmartinec | 2013-04-17 11:59:22 +0000 (Wed, 17 Apr 2013) | 1 
-line
- 
- Bug 6927: IP_PRIVATE should also include shared address space (used in 
-CGN, RFC 6598)
-------------------------------------------------------------------------
-r1468729 | spamassassin_role | 2013-04-17 02:52:42 +0000 (Wed, 17 Apr 
-2013) | 1 line
- 
- updated scores for revision 1468327 active rules added since last 
-mass-check
-------------------------------------------------------------------------
-r1468294 | spamassassin_role | 2013-04-16 02:48:17 +0000 (Tue, 16 Apr 
-2013) | 1 line
- 
- updated scores for revision 1467901 active rules added since last 
-mass-check
-------------------------------------------------------------------------
-r1467846 | spamassassin_role | 2013-04-15 02:50:18 +0000 (Mon, 15 Apr 
-2013) | 1 line
- 
- updated scores for revision 1467748 active rules added since last 
-mass-check
-------------------------------------------------------------------------
-r1467720 | spamassassin_role | 2013-04-14 02:50:49 +0000 (Sun, 14 Apr 
-2013) | 1 line
- 
- updated scores for revision 1467575 active rules added since last 
-mass-check
-------------------------------------------------------------------------
-r1466584 | mmartinec | 2013-04-10 17:41:57 +0000 (Wed, 10 Apr 2013) | 1 
-line
- 
- adjust parsing of zone_id in scoped IPv6 address according to RFC 6874
-------------------------------------------------------------------------
-r1466502 | mmartinec | 2013-04-10 14:59:47 +0000 (Wed, 10 Apr 2013) | 1 
-line
- 
- updated document sources in comments (RFC 5735 etc)
-------------------------------------------------------------------------
-r1465343 | axb | 2013-04-07 08:20:27 +0000 (Sun, 07 Apr 2013) | 1 line
- 
- added: util_rb_3tld user.icpnet.pl
-------------------------------------------------------------------------
-r1464265 | spamassassin_role | 2013-04-04 03:01:51 +0000 (Thu, 04 Apr 
-2013) | 1 line
- 
- updated scores for revision 1463883 active rules added since last 
-mass-check
-------------------------------------------------------------------------
-r1463659 | kmcgrail | 2013-04-02 18:23:01 +0000 (Tue, 02 Apr 2013) | 1 
-line
- 
- Fix for MIRRORED.BY file being 0 byte
-------------------------------------------------------------------------
-r1462871 | spamassassin_role | 2013-03-31 03:05:28 +0000 (Sun, 31 Mar 
-2013) | 1 line
- 
- updated scores for revision 1462718 active rules added since last 
-mass-check
-------------------------------------------------------------------------
-r1462870 | jhardin | 2013-03-31 01:36:24 +0000 (Sun, 31 Mar 2013) | 1 line
- 
- More FP avoidance, add scored URI_BITLY, test a scored ADV_FEE_2 rule
-------------------------------------------------------------------------
-r1462694 | spamassassin_role | 2013-03-30 03:09:59 +0000 (Sat, 30 Mar 
-2013) | 1 line
- 
- updated scores for revision 1462428 active rules added since last 
-mass-check
-------------------------------------------------------------------------
-r1462388 | spamassassin_role | 2013-03-29 03:10:36 +0000 (Fri, 29 Mar 
-2013) | 1 line
- 
- updated scores for revision 1461994 active rules added since last 
-mass-check
-------------------------------------------------------------------------
-r1462345 | smf | 2013-03-28 23:10:50 +0000 (Thu, 28 Mar 2013) | 1 line
- 
- Sandbox updates
-------------------------------------------------------------------------
-r1462236 | mmartinec | 2013-03-28 17:50:20 +0000 (Thu, 28 Mar 2013) | 1 
-line
- 
- t/spamd_hup.t: slightly increase timeout to let the test pass on a 
-Raspberry PI;  t/re_base_extraction.t: fix a typo
-------------------------------------------------------------------------
-r1461939 | spamassassin_role | 2013-03-28 03:18:42 +0000 (Thu, 28 Mar 
-2013) | 1 line
- 
- updated scores for revision 1461449 active rules added since last 
-mass-check
-------------------------------------------------------------------------
-r1461397 | spamassassin_role | 2013-03-27 03:12:58 +0000 (Wed, 27 Mar 
-2013) | 1 line
- 
- updated scores for revision 1461022 active rules added since last 
-mass-check
-------------------------------------------------------------------------
-r1461367 | smf | 2013-03-26 23:09:24 +0000 (Tue, 26 Mar 2013) | 1 line
- 
- Sandbox updates
-------------------------------------------------------------------------
-r1460958 | spamassassin_role | 2013-03-26 03:19:18 +0000 (Tue, 26 Mar 
-2013) | 1 line
- 
- updated scores for revision 1460549 active rules added since last 
-mass-check
-------------------------------------------------------------------------
-r1460940 | smf | 2013-03-26 00:45:41 +0000 (Tue, 26 Mar 2013) | 1 line
- 
- Sandbox updates
-------------------------------------------------------------------------
-r1460516 | spamassassin_role | 2013-03-25 03:22:47 +0000 (Mon, 25 Mar 
-2013) | 1 line
- 
- updated scores for revision 1460285 active rules added since last 
-mass-check
-------------------------------------------------------------------------
-r1460411 | smf | 2013-03-24 15:56:21 +0000 (Sun, 24 Mar 2013) | 1 line
- 
- More sandbox updates...
-------------------------------------------------------------------------
-r1460409 | smf | 2013-03-24 15:55:46 +0000 (Sun, 24 Mar 2013) | 1 line
- 
- Sandbox updates
-------------------------------------------------------------------------
-r1460257 | spamassassin_role | 2013-03-24 03:16:20 +0000 (Sun, 24 Mar 
-2013) | 1 line
- 
- updated scores for revision 1460120 active rules added since last 
-mass-check
-------------------------------------------------------------------------
-r1460247 | jhardin | 2013-03-24 00:44:46 +0000 (Sun, 24 Mar 2013) | 1 line
- 
- Add scoring rule for __FOUND_YOU
-------------------------------------------------------------------------
-r1460087 | spamassassin_role | 2013-03-23 03:45:35 +0000 (Sat, 23 Mar 
-2013) | 1 line
- 
- updated scores for revision 1459667 active rules added since last 
-mass-check
-------------------------------------------------------------------------
-r1460025 | smf | 2013-03-22 22:02:23 +0000 (Fri, 22 Mar 2013) | 1 line
- 
- Sandbox updates
-------------------------------------------------------------------------
-r1459738 | kmcgrail | 2013-03-22 11:57:51 +0000 (Fri, 22 Mar 2013) | 1 
-line
- 
- lower score for masscheck ceiling on CK_HELO_DYNAMIC_SPLIT_IP
-------------------------------------------------------------------------
-r1459615 | spamassassin_role | 2013-03-22 03:35:58 +0000 (Fri, 22 Mar 
-2013) | 1 line
- 
- updated scores for revision 1459191 active rules added since last 
-mass-check
-------------------------------------------------------------------------
-r1459558 | smf | 2013-03-21 22:31:29 +0000 (Thu, 21 Mar 2013) | 1 line
- 
- Updated sandbox rules
-------------------------------------------------------------------------
-r1459144 | spamassassin_role | 2013-03-21 03:45:56 +0000 (Thu, 21 Mar 
-2013) | 1 line
- 
- updated scores for revision 1458688 active rules added since last 
-mass-check
-------------------------------------------------------------------------
-r1458700 | axb | 2013-03-20 09:27:23 +0000 (Wed, 20 Mar 2013) | 1 line
- 
- removed "no hit" rules
-------------------------------------------------------------------------
-r1458630 | spamassassin_role | 2013-03-20 04:05:37 +0000 (Wed, 20 Mar 
-2013) | 1 line
- 
- updated scores for revision 1458179 active rules added since last 
-mass-check
-------------------------------------------------------------------------
-r1458609 | smf | 2013-03-20 02:01:36 +0000 (Wed, 20 Mar 2013) | 1 line
- 
- Disabled shortener test
-------------------------------------------------------------------------
-r1458606 | smf | 2013-03-20 01:40:06 +0000 (Wed, 20 Mar 2013) | 1 line
- 
- Sandbox updates
-------------------------------------------------------------------------
-r1458605 | smf | 2013-03-20 01:37:52 +0000 (Wed, 20 Mar 2013) | 1 line
- 
- Add test rules for bug 6919
-------------------------------------------------------------------------
-r1458260 | smf | 2013-03-19 12:56:48 +0000 (Tue, 19 Mar 2013) | 1 line
- 
- Fix sandbox rule
-------------------------------------------------------------------------
-r1458124 | spamassassin_role | 2013-03-19 04:18:34 +0000 (Tue, 19 Mar 
-2013) | 1 line
- 
- updated scores for revision 1457672 active rules added since last 
-mass-check
-------------------------------------------------------------------------
-r1458092 | smf | 2013-03-19 02:00:35 +0000 (Tue, 19 Mar 2013) | 2 lines
- 
- Remove superceded rules from sandbox
- 
-------------------------------------------------------------------------
-r1458091 | smf | 2013-03-19 01:59:42 +0000 (Tue, 19 Mar 2013) | 2 lines
- 
- Sandbox updates
- 
-------------------------------------------------------------------------
-r1458081 | smf | 2013-03-19 01:24:48 +0000 (Tue, 19 Mar 2013) | 2 lines
- 
- Updated sandbox rules
- 
-------------------------------------------------------------------------
-r1457635 | spamassassin_role | 2013-03-18 04:17:01 +0000 (Mon, 18 Mar 
-2013) | 1 line
- 
- updated scores for revision 1457395 active rules added since last 
-mass-check
-------------------------------------------------------------------------
-r1457369 | spamassassin_role | 2013-03-17 04:04:36 +0000 (Sun, 17 Mar 
-2013) | 1 line
- 
- updated scores for revision 1457225 active rules added since last 
-mass-check
-------------------------------------------------------------------------
-r1457195 | spamassassin_role | 2013-03-16 03:40:05 +0000 (Sat, 16 Mar 
-2013) | 1 line
- 
- updated scores for revision 1456805 active rules added since last 
-mass-check
-------------------------------------------------------------------------
-r1456965 | mmartinec | 2013-03-15 14:24:20 +0000 (Fri, 15 Mar 2013) | 1 
-line
- 
- spamd.raw: avoid an unnecessary complication creating a socket through 
-new_io_socket_inetx
-------------------------------------------------------------------------
-r1456757 | spamassassin_role | 2013-03-15 03:52:11 +0000 (Fri, 15 Mar 
-2013) | 1 line
- 
- updated scores for revision 1456366 active rules added since last 
-mass-check
-------------------------------------------------------------------------
-r1456318 | spamassassin_role | 2013-03-14 03:44:02 +0000 (Thu, 14 Mar 
-2013) | 1 line
- 
- updated scores for revision 1455841 active rules added since last 
-mass-check
-------------------------------------------------------------------------
-r1455787 | spamassassin_role | 2013-03-13 03:42:11 +0000 (Wed, 13 Mar 
-2013) | 1 line
- 
- updated scores for revision 1455441 active rules added since last 
-mass-check
-------------------------------------------------------------------------
-r1455728 | smf | 2013-03-12 21:59:52 +0000 (Tue, 12 Mar 2013) | 2 lines
- 
- Updated sandbox rules
- 
-------------------------------------------------------------------------
-r1455399 | spamassassin_role | 2013-03-12 03:50:24 +0000 (Tue, 12 Mar 
-2013) | 1 line
- 
- updated scores for revision 1455057 active rules added since last 
-mass-check
-------------------------------------------------------------------------
-r1454987 | spamassassin_role | 2013-03-11 03:33:41 +0000 (Mon, 11 Mar 
-2013) | 1 line
- 
- updated scores for revision 1454805 active rules added since last 
-mass-check
-------------------------------------------------------------------------
-r1454886 | jhardin | 2013-03-10 17:50:51 +0000 (Sun, 10 Mar 2013) | 1 line
- 
- Add rule for invalid .. in URI domain (DNS error)
-------------------------------------------------------------------------
-r1454780 | spamassassin_role | 2013-03-10 03:31:25 +0000 (Sun, 10 Mar 
-2013) | 1 line
- 
- updated scores for revision 1454674 active rules added since last 
-mass-check
-------------------------------------------------------------------------
-r1454759 | jhardin | 2013-03-09 19:31:51 +0000 (Sat, 09 Mar 2013) | 1 line
- 
- More FP avoidance, tweak CN_B2B
-------------------------------------------------------------------------
-r1454648 | spamassassin_role | 2013-03-09 03:17:27 +0000 (Sat, 09 Mar 
-2013) | 1 line
- 
- updated scores for revision 1454288 active rules added since last 
-mass-check
-------------------------------------------------------------------------
-r1454230 | spamassassin_role | 2013-03-08 03:17:30 +0000 (Fri, 08 Mar 
-2013) | 1 line
- 
- updated scores for revision 1453735 active rules added since last 
-mass-check
-------------------------------------------------------------------------
-r1453674 | spamassassin_role | 2013-03-07 03:23:57 +0000 (Thu, 07 Mar 
-2013) | 1 line
- 
- updated scores for revision 1453215 active rules added since last 
-mass-check
-------------------------------------------------------------------------
-r1453409 | mmartinec | 2013-03-06 16:37:06 +0000 (Wed, 06 Mar 2013) | 1 
-line
- 
- typo in a comment
-------------------------------------------------------------------------
-r1453407 | mmartinec | 2013-03-06 16:31:47 +0000 (Wed, 06 Mar 2013) | 1 
-line
- 
- Bug 6915: PerMsgStatus::get_tag() enhancement and optimization
-------------------------------------------------------------------------
-r1453263 | axb | 2013-03-06 10:13:33 +0000 (Wed, 06 Mar 2013) | 1 line
- 
- disabled 0 hit rules and/or bad performers, abandoned rules
-------------------------------------------------------------------------
-r1453242 | axb | 2013-03-06 09:45:59 +0000 (Wed, 06 Mar 2013) | 1 line
- 
- added meta dependencies from hstern's sandbox
-------------------------------------------------------------------------
-r1453241 | axb | 2013-03-06 09:42:59 +0000 (Wed, 06 Mar 2013) | 1 line
- 
- added meta dependencies from hstern's sanbox
-------------------------------------------------------------------------
-r1453154 | spamassassin_role | 2013-03-06 03:09:40 +0000 (Wed, 06 Mar 
-2013) | 1 line
- 
- updated scores for revision 1452698 active rules added since last 
-mass-check
-------------------------------------------------------------------------
-r1452948 | mmartinec | 2013-03-05 19:05:18 +0000 (Tue, 05 Mar 2013) | 1 
-line
- 
- trivial details in comment
-------------------------------------------------------------------------
-r1452876 | kmcgrail | 2013-03-05 16:13:45 +0000 (Tue, 05 Mar 2013) | 1 
-line
- 
- small document change to remove NJABL as it is shutdown and change to 
-priorities.t to use a different RBL for the priorities testing.
-------------------------------------------------------------------------
-r1452805 | axb | 2013-03-05 14:15:07 +0000 (Tue, 05 Mar 2013) | 1 line
- 
- disabled ancient primitive "replica" rule
-------------------------------------------------------------------------
-r1452785 | axb | 2013-03-05 13:07:59 +0000 (Tue, 05 Mar 2013) | 3 lines
- 
- URIBL_SBL_A  rule is in 25_uribl.cf
- no need for redundant rule in sandbox - disabled
- pending removal after SA 3.4 release
-------------------------------------------------------------------------
-r1452758 | axb | 2013-03-05 12:07:59 +0000 (Tue, 05 Mar 2013) | 1 line
- 
- Moved rules to 20_dnsbl_tests.cf for permanent SA default inclusion 
-------------------------------------------------------------------------
-r1452757 | axb | 2013-03-05 12:07:03 +0000 (Tue, 05 Mar 2013) | 2 lines
- 
- moved RCVD_IN_RP_ rules to 20_dnsbl_tests.cf
- original sandbox rules have been commented out.
-------------------------------------------------------------------------
-r1452748 | axb | 2013-03-05 11:36:44 +0000 (Tue, 05 Mar 2013) | 1 line
- 
- removed rfc-ignorant.org comments
-------------------------------------------------------------------------
-r1452649 | spamassassin_role | 2013-03-05 03:22:12 +0000 (Tue, 05 Mar 
-2013) | 1 line
- 
- updated scores for revision 1452211 active rules added since last 
-mass-check
-------------------------------------------------------------------------
-r1452566 | axb | 2013-03-04 22:24:04 +0000 (Mon, 04 Mar 2013) | 1 line
- 
- removed all references to NJABL
-------------------------------------------------------------------------
-r1452565 | axb | 2013-03-04 22:22:47 +0000 (Mon, 04 Mar 2013) | 1 line
- 
- removed references to NJABL
-------------------------------------------------------------------------
-r1452564 | axb | 2013-03-04 22:22:13 +0000 (Mon, 04 Mar 2013) | 1 line
- 
- removed references to NJABL
-------------------------------------------------------------------------
-r1452176 | spamassassin_role | 2013-03-04 03:13:25 +0000 (Mon, 04 Mar 
-2013) | 1 line
- 
- updated scores for revision 1452019 active rules added since last 
-mass-check
-------------------------------------------------------------------------
-r1452116 | jhardin | 2013-03-03 19:57:15 +0000 (Sun, 03 Mar 2013) | 1 line
- 
- NJABL DNSBL is gone
-------------------------------------------------------------------------
-r1451999 | spamassassin_role | 2013-03-03 03:20:11 +0000 (Sun, 03 Mar 
-2013) | 1 line
- 
- updated scores for revision 1451851 active rules added since last 
-mass-check
-------------------------------------------------------------------------
-r1451823 | spamassassin_role | 2013-03-02 03:06:36 +0000 (Sat, 02 Mar 
-2013) | 1 line
- 
- updated scores for revision 1451526 active rules added since last 
-mass-check
-------------------------------------------------------------------------
-r1451822 | jhardin | 2013-03-02 02:19:39 +0000 (Sat, 02 Mar 2013) | 1 line
- 
- __MANY_RECIPS too easily bypassed by long email addresses
-------------------------------------------------------------------------
-r1451776 | axb | 2013-03-01 23:36:46 +0000 (Fri, 01 Mar 2013) | 1 line
- 
- Bug 6913; Disabled rules/scores for njabl.org  
-------------------------------------------------------------------------
-r1451464 | spamassassin_role | 2013-03-01 03:17:29 +0000 (Fri, 01 Mar 
-2013) | 1 line
- 
- updated scores for revision 1451140 active rules added since last 
-mass-check
-------------------------------------------------------------------------
-r1451451 | mmartinec | 2013-03-01 01:24:04 +0000 (Fri, 01 Mar 2013) | 1 
-line
- 
- Bug 3062: SpamAssassin should be "locale safe"
-------------------------------------------------------------------------
-r1451317 | mmartinec | 2013-02-28 19:54:25 +0000 (Thu, 28 Feb 2013) | 1 
-line
- 
- Bug 6388: Patch to allow administrator control over failure to retrieve 
-userprefs from LDAP or SQL
-------------------------------------------------------------------------
-r1451230 | mmartinec | 2013-02-28 15:20:09 +0000 (Thu, 28 Feb 2013) | 1 
-line
- 
- related to Bug 6841: testing for PF_INET and PF_INET6 availability in 
-spamd allows automatic choice of default protocol families for listen 
-sockets (like on an IPv6-only host); documentation details; more 
-informative debugging
-------------------------------------------------------------------------
-r1451170 | axb | 2013-02-28 10:38:37 +0000 (Thu, 28 Feb 2013) | 1 line
- 
- added mykolab.com
-------------------------------------------------------------------------
-r1451083 | spamassassin_role | 2013-02-28 03:15:10 +0000 (Thu, 28 Feb 
-2013) | 1 line
- 
- updated scores for revision 1450680 active rules added since last 
-mass-check
-------------------------------------------------------------------------
-r1450914 | mmartinec | 2013-02-27 18:52:50 +0000 (Wed, 27 Feb 2013) | 1 
-line
- 
- Bug 6901: untie db first to fix "bayes db version 0 is not able to be 
-used, aborting!" problem
-------------------------------------------------------------------------
-r1450858 | mmartinec | 2013-02-27 17:21:53 +0000 (Wed, 27 Feb 2013) | 1 
-line
- 
- related to Bug 6841: decouple choosing a Socket vs. Socket6 module from 
-choosing an IO::Socket::{IP,INET6,INET} module, improve compatibility 
-with old versions of these modules
-------------------------------------------------------------------------
-r1450588 | spamassassin_role | 2013-02-27 03:17:27 +0000 (Wed, 27 Feb 
-2013) | 1 line
- 
- updated scores for revision 1450078 active rules added since last 
-mass-check
-------------------------------------------------------------------------
-r1450292 | mmartinec | 2013-02-26 17:25:11 +0000 (Tue, 26 Feb 2013) | 1 
-line
- 
- updated a comment: add a ref to Net::DNS bug [rt.cpan.org #83451]
-------------------------------------------------------------------------
-r1450204 | jhardin | 2013-02-26 15:07:20 +0000 (Tue, 26 Feb 2013) | 1 line
- 
- Tweak email phishing rules
-------------------------------------------------------------------------
-r1450002 | spamassassin_role | 2013-02-26 03:02:17 +0000 (Tue, 26 Feb 
-2013) | 1 line
- 
- updated scores for revision 1449620 active rules added since last 
-mass-check
-------------------------------------------------------------------------
-r1449825 | kmcgrail | 2013-02-25 19:36:42 +0000 (Mon, 25 Feb 2013) | 1 
-line
- 
- small change to the README name
-------------------------------------------------------------------------
-r1449583 | jhardin | 2013-02-25 03:47:47 +0000 (Mon, 25 Feb 2013) | 1 line
- 
- More FP avoidance
-------------------------------------------------------------------------
-r1449580 | spamassassin_role | 2013-02-25 03:11:36 +0000 (Mon, 25 Feb 
-2013) | 1 line
- 
- updated scores for revision 1449446 active rules added since last 
-mass-check
-------------------------------------------------------------------------
-r1449530 | kmcgrail | 2013-02-24 19:21:44 +0000 (Sun, 24 Feb 2013) | 1 
-line
- 
- added ceiling for score on SHORTENED_URL_HREF
-------------------------------------------------------------------------
-r1449434 | spamassassin_role | 2013-02-24 03:10:37 +0000 (Sun, 24 Feb 
-2013) | 1 line
- 
- updated scores for revision 1449282 active rules added since last 
-mass-check
-------------------------------------------------------------------------
-r1449427 | jhardin | 2013-02-23 23:57:02 +0000 (Sat, 23 Feb 2013) | 1 line
- 
- More FP avoidance
-------------------------------------------------------------------------
-r1449266 | spamassassin_role | 2013-02-23 03:27:09 +0000 (Sat, 23 Feb 
-2013) | 1 line
- 
- updated scores for revision 1448941 active rules added since last 
-mass-check
-------------------------------------------------------------------------
-r1449099 | jhardin | 2013-02-22 16:23:59 +0000 (Fri, 22 Feb 2013) | 1 line
- 
- Tweak lottery rules
-------------------------------------------------------------------------
-r1449098 | jhardin | 2013-02-22 16:23:01 +0000 (Fri, 22 Feb 2013) | 1 line
- 
- Fix missing ifplugin
-------------------------------------------------------------------------
-r1448885 | spamassassin_role | 2013-02-22 03:13:22 +0000 (Fri, 22 Feb 
-2013) | 1 line
- 
- updated scores for revision 1448547 active rules added since last 
-mass-check
-------------------------------------------------------------------------
-r1448607 | mmartinec | 2013-02-21 11:47:22 +0000 (Thu, 21 Feb 2013) | 1 
-line
- 
- Bug 6910: changed a default to edns=4096 (What DNS buffer size (EDNS) - 
-or to implement a DNS over TCP fallback); adjust Plugin::DKIM accordingly
-------------------------------------------------------------------------
-r1448575 | mmartinec | 2013-02-21 11:02:25 +0000 (Thu, 21 Feb 2013) | 1 
-line
- 
- avoid a warning: Use of uninitialized value in concatenation at 
-RelayCountry.pm line 78
-------------------------------------------------------------------------
-r1448566 | axb | 2013-02-21 10:09:10 +0000 (Thu, 21 Feb 2013) | 1 line
- 
- cleanup  zim.gov.zwpenmail.cc / removed dead domains
-------------------------------------------------------------------------
-r1448500 | spamassassin_role | 2013-02-21 03:18:07 +0000 (Thu, 21 Feb 
-2013) | 1 line
- 
- updated scores for revision 1448039 active rules added since last 
-mass-check
-------------------------------------------------------------------------
-r1448183 | axb | 2013-02-20 14:34:49 +0000 (Wed, 20 Feb 2013) | 1 line
- 
- fixes as per Bug 6903
-------------------------------------------------------------------------
-r1447990 | spamassassin_role | 2013-02-20 03:15:23 +0000 (Wed, 20 Feb 
-2013) | 1 line
- 
- updated scores for revision 1447627 active rules added since last 
-mass-check
-------------------------------------------------------------------------
-r1447944 | axb | 2013-02-19 22:30:33 +0000 (Tue, 19 Feb 2013) | 1 line
- 
- added  home.pl
-------------------------------------------------------------------------
-r1447937 | jhardin | 2013-02-19 21:50:04 +0000 (Tue, 19 Feb 2013) | 1 line
- 
- Tweak email phishing rules
-------------------------------------------------------------------------
-r1447855 | mmartinec | 2013-02-19 18:01:11 +0000 (Tue, 19 Feb 2013) | 1 
-line
- 
- propagate __alarm__ignore__ signal from eval_checks too, quenches two 
-more warnings
-------------------------------------------------------------------------
-r1447741 | axb | 2013-02-19 14:51:10 +0000 (Tue, 19 Feb 2013) | 1 line
- 
- Several  updates as per Bug # 6903, etc.
-------------------------------------------------------------------------
-r1447580 | spamassassin_role | 2013-02-19 03:32:25 +0000 (Tue, 19 Feb 
-2013) | 1 line
- 
- updated scores for revision 1447148 active rules added since last 
-mass-check
-------------------------------------------------------------------------
-r1447572 | mmartinec | 2013-02-19 02:09:47 +0000 (Tue, 19 Feb 2013) | 1 
-line
- 
- resignal __alarm__ignore__ if caught in an unrelated eval; wrap 
-DnsResolver select() in eval to avoid "(in cleanup) __alarm__ignore__" 
-warnings; avoid "Use of uninitialized value" in AsyncLoop
-------------------------------------------------------------------------
-r1447530 | jhardin | 2013-02-18 22:56:44 +0000 (Mon, 18 Feb 2013) | 1 line
- 
- Tweak CN_B2B_SPAMMER
-------------------------------------------------------------------------
-r1447126 | spamassassin_role | 2013-02-18 03:06:55 +0000 (Mon, 18 Feb 
-2013) | 1 line
- 
- updated scores for revision 1447002 active rules added since last 
-mass-check
-------------------------------------------------------------------------
-r1447117 | mmartinec | 2013-02-18 01:24:49 +0000 (Mon, 18 Feb 2013) | 1 
-line
- 
- got_hit() should clear the %{$self->{test_log_msgs}} even on early 
-returns (like on multiple hits of a rule)
-------------------------------------------------------------------------
-r1447063 | jhardin | 2013-02-17 19:51:47 +0000 (Sun, 17 Feb 2013) | 1 line
+ typo in man page
  
- URI_DBL_SUBDOM not performing well, disable
 ------------------------------------------------------------------------
-r1446994 | spamassassin_role | 2013-02-17 03:22:42 +0000 (Sun, 17 Feb 
-2013) | 1 line
- 
- updated scores for revision 1446852 active rules added since last 
-mass-check
-------------------------------------------------------------------------
-r1446924 | jhardin | 2013-02-16 19:10:00 +0000 (Sat, 16 Feb 2013) | 1 line
- 
- More FP avoidance
-------------------------------------------------------------------------
-r1446839 | spamassassin_role | 2013-02-16 03:11:03 +0000 (Sat, 16 Feb 
-2013) | 1 line
- 
- updated scores for revision 1446474 active rules added since last 
-mass-check
-------------------------------------------------------------------------
-r1446438 | spamassassin_role | 2013-02-15 03:16:09 +0000 (Fri, 15 Feb 
-2013) | 1 line
- 
- updated scores for revision 1446069 active rules added since last 
-mass-check
-------------------------------------------------------------------------
-r1446278 | mmartinec | 2013-02-14 17:28:05 +0000 (Thu, 14 Feb 2013) | 9 
+r1839639 | gbechis | 2018-08-30 07:30:54 +0000 (Thu, 30 Aug 2018) | 2 
 lines
  
- - change description of a dns_options EDNS option, add alias EDNS0
- - ignore trailing dot in a domain name which sometimes still creep in
- - change word 'response' -> 'reply' in DNS debugging messages (RFC 1035)
- - test for truncated DNS reply, issue an info-level warning
- - debugging: trying to track down a bug in Net::DNS which can
-   return a DNS packet with an empty question section
- 
- Submitted by: Mark
- 
-------------------------------------------------------------------------
-r1446038 | spamassassin_role | 2013-02-14 03:16:06 +0000 (Thu, 14 Feb 
-2013) | 1 line
- 
- updated scores for revision 1445505 active rules added since last 
-mass-check
-------------------------------------------------------------------------
-r1446031 | jhardin | 2013-02-14 01:49:57 +0000 (Thu, 14 Feb 2013) | 1 line
- 
- More FP avoidance
-------------------------------------------------------------------------
-r1446030 | jhardin | 2013-02-14 01:49:27 +0000 (Thu, 14 Feb 2013) | 1 line
- 
- Disable DECEASED_NO_ML, not worthy
-------------------------------------------------------------------------
-r1445466 | spamassassin_role | 2013-02-13 03:17:32 +0000 (Wed, 13 Feb 
-2013) | 1 line
- 
- updated scores for revision 1445060 active rules added since last 
-mass-check
-------------------------------------------------------------------------
-r1445419 | jhardin | 2013-02-12 22:35:53 +0000 (Tue, 12 Feb 2013) | 1 line
- 
- TBIRD_SPOOF too dangerous
-------------------------------------------------------------------------
-r1445270 | jhardin | 2013-02-12 17:10:58 +0000 (Tue, 12 Feb 2013) | 1 line
- 
- Reduce TBIRD_SPOOF score limit
-------------------------------------------------------------------------
-r1445186 | mmartinec | 2013-02-12 14:41:08 +0000 (Tue, 12 Feb 2013) | 1 
-line
- 
- Plugin/DCC.pm typo in a comment
-------------------------------------------------------------------------
-r1445185 | mmartinec | 2013-02-12 14:39:14 +0000 (Tue, 12 Feb 2013) | 1 
-line
- 
- t/rcvd_parser.t cosmetic detail (added a comma -> smaller diff when 
-adding new cases)
-------------------------------------------------------------------------
-r1445025 | spamassassin_role | 2013-02-12 03:16:18 +0000 (Tue, 12 Feb 
-2013) | 1 line
- 
- updated scores for revision 1444680 active rules added since last 
-mass-check
-------------------------------------------------------------------------
-r1445019 | jhardin | 2013-02-12 02:27:08 +0000 (Tue, 12 Feb 2013) | 1 line
- 
- More FP avoidance
-------------------------------------------------------------------------
-r1444945 | jhardin | 2013-02-11 20:23:01 +0000 (Mon, 11 Feb 2013) | 1 line
- 
- tweak __UNSUBSCRIBE_ES
-------------------------------------------------------------------------
-r1444909 | jhardin | 2013-02-11 18:10:45 +0000 (Mon, 11 Feb 2013) | 1 line
- 
- More FP avoidance, more portuguese email phishing variants
-------------------------------------------------------------------------
-r1444651 | spamassassin_role | 2013-02-11 03:13:54 +0000 (Mon, 11 Feb 
-2013) | 1 line
- 
- updated scores for revision 1444510 active rules added since last 
-mass-check
-------------------------------------------------------------------------
-r1444476 | spamassassin_role | 2013-02-10 03:15:11 +0000 (Sun, 10 Feb 
-2013) | 1 line
- 
- updated scores for revision 1444342 active rules added since last 
-mass-check
-------------------------------------------------------------------------
-r1444329 | jhardin | 2013-02-09 05:19:32 +0000 (Sat, 09 Feb 2013) | 1 line
- 
- Tune phishing rules; ensure __RP_MATCHES_RCVD always exists
-------------------------------------------------------------------------
-r1444319 | spamassassin_role | 2013-02-09 03:08:13 +0000 (Sat, 09 Feb 
-2013) | 1 line
- 
- updated scores for revision 1443890 active rules added since last 
-mass-check
-------------------------------------------------------------------------
-r1444287 | jhardin | 2013-02-08 23:34:12 +0000 (Fri, 08 Feb 2013) | 1 line
- 
- FP reduction on LOTSA_MONEY when the money isn't really that much
-------------------------------------------------------------------------
-r1444177 | jhardin | 2013-02-08 18:20:15 +0000 (Fri, 08 Feb 2013) | 1 line
- 
- Add __UNSUBSCRIBE_PT
-------------------------------------------------------------------------
-r1444143 | kmcgrail | 2013-02-08 16:57:13 +0000 (Fri, 08 Feb 2013) | 1 
-line
- 
- disabling extra debugs  from bug 6905
-------------------------------------------------------------------------
-r1444091 | kmcgrail | 2013-02-08 16:17:14 +0000 (Fri, 08 Feb 2013) | 1 
-line
- 
- More debugs for dependency checks
-------------------------------------------------------------------------
-r1444069 | kmcgrail | 2013-02-08 15:27:08 +0000 (Fri, 08 Feb 2013) | 1 
-line
- 
- Reverting change to regexp that should not have been committed
-------------------------------------------------------------------------
-r1444065 | kmcgrail | 2013-02-08 15:24:52 +0000 (Fri, 08 Feb 2013) | 1 
-line
- 
- DEBUG added to Makefile for input due to hang report
-------------------------------------------------------------------------
-r1443831 | spamassassin_role | 2013-02-08 03:07:51 +0000 (Fri, 08 Feb 
-2013) | 1 line
- 
- updated scores for revision 1443355 active rules added since last 
-mass-check
-------------------------------------------------------------------------
-r1443824 | jhardin | 2013-02-08 02:16:31 +0000 (Fri, 08 Feb 2013) | 1 line
- 
- More FP avoidance
-------------------------------------------------------------------------
-r1443822 | jhardin | 2013-02-08 01:57:04 +0000 (Fri, 08 Feb 2013) | 1 line
- 
- Add TBIRD_SPOOF
-------------------------------------------------------------------------
-r1443820 | jhardin | 2013-02-08 01:45:26 +0000 (Fri, 08 Feb 2013) | 1 line
- 
- Added TBIRD_SUSP_MSGID based on imcomplete overlap analysis - revert
-------------------------------------------------------------------------
-r1443818 | jhardin | 2013-02-08 01:42:08 +0000 (Fri, 08 Feb 2013) | 1 line
- 
- More FP avoidance; tweak YOUR_PHOTOS; add TBIRD_SUSP_MSGID
-------------------------------------------------------------------------
-r1443305 | jhardin | 2013-02-07 03:15:01 +0000 (Thu, 07 Feb 2013) | 1 line
- 
- More FP reduction, fix some spanish-language UTF8 errors
-------------------------------------------------------------------------
-r1443302 | spamassassin_role | 2013-02-07 03:12:51 +0000 (Thu, 07 Feb 
-2013) | 1 line
- 
- updated scores for revision 1442869 active rules added since last 
-mass-check
-------------------------------------------------------------------------
-r1443294 | mmartinec | 2013-02-07 02:05:47 +0000 (Thu, 07 Feb 2013) | 1 
-line
- 
- Plugin/DKIM.pm: adapt to a last-minute change in Mail::DKIM before its 
-0.40 release, [rt.cpan.org #83170], [rt.cpan.org #80425]
-------------------------------------------------------------------------
-r1443004 | mmartinec | 2013-02-06 15:12:51 +0000 (Wed, 06 Feb 2013) | 1 
-line
- 
- Now that Mail::DKIM 0.40 is coming out, adapt the DKIM plugin to use the 
-official way of supplying a DNS resolver object to Mail::DKIM
-------------------------------------------------------------------------
-r1442836 | spamassassin_role | 2013-02-06 03:06:50 +0000 (Wed, 06 Feb 
-2013) | 1 line
- 
- updated scores for revision 1442501 active rules added since last 
-mass-check
-------------------------------------------------------------------------
-r1442802 | jhardin | 2013-02-05 23:53:04 +0000 (Tue, 05 Feb 2013) | 1 line
- 
- Bug 6094:FUZZY_AMBIEN FP on "tambien" (es)
-------------------------------------------------------------------------
-r1442651 | jhardin | 2013-02-05 16:28:51 +0000 (Tue, 05 Feb 2013) | 1 line
- 
- More FP reduction, some new test rules for URIs and low-contrast HTML
-------------------------------------------------------------------------
-r1442459 | spamassassin_role | 2013-02-05 03:11:32 +0000 (Tue, 05 Feb 
-2013) | 1 line
- 
- updated scores for revision 1442048 active rules added since last 
-mass-check
-------------------------------------------------------------------------
-r1442180 | mmartinec | 2013-02-04 17:03:04 +0000 (Mon, 04 Feb 2013) | 1 
-line
- 
- reduce default EDNS0 packet size from 1280 to 1240 
-(draft-andrews-dnsext-udp-fragmentation)
-------------------------------------------------------------------------
-r1442145 | mmartinec | 2013-02-04 14:58:06 +0000 (Mon, 04 Feb 2013) | 1 
-line
- 
- dns0x20 and domain name case sensitivity tweaks, added an explanation
-------------------------------------------------------------------------
-r1442014 | spamassassin_role | 2013-02-04 02:59:47 +0000 (Mon, 04 Feb 
-2013) | 1 line
- 
- updated scores for revision 1441874 active rules added since last 
-mass-check
-------------------------------------------------------------------------
-r1441851 | spamassassin_role | 2013-02-03 03:10:50 +0000 (Sun, 03 Feb 
-2013) | 1 line
- 
- updated scores for revision 1441715 active rules added since last 
-mass-check
-------------------------------------------------------------------------
-r1441795 | jhardin | 2013-02-02 19:43:10 +0000 (Sat, 02 Feb 2013) | 1 line
- 
- More FP avoidance
-------------------------------------------------------------------------
-r1441694 | spamassassin_role | 2013-02-02 03:13:25 +0000 (Sat, 02 Feb 
-2013) | 1 line
- 
- updated scores for revision 1441344 active rules added since last 
-mass-check
-------------------------------------------------------------------------
-r1441551 | mmartinec | 2013-02-01 17:40:33 +0000 (Fri, 01 Feb 2013) | 1 
-line
- 
- partly revert previous debugging change, too much noise at the info level
-------------------------------------------------------------------------
-r1441536 | mmartinec | 2013-02-01 17:10:13 +0000 (Fri, 01 Feb 2013) | 1 
-line
- 
- Bug 6547: let Client.pm use the same logic as DnsResolver.pm in deciding 
-which of the IO modules to use (IO::Socket::IP preferred to older 
-IO::Socket::INET6, which in turn is preferred to IPv4-only 
-IO::Socket::INET)
-------------------------------------------------------------------------
-r1441511 | mmartinec | 2013-02-01 16:27:50 +0000 (Fri, 01 Feb 2013) | 1 
-line
- 
- documentation detail, debugging detail
-------------------------------------------------------------------------
-r1441489 | jhardin | 2013-02-01 15:32:13 +0000 (Fri, 01 Feb 2013) | 1 line
- 
- More FP avoidance
-------------------------------------------------------------------------
-r1441301 | spamassassin_role | 2013-02-01 03:15:14 +0000 (Fri, 01 Feb 
-2013) | 1 line
- 
- updated scores for revision 1440879 active rules added since last 
-mass-check
-------------------------------------------------------------------------
-r1440828 | spamassassin_role | 2013-01-31 03:05:37 +0000 (Thu, 31 Jan 
-2013) | 1 line
- 
- updated scores for revision 1440304 active rules added since last 
-mass-check
-------------------------------------------------------------------------
-r1440823 | jhardin | 2013-01-31 02:53:14 +0000 (Thu, 31 Jan 2013) | 1 line
- 
- More FP avoidance
-------------------------------------------------------------------------
-r1440261 | spamassassin_role | 2013-01-30 02:54:53 +0000 (Wed, 30 Jan 
-2013) | 1 line
+ Phishing plugin
  
- updated scores for revision 1439791 active rules added since last 
-mass-check
 ------------------------------------------------------------------------
-r1440178 | jhardin | 2013-01-29 22:03:49 +0000 (Tue, 29 Jan 2013) | 1 line
- 
- Tweak email phishing rules
-------------------------------------------------------------------------
-r1439916 | mmartinec | 2013-01-29 14:48:16 +0000 (Tue, 29 Jan 2013) | 1 
-line
- 
- added a DNS check for multiple question sections, just in case
-------------------------------------------------------------------------
-r1439884 | mmartinec | 2013-01-29 13:15:42 +0000 (Tue, 29 Jan 2013) | 1 
-line
- 
- Bug 6896: encode also nonprintables, just in case (Net::DNS 
-feature-proofing)
-------------------------------------------------------------------------
-r1439747 | jhardin | 2013-01-29 05:33:00 +0000 (Tue, 29 Jan 2013) | 1 line
- 
- More FP avoidance, Add scored versions of some promising subrules
-------------------------------------------------------------------------
-r1439735 | spamassassin_role | 2013-01-29 03:06:49 +0000 (Tue, 29 Jan 
-2013) | 1 line
- 
- updated scores for revision 1439302 active rules added since last 
-mass-check
-------------------------------------------------------------------------
-r1439553 | jhardin | 2013-01-28 18:23:54 +0000 (Mon, 28 Jan 2013) | 1 line
- 
- More FP avoidance
-------------------------------------------------------------------------
-r1439552 | mmartinec | 2013-01-28 18:20:18 +0000 (Mon, 28 Jan 2013) | 1 
-line
- 
- Bug 6896: DnsResolver.pm: encode characters above 0200 to prevent 
-Net::DNS 0.68 from interpreting these as an IDN domain name
-------------------------------------------------------------------------
-r1439496 | jhardin | 2013-01-28 16:57:58 +0000 (Mon, 28 Jan 2013) | 1 line
- 
- More FP avoidance
-------------------------------------------------------------------------
-r1439235 | spamassassin_role | 2013-01-28 03:11:46 +0000 (Mon, 28 Jan 
-2013) | 1 line
- 
- updated scores for revision 1439040 active rules added since last 
-mass-check
-------------------------------------------------------------------------
-r1439015 | spamassassin_role | 2013-01-27 03:11:44 +0000 (Sun, 27 Jan 
-2013) | 1 line
- 
- updated scores for revision 1438865 active rules added since last 
-mass-check
-------------------------------------------------------------------------
-r1438927 | jhardin | 2013-01-26 18:02:23 +0000 (Sat, 26 Jan 2013) | 1 line
- 
- tweak email phishing rules - more polish variants; add "your photos" 
-rule; tweak "I'm not spam!" rule
-------------------------------------------------------------------------
-r1438917 | jhardin | 2013-01-26 17:13:13 +0000 (Sat, 26 Jan 2013) | 1 line
- 
- Tweak lotsa_money
-------------------------------------------------------------------------
-r1438828 | spamassassin_role | 2013-01-26 03:11:39 +0000 (Sat, 26 Jan 
-2013) | 1 line
- 
- updated scores for revision 1438389 active rules added since last 
-mass-check
-------------------------------------------------------------------------
-r1438806 | mmartinec | 2013-01-26 01:13:09 +0000 (Sat, 26 Jan 2013) | 1 
-line
- 
- Bug 6899: more informative diagnostics in case of a DNS response with no 
-query section
-------------------------------------------------------------------------
-r1438670 | mmartinec | 2013-01-25 19:53:04 +0000 (Fri, 25 Jan 2013) | 1 
-line
- 
- Bug 6896: encode/decode a DNS query according to RFC 1035 zone file 
-format as expected by Net::DNS API (what a terrible idea!), turn warning 
-into info() for unmatching DNS responses
-------------------------------------------------------------------------
-r1438581 | mmartinec | 2013-01-25 16:39:27 +0000 (Fri, 25 Jan 2013) | 1 
-line
- 
- spelling (indefinite article usage)
-------------------------------------------------------------------------
-r1438307 | spamassassin_role | 2013-01-25 03:15:45 +0000 (Fri, 25 Jan 
-2013) | 1 line
- 
- updated scores for revision 1437901 active rules added since last 
-mass-check
-------------------------------------------------------------------------
-r1437849 | spamassassin_role | 2013-01-24 03:11:52 +0000 (Thu, 24 Jan 
-2013) | 1 line
- 
- updated scores for revision 1437299 active rules added since last 
-mass-check
-------------------------------------------------------------------------
-r1437629 | mmartinec | 2013-01-23 19:05:24 +0000 (Wed, 23 Jan 2013) | 1 
-line
- 
- more informative warnings on dns socket troubles
-------------------------------------------------------------------------
-r1437596 | mmartinec | 2013-01-23 17:40:55 +0000 (Wed, 23 Jan 2013) | 1 
-line
- 
- (adding a comment)
-------------------------------------------------------------------------
-r1437595 | mmartinec | 2013-01-23 17:38:23 +0000 (Wed, 23 Jan 2013) | 1 
-line
- 
- Bug 6895" Avoid "Use of uninitialized value" warnings in DKIM plugin on 
-broken signatures - one more
-------------------------------------------------------------------------
-r1437593 | mmartinec | 2013-01-23 17:34:35 +0000 (Wed, 23 Jan 2013) | 1 
-line
- 
- Bug 6895" Avoid "Use of uninitialized value" warnings in DKIM plugin on 
-broken signatures
-------------------------------------------------------------------------
-r1437260 | spamassassin_role | 2013-01-23 03:07:14 +0000 (Wed, 23 Jan 
-2013) | 1 line
- 
- updated scores for revision 1436801 active rules added since last 
-mass-check
-------------------------------------------------------------------------
-r1436735 | spamassassin_role | 2013-01-22 03:17:17 +0000 (Tue, 22 Jan 
-2013) | 1 line
- 
- updated scores for revision 1436227 active rules added since last 
-mass-check
-------------------------------------------------------------------------
-r1436729 | kmcgrail | 2013-01-22 02:55:50 +0000 (Tue, 22 Jan 2013) | 1 
-line
- 
- Added some functions to debug hashes and arrays for test debugging, 
-rewrote rule_tests.t to work now that test_types is not cleared (bug 
-6893), fixed a few regression tests that were not up to date, commented 
-one regression test that is not working (bug 6894).
-------------------------------------------------------------------------
-r1436374 | kmcgrail | 2013-01-21 14:36:59 +0000 (Mon, 21 Jan 2013) | 1 
-line
- 
- small tweak to remove stderr redir and debug
-------------------------------------------------------------------------
-r1436371 | kmcgrail | 2013-01-21 14:33:20 +0000 (Mon, 21 Jan 2013) | 1 
-line
- 
- Added a test for autolearn
-------------------------------------------------------------------------
-r1436363 | kmcgrail | 2013-01-21 14:20:20 +0000 (Mon, 21 Jan 2013) | 1 
-line
- 
- Made autolearn_force tests require DB_File so they pass on Jenkins and 
-fixed Manifest.  Bug 5503.
-------------------------------------------------------------------------
-r1436202 | kmcgrail | 2013-01-21 04:48:44 +0000 (Mon, 21 Jan 2013) | 1 
-line
- 
- cleaned up more with the autolearn_force code and worked on major 
-autolearn bug - bug 5503
-------------------------------------------------------------------------
-r1436171 | kmcgrail | 2013-01-21 03:41:58 +0000 (Mon, 21 Jan 2013) | 1 
-line
- 
- feature request for tflag autolearn_force to make the requirements less 
-stringent - bug 5503
-------------------------------------------------------------------------
-r1436154 | spamassassin_role | 2013-01-21 03:22:06 +0000 (Mon, 21 Jan 
-2013) | 1 line
- 
- updated scores for revision 1435801 active rules added since last 
-mass-check
-------------------------------------------------------------------------
-r1435923 | jhardin | 2013-01-20 19:28:57 +0000 (Sun, 20 Jan 2013) | 1 line
- 
- Add some "ifplugin DKIM" directives that were overlooked
-------------------------------------------------------------------------
-r1435781 | spamassassin_role | 2013-01-20 03:22:49 +0000 (Sun, 20 Jan 
-2013) | 1 line
- 
- updated scores for revision 1435506 active rules added since last 
-mass-check
-------------------------------------------------------------------------
-r1435646 | jhardin | 2013-01-19 19:38:08 +0000 (Sat, 19 Jan 2013) | 1 line
- 
- Tweak lotsa_money
-------------------------------------------------------------------------
-r1435483 | spamassassin_role | 2013-01-19 03:18:51 +0000 (Sat, 19 Jan 
-2013) | 1 line
- 
- updated scores for revision 1435054 active rules added since last 
-mass-check
-------------------------------------------------------------------------
-r1435404 | kmcgrail | 2013-01-18 22:59:05 +0000 (Fri, 18 Jan 2013) | 1 
-line
- 
- Preparing for release 3.4.0-pre3
-------------------------------------------------------------------------
-r1435395 | kmcgrail | 2013-01-18 22:47:35 +0000 (Fri, 18 Jan 2013) | 1 
-line
- 
- preparing to release 3.4.0-pre3
-------------------------------------------------------------------------
-r1435385 | kmcgrail | 2013-01-18 22:41:14 +0000 (Fri, 18 Jan 2013) | 1 
-line
- 
- bug 6891 - removed prototype on sub domain_to_search_list
-------------------------------------------------------------------------
-r1435012 | spamassassin_role | 2013-01-18 03:11:34 +0000 (Fri, 18 Jan 
-2013) | 1 line
- 
- updated scores for revision 1434591 active rules added since last 
-mass-check
-------------------------------------------------------------------------
-r1434556 | jhardin | 2013-01-17 04:51:34 +0000 (Thu, 17 Jan 2013) | 1 line
- 
- More FP avoidance
-------------------------------------------------------------------------
-r1434544 | spamassassin_role | 2013-01-17 03:18:52 +0000 (Thu, 17 Jan 
-2013) | 1 line
- 
- updated scores for revision 1433857 active rules added since last 
-mass-check
-------------------------------------------------------------------------
-r1434534 | kmcgrail | 2013-01-17 01:51:13 +0000 (Thu, 17 Jan 2013) | 1 
-line
- 
- Changes for t/whitelist_addrs.t to check for DB_File - bug 6884
-------------------------------------------------------------------------
-r1434367 | mmartinec | 2013-01-16 20:25:51 +0000 (Wed, 16 Jan 2013) | 1 
-line
- 
- Bug 6884, forgot to checkin t/uribl.t
-------------------------------------------------------------------------
-r1434360 | mmartinec | 2013-01-16 20:13:47 +0000 (Wed, 16 Jan 2013) | 15 
+r1839638 | gbechis | 2018-08-30 07:27:29 +0000 (Thu, 30 Aug 2018) | 6 
 lines
  
- Bug 6884:
- - a new subroutine AsyncLoop::bgsend_and_start_lookup() implements a
-   commonly used idiom of calling bgsend(), followed by start_lookup(),
-   while implementing a mechanism for grouping equal DNS queries,
-   simplifying several other code sections;
- - rewrite URIDNSBL.pm to put the new mechanism to good use,
-   fixing the particular Bug 6884 and test 5 in t/uribl.t;
- - fix the t/uribl.t, moving X_URIBL_FULL_NS from %patterns
-   to %anti_patterns;
- - add a dns_query_restriction configuration option;
- - some cosmetic edits, like renaming some variables for consistency.
- 
- PR:		6884
- Submitted by:	Mark.Martinec@ijs.si
- 
-------------------------------------------------------------------------
-r1434118 | jhardin | 2013-01-16 19:18:07 +0000 (Wed, 16 Jan 2013) | 1 line
- 
- tweak email phishing rules - add more brazilian variants
-------------------------------------------------------------------------
-r1433811 | spamassassin_role | 2013-01-16 03:12:28 +0000 (Wed, 16 Jan 
-2013) | 1 line
- 
- updated scores for revision 1433312 active rules added since last 
-mass-check
-------------------------------------------------------------------------
-r1433273 | spamassassin_role | 2013-01-15 03:14:11 +0000 (Tue, 15 Jan 
-2013) | 1 line
- 
- updated scores for revision 1432840 active rules added since last 
-mass-check
-------------------------------------------------------------------------
-r1432793 | spamassassin_role | 2013-01-14 03:13:37 +0000 (Mon, 14 Jan 
-2013) | 1 line
- 
- updated scores for revision 1432568 active rules added since last 
-mass-check
-------------------------------------------------------------------------
-r1432750 | jhardin | 2013-01-13 22:03:44 +0000 (Sun, 13 Jan 2013) | 1 line
- 
- Tune LOTSA_MONEY and email phishing, more FP avoidance
-------------------------------------------------------------------------
-r1432712 | jhardin | 2013-01-13 19:25:27 +0000 (Sun, 13 Jan 2013) | 1 line
- 
- Build destabilized by 'SPOOFED_URL_HOST depends on T_URL_SHORTENER which 
-is nonexistent' - split khopesh URL_SHORTENER into __subrule and scored 
-rule and fix dependencies to stabilize the build. KAM, darxus and Adam 
-please review these rules. Also, URL_SHORTENER is explicitly marked 
-'nopublish' so this problem should have manifested much earlier - 
-'nopublish' rules appear to still be leaking out.
-------------------------------------------------------------------------
-r1432546 | jhardin | 2013-01-13 04:14:01 +0000 (Sun, 13 Jan 2013) | 1 line
- 
- Split REMOTE_IMAGE into __REMOTE_IMAGE for use in metas
-------------------------------------------------------------------------
-r1432544 | spamassassin_role | 2013-01-13 03:17:12 +0000 (Sun, 13 Jan 
-2013) | 1 line
- 
- updated scores for revision 1432400 active rules added since last 
-mass-check
-------------------------------------------------------------------------
-r1432496 | kmcgrail | 2013-01-12 20:01:49 +0000 (Sat, 12 Jan 2013) | 1 
-line
- 
- preparing to release 3.4.0-pre2
-------------------------------------------------------------------------
-r1432359 | mmartinec | 2013-01-12 02:28:13 +0000 (Sat, 12 Jan 2013) | 1 
-line
- 
- DnsResolver: prevent a failed or suppressed DNS query packet generation 
-from propagating unnecessarily
-------------------------------------------------------------------------
-r1432293 | kmcgrail | 2013-01-11 21:33:16 +0000 (Fri, 11 Jan 2013) | 1 
-line
- 
- small clarification on docs for error codes
-------------------------------------------------------------------------
-r1432200 | mmartinec | 2013-01-11 18:15:08 +0000 (Fri, 11 Jan 2013) | 1 
-line
- 
- Bug 6884: $pms->{test_log_msgs} is a hashref, not a hash;  some 
-cosmetics and debugging in Plugin/URIDNSBL.pm
-------------------------------------------------------------------------
-r1432196 | kmcgrail | 2013-01-11 17:56:42 +0000 (Fri, 11 Jan 2013) | 1 
-line
- 
- small update for dkim test rename
-------------------------------------------------------------------------
-r1432192 | kmcgrail | 2013-01-11 17:48:17 +0000 (Fri, 11 Jan 2013) | 1 
-line
- 
- Prep for 3.4.0-pre2
-------------------------------------------------------------------------
-r1432188 | kmcgrail | 2013-01-11 17:45:53 +0000 (Fri, 11 Jan 2013) | 1 
-line
- 
- Switch to handling of Version in redis.pm - bug 6888
-------------------------------------------------------------------------
-r1432183 | kmcgrail | 2013-01-11 17:39:11 +0000 (Fri, 11 Jan 2013) | 1 
-line
+ Add  Mail::SpamAssassin::Plugin::Phishing
+ This phishing plugin finds uris used in phishing campaigns detected by
+ OpenPhish or PhishTank feeds.
  
- replacing dkim test with dkim2
-------------------------------------------------------------------------
-r1432180 | kmcgrail | 2013-01-11 17:36:05 +0000 (Fri, 11 Jan 2013) | 1 
-line
+ bz 7564
  
- removing dkim.t because test is replaced by dkim2.t
 ------------------------------------------------------------------------
-r1432178 | kmcgrail | 2013-01-11 17:35:02 +0000 (Fri, 11 Jan 2013) | 1 
+r1839529 | kmcgrail | 2018-08-29 01:29:54 +0000 (Wed, 29 Aug 2018) | 1 
 line
  
- Small cleanup that EX_TOOBIG is never used for spamd per bug 5412
+ Fixing small perlcritic issue
 ------------------------------------------------------------------------
-r1431121 | kmcgrail | 2013-01-09 22:34:58 +0000 (Wed, 09 Jan 2013) | 1 
+r1839517 | kmcgrail | 2018-08-29 00:27:22 +0000 (Wed, 29 Aug 2018) | 1 
 line
  
- small changes to resolve xt/60_perlcritic
+ small spelling error
 ------------------------------------------------------------------------
-r1431038 | kmcgrail | 2013-01-09 20:03:16 +0000 (Wed, 09 Jan 2013) | 1 
+r1839515 | billcole | 2018-08-28 23:55:29 +0000 (Tue, 28 Aug 2018) | 1 
 line
  
- Tweaks for xt tests in prep for 3.4.0 including adding more override 
-variables for tests to not be skipped and removing some hardcoded 
-usernames
+ Detect UTF-16 flavor
 ------------------------------------------------------------------------
-r1431037 | kmcgrail | 2013-01-09 20:02:27 +0000 (Wed, 09 Jan 2013) | 1 
+r1839514 | billcole | 2018-08-28 23:44:51 +0000 (Tue, 28 Aug 2018) | 1 
 line
  
- Added the ability to override more than one variable
+ switch default for parse_dkim_uris
 ------------------------------------------------------------------------
-r1430432 | kmcgrail | 2013-01-08 18:27:02 +0000 (Tue, 08 Jan 2013) | 1 
+r1839511 | billcole | 2018-08-28 23:12:05 +0000 (Tue, 28 Aug 2018) | 1 
 line
  
- Cleaning up xt dir so that 20_saw_ampersand works
+ Fixing t/util_wrap.t for new tab=>8 spaces accounting
 ------------------------------------------------------------------------
-r1430431 | kmcgrail | 2013-01-08 18:26:27 +0000 (Tue, 08 Jan 2013) | 1 
+r1839487 | billcole | 2018-08-28 17:16:00 +0000 (Tue, 28 Aug 2018) | 1 
 line
  
- Cleaning up release docs
+ Making allowance for tabs in M::SA::Util=>wrap(), tweaking default wrap 
+width
 ------------------------------------------------------------------------
-r1430121 | jhardin | 2013-01-08 02:46:58 +0000 (Tue, 08 Jan 2013) | 1 line
+r1839410 | gbechis | 2018-08-28 07:45:52 +0000 (Tue, 28 Aug 2018) | 4 
+lines
  
- tweak email phishing rules
-------------------------------------------------------------------------
-r1430120 | jhardin | 2013-01-08 02:46:42 +0000 (Tue, 08 Jan 2013) | 1 line
+ Fix indented rules to be rescored
+ Give a chance to RCVD_IN_MSPIKE rules.
+ bz #6400
  
- GA is now scoring EMAIL_URI_PHISH
 ------------------------------------------------------------------------
-r1429988 | kmcgrail | 2013-01-07 20:12:44 +0000 (Mon, 07 Jan 2013) | 1 
-line
+r1839409 | gbechis | 2018-08-28 07:35:13 +0000 (Tue, 28 Aug 2018) | 2 
+lines
  
- Disabled parsing of DKIM Header to extract URIs - Bug 6700
-------------------------------------------------------------------------
-r1429673 | jhardin | 2013-01-07 05:24:07 +0000 (Mon, 07 Jan 2013) | 1 line
+ Mention 'report_wrap_width' new option
  
- Fix typo
 ------------------------------------------------------------------------
-r1429672 | jhardin | 2013-01-07 05:20:49 +0000 (Mon, 07 Jan 2013) | 1 line
- 
- More FP avoidance, add PHP-MUA-without-version scored rule
-------------------------------------------------------------------------
-r1429631 | mmartinec | 2013-01-07 00:45:43 +0000 (Mon, 07 Jan 2013) | 1 
+r1839390 | kmcgrail | 2018-08-28 02:48:28 +0000 (Tue, 28 Aug 2018) | 1 
 line
  
- just warn (not die) if a temp file for a helper application does not 
-exist when deleting it
+ Adding more features to WLBLEval - Bug 7354
 ------------------------------------------------------------------------
-r1429359 | jhardin | 2013-01-05 19:00:37 +0000 (Sat, 05 Jan 2013) | 1 line
- 
- tweak email phishing rules
-------------------------------------------------------------------------
-r1429198 | spamassassin_role | 2013-01-05 03:15:51 +0000 (Sat, 05 Jan 
-2013) | 1 line
- 
- updated scores for revision 1428749 active rules added since last 
-mass-check
-------------------------------------------------------------------------
-r1429187 | mmartinec | 2013-01-05 01:45:15 +0000 (Sat, 05 Jan 2013) | 1 
+r1839388 | kmcgrail | 2018-08-28 02:39:26 +0000 (Tue, 28 Aug 2018) | 1 
 line
  
- t/rule_names.t fix for "Parse errors: No plan found in TAP output"
+ Adding FromNameSpoof plugin - bug 7606
 ------------------------------------------------------------------------
-r1429136 | kmcgrail | 2013-01-04 21:37:08 +0000 (Fri, 04 Jan 2013) | 1 
+r1839367 | billcole | 2018-08-27 19:18:16 +0000 (Mon, 27 Aug 2018) | 1 
 line
  
- Added descriptions for rules for bugs 6880/6884 to fix uribl_all_types.t
+ Adding configurable wrap width for X-Spam-Report header. Bug #6104
 ------------------------------------------------------------------------
-r1429058 | mmartinec | 2013-01-04 19:43:38 +0000 (Fri, 04 Jan 2013) | 1 
-line
+r1839294 | gbechis | 2018-08-27 10:41:59 +0000 (Mon, 27 Aug 2018) | 2 
+lines
  
- Bug 3806: one more case of too generous checking for version of 
-Sys::Hostname::Long
-------------------------------------------------------------------------
-r1429002 | mmartinec | 2013-01-04 17:54:20 +0000 (Fri, 04 Jan 2013) | 1 
-line
+ detect Sympa mailinglists, bz #7523
  
- t/spf.t - make disabling of this test more selective: if 
-Sys::Hostname::Long does not exists that is just fine
 ------------------------------------------------------------------------
-r1428943 | mmartinec | 2013-01-04 16:00:33 +0000 (Fri, 04 Jan 2013) | 1 
+r1839260 | kmcgrail | 2018-08-26 21:55:00 +0000 (Sun, 26 Aug 2018) | 1 
 line
  
- re-enabling test t/spamd_maxsize.t
+ build_spamc & build_spamd are options for win32 only - bug 7376
 ------------------------------------------------------------------------
-r1428892 | mmartinec | 2013-01-04 14:35:13 +0000 (Fri, 04 Jan 2013) | 1 
+r1839147 | kmcgrail | 2018-08-25 23:31:00 +0000 (Sat, 25 Aug 2018) | 1 
 line
  
- t/rule_names.t : missing boilerplate "use SATest", allow_user_rules=1, 
-too early call to Test::plan; fix tainted PATH in 
-SATest::probably_unused_spamd_port()
+ Addig tag for LASTEXTERNALIP - Bug 7334
 ------------------------------------------------------------------------
-r1428720 | kmcgrail | 2013-01-04 04:28:42 +0000 (Fri, 04 Jan 2013) | 1 
+r1839143 | kmcgrail | 2018-08-25 23:17:51 +0000 (Sat, 25 Aug 2018) | 1 
 line
  
- Cleaned up DependencyInfo for Curl and Fetch.
+ allow font names in tickmarks - bug 7312
 ------------------------------------------------------------------------
-r1428716 | kmcgrail | 2013-01-04 04:09:02 +0000 (Fri, 04 Jan 2013) | 1 
+r1839141 | kmcgrail | 2018-08-25 23:11:53 +0000 (Sat, 25 Aug 2018) | 1 
 line
  
- changes to received parsing for gmx - bug 6877
+ changing socket handling for spamd - bug 7274
 ------------------------------------------------------------------------
-r1428708 | spamassassin_role | 2013-01-04 03:12:23 +0000 (Fri, 04 Jan 
-2013) | 1 line
- 
- updated scores for revision 1428221 active rules added since last 
-mass-check
-------------------------------------------------------------------------
-r1428702 | kmcgrail | 2013-01-04 02:44:03 +0000 (Fri, 04 Jan 2013) | 1 
+r1839140 | kmcgrail | 2018-08-25 23:04:42 +0000 (Sat, 25 Aug 2018) | 1 
 line
  
- update to change rule descriptions that are blank to "No description 
-available." and code to list rules missing descriptions with -D - bug 6880
+ Improving razor2 test
 ------------------------------------------------------------------------
-r1428581 | kmcgrail | 2013-01-03 20:41:13 +0000 (Thu, 03 Jan 2013) | 1 
+r1839137 | kmcgrail | 2018-08-25 22:49:01 +0000 (Sat, 25 Aug 2018) | 1 
 line
  
- Documentation in INSTALL and DependencyInfo.pm because sa-update now 
-uses binaries before LWP for better ipv6 support - bug 6655
+ changing make to $Config{make} for sa-compile - bug 7294
 ------------------------------------------------------------------------
-r1428508 | kmcgrail | 2013-01-03 17:51:43 +0000 (Thu, 03 Jan 2013) | 1 
+r1839132 | kmcgrail | 2018-08-25 22:35:14 +0000 (Sat, 25 Aug 2018) | 1 
 line
  
- adding -X option to allow spamc to return EX_TEMPFAIL instead of 
-EX_UNAVAILABLE when using -x option
+ Add references to plugins - bug 7280
 ------------------------------------------------------------------------
-r1428402 | kmcgrail | 2013-01-03 15:36:34 +0000 (Thu, 03 Jan 2013) | 1 
+r1839127 | kmcgrail | 2018-08-25 22:08:33 +0000 (Sat, 25 Aug 2018) | 1 
 line
  
- Order of -T -w changed per bug 6883
-------------------------------------------------------------------------
-r1428150 | spamassassin_role | 2013-01-03 03:07:30 +0000 (Thu, 03 Jan 
-2013) | 1 line
- 
- updated scores for revision 1427706 active rules added since last 
-mass-check
-------------------------------------------------------------------------
-r1427629 | spamassassin_role | 2013-01-02 03:15:11 +0000 (Wed, 02 Jan 
-2013) | 1 line
- 
- updated scores for revision 1427336 active rules added since last 
-mass-check
+ Adding information rule updates and sha1 to announcement
 ------------------------------------------------------------------------
-r1427476 | jhardin | 2013-01-01 17:13:47 +0000 (Tue, 01 Jan 2013) | 1 line
+r1839085 | gbechis | 2018-08-25 17:20:14 +0000 (Sat, 25 Aug 2018) | 2 
+lines
  
- Tweak fill_form, lotsa_money and email phishing rules- add Polish 
-variants
-------------------------------------------------------------------------
-r1427288 | spamassassin_role | 2013-01-01 03:10:56 +0000 (Tue, 01 Jan 
-2013) | 1 line
+ revert r1826179, fixes bz #7602
  
- updated scores for revision 1427053 active rules added since last 
-mass-check
 ------------------------------------------------------------------------
-r1427272 | kmcgrail | 2013-01-01 01:15:57 +0000 (Tue, 01 Jan 2013) | 1 
+r1839015 | billcole | 2018-08-25 05:15:19 +0000 (Sat, 25 Aug 2018) | 1 
 line
  
- preparing for release 3.4.0-pre1
+ Really skip Devel::SawAmpersand test when it's unneeded
 ------------------------------------------------------------------------
-r1427271 | kmcgrail | 2013-01-01 01:11:03 +0000 (Tue, 01 Jan 2013) | 1 
+r1839005 | kmcgrail | 2018-08-25 01:44:30 +0000 (Sat, 25 Aug 2018) | 1 
 line
  
- preparing for release 3.4.0-pre1
+ adding a description of why the change exists
 ------------------------------------------------------------------------
-r1427270 | kmcgrail | 2013-01-01 01:10:54 +0000 (Tue, 01 Jan 2013) | 1 
+r1839002 | kmcgrail | 2018-08-25 01:22:03 +0000 (Sat, 25 Aug 2018) | 1 
 line
  
- preparing for release 3.4.0-pre1
+ Adding more cases for user_prefs.template to be found - bug 7298
 ------------------------------------------------------------------------
-r1427269 | kmcgrail | 2013-01-01 01:10:43 +0000 (Tue, 01 Jan 2013) | 1 
+r1838999 | kmcgrail | 2018-08-25 00:47:02 +0000 (Sat, 25 Aug 2018) | 1 
 line
  
- preparing for release 3.4.0-pre1
+ Small fix for new6 bug - reported by ToddR, cPanel
 ------------------------------------------------------------------------
-r1427263 | kmcgrail | 2013-01-01 00:30:01 +0000 (Tue, 01 Jan 2013) | 1 
+r1838992 | kmcgrail | 2018-08-24 23:58:13 +0000 (Fri, 24 Aug 2018) | 1 
 line
  
- preparing to release 3.4.0-pre1
-------------------------------------------------------------------------
-r1427253 | kmcgrail | 2012-12-31 23:05:23 +0000 (Mon, 31 Dec 2012) | 1 
-line
- 
- Preparing for 3.4.0-pre1 fixing some MANIFEST issues
-------------------------------------------------------------------------
-r1427038 | spamassassin_role | 2012-12-31 03:09:32 +0000 (Mon, 31 Dec 
-2012) | 1 line
- 
- updated scores for revision 1426907 active rules added since last 
-mass-check
-------------------------------------------------------------------------
-r1426886 | spamassassin_role | 2012-12-30 03:08:08 +0000 (Sun, 30 Dec 
-2012) | 1 line
- 
- updated scores for revision 1426716 active rules added since last 
-mass-check
-------------------------------------------------------------------------
-r1426696 | spamassassin_role | 2012-12-29 03:11:26 +0000 (Sat, 29 Dec 
-2012) | 1 line
- 
- updated scores for revision 1426433 active rules added since last 
-mass-check
-------------------------------------------------------------------------
-r1426380 | spamassassin_role | 2012-12-28 03:04:46 +0000 (Fri, 28 Dec 
-2012) | 1 line
- 
- updated scores for revision 1426146 active rules added since last 
-mass-check
-------------------------------------------------------------------------
-r1426375 | mmartinec | 2012-12-28 01:29:41 +0000 (Fri, 28 Dec 2012) | 1 
-line
- 
- Net::DNS 0.68 introduced a new API to EDNS; untaint nameservers IP 
-addresses as read from /etc/resolv.conf just in case Net::DNS changes its 
-mind leaving these tainted
-------------------------------------------------------------------------
-r1426245 | jhardin | 2012-12-27 16:31:50 +0000 (Thu, 27 Dec 2012) | 1 line
- 
- tweak email phishing rules - add spanish variants, FP avoidance
+ fixing Use of uninitialized value $file in File::Spec->catpath bug 7272
 ------------------------------------------------------------------------
-r1426109 | spamassassin_role | 2012-12-27 03:04:39 +0000 (Thu, 27 Dec 
-2012) | 1 line
- 
- updated scores for revision 1425856 active rules added since last 
-mass-check
-------------------------------------------------------------------------
-r1425811 | spamassassin_role | 2012-12-26 03:09:13 +0000 (Wed, 26 Dec 
-2012) | 1 line
- 
- updated scores for revision 1425729 active rules added since last 
-mass-check
-------------------------------------------------------------------------
-r1425708 | spamassassin_role | 2012-12-25 03:15:38 +0000 (Tue, 25 Dec 
-2012) | 1 line
- 
- updated scores for revision 1425604 active rules added since last 
-mass-check
-------------------------------------------------------------------------
-r1425678 | jhardin | 2012-12-24 20:19:26 +0000 (Mon, 24 Dec 2012) | 1 line
+r1838856 | gbechis | 2018-08-24 13:39:02 +0000 (Fri, 24 Aug 2018) | 2 
+lines
  
- Force publication of EMAIL_URI_PHISH
-------------------------------------------------------------------------
-r1425579 | spamassassin_role | 2012-12-24 03:12:55 +0000 (Mon, 24 Dec 
-2012) | 1 line
+ typo in optional module
  
- updated scores for revision 1425441 active rules added since last 
-mass-check
 ------------------------------------------------------------------------
-r1425397 | spamassassin_role | 2012-12-23 03:13:26 +0000 (Sun, 23 Dec 
-2012) | 1 line
- 
- updated scores for revision 1425259 active rules added since last 
-mass-check
-------------------------------------------------------------------------
-r1425396 | jhardin | 2012-12-23 02:48:08 +0000 (Sun, 23 Dec 2012) | 1 line
- 
- Bug 6867 - fall back to time header if time is formatted to unexpected 
-locale
-------------------------------------------------------------------------
-r1425395 | jhardin | 2012-12-23 02:44:12 +0000 (Sun, 23 Dec 2012) | 1 line
+r1838854 | gbechis | 2018-08-24 13:29:27 +0000 (Fri, 24 Aug 2018) | 2 
+lines
  
- More FP avoidance in phishing rule, add Portuguese variants
-------------------------------------------------------------------------
-r1425236 | spamassassin_role | 2012-12-22 03:17:35 +0000 (Sat, 22 Dec 
-2012) | 1 line
+ Mention Mail::SpamAssassin::Plugin::ResourceLimit
  
- updated scores for revision 1424823 active rules added since last 
-mass-check
 ------------------------------------------------------------------------
-r1425068 | mmartinec | 2012-12-21 18:21:45 +0000 (Fri, 21 Dec 2012) | 1 
+r1838779 | kmcgrail | 2018-08-24 01:53:14 +0000 (Fri, 24 Aug 2018) | 1 
 line
  
- Bug 6872 - replace $rr->rdatastr with $rr->txtdata where appropriate
-------------------------------------------------------------------------
-r1424795 | spamassassin_role | 2012-12-21 03:16:38 +0000 (Fri, 21 Dec 
-2012) | 1 line
- 
- updated scores for revision 1424369 active rules added since last 
-mass-check
-------------------------------------------------------------------------
-r1424274 | spamassassin_role | 2012-12-20 03:17:04 +0000 (Thu, 20 Dec 
-2012) | 1 line
- 
- updated scores for revision 1423795 active rules added since last 
-mass-check
-------------------------------------------------------------------------
-r1424267 | jhardin | 2012-12-20 01:52:34 +0000 (Thu, 20 Dec 2012) | 1 line
- 
- more FP avoidance
-------------------------------------------------------------------------
-r1423746 | spamassassin_role | 2012-12-19 03:15:44 +0000 (Wed, 19 Dec 
-2012) | 1 line
- 
- updated scores for revision 1423347 active rules added since last 
-mass-check
-------------------------------------------------------------------------
-r1423467 | hege | 2012-12-18 15:05:37 +0000 (Tue, 18 Dec 2012) | 2 lines
- 
- Bug 6881: Bayes storage module for Redis should be optional
- 
+ fixing an opt not freed. bug 7509
 ------------------------------------------------------------------------
-r1423268 | kmcgrail | 2012-12-18 03:26:31 +0000 (Tue, 18 Dec 2012) | 1 
+r1838777 | kmcgrail | 2018-08-24 01:45:57 +0000 (Fri, 24 Aug 2018) | 1 
 line
  
- Lowered score and added condition for 3.4 because From:name works 
-differently prior - bug 6817
-------------------------------------------------------------------------
-r1423267 | spamassassin_role | 2012-12-18 03:23:06 +0000 (Tue, 18 Dec 
-2012) | 1 line
- 
- updated scores for revision 1422798 active rules added since last 
-mass-check
-------------------------------------------------------------------------
-r1422745 | spamassassin_role | 2012-12-17 03:08:34 +0000 (Mon, 17 Dec 
-2012) | 1 line
- 
- updated scores for revision 1422487 active rules added since last 
-mass-check
-------------------------------------------------------------------------
-r1422678 | jhardin | 2012-12-16 20:08:24 +0000 (Sun, 16 Dec 2012) | 1 line
- 
- Tweak lotsa_money
-------------------------------------------------------------------------
-r1422572 | axb | 2012-12-16 13:03:57 +0000 (Sun, 16 Dec 2012) | 1 line
- 
- added zapto.org
-------------------------------------------------------------------------
-r1422095 | jhardin | 2012-12-14 21:13:21 +0000 (Fri, 14 Dec 2012) | 1 line
- 
- possibly address UTF8 issues
-------------------------------------------------------------------------
-r1422080 | jhardin | 2012-12-14 21:05:59 +0000 (Fri, 14 Dec 2012) | 1 line
- 
- possibly address UTF8 issues
-------------------------------------------------------------------------
-r1421774 | hege | 2012-12-14 09:56:17 +0000 (Fri, 14 Dec 2012) | 2 lines
- 
- Bug 6879: Bayes storage module for Redis
- 
-------------------------------------------------------------------------
-r1421587 | jhardin | 2012-12-13 22:40:36 +0000 (Thu, 13 Dec 2012) | 1 line
- 
- Limit hits for __BODY_TEXT_LINE
+ Reverting previous comment of return - bug 7191 comment 18
 ------------------------------------------------------------------------
-r1421070 | jhardin | 2012-12-13 03:05:49 +0000 (Thu, 13 Dec 2012) | 1 line
- 
- tweak lotsa_money, more FP avoidance
-------------------------------------------------------------------------
-r1420906 | mmartinec | 2012-12-12 18:38:25 +0000 (Wed, 12 Dec 2012) | 1 
+r1838775 | kmcgrail | 2018-08-24 01:35:46 +0000 (Fri, 24 Aug 2018) | 1 
 line
  
- Bug 6872, one more
+ logic switch on spamd to fix the unlimited timeout option.  bug 6748
 ------------------------------------------------------------------------
-r1420890 | mmartinec | 2012-12-12 17:59:20 +0000 (Wed, 12 Dec 2012) | 1 
+r1838771 | kmcgrail | 2018-08-24 00:45:27 +0000 (Fri, 24 Aug 2018) | 1 
 line
  
- Bug 6872, fix breakage introduced by my previous change - DNS replies 
-with no answers would wait till their timeout
-------------------------------------------------------------------------
-r1419839 | jhardin | 2012-12-10 22:19:56 +0000 (Mon, 10 Dec 2012) | 1 line
- 
- add lottery + empty body + attachment rule
+ Adding ResourceLimits.pm plugin and dependency test for BSD::Resources
 ------------------------------------------------------------------------
-r1419685 | kmcgrail | 2012-12-10 19:26:34 +0000 (Mon, 10 Dec 2012) | 1 
+r1838645 | billcole | 2018-08-22 15:24:51 +0000 (Wed, 22 Aug 2018) | 1 
 line
  
- Tweak for bug 6874
+ Restoring required -D flag so that the patterns & antipatterns can 
+actually work
 ------------------------------------------------------------------------
-r1419599 | kmcgrail | 2012-12-10 17:33:01 +0000 (Mon, 10 Dec 2012) | 1 
+r1838604 | kmcgrail | 2018-08-22 04:41:03 +0000 (Wed, 22 Aug 2018) | 1 
 line
  
- Bug 6875 to try and lower scores re: tabs in date and from header
-------------------------------------------------------------------------
-r1419559 | jhardin | 2012-12-10 16:24:03 +0000 (Mon, 10 Dec 2012) | 1 line
- 
- tweak FIN_FREE per http://isc.sans.edu/diary.html?storyid=14656
+ Minor version check robustness bug 7095
 ------------------------------------------------------------------------
-r1419508 | jhardin | 2012-12-10 15:15:58 +0000 (Mon, 10 Dec 2012) | 1 line
- 
- Tweak lotsa_money and email phishing rules- add more French and Swedish 
-variants
-------------------------------------------------------------------------
-r1419124 | jhardin | 2012-12-09 20:08:30 +0000 (Sun, 09 Dec 2012) | 1 line
- 
- Tweak lotsa_money
-------------------------------------------------------------------------
-r1418713 | jhardin | 2012-12-08 17:16:34 +0000 (Sat, 08 Dec 2012) | 1 line
- 
- tweak LOTSA_MONEY
-------------------------------------------------------------------------
-r1418600 | spamassassin_role | 2012-12-08 03:18:10 +0000 (Sat, 08 Dec 
-2012) | 1 line
- 
- updated scores for revision 1418219 active rules added since last 
-mass-check
-------------------------------------------------------------------------
-r1418317 | mmartinec | 2012-12-07 14:04:22 +0000 (Fri, 07 Dec 2012) | 1 
+r1838601 | kmcgrail | 2018-08-22 04:15:31 +0000 (Wed, 22 Aug 2018) | 1 
 line
  
- Net::DNS 0.69 $rr->rdatastr no longer quotes returned TXT ([rt.cpan.org 
-#81760]); some other DNS-related cosmetics; more RR types in AskDNS.pm
-------------------------------------------------------------------------
-r1418179 | spamassassin_role | 2012-12-07 03:16:12 +0000 (Fri, 07 Dec 
-2012) | 1 line
- 
- updated scores for revision 1417778 active rules added since last 
-mass-check
-------------------------------------------------------------------------
-r1417731 | spamassassin_role | 2012-12-06 03:22:43 +0000 (Thu, 06 Dec 
-2012) | 1 line
- 
- updated scores for revision 1417315 active rules added since last 
-mass-check
-------------------------------------------------------------------------
-r1417272 | spamassassin_role | 2012-12-05 03:27:01 +0000 (Wed, 05 Dec 
-2012) | 1 line
- 
- updated scores for revision 1416819 active rules added since last 
-mass-check
-------------------------------------------------------------------------
-r1416757 | spamassassin_role | 2012-12-04 03:29:37 +0000 (Tue, 04 Dec 
-2012) | 1 line
- 
- updated scores for revision 1416377 active rules added since last 
-mass-check
-------------------------------------------------------------------------
-r1416556 | jhardin | 2012-12-03 15:16:17 +0000 (Mon, 03 Dec 2012) | 1 line
- 
- tweak ATM_CARD
-------------------------------------------------------------------------
-r1416457 | hege | 2012-12-03 11:44:46 +0000 (Mon, 03 Dec 2012) | 2 lines
- 
- Bug 6871: FreeMail plugin not checking Reply-To properly
- 
+ Adding info about rules being in root to manifest
 ------------------------------------------------------------------------
-r1416341 | spamassassin_role | 2012-12-03 03:31:58 +0000 (Mon, 03 Dec 
-2012) | 1 line
- 
- updated scores for revision 1416144 active rules added since last 
-mass-check
-------------------------------------------------------------------------
-r1416328 | jhardin | 2012-12-03 01:10:58 +0000 (Mon, 03 Dec 2012) | 1 line
- 
- tweak email phishing rules
-------------------------------------------------------------------------
-r1416104 | spamassassin_role | 2012-12-02 03:33:15 +0000 (Sun, 02 Dec 
-2012) | 1 line
- 
- updated scores for revision 1415949 active rules added since last 
-mass-check
-------------------------------------------------------------------------
-r1415948 | jhardin | 2012-12-01 08:45:59 +0000 (Sat, 01 Dec 2012) | 1 line
- 
- Force publication of Google Docs email phishing rule: S/O=1.000, only 
-hits spams otherwise scoring <= 6 points
-------------------------------------------------------------------------
-r1415910 | spamassassin_role | 2012-12-01 03:22:32 +0000 (Sat, 01 Dec 
-2012) | 1 line
- 
- updated scores for revision 1415545 active rules added since last 
-mass-check
-------------------------------------------------------------------------
-r1415861 | jhardin | 2012-11-30 21:50:22 +0000 (Fri, 30 Nov 2012) | 1 line
- 
- More FP avoidance in FROM_MISSP* rules
-------------------------------------------------------------------------
-r1415751 | kmcgrail | 2012-11-30 17:21:35 +0000 (Fri, 30 Nov 2012) | 1 
+r1838598 | kmcgrail | 2018-08-22 04:06:35 +0000 (Wed, 22 Aug 2018) | 1 
 line
  
- Bug 6870 adding boundaries for ACT_NOW_CAPS
-------------------------------------------------------------------------
-r1415495 | jhardin | 2012-11-30 04:08:43 +0000 (Fri, 30 Nov 2012) | 1 line
- 
- more FROM_MISSP* FP avoidance
-------------------------------------------------------------------------
-r1415488 | spamassassin_role | 2012-11-30 03:32:33 +0000 (Fri, 30 Nov 
-2012) | 1 line
- 
- updated scores for revision 1415087 active rules added since last 
-mass-check
-------------------------------------------------------------------------
-r1415458 | jhardin | 2012-11-29 23:34:16 +0000 (Thu, 29 Nov 2012) | 1 line
- 
- add HTML_FONT_TINY
+ Commenting a change accidentally committed for Bug 7095
 ------------------------------------------------------------------------
-r1415324 | jhardin | 2012-11-29 19:02:16 +0000 (Thu, 29 Nov 2012) | 1 line
- 
- More FP avoidance
-------------------------------------------------------------------------
-r1415034 | spamassassin_role | 2012-11-29 03:27:10 +0000 (Thu, 29 Nov 
-2012) | 1 line
- 
- updated scores for revision 1414583 active rules added since last 
-mass-check
-------------------------------------------------------------------------
-r1414518 | spamassassin_role | 2012-11-28 03:33:06 +0000 (Wed, 28 Nov 
-2012) | 1 line
- 
- updated scores for revision 1414021 active rules added since last 
-mass-check
-------------------------------------------------------------------------
-r1414465 | mmartinec | 2012-11-27 23:21:34 +0000 (Tue, 27 Nov 2012) | 1 
+r1838597 | kmcgrail | 2018-08-22 03:56:32 +0000 (Wed, 22 Aug 2018) | 1 
 line
  
- DCC plugin: fix calls to dbg() - log facility must be a constant string 
-before a sprintf expansion; hardened Logger.pm against a missing or 
-broken log facility
-------------------------------------------------------------------------
-r1413987 | spamassassin_role | 2012-11-27 03:44:37 +0000 (Tue, 27 Nov 
-2012) | 1 line
- 
- updated scores for revision 1413510 active rules added since last 
-mass-check
-------------------------------------------------------------------------
-r1413473 | jhardin | 2012-11-26 03:41:18 +0000 (Mon, 26 Nov 2012) | 1 line
- 
- More FP avoidance in 419/fraud rules
-------------------------------------------------------------------------
-r1413472 | spamassassin_role | 2012-11-26 03:32:43 +0000 (Mon, 26 Nov 
-2012) | 1 line
- 
- updated scores for revision 1413300 active rules added since last 
-mass-check
-------------------------------------------------------------------------
-r1413469 | jhardin | 2012-11-26 03:16:43 +0000 (Mon, 26 Nov 2012) | 1 line
- 
- more TO_NO_BRKTS_MSFT FP avoidance
-------------------------------------------------------------------------
-r1413466 | jhardin | 2012-11-26 03:04:08 +0000 (Mon, 26 Nov 2012) | 1 line
- 
- COMPENSATION FP avoidance
-------------------------------------------------------------------------
-r1413412 | jhardin | 2012-11-25 20:40:06 +0000 (Sun, 25 Nov 2012) | 1 line
- 
- tweak email phishing rules
-------------------------------------------------------------------------
-r1413288 | spamassassin_role | 2012-11-25 03:25:41 +0000 (Sun, 25 Nov 
-2012) | 1 line
- 
- updated scores for revision 1413153 active rules added since last 
-mass-check
-------------------------------------------------------------------------
-r1413121 | spamassassin_role | 2012-11-24 03:30:37 +0000 (Sat, 24 Nov 
-2012) | 1 line
- 
- updated scores for revision 1412776 active rules added since last 
-mass-check
-------------------------------------------------------------------------
-r1413113 | jhardin | 2012-11-24 01:39:51 +0000 (Sat, 24 Nov 2012) | 1 line
- 
- More FP avoidance in 419 rules
-------------------------------------------------------------------------
-r1412990 | jhardin | 2012-11-23 17:26:04 +0000 (Fri, 23 Nov 2012) | 1 line
- 
- Tweak email phishing rules
-------------------------------------------------------------------------
-r1412952 | jhardin | 2012-11-23 16:53:24 +0000 (Fri, 23 Nov 2012) | 1 line
- 
- Tweak __TVD_PH_BODY_ACCOUNTS_POST
-------------------------------------------------------------------------
-r1412738 | spamassassin_role | 2012-11-23 03:30:05 +0000 (Fri, 23 Nov 
-2012) | 1 line
- 
- updated scores for revision 1412451 active rules added since last 
-mass-check
-------------------------------------------------------------------------
-r1412412 | spamassassin_role | 2012-11-22 03:15:51 +0000 (Thu, 22 Nov 
-2012) | 1 line
- 
- updated scores for revision 1412016 active rules added since last 
-mass-check
-------------------------------------------------------------------------
-r1411979 | spamassassin_role | 2012-11-21 03:11:38 +0000 (Wed, 21 Nov 
-2012) | 1 line
- 
- updated scores for revision 1411588 active rules added since last 
-mass-check
-------------------------------------------------------------------------
-r1411520 | spamassassin_role | 2012-11-20 03:18:52 +0000 (Tue, 20 Nov 
-2012) | 1 line
- 
- updated scores for revision 1411099 active rules added since last 
-mass-check
-------------------------------------------------------------------------
-r1411065 | jhardin | 2012-11-19 04:58:05 +0000 (Mon, 19 Nov 2012) | 1 line
- 
- LOTTO_DEPT FP avoidance
-------------------------------------------------------------------------
-r1411050 | spamassassin_role | 2012-11-19 03:17:46 +0000 (Mon, 19 Nov 
-2012) | 1 line
- 
- updated scores for revision 1410852 active rules added since last 
-mass-check
-------------------------------------------------------------------------
-r1410970 | jhardin | 2012-11-18 19:55:06 +0000 (Sun, 18 Nov 2012) | 1 line
- 
- Add rules for "compensation" and google docs URIs
-------------------------------------------------------------------------
-r1410819 | spamassassin_role | 2012-11-18 03:13:35 +0000 (Sun, 18 Nov 
-2012) | 1 line
- 
- updated scores for revision 1410711 active rules added since last 
-mass-check
-------------------------------------------------------------------------
-r1410687 | spamassassin_role | 2012-11-17 03:19:10 +0000 (Sat, 17 Nov 
-2012) | 1 line
- 
- updated scores for revision 1410255 active rules added since last 
-mass-check
-------------------------------------------------------------------------
-r1410191 | jhardin | 2012-11-16 03:43:15 +0000 (Fri, 16 Nov 2012) | 1 line
- 
- KHOP_NO_FULL_NAME useful in FP-avoidance metas, break into subrule + 
-scored meta
-------------------------------------------------------------------------
-r1410176 | spamassassin_role | 2012-11-16 03:03:22 +0000 (Fri, 16 Nov 
-2012) | 1 line
- 
- updated scores for revision 1409693 active rules added since last 
-mass-check
-------------------------------------------------------------------------
-r1410013 | jhardin | 2012-11-15 21:07:27 +0000 (Thu, 15 Nov 2012) | 1 line
- 
- Add a timeout around ruleqa SVN operations, they have been observed to 
-wedge on the ruleqa zone VM
-------------------------------------------------------------------------
-r1409641 | spamassassin_role | 2012-11-15 03:06:30 +0000 (Thu, 15 Nov 
-2012) | 1 line
- 
- updated scores for revision 1409116 active rules added since last 
-mass-check
-------------------------------------------------------------------------
-r1409074 | spamassassin_role | 2012-11-14 03:26:57 +0000 (Wed, 14 Nov 
-2012) | 1 line
- 
- updated scores for revision 1408637 active rules added since last 
-mass-check
-------------------------------------------------------------------------
-r1409047 | jhardin | 2012-11-14 01:05:56 +0000 (Wed, 14 Nov 2012) | 1 line
- 
- Tune mixed-case URI rules
-------------------------------------------------------------------------
-r1408914 | jhardin | 2012-11-13 19:46:00 +0000 (Tue, 13 Nov 2012) | 1 line
- 
- Add __URI_WWW_MC
+ rules, rulesrc and t.rules are only in trunk now
 ------------------------------------------------------------------------
-r1408570 | spamassassin_role | 2012-11-13 03:09:50 +0000 (Tue, 13 Nov 
-2012) | 1 line
- 
- updated scores for revision 1408190 active rules added since last 
-mass-check
-------------------------------------------------------------------------
-r1408170 | spamassassin_role | 2012-11-12 03:32:07 +0000 (Mon, 12 Nov 
-2012) | 1 line
- 
- updated scores for revision 1407926 active rules added since last 
-mass-check
-------------------------------------------------------------------------
-r1408133 | jhardin | 2012-11-11 22:14:11 +0000 (Sun, 11 Nov 2012) | 1 line
- 
- ensure URI rules are case-insensitive; tweak marketing lists rules, 
-__FROM_RUNON & related rules, IRS and FBI spoofing rules, email phishing 
-rules; add mixed-case-URI rules
-------------------------------------------------------------------------
-r1407908 | spamassassin_role | 2012-11-11 03:20:49 +0000 (Sun, 11 Nov 
-2012) | 1 line
- 
- updated scores for revision 1407733 active rules added since last 
-mass-check
-------------------------------------------------------------------------
-r1407724 | spamassassin_role | 2012-11-10 03:26:03 +0000 (Sat, 10 Nov 
-2012) | 1 line
- 
- updated scores for revision 1407383 active rules added since last 
-mass-check
-------------------------------------------------------------------------
-r1407347 | spamassassin_role | 2012-11-09 03:34:58 +0000 (Fri, 09 Nov 
-2012) | 1 line
- 
- updated scores for revision 1406959 active rules added since last 
-mass-check
-------------------------------------------------------------------------
-r1407297 | jhardin | 2012-11-08 22:22:06 +0000 (Thu, 08 Nov 2012) | 1 line
- 
- Reduce LOTTO_AGENT FPs
-------------------------------------------------------------------------
-r1407194 | mmartinec | 2012-11-08 18:07:22 +0000 (Thu, 08 Nov 2012) | 1 
+r1838596 | kmcgrail | 2018-08-22 03:55:49 +0000 (Wed, 22 Aug 2018) | 1 
 line
  
- Bug 6862: Allow a DNS resolver to use EDNS (let it apply to queries 
-prepared by our DnsResolver.pm too)
-------------------------------------------------------------------------
-r1406906 | spamassassin_role | 2012-11-08 03:31:23 +0000 (Thu, 08 Nov 
-2012) | 1 line
- 
- updated scores for revision 1406499 active rules added since last 
-mass-check
+ prepping for 3.4.2 release
 ------------------------------------------------------------------------
-r1406438 | spamassassin_role | 2012-11-07 03:26:39 +0000 (Wed, 07 Nov 
-2012) | 1 line
- 
- updated scores for revision 1406071 active rules added since last 
-mass-check
-------------------------------------------------------------------------
-r1406273 | mmartinec | 2012-11-06 19:21:55 +0000 (Tue, 06 Nov 2012) | 1 
+r1838594 | kmcgrail | 2018-08-22 02:27:45 +0000 (Wed, 22 Aug 2018) | 1 
 line
  
- Bug 6862 (detail)
+ Removing 3 experimental/devel plugins
 ------------------------------------------------------------------------
-r1406272 | mmartinec | 2012-11-06 19:15:38 +0000 (Tue, 06 Nov 2012) | 1 
+r1838591 | kmcgrail | 2018-08-21 23:53:30 +0000 (Tue, 21 Aug 2018) | 1 
 line
  
- Bug 6862 - Allow a DNS resolver to use EDNS - UDP packets larger than 
-512 bytes (configurable)
-------------------------------------------------------------------------
-r1406037 | jhardin | 2012-11-06 04:09:19 +0000 (Tue, 06 Nov 2012) | 1 line
- 
- Tweak LOTSA_MONEY
-------------------------------------------------------------------------
-r1406033 | spamassassin_role | 2012-11-06 03:18:38 +0000 (Tue, 06 Nov 
-2012) | 1 line
- 
- updated scores for revision 1405711 active rules added since last 
-mass-check
+ Remove pretty command line in ps so pkill can work
 ------------------------------------------------------------------------
-r1406030 | kmcgrail | 2012-11-06 02:28:04 +0000 (Tue, 06 Nov 2012) | 1 
+r1838588 | kmcgrail | 2018-08-21 23:22:01 +0000 (Tue, 21 Aug 2018) | 1 
 line
  
- Bug 6861 for test_version fixed for binary dependencies
-------------------------------------------------------------------------
-r1405691 | spamassassin_role | 2012-11-05 03:21:20 +0000 (Mon, 05 Nov 
-2012) | 1 line
- 
- updated scores for revision 1405513 active rules added since last 
-mass-check
+ Reminder not to leave -D
 ------------------------------------------------------------------------
-r1405495 | spamassassin_role | 2012-11-04 03:32:12 +0000 (Sun, 04 Nov 
-2012) | 1 line
- 
- updated scores for revision 1405308 active rules added since last 
-mass-check
-------------------------------------------------------------------------
-r1405274 | spamassassin_role | 2012-11-03 03:19:15 +0000 (Sat, 03 Nov 
-2012) | 1 line
- 
- updated scores for revision 1404892 active rules added since last 
-mass-check
-------------------------------------------------------------------------
-r1405084 | mmartinec | 2012-11-02 18:15:37 +0000 (Fri, 02 Nov 2012) | 1 
+r1838586 | billcole | 2018-08-21 21:34:03 +0000 (Tue, 21 Aug 2018) | 1 
 line
  
- t/debug.t: avoid "malformed debug message" due to a timestamp in a log, 
-add missing facilities to the list
-------------------------------------------------------------------------
-r1404866 | spamassassin_role | 2012-11-02 03:43:58 +0000 (Fri, 02 Nov 
-2012) | 1 line
- 
- updated scores for revision 1404503 active rules added since last 
-mass-check
-------------------------------------------------------------------------
-r1404458 | spamassassin_role | 2012-11-01 03:47:56 +0000 (Thu, 01 Nov 
-2012) | 1 line
- 
- updated scores for revision 1404039 active rules added since last 
-mass-check
+ tighten up patterns in t/dnsbl.t
 ------------------------------------------------------------------------
-r1404381 | axb | 2012-10-31 22:08:33 +0000 (Wed, 31 Oct 2012) | 1 line
- 
- allow Ga manage HK_LOTTO hardwired score
-------------------------------------------------------------------------
-r1403962 | spamassassin_role | 2012-10-31 03:26:18 +0000 (Wed, 31 Oct 
-2012) | 1 line
- 
- updated scores for revision 1403638 active rules added since last 
-mass-check
-------------------------------------------------------------------------
-r1403609 | spamassassin_role | 2012-10-30 03:34:12 +0000 (Tue, 30 Oct 
-2012) | 1 line
- 
- updated scores for revision 1403196 active rules added since last 
-mass-check
-------------------------------------------------------------------------
-r1403592 | mmartinec | 2012-10-30 01:02:52 +0000 (Tue, 30 Oct 2012) | 7 
+r1838522 | gbechis | 2018-08-21 07:51:57 +0000 (Tue, 21 Aug 2018) | 2 
 lines
  
- Bug 6508: Speeding up lookups on {trusted,internal,msa}_networks
- Documentation update:
- - document how Net::Patricia search differs from a sequential search
- - document/clarify IPv6 syntax in {trusted,internal,msa}_networks
- - remove the claim on flexibility
- 
- 
-------------------------------------------------------------------------
-r1403578 | mmartinec | 2012-10-29 23:39:24 +0000 (Mon, 29 Oct 2012) | 1 
-line
- 
- Bug 6681: add_cidr() to recognize and strip [] and %scope in IPv6 
-addresses - unifies parsing in non-Net::Patricia and Net::Patricia setups
-------------------------------------------------------------------------
-r1403571 | jhardin | 2012-10-29 22:44:51 +0000 (Mon, 29 Oct 2012) | 1 line
- 
- tweak generated score limits
-------------------------------------------------------------------------
-r1403401 | jhardin | 2012-10-29 16:18:51 +0000 (Mon, 29 Oct 2012) | 1 line
- 
- Add suspiciously-named-attachment rules; tweak multiple-domain-in-URI 
-rules; add email phishing w/Google Docs rules
-------------------------------------------------------------------------
-r1403400 | jhardin | 2012-10-29 16:16:06 +0000 (Mon, 29 Oct 2012) | 1 line
- 
- Tweak LOTSA_MONEY
-------------------------------------------------------------------------
-r1403151 | spamassassin_role | 2012-10-29 03:19:07 +0000 (Mon, 29 Oct 
-2012) | 1 line
- 
- updated scores for revision 1402956 active rules added since last 
-mass-check
-------------------------------------------------------------------------
-r1403067 | jhardin | 2012-10-28 18:37:02 +0000 (Sun, 28 Oct 2012) | 1 line
- 
- Split some scored rules into subrule + scored-meta sets to allow their 
-use in other scored meta rules even if the perform poorly on their own; 
-minor tweaking of __TVD_PH_BODY_ACCOUNTS_POST
-------------------------------------------------------------------------
-r1402925 | spamassassin_role | 2012-10-28 03:52:03 +0000 (Sun, 28 Oct 
-2012) | 1 line
- 
- updated scores for revision 1402761 active rules added since last 
-mass-check
-------------------------------------------------------------------------
-r1402736 | spamassassin_role | 2012-10-27 03:42:54 +0000 (Sat, 27 Oct 
-2012) | 1 line
- 
- updated scores for revision 1402431 active rules added since last 
-mass-check
-------------------------------------------------------------------------
-r1402382 | spamassassin_role | 2012-10-26 03:25:01 +0000 (Fri, 26 Oct 
-2012) | 1 line
- 
- updated scores for revision 1402026 active rules added since last 
-mass-check
-------------------------------------------------------------------------
-r1402227 | mmartinec | 2012-10-25 17:38:04 +0000 (Thu, 25 Oct 2012) | 1 
-line
- 
- Bug 6856: Mass check is throwing a '1/8' isn't numeric error
-------------------------------------------------------------------------
-r1402074 | axb | 2012-10-25 09:54:10 +0000 (Thu, 25 Oct 2012) | 1 line
- 
- added ifplugin/endif to Vbounce scores
-------------------------------------------------------------------------
-r1401968 | spamassassin_role | 2012-10-25 03:46:47 +0000 (Thu, 25 Oct 
-2012) | 1 line
- 
- updated scores for revision 1401586 active rules added since last 
-mass-check
-------------------------------------------------------------------------
-r1401727 | mmartinec | 2012-10-24 15:25:08 +0000 (Wed, 24 Oct 2012) | 1 
-line
- 
- oops, rule names can start with a digit after leading underscores
-------------------------------------------------------------------------
-r1401531 | spamassassin_role | 2012-10-24 03:33:35 +0000 (Wed, 24 Oct 
-2012) | 1 line
- 
- updated scores for revision 1401197 active rules added since last 
-mass-check
-------------------------------------------------------------------------
-r1401393 | mmartinec | 2012-10-23 19:12:17 +0000 (Tue, 23 Oct 2012) | 1 
-line
- 
- Bug 6854: Optimizations, profiling
-------------------------------------------------------------------------
-r1401150 | spamassassin_role | 2012-10-23 03:51:21 +0000 (Tue, 23 Oct 
-2012) | 1 line
- 
- updated scores for revision 1400804 active rules added since last 
-mass-check
-------------------------------------------------------------------------
-r1400858 | kmcgrail | 2012-10-22 12:13:44 +0000 (Mon, 22 Oct 2012) | 1 
-line
- 
- Step 1 of bug 6853  to remove SURBL Outblaze (OB) list
-------------------------------------------------------------------------
-r1400752 | spamassassin_role | 2012-10-22 03:45:45 +0000 (Mon, 22 Oct 
-2012) | 1 line
- 
- updated scores for revision 1400596 active rules added since last 
-mass-check
-------------------------------------------------------------------------
-r1400564 | spamassassin_role | 2012-10-21 03:30:04 +0000 (Sun, 21 Oct 
-2012) | 1 line
- 
- updated scores for revision 1400389 active rules added since last 
-mass-check
-------------------------------------------------------------------------
-r1400485 | jhardin | 2012-10-20 16:12:03 +0000 (Sat, 20 Oct 2012) | 1 line
- 
- cosmetic
-------------------------------------------------------------------------
-r1400357 | spamassassin_role | 2012-10-20 03:43:39 +0000 (Sat, 20 Oct 
-2012) | 1 line
+ Describe some of the code developed and to be released in 3.4.2
  
- updated scores for revision 1400000 active rules added since last 
-mass-check
 ------------------------------------------------------------------------
-r1400236 | mmartinec | 2012-10-19 19:13:11 +0000 (Fri, 19 Oct 2012) | 1 
+r1838511 | billcole | 2018-08-20 23:48:03 +0000 (Mon, 20 Aug 2018) | 1 
 line
  
- Change wording on IO::Socket::IP and IO::Socket::INET6 in 
-DependencyInfo.pm
-------------------------------------------------------------------------
-r1399957 | spamassassin_role | 2012-10-19 03:32:53 +0000 (Fri, 19 Oct 
-2012) | 1 line
- 
- updated scores for revision 1399554 active rules added since last 
-mass-check
-------------------------------------------------------------------------
-r1399826 | jhardin | 2012-10-18 20:07:42 +0000 (Thu, 18 Oct 2012) | 1 line
- 
- Tweak LOTSA_MONEY, add more spanish variants
+ Check for rules before using them in test
 ------------------------------------------------------------------------
-r1399735 | jhardin | 2012-10-18 16:47:59 +0000 (Thu, 18 Oct 2012) | 1 line
- 
- Add some phishing rules
-------------------------------------------------------------------------
-r1399509 | spamassassin_role | 2012-10-18 03:30:30 +0000 (Thu, 18 Oct 
-2012) | 1 line
- 
- updated scores for revision 1399152 active rules added since last 
-mass-check
-------------------------------------------------------------------------
-r1399087 | spamassassin_role | 2012-10-17 03:27:11 +0000 (Wed, 17 Oct 
-2012) | 1 line
- 
- updated scores for revision 1398698 active rules added since last 
-mass-check
-------------------------------------------------------------------------
-r1398922 | mmartinec | 2012-10-16 18:52:52 +0000 (Tue, 16 Oct 2012) | 1 
+r1838509 | kmcgrail | 2018-08-20 23:32:03 +0000 (Mon, 20 Aug 2018) | 1 
 line
  
- Bug 6840: Documentation for IPV6 in spamd inconsistent - updated docs 
-for -6
+ Updated committer and pmc list
 ------------------------------------------------------------------------
-r1398918 | mmartinec | 2012-10-16 18:39:45 +0000 (Tue, 16 Oct 2012) | 1 
+r1838499 | billcole | 2018-08-20 21:45:37 +0000 (Mon, 20 Aug 2018) | 1 
 line
  
- Bug 6840: Documentation for IPV6 in spamd inconsistent - update docs for 
-option -A
+ backport trunk sa-compile and t/sa_compile.t fixes
 ------------------------------------------------------------------------
-r1398910 | mmartinec | 2012-10-16 18:16:58 +0000 (Tue, 16 Oct 2012) | 1 
+r1838491 | kmcgrail | 2018-08-20 20:52:44 +0000 (Mon, 20 Aug 2018) | 1 
 line
  
- minor: another case of an undef warning in DependencyInfo.pm (some old 
-modules do not provide a VERSION method)
+ rewrite of razor2 test and a sample email for testing
 ------------------------------------------------------------------------
-r1398905 | mmartinec | 2012-10-16 18:04:51 +0000 (Tue, 16 Oct 2012) | 1 
+r1838489 | kmcgrail | 2018-08-20 20:52:11 +0000 (Mon, 20 Aug 2018) | 1 
 line
  
- Bug 6841: Add options -4 and -6 to spamassassin, use IO::Socket::IP for 
-DNS if available
-------------------------------------------------------------------------
-r1398717 | axb | 2012-10-16 10:21:09 +0000 (Tue, 16 Oct 2012) | 1 line
- 
- added AXB_BULK_ECO (how many certified bulkers land in spam corpus?)
-------------------------------------------------------------------------
-r1398628 | spamassassin_role | 2012-10-16 03:26:50 +0000 (Tue, 16 Oct 
-2012) | 1 line
- 
- updated scores for revision 1398217 active rules added since last 
-mass-check
-------------------------------------------------------------------------
-r1398179 | spamassassin_role | 2012-10-15 03:18:49 +0000 (Mon, 15 Oct 
-2012) | 1 line
- 
- updated scores for revision 1398037 active rules added since last 
-mass-check
-------------------------------------------------------------------------
-r1397997 | spamassassin_role | 2012-10-14 03:26:29 +0000 (Sun, 14 Oct 
-2012) | 1 line
- 
- updated scores for revision 1397802 active rules added since last 
-mass-check
-------------------------------------------------------------------------
-r1397764 | spamassassin_role | 2012-10-13 03:21:09 +0000 (Sat, 13 Oct 
-2012) | 1 line
- 
- updated scores for revision 1397470 active rules added since last 
-mass-check
-------------------------------------------------------------------------
-r1397433 | jhardin | 2012-10-12 04:38:43 +0000 (Fri, 12 Oct 2012) | 1 line
- 
- Add a rule to detect spams passed by Bug#6845
+ rewrite of razor2 test and a sample email for testing
 ------------------------------------------------------------------------
-r1397424 | spamassassin_role | 2012-10-12 03:35:14 +0000 (Fri, 12 Oct 
-2012) | 1 line
- 
- updated scores for revision 1396949 active rules added since last 
-mass-check
-------------------------------------------------------------------------
-r1397075 | jhardin | 2012-10-11 14:28:12 +0000 (Thu, 11 Oct 2012) | 1 line
- 
- Bug 6845: fix parsing of multipart MIME when the first body content 
-lines could be incorrectly interpreted as MIME headers
-------------------------------------------------------------------------
-r1396895 | spamassassin_role | 2012-10-11 03:24:02 +0000 (Thu, 11 Oct 
-2012) | 1 line
- 
- updated scores for revision 1396513 active rules added since last 
-mass-check
-------------------------------------------------------------------------
-r1396714 | mmartinec | 2012-10-10 18:04:37 +0000 (Wed, 10 Oct 2012) | 1 
+r1838485 | kmcgrail | 2018-08-20 20:07:49 +0000 (Mon, 20 Aug 2018) | 1 
 line
  
- Plugin/DCC: avoid two undef warnings when dcc progs are not available, 
-avoid runtime formats when a sprintf form of a dbg() call is used
+ removing prototype on bgread for PerlCritic
 ------------------------------------------------------------------------
-r1396626 | mmartinec | 2012-10-10 14:56:39 +0000 (Wed, 10 Oct 2012) | 1 
+r1838443 | kmcgrail | 2018-08-20 17:39:25 +0000 (Mon, 20 Aug 2018) | 1 
 line
  
- Bug 6841 - Spamd cannot listen to more than one IP address (or to v4/v6 
-at the same time)
-------------------------------------------------------------------------
-r1396456 | spamassassin_role | 2012-10-10 03:16:43 +0000 (Wed, 10 Oct 
-2012) | 1 line
- 
- updated scores for revision 1395916 active rules added since last 
-mass-check
+ moved rules and rules-extra to trunk-only for 3.4 and continue 
+streamlining build process
 ------------------------------------------------------------------------
-r1396031 | mmartinec | 2012-10-09 13:36:46 +0000 (Tue, 09 Oct 2012) | 1 
+r1838429 | kmcgrail | 2018-08-20 14:20:05 +0000 (Mon, 20 Aug 2018) | 1 
 line
  
- cosmetics: remove a few remaining redundant array/hash initializations
+ framework for 3.4.2 announcement
 ------------------------------------------------------------------------
-r1396026 | mmartinec | 2012-10-09 13:27:52 +0000 (Tue, 09 Oct 2012) | 1 
+r1838390 | kmcgrail | 2018-08-19 16:14:03 +0000 (Sun, 19 Aug 2018) | 1 
 line
  
- t/re_base_extraction.t: suppress a perl 5.16 warning: Filehandle STDIN 
-reopened as OUT only for output
+ Fixing the MANIFEST
 ------------------------------------------------------------------------
-r1395849 | spamassassin_role | 2012-10-09 03:14:21 +0000 (Tue, 09 Oct 
-2012) | 1 line
- 
- updated scores for revision 1395472 active rules added since last 
-mass-check
-------------------------------------------------------------------------
-r1395611 | kmcgrail | 2012-10-08 15:21:17 +0000 (Mon, 08 Oct 2012) | 1 
+r1838387 | kmcgrail | 2018-08-19 16:13:01 +0000 (Sun, 19 Aug 2018) | 1 
 line
  
- added plugin loops for some RBL rules  bug 6852
-------------------------------------------------------------------------
-r1395590 | jhardin | 2012-10-08 14:48:29 +0000 (Mon, 08 Oct 2012) | 1 line
- 
- Tweak LOTSA_MONEY
-------------------------------------------------------------------------
-r1395445 | spamassassin_role | 2012-10-08 03:15:42 +0000 (Mon, 08 Oct 
-2012) | 1 line
- 
- updated scores for revision 1395248 active rules added since last 
-mass-check
-------------------------------------------------------------------------
-r1395343 | jhardin | 2012-10-07 17:30:13 +0000 (Sun, 07 Oct 2012) | 1 line
- 
- Tweak LOTSA_MONEY, add more french variants
-------------------------------------------------------------------------
-r1395208 | spamassassin_role | 2012-10-07 03:12:49 +0000 (Sun, 07 Oct 
-2012) | 1 line
- 
- updated scores for revision 1394971 active rules added since last 
-mass-check
+  Bug 7591 not using this faster untaint
 ------------------------------------------------------------------------
-r1394909 | spamassassin_role | 2012-10-06 03:08:08 +0000 (Sat, 06 Oct 
-2012) | 1 line
- 
- updated scores for revision 1394411 active rules added since last 
-mass-check
-------------------------------------------------------------------------
-r1394351 | spamassassin_role | 2012-10-05 03:12:10 +0000 (Fri, 05 Oct 
-2012) | 1 line
- 
- updated scores for revision 1393956 active rules added since last 
-mass-check
-------------------------------------------------------------------------
-r1394191 | jhardin | 2012-10-04 18:24:24 +0000 (Thu, 04 Oct 2012) | 1 line
- 
- Clean up references to freemail rules and add #ifplugins
-------------------------------------------------------------------------
-r1394083 | kmcgrail | 2012-10-04 14:13:26 +0000 (Thu, 04 Oct 2012) | 1 
-line
+r1838374 | gbechis | 2018-08-19 10:10:16 +0000 (Sun, 19 Aug 2018) | 2 
+lines
  
- More regression test fails. Moved __FROM_FREEMAIL to 10_has_base.cf as 
-well
-------------------------------------------------------------------------
-r1393899 | spamassassin_role | 2012-10-04 03:11:19 +0000 (Thu, 04 Oct 
-2012) | 1 line
+ refactor some "require" code
  
- updated scores for revision 1393354 active rules added since last 
-mass-check
 ------------------------------------------------------------------------
-r1393572 | axb | 2012-10-03 15:59:58 +0000 (Wed, 03 Oct 2012) | 1 line
+r1838365 | gbechis | 2018-08-19 08:54:59 +0000 (Sun, 19 Aug 2018) | 2 
+lines
  
- added 20_bug_6848_ajb.cf
-------------------------------------------------------------------------
-r1393265 | spamassassin_role | 2012-10-03 03:03:39 +0000 (Wed, 03 Oct 
-2012) | 1 line
+ skip tests if GeoIP is installed but there are no databases available
  
- updated scores for revision 1392792 active rules added since last 
-mass-check
 ------------------------------------------------------------------------
-r1392994 | axb | 2012-10-02 15:55:09 +0000 (Tue, 02 Oct 2012) | 2 lines
+r1838364 | gbechis | 2018-08-19 08:52:11 +0000 (Sun, 19 Aug 2018) | 2 
+lines
  
-  header  __HAS_REPLY_TO moved to 10_hasbase.cf
- (att KAM: passed test)
-------------------------------------------------------------------------
-r1392900 | kmcgrail | 2012-10-02 13:08:14 +0000 (Tue, 02 Oct 2012) | 1 
-line
+ better detection of GeoIP installed modules
  
- Adding __HAS_REPLY_TO back since it is used elsewhere
 ------------------------------------------------------------------------
-r1392892 | mmartinec | 2012-10-02 12:43:14 +0000 (Tue, 02 Oct 2012) | 1 
-line
+r1837877 | gbechis | 2018-08-11 18:33:18 +0000 (Sat, 11 Aug 2018) | 2 
+lines
  
- avoid: Use of uninitialized value in pattern match (m//) at 
-.../DependencyInfo.pm line 375
-------------------------------------------------------------------------
-r1392817 | axb | 2012-10-02 09:46:34 +0000 (Tue, 02 Oct 2012) | 1 line
+ typo
  
- disabled FSL_FREEMAIL_1 / FSL_FREEMAIL_2 - This is handled by Freemail 
-plugin 
 ------------------------------------------------------------------------
-r1392794 | axb | 2012-10-02 08:52:40 +0000 (Tue, 02 Oct 2012) | 1 line
+r1837876 | gbechis | 2018-08-11 18:23:51 +0000 (Sat, 11 Aug 2018) | 3 
+lines
  
- # TrendMicro antispam outbound tagged? - could cause Fps due to dubious 
-filter quality
-------------------------------------------------------------------------
-r1392717 | spamassassin_role | 2012-10-02 03:01:14 +0000 (Tue, 02 Oct 
-2012) | 1 line
+ close file descriptors when they are no more needed
+ probably only partial fix for #7587
  
- updated scores for revision 1392240 active rules added since last 
-mass-check
 ------------------------------------------------------------------------
-r1392699 | mmartinec | 2012-10-02 00:19:47 +0000 (Tue, 02 Oct 2012) | 1 
-line
+r1837466 | gbechis | 2018-08-05 13:39:41 +0000 (Sun, 05 Aug 2018) | 4 
+lines
  
- Bug 6842 - Spamc should have an option to only try v4 addresses when 
-hostnames are specified with -d ... implemented options -4 and -6 to spamc
-------------------------------------------------------------------------
-r1392178 | spamassassin_role | 2012-10-01 03:14:03 +0000 (Mon, 01 Oct 
-2012) | 1 line
+ Starting from 04/01/2018 GeoLite Legacy databases have been 
+discontinued.      
+ Add optional support to new Maxmind database type (GeoIP2).
+ fixes bz #7529
  
- updated scores for revision 1391968 active rules added since last 
-mass-check
 ------------------------------------------------------------------------
-r1391941 | spamassassin_role | 2012-09-30 02:56:49 +0000 (Sun, 30 Sep 
-2012) | 1 line
+r1837465 | gbechis | 2018-08-05 13:38:31 +0000 (Sun, 05 Aug 2018) | 8 
+lines
  
- updated scores for revision 1391774 active rules added since last 
-mass-check
-------------------------------------------------------------------------
-r1391738 | spamassassin_role | 2012-09-29 03:02:16 +0000 (Sat, 29 Sep 
-2012) | 1 line
+ Starting from 04/01/2018 GeoLite Legacy databases have been 
+discontinued.      
+ Add optional support to new Maxmind database type (GeoIP2).
+ In addiction to that add support also to IP::Country::DB_File database;
+ IP::Country::DB_File database is created from official 
+Ripe/Arin/Afrinic/... 
+ data, it's faster than IP::Country::Fast on updating a database and it 
+supports ipv6.
  
- updated scores for revision 1391368 active rules added since last 
-mass-check
-------------------------------------------------------------------------
-r1391669 | axb | 2012-09-28 21:49:39 +0000 (Fri, 28 Sep 2012) | 1 line
+ fixes bz #7529
  
- enabled AXB_XM_FORGED_OL2600
 ------------------------------------------------------------------------
-r1391287 | spamassassin_role | 2012-09-28 03:08:53 +0000 (Fri, 28 Sep 
-2012) | 1 line
+r1836883 | gbechis | 2018-07-28 09:38:39 +0000 (Sat, 28 Jul 2018) | 3 
+lines
  
- updated scores for revision 1390892 active rules added since last 
-mass-check
-------------------------------------------------------------------------
-r1391000 | kmcgrail | 2012-09-27 13:25:01 +0000 (Thu, 27 Sep 2012) | 1 
-line
+ Add possibility to match multiple rules
+ for a single uri, bz #7595
  
- removing SUBJ_YOUR_DEBT from all files due to poor S/O
 ------------------------------------------------------------------------
-r1390968 | kmcgrail | 2012-09-27 12:33:12 +0000 (Thu, 27 Sep 2012) | 1 
-line
+r1836855 | gbechis | 2018-07-27 18:03:13 +0000 (Fri, 27 Jul 2018) | 2 
+lines
  
- removing SUBJ_YOUR_DEBT due to poor S/O
-------------------------------------------------------------------------
-r1390871 | axb | 2012-09-27 07:50:47 +0000 (Thu, 27 Sep 2012) | 1 line
+ improve tests
  
- Initial "automasscheck-minimal" commit - needs testing and  documentation
 ------------------------------------------------------------------------
-r1390870 | axb | 2012-09-27 07:49:30 +0000 (Thu, 27 Sep 2012) | 1 line
+r1836516 | gbechis | 2018-07-23 21:23:37 +0000 (Mon, 23 Jul 2018) | 2 
+lines
  
- Initial "automasscheck-minimal" commit - needs testing and  documentation
-------------------------------------------------------------------------
-r1390866 | axb | 2012-09-27 07:01:16 +0000 (Thu, 27 Sep 2012) | 1 line
+ Add Mail::SpamAssassin::Plugin::URILocalBL regression tests
  
- disabled FSL_RCVD_USER to avoid overlap similar rule with better hit rate
 ------------------------------------------------------------------------
-r1390861 | axb | 2012-09-27 06:19:19 +0000 (Thu, 27 Sep 2012) | 1 line
+r1836275 | gbechis | 2018-07-19 14:19:48 +0000 (Thu, 19 Jul 2018) | 2 
+lines
  
- Disabled overlapping rules - disabled ignored score entries
-------------------------------------------------------------------------
-r1390817 | spamassassin_role | 2012-09-27 03:06:02 +0000 (Thu, 27 Sep 
-2012) | 1 line
+ Mail::SpamAssassin::Plugin::RelayCountry regression tests
  
- updated scores for revision 1390330 active rules added since last 
-mass-check
 ------------------------------------------------------------------------
-r1390263 | spamassassin_role | 2012-09-26 02:57:33 +0000 (Wed, 26 Sep 
-2012) | 1 line
+r1835030 | gbechis | 2018-07-03 22:20:19 +0000 (Tue, 03 Jul 2018) | 2 
+lines
  
- updated scores for revision 1389758 active rules added since last 
-mass-check
-------------------------------------------------------------------------
-r1389694 | spamassassin_role | 2012-09-25 03:07:48 +0000 (Tue, 25 Sep 
-2012) | 1 line
+ make it work even if SA is not installed
  
- updated scores for revision 1389247 active rules added since last 
-mass-check
 ------------------------------------------------------------------------
-r1389191 | spamassassin_role | 2012-09-24 03:04:12 +0000 (Mon, 24 Sep 
-2012) | 1 line
+r1834725 | gbechis | 2018-06-30 07:01:43 +0000 (Sat, 30 Jun 2018) | 2 
+lines
  
- updated scores for revision 1388977 active rules added since last 
-mass-check
-------------------------------------------------------------------------
-r1388981 | axb | 2012-09-23 08:58:46 +0000 (Sun, 23 Sep 2012) | 1 line
+ typo in man page
  
- added ukrpost.ua
 ------------------------------------------------------------------------
-r1388951 | spamassassin_role | 2012-09-23 03:10:10 +0000 (Sun, 23 Sep 
-2012) | 1 line
+r1834723 | gbechis | 2018-06-30 06:37:15 +0000 (Sat, 30 Jun 2018) | 3 
+lines
  
- updated scores for revision 1388752 active rules added since last 
-mass-check
-------------------------------------------------------------------------
-r1388732 | spamassassin_role | 2012-09-22 03:15:14 +0000 (Sat, 22 Sep 
-2012) | 1 line
+ correct syntax for GRANT with PostgreSQL
+ bz 7281
  
- updated scores for revision 1388377 active rules added since last 
-mass-check
 ------------------------------------------------------------------------
-r1388310 | spamassassin_role | 2012-09-21 03:14:46 +0000 (Fri, 21 Sep 
-2012) | 1 line
+r1834722 | gbechis | 2018-06-30 06:12:21 +0000 (Sat, 30 Jun 2018) | 5 
+lines
  
- updated scores for revision 1387911 active rules added since last 
-mass-check
-------------------------------------------------------------------------
-r1387848 | spamassassin_role | 2012-09-20 03:23:37 +0000 (Thu, 20 Sep 
-2012) | 1 line
+ remove an extra blank line put on the MIME-parts
+ array. That way the resultant email analized
+ by SA was a bit different from the original one.
+ bz 6708
  
- updated scores for revision 1387490 active rules added since last 
-mass-check
 ------------------------------------------------------------------------
-r1387594 | mmartinec | 2012-09-19 13:42:42 +0000 (Wed, 19 Sep 2012) | 1 
+r1834452 | billcole | 2018-06-26 17:37:23 +0000 (Tue, 26 Jun 2018) | 1 
 line
  
- Bug 6837: (was: spamd does not require IO::Socket::IP) - spamd reports 
-failed eval attempt in a required module as an error
-------------------------------------------------------------------------
-r1387505 | axb | 2012-09-19 09:45:13 +0000 (Wed, 19 Sep 2012) | 1 line
- 
- disabled - bad performance/hit rate
-------------------------------------------------------------------------
-r1387440 | spamassassin_role | 2012-09-19 03:14:12 +0000 (Wed, 19 Sep 
-2012) | 1 line
- 
- updated scores for revision 1387055 active rules added since last 
-mass-check
-------------------------------------------------------------------------
-r1387137 | axb | 2012-09-18 13:15:54 +0000 (Tue, 18 Sep 2012) | 1 line
- 
- removed forced scores for disabled rules (mainly HS_*)
-------------------------------------------------------------------------
-r1386993 | axb | 2012-09-18 05:40:15 +0000 (Tue, 18 Sep 2012) | 3 lines
- 
- removed
- publish DNS_FROM_RFC_BOGUSMX
- publish DNS_FROM_RFC_DSN
-------------------------------------------------------------------------
-r1386975 | spamassassin_role | 2012-09-18 03:15:19 +0000 (Tue, 18 Sep 
-2012) | 1 line
- 
- updated scores for revision 1386514 active rules added since last 
-mass-check
-------------------------------------------------------------------------
-r1386456 | spamassassin_role | 2012-09-17 03:13:24 +0000 (Mon, 17 Sep 
-2012) | 1 line
- 
- updated scores for revision 1385232 active rules added since last 
-mass-check
-------------------------------------------------------------------------
-r1385211 | spamassassin_role | 2012-09-16 03:21:55 +0000 (Sun, 16 Sep 
-2012) | 1 line
- 
- updated scores for revision 1385031 active rules added since last 
-mass-check
-------------------------------------------------------------------------
-r1385127 | axb | 2012-09-15 17:02:56 +0000 (Sat, 15 Sep 2012) | 1 line
- 
- removed rfc-ignorant.org
-------------------------------------------------------------------------
-r1385004 | spamassassin_role | 2012-09-15 03:24:55 +0000 (Sat, 15 Sep 
-2012) | 1 line
- 
- updated scores for revision 1384686 active rules added since last 
-mass-check
-------------------------------------------------------------------------
-r1384667 | axb | 2012-09-14 07:27:53 +0000 (Fri, 14 Sep 2012) | 1 line
- 
- added "ifplugin Mail::SpamAssassin::Plugin::Bayes" in lang files
+ Test for bug 7591
 ------------------------------------------------------------------------
-r1384631 | spamassassin_role | 2012-09-14 03:17:55 +0000 (Fri, 14 Sep 
-2012) | 1 line
- 
- updated scores for revision 1384236 active rules added since last 
-mass-check
-------------------------------------------------------------------------
-r1384196 | spamassassin_role | 2012-09-13 03:28:05 +0000 (Thu, 13 Sep 
-2012) | 1 line
- 
- updated scores for revision 1383849 active rules added since last 
-mass-check
-------------------------------------------------------------------------
-r1383742 | spamassassin_role | 2012-09-12 03:14:16 +0000 (Wed, 12 Sep 
-2012) | 1 line
- 
- updated scores for revision 1383293 active rules added since last 
-mass-check
-------------------------------------------------------------------------
-r1383230 | spamassassin_role | 2012-09-11 03:19:31 +0000 (Tue, 11 Sep 
-2012) | 1 line
- 
- updated scores for revision 1382695 active rules added since last 
-mass-check
-------------------------------------------------------------------------
-r1382632 | spamassassin_role | 2012-09-10 03:23:24 +0000 (Mon, 10 Sep 
-2012) | 1 line
- 
- updated scores for revision 1382427 active rules added since last 
-mass-check
-------------------------------------------------------------------------
-r1382394 | spamassassin_role | 2012-09-09 03:22:12 +0000 (Sun, 09 Sep 
-2012) | 1 line
- 
- updated scores for revision 1382249 active rules added since last 
-mass-check
-------------------------------------------------------------------------
-r1382239 | jhardin | 2012-09-08 04:36:43 +0000 (Sat, 08 Sep 2012) | 1 line
- 
- Add rules-all debug channel: list rule name before execution to find 
-runaway rule
-------------------------------------------------------------------------
-r1382238 | jhardin | 2012-09-08 04:25:20 +0000 (Sat, 08 Sep 2012) | 1 line
- 
- __FROM_12LTRDOM_1 FP reduction
-------------------------------------------------------------------------
-r1382228 | spamassassin_role | 2012-09-08 03:09:51 +0000 (Sat, 08 Sep 
-2012) | 1 line
- 
- updated scores for revision 1381936 active rules added since last 
-mass-check
-------------------------------------------------------------------------
-r1382118 | kmcgrail | 2012-09-07 18:35:25 +0000 (Fri, 07 Sep 2012) | 1 
+r1834327 | billcole | 2018-06-25 13:34:44 +0000 (Mon, 25 Jun 2018) | 1 
 line
  
- Added overlap meta rule for BILLION_DOLLARS and US_DOLLARS_3
+ REALLY revert whitewash fix of t/idn_dots.t
 ------------------------------------------------------------------------
-r1381846 | spamassassin_role | 2012-09-07 03:10:48 +0000 (Fri, 07 Sep 
-2012) | 1 line
- 
- updated scores for revision 1381532 active rules added since last 
-mass-check
-------------------------------------------------------------------------
-r1381591 | mmartinec | 2012-09-06 13:17:24 +0000 (Thu, 06 Sep 2012) | 1 
+r1834325 | billcole | 2018-06-25 13:30:17 +0000 (Mon, 25 Jun 2018) | 1 
 line
  
- Bug 6830: check_body_length - provide a has_check_body_length feature 
-test capability, deal with truncated messages
-------------------------------------------------------------------------
-r1381483 | axb | 2012-09-06 07:07:09 +0000 (Thu, 06 Sep 2012) | 1 line
- 
- updated descriptions as per SA users thread + KAM comments
-------------------------------------------------------------------------
-r1381466 | spamassassin_role | 2012-09-06 03:06:19 +0000 (Thu, 06 Sep 
-2012) | 1 line
- 
- updated scores for revision 1381077 active rules added since last 
-mass-check
+ Revert whitewash fix of t/idn_dots.t
 ------------------------------------------------------------------------
-r1381251 | jhardin | 2012-09-05 17:09:44 +0000 (Wed, 05 Sep 2012) | 1 line
- 
- Limit score generated for FILL_THIS_FORM_SHORT
-------------------------------------------------------------------------
-r1380958 | spamassassin_role | 2012-09-05 03:05:38 +0000 (Wed, 05 Sep 
-2012) | 1 line
- 
- updated scores for revision 1380492 active rules added since last 
-mass-check
-------------------------------------------------------------------------
-r1380441 | kmcgrail | 2012-09-04 03:16:41 +0000 (Tue, 04 Sep 2012) | 1 
+r1834218 | billcole | 2018-06-23 17:21:42 +0000 (Sat, 23 Jun 2018) | 1 
 line
  
- Adding test for version 3.4 for eval for body length
-------------------------------------------------------------------------
-r1380439 | spamassassin_role | 2012-09-04 03:06:17 +0000 (Tue, 04 Sep 
-2012) | 1 line
- 
- updated scores for revision 1380170 active rules added since last 
-mass-check
-------------------------------------------------------------------------
-r1380119 | spamassassin_role | 2012-09-03 03:08:42 +0000 (Mon, 03 Sep 
-2012) | 1 line
- 
- updated scores for revision 1379932 active rules added since last 
-mass-check
+ add 'use utf8' for older Perl
 ------------------------------------------------------------------------
-r1379912 | spamassassin_role | 2012-09-02 03:02:07 +0000 (Sun, 02 Sep 
-2012) | 1 line
- 
- updated scores for revision 1379722 active rules added since last 
-mass-check
-------------------------------------------------------------------------
-r1379563 | axb | 2012-08-31 19:55:39 +0000 (Fri, 31 Aug 2012) | 1 line
- 
- added wanadoo.fr
-------------------------------------------------------------------------
-r1378630 | jhardin | 2012-08-29 16:20:22 +0000 (Wed, 29 Aug 2012) | 1 line
- 
- Add rule for "data:" URI per 
-https://isc.sans.edu/diary.html?storyid=13996
-------------------------------------------------------------------------
-r1378186 | mmartinec | 2012-08-28 15:47:14 +0000 (Tue, 28 Aug 2012) | 1 
+r1834151 | kmcgrail | 2018-06-22 18:09:19 +0000 (Fri, 22 Jun 2018) | 1 
 line
  
- remove a (now)redundant test in listpromotable (Bug 6820)
+ Working on idn_dots.t test failures for RC4
 ------------------------------------------------------------------------
-r1377188 | spamassassin_role | 2012-08-25 03:28:44 +0000 (Sat, 25 Aug 
-2012) | 1 line
+r1833929 | gbechis | 2018-06-20 17:16:33 +0000 (Wed, 20 Jun 2018) | 3 
+lines
  
- updated scores for revision 1376865 active rules added since last 
-mass-check
-------------------------------------------------------------------------
-r1376817 | spamassassin_role | 2012-08-24 03:26:43 +0000 (Fri, 24 Aug 
-2012) | 1 line
+ silence a warning if GeoIP v6 database is not installed
+ but a v6 address is on relay headers
  
- updated scores for revision 1376408 active rules added since last 
-mass-check
 ------------------------------------------------------------------------
-r1376355 | spamassassin_role | 2012-08-23 03:21:41 +0000 (Thu, 23 Aug 
-2012) | 1 line
+r1833660 | gbechis | 2018-06-17 09:41:02 +0000 (Sun, 17 Jun 2018) | 11 
+lines
  
- updated scores for revision 1375947 active rules added since last 
-mass-check
-------------------------------------------------------------------------
-r1376090 | kmcgrail | 2012-08-22 15:10:48 +0000 (Wed, 22 Aug 2012) | 1 
-line
+ partial fix for bz 7529
+ starting from 04/01/2018, Geolite legacy databases has been
+ discontinued and they will be no more updates.
+ Add a "country_db_type" option that will let the user choose
+ between GeoIP and IP::Country::Fast databases.
+ By default GeoIP is enabled and there is still a fallback
+ on IP::Country::Fast as in previuos implementation.
  
- Adding a less than 128 byte body test rule as well
-------------------------------------------------------------------------
-r1376083 | kmcgrail | 2012-08-22 14:50:16 +0000 (Wed, 22 Aug 2012) | 1 
-line
+ IP::Country::Fast has no ipv6 support, so a better api
+ should be adopted sooner or later.
  
- Added possible improvement for check_body_length and more comments re: 
-bug 6830
 ------------------------------------------------------------------------
-r1376077 | kmcgrail | 2012-08-22 14:43:30 +0000 (Wed, 22 Aug 2012) | 1 
+r1833617 | billcole | 2018-06-15 17:33:15 +0000 (Fri, 15 Jun 2018) | 1 
 line
  
- Body Length rule for Bug 6830
-------------------------------------------------------------------------
-r1375944 | axb | 2012-08-22 08:41:51 +0000 (Wed, 22 Aug 2012) | 5 lines
- 
- Disabled
- 
-   MSHTML_6_00_2900_3199_A:  no hits at all
-   MSHTML_6_00_2900_3199_B:  no hits at all
-   MSHTML_6_00_2900_3199_C:  no hits at all
-------------------------------------------------------------------------
-r1375943 | axb | 2012-08-22 08:40:50 +0000 (Wed, 22 Aug 2012) | 6 lines
- 
- Disabled:
- 
-   FAKE_OUTBLAZE_RCVD_168:  no hits at all
-   FAKE_OUTBLAZE_RCVD_168_2:  no hits at all
-   FAKE_OUTBLAZE_RCVD_PURIN:  no hits at all
-   FAKE_OUTBLAZE_RCVD_PURIN_2:  no hits at all
-------------------------------------------------------------------------
-r1375942 | axb | 2012-08-22 08:39:10 +0000 (Wed, 22 Aug 2012) | 5 lines
- 
-   GAMES:  no hits at all
-   __GAMES_BODY:  no hits at all
-       # used in: GAMES
-   __GAMES_SUBJ:  no hits at all
-       # used in: GAMES
+ Reverting prematurely-committed changes
 ------------------------------------------------------------------------
-r1375941 | axb | 2012-08-22 08:38:07 +0000 (Wed, 22 Aug 2012) | 2 lines
- 
- GMD_R_DOT_HTML:  no hits at all
- JM_MID_STORM:  no hits at all
-------------------------------------------------------------------------
-r1375884 | spamassassin_role | 2012-08-22 03:16:18 +0000 (Wed, 22 Aug 
-2012) | 1 line
- 
- updated scores for revision 1375431 active rules added since last 
-mass-check
-------------------------------------------------------------------------
-r1375379 | spamassassin_role | 2012-08-21 03:15:55 +0000 (Tue, 21 Aug 
-2012) | 1 line
- 
- updated scores for revision 1374945 active rules added since last 
-mass-check
-------------------------------------------------------------------------
-r1375208 | kmcgrail | 2012-08-20 20:30:34 +0000 (Mon, 20 Aug 2012) | 1 
+r1833615 | billcole | 2018-06-15 17:23:05 +0000 (Fri, 15 Jun 2018) | 1 
 line
  
- added some error checking and emails to the do-stable-update-with-scores
+ Corrected link to Pyzor documentation site, replacing OTHER dead SF link.
 ------------------------------------------------------------------------
-r1375096 | jhardin | 2012-08-20 16:38:33 +0000 (Mon, 20 Aug 2012) | 1 line
+r1832678 | gbechis | 2018-06-01 11:15:23 +0000 (Fri, 01 Jun 2018) | 2 
+lines
  
- Add possible malware/phishing sign per 
-http://isc.sans.edu/diary.html?storyid=13921
-------------------------------------------------------------------------
-r1375095 | jhardin | 2012-08-20 16:37:18 +0000 (Mon, 20 Aug 2012) | 1 line
+ fix custom headers length, fix another fp via Google Groups
  
- Tweak LOTSA_MONEY
 ------------------------------------------------------------------------
-r1374957 | axb | 2012-08-20 09:30:27 +0000 (Mon, 20 Aug 2012) | 15 lines
- 
- removed "publish" for disabled out rules
- 
- publish HS_DRUG_DOLLAR_1
- publish HS_DRUG_DOLLAR_2
- publish HS_DRUG_DOLLAR_3
- publish HS_DRUG_DOLLAR_MANY
- publish HS_FORGED_OE_FW
- publish HS_GETMEOFF
- publish HS_INDEX_PARAM
- publish HS_MEETUP_FOR_SEX
- publish HS_SUBJ_NEW_SOFTWARE
- publish HS_SUBJ_ONLINE_PHARMACEUTICAL
- publish HS_VPXL
- 
+r1831955 | gbechis | 2018-05-21 06:24:55 +0000 (Mon, 21 May 2018) | 2 
+lines
  
-------------------------------------------------------------------------
-r1374904 | spamassassin_role | 2012-08-20 03:19:37 +0000 (Mon, 20 Aug 
-2012) | 1 line
+ more generic regexp to match ipv6
  
- updated scores for revision 1374711 active rules added since last 
-mass-check
 ------------------------------------------------------------------------
-r1374505 | spamassassin_role | 2012-08-18 03:14:43 +0000 (Sat, 18 Aug 
-2012) | 1 line
+r1831837 | gbechis | 2018-05-18 09:04:10 +0000 (Fri, 18 May 2018) | 2 
+lines
  
- updated scores for revision 1374176 active rules added since last 
-mass-check
-------------------------------------------------------------------------
-r1374213 | mmartinec | 2012-08-17 11:58:39 +0000 (Fri, 17 Aug 2012) | 1 
-line
+ Unbreak FORGED_GMAIL_RCVD
  
- Bug 6829: Avoid unsightly warnings in SA::Util::DependencyInfo when gpg 
-is missing
 ------------------------------------------------------------------------
-r1374131 | spamassassin_role | 2012-08-17 03:07:43 +0000 (Fri, 17 Aug 
-2012) | 1 line
+r1831826 | gbechis | 2018-05-18 07:13:02 +0000 (Fri, 18 May 2018) | 2 
+lines
  
- updated scores for revision 1373758 active rules added since last 
-mass-check
-------------------------------------------------------------------------
-r1373716 | spamassassin_role | 2012-08-16 03:19:25 +0000 (Thu, 16 Aug 
-2012) | 1 line
+ Fix another fp on FORGED_GMAIL_RCVD rule
  
- updated scores for revision 1373273 active rules added since last 
-mass-check
 ------------------------------------------------------------------------
-r1373202 | kmcgrail | 2012-08-15 04:04:03 +0000 (Wed, 15 Aug 2012) | 1 
-line
+r1831443 | gbechis | 2018-05-11 19:44:30 +0000 (Fri, 11 May 2018) | 2 
+lines
  
- change to mass-check to get ArchiteIterator sane defaults like the from 
-separator
-------------------------------------------------------------------------
-r1373199 | spamassassin_role | 2012-08-15 03:10:18 +0000 (Wed, 15 Aug 
-2012) | 1 line
+ fix fp for FORGED_GMAIL_RCVD rule
  
- updated scores for revision 1372782 active rules added since last 
-mass-check
 ------------------------------------------------------------------------
-r1373194 | kmcgrail | 2012-08-15 02:24:04 +0000 (Wed, 15 Aug 2012) | 1 
+r1831329 | billcole | 2018-05-10 12:08:55 +0000 (Thu, 10 May 2018) | 1 
 line
  
- Net::Patricia not as flexible as NetAddr::IP with overlapping networks.  
-Updated documentation to help make this more apparent and also fixed 
-trust_path.t to avoid tests for incompatible syntaxes.
+ revert r1823175
 ------------------------------------------------------------------------
-r1373030 | mmartinec | 2012-08-14 19:06:35 +0000 (Tue, 14 Aug 2012) | 1 
+r1831273 | billcole | 2018-05-09 17:37:07 +0000 (Wed, 09 May 2018) | 1 
 line
  
- Bug 6819, more cases
+ Improve spamd PID detection with a fixed pidfile
 ------------------------------------------------------------------------
-r1372996 | mmartinec | 2012-08-14 17:54:31 +0000 (Tue, 14 Aug 2012) | 1 
+r1831272 | billcole | 2018-05-09 17:35:07 +0000 (Wed, 09 May 2018) | 1 
 line
  
- minor docs fix in RelayCountry.pm
-------------------------------------------------------------------------
-r1372973 | spamassassin_role | 2012-08-14 17:11:20 +0000 (Tue, 14 Aug 
-2012) | 1 line
- 
- updated scores for revision 1372782 active rules added since last 
-mass-check
-------------------------------------------------------------------------
-r1372304 | hege | 2012-08-13 08:06:26 +0000 (Mon, 13 Aug 2012) | 2 lines
- 
- Bug 6823: Last body line skipped if multipart end boundary missing
- 
-------------------------------------------------------------------------
-r1372248 | spamassassin_role | 2012-08-13 03:08:27 +0000 (Mon, 13 Aug 
-2012) | 1 line
- 
- updated scores for revision 1372057 active rules added since last 
-mass-check
-------------------------------------------------------------------------
-r1372142 | axb | 2012-08-12 16:15:50 +0000 (Sun, 12 Aug 2012) | 1 line
- 
- added outlook.com
-------------------------------------------------------------------------
-r1372141 | axb | 2012-08-12 16:14:19 +0000 (Sun, 12 Aug 2012) | 1 line
- 
- disabled lookups
-------------------------------------------------------------------------
-r1372140 | axb | 2012-08-12 16:13:19 +0000 (Sun, 12 Aug 2012) | 1 line
- 
- disabled lookups
+ Decouple mass-check from "base" perl
 ------------------------------------------------------------------------
-r1372139 | axb | 2012-08-12 16:13:01 +0000 (Sun, 12 Aug 2012) | 1 line
- 
- disabled lookups
-------------------------------------------------------------------------
-r1372135 | axb | 2012-08-12 15:48:11 +0000 (Sun, 12 Aug 2012) | 2 lines
- 
- disabled as per 
-https://issues.apache.org/SpamAssassin/show_bug.cgi?id=6220
+r1831073 | gbechis | 2018-05-07 06:37:50 +0000 (Mon, 07 May 2018) | 3 
+lines
  
-------------------------------------------------------------------------
-r1372051 | kmcgrail | 2012-08-12 06:48:47 +0000 (Sun, 12 Aug 2012) | 1 
-line
+ Enforce a C locale when logging to stder
+ bz #7305
  
- more logic for rpm-based perl and lib64 issues - bug 6809
 ------------------------------------------------------------------------
-r1372048 | spamassassin_role | 2012-08-12 02:59:18 +0000 (Sun, 12 Aug 
-2012) | 1 line
+r1829671 | gbechis | 2018-04-20 17:45:03 +0000 (Fri, 20 Apr 2018) | 2 
+lines
  
- updated scores for revision 1371891 active rules added since last 
-mass-check
-------------------------------------------------------------------------
-r1371943 | axb | 2012-08-11 13:08:37 +0000 (Sat, 11 Aug 2012) | 1 line
+ Test spamc also with --option=value case
  
- Updated missing .ni  entries
 ------------------------------------------------------------------------
-r1370995 | kmcgrail | 2012-08-08 22:24:00 +0000 (Wed, 08 Aug 2012) | 1 
-line
+r1829628 | gbechis | 2018-04-20 06:48:21 +0000 (Fri, 20 Apr 2018) | 3 
+lines
  
- Added some small debug texts
-------------------------------------------------------------------------
-r1370940 | kmcgrail | 2012-08-08 20:17:17 +0000 (Wed, 08 Aug 2012) | 1 
-line
+ too much free(3) will kill --reporttype=option handling
+ problem spotted by Reio Remma, thanks
  
- Added warning that these dir is possibly replaced by 
-rulesrc/sandbox/dos/new-rule-score-gen/
 ------------------------------------------------------------------------
-r1370938 | kmcgrail | 2012-08-08 20:16:05 +0000 (Wed, 08 Aug 2012) | 1 
-line
+r1829033 | gbechis | 2018-04-13 06:45:35 +0000 (Fri, 13 Apr 2018) | 5 
+lines
  
- updating the correct generate-new-scores file
-------------------------------------------------------------------------
-r1370926 | kmcgrail | 2012-08-08 20:05:01 +0000 (Wed, 08 Aug 2012) | 1 
-line
+ Add an option to score uris per continent.
+ Possible continent codes are:
+ af, as, eu, na, oc, sa for Africa, Asia, Europe, North America, 
+ Oceania  and South America.
  
- changed masscheck to use 84 months of HAM up from 72
 ------------------------------------------------------------------------
-r1370900 | kmcgrail | 2012-08-08 19:17:57 +0000 (Wed, 08 Aug 2012) | 1 
+r1828218 | kmcgrail | 2018-04-03 11:28:11 +0000 (Tue, 03 Apr 2018) | 1 
 line
  
- small misspelling
+ Adding Manifest items fo3 3.42
 ------------------------------------------------------------------------
-r1370799 | kmcgrail | 2012-08-08 15:09:06 +0000 (Wed, 08 Aug 2012) | 1 
+r1826916 | billcole | 2018-03-16 03:15:19 +0000 (Fri, 16 Mar 2018) | 1 
 line
  
- adding some debug to  generate-new-scores for bug 6821
+ added optional support for SHA256 in addition to or instead of SHA1 
+validation
 ------------------------------------------------------------------------
-r1370784 | kmcgrail | 2012-08-08 14:24:01 +0000 (Wed, 08 Aug 2012) | 1 
-line
+r1826822 | gbechis | 2018-03-15 14:27:09 +0000 (Thu, 15 Mar 2018) | 2 
+lines
  
- Adding parens on regex to define $1 for bug 6820
-------------------------------------------------------------------------
-r1370753 | kmcgrail | 2012-08-08 13:11:42 +0000 (Wed, 08 Aug 2012) | 1 
-line
+ fix for perl older than 5.24
  
- DEBUG for bug 6820
 ------------------------------------------------------------------------
-r1369788 | axb | 2012-08-06 11:40:01 +0000 (Mon, 06 Aug 2012) | 3 lines
+r1826771 | gbechis | 2018-03-15 07:33:00 +0000 (Thu, 15 Mar 2018) | 4 
+lines
  
- util_rb_2tld no-ip.co.uk should be 
+ If there are rules present in score but not in .cf files a warning is 
+printed,
+ shut up the warning.
+ bz 7535
  
- util_rb_3tld no-ip.co.uk
 ------------------------------------------------------------------------
-r1369746 | axb | 2012-08-06 08:20:30 +0000 (Mon, 06 Aug 2012) | 9 lines
- 
- added:
+r1826742 | gbechis | 2018-03-14 17:36:30 +0000 (Wed, 14 Mar 2018) | 3 
+lines
  
- util_rb_2tld no-ip.biz
- util_rb_2tld no-ip.ca
- util_rb_2tld no-ip.co.uk
- util_rb_2tld no-ip.com
- util_rb_2tld no-ip.info
- util_rb_2tld no-ip.net
- util_rb_2tld no-ip.org 
-------------------------------------------------------------------------
-r1369738 | axb | 2012-08-06 07:25:05 +0000 (Mon, 06 Aug 2012) | 2 lines
+ detect more http[s] url mismatches
+ bz 6977
  
- Added co.cm com.cm net.cm
- (http://wiki.rrpproxy.net/CM)
 ------------------------------------------------------------------------
-r1367840 | khopesh | 2012-08-01 01:39:21 +0000 (Wed, 01 Aug 2012) | 1 line
+r1826740 | gbechis | 2018-03-14 17:26:02 +0000 (Wed, 14 Mar 2018) | 2 
+lines
  
- misc FP resolution for URI_HEX
-------------------------------------------------------------------------
-r1367837 | khopesh | 2012-08-01 01:38:45 +0000 (Wed, 01 Aug 2012) | 1 line
+ fix utf8 mode
  
- bug 6814
 ------------------------------------------------------------------------
-r1367634 | mmartinec | 2012-07-31 15:59:09 +0000 (Tue, 31 Jul 2012) | 1 
+r1826582 | billcole | 2018-03-12 17:49:59 +0000 (Mon, 12 Mar 2018) | 1 
 line
  
- Bug 6819: Avoiding some DNS lookup failure warnings
+ Update documentation of 'eval' rule method source, sanity-check method 
+calls. Fixes Bug #7558
 ------------------------------------------------------------------------
-r1367116 | mmartinec | 2012-07-30 15:20:40 +0000 (Mon, 30 Jul 2012) | 1 
+r1826356 | billcole | 2018-03-09 16:02:43 +0000 (Fri, 09 Mar 2018) | 1 
 line
  
- Bug 6819, one more detail
+ Partial fix for bug 7558
 ------------------------------------------------------------------------
-r1366003 | jhardin | 2012-07-26 14:06:48 +0000 (Thu, 26 Jul 2012) | 1 line
- 
- Tweak LOTSA_MONEY, add more french variants
-------------------------------------------------------------------------
-r1365983 | mmartinec | 2012-07-26 13:29:26 +0000 (Thu, 26 Jul 2012) | 1 
-line
+r1826202 | gbechis | 2018-03-08 10:48:04 +0000 (Thu, 08 Mar 2018) | 3 
+lines
  
- Bug 6819: Avoiding some DNS lookup failure warnings
-------------------------------------------------------------------------
-r1365860 | jhardin | 2012-07-26 01:03:38 +0000 (Thu, 26 Jul 2012) | 1 line
+ add homedir parameter in dccproc call
+ RedHat bz 1532139 
  
- Relax HTML_ATTACH a bit, Content_Type header may not contain a filename; 
-add HTML attachment obfu malware rule for zip MIME type + html filename
 ------------------------------------------------------------------------
-r1365644 | jhardin | 2012-07-25 15:56:45 +0000 (Wed, 25 Jul 2012) | 1 line
+r1826187 | gbechis | 2018-03-08 08:17:53 +0000 (Thu, 08 Mar 2018) | 3 
+lines
  
- HDRS_LCASE FP avoidance
-------------------------------------------------------------------------
-r1365206 | mmartinec | 2012-07-24 18:25:20 +0000 (Tue, 24 Jul 2012) | 1 
-line
+ fix utf8 decoding in some corner cases
+ bz 7520
  
- fix a perl 5.17 warning about unquoted "{" in a regexp - in 20_basic.cf
 ------------------------------------------------------------------------
-r1365195 | mmartinec | 2012-07-24 18:06:16 +0000 (Tue, 24 Jul 2012) | 1 
+r1826179 | billcole | 2018-03-08 06:41:57 +0000 (Thu, 08 Mar 2018) | 1 
 line
  
- fix a perl 5.17 warning about unquoted "{" in a regexp
-------------------------------------------------------------------------
-r1362834 | axb | 2012-07-18 09:50:50 +0000 (Wed, 18 Jul 2012) | 1 line
- 
- disabled hstern "no hits at all" rules
-------------------------------------------------------------------------
-r1361596 | jhardin | 2012-07-14 21:54:55 +0000 (Sat, 14 Jul 2012) | 1 line
- 
- Add some MSGID rules to possibly help tune HDRS_LCASE
-------------------------------------------------------------------------
-r1359162 | jhardin | 2012-07-09 13:29:45 +0000 (Mon, 09 Jul 2012) | 1 line
- 
- HDRS_LCASE tuning, more LOTSA_MONEY combos, "spam bill 1618" showing up 
-again so add rules in case it gets popular
-------------------------------------------------------------------------
-r1358492 | spamassassin_role | 2012-07-07 02:54:24 +0000 (Sat, 07 Jul 
-2012) | 1 line
- 
- updated scores for revision 1358082 active rules added since last 
-mass-check
-------------------------------------------------------------------------
-r1358028 | spamassassin_role | 2012-07-06 03:00:17 +0000 (Fri, 06 Jul 
-2012) | 1 line
- 
- updated scores for revision 1357494 active rules added since last 
-mass-check
-------------------------------------------------------------------------
-r1358021 | khopesh | 2012-07-06 01:34:56 +0000 (Fri, 06 Jul 2012) | 1 line
- 
- removed copyright notice (relying upon the Berne Convention's automatic 
-copyright) to comply with 
-http://www.apache.org/dev/apply-license.html#contributor-copyright
-------------------------------------------------------------------------
-r1357834 | khopesh | 2012-07-05 19:44:58 +0000 (Thu, 05 Jul 2012) | 1 line
- 
- relicensed
-------------------------------------------------------------------------
-r1357449 | spamassassin_role | 2012-07-05 03:02:44 +0000 (Thu, 05 Jul 
-2012) | 1 line
- 
- updated scores for revision 1357175 active rules added since last 
-mass-check
-------------------------------------------------------------------------
-r1357280 | jhardin | 2012-07-04 14:43:04 +0000 (Wed, 04 Jul 2012) | 1 line
- 
- Reduce generated score limit on some rules poorly represented in 
-masscheck corpora until they are better tuned
-------------------------------------------------------------------------
-r1357172 | axb | 2012-07-04 08:47:16 +0000 (Wed, 04 Jul 2012) | 1 line
- 
- Disabled "no hits at all" rules
-------------------------------------------------------------------------
-r1357048 | spamassassin_role | 2012-07-04 03:02:45 +0000 (Wed, 04 Jul 
-2012) | 1 line
- 
- updated scores for revision 1356619 active rules added since last 
-mass-check
-------------------------------------------------------------------------
-r1356883 | jhardin | 2012-07-03 19:35:18 +0000 (Tue, 03 Jul 2012) | 1 line
- 
- Reduce generated score limit on some rules poorly represented in 
-masscheck corpora until they are better tuned
-------------------------------------------------------------------------
-r1356595 | axb | 2012-07-03 07:45:58 +0000 (Tue, 03 Jul 2012) | 1 line
- 
- Fix for Bug 6813
+ Fix for Bug #7557
 ------------------------------------------------------------------------
-r1356555 | spamassassin_role | 2012-07-03 03:03:05 +0000 (Tue, 03 Jul 
-2012) | 1 line
- 
- updated scores for revision 1356113 active rules added since last 
-mass-check
-------------------------------------------------------------------------
-r1356526 | jhardin | 2012-07-03 00:01:14 +0000 (Tue, 03 Jul 2012) | 1 line
- 
- More FP avoidance
-------------------------------------------------------------------------
-r1356270 | jhardin | 2012-07-02 14:54:08 +0000 (Mon, 02 Jul 2012) | 1 line
- 
- More FP avoidance
-------------------------------------------------------------------------
-r1356240 | jhardin | 2012-07-02 14:16:20 +0000 (Mon, 02 Jul 2012) | 1 line
- 
- More FP avoidance, score limits
-------------------------------------------------------------------------
-r1356060 | spamassassin_role | 2012-07-02 03:08:01 +0000 (Mon, 02 Jul 
-2012) | 1 line
- 
- updated scores for revision 1355863 active rules added since last 
-mass-check
-------------------------------------------------------------------------
-r1355764 | jhardin | 2012-06-30 16:41:40 +0000 (Sat, 30 Jun 2012) | 1 line
- 
- More FP avoidance, score limits
-------------------------------------------------------------------------
-r1355622 | spamassassin_role | 2012-06-30 02:57:53 +0000 (Sat, 30 Jun 
-2012) | 1 line
- 
- updated scores for revision 1355272 active rules added since last 
-mass-check
-------------------------------------------------------------------------
-r1355224 | spamassassin_role | 2012-06-29 03:03:45 +0000 (Fri, 29 Jun 
-2012) | 1 line
- 
- updated scores for revision 1354859 active rules added since last 
-mass-check
-------------------------------------------------------------------------
-r1354802 | spamassassin_role | 2012-06-28 02:57:52 +0000 (Thu, 28 Jun 
-2012) | 1 line
- 
- updated scores for revision 1354373 active rules added since last 
-mass-check
-------------------------------------------------------------------------
-r1354654 | mmartinec | 2012-06-27 18:15:42 +0000 (Wed, 27 Jun 2012) | 1 
+r1826177 | billcole | 2018-03-08 05:33:13 +0000 (Thu, 08 Mar 2018) | 1 
 line
  
- Bug 6803: disable test X_URIBL_Y_FFD in t/dnsbl_subtests.t, no longer 
-applies
+ Fix for bug #7556
 ------------------------------------------------------------------------
-r1354598 | mmartinec | 2012-06-27 16:01:43 +0000 (Wed, 27 Jun 2012) | 1 
-line
+r1825725 | gbechis | 2018-03-02 13:57:33 +0000 (Fri, 02 Mar 2018) | 2 
+lines
  
- Bug 6803: Add input validation to responses from DNSBL queries
-------------------------------------------------------------------------
-r1354506 | mmartinec | 2012-06-27 13:58:21 +0000 (Wed, 27 Jun 2012) | 1 
-line
+ Add HashBL (Email Blocklist (EBL), http://msbl.org/ebl.html) plugin, bz 
+#7548
  
- Bug 6805: subject_is_all_caps - strip prefixes like Re:, Fwd:
 ------------------------------------------------------------------------
-r1354161 | mmartinec | 2012-06-26 18:46:05 +0000 (Tue, 26 Jun 2012) | 1 
-line
+r1825185 | gbechis | 2018-02-24 00:37:46 +0000 (Sat, 24 Feb 2018) | 4 
+lines
  
- Bug 6808: AsyncLoop and Perl 5.16.0
-------------------------------------------------------------------------
-r1354108 | mmartinec | 2012-06-26 16:51:18 +0000 (Tue, 26 Jun 2012) | 1 
-line
+ As per rfc 5322 the time zone is a required field,
+ so a date without time zone should be considered as invalid
+ bz #6894
  
- Bug 6811 (lost one line)
 ------------------------------------------------------------------------
-r1354103 | mmartinec | 2012-06-26 16:33:53 +0000 (Tue, 26 Jun 2012) | 1 
-line
+r1825177 | gbechis | 2018-02-23 22:50:32 +0000 (Fri, 23 Feb 2018) | 3 
+lines
  
- Bug 6811: Add option to sa-learn (and ArchiveIterator) to override a 
-built-in message size limit
-------------------------------------------------------------------------
-r1354072 | mmartinec | 2012-06-26 15:49:50 +0000 (Tue, 26 Jun 2012) | 1 
-line
+ document when --mbox or --mbx parameters are needed
+ bz #6857
  
- Bug 6703 fix
 ------------------------------------------------------------------------
-r1353987 | mmartinec | 2012-06-26 12:23:34 +0000 (Tue, 26 Jun 2012) | 1 
-line
+r1825175 | gbechis | 2018-02-23 22:44:45 +0000 (Fri, 23 Feb 2018) | 4 
+lines
  
- *@survey.ebay.com signed by ebay.com: updated 60_adsp_override_dkim.cf 
-and 60_whitelist_dkim.cf
-------------------------------------------------------------------------
-r1353840 | axb | 2012-06-26 07:14:37 +0000 (Tue, 26 Jun 2012) | 2 lines
+ In OpenBSD /usr/sbin/sysctl is a symlink to /sbin/sysctl
+ fix path, no functional change
+ bz #7545
  
- See bug 6810
- removed 5/8 from RCVD_ILLEGAL_IP - allocated by Ripe. 
 ------------------------------------------------------------------------
-r1353647 | jhardin | 2012-06-25 16:42:50 +0000 (Mon, 25 Jun 2012) | 1 line
+r1825157 | gbechis | 2018-02-23 18:25:25 +0000 (Fri, 23 Feb 2018) | 5 
+lines
  
- More FP avoidance
-------------------------------------------------------------------------
-r1353067 | jhardin | 2012-06-23 05:33:16 +0000 (Sat, 23 Jun 2012) | 1 line
+ Change a couple of die calls into warnings,
+ this way  pyzor throws a python error, 
+ all other async lookups are not aborted.
+ bz #7026
  
- More FP avoidance, score limits
 ------------------------------------------------------------------------
-r1352762 | spamassassin_role | 2012-06-22 03:01:27 +0000 (Fri, 22 Jun 
-2012) | 1 line
+r1825154 | gbechis | 2018-02-23 18:17:29 +0000 (Fri, 23 Feb 2018) | 3 
+lines
  
- updated scores for revision 1352457 active rules added since last 
-mass-check
-------------------------------------------------------------------------
-r1352397 | spamassassin_role | 2012-06-21 03:00:27 +0000 (Thu, 21 Jun 
-2012) | 1 line
+ check for freemail for all emails in a Reply-To header
+ bz #6664
  
- updated scores for revision 1351995 active rules added since last 
-mass-check
 ------------------------------------------------------------------------
-r1351926 | spamassassin_role | 2012-06-20 02:59:25 +0000 (Wed, 20 Jun 
-2012) | 1 line
+r1825032 | gbechis | 2018-02-22 08:20:37 +0000 (Thu, 22 Feb 2018) | 3 
+lines
  
- updated scores for revision 1351605 active rules added since last 
-mass-check
-------------------------------------------------------------------------
-r1351564 | spamassassin_role | 2012-06-19 03:01:46 +0000 (Tue, 19 Jun 
-2012) | 1 line
+ Check if $socket is defined and print error accordingly
+ bz 7380
  
- updated scores for revision 1351242 active rules added since last 
-mass-check
 ------------------------------------------------------------------------
-r1351397 | mmartinec | 2012-06-18 16:01:18 +0000 (Mon, 18 Jun 2012) | 1 
+r1825018 | billcole | 2018-02-21 23:46:08 +0000 (Wed, 21 Feb 2018) | 1 
 line
  
- nitpick, spelling
-------------------------------------------------------------------------
-r1351382 | jhardin | 2012-06-18 15:11:28 +0000 (Mon, 18 Jun 2012) | 1 line
- 
- Fix make_install.t 64-bit libs tests for Gentoo
-------------------------------------------------------------------------
-r1351202 | spamassassin_role | 2012-06-18 03:00:10 +0000 (Mon, 18 Jun 
-2012) | 1 line
- 
- updated scores for revision 1351075 active rules added since last 
-mass-check
+ Group switching code for bugs #7554 and #7555
 ------------------------------------------------------------------------
-r1351197 | jhardin | 2012-06-18 02:17:27 +0000 (Mon, 18 Jun 2012) | 1 line
+r1824931 | gbechis | 2018-02-21 07:33:02 +0000 (Wed, 21 Feb 2018) | 2 
+lines
  
- More FP avoidance
-------------------------------------------------------------------------
-r1350952 | jhardin | 2012-06-16 16:21:14 +0000 (Sat, 16 Jun 2012) | 1 line
+ Add an example of a rule that matches an ASN, bz 6929
  
- More FP avoidance
 ------------------------------------------------------------------------
-r1350949 | jhardin | 2012-06-16 16:12:37 +0000 (Sat, 16 Jun 2012) | 1 line
+r1824688 | gbechis | 2018-02-18 18:35:40 +0000 (Sun, 18 Feb 2018) | 2 
+lines
  
- More FP avoidance
-------------------------------------------------------------------------
-r1350948 | jhardin | 2012-06-16 16:05:31 +0000 (Sat, 16 Jun 2012) | 1 line
+ fix all pod errors spotted in bz 7168 and many more
  
- More FP avoidance
 ------------------------------------------------------------------------
-r1350846 | spamassassin_role | 2012-06-16 03:02:09 +0000 (Sat, 16 Jun 
-2012) | 1 line
+r1824577 | gbechis | 2018-02-17 09:47:43 +0000 (Sat, 17 Feb 2018) | 2 
+lines
  
- updated scores for revision 1350536 active rules added since last 
-mass-check
-------------------------------------------------------------------------
-r1350842 | kmcgrail | 2012-06-16 02:50:07 +0000 (Sat, 16 Jun 2012) | 1 
-line
+ Fix some regression tests on OpenBSD, bz 7499
  
- Fixing meta tag relation name
 ------------------------------------------------------------------------
-r1350841 | kmcgrail | 2012-06-16 02:32:13 +0000 (Sat, 16 Jun 2012) | 1 
+r1823276 | kmcgrail | 2018-02-06 06:05:37 +0000 (Tue, 06 Feb 2018) | 1 
 line
  
- Fix for unparseable relay suggested by Cedric Knight bug 6801
+ Bug 7418 - sa-update change to handle cross platform newline better
 ------------------------------------------------------------------------
-r1350839 | kmcgrail | 2012-06-16 02:29:08 +0000 (Sat, 16 Jun 2012) | 1 
+r1823274 | kmcgrail | 2018-02-06 05:10:42 +0000 (Tue, 06 Feb 2018) | 1 
 line
  
- mbox_format_from_regex option addition bug 6703
-------------------------------------------------------------------------
-r1350456 | spamassassin_role | 2012-06-15 03:03:19 +0000 (Fri, 15 Jun 
-2012) | 1 line
- 
- updated scores for revision 1350129 active rules added since last 
-mass-check
-------------------------------------------------------------------------
-r1350079 | spamassassin_role | 2012-06-14 03:02:54 +0000 (Thu, 14 Jun 
-2012) | 1 line
- 
- updated scores for revision 1349685 active rules added since last 
-mass-check
-------------------------------------------------------------------------
-r1349620 | spamassassin_role | 2012-06-13 03:04:02 +0000 (Wed, 13 Jun 
-2012) | 1 line
- 
- updated scores for revision 1349193 active rules added since last 
-mass-check
-------------------------------------------------------------------------
-r1349125 | jhardin | 2012-06-12 05:30:56 +0000 (Tue, 12 Jun 2012) | 1 line
- 
- Tweak FILL_THIS_FORM
-------------------------------------------------------------------------
-r1349103 | spamassassin_role | 2012-06-12 03:08:46 +0000 (Tue, 12 Jun 
-2012) | 1 line
- 
- updated scores for revision 1348751 active rules added since last 
-mass-check
-------------------------------------------------------------------------
-r1348713 | spamassassin_role | 2012-06-11 03:05:01 +0000 (Mon, 11 Jun 
-2012) | 1 line
- 
- updated scores for revision 1348551 active rules added since last 
-mass-check
-------------------------------------------------------------------------
-r1348662 | jhardin | 2012-06-10 21:10:23 +0000 (Sun, 10 Jun 2012) | 1 line
- 
- More FP avoidance
-------------------------------------------------------------------------
-r1348528 | jhardin | 2012-06-10 04:12:50 +0000 (Sun, 10 Jun 2012) | 1 line
- 
- More FP avoidance
-------------------------------------------------------------------------
-r1348525 | spamassassin_role | 2012-06-10 03:01:18 +0000 (Sun, 10 Jun 
-2012) | 1 line
- 
- updated scores for revision 1348336 active rules added since last 
-mass-check
-------------------------------------------------------------------------
-r1348302 | spamassassin_role | 2012-06-09 03:00:34 +0000 (Sat, 09 Jun 
-2012) | 1 line
- 
- updated scores for revision 1347949 active rules added since last 
-mass-check
-------------------------------------------------------------------------
-r1348144 | jhardin | 2012-06-08 16:28:12 +0000 (Fri, 08 Jun 2012) | 1 line
- 
- More FP avoidance
-------------------------------------------------------------------------
-r1348054 | axb | 2012-06-08 13:02:24 +0000 (Fri, 08 Jun 2012) | 1 line
- 
- removed skim.com  as per Bug 6804 -
+ Bug 7496 - speed up startup code
 ------------------------------------------------------------------------
-r1347871 | spamassassin_role | 2012-06-08 02:59:48 +0000 (Fri, 08 Jun 
-2012) | 1 line
- 
- updated scores for revision 1347536 active rules added since last 
-mass-check
-------------------------------------------------------------------------
-r1347616 | axb | 2012-06-07 13:42:32 +0000 (Thu, 07 Jun 2012) | 1 line
- 
- updated 20_xmailer.cf
-------------------------------------------------------------------------
-r1347344 | spamassassin_role | 2012-06-07 03:00:53 +0000 (Thu, 07 Jun 
-2012) | 1 line
- 
- updated scores for revision 1346785 active rules added since last 
-mass-check
-------------------------------------------------------------------------
-r1346908 | mmartinec | 2012-06-06 14:21:57 +0000 (Wed, 06 Jun 2012) | 1 
+r1823205 | kmcgrail | 2018-02-05 16:13:03 +0000 (Mon, 05 Feb 2018) | 1 
 line
  
- Bug 6798: WIFEXITED not supported in windows from Util.pm
-------------------------------------------------------------------------
-r1346724 | jhardin | 2012-06-06 03:20:58 +0000 (Wed, 06 Jun 2012) | 1 line
- 
- More FP avoidance, ACH_CANCELLED tweaking
-------------------------------------------------------------------------
-r1346721 | spamassassin_role | 2012-06-06 03:01:06 +0000 (Wed, 06 Jun 
-2012) | 1 line
- 
- updated scores for revision 1346294 active rules added since last 
-mass-check
+ Clean-up of unmaintained tools and files that are only maintained in 
+trunk - see trunk-only/
 ------------------------------------------------------------------------
-r1346472 | mmartinec | 2012-06-05 17:09:15 +0000 (Tue, 05 Jun 2012) | 1 
+r1823175 | kmcgrail | 2018-02-05 14:10:22 +0000 (Mon, 05 Feb 2018) | 1 
 line
  
- sa-update: properly report exit status of a failed GPG call
+ Bug 7492 - switch from use vars to our cleanup
 ------------------------------------------------------------------------
-r1346458 | mmartinec | 2012-06-05 16:35:28 +0000 (Tue, 05 Jun 2012) | 1 
-line
+r1823171 | davej | 2018-02-05 13:34:29 +0000 (Mon, 05 Feb 2018) | 1 line
  
- Bug 6800 (removed a redundant grep)
+ Bug 7417
 ------------------------------------------------------------------------
-r1346448 | mmartinec | 2012-06-05 16:00:43 +0000 (Tue, 05 Jun 2012) | 1 
+r1823142 | kmcgrail | 2018-02-05 09:10:12 +0000 (Mon, 05 Feb 2018) | 1 
 line
  
- Bug 6800: X-Spam-Checker-Version should also show what sa-update we are 
-at
-------------------------------------------------------------------------
-r1346219 | spamassassin_role | 2012-06-05 03:02:14 +0000 (Tue, 05 Jun 
-2012) | 1 line
- 
- updated scores for revision 1345872 active rules added since last 
-mass-check
+ Bug 7491 switch test framework to Test::More
 ------------------------------------------------------------------------
-r1346064 | mmartinec | 2012-06-04 18:05:53 +0000 (Mon, 04 Jun 2012) | 1 
+r1823126 | kmcgrail | 2018-02-05 06:20:06 +0000 (Mon, 05 Feb 2018) | 1 
 line
  
- Bug 6802: a hack on three J_CHICKENPOX_* rules replacing ss with s[s] 
-avoids interpreting "ss" as "sharp s"
+ Bug 7481 - Adding build time specification of re2c binary
 ------------------------------------------------------------------------
-r1345864 | dlemke | 2012-06-04 08:23:35 +0000 (Mon, 04 Jun 2012) | 1 line
+r1822650 | davej | 2018-01-30 14:19:37 +0000 (Tue, 30 Jan 2018) | 1 line
  
- added sandbox folder for Daniel Lemke (initial commit)
+ Bug 6222
 ------------------------------------------------------------------------
-r1345816 | spamassassin_role | 2012-06-04 02:51:08 +0000 (Mon, 04 Jun 
-2012) | 1 line
- 
- updated scores for revision 1345631 active rules added since last 
-mass-check
-------------------------------------------------------------------------
-r1345467 | axb | 2012-06-02 09:09:57 +0000 (Sat, 02 Jun 2012) | 2 lines
- 
- moved URIBL_SBL_A from sandbox
+r1822649 | davej | 2018-01-30 14:17:16 +0000 (Tue, 30 Jan 2018) | 1 line
  
+ Bug 7540
 ------------------------------------------------------------------------
-r1345463 | axb | 2012-06-02 08:46:56 +0000 (Sat, 02 Jun 2012) | 3 lines
+r1822483 | davej | 2018-01-28 22:40:16 +0000 (Sun, 28 Jan 2018) | 1 line
  
- removed 
- publish FH_HELO_EQ_D_D_D_D
- for disabled rule
+ Bug 7534
 ------------------------------------------------------------------------
-r1345460 | axb | 2012-06-02 08:14:51 +0000 (Sat, 02 Jun 2012) | 1 line
- 
- removed hardcoded scores for JM's deprecated XMAILER_* rules
-------------------------------------------------------------------------
-r1345423 | spamassassin_role | 2012-06-02 03:00:09 +0000 (Sat, 02 Jun 
-2012) | 1 line
- 
- updated scores for revision 1345016 active rules added since last 
-mass-check
-------------------------------------------------------------------------
-r1345213 | axb | 2012-06-01 14:47:41 +0000 (Fri, 01 Jun 2012) | 4 lines
- 
- removed hardcoded publish XMAILER_MIMEOLE_ *
- (obsoleted JM rules)
+r1822467 | davej | 2018-01-28 16:03:13 +0000 (Sun, 28 Jan 2018) | 1 line
  
- these have been replaced by regularly updated  & auto promoted 
-AXB_XMAILER_* /rulesrc/sandbox/axb/20_xmailer.cf) rules
+ Bug 6946.
 ------------------------------------------------------------------------
-r1344975 | spamassassin_role | 2012-06-01 02:54:24 +0000 (Fri, 01 Jun 
-2012) | 1 line
- 
- updated scores for revision 1344598 active rules added since last 
-mass-check
-------------------------------------------------------------------------
-r1344966 | jhardin | 2012-06-01 01:54:48 +0000 (Fri, 01 Jun 2012) | 1 line
- 
- More FP avoidance
-------------------------------------------------------------------------
-r1342671 | axb | 2012-05-25 15:07:31 +0000 (Fri, 25 May 2012) | 2 lines
- 
- removed *.s3.amazonaws.com
- too much potential for PFs - not enough abuse to justify
-------------------------------------------------------------------------
-r1341124 | mmartinec | 2012-05-21 17:37:48 +0000 (Mon, 21 May 2012) | 1 
-line
- 
- added comments that study() is a no-op since perl 5.16.0, eliminating 
-related bugs
-------------------------------------------------------------------------
-r1339707 | axb | 2012-05-17 16:57:47 +0000 (Thu, 17 May 2012) | 2 lines
- 
- Initial commit for __HAS base rules
+r1821749 | davej | 2018-01-20 15:26:02 +0000 (Sat, 20 Jan 2018) | 1 line
  
+ Bug 6946
 ------------------------------------------------------------------------
-r1339152 | mmartinec | 2012-05-16 13:12:03 +0000 (Wed, 16 May 2012) | 1 
-line
+r1819502 | davej | 2017-12-29 18:37:34 +0000 (Fri, 29 Dec 2017) | 1 line
  
- docs detail
+ Bug 6420
 ------------------------------------------------------------------------
-r1338801 | mmartinec | 2012-05-15 17:22:06 +0000 (Tue, 15 May 2012) | 1 
+r1819497 | kmcgrail | 2017-12-29 15:20:04 +0000 (Fri, 29 Dec 2017) | 1 
 line
  
- Bug 6770: initial dns test eventually creates incorrect disabling of 
-certain plugins - change a default for dns_available from "test" to "yes"
-------------------------------------------------------------------------
-r1338747 | axb | 2012-05-15 15:15:03 +0000 (Tue, 15 May 2012) | 1 line
- 
- cleanup work in prgress
+ Bug 7525 - missing includes declarations in spamc
 ------------------------------------------------------------------------
-r1338717 | mmartinec | 2012-05-15 14:11:53 +0000 (Tue, 15 May 2012) | 1 
+r1819449 | kmcgrail | 2017-12-28 23:14:24 +0000 (Thu, 28 Dec 2017) | 1 
 line
  
- Bug 6769: update docs for option dns_available to match actual semantics
+ bug 7524 logic patch for getoptlong issues in spamc
 ------------------------------------------------------------------------
-r1338665 | kmcgrail | 2012-05-15 12:09:53 +0000 (Tue, 15 May 2012) | 1 
+r1819447 | kmcgrail | 2017-12-28 22:49:03 +0000 (Thu, 28 Dec 2017) | 1 
 line
  
- more parsing cleanup thanks to Adam Katz per bug 6549
+ Bug 6970 - adding t.co url shortener
 ------------------------------------------------------------------------
-r1338479 | mmartinec | 2012-05-14 22:56:40 +0000 (Mon, 14 May 2012) | 1 
+r1819442 | kmcgrail | 2017-12-28 22:20:16 +0000 (Thu, 28 Dec 2017) | 1 
 line
  
- test spamd_sql_prefs.t failed because rules MSGID_RANDY and 
-DATE_IN_PAST_03_06 brought a test message over a spam threshold
+ bug 7524 - opt cant be freed here or getoptlong fails
 ------------------------------------------------------------------------
-r1338477 | mmartinec | 2012-05-14 22:52:41 +0000 (Mon, 14 May 2012) | 1 
+r1816710 | kmcgrail | 2017-11-30 12:46:21 +0000 (Thu, 30 Nov 2017) | 1 
 line
  
- Bug 6759: "ESMTPA;" not detected by Received.pm - fix three test cases 
-in rcvd_parser.t
+ Bug 7509 - free for spamc opt
 ------------------------------------------------------------------------
-r1338469 | mmartinec | 2012-05-14 22:43:39 +0000 (Mon, 14 May 2012) | 1 
-line
+r1815854 | jhardin | 2017-11-20 20:54:17 +0000 (Mon, 20 Nov 2017) | 1 line
  
- Bug 5808, localize $@ in DESTROY
+ Bug 7437 - fix issues with parsing a message having an unclosed HTML 
+<style> and <script> tag (e.g. due to spamc size limits)
 ------------------------------------------------------------------------
-r1338329 | mmartinec | 2012-05-14 18:26:39 +0000 (Mon, 14 May 2012) | 1 
-line
+r1815828 | jhardin | 2017-11-20 18:21:15 +0000 (Mon, 20 Nov 2017) | 1 line
  
- Bug 6487: checking for From and EnvelopeFrom headers (the other one too, 
-as per comment 3)
+ Bug 7437 - fix issues with parsing a message having an unclosed HTML 
+<style> tag (e.g. due to spamc size limits)
 ------------------------------------------------------------------------
-r1338324 | mmartinec | 2012-05-14 18:13:46 +0000 (Mon, 14 May 2012) | 1 
+r1815773 | billcole | 2017-11-20 05:09:20 +0000 (Mon, 20 Nov 2017) | 1 
 line
  
- Bug 5390: SpamdForkScaling - sysread errors ( change a warn() into a 
-dbg() )
+ Prevent BodyRuleBaseExtractor from orphaning files in sa-compile runs
 ------------------------------------------------------------------------
-r1338300 | mmartinec | 2012-05-14 17:26:43 +0000 (Mon, 14 May 2012) | 1 
+r1814251 | kmcgrail | 2017-11-04 04:13:10 +0000 (Sat, 04 Nov 2017) | 1 
 line
  
- Bug 6360: "negative match" on a "0" string - not fixed, appears 
-cosmetic, just added a comment
+ Remove META.yml file from MANIFEST. It is added with make dist 
+automatically.  Added .gitignore and build/pga dir to MANIFEST.SKIP.  
+Removed META.yml from svn, it is created from make dist.  Requiring 
+MakeMaker v6.17 to make.  Cleaned up some meta file information.  Set the 
+minimum version for IO::Socket::SSL to 1.76.
 ------------------------------------------------------------------------
-r1338278 | mmartinec | 2012-05-14 16:31:09 +0000 (Mon, 14 May 2012) | 1 
+r1814016 | billcole | 2017-11-01 22:40:24 +0000 (Wed, 01 Nov 2017) | 1 
 line
  
- Bug 6745: spamd crashes because of memory problems in Logger.pm
+ Recognize Horde HTTPS protocol in Received header
 ------------------------------------------------------------------------
-r1338255 | mmartinec | 2012-05-14 15:24:11 +0000 (Mon, 14 May 2012) | 1 
+r1813995 | kmcgrail | 2017-11-01 20:46:34 +0000 (Wed, 01 Nov 2017) | 1 
 line
  
- Bug 5808: temp files not removed
+ Adding .gitignore file
 ------------------------------------------------------------------------
-r1338216 | mmartinec | 2012-05-14 14:15:34 +0000 (Mon, 14 May 2012) | 1 
-line
+r1812595 | kb | 2017-10-18 23:19:59 +0000 (Wed, 18 Oct 2017) | 6 lines
  
- Bug 6759: "ESMTPA;" not detected by Received.pm (recognize semicolon as 
-a terminator)
-------------------------------------------------------------------------
-r1333867 | axb | 2012-05-04 10:40:49 +0000 (Fri, 04 May 2012) | 3 lines
+ Bug 7256, using a header rule with an eval() function does not work the 
+way
+ this was intended.
  
- as per arrangement with JM, rule is replaced by maintained/updated 
-version (axb)
- file left to historical reasons
+ Remove HEADER_HOST_IN_BLACKLIST and *_WHITELIST rules.
  
-------------------------------------------------------------------------
-r1333855 | axb | 2012-05-04 10:11:03 +0000 (Fri, 04 May 2012) | 5 lines
  
- added co.mp
- edu.mp
- gov.mp
- net.mp
- org.mp
 ------------------------------------------------------------------------
-r1330920 | axb | 2012-04-26 16:13:52 +0000 (Thu, 26 Apr 2012) | 2 lines
+r1812589 | kb | 2017-10-18 22:48:31 +0000 (Wed, 18 Oct 2017) | 3 lines
  
- updated "full list"
+ clarify (URI|HEADER)_HOST_IN_(BLACK|WHITE)LIST descriptions
  
-------------------------------------------------------------------------
-r1330914 | axb | 2012-04-26 16:03:42 +0000 (Thu, 26 Apr 2012) | 1 line
  
- added util_rb_2tld blogspot.co.uk
 ------------------------------------------------------------------------
-r1329877 | mmartinec | 2012-04-24 17:33:32 +0000 (Tue, 24 Apr 2012) | 1 
-line
+r1808962 | kb | 2017-09-20 00:15:45 +0000 (Wed, 20 Sep 2017) | 1 line
  
- Bug 6793: reduce sa-awl memory usage
+ bug 7472: Fix POD errors with perl >= 5.18, wrap exit code items in C<> 
+to avoid parser complaints
 ------------------------------------------------------------------------
-r1329869 | mmartinec | 2012-04-24 17:16:53 +0000 (Tue, 24 Apr 2012) | 1 
+r1808358 | billcole | 2017-09-14 15:23:26 +0000 (Thu, 14 Sep 2017) | 1 
 line
  
- Bug 6654 detail: increase timeouts, ignore empty file for IMS, drop 
---wait with lwp
+ Corrected alphabetization of patch contributor credits
 ------------------------------------------------------------------------
-r1325517 | axb | 2012-04-12 21:11:25 +0000 (Thu, 12 Apr 2012) | 1 line
- 
- added gob.ec - Ecuador Gobierno (gov)
-------------------------------------------------------------------------
-r1325118 | jhardin | 2012-04-12 05:06:24 +0000 (Thu, 12 Apr 2012) | 1 line
+r1808350 | billcole | 2017-09-14 15:01:42 +0000 (Thu, 14 Sep 2017) | 2 
+lines
  
- Rule for oddly mixed-case Subject: header
-------------------------------------------------------------------------
-r1310367 | kmcgrail | 2012-04-06 14:50:32 +0000 (Fri, 06 Apr 2012) | 1 
-line
+ Corrected Dianne Skoll's name in CREDITS
  
- Moved KHOP_HELO_AS_VICTIM to nopublish because of dependency on 
-nopublish rule
 ------------------------------------------------------------------------
-r1309465 | axb | 2012-04-04 15:40:07 +0000 (Wed, 04 Apr 2012) | 1 line
+r1806880 | kb | 2017-09-01 00:10:12 +0000 (Fri, 01 Sep 2017) | 6 lines
  
- Added:  edu.zm,  com.zm
-------------------------------------------------------------------------
-r1309127 | hege | 2012-04-03 20:21:13 +0000 (Tue, 03 Apr 2012) | 2 lines
+ RFC 2231 section 3: Parameter Value Continuations
  
- Try some html comment length rules
+ Support MIME parameter value continuations for the filename value, which 
+is
+ actually used by plugins and rules.
  
-------------------------------------------------------------------------
-r1308610 | kmcgrail | 2012-04-02 23:04:06 +0000 (Mon, 02 Apr 2012) | 1 
-line
  
- Bug 6783 for NaSMail Received Header
 ------------------------------------------------------------------------
-r1308349 | hege | 2012-04-02 13:33:08 +0000 (Mon, 02 Apr 2012) | 2 lines
+r1806756 | kb | 2017-08-31 01:41:06 +0000 (Thu, 31 Aug 2017) | 3 lines
  
- Bug 4385: also fix .xxx in t/uri_text.t
+ bug 7466: decode Content-* header
  
-------------------------------------------------------------------------
-r1308173 | hege | 2012-04-01 18:41:01 +0000 (Sun, 01 Apr 2012) | 2 lines
- 
- Bug 6617: Fix appending emails in description
  
 ------------------------------------------------------------------------
-r1308124 | hege | 2012-04-01 14:28:07 +0000 (Sun, 01 Apr 2012) | 2 lines
- 
- Bug 6698: Fix uninitialized $dir, remove unused $dcc_libexec
+r1806555 | kb | 2017-08-29 10:45:10 +0000 (Tue, 29 Aug 2017) | 3 lines
  
-------------------------------------------------------------------------
-r1308091 | hege | 2012-04-01 12:13:08 +0000 (Sun, 01 Apr 2012) | 2 lines
+ bug 7361: Allow building against OpenSSL 1.1.0
  
- Bug 4385: Re-add .xxx tld
  
 ------------------------------------------------------------------------
-r1308076 | hege | 2012-04-01 11:19:59 +0000 (Sun, 01 Apr 2012) | 2 lines
- 
- Remove "use RegistrarBoundaries", nothing uses it
+r1806518 | kb | 2017-08-29 00:41:13 +0000 (Tue, 29 Aug 2017) | 3 lines
  
-------------------------------------------------------------------------
-r1308059 | hege | 2012-04-01 10:03:12 +0000 (Sun, 01 Apr 2012) | 2 lines
+ bug 7453: Fix "use of uninitialized value in pattern match" warning.
  
- Bug 6599: Add Geo::IP support to RelayCountries
  
 ------------------------------------------------------------------------
-r1307918 | jhardin | 2012-03-31 22:01:16 +0000 (Sat, 31 Mar 2012) | 1 line
+r1806114 | kb | 2017-08-24 23:50:59 +0000 (Thu, 24 Aug 2017) | 3 lines
  
- Add URI with doubled domain name rules
-------------------------------------------------------------------------
-r1305959 | axb | 2012-03-27 19:11:56 +0000 (Tue, 27 Mar 2012) | 1 line
+ bug 7462: "use lib '.'" before "use SATest" for Perl 5.26 compatibility
  
- added qip.ru
-------------------------------------------------------------------------
-r1305899 | kmcgrail | 2012-03-27 16:49:36 +0000 (Tue, 27 Mar 2012) | 1 
-line
  
- fixing dependency broken by 6778
 ------------------------------------------------------------------------
-r1303613 | kmcgrail | 2012-03-21 23:00:21 +0000 (Wed, 21 Mar 2012) | 1 
-line
+r1806023 | kb | 2017-08-24 10:52:44 +0000 (Thu, 24 Aug 2017) | 3 lines
  
- Added a default rule for SPF_NONE that is disabled with Score 0 for 
-administrators to activate
-------------------------------------------------------------------------
-r1303608 | kmcgrail | 2012-03-21 22:31:30 +0000 (Wed, 21 Mar 2012) | 1 
-line
+ bug 7441: handle Received-SPF temperror and permerror
  
- Adding a test rule for invalid html font colors and the underlying code 
-- continuation of bug 6760
-------------------------------------------------------------------------
-r1303397 | kmcgrail | 2012-03-21 14:10:27 +0000 (Wed, 21 Mar 2012) | 1 
-line
  
- Demoted MSGID_MULTIPLE_AT from default rules to sandbox
 ------------------------------------------------------------------------
-r1303367 | kmcgrail | 2012-03-21 12:13:33 +0000 (Wed, 21 Mar 2012) | 1 
-line
+r1806020 | kb | 2017-08-24 10:32:59 +0000 (Thu, 24 Aug 2017) | 3 lines
  
- Patch to change name_to_rgb substantially, revised 
-HTML_FONT_LOW_CONTRAST rule and invisibility modification, tests for more 
-colors - bug 6760
-------------------------------------------------------------------------
-r1303366 | kmcgrail | 2012-03-21 12:11:23 +0000 (Wed, 21 Mar 2012) | 1 
-line
+ bug 7443: handle inline style attributes in table and anchor tags
  
- Removing curl commands for retry as they are not compatible with older 
-versions
-------------------------------------------------------------------------
-r1303365 | kmcgrail | 2012-03-21 12:09:28 +0000 (Wed, 21 Mar 2012) | 1 
-line
  
- Defaulting to run long tests - bug 6776
 ------------------------------------------------------------------------
-r1302741 | kmcgrail | 2012-03-20 01:01:34 +0000 (Tue, 20 Mar 2012) | 1 
-line
+r1805349 | kb | 2017-08-17 23:24:36 +0000 (Thu, 17 Aug 2017) | 3 lines
  
- Minor change - Trying to trigger another svn so Jenkins will build 
-properly
-------------------------------------------------------------------------
-r1302619 | kmcgrail | 2012-03-19 19:42:44 +0000 (Mon, 19 Mar 2012) | 1 
-line
+ bug 7340: remove expire flag after token expiration is done
  
- reverting incorrect commit
-------------------------------------------------------------------------
-r1302618 | kmcgrail | 2012-03-19 19:41:18 +0000 (Mon, 19 Mar 2012) | 1 
-line
  
- Fails lint for t/lang_lint which broken jenkins
 ------------------------------------------------------------------------
-r1302584 | kmcgrail | 2012-03-19 18:32:53 +0000 (Mon, 19 Mar 2012) | 1 
+r1804611 | kmcgrail | 2017-08-09 21:51:29 +0000 (Wed, 09 Aug 2017) | 1 
 line
  
- Fails lint for t/lang_lint which broken jenkins
+ Bug 7416 patch from Dave Jones
 ------------------------------------------------------------------------
-r1301767 | jhardin | 2012-03-16 21:11:35 +0000 (Fri, 16 Mar 2012) | 1 line
+r1804346 | kb | 2017-08-07 15:57:21 +0000 (Mon, 07 Aug 2017) | 3 lines
  
- Set generated score limit on FROM_MISSPACED
-------------------------------------------------------------------------
-r1300076 | axb | 2012-03-13 11:14:43 +0000 (Tue, 13 Mar 2012) | 1 line
+ bug 7296: sa-learn --folders option: default to type "detect", if not 
+explicitely specified
  
- 1st test version
-------------------------------------------------------------------------
-r1299916 | axb | 2012-03-12 22:45:17 +0000 (Mon, 12 Mar 2012) | 1 line
  
- file was missing to make use of JM maildir-scan-headers routines
 ------------------------------------------------------------------------
-r1293526 | spamassassin_role | 2012-02-25 03:04:21 +0000 (Sat, 25 Feb 
-2012) | 1 line
+r1804338 | kb | 2017-08-07 14:13:56 +0000 (Mon, 07 Aug 2017) | 3 lines
  
- updated scores for revision 1293136 active rules added since last 
-mass-check
-------------------------------------------------------------------------
-r1293063 | spamassassin_role | 2012-02-24 03:03:14 +0000 (Fri, 24 Feb 
-2012) | 1 line
+ bug 7447: Delete parse_queue in Message::finish() to prevent memory leak.
  
- updated scores for revision 1292708 active rules added since last 
-mass-check
-------------------------------------------------------------------------
-r1292633 | spamassassin_role | 2012-02-23 03:17:38 +0000 (Thu, 23 Feb 
-2012) | 1 line
  
- updated scores for revision 1292191 active rules added since last 
-mass-check
 ------------------------------------------------------------------------
-r1292324 | kmcgrail | 2012-02-22 14:52:04 +0000 (Wed, 22 Feb 2012) | 1 
-line
+r1804327 | kb | 2017-08-07 12:43:37 +0000 (Mon, 07 Aug 2017) | 3 lines
  
- Change to the msgid calculation caused test failures with long tests 
-enabled - bug 6762
-------------------------------------------------------------------------
-r1292113 | spamassassin_role | 2012-02-22 02:57:36 +0000 (Wed, 22 Feb 
-2012) | 1 line
+ bug 7304, replace memcmp with strncmp
  
- updated scores for revision 1291660 active rules added since last 
-mass-check
-------------------------------------------------------------------------
-r1291912 | axb | 2012-02-21 16:55:41 +0000 (Tue, 21 Feb 2012) | 1 line
  
- updated regex (Thx Michael Parker)
 ------------------------------------------------------------------------
-r1291757 | axb | 2012-02-21 13:04:42 +0000 (Tue, 21 Feb 2012) | 2 lines
+r1804260 | kb | 2017-08-06 19:20:50 +0000 (Sun, 06 Aug 2017) | 3 lines
  
- see
- https://issues.apache.org/SpamAssassin/show_bug.cgi?id=6734
-------------------------------------------------------------------------
-r1291579 | spamassassin_role | 2012-02-21 03:32:53 +0000 (Tue, 21 Feb 
-2012) | 1 line
+ fix typo
  
- updated scores for revision 1291150 active rules added since last 
-mass-check
-------------------------------------------------------------------------
-r1291419 | khopesh | 2012-02-20 19:50:41 +0000 (Mon, 20 Feb 2012) | 1 line
  
- renamed rules for appropriateness, composed meta of the best of them, 
-ready for publishing
 ------------------------------------------------------------------------
-r1291122 | spamassassin_role | 2012-02-20 03:14:36 +0000 (Mon, 20 Feb 
-2012) | 1 line
+r1803384 | kb | 2017-07-29 17:56:31 +0000 (Sat, 29 Jul 2017) | 3 lines
  
- updated scores for revision 1290969 active rules added since last 
-mass-check
-------------------------------------------------------------------------
-r1290927 | spamassassin_role | 2012-02-19 03:16:07 +0000 (Sun, 19 Feb 
-2012) | 1 line
+ bug 7155: Fix spamc longoptions prefix-substring handling.
  
- updated scores for revision 1245892 active rules added since last 
-mass-check
-------------------------------------------------------------------------
-r1245853 | spamassassin_role | 2012-02-18 03:15:09 +0000 (Sat, 18 Feb 
-2012) | 1 line
  
- updated scores for revision 1245347 active rules added since last 
-mass-check
 ------------------------------------------------------------------------
-r1245851 | khopesh | 2012-02-18 02:54:33 +0000 (Sat, 18 Feb 2012) | 1 line
+r1803335 | kb | 2017-07-28 20:22:06 +0000 (Fri, 28 Jul 2017) | 3 lines
  
- neon_overload JS rules: updates from the author (and me)
-------------------------------------------------------------------------
-r1245308 | spamassassin_role | 2012-02-17 03:07:58 +0000 (Fri, 17 Feb 
-2012) | 1 line
+ bug 7442: SQL grants, add missing UPDATE privilege
  
- updated scores for revision 1244890 active rules added since last 
-mass-check
-------------------------------------------------------------------------
-r1245135 | khopesh | 2012-02-16 19:47:00 +0000 (Thu, 16 Feb 2012) | 1 line
  
- rules proposed on sa-users list
 ------------------------------------------------------------------------
-r1244843 | spamassassin_role | 2012-02-16 03:41:17 +0000 (Thu, 16 Feb 
-2012) | 1 line
+r1803310 | kb | 2017-07-28 17:33:10 +0000 (Fri, 28 Jul 2017) | 3 lines
  
- updated scores for revision 1244399 active rules added since last 
-mass-check
-------------------------------------------------------------------------
-r1244330 | spamassassin_role | 2012-02-15 03:16:46 +0000 (Wed, 15 Feb 
-2012) | 1 line
+ bug 7303, fix "uninitialized value" warning
  
- updated scores for revision 1243828 active rules added since last 
-mass-check
-------------------------------------------------------------------------
-r1243775 | spamassassin_role | 2012-02-14 03:14:48 +0000 (Tue, 14 Feb 
-2012) | 1 line
  
- updated scores for revision 1243434 active rules added since last 
-mass-check
 ------------------------------------------------------------------------
-r1243406 | spamassassin_role | 2012-02-13 03:36:54 +0000 (Mon, 13 Feb 
-2012) | 1 line
+r1796723 | jhardin | 2017-05-30 01:32:39 +0000 (Tue, 30 May 2017) | 3 
+lines
  
- updated scores for revision 1243210 active rules added since last 
-mass-check
+ Update __MOZILLA_MSGID per users list discussion, tbird using new format 
+- 8-4-4-4-12 lc hex, was 8.8 UC hex. Recognize both.
+ N.B.: 8-4-4-4-12 UC hex is Apple Mail MUA.
+ Copy from trunk
 ------------------------------------------------------------------------
-r1243302 | kmcgrail | 2012-02-12 19:31:32 +0000 (Sun, 12 Feb 2012) | 1 
+r1795107 | kmcgrail | 2017-05-14 14:37:05 +0000 (Sun, 14 May 2017) | 1 
 line
  
- Changing the way the msgid is calculated to remove last received and to 
-also remove cr/lf from the body. bug 5185.
-------------------------------------------------------------------------
-r1243198 | spamassassin_role | 2012-02-12 02:59:46 +0000 (Sun, 12 Feb 
-2012) | 1 line
- 
- updated scores for revision 1243018 active rules added since last 
-mass-check
-------------------------------------------------------------------------
-r1243006 | spamassassin_role | 2012-02-11 04:42:28 +0000 (Sat, 11 Feb 
-2012) | 1 line
- 
- updated scores for revision 1242704 active rules added since last 
-mass-check
-------------------------------------------------------------------------
-r1242668 | spamassassin_role | 2012-02-10 04:38:04 +0000 (Fri, 10 Feb 
-2012) | 1 line
- 
- updated scores for revision 1242239 active rules added since last 
-mass-check
-------------------------------------------------------------------------
-r1242216 | spamassassin_role | 2012-02-09 04:23:35 +0000 (Thu, 09 Feb 
-2012) | 1 line
- 
- updated scores for revision 1241818 active rules added since last 
-mass-check
-------------------------------------------------------------------------
-r1241778 | spamassassin_role | 2012-02-08 05:11:14 +0000 (Wed, 08 Feb 
-2012) | 1 line
- 
- updated scores for revision 1241377 active rules added since last 
-mass-check
-------------------------------------------------------------------------
-r1241765 | jhardin | 2012-02-08 03:54:11 +0000 (Wed, 08 Feb 2012) | 1 line
- 
- tune STYLE_GIBBERISH
-------------------------------------------------------------------------
-r1241341 | spamassassin_role | 2012-02-07 03:32:44 +0000 (Tue, 07 Feb 
-2012) | 1 line
- 
- updated scores for revision 1240925 active rules added since last 
-mass-check
-------------------------------------------------------------------------
-r1240895 | spamassassin_role | 2012-02-06 04:36:01 +0000 (Mon, 06 Feb 
-2012) | 1 line
- 
- updated scores for revision 1240683 active rules added since last 
-mass-check
-------------------------------------------------------------------------
-r1240762 | jhardin | 2012-02-05 16:23:13 +0000 (Sun, 05 Feb 2012) | 1 line
- 
- tune ACH_CANCELLED
-------------------------------------------------------------------------
-r1240661 | spamassassin_role | 2012-02-05 04:33:13 +0000 (Sun, 05 Feb 
-2012) | 1 line
- 
- updated scores for revision 1240465 active rules added since last 
-mass-check
-------------------------------------------------------------------------
-r1236969 | spamassassin_role | 2012-01-28 03:14:09 +0000 (Sat, 28 Jan 
-2012) | 1 line
- 
- updated scores for revision 1236595 active rules added since last 
-mass-check
-------------------------------------------------------------------------
-r1236502 | spamassassin_role | 2012-01-27 03:02:32 +0000 (Fri, 27 Jan 
-2012) | 1 line
- 
- updated scores for revision 1236080 active rules added since last 
-mass-check
-------------------------------------------------------------------------
-r1236032 | spamassassin_role | 2012-01-26 03:10:27 +0000 (Thu, 26 Jan 
-2012) | 1 line
- 
- updated scores for revision 1235691 active rules added since last 
-mass-check
+ More prep work on the build with infrastructure for 3.4.2
 ------------------------------------------------------------------------
-r1235609 | spamassassin_role | 2012-01-25 03:05:14 +0000 (Wed, 25 Jan 
-2012) | 1 line
+r1793220 | davej | 2017-04-29 17:00:44 +0000 (Sat, 29 Apr 2017) | 1 line
  
- updated scores for revision 1235168 active rules added since last 
-mass-check
+ Corrected ordering by last name of committers list
 ------------------------------------------------------------------------
-r1235114 | spamassassin_role | 2012-01-24 03:00:39 +0000 (Tue, 24 Jan 
-2012) | 1 line
+r1793217 | davej | 2017-04-29 16:58:22 +0000 (Sat, 29 Apr 2017) | 1 line
  
- updated scores for revision 1234702 active rules added since last 
-mass-check
+ Added Dave Jones to committers list
 ------------------------------------------------------------------------
-r1234678 | spamassassin_role | 2012-01-23 03:04:54 +0000 (Mon, 23 Jan 
-2012) | 1 line
- 
- updated scores for revision 1234463 active rules added since last 
-mass-check
-------------------------------------------------------------------------
-r1234448 | spamassassin_role | 2012-01-22 02:54:13 +0000 (Sun, 22 Jan 
-2012) | 1 line
- 
- updated scores for revision 1234286 active rules added since last 
-mass-check
-------------------------------------------------------------------------
-r1234254 | spamassassin_role | 2012-01-21 03:00:19 +0000 (Sat, 21 Jan 
-2012) | 1 line
- 
- updated scores for revision 1233814 active rules added since last 
-mass-check
-------------------------------------------------------------------------
-r1233985 | kmcgrail | 2012-01-20 16:20:53 +0000 (Fri, 20 Jan 2012) | 1 
+r1792371 | kmcgrail | 2017-04-23 15:19:46 +0000 (Sun, 23 Apr 2017) | 1 
 line
  
- reverting Bayes.pm patch unintentionally committed
+ Continued tweaks on the build process
 ------------------------------------------------------------------------
-r1233974 | kmcgrail | 2012-01-20 15:57:10 +0000 (Fri, 20 Jan 2012) | 1 
+r1792309 | kmcgrail | 2017-04-22 17:42:58 +0000 (Sat, 22 Apr 2017) | 1 
 line
  
- Remove mailspike from sandbox and moved to rules.  remove mspike rules 
-from force active.  Trying to fix the duplicate scores in 72_scores.cf 
-and 50_scores.cf.
+ preparing to release 3.4.2 pre3
 ------------------------------------------------------------------------
-r1233741 | spamassassin_role | 2012-01-20 03:00:04 +0000 (Fri, 20 Jan 
-2012) | 1 line
- 
- updated scores for revision 1233246 active rules added since last 
-mass-check
-------------------------------------------------------------------------
-r1233394 | axb | 2012-01-19 14:27:23 +0000 (Thu, 19 Jan 2012) | 1 line
- 
- dummy  test entry
-------------------------------------------------------------------------
-r1233152 | spamassassin_role | 2012-01-19 03:06:43 +0000 (Thu, 19 Jan 
-2012) | 1 line
- 
- updated scores for revision 1232787 active rules added since last 
-mass-check
-------------------------------------------------------------------------
-r1233133 | kmcgrail | 2012-01-19 00:00:29 +0000 (Thu, 19 Jan 2012) | 1 
+r1792301 | kmcgrail | 2017-04-22 16:37:41 +0000 (Sat, 22 Apr 2017) | 1 
 line
  
- failing post svn due to missing plugin eval
+ Bug 7411 FORGED_MUA_MOZILLA
 ------------------------------------------------------------------------
-r1233130 | kmcgrail | 2012-01-18 23:52:50 +0000 (Wed, 18 Jan 2012) | 1 
+r1792295 | kmcgrail | 2017-04-22 15:43:11 +0000 (Sat, 22 Apr 2017) | 1 
 line
  
- fixed more 3.4 version check errors
+ working through bugs in the release process
 ------------------------------------------------------------------------
-r1233128 | kmcgrail | 2012-01-18 23:49:40 +0000 (Wed, 18 Jan 2012) | 1 
+r1792266 | kmcgrail | 2017-04-22 06:08:20 +0000 (Sat, 22 Apr 2017) | 1 
 line
  
- fixed version check to 3.004000
+ preparing to release 3.4.2-pre1
 ------------------------------------------------------------------------
-r1233126 | kmcgrail | 2012-01-18 23:48:49 +0000 (Wed, 18 Jan 2012) | 1 
+r1792260 | kmcgrail | 2017-04-22 05:20:27 +0000 (Sat, 22 Apr 2017) | 1 
 line
  
- fixed version check to 3.004000
-------------------------------------------------------------------------
-r1233100 | kmcgrail | 2012-01-18 22:42:10 +0000 (Wed, 18 Jan 2012) | 1 
-line
- 
- UTF-7 encoding poison pill rule per bug 4745
-------------------------------------------------------------------------
-r1232727 | spamassassin_role | 2012-01-18 03:01:44 +0000 (Wed, 18 Jan 
-2012) | 1 line
- 
- updated scores for revision 1232341 active rules added since last 
-mass-check
-------------------------------------------------------------------------
-r1232441 | axb | 2012-01-17 15:24:21 +0000 (Tue, 17 Jan 2012) | 1 line
- 
- added "fix" to __RDNS_STATIC
-------------------------------------------------------------------------
-r1232282 | spamassassin_role | 2012-01-17 03:03:55 +0000 (Tue, 17 Jan 
-2012) | 1 line
- 
- updated scores for revision 1231867 active rules added since last 
-mass-check
+ Unifying small rule changes between 3.4 and trunk
 ------------------------------------------------------------------------
-r1231813 | spamassassin_role | 2012-01-16 03:02:12 +0000 (Mon, 16 Jan 
-2012) | 1 line
+r1791591 | sidney | 2017-04-16 10:19:00 +0000 (Sun, 16 Apr 2017) | 2 lines
  
- updated scores for revision 1231638 active rules added since last 
-mass-check
+ Bug 7225: A regexp for parsing an IPv4 address inconsistently 
+allows/disallows a leading zero
+ Fix problem in  port from trunk
 ------------------------------------------------------------------------
-r1231617 | spamassassin_role | 2012-01-15 02:59:10 +0000 (Sun, 15 Jan 
-2012) | 1 line
+r1791583 | sidney | 2017-04-16 09:36:02 +0000 (Sun, 16 Apr 2017) | 1 line
  
- updated scores for revision 1231463 active rules added since last 
-mass-check
+ fix typo in comment
 ------------------------------------------------------------------------
-r1231439 | spamassassin_role | 2012-01-14 03:04:18 +0000 (Sat, 14 Jan 
-2012) | 1 line
+r1791582 | sidney | 2017-04-16 09:26:14 +0000 (Sun, 16 Apr 2017) | 1 line
  
- updated scores for revision 1230922 active rules added since last 
-mass-check
+ Merged from trunk - bug 7198: Let whitelist_from_rcvd also accept CIDR 
+notation and IPv6 address [from revision 1681350]
 ------------------------------------------------------------------------
-r1231091 | jhardin | 2012-01-13 14:34:13 +0000 (Fri, 13 Jan 2012) | 1 line
+r1791580 | sidney | 2017-04-16 09:06:27 +0000 (Sun, 16 Apr 2017) | 1 line
  
- tune ACH_CANCELLED
+ Merged from trunk - Bug 7212: code compaction (was: Warning of 
+uninitialized value) [from revision 1685857]
 ------------------------------------------------------------------------
-r1230874 | spamassassin_role | 2012-01-13 03:04:59 +0000 (Fri, 13 Jan 
-2012) | 1 line
+r1791577 | sidney | 2017-04-16 08:32:11 +0000 (Sun, 16 Apr 2017) | 1 line
  
- updated scores for revision 1230441 active rules added since last 
-mass-check
+ bug 7410 - Port to 3.4 branch some cleanup that was committed to trunk 
+in Plugin/HeaderEval
 ------------------------------------------------------------------------
-r1230383 | spamassassin_role | 2012-01-12 03:11:29 +0000 (Thu, 12 Jan 
-2012) | 1 line
+r1791576 | sidney | 2017-04-16 07:47:45 +0000 (Sun, 16 Apr 2017) | 1 line
  
- updated scores for revision 1229933 active rules added since last 
-mass-check
+ Merged from trunk - bug 7409 - get plugins FreeMail, TextCat and VBounce 
+ready to deal with perl characters if they happen to reach them in a mail 
+body [from revision 1707595]
 ------------------------------------------------------------------------
-r1229932 | axb | 2012-01-11 08:48:25 +0000 (Wed, 11 Jan 2012) | 1 line
- 
- disabled AB_TEST_PDF4
-------------------------------------------------------------------------
-r1229879 | spamassassin_role | 2012-01-11 03:04:09 +0000 (Wed, 11 Jan 
-2012) | 1 line
- 
- updated scores for revision 1229487 active rules added since last 
-mass-check
-------------------------------------------------------------------------
-r1229626 | spamassassin_role | 2012-01-10 16:20:07 +0000 (Tue, 10 Jan 
-2012) | 1 line
- 
- updated scores for revision 1229487 active rules added since last 
-mass-check
-------------------------------------------------------------------------
-r1229566 | axb | 2012-01-10 14:47:34 +0000 (Tue, 10 Jan 2012) | 2 lines
- 
- force publish URIBL_SBL_A
- 
-------------------------------------------------------------------------
-r1229559 | spamassassin_role | 2012-01-10 14:38:17 +0000 (Tue, 10 Jan 
-2012) | 1 line
- 
- updated scores for revision 1229487 active rules added since last 
-mass-check
-------------------------------------------------------------------------
-r1228006 | hege | 2012-01-06 07:53:37 +0000 (Fri, 06 Jan 2012) | 2 lines
- 
- Test few invalid ips
- 
-------------------------------------------------------------------------
-r1227460 | spamassassin_role | 2012-01-05 03:01:14 +0000 (Thu, 05 Jan 
-2012) | 1 line
- 
- updated scores for revision 1227079 active rules added since last 
-mass-check
-------------------------------------------------------------------------
-r1227073 | axb | 2012-01-04 08:23:04 +0000 (Wed, 04 Jan 2012) | 4 lines
- 
- allowing auto promoting after seeing some benefit
- hits:
- URIBL_SBL_A  1087
- URIBL_SBL    1082
-------------------------------------------------------------------------
-r1227034 | spamassassin_role | 2012-01-04 03:01:15 +0000 (Wed, 04 Jan 
-2012) | 1 line
- 
- updated scores for revision 1226707 active rules added since last 
-mass-check
-------------------------------------------------------------------------
-r1226783 | jhardin | 2012-01-03 14:17:38 +0000 (Tue, 03 Jan 2012) | 1 line
- 
- fix bug#6746
-------------------------------------------------------------------------
-r1226614 | spamassassin_role | 2012-01-03 03:10:20 +0000 (Tue, 03 Jan 
-2012) | 1 line
- 
- updated scores for revision 1226368 active rules added since last 
-mass-check
-------------------------------------------------------------------------
-r1226334 | spamassassin_role | 2012-01-02 03:10:14 +0000 (Mon, 02 Jan 
-2012) | 1 line
- 
- updated scores for revision 1226218 active rules added since last 
-mass-check
-------------------------------------------------------------------------
-r1226210 | spamassassin_role | 2012-01-01 03:05:31 +0000 (Sun, 01 Jan 
-2012) | 1 line
- 
- updated scores for revision 1226049 active rules added since last 
-mass-check
-------------------------------------------------------------------------
-r1226030 | spamassassin_role | 2011-12-31 02:56:02 +0000 (Sat, 31 Dec 
-2011) | 1 line
- 
- updated scores for revision 1225774 active rules added since last 
-mass-check
-------------------------------------------------------------------------
-r1225735 | spamassassin_role | 2011-12-30 03:08:13 +0000 (Fri, 30 Dec 
-2011) | 1 line
- 
- updated scores for revision 1225474 active rules added since last 
-mass-check
-------------------------------------------------------------------------
-r1225646 | kmcgrail | 2011-12-29 20:43:23 +0000 (Thu, 29 Dec 2011) | 1 
-line
- 
- Grouping Freemail scores and lowering then substantially per bug 6744
-------------------------------------------------------------------------
-r1225555 | jhardin | 2011-12-29 15:17:20 +0000 (Thu, 29 Dec 2011) | 1 line
- 
- tune ACH_CANCELLED
-------------------------------------------------------------------------
-r1225551 | jhardin | 2011-12-29 15:06:10 +0000 (Thu, 29 Dec 2011) | 1 line
- 
- tune ACH_CANCELLED and PILL_PRICE
-------------------------------------------------------------------------
-r1225418 | spamassassin_role | 2011-12-29 03:08:02 +0000 (Thu, 29 Dec 
-2011) | 1 line
- 
- updated scores for revision 1225143 active rules added since last 
-mass-check
-------------------------------------------------------------------------
-r1225374 | kmcgrail | 2011-12-28 23:02:39 +0000 (Wed, 28 Dec 2011) | 1 
-line
+r1791573 | sidney | 2017-04-16 07:28:59 +0000 (Sun, 16 Apr 2017) | 2 lines
  
- bug 6742 test rule
+ Bug 7231 - Net::DNS 1.01 returns answers formatted differently, breaks SA
+ Port more of the changes that were committed to trunk for this as part 
+of syncing 3.4 branch with trunk before 3.4.2 release
 ------------------------------------------------------------------------
-r1225371 | kmcgrail | 2011-12-28 22:58:14 +0000 (Wed, 28 Dec 2011) | 1 
-line
+r1791571 | sidney | 2017-04-16 06:18:27 +0000 (Sun, 16 Apr 2017) | 1 line
  
- Adding to force_active to see if it resolves MSPIKE being T_ rules - bug 
-6400
+ Merged from trunk - Bug 7285: Make the DKIM selector a tag [from 
+revision 1749299]
 ------------------------------------------------------------------------
-r1225076 | spamassassin_role | 2011-12-28 03:03:55 +0000 (Wed, 28 Dec 
-2011) | 1 line
+r1791569 | sidney | 2017-04-16 06:00:55 +0000 (Sun, 16 Apr 2017) | 1 line
  
- updated scores for revision 1224880 active rules added since last 
-mass-check
+ Merge from trunk - Bug 7265 - DNS resolving breaks with Net::DNS 1.03
 ------------------------------------------------------------------------
-r1224866 | spamassassin_role | 2011-12-27 03:07:38 +0000 (Tue, 27 Dec 
-2011) | 1 line
+r1791555 | sidney | 2017-04-16 02:16:05 +0000 (Sun, 16 Apr 2017) | 1 line
  
- updated scores for revision 1224695 active rules added since last 
-mass-check
+ Merged from trunk - Bug 7408 - Change some methods in Node.pm from 
+methods to ordinary subroutines [from revision 1707588]
 ------------------------------------------------------------------------
-r1224826 | mmartinec | 2011-12-26 22:08:27 +0000 (Mon, 26 Dec 2011) | 1 
-line
+r1791487 | sidney | 2017-04-15 10:07:38 +0000 (Sat, 15 Apr 2017) | 1 line
  
- Bug 6698 #23 - use -Q instead of -Qmany on incoming mail with existing 
-X-DCC headers
+ Merged from trunk - Bug 6608: Make thinks that Digest::SHA is optional 
+AND required - Make Digest::SHA required and Digest::SHA1 as optional 
+[from revision 1749931]
 ------------------------------------------------------------------------
-r1224672 | spamassassin_role | 2011-12-26 03:06:50 +0000 (Mon, 26 Dec 
-2011) | 1 line
+r1791474 | sidney | 2017-04-15 08:55:53 +0000 (Sat, 15 Apr 2017) | 1 line
  
- updated scores for revision 1223052 active rules added since last 
-mass-check
+ Merged from trunk - Bug 7225: A regexp for parsing an IPv4 address 
+inconsistently allows/disallows a leading zero [from revision 1692208]
 ------------------------------------------------------------------------
-r1223043 | spamassassin_role | 2011-12-25 02:55:57 +0000 (Sun, 25 Dec 
-2011) | 1 line
+r1791469 | sidney | 2017-04-15 08:19:48 +0000 (Sat, 15 Apr 2017) | 1 line
  
- updated scores for revision 1222937 active rules added since last 
-mass-check
+ Sync with trunk before 3.4.2 release - port update of version number to 
+3.4.2
 ------------------------------------------------------------------------
-r1222902 | spamassassin_role | 2011-12-24 03:09:46 +0000 (Sat, 24 Dec 
-2011) | 1 line
+r1791456 | sidney | 2017-04-15 07:01:26 +0000 (Sat, 15 Apr 2017) | 1 line
  
- updated scores for revision 1222605 active rules added since last 
-mass-check
+ Bug 7406 - Update branch 3.4 version of 20_aux_tlds.cf with TLD changes 
+previously committed to trunk
 ------------------------------------------------------------------------
-r1222536 | spamassassin_role | 2011-12-23 03:02:47 +0000 (Fri, 23 Dec 
-2011) | 1 line
+r1791448 | sidney | 2017-04-15 04:38:56 +0000 (Sat, 15 Apr 2017) | 1 line
  
- updated scores for revision 1222103 active rules added since last 
-mass-check
+ Merged from trunk - Bug 7192 moving MILLION_USD, NA_DOLLARS & US_DOLLARS 
+to sandbox for ruleqa/promotion, etc. [from revision 1679253]
 ------------------------------------------------------------------------
-r1222017 | spamassassin_role | 2011-12-22 03:14:41 +0000 (Thu, 22 Dec 
-2011) | 1 line
+r1791428 | sidney | 2017-04-14 23:21:40 +0000 (Fri, 14 Apr 2017) | 1 line
  
- updated scores for revision 1221646 active rules added since last 
-mass-check
+ Merged from trunk - Clarifying Copyright - bug 7263 [from revision 
+1714592]
 ------------------------------------------------------------------------
-r1221586 | spamassassin_role | 2011-12-21 03:12:35 +0000 (Wed, 21 Dec 
-2011) | 1 line
+r1791426 | sidney | 2017-04-14 22:35:30 +0000 (Fri, 14 Apr 2017) | 2 lines
  
- updated scores for revision 1221146 active rules added since last 
-mass-check
+ Bug 7405 - Error in commit of new option in seek-phrases-in-log was 
+fixed in trunk after 3.4 was branched
+ This makes 3.4 branch same as what is in trunk
 ------------------------------------------------------------------------
-r1221346 | mmartinec | 2011-12-20 17:14:00 +0000 (Tue, 20 Dec 2011) | 6 
+r1791197 | billcole | 2017-04-13 01:22:08 +0000 (Thu, 13 Apr 2017) | 3 
 lines
  
- Play safe: prevent a warning during an unclean/forced shutdown:
-   Can't call method "timer_end" on an undefined value 
-   at .../Mail/SpamAssassin/Util/ScopedTimer.pm line 45
-   during global destruction
- 
- 
-------------------------------------------------------------------------
-r1221084 | spamassassin_role | 2011-12-20 03:04:29 +0000 (Tue, 20 Dec 
-2011) | 1 line
- 
- updated scores for revision 1220657 active rules added since last 
-mass-check
-------------------------------------------------------------------------
-r1220844 | kmcgrail | 2011-12-19 17:00:06 +0000 (Mon, 19 Dec 2011) | 1 
-line
- 
- Turning DNSWL back on now that they don not return FPs for abusive 
-queriers - bug 6724
-------------------------------------------------------------------------
-r1220679 | axb | 2011-12-19 10:14:29 +0000 (Mon, 19 Dec 2011) | 3 lines
- 
- dyndns.dk
- dyndns.ws
- mydyndns.org
-------------------------------------------------------------------------
-r1220598 | spamassassin_role | 2011-12-19 03:27:32 +0000 (Mon, 19 Dec 
-2011) | 1 line
- 
- updated scores for revision 1220357 active rules added since last 
-mass-check
-------------------------------------------------------------------------
-r1220327 | spamassassin_role | 2011-12-18 03:00:29 +0000 (Sun, 18 Dec 
-2011) | 1 line
- 
- updated scores for revision 1215443 active rules added since last 
-mass-check
-------------------------------------------------------------------------
-r1220307 | jhardin | 2011-12-18 00:31:02 +0000 (Sun, 18 Dec 2011) | 1 line
- 
- Let GA score SUBJ_OBFU_PUNCT_MANY higher
-------------------------------------------------------------------------
-r1215391 | jhardin | 2011-12-17 04:14:58 +0000 (Sat, 17 Dec 2011) | 1 line
- 
- tune ACH_CANCELLED
-------------------------------------------------------------------------
-r1215388 | spamassassin_role | 2011-12-17 03:12:40 +0000 (Sat, 17 Dec 
-2011) | 1 line
- 
- updated scores for revision 1215061 active rules added since last 
-mass-check
-------------------------------------------------------------------------
-r1215030 | spamassassin_role | 2011-12-16 03:06:38 +0000 (Fri, 16 Dec 
-2011) | 1 line
- 
- updated scores for revision 1214658 active rules added since last 
-mass-check
-------------------------------------------------------------------------
-r1214951 | kmcgrail | 2011-12-15 20:32:45 +0000 (Thu, 15 Dec 2011) | 1 
-line
- 
- Rules for Garbled porn subjects suggested by Sergio secmas@gmail.com
-------------------------------------------------------------------------
-r1214608 | spamassassin_role | 2011-12-15 03:09:31 +0000 (Thu, 15 Dec 
-2011) | 1 line
- 
- updated scores for revision 1214114 active rules added since last 
-mass-check
-------------------------------------------------------------------------
-r1214416 | kmcgrail | 2011-12-14 19:23:15 +0000 (Wed, 14 Dec 2011) | 1 
-line
- 
- Removed nice flag on _BLOCKED rules
-------------------------------------------------------------------------
-r1214333 | kb | 2011-12-14 16:54:48 +0000 (Wed, 14 Dec 2011) | 3 lines
- 
- Bug 6724.  Implemented RCVD_IN_DNSWL_BLOCKED rule.  Also some minor 
-fixes to
- URIBL rules.
- 
-------------------------------------------------------------------------
-r1214040 | spamassassin_role | 2011-12-14 03:16:31 +0000 (Wed, 14 Dec 
-2011) | 1 line
- 
- updated scores for revision 1213599 active rules added since last 
-mass-check
-------------------------------------------------------------------------
-r1213921 | kmcgrail | 2011-12-13 20:56:50 +0000 (Tue, 13 Dec 2011) | 1 
-line
- 
- Implementation of a proposed Block Notification Rule for URIBL using bit 
-1 - Bug 6724
-------------------------------------------------------------------------
-r1213920 | kmcgrail | 2011-12-13 20:54:02 +0000 (Tue, 13 Dec 2011) | 1 
-line
- 
- Removing old statistics from MANIFEST - Bug 6726
-------------------------------------------------------------------------
-r1213831 | kmcgrail | 2011-12-13 18:29:33 +0000 (Tue, 13 Dec 2011) | 1 
-line
+ Fixed to use sitebin instead of hardcoded '/bin'
  
- renaming CK_HELO_DYNAMIC_POOL to CK_HELO_GENERIC to better reflect the 
-tests actual implementation - bug 6522
-------------------------------------------------------------------------
-r1213791 | kmcgrail | 2011-12-13 17:17:19 +0000 (Tue, 13 Dec 2011) | 1 
-line
  
- Adding a second endif and indentation to clarify rule block encapsulation
 ------------------------------------------------------------------------
-r1213749 | kmcgrail | 2011-12-13 15:52:36 +0000 (Tue, 13 Dec 2011) | 1 
-line
- 
- Added an s to the script name
-------------------------------------------------------------------------
-r1213551 | wtogami | 2011-12-13 03:31:43 +0000 (Tue, 13 Dec 2011) | 2 
+r1791044 | billcole | 2017-04-11 22:03:38 +0000 (Tue, 11 Apr 2017) | 3 
 lines
  
- Enable MSPIKE for Spamassassin 3.4+.  Prep for balancing of scores in GA.
- 
-------------------------------------------------------------------------
-r1213547 | spamassassin_role | 2011-12-13 03:05:58 +0000 (Tue, 13 Dec 
-2011) | 1 line
+ Assuring that the test doesn't mess with /{etc,var}/opt/ if PREFIX is 
+/opt/$DIR
  
- updated scores for revision 1213165 active rules added since last 
-mass-check
-------------------------------------------------------------------------
-r1213452 | kmcgrail | 2011-12-12 21:44:24 +0000 (Mon, 12 Dec 2011) | 1 
-line
  
- Found 3 orphaned scripts in svn dir for mkupdates not under svn control. 
- Adding them.
 ------------------------------------------------------------------------
-r1213397 | kmcgrail | 2011-12-12 19:51:33 +0000 (Mon, 12 Dec 2011) | 1 
+r1791013 | mmartinec | 2017-04-11 18:56:16 +0000 (Tue, 11 Apr 2017) | 1 
 line
  
- Enabling of Mailspike RBL for 3.4+ - bug 6400
-------------------------------------------------------------------------
-r1213299 | kmcgrail | 2011-12-12 16:27:50 +0000 (Mon, 12 Dec 2011) | 1 
-line
- 
- Changing scores of DNSWL due to FPs caused by their nameservers 
-anti-abuse policies - Bug 6668
-------------------------------------------------------------------------
-r1213279 | axb | 2011-12-12 15:29:08 +0000 (Mon, 12 Dec 2011) | 2 lines
- 
- added if (version >= 3.200000)
- 
-------------------------------------------------------------------------
-r1213202 | axb | 2011-12-12 12:06:18 +0000 (Mon, 12 Dec 2011) | 1 line
- 
- added ifplugin and tflags nopublish
-------------------------------------------------------------------------
-r1213135 | spamassassin_role | 2011-12-12 03:04:02 +0000 (Mon, 12 Dec 
-2011) | 1 line
- 
- updated scores for revision 1212981 active rules added since last 
-mass-check
+ Bug 7404: Bad regexp (and logic) in MS::PerMsgStatus::get_content_preview
 ------------------------------------------------------------------------
-r1212962 | spamassassin_role | 2011-12-11 02:55:56 +0000 (Sun, 11 Dec 
-2011) | 1 line
- 
- updated scores for revision 1212747 active rules added since last 
-mass-check
-------------------------------------------------------------------------
-r1212845 | jhardin | 2011-12-10 19:08:27 +0000 (Sat, 10 Dec 2011) | 1 line
- 
- Wrap ifplugin around SPF rules
-------------------------------------------------------------------------
-r1212803 | kmcgrail | 2011-12-10 14:41:53 +0000 (Sat, 10 Dec 2011) | 1 
+r1790998 | kmcgrail | 2017-04-11 16:31:20 +0000 (Tue, 11 Apr 2017) | 1 
 line
  
- Bug 6487 - This is a commit with version encapsulation as this code 
-broke updates in bug 6702.  Also implemented small regex change from Mark
+ fix for 7181 on 3.4 - same as revision 1790984.
 ------------------------------------------------------------------------
-r1212802 | kmcgrail | 2011-12-10 14:37:57 +0000 (Sat, 10 Dec 2011) | 1 
-line
+r1790926 | kmcgrail | 2017-04-11 05:54:45 +0000 (Tue, 11 Apr 2017) | 5 
+lines
  
- Bug 6549 fix for received headers for authenticated squirrelmail senders 
-and small test fixes for rcvd_parser.t
-------------------------------------------------------------------------
-r1212723 | spamassassin_role | 2011-12-10 03:03:28 +0000 (Sat, 10 Dec 
-2011) | 1 line
+ KG: Syncing Trunk to 3.4: 
  
- updated scores for revision 1212281 active rules added since last 
-mass-check
-------------------------------------------------------------------------
-r1212237 | spamassassin_role | 2011-12-09 03:10:25 +0000 (Fri, 09 Dec 
-2011) | 1 line
+ Revision 1707582 "random changes, cosmetic or trivial - 
  
- updated scores for revision 1211786 active rules added since last 
-mass-check
+ Revision 1707583 "Plugin/Bayes.pm: add missing $tokprefix to u8: and 8: 
+tokens, shorten also tokens in Content-Disposition and 
+Content-Transfer-Encoding"
 ------------------------------------------------------------------------
-r1212010 | kmcgrail | 2011-12-08 18:05:53 +0000 (Thu, 08 Dec 2011) | 1 
+r1790920 | kmcgrail | 2017-04-11 05:05:28 +0000 (Tue, 11 Apr 2017) | 1 
 line
  
- Disabling check_equal_from_domains() rule to see if it helps updates bug 
-6702
+ KG: Syncing Trunk to 3.4: RFC 4408 -> 7208 comment
 ------------------------------------------------------------------------
-r1211750 | spamassassin_role | 2011-12-08 03:09:51 +0000 (Thu, 08 Dec 
-2011) | 1 line
- 
- updated scores for revision 1211339 active rules added since last 
-mass-check
-------------------------------------------------------------------------
-r1211678 | kmcgrail | 2011-12-07 22:23:16 +0000 (Wed, 07 Dec 2011) | 1 
+r1790919 | kmcgrail | 2017-04-11 04:58:54 +0000 (Tue, 11 Apr 2017) | 1 
 line
  
- reverting to previous padding for scores bug 6651 specifically for 
-_SCORE(pad)_ tag
-------------------------------------------------------------------------
-r1211278 | spamassassin_role | 2011-12-07 03:13:29 +0000 (Wed, 07 Dec 
-2011) | 1 line
- 
- updated scores for revision 1210826 active rules added since last 
-mass-check
-------------------------------------------------------------------------
-r1211003 | jhardin | 2011-12-06 16:32:57 +0000 (Tue, 06 Dec 2011) | 1 line
- 
- tune ACH_CANCELLED
-------------------------------------------------------------------------
-r1210939 | jhardin | 2011-12-06 14:37:32 +0000 (Tue, 06 Dec 2011) | 1 line
- 
- tune ACH_CANCELLED
-------------------------------------------------------------------------
-r1210769 | spamassassin_role | 2011-12-06 03:34:32 +0000 (Tue, 06 Dec 
-2011) | 1 line
- 
- updated scores for revision 1210363 active rules added since last 
-mass-check
-------------------------------------------------------------------------
-r1210318 | spamassassin_role | 2011-12-05 03:25:31 +0000 (Mon, 05 Dec 
-2011) | 1 line
- 
- updated scores for revision 1210077 active rules added since last 
-mass-check
-------------------------------------------------------------------------
-r1210047 | spamassassin_role | 2011-12-04 03:09:00 +0000 (Sun, 04 Dec 
-2011) | 1 line
- 
- updated scores for revision 1209855 active rules added since last 
-mass-check
-------------------------------------------------------------------------
-r1209957 | jhardin | 2011-12-03 17:25:08 +0000 (Sat, 03 Dec 2011) | 1 line
- 
- tune ACH_CANCELLED
+ KG: Syncing Trunk to 3.4: missed a use bytes
 ------------------------------------------------------------------------
-r1209157 | mmartinec | 2011-12-01 17:18:36 +0000 (Thu, 01 Dec 2011) | 1 
+r1790918 | kmcgrail | 2017-04-11 04:56:50 +0000 (Tue, 11 Apr 2017) | 1 
 line
  
- Bug 6715: Make distinct the four cases of "spamd: handle_user unable to 
-find user"
+ Removing deprecated RegistrarBoundaries.pm and related routines/MANIFEST 
+entries per bug 7170 and added rules-extras/
 ------------------------------------------------------------------------
-r1208601 | mmartinec | 2011-11-30 18:07:38 +0000 (Wed, 30 Nov 2011) | 1 
+r1790913 | kmcgrail | 2017-04-11 03:59:33 +0000 (Tue, 11 Apr 2017) | 1 
 line
  
- sa-update: show downloading method in verbose mode log
-------------------------------------------------------------------------
-r1207886 | jhardin | 2011-11-29 14:27:43 +0000 (Tue, 29 Nov 2011) | 1 line
- 
- tune ACH_CANCELLED
-------------------------------------------------------------------------
-r1207814 | axb | 2011-11-29 10:25:44 +0000 (Tue, 29 Nov 2011) | 1 line
- 
- disabled FAKE_HELO_MAIL_COM_DOM to avoid FPs
-------------------------------------------------------------------------
-r1207813 | axb | 2011-11-29 10:25:11 +0000 (Tue, 29 Nov 2011) | 1 line
- 
- disabled FAKE_HELO_MAIL_COM_DOM to avoid FPs due to changes in mail.com 
-hosting env.
-------------------------------------------------------------------------
-r1207812 | axb | 2011-11-29 10:23:23 +0000 (Tue, 29 Nov 2011) | 1 line
- 
- disabled FAKE_HELO_MAIL_COM_DOM - needs updating to avoid FPs
+ KG: Syncing Trunk to 3.4: sync TxRep.pm (imports comments and reformats 
+a little whitespace)
 ------------------------------------------------------------------------
-r1206794 | kmcgrail | 2011-11-27 18:24:49 +0000 (Sun, 27 Nov 2011) | 1 
+r1790912 | kmcgrail | 2017-04-11 03:54:45 +0000 (Tue, 11 Apr 2017) | 1 
 line
  
- Small documentation change for sa-update for umask
-------------------------------------------------------------------------
-r1206395 | spamassassin_role | 2011-11-26 04:04:14 +0000 (Sat, 26 Nov 
-2011) | 1 line
- 
- updated scores for revision 1206076 active rules added since last 
-mass-check
-------------------------------------------------------------------------
-r1206057 | spamassassin_role | 2011-11-25 04:36:20 +0000 (Fri, 25 Nov 
-2011) | 1 line
- 
- updated scores for revision 1205753 active rules added since last 
-mass-check
-------------------------------------------------------------------------
-r1205720 | spamassassin_role | 2011-11-24 04:15:16 +0000 (Thu, 24 Nov 
-2011) | 1 line
- 
- updated scores for revision 1205327 active rules added since last 
-mass-check
-------------------------------------------------------------------------
-r1205479 | jhardin | 2011-11-23 16:21:23 +0000 (Wed, 23 Nov 2011) | 1 line
- 
- tune ACH_CANCELLED
-------------------------------------------------------------------------
-r1205275 | spamassassin_role | 2011-11-23 03:39:29 +0000 (Wed, 23 Nov 
-2011) | 1 line
- 
- updated scores for revision 1204860 active rules added since last 
-mass-check
-------------------------------------------------------------------------
-r1204798 | spamassassin_role | 2011-11-22 03:44:38 +0000 (Tue, 22 Nov 
-2011) | 1 line
- 
- updated scores for revision 1204402 active rules added since last 
-mass-check
-------------------------------------------------------------------------
-r1204758 | spamassassin_role | 2011-11-22 00:03:23 +0000 (Tue, 22 Nov 
-2011) | 1 line
- 
- updated scores for revision 1204402 active rules added since last 
-mass-check
-------------------------------------------------------------------------
-r1204344 | spamassassin_role | 2011-11-21 03:46:24 +0000 (Mon, 21 Nov 
-2011) | 1 line
- 
- updated scores for revision 1204135 active rules added since last 
-mass-check
-------------------------------------------------------------------------
-r1204213 | jhardin | 2011-11-20 19:05:25 +0000 (Sun, 20 Nov 2011) | 1 line
- 
- Add ACH_CANCELLED
-------------------------------------------------------------------------
-r1204121 | spamassassin_role | 2011-11-20 04:04:35 +0000 (Sun, 20 Nov 
-2011) | 1 line
- 
- updated scores for revision 1203962 active rules added since last 
-mass-check
-------------------------------------------------------------------------
-r1204076 | jhardin | 2011-11-19 21:11:30 +0000 (Sat, 19 Nov 2011) | 1 line
- 
- More FP avoidance
-------------------------------------------------------------------------
-r1204060 | jhardin | 2011-11-19 20:05:59 +0000 (Sat, 19 Nov 2011) | 1 line
- 
- Tweak LOTSA_MONEY, add more spanish variants
-------------------------------------------------------------------------
-r1204054 | jhardin | 2011-11-19 19:53:20 +0000 (Sat, 19 Nov 2011) | 1 line
- 
- Remove FROM_MYFANBOX, poor performance
-------------------------------------------------------------------------
-r1203951 | spamassassin_role | 2011-11-19 03:14:31 +0000 (Sat, 19 Nov 
-2011) | 1 line
- 
- updated scores for revision 1203533 active rules added since last 
-mass-check
-------------------------------------------------------------------------
-r1203469 | spamassassin_role | 2011-11-18 03:05:48 +0000 (Fri, 18 Nov 
-2011) | 1 line
- 
- updated scores for revision 1203110 active rules added since last 
-mass-check
-------------------------------------------------------------------------
-r1203037 | spamassassin_role | 2011-11-17 03:21:26 +0000 (Thu, 17 Nov 
-2011) | 1 line
- 
- updated scores for revision 1202589 active rules added since last 
-mass-check
-------------------------------------------------------------------------
-r1202021 | spamassassin_role | 2011-11-15 03:11:16 +0000 (Tue, 15 Nov 
-2011) | 1 line
- 
- updated scores for revision 1201632 active rules added since last 
-mass-check
+ KG: Syncing Trunk to 3.4: 
+https://bz.apache.org/SpamAssassin/show_bug.cgi?id=7232 removing use bytes
 ------------------------------------------------------------------------
-r1201835 | mmartinec | 2011-11-14 19:21:56 +0000 (Mon, 14 Nov 2011) | 1 
+r1790909 | kmcgrail | 2017-04-11 03:17:35 +0000 (Tue, 11 Apr 2017) | 1 
 line
  
- Bug 6698#9: New DCC.pm improves performance, is more resilient
+ KG: Syncing Trunk to 3.4: 
+https://bz.apache.org/SpamAssassin/show_bug.cgi?id=7305
 ------------------------------------------------------------------------
-r1201831 | mmartinec | 2011-11-14 19:18:19 +0000 (Mon, 14 Nov 2011) | 1 
+r1790908 | kmcgrail | 2017-04-11 03:15:10 +0000 (Tue, 11 Apr 2017) | 1 
 line
  
- Bug 6699: Obsolete links to rhyolite.com in various dcc related files - 
-adjust the test dcc.t accordingly
-------------------------------------------------------------------------
-r1201823 | sidney | 2011-11-14 18:51:27 +0000 (Mon, 14 Nov 2011) | 1 line
- 
- bug 6699 - Better rule description - DCC
-------------------------------------------------------------------------
-r1201588 | spamassassin_role | 2011-11-14 03:26:30 +0000 (Mon, 14 Nov 
-2011) | 1 line
- 
- updated scores for revision 1201411 active rules added since last 
-mass-check
-------------------------------------------------------------------------
-r1201573 | sidney | 2011-11-14 02:02:50 +0000 (Mon, 14 Nov 2011) | 1 line
- 
- bug 6699 - Better rule description - DCC
-------------------------------------------------------------------------
-r1201551 | sidney | 2011-11-13 23:45:42 +0000 (Sun, 13 Nov 2011) | 1 line
- 
- bug 6699 - Even better rule description
+ KG: Syncing Trunk to 3.4: A small change to the redis bayes config
 ------------------------------------------------------------------------
-r1201384 | mmartinec | 2011-11-13 01:27:38 +0000 (Sun, 13 Nov 2011) | 1 
+r1790907 | kmcgrail | 2017-04-11 02:07:56 +0000 (Tue, 11 Apr 2017) | 1 
 line
  
- Bug 6698: New DCC.pm improves performance, is more resilient
+ Working with Kevin Golding to sync trunk & 3.4 branch: First sweep is a 
+small one, it just merges in release details and metadata type files.
 ------------------------------------------------------------------------
-r1201350 | sidney | 2011-11-12 23:05:24 +0000 (Sat, 12 Nov 2011) | 1 line
- 
- bug 6699 Update link about DCC to new location
-------------------------------------------------------------------------
-r1201349 | sidney | 2011-11-12 22:59:59 +0000 (Sat, 12 Nov 2011) | 1 line
- 
- bug 6699 Update link about DCC to new location
-------------------------------------------------------------------------
-r1200739 | spamassassin_role | 2011-11-11 05:29:17 +0000 (Fri, 11 Nov 
-2011) | 1 line
- 
- updated scores for revision 1200220 active rules added since last 
-mass-check
-------------------------------------------------------------------------
-r1200153 | spamassassin_role | 2011-11-10 05:12:53 +0000 (Thu, 10 Nov 
-2011) | 1 line
- 
- updated scores for revision 1199655 active rules added since last 
-mass-check
-------------------------------------------------------------------------
-r1199770 | mmartinec | 2011-11-09 14:26:15 +0000 (Wed, 09 Nov 2011) | 1 
+r1790906 | kmcgrail | 2017-04-11 02:04:24 +0000 (Tue, 11 Apr 2017) | 1 
 line
  
- Bug 6697: Make spamc VC 2010 compliant
-------------------------------------------------------------------------
-r1199767 | axb | 2011-11-09 14:15:14 +0000 (Wed, 09 Nov 2011) | 1 line
- 
- fixed typo
+ Small whitespace cleanup for readability
 ------------------------------------------------------------------------
-r1199762 | mmartinec | 2011-11-09 14:01:27 +0000 (Wed, 09 Nov 2011) | 1 
+r1790769 | kmcgrail | 2017-04-10 02:12:14 +0000 (Mon, 10 Apr 2017) | 1 
 line
  
- Bug 6696: Add URIBL SBL lookup to check A record of domain using new 
-"net a" - load URIDNSBL plugin for lint, reinstate the URIBL_SBL_A rule
+ Minor patch to check for re2c binary
 ------------------------------------------------------------------------
-r1199281 | axb | 2011-11-08 15:20:21 +0000 (Tue, 08 Nov 2011) | 1 line
+r1782717 | jhardin | 2017-02-13 02:16:44 +0000 (Mon, 13 Feb 2017) | 1 line
  
- missing test for this rule?
+ Fix bug#7367: Don't assume cwd (".") is in @INC, it may be removed for 
+security reasons - see CVE-2016-1238
 ------------------------------------------------------------------------
-r1199257 | axb | 2011-11-08 14:27:16 +0000 (Tue, 08 Nov 2011) | 2 lines
- 
- reinstated score FRT_PRICE 0
- 
-------------------------------------------------------------------------
-r1199255 | axb | 2011-11-08 14:19:49 +0000 (Tue, 08 Nov 2011) | 1 line
- 
- re enabled FRT_PRICE
-------------------------------------------------------------------------
-r1199244 | axb | 2011-11-08 13:58:56 +0000 (Tue, 08 Nov 2011) | 1 line
- 
- Contains a URL's A record listed in the SBL blocklist
-------------------------------------------------------------------------
-r1199126 | axb | 2011-11-08 06:53:09 +0000 (Tue, 08 Nov 2011) | 7 lines
- 
- # 2011-11-07 - AXB
- 
- Disabled / Commented out rules which had a hardcoded score of 0 in 
-50_scores.cf
- Also removed those scores from 50_scores.cf
- 
- WARNING: Disabled rules would cause FPs due to replacetags 
-incompatibility with newer SA versions.
- 
-------------------------------------------------------------------------
-r1199115 | spamassassin_role | 2011-11-08 05:39:08 +0000 (Tue, 08 Nov 
-2011) | 1 line
- 
- updated scores for revision 1198651 active rules added since last 
-mass-check
-------------------------------------------------------------------------
-r1199081 | mmartinec | 2011-11-08 02:52:16 +0000 (Tue, 08 Nov 2011) | 18 
+r1782715 | jhardin | 2017-02-13 01:15:03 +0000 (Mon, 13 Feb 2017) | 3 
 lines
  
- Bug 6655: sa-update might DOS mirrors if TMPDIR unwritable
- Bug 6654: Make sa-update and its infrastructure usable over IPv6
- 
- - the LWP perl module does not support IPv6 and is hard to trick properly
-   to use IO::Socket::INET6 in place of IO::Socket::INET (e.g., doesn't
-   handle multihomed (like dual-stack) hosts).  Instead, add code to use
-   one of the external programs (curl, wget, fetch) to download rules 
-files
-   and mirrors file, and make LWP module optional. If an external program
-   is not available, fall back to LWP;
- 
- - preserve .tar.gz, .sha1 and .asc files if rules installation fails,
-   so that a subsequent attempt does not download these files again,
-   as long as their size and creation time match the server
-   (this task is handled by curl, wget, or fetch);
- 
- - improve debug logging;
- 
- 
-------------------------------------------------------------------------
-r1199068 | mmartinec | 2011-11-08 02:30:09 +0000 (Tue, 08 Nov 2011) | 1 
-line
- 
- WLBLEval.pm: add forgotten aliases for check_uri_host_listed("BLACK") 
-and "WHITE"
-------------------------------------------------------------------------
-r1198823 | axb | 2011-11-07 17:24:21 +0000 (Mon, 07 Nov 2011) | 2 lines
- 
- removed rest of FRT_* hardcoded scores
- let autopromoting reactivate/score when necessary
-------------------------------------------------------------------------
-r1198820 | axb | 2011-11-07 17:18:24 +0000 (Mon, 07 Nov 2011) | 3 lines
- 
- removed hadcoded 0 scores for deprecated FRT_* rules
- (origin /rulesrc/sandbox/00_FVGT_File001.cf)
- mostly defect/bad replacetags rules
-------------------------------------------------------------------------
-r1198817 | axb | 2011-11-07 17:14:20 +0000 (Mon, 07 Nov 2011) | 1 line
- 
- commented out rules with a hardcoded score = 0 in 50_scores.cf
-------------------------------------------------------------------------
-r1198801 | kmcgrail | 2011-11-07 16:21:58 +0000 (Mon, 07 Nov 2011) | 1 
-line
- 
- Found sought files orphaned on zone
-------------------------------------------------------------------------
-r1198800 | kmcgrail | 2011-11-07 16:20:16 +0000 (Mon, 07 Nov 2011) | 1 
-line
- 
- Found that /etc/apache/local-conf/httpd.conf was supposed to be in sync 
-with sv.  Found orphaned on zones.
-------------------------------------------------------------------------
-r1198625 | spamassassin_role | 2011-11-07 05:48:04 +0000 (Mon, 07 Nov 
-2011) | 1 line
- 
- updated scores for revision 1198279 active rules added since last 
-mass-check
-------------------------------------------------------------------------
-r1198597 | jhardin | 2011-11-07 00:24:09 +0000 (Mon, 07 Nov 2011) | 1 line
- 
- Add FROM_MYFANBOX test rule for darxus@chaosreigns.com
-------------------------------------------------------------------------
-r1198539 | jhardin | 2011-11-06 19:19:52 +0000 (Sun, 06 Nov 2011) | 1 line
- 
- Add FROM_MYFANBOX test rule for darxus@chaosreigns.com
-------------------------------------------------------------------------
-r1198432 | jhardin | 2011-11-06 16:51:12 +0000 (Sun, 06 Nov 2011) | 1 line
- 
- add some descriptions and minor rule tweaks
+ Merge revision 1782713 from trunk:
+ Fix $JOBS (thx Tom Hendrikx)
+ Add log file symlinks (thx Kevin A. McGrail)
 ------------------------------------------------------------------------
-r1198146 | spamassassin_role | 2011-11-06 07:07:46 +0000 (Sun, 06 Nov 
-2011) | 1 line
+r1750443 | sidney | 2016-06-28 04:41:16 +0000 (Tue, 28 Jun 2016) | 1 line
  
- updated scores for revision 1197902 active rules added since last 
-mass-check
+ New PMC member, new committer
 ------------------------------------------------------------------------
-r1198118 | mmartinec | 2011-11-06 01:14:24 +0000 (Sun, 06 Nov 2011) | 1 
+r1749347 | mmartinec | 2016-06-20 14:37:18 +0000 (Mon, 20 Jun 2016) | 1 
 line
  
- small docs update on a config directive enlist_uri_host
+ Bad SSL/TLS Version Default - applied Proposed Patch v2: support for 
+SSLv3 removed - removed t/spamd_ssl_tls.t and t/spamd_ssl_v3.t
 ------------------------------------------------------------------------
-r1198056 | jhardin | 2011-11-05 21:05:30 +0000 (Sat, 05 Nov 2011) | 1 line
- 
- FP reduction for SUBJ_OBFU_PUNCT
-------------------------------------------------------------------------
-r1198052 | jhardin | 2011-11-05 20:51:27 +0000 (Sat, 05 Nov 2011) | 1 line
- 
- protect LARGE_PERCENT_AFTER against infinite loop in older SA (bug 6558)
-------------------------------------------------------------------------
-r1198050 | jhardin | 2011-11-05 20:48:11 +0000 (Sat, 05 Nov 2011) | 1 line
- 
- tweak LOTSA_MONEY
-------------------------------------------------------------------------
-r1198010 | axb | 2011-11-05 18:49:48 +0000 (Sat, 05 Nov 2011) | 7 lines
- 
- removed fixed scores - from pre autopromoting
- 
- Nov  5 11:45:43.969 [29195] dbg: config: warning: score set for 
-non-existent rule TVD_PH_SUBJ_URGENT
- Nov  5 11:45:43.970 [29195] dbg: config: warning: score set for 
-non-existent rule TVD_PH_SUBJ_ACCOUNTS_POST
- Nov  5 11:45:43.970 [29195] dbg: config: warning: score set for 
-non-existent rule TVD_PH_SUBJ_SEC_MEASURES
- 
- 
-------------------------------------------------------------------------
-r1197875 | spamassassin_role | 2011-11-05 03:08:12 +0000 (Sat, 05 Nov 
-2011) | 1 line
- 
- updated scores for revision 1197428 active rules added since last 
-mass-check
-------------------------------------------------------------------------
-r1197399 | spamassassin_role | 2011-11-04 03:53:17 +0000 (Fri, 04 Nov 
-2011) | 1 line
- 
- updated scores for revision 1196997 active rules added since last 
-mass-check
-------------------------------------------------------------------------
-r1197282 | kmcgrail | 2011-11-03 19:32:33 +0000 (Thu, 03 Nov 2011) | 1 
-line
- 
- Patch to extend checking for color on p and div tags per bug6554
-------------------------------------------------------------------------
-r1197259 | mmartinec | 2011-11-03 18:38:00 +0000 (Thu, 03 Nov 2011) | 1 
+r1749346 | mmartinec | 2016-06-20 14:35:01 +0000 (Mon, 20 Jun 2016) | 1 
 line
  
- Bug 6690: Give a caller a choice to call srand() by itself or let a 
-SpamAssassin library do it
+ Bad SSL/TLS Version Default - applied Proposed Patch v2: support for 
+SSLv3 removed, removed spamd option --ssl-version, removed spamc option 
+--ssl=sslv3
 ------------------------------------------------------------------------
-r1197179 | mmartinec | 2011-11-03 15:17:18 +0000 (Thu, 03 Nov 2011) | 1 
+r1749230 | mmartinec | 2016-06-19 23:15:55 +0000 (Sun, 19 Jun 2016) | 1 
 line
  
- Bug 6681: NetAddr-IP version above 4.048 break sa-update - recommend 
-avoiding versions 4.045 to 4.054
-------------------------------------------------------------------------
-r1196929 | spamassassin_role | 2011-11-03 03:32:17 +0000 (Thu, 03 Nov 
-2011) | 1 line
- 
- updated scores for revision 1196505 active rules added since last 
-mass-check
-------------------------------------------------------------------------
-r1196913 | jhardin | 2011-11-03 01:33:24 +0000 (Thu, 03 Nov 2011) | 1 line
- 
- Add LARGE_PCT_AFTER_MANY for testing
+ Bug 6461 - whatis parse fails for some man pages - adding missing NAME, 
+SYNOPSIS, DESCRIPTION
 ------------------------------------------------------------------------
-r1196617 | kmcgrail | 2011-11-02 15:04:35 +0000 (Wed, 02 Nov 2011) | 1 
+r1749190 | mmartinec | 2016-06-19 17:44:26 +0000 (Sun, 19 Jun 2016) | 1 
 line
  
- Changes to pt_br translation to pass perl t/lang_lint.t TEST_VERBOSE=1 
-with long tests enabled
-------------------------------------------------------------------------
-r1196440 | spamassassin_role | 2011-11-02 03:05:10 +0000 (Wed, 02 Nov 
-2011) | 1 line
- 
- updated scores for revision 1195874 active rules added since last 
-mass-check
+ Bug 6461 - whatis parse fails for some man pages - fixing POD
 ------------------------------------------------------------------------
-r1196422 | kmcgrail | 2011-11-02 01:13:52 +0000 (Wed, 02 Nov 2011) | 1 
+r1748642 | mmartinec | 2016-06-15 23:10:23 +0000 (Wed, 15 Jun 2016) | 1 
 line
  
- newer PT_BR rules and template translations from Pedro Padron per ticket 
-6539
+ Bug 7321: impossible to disable ipv6 in spamc - document options -4 and 
+-6 in spamc.pod
 ------------------------------------------------------------------------
-r1196393 | kmcgrail | 2011-11-01 23:26:35 +0000 (Tue, 01 Nov 2011) | 1 
+r1748623 | mmartinec | 2016-06-15 19:20:50 +0000 (Wed, 15 Jun 2016) | 1 
 line
  
- fixing __s missing on meta rule  bug 6543
+ Bug 7326: Add log info about revoke report to Razor2 - log "spam 
+revoked" at the same log level as "spam reported" for consistency
 ------------------------------------------------------------------------
-r1196352 | axb | 2011-11-01 23:00:56 +0000 (Tue, 01 Nov 2011) | 1 line
- 
- removed orphaned scores  bug 6543
-------------------------------------------------------------------------
-r1196336 | kmcgrail | 2011-11-01 22:34:28 +0000 (Tue, 01 Nov 2011) | 1 
+r1726002 | mmartinec | 2016-01-21 16:17:13 +0000 (Thu, 21 Jan 2016) | 1 
 line
  
- Dynamic Helo Rules for Testing per Bug 6522
+ added a comment that a bug 99755 in HTML::Parser was fixed in 3.72
 ------------------------------------------------------------------------
-r1196293 | kmcgrail | 2011-11-01 21:33:06 +0000 (Tue, 01 Nov 2011) | 1 
+r1722535 | kmcgrail | 2016-01-01 19:01:04 +0000 (Fri, 01 Jan 2016) | 1 
 line
  
- Small documentation update for sa-compile
+ Fix Pod error - 7283
 ------------------------------------------------------------------------
-r1196264 | kmcgrail | 2011-11-01 20:39:04 +0000 (Tue, 01 Nov 2011) | 1 
+r1721238 | kmcgrail | 2015-12-21 19:25:57 +0000 (Mon, 21 Dec 2015) | 1 
 line
  
- Bug 6495 expanded to allow Communigate Airsync
+ Change #1 from bug 7279 for SURBL list changes for 3.4
 ------------------------------------------------------------------------
-r1196260 | kmcgrail | 2011-11-01 20:26:20 +0000 (Tue, 01 Nov 2011) | 1 
+r1720874 | mmartinec | 2015-12-19 01:24:12 +0000 (Sat, 19 Dec 2015) | 1 
 line
  
- Committing rule for mass check tests from bug 6487
+ updated a comment
 ------------------------------------------------------------------------
-r1196259 | kmcgrail | 2011-11-01 20:25:56 +0000 (Tue, 01 Nov 2011) | 1 
+r1720872 | mmartinec | 2015-12-19 00:46:26 +0000 (Sat, 19 Dec 2015) | 1 
 line
  
- Committing rule for mass check tests from bug 6487
+ Bug 7278: redirector_pattern - reverse order so hardcoded check done last
 ------------------------------------------------------------------------
-r1195855 | spamassassin_role | 2011-11-01 07:16:21 +0000 (Tue, 01 Nov 
-2011) | 1 line
+r1720454 | jquinn | 2015-12-16 21:06:45 +0000 (Wed, 16 Dec 2015) | 1 line
  
- updated scores for revision 1195374 active rules added since last 
-mass-check
+ new Received authentication methods for CommuniGate
 ------------------------------------------------------------------------
-r1195421 | axb | 2011-10-31 11:34:38 +0000 (Mon, 31 Oct 2011) | 1 line
+r1720441 | jquinn | 2015-12-16 20:23:15 +0000 (Wed, 16 Dec 2015) | 1 line
  
- added dyndns.com domains
+ Updated TxRep documentation
 ------------------------------------------------------------------------
-r1195323 | spamassassin_role | 2011-10-31 03:50:56 +0000 (Mon, 31 Oct 
-2011) | 1 line
+r1720216 | jquinn | 2015-12-15 18:25:27 +0000 (Tue, 15 Dec 2015) | 1 line
  
- updated scores for revision 1195131 active rules added since last 
-mass-check
+ fix for username inconsistencies in bug 7191
 ------------------------------------------------------------------------
-r1195206 | jhardin | 2011-10-30 18:12:33 +0000 (Sun, 30 Oct 2011) | 1 line
- 
- Tweak SUBJ_OBFU_PUNCT
-------------------------------------------------------------------------
-r1195106 | spamassassin_role | 2011-10-30 03:41:21 +0000 (Sun, 30 Oct 
-2011) | 1 line
- 
- updated scores for revision 1190771 active rules added since last 
-mass-check
-------------------------------------------------------------------------
-r1190742 | kmcgrail | 2011-10-29 02:40:39 +0000 (Sat, 29 Oct 2011) | 1 
+r1716143 | mmartinec | 2015-11-24 14:16:16 +0000 (Tue, 24 Nov 2015) | 1 
 line
  
- extension of From: boundary check for Communigate Pro Bug 6413
+ Bug 7266: scheme name is case insensitive, digits 1-8 are allowed too
 ------------------------------------------------------------------------
-r1190565 | mmartinec | 2011-10-28 20:57:44 +0000 (Fri, 28 Oct 2011) | 1 
+r1716140 | mmartinec | 2015-11-24 14:00:54 +0000 (Tue, 24 Nov 2015) | 1 
 line
  
- Bug 6686: Allow Mail::SpamAssassin::parser to accept $message also as a 
-string ref, saves a copy and memory
+ Bug 7266 - no IPv6 address on sa-update.secnap.net - @af -> @my_af
 ------------------------------------------------------------------------
-r1190550 | mmartinec | 2011-10-28 20:28:17 +0000 (Fri, 28 Oct 2011) | 1 
+r1716132 | mmartinec | 2015-11-24 13:51:03 +0000 (Tue, 24 Nov 2015) | 1 
 line
  
- Bug 6429: vger.kernel.org triggers KB_DATE_CONTAINS_TAB and TAB_IN_FROM
+ Bug 7266 - no IPv6 address on sa-update.secnap.net - missing semicolon, 
+tabs->space, aestetics
 ------------------------------------------------------------------------
-r1190522 | jhardin | 2011-10-28 19:43:23 +0000 (Fri, 28 Oct 2011) | 1 line
+r1715936 | jquinn | 2015-11-23 19:58:50 +0000 (Mon, 23 Nov 2015) | 1 line
  
- More FP avoidance
+ sa-update tries both ipv6 and ipv4
 ------------------------------------------------------------------------
-r1190507 | mmartinec | 2011-10-28 19:12:55 +0000 (Fri, 28 Oct 2011) | 1 
+r1715248 | mmartinec | 2015-11-19 19:22:25 +0000 (Thu, 19 Nov 2015) | 1 
 line
  
- Bug 6550: Add DBL spammed redirector - rule URIBL_DBL_REDIR
-------------------------------------------------------------------------
-r1190353 | kmcgrail | 2011-10-28 14:29:50 +0000 (Fri, 28 Oct 2011) | 1 
-line
- 
- Debian build file changes per bug 6685
-------------------------------------------------------------------------
-r1188656 | jhardin | 2011-10-25 13:45:40 +0000 (Tue, 25 Oct 2011) | 1 line
- 
- FP reduction for SUBJ_OBFU_PUNCT
-------------------------------------------------------------------------
-r1187928 | jhardin | 2011-10-23 16:48:07 +0000 (Sun, 23 Oct 2011) | 1 line
- 
- More FP avoidance
-------------------------------------------------------------------------
-r1187530 | jhardin | 2011-10-21 19:56:37 +0000 (Fri, 21 Oct 2011) | 1 line
- 
- Add SCANNED_EXTERNAL
-------------------------------------------------------------------------
-r1187366 | jhardin | 2011-10-21 14:36:34 +0000 (Fri, 21 Oct 2011) | 1 line
- 
- FP reduction for SUBJ_OBFU_PUNCT
+ Bug 7265: DNS resolving breaks with Net::DNS 1.03 - fixing Plugin/DKIM.pm
 ------------------------------------------------------------------------
-r1187178 | jhardin | 2011-10-21 04:13:52 +0000 (Fri, 21 Oct 2011) | 1 line
- 
- Fix RE typo
-------------------------------------------------------------------------
-r1185390 | khopesh | 2011-10-17 21:47:59 +0000 (Mon, 17 Oct 2011) | 1 line
- 
- SUBJ_LACKS_WORDS
-------------------------------------------------------------------------
-r1185356 | kmcgrail | 2011-10-17 20:28:21 +0000 (Mon, 17 Oct 2011) | 1 
+r1715197 | mmartinec | 2015-11-19 15:31:49 +0000 (Thu, 19 Nov 2015) | 1 
 line
  
- Added Spoofed URL test rule per bug 6676 for Darxus
-------------------------------------------------------------------------
-r1184850 | jhardin | 2011-10-16 15:38:24 +0000 (Sun, 16 Oct 2011) | 1 line
- 
- Add SUBJ_OBFU_PUNCT
+ Bug 7265: DNS resolving breaks with Net::DNS 1.03
 ------------------------------------------------------------------------
-r1183406 | khopesh | 2011-10-14 16:16:14 +0000 (Fri, 14 Oct 2011) | 1 line
- 
- case fix for logwatch
-------------------------------------------------------------------------
-r1182629 | khopesh | 2011-10-13 01:01:14 +0000 (Thu, 13 Oct 2011) | 1 line
- 
- updated __SPOOFED_URL
-------------------------------------------------------------------------
-r1178448 | mmartinec | 2011-10-03 16:40:23 +0000 (Mon, 03 Oct 2011) | 1 
+r1714589 | kmcgrail | 2015-11-16 14:14:51 +0000 (Mon, 16 Nov 2015) | 1 
 line
  
- [doc] Bug 6667: bayes_use_hapaxes and dubious claim about database size
-------------------------------------------------------------------------
-r1178259 | jhardin | 2011-10-02 21:30:26 +0000 (Sun, 02 Oct 2011) | 1 line
- 
- Add some Spanish phrases to lotsa money rules
-------------------------------------------------------------------------
-r1178255 | jhardin | 2011-10-02 21:15:22 +0000 (Sun, 02 Oct 2011) | 1 line
- 
- More changes per bug 6660
-------------------------------------------------------------------------
-r1177502 | khopesh | 2011-09-30 04:20:59 +0000 (Fri, 30 Sep 2011) | 1 line
- 
- FP redux for SPOOF_COM2OTH SPOOF_COM2COM SPOOF_NET2COM and 
-HELO_DYNAMIC_IPADDR2
-------------------------------------------------------------------------
-r1176838 | axb | 2011-09-28 12:05:27 +0000 (Wed, 28 Sep 2011) | 2 lines
- 
- util_rb_2tld cz.cc # Shutdown due to abuse - keeping for masscheck on 
-older mail
- 
-------------------------------------------------------------------------
-r1176837 | axb | 2011-09-28 12:04:25 +0000 (Wed, 28 Sep 2011) | 2 lines
- 
- util_rb_2tld cz.cc # Shutdown due to abuse - keeping for masscheck on 
-old corpuses
- 
+ Clarifying Copyright - bug 7263
 ------------------------------------------------------------------------
-r1176141 | mmartinec | 2011-09-27 00:42:33 +0000 (Tue, 27 Sep 2011) | 1 
+r1714143 | mmartinec | 2015-11-12 23:59:41 +0000 (Thu, 12 Nov 2015) | 1 
 line
  
- tests: prevent tests from failing on an net6 -only host
+ Bug 7264 - Allow '(' and ')' in paths when untainting
 ------------------------------------------------------------------------
-r1176002 | mmartinec | 2011-09-26 19:12:08 +0000 (Mon, 26 Sep 2011) | 1 
-line
+r1713710 | jquinn | 2015-11-10 18:20:36 +0000 (Tue, 10 Nov 2015) | 1 line
  
- oops (tests)
+ Wrong SA version in readme
 ------------------------------------------------------------------------
-r1175996 | mmartinec | 2011-09-26 18:56:32 +0000 (Mon, 26 Sep 2011) | 1 
-line
+r1713709 | jquinn | 2015-11-10 18:15:48 +0000 (Tue, 10 Nov 2015) | 1 line
  
- tests: choosing a sensible default for SPAMD_HOST prevents spamd tests 
-from failing on an inet6 -only host
+ Windows option to enable building spamd
 ------------------------------------------------------------------------
-r1175985 | mmartinec | 2011-09-26 18:30:35 +0000 (Mon, 26 Sep 2011) | 1 
+r1711889 | kmcgrail | 2015-11-02 03:27:24 +0000 (Mon, 02 Nov 2015) | 1 
 line
  
- prevent a test t/dnsbl_subtests.t from failing on an inet6 -only host
+ Fix Credits File for a few international names
 ------------------------------------------------------------------------
-r1174875 | mmartinec | 2011-09-23 16:35:53 +0000 (Fri, 23 Sep 2011) | 1 
-line
+r1710612 | jquinn | 2015-10-26 15:03:14 +0000 (Mon, 26 Oct 2015) | 1 line
  
- Bug 6449: Remove Net::Ident dependency from SpamAssassin
+ better handling of newlines in debug output
 ------------------------------------------------------------------------
-r1174746 | mmartinec | 2011-09-23 13:36:34 +0000 (Fri, 23 Sep 2011) | 1 
-line
+r1710602 | jquinn | 2015-10-26 14:05:56 +0000 (Mon, 26 Oct 2015) | 1 line
  
- removed a debugging aid (Bug 6354)
+ makefile that is nicer for windows
 ------------------------------------------------------------------------
-r1174742 | mmartinec | 2011-09-23 13:29:30 +0000 (Fri, 23 Sep 2011) | 1 
-line
+r1708487 | sidney | 2015-10-13 19:11:23 +0000 (Tue, 13 Oct 2015) | 1 line
  
- Bug 6354: Header ":name" modifier should only ever match a name
+ bug 7251: merge from trunk - temp dir creation all using 
+Util::secure_tmpdir() instead of duplicating code and possibly 
+introducing bugs
 ------------------------------------------------------------------------
-r1174349 | mmartinec | 2011-09-22 19:57:35 +0000 (Thu, 22 Sep 2011) | 1 
-line
+r1706851 | jquinn | 2015-10-05 15:21:26 +0000 (Mon, 05 Oct 2015) | 1 line
  
- Bug 6649: sa-compile fails on SOUGHT rule with re2c: unterminated string 
-constant - protect special characters, some debuggings aids, perl 
--Mre=debug changed its output format with perl 5.10
+ decode MIME attachment names for better rule matching
 ------------------------------------------------------------------------
-r1173590 | axb | 2011-09-21 12:29:11 +0000 (Wed, 21 Sep 2011) | 1 line
+r1698172 | jquinn | 2015-08-27 14:43:31 +0000 (Thu, 27 Aug 2015) | 1 line
  
- AXB_X_PHPSCRP_WRDPRESS
+ Ugly fix for TxRep data being updated incorrectly
 ------------------------------------------------------------------------
-r1173462 | mmartinec | 2011-09-21 02:13:30 +0000 (Wed, 21 Sep 2011) | 1 
+r1694126 | mmartinec | 2015-08-04 23:16:38 +0000 (Tue, 04 Aug 2015) | 1 
 line
  
- Bug 6547: Client.pm uses IO::Socket::INET, not IPv6 compatible; let the 
-spamd -A default include also the ::1 in addition to 127.0.0.1
+ Bug 7231: Net::DNS 1.01 returns answers formatted differently, breaks SA
 ------------------------------------------------------------------------
-r1173273 | kmcgrail | 2011-09-20 17:45:03 +0000 (Tue, 20 Sep 2011) | 1 
+r1693640 | mmartinec | 2015-07-31 19:03:30 +0000 (Fri, 31 Jul 2015) | 1 
 line
  
- removed SSLv2 tests from MANIFEST
+ Plugin::DKIM warning: Redundant argument in printf
 ------------------------------------------------------------------------
-r1173177 | mmartinec | 2011-09-20 14:58:57 +0000 (Tue, 20 Sep 2011) | 1 
+r1693414 | mmartinec | 2015-07-30 11:45:48 +0000 (Thu, 30 Jul 2015) | 1 
 line
  
- some minor tweaks: readability, user data as boolean, debug aids
+ Bug 7226: Enhance whitelist_from_dkim to let it accept signing subdomains
 ------------------------------------------------------------------------
-r1173121 | mmartinec | 2011-09-20 12:45:35 +0000 (Tue, 20 Sep 2011) | 1 
+r1691992 | mmartinec | 2015-07-20 18:24:48 +0000 (Mon, 20 Jul 2015) | 1 
 line
  
- Bug 6661: t/spamd_ssl*2* obsolete, deleted to avoid them failing with 
-"spamd: invalid ssl-version"
-------------------------------------------------------------------------
-r1172606 | jhardin | 2011-09-19 13:09:13 +0000 (Mon, 19 Sep 2011) | 1 line
- 
- throttle some TO_NO_BRKTS rules
+ Bug 7223: Net::DNS 1.01 breaks DnsResolver
 ------------------------------------------------------------------------
-r1171997 | jhardin | 2011-09-17 14:55:16 +0000 (Sat, 17 Sep 2011) | 1 line
+r1688247 | jquinn | 2015-06-29 15:03:27 +0000 (Mon, 29 Jun 2015) | 1 line
  
- "risky free"? Okay, whatever you say.
+ anchored txrep relay helo check for extra safety
 ------------------------------------------------------------------------
-r1171995 | jhardin | 2011-09-17 14:53:08 +0000 (Sat, 17 Sep 2011) | 1 line
+r1688201 | jquinn | 2015-06-29 13:11:21 +0000 (Mon, 29 Jun 2015) | 1 line
  
- Fix bug 6660
+ fix for txrep sql that is not valid postgres
 ------------------------------------------------------------------------
-r1171657 | mmartinec | 2011-09-16 16:44:01 +0000 (Fri, 16 Sep 2011) | 18 
-lines
- 
- Bug 6654: Make sa-update and its infrastructure usable over IPv6
- - let sa-update check whether it has inet and inet6 capabilities;
- - add command line options -4 and -6 to be able to overrule a
-   default (which is to use whatever is available or both);
-   these options are modelled after their nameseke options
-   in telnet, ssh, curl, ...
- - for consistency add an alias option -4 to spamd too
-   (alias for --ipv4);
- - as the LWP module does not understand IPv6, trick it by
-   hotpatching IO::Socket::INET6 over IO::Socket::INET,
-   as sugested by the Net::INET6Glue::INET_is_INET6 module;
- - btw, slightly generalize a do_txt_query into do_dns_query,
-   we may decide to do additional tests on host addresses
-   in URLs to avoid some ugly warnings from LWP;
- - btw, do not treat user data as perl booleans;
- - improved debugging messages a bit
+r1687548 | hege | 2015-06-25 15:14:03 +0000 (Thu, 25 Jun 2015) | 2 lines
  
+ Bug 7216: TextCat documentation enhancement and _TEXTCATRESULTS_ tag
  
 ------------------------------------------------------------------------
-r1170704 | mmartinec | 2011-09-14 16:29:29 +0000 (Wed, 14 Sep 2011) | 1 
+r1686458 | mmartinec | 2015-06-19 17:11:38 +0000 (Fri, 19 Jun 2015) | 1 
 line
  
- fix typo in a comment
+ Bug 7213: UNPARSEABLE_RELAY false positive on valid 'LHLO ... LMTP' 
+header
 ------------------------------------------------------------------------
-r1170502 | mmartinec | 2011-09-14 09:50:43 +0000 (Wed, 14 Sep 2011) | 1 
+r1685843 | kmcgrail | 2015-06-16 14:17:18 +0000 (Tue, 16 Jun 2015) | 1 
 line
  
- Bug 6642: just in case - as a precaution against CPAN-RT#56826 memory 
-corruption bug in Sys-Syslog older than 0.28
+ Fixed uninitialized error with $line - Thanks to Franz Schwartau bug 
+7212 - 3.4
 ------------------------------------------------------------------------
-r1170488 | mmartinec | 2011-09-14 09:14:19 +0000 (Wed, 14 Sep 2011) | 2 
-lines
- 
- Bug 6657 - final touches
- 
-------------------------------------------------------------------------
-r1169912 | khopesh | 2011-09-12 20:36:09 +0000 (Mon, 12 Sep 2011) | 1 line
- 
- removed duplicate dependencies from VBOUNCE_MESSAGE
-------------------------------------------------------------------------
-r1166476 | mmartinec | 2011-09-08 00:12:44 +0000 (Thu, 08 Sep 2011) | 1 
+r1684652 | kmcgrail | 2015-06-10 12:15:22 +0000 (Wed, 10 Jun 2015) | 1 
 line
  
- Bug 6657 - docs rewording
+ reverting accidental commit
 ------------------------------------------------------------------------
-r1166471 | mmartinec | 2011-09-07 23:40:42 +0000 (Wed, 07 Sep 2011) | 1 
+r1684648 | kmcgrail | 2015-06-10 12:03:35 +0000 (Wed, 10 Jun 2015) | 1 
 line
  
- Bug 6657: tighten header rule parsing syntax check, improve error 
-message for a header rule like "exists:References:addr"
+ referencing SF account in build/README for consideration at next release
 ------------------------------------------------------------------------
-r1166469 | mmartinec | 2011-09-07 23:36:15 +0000 (Wed, 07 Sep 2011) | 1 
-line
- 
- add a comment
-------------------------------------------------------------------------
-r1165372 | mmartinec | 2011-09-05 17:47:33 +0000 (Mon, 05 Sep 2011) | 24 
-lines
- 
- Bug 6655: sa-update might DOS mirrors if TMPDIR unwritable
- 
- - sa-update can now take multiple -v or --verbose options to increase
-   verbosity; currently one or two levels are in use: two levels
-   add reporting on a DNS query and HTTP GET requests;
- - allow Mail::SpamAssassin::Util::secure_tmpfile to signal a
-   failure, adjust callers for this;
- - Message.pm: test $msg->{'raw'} for defined(), not for exists();
-   do not store a file handle there if it is not defined;
- - sub secure_tmpfile: only retry on failures which are expected
-   not to be permanent (e.g. makes no point in trying 20 times
-   to create a file when a status is always a "Permission denied";
- - sub secure_tmpfile: do not bother with umask, sysopen specifies
-   the mode explicitly;
- - sa-update: add several missing status tests to system calls,
-   improve debug and verbose logging;
- - sa-update: use eval{} in the 'try/rollback' idiom to simplify
-   diagnostics;
- - sa-update: ignore non-'TXT' and empty fields in a DNS reply;
- - sa-update: better report gpg process crashes and failure exit status;
- - sa-update: some style and terminology changes to go along the
-   rest of the modules (like: || warn -> or warn; can't -> cannot);
- 
+r1684226 | jquinn | 2015-06-08 17:11:20 +0000 (Mon, 08 Jun 2015) | 1 line
  
+ Typo in TxRep.pm
 ------------------------------------------------------------------------
-r1163848 | kmcgrail | 2011-08-31 22:33:25 +0000 (Wed, 31 Aug 2011) | 1 
+r1681230 | kmcgrail | 2015-05-22 20:18:31 +0000 (Fri, 22 May 2015) | 1 
 line
  
- Michaels patch for more error trapping on sa-update.  See bug 6655
+ Cleanup of spamd-apache2 for httpd 2.4 - bug 7197 - 3.4
 ------------------------------------------------------------------------
-r1162292 | spamassassin_role | 2011-08-27 03:28:53 +0000 (Sat, 27 Aug 
-2011) | 1 line
- 
- updated scores for revision 1162027 active rules added since last 
-mass-check
-------------------------------------------------------------------------
-r1161977 | spamassassin_role | 2011-08-26 03:19:31 +0000 (Fri, 26 Aug 
-2011) | 1 line
- 
- updated scores for revision 1161446 active rules added since last 
-mass-check
-------------------------------------------------------------------------
-r1161371 | spamassassin_role | 2011-08-25 03:17:33 +0000 (Thu, 25 Aug 
-2011) | 1 line
- 
- updated scores for revision 1161015 active rules added since last 
-mass-check
-------------------------------------------------------------------------
-r1161105 | mmartinec | 2011-08-24 14:13:35 +0000 (Wed, 24 Aug 2011) | 1 
+r1681095 | kmcgrail | 2015-05-22 12:45:48 +0000 (Fri, 22 May 2015) | 1 
 line
  
- Bug 6653: DnsResolver inappropriate test on an IPv6-only host
-------------------------------------------------------------------------
-r1160968 | spamassassin_role | 2011-08-24 03:13:15 +0000 (Wed, 24 Aug 
-2011) | 1 line
- 
- updated scores for revision 1160585 active rules added since last 
-mass-check
+ Cleaning up the copyright/author/etc. in apache-spamd to be ASF compliant
 ------------------------------------------------------------------------
-r1160534 | spamassassin_role | 2011-08-23 03:11:23 +0000 (Tue, 23 Aug 
-2011) | 1 line
- 
- updated scores for revision 1160145 active rules added since last 
-mass-check
-------------------------------------------------------------------------
-r1160097 | spamassassin_role | 2011-08-22 03:23:09 +0000 (Mon, 22 Aug 
-2011) | 1 line
- 
- updated scores for revision 1159951 active rules added since last 
-mass-check
-------------------------------------------------------------------------
-r1159938 | spamassassin_role | 2011-08-21 03:07:33 +0000 (Sun, 21 Aug 
-2011) | 1 line
- 
- updated scores for revision 1159860 active rules added since last 
-mass-check
-------------------------------------------------------------------------
-r1159836 | spamassassin_role | 2011-08-20 03:08:42 +0000 (Sat, 20 Aug 
-2011) | 1 line
- 
- updated scores for revision 1159550 active rules added since last 
-mass-check
-------------------------------------------------------------------------
-r1159659 | mmartinec | 2011-08-19 15:08:58 +0000 (Fri, 19 Aug 2011) | 1 
+r1679656 | mmartinec | 2015-05-15 23:01:12 +0000 (Fri, 15 May 2015) | 1 
 line
  
- PluginHandler.pm returned undef instead of 0 when some of the called 
-plugins returned a 0 and the last one failed with undef - leading to 
-sa-learn aborting scan of further messages with "ERROR: the Bayes learn 
-function returned an error" on encountering the first already learned 
-message
-------------------------------------------------------------------------
-r1159554 | axb | 2011-08-19 09:10:29 +0000 (Fri, 19 Aug 2011) | 2 lines
- 
- # Creation: 2011-08-19 11:03:04
- 
-------------------------------------------------------------------------
-r1159500 | jhardin | 2011-08-19 04:34:16 +0000 (Fri, 19 Aug 2011) | 1 line
- 
- remove poor S/O GAPPY_HTML subrules
-------------------------------------------------------------------------
-r1159493 | spamassassin_role | 2011-08-19 03:21:49 +0000 (Fri, 19 Aug 
-2011) | 1 line
- 
- updated scores for revision 1159091 active rules added since last 
-mass-check
-------------------------------------------------------------------------
-r1159008 | spamassassin_role | 2011-08-18 03:11:47 +0000 (Thu, 18 Aug 
-2011) | 1 line
- 
- updated scores for revision 1158582 active rules added since last 
-mass-check
-------------------------------------------------------------------------
-r1158968 | jhardin | 2011-08-17 23:29:52 +0000 (Wed, 17 Aug 2011) | 1 line
- 
- Fix bug 6650
-------------------------------------------------------------------------
-r1158496 | spamassassin_role | 2011-08-17 03:19:33 +0000 (Wed, 17 Aug 
-2011) | 1 line
- 
- updated scores for revision 1158155 active rules added since last 
-mass-check
-------------------------------------------------------------------------
-r1158093 | spamassassin_role | 2011-08-16 03:13:41 +0000 (Tue, 16 Aug 
-2011) | 1 line
- 
- updated scores for revision 1157739 active rules added since last 
-mass-check
-------------------------------------------------------------------------
-r1158082 | jhardin | 2011-08-16 01:30:47 +0000 (Tue, 16 Aug 2011) | 1 line
- 
- Add CTYPE_NULL (suggested by bug#6649 comment 8)
-------------------------------------------------------------------------
-r1157705 | spamassassin_role | 2011-08-15 03:12:49 +0000 (Mon, 15 Aug 
-2011) | 1 line
- 
- updated scores for revision 1157497 active rules added since last 
-mass-check
-------------------------------------------------------------------------
-r1157460 | spamassassin_role | 2011-08-14 03:31:59 +0000 (Sun, 14 Aug 
-2011) | 1 line
- 
- updated scores for revision 1157350 active rules added since last 
-mass-check
-------------------------------------------------------------------------
-r1157311 | spamassassin_role | 2011-08-13 03:02:26 +0000 (Sat, 13 Aug 
-2011) | 1 line
- 
- updated scores for revision 1157010 active rules added since last 
-mass-check
+ Bug 7195: Util warnings from trim_domain()
 ------------------------------------------------------------------------
-r1157252 | khopesh | 2011-08-12 21:03:30 +0000 (Fri, 12 Aug 2011) | 1 line
- 
- allow scoring of KHOP_HELO_FCRDNS, added FORGED_SPF_HELO as 
-proof-of-concept
-------------------------------------------------------------------------
-r1157186 | mmartinec | 2011-08-12 16:49:27 +0000 (Fri, 12 Aug 2011) | 1 
+r1679653 | mmartinec | 2015-05-15 22:30:39 +0000 (Fri, 15 May 2015) | 1 
 line
  
- Bug 6647: Sync Debian packaging from v3.3.2-1 to trunk
-------------------------------------------------------------------------
-r1156945 | spamassassin_role | 2011-08-12 03:14:37 +0000 (Fri, 12 Aug 
-2011) | 1 line
- 
- updated scores for revision 1156542 active rules added since last 
-mass-check
-------------------------------------------------------------------------
-r1156487 | jhardin | 2011-08-11 04:55:43 +0000 (Thu, 11 Aug 2011) | 1 line
- 
- More FP avoidance and rule tweaking, add SPF test rule
-------------------------------------------------------------------------
-r1156461 | spamassassin_role | 2011-08-11 03:06:14 +0000 (Thu, 11 Aug 
-2011) | 1 line
- 
- updated scores for revision 1156072 active rules added since last 
-mass-check
-------------------------------------------------------------------------
-r1156004 | spamassassin_role | 2011-08-10 03:08:57 +0000 (Wed, 10 Aug 
-2011) | 1 line
- 
- updated scores for revision 1155262 active rules added since last 
-mass-check
-------------------------------------------------------------------------
-r1155967 | khopesh | 2011-08-09 23:17:42 +0000 (Tue, 09 Aug 2011) | 1 line
- 
- okay to publish KHOP_DYNAMIC.  adding tflags nice to lots of __rules to 
-appease 'bad sandbox rules report' emails, shuffling a few rules between 
-files for channels, removed stale+bad rules, minor tweaks to DEAR_NOBODY
-------------------------------------------------------------------------
-r1155196 | spamassassin_role | 2011-08-09 03:01:17 +0000 (Tue, 09 Aug 
-2011) | 1 line
- 
- updated scores for revision 1154874 active rules added since last 
-mass-check
-------------------------------------------------------------------------
-r1154812 | spamassassin_role | 2011-08-08 03:08:19 +0000 (Mon, 08 Aug 
-2011) | 1 line
- 
- updated scores for revision 1154673 active rules added since last 
-mass-check
-------------------------------------------------------------------------
-r1154646 | spamassassin_role | 2011-08-07 03:00:36 +0000 (Sun, 07 Aug 
-2011) | 1 line
- 
- updated scores for revision 1154462 active rules added since last 
-mass-check
-------------------------------------------------------------------------
-r1154440 | spamassassin_role | 2011-08-06 03:06:50 +0000 (Sat, 06 Aug 
-2011) | 1 line
- 
- updated scores for revision 1154128 active rules added since last 
-mass-check
-------------------------------------------------------------------------
-r1154081 | spamassassin_role | 2011-08-05 03:07:57 +0000 (Fri, 05 Aug 
-2011) | 1 line
- 
- updated scores for revision 1153786 active rules added since last 
-mass-check
-------------------------------------------------------------------------
-r1153736 | spamassassin_role | 2011-08-04 03:08:59 +0000 (Thu, 04 Aug 
-2011) | 1 line
- 
- updated scores for revision 1153391 active rules added since last 
-mass-check
+ Bug 7196: PerMsgStatus Warning
 ------------------------------------------------------------------------
-r1153326 | spamassassin_role | 2011-08-03 03:15:51 +0000 (Wed, 03 Aug 
-2011) | 1 line
- 
- updated scores for revision 1153066 active rules added since last 
-mass-check
-------------------------------------------------------------------------
-r1153009 | spamassassin_role | 2011-08-02 03:12:06 +0000 (Tue, 02 Aug 
-2011) | 1 line
- 
- updated scores for revision 1152704 active rules added since last 
-mass-check
-------------------------------------------------------------------------
-r1152697 | axb | 2011-08-01 07:43:35 +0000 (Mon, 01 Aug 2011) | 2 lines
- 
- util_rb_3tld s3.amazonaws.com
- 
-------------------------------------------------------------------------
-r1152680 | spamassassin_role | 2011-08-01 03:11:16 +0000 (Mon, 01 Aug 
-2011) | 1 line
- 
- updated scores for revision 1152559 active rules added since last 
-mass-check
-------------------------------------------------------------------------
-r1152676 | jhardin | 2011-08-01 02:34:49 +0000 (Mon, 01 Aug 2011) | 1 line
- 
- Add maxhits=N to rules, do some FP avoidance tweaks
-------------------------------------------------------------------------
-r1152594 | jhardin | 2011-07-31 17:08:15 +0000 (Sun, 31 Jul 2011) | 1 line
- 
- Implement bounded tflags per bug 6641
-------------------------------------------------------------------------
-r1152539 | spamassassin_role | 2011-07-31 03:07:37 +0000 (Sun, 31 Jul 
-2011) | 1 line
- 
- updated scores for revision 1152433 active rules added since last 
-mass-check
-------------------------------------------------------------------------
-r1152422 | spamassassin_role | 2011-07-30 03:03:16 +0000 (Sat, 30 Jul 
-2011) | 1 line
- 
- updated scores for revision 1152144 active rules added since last 
-mass-check
-------------------------------------------------------------------------
-r1152404 | mmartinec | 2011-07-30 00:35:54 +0000 (Sat, 30 Jul 2011) | 1 
+r1679280 | kmcgrail | 2015-05-13 21:28:52 +0000 (Wed, 13 May 2015) | 1 
 line
  
- Bug 6642: unknown facility/priority - try to catch and report bad 
-priority
-------------------------------------------------------------------------
-r1152082 | spamassassin_role | 2011-07-29 03:06:36 +0000 (Fri, 29 Jul 
-2011) | 1 line
- 
- updated scores for revision 1151767 active rules added since last 
-mass-check
-------------------------------------------------------------------------
-r1151712 | spamassassin_role | 2011-07-28 03:28:10 +0000 (Thu, 28 Jul 
-2011) | 1 line
- 
- updated scores for revision 1151385 active rules added since last 
-mass-check
+ adds --timing parm for spamd for 3.4 branch - bug 7194
 ------------------------------------------------------------------------
-r1151705 | jhardin | 2011-07-28 03:11:36 +0000 (Thu, 28 Jul 2011) | 1 line
- 
- Tweaks for Zixmail malformatted header FPs
-------------------------------------------------------------------------
-r1151320 | spamassassin_role | 2011-07-27 03:10:34 +0000 (Wed, 27 Jul 
-2011) | 1 line
- 
- updated scores for revision 1151020 active rules added since last 
-mass-check
-------------------------------------------------------------------------
-r1151299 | mmartinec | 2011-07-27 00:29:26 +0000 (Wed, 27 Jul 2011) | 1 
+r1678016 | kmcgrail | 2015-05-06 14:59:03 +0000 (Wed, 06 May 2015) | 1 
 line
  
- changelog typo: actually the r1151284 fixed a 
-TestingAndDebugging::RequireUseStrict
+ bug 7164 - 3.4 commit - small clean up on whitespace/logic for clarity 
+and added logic for msgscore undefined in Txrep.pm
 ------------------------------------------------------------------------
-r1151298 | mmartinec | 2011-07-27 00:18:24 +0000 (Wed, 27 Jul 2011) | 1 
+r1677162 | kmcgrail | 2015-05-01 14:53:15 +0000 (Fri, 01 May 2015) | 1 
 line
  
- avoid a Test::Perl::Critic warning 
-Subroutines::ProhibitSubroutinePrototypes as reported by 
-xt/60_perlcritic.t
+ 3.4 Commit for bug 7186 lowering TVD_PH_BODY_ACCOUNTS_PRE scores to 0.001
 ------------------------------------------------------------------------
-r1151297 | mmartinec | 2011-07-27 00:09:21 +0000 (Wed, 27 Jul 2011) | 1 
+r1676888 | kmcgrail | 2015-04-30 03:03:36 +0000 (Thu, 30 Apr 2015) | 1 
 line
  
- fix a Test::Perl::Critic Variables::RequireLexicalLoopIterators bug as 
-reported by xt/60_perlcritic.t
+ 3.4 commit - adding compress header debug statement - bug 7183
 ------------------------------------------------------------------------
-r1151293 | mmartinec | 2011-07-26 23:34:52 +0000 (Tue, 26 Jul 2011) | 1 
+r1676800 | kmcgrail | 2015-04-29 17:19:13 +0000 (Wed, 29 Apr 2015) | 1 
 line
  
- fix Test::Perl::Critic Subroutines::ProhibitExplicitReturnUndef warnings 
-emitted by 60_perlcritic.t - replacing "return undef" with "return" 
-prevents accidental subroutine call in a list context from treating a 
-failure as a true
+ unifying 3.4 branch build readme with trunk
 ------------------------------------------------------------------------
-r1151284 | mmartinec | 2011-07-26 22:51:38 +0000 (Tue, 26 Jul 2011) | 1 
+r1676787 | kmcgrail | 2015-04-29 16:36:50 +0000 (Wed, 29 Apr 2015) | 1 
 line
  
- fix Test::Perl::Critic InputOutput::ProhibitTwoArgOpen warnings emitted 
-by xt/60_perlcritic.t
+ 3.4 branch Commit of Bug 7182 for raise from 15 to 20
 ------------------------------------------------------------------------
-r1151279 | mmartinec | 2011-07-26 22:24:21 +0000 (Tue, 26 Jul 2011) | 1 
+r1676620 | kmcgrail | 2015-04-28 20:38:08 +0000 (Tue, 28 Apr 2015) | 1 
 line
  
- SpamAssassin.pm: fix a Subroutines::ProhibitReturnSort warning emitted 
-by xt/60_perlcritic.t about a "return" followed by a "sort"; test I/O 
-status in 60_perlcritic.t
-------------------------------------------------------------------------
-r1151009 | axb | 2011-07-26 07:39:26 +0000 (Tue, 26 Jul 2011) | 1 line
- 
- added tumblr.com
-------------------------------------------------------------------------
-r1150976 | spamassassin_role | 2011-07-26 03:01:34 +0000 (Tue, 26 Jul 
-2011) | 1 line
- 
- updated scores for revision 1150583 active rules added since last 
-mass-check
-------------------------------------------------------------------------
-r1150942 | khopesh | 2011-07-25 22:29:58 +0000 (Mon, 25 Jul 2011) | 1 line
- 
- bug 6615, Swedish words 'sommar' and 'som \xe4r' (meaning summer) now no 
-longer trigger FRT_SOMA, FRT_SOMA2, or __DRUGS_MUSCLE1
-------------------------------------------------------------------------
-r1150909 | khopesh | 2011-07-25 21:09:19 +0000 (Mon, 25 Jul 2011) | 1 line
- 
- added DKIM-Signature to exclusions for __SINGLE_HEADER_1K, removed 
-redundant __DOS_HAS_LIST_ID from predicates (already included by __VIA_ML)
-------------------------------------------------------------------------
-r1150904 | khopesh | 2011-07-25 20:55:01 +0000 (Mon, 25 Jul 2011) | 1 line
- 
- edits for bug 6634 comment 2 to work around removal of __RCVD_IN_BRBL
-------------------------------------------------------------------------
-r1150754 | axb | 2011-07-25 15:42:30 +0000 (Mon, 25 Jul 2011) | 1 line
- 
- updated with short patterns
-------------------------------------------------------------------------
-r1150749 | axb | 2011-07-25 15:26:00 +0000 (Mon, 25 Jul 2011) | 5 lines
- 
- added --maxreqpatlength: maximum pattern length, in characters (default: 
-2048)
- 
- Thanks to Dallas Engelken for the hack.
- 
- 
+ 3.4.2 devel cycle started
 ------------------------------------------------------------------------
-r1150715 | mmartinec | 2011-07-25 14:18:02 +0000 (Mon, 25 Jul 2011) | 1 
+r1676616 | kmcgrail | 2015-04-28 20:36:05 +0000 (Tue, 28 Apr 2015) | 1 
 line
  
- Bug 6634: Remove __RCVD_IN_BRBL
-------------------------------------------------------------------------
-r1150618 | axb | 2011-07-25 10:31:07 +0000 (Mon, 25 Jul 2011) | 1 line
- 
- reverted
-------------------------------------------------------------------------
-r1150592 | axb | 2011-07-25 08:59:50 +0000 (Mon, 25 Jul 2011) | 1 line
- 
- removed net.in  parked and abused
-------------------------------------------------------------------------
-r1150590 | axb | 2011-07-25 08:55:57 +0000 (Mon, 25 Jul 2011) | 5 lines
- 
- removed 
- firm.in 
- gen.in 
- 
- parked & "This website is for sale!"
-------------------------------------------------------------------------
-r1150548 | jhardin | 2011-07-25 05:01:00 +0000 (Mon, 25 Jul 2011) | 1 line
- 
- More FP avoidance (khopesh SINGLE_HEADER_1K)
-------------------------------------------------------------------------
-r1150529 | spamassassin_role | 2011-07-25 03:22:11 +0000 (Mon, 25 Jul 
-2011) | 1 line
- 
- updated scores for revision 1150300 active rules added since last 
-mass-check
-------------------------------------------------------------------------
-r1150527 | jhardin | 2011-07-25 01:54:27 +0000 (Mon, 25 Jul 2011) | 1 line
- 
- Revert revision 1150225 at request of Michael Parker, performance 
-improvements and more-human-readable output changes to HitFreqsRuleTiming 
-plugin instead.
-------------------------------------------------------------------------
-r1150429 | jhardin | 2011-07-24 16:31:41 +0000 (Sun, 24 Jul 2011) | 1 line
- 
- More FP avoidance
-------------------------------------------------------------------------
-r1150428 | jhardin | 2011-07-24 16:21:27 +0000 (Sun, 24 Jul 2011) | 1 line
- 
- tweak GAPPY_HTML, add XM_EC_MESSENGER for testing
-------------------------------------------------------------------------
-r1150265 | spamassassin_role | 2011-07-24 03:08:57 +0000 (Sun, 24 Jul 
-2011) | 1 line
- 
- updated scores for revision 1150068 active rules added since last 
-mass-check
-------------------------------------------------------------------------
-r1150238 | axb | 2011-07-23 22:54:24 +0000 (Sat, 23 Jul 2011) | 1 line
- 
- Autogenerated rules - testing
-------------------------------------------------------------------------
-r1150230 | jhardin | 2011-07-23 22:21:56 +0000 (Sat, 23 Jul 2011) | 1 line
- 
- Interpret would_log() return value correctly
-------------------------------------------------------------------------
-r1150225 | jhardin | 2011-07-23 21:41:27 +0000 (Sat, 23 Jul 2011) | 1 line
- 
- Add per-rule timing (debug "ruletimes" channel) for most rule types
-------------------------------------------------------------------------
-r1150223 | jhardin | 2011-07-23 21:33:52 +0000 (Sat, 23 Jul 2011) | 1 line
- 
- More FILL_THIS_FORM performance improvement
-------------------------------------------------------------------------
-r1150209 | jhardin | 2011-07-23 20:10:46 +0000 (Sat, 23 Jul 2011) | 1 line
- 
- Fix bug 6532
-------------------------------------------------------------------------
-r1150178 | jhardin | 2011-07-23 17:45:34 +0000 (Sat, 23 Jul 2011) | 1 line
- 
- address bug 6637
-------------------------------------------------------------------------
-r1149788 | spamassassin_role | 2011-07-23 03:24:29 +0000 (Sat, 23 Jul 
-2011) | 1 line
- 
- updated scores for revision 1149503 active rules added since last 
-mass-check
-------------------------------------------------------------------------
-r1149758 | sidney | 2011-07-22 23:16:17 +0000 (Fri, 22 Jul 2011) | 1 line
- 
- bug 6638 - 3.3.1.txt should have been added to trunk as well as branch
-------------------------------------------------------------------------
-r1149753 | sidney | 2011-07-22 22:47:49 +0000 (Fri, 22 Jul 2011) | 1 line
- 
- bug 6638 - line-wrap/whitespace correction to previous commit
-------------------------------------------------------------------------
-r1149751 | sidney | 2011-07-22 22:27:54 +0000 (Fri, 22 Jul 2011) | 1 line
- 
- bug 6638 - 3.3.2 release notes were not committed to svn
+ Creating 3.4 branch based on 3.4.1 so that trunk can go to 4.0
 ------------------------------------------------------------------------
diff -Nru spamassassin-3.4.0/CREDITS spamassassin-3.4.2/CREDITS
--- spamassassin-3.4.0/CREDITS	2014-02-07 03:36:38.000000000 -0500
+++ spamassassin-3.4.2/CREDITS	2018-09-13 21:27:51.000000000 -0400
@@ -1,3 +1,5 @@
+Copyright (C) 2018 The Apache Software Foundation
+
 Project Management Committee (PMC):
 
   This list contains PMC members in alphabetical order (and their Amazon
@@ -7,20 +9,27 @@
   non-confidential correspondence.
 
    - Karsten Bräckelmann
-   - Alex Broens
+   - Alex Broens	  http://www.msf.org/en/donate
+   - Bill Cole
+   - John Hardin
+   - Dave Jones
    - Adam Katz
-   - Sidney Markowitz     http://www.amazon.com/o/registry/1WJ8J7403BLTS
+   - Sidney Markowitz
    - Mark Martinec
    - Kevin A. McGrail
    - Michael Parker       http://www.amazon.com/o/registry/10BBAR2M03T6F
+   - Joe Quinn
 
 Committers:
 
   This list contains committers in alphabetical order (and their Amazon
   wishlists).
 
-   - John Hardin
+   - Giovanni Bechis
    - Henrik Krohns
+   - Paul Stead
+   - Merijn van den Kroonenberg
+   - Bryan Vest
 
 PMC Emeritus & inactive committers:
 
@@ -32,7 +41,7 @@
    - Duncan Findlay - PMC Emeritus
    - Tony Finch
    - Steve Freegard
-   - Craig Hughes 
+   - Craig Hughes
    - Matt Kettler - PMC Emeritus
    - Justin Mason - Creator & PMC Emeritus
    - Robert Menschel
@@ -96,9 +105,9 @@
     to avoid losing mail from spamc; BSMTP and -e support; tracking of
     number of spamd processes; several other mods.
 
-  - Kristian Koehntopp <kris(at)koehntopp.de>: LDAP support.
+  - Kristian Köhntopp, <kris(at)koehntopp.de>: LDAP support.
 
-  - Matthias Leisi <matthias(at)leisi.net>: Mail::SpamAssassin::Plugin::ASN
+  - Matthias Leisi, <matthias(at)leisi.net>: Mail::SpamAssassin::Plugin::ASN
     plugin.
 
   - Daniel Lemke, <lemke(at)jam-software.com>: many Windows support fixes
@@ -141,6 +150,8 @@
 
   - Henry Stern: perceptron score optimizer (replacing the GA).
 
+  - Ivo Truxa: TxRep reputation database plugin.
+
   - Liam Widdowson, <liam(at)inodes.org>: shared-library use of spamc.
 
   - Radoslaw Zielinski, <radek(at)pld-linux.org>:
@@ -205,6 +216,9 @@
 
   - Chris Eykamp, <chris(at)eykamp.com>: 4 weight loss rules.
 
+  - David B Funk <dbfunk(at)engineering.uiowa.edu>: Fix for newline collapse
+    causing excessive whitespace rules to not match
+
   - Alan Ford, <alan(at)whirlnet.co.uk>: Getting a list of symbols of tests hit
     with spamd; patch for spamd response headers.
 
@@ -227,9 +241,6 @@
 
   - Morbus Iff, <morbus(at)disobey.com>: don't create prefs patch.
 
-  - David F. Skoll, <dfs(at)roaringpenguin.com>: one line change to
-    __OUTLOOK_MUA.
-
   - Steve Keay, <steve-spamassassin-bugzilla(at)keay.com>: spamd -A network
     ranges support.
 
@@ -285,14 +296,14 @@
 
   - Mike Nolan, <nolan(at)naic.edu>: SunOS build directions
 
-  - Martin O"stlund, <mo(at)microsaft.nu>: Slackware 9.0 rc-script for spamd.
+  - Martin Östlund, <mo(at)microsaft.nu>: Slackware 9.0 rc-script for spamd.
 
   - Tomasz Ostrowski, <tometzky(at)batory.org.pl>: perl 5.005 support.
 
   - Henning P. Schmiedehausen, <hps(at)intermeta.de> <henning(at)apache.org>:
     adding ? to shell globs.
 
-  - Francesco Potorti, <pot(at)gnu.org>: documentation improvements
+  - Francesco Potortì, <pot(at)gnu.org>: documentation improvements
 
   - Alan Premselaar, <alien(at)12inch.com>: rule suggestions.
 
@@ -314,6 +325,9 @@
   - Bart Schaefer, <schaefer(at)zanshin.com>: bug fix for DCC; Razor
     support; rules.
 
+  - Dianne Skoll, <dfs(at)roaringpenguin.com>: one line change to
+    __OUTLOOK_MUA.
+
   - Al Smith, <al.smith(at)aeschi.ch.eu.org>: fix to SSL spamd bug.
 
   - Sander Steffann, <sander(at)steffann.nl>: patch to contrib/spamcheck.py.
@@ -363,7 +377,7 @@
 Resources:
 
   Thanks to our previous mirrors: Peregrine Computer Consultants Corporation
-  (previously Peregrine Hardware, Inc.) and Kevin A. McGrail, Jeremy Zawodny, 
+  (previously Peregrine Hardware, Inc.) and Kevin A. McGrail, Jeremy Zawodny,
   Mark Reynolds, RedIRIS, Hagen Herrschaft, and PlanetMirror.
 
   Thanks to Mark Reynolds of Reynolds Technology (http://www.reynolds.net.au/)
@@ -385,6 +399,6 @@
 Finally:
 
   Thanks to James Thompson at cPanel Inc who designed our new logo in 2014 and
-  to Christian Rauh, winner of the SpamAssassin logo contest, who created, 
-  designed, and illustrated our first the Apache SpamAssassin logo.
+  to Christian Rauh, winner of the SpamAssassin logo contest, who created,
+  designed, and illustrated our first Apache SpamAssassin logo.
 
diff -Nru spamassassin-3.4.0/debian/changelog spamassassin-3.4.2/debian/changelog
--- spamassassin-3.4.0/debian/changelog	2015-01-31 14:07:51.000000000 -0500
+++ spamassassin-3.4.2/debian/changelog	2018-10-30 13:28:29.000000000 -0400
@@ -1,3 +1,36 @@
+spamassassin (3.4.2-0+deb8u1) UNRELEASED; urgency=medium
+
+  * Non-maintainer upload by the LTS Security Team.
+  * New upstream version to fix several security issues and critical bugs:
+    - CVE-2017-15705: Denial of service issue in which certain unclosed
+      tags in emails cause markup to be handled incorrectly leading to
+      scan timeouts. (Closes: 908969)
+    - CVE-2016-1238: Unsafe usage of "." in @INC in a configuration
+      script.
+    - CVE-2018-11780: potential Remote Code Execution bug with the
+      PDFInfo plugin. (Closes: 908970)
+    - CVE-2018-11781: local user code injection in the meta rule syntax.
+      (Closes: 908971)
+    - BayesStore: bayes_expire table grows, remove_running_expire_tok not
+      called (Closes: 883775)
+    - Fix use of uninitialized variable warning in PDFInfo.pm
+      (Closes: 865924)
+    - Fix "failed to parse plugin" error in
+      Mail::SpamAssassin::Plugin::URILocalBL (Closes: 891041)
+  * Don't recursively chown /var/lib/spamassassin during postinst.
+    (Closes: 889501)
+  * Update SysV init script to cope with upstream's change to $0.
+  * Refresh patches
+  * Removed patches merged upstream:
+    - 30_edit_README
+    - 35_bug752542-libnet-dns-perl.patch
+    - 97_bug720499-pod-5.18
+    - bug_771408_perl_version
+    - bug_774768_disable_ahbl
+  * Run test suite during build (Closes: #784023).
+
+ -- Antoine Beaupré <anarcat@debian.org>  Tue, 30 Oct 2018 13:28:29 -0400
+
 spamassassin (3.4.0-6) unstable; urgency=medium
 
   * Remove references to ahbl.org DNSBL, which has ceased operation.
diff -Nru spamassassin-3.4.0/debian/control spamassassin-3.4.2/debian/control
--- spamassassin-3.4.0/debian/control	2015-01-31 14:07:51.000000000 -0500
+++ spamassassin-3.4.2/debian/control	2018-10-30 13:28:29.000000000 -0400
@@ -4,7 +4,7 @@
 Maintainer: Noah Meyerhans <noahm@debian.org>
 Build-Depends: debhelper (>= 7), perl, libssl-dev,
  libhtml-parser-perl (>= 3.24), libnet-dns-perl (>= 0.34), libnetaddr-ip-perl,
- dh-systemd
+ dh-systemd, libberkeleydb-perl, netbase
 Standards-Version: 3.9.6
 Homepage: http://www.spamassassin.org/
 Vcs-Svn: svn://svn.debian.org/svn/collab-maint/deb-maint/spamassassin/trunk
diff -Nru spamassassin-3.4.0/debian/patches/10_change_config_paths spamassassin-3.4.2/debian/patches/10_change_config_paths
--- spamassassin-3.4.0/debian/patches/10_change_config_paths	2015-01-31 14:07:51.000000000 -0500
+++ spamassassin-3.4.2/debian/patches/10_change_config_paths	2018-10-30 13:28:29.000000000 -0400
@@ -1,8 +1,8 @@
-Index: spamassassin-3.4.0/INSTALL
+Index: spamassassin-3.4.2/INSTALL
 ===================================================================
---- spamassassin-3.4.0.orig/INSTALL	2014-06-24 21:59:07.511058109 -0700
-+++ spamassassin-3.4.0/INSTALL	2014-06-24 21:59:09.387067407 -0700
-@@ -462,7 +462,7 @@
+--- spamassassin-3.4.2.orig/INSTALL
++++ spamassassin-3.4.2/INSTALL
+@@ -462,7 +462,7 @@ version is too low for them to be used.
      perl interpreter.  Version 2.83 or later fixes this.
  
      If you do not plan to use this plugin, be sure to comment out
@@ -11,11 +11,11 @@
  
  
  What Next?
-Index: spamassassin-3.4.0/README
+Index: spamassassin-3.4.2/README
 ===================================================================
---- spamassassin-3.4.0.orig/README	2014-06-24 21:59:07.511058109 -0700
-+++ spamassassin-3.4.0/README	2014-06-24 21:59:09.387067407 -0700
-@@ -111,13 +111,13 @@
+--- spamassassin-3.4.2.orig/README
++++ spamassassin-3.4.2/README
+@@ -114,13 +114,13 @@ default locations that Apache SpamAssass
          not modify these, as they are overwritten when you run
          "sa-update".
  
@@ -31,7 +31,7 @@
  
          Plugin control files, installed from the distribution. These are
          used to control what plugins are loaded.  Modifications here will
-@@ -126,7 +126,7 @@
+@@ -129,7 +129,7 @@ default locations that Apache SpamAssass
          
          You want to modify these files if you want to load additional
          plugins, or inhibit loading a plugin that is enabled by default.
@@ -40,7 +40,7 @@
          be overwritten during future installs.
  
    - /usr/share/spamassassin/user_prefs.template:
-@@ -134,14 +134,14 @@
+@@ -137,14 +137,14 @@ default locations that Apache SpamAssass
  	Distributed default user preferences. Do not modify this, as it is
  	overwritten when you upgrade.
  
@@ -57,11 +57,11 @@
          just a template, which will be copied to a user's home directory
          for them to change.
  
-Index: spamassassin-3.4.0/UPGRADE
+Index: spamassassin-3.4.2/UPGRADE
 ===================================================================
---- spamassassin-3.4.0.orig/UPGRADE	2014-06-24 21:59:07.511058109 -0700
-+++ spamassassin-3.4.0/UPGRADE	2014-06-24 21:59:09.391067429 -0700
-@@ -49,7 +49,7 @@
+--- spamassassin-3.4.2.orig/UPGRADE
++++ spamassassin-3.4.2/UPGRADE
+@@ -253,7 +253,7 @@ Note for Users Upgrading to SpamAssassin
    perldoc Mail::SpamAssassin::Plugin::* (ie AWL, DCC, etc)
  
  - There are now multiple files read to enable plugins in the
@@ -70,7 +70,7 @@
    read.  Now both "init.pre", "v310.pre", and any other files ending
    in ".pre" will be read.  As future releases are made, new plugins
    will be added to new files named according to the release they're
-@@ -207,7 +207,7 @@
+@@ -411,7 +411,7 @@ Note for Users Upgrading to SpamAssassin
  - If you are using a UNIX machine with all database files on local disks,
    and no sharing of those databases across NFS filesystems, you can use a
    more efficient, but non-NFS-safe, locking mechanism.   Do this by adding
@@ -79,11 +79,11 @@
    file. This is strongly recommended if you're not using NFS, as it is
    much faster than the NFS-safe locker.
  
-Index: spamassassin-3.4.0/USAGE
+Index: spamassassin-3.4.2/USAGE
 ===================================================================
---- spamassassin-3.4.0.orig/USAGE	2014-06-24 21:59:07.511058109 -0700
-+++ spamassassin-3.4.0/USAGE	2014-06-24 21:59:09.391067429 -0700
-@@ -117,7 +117,7 @@
+--- spamassassin-3.4.2.orig/USAGE
++++ spamassassin-3.4.2/USAGE
+@@ -117,7 +117,7 @@ Other Installation Notes
      CPU-intensive task before they can send mail to you, so we give that
      some bonus points.  However, it requires that you list what addresses
      you expect to receive mail for, by adding 'hashcash_accept' lines to
@@ -92,7 +92,7 @@
      files.  See the Mail::SpamAssassin::Plugin::Hashcash manual page for
      details on how to specify these.
  
-@@ -129,14 +129,14 @@
+@@ -129,14 +129,14 @@ Other Installation Notes
  
  
    - You can create your own system-wide rules files in
@@ -109,11 +109,11 @@
      override these files.
  
  
-Index: spamassassin-3.4.0/ldap/README
+Index: spamassassin-3.4.2/ldap/README
 ===================================================================
---- spamassassin-3.4.0.orig/ldap/README	2014-06-24 21:59:07.511058109 -0700
-+++ spamassassin-3.4.0/ldap/README	2014-06-24 21:59:09.391067429 -0700
-@@ -13,7 +13,7 @@
+--- spamassassin-3.4.2.orig/ldap/README
++++ spamassassin-3.4.2/ldap/README
+@@ -13,7 +13,7 @@ therefore, the only way to have their ow
  database or LDAP server.
  
  SpamAssassin will check the global configuration file (ie. any file matching
@@ -122,11 +122,11 @@
  
    user_scores_dsn ldap://host:port/dc=basedn,dc=de?attr?scope?uid=__USERNAME__
    user_scores_ldap_username	bind dn
-Index: spamassassin-3.4.0/lib/Mail/SpamAssassin/Conf.pm
+Index: spamassassin-3.4.2/lib/Mail/SpamAssassin/Conf.pm
 ===================================================================
---- spamassassin-3.4.0.orig/lib/Mail/SpamAssassin/Conf.pm	2014-06-24 21:59:07.511058109 -0700
-+++ spamassassin-3.4.0/lib/Mail/SpamAssassin/Conf.pm	2014-06-24 21:59:09.395067452 -0700
-@@ -40,7 +40,7 @@
+--- spamassassin-3.4.2.orig/lib/Mail/SpamAssassin/Conf.pm
++++ spamassassin-3.4.2/lib/Mail/SpamAssassin/Conf.pm
+@@ -40,7 +40,7 @@ Mail::SpamAssassin::Conf - SpamAssassin
  =head1 DESCRIPTION
  
  SpamAssassin is configured using traditional UNIX-style configuration files,
@@ -135,7 +135,7 @@
  directories.
  
  The following web page lists the most important configuration settings
-@@ -2517,7 +2517,7 @@
+@@ -2673,7 +2673,7 @@ If this option is set to 1 and the messa
  
  These settings differ from the ones above, in that they are considered
  'privileged'.  Only users running C<spamassassin> from their procmailrc's or
@@ -144,11 +144,11 @@
  use them.   C<spamd> users cannot use them in their C<user_prefs> files, for
  security and efficiency reasons, unless C<allow_user_rules> is enabled (and
  then, they may only add rules from below).
-Index: spamassassin-3.4.0/lib/Mail/SpamAssassin/Plugin/Test.pm
+Index: spamassassin-3.4.2/lib/Mail/SpamAssassin/Plugin/Test.pm
 ===================================================================
---- spamassassin-3.4.0.orig/lib/Mail/SpamAssassin/Plugin/Test.pm	2014-06-24 21:59:07.511058109 -0700
-+++ spamassassin-3.4.0/lib/Mail/SpamAssassin/Plugin/Test.pm	2014-06-24 21:59:09.399067468 -0700
-@@ -27,7 +27,7 @@
+--- spamassassin-3.4.2.orig/lib/Mail/SpamAssassin/Plugin/Test.pm
++++ spamassassin-3.4.2/lib/Mail/SpamAssassin/Plugin/Test.pm
+@@ -27,7 +27,7 @@ Test - test plugin
  =head1 DESCRIPTION
  
  To try this plugin, write the above two lines in the synopsis to
@@ -157,11 +157,11 @@
  
  =cut
  
-Index: spamassassin-3.4.0/lib/spamassassin-run.pod
+Index: spamassassin-3.4.2/lib/spamassassin-run.pod
 ===================================================================
---- spamassassin-3.4.0.orig/lib/spamassassin-run.pod	2014-06-24 21:59:07.511058109 -0700
-+++ spamassassin-3.4.0/lib/spamassassin-run.pod	2014-06-24 21:59:09.399067468 -0700
-@@ -41,7 +41,7 @@
+--- spamassassin-3.4.2.orig/lib/spamassassin-run.pod
++++ spamassassin-3.4.2/lib/spamassassin-run.pod
+@@ -41,7 +41,7 @@ Options:
   -p prefs, --prefspath=file, --prefs-file=file
                                     Set user preferences file
   --siteconfigpath=path             Path for site configs
@@ -170,7 +170,7 @@
   --cf='config line'                Additional line of configuration
   -x, --nocreate-prefs              Don't create user preferences file
   -e, --exit-code                   Exit with a non-zero exit code if the
-@@ -240,7 +240,7 @@
+@@ -240,7 +240,7 @@ Ignore the default directories (usually
  =item B<--siteconfigpath>=I<path>
  
  Use the specified path for locating site-specific configuration files.  Ignore
@@ -179,10 +179,10 @@
  
  =item B<--cf='config line'>
  
-Index: spamassassin-3.4.0/rules/user_prefs.template
+Index: spamassassin-3.4.2/rules/user_prefs.template
 ===================================================================
---- spamassassin-3.4.0.orig/rules/user_prefs.template	2014-06-24 21:59:07.511058109 -0700
-+++ spamassassin-3.4.0/rules/user_prefs.template	2014-06-24 21:59:09.399067468 -0700
+--- spamassassin-3.4.2.orig/rules/user_prefs.template
++++ spamassassin-3.4.2/rules/user_prefs.template
 @@ -5,7 +5,7 @@
  #* directory. At runtime, if a user has no preferences in their home directory
  #* already, it will be copied for them, allowing them to perform personalised
@@ -192,20 +192,20 @@
  ###########################################################################
  
  # How many points before a mail is considered spam.
-Index: spamassassin-3.4.0/sa-compile.raw
+Index: spamassassin-3.4.2/sa-compile.raw
 ===================================================================
---- spamassassin-3.4.0.orig/sa-compile.raw	2014-06-24 21:59:07.511058109 -0700
-+++ spamassassin-3.4.0/sa-compile.raw	2014-06-24 21:59:09.399067468 -0700
-@@ -675,7 +675,7 @@
+--- spamassassin-3.4.2.orig/sa-compile.raw
++++ spamassassin-3.4.2/sa-compile.raw
+@@ -678,7 +678,7 @@ Options:
    -p prefs, --prefspath=file, --prefs-file=file
                                  Set user preferences file
    --siteconfigpath=path         Path for site configs
--                                (default: /etc/mail/spamassassin)
-+                                (default: /etc/spamassassin)
+-                                (default: @@PREFIX@@/etc/mail/spamassassin)
++                                (default: @@PREFIX@@/etc/spamassassin)
    --updatedir=path              Directory to place updates
            (default: @@LOCAL_STATE_DIR@@/compiled/<perlversion>/@@VERSION@@)
    --cf='config line'            Additional line of configuration
-@@ -740,7 +740,7 @@
+@@ -743,7 +743,7 @@ Ignore the default directories (usually
  =item B<--siteconfigpath>=I<path>
  
  Use the specified path for locating site-specific configuration files.  Ignore
@@ -214,20 +214,20 @@
  
  =item B<--updatedir>
  
-Index: spamassassin-3.4.0/sa-learn.raw
+Index: spamassassin-3.4.2/sa-learn.raw
 ===================================================================
---- spamassassin-3.4.0.orig/sa-learn.raw	2014-06-24 21:59:07.511058109 -0700
-+++ spamassassin-3.4.0/sa-learn.raw	2014-06-24 21:59:09.403067491 -0700
-@@ -649,7 +649,7 @@
+--- spamassassin-3.4.2.orig/sa-learn.raw
++++ spamassassin-3.4.2/sa-learn.raw
+@@ -655,7 +655,7 @@ Options:
   -p prefs, --prefspath=file, --prefs-file=file
                         Set user preferences file
   --siteconfigpath=path Path for site configs
--                       (default: /etc/mail/spamassassin)
-+                       (default: /etc/spamassassin)
+-                       (default:  @@PREFIX@@/etc/mail/spamassassin)
++                       (default:  @@PREFIX@@/etc/spamassassin)
   --cf='config line'    Additional line of configuration
   -D, --debug [area=n,...]  Print debugging messages
   -V, --version         Print version
-@@ -806,7 +806,7 @@
+@@ -815,7 +815,7 @@ Ignore the default directories (usually
  =item B<--siteconfigpath>=I<path>
  
  Use the specified path for locating site-specific configuration files.  Ignore
@@ -236,11 +236,11 @@
  
  =item B<--cf='config line'>
  
-Index: spamassassin-3.4.0/spamc/spamc.pod
+Index: spamassassin-3.4.2/spamc/spamc.pod
 ===================================================================
---- spamassassin-3.4.0.orig/spamc/spamc.pod	2014-06-24 21:59:07.511058109 -0700
-+++ spamassassin-3.4.0/spamc/spamc.pod	2014-06-24 21:59:09.403067491 -0700
-@@ -278,8 +278,8 @@
+--- spamassassin-3.4.2.orig/spamc/spamc.pod
++++ spamassassin-3.4.2/spamc/spamc.pod
+@@ -288,8 +288,8 @@ any settings in the configuration file.
  
  If the B<-F> switch is specified, that file will be used.  Otherwise,
  C<spamc> will attempt to load spamc.conf in C<SYSCONFDIR> (default:
@@ -251,11 +251,11 @@
  
  Example:
  
-Index: spamassassin-3.4.0/spamd/README
+Index: spamassassin-3.4.2/spamd/README
 ===================================================================
---- spamassassin-3.4.0.orig/spamd/README	2014-06-24 21:59:07.511058109 -0700
-+++ spamassassin-3.4.0/spamd/README	2014-06-24 21:59:09.403067491 -0700
-@@ -105,7 +105,7 @@
+--- spamassassin-3.4.2.orig/spamd/README
++++ spamassassin-3.4.2/spamd/README
+@@ -105,7 +105,7 @@ The Bayesian Classifier
  If you plan to use Bayesian classification (the BAYES rules) with spamd,
  you will need to either
  
@@ -264,11 +264,11 @@
    tokens, by setting the 'bayes_path' setting to a path all users can read
    and write to.  You will also need to set the 'bayes_file_mode' setting
    to 0666 so that created files are shared, too.
-Index: spamassassin-3.4.0/spamd/README.vpopmail
+Index: spamassassin-3.4.2/spamd/README.vpopmail
 ===================================================================
---- spamassassin-3.4.0.orig/spamd/README.vpopmail	2014-06-24 21:59:07.511058109 -0700
-+++ spamassassin-3.4.0/spamd/README.vpopmail	2014-06-24 21:59:09.407067507 -0700
-@@ -43,7 +43,7 @@
+--- spamassassin-3.4.2.orig/spamd/README.vpopmail
++++ spamassassin-3.4.2/spamd/README.vpopmail
+@@ -43,7 +43,7 @@ then their user_prefs would be stored in
  	/home/vpopmail/domains/somedomain.net/4/userid/.spamassassin/user_prefs
  
  5. One gotcha - cannot have personal AWL dbs - only a sitewide AWL will work.
@@ -277,11 +277,11 @@
  future enhancement would be to add the capability to have personal AWL db.
  
  6. Of course vpopmail must have the seekable patch installed (see 
-Index: spamassassin-3.4.0/spamd/spamd.raw
+Index: spamassassin-3.4.2/spamd/spamd.raw
 ===================================================================
---- spamassassin-3.4.0.orig/spamd/spamd.raw	2014-06-24 21:59:07.511058109 -0700
-+++ spamassassin-3.4.0/spamd/spamd.raw	2014-06-24 21:59:09.411067530 -0700
-@@ -3281,7 +3281,7 @@
+--- spamassassin-3.4.2.orig/spamd/spamd.raw
++++ spamassassin-3.4.2/spamd/spamd.raw
+@@ -3352,7 +3352,7 @@ Ignore the default directories (usually
  =item B<--siteconfigpath>=I<path>
  
  Use the specified path for locating site-specific configuration files.  Ignore
@@ -290,11 +290,11 @@
  
  =item B<--cf='config line'>
  
-Index: spamassassin-3.4.0/sql/README
+Index: spamassassin-3.4.2/sql/README
 ===================================================================
---- spamassassin-3.4.0.orig/sql/README	2014-06-24 21:59:07.511058109 -0700
-+++ spamassassin-3.4.0/sql/README	2014-06-24 21:59:09.411067530 -0700
-@@ -18,7 +18,7 @@
+--- spamassassin-3.4.2.orig/sql/README
++++ spamassassin-3.4.2/sql/README
+@@ -18,7 +18,7 @@ In addition, any config options marked a
  SQL preferences.
  
  SpamAssassin will check the global configuration file (ie. any file matching
@@ -303,11 +303,11 @@
  
    user_scores_dsn		DBI:driver:connection
    user_scores_sql_username	dbusername
-Index: spamassassin-3.4.0/sql/README.awl
+Index: spamassassin-3.4.2/sql/README.awl
 ===================================================================
---- spamassassin-3.4.0.orig/sql/README.awl	2014-06-24 21:59:07.511058109 -0700
-+++ spamassassin-3.4.0/sql/README.awl	2014-06-24 21:59:09.411067530 -0700
-@@ -15,7 +15,7 @@
+--- spamassassin-3.4.2.orig/sql/README.awl
++++ spamassassin-3.4.2/sql/README.awl
+@@ -15,7 +15,7 @@ so:
  auto_whitelist_factory Mail::SpamAssassin::SQLBasedAddrList
  
  SpamAssassin will check the global configuration file (ie. any file
@@ -316,10 +316,10 @@
  
  user_awl_dsn                 DBI:driver:database:hostname[:port]
  user_awl_sql_username        dbusername
-Index: spamassassin-3.4.0/t/data/testplugin.pm
+Index: spamassassin-3.4.2/t/data/testplugin.pm
 ===================================================================
---- spamassassin-3.4.0.orig/t/data/testplugin.pm	2014-06-24 21:59:07.511058109 -0700
-+++ spamassassin-3.4.0/t/data/testplugin.pm	2014-06-24 21:59:09.411067530 -0700
+--- spamassassin-3.4.2.orig/t/data/testplugin.pm
++++ spamassassin-3.4.2/t/data/testplugin.pm
 @@ -1,6 +1,6 @@
  =head1 testplugin.pm
  
diff -Nru spamassassin-3.4.0/debian/patches/20_edit_spamc_pod spamassassin-3.4.2/debian/patches/20_edit_spamc_pod
--- spamassassin-3.4.0/debian/patches/20_edit_spamc_pod	2015-01-31 14:07:51.000000000 -0500
+++ spamassassin-3.4.2/debian/patches/20_edit_spamc_pod	2018-10-30 13:28:29.000000000 -0400
@@ -1,8 +1,8 @@
-Index: spamassassin-3.4.0-rc5/spamc/spamc.pod
+Index: spamassassin-3.4.2-pre3/spamc/spamc.pod
 ===================================================================
---- spamassassin-3.4.0-rc5.orig/spamc/spamc.pod	2014-02-10 21:35:08.896487637 -0800
-+++ spamassassin-3.4.0-rc5/spamc/spamc.pod	2014-02-10 21:35:58.860735402 -0800
-@@ -331,7 +331,7 @@
+--- spamassassin-3.4.2-pre3.orig/spamc/spamc.pod
++++ spamassassin-3.4.2-pre3/spamc/spamc.pod
+@@ -341,7 +341,7 @@ The exit codes used are as follows:
  
  =head1 SEE ALSO
  
diff -Nru spamassassin-3.4.0/debian/patches/30_edit_README spamassassin-3.4.2/debian/patches/30_edit_README
--- spamassassin-3.4.0/debian/patches/30_edit_README	2015-01-31 14:07:51.000000000 -0500
+++ spamassassin-3.4.2/debian/patches/30_edit_README	1969-12-31 19:00:00.000000000 -0500
@@ -1,16 +0,0 @@
-Index: b/README
-===================================================================
---- a/README	2010-01-26 23:16:56.000000000 -0500
-+++ b/README	2010-01-26 23:16:57.000000000 -0500
-@@ -129,11 +129,6 @@
-         If the files exist in /etc/spamassassin, they will not
-         be overwritten during future installs.
- 
--  - /usr/share/spamassassin/user_prefs.template:
--
--	Distributed default user preferences. Do not modify this, as it is
--	overwritten when you upgrade.
--
-   - /etc/spamassassin/user_prefs.template:
- 
- 	Default user preferences, for system admins to create, modify, and
diff -Nru spamassassin-3.4.0/debian/patches/35_bug752542-libnet-dns-perl.patch spamassassin-3.4.2/debian/patches/35_bug752542-libnet-dns-perl.patch
--- spamassassin-3.4.0/debian/patches/35_bug752542-libnet-dns-perl.patch	2015-01-31 14:07:51.000000000 -0500
+++ spamassassin-3.4.2/debian/patches/35_bug752542-libnet-dns-perl.patch	1969-12-31 19:00:00.000000000 -0500
@@ -1,18 +0,0 @@
-Taken from https://svn.apache.org/viewvc/spamassassin/trunk/lib/Mail/SpamAssassin/DnsResolver.pm?r1=1603518&r2=1603517&pathrev=1603518
-Index: spamassassin-3.4.0/lib/Mail/SpamAssassin/DnsResolver.pm
-===================================================================
---- spamassassin-3.4.0.orig/lib/Mail/SpamAssassin/DnsResolver.pm	2014-02-07 00:36:28.000000000 -0800
-+++ spamassassin-3.4.0/lib/Mail/SpamAssassin/DnsResolver.pm	2014-06-24 22:02:48.552154294 -0700
-@@ -204,8 +204,10 @@
-     @ns_addr_port = @{$self->{conf}->{dns_servers}};
-     dbg("dns: servers set by config to: %s", join(', ',@ns_addr_port));
-   } elsif ($res) {  # default as provided by Net::DNS, e.g. /etc/resolv.conf
--    @ns_addr_port = map(untaint_var("[$_]:" . $res->{port}),
--                        @{$res->{nameservers}});
-+    my @ns = $res->UNIVERSAL::can('nameservers') ? $res->nameservers
-+                                                 : @{$res->{nameservers}};
-+    my $port = $res->UNIVERSAL::can('port') ? $res->port : $res->{port};
-+    @ns_addr_port = map(untaint_var("[$_]:" . $port), @ns);
-     dbg("dns: servers obtained from Net::DNS : %s", join(', ',@ns_addr_port));
-   }
-   return @ns_addr_port;
diff -Nru spamassassin-3.4.0/debian/patches/90_pod_cleanup spamassassin-3.4.2/debian/patches/90_pod_cleanup
--- spamassassin-3.4.0/debian/patches/90_pod_cleanup	2015-01-31 14:07:51.000000000 -0500
+++ spamassassin-3.4.2/debian/patches/90_pod_cleanup	2018-10-30 13:28:29.000000000 -0400
@@ -1,8 +1,8 @@
-Index: spamassassin-3.4.0/lib/Mail/SpamAssassin/Conf.pm
+Index: spamassassin-3.4.2/lib/Mail/SpamAssassin/Conf.pm
 ===================================================================
---- spamassassin-3.4.0.orig/lib/Mail/SpamAssassin/Conf.pm	2014-06-24 21:59:28.339161372 -0700
-+++ spamassassin-3.4.0/lib/Mail/SpamAssassin/Conf.pm	2014-06-24 21:59:34.195190420 -0700
-@@ -3566,7 +3566,7 @@
+--- spamassassin-3.4.2.orig/lib/Mail/SpamAssassin/Conf.pm
++++ spamassassin-3.4.2/lib/Mail/SpamAssassin/Conf.pm
+@@ -3994,7 +3994,7 @@ This option gives the password used by t
  
  Whether to call the services_authorized_for_username plugin hook in BayesSQL.
  If the hook does not determine that the user is allowed to use bayes or is
@@ -11,39 +11,62 @@
  
  NOTE: By default the user is considered invalid until a plugin returns
  a true value.  If you enable this, but do not have a proper plugin
-Index: spamassassin-3.4.0/lib/Mail/SpamAssassin/Plugin/DCC.pm
+Index: spamassassin-3.4.2/lib/Mail/SpamAssassin/Plugin/MIMEEval.pm
 ===================================================================
---- spamassassin-3.4.0.orig/lib/Mail/SpamAssassin/Plugin/DCC.pm	2014-06-24 21:59:07.039055769 -0700
-+++ spamassassin-3.4.0/lib/Mail/SpamAssassin/Plugin/DCC.pm	2014-06-24 21:59:34.199190434 -0700
-@@ -1091,3 +1091,5 @@
- }
+--- spamassassin-3.4.2.orig/lib/Mail/SpamAssassin/Plugin/MIMEEval.pm
++++ spamassassin-3.4.2/lib/Mail/SpamAssassin/Plugin/MIMEEval.pm
+@@ -17,7 +17,7 @@
  
- 1;
-+
-+=back
-Index: spamassassin-3.4.0/lib/Mail/SpamAssassin/Plugin/DNSEval.pm
-===================================================================
---- spamassassin-3.4.0.orig/lib/Mail/SpamAssassin/Plugin/DNSEval.pm	2014-06-24 21:59:07.039055769 -0700
-+++ spamassassin-3.4.0/lib/Mail/SpamAssassin/Plugin/DNSEval.pm	2014-06-24 21:59:34.199190434 -0700
-@@ -325,6 +325,7 @@
- This checks all the from addrs domain names as an alternate to check_rbl_from_host
+ =head1 NAME
  
- =cut
-+
- sub check_rbl_from_domain {
-   _check_rbl_addresses(@_, $_[1]->all_from_addrs_domains());
+-MIMEEval - perform various tests against MIME structure and body
++Mail::SpamAssassin::Plugin::MIMEEval - perform various tests against MIME structure and body
+ 
+ =head1 SYNOPSIS
+ 
+@@ -175,6 +175,31 @@ sub check_for_faraway_charset {
+   0;
  }
-@@ -334,6 +335,7 @@
- Adds capability check for "if can()" for check_rbl_from_domain
  
- =cut
++=item check_for_mime
++
++Check for various MIME properties.
 +
- sub has_check_rbl_from_domain { 1 }
++Use in rules such as:
++
++  rawbody MIME_BASE64      eval:check_for_mime('mime_base64_count')
++  describe MIME_BASE64     Includes a base64 attachment
++
++  mime_base64_count
++  mime_base64_encoded_text
++  mime_body_html_count
++  mime_body_text_count
++  mime_faraway_charset
++  mime_missing_boundary
++  mime_multipart_alternative
++  mime_multipart_ratio
++  mime_qp_count
++  mime_qp_long_line
++  mime_qp_ratio
++  mime_ascii_text_illegal
++  mime_text_unicode_ratio
++
++=cut
++
+ sub check_for_mime {
+   my ($self, $pms, undef, $test) = @_;
  
- # this only checks the address host name and not the domain name because
-@@ -412,3 +414,5 @@
+@@ -193,7 +218,12 @@ sub check_for_mime_html {
+   return ($pms->{mime_body_html_count} > 0);
  }
  
- 1;
+-# HTML without some other type of MIME text part
++=item check_for_mime_html_only
 +
-+=back
++Check for messages containing only text/html body parts
++
++=cut
++
+ sub check_for_mime_html_only {
+   my ($self, $pms) = @_;
+ 
diff -Nru spamassassin-3.4.0/debian/patches/97_bug720499-pod-5.18 spamassassin-3.4.2/debian/patches/97_bug720499-pod-5.18
--- spamassassin-3.4.0/debian/patches/97_bug720499-pod-5.18	2015-01-31 14:07:51.000000000 -0500
+++ spamassassin-3.4.2/debian/patches/97_bug720499-pod-5.18	1969-12-31 19:00:00.000000000 -0500
@@ -1,33 +0,0 @@
-Description: fix POD errors with perl 5.18
- Wrap number-like items in C<>, to avoid parser complains
-Author: Damyan Ivanov <dmn@debian.org>
-Bug-Debian: http://bugs.debian.org/720499
-
---- a/sa-check_spamd.raw
-+++ b/sa-check_spamd.raw
-@@ -424,21 +424,21 @@ exiting with one of these values:
- 
- =over 4
- 
--=item 0
-+=item C<0>
- 
- OK: A spamd ping response was received within all threshold times.
- 
--=item 1
-+=item C<1>
- 
- WARNING: A spamd ping response exceeded the warning threshold but not the
- critical threshold.
- 
--=item 2
-+=item C<2>
- 
- CRITICAL: A spamd ping response exceeded either the critical threshold or the
- timeout value.
- 
--=item 3
-+=item C<3>
- 
- UNKNOWN: An error, probably caused by a missing dependency or an invalid
- configuration parameter being supplied, occurred in the sa-check_spamd program.
diff -Nru spamassassin-3.4.0/debian/patches/98_sa-compile-quiet spamassassin-3.4.2/debian/patches/98_sa-compile-quiet
--- spamassassin-3.4.0/debian/patches/98_sa-compile-quiet	2015-01-31 14:07:51.000000000 -0500
+++ spamassassin-3.4.2/debian/patches/98_sa-compile-quiet	2018-10-30 13:28:29.000000000 -0400
@@ -1,8 +1,8 @@
-Index: spamassassin-3.4.0~rc5/lib/Mail/SpamAssassin/Plugin/BodyRuleBaseExtractor.pm
+Index: spamassassin-3.4.2/lib/Mail/SpamAssassin/Plugin/BodyRuleBaseExtractor.pm
 ===================================================================
---- spamassassin-3.4.0~rc5.orig/lib/Mail/SpamAssassin/Plugin/BodyRuleBaseExtractor.pm	2014-01-11 09:13:23.000000000 -0800
-+++ spamassassin-3.4.0~rc5/lib/Mail/SpamAssassin/Plugin/BodyRuleBaseExtractor.pm	2014-02-14 21:34:59.109796791 -0800
-@@ -192,7 +192,8 @@
+--- spamassassin-3.4.2.orig/lib/Mail/SpamAssassin/Plugin/BodyRuleBaseExtractor.pm
++++ spamassassin-3.4.2/lib/Mail/SpamAssassin/Plugin/BodyRuleBaseExtractor.pm
+@@ -191,7 +191,8 @@ NEXT_RULE:
          dbg("zoom: giving up on regexp: $eval_stat");
        };
  
diff -Nru spamassassin-3.4.0/debian/patches/bug_766718-net-dns-vers spamassassin-3.4.2/debian/patches/bug_766718-net-dns-vers
--- spamassassin-3.4.0/debian/patches/bug_766718-net-dns-vers	2015-01-31 14:07:51.000000000 -0500
+++ spamassassin-3.4.2/debian/patches/bug_766718-net-dns-vers	2018-10-30 13:28:29.000000000 -0400
@@ -1,9 +1,16 @@
-Improve Net::DNS package version checks. See https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=766718
-Index: spamassassin-3.4.0/lib/Mail/SpamAssassin/Dns.pm
+Description: Improve Net::DNS package version checks.
+ This isn't strictly necessary right now, but does make version checks more
+ robust and should be forwarded upstream. In multiple places, spamassassin
+ contains tests against $Net::DNS::VERSION that assume the value is numeric. It
+ is not guaranteed to be numeric, and in cases where it isn't the tests trigger
+ warnings.
+Bug-Debian: https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=766718
+Forwarded: no
+Index: spamassassin-3.4.2/lib/Mail/SpamAssassin/Dns.pm
 ===================================================================
---- spamassassin-3.4.0.orig/lib/Mail/SpamAssassin/Dns.pm	2014-02-07 00:36:28.000000000 -0800
-+++ spamassassin-3.4.0/lib/Mail/SpamAssassin/Dns.pm	2014-11-14 13:38:27.515047348 -0800
-@@ -511,14 +511,15 @@
+--- spamassassin-3.4.2.orig/lib/Mail/SpamAssassin/Dns.pm
++++ spamassassin-3.4.2/lib/Mail/SpamAssassin/Dns.pm
+@@ -520,14 +520,15 @@ sub is_dns_available {
  
    # Check version numbers - runtime check only
    if (defined $Net::DNS::VERSION) {
@@ -21,18 +28,3 @@
  	warn("dns: Net::DNS version is $Net::DNS::VERSION, but need 0.34");
  	return $IS_DNS_AVAILABLE;
        }
-Index: spamassassin-3.4.0/lib/Mail/SpamAssassin/Plugin/AskDNS.pm
-===================================================================
---- spamassassin-3.4.0.orig/lib/Mail/SpamAssassin/Plugin/AskDNS.pm	2014-02-07 00:36:27.000000000 -0800
-+++ spamassassin-3.4.0/lib/Mail/SpamAssassin/Plugin/AskDNS.pm	2014-11-14 14:07:51.671795329 -0800
-@@ -211,7 +211,9 @@
- 
-   $self->set_config($sa_main->{conf});
- 
--  $txtdata_can_provide_a_list = Net::DNS->VERSION >= 0.69;
-+  use version 0.77;
-+  $txtdata_can_provide_a_list =
-+      version->parse(Net::DNS->VERSION) >= version->parse('0.69');
- 
-   return $self;
- }
diff -Nru spamassassin-3.4.0/debian/patches/bug_771408_perl_version spamassassin-3.4.2/debian/patches/bug_771408_perl_version
--- spamassassin-3.4.0/debian/patches/bug_771408_perl_version	2015-01-31 14:07:51.000000000 -0500
+++ spamassassin-3.4.2/debian/patches/bug_771408_perl_version	1969-12-31 19:00:00.000000000 -0500
@@ -1,15 +0,0 @@
-upstream fix for bug #771408
-Index: spamassassin-3.4.0/lib/Mail/SpamAssassin/Conf/Parser.pm
-===================================================================
---- spamassassin-3.4.0.orig/lib/Mail/SpamAssassin/Conf/Parser.pm
-+++ spamassassin-3.4.0/lib/Mail/SpamAssassin/Conf/Parser.pm
-@@ -533,6 +533,9 @@ sub handle_conditional {
-     elsif ($token eq 'version') {
-       $eval .= $Mail::SpamAssassin::VERSION." ";
-     }
-+    elsif ($token eq 'perl_version') {
-+      $eval .= $]." ";
-+    }
-     elsif ($token =~ /^\w[\w\:]+$/) { # class name
-       my $u = untaint_var($token);
-       $eval .= '"' . $u . '" ';
diff -Nru spamassassin-3.4.0/debian/patches/bug_774768_disable_ahbl spamassassin-3.4.2/debian/patches/bug_774768_disable_ahbl
--- spamassassin-3.4.0/debian/patches/bug_774768_disable_ahbl	2015-01-31 14:07:51.000000000 -0500
+++ spamassassin-3.4.2/debian/patches/bug_774768_disable_ahbl	1969-12-31 19:00:00.000000000 -0500
@@ -1,53 +0,0 @@
-Index: spamassassin-3.4.0/pkgrules/20_dnsbl_tests.cf
-===================================================================
---- spamassassin-3.4.0.orig/pkgrules/20_dnsbl_tests.cf
-+++ spamassassin-3.4.0/pkgrules/20_dnsbl_tests.cf
-@@ -130,12 +130,6 @@ reuse  RCVD_IN_PBL
- # ---------------------------------------------------------------------------
- # Now, single zone BLs follow:
- 
--# another domain-based blacklist
--header DNS_FROM_AHBL_RHSBL      eval:check_rbl_envfrom('ahbl', 'rhsbl.ahbl.org.')
--describe DNS_FROM_AHBL_RHSBL    Envelope sender listed in dnsbl.ahbl.org
--tflags DNS_FROM_AHBL_RHSBL      net
--reuse  DNS_FROM_AHBL_RHSBL
--
- # ---------------------------------------------------------------------------
- # NOTE: donation tests, see README file for details
- 
-Index: spamassassin-3.4.0/pkgrules/30_text_de.cf
-===================================================================
---- spamassassin-3.4.0.orig/pkgrules/30_text_de.cf
-+++ spamassassin-3.4.0/pkgrules/30_text_de.cf
-@@ -88,7 +88,6 @@ lang de describe RCVD_IN_SORBS_ZOMBIE SO
- lang de describe RCVD_IN_SORBS_DUL SORBS: Senderechner nur temporär mit Internet verbunden
- lang de describe RCVD_IN_SBL Transportiert via Rechner in SBL-Liste (http://www.spamhaus.org/sbl/)
- lang de describe RCVD_IN_XBL Transportiert via Rechner in XBL-Liste (http://www.spamhaus.org/xbl/)
--lang de describe DNS_FROM_AHBL_RHSBL Absenderadresse in Liste von dnsbl.ahbl.org
- lang de describe RCVD_IN_BL_SPAMCOP_NET Transportiert via Rechner in Liste von www.spamcop.net
- lang de describe RCVD_IN_MAPS_RBL Transportiert via Rechner in Liste von http://www.mail-abuse.org/rbl/
- lang de describe RCVD_IN_MAPS_DUL Transportiert via Rechner in Liste von http://www.mail-abuse.org/dul/
-Index: spamassassin-3.4.0/pkgrules/30_text_pt_br.cf
-===================================================================
---- spamassassin-3.4.0.orig/pkgrules/30_text_pt_br.cf
-+++ spamassassin-3.4.0/pkgrules/30_text_pt_br.cf
-@@ -110,7 +110,6 @@ lang pt_BR describe __RCVD_IN_ZEN Recebi
- lang pt_BR describe RCVD_IN_SBL Recebida por um relay listado em Spamhaus SBL
- lang pt_BR describe RCVD_IN_XBL Recebida por um relay listado em Spamhaus XBL
- lang pt_BR describe RCVD_IN_PBL Recebida por um relay listado em Spamhaus PBL
--lang pt_BR describe DNS_FROM_AHBL_RHSBL Envelope sender consta em dnsbl.ahbl.org
- lang pt_BR describe RCVD_IN_BL_SPAMCOP_NET Recebida por um relay listado em bl.spamcop.net
- lang pt_BR describe RCVD_IN_MAPS_RBL Relay consta em RBL, http://www.mail-abuse.com/enduserinfo_rbl.html
- lang pt_BR describe RCVD_IN_MAPS_DUL Relay consta em DUL, http://www.mail-abuse.com/enduserinfo_dul.html
-Index: spamassassin-3.4.0/pkgrules/50_scores.cf
-===================================================================
---- spamassassin-3.4.0.orig/pkgrules/50_scores.cf
-+++ spamassassin-3.4.0/pkgrules/50_scores.cf
-@@ -515,7 +515,6 @@ score RCVD_IN_SORBS_WEB 0 0.614 0 0.770
- score RCVD_IN_SORBS_ZOMBIE 0 # n=0 n=1 n=2 n=3
- score RCVD_IN_XBL 0 0.724 0 0.375 # n=0 n=2
- score RCVD_IN_PBL 0 3.558 0 3.335 # n=0 n=2
--score DNS_FROM_AHBL_RHSBL 0 2.438 0 2.699 # n=0 n=2
- score NO_DNS_FOR_FROM 0 0.379 0 0.001 # n=0 n=2
- # </gen:mutable>
- 
diff -Nru spamassassin-3.4.0/debian/patches/series spamassassin-3.4.2/debian/patches/series
--- spamassassin-3.4.0/debian/patches/series	2015-01-31 14:07:51.000000000 -0500
+++ spamassassin-3.4.2/debian/patches/series	2018-10-30 13:28:29.000000000 -0400
@@ -1,11 +1,6 @@
 10_change_config_paths
 20_edit_spamc_pod
-30_edit_README
-35_bug752542-libnet-dns-perl.patch
 55_disable_nagios_epm
 90_pod_cleanup
-97_bug720499-pod-5.18
 98_sa-compile-quiet
 bug_766718-net-dns-vers
-bug_771408_perl_version
-bug_774768_disable_ahbl
diff -Nru spamassassin-3.4.0/debian/rules spamassassin-3.4.2/debian/rules
--- spamassassin-3.4.0/debian/rules	2015-01-31 14:07:51.000000000 -0500
+++ spamassassin-3.4.2/debian/rules	2018-10-30 13:28:29.000000000 -0400
@@ -70,6 +70,11 @@
 
 	$(MAKE) CFOPTIMIZE="$(CFLAGS)" CFCCFLAGS="" CFLIBS="" CFLDFLAGS="$(LDFLAGS)"
 
+ifeq (,$(filter nocheck,$(DEB_BUILD_OPTIONS)))
+	$(MAKE) test
+endif
+
+
 	pod2man sa-awl.raw sa-awl.1p
 	pod2man sa-check_spamd.raw sa-check_spamd.1p
 
diff -Nru spamassassin-3.4.0/debian/spamassassin.init spamassassin-3.4.2/debian/spamassassin.init
--- spamassassin-3.4.0/debian/spamassassin.init	2015-01-31 14:07:51.000000000 -0500
+++ spamassassin-3.4.2/debian/spamassassin.init	2018-10-30 13:28:29.000000000 -0400
@@ -51,30 +51,30 @@
   start)
 	check_enabled
 	echo -n "Starting $DESC: "
-	start-stop-daemon --start --pidfile $PIDFILE --name $DAEMON \
+	start-stop-daemon --start --pidfile $PIDFILE --name $NAME \
 	    $NICE --oknodo --startas $DAEMON -- $OPTIONS $DOPTIONS
 	echo "$NAME."
 	;;
 
   stop)
 	echo -n "Stopping $DESC: "
-	start-stop-daemon --stop --pidfile $PIDFILE --name $DAEMON --oknodo
+	start-stop-daemon --stop --pidfile $PIDFILE --name $NAME --oknodo
 	echo "$NAME."
 	;;
 
   reload|force-reload)
 	check_enabled
 	echo -n "Reloading $DESC: "
-	start-stop-daemon --stop --pidfile $PIDFILE --signal HUP --name $DAEMON
+	start-stop-daemon --stop --pidfile $PIDFILE --signal HUP --name $NAME
 	echo "$NAME."
 	;;
 
   restart)
 	check_enabled
 	echo -n "Restarting $DESC: "
-	start-stop-daemon --stop --pidfile $PIDFILE --name $DAEMON \
+	start-stop-daemon --stop --pidfile $PIDFILE --name $NAME \
 	    --retry 5 --oknodo
-	start-stop-daemon --start --pidfile $PIDFILE --name $DAEMON \
+	start-stop-daemon --start --pidfile $PIDFILE --name $NAME \
 	    $NICE --oknodo --startas $DAEMON -- $OPTIONS $DOPTIONS
 
 	echo "$NAME."
diff -Nru spamassassin-3.4.0/debian/spamassassin.postinst spamassassin-3.4.2/debian/spamassassin.postinst
--- spamassassin-3.4.0/debian/spamassassin.postinst	2015-01-31 14:07:51.000000000 -0500
+++ spamassassin-3.4.2/debian/spamassassin.postinst	2018-10-30 13:28:29.000000000 -0400
@@ -23,7 +23,7 @@
     # unless the user has overridden.
     if ! dpkg-statoverride --list /var/lib/spamassassin/* >/dev/null && \
         [ "$OWNER:$GROUP" != "debian-spamd:debian-spamd" ]; then
-	chown -R debian-spamd:debian-spamd /var/lib/spamassassin
+        chown debian-spamd:debian-spamd /var/lib/spamassassin
         OWNER=debian-spamd
         GROUP=debian-spamd
     fi
diff -Nru spamassassin-3.4.0/debian/spamassassin.preinst spamassassin-3.4.2/debian/spamassassin.preinst
--- spamassassin-3.4.0/debian/spamassassin.preinst	2015-01-31 14:07:51.000000000 -0500
+++ spamassassin-3.4.2/debian/spamassassin.preinst	2018-10-30 13:28:29.000000000 -0400
@@ -32,6 +32,16 @@
         rm_conffile spamassassin "/etc/logcheck/ignore.d.paranoid/spamassassin"
         rm_conffile spamassassin "/etc/logcheck/violations.ignore.d/spamassassin"
     fi
+    if dpkg --compare-versions "$2" lt-nl "3.4.2" &&
+       ! command -v systemctl > /dev/null; then
+	# spamd changed its process name in 3.4.2. If we're running a
+	# previous version under sysvinit, we need to stop the old
+	# version
+	echo "Handling upgrade from pre 3.4.2"
+	start-stop-daemon --stop --oknodo \
+			  --pidfile /var/run/spamd.pid \
+			  --name /usr/sbin/spamd
+    fi
 esac
 
 #DEBHELPER#
diff -Nru spamassassin-3.4.0/INSTALL spamassassin-3.4.2/INSTALL
--- spamassassin-3.4.0/INSTALL	2014-02-07 03:36:38.000000000 -0500
+++ spamassassin-3.4.2/INSTALL	2018-09-13 21:27:51.000000000 -0400
@@ -340,7 +340,7 @@
 
   - DB_File (from CPAN, included in many distributions)
 
-    Used to store data on-disk, for the Bayes-style logic and
+    Used to store data on-disk, for the Bayes-style logic, TxRep, and
     auto-whitelist.  *Much* more efficient than the other standard Perl
     database packages.  Strongly recommended.
 
diff -Nru spamassassin-3.4.0/lib/Mail/SpamAssassin/AICache.pm spamassassin-3.4.2/lib/Mail/SpamAssassin/AICache.pm
--- spamassassin-3.4.0/lib/Mail/SpamAssassin/AICache.pm	2014-02-07 03:36:28.000000000 -0500
+++ spamassassin-3.4.2/lib/Mail/SpamAssassin/AICache.pm	2018-09-13 21:27:51.000000000 -0400
@@ -20,8 +20,6 @@
 Mail::SpamAssassin::AICache - provide access to cached information for
 ArchiveIterator
 
-=head1 SYNOPSIS
-
 =head1 DESCRIPTION
 
 This module allows ArchiveIterator to use cached atime information instead of
diff -Nru spamassassin-3.4.0/lib/Mail/SpamAssassin/ArchiveIterator.pm spamassassin-3.4.2/lib/Mail/SpamAssassin/ArchiveIterator.pm
--- spamassassin-3.4.0/lib/Mail/SpamAssassin/ArchiveIterator.pm	2014-02-07 03:36:28.000000000 -0500
+++ spamassassin-3.4.2/lib/Mail/SpamAssassin/ArchiveIterator.pm	2018-09-13 21:27:51.000000000 -0400
@@ -21,7 +21,7 @@
 
 use strict;
 use warnings;
-use bytes;
+# use bytes;
 use re 'taint';
 
 use Errno qw(ENOENT EACCES EBADF);
@@ -33,14 +33,9 @@
 # 256 KiB is a big email, unless stated otherwise
 use constant BIG_BYTES => 256*1024;
 
-use vars qw {
-  $MESSAGES
-  $AICache
-  %class_opts
-  @ISA
-};
+our ( $MESSAGES, $AICache, %class_opts );
 
-@ISA = qw();
+our @ISA = qw();
 
 =head1 NAME
 
@@ -180,11 +175,11 @@
 
 =item opt_from_regex
 
-This setting allows for flexibility in specifying the mbox format From seperator.
+This setting allows for flexibility in specifying the mbox format From separator.
 
 It defaults to the regular expression:
 
-/^From \S+  ?(\S\S\S \S\S\S .\d .\d:\d\d:\d\d \d{4}|.\d-\d\d-\d{4}_\d\d:\d\d:\d\d_)/
+/^From \S+  ?(\S\S\S \S\S\S .?\d .?\d:\d\d:\d\d \d{4}|.?\d-\d\d-\d{4}_\d\d:\d\d:\d\d_)/
 
 Some SpamAssassin programs such as sa-learn will use the configuration option 
 'mbox_format_from_regex' to override the default regular expression.
@@ -417,7 +412,10 @@
 sub _run_mailbox {
   my ($self, $class, $format, $where, $date) = @_;
 
-  my ($file, $offset) = ($where =~ m/(.*)\.(\d+)$/);
+  my ($file, $offset);
+  { local($1,$2);  # Bug 7140 (avoids perl bug [perl #123880])
+    ($file, $offset) = ($where =~ m/(.*)\.(\d+)$/);
+  }
   my @msg;
   my $header;
   if (!_mail_open($file)) {
@@ -665,7 +663,7 @@
   $self->{opt_want_date} = 1 unless (defined $self->{opt_want_date});
   $self->{opt_cache} = 0 unless (defined $self->{opt_cache});
   #Changed Regex to include boundaries for Communigate Pro versions (5.2.x and later). per Bug 6413
-  $self->{opt_from_regex} = '^From \S+  ?(\S\S\S \S\S\S .\d .\d:\d\d:\d\d \d{4}|.\d-\d\d-\d{4}_\d\d:\d\d:\d\d_)' unless (defined $self->{opt_from_regex});
+  $self->{opt_from_regex} = '^From \S+  ?(\S\S\S \S\S\S .?\d .?\d:\d\d:\d\d \d{4}|.?\d-\d\d-\d{4}_\d\d:\d\d:\d\d_)' unless (defined $self->{opt_from_regex});
 
   #STRIP LEADING AND TRAILING / FROM REGEX FOR OPTION
   $self->{opt_from_regex} =~ s/^\///;
diff -Nru spamassassin-3.4.0/lib/Mail/SpamAssassin/AsyncLoop.pm spamassassin-3.4.2/lib/Mail/SpamAssassin/AsyncLoop.pm
--- spamassassin-3.4.0/lib/Mail/SpamAssassin/AsyncLoop.pm	2014-02-07 03:36:28.000000000 -0500
+++ spamassassin-3.4.2/lib/Mail/SpamAssassin/AsyncLoop.pm	2018-09-13 21:27:51.000000000 -0400
@@ -35,7 +35,7 @@
 
 use strict;
 use warnings;
-use bytes;
+# use bytes;
 use re 'taint';
 
 use Time::HiRes qw(time);
@@ -46,8 +46,8 @@
 our @ISA = qw();
 
 # obtain timer resolution if possible
+our $timer_resolution;
 BEGIN {
-  use vars qw($timer_resolution);
   eval {
     $timer_resolution = Time::HiRes->can('clock_getres')
       ? Time::HiRes::clock_getres(Time::HiRes::CLOCK_REALTIME())
@@ -212,6 +212,7 @@
 
   my $t_end = $ent->{timeout_min};       # application-specified has precedence
   $t_end = $settings->{rbl_timeout_min}  if $settings && !defined $t_end;
+  $t_end = $self->{main}->{conf}->{rbl_timeout_min}  if !defined $t_end; # added for bug 7070
   $t_end = 0.2 * $t_init  if !defined $t_end;
   $t_end = 0  if $t_end < 0;  # just in case
   $t_init = $t_end  if $t_init < $t_end;
diff -Nru spamassassin-3.4.0/lib/Mail/SpamAssassin/AutoWhitelist.pm spamassassin-3.4.2/lib/Mail/SpamAssassin/AutoWhitelist.pm
--- spamassassin-3.4.0/lib/Mail/SpamAssassin/AutoWhitelist.pm	2014-02-07 03:36:28.000000000 -0500
+++ spamassassin-3.4.2/lib/Mail/SpamAssassin/AutoWhitelist.pm	2018-09-13 21:27:51.000000000 -0400
@@ -43,7 +43,7 @@
 
 use strict;
 use warnings;
-use bytes;
+# use bytes;
 use re 'taint';
 
 use NetAddr::IP 4.000;
@@ -52,11 +52,7 @@
 use Mail::SpamAssassin::Logger;
 use Mail::SpamAssassin::Util qw(untaint_var);
 
-use vars	qw{
-  	@ISA
-};
-
-@ISA = qw();
+our @ISA = qw();
 
 ###########################################################################
 
diff -Nru spamassassin-3.4.0/lib/Mail/SpamAssassin/Bayes/CombineChi.pm spamassassin-3.4.2/lib/Mail/SpamAssassin/Bayes/CombineChi.pm
--- spamassassin-3.4.0/lib/Mail/SpamAssassin/Bayes/CombineChi.pm	2014-02-07 03:36:28.000000000 -0500
+++ spamassassin-3.4.2/lib/Mail/SpamAssassin/Bayes/CombineChi.pm	2018-09-13 21:27:51.000000000 -0400
@@ -30,7 +30,7 @@
 
 use strict;
 use warnings;
-use bytes;
+# use bytes;
 use re 'taint';
 
 use POSIX qw(frexp);
diff -Nru spamassassin-3.4.0/lib/Mail/SpamAssassin/Bayes/CombineNaiveBayes.pm spamassassin-3.4.2/lib/Mail/SpamAssassin/Bayes/CombineNaiveBayes.pm
--- spamassassin-3.4.0/lib/Mail/SpamAssassin/Bayes/CombineNaiveBayes.pm	2014-02-07 03:36:28.000000000 -0500
+++ spamassassin-3.4.2/lib/Mail/SpamAssassin/Bayes/CombineNaiveBayes.pm	2018-09-13 21:27:51.000000000 -0400
@@ -30,7 +30,7 @@
 
 use strict;
 use warnings;
-use bytes;
+# use bytes;
 use re 'taint';
 
 ###########################################################################
diff -Nru spamassassin-3.4.0/lib/Mail/SpamAssassin/Bayes.pm spamassassin-3.4.2/lib/Mail/SpamAssassin/Bayes.pm
--- spamassassin-3.4.0/lib/Mail/SpamAssassin/Bayes.pm	2014-02-07 03:36:28.000000000 -0500
+++ spamassassin-3.4.2/lib/Mail/SpamAssassin/Bayes.pm	2018-09-13 21:27:51.000000000 -0400
@@ -34,7 +34,7 @@
 
 use strict;
 use warnings;
-use bytes;
+# use bytes;
 use re 'taint';
 
 use Mail::SpamAssassin;
diff -Nru spamassassin-3.4.0/lib/Mail/SpamAssassin/BayesStore/BDB.pm spamassassin-3.4.2/lib/Mail/SpamAssassin/BayesStore/BDB.pm
--- spamassassin-3.4.0/lib/Mail/SpamAssassin/BayesStore/BDB.pm	2014-02-07 03:36:28.000000000 -0500
+++ spamassassin-3.4.2/lib/Mail/SpamAssassin/BayesStore/BDB.pm	2018-09-13 21:27:51.000000000 -0400
@@ -19,8 +19,6 @@
 
 Mail::SpamAssassin::BayesStore::BDB - BerkeleyDB Bayesian Storage Module Implementation
 
-=head1 SYNOPSIS
-
 =head1 DESCRIPTION
 
 This module implementes a BDB based bayesian storage module.
@@ -31,7 +29,7 @@
 
 use strict;
 use warnings;
-use bytes;
+# use bytes;
 use re 'taint';
 use Errno qw(EBADF);
 #use Data::Dumper;
@@ -46,9 +44,7 @@
 use Mail::SpamAssassin::BayesStore;
 use Mail::SpamAssassin::Logger;
 
-use vars qw( @ISA );
-
-@ISA = qw( Mail::SpamAssassin::BayesStore );
+our @ISA = qw( Mail::SpamAssassin::BayesStore );
 
 use constant HAS_BDB => eval { require BerkeleyDB; BerkeleyDB->import; };
 
diff -Nru spamassassin-3.4.0/lib/Mail/SpamAssassin/BayesStore/DBM.pm spamassassin-3.4.2/lib/Mail/SpamAssassin/BayesStore/DBM.pm
--- spamassassin-3.4.0/lib/Mail/SpamAssassin/BayesStore/DBM.pm	2014-02-07 03:36:28.000000000 -0500
+++ spamassassin-3.4.2/lib/Mail/SpamAssassin/BayesStore/DBM.pm	2018-09-13 21:27:51.000000000 -0400
@@ -19,7 +19,7 @@
 
 use strict;
 use warnings;
-use bytes;
+# use bytes;
 use re 'taint';
 
 use Fcntl;
@@ -40,16 +40,14 @@
 
 use constant MAGIC_RE    => qr/^\015\001\007\011\003/;
 
-use vars qw{
-  @ISA
-  @DBNAMES
-  $NSPAM_MAGIC_TOKEN $NHAM_MAGIC_TOKEN $LAST_EXPIRE_MAGIC_TOKEN $LAST_JOURNAL_SYNC_MAGIC_TOKEN
-  $NTOKENS_MAGIC_TOKEN $OLDEST_TOKEN_AGE_MAGIC_TOKEN $LAST_EXPIRE_REDUCE_MAGIC_TOKEN
-  $RUNNING_EXPIRE_MAGIC_TOKEN $DB_VERSION_MAGIC_TOKEN $LAST_ATIME_DELTA_MAGIC_TOKEN
+our ( @DBNAMES,
+  $NSPAM_MAGIC_TOKEN, $NHAM_MAGIC_TOKEN, $LAST_EXPIRE_MAGIC_TOKEN, $LAST_JOURNAL_SYNC_MAGIC_TOKEN,
+  $NTOKENS_MAGIC_TOKEN, $OLDEST_TOKEN_AGE_MAGIC_TOKEN, $LAST_EXPIRE_REDUCE_MAGIC_TOKEN,
+  $RUNNING_EXPIRE_MAGIC_TOKEN, $DB_VERSION_MAGIC_TOKEN, $LAST_ATIME_DELTA_MAGIC_TOKEN,
   $NEWEST_TOKEN_AGE_MAGIC_TOKEN
-};
+);
 
-@ISA = qw( Mail::SpamAssassin::BayesStore );
+our @ISA = qw( Mail::SpamAssassin::BayesStore );
 
 # db layout (quoting Matt):
 #
@@ -139,7 +137,7 @@
   my ($self) = @_;
 
   if (!$self->HAS_DBM_MODULE) {
-    dbg("bayes: " . $self->DBM_MODULE . " module not installed, cannot use bayes");
+    dbg("bayes: %s module not installed, cannot use bayes", $self->DBM_MODULE);
     return 0;
   }
 
@@ -166,7 +164,7 @@
   }
 
   if (!$found) {
-    dbg("bayes: no dbs present, cannot tie DB R/O: ${path}_toks");
+    dbg("bayes: no dbs present, cannot tie DB R/O: %s", $path.'_toks');
     return 0;
   }
 
@@ -201,7 +199,7 @@
   }
 
   $self->{db_version} = ($self->get_storage_variables())[6];
-  dbg("bayes: found bayes db version ".$self->{db_version});
+  dbg("bayes: found bayes db version %s", $self->{db_version});
 
   # If the DB version is one we don't understand, abort!
   if ($self->_check_db_version() != 0) {
@@ -232,7 +230,7 @@
   my ($self) = @_;
 
   if (!$self->HAS_DBM_MODULE) {
-    dbg("bayes: " . $self->DBM_MODULE . " module not installed, cannot use bayes");
+    dbg("bayes: %s module not installed, cannot use bayes", $self->DBM_MODULE);
     return 0;
   }
 
@@ -306,7 +304,7 @@
   # set our cache to what version DB we're using
   $self->{db_version} = ($self->get_storage_variables())[6];
   # don't bother printing this unless found since it would be bogus anyway
-  dbg("bayes: found bayes db version ".$self->{db_version}) if ($found);
+  dbg("bayes: found bayes db version %s", $self->{db_version}) if $found;
 
   # figure out if we can read the current DB and if we need to do a
   # DB version update and do it if necessary if either has a problem,
@@ -319,7 +317,7 @@
   elsif (!$found) { # new DB, make sure we know that ...
     $self->{db_version} = $self->{db_toks}->{$DB_VERSION_MAGIC_TOKEN} = $self->DB_VERSION;
     $self->{db_toks}->{$NTOKENS_MAGIC_TOKEN} = 0; # no tokens in the db ...
-    dbg("bayes: new db, set db version ".$self->{db_version}." and 0 tokens");
+    dbg("bayes: new db, set db version %s and 0 tokens", $self->{db_version});
   }
 
   $self->{already_tied} = 1;
@@ -373,7 +371,7 @@
   # Do conversions in order so we can go 1 -> 3, make sure to update
   #   $self->{db_version} along the way
 
-  dbg("bayes: detected bayes db format ".$self->{db_version}.", upgrading");
+  dbg("bayes: detected bayes db format %s, upgrading", $self->{db_version});
 
   # since DB_File will not shrink a database (!!), we need to *create*
   # a new one instead.
@@ -389,7 +387,7 @@
   }
 
   if ($self->{db_version} < 2) {
-    dbg("bayes: upgrading database format from v".$self->{db_version}." to v2");
+    dbg("bayes: upgrading database format from v%s to v2", $self->{db_version});
     $self->set_running_expire_tok();
 
     my ($DB_NSPAM_MAGIC_TOKEN, $DB_NHAM_MAGIC_TOKEN, $DB_NTOKENS_MAGIC_TOKEN);
@@ -499,13 +497,14 @@
     return 0 unless $res;
     undef $res;
 
-    dbg("bayes: upgraded database format from v".$self->{db_version}." to v2 in ".(time - $started)." seconds");
+    dbg("bayes: upgraded database format from v%s to v2 in %d seconds",
+        $self->{db_version}, time - $started);
     $self->{db_version} = 2; # need this for other functions which check
   }
 
   # Version 3 of the database converts all existing tokens to SHA1 hashes
   if ($self->{db_version} == 2) {
-    dbg("bayes: upgrading database format from v".$self->{db_version}." to v3");
+    dbg("bayes: upgrading database format from v%s to v3", $self->{db_version});
     $self->set_running_expire_tok();
 
     my $DB_NSPAM_MAGIC_TOKEN		  = "\015\001\007\011\003NSPAM";
@@ -587,7 +586,8 @@
     return 0 unless $res;
     undef $res;
 
-    dbg("bayes: upgraded database format from v".$self->{db_version}." to v3 in ".(time - $started)." seconds");
+    dbg("bayes: upgraded database format from v%s to v3 in %d seconds",
+        $self->{db_version}, time - $started);
 
     $self->{db_version} = 3; # need this for other functions which check
   }
@@ -812,7 +812,7 @@
   return 0 if ($conf->{bayes_journal_max_size} == 0);
 
   my @vars = $self->get_storage_variables();
-  dbg("bayes: DB journal sync: last sync: ".$vars[7],'bayes','-1');
+  dbg("bayes: DB journal sync: last sync: %s", $vars[7]);
 
   ## Ok, should we do a sync?
 
@@ -1571,7 +1571,8 @@
     foreach my $ext ($self->DB_EXTENSIONS) {
       my $name = $path.'_'.$dbname.$ext;
       my $ret = unlink $name;
-      dbg("bayes: clear_database: " . ($ret ? 'removed' : 'tried to remove') . " $name");
+      dbg("bayes: clear_database: %s %s",
+          $ret ? 'removed' : 'tried to remove', $name);
     }
   }
 
@@ -1579,7 +1580,8 @@
   foreach my $dbname ('journal') {
     my $name = $path.'_'.$dbname;
     my $ret = unlink $name;
-    dbg("bayes: clear_database: " . ($ret ? 'removed' : 'tried to remove') . " $name");
+    dbg("bayes: clear_database: %s %s",
+        $ret ? 'removed' : 'tried to remove', $name);
   }
 
   $self->untie_db();
@@ -1758,7 +1760,8 @@
       }
 
       if ($token_warn_p) {
-	dbg("bayes: token ($token) has the following warnings:\n".join("\n",@warnings));
+	dbg("bayes: token (%s) has the following warnings:\n%s",
+            $token, join("\n",@warnings));
       }
 
       # database versions < 3 did not encode their token values
diff -Nru spamassassin-3.4.0/lib/Mail/SpamAssassin/BayesStore/MySQL.pm spamassassin-3.4.2/lib/Mail/SpamAssassin/BayesStore/MySQL.pm
--- spamassassin-3.4.0/lib/Mail/SpamAssassin/BayesStore/MySQL.pm	2014-02-07 03:36:28.000000000 -0500
+++ spamassassin-3.4.2/lib/Mail/SpamAssassin/BayesStore/MySQL.pm	2018-09-13 21:27:51.000000000 -0400
@@ -19,8 +19,6 @@
 
 Mail::SpamAssassin::BayesStore::MySQL - MySQL Specific Bayesian Storage Module Implementation
 
-=head1 SYNOPSIS
-
 =head1 DESCRIPTION
 
 This module implements a MySQL specific based bayesian storage module.  It
@@ -38,15 +36,13 @@
 
 use strict;
 use warnings;
-use bytes;
+# use bytes;
 use re 'taint';
 
 use Mail::SpamAssassin::BayesStore::SQL;
 use Mail::SpamAssassin::Logger;
 
-use vars qw( @ISA );
-
-@ISA = qw( Mail::SpamAssassin::BayesStore::SQL );
+our @ISA = qw( Mail::SpamAssassin::BayesStore::SQL );
 
 use constant HAS_DBI => eval { require DBI; };
 
@@ -195,7 +191,10 @@
   return 0 unless (defined($self->{_dbh}));
 
   my $sql = "INSERT INTO bayes_seen (id, msgid, flag)
-             VALUES (?,?,?)";
+             VALUES (?,?,?)
+	     ON DUPLICATE KEY UPDATE flag=VALUES(flag)"; 
+
+  #added ON DUPLICATE KEY UPDATE flag=VALUES(flag) per bug 5998 on 4/8/2015
   
   my $rows = $self->{_dbh}->do($sql,
 			       undef,
diff -Nru spamassassin-3.4.0/lib/Mail/SpamAssassin/BayesStore/PgSQL.pm spamassassin-3.4.2/lib/Mail/SpamAssassin/BayesStore/PgSQL.pm
--- spamassassin-3.4.0/lib/Mail/SpamAssassin/BayesStore/PgSQL.pm	2014-02-07 03:36:28.000000000 -0500
+++ spamassassin-3.4.2/lib/Mail/SpamAssassin/BayesStore/PgSQL.pm	2018-09-13 21:27:51.000000000 -0400
@@ -19,8 +19,6 @@
 
 Mail::SpamAssassin::BayesStore::PgSQL - PostgreSQL Specific Bayesian Storage Module Implementation
 
-=head1 SYNOPSIS
-
 =head1 DESCRIPTION
 
 This module implements a PostgreSQL specific bayesian storage module.
@@ -30,21 +28,24 @@
 for the token column type you must make sure that the DBD driver does the proper
 quoting.  You can accomplish this by binding the token column to a specific type.
 
+In versions 8.3 and up, synchronous_commit is disabled for faster performance.
+Data is not guaranteed to be stored until (3 * wal_writer_delay) (default: 0.6s)
+after it is written. This tradeoff works for Bayes because we care about aggregate
+data and a small period of time can be lost without sacrificing accuracy.
+
 =cut
 
 package Mail::SpamAssassin::BayesStore::PgSQL;
 
 use strict;
 use warnings;
-use bytes;
+# use bytes;
 use re 'taint';
 
 use Mail::SpamAssassin::BayesStore::SQL;
 use Mail::SpamAssassin::Logger;
 
-use vars qw( @ISA );
-
-@ISA = qw( Mail::SpamAssassin::BayesStore::SQL );
+our @ISA = qw( Mail::SpamAssassin::BayesStore::SQL );
 
 use constant HAS_DBI => eval { require DBI; };
 
@@ -932,6 +933,10 @@
     dbg("bayes: database connection established");
   }
 
+  if ( $dbh->{pg_server_version} >= 80300 ) {
+    $dbh->do('SET synchronous_commit=off')
+  }
+
   if ( $dbh->{pg_server_version} >= 80100 ) {
     $self->{_esc_prefix} = 'E';
   }
diff -Nru spamassassin-3.4.0/lib/Mail/SpamAssassin/BayesStore/Redis.pm spamassassin-3.4.2/lib/Mail/SpamAssassin/BayesStore/Redis.pm
--- spamassassin-3.4.0/lib/Mail/SpamAssassin/BayesStore/Redis.pm	2014-02-07 03:36:28.000000000 -0500
+++ spamassassin-3.4.2/lib/Mail/SpamAssassin/BayesStore/Redis.pm	2018-09-13 21:27:51.000000000 -0400
@@ -19,8 +19,6 @@
 
 Mail::SpamAssassin::BayesStore::Redis - Redis Bayesian Storage Module Implementation
 
-=head1 SYNOPSIS
-
 =head1 DESCRIPTION
 
 This module implementes a Redis based bayesian storage module.
@@ -118,7 +116,7 @@
 
 use strict;
 use warnings;
-use bytes;
+# use bytes;
 use re 'taint';
 use Errno qw(EBADF);
 use Mail::SpamAssassin::Util qw(untaint_var);
@@ -133,12 +131,8 @@
 use Mail::SpamAssassin::BayesStore;
 use Mail::SpamAssassin::Util::TinyRedis;
 
-use vars qw( @ISA $VERSION );
-
-BEGIN {
-  $VERSION = 0.09;
-  @ISA = qw( Mail::SpamAssassin::BayesStore );
-}
+our $VERSION = 0.09;
+our @ISA = qw( Mail::SpamAssassin::BayesStore );
 
 =head1 METHODS
 
@@ -161,7 +155,7 @@
   my $bconf = $self->{bayes}->{conf};
 
   foreach (split(';', $bconf->{bayes_sql_dsn})) {
-    my ($a, $b) = split('=');
+    my ($a, $b) = split(/=/, $_, 2);
     if (!defined $b) {
       warn("bayes: invalid bayes_sql_dsn config\n");
       return;
@@ -202,35 +196,38 @@
 
 sub disconnect {
   my($self) = @_;
+  local($@, $!);
   if ($self->{connected}) {
-    local($@, $!);
     dbg("bayes: Redis disconnect");
-    $self->{connected} = 0; undef $self->{redis};
+    $self->{connected} = 0;
+    $self->{redis}->disconnect;
   }
+  undef $self->{redis};
 }
 
 sub DESTROY {
   my($self) = @_;
   local($@, $!, $_);
+  dbg("bayes: Redis destroy");
   $self->{connected} = 0; undef $self->{redis};
 }
 
 # Called from a Redis module on Redis->new and on automatic re-connect.
 # The on_connect() callback must not use batched calls!
 sub on_connect {
-  my($self, $r) = @_;
-  my $db_id = $self->{db_id} || 0;
+  my($r, $db_id, $pwd) = @_;
+  $db_id ||= 0;
   dbg("bayes: Redis on-connect, db_id %d", $db_id);
   eval {
     $r->call('SELECT', $db_id) eq 'OK' ? 1 : 0;
   } or do {
-    if ($@ =~ /\bNOAUTH\b/) {
-      defined $self->{password}
+    if ($@ =~ /^NOAUTH\b/ || $@ =~ /^ERR operation not permitted/) {
+      defined $pwd
         or die "Redis server requires authentication, no password provided";
-      $r->call('AUTH', $self->{password});
+      $r->call('AUTH', $pwd);
       $r->call('SELECT', $db_id);
     } else {
-      chomp $@; die "Redis error: $@";
+      chomp $@; die "Command 'SELECT $db_id' failed: $@";
     }
   };
   eval {
@@ -250,11 +247,14 @@
 
   my $err = $self->{timer}->run_and_catch(sub {
     $self->{opened_from_pid} = $$;
+    # Bug 7034: avoid a closure passing $self to $self->{redis}->{on_connect},
+    # otherwise a circular reference prevents object destruction!
+    my $db_id = $self->{db_id};
+    my $pwd = $self->{password};
     # will keep a persistent session open to a redis server
     $self->{redis} = Mail::SpamAssassin::Util::TinyRedis->new(
                        @{$self->{redis_conf}},
-                       on_connect => sub { $self->on_connect(@_) },
-                     );
+                       on_connect => sub { on_connect($_[0], $db_id, $pwd) });
     $self->{redis} or die "Error: $!";
   });
   if ($self->{timer}->timed_out()) {
diff -Nru spamassassin-3.4.0/lib/Mail/SpamAssassin/BayesStore/SDBM.pm spamassassin-3.4.2/lib/Mail/SpamAssassin/BayesStore/SDBM.pm
--- spamassassin-3.4.0/lib/Mail/SpamAssassin/BayesStore/SDBM.pm	2014-02-07 03:36:28.000000000 -0500
+++ spamassassin-3.4.2/lib/Mail/SpamAssassin/BayesStore/SDBM.pm	2018-09-13 21:27:51.000000000 -0400
@@ -19,16 +19,15 @@
 
 use strict;
 use warnings;
-use bytes;
+# use bytes;
 use re 'taint';
 use Fcntl;
 
 use Mail::SpamAssassin::BayesStore::DBM;
 use Mail::SpamAssassin::Logger;
 
-use vars qw{ @ISA @DBNAMES };
-
-@ISA = qw( Mail::SpamAssassin::BayesStore::DBM );
+# our @DBNAMES; # <---- unused!
+our @ISA = qw( Mail::SpamAssassin::BayesStore::DBM );
 
 sub HAS_DBM_MODULE {
   my ($self) = @_;
diff -Nru spamassassin-3.4.0/lib/Mail/SpamAssassin/BayesStore/SQL.pm spamassassin-3.4.2/lib/Mail/SpamAssassin/BayesStore/SQL.pm
--- spamassassin-3.4.0/lib/Mail/SpamAssassin/BayesStore/SQL.pm	2014-02-07 03:36:28.000000000 -0500
+++ spamassassin-3.4.2/lib/Mail/SpamAssassin/BayesStore/SQL.pm	2018-09-13 21:27:51.000000000 -0400
@@ -19,8 +19,6 @@
 
 Mail::SpamAssassin::BayesStore::SQL - SQL Bayesian Storage Module Implementation
 
-=head1 SYNOPSIS
-
 =head1 DESCRIPTION
 
 This module implementes a SQL based bayesian storage module.
@@ -31,7 +29,7 @@
 
 use strict;
 use warnings;
-use bytes;
+# use bytes;
 use re 'taint';
 use Errno qw(EBADF);
 
@@ -43,9 +41,7 @@
 use Mail::SpamAssassin::BayesStore;
 use Mail::SpamAssassin::Logger;
 
-use vars qw( @ISA );
-
-@ISA = qw( Mail::SpamAssassin::BayesStore );
+our @ISA = qw( Mail::SpamAssassin::BayesStore );
 
 use constant HAS_DBI => eval { require DBI; };
 
diff -Nru spamassassin-3.4.0/lib/Mail/SpamAssassin/BayesStore.pm spamassassin-3.4.2/lib/Mail/SpamAssassin/BayesStore.pm
--- spamassassin-3.4.0/lib/Mail/SpamAssassin/BayesStore.pm	2014-02-07 03:36:28.000000000 -0500
+++ spamassassin-3.4.2/lib/Mail/SpamAssassin/BayesStore.pm	2018-09-13 21:27:51.000000000 -0400
@@ -30,7 +30,7 @@
 
 use strict;
 use warnings;
-use bytes;
+# use bytes;
 use re 'taint';
 use Mail::SpamAssassin::Logger;
 
@@ -419,6 +419,7 @@
     dbg("bayes: $msg: $msg2");
   }
 
+  $self->remove_running_expire_tok();
   return 1;
 }
 
diff -Nru spamassassin-3.4.0/lib/Mail/SpamAssassin/Conf/LDAP.pm spamassassin-3.4.2/lib/Mail/SpamAssassin/Conf/LDAP.pm
--- spamassassin-3.4.0/lib/Mail/SpamAssassin/Conf/LDAP.pm	2014-02-07 03:36:23.000000000 -0500
+++ spamassassin-3.4.2/lib/Mail/SpamAssassin/Conf/LDAP.pm	2018-09-13 21:27:51.000000000 -0400
@@ -45,14 +45,10 @@
 
 use strict;
 use warnings;
-use bytes;
+# use bytes;
 use re 'taint';
 
-use vars qw{
-  @ISA
-};
-
-@ISA = qw();
+our @ISA = qw();
 
 ###########################################################################
 
diff -Nru spamassassin-3.4.0/lib/Mail/SpamAssassin/Conf/Parser.pm spamassassin-3.4.2/lib/Mail/SpamAssassin/Conf/Parser.pm
--- spamassassin-3.4.0/lib/Mail/SpamAssassin/Conf/Parser.pm	2014-02-07 03:36:23.000000000 -0500
+++ spamassassin-3.4.2/lib/Mail/SpamAssassin/Conf/Parser.pm	2018-09-13 21:27:51.000000000 -0400
@@ -142,14 +142,10 @@
 
 use strict;
 use warnings;
-use bytes;
+# use bytes;
 use re 'taint';
 
-use vars qw{
-  @ISA
-};
-
-@ISA = qw();
+our @ISA = qw();
 
 ###########################################################################
 
@@ -263,6 +259,7 @@
   while (defined ($line = shift @conf_lines)) {
     local ($1);         # bug 3838: prevent random taint flagging of $1
 
+   if (index($line,'#') > -1) {
     # bug 5545: used to support testing rules in the ruleqa system
     if ($keepmetadata && $line =~ /^\#testrules/) {
       $self->{file_scoped_attrs}->{testrules}++;
@@ -278,8 +275,12 @@
 
     $line =~ s/(?<!\\)#.*$//; # remove comments
     $line =~ s/\\#/#/g; # hash chars are escaped, so unescape them
+   }
+
+   if ($line =~ tr{ \t\r\n\f}{}) {
     $line =~ s/^\s+//;  # remove leading whitespace
     $line =~ s/\s+$//;  # remove tailing whitespace
+  }
     next unless($line); # skip empty lines
 
     # handle i18n
@@ -288,7 +289,7 @@
     my($key, $value) = split(/\s+/, $line, 2);
     $key = lc $key;
     # convert all dashes in setting name to underscores.
-    $key =~ s/-/_/g;
+    $key =~ tr/-/_/;
     $value = '' unless defined($value);
 
 #   # Do a better job untainting this info ...
@@ -338,26 +339,26 @@
     }
 
     # now handle the commands.
-    if ($key eq 'include') {
+    elsif ($key eq 'include') {
       $value = $self->fix_path_relative_to_current_file($value);
       my $text = $conf->{main}->read_cf($value, 'included file');
       unshift (@conf_lines, split (/\n/, $text));
       next;
     }
 
-    if ($key eq 'ifplugin') {
+    elsif ($key eq 'ifplugin') {
       $self->handle_conditional ($key, "plugin ($value)",
                         \@if_stack, \$skip_parsing);
       next;
     }
 
-    if ($key eq 'if') {
+    elsif ($key eq 'if') {
       $self->handle_conditional ($key, $value,
                         \@if_stack, \$skip_parsing);
       next;
     }
 
-    if ($key eq 'else') {
+    elsif ($key eq 'else') {
       # TODO: if/else/else won't get flagged here :(
       if (!@if_stack) {
         $parse_error = "config: found else without matching conditional";
@@ -369,7 +370,7 @@
     }
 
     # and the endif statement:
-    if ($key eq 'endif') {
+    elsif ($key eq 'endif') {
       my $lastcond = pop @if_stack;
       if (!defined $lastcond) {
         $parse_error = "config: found endif without matching conditional";
@@ -508,7 +509,7 @@
   my $conf = $self->{conf};
 
   my $lexer = ARITH_EXPRESSION_LEXER;
-  my @tokens = ($value =~ m/($lexer)/g);
+  my @tokens = ($value =~ m/($lexer)/og);
 
   my $eval = '';
   my $bad = 0;
@@ -533,6 +534,9 @@
     elsif ($token eq 'version') {
       $eval .= $Mail::SpamAssassin::VERSION." ";
     }
+    elsif ($token eq 'perl_version') {
+      $eval .= $]." ";
+    }
     elsif ($token =~ /^\w[\w\:]+$/) { # class name
       my $u = untaint_var($token);
       $eval .= '"' . $u . '" ';
@@ -570,6 +574,10 @@
 
 sub cond_clause_can {
   my ($self, $method) = @_;
+  if ($self->{currentfile} =~ q!/user_prefs$! ) {
+    warn "config: 'if can $method' not available in user_prefs";
+    return 0
+  }
   $self->cond_clause_can_or_has('can', $method);
 }
 
@@ -588,7 +596,7 @@
   } elsif ($method =~ /^(.*)::([^:]+)$/) {
     no strict "refs";
     my($module, $meth) = ($1, $2);
-    return 1  if UNIVERSAL::can($module,$meth) &&
+    return 1  if $module->can($meth) &&
                  ( $fn_name eq 'has' || &{$method}() );
   } else {
     $self->lint_warn("bad 'if' line, cannot find '::' in $fn_name($method), ".
@@ -981,14 +989,14 @@
 
   # Lex the rule into tokens using a rather simple RE method ...
   my $lexer = ARITH_EXPRESSION_LEXER;
-  my @tokens = ($rule =~ m/$lexer/g);
+  my @tokens = ($rule =~ m/$lexer/og);
 
   # Go through each token in the meta rule
   my $conf_tests = $conf->{tests};
   foreach my $token (@tokens) {
     # has to be an alpha+numeric token
-  # next if $token =~ /^(?:\W+|[+-]?\d+(?:\.\d+)?)$/;
-    next if $token !~ /^[A-Za-z_][A-Za-z0-9_]*\z/s;  # faster
+    next if $token =~ tr{A-Za-z0-9_}{}c || substr($token,0,1) =~ tr{A-Za-z_}{}c; # even faster
+
     # and has to be a rule name
     next unless exists $conf_tests->{$token};
 
@@ -1175,25 +1183,25 @@
   my $conf = $self->{conf};
 
   # Don't allow invalid names ...
-  if ($name !~ /^\D\w*$/) {
+  if ($name !~ /^[_[:alpha:]]\w*$/) {
     $self->lint_warn("config: error: rule '$name' has invalid characters ".
 	   "(not Alphanumeric + Underscore + starting with a non-digit)\n", $name);
     return;
   }
 
-  # Also set a hard limit for ALL rules (rule names longer than 242
+  # Also set a hard limit for ALL rules (rule names longer than 40
   # characters throw warnings).  Check this separately from the above
   # pattern to avoid vague error messages.
-  if (length $name > 200) {
-    $self->lint_warn("config: error: rule '$name' is way too long ".
+  if (length $name > 100) {
+    $self->lint_warn("config: error: rule '$name' is too long ".
 	   "(recommended maximum length is 22 characters)\n", $name);
     return;
   }
 
   # Warn about, but use, long rule names during --lint
   if ($conf->{lint_rules}) {
-    if (length($name) > 50 && $name !~ /^__/ && $name !~ /^T_/) {
-      $self->lint_warn("config: warning: rule name '$name' is over 50 chars ".
+    if (length($name) > 40 && $name !~ /^__/ && $name !~ /^T_/) {
+      $self->lint_warn("config: warning: rule name '$name' is over 40 chars ".
 	     "(recommended maximum length is 22 characters)\n", $name);
     }
   }
@@ -1209,6 +1217,7 @@
   if ($type == $Mail::SpamAssassin::Conf::TYPE_HEAD_TESTS)
   {
     # RFC 5322 section 3.6.8, ftext printable US-ASCII chars not including ":"
+    # no re "strict";  # since perl 5.21.8: Ranges of ASCII printables...
     if ($text =~ /^!?defined\([!-9;-\176]+\)$/) {
       # fine, implements 'exists:'
     } else {
@@ -1282,12 +1291,18 @@
 sub is_meta_valid {
   my ($self, $name, $rule) = @_;
 
+  # $meta is a degenerate translation of the rule, replacing all variables (i.e. rule names) with 0. 
   my $meta = '';
   $rule = untaint_var($rule);  # must be careful below
+  # Bug #7557 code injection
+  if ( $rule =~ /\S(::|->)\S/ )  {
+    warn("is_meta_valid: Bogus rule $name: $rule") ;
+    return 0;
+  }
 
   # Lex the rule into tokens using a rather simple RE method ...
   my $lexer = ARITH_EXPRESSION_LEXER;
-  my @tokens = ($rule =~ m/$lexer/g);
+  my @tokens = ($rule =~ m/$lexer/og);
   if (length($name) == 1) {
     for (@tokens) {
       print "$name $_\n "  or die "Error writing token: $!";
@@ -1295,16 +1310,20 @@
   }
   # Go through each token in the meta rule
   foreach my $token (@tokens) {
-    # Numbers can't be rule names
-    if ($token !~ /^[A-Za-z_][A-Za-z0-9_]*\z/s) {
+    # If the token is a syntactically legal rule name, make it zero
+    if ($token =~ /^[_[:alpha:]]\w+\z/s) {
+      $meta .= "0 ";
+    }
+    # if it is a number or a string of 1 or 2 punctuation characters (i.e. operators) tack it onto the degenerate rule
+    elsif ( $token =~ /^(\d+|[[:punct:]]{1,2})\z/s ) {
       $meta .= "$token ";
     }
-    # Zero will probably cause more errors
+    # WTF is it? Just warn, for now. Bug #7557
     else {
-      $meta .= "0 ";
+      $self->lint_warn("config: Strange rule token: $token", $name);
+      $meta .= "$token ";
     }
   }
-
   my $evalstr = 'my $x = ' . $meta . '; 1;';
   if (eval $evalstr) {
     return 1;
@@ -1380,8 +1399,8 @@
   # interpolation of the $re variable into a code regexp, in order to test the
   # security of the regexp.  simply using ("" =~ $re) will NOT do that, and
   # will therefore open a hole!
-  if (eval { ("" =~ m{$re}); 1; }) {
-    return 1;
+  { # no re "strict";  # since perl 5.21.8: Ranges of ASCII printables...
+    if (eval { ("" =~ m{$re}); 1; }) { return 1 }
   }
   my $err = $@ ne '' ? $@ : "errno=$!";  chomp $err;
   $err =~ s/ at .*? line \d.*$//;
diff -Nru spamassassin-3.4.0/lib/Mail/SpamAssassin/Conf/SQL.pm spamassassin-3.4.2/lib/Mail/SpamAssassin/Conf/SQL.pm
--- spamassassin-3.4.0/lib/Mail/SpamAssassin/Conf/SQL.pm	2014-02-07 03:36:23.000000000 -0500
+++ spamassassin-3.4.2/lib/Mail/SpamAssassin/Conf/SQL.pm	2018-09-13 21:27:51.000000000 -0400
@@ -45,14 +45,10 @@
 
 use strict;
 use warnings;
-use bytes;
+# use bytes;
 use re 'taint';
 
-use vars qw{
-  @ISA
-};
-
-@ISA = qw();
+our @ISA = qw();
 
 ###########################################################################
 
diff -Nru spamassassin-3.4.0/lib/Mail/SpamAssassin/Conf.pm spamassassin-3.4.2/lib/Mail/SpamAssassin/Conf.pm
--- spamassassin-3.4.0/lib/Mail/SpamAssassin/Conf.pm	2014-02-07 03:36:28.000000000 -0500
+++ spamassassin-3.4.2/lib/Mail/SpamAssassin/Conf.pm	2018-09-13 21:27:51.000000000 -0400
@@ -79,7 +79,7 @@
 
 use strict;
 use warnings;
-use bytes;
+# use bytes;
 use re 'taint';
 
 use Mail::SpamAssassin::Util;
@@ -91,40 +91,25 @@
 use Mail::SpamAssassin::Util qw(untaint_var);
 use File::Spec;
 
-use vars qw{
-  @ISA 
-  $CONF_TYPE_STRING $CONF_TYPE_BOOL
-  $CONF_TYPE_NUMERIC $CONF_TYPE_HASH_KEY_VALUE
-  $CONF_TYPE_ADDRLIST $CONF_TYPE_TEMPLATE
-  $CONF_TYPE_STRINGLIST $CONF_TYPE_IPADDRLIST
-  $CONF_TYPE_DURATION $CONF_TYPE_NOARGS
-  $MISSING_REQUIRED_VALUE $INVALID_VALUE $INVALID_HEADER_FIELD_NAME
-  @MIGRATED_SETTINGS
-  $COLLECT_REGRESSION_TESTS
-
-$TYPE_HEAD_TESTS $TYPE_HEAD_EVALS
-$TYPE_BODY_TESTS $TYPE_BODY_EVALS $TYPE_FULL_TESTS $TYPE_FULL_EVALS
-$TYPE_RAWBODY_TESTS $TYPE_RAWBODY_EVALS $TYPE_URI_TESTS $TYPE_URI_EVALS
-$TYPE_META_TESTS $TYPE_RBL_EVALS $TYPE_EMPTY_TESTS
-};
+our @ISA = qw();
 
-@ISA = qw();
+our $COLLECT_REGRESSION_TESTS; # Used only for unit tests.
 
 # odd => eval test.  Not constants so they can be shared with Parser
 # TODO: move to Constants.pm?
-$TYPE_HEAD_TESTS    = 0x0008;
-$TYPE_HEAD_EVALS    = 0x0009;
-$TYPE_BODY_TESTS    = 0x000a;
-$TYPE_BODY_EVALS    = 0x000b;
-$TYPE_FULL_TESTS    = 0x000c;
-$TYPE_FULL_EVALS    = 0x000d;
-$TYPE_RAWBODY_TESTS = 0x000e;
-$TYPE_RAWBODY_EVALS = 0x000f;
-$TYPE_URI_TESTS     = 0x0010;
-$TYPE_URI_EVALS     = 0x0011;
-$TYPE_META_TESTS    = 0x0012;
-$TYPE_RBL_EVALS     = 0x0013;
-$TYPE_EMPTY_TESTS   = 0x0014;
+our $TYPE_HEAD_TESTS    = 0x0008;
+our $TYPE_HEAD_EVALS    = 0x0009;
+our $TYPE_BODY_TESTS    = 0x000a;
+our $TYPE_BODY_EVALS    = 0x000b;
+our $TYPE_FULL_TESTS    = 0x000c;
+our $TYPE_FULL_EVALS    = 0x000d;
+our $TYPE_RAWBODY_TESTS = 0x000e;
+our $TYPE_RAWBODY_EVALS = 0x000f;
+our $TYPE_URI_TESTS     = 0x0010;
+our $TYPE_URI_EVALS     = 0x0011;
+our $TYPE_META_TESTS    = 0x0012;
+our $TYPE_RBL_EVALS     = 0x0013;
+our $TYPE_EMPTY_TESTS   = 0x0014;
 
 my @rule_types = ("body_tests", "uri_tests", "uri_evals",
                   "head_tests", "head_evals", "body_evals", "full_tests",
@@ -137,19 +122,19 @@
 # these are variables instead of constants so that other classes can
 # access them; if they're constants, they'd have to go in Constants.pm
 # TODO: move to Constants.pm?
-$CONF_TYPE_STRING           =  1;
-$CONF_TYPE_BOOL             =  2;
-$CONF_TYPE_NUMERIC          =  3;
-$CONF_TYPE_HASH_KEY_VALUE   =  4;
-$CONF_TYPE_ADDRLIST         =  5;
-$CONF_TYPE_TEMPLATE         =  6;
-$CONF_TYPE_NOARGS           =  7;
-$CONF_TYPE_STRINGLIST       =  8;
-$CONF_TYPE_IPADDRLIST       =  9;
-$CONF_TYPE_DURATION         = 10;
-$MISSING_REQUIRED_VALUE     = '-99999999999999';  # string expected by parser
-$INVALID_VALUE              = '-99999999999998';
-$INVALID_HEADER_FIELD_NAME  = '-99999999999997';
+our $CONF_TYPE_STRING           =  1;
+our $CONF_TYPE_BOOL             =  2;
+our $CONF_TYPE_NUMERIC          =  3;
+our $CONF_TYPE_HASH_KEY_VALUE   =  4;
+our $CONF_TYPE_ADDRLIST         =  5;
+our $CONF_TYPE_TEMPLATE         =  6;
+our $CONF_TYPE_NOARGS           =  7;
+our $CONF_TYPE_STRINGLIST       =  8;
+our $CONF_TYPE_IPADDRLIST       =  9;
+our $CONF_TYPE_DURATION         = 10;
+our $MISSING_REQUIRED_VALUE     = '-99999999999999';  # string expected by parser
+our $INVALID_VALUE              = '-99999999999998';
+our $INVALID_HEADER_FIELD_NAME  = '-99999999999997';
 
 # set to "1" by the test suite code, to record regression tests
 # $Mail::SpamAssassin::Conf::COLLECT_REGRESSION_TESTS = 1;
@@ -360,24 +345,24 @@
 address to whitelist, and the second is a string to match the relay's rDNS,
 or its IP address. Matching is case-insensitive.
 
-This second parameter is matched against the TCP-info information field as
-provided in a FROM clause of a trace information (i.e. the Received header
+This second parameter is matched against a TCP-info information field as
+provided in a FROM clause of a trace information (i.e. in a Received header
 field, see RFC 5321). Only the Received header fields inserted by trusted
-hosts are considered. This parameter can either be a full hostname, or the
-domain component of that hostname, or an IP address in square brackets.
-The reverse DNS lookup is done by a MTA, not by SpamAssassin.
-
-In case of an IPv4 address in brackets, it may be truncated on classful
-boundaries to cover whole subnets, e.g. C<[10.1.2.3]>, C<[10.1.2]>,
-C<[10.1]>, C<[10]>.  CIDR notation is currently not supported, nor is
-IPv6. The matching on IP address is mainly provided to cover rare cases
-where whitelisting of a sending MTA is desired which does not have a
-correct reverse DNS configured.
+hosts are considered. This parameter can either be a full hostname, or a
+domain component of that hostname, or an IP address (optionally followed
+by a slash and a prefix length) in square brackets. The address prefix
+(mask) length with a slash may stand within brackets along with an address,
+or may follow the bracketed address. Reverse DNS lookup is done by an MTA,
+not by SpamAssassin.
+
+For backward compatibility as an alternative to a CIDR notation, an IPv4
+address in brackets may be truncated on classful boundaries to cover whole
+subnets, e.g. C<[10.1.2.3]>, C<[10.1.2]>, C<[10.1]>, C<[10]>.
 
 In other words, if the host that connected to your MX had an IP address
 192.0.2.123 that mapped to 'sendinghost.example.org', you should specify
-C<sendinghost.example.org>, or C<example.org>, or C<[192.0.2.123]> or
-C<[192.0.2]> here.
+C<sendinghost.example.org>, or C<example.org>, or C<[192.0.2.123]>, or
+C<[192.0.2.0/24]>, or C<[192.0.2]> here.
 
 Note that this requires that C<internal_networks> be correct.  For simple
 cases, it will be, but for a complex network you may get better results
@@ -390,8 +375,12 @@
 e.g.
 
   whitelist_from_rcvd joe@example.com  example.com
-  whitelist_from_rcvd *@axkit.org      sergeant.org
+  whitelist_from_rcvd *@*              mail.example.org
   whitelist_from_rcvd *@axkit.org      [192.0.2.123]
+  whitelist_from_rcvd *@axkit.org      [192.0.2.0/24]
+  whitelist_from_rcvd *@axkit.org      [192.0.2.0]/24
+  whitelist_from_rcvd *@axkit.org      [2001:db8:1234::/48]
+  whitelist_from_rcvd *@axkit.org      [2001:db8:1234::]/48
 
 =item def_whitelist_from_rcvd addr@lists.sourceforge.net sourceforge.net
 
@@ -754,6 +743,58 @@
     }
   });
 
+=item enlist_addrlist (listname) user@example.com
+
+Adds one or more addresses to a named list of addresses.
+The named list can then be consulted through a check_from_in_list() or a 
+check_to_in_list() eval rule implemented by the WLBLEval plugin, which takes 
+the list name as an argument. Parenthesis around a list name are literal - a 
+required syntax.
+
+Listed addresses are file-glob-style patterns, so C<friend@somewhere.com>, 
+C<*@isp.com>, or C<*.domain.net> will all work.
+Specifically, C<*> and C<?> are allowed, but all other metacharacters
+are not. Regular expressions are not used for security reasons.
+Matching is case-insensitive.
+
+Multiple addresses per line, separated by spaces, is OK.  Multiple
+C<enlist_addrlist> lines are also OK.
+
+Enlisting an address to the list named blacklist_to is synonymous to using the
+directive blacklist_to 
+
+Enlisting an address to the list named blacklist_from is synonymous to using the
+directive blacklist_from
+
+Enlisting an address to the list named whitelist_to is synonymous to using the
+directive whitelist_to 
+
+Enlisting an address to the list named whitelist_from is synonymous to using the
+directive whitelist_from
+
+e.g.
+
+  enlist_addrlist (PAYPAL_ADDRESS) service@paypal.com
+  enlist_addrlist (PAYPAL_ADDRESS) *@paypal.co.uk
+
+=cut
+
+  push (@cmds, {
+    setting => 'enlist_addrlist',
+    type => $CONF_TYPE_ADDRLIST,
+    code => sub {
+      my($conf, $key, $value, $line) = @_;
+      local($1,$2);
+      if ($value !~ /^ \( (.*?) \) \s+ (.*) \z/sx) {
+        return $MISSING_REQUIRED_VALUE;
+      }
+      my $listname = $1;  # corresponds to arg in check_uri_host_in_wblist()
+      # note: must not factor out dereferencing, as otherwise
+      # subhashes would spring up in a copy and be lost
+      $conf->{parser}->add_to_addrlist ($listname, split(/\s+/, $value));
+    }
+  });
+
 =item blacklist_uri_host host-or-domain ...
 
 Is a shorthand for a directive:  enlist_uri_host (BLACK) host ...
@@ -1054,6 +1095,19 @@
     }
   });
 
+=item report_wrap_width (default: 70) 
+
+This option sets the wrap width for description lines in the X-Spam-Report 
+header, not accounting for tab width. 
+
+=cut
+
+  push (@cmds, {
+    setting => 'report_wrap_width',
+    default => '70',
+    type => $CONF_TYPE_NUMERIC,
+  });
+
 =back
 
 =head2 LANGUAGE OPTIONS
@@ -1112,9 +1166,21 @@
 
 =item normalize_charset ( 0 | 1)        (default: 0)
 
-Whether to detect character sets and normalize message content to
-Unicode.  Requires the Encode::Detect module, HTML::Parser version
-3.46 or later, and Perl 5.8.5 or later.
+Whether to decode non- UTF-8 and non-ASCII textual parts and recode them
+to UTF-8 before the text is given over to rules processing. The character
+set used for attempted decoding is primarily based on a declared character
+set in a Content-Type header, but if the decoding attempt fails a module
+Encode::Detect::Detector is consulted (if available) to provide a guess
+based on the actual text, and decoding is re-attempted. Even if the option
+is enabled no unnecessary decoding and re-encoding work is done when
+possible (like with an all-ASCII text with a US-ASCII or extended ASCII
+character set declaration, e.g. UTF-8 or ISO-8859-nn or Windows-nnnn).
+
+Unicode support in old versions of perl or in a core module Encode is likely
+to be buggy in places, so if the normalize_charset function is enabled
+it is advised to stick to more recent versions of perl (preferably 5.12
+or later). The module Encode::Detect::Detector is optional, when necessary
+it will be used if it is available.
 
 =cut
 
@@ -1127,28 +1193,29 @@
 	unless (defined $value && $value !~ /^$/) {
 	    return $MISSING_REQUIRED_VALUE;
 	}
-	return  if $value == 0;
-	return $INVALID_VALUE unless $value == 1;
+        if    (lc $value eq 'yes' || $value eq '1') { $value = 1 }
+        elsif (lc $value eq 'no'  || $value eq '0') { $value = 0 }
+        else { return $INVALID_VALUE }
+
+	$self->{normalize_charset} = $value;
 
 	unless ($] > 5.008004) {
 	    $self->{parser}->lint_warn("config: normalize_charset requires Perl 5.8.5 or later");
+	    $self->{normalize_charset} = 0;
 	    return $INVALID_VALUE;
 	}
 	require HTML::Parser;
-	unless ($HTML::Parser::VERSION >= 3.46) {
+        #changed to eval to use VERSION so that this version was not incorrectly parsed for CPAN
+	unless ( eval { HTML::Parser->VERSION(3.46) } ) {
 	    $self->{parser}->lint_warn("config: normalize_charset requires HTML::Parser 3.46 or later");
-	    return $INVALID_VALUE;
-	}
-	unless (eval 'require Encode::Detect::Detector') {
-	    $self->{parser}->lint_warn("config: normalize_charset requires Encode::Detect");
+	    $self->{normalize_charset} = 0;
 	    return $INVALID_VALUE;
 	}
 	unless (eval 'require Encode') {
 	    $self->{parser}->lint_warn("config: normalize_charset requires Encode");
+	    $self->{normalize_charset} = 0;
 	    return $INVALID_VALUE;
 	}
-
-	$self->{normalize_charset} = 1;
     }
   });
 
@@ -1515,13 +1582,16 @@
 brackets, and optionally followed by a colon and a port number. In absence
 of a port number a standard port number 53 is assumed. When an IPv6 address
 is specified along with a port number, the address B<must> be enclosed in
-brackets to avoid parsing ambiguity regarding a colon separator,
+brackets to avoid parsing ambiguity regarding a colon separator. A scoped
+link-local IP address is allowed (assuming underlying modules allow it).
 
 Examples :
  dns_server 127.0.0.1
  dns_server 127.0.0.1:53
  dns_server [127.0.0.1]:53
  dns_server [::1]:53
+ dns_server fe80::1%lo0
+ dns_server [fe80::1%lo0]:53
 
 In absence of I<dns_server> directives, the list of name servers is provided
 by Net::DNS module, which typically obtains the list from /etc/resolv.conf,
@@ -1538,16 +1608,19 @@
       my($address,$port); local($1,$2,$3);
       if ($value =~ /^(?: \[ ([^\]]*) \] | ([^:]*) ) : (\d+) \z/sx) {
         $address = defined $1 ? $1 : $2;  $port = $3;
-      } elsif ($value =~ /^(?: \[ ([^\]]*) \] | ([0-9a-fA-F.:]+) ) \z/sx) {
+      } elsif ($value =~ /^(?: \[ ([^\]]*) \] |
+                               ([0-9A-F.:]+ (?: %[A-Z0-9._~-]* )? ) ) \z/six) {
         $address = defined $1 ? $1 : $2;  $port = '53';
       } else {
         return $INVALID_VALUE;
       }
-      my $IP_ADDRESS = IP_ADDRESS;
+      my $scope = '';  # scoped IP address?
+      $scope = $1  if $address =~ s/ ( % [A-Z0-9._~-]* ) \z//xsi;
+      my $IP_ADDRESS = IP_ADDRESS;  # IP_ADDRESS regexp does not handle scope
       if ($address =~ /$IP_ADDRESS/ && $port >= 1 && $port <= 65535) {
         $self->{dns_servers} = []  if !$self->{dns_servers};
         # checked, untainted, stored in a normalized form
-        push(@{$self->{dns_servers}}, untaint_var("[$address]:$port"));
+        push(@{$self->{dns_servers}}, untaint_var("[$address$scope]:$port"));
       } else {
         return $INVALID_VALUE;
       }
@@ -1928,6 +2001,76 @@
     type => $CONF_TYPE_BOOL,
   });
 
+=item bayes_token_sources  (default: header visible invisible uri)
+
+Controls which sources in a mail message can contribute tokens (e.g. words,
+phrases, etc.) to a Bayes classifier. The argument is a space-separated list
+of keywords: I<header>, I<visible>, I<invisible>, I<uri>, I<mimepart>), each
+of which may be prefixed by a I<no> to indicate its exclusion. Additionally
+two reserved keywords are allowed: I<all> and I<none> (or: I<noall>). The list
+of keywords is processed sequentially: a keyword I<all> adds all available
+keywords to a set being built, a I<none> or I<noall> clears the set, other
+non-negated keywords are added to the set, and negated keywords are removed
+from the set. Keywords are case-insensitive.
+
+The default set is: I<header> I<visible> I<invisible> I<uri>, which is
+equivalent for example to: I<All> I<NoMIMEpart>. The reason why I<mimepart>
+is not currently in a default set is that it is a newer source (introduced
+with SpamAssassin version 3.4.1) and not much experience has yet been gathered
+regarding its usefulness.
+
+See also option C<bayes_ignore_header> for a fine-grained control on individual
+header fields under the umbrella of a more general keyword I<header> here.
+
+Keywords imply the following data sources:
+
+=over 4
+
+=item I<header> - tokens collected from a message header section
+
+=item I<visible> - words from visible text (plain or HTML) in a message body
+
+=item I<invisible> - hidden/invisible text in HTML parts of a message body
+
+=item I<uri> - URIs collected from a message body
+
+=item I<mimepart> - digests (hashes) of all MIME parts (textual or non-textual) of a message, computed after Base64 and quoted-printable decoding, suffixed by their Content-Type
+
+=item I<all> - adds all the above keywords to the set being assembled
+
+=item I<none> or I<noall> - removes all keywords from the set
+
+=back
+
+The C<bayes_token_sources> directive may appear multiple times, its keywords
+are interpreted sequentially, adding or removing items from the final set
+as they appear in their order in C<bayes_token_sources> directive(s).
+
+=cut
+
+  push (@cmds, {
+    setting => 'bayes_token_sources',
+    default => { map(($_,1), qw(header visible invisible uri)) },  # mimepart
+    type => $CONF_TYPE_HASH_KEY_VALUE,
+    code => sub {
+      my ($self, $key, $value, $line) = @_;
+      return $MISSING_REQUIRED_VALUE  if $value eq '';
+      my $h = ($self->{bayes_token_sources} ||= {});
+      my %all_kw = map(($_,1), qw(header visible invisible uri mimepart));
+      foreach (split(' ', lc $value)) {
+        if (/^(none|noall)\z/) {
+          %$h = ();
+        } elsif ($_ eq 'all') {
+          %$h = %all_kw;
+        } elsif (/^(no)?(.+)\z/s && exists $all_kw{$2}) {
+          $h->{$2} = defined $1 ? 0 : 1;
+        } else {
+          return $INVALID_VALUE;
+        }
+      }
+    }
+  });
+
 =item bayes_ignore_header header_name
 
 If you receive mail filtered by upstream mail systems, like
@@ -2511,6 +2654,19 @@
     type => $CONF_TYPE_STRING
   });
 
+
+=item parse_dkim_uris ( 0 | 1 ) (default: 1)
+
+If this option is set to 1 and the message contains DKIM headers, the headers will be parsed for URIs to process alongside URIs found in the body with some rules and modules (ex. URIDNSBL)
+
+=cut
+
+  push (@cmds, {
+    setting => 'parse_dkim_uris',
+    default => 1,
+    type => $CONF_TYPE_BOOL,
+  });
+
 =back
 
 =head1 RULE DEFINITIONS AND PRIVILEGED SETTINGS
@@ -2734,8 +2890,8 @@
 =item header SYMBOLIC_TEST_NAME eval:name_of_eval_method([arguments])
 
 Define a header eval test.  C<name_of_eval_method> is the name of
-a method on the C<Mail::SpamAssassin::EvalTests> object.  C<arguments>
-are optional arguments to the function call.
+a method registered by a C<Mail::SpamAssassin::Plugin> object.
+C<arguments> are optional arguments to the function call.
 
 =item header SYMBOLIC_TEST_NAME eval:check_rbl('set', 'zone' [, 'sub-test'])
 
@@ -2848,7 +3004,10 @@
       local ($1,$2);
       if ($value =~ /^(\S+)\s+(?:rbl)?eval:(.*)$/) {
         my ($rulename, $fn) = ($1, $2);
-
+        dbg("config: header eval rule name is $rulename function is $fn");
+        if ($fn !~ /^\w+(\(.*\))?$/) {
+          return $INVALID_VALUE;
+        }
         if ($fn =~ /^check_(?:rbl|dns)/) {
           $self->{parser}->add_test ($rulename, $fn, $TYPE_RBL_EVALS);
         }
@@ -2906,7 +3065,13 @@
       my ($self, $key, $value, $line) = @_;
       local ($1,$2);
       if ($value =~ /^(\S+)\s+eval:(.*)$/) {
-        $self->{parser}->add_test ($1, $2, $TYPE_BODY_EVALS);
+        my ($rulename, $fn) = ($1, $2);
+        dbg("config: body eval rule name is $rulename function is $fn");
+
+        if ($fn !~ /^\w+(\(.*\))?$/) {
+          return $INVALID_VALUE;
+        }
+        $self->{parser}->add_test ($rulename, $fn, $TYPE_BODY_EVALS);
       }
       else {
 	my @values = split(/\s+/, $value, 2);
@@ -3147,6 +3312,16 @@
 the threshold at 6 points total but changes it to have no regard to the 
 source of the points.
 
+=item  noawl
+
+This flag is specific when using AWL plugin.
+
+Normally, AWL plugin normalizes scores via auto-whitelist. In some scenarios
+it works against the system administrator when trying to add some rules to
+correct miss-classified email. When AWL plugin searches the email and finds 
+the noawl flag it will exit without normalizing the score nor storing the
+value in db.
+
 =item  multiple
 
 The test will be evaluated multiple times, for use with meta rules.
@@ -3237,7 +3412,7 @@
 =item version_tag string
 
 This tag is appended to the SA version in the X-Spam-Status header. You should
-include it when modify your ruleset, especially if you plan to distribute it.
+include it when you modify your ruleset, especially if you plan to distribute it.
 A good choice for I<string> is your last name or your initials followed by a
 number which you increase with each change.
 
@@ -3361,13 +3536,72 @@
 
 =item util_rb_tld tld1 tld2 ...
 
-This option allows the addition of new TLDs to the RegistrarBoundaries code.
-Updates to the list usually happen when new versions of SpamAssassin are
-released, but sometimes it's necessary to add in new TLDs faster than a
-release can occur.  TLDs include things like com, net, org, etc.
+This option maintains list of valid TLDs in the RegistryBoundaries code. 
+TLDs include things like com, net, org, etc.
 
 =cut
 
+  # DO NOT UPDATE THIS HARDCODED LIST!! It is only as fallback for
+  # transitional period and to be removed later.  TLDs are now maintained in
+  # sa-update 20_aux_tlds.cf.
+  foreach (qw/
+    ac academy accountants active actor ad ae aero af ag agency ai airforce al am an
+    ao aq ar archi army arpa as asia associates at attorney au auction audio autos
+    aw ax axa az ba bar bargains bayern bb bd be beer berlin best bf bg bh bi bid
+    bike bio biz bj black blackfriday blue bm bmw bn bnpparibas bo boo boutique br
+    brussels bs bt build builders business buzz bv bw by bz bzh ca cab camera camp
+    cancerresearch capetown capital caravan cards care career careers cash cat
+    catering cc cd center ceo cern cf cg ch cheap christmas church ci citic city ck
+    cl claims cleaning click clinic clothing club cm cn co codes coffee college
+    cologne com community company computer condos construction consulting
+    contractors cooking cool coop country cr credit creditcard cruises cu cuisinella
+    cv cw cx cy cymru cz dad dance dating day de deals degree democrat dental
+    dentist desi diamonds diet digital direct directory discount dj dk dm dnp do
+    domains durban dz eat ec edu education ee eg email engineer engineering
+    enterprises equipment er es esq estate et eu eus events exchange expert exposed
+    fail farm feedback fi finance financial fish fishing fitness fj fk flights
+    florist fm fo foo foundation fr frl frogans fund furniture futbol ga gal gallery
+    gb gbiz gd ge gent gf gg gh gi gift gifts gives gl glass global globo gm gmail
+    gmo gn gop gov gp gq gr graphics gratis green gripe gs gt gu guide guitars guru
+    gw gy hamburg haus healthcare help here hiphop hiv hk hm hn holdings holiday
+    homes horse host hosting house how hr ht hu id ie il im immo immobilien in
+    industries info ing ink institute insure int international investments io iq ir
+    is it je jetzt jm jo jobs joburg jp juegos kaufen ke kg kh ki kim kitchen kiwi
+    km kn koeln kp kr krd kred kw ky kz la lacaixa land lawyer lb lc lease lgbt li
+    life lighting limited limo link lk loans london lotto lr ls lt ltda lu luxe
+    luxury lv ly ma maison management mango market marketing mc md me media meet
+    melbourne meme menu mg mh miami mil mini mk ml mm mn mo mobi moda moe monash
+    mortgage moscow motorcycles mov mp mq mr ms mt mu museum mv mw mx my mz na
+    nagoya name navy nc ne net network neustar new nf ng ngo nhk ni ninja nl no np
+    nr nra nrw nu nyc nz okinawa om ong onl ooo org organic otsuka ovh pa paris
+    partners parts pe pf pg ph photo photography photos physio pics pictures pink
+    pizza pk pl place plumbing pm pn post pr praxi press pro prod productions
+    properties property ps pt pub pw py qa qpon quebec re realtor recipes red rehab
+    reise reisen ren rentals repair report republican rest restaurant reviews rich
+    rio ro rocks rodeo rs rsvp ru ruhr rw ryukyu sa saarland sarl sb sc sca scb
+    schmidt schule scot sd se services sexy sg sh shiksha shoes si singles sj sk sl
+    sm sn so social software sohu solar solutions soy space spiegel sr st su
+    supplies supply support surf surgery suzuki sv sx sy systems sz tatar tattoo tax
+    tc td technology tel tf tg th tienda tips tirol tj tk tl tm tn to today tokyo
+    tools top town toys tr trade training travel tt tv tw tz ua ug uk university
+    uno uol us uy uz va vacations vc ve vegas ventures versicherung vet vg vi viajes
+    villas vision vlaanderen vn vodka vote voting voto voyage vu wales wang watch
+    webcam website wed wf whoswho wien wiki williamhill works ws wtc wtf xn--1qqw23a
+    xn--3bst00m xn--3ds443g xn--3e0b707e xn--45brj9c xn--4gbrim xn--55qw42g
+    xn--55qx5d xn--6frz82g xn--6qq986b3xl xn--80adxhks xn--80ao21a xn--80asehdb
+    xn--80aswg xn--90a3ac xn--c1avg xn--cg4bki xn--clchc0ea0b2g2a9gcd xn--czr694b
+    xn--czru2d xn--d1acj3b xn--fiq228c5hs xn--fiq64b xn--fiqs8s xn--fiqz9s
+    xn--fpcrj9c3d xn--fzc2c9e2c xn--gecrj9c xn--h2brj9c xn--i1b6b1a6a2e xn--io0a7i
+    xn--j1amh xn--j6w193g xn--kprw13d xn--kpry57d xn--kput3i xn--l1acc
+    xn--lgbbat1ad8j xn--mgb9awbf xn--mgba3a4f16a xn--mgbaam7a8h xn--mgbab2bd
+    xn--mgbayh7gpa xn--mgbbh1a71e xn--mgbc0a9azcg xn--mgberp4a5d4ar xn--mgbx4cd0ab
+    xn--ngbc5azd xn--nqv7f xn--nqv7fs00ema xn--o3cw4h xn--ogbpf8fl xn--p1ai
+    xn--pgbs0dh xn--q9jyb4c xn--rhqv96g xn--s9brj9c xn--ses554g xn--unup4y xn--vhquv
+    xn--wgbh1c xn--wgbl6a xn--xhq521b xn--xkc2al3hye2a xn--xkc2dl3a5ee0h
+    xn--yfro4i67o xn--ygbi2ammx xn--zfr164b xxx xyz yachts yandex ye yokohama
+    youtube yt za zm zone zw
+    /) { $self->{valid_tlds}{lc $_} = 1; }
+
   push (@cmds, {
     setting => 'util_rb_tld',
     is_admin => 1,
@@ -3376,25 +3610,192 @@
       unless (defined $value && $value !~ /^$/) {
 	return $MISSING_REQUIRED_VALUE;
       }
-      unless ($value =~ /^[a-zA-Z]+(?:\s+[a-zA-Z]+)*$/) {
+      unless ($value =~ /^[^\s.]+(?:\s+[^\s.]+)*$/) {
 	return $INVALID_VALUE;
       }
       foreach (split(/\s+/, $value)) {
-        $Mail::SpamAssassin::Util::RegistrarBoundaries::VALID_TLDS{lc $_} = 1;
+        $self->{valid_tlds}{lc $_} = 1;
       }
+      dbg("config: added tld list - $value");
     }
   });
 
 =item util_rb_2tld 2tld-1.tld 2tld-2.tld ...
 
-This option allows the addition of new 2nd-level TLDs (2TLD) to the
-RegistrarBoundaries code.  Updates to the list usually happen when new
-versions of SpamAssassin are released, but sometimes it's necessary to add in
-new 2TLDs faster than a release can occur.  2TLDs include things like co.uk,
-fed.us, etc.
+This option maintains list of valid 2nd-level TLDs in the RegistryBoundaries
+code.  2TLDs include things like co.uk, fed.us, etc.
 
 =cut
 
+  # DO NOT UPDATE THIS HARDCODED LIST!! It is only as fallback for
+  # transitional period and to be removed later.  TLDs are now maintained in
+  # sa-update 20_aux_tlds.cf.
+  foreach (qw/
+    com.ac edu.ac gov.ac mil.ac net.ac org.ac nom.ad ac.ae co.ae com.ae gov.ae
+    mil.ae name.ae net.ae org.ae pro.ae sch.ae com.af edu.af gov.af net.af
+    co.ag com.ag net.ag nom.ag org.ag com.ai edu.ai gov.ai net.ai off.ai
+    org.ai com.al edu.al gov.al net.al org.al com.an edu.an net.an org.an
+    co.ao ed.ao gv.ao it.ao og.ao pb.ao com.ar edu.ar gov.ar int.ar mil.ar
+    net.ar org.ar e164.arpa in-addr.arpa ip6.arpa iris.arpa uri.arpa urn.arpa
+    ac.at co.at gv.at or.at priv.at act.au asn.au com.au conf.au csiro.au
+    edu.au gov.au id.au info.au net.au nsw.au nt.au org.au otc.au oz.au qld.au
+    sa.au tas.au telememo.au vic.au wa.au com.aw biz.az com.az edu.az gov.az
+    info.az int.az mil.az name.az net.az org.az pp.az co.ba com.ba edu.ba
+    gov.ba mil.ba net.ba org.ba rs.ba unbi.ba unsa.ba com.bb edu.bb gov.bb
+    net.bb org.bb ac.bd com.bd edu.bd gov.bd mil.bd net.bd org.bd ac.be
+    belgie.be dns.be fgov.be gov.bf biz.bh cc.bh com.bh edu.bh gov.bh info.bh
+    net.bh org.bh com.bm edu.bm gov.bm net.bm org.bm com.bn edu.bn net.bn
+    org.bn com.bo edu.bo gob.bo gov.bo int.bo mil.bo net.bo org.bo tv.bo
+    adm.br adv.br agr.br am.br arq.br art.br ato.br bio.br bmd.br cim.br
+    cng.br cnt.br com.br coop.br dpn.br eco.br ecn.br edu.br eng.br esp.br
+    etc.br eti.br far.br fm.br fnd.br fot.br fst.br g12.br ggf.br gov.br
+    imb.br ind.br inf.br jor.br lel.br mat.br med.br mil.br mus.br net.br
+    nom.br not.br ntr.br odo.br org.br ppg.br pro.br psc.br psi.br qsl.br
+    rec.br slg.br srv.br tmp.br trd.br tur.br tv.br vet.br zlg.br com.bs
+    net.bs org.bs com.bt edu.bt gov.bt net.bt org.bt co.bw org.bw gov.by
+    mil.by com.bz net.bz org.bz ab.ca bc.ca gc.ca mb.ca nb.ca nf.ca nl.ca
+    ns.ca nt.ca nu.ca on.ca pe.ca qc.ca sk.ca yk.ca co.ck edu.ck gov.ck net.ck
+    org.ck ac.cn ah.cn bj.cn com.cn cq.cn edu.cn fj.cn gd.cn gov.cn gs.cn
+    gx.cn gz.cn ha.cn hb.cn he.cn hi.cn hk.cn hl.cn hn.cn jl.cn js.cn jx.cn
+    ln.cn mo.cn net.cn nm.cn nx.cn org.cn qh.cn sc.cn sd.cn sh.cn sn.cn sx.cn
+    tj.cn tw.cn xj.cn xz.cn yn.cn zj.cn arts.co com.co edu.co firm.co gov.co
+    info.co int.co mil.co net.co nom.co org.co rec.co web.co lkd.co.im
+    ltd.co.im plc.co.im co.cm com.cm net.cm au.com br.com cn.com de.com eu.com
+    gb.com hu.com no.com qc.com ru.com sa.com se.com uk.com us.com uy.com
+    za.com ac.cr co.cr ed.cr fi.cr go.cr or.cr sa.cr com.cu edu.cu gov.cu
+    inf.cu net.cu org.cu gov.cx ac.cy biz.cy com.cy ekloges.cy gov.cy ltd.cy
+    name.cy net.cy org.cy parliament.cy press.cy pro.cy tm.cy co.dk com.dm
+    edu.dm gov.dm net.dm org.dm art.do com.do edu.do gob.do gov.do mil.do
+    net.do org.do sld.do web.do art.dz asso.dz com.dz edu.dz gov.dz net.dz
+    org.dz pol.dz com.ec edu.ec fin.ec gov.ec info.ec k12.ec med.ec mil.ec
+    net.ec org.ec pro.ec gob.ec co.ee com.ee edu.ee fie.ee med.ee org.ee
+    pri.ee com.eg edu.eg eun.eg gov.eg mil.eg net.eg org.eg sci.eg com.er
+    edu.er gov.er ind.er mil.er net.er org.er com.es edu.es gob.es nom.es
+    org.es biz.et com.et edu.et gov.et info.et name.et net.et org.et aland.fi
+    ac.fj biz.fj com.fj gov.fj id.fj info.fj mil.fj name.fj net.fj org.fj
+    pro.fj school.fj ac.fk co.fk com.fk gov.fk net.fk nom.fk org.fk tm.fr
+    asso.fr nom.fr prd.fr presse.fr com.fr gouv.fr com.ge edu.ge gov.ge mil.ge
+    net.ge org.ge pvt.ge ac.gg alderney.gg co.gg gov.gg guernsey.gg ind.gg
+    ltd.gg net.gg org.gg sark.gg sch.gg com.gh edu.gh gov.gh mil.gh org.gh
+    com.gi edu.gi gov.gi ltd.gi mod.gi org.gi ac.gn com.gn gov.gn net.gn
+    org.gn asso.gp com.gp edu.gp net.gp org.gp com.gr edu.gr gov.gr net.gr
+    org.gr com.gt edu.gt gob.gt ind.gt mil.gt net.gt org.gt com.gu edu.gu
+    gov.gu mil.gu net.gu org.gu com.hk edu.hk gov.hk idv.hk net.hk org.hk
+    com.hn edu.hn gob.hn mil.hn net.hn org.hn com.hr from.hr iz.hr name.hr
+    adult.ht art.ht asso.ht com.ht coop.ht edu.ht firm.ht gouv.ht info.ht
+    med.ht net.ht org.ht perso.ht pol.ht pro.ht rel.ht shop.ht 2000.hu
+    agrar.hu bolt.hu casino.hu city.hu co.hu erotica.hu erotika.hu film.hu
+    forum.hu games.hu hotel.hu info.hu ingatlan.hu jogasz.hu konyvelo.hu
+    lakas.hu media.hu news.hu org.hu priv.hu reklam.hu sex.hu shop.hu sport.hu
+    suli.hu szex.hu tm.hu tozsde.hu utazas.hu video.hu ac.id co.id go.id
+    mil.id net.id or.id sch.id web.id gov.ie ac.il co.il gov.il idf.il k12.il
+    muni.il net.il org.il ac.im co.im gov.im net.im nic.im org.im ac.in co.in
+    edu.in ernet.in firm.in gen.in gov.in ind.in mil.in net.in nic.in org.in
+    res.in com.io gov.io mil.io net.io org.io ac.ir co.ir gov.ir id.ir net.ir
+    org.ir sch.ir edu.it gov.it ac.je co.je gov.je ind.je jersey.je ltd.je
+    net.je org.je sch.je com.jm edu.jm gov.jm net.jm org.jm com.jo edu.jo
+    gov.jo mil.jo net.jo org.jo ac.jp ad.jp aichi.jp akita.jp aomori.jp
+    chiba.jp co.jp ed.jp ehime.jp fukui.jp fukuoka.jp fukushima.jp gifu.jp
+    go.jp gov.jp gr.jp gunma.jp hiroshima.jp hokkaido.jp hyogo.jp ibaraki.jp
+    ishikawa.jp iwate.jp kagawa.jp kagoshima.jp kanagawa.jp kanazawa.jp
+    kawasaki.jp kitakyushu.jp kobe.jp kochi.jp kumamoto.jp kyoto.jp lg.jp
+    matsuyama.jp mie.jp miyagi.jp miyazaki.jp nagano.jp nagasaki.jp nagoya.jp
+    nara.jp ne.jp net.jp niigata.jp oita.jp okayama.jp okinawa.jp or.jp org.jp
+    osaka.jp saga.jp saitama.jp sapporo.jp sendai.jp shiga.jp shimane.jp
+    shizuoka.jp takamatsu.jp tochigi.jp tokushima.jp tokyo.jp tottori.jp
+    toyama.jp utsunomiya.jp wakayama.jp yamagata.jp yamaguchi.jp yamanashi.jp
+    yokohama.jp ac.ke co.ke go.ke ne.ke new.ke or.ke sc.ke com.kg edu.kg
+    gov.kg mil.kg net.kg org.kg com.kh edu.kh gov.kh mil.kh net.kh org.kh
+    per.kh ac.kr busan.kr chungbuk.kr chungnam.kr co.kr daegu.kr daejeon.kr
+    es.kr gangwon.kr go.kr gwangju.kr gyeongbuk.kr gyeonggi.kr gyeongnam.kr
+    hs.kr incheon.kr jeju.kr jeonbuk.kr jeonnam.kr kg.kr kyonggi.kr mil.kr
+    ms.kr ne.kr or.kr pe.kr re.kr sc.kr seoul.kr ulsan.kr com.kw edu.kw gov.kw
+    mil.kw net.kw org.kw com.ky edu.ky gov.ky net.ky org.ky com.kz edu.kz
+    gov.kz mil.kz net.kz org.kz com.la net.la org.la com.lb edu.lb gov.lb
+    mil.lb net.lb org.lb com.lc edu.lc gov.lc net.lc org.lc assn.lk com.lk
+    edu.lk gov.lk grp.lk hotel.lk int.lk ltd.lk net.lk ngo.lk org.lk sch.lk
+    soc.lk web.lk com.lr edu.lr gov.lr net.lr org.lr co.ls org.ls gov.lt
+    mil.lt asn.lv com.lv conf.lv edu.lv gov.lv id.lv mil.lv net.lv org.lv
+    biz.ly com.ly edu.ly gov.ly id.ly med.ly net.ly org.ly plc.ly sch.ly ac.ma
+    co.ma gov.ma net.ma org.ma press.ma asso.mc tm.mc ac.me co.me edu.me
+    gov.me its.me net.me org.me priv.me com.mg edu.mg gov.mg mil.mg nom.mg
+    org.mg prd.mg tm.mg army.mil navy.mil com.mk org.mk com.mm edu.mm gov.mm
+    net.mm org.mm edu.mn gov.mn org.mn com.mo edu.mo gov.mo net.mo org.mo
+    music.mobi weather.mobi co.mp edu.mp gov.mp net.mp org.mp com.mt edu.mt
+    gov.mt net.mt org.mt tm.mt uu.mt co.mu com.mu aero.mv biz.mv com.mv
+    coop.mv edu.mv gov.mv info.mv int.mv mil.mv museum.mv name.mv net.mv
+    org.mv pro.mv ac.mw co.mw com.mw coop.mw edu.mw gov.mw int.mw museum.mw
+    net.mw org.mw com.mx edu.mx gob.mx net.mx org.mx com.my edu.my gov.my
+    mil.my name.my net.my org.my alt.na com.na cul.na edu.na net.na org.na
+    telecom.na unam.na com.nc net.nc org.nc de.net gb.net uk.net ac.ng com.ng
+    edu.ng gov.ng net.ng org.ng sch.ng ac.ni biz.ni com.ni edu.ni gob.ni in.ni
+    info.ni int.ni mil.ni net.ni nom.ni org.ni web.ni fhs.no folkebibl.no
+    fylkesbibl.no herad.no idrett.no kommune.no mil.no museum.no priv.no
+    stat.no tel.no vgs.no com.np edu.np gov.np mil.np net.np org.np biz.nr
+    co.nr com.nr edu.nr fax.nr gov.nr info.nr mob.nr mobil.nr mobile.nr net.nr
+    org.nr tel.nr tlf.nr ac.nz co.nz cri.nz geek.nz gen.nz govt.nz iwi.nz
+    maori.nz mil.nz net.nz org.nz school.nz ac.om biz.om co.om com.om edu.om
+    gov.om med.om mil.om mod.om museum.om net.om org.om pro.om sch.om dk.org
+    eu.org abo.pa ac.pa com.pa edu.pa gob.pa ing.pa med.pa net.pa nom.pa
+    org.pa sld.pa com.pe edu.pe gob.pe mil.pe net.pe nom.pe org.pe com.pf
+    edu.pf org.pf ac.pg com.pg net.pg com.ph edu.ph gov.ph mil.ph net.ph
+    ngo.ph org.ph biz.pk com.pk edu.pk fam.pk gob.pk gok.pk gon.pk gop.pk
+    gos.pk gov.pk net.pk org.pk web.pk art.pl biz.pl com.pl edu.pl gov.pl
+    info.pl mil.pl net.pl ngo.pl org.pl biz.pr com.pr edu.pr gov.pr info.pr
+    isla.pr name.pr net.pr org.pr pro.pr cpa.pro law.pro med.pro com.ps edu.ps
+    gov.ps net.ps org.ps plo.ps sec.ps com.pt edu.pt gov.pt int.pt net.pt
+    nome.pt org.pt publ.pt com.py edu.py gov.py net.py org.py com.qa edu.qa
+    gov.qa net.qa org.qa asso.re com.re nom.re arts.ro com.ro firm.ro info.ro
+    nom.ro nt.ro org.ro rec.ro store.ro tm.ro www.ro ac.rs co.rs edu.rs gov.rs
+    in.rs org.rs ac.ru com.ru edu.ru gov.ru int.ru mil.ru net.ru org.ru pp.ru
+    ac.rw co.rw com.rw edu.rw gouv.rw gov.rw int.rw mil.rw net.rw com.sa
+    edu.sa gov.sa med.sa net.sa org.sa pub.sa sch.sa com.sb edu.sb gov.sb
+    net.sb org.sb com.sc edu.sc gov.sc net.sc org.sc com.sd edu.sd gov.sd
+    info.sd med.sd net.sd org.sd sch.sd tv.sd ab.se ac.se bd.se brand.se c.se
+    d.se e.se f.se fh.se fhsk.se fhv.se g.se h.se i.se k.se komforb.se
+    kommunalforbund.se komvux.se lanarb.se lanbib.se m.se mil.se n.se
+    naturbruksgymn.se o.se org.se parti.se pp.se press.se s.se sshn.se t.se
+    tm.se u.se w.se x.se y.se z.se com.sg edu.sg gov.sg idn.sg net.sg org.sg
+    per.sg com.sh edu.sh gov.sh mil.sh net.sh org.sh edu.sk gov.sk mil.sk
+    co.st com.st consulado.st edu.st embaixada.st gov.st mil.st net.st org.st
+    principe.st saotome.st store.st com.sv edu.sv gob.sv org.sv red.sv com.sy
+    gov.sy net.sy org.sy at.tf bg.tf ca.tf ch.tf cz.tf de.tf edu.tf eu.tf
+    int.tf net.tf pl.tf ru.tf sg.tf us.tf ac.th co.th go.th in.th mi.th net.th
+    or.th ac.tj biz.tj co.tj com.tj edu.tj go.tj gov.tj int.tj mil.tj name.tj
+    net.tj org.tj web.tj com.tn edunet.tn ens.tn fin.tn gov.tn ind.tn info.tn
+    intl.tn nat.tn net.tn org.tn rnrt.tn rns.tn rnu.tn tourism.tn gov.to
+    av.tr bbs.tr bel.tr biz.tr com.tr dr.tr edu.tr gen.tr gov.tr
+    info.tr k12.tr mil.tr name.tr net.tr org.tr pol.tr tel.tr web.tr aero.tt
+    at.tt au.tt be.tt biz.tt ca.tt co.tt com.tt coop.tt de.tt dk.tt edu.tt
+    es.tt eu.tt fr.tt gov.tt info.tt int.tt it.tt jobs.tt mobi.tt museum.tt
+    name.tt net.tt nic.tt org.tt pro.tt se.tt travel.tt uk.tt us.tt co.tv
+    gov.tv club.tw com.tw ebiz.tw edu.tw game.tw gov.tw idv.tw mil.tw net.tw
+    org.tw ac.tz co.tz go.tz ne.tz or.tz cherkassy.ua chernigov.ua
+    chernovtsy.ua ck.ua cn.ua co.ua com.ua crimea.ua cv.ua dn.ua
+    dnepropetrovsk.ua donetsk.ua dp.ua edu.ua gov.ua if.ua in.ua
+    ivano-frankivsk.ua kh.ua kharkov.ua kherson.ua khmelnitskiy.ua kiev.ua
+    kirovograd.ua km.ua kr.ua ks.ua kv.ua lg.ua lugansk.ua lutsk.ua lviv.ua
+    mk.ua net.ua nikolaev.ua od.ua odessa.ua org.ua pl.ua poltava.ua rovno.ua
+    rv.ua sebastopol.ua sumy.ua te.ua ternopil.ua uzhgorod.ua vinnica.ua vn.ua
+    zaporizhzhe.ua zhitomir.ua zp.ua zt.ua ac.ug co.ug go.ug ne.ug or.ug sc.ug
+    ac.uk bl.uk british-library.uk co.uk edu.uk gov.uk icnet.uk jet.uk ltd.uk
+    me.uk mod.uk national-library-scotland.uk net.uk nhs.uk nic.uk nls.uk
+    org.uk parliament.uk plc.uk police.uk sch.uk ak.us al.us ar.us az.us ca.us
+    co.us ct.us dc.us de.us dni.us fed.us fl.us ga.us hi.us ia.us id.us il.us
+    in.us isa.us kids.us ks.us ky.us la.us ma.us md.us me.us mi.us mn.us mo.us
+    ms.us mt.us nc.us nd.us ne.us nh.us nj.us nm.us nsn.us nv.us ny.us oh.us
+    ok.us or.us pa.us ri.us sc.us sd.us tn.us tx.us ut.us va.us vt.us wa.us
+    wi.us wv.us wy.us com.uy edu.uy gub.uy mil.uy net.uy org.uy vatican.va
+    arts.ve bib.ve co.ve com.ve edu.ve firm.ve gov.ve info.ve int.ve mil.ve
+    net.ve nom.ve org.ve rec.ve store.ve tec.ve web.ve co.vi com.vi edu.vi
+    gov.vi net.vi org.vi ac.vn biz.vn com.vn edu.vn gov.vn health.vn info.vn
+    int.vn name.vn net.vn org.vn pro.vn ch.vu com.vu de.vu edu.vu fr.vu net.vu
+    org.vu com.ws edu.ws gov.ws net.ws org.ws com.ye edu.ye gov.ye mil.ye
+    net.ye org.ye ac.za alt.za bourse.za city.za co.za edu.za gov.za law.za
+    mil.za net.za ngo.za nom.za org.za school.za tm.za web.za ac.zm co.zm
+    com.zm edu.zm gov.zm org.zm sch.zm ac.zw co.zw gov.zw org.zw
+    /) { $self->{two_level_domains}{lc $_} = 1; }
+
   push (@cmds, {
     setting => 'util_rb_2tld',
     is_admin => 1,
@@ -3407,21 +3808,25 @@
 	return $INVALID_VALUE;
       }
       foreach (split(/\s+/, $value)) {
-        $Mail::SpamAssassin::Util::RegistrarBoundaries::TWO_LEVEL_DOMAINS{lc $_} = 1;
+        $self->{two_level_domains}{lc $_} = 1;
       }
     }
   });
 
 =item util_rb_3tld 3tld1.some.tld 3tld2.other.tld ...
 
-This option allows the addition of new 3rd-level TLDs (3TLD) to the
-RegistrarBoundaries code.  Updates to the list usually happen when new
-versions of SpamAssassin are released, but sometimes it's necessary to add in
-new 3TLDs faster than a release can occur.  3TLDs include things like
-demon.co.uk, plc.co.im, etc.
+This option maintains list of valid 3rd-level TLDs in the RegistryBoundaries
+code.  3TLDs include things like demon.co.uk, plc.co.im, etc.
 
 =cut
 
+  # DO NOT UPDATE THIS HARDCODED LIST!! It is only as fallback for
+  # transitional period and to be removed later.  TLDs are now maintained in
+  # sa-update 20_aux_tlds.cf.
+  foreach (qw/
+    demon.co.uk esc.edu.ar lkd.co.im plc.co.im
+    /) { $self->{three_level_domains}{lc $_} = 1; }
+
   push (@cmds, {
     setting => 'util_rb_3tld',
     is_admin => 1,
@@ -3430,15 +3835,38 @@
       unless (defined $value && $value !~ /^$/) {
 	return $MISSING_REQUIRED_VALUE;
       }
-      unless ($value =~ /^[^\s.]+\.[^\s.]+\.[^\s.]+(?:\s+[^\s.]+\.[^\s.]+)*$/) {
+      unless ($value =~ /^[^\s.]+\.[^\s.]+\.[^\s.]+(?:\s+[^\s.]+\.[^\s.]+\.[^\s.]+)*$/) {
 	return $INVALID_VALUE;
       }
       foreach (split(/\s+/, $value)) {
-        $Mail::SpamAssassin::Util::RegistrarBoundaries::THREE_LEVEL_DOMAINS{lc $_} = 1;
+        $self->{three_level_domains}{lc $_} = 1;
       }
     }
   });
 
+=item clear_util_rb
+
+Empty internal list of valid TLDs (including 2nd and 3rd level) which
+RegistryBoundaries code uses.  Only useful if you want to override the
+standard lists supplied by sa-update.
+
+=cut
+
+  push (@cmds, {
+    setting => 'clear_util_rb',
+    type => $CONF_TYPE_NOARGS,
+    code => sub {
+      my ($self, $key, $value, $line) = @_;
+      unless (!defined $value || $value eq '') {
+        return $INVALID_VALUE;
+      }
+      $self->{valid_tlds} = ();
+      $self->{two_level_domains} = ();
+      $self->{three_level_domains} = ();
+      dbg("config: cleared tld lists");
+    }
+  });
+
 =item bayes_path /path/filename	(default: ~/.spamassassin/bayes)
 
 This is the directory and filename for Bayes databases.  Several databases
@@ -3859,8 +4287,35 @@
 This will be replaced with the version number of the currently-running
 SpamAssassin engine.  Note: The version used is in the internal SpamAssassin
 version format which is C<x.yyyzzz>, where x is major version, y is minor
-version, and z is maintenance version.  So 3.0.0 is C<3.000000>, and 3.4.80 is
-C<3.004080>.
+version, and z is maintenance version.  So 3.0.0 is C<3.000000>, and 3.4.80
+is C<3.004080>.
+
+=item perl_version
+
+(Introduced in 3.4.1)  This will be replaced with the version number of the
+currently-running perl engine.  Note: The version used is in the $] version
+format which is C<x.yyyzzz>, where x is major version, y is minor version,
+and z is maintenance version.  So 5.8.8 is C<5.008008>, and 5.10.0 is
+C<5.010000>. Use to protect rules that incorporate RE syntax elements
+introduced in later versions of perl, such as the C<++> non-backtracking
+match introduced in perl 5.10. For example:
+
+  # Avoid lint error on older perl installs
+  # Check SA version first to avoid warnings on checking perl_version on older SA
+  if version > 3.004001 && perl_version >= 5.018000
+    body  INVALID_RE_SYNTAX_IN_PERL_BEFORE_5_18  /(?[ \p{Thai} & \p{Digit} ])/
+  endif
+
+Note that the above will still generate a warning on perl older than 5.10.0;
+to avoid that warning do this instead:
+
+  # Avoid lint error on older perl installs
+  if can(Mail::SpamAssassin::Conf::perl_min_version_5010000)
+    body  INVALID_RE_SYNTAX_IN_PERL_5_8  /\w++/
+  endif
+
+Warning: a can() test is only defined for perl 5.10.0!
+
 
 =item plugin(Name::Of::Plugin)
 
@@ -3979,6 +4434,11 @@
  _DATE_            rfc-2822 date of scan
  _STARS(*)_        one "*" (use any character) for each full score point
                    (note: limited to 50 'stars')
+ _SENDERDOMAIN_    a domain name of the envelope sender address, lowercased
+ _AUTHORDOMAIN_    a domain name of the author address (the From header
+                   field), lowercased;  note that RFC 5322 allows a mail
+                   message to have multiple authors - currently only the
+                   domain name of the first email address is returned
  _RELAYSTRUSTED_   relays used and deemed to be trusted (see the 
                    'X-Spam-Relays-Trusted' pseudo-header)
  _RELAYSUNTRUSTED_ relays used that can not be trusted (see the 
@@ -4020,6 +4480,13 @@
 by a loaded plugin, the reference will be left intact and not replaced by any
 value.
 
+Additional, plugin specific, template tags can be found in the documentation for
+the following plugins:
+
+ L<Mail::SpamAssassin::Plugin::ASN>
+ L<Mail::SpamAssassin::Plugin::AWL>
+ L<Mail::SpamAssassin::Plugin::TxRep>
+
 The C<HAMMYTOKENS> and C<SPAMMYTOKENS> tags have an optional second argument
 which specifies a format.  See the B<HAMMYTOKENS/SPAMMYTOKENS TAG FORMAT>
 section, below, for details.
@@ -4101,7 +4568,7 @@
 # bundled plugins. These will be warned about, but do not generate a fatal
 # error when "spamassassin --lint" is run like a normal syntax error would.
 
-@MIGRATED_SETTINGS = qw{
+our @MIGRATED_SETTINGS = qw{
   ok_languages
 };
 
@@ -4218,12 +4685,12 @@
 
 sub parse_scores_only {
   my ($self) = @_;
-  $_[0]->{parser}->parse ($_[1], 1);
+  $self->{parser}->parse ($_[1], 1);
 }
 
 sub parse_rules {
   my ($self) = @_;
-  $_[0]->{parser}->parse ($_[1], 0);
+  $self->{parser}->parse ($_[1], 0);
 }
 
 ###########################################################################
@@ -4729,6 +5196,8 @@
 sub feature_bug6558_free { 1 }
 sub feature_edns { 1 }  # supports 'dns_options edns' config option
 sub feature_dns_query_restriction { 1 }  # supported config option
+sub feature_registryboundaries { 1 } # replaces deprecated registrarboundaries
+sub perl_min_version_5010000 { return $] >= 5.010000 }  # perl version check ("perl_version" not neatly backwards-compatible)
 
 ###########################################################################
 
diff -Nru spamassassin-3.4.0/lib/Mail/SpamAssassin/Constants.pm spamassassin-3.4.2/lib/Mail/SpamAssassin/Constants.pm
--- spamassassin-3.4.0/lib/Mail/SpamAssassin/Constants.pm	2014-02-07 03:36:28.000000000 -0500
+++ spamassassin-3.4.2/lib/Mail/SpamAssassin/Constants.pm	2018-09-13 21:27:51.000000000 -0400
@@ -25,16 +25,14 @@
 use warnings;
 use re 'taint';
 
-BEGIN {
-  use Exporter ();
-  use vars qw(@ISA);
-  @ISA = qw(Exporter);
+use Exporter ();
+our  @ISA = qw(Exporter);
 
-  use vars qw (
-	@BAYES_VARS @IP_VARS @SA_VARS %EXPORT_TAGS @EXPORT_OK
-  );
+our(@BAYES_VARS, @IP_VARS, @SA_VARS, %EXPORT_TAGS, @EXPORT_OK);
 
-  @IP_VARS = qw(
+# NOTE: Unless you need these to be available at BEGIN time, you're better with this out of a BEGIN block with a simple our statement.
+BEGIN { 
+    @IP_VARS = qw(
 	IP_IN_RESERVED_RANGE IP_PRIVATE LOCALHOST IPV4_ADDRESS IP_ADDRESS
   );
   @BAYES_VARS = qw(
@@ -253,10 +251,10 @@
 # an IP address, in IPv4 format only.
 #
 use constant IPV4_ADDRESS => qr/\b
-		    (?:1\d\d|2[0-4]\d|25[0-5]|\d\d|\d)\.
-                    (?:1\d\d|2[0-4]\d|25[0-5]|\d\d|\d)\.
-                    (?:1\d\d|2[0-4]\d|25[0-5]|\d\d|\d)\.
-                    (?:1\d\d|2[0-4]\d|25[0-5]|\d\d|\d)
+		    (?:1\d\d|2[0-4]\d|25[0-5]|[1-9]\d|\d)\.
+                    (?:1\d\d|2[0-4]\d|25[0-5]|[1-9]\d|\d)\.
+                    (?:1\d\d|2[0-4]\d|25[0-5]|[1-9]\d|\d)\.
+                    (?:1\d\d|2[0-4]\d|25[0-5]|[1-9]\d|\d)
                   \b/ox;
 
 # ---------------------------------------------------------------------------
@@ -267,10 +265,10 @@
 		    (?:
 		      \b(?<!:)	# ensure no "::" IPv4 marker before this one
 		      # plain IPv4, as above
-		      (?:1\d\d|2[0-4]\d|25[0-5]|\d\d|\d)\.
-		      (?:1\d\d|2[0-4]\d|25[0-5]|\d\d|\d)\.
-		      (?:1\d\d|2[0-4]\d|25[0-5]|\d\d|\d)\.
-		      (?:1\d\d|2[0-4]\d|25[0-5]|\d\d|\d)\b
+		      (?:1\d\d|2[0-4]\d|25[0-5]|[1-9]\d|\d)\.
+		      (?:1\d\d|2[0-4]\d|25[0-5]|[1-9]\d|\d)\.
+		      (?:1\d\d|2[0-4]\d|25[0-5]|[1-9]\d|\d)\.
+		      (?:1\d\d|2[0-4]\d|25[0-5]|[1-9]\d|\d)\b
 		    |
 		      # IPv6 addresses
 		      # don't use \b here, it hits on :'s
@@ -303,10 +301,10 @@
 			  (?:[a-f0-9]{1,4}:){4}:[a-f0-9]{1,4}:
 			)
 			# and the IPv4 address appended to all of the 12 bytes above
-			(?:1\d\d|2[0-4]\d|25[0-5]|\d\d|\d)\.
-			(?:1\d\d|2[0-4]\d|25[0-5]|\d\d|\d)\.
-			(?:1\d\d|2[0-4]\d|25[0-5]|\d\d|\d)\.
-			(?:1\d\d|2[0-4]\d|25[0-5]|\d\d|\d)   # no \b, we check later
+			(?:1\d\d|2[0-4]\d|25[0-5]|[1-9]\d|\d)\.
+			(?:1\d\d|2[0-4]\d|25[0-5]|[1-9]\d|\d)\.
+			(?:1\d\d|2[0-4]\d|25[0-5]|[1-9]\d|\d)\.
+			(?:1\d\d|2[0-4]\d|25[0-5]|[1-9]\d|\d)   # no \b, we check later
 
 			| # or (separately) a pure IPv6 address
 
@@ -401,7 +399,7 @@
 
 # Charsets which use capital letters heavily in their encoded representation.
 use constant CHARSETS_LIKELY_TO_FP_AS_CAPS => qr{[-_a-z0-9]*(?:
-	  koi|jp|jis|euc|gb|big5|isoir|cp1251|georgianps|pt154|tis
+	  koi|jp|jis|euc|gb|big5|isoir|cp1251|windows-1251|georgianps|pt154|tis
 	)[-_a-z0-9]*}ix;
 
 1;
diff -Nru spamassassin-3.4.0/lib/Mail/SpamAssassin/DBBasedAddrList.pm spamassassin-3.4.2/lib/Mail/SpamAssassin/DBBasedAddrList.pm
--- spamassassin-3.4.0/lib/Mail/SpamAssassin/DBBasedAddrList.pm	2014-02-07 03:36:28.000000000 -0500
+++ spamassassin-3.4.2/lib/Mail/SpamAssassin/DBBasedAddrList.pm	2018-09-13 21:27:51.000000000 -0400
@@ -19,7 +19,7 @@
 
 use strict;
 use warnings;
-use bytes;
+# use bytes;
 use re 'taint';
 use Fcntl;
 
diff -Nru spamassassin-3.4.0/lib/Mail/SpamAssassin/Dns.pm spamassassin-3.4.2/lib/Mail/SpamAssassin/Dns.pm
--- spamassassin-3.4.0/lib/Mail/SpamAssassin/Dns.pm	2014-02-07 03:36:28.000000000 -0500
+++ spamassassin-3.4.2/lib/Mail/SpamAssassin/Dns.pm	2018-09-13 21:27:51.000000000 -0400
@@ -22,7 +22,7 @@
 
 use strict;
 use warnings;
-use bytes;
+# use bytes;
 use re 'taint';
 
 use Mail::SpamAssassin::Conf;
@@ -35,13 +35,13 @@
 use IO::Socket;
 use POSIX ":sys_wait_h";
 
-use vars qw{
-  $KNOWN_BAD_DIALUP_RANGES @EXISTING_DOMAINS $IS_DNS_AVAILABLE $LAST_DNS_CHECK 
-};
+
+our $KNOWN_BAD_DIALUP_RANGES; # Nothing uses this var???
+our $LAST_DNS_CHECK;
 
 # use very well-connected domains (fast DNS response, many DNS servers,
 # geographical distribution is a plus, TTL of at least 3600s)
-@EXISTING_DOMAINS = qw{
+our @EXISTING_DOMAINS = qw{
   adelphia.net
   akamai.com
   apache.org
@@ -64,7 +64,7 @@
   yahoo.com
 };
 
-$IS_DNS_AVAILABLE = undef;
+our $IS_DNS_AVAILABLE = undef;
 
 #Removed $VERSION per BUG 6422
 #$VERSION = 'bogus';     # avoid CPAN.pm picking up razor ver
@@ -171,7 +171,7 @@
   if (substr($rule, 0, 2) eq "__") {
     # don't bother with meta rules
   } elsif ($answer->type eq 'TXT') {
-    # txtdata returns a non- zone-file-format encoded result, unlike rdatastr;
+    # txtdata returns a non- zone-file-format encoded result, unlike rdstring;
     # avoid space-separated RDATA <character-string> fields if possible,
     # txtdata provides a list of strings in a list context since Net::DNS 0.69
     $log = join('',$answer->txtdata);
@@ -215,11 +215,13 @@
 
   my $qname = $question->qname;
 
-  # txtdata returns a non- zone-file-format encoded result, unlike rdatastr;
+  # txtdata returns a non- zone-file-format encoded result, unlike rdstring;
   # avoid space-separated RDATA <character-string> fields if possible,
   # txtdata provides a list of strings in a list context since Net::DNS 0.69
   #
+  # rdatastr() is historical/undocumented, use rdstring() since Net::DNS 0.69
   my $rdatastr = $answer->UNIVERSAL::can('txtdata') ? join('',$answer->txtdata)
+               : $answer->UNIVERSAL::can('rdstring') ? $answer->rdstring
                                                     : $answer->rdatastr;
   if (defined $qname && defined $rdatastr) {
     my $qclass = $question->qclass;
@@ -267,8 +269,13 @@
     my $answ_type = $answer->type;
     # TODO: there are some CNAME returns that might be useful
     next if ($answ_type ne 'A' && $answ_type ne 'TXT');
-    # skip any A record that isn't on 127/8
-    next if ($answ_type eq 'A' && $answer->rdatastr !~ /^127\./);
+    if ($answ_type eq 'A') {
+      # Net::DNS::RR::A::address() is available since Net::DNS 0.69
+      my $ip_address = $answer->UNIVERSAL::can('address') ? $answer->address
+                                                          : $answer->rdatastr;
+      # skip any A record that isn't on 127.0.0.0/8
+      next if $ip_address !~ /^127\./;
+    }
     for my $rule (@{$rules}) {
       $self->dnsbl_hit($rule, $question, $answer);
     }
@@ -284,11 +291,13 @@
 sub process_dnsbl_set {
   my ($self, $set, $question, $answer) = @_;
 
-  # txtdata returns a non- zone-file-format encoded result, unlike rdatastr;
+  # txtdata returns a non- zone-file-format encoded result, unlike rdstring;
   # avoid space-separated RDATA <character-string> fields if possible,
   # txtdata provides a list of strings in a list context since Net::DNS 0.69
   #
-  my $rdatastr = $answer->UNIVERSAL::can('txtdata') ? join('',$answer->txtdata)
+  # rdatastr() is historical/undocumented, use rdstring() since Net::DNS 0.69
+  my $rdatastr = $answer->UNIVERSAL::can('txtdata')  ? join('',$answer->txtdata)
+               : $answer->UNIVERSAL::can('rdstring') ? $answer->rdstring
                                                     : $answer->rdatastr;
 
   while (my ($subtest, $rule) = each %{ $self->{dnspost}->{$set} }) {
diff -Nru spamassassin-3.4.0/lib/Mail/SpamAssassin/DnsResolver.pm spamassassin-3.4.2/lib/Mail/SpamAssassin/DnsResolver.pm
--- spamassassin-3.4.0/lib/Mail/SpamAssassin/DnsResolver.pm	2014-02-07 03:36:28.000000000 -0500
+++ spamassassin-3.4.2/lib/Mail/SpamAssassin/DnsResolver.pm	2018-09-13 21:27:51.000000000 -0400
@@ -37,9 +37,11 @@
 
 use strict;
 use warnings;
-use bytes;
+# use bytes;
 use re 'taint';
 
+require 5.008001;  # needs utf8::is_utf8()
+
 use Mail::SpamAssassin;
 use Mail::SpamAssassin::Logger;
 use Mail::SpamAssassin::Constants qw(:ip);
@@ -51,7 +53,7 @@
 
 our @ISA = qw();
 
-use vars qw($io_socket_module_name);
+our $io_socket_module_name;
 BEGIN {
   if (eval { require IO::Socket::IP }) {
     $io_socket_module_name = 'IO::Socket::IP';
@@ -165,7 +167,9 @@
     dbg("dns: eval failed: $eval_stat");
   };
 
-  dbg("dns: using socket module: %s%s", $io_socket_module_name,
+  dbg("dns: using socket module: %s version %s%s",
+      $io_socket_module_name,
+      $io_socket_module_name->VERSION,
       $self->{force_ipv4} ? ', forced IPv4' :
       $self->{force_ipv6} ? ', forced IPv6' : '');
   dbg("dns: is Net::DNS::Resolver available? %s",
@@ -204,8 +208,10 @@
     @ns_addr_port = @{$self->{conf}->{dns_servers}};
     dbg("dns: servers set by config to: %s", join(', ',@ns_addr_port));
   } elsif ($res) {  # default as provided by Net::DNS, e.g. /etc/resolv.conf
-    @ns_addr_port = map(untaint_var("[$_]:" . $res->{port}),
-                        @{$res->{nameservers}});
+    my @ns = $res->UNIVERSAL::can('nameservers') ? $res->nameservers
+                                                 : @{$res->{nameservers}};
+    my $port = $res->UNIVERSAL::can('port') ? $res->port : $res->{port};
+    @ns_addr_port = map(untaint_var("[$_]:" . $port), @ns);
     dbg("dns: servers obtained from Net::DNS : %s", join(', ',@ns_addr_port));
   }
   return @ns_addr_port;
@@ -300,7 +306,7 @@
       if  ($b eq $all_zeroes) { $ind += 256 }
       elsif ($b eq $all_ones) { $ind += 256; $cnt += 256 }
       else {  # count nontrivial cases the slow way
-        foreach (0..255) { if (vec($ports_bitset, $ind++, 1)) { $cnt++ } }
+        vec($ports_bitset, $ind++, 1) && $cnt++  for 0..255;
       }
       $available_portscount += $cnt;
       $bucket_counts[$bucket] = $cnt;
@@ -385,8 +391,6 @@
   } else {  # unrecognized
     # unspecified address, unspecified protocol family
   }
-  dbg("dns: LocalAddr: %s, name server(s): %s",
-      $srcaddr||'', join(', ',@ns_addr_port));
 
   # find a free local random port from a set of declared-to-be-available ports
   my $lport;
@@ -403,6 +407,8 @@
       $errno = 0;
       last;
     }
+    dbg("dns: LocalAddr: [%s]:%d, name server: [%s]:%d, module %s",
+        $srcaddr||'x', $lport,  $ns_addr, $ns_port,  $io_socket_module_name);
     my %args = (
         PeerAddr => $ns_addr,
         PeerPort => $ns_port,
@@ -575,7 +581,7 @@
     #    time, $domain, $type, $packet->id);
     1;
   } or do {
-    # this can if a domain name in a query is invalid, or if a timeout signal
+    # get here if a domain name in a query is invalid, or if a timeout signal
     # happened to be trapped by this eval, or if Net::DNS signalled an error
     my $eval_stat = $@ ne '' ? $@ : "errno=$!";  chomp $eval_stat;
     # resignal if alarm went off
@@ -586,6 +592,9 @@
   };
 
   if ($packet) {
+    # RD flag needs to be set explicitly since Net::DNS 1.01, Bug 7223	
+    $packet->header->rd(1);
+
   # my $udp_payload_size = $self->{res}->udppacketsize;
     my $udp_payload_size = $self->{conf}->{dns_options}->{edns};
     if ($udp_payload_size && $udp_payload_size > 512) {
@@ -716,6 +725,37 @@
 
 ###########################################################################
 
+=item $id = $res->bgread()
+
+Similar to C<Net::DNS::Resolver::bgread>.  Reads a DNS packet from
+a supplied socket, decodes it, and returns a Net::DNS::Packet object
+if successful.  Dies on error.
+
+=cut
+
+sub bgread {
+  my ($self) = @_;
+  my $sock = $self->{sock};
+  my $packetsize = $self->{res}->udppacketsize;
+  $packetsize = 512  if $packetsize < 512;  # just in case
+  my $data = '';
+  my $peeraddr = $sock->recv($data, $packetsize+256);  # with some size margin for troubleshooting
+  defined $peeraddr or die "bgread: recv() failed: $!";
+  my $peerhost = $sock->peerhost;
+  $data ne '' or die "bgread: received empty packet from $peerhost";
+  dbg("dns: bgread: received %d bytes from %s", length($data), $peerhost);
+  my($answerpkt, $decoded_length) = Net::DNS::Packet->new(\$data);
+  $answerpkt or die "bgread: decoding DNS packet failed: $@";
+  $answerpkt->answerfrom($peerhost);
+  if (defined $decoded_length && $decoded_length ne "" && $decoded_length != length($data)) {
+    warn sprintf("bgread: received a %d bytes packet from %s, decoded %d bytes\n",
+                 length($data), $peerhost, $decoded_length);
+  }
+  return $answerpkt;
+}
+
+###########################################################################
+
 =item $nfound = $res->poll_responses()
 
 See if there are any C<bgsend> reply packets ready, and return
@@ -763,13 +803,24 @@
     $timeout = 0;  # next time around collect whatever is available, then exit
     last  if $nfound == 0;
 
-    my $packet = $self->{res}->bgread($self->{sock});
+    my $packet;
+    # Bug 7265, use our own bgread() below
+    # $packet = $self->{res}->bgread($self->{sock});
+    eval {
+      $packet = $self->bgread();  # Bug 7265, use our own bgread()
+    } or do {
+      undef $packet;
+      my $eval_stat = $@ ne '' ? $@ : "errno=$!";  chomp $eval_stat;
+      # resignal if alarm went off
+      die $eval_stat  if $eval_stat =~ /__alarm__ignore__\(.*\)/s;
+      info("dns: bad dns reply: %s", $eval_stat);
+    };
 
     if (!$packet) {
-      my $dns_err = $self->{res}->errorstring;
-      # resignal if alarm went off
-      die "dns (3) $dns_err\n"  if $dns_err =~ /__alarm__ignore__\(.*\)/s;
-      info("dns: bad dns reply: $dns_err");
+      # error already reported above
+#     my $dns_err = $self->{res}->errorstring;
+#     die "dns (3) $dns_err\n"  if $dns_err =~ /__alarm__ignore__\(.*\)/s;
+#     info("dns: bad dns reply: $dns_err");
     } else {
       my $header = $packet->header;
       if (!$header) {
@@ -805,8 +856,12 @@
           $cb->($packet, $id, $now);
           $cnt++;
         } else {  # no match, report the problem
-          info("dns: no callback for id %s, ignored; packet: %s",
-               $id,  $packet ? $packet->string : "undef" );
+          if ($rcode eq 'REFUSED' || $id =~ m{^\d+/NO_QUESTION_IN_PACKET\z}) {
+            # the failure was already reported above
+          } else {
+            info("dns: no callback for id %s, ignored; packet: %s",
+                 $id,  $packet ? $packet->string : "undef" );
+          }
           # report a likely matching query for diagnostic purposes
           local $1;
           if ($id =~ m{^(\d+)/}) {
@@ -851,7 +906,8 @@
 This subroutine is a simple synchronous leftover from SpamAssassin version
 3.3 and does not participate in packet query caching and callback grouping
 as implemented by AsyncLoop::bgsend_and_start_lookup().  As such it should
-be avoided for mainstream usage.
+be avoided for mainstream usage.  Currently used through Mail::SPF::Server
+by the SPF plugin.
 
 =cut
 
diff -Nru spamassassin-3.4.0/lib/Mail/SpamAssassin/HTML.pm spamassassin-3.4.2/lib/Mail/SpamAssassin/HTML.pm
--- spamassassin-3.4.0/lib/Mail/SpamAssassin/HTML.pm	2014-02-07 03:36:28.000000000 -0500
+++ spamassassin-3.4.2/lib/Mail/SpamAssassin/HTML.pm	2018-09-13 21:27:51.000000000 -0400
@@ -24,6 +24,9 @@
 use warnings;
 use re 'taint';
 
+require 5.008;     # need basic Unicode support for HTML::Parser::utf8_mode
+# require 5.008008;  # Bug 3787; [perl #37950]: Malformed UTF-8 character ...
+
 use HTML::Parser 3.43 ();
 use Mail::SpamAssassin::Logger;
 use Mail::SpamAssassin::Constants qw(:sa);
@@ -52,7 +55,7 @@
 
 # elements that change text style
 my %elements_text_style = map {; $_ => 1 }
-  qw( body font table tr th td big small basefont marquee span p div ),
+  qw( body font table tr th td big small basefont marquee span p div a ),
 ;
 
 # elements that insert whitespace
@@ -77,16 +80,17 @@
 $ok_attributes{body}{$_} = 1 for qw( text bgcolor link alink vlink background );
 $ok_attributes{font}{$_} = 1 for qw( color face size );
 $ok_attributes{marquee}{$_} = 1 for qw( bgcolor background );
-$ok_attributes{table}{$_} = 1 for qw( bgcolor );
-$ok_attributes{td}{$_} = 1 for qw( bgcolor );
-$ok_attributes{th}{$_} = 1 for qw( bgcolor );
-$ok_attributes{tr}{$_} = 1 for qw( bgcolor );
+$ok_attributes{table}{$_} = 1 for qw( bgcolor style );
+$ok_attributes{td}{$_} = 1 for qw( bgcolor style );
+$ok_attributes{th}{$_} = 1 for qw( bgcolor style );
+$ok_attributes{tr}{$_} = 1 for qw( bgcolor style );
 $ok_attributes{span}{$_} = 1 for qw( style );
 $ok_attributes{p}{$_} = 1 for qw( style );
 $ok_attributes{div}{$_} = 1 for qw( style );
+$ok_attributes{a}{$_} = 1 for qw( style );
 
 sub new {
-  my ($class) = @_;
+  my ($class, $character_semantics_input, $character_semantics_output) = @_;
   my $self = $class->SUPER::new(
 		api_version => 3,
 		handlers => [
@@ -99,7 +103,9 @@
 			declaration => ["html_declaration", "self,text"],
 		],
 		marked_sections => 1);
-
+  $self->{SA_character_semantics_input} = $character_semantics_input;
+  $self->{SA_encode_results} =
+    $character_semantics_input && !$character_semantics_output;
   $self;
 }
 
@@ -125,7 +131,7 @@
 
   my @uri;
 
-  # add the canonified version of each uri to the detail list
+  # add the canonicalized version of each uri to the detail list
   if (defined $self->{uri}) {
     @uri = keys %{$self->{uri}};
   }
@@ -232,23 +238,33 @@
   # NOTE: HTML::Parser can cope with: <?xml pis>, <? with space>, so we
   # don't need to fix them here.
 
-  # HTML::Parser converts &nbsp; into a question mark ("?") for some
-  # reason, so convert them to spaces.  Confirmed in 3.31, at least.
+  # # (outdated claim) HTML::Parser converts &nbsp; into a question mark ("?")
+  # # for some reason, so convert them to spaces.  Confirmed in 3.31, at least.
+  # ... Actually it doesn't, it is correctly coverted into Unicode NBSP,
+  # nevertheless it does not hurt to treat it as a space.
   $text =~ s/&nbsp;/ /g;
 
   # bug 4695: we want "<br/>" to be treated the same as "<br>", and
   # the HTML::Parser API won't do it for us
   $text =~ s/<(\w+)\s*\/>/<$1>/gi;
 
-  # Ignore stupid warning that can't be suppressed: 'Parsing of
-  # undecoded UTF-8 will give garbage when decoding entities at ..' (bug 4046)
-  {
-    local $SIG{__WARN__} = sub {
-      warn @_ unless (defined $_[0] && $_[0] =~ /^Parsing of undecoded UTF-/);
-    };
-
-    $self->SUPER::parse($text);
-  }
+  if (!$self->UNIVERSAL::can('utf8_mode')) {
+    # utf8_mode is cleared by default, only warn if it would need to be set
+    warn "message: cannot set utf8_mode, module HTML::Parser is too old\n"
+      if !$self->{SA_character_semantics_input};
+  } else {
+    $self->SUPER::utf8_mode($self->{SA_character_semantics_input} ? 0 : 1);
+    my $utf8_mode = $self->SUPER::utf8_mode;
+    dbg("message: HTML::Parser utf8_mode %s",
+        $utf8_mode ? "on (assumed UTF-8 octets)"
+                   : "off (default, assumed Unicode characters)");
+  }
+  $self->SUPER::parse($text);
+
+  # bug 7437: deal gracefully with HTML::Parser misbehavior on unclosed <style> and <script> tags
+  # (typically from not passing the entire message to spamc, but possibly a DoS attack)
+  $self->SUPER::parse("</style>") while exists $self->{inside}{style} && $self->{inside}{style} > 0;
+  $self->SUPER::parse("</script>") while exists $self->{inside}{script} && $self->{inside}{script} > 0;
 
   $self->SUPER::eof;
 
@@ -257,6 +273,7 @@
 
 sub html_tag {
   my ($self, $tag, $attr, $num) = @_;
+  utf8::encode($tag) if $self->{SA_encode_results};
 
   my $maybe_namespace = ($tag =~ m@^(?:o|st\d):[\w-]+/?$@);
 
@@ -276,15 +293,15 @@
 
   # ignore non-elements
   if (exists $elements{$tag} || exists $tricks{$tag}) {
-    text_style(@_) if exists $elements_text_style{$tag};
+    $self->text_style($tag, $attr, $num) if exists $elements_text_style{$tag};
 
     # bug 5009: things like <p> and </p> both need dealing with
-    html_whitespace(@_) if exists $elements_whitespace{$tag};
+    $self->html_whitespace($tag) if exists $elements_whitespace{$tag};
 
     # start tags
     if ($num == 1) {
-      html_uri(@_) if exists $elements_uri{$tag};
-      html_tests(@_);
+      $self->html_uri($tag, $attr) if exists $elements_uri{$tag};
+      $self->html_tests($tag, $attr, $num);
     }
     # end tags
     else {
@@ -315,13 +332,12 @@
   my ($self, $type, $uri) = @_;
 
   $uri = $self->canon_uri($uri);
+  utf8::encode($uri) if $self->{SA_encode_results};
 
   my $target = target_uri($self->{base_href} || "", $uri);
 
   # skip things like <iframe src="" ...>
-  if (length $uri) {
-    $self->{uri}->{$uri}->{types}->{$type} = 1;
-  }
+  $self->{uri}->{$uri}->{types}->{$type} = 1  if $uri ne '';
 }
 
 sub canon_uri {
@@ -382,6 +398,7 @@
 
 	# Make sure it ends in a slash
 	$uri .= "/" unless $uri =~ m@/$@;
+        utf8::encode($uri) if $self->{SA_encode_results};
 	$self->{base_href} = $uri;
       }
     }
@@ -599,12 +616,14 @@
   my ($self, $tag, $attr, $num) = @_;
 
   if ($tag eq "font" && exists $attr->{face}) {
-    if ($attr->{face} !~ /^[a-z][a-z -]*[a-z](?:,\s*[a-z][a-z -]*[a-z])*$/i) {
+    if ($attr->{face} !~ /^'?[a-z ][a-z -]*[a-z](?:,\s*[a-z][a-z -]*[a-z])*'?$/i) {
       $self->put_results(font_face_bad => 1);
     }
   }
   if ($tag eq "img" && exists $self->{inside}{a} && $self->{inside}{a} > 0) {
-    $self->{uri}->{$self->{anchor_last}}->{anchor_text}->[-1] .= "<img>\n";
+    my $uri = $self->{anchor_last};
+    utf8::encode($uri) if $self->{SA_encode_results};
+    $self->{uri}->{$uri}->{anchor_text}->[-1] .= "<img>\n";
     $self->{anchor}->[-1] .= "<img>\n";
   }
 
@@ -639,8 +658,10 @@
 
   # special text delimiters - <a> and <title>
   if ($tag eq "a") {
-    $self->{anchor_last} = (exists $attr->{href} ? $self->canon_uri($attr->{href}) : "");
-    push(@{$self->{uri}->{$self->{anchor_last}}->{anchor_text}}, '');
+    my $uri = $self->{anchor_last} =
+      (exists $attr->{href} ? $self->canon_uri($attr->{href}) : "");
+    utf8::encode($uri) if $self->{SA_encode_results};
+    push(@{$self->{uri}->{$uri}->{anchor_text}}, '');
     push(@{$self->{anchor}}, '');
   }
   if ($tag eq "title") {
@@ -681,7 +702,8 @@
     }
   }
   else {
-    $text =~ s/[ \t\n\r\f\x0b\xa0]+/ /g;
+    # NBSP:  UTF-8: C2 A0, ISO-8859-*: A0
+    $text =~ s/[ \t\n\r\f\x0b]+|\xc2\xa0/ /gs;
     # trim leading whitespace if previous element was whitespace 
     # and current element is not invisible
     if (@{ $self->{text} } && !$display{invisible} &&
@@ -701,6 +723,7 @@
 
 sub html_text {
   my ($self, $text) = @_;
+  utf8::encode($text) if $self->{SA_encode_results};
 
   # text that is not part of body
   if (exists $self->{inside}{script} && $self->{inside}{script} > 0)
@@ -715,7 +738,9 @@
   # text that is part of body and also stored separately
   if (exists $self->{inside}{a} && $self->{inside}{a} > 0) {
     # this doesn't worry about nested anchors
-    $self->{uri}->{$self->{anchor_last}}->{anchor_text}->[-1] .= $text;
+    my $uri = $self->{anchor_last};
+    utf8::encode($uri) if $self->{SA_encode_results};
+    $self->{uri}->{$uri}->{anchor_text}->[-1] .= $text;
     $self->{anchor}->[-1] .= $text;
   }
   if (exists $self->{inside}{title} && $self->{inside}{title} > 0) {
@@ -723,7 +748,9 @@
   }
 
   my $invisible_for_bayes = 0;
-  if ($text =~ /[^ \t\n\r\f\x0b\xa0]/) {
+
+  # NBSP:  UTF-8: C2 A0, ISO-8859-*: A0
+  if ($text !~ /^(?:[ \t\n\r\f\x0b]|\xc2\xa0)*\z/s) {
     $invisible_for_bayes = $self->html_font_invisible($text);
   }
 
@@ -731,6 +758,7 @@
     # ideas discarded since they would be easy to evade:
     # 1. using \w or [A-Za-z] instead of \S or non-punctuation
     # 2. exempting certain tags
+    # no re "strict";  # since perl 5.21.8: Ranges of ASCII printables...
     if ($text =~ /^[^\s\x21-\x2f\x3a-\x40\x5b-\x60\x7b-\x7e]/s &&
 	$self->{text}->[-1] =~ /[^\s\x21-\x2f\x3a-\x40\x5b-\x60\x7b-\x7e]\z/s)
     {
@@ -757,12 +785,14 @@
 # note: $text includes <!-- and -->
 sub html_comment {
   my ($self, $text) = @_;
+  utf8::encode($text) if $self->{SA_encode_results};
 
   push @{ $self->{comment} }, $text;
 }
 
 sub html_declaration {
   my ($self, $text) = @_;
+  utf8::encode($text) if $self->{SA_encode_results};
 
   if ($text =~ /^<!doctype/i) {
     my $tag = "!doctype";
diff -Nru spamassassin-3.4.0/lib/Mail/SpamAssassin/Locales.pm spamassassin-3.4.2/lib/Mail/SpamAssassin/Locales.pm
--- spamassassin-3.4.0/lib/Mail/SpamAssassin/Locales.pm	2014-02-07 03:36:28.000000000 -0500
+++ spamassassin-3.4.2/lib/Mail/SpamAssassin/Locales.pm	2018-09-13 21:27:51.000000000 -0400
@@ -19,13 +19,9 @@
 
 use strict;
 use warnings;
-use bytes;
+# use bytes;
 use re 'taint';
 
-use vars qw{
-  %charsets_for_locale
-};
-
 ###########################################################################
 
 # A mapping of known country codes to frequent charsets used therein.
@@ -36,7 +32,7 @@
 #
 # A good listing is in /usr/share/config/charsets from KDE 2.2.1
 #
-%charsets_for_locale = (
+our %charsets_for_locale = (
 
   # Japanese: Peter Evans writes: iso-2022-jp = rfc approved, rfc 1468, created
   # by Jun Murai in 1993 back when he didnt have white hair!  rfc approved.
diff -Nru spamassassin-3.4.0/lib/Mail/SpamAssassin/Locker/Flock.pm spamassassin-3.4.2/lib/Mail/SpamAssassin/Locker/Flock.pm
--- spamassassin-3.4.0/lib/Mail/SpamAssassin/Locker/Flock.pm	2014-02-07 03:36:23.000000000 -0500
+++ spamassassin-3.4.2/lib/Mail/SpamAssassin/Locker/Flock.pm	2018-09-13 21:27:51.000000000 -0400
@@ -19,7 +19,7 @@
 
 use strict;
 use warnings;
-use bytes;
+# use bytes;
 use re 'taint';
 
 use Mail::SpamAssassin;
@@ -30,11 +30,7 @@
 use IO::File;
 use Fcntl qw(:DEFAULT :flock);
 
-use vars qw{
-  @ISA
-};
-
-@ISA = qw(Mail::SpamAssassin::Locker);
+our @ISA = qw(Mail::SpamAssassin::Locker);
 
 ###########################################################################
 
diff -Nru spamassassin-3.4.0/lib/Mail/SpamAssassin/Locker/UnixNFSSafe.pm spamassassin-3.4.2/lib/Mail/SpamAssassin/Locker/UnixNFSSafe.pm
--- spamassassin-3.4.0/lib/Mail/SpamAssassin/Locker/UnixNFSSafe.pm	2014-02-07 03:36:23.000000000 -0500
+++ spamassassin-3.4.2/lib/Mail/SpamAssassin/Locker/UnixNFSSafe.pm	2018-09-13 21:27:51.000000000 -0400
@@ -19,7 +19,7 @@
 
 use strict;
 use warnings;
-use bytes;
+# use bytes;
 use re 'taint';
 
 use Mail::SpamAssassin;
@@ -30,11 +30,7 @@
 use Time::Local;
 use Fcntl qw(:DEFAULT :flock);
 
-use vars qw{
-  @ISA
-};
-
-@ISA = qw(Mail::SpamAssassin::Locker);
+our @ISA = qw(Mail::SpamAssassin::Locker);
 
 ###########################################################################
 
diff -Nru spamassassin-3.4.0/lib/Mail/SpamAssassin/Locker/Win32.pm spamassassin-3.4.2/lib/Mail/SpamAssassin/Locker/Win32.pm
--- spamassassin-3.4.0/lib/Mail/SpamAssassin/Locker/Win32.pm	2014-02-07 03:36:23.000000000 -0500
+++ spamassassin-3.4.2/lib/Mail/SpamAssassin/Locker/Win32.pm	2018-09-13 21:27:51.000000000 -0400
@@ -19,7 +19,7 @@
 
 use strict;
 use warnings;
-use bytes;
+# use bytes;
 use re 'taint';
 use Fcntl;
 
@@ -30,11 +30,7 @@
 use File::Spec;
 use Time::Local;
 
-use vars qw{
-  @ISA 
-};
-
-@ISA = qw(Mail::SpamAssassin::Locker);
+our @ISA = qw(Mail::SpamAssassin::Locker);
 
 ###########################################################################
 
diff -Nru spamassassin-3.4.0/lib/Mail/SpamAssassin/Locker.pm spamassassin-3.4.2/lib/Mail/SpamAssassin/Locker.pm
--- spamassassin-3.4.0/lib/Mail/SpamAssassin/Locker.pm	2014-02-07 03:36:28.000000000 -0500
+++ spamassassin-3.4.2/lib/Mail/SpamAssassin/Locker.pm	2018-09-13 21:27:51.000000000 -0400
@@ -19,18 +19,14 @@
 
 use strict;
 use warnings;
-use bytes;
+# use bytes;
 use re 'taint';
 use Fcntl;
 use Time::HiRes ();
 
 use Mail::SpamAssassin;
 
-use vars qw{
-  @ISA
-};
-
-@ISA = qw();
+our @ISA = qw();
 
 ###########################################################################
 
diff -Nru spamassassin-3.4.0/lib/Mail/SpamAssassin/Logger/File.pm spamassassin-3.4.2/lib/Mail/SpamAssassin/Logger/File.pm
--- spamassassin-3.4.0/lib/Mail/SpamAssassin/Logger/File.pm	2014-02-07 03:36:23.000000000 -0500
+++ spamassassin-3.4.2/lib/Mail/SpamAssassin/Logger/File.pm	2018-09-13 21:27:51.000000000 -0400
@@ -31,15 +31,21 @@
 
 use strict;
 use warnings;
-use bytes;
+# use bytes;
 use re 'taint';
 
 use POSIX ();
 use Time::HiRes ();
 use Mail::SpamAssassin::Logger;
+use Mail::SpamAssassin::Util qw(am_running_on_windows);
 
-use vars qw(@ISA);
-@ISA = ();
+our @ISA = ();
+
+# ADDING OS-DEPENDENT LINE TERMINATOR - BUG 6456
+my $eol = "\n";
+if (am_running_on_windows()) {
+  $eol = "\r\n";
+}
 
 sub new {
   my $class = shift;
@@ -54,7 +60,7 @@
   $self->{timestamp_fmt} = $params{timestamp_fmt};
 
   if (! $self->init()) {
-    die "logger: file initialization failed\n";
+    die "logger: file initialization failed$eol";
   }
 
   return($self);
@@ -75,7 +81,7 @@
     return 1;
   }
   else {
-    warn "logger: failed to open file $self->{filename}: $!\n";
+    warn "logger: failed to open file $self->{filename}: $!$eol";
     return 0;
   }
 }
@@ -94,8 +100,8 @@
   }
   $timestamp .= ' '  if $timestamp ne '';
 
-  my($nwrite) = syswrite(STDLOG, sprintf("%s[%s] %s: %s\n",
-                                         $timestamp, $$, $level, $msg));
+  my($nwrite) = syswrite(STDLOG, sprintf("%s[%s] %s: %s%s",
+                                         $timestamp, $$, $level, $msg, $eol));
   defined $nwrite  or warn "error writing to log file: $!";
 }
 
diff -Nru spamassassin-3.4.0/lib/Mail/SpamAssassin/Logger/Stderr.pm spamassassin-3.4.2/lib/Mail/SpamAssassin/Logger/Stderr.pm
--- spamassassin-3.4.0/lib/Mail/SpamAssassin/Logger/Stderr.pm	2014-02-07 03:36:23.000000000 -0500
+++ spamassassin-3.4.2/lib/Mail/SpamAssassin/Logger/Stderr.pm	2018-09-13 21:27:51.000000000 -0400
@@ -31,14 +31,24 @@
 
 use strict;
 use warnings;
-use bytes;
+# use bytes;
 use re 'taint';
 
 use POSIX ();
 use Time::HiRes ();
 
-use vars qw(@ISA);
-@ISA = ();
+our @ISA = ();
+
+# ADDING OS-DEPENDENT LINE TERMINATOR - BUG 6456
+
+# Using Mail::SpamAssassin::Util::am_running_on_windows() leads to circular
+# dependencies. So, we are duplicating the code instead.
+use constant RUNNING_ON_WINDOWS => ($^O =~ /^(?:mswin|dos|os2)/oi);
+
+my $eol = "\n";
+if (RUNNING_ON_WINDOWS) {
+  $eol = "\r\n";
+}
 
 sub new {
   my $class = shift;
@@ -61,8 +71,9 @@
   if (!defined $fmt) {
     # default since 3.3.0
     my $now = Time::HiRes::time;
-    $timestamp = sprintf("%s:%06.3f",
-      POSIX::strftime("%b %d %H:%M", localtime($now)), $now-int($now/60)*60);
+    my $datetime = POSIX::strftime("%b %d %H:%M", localtime($now));
+    utf8::encode($datetime)  if utf8::is_utf8($datetime);  # Bug 7305
+    $timestamp = sprintf("%s:%06.3f", $datetime, $now-int($now/60)*60);
     # Bug 6329: %e is not in a POSIX standard, use %d instead and edit
     local $1; $timestamp =~ s/^(\S+\s+)0/$1 /;
   } elsif ($fmt eq '') {
@@ -72,8 +83,8 @@
   }
   $timestamp .= ' '  if $timestamp ne '';
 
-  my($nwrite) = syswrite(STDERR, sprintf("%s[%d] %s: %s\n",
-                                         $timestamp, $$, $level, $msg));
+  my($nwrite) = syswrite(STDERR, sprintf("%s[%d] %s: %s%s",
+                                         $timestamp, $$, $level, $msg, $eol));
   defined $nwrite  or warn "error writing to log file: $!";
 }
 
diff -Nru spamassassin-3.4.0/lib/Mail/SpamAssassin/Logger/Syslog.pm spamassassin-3.4.2/lib/Mail/SpamAssassin/Logger/Syslog.pm
--- spamassassin-3.4.0/lib/Mail/SpamAssassin/Logger/Syslog.pm	2014-02-07 03:36:23.000000000 -0500
+++ spamassassin-3.4.2/lib/Mail/SpamAssassin/Logger/Syslog.pm	2018-09-13 21:27:51.000000000 -0400
@@ -31,7 +31,7 @@
 
 use strict;
 use warnings;
-use bytes;
+# use bytes;
 use re 'taint';
 
 use POSIX qw(:sys_wait_h setsid sigprocmask);
@@ -39,22 +39,19 @@
 use Sys::Syslog qw(:DEFAULT setlogsock);
 use Mail::SpamAssassin::Logger;
 
-use vars qw(@ISA %prio_map $syslog_open);
-@ISA = ();
+our @ISA = ();
 
-BEGIN {
-  # %prio_map maps Logger.pm log level names (warn, error, info, dbg)
-  # into standard Sys::Syslog::syslog() log level names
-  #
-  %prio_map = (dbg => 'debug', debug => 'debug', info => 'info',
-               notice => 'notice', warn => 'warning', warning => 'warning',
-               error => 'err', err => 'err', crit => 'crit', alert => 'alert',
-               emerg => 'emerg');
-
-  # make sure never to hit the CPAN-RT#56826 bug (memory corruption
-  # when closelog() is called twice), fixed in Sys-Syslog 0.28
-  $syslog_open = 0;
-}
+# %prio_map maps Logger.pm log level names (warn, error, info, dbg)
+# into standard Sys::Syslog::syslog() log level names
+#
+our  %prio_map = (dbg => 'debug', debug => 'debug', info => 'info',
+                  notice => 'notice', warn => 'warning', warning => 'warning',
+                  error => 'err', err => 'err', crit => 'crit', alert => 'alert',
+                  emerg => 'emerg');
+
+# make sure never to hit the CPAN-RT#56826 bug (memory corruption
+# when closelog() is called twice), fixed in Sys-Syslog 0.28
+our $syslog_open = 0;
 
 sub new {
   my $class = shift;
diff -Nru spamassassin-3.4.0/lib/Mail/SpamAssassin/Logger.pm spamassassin-3.4.2/lib/Mail/SpamAssassin/Logger.pm
--- spamassassin-3.4.0/lib/Mail/SpamAssassin/Logger.pm	2014-02-07 03:36:28.000000000 -0500
+++ spamassassin-3.4.2/lib/Mail/SpamAssassin/Logger.pm	2018-09-13 21:27:51.000000000 -0400
@@ -37,16 +37,14 @@
 
 use strict;
 use warnings;
-use bytes;
+# use bytes;
 use re 'taint';
 
-BEGIN {
-  use Exporter ();
-  use vars qw(@ISA @EXPORT @EXPORT_OK);
-  @ISA = qw(Exporter);
-  @EXPORT = qw(dbg info would_log);
-  @EXPORT_OK = qw(log_message);
-}
+use Exporter ();
+
+our @ISA = qw(Exporter);
+our @EXPORT = qw(dbg info would_log);
+our @EXPORT_OK = qw(log_message);
 
 use constant ERROR => 0;
 use constant WARNING => 1;
@@ -236,7 +234,7 @@
   }
 
   my ($level, $message, @args) = @_;
-  $message =~ s/^([a-z0-9_-]*):\s*//i;
+  $message =~ s/^(?:[a-z0-9_-]*):\s*//i;
 
   $message = sprintf($message,@args)  if @args;
   $message =~ s/\n+$//s;
@@ -322,8 +320,8 @@
 
 =item would_log($level, $facility)
 
-Returns 0 if a message at the given level and with the given facility
-would be logged.  Returns 1 if a message at a given level and facility
+Returns false if a message at the given level and with the given facility
+would not be logged.  Returns 1 if a message at a given level and facility
 would be logged normally.  Returns 2 if the facility was specifically
 enabled.
 
diff -Nru spamassassin-3.4.0/lib/Mail/SpamAssassin/MailingList.pm spamassassin-3.4.2/lib/Mail/SpamAssassin/MailingList.pm
--- spamassassin-3.4.0/lib/Mail/SpamAssassin/MailingList.pm	2014-02-07 03:36:28.000000000 -0500
+++ spamassassin-3.4.2/lib/Mail/SpamAssassin/MailingList.pm	2018-09-13 21:27:51.000000000 -0400
@@ -24,7 +24,7 @@
 
 use strict;
 use warnings;
-use bytes;
+# use bytes;
 use re 'taint';
 
 sub detect_mailing_list {
@@ -104,11 +104,14 @@
 # List-Unsubscribe: <mailto:sympa@somedomain.com?subject=unsubscribe%somelist>
 # List-Post: <mailto:somelist@somedomain.com>
 # List-Owner: <mailto:somelist-request@somedomain.com>
+# X-Mailer: Sympa 6.2.22
+# X-Sympa-To: somelist@somedomain.com
 # [and optionally] List-Archive: <http://www.somedomain.com/wws/arc/somelist>
 
-# NB: This isn't implemented, since there is nothing here saying "Sympa".
 sub detect_ml_sympa {
     my ($self) = @_;
+    return 1 if $self->get('X-Mailer') =~ /^Sympa \d\.\d\.\d/;
+    return 1 if defined ($self->get('X-Sympa-To',undef));
     return 0;
 }
 
diff -Nru spamassassin-3.4.0/lib/Mail/SpamAssassin/Message/Metadata/Received.pm spamassassin-3.4.2/lib/Mail/SpamAssassin/Message/Metadata/Received.pm
--- spamassassin-3.4.0/lib/Mail/SpamAssassin/Message/Metadata/Received.pm	2014-02-07 03:36:23.000000000 -0500
+++ spamassassin-3.4.2/lib/Mail/SpamAssassin/Message/Metadata/Received.pm	2018-09-13 21:27:51.000000000 -0400
@@ -43,7 +43,7 @@
 package Mail::SpamAssassin::Message::Metadata;
 use strict;
 use warnings;
-use bytes;
+# use bytes;
 use re 'taint';
 
 use Mail::SpamAssassin::Dns;
@@ -84,6 +84,8 @@
   $self->{last_trusted_relay_index} = -1;	# last counting from the top,
   $self->{last_internal_relay_index} = -1;	# first in time
 
+  $self->{allow_mailfetch_markers} = 1;         # This needs to be set for the
+                                                # first Received: header
   # now figure out what relays are trusted...
   my $trusted = $permsgstatus->{main}->{conf}->{trusted_networks};
   my $internal = $permsgstatus->{main}->{conf}->{internal_networks};
@@ -238,11 +240,11 @@
 
     if ($in_trusted) {
       push (@{$self->{relays_trusted}}, $relay);
-      $self->{allow_fetchmail_markers} = 1;
+      $self->{allow_mailfetch_markers} = 1;
       $self->{last_trusted_relay_index}++;
     } else {
       push (@{$self->{relays_untrusted}}, $relay);
-      $self->{allow_fetchmail_markers} = 0;
+      $self->{allow_mailfetch_markers} = 0;
     }
 
     if ($in_internal) {
@@ -404,7 +406,10 @@
   # with ASMTP (Authenticated SMTP) is used by Earthlink, Exim 4.34, and others
   # with HTTP should only be authenticated webmail sessions
   # with HTTPU is used by Communigate Pro with Pronto! webmail interface
-  if (/ by / && / with ((?:ES|L|UTF8S|UTF8L)MTPS?A|ASMTP|HTTPU?)(?: |;|$)/i) {
+  # with HTTPS is used by Horde adjusts the Received header to say "HTTPS" when
+  # a connection is made over HTTPS
+  # IANA registry: http://www.iana.org/assignments/mail-parameters/mail-parameters.xhtml
+  if (/ by / && / with ((?:ES|L|UTF8S|UTF8L)MTPS?A|ASMTP|HTTP[SU]?)(?: |;|$)/i) {
     $auth = $1;
   }
   # GMail should use ESMTPSA to indicate that it is in fact authenticated,
@@ -433,13 +438,18 @@
     $auth = 'Postfix';
   }
   # Communigate Pro - Bug 6495 adds HTTP as possible transmission method
-  elsif (/CommuniGate Pro (HTTP|SMTP)/ && / \(account /) {
+  # 	Bug 7277: XIMSS used by Pronto and other custom apps, IMAP supports XMIT extension
+  elsif (/CommuniGate Pro (HTTP|SMTP|XIMSS|IMAP)/ && / \(account /) {
     $auth = 'Communigate';
   }
   # Microsoft Exchange (complete with syntax error)
   elsif (/ with Microsoft Exchange Server HTTP-DAV\b/) {
     $auth = 'HTTP-DAV';
   }
+  # froufrou mailers like United Internet use a '(via HTTP)' comment, Bug 7101
+  elsif (/ by / && / \(via (HTTP.?)\)(?: |;|$)/i) {
+    $auth = $1;
+  }
 
 # ---------------------------------------------------------------------------
 
@@ -712,6 +722,11 @@
       $rdns = $1; $helo = $2; $ip = $3; $by = $4; goto enough;
     }
 
+    # Received: from mail-backend.DDDD.com (LHLO mail-backend.DDDD.com) (10.2.2.20) by mail-backend.DDDD.com with LMTP; Thu, 18 Jun 2015 16:50:56 -0700 (PDT)
+    if (/^(\S+) \(LHLO (\S*)\) \((${IP_ADDRESS})\) by (\S+) with LMTP/) {
+      $rdns = $1; $helo = $2; $ip = $3; $by = $4; goto enough;
+    }
+
     # from dslb-082-083-045-064.pools.arcor-ip.net (EHLO homepc) [82.83.45.64] by mail.gmx.net (mp010) with SMTP; 03 Feb 2007 13:13:47 +0100
     if (/^(\S+) \((?:HELO|EHLO) (\S*)\) \[(${IP_ADDRESS})\] by (\S+) \([^\)]+\) with (?:ESMTP|SMTP)/) {
       $rdns = $1; $helo = $2; $ip = $3; $by = $4; goto enough;
@@ -862,12 +877,19 @@
       $helo = $1; $rdns = $2; $ip = $3; $by = $4; goto enough;
     }
 
+    # Identify fetch-from-server incidents:
+    # Fetchmail:
     # Received: from cabbage.jmason.org [127.0.0.1]
     # by localhost with IMAP (fetchmail-5.9.0)
     # for jm@localhost (single-drop); Thu, 13 Mar 2003 20:39:56 -0800 (PST)
-    if (/fetchmail/&&/^(\S+) (?:\[(${IP_ADDRESS})\] )?by (\S+) with \S+ \(fetchmail/) {
+    #
+    # Getmail:
+    # Received: from pop3.mail.dk (195.41.46.251) by loki.valhalla with POP3;
+    # 14 Apr 2010 11:14:29 -0000
+    #
+    if (/with (?:POP3|IMAP)/) {
       $self->found_pop_fetcher_sig();
-      return 0;		# skip fetchmail handovers
+      return 0;		# skip mail fetcher handovers
     }
 
     # Let's try to support a few qmailish formats in one;
@@ -905,14 +927,6 @@
       $ip = $1; $by = $2; goto enough;
     }
 
-    # Received: from po11.mit.edu [18.7.21.73]
-    # by stark.dyndns.tv with POP3 (fetchmail-5.9.7)
-    # for stark@localhost (single-drop); Tue, 18 Feb 2003 10:43:09 -0500 (EST)
-    # by po11.mit.edu (Cyrus v2.1.5) with LMTP; Tue, 18 Feb 2003 09:49:46 -0500
-    if (/ with POP3 /&&/^(\S+) \[(${IP_ADDRESS})\] by (\S+) with POP3 /) {
-      $rdns = $1; $ip = $2; $by = $3; goto enough;
-    }
-
     # Received: from snake.corp.yahoo.com(216.145.52.229) by x.x.org via smap (V1.3)
     # id xma093673; Wed, 26 Mar 03 20:43:24 -0600
     if (/ via smap /&&/^(\S+)\((${IP_ADDRESS})\) by (\S+) via smap /) {
@@ -1176,7 +1190,7 @@
     # logging a little more.
     if (/^\S+ by \S+ \(.{0,100}\) with qmail-scanner/) {
       $envfrom =~ s/^\s*<*//gs; $envfrom =~ s/>*\s*$//gs;
-      $envfrom =~ s/[\s\0\#\[\]\(\)\<\>\|]/!/gs;
+      $envfrom =~ s/[\s\000\#\[\]\(\)\<\>\|]/!/gs;
       $self->{qmail_scanner_env_from} = $envfrom; # hack!
       return 0;
     }
@@ -1185,6 +1199,11 @@
     # id 18tOsg-0008FX-00; Thu, 13 Mar 2003 09:20:06 +0000
     if (/^\S+ by \S+ with local/) { return 0; }
 
+    # Local unix socket handover from Cyrus, tested with v2.3.14
+    # Received: from testintranator.net.vm ([unix socket])_ by testintranator.net.vm (Cyrus v2.3.14) with LMTPA;_ Tue, 21 Jul 2009 14:34:14 +0200
+    # Attention: Actually the received header is parsed as "testintranator.net.vm ([unix socket]) by testintranator.net.vm (Cyrus v2.3.14) with LMTPA", "from" is ommited.
+    if (/^\S+ \(\[unix socket\]\) by \S+ \(Cyrus v[0-9]*?\.[0-9]*?\.[0-9]*?\) with LMTPA/) { return 0; }
+
     # HANDOVERS WE KNOW WE CAN'T DEAL WITH: TCP transmission, but to MTAs that
     # just don't log enough info for us to use (ie. no IP address present).
     # Note: "return 0" is strongly recommended here, unless you're sure
@@ -1306,12 +1325,12 @@
   # presence, though.  NOTE: this means "[1.2.3.4]" IP addr HELO
   # strings, which are legit by RFC-2821, look like "!1.2.3.4!".
   # still useful though.
-  $ip =~ s/[\s\0\#\[\]\(\)\<\>\|]/!/gs;
-  $rdns =~ s/[\s\0\#\[\]\(\)\<\>\|]/!/gs;
-  $helo =~ s/[\s\0\#\[\]\(\)\<\>\|]/!/gs;
-  $by =~ s/[\s\0\#\[\]\(\)\<\>\|]/!/gs;
-  $ident =~ s/[\s\0\#\[\]\(\)\<\>\|]/!/gs;
-  $envfrom =~ s/[\s\0\#\[\]\(\)\<\>\|]/!/gs;
+  $ip =~ s/[\s\000\#\[\]\(\)\<\>\|]/!/gs;
+  $rdns =~ s/[\s\000\#\[\]\(\)\<\>\|]/!/gs;
+  $helo =~ s/[\s\000\#\[\]\(\)\<\>\|]/!/gs;
+  $by =~ s/[\s\000\#\[\]\(\)\<\>\|]/!/gs;
+  $ident =~ s/[\s\000\#\[\]\(\)\<\>\|]/!/gs;
+  $envfrom =~ s/[\s\000\#\[\]\(\)\<\>\|]/!/gs;
 
   my $relay = {
     ip => $ip,
@@ -1367,13 +1386,13 @@
 # spamcop does this, and it's a great idea ;)
 sub found_pop_fetcher_sig {
   my ($self) = @_;
-  if ($self->{allow_fetchmail_markers}) {
-    dbg("received-header: found fetchmail marker, restarting parse");
+  if ($self->{allow_mailfetch_markers}) {
+    dbg("received-header: found mail fetcher marker, restarting parse");
     $self->{relays_trusted} = [ ];
     $self->{relays_internal} = [ ];
     $self->{relays_external} = [ ];
   } else {
-    dbg("received-header: found fetchmail marker outside trusted area, ignored");
+    dbg("received-header: found mail fetcher marker outside trusted area, ignored");
   }
 }
 
diff -Nru spamassassin-3.4.0/lib/Mail/SpamAssassin/Message/Metadata.pm spamassassin-3.4.2/lib/Mail/SpamAssassin/Message/Metadata.pm
--- spamassassin-3.4.0/lib/Mail/SpamAssassin/Message/Metadata.pm	2014-02-07 03:36:23.000000000 -0500
+++ spamassassin-3.4.2/lib/Mail/SpamAssassin/Message/Metadata.pm	2018-09-13 21:27:51.000000000 -0400
@@ -19,8 +19,6 @@
 
 Mail::SpamAssassin::Message::Metadata - extract metadata from a message
 
-=head1 SYNOPSIS
-
 =head1 DESCRIPTION
 
 This class is tasked with extracting "metadata" from messages for use as
@@ -50,7 +48,7 @@
 
 use strict;
 use warnings;
-use bytes;
+# use bytes;
 use re 'taint';
 
 use Mail::SpamAssassin;
diff -Nru spamassassin-3.4.0/lib/Mail/SpamAssassin/Message/Node.pm spamassassin-3.4.2/lib/Mail/SpamAssassin/Message/Node.pm
--- spamassassin-3.4.0/lib/Mail/SpamAssassin/Message/Node.pm	2014-02-07 03:36:23.000000000 -0500
+++ spamassassin-3.4.2/lib/Mail/SpamAssassin/Message/Node.pm	2018-09-13 21:27:51.000000000 -0400
@@ -19,8 +19,6 @@
 
 Mail::SpamAssassin::Message::Node - decode, render, and make available MIME message parts
 
-=head1 SYNOPSIS
-
 =head1 DESCRIPTION
 
 This module will encapsulate an email message and allow access to
@@ -38,11 +36,22 @@
 use warnings;
 use re 'taint';
 
+require 5.008001;  # needs utf8::is_utf8()
+
 use Mail::SpamAssassin;
 use Mail::SpamAssassin::Constants qw(:sa);
 use Mail::SpamAssassin::HTML;
 use Mail::SpamAssassin::Logger;
 
+our($enc_utf8, $enc_w1252, $have_encode_detector);
+BEGIN {
+  eval { require Encode }
+    and do { $enc_utf8  = Encode::find_encoding('UTF-8');
+             $enc_w1252 = Encode::find_encoding('Windows-1252') };
+  eval { require Encode::Detect::Detector }
+    and do { $have_encode_detector = 1 };
+};
+
 =item new()
 
 Generates an empty Node object and returns it.  Typically only called
@@ -175,7 +184,7 @@
     $dec_value =~ s/\n[ \t]+/ /gs;
     $dec_value =~ s/\s+$//s;
     $dec_value =~ s/^\s+//s;
-    push @{ $self->{'headers'}->{$key} }, $self->_decode_header($dec_value,$key);
+    push @{ $self->{'headers'}->{$key} }, _decode_header($dec_value,$key);
 
     push @{ $self->{'raw_headers'}->{$key} }, $raw_value;
 
@@ -272,8 +281,9 @@
     my $fd = $self->{'raw'};
     seek($fd, 0, 0)  or die "message: cannot rewind file: $!";
 
-    my($inbuf,$nread,$raw_str); $raw_str = '';
-    while ( $nread=sysread($fd,$inbuf,16384) ) { $raw_str .= $inbuf }
+    # dbg("message: (raw) reading mime part from a temporary file");
+    my($nread,$raw_str); $raw_str = '';
+    while ( $nread=sysread($fd, $raw_str, 16384, length $raw_str) ) { }
     defined $nread  or die "error reading: $!";
     my @array = split(/^/m, $raw_str, -1);
 
@@ -308,8 +318,9 @@
       my $fd = $self->{'raw'};
       seek($fd, 0, 0)  or die "message: cannot rewind file: $!";
 
-      my($inbuf,$nread,$raw_str); $raw = '';
-      while ( $nread=sysread($fd,$inbuf,16384) ) { $raw .= $inbuf }
+      # dbg("message: (decode) reading mime part from a temporary file");
+      my($nread,$raw_str); $raw = '';
+      while ( $nread=sysread($fd, $raw, 16384, length $raw) ) { }
       defined $nread  or die "error reading: $!";
 
       dbg("message: empty message read from a temp file")  if $raw eq '';
@@ -366,6 +377,56 @@
   }
 }
 
+# Detect endianness of UTF-16 encoded data
+sub detect_utf16 {
+	use Data::Dumper;
+	my $data = $_[0];  # could not avoid copying large strings
+	my $utf16le_clues = 0;
+	my $utf16be_clues = 0;
+	my $sum_h_e = 0;
+	my $sum_h_o = 0;
+	my $sum_l_e = 0;
+	my $sum_l_o = 0;
+	my $decoder = undef;
+
+	my @msg_h = unpack 'H' x length( $data ), $data;
+	my @msg_l = unpack 'h' x length( $data ), $data;
+
+	for( my $i = 0; $i < length( $data ); $i+=2 ) {
+		my $check_char = sprintf( "%01X%01X %01X%01X", hex $msg_h[$i], hex $msg_l[$i], hex $msg_h[$i+1], hex $msg_l[$i+1] );
+		$sum_h_e += hex $msg_h[$i];
+		$sum_h_o += hex $msg_h[$i+1];
+		$sum_l_e += hex $msg_l[$i];
+		$sum_l_o += hex $msg_l[$i+1];
+		if( $check_char =~ /20 00/ ) {
+			# UTF-16LE space char detected
+			$utf16le_clues++;
+		}
+		if( $check_char =~ /00 20/ ) {
+			# UTF-16BE space char detected
+			$utf16be_clues++;
+		}
+	}
+
+	# If we have 4x as many non-null characters in the odd bytes, we're probably UTF-16LE
+	$utf16le_clues++ if( ($sum_h_e + $sum_l_e) > ($sum_h_o + $sum_l_o)*4 );
+
+	# If we have 4x as many non-null characters in the even bytes, we're probably UTF-16BE
+	$utf16be_clues++ if( ($sum_h_o + $sum_l_o)*4 > ($sum_h_e + $sum_l_e) );
+
+	if( $utf16le_clues > $utf16be_clues ) {
+		dbg( "message: detect_utf16: UTF-16LE" );
+		$decoder = Encode::find_encoding("UTF-16LE");
+	} elsif( $utf16le_clues > $utf16be_clues ) {
+		dbg( "message: detect_utf16: UTF-16BE" );
+		$decoder = Encode::find_encoding("UTF-16BE");
+	} else {
+		dbg( "message: detect_utf16: Could not detect UTF-16 endianness" );
+	}
+
+	return $decoder;
+}
+
 # Look at a text scalar and determine whether it should be rendered
 # as text/html.
 #
@@ -383,29 +444,201 @@
   return 0;
 }
 
+# Decode character set of a given text to perl characters (Unicode),
+# then encode into UTF-8 octets if requested.
+#
 sub _normalize {
-  my ($self, $data, $charset) = @_;
-  return $data unless $self->{normalize};
-
-  my $detected = Encode::Detect::Detector::detect($data);
-
-  my $converter;
-
-  if ($charset && $charset !~ /^us-ascii$/i &&
-      ($detected || 'none') !~ /^(?:UTF|EUC|ISO-2022|Shift_JIS|Big5|GB)/i) {
-      dbg("message: Using labeled charset $charset");
-      $converter = Encode::find_encoding($charset);
+# my $data = $_[0];  # avoid copying large strings
+  my $charset_declared = $_[1];
+  my $return_decoded = $_[2];  # true: Unicode characters, false: UTF-8 octets
+
+  warn "message: _normalize() was given characters, expected bytes: $_[0]\n"
+    if utf8::is_utf8($_[0]);
+
+  # workaround for Encode::decode taint laundering bug [rt.cpan.org #84879]
+  my $data_taint = substr($_[0], 0, 0);  # empty string, tainted like $data
+
+  if (!defined $charset_declared || $charset_declared eq '') {
+    $charset_declared = 'us-ascii';
+  }
+
+  # number of characters with code above 127
+  my $cnt_8bits = $_[0] =~ tr/\x00-\x7F//c;
+
+  if (!$cnt_8bits &&
+      $charset_declared =~
+        /^(?: (?:US-)?ASCII | ANSI[_ ]? X3\.4- (?:1986|1968) |
+              ISO646-US )\z/xsi)
+  { # declared as US-ASCII (a.k.a. ANSI X3.4-1986) and it really is
+    dbg("message: kept, charset is US-ASCII as declared");
+    return $_[0];  # is all-ASCII, no need for decoding
+  }
+
+  if (!$cnt_8bits &&
+      $charset_declared =~
+        /^(?: ISO[ -]?8859 (?: - \d{1,2} )? | Windows-\d{4} |
+              UTF-?8 | (KOI8|EUC)-[A-Z]{1,2} |
+              Big5 | GBK | GB[ -]?18030 (?:-20\d\d)? )\z/xsi)
+  { # declared as extended ASCII, but it is actually a plain 7-bit US-ASCII
+    dbg("message: kept, charset is US-ASCII, declared %s", $charset_declared);
+    return $_[0];  # is all-ASCII, no need for decoding
+  }
+
+  # Try first to strictly decode based on a declared character set.
+
+  my $rv;
+  if ($charset_declared =~ /^UTF-?8\z/i) {
+    # attempt decoding as strict UTF-8  (flags: FB_CROAK | LEAVE_SRC)
+    if (eval { $rv = $enc_utf8->decode($_[0], 1|8); defined $rv }) {
+      dbg("message: decoded as declared charset UTF-8");
+      return $_[0]  if !$return_decoded;
+      $rv .= $data_taint;  # carry taintedness over, avoid Encode bug
+      return $rv;  # decoded
+    } else {
+      dbg("message: failed decoding as declared charset UTF-8");
+    };
+
+  } elsif ($charset_declared =~ /^UTF[ -]?16/i) {
+    # Handle cases where spammers use UTF-16 encoding without including a BOM
+    # or declaring endianness as reported at:
+    # https://bz.apache.org/SpamAssassin/show_bug.cgi?id=7252
+
+    my $decoder = detect_utf16( $_[0] );
+    if (eval { $rv = $decoder->decode($_[0], 1|8); defined $rv }) {
+      dbg("message: declared charset %s decoded as charset %s", $charset_declared, $decoder->name);
+      return $_[0]  if !$return_decoded;
+      $rv .= $data_taint;  # carry taintedness over, avoid Encode bug
+      return $rv;  # decoded
+    } else {
+      dbg("message: failed decoding as declared charset $charset_declared");
+    };
+
+  } elsif ($cnt_8bits &&
+           eval { $rv = $enc_utf8->decode($_[0], 1|8); defined $rv }) {
+    dbg("message: decoded as charset UTF-8, declared %s", $charset_declared);
+    return $_[0]  if !$return_decoded;
+    $rv .= $data_taint;  # carry taintedness over, avoid Encode bug
+    return $rv;  # decoded
+
+  } elsif ($charset_declared =~ /^(?:US-)?ASCII\z/i) {
+    # declared as US-ASCII but contains 8-bit characters, makes no sense
+    # to attempt decoding first as strict US-ASCII as we know it would fail
+
+  } else {
+    # try decoding as a declared character set
+
+    # ->  http://en.wikipedia.org/wiki/Windows-1252
+    # Windows-1252 character encoding is a superset of ISO 8859-1, but differs
+    # from the IANA's ISO-8859-1 by using displayable characters rather than
+    # control characters in the 80 to 9F (hex) range. [...]
+    # It is very common to mislabel Windows-1252 text with the charset label
+    # ISO-8859-1. A common result was that all the quotes and apostrophes
+    # (produced by "smart quotes" in word-processing software) were replaced
+    # with question marks or boxes on non-Windows operating systems, making
+    # text difficult to read. Most modern web browsers and e-mail clients
+    # treat the MIME charset ISO-8859-1 as Windows-1252 to accommodate
+    # such mislabeling. This is now standard behavior in the draft HTML 5
+    # specification, which requires that documents advertised as ISO-8859-1
+    # actually be parsed with the Windows-1252 encoding.
+    #
+    my($chset, $decoder);
+    if ($charset_declared =~ /^(?: ISO-?8859-1 | Windows-1252 | CP1252 )\z/xi) {
+      $chset = 'Windows-1252'; $decoder = $enc_w1252;
+    } else {
+      $chset = $charset_declared; $decoder = Encode::find_encoding($chset);
+      if (!$decoder && $chset =~ /^GB[ -]?18030(?:-20\d\d)?\z/i) {
+        $decoder = Encode::find_encoding('GBK');  # a subset of GB18030
+        dbg("message: no decoder for a declared charset %s, using GBK",
+            $chset)  if $decoder;
+      }
+    }
+    if (!$decoder) {
+      dbg("message: failed decoding, no decoder for a declared charset %s",
+          $chset);
+    } else {
+      eval { $rv = $decoder->decode($_[0], 1|8) };  # FB_CROAK | LEAVE_SRC
+      if (lc $chset eq lc $charset_declared) {
+        dbg("message: %s as declared charset %s",
+            defined $rv ? 'decoded' : 'failed decoding', $charset_declared);
+      } else {
+        dbg("message: %s as charset %s, declared %s",
+            defined $rv ? 'decoded' : 'failed decoding',
+            $chset, $charset_declared);
+      }
+    }
   }
 
-  $converter = Encode::find_encoding($detected) unless $converter || !defined($detected);
-
-  return $data unless $converter;
-
-  dbg("message: Converting...");
+  # If the above failed, check if it is US-ASCII, possibly extended by few
+  # NBSP or SHY characters from ISO-8859-* or Windows-1252, or containing
+  # some popular punctuation or special characters from Windows-1252 in
+  # the \x80-\x9F range (which is unassigned in ISO-8859-*).
+  # Note that Windows-1252 is a proper superset of ISO-8859-1.
+  #
+  if (!defined $rv && !$cnt_8bits) {
+    dbg("message: kept, guessed charset is US-ASCII, declared %s",
+        $charset_declared);
+    return $_[0];  # is all-ASCII, no need for decoding
+
+  } elsif (!defined $rv && $enc_w1252 &&
+      #             ASCII  NBSP (c) SHY  '   "  ...   '".-   TM
+      $_[0] !~ tr/\x00-\x7F\xA0\xA9\xAD\x82\x84\x85\x91-\x97\x99//c)
+  { # ASCII + NBSP + SHY + some punctuation characters
+    # NBSP (A0) and SHY (AD) are at the same position in ISO-8859-* too
+    # consider also: AE (r), 80 Euro
+    eval { $rv = $enc_w1252->decode($_[0], 1|8) };  # FB_CROAK | LEAVE_SRC
+    # the above can't fail, but keep code general just in case
+    dbg("message: %s as guessed charset %s, declared %s",
+        defined $rv ? 'decoded' : 'failed decoding',
+        'Windows-1252', $charset_declared);
+  }
+
+  # If we were unsuccessful so far, try some guesswork
+  # based on Encode::Detect::Detector .
+
+  if (defined $rv) {
+    # done, no need for guesswork
+  } elsif (!$have_encode_detector) {
+    dbg("message: Encode::Detect::Detector not available, declared %s failed",
+        $charset_declared);
+  } else {
+    my $charset_detected = Encode::Detect::Detector::detect($_[0]);
+    if ($charset_detected && lc $charset_detected ne lc $charset_declared) {
+      my $decoder = Encode::find_encoding($charset_detected);
+      if (!$decoder && $charset_detected =~ /^GB[ -]?18030(?:-20\d\d)?\z/i) {
+        $decoder = Encode::find_encoding('GBK');  # a subset of GB18030
+        dbg("message: no decoder for a detected charset %s, using GBK",
+            $charset_detected)  if $decoder;
+      }
+      if (!$decoder) {
+        dbg("message: failed decoding, no decoder for a detected charset %s",
+            $charset_detected);
+      } else {
+        eval { $rv = $decoder->decode($_[0], 1|8) };  # FB_CROAK | LEAVE_SRC
+        dbg("message: %s as detected charset %s, declared %s",
+            defined $rv ? 'decoded' : 'failed decoding',
+            $charset_detected, $charset_declared);
+      }
+    }
+  }
 
-  my $rv = $converter->decode($data, 0);
-  utf8::downgrade($rv, 1);
-  return $rv
+  if (!defined $rv) {  # all decoding attempts failed so far, probably garbage
+    # go for Windows-1252 which can't fail
+    eval { $rv = $enc_w1252->decode($_[0]) };
+    dbg("message: %s as last-resort charset %s, declared %s",
+        defined $rv ? 'decoded' : 'failed decoding',
+        'Windows-1252', $charset_declared);
+  }
+
+  if (!defined $rv) {  # just in case - all decoding attempts failed so far
+    return $_[0];  # garbage-in / garbage-out, return unchanged octets
+  }
+  # decoding octets to characters was successful
+  if (!$return_decoded) {
+    # utf8::encode() is much faster than $enc_utf8->encode on utf8-flagged arg
+    utf8::encode($rv);  # encode Unicode characters to UTF-8 octets
+  }
+  $rv .= $data_taint;  # carry taintedness over, avoid Encode bug
+  return $rv;
 }
 
 =item rendered()
@@ -428,19 +661,43 @@
     # text/x-aol is ignored here, but looks like text/html ...
     return(undef,undef) unless ( $self->{'type'} =~ /^text\/(?:plain|html)$/i );
 
-    my $text = $self->_normalize($self->decode(), $self->{charset});
-    my $raw = length($text);
+    my $text = $self->decode;  # QP and Base64 decoding, bytes
+    my $text_len = length($text);  # num of bytes in original charset encoding
 
     # render text/html always, or any other text|text/plain part as text/html
     # based on a heuristic which simulates a certain common mail client
-    if ($raw > 0 && ($self->{'type'} =~ m@^text/html$@i ||
-		     ($self->{'type'} =~ m@^text/plain$@i &&
-		      _html_render(substr($text, 0, 23)))))
+    if ($text ne '' && ($self->{'type'} =~ m{^text/html$}i ||
+		        ($self->{'type'} =~ m{^text/plain$}i &&
+		         _html_render(substr($text, 0, 23)))))
     {
       $self->{rendered_type} = 'text/html';
 
-      my $html = Mail::SpamAssassin::HTML->new();	# object
-      $html->parse($text);				# parse+render text
+      # will input text to HTML::Parser be provided as Unicode characters?
+      my $character_semantics = 0;  # $text is in bytes
+      if ($self->{normalize} && $enc_utf8) {  # charset decoding requested
+        # Provide input to HTML::Parser as Unicode characters
+        # which avoids a HTML::Parser bug in utf8_mode
+        #   https://rt.cpan.org/Public/Bug/Display.html?id=99755
+        #   Note: the above bug was fixed in HTML-Parser 3.72, January 2016.
+        # Avoid unnecessary step of encoding-then-decoding by telling
+        # subroutine _normalize() to return Unicode text.  See Bug 7133
+        #
+        $character_semantics = 1;  # $text will be in characters
+        $text = _normalize($text, $self->{charset}, 1); # bytes to chars
+      } elsif (!defined $self->{charset} ||
+               $self->{charset} =~ /^(?:US-ASCII|UTF-8)\z/i) {
+        # With some luck input can be interpreted as UTF-8, do not warn.
+        # It is still possible to hit the HTML::Parses utf8_mode bug however.
+      } else {
+        dbg("message: 'normalize_charset' is off, encoding will likely ".
+            "be misinterpreted; declared charset: %s", $self->{charset});
+      }
+      # the 0 requires decoded HTML results to be in bytes (not characters)
+      my $html = Mail::SpamAssassin::HTML->new($character_semantics,0); # object
+
+      $html->parse($text);  # parse+render text
+
+      # resulting HTML-decoded text is in bytes, likely encoded as UTF-8
       $self->{rendered} = $html->get_rendered_text();
       $self->{visible_rendered} = $html->get_rendered_text(invisible => 0);
       $self->{invisible_rendered} = $html->get_rendered_text(invisible => 1);
@@ -449,15 +706,20 @@
       # end-of-document result values that require looking at the text
       my $r = $self->{html_results};	# temporary reference for brevity
 
-      # count the number of spaces in the rendered text
-      my $rt = pack "C0A*", $self->{rendered};
-      my $space = ($rt =~ tr/ \t\n\r\x0b\xa0/ \t\n\r\x0b\xa0/);
-      $r->{html_length} = length($rt);
+      # count the number of spaces in the rendered text (likely UTF-8 octets)
+      my $space = $self->{rendered} =~ tr/ \t\n\r\x0b//;
+      # we may want to add the count of other Unicode whitespace characters
 
+      $r->{html_length} = length $self->{rendered};  # bytes (likely UTF-8)
       $r->{non_space_len} = $r->{html_length} - $space;
-      $r->{ratio} = ($raw - $r->{html_length}) / $raw;
+      $r->{ratio} = ($text_len - $r->{html_length}) / $text_len  if $text_len;
     }
-    else {
+
+    else {  # plain text
+      if ($self->{normalize} && $enc_utf8) {
+        # request transcoded result as UTF-8 octets!
+        $text = _normalize($text, $self->{charset}, 0);
+      }
       $self->{rendered_type} = $self->{type};
       $self->{rendered} = $self->{'visible_rendered'} = $text;
       $self->{'invisible_rendered'} = '';
@@ -561,7 +823,7 @@
 
 # decode a header appropriately.  don't bother adding it to the pod documents.
 sub __decode_header {
-  my ( $self, $encoding, $cte, $data ) = @_;
+  my ( $encoding, $cte, $data ) = @_;
 
   if ( $cte eq 'B' ) {
     # base 64 encoded
@@ -579,13 +841,13 @@
     # not possible since the input has already been limited to 'B' and 'Q'
     die "message: unknown encoding type '$cte' in RFC2047 header";
   }
-  return $self->_normalize($data, $encoding);
+  return _normalize($data, $encoding, 0);  # transcode to UTF-8 octets
 }
 
 # Decode base64 and quoted-printable in headers according to RFC2047.
 #
 sub _decode_header {
-  my($self, $header_field_body, $header_field_name) = @_;
+  my($header_field_body, $header_field_name) = @_;
 
   return '' unless defined $header_field_body && $header_field_body ne '';
 
@@ -593,30 +855,32 @@
   $header_field_body =~ s/\n[ \t]+/\n /g;
   $header_field_body =~ s/\015?\012//gs;
 
-  # Bug 6945: some header fields must not be processed for MIME encoding
   if ($header_field_name =~
-       /^ (?: (?: Received | (?:Resent-)? (?: Message-ID | Date ) |
-                  MIME-Version | References | In-Reply-To ) \z
-            | (?: List- | Content- ) ) /xsi ) {
-    return $header_field_body;
-  }
-
-  # multiple encoded sections must ignore the interim whitespace.
-  # to avoid possible FPs with (\s+(?==\?))?, look for the whole RE
-  # separated by whitespace.
-  1 while ($header_field_body =~ s/(=\?[\w_-]+\?[bqBQ]\?[^?]+\?=)\s+(=\?[\w_-]+\?[bqBQ]\?[^?]+\?=)/$1$2/g);
-
-# unless ($header_field_body =~
-#	  s/=\?([\w_-]+)\?([bqBQ])\?([^?]+)\?=/$self->__decode_header($1, uc($2), $3)/ge) {
-#   $header_field_body = $self->_normalize($header_field_body);
-# }
-
-  # Bug 6945: header fields have no inherent character set;
-  # only decode and normalize properly encoded RFC 2047 substrings,
-  # leave the rest as plain octets
-  $header_field_body =~ s{ = \? ([A-Za-z0-9_-]+) \? ([bqBQ]) \? ([^?]+) \? = }
-                         { $self->__decode_header($1, uc($2), $3) }xge;
+       /^ (?: Received | (?:Resent-)? (?: Message-ID | Date ) |
+              MIME-Version | References | In-Reply-To | List-.* ) \z /xsi ) {
+    # Bug 6945: some header fields must not be processed for MIME encoding
+    # Bug 7466: leave out the Content-*
+
+  } else {
+    local($1,$2,$3);
+
+    # Multiple encoded sections must ignore the interim whitespace.
+    # To avoid possible FPs with (\s+(?==\?))?, look for the whole RE
+    # separated by whitespace.
+    1 while $header_field_body =~
+              s{ ( = \? [A-Za-z0-9_-]+ \? [bqBQ] \? [^?]* \? = ) \s+
+                 ( = \? [A-Za-z0-9_-]+ \? [bqBQ] \? [^?]* \? = ) }
+               {$1$2}xsg;
+
+    # transcode properly encoded RFC 2047 substrings into UTF-8 octets,
+    # leave everything else unchanged as it is supposed to be UTF-8 (RFC 6532)
+    # or plain US-ASCII
+    $header_field_body =~
+      s{ (?: = \? ([A-Za-z0-9_-]+) \? ([bqBQ]) \? ([^?]*) \? = ) }
+       { __decode_header($1, uc($2), $3) }xsge;
+  }
 
+# dbg("message: _decode_header %s: %s", $header_field_name, $header_field_body);
   return $header_field_body;
 }
 
diff -Nru spamassassin-3.4.0/lib/Mail/SpamAssassin/Message.pm spamassassin-3.4.2/lib/Mail/SpamAssassin/Message.pm
--- spamassassin-3.4.0/lib/Mail/SpamAssassin/Message.pm	2014-02-07 03:36:28.000000000 -0500
+++ spamassassin-3.4.2/lib/Mail/SpamAssassin/Message.pm	2018-09-13 21:27:51.000000000 -0400
@@ -46,15 +46,18 @@
 use warnings;
 use re 'taint';
 
+BEGIN {
+  eval { require Digest::SHA; import Digest::SHA qw(sha1 sha1_hex); 1 }
+  or do { require Digest::SHA1; import Digest::SHA1 qw(sha1 sha1_hex) }
+}
+
 use Mail::SpamAssassin;
 use Mail::SpamAssassin::Message::Node;
 use Mail::SpamAssassin::Message::Metadata;
 use Mail::SpamAssassin::Constants qw(:sa);
 use Mail::SpamAssassin::Logger;
 
-use vars qw(@ISA);
-
-@ISA = qw(Mail::SpamAssassin::Message::Node);
+our @ISA = qw(Mail::SpamAssassin::Message::Node);
 
 # ---------------------------------------------------------------------------
 
@@ -117,6 +120,25 @@
   $self->{master_deadline} = $opts->{'master_deadline'};
   $self->{suppl_attrib} = $opts->{'suppl_attrib'};
 
+  if ($self->{suppl_attrib}) {  # caller-provided additional information
+    # pristine_body_length is currently used by an eval test check_body_length
+    # Possible To-Do: Base the length on the @message array later down?
+    if (defined $self->{suppl_attrib}{body_size}) {
+      # Optional info provided by a caller; should reflect the original
+      # message body size if provided, and as such it may differ from the
+      # $self->{pristine_body} size, e.g. when the caller passed a truncated
+      # message to SpamAssassin, or when counting line-endings differently.
+      $self->{pristine_body_length} = $self->{suppl_attrib}{body_size};
+    }
+    if (ref $self->{suppl_attrib}{mimepart_digests}) {
+      # Optional info provided by a caller: an array of digest codes (e.g. SHA1)
+      # of each MIME part. Should reflect the original message if provided.
+      # As such it may differ from digests calculated by get_mimepart_digests(),
+      # e.g. when the caller passed a truncated message to SpamAssassin.
+      $self->{mimepart_digests} = $self->{suppl_attrib}{mimepart_digests};
+    }
+  }
+
   bless($self,$class);
 
   # create the metadata holder class
@@ -139,8 +161,8 @@
       # and is faster than (<$message>) by 10..25 %
       # (a drawback is a short-term double storage of a text in $raw_str)
       #
-      my($inbuf,$nread,$raw_str); $raw_str = '';
-      while ( $nread=sysread($message,$inbuf,16384) ) { $raw_str .= $inbuf }
+      my($nread,$raw_str); $raw_str = '';
+      while ( $nread=sysread($message, $raw_str, 16384, length $raw_str) ) { }
       defined $nread  or die "error reading: $!";
       @message = split(/^/m, $raw_str, -1);
 
@@ -214,6 +236,9 @@
     dbg("message: line ending changed to CRLF");
   }
 
+  # Is a CRLF -> LF line endings conversion necessary?
+  my $squash_crlf = $self->{line_ending} eq "\015\012";
+
   # Go through all the header fields of the message
   my $hdr_errors = 0;
   my $header;
@@ -240,6 +265,8 @@
 
         # If it's not a valid header (aka: not in the form "foo:bar"), skip it.
         if (defined $value) {
+	  # CRLF -> LF line-endings conversion if necessary
+	  $value =~ s/\015\012/\012/sg  if $squash_crlf;
 	  $key =~ s/[ \t]+\z//;  # strip WSP before colon, obsolete rfc822 syn
 	  # limit the length of the pairs we store
 	  if (length($key) > MAX_HEADER_KEY_LENGTH) {
@@ -268,18 +295,21 @@
  	last;
       }
       # should we assume entering a body on encountering invalid header field?
-      elsif ($current !~ /^[\041-\071\073-\176]+[ \t]*:/) {
-	# A field name MUST be composed of printable US-ASCII characters
-	# (i.e., characters that have values between 33 (041) and 126 (176),
-	# inclusive), except colon (072). Obsolete header field syntax
-	# allowed WSP before a colon.
-	if (++$hdr_errors <= 3) {
-	  # just consume but ignore a few invalid header fields
-	} else {  # enough is enough...
-	  $self->{'missing_head_body_separator'} = 1;
-	  unshift(@message, $current);
- 	  last;
- 	}
+      else {
+        # no re "strict";  # since perl 5.21.8: Ranges of ASCII printables...
+        if ($current !~ /^[\041-\071\073-\176]+[ \t]*:/) {
+	  # A field name MUST be composed of printable US-ASCII characters
+	  # (i.e., characters that have values between 33 (041) and 126 (176),
+	  # inclusive), except colon (072). Obsolete header field syntax
+	  # allowed WSP before a colon.
+	  if (++$hdr_errors <= 3) {
+	    # just consume but ignore a few invalid header fields
+	  } else {  # enough is enough...
+	    $self->{'missing_head_body_separator'} = 1;
+	    unshift(@message, $current);
+ 	    last;
+	  }
+	}
       }
 
       # start collecting a new header field
@@ -293,26 +323,16 @@
   # will get modified below
   $self->{'pristine_body'} = join('', @message);
 
-  # pristine_body_length is currently used by an eval test check_body_length.  
-  # Possible To-Do: Base the length on the @message array later down?
-  # Or a different copy of the message post decoding?
-  if ($self->{suppl_attrib} && defined $self->{suppl_attrib}{body_size}) {
-    # optional info provided by a caller; should reflect the original
-    # message body size if provided, and as such it may differ from the
-    # $self->{pristine_body} size, e.g. when the caller passed a truncated
-    # message to SpamAssassin, or when counting line-endings differently
-    $self->{'pristine_body_length'} = $self->{suppl_attrib}{body_size};
-  } else {
-    $self->{'pristine_body_length'} = length($self->{'pristine_body'});
+  if (!defined $self->{pristine_body_length}) {
+    $self->{'pristine_body_length'} = length $self->{'pristine_body'};
   }
 
-  # CRLF -> LF  (but avoid expensive operation unless necessary)
-  # also merge multiple blank lines into a single one
-  my $squash_crlf = $self->{line_ending} eq "\015\012";
-  my $start;
   # iterate over lines in reverse order
+  # merge multiple blank lines into a single one
+  my $start;
   for (my $cnt=$#message; $cnt>=0; $cnt--) {
-    $message[$cnt] =~ s/\015\012/\012/  if $squash_crlf;
+    # CRLF -> LF line-endings conversion if necessary
+    $message[$cnt] =~ s/\015\012\z/\012/  if $squash_crlf;
 
     # line is blank
     if ($message[$cnt] =~ /^\s*$/) {
@@ -327,9 +347,10 @@
 
     # if we've got a series of blank lines, get rid of them
     if (defined $start) {
+      my $max_blank_lines = 20;
       my $num = $start-$cnt;
-      if ($num > 10) {
-        splice @message, $cnt+2, $num-1;
+      if ($num > $max_blank_lines) {
+        splice @message, $cnt+2, $num-$max_blank_lines;
       }
       undef $start;
     }
@@ -605,6 +626,9 @@
   delete $self->{'line_ending'};
   delete $self->{'missing_head_body_separator'};
 
+  # Remove the queue variable, in case the body has not been parsed
+  delete $self->{'parse_queue'};
+
   my @toclean = ( $self );
 
   # Go ahead and clean up all of the Message::Node parts
@@ -717,25 +741,34 @@
     # one doesn't, assume it's malformed and send it to be parsed as a
     # non-multipart section
     #
-    if ( $toparse->[0]->{'type'} =~ /^multipart\//i && defined $toparse->[1] && ($toparse->[3] > 0)) {
+    my ($msg, $boundary, $body, $subparse) = @$toparse;
+
+    if ($msg->{'type'} =~ m{^multipart/}i && defined $boundary && $subparse > 0) {
       $self->_parse_multipart($toparse);
     }
     else {
       # If it's not multipart, go ahead and just deal with it.
       $self->_parse_normal($toparse);
 
-      # bug 5041: exclude message/partial messages, however
-      if ($toparse->[0]->{'type'} =~ /^message\b/i &&
-          $toparse->[0]->{'type'} !~ /^message\/partial$/i &&
-            ($toparse->[3] > 0))
+      # bug 5041: process message/*, but exclude message/partial content types
+      if ($msg->{'type'} =~ m{^message/(?!partial\z)}i && $subparse > 0)
       {
-        # Just decode the part, but we don't care about the result here.
-        $toparse->[0]->decode(0);
+        # Just decode the part, but we don't need the resulting string here.
+        $msg->decode(0);
+
+        # bug 7125: decode and parse only message/rfc822 or message/global,
+        # but do not treat other message/* content types (like the ones listed
+        # here) as a message consisting of a header and a body, as they are not:
+        #    message/delivery-status, message/global-delivery-status,
+        #    message/feedback-report, message/global-headers,
+        #    message/global-disposition-notification,
+        #    message/disposition-notification, (and message/partial)
+
+        # bug 5051, bug 3748: check $msg->{decoded}: sometimes message/* parts
+        # have no content, and we get stuck waiting for STDIN, which is bad. :(
 
-        # bug 5051, bug 3748: sometimes message/* parts have no content,
-        # and we get stuck waiting for STDIN, which is bad. :(
-        if (defined $toparse->[0]->{'decoded'} &&
-            $toparse->[0]->{'decoded'} ne '')
+        if ($msg->{'type'} =~ m{^message/(?:rfc822|global)\z}i &&
+            defined $msg->{'decoded'} && $msg->{'decoded'} ne '')
         {
 	  # Ok, so this part is still semi-recursive, since M::SA::Message
 	  # calls M::SA::Message, but we don't subparse the new message,
@@ -744,14 +777,14 @@
 	  # since it's faster.
 	  # 
           my $msg_obj = Mail::SpamAssassin::Message->new({
-    	    message	=>	$toparse->[0]->{'decoded'},
+    	    message	=>	$msg->{'decoded'},
 	    parsenow	=>	0,
 	    normalize	=>	$self->{normalize},
-	    subparse	=>	$toparse->[3]-1,
+	    subparse	=>	$subparse - 1,
 	    });
 
 	  # Add the new message to the current node
-          $toparse->[0]->add_body_part($msg_obj);
+          $msg->add_body_part($msg_obj);
 
 	  # now this is the sneaky bit ... steal the sub-message's parse_queue
 	  # and add it to ours.  then we'll handle the sub-message in our
@@ -762,15 +795,15 @@
 	  # Ok, we've subparsed, so go ahead and remove the raw and decoded
 	  # data because we won't need them anymore (the tree under this part
 	  # will have that data)
-	  if (ref $toparse->[0]->{'raw'} eq 'GLOB') {
+	  if (ref $msg->{'raw'} eq 'GLOB') {
 	    # Make sure we close it if it's a temp file -- Bug 5166
-	    close($toparse->[0]->{'raw'})
+	    close($msg->{'raw'})
 	      or die "error closing input file: $!";
 	  }
 
-	  delete $toparse->[0]->{'raw'};
+	  delete $msg->{'raw'};
 	  
-	  delete $toparse->[0]->{'decoded'};
+	  delete $msg->{'decoded'};
         }
       }
     }
@@ -820,6 +853,7 @@
 
 	# if the line after the opening boundary isn't a header, flag it.
 	# we need to make sure that there's actually another line though.
+	# no re "strict";  # since perl 5.21.8: Ranges of ASCII printables...
 	if ($line+1 < $tmp_line && $body->[$line+1] !~ /^[\041-\071\073-\176]+:/) {
 	  $self->{'missing_mime_headers'} = 1;
 	}
@@ -900,6 +934,7 @@
       # 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*$/) {
 	  # Make a note that we've seen the end boundary
 	  $self->{mime_boundary_state}->{$boundary}--;
@@ -924,6 +959,7 @@
 
     if (!$in_body) {
       # s/\s+$//;   # bug 5127: don't clean this up (yet)
+      # no re "strict";  # since perl 5.21.8: Ranges of ASCII printables...
       if (/^[\041-\071\073-\176]+[ \t]*:/) {
         if ($header) {
           my ( $key, $value ) = split ( /:\s*/, $header, 2 );
@@ -1005,12 +1041,15 @@
 
   # attempt to figure out a name for this attachment if there is one ...
   my $disp = $msg->header('content-disposition') || '';
-  if ($disp =~ /name="?([^\";]+)"?/i) {
+  if ($disp =~ /name=\s*"?([^";]+)"?/i) {
     $msg->{'name'} = $1;
   }
   elsif ($ct[3]) {
     $msg->{'name'} = $ct[3];
   }
+  if ($msg->{'name'}) {
+    $msg->{'name'} = Encode::decode("MIME-Header", $msg->{'name'});
+  }
 
   $msg->{'boundary'} = $boundary;
 
@@ -1031,7 +1070,9 @@
       # we cannot just delete immediately in the POSIX idiom, as this is
       # unportable (to win32 at least)
       push @{$self->{tmpfiles}}, $filepath;
+      dbg("message: storing a message part to file %s", $filepath);
       $fh->print(@{$body})  or die "error writing to $filepath: $!";
+      $fh->flush  or die "error writing (flush) to $filepath: $!";
       $msg->{'raw'} = $fh;
     }
   }
@@ -1045,87 +1086,50 @@
 
 # ---------------------------------------------------------------------------
 
-sub get_rendered_body_text_array {
+sub get_mimepart_digests {
   my ($self) = @_;
 
-  if (exists $self->{text_rendered}) { return $self->{text_rendered}; }
-
-  $self->{text_rendered} = [];
-
-  # Find all parts which are leaves
-  my @parts = $self->find_parts(qr/./,1);
-  return $self->{text_rendered} unless @parts;
-
-  # the html metadata may have already been set, so let's not bother if it's
-  # already been done.
-  my $html_needs_setting = !exists $self->{metadata}->{html};
-
-  # Go through each part
-  my $text = $self->get_header ('subject') || "\n";
-  for(my $pt = 0 ; $pt <= $#parts ; $pt++ ) {
-    my $p = $parts[$pt];
-
-    # put a blank line between parts ...
-    $text .= "\n";
-
-    my($type, $rnd) = $p->rendered(); # decode this part
-    if ( defined $rnd ) {
-      # Only text/* types are rendered ...
-      $text .= $rnd;
-
-      # TVD - if there are multiple parts, what should we do?
-      # right now, just use the last one.  we may need to give some priority
-      # at some point, ie: use text/html rendered if it exists, or
-      # text/plain rendered as html otherwise.
-      if ($html_needs_setting && $type eq 'text/html') {
-        $self->{metadata}->{html} = $p->{html_results};
-      }
-    }
+  if (!exists $self->{mimepart_digests}) {
+    # traverse all parts which are leaves, recursively
+    $self->{mimepart_digests} =
+      [ map(sha1_hex($_->decode) . ':' . lc($_->{type}||''),
+            $self->find_parts(qr/^/,1,1)) ];
   }
-
-  # whitespace handling (warning: small changes have large effects!)
-  $text =~ s/\n+\s*\n+/\f/gs;		# double newlines => form feed
-  $text =~ tr/ \t\n\r\x0b\xa0/ /s;	# whitespace => space
-  $text =~ tr/\f/\n/;			# form feeds => newline
-  
-  # warn "message: $text";
-
-  my @textary = split_into_array_of_short_lines ($text);
-  $self->{text_rendered} = \@textary;
-
-  return $self->{text_rendered};
+  return $self->{mimepart_digests};
 }
 
 # ---------------------------------------------------------------------------
 
-# TODO: possibly this should just replace get_rendered_body_text_array().
-# (although watch out, this one doesn't copy {html} to metadata)
-sub get_visible_rendered_body_text_array {
-  my ($self) = @_;
+# common code for get_rendered_body_text_array,
+# get_visible_rendered_body_text_array, get_invisible_rendered_body_text_array
+#
+sub get_body_text_array_common {
+  my ($self, $method_name) = @_;
 
-  if (exists $self->{text_visible_rendered}) {
-    return $self->{text_visible_rendered};
-  }
+  my $key = 'text_' . $method_name;
+  if (exists $self->{$key}) { return $self->{$key} }
 
-  $self->{text_visible_rendered} = [];
+  $self->{$key} = [];
 
   # Find all parts which are leaves
   my @parts = $self->find_parts(qr/./,1);
-  return $self->{text_visible_rendered} unless @parts;
+  return $self->{$key} unless @parts;
 
   # the html metadata may have already been set, so let's not bother if it's
   # already been done.
   my $html_needs_setting = !exists $self->{metadata}->{html};
 
+  my $text = $method_name eq 'invisible_rendered' ? ''
+               : ($self->get_header('subject') || "\n");
+
   # Go through each part
-  my $text = $self->get_header ('subject') || "\n";
-  for(my $pt = 0 ; $pt <= $#parts ; $pt++ ) {
+  for (my $pt = 0 ; $pt <= $#parts ; $pt++ ) {
     my $p = $parts[$pt];
 
     # put a blank line between parts ...
-    $text .= "\n";
+    $text .= "\n"  if $text ne '';
 
-    my($type, $rnd) = $p->visible_rendered(); # decode this part
+    my($type, $rnd) = $p->$method_name();  # decode this part
     if ( defined $rnd ) {
       # Only text/* types are rendered ...
       $text .= $rnd;
@@ -1142,64 +1146,31 @@
 
   # whitespace handling (warning: small changes have large effects!)
   $text =~ s/\n+\s*\n+/\f/gs;		# double newlines => form feed
-  $text =~ tr/ \t\n\r\x0b\xa0/ /s;	# whitespace => space
+# $text =~ tr/ \t\n\r\x0b\xa0/ /s;	# whitespace (incl. VT, NBSP) => space
+  $text =~ tr/ \t\n\r\x0b/ /s;		# whitespace (incl. VT) => space
   $text =~ tr/\f/\n/;			# form feeds => newline
 
-  my @textary = split_into_array_of_short_lines ($text);
-  $self->{text_visible_rendered} = \@textary;
+  my @textary = split_into_array_of_short_lines($text);
+  $self->{$key} = \@textary;
 
-  return $self->{text_visible_rendered};
+  return $self->{$key};
 }
 
-sub get_invisible_rendered_body_text_array {
-  my ($self) = @_;
-
-  if (exists $self->{text_invisible_rendered}) {
-    return $self->{text_invisible_rendered};
-  }
-
-  $self->{text_invisible_rendered} = [];
-
-  # Find all parts which are leaves
-  my @parts = $self->find_parts(qr/./,1);
-  return $self->{text_invisible_rendered} unless @parts;
-
-  # the html metadata may have already been set, so let's not bother if it's
-  # already been done.
-  my $html_needs_setting = !exists $self->{metadata}->{html};
-
-  # Go through each part
-  my $text = '';
-  for(my $pt = 0 ; $pt <= $#parts ; $pt++ ) {
-    my $p = $parts[$pt];
-
-    # put a blank line between parts ...
-    $text .= "\n" if ( $text );
-
-    my($type, $rnd) = $p->invisible_rendered(); # decode this part
-    if ( defined $rnd ) {
-      # Only text/* types are rendered ...
-      $text .= $rnd;
-
-      # TVD - if there are multiple parts, what should we do?
-      # right now, just use the last one.  we may need to give some priority
-      # at some point, ie: use text/html rendered if it exists, or
-      # text/plain rendered as html otherwise.
-      if ($html_needs_setting && $type eq 'text/html') {
-        $self->{metadata}->{html} = $p->{html_results};
-      }
-    }
-  }
+# ---------------------------------------------------------------------------
 
-  # whitespace handling (warning: small changes have large effects!)
-  $text =~ s/\n+\s*\n+/\f/gs;		# double newlines => form feed
-  $text =~ tr/ \t\n\r\x0b\xa0/ /s;	# whitespace => space
-  $text =~ tr/\f/\n/;			# form feeds => newline
+sub get_rendered_body_text_array {
+  my ($self) = @_;
+  return $self->get_body_text_array_common('rendered');
+}
 
-  my @textary = split_into_array_of_short_lines ($text);
-  $self->{text_invisible_rendered} = \@textary;
+sub get_visible_rendered_body_text_array {
+  my ($self) = @_;
+  return $self->get_body_text_array_common('visible_rendered');
+}
 
-  return $self->{text_invisible_rendered};
+sub get_invisible_rendered_body_text_array {
+  my ($self) = @_;
+  return $self->get_body_text_array_common('invisible_rendered');
 }
 
 # ---------------------------------------------------------------------------
@@ -1220,7 +1191,6 @@
     # and not displayed
     next if ($parts[$pt]->{'type'} eq 'text/calendar');
 
-    push(@{$self->{text_decoded}}, "\n") if ( @{$self->{text_decoded}} );
     push(@{$self->{text_decoded}},
          split_into_array_of_short_paragraphs($parts[$pt]->decode()));
   }
diff -Nru spamassassin-3.4.0/lib/Mail/SpamAssassin/NetSet.pm spamassassin-3.4.2/lib/Mail/SpamAssassin/NetSet.pm
--- spamassassin-3.4.0/lib/Mail/SpamAssassin/NetSet.pm	2014-02-07 03:36:28.000000000 -0500
+++ spamassassin-3.4.2/lib/Mail/SpamAssassin/NetSet.pm	2018-09-13 21:27:51.000000000 -0400
@@ -20,7 +20,7 @@
 
 use strict;
 use warnings;
-use bytes;
+# use bytes;
 use re 'taint';
 use Time::HiRes qw(time);
 use NetAddr::IP 4.000;
@@ -28,10 +28,7 @@
 use Mail::SpamAssassin::Util;
 use Mail::SpamAssassin::Logger;
 
-use vars qw{
-  @ISA $TESTCODE $NUMTESTS $have_patricia
-};
-
+our $have_patricia;
 BEGIN {
   eval {
     require Net::Patricia;
@@ -205,7 +202,7 @@
 
   # else we have a CIDR mask specified. use new6() to do this
   #
-  my $ip6 = ""+(NetAddr::IP->new6($cidr));
+  my $ip6 = NetAddr::IP->new6($cidr)->cidr;
   # 127.0.0.1 -> 0:0:0:0:0:0:7F00:0001/128
   # 127/8 -> 0:0:0:0:0:0:7F00:0/104
 
diff -Nru spamassassin-3.4.0/lib/Mail/SpamAssassin/PerMsgLearner.pm spamassassin-3.4.2/lib/Mail/SpamAssassin/PerMsgLearner.pm
--- spamassassin-3.4.0/lib/Mail/SpamAssassin/PerMsgLearner.pm	2014-02-07 03:36:28.000000000 -0500
+++ spamassassin-3.4.2/lib/Mail/SpamAssassin/PerMsgLearner.pm	2018-09-13 21:27:51.000000000 -0400
@@ -48,7 +48,7 @@
 
 use strict;
 use warnings;
-use bytes;
+# use bytes;
 use re 'taint';
 
 use Mail::SpamAssassin;
@@ -56,11 +56,7 @@
 use Mail::SpamAssassin::Bayes;
 use Mail::SpamAssassin::Logger;
 
-use vars qw{
-  @ISA
-};
-
-@ISA = qw();
+our @ISA = qw();
 
 ###########################################################################
 
diff -Nru spamassassin-3.4.0/lib/Mail/SpamAssassin/PerMsgStatus.pm spamassassin-3.4.2/lib/Mail/SpamAssassin/PerMsgStatus.pm
--- spamassassin-3.4.0/lib/Mail/SpamAssassin/PerMsgStatus.pm	2014-02-07 03:36:28.000000000 -0500
+++ spamassassin-3.4.2/lib/Mail/SpamAssassin/PerMsgStatus.pm	2018-09-13 21:27:51.000000000 -0400
@@ -59,26 +59,21 @@
 use Mail::SpamAssassin::Constants qw(:sa);
 use Mail::SpamAssassin::AsyncLoop;
 use Mail::SpamAssassin::Conf;
-use Mail::SpamAssassin::Util qw(untaint_var);
-use Mail::SpamAssassin::Util::RegistrarBoundaries;
+use Mail::SpamAssassin::Util qw(untaint_var uri_list_canonicalize);
 use Mail::SpamAssassin::Timeout;
 use Mail::SpamAssassin::Logger;
 
-use vars qw{
-  @ISA @TEMPORARY_METHODS %TEMPORARY_EVAL_GLUE_METHODS
-};
-
-@ISA = qw();
+our @ISA = qw();
 
 # methods defined by the compiled ruleset; deleted in finish_tests()
-@TEMPORARY_METHODS = ();
+our @TEMPORARY_METHODS;
 
 # methods defined by register_plugin_eval_glue(); deleted in finish_tests()
-%TEMPORARY_EVAL_GLUE_METHODS = ();
+our %TEMPORARY_EVAL_GLUE_METHODS;
 
 ###########################################################################
 
-use vars qw( %common_tags );
+our %common_tags;
 
 BEGIN {
   %common_tags = (
@@ -87,7 +82,7 @@
       my $pms = shift;
       $pms->_get_tag_value_for_yesno(@_);
     },
-  
+
     YESNOCAPS => sub {
       my $pms = shift;
       uc $pms->_get_tag_value_for_yesno(@_);
@@ -167,14 +162,15 @@
                                    : "0.5";
     },
 
-    DATE => \&Mail::SpamAssassin::Util::time_to_rfc822_date,
+    DATE => sub { Mail::SpamAssassin::Util::time_to_rfc822_date() },
 
     STARS => sub {
       my $pms = shift;
       my $arg = (shift || "*");
       my $length = int($pms->{score});
       $length = 50 if $length > 50;
-      $arg x $length;
+      # avoid a perl 5.21 warning: "Negative repeat count does nothing"
+      $length > 0 ? $arg x $length : '';
     },
 
     AUTOLEARN => sub {
@@ -190,26 +186,21 @@
     TESTS => sub {
       my $pms = shift;
       my $arg = (shift || ',');
-      join($arg, sort(@{$pms->{test_names_hit}})) || "none";
+      join($arg, sort @{$pms->{test_names_hit}}) || "none";
     },
 
     SUBTESTS => sub {
       my $pms = shift;
       my $arg = (shift || ',');
-      join($arg, sort(@{$pms->{subtest_names_hit}})) || "none";
+      join($arg, sort @{$pms->{subtest_names_hit}}) || "none";
     },
 
     TESTSSCORES => sub {
       my $pms = shift;
       my $arg = (shift || ",");
-      my $line = '';
-      foreach my $test (sort @{$pms->{test_names_hit}}) {
-        my $score = $pms->{conf}->{scores}->{$test};
-        $score = '0'  if !defined $score;
-        $line .= $arg  if $line ne '';
-        $line .= $test . "=" . $score;
-      }
-      $line ne '' ? $line : 'none';
+      my $scores = $pms->{conf}->{scores};
+      join($arg, map($_ . "=" . ($scores->{$_} || '0'),
+                     sort @{$pms->{test_names_hit}})) || "none";
     },
 
     PREVIEW => sub {
@@ -376,11 +367,11 @@
   # to see if we should go from {0,1} to {2,3}.  We of course don't need
   # to do this switch if we're already using bayes ... ;)
   my $set = $self->{conf}->get_score_set();
-  if (($set & 2) == 0 && $self->{main}->{bayes_scanner} && $self->{main}->{bayes_scanner}->is_scan_available()) {
+  if (($set & 2) == 0 && $self->{main}->{bayes_scanner} && $self->{main}->{bayes_scanner}->is_scan_available() && $self->{conf}->{use_bayes_rules}) {
     dbg("check: scoreset $set but bayes is available, switching scoresets");
     $self->{conf}->set_score_set ($set|2);
   }
-
+  dbg("check: using scoreset $set in M:S:Pms"); 
   # The primary check functionality occurs via a plugin call.  For more
   # information, please see: Mail::SpamAssassin::Plugin::Check
   if (!$self->{main}->call_plugins ("check_main", { permsgstatus => $self }))
@@ -388,7 +379,8 @@
     # did anything happen?  if not, this is fatal
     if (!$self->{main}->have_plugin("check_main")) {
       die "check: no loaded plugin implements 'check_main': cannot scan!\n".
-            "Check the necessary '.pre' files are in the config directory.\n";
+            "Check that the necessary '.pre' files are in the config directory.\n".
+              "At a minimum, v320.pre loads the Check plugin which is required.\n";
     }
   }
 
@@ -403,7 +395,7 @@
   # We assume required_score to be properly rounded already.
   # add 0 to force it back to numeric representation instead of string.
   $self->{score} = (sprintf "%0.3f", $self->{score}) + 0;
-  
+
   dbg("check: is spam? score=".$self->{score}.
                         " required=".$self->{conf}->{required_score});
   dbg("check: tests=".$self->get_names_of_tests_hit());
@@ -580,22 +572,22 @@
 
 =item $score = $status->get_autolearn_force_status()
 
-Return whether a message's score included any rules that are flagged as 
+Return whether a message's score included any rules that are flagged as
 autolearn_force.
-  
+
 =cut
 
 sub get_autolearn_force_status {
   my ($self) = @_;
   $self->_get_autolearn_points();
   return $self->{autolearn_force};
-} 
+}
 
 =item $rule_names = $status->get_autolearn_force_names()
 
-Return a list of comma separated list of rule names if a message's 
+Return a list of comma separated list of rule names if a message's
 score included any rules that are flagged as autolearn_force.
-  
+
 =cut
 
 sub get_autolearn_force_names {
@@ -604,8 +596,8 @@
 
   $self->_get_autolearn_points();
   $names = $self->{autolearn_force_names};
- 
-  if (defined $names) { 
+
+  if (defined $names) {
     #remove trailing comma
     $names =~ s/,$//;
   } else {
@@ -661,8 +653,8 @@
         $self->{learned_points} += $self->{conf}->{scoreset}->[$orig_scoreset]->{$test};
 	next;
       }
-    
-      #IF ANY RULES ARE AUTOLEARN FORCE, SET THAT FLAG  
+
+      #IF ANY RULES ARE AUTOLEARN FORCE, SET THAT FLAG
       if ($tflags->{$test} =~ /\bautolearn_force\b/) {
         $self->{autolearn_force}++;
         #ADD RULE NAME TO LIST
@@ -673,7 +665,7 @@
     # ignore tests with 0 score (or undefined) in this scoreset
     next if !$scores->{$test};
 
-    # Go ahead and add points to the proper locations 
+    # Go ahead and add points to the proper locations
     # Changed logic because in testing, I was getting both head and body. Bug 5503
     if ($self->{conf}->maybe_header_only ($test)) {
       $self->{head_only_points} += $scores->{$test};
@@ -717,23 +709,59 @@
 
 After a mail message has been checked, this method can be called. It will
 return a comma-separated string, listing all the symbolic test names
-of the tests which were trigged by the mail.
+of the tests which were triggered by the mail.
 
 =cut
 
 sub get_names_of_tests_hit {
   my ($self) = @_;
 
-  return join(',', sort(@{$self->{test_names_hit}}));
+  return join(',', sort @{$self->{test_names_hit}});
+}
+
+=item $list = $status->get_names_of_tests_hit_with_scores_hash ()
+
+After a mail message has been checked, this method can be called. It will
+return a pointer to a hash for rule & score pairs for all the symbolic
+test names and individual scores of the tests which were triggered by the mail.
+
+=cut
+
+sub get_names_of_tests_hit_with_scores_hash {
+  my ($self) = @_;
+
+  #BASED ON CODE FOR TESTSSCORES TAG
+  my $scores = $self->{conf}->{scores};
+  my %testsscores;
+  $testsscores{$_} = $scores->{$_} || '0'  for @{$self->{test_names_hit}};
+  return \%testsscores;
+}
+
+=item $list = $status->get_names_of_tests_hit_with_scores ()
+
+After a mail message has been checked, this method can be called. It will
+return a comma-separated string of rule=score pairs for all the symbolic
+test names and individual scores of the tests which were triggered by the mail.
+
+=cut
+
+sub get_names_of_tests_hit_with_scores {
+  my ($self) = @_;
+
+  #BASED ON CODE FOR TESTSSCORES TAG
+  my $scores = $self->{conf}->{scores};
+  return join(',', map($_ . '=' . ($scores->{$_} || '0'),
+                       sort @{$self->{test_names_hit}})) || "none";
 }
 
+
 ###########################################################################
 
 =item $list = $status->get_names_of_subtests_hit ()
 
 After a mail message has been checked, this method can be called.  It will
 return a comma-separated string, listing all the symbolic test names of the
-meta-rule sub-tests which were trigged by the mail.  Sub-tests are the
+meta-rule sub-tests which were triggered by the mail.  Sub-tests are the
 normally-hidden rules, which score 0 and have names beginning with two
 underscores, used in meta rules.
 
@@ -742,7 +770,7 @@
 sub get_names_of_subtests_hit {
   my ($self) = @_;
 
-  return join(',', sort(@{$self->{subtest_names_hit}}));
+  return join(',', sort @{$self->{subtest_names_hit}});
 }
 
 ###########################################################################
@@ -864,16 +892,16 @@
     $str .= shift @{$ary};
   }
   undef $ary;
-  chomp ($str); $str .= " [...]\n";
 
   # in case the last line was huge, trim it back to around 200 chars
   local $1;
-  $str =~ s/^(.{,200}).*$/$1/gs;
+  $str =~ s/^(.{200}).+$/$1 [...]/gm;
+  chomp ($str); $str .= "\n";
 
   # now, some tidy-ups that make things look a bit prettier
-  $str =~ s/-----Original Message-----.*$//gs;
+  $str =~ s/-----Original Message-----.*$//gm;
   $str =~ s/This is a multi-part message in MIME format\.//gs;
-  $str =~ s/[-_\*\.]{10,}//gs;
+  $str =~ s/[-_*.]{10,}//gs;
   $str =~ s/\s+/ /gs;
 
   # add "Content preview:" ourselves, so that the text aligns
@@ -1080,7 +1108,7 @@
   # tvd: do this after report_safe_copy_headers so Received will be done correctly
   $newmsg = "Received: from localhost by " .
               Mail::SpamAssassin::Util::fq_hostname() . "\n" .
-            "\twith SpamAssassin (version " . 
+            "\twith SpamAssassin (version " .
               Mail::SpamAssassin::Version() . ");\n" .
             "\t" . Mail::SpamAssassin::Util::time_to_rfc822_date() . "\n" .
             $newmsg;
@@ -1154,7 +1182,7 @@
 
   # put the pristine headers into an array
   # skip the X-Spam- headers, but allow the X-Spam-Prev headers to remain.
-  # since there may be a missing header/body 
+  # since there may be a missing header/body
   #
   my @pristine_headers = split(/^/m, $self->{msg}->get_pristine_header());
   for (my $line = 0; $line <= $#pristine_headers; $line++) {
@@ -1239,8 +1267,8 @@
 sub qp_encode_header {
   my ($self, $text) = @_;
 
-  # do nothing unless there's an 8-bit char
-  return $text unless ($text =~ /[\x80-\xff]/);
+  # return unchanged if there are no 8-bit characters
+  return $text  if $text !~ tr/\x00-\x7F//c;
 
   my $cs = 'ISO-8859-1';
   if ($self->{report_charset}) {
@@ -1648,7 +1676,7 @@
 
 sub extract_message_metadata {
   my ($self) = @_;
-  
+
   my $timer = $self->{main}->time_method("extract_message_metadata");
   $self->{msg}->extract_message_metadata($self);
 
@@ -1664,10 +1692,34 @@
     $self->{$item} = $self->{msg}->{metadata}->{$item};
   }
 
+  # TODO: International domain names (UTF-8) must be converted to
+  # ASCII-compatible encoding (ACE) for the purpose of setting the
+  # SENDERDOMAIN and AUTHORDOMAIN tags (and probably for other uses too).
+  # (explicitly required for DMARC, draft-kucherawy-dmarc-base sect. 5.6.1)
+  #
+  { local $1;
+    my $addr = $self->get('EnvelopeFrom:addr', undef);
+    # collect a FQDN, ignoring potential trailing WSP
+    if (defined $addr && $addr =~ /\@([^@. \t]+\.[^@ \t]+?)[ \t]*\z/s) {
+      $self->set_tag('SENDERDOMAIN', lc $1);
+    }
+    # TODO: the get ':addr' only returns the first address; this should be
+    # augmented to be able to return all addresses in a header field, multiple
+    # addresses in a From header field are allowed according to RFC 5322
+    $addr = $self->get('From:addr', undef);
+    if (defined $addr && $addr =~ /\@([^@. \t]+\.[^@ \t]+?)[ \t]*\z/s) {
+      $self->set_tag('AUTHORDOMAIN', lc $1);
+    }
+  }
+
   $self->set_tag('RELAYSTRUSTED',   $self->{relays_trusted_str});
   $self->set_tag('RELAYSUNTRUSTED', $self->{relays_untrusted_str});
   $self->set_tag('RELAYSINTERNAL',  $self->{relays_internal_str});
   $self->set_tag('RELAYSEXTERNAL',  $self->{relays_external_str});
+  my $lasthop = $self->{relays_external}->[0];
+  if ($lasthop) {
+    $self->set_tag('LASTEXTERNALIP',  $lasthop->{ip});
+  }
   $self->set_tag('LANGUAGES', $self->{msg}->get_metadata("X-Languages"));
 
   # This should happen before we get called, but just in case.
@@ -1910,14 +1962,15 @@
   else {
     my @results = $getraw ? $self->{msg}->raw_header($request)
                           : $self->{msg}->get_header($request);
-  # dbg("message: get(%s) = %s", $request, join(", ",@results));
+  # dbg("message: get(%s)%s = %s",
+  #     $request, $getraw?'raw':'', join(", ",@results));
     if (@results) {
       $result = join('', @results);
     } else {  # metadata
       $result = $self->{msg}->get_metadata($request);
     }
   }
-      
+
   # special queries
   if (defined $result && ($getaddr || $getname)) {
     local $1;
@@ -1941,7 +1994,7 @@
       $result =~ s/\s*\(.*?\)//g;
       # strip out the "quoted text", unless it's the only thing in the string
       if ($result !~ /^".*"$/) {
-        $result =~ s/(?<!<)"[^"]*"(?!@)//g;   #" emacs
+        $result =~ s/(?<!<)"[^"]*"(?!\@)//g;   #" emacs
       }
       # Foo Blah <jm@xxx> or <jm@xxx>
       local $1;
@@ -2037,27 +2090,39 @@
 #
 # bug 4522: ISO2022 format mail, most commonly Japanese SHIFT-JIS, inserts a three character escape sequence  ESC ( .
 
-# a hybrid of tbird and oe's  version of uri parsing
-my $tbirdstartdelim = '><"\'`,{[(|\s'  . "\x1b";  # The \x1b as per bug 4522
-my $iso2022shift = "\x1b" . '\(.';  # bug 4522
-my $tbirdenddelim = '><"`}\]{[|\s' . "\x1b";  # The \x1b as per bug 4522
-my $oeignoreatend = '-~!@#^&*()_+=:;\'?,.';
-my $nonASCII    = '\x80-\xff';
-my $tbirdenddelimemail = $tbirdenddelim . '(\'' . $nonASCII;  # tbird ignores non-ASCII mail addresses for now, until RFC changes
-my $tbirdenddelimplusat = $tbirdenddelimemail . '@';
-
-# valid TLDs
-my $tldsRE = $Mail::SpamAssassin::Util::RegistrarBoundaries::VALID_TLDS_RE;
-
-# knownscheme regexp looks for either a https?: or ftp: scheme, or www\d*\. or ftp\. prefix, i.e., likely to start a URL
-# schemeless regexp looks for a valid TLD at the end of what may be a FQDN, followed by optional ., optional :portnum, optional /rest_of_uri
-my $urischemeless = qr/[a-z\d][a-z\d._-]{0,251}\.${tldsRE}\.?(?::\d{1,5})?(?:\/[^$tbirdenddelim]{1,251})?/io;
-my $uriknownscheme = qr/(?:(?:(?:(?:https?)|(?:ftp)):(?:\/\/)?)|(?:(?:www\d{0,2}|ftp)\.))[^$tbirdenddelim]{1,251}/io;
-my $urimailscheme = qr/(?:mailto:)?[^$tbirdenddelimplusat]{1,251}@[^$tbirdenddelimemail]{1,251}/io;
-my $tbirdurire = qr/(?:\b|(?<=$iso2022shift)|(?<=[$tbirdstartdelim]))
-                    (?:(?:($uriknownscheme)(?=(?:[$tbirdenddelim]|\z))) |
-                       (?:($urimailscheme)(?=(?:[$tbirdenddelimemail]|\z))) |
-                       (?:\b($urischemeless)(?=(?:[$tbirdenddelim]|\z))))/xo;
+sub _tbirdurire {
+  my ($self) = @_;
+
+  # Cached?
+  return $self->{tbirdurire} if $self->{tbirdurire};
+
+  # a hybrid of tbird and oe's  version of uri parsing
+  my $tbirdstartdelim = '><"\'`,{[(|\s'  . "\x1b";  # The \x1b as per bug 4522
+  my $iso2022shift = "\x1b" . '\(.';  # bug 4522
+  my $tbirdenddelim = '><"`}\]{[|\s' . "\x1b";  # The \x1b as per bug 4522
+  my $nonASCII    = '\x80-\xff';
+
+  # bug 7100: we allow a comma to delimit the end of an email address because it will never appear in a domain name, and
+  # it's a common thing to find in text
+  my $tbirdenddelimemail = $tbirdenddelim . ',(\'' . $nonASCII;  # tbird ignores non-ASCII mail addresses for now, until RFC changes
+  my $tbirdenddelimplusat = $tbirdenddelimemail . '@';
+
+  # valid TLDs
+  my $tldsRE = $self->{main}->{registryboundaries}->{valid_tlds_re};
+
+  # knownscheme regexp looks for either a https?: or ftp: scheme, or www\d*\. or ftp\. prefix, i.e., likely to start a URL
+  # schemeless regexp looks for a valid TLD at the end of what may be a FQDN, followed by optional ., optional :portnum, optional /rest_of_uri
+  my $urischemeless = qr/[a-z\d][a-z\d._-]{0,251}\.${tldsRE}\.?(?::\d{1,5})?(?:\/[^$tbirdenddelim]{1,251})?/io;
+  my $uriknownscheme = qr/(?:(?:(?:(?:https?)|(?:ftp)):(?:\/\/)?)|(?:(?:www\d{0,2}|ftp)\.))[^$tbirdenddelim]{1,251}/io;
+  my $urimailscheme = qr/(?:mailto:)?[^$tbirdenddelimplusat]{1,251}@[^$tbirdenddelimemail]{1,251}/io;
+
+  $self->{tbirdurire} = qr/(?:\b|(?<=$iso2022shift)|(?<=[$tbirdstartdelim]))
+                        (?:(?:($uriknownscheme)(?=(?:[$tbirdenddelim]|\z))) |
+                        (?:($urimailscheme)(?=(?:[$tbirdenddelimemail]|\z))) |
+                        (?:\b($urischemeless)(?=(?:[$tbirdenddelim]|\z))))/xo;
+
+  return $self->{tbirdurire};
+}
 
 =item $status->get_uri_list ()
 
@@ -2118,7 +2183,7 @@
 
   raw_uri => {
     types => { a => 1, img => 1, parsed => 1 },
-    cleaned => [ canonified_uri ],
+    cleaned => [ canonicalized_uri ],
     anchor_text => [ "click here", "no click here" ],
     domains => { domain1 => 1, domain2 => 1 },
   }
@@ -2130,15 +2195,15 @@
 the raw_uri.  I<parsed> is a faked type which specifies that the
 raw_uri was seen in the rendered text.
 
-C<cleaned> is an array of the raw and canonified version of the raw_uri
+C<cleaned> is an array of the raw and canonicalized version of the raw_uri
 (http://spamassassin.apache%2Eorg/, http://spamassassin.apache.org/).
 
 C<anchor_text> is an array of the anchor text (text between <a> and
 </a>), if any, which linked to the URI.
 
-C<domains> is a hash of the domains found in the canonified URIs.
+C<domains> is a hash of the domains found in the canonicalized URIs.
 
-C<hosts> is a hash of unstripped hostnames found in the canonified URIs
+C<hosts> is a hash of unstripped hostnames found in the canonicalized URIs
 as hash keys, with their domain part stored as a value of each hash entry.
 
 =cut
@@ -2162,15 +2227,20 @@
   # This parses of DKIM for URIs disagrees with documentation and bug 6700 votes to disable
   # this functionality
   # 2013-01-07
+  # This functionality is re-enabled as a configuration option disabled by
+  # default (bug 7087)
+  # 2014-10-06
 
   # Look for the domain in DK/DKIM headers
-  #my $dk = join(" ", grep {defined} ( $self->get('DomainKey-Signature',undef),
-  #                                    $self->get('DKIM-Signature',undef) ));
-  #while ($dk =~ /\bd\s*=\s*([^;]+)/g) {
-  #  my $dom = $1;
-  #  $dom =~ s/\s+//g;
-  #  $parsed{$dom} = 'domainkeys';
-  #}
+  if ( $self->{conf}->{parse_dkim_uris} ) {
+    my $dk = join(" ", grep {defined} ( $self->get('DomainKey-Signature',undef),
+                                        $self->get('DKIM-Signature',undef) ));
+    while ($dk =~ /\bd\s*=\s*([^;]+)/g) {
+      my $dom = $1;
+      $dom =~ s/\s+//g;
+      $parsed{$dom} = 'domainkeys';
+    }
+  }
 
   # get URIs from HTML parsing
   # use the metadata version since $self->{html} may not be setup
@@ -2180,13 +2250,13 @@
   # don't keep dereferencing ...
   my $redirector_patterns = $self->{conf}->{redirector_patterns};
 
-  # canonify the HTML parsed URIs
+  # canonicalize the HTML parsed URIs
   while(my($uri, $info) = each %{ $detail }) {
-    my @tmp = Mail::SpamAssassin::Util::uri_list_canonify($redirector_patterns, $uri);
+    my @tmp = uri_list_canonicalize($redirector_patterns, $uri);
     $info->{cleaned} = \@tmp;
 
     foreach (@tmp) {
-      my($domain,$host) = Mail::SpamAssassin::Util::uri_to_domain($_);
+      my($domain,$host) = $self->{main}->{registryboundaries}->uri_to_domain($_);
       if (defined $host && $host ne '' && !$info->{hosts}->{$host}) {
         # unstripped full host name as a key, and its domain part as a value
         $info->{hosts}->{$host} = $domain;
@@ -2210,16 +2280,16 @@
     }
   }
 
-  # canonify the text parsed URIs
+  # canonicalize the text parsed URIs
   while (my($uri, $type) = each %parsed) {
     $detail->{$uri}->{types}->{$type} = 1;
     my $info = $detail->{$uri};
 
     my @uris;
-    
+
     if (!exists $info->{cleaned}) {
       if ($type eq 'parsed') {
-        @uris = Mail::SpamAssassin::Util::uri_list_canonify($redirector_patterns, $uri);
+        @uris = uri_list_canonicalize($redirector_patterns, $uri);
       }
       else {
         @uris = ( $uri );
@@ -2227,7 +2297,7 @@
       $info->{cleaned} = \@uris;
 
       foreach (@uris) {
-        my($domain,$host) = Mail::SpamAssassin::Util::uri_to_domain($_);
+        my($domain,$host) = $self->{main}->{registryboundaries}->uri_to_domain($_);
         if (defined $host && $host ne '' && !$info->{hosts}->{$host}) {
           # unstripped full host name as a key, and its domain part as a value
           $info->{hosts}->{$host} = $domain;
@@ -2275,10 +2345,11 @@
 
     my ($rulename, $pat, @uris);
     my $text;
+    my $tbirdurire = $self->_tbirdurire;
 
     for my $entry (@$textary) {
 
-      # a workaround for [perl #69973] bug: 
+      # a workaround for [perl #69973] bug:
       # Invalid and tainted utf-8 char crashes perl 5.10.1 in regexp evaluation
       # Bug 6225, regexp and string should both be utf8, or none of them;
       # untainting string also seems to avoid the crash
@@ -2290,7 +2361,7 @@
       while (/$tbirdurire/igo) {
         my $rawuri = $1||$2||$3;
         $rawuri =~ s/(^[^(]*)\).*$/$1/;  # as per ThunderBird, ) is an end delimiter if there is no ( preceeding it
-        $rawuri =~ s/[$oeignoreatend]*$//; # remove trailing string of punctuations that TBird ignores
+        $rawuri =~ s/[-~!@#^&*()_+=:;\'?,.]*$//; # remove trailing string of punctuations that TBird ignores
         # skip if there is '..' in the hostname portion of the URI, something we can't catch in the general URI regexp
         next if $rawuri =~ /^(?:(?:https?|ftp|mailto):(?:\/\/)?)?[a-z\d.-]*\.\./i;
 
@@ -2319,9 +2390,9 @@
 
         if ($uri =~ /^mailto:/i) {
           # skip a mail link that does not have a valid TLD or other than one @ after decoding any URLEncoded characters
-          $uri = Mail::SpamAssassin::Util::url_encode($uri) if ($uri =~ /\%(?:2[1-9a-fA-F]|[3-6][0-9a-fA-f]|7[0-9a-eA-E])/);
+          $uri = Mail::SpamAssassin::Util::url_encode($uri) if ($uri =~ /\%(?:2[1-9a-fA-F]|[3-6][0-9a-fA-F]|7[0-9a-eA-E])/);
           next if ($uri !~ /^[^@]+@[^@]+$/);
-          my $domuri = Mail::SpamAssassin::Util::uri_to_domain($uri);
+          my $domuri = $self->{main}->{registryboundaries}->uri_to_domain($uri);
           next unless $domuri;
           push (@uris, $rawuri);
           push (@uris, $uri) unless ($rawuri eq $uri);
@@ -2329,10 +2400,10 @@
 
         next unless ($uri =~/^(?:https?|ftp):/i);  # at this point only valid if one or the other of these
 
-        my @tmp = Mail::SpamAssassin::Util::uri_list_canonify($redirector_patterns, $uri);
+        my @tmp = uri_list_canonicalize($redirector_patterns, $uri);
         my $goodurifound = 0;
         foreach my $cleanuri (@tmp) {
-          my $domain = Mail::SpamAssassin::Util::uri_to_domain($cleanuri);
+          my $domain = $self->{main}->{registryboundaries}->uri_to_domain($cleanuri);
           if ($domain) {
             # bug 5780: Stop after domain to avoid FP, but do that after all deobfuscation of urlencoding and redirection
             if ($rblonly) {
@@ -2525,7 +2596,7 @@
   my ($self, $desc, $firstlinelength, $prefix) = @_;
 
   my $firstline = " " x $firstlinelength;
-  my $wrapped = Mail::SpamAssassin::Util::wrap($desc, $prefix, $firstline, 75, 0);
+  my $wrapped = Mail::SpamAssassin::Util::wrap($desc, $prefix, $firstline, $self->{conf}->{report_wrap_width}, 0);
   $wrapped =~ s/^\s+//s;
   $wrapped;
 }
@@ -2696,7 +2767,7 @@
 # and this does not!
 sub get_envelope_from {
   my ($self) = @_;
-  
+
   # bug 2142:
   # Get the SMTP MAIL FROM:, aka. the "envelope sender", if our
   # calling app has helpfully marked up the source message
@@ -2712,7 +2783,7 @@
     # make sure we get the most recent copy - there can be only one EnvelopeSender.
     $envf = $self->get($self->{conf}->{envelope_sender_header}.":addr",undef);
     # ok if it contains an "@" sign, or is "" (ie. "<>" without the < and >)
-    goto ok if defined $envf && ($envf =~ /\@/ || $envf =~ /^$/);
+    goto ok if defined $envf && ($envf =~ /\@/ || $envf eq '');
     # Warn them if it's configured, but not there or not usable.
     if (defined $envf) {
       chomp $envf;
@@ -2807,8 +2878,9 @@
   return;
 
 ok:
-  $envf =~ s/^<*//gs;                # remove <
-  $envf =~ s/>*\s*$//gs;        # remove >, whitespace, newlines
+  $envf =~ s/^<*//s;            # remove <
+  $envf =~ s/>*\s*\z//s;        # remove >, whitespace, newlines
+
   return $envf;
 }
 
@@ -2886,7 +2958,17 @@
 
   my ($tmpf, $tmpfh) = Mail::SpamAssassin::Util::secure_tmpfile();
   $tmpfh  or die "failed to create a temporary file";
-  print $tmpfh $$fulltext  or die "error writing to $tmpf: $!";
+
+  # PerlIO's buffered print writes in 8 kB chunks - which can be slow.
+  #   print $tmpfh $$fulltext  or die "error writing to $tmpf: $!";
+  #
+  # reducing the number of writes and bypassing extra buffering in PerlIO
+  # speeds up writing of larger text by a factor of 2
+  my $nwrites;
+  for (my $ofs = 0; $ofs < length($$fulltext); $ofs += $nwrites) {
+    $nwrites = $tmpfh->syswrite($$fulltext, length($$fulltext)-$ofs, $ofs);
+    defined $nwrites  or die "error writing to $tmpf: $!";
+  }
   close $tmpfh  or die "error closing $tmpf: $!";
 
   $self->{fulltext_tmpfile} = $tmpf;
@@ -2960,38 +3042,39 @@
 
 =item all_from_addrs_domains
 
-This function returns all the various from addresses in a message using all_from_addrs() 
-and then returns only the domain names.  
+This function returns all the various from addresses in a message using all_from_addrs()
+and then returns only the domain names.
 
 =cut
 
 sub all_from_addrs_domains {
   my ($self) = @_;
 
-  if (exists $self->{all_from_addrs_domains}) { 
+  if (exists $self->{all_from_addrs_domains}) {
     return @{$self->{all_from_addrs_domains}};
   }
 
-  #TEST POINT - my @addrs = ("test.voipquotes2.net","test.voipquotes2.co.uk"); 
+  #TEST POINT - my @addrs = ("test.voipquotes2.net","test.voipquotes2.co.uk");
   #Start with all the normal from addrs
-  my @addrs = &all_from_addrs($self);
+  my @addrs = all_from_addrs($self);
 
   dbg("eval: all '*From' addrs domains (before): " . join(" ", @addrs));
 
-  #loop through and limit to just the domain with a dummy address
-  for (my $i = 0; $i < scalar(@addrs); $i++) {
-    $addrs[$i] = 'dummy@'.&Mail::SpamAssassin::Util::uri_to_domain($addrs[$i]);
+  #Take just the domain with a dummy localpart
+  #removing invalid and duplicate domains
+  my(%addrs_seen, @addrs_filtered);
+  foreach my $a (@addrs) {
+    my $domain = $self->{main}->{registryboundaries}->uri_to_domain($a);
+    next if !defined $domain || $addrs_seen{lc $domain}++;
+    push(@addrs_filtered, 'dummy@'.$domain);
   }
 
-  #Remove duplicate domains
-  my %addrs = map { $_ => 1 } @addrs;
-  @addrs = keys %addrs;
-
-  dbg("eval: all '*From' addrs domains (after uri to domain): " . join(" ", @addrs));
+  dbg("eval: all '*From' addrs domains (after uri to domain): " .
+      join(" ", @addrs_filtered));
 
-  $self->{all_from_addrs_domains} = \@addrs;
+  $self->{all_from_addrs_domains} = \@addrs_filtered;
 
-  return @addrs;
+  return @addrs_filtered;
 }
 
 sub all_to_addrs {
@@ -3024,7 +3107,7 @@
     @addrs = $self->{main}->find_all_addrs_in_line (
        join('',
 	 join(" ", @rcvdaddrs)."\n",
-         $self->get('To'),			# std 
+         $self->get('To'),			# std
   	 $self->get('Apparently-To'),		# sendmail, from envelope
   	 $self->get('Delivered-To'),		# Postfix, poss qmail
   	 $self->get('Envelope-Recipients'),	# qmail: new-inject(1)
diff -Nru spamassassin-3.4.0/lib/Mail/SpamAssassin/PersistentAddrList.pm spamassassin-3.4.2/lib/Mail/SpamAssassin/PersistentAddrList.pm
--- spamassassin-3.4.0/lib/Mail/SpamAssassin/PersistentAddrList.pm	2014-02-07 03:36:28.000000000 -0500
+++ spamassassin-3.4.2/lib/Mail/SpamAssassin/PersistentAddrList.pm	2018-09-13 21:27:51.000000000 -0400
@@ -48,14 +48,10 @@
 
 use strict;
 use warnings;
-use bytes;
+# use bytes;
 use re 'taint';
 
-use vars qw{
-  @ISA
-};
-
-@ISA = qw();
+our @ISA = qw();
 
 ###########################################################################
 
diff -Nru spamassassin-3.4.0/lib/Mail/SpamAssassin/Plugin/AccessDB.pm spamassassin-3.4.2/lib/Mail/SpamAssassin/Plugin/AccessDB.pm
--- spamassassin-3.4.0/lib/Mail/SpamAssassin/Plugin/AccessDB.pm	2014-02-07 03:36:27.000000000 -0500
+++ spamassassin-3.4.2/lib/Mail/SpamAssassin/Plugin/AccessDB.pm	2018-09-13 21:27:51.000000000 -0400
@@ -57,11 +57,10 @@
 use Fcntl;
 use strict;
 use warnings;
-use bytes;
+# use bytes;
 use re 'taint';
 
-use vars qw(@ISA);
-@ISA = qw(Mail::SpamAssassin::Plugin);
+our @ISA = qw(Mail::SpamAssassin::Plugin);
 
 use constant HAS_DB_FILE => eval { require DB_File; };
 
diff -Nru spamassassin-3.4.0/lib/Mail/SpamAssassin/Plugin/AntiVirus.pm spamassassin-3.4.2/lib/Mail/SpamAssassin/Plugin/AntiVirus.pm
--- spamassassin-3.4.0/lib/Mail/SpamAssassin/Plugin/AntiVirus.pm	2014-02-07 03:36:27.000000000 -0500
+++ spamassassin-3.4.2/lib/Mail/SpamAssassin/Plugin/AntiVirus.pm	2018-09-13 21:27:51.000000000 -0400
@@ -49,11 +49,10 @@
 use Mail::SpamAssassin::Util;
 use strict;
 use warnings;
-use bytes;
+# use bytes;
 use re 'taint';
 
-use vars qw(@ISA);
-@ISA = qw(Mail::SpamAssassin::Plugin);
+our @ISA = qw(Mail::SpamAssassin::Plugin);
 
 # constructor: register the eval rule
 sub new {
diff -Nru spamassassin-3.4.0/lib/Mail/SpamAssassin/Plugin/AskDNS.pm spamassassin-3.4.2/lib/Mail/SpamAssassin/Plugin/AskDNS.pm
--- spamassassin-3.4.0/lib/Mail/SpamAssassin/Plugin/AskDNS.pm	2014-02-07 03:36:27.000000000 -0500
+++ spamassassin-3.4.2/lib/Mail/SpamAssassin/Plugin/AskDNS.pm	2018-09-13 21:27:51.000000000 -0400
@@ -140,7 +140,7 @@
 multiple character-strings (as defined in Section 3.3 of [RFC1035]), these
 strings are concatenated with no delimiters before comparing the result
 to the filtering string. This follows requirements of several documents,
-such as RFC 5518, RFC 4408, RFC 4871, RFC 5617.  Examples of a plain text
+such as RFC 5518, RFC 7208, RFC 4871, RFC 5617.  Examples of a plain text
 filtering parameter: "127.0.0.1", "transaction", 'list' .
 
 A regular expression follows a familiar perl syntax like /.../ or m{...}
@@ -191,17 +191,19 @@
 use Mail::SpamAssassin::Plugin;
 use Mail::SpamAssassin::Util qw(decode_dns_question_entry);
 use Mail::SpamAssassin::Logger;
+use version 0.77;
 
-use vars qw(@ISA %rcode_value $txtdata_can_provide_a_list);
-@ISA = qw(Mail::SpamAssassin::Plugin);
+our @ISA = qw(Mail::SpamAssassin::Plugin);
 
-%rcode_value = (  # http://www.iana.org/assignments/dns-parameters, RFC 6195
+our %rcode_value = (  # http://www.iana.org/assignments/dns-parameters, RFC 6195
   NOERROR => 0,  FORMERR => 1, SERVFAIL => 2, NXDOMAIN => 3, NOTIMP => 4,
   REFUSED => 5,  YXDOMAIN => 6, YXRRSET => 7, NXRRSET => 8, NOTAUTH => 9,
   NOTZONE => 10, BADVERS => 16, BADSIG => 16, BADKEY => 17, BADTIME => 18,
   BADMODE => 19, BADNAME => 20, BADALG => 21, BADTRUNC => 22,
 );
 
+our $txtdata_can_provide_a_list;
+
 sub new {
   my($class,$sa_main) = @_;
 
@@ -211,7 +213,9 @@
 
   $self->set_config($sa_main->{conf});
 
-  $txtdata_can_provide_a_list = Net::DNS->VERSION >= 0.69;
+  #$txtdata_can_provide_a_list = Net::DNS->VERSION >= 0.69;
+  #more robust version check from Damyan Ivanov - Bug 7095
+  $txtdata_can_provide_a_list = version->parse(Net::DNS->VERSION) >= version->parse('0.69');
 
   return $self;
 }
@@ -376,6 +380,17 @@
   for my $depends_on_tags (keys %{$conf->{askdns}}) {
     my @tags;
     @tags = split(/,/, $depends_on_tags)  if $depends_on_tags ne '';
+
+    if (would_log("dbg","askdns")) {
+      while ( my($query_template_key, $struct) =
+                each %{$conf->{askdns}{$depends_on_tags}} ) {
+        my($query_template, $query_type, $answer_types_ref, $rules) =
+          @$struct{qw(query q_type a_types rules)};
+        dbg("askdns: depend on tags %s, rules: %s ",
+            $depends_on_tags, join(', ', keys %$rules));
+      }
+    }
+
     if (!@tags) {
       # no dependencies on tags, just call directly
       $self->launch_queries($pms,$depends_on_tags);
@@ -528,7 +543,7 @@
     @answer = ( undef );
   }
 
-  # NOTE:  $rr->rdatastr returns the result encoded in a DNS zone file
+  # NOTE:  $rr->rdstring returns the result encoded in a DNS zone file
   # format, i.e. enclosed in double quotes if a result contains whitespace
   # (or other funny characters), and may use \DDD encoding or \X quoting as
   # per RFC 1035.  Using $rr->txtdata instead avoids this unnecessary encoding
@@ -546,7 +561,8 @@
   # the code handling such reply from DNS MUST assemble all of these
   # marshaled text blocks into a single one before any syntactical
   # verification takes place.
-  # The same goes for RFC 4408 (SPF), RFC 4871 (DKIM), RFC 5617 (ADSP) ...
+  # The same goes for RFC 4408 (SPF), RFC 4871 (DKIM), RFC 5617 (ADSP),
+  # draft-kucherawy-dmarc-base (DMARC), ...
 
   for my $rr (@answer) {
     my($rr_rdatastr, $rdatanum, $rr_type);
@@ -554,19 +570,26 @@
       # special case, no answer records, only rcode can be tested
     } else {
       $rr_type = uc $rr->type;
-      if ($rr->UNIVERSAL::can('txtdata')) {  # TXT, SPF
-        # join with no intervening spaces, as per RFC 5518
+      if ($rr_type eq 'A') {
+        # Net::DNS::RR::A::address() is available since Net::DNS 0.69
+        $rr_rdatastr = $rr->UNIVERSAL::can('address') ? $rr->address
+                                                      : $rr->rdatastr;
+        if ($rr_rdatastr =~ m/^\d{1,3}\.\d{1,3}\.\d{1,3}\.\d{1,3}\z/) {
+          $rdatanum = Mail::SpamAssassin::Util::my_inet_aton($rr_rdatastr);
+        }
+
+      } elsif ($rr->UNIVERSAL::can('txtdata')) {
+        # TXT, SPF: join with no intervening spaces, as per RFC 5518
         if ($txtdata_can_provide_a_list || $rr_type ne 'TXT') {
           $rr_rdatastr = join('', $rr->txtdata);  # txtdata() in list context!
         } else {  # char_str_list() is only available for TXT records
           $rr_rdatastr = join('', $rr->char_str_list);  # historical
         }
       } else {
-        $rr_rdatastr = $rr->rdatastr;
-        if ($rr_type eq 'A' &&
-            $rr_rdatastr =~ m/^\d{1,3}\.\d{1,3}\.\d{1,3}\.\d{1,3}\z/) {
-          $rdatanum = Mail::SpamAssassin::Util::my_inet_aton($rr_rdatastr);
-        }
+        # rdatastr() is historical, use rdstring() since Net::DNS 0.69
+        $rr_rdatastr = $rr->UNIVERSAL::can('rdstring') ? $rr->rdstring
+                                                       : $rr->rdatastr;
+        utf8::encode($rr_rdatastr)  if utf8::is_utf8($rr_rdatastr);
       }
     # dbg("askdns: received rr type %s, data: %s", $rr_type, $rr_rdatastr);
     }
@@ -589,7 +612,8 @@
           $match = 1  if $subtest->{$rcode};
         } elsif ($rcode != 0) {
           # skip remaining tests on DNS error
-        } elsif (!grep($_ eq 'ANY' || $_ eq $rr_type, @$answer_types_ref) ) {
+        } elsif (!defined($rr_type) ||
+                 !grep($_ eq 'ANY' || $_ eq $rr_type, @$answer_types_ref) ) {
           # skip remaining tests on wrong RR type
         } elsif (!defined $subtest) {
           $match = 1;  # any valid response of the requested RR type matches
diff -Nru spamassassin-3.4.0/lib/Mail/SpamAssassin/Plugin/ASN.pm spamassassin-3.4.2/lib/Mail/SpamAssassin/Plugin/ASN.pm
--- spamassassin-3.4.0/lib/Mail/SpamAssassin/Plugin/ASN.pm	2014-02-07 03:36:27.000000000 -0500
+++ spamassassin-3.4.2/lib/Mail/SpamAssassin/Plugin/ASN.pm	2018-09-13 21:27:51.000000000 -0400
@@ -54,6 +54,8 @@
 
  add_header all ASN _ASN_ _ASNCIDR_
 
+ header TEST_AS1234 X-ASN =~ /^1234$/
+
 =head1 DESCRIPTION
 
 This plugin uses DNS lookups to the services of an external DNS zone such
@@ -111,6 +113,7 @@
 package Mail::SpamAssassin::Plugin::ASN;
 
 use strict;
+use warnings;
 use re 'taint';
 use Mail::SpamAssassin;
 use Mail::SpamAssassin::Plugin;
diff -Nru spamassassin-3.4.0/lib/Mail/SpamAssassin/Plugin/AutoLearnThreshold.pm spamassassin-3.4.2/lib/Mail/SpamAssassin/Plugin/AutoLearnThreshold.pm
--- spamassassin-3.4.0/lib/Mail/SpamAssassin/Plugin/AutoLearnThreshold.pm	2014-02-07 03:36:27.000000000 -0500
+++ spamassassin-3.4.2/lib/Mail/SpamAssassin/Plugin/AutoLearnThreshold.pm	2018-09-13 21:27:51.000000000 -0400
@@ -55,11 +55,10 @@
 use Mail::SpamAssassin::Logger;
 use strict;
 use warnings;
-use bytes;
+# use bytes;
 use re 'taint';
 
-use vars qw(@ISA);
-@ISA = qw(Mail::SpamAssassin::Plugin);
+our @ISA = qw(Mail::SpamAssassin::Plugin);
 
 sub new {
   my $class = shift;
diff -Nru spamassassin-3.4.0/lib/Mail/SpamAssassin/Plugin/AWL.pm spamassassin-3.4.2/lib/Mail/SpamAssassin/Plugin/AWL.pm
--- spamassassin-3.4.0/lib/Mail/SpamAssassin/Plugin/AWL.pm	2014-02-07 03:36:27.000000000 -0500
+++ spamassassin-3.4.2/lib/Mail/SpamAssassin/Plugin/AWL.pm	2018-09-13 21:27:51.000000000 -0400
@@ -60,15 +60,14 @@
 
 use strict;
 use warnings;
-use bytes;
+# use bytes;
 use re 'taint';
 use Mail::SpamAssassin::Plugin;
 use Mail::SpamAssassin::AutoWhitelist;
 use Mail::SpamAssassin::Util qw(untaint_var);
 use Mail::SpamAssassin::Logger;
 
-use vars qw(@ISA);
-@ISA = qw(Mail::SpamAssassin::Plugin);
+our @ISA = qw(Mail::SpamAssassin::Plugin);
 
 # constructor: register the eval rule
 sub new {
@@ -437,6 +436,7 @@
       # or if the test is marked as "noautolearn"
       next if !$scores->{$test};
       next if exists $tflags->{$test} && $tflags->{$test} =~ /\bnoautolearn\b/;
+      return 0 if exists $tflags->{$test} && $tflags->{$test} =~ /\bnoawl\b/;
       $points += $scores->{$test};
     }
 
diff -Nru spamassassin-3.4.0/lib/Mail/SpamAssassin/Plugin/Bayes.pm spamassassin-3.4.2/lib/Mail/SpamAssassin/Plugin/Bayes.pm
--- spamassassin-3.4.0/lib/Mail/SpamAssassin/Plugin/Bayes.pm	2014-02-07 03:36:27.000000000 -0500
+++ spamassassin-3.4.2/lib/Mail/SpamAssassin/Plugin/Bayes.pm	2018-09-13 21:27:51.000000000 -0400
@@ -45,7 +45,7 @@
 
 use strict;
 use warnings;
-use bytes;
+# use bytes;
 use re 'taint';
 
 BEGIN {
@@ -65,20 +65,13 @@
 
 our @ISA = qw(Mail::SpamAssassin::Plugin);
 
-use vars qw{
-  $IGNORED_HDRS
-  $MARK_PRESENCE_ONLY_HDRS
-  %HEADER_NAME_COMPRESSION
-  $OPPORTUNISTIC_LOCK_VALID
-};
-
 # Which headers should we scan for tokens?  Don't use all of them, as it's easy
 # to pick up spurious clues from some.  What we now do is use all of them
 # *less* these well-known headers; that way we can pick up spammers' tracking
 # headers (which are obviously not well-known in advance!).
 
 # Received is handled specially
-$IGNORED_HDRS = qr{(?: (?:X-)?Sender    # misc noise
+our $IGNORED_HDRS = qr{(?: (?:X-)?Sender    # misc noise
   |Delivered-To |Delivery-Date
   |(?:X-)?Envelope-To
   |X-MIME-Auto[Cc]onverted |X-Converted-To-Plain-Text
@@ -145,18 +138,21 @@
 
 # Note only the presence of these headers, in order to reduce the
 # hapaxen they generate.
-$MARK_PRESENCE_ONLY_HDRS = qr{(?: X-Face
+our $MARK_PRESENCE_ONLY_HDRS = qr{(?: X-Face
   |X-(?:Gnu-?PG|PGP|GPG)(?:-Key)?-Fingerprint
   |D(?:KIM|omainKey)-Signature
 )}ix;
 
-# tweaks tested as of Nov 18 2002 by jm: see SpamAssassin-devel list archives
+# tweaks tested as of Nov 18 2002 by jm posted to -devel at
+# http://sourceforge.net/p/spamassassin/mailman/message/12977556/
 # for results.  The winners are now the default settings.
 use constant IGNORE_TITLE_CASE => 1;
-use constant TOKENIZE_LONG_8BIT_SEQS_AS_TUPLES => 1;
+use constant TOKENIZE_LONG_8BIT_SEQS_AS_TUPLES => 0;
+use constant TOKENIZE_LONG_8BIT_SEQS_AS_UTF8_CHARS => 1;
 use constant TOKENIZE_LONG_TOKENS_AS_SKIPS => 1;
 
-# tweaks of May 12 2003, see SpamAssassin-devel archives again.
+# tweaks by jm on May 12 2003, see -devel email at
+# http://sourceforge.net/p/spamassassin/mailman/message/14844556/
 use constant PRE_CHEW_ADDR_HEADERS => 1;
 use constant CHEW_BODY_URIS => 1;
 use constant CHEW_BODY_MAILADDRS => 1;
@@ -182,7 +178,7 @@
 # be 2-way (ie. LHSes that map to the same RHS are not a problem), but mixing
 # tokens from multiple different headers may impact accuracy, so might as well
 # avoid this if possible. These are the top ones from my corpus, BTW (jm).
-%HEADER_NAME_COMPRESSION = (
+our %HEADER_NAME_COMPRESSION = (
   'Message-Id'		=> '*m',
   'Message-ID'		=> '*M',
   'Received'		=> '*r',
@@ -197,13 +193,15 @@
   'X-Authentication-Warning' => '*a',
   'Organization'	=> '*o',
   'Organisation'        => '*o',
-  'Content-Type'	=> '*c',
+  'Content-Type'	=> '*ct',
+  'Content-Disposition'	=> '*cd',
+  'Content-Transfer-Encoding' => '*ce',
   'x-spam-relays-trusted' => '*RT',
   'x-spam-relays-untrusted' => '*RU',
 );
 
 # How many seconds should the opportunistic_expire lock be valid?
-$OPPORTUNISTIC_LOCK_VALID = 300;
+our $OPPORTUNISTIC_LOCK_VALID = 300;
 
 # Should we use the Robinson f(w) equation from
 # http://radio.weblogs.com/0101454/stories/2002/09/16/spamDetection.html ?
@@ -288,8 +286,8 @@
 sub check_bayes {
   my ($self, $pms, $fulltext, $min, $max) = @_;
 
-  return 0 if (!$pms->{conf}->{use_learner});
-  return 0 if (!$pms->{conf}->{use_bayes} || !$pms->{conf}->{use_bayes_rules});
+  return 0 if (!$self->{conf}->{use_learner});
+  return 0 if (!$self->{conf}->{use_bayes} || !$self->{conf}->{use_bayes_rules});
 
   if (!exists ($pms->{bayes_score})) {
     my $timer = $self->{main}->time_method("check_bayes");
@@ -300,7 +298,7 @@
       ($min == 0 || $pms->{bayes_score} > $min) &&
       ($max eq "undef" || $pms->{bayes_score} <= $max))
   {
-      if ($pms->{conf}->{detailed_bayes_score}) {
+      if ($self->{conf}->{detailed_bayes_score}) {
         $pms->test_log(sprintf ("score: %3.4f, hits: %s",
                                  $pms->{bayes_score},
                                  $pms->{bayes_hits}));
@@ -321,7 +319,7 @@
   my ($self, $params) = @_;
   my $quiet = $params->{quiet};
 
-  # do a sanity check here.  Wierd things happen if we remain tied
+  # do a sanity check here.  Weird things happen if we remain tied
   # after compiling; for example, spamd will never see that the
   # number of messages has reached the bayes-scanning threshold.
   if ($self->{store}->db_readable()) {
@@ -1033,12 +1031,18 @@
 }
 
 sub _get_msgdata_from_permsgstatus {
-  my ($self, $msg) = @_;
+  my ($self, $pms) = @_;
 
+  my $t_src = $self->{conf}->{bayes_token_sources};
   my $msgdata = { };
-  $msgdata->{bayes_token_body} = $msg->{msg}->get_visible_rendered_body_text_array();
-  $msgdata->{bayes_token_inviz} = $msg->{msg}->get_invisible_rendered_body_text_array();
-  @{$msgdata->{bayes_token_uris}} = $msg->get_uri_list();
+  $msgdata->{bayes_token_body} =
+    $pms->{msg}->get_visible_rendered_body_text_array() if $t_src->{visible};
+  $msgdata->{bayes_token_inviz} =
+    $pms->{msg}->get_invisible_rendered_body_text_array() if $t_src->{invisible};
+  $msgdata->{bayes_mimepart_digests} =
+    $pms->{msg}->get_mimepart_digests() if $t_src->{mimepart};
+  @{$msgdata->{bayes_token_uris}} =
+    $pms->get_uri_list() if $t_src->{uri};
   return $msgdata;
 }
 
@@ -1048,36 +1052,71 @@
 sub tokenize {
   my ($self, $msg, $msgdata) = @_;
 
-  # the body
-  my @tokens = map { $self->_tokenize_line ($_, '', 1) }
-                                    @{$msgdata->{bayes_token_body}};
+  my $t_src = $self->{conf}->{bayes_token_sources};
+  my @tokens;
 
+  # visible tokens from the body
+  if ($msgdata->{bayes_token_body}) {
+    my(@t) = map($self->_tokenize_line ($_, '', 1),
+                 @{$msgdata->{bayes_token_body}} );
+    dbg("bayes: tokenized body: %d tokens", scalar @t);
+    push(@tokens, @t);
+  }
   # the URI list
-  push (@tokens, map { $self->_tokenize_line ($_, '', 2) }
-                                    @{$msgdata->{bayes_token_uris}});
-
+  if ($msgdata->{bayes_token_uris}) {
+    my(@t) = map($self->_tokenize_line ($_, '', 2),
+                 @{$msgdata->{bayes_token_uris}} );
+    dbg("bayes: tokenized uri: %d tokens", scalar @t);
+    push(@tokens, @t);
+  }
   # add invisible tokens
-  if (ADD_INVIZ_TOKENS_I_PREFIX) {
-    push (@tokens, map { $self->_tokenize_line ($_, "I*:", 1) }
-                                    @{$msgdata->{bayes_token_inviz}});
-  }
-  if (ADD_INVIZ_TOKENS_NO_PREFIX) {
-    push (@tokens, map { $self->_tokenize_line ($_, "", 1) }
-                                    @{$msgdata->{bayes_token_inviz}});
+  if ($msgdata->{bayes_token_inviz}) {
+    my $tokprefix;
+    if (ADD_INVIZ_TOKENS_I_PREFIX)  { $tokprefix = 'I*:' }
+    if (ADD_INVIZ_TOKENS_NO_PREFIX) { $tokprefix = '' }
+    if (defined $tokprefix) {
+      my(@t) = map($self->_tokenize_line ($_, $tokprefix, 1),
+                   @{$msgdata->{bayes_token_inviz}} );
+      dbg("bayes: tokenized invisible: %d tokens", scalar @t);
+      push(@tokens, @t);
+    }
+  }
+
+  # add digests and Content-Type of all MIME parts
+  if ($msgdata->{bayes_mimepart_digests}) {
+    my %shorthand = (  # some frequent MIME part contents for human readability
+     'da39a3ee5e6b4b0d3255bfef95601890afd80709:text/plain'=> 'Empty-Plaintext',
+     'da39a3ee5e6b4b0d3255bfef95601890afd80709:text/html' => 'Empty-HTML',
+     'da39a3ee5e6b4b0d3255bfef95601890afd80709:text/xml'  => 'Empty-XML',
+     'adc83b19e793491b1c6ea0fd8b46cd9f32e592fc:text/plain'=> 'OneNL-Plaintext',
+     'adc83b19e793491b1c6ea0fd8b46cd9f32e592fc:text/html' => 'OneNL-HTML',
+     '71853c6197a6a7f222db0f1978c7cb232b87c5ee:text/plain'=> 'TwoNL-Plaintext',
+     '71853c6197a6a7f222db0f1978c7cb232b87c5ee:text/html' => 'TwoNL-HTML',
+    );
+    my(@t) = map('MIME:' . ($shorthand{$_} || $_),
+                 @{ $msgdata->{bayes_mimepart_digests} });
+    dbg("bayes: tokenized mime parts: %d tokens", scalar @t);
+    dbg("bayes: mime-part token %s", $_) for @t;
+    push(@tokens, @t);
   }
 
   # Tokenize the headers
-  my %hdrs = $self->_tokenize_headers ($msg);
-  while( my($prefix, $value) = each %hdrs ) {
-    push(@tokens, $self->_tokenize_line ($value, "H$prefix:", 0));
+  if ($t_src->{header}) {
+    my(@t);
+    my %hdrs = $self->_tokenize_headers ($msg);
+    while( my($prefix, $value) = each %hdrs ) {
+      push(@t, $self->_tokenize_line ($value, "H$prefix:", 0));
+    }
+    dbg("bayes: tokenized header: %d tokens", scalar @t);
+    push(@tokens, @t);
   }
 
   # Go ahead and uniq the array, skip null tokens (can happen sometimes)
   # generate an SHA1 hash and take the lower 40 bits as our token
   my %tokens;
   foreach my $token (@tokens) {
-    next unless length($token); # skip 0 length tokens
-    $tokens{substr(sha1($token), -5)} = $token;
+  # dbg("bayes: token: %s", $token);
+    $tokens{substr(sha1($token), -5)} = $token  if $token ne '';
   }
 
   # return the keys == tokens ...
@@ -1095,7 +1134,17 @@
   # include quotes, .'s and -'s for URIs, and [$,]'s for Nigerian-scam strings,
   # and ISO-8859-15 alphas.  Do not split on @'s; better results keeping it.
   # Some useful tokens: "$31,000,000" "www.clock-speed.net" "f*ck" "Hits!"
-  tr/-A-Za-z0-9,\@\*\!_'"\$.\241-\377 / /cs;
+
+  ### (previous:)  tr/-A-Za-z0-9,\@\*\!_'"\$.\241-\377 / /cs;
+
+  ### (now): see Bug 7130 for rationale (slower, but makes UTF-8 chars atomic)
+  s{ ( [A-Za-z0-9,@*!_'"\$. -]+  |
+       [\xC0-\xDF][\x80-\xBF]    |
+       [\xE0-\xEF][\x80-\xBF]{2} |
+       [\xF0-\xF4][\x80-\xBF]{3} |
+       [\xA1-\xFF] ) | . }
+   { defined $1 ? $1 : ' ' }xsge;
+  # should we also turn NBSP ( \xC2\xA0 ) into space?
 
   # DO split on "..." or "--" or "---"; common formatting error resulting in
   # hapaxes.  Keep the separator itself as a token, though, as long ones can
@@ -1113,6 +1162,10 @@
 
   my $magic_re = $self->{store}->get_magic_re();
 
+  # Note that split() in scope of 'use bytes' results in words with utf8 flag
+  # cleared, even if the source string has perl characters semantics !!!
+  # Is this really still desirable?
+
   foreach my $token (split) {
     $token =~ s/^[-'"\.,]+//;        # trim non-alphanum chars at start or end
     $token =~ s/[-'"\.,]+$//;        # so we don't get loads of '"foo' tokens
@@ -1152,12 +1205,24 @@
     # the domain ".net" appeared in the To header.
     #
     if ($len > MAX_TOKEN_LENGTH && $token !~ /\*/) {
+
+      if (TOKENIZE_LONG_8BIT_SEQS_AS_UTF8_CHARS && $token =~ /[\x80-\xBF]{2}/) {
+	# Bug 7135
+	# collect 3- and 4-byte UTF-8 sequences, ignore 2-byte sequences
+	my(@t) = $token =~ /( (?: [\xE0-\xEF] | [\xF0-\xF4][\x80-\xBF] )
+                              [\x80-\xBF]{2} )/xsg;
+	if (@t) {
+          push (@rettokens, map($tokprefix.'u8:'.$_, @t));
+	  next;
+	}
+      }
+
       if (TOKENIZE_LONG_8BIT_SEQS_AS_TUPLES && $token =~ /[\xa0-\xff]{2}/) {
 	# Matt sez: "Could be asian? Autrijus suggested doing character ngrams,
 	# but I'm doing tuples to keep the dbs small(er)."  Sounds like a plan
 	# to me! (jm)
 	while ($token =~ s/^(..?)//) {
-	  push (@rettokens, "8:$1");
+	  push (@rettokens, $tokprefix.'8:'.$1);
 	}
 	next;
       }
@@ -1167,10 +1232,18 @@
             || ($region == 2 && URIS_TOKENIZE_LONG_TOKENS_AS_SKIPS))
       {
 	# if (TOKENIZE_LONG_TOKENS_AS_SKIPS)
-	# Spambayes trick via Matt: Just retain 7 chars.  Do not retain
-	# the length, it does not help; see my mail to -devel of Nov 20 2002.
+	# Spambayes trick via Matt: Just retain 7 chars.  Do not retain the
+	# length, it does not help; see jm's mail to -devel on Nov 20 2002 at
+	# http://sourceforge.net/p/spamassassin/mailman/message/12977605/
 	# "sk:" stands for "skip".
-	$token = "sk:".substr($token, 0, 7);
+	# Bug 7141: retain seven UTF-8 chars (or other bytes),
+	# if followed by at least two bytes
+	$token =~ s{ ^ ( (?> (?: [\x00-\x7F\xF5-\xFF]      |
+	                         [\xC0-\xDF][\x80-\xBF]    |
+	                         [\xE0-\xEF][\x80-\xBF]{2} |
+	                         [\xF0-\xF4][\x80-\xBF]{3} | . ){7} ))
+	             .{2,} \z }{sk:$1}xs;
+	## (was:)  $token = "sk:".substr($token, 0, 7);  # seven bytes
       }
     }
 
@@ -1575,6 +1648,7 @@
   $module = 'Mail::SpamAssassin::BayesStore::DBM'  if !$module;
 
   dbg("bayes: learner_new self=%s, bayes_store_module=%s", $self,$module);
+  undef $self->{store};  # DESTROYs previous object, if any
   eval '
     require '.$module.';
     $store = '.$module.'->new($self);
diff -Nru spamassassin-3.4.0/lib/Mail/SpamAssassin/Plugin/BodyEval.pm spamassassin-3.4.2/lib/Mail/SpamAssassin/Plugin/BodyEval.pm
--- spamassassin-3.4.0/lib/Mail/SpamAssassin/Plugin/BodyEval.pm	2014-02-07 03:36:27.000000000 -0500
+++ spamassassin-3.4.2/lib/Mail/SpamAssassin/Plugin/BodyEval.pm	2018-09-13 21:27:51.000000000 -0400
@@ -23,11 +23,10 @@
 
 use strict;
 use warnings;
-use bytes;
+# use bytes;
 use re 'taint';
 
-use vars qw(@ISA);
-@ISA = qw(Mail::SpamAssassin::Plugin);
+our @ISA = qw(Mail::SpamAssassin::Plugin);
 
 # constructor: register the eval rule
 sub new {
@@ -218,6 +217,7 @@
     }
   }
 
+  dbg("eval: tvd_vertical_words value: $pms->{tvd_vertical_words} / min: $min / max: $max - value must be >= min and < max");
   return 1 if ($pms->{tvd_vertical_words} >= $min && $pms->{tvd_vertical_words} < $max);
 }
 
diff -Nru spamassassin-3.4.0/lib/Mail/SpamAssassin/Plugin/BodyRuleBaseExtractor.pm spamassassin-3.4.2/lib/Mail/SpamAssassin/Plugin/BodyRuleBaseExtractor.pm
--- spamassassin-3.4.0/lib/Mail/SpamAssassin/Plugin/BodyRuleBaseExtractor.pm	2014-02-07 03:36:27.000000000 -0500
+++ spamassassin-3.4.2/lib/Mail/SpamAssassin/Plugin/BodyRuleBaseExtractor.pm	2018-09-13 21:27:51.000000000 -0400
@@ -37,11 +37,10 @@
 
 use strict;
 use warnings;
-use bytes;
+# use bytes;
 use re 'taint';
 
-use vars qw(@ISA);
-@ISA = qw(Mail::SpamAssassin::Plugin);
+our @ISA = qw(Mail::SpamAssassin::Plugin);
 
 use constant DEBUG_RE_PARSING => 0;     # noisy!
 
@@ -528,8 +527,8 @@
   while ( $nread=read(IN,$inbuf,16384) ) { $fullstr .= $inbuf }
   defined $nread  or die "error reading from pipe: $!";
 
-  close IN      or die "error closing pipe: $!";
   unlink $tmpf  or die "cannot unlink $tmpf: $!";
+  close IN      or die "error closing pipe: $!";
   defined $fullstr  or warn "empty result from a pipe";
 
   # now parse the -Mre=debug output.
diff -Nru spamassassin-3.4.0/lib/Mail/SpamAssassin/Plugin/Check.pm spamassassin-3.4.2/lib/Mail/SpamAssassin/Plugin/Check.pm
--- spamassassin-3.4.0/lib/Mail/SpamAssassin/Plugin/Check.pm	2014-02-07 03:36:27.000000000 -0500
+++ spamassassin-3.4.2/lib/Mail/SpamAssassin/Plugin/Check.pm	2018-09-13 21:27:51.000000000 -0400
@@ -26,11 +26,10 @@
 use Mail::SpamAssassin::Timeout;
 use Mail::SpamAssassin::Constants qw(:sa);
 
-use vars qw(@ISA @TEMPORARY_METHODS);
-@ISA = qw(Mail::SpamAssassin::Plugin);
+our @ISA = qw(Mail::SpamAssassin::Plugin);
 
-# methods defined by the compiled ruleset; deleted in finish_tests() 
-@TEMPORARY_METHODS = (); 
+# methods defined by the compiled ruleset; deleted in finish_tests()
+our @TEMPORARY_METHODS;
 
 # constructor
 sub new {
@@ -534,7 +533,7 @@
 
     # Lex the rule into tokens using a rather simple RE method ...
     my $lexer = ARITH_EXPRESSION_LEXER;
-    my @tokens = ($rule =~ m/$lexer/g);
+    my @tokens = ($rule =~ m/$lexer/og);
 
     # Set the rule blank to start
     $meta{$rulename} = "";
@@ -546,8 +545,7 @@
     foreach my $token (@tokens) {
 
       # Numbers can't be rule names
-    # if ($token =~ /^(?:\W+|[+-]?\d+(?:\.\d+)?)$/) {
-      if ($token !~ /^[A-Za-z_][A-Za-z0-9_]*\z/s) {  # faster
+      if ($token =~ tr{A-Za-z0-9_}{}c || substr($token,0,1) =~ tr{A-Za-z_}{}c) {
         $meta{$rulename} .= "$token ";
       }
       else {  # token is a rule name
@@ -613,7 +611,7 @@
           warn "no meta_dependencies defined for $metas[$i]";
         }
         my $alldeps = join ' ', grep {
-                ($tflags->{$_}||'') =~ /\bnet\b/
+                index( ($tflags->{$_}||''),'net') > -1 && ($tflags->{$_}||'') =~ /\bnet\b/
               } split (' ', $conf->{meta_dependencies}->{ $metas[$i] } );
 
         if ($alldeps ne '') {
diff -Nru spamassassin-3.4.0/lib/Mail/SpamAssassin/Plugin/DCC.pm spamassassin-3.4.2/lib/Mail/SpamAssassin/Plugin/DCC.pm
--- spamassassin-3.4.0/lib/Mail/SpamAssassin/Plugin/DCC.pm	2014-02-07 03:36:27.000000000 -0500
+++ spamassassin-3.4.2/lib/Mail/SpamAssassin/Plugin/DCC.pm	2018-09-13 21:27:51.000000000 -0400
@@ -77,7 +77,7 @@
 
 use strict;
 use warnings;
-use bytes;
+# use bytes;
 use re 'taint';
 
 use Mail::SpamAssassin::Plugin;
@@ -88,8 +88,18 @@
 use Errno qw(ENOENT EACCES);
 use IO::Socket;
 
-use vars qw(@ISA);
-@ISA = qw(Mail::SpamAssassin::Plugin);
+our @ISA = qw(Mail::SpamAssassin::Plugin);
+
+our $io_socket_module_name;
+BEGIN {
+  if (eval { require IO::Socket::IP }) {
+    $io_socket_module_name = 'IO::Socket::IP';
+  } elsif (eval { require IO::Socket::INET6 }) {
+    $io_socket_module_name = 'IO::Socket::INET6';
+  } elsif (eval { require IO::Socket::INET }) {
+    $io_socket_module_name = 'IO::Socket::INET';
+  }
+}
 
 sub new {
   my $class = shift;
@@ -242,7 +252,7 @@
 of a local Unix socket named C<dccifd> in the C<dcc_home> directory.
 If a socket is specified or found, use it instead of C<dccproc>.
 
-If specifed, C<dcc_dccifd_path> is the absolute path of local Unix socket
+If specified, C<dcc_dccifd_path> is the absolute path of local Unix socket
 or an INET socket specified as C<[Host]:Port> or C<Host:Port>.
 Host can be an IPv4 or IPv6 address or a host name
 Port is a TCP port number. The brackets are required for an IPv6 address.
@@ -277,10 +287,6 @@
 
 	$self->{dcc_dccifd_host} = $host;
 	$self->{dcc_dccifd_port} = $port;
-	if ($host !~ /^\d{1,3}\.\d{1,3}\.\d{1,3}\.\d{1,3}\z/) {
-	  # remember to try IPv6 if we can with a host name or non-IPv4 address
-	  $self->{dcc_dccifd_IPv6} = eval { require IO::Socket::INET6 };
-	}
 	dbg("config: dcc_dccifd_path set to [%s]:%s", $host, $port);
 
       } else {
@@ -388,6 +394,8 @@
 Report messages with total scores this much larger than the
 SpamAssassin spam threshold to DCC as spam.
 
+=back
+
 =cut
 
   push (@cmds, {
@@ -535,9 +543,9 @@
   # dccifd remains available until it breaks
   return $self->{dccifd_available} if $self->{dccifd_available};
 
-  # deal with configured INET socket
+  # deal with configured INET or INET6 socket
   if (defined $conf->{dcc_dccifd_host}) {
-    dbg("dcc: dccifd is available via INET socket [%s]:%s",
+    dbg("dcc: dccifd is available via socket [%s]:%s",
 	$conf->{dcc_dccifd_host}, $conf->{dcc_dccifd_port});
     return ($self->{dccifd_available} = 1);
   }
@@ -589,34 +597,22 @@
   my $sock;
 
   if (defined $sockpath) {
+    dbg("$tag connecting to local socket $sockpath");
     $sock = IO::Socket::UNIX->new(Type => SOCK_STREAM, Peer => $sockpath);
-    if ($sock) {
-      dbg("$tag connected to local socket $sockpath");
-      return $sock;
-    }
-    $self->{dccifd_available} = 0;
-    info("$tag failed to connect to local socket $sockpath");
-    return $sock
-  }
+    info("$tag failed to connect to local socket $sockpath") if !$sock;
 
-  # must be TCP/IP
-  my $host = $conf->{dcc_dccifd_host};
-  my $port = $conf->{dcc_dccifd_port};
-
-  if ($conf->{dcc_dccifd_IPv6}) {
-    # try IPv6 if we can with a host name or non-IPv4 address
-    dbg("$tag connecting to inet6 socket [$host]:$port");
-    $sock = IO::Socket::INET6->new(
-		  Proto => 'tcp', PeerAddr => $host, PeerPort => $port);
-    # fall back to IPv4 if that failed
-  }
-  if (!$sock) {
-    dbg("$tag connecting to inet4 socket [$host]:$port");
-    $sock = IO::Socket::INET->new(
-		Proto => 'tcp', PeerAddr => $host, PeerPort => $port);
+  } else {  # must be TCP/IP
+    my $host = $conf->{dcc_dccifd_host};
+    my $port = $conf->{dcc_dccifd_port};
+    dbg("$tag connecting to [%s]:%s using %s",
+        $host, $port, $io_socket_module_name);
+    $sock = $io_socket_module_name->new(
+              Proto => 'tcp', PeerAddr => $host, PeerPort => $port);
+    info("$tag failed to connect to [%s]:%s using %s: %s",
+         $host, $port, $io_socket_module_name, $!) if !$sock;
   }
 
-  info("failed to connect to [$host]:$port : $!") if !$sock;
+  $self->{dccifd_available} = 0  if !$sock;
   return $sock;
 }
 
@@ -871,6 +867,10 @@
 	# learn or report spam
 	unshift(@opts, '-t', 'many');
       }
+      if ($conf->{dcc_home}) {
+        # set home directory explicitly
+        unshift(@opts, '-h', $conf->{dcc_home});
+      };
 
       defined $path  or die "no dcc_path found\n";
       dbg("$tag opening pipe to " .
@@ -912,13 +912,13 @@
   $permsgstatus->leave_helper_run_mode();
 
   if ($timer->timed_out()) {
-    dbg("$tag $pgm timed out after $timeout seconds");
+    dbg("$tag %s timed out after %d seconds", $pgm||'', $timeout);
     return (undef, undef);
   }
 
   if ($err) {
     chomp $err;
-    info("$tag $pgm failed: $err\n");
+    info("$tag %s failed: %s", $pgm||'', $err);
     return (undef, undef);
   }
 
diff -Nru spamassassin-3.4.0/lib/Mail/SpamAssassin/Plugin/DKIM.pm spamassassin-3.4.2/lib/Mail/SpamAssassin/Plugin/DKIM.pm
--- spamassassin-3.4.0/lib/Mail/SpamAssassin/Plugin/DKIM.pm	2014-02-07 03:36:27.000000000 -0500
+++ spamassassin-3.4.2/lib/Mail/SpamAssassin/Plugin/DKIM.pm	2018-09-13 21:27:51.000000000 -0400
@@ -28,6 +28,7 @@
  full   DKIM_SIGNED           eval:check_dkim_signed()
  full   DKIM_VALID            eval:check_dkim_valid()
  full   DKIM_VALID_AU         eval:check_dkim_valid_author_sig()
+ full   DKIM_VALID_EF         eval:check_dkim_valid_envelopefrom()
 
 Taking into account signatures from specified signing domains only:
 (quotes may be omitted on domain names consisting only of letters, digits,
@@ -55,6 +56,7 @@
  describe DKIM_SIGNED   Message has a DKIM or DK signature, not necessarily valid
  describe DKIM_VALID    Message has at least one valid DKIM or DK signature
  describe DKIM_VALID_AU Message has a valid DKIM or DK signature from author's domain
+ describe DKIM_VALID_EF Message has a valid DKIM or DK signature from envelope-from domain
  describe __DKIM_DEPENDABLE     A validation failure not attributable to truncation
 
  describe DKIM_ADSP_NXDOMAIN    Domain not in DNS and no valid author domain signature
@@ -99,6 +101,9 @@
   _DKIMDOMAIN_
     Signing Domain Identifier (SDID) (the 'd' tag) from valid signatures;
 
+  _DKIMSELECTOR_
+    DKIM selector (the 's' tag) from valid signatures;
+
 Identities and domains from signatures which failed verification are not
 included in these tags. Duplicates are eliminated (e.g. when there are two or
 more valid signatures from the same signer, only one copy makes it into a tag).
@@ -125,11 +130,10 @@
 
 use strict;
 use warnings;
-use bytes;
+# use bytes;
 use re 'taint';
 
-use vars qw(@ISA);
-@ISA = qw(Mail::SpamAssassin::Plugin);
+our @ISA = qw(Mail::SpamAssassin::Plugin);
 
 # constructor: register the eval rule
 sub new {
@@ -145,6 +149,7 @@
   $self->register_eval_rule("check_dkim_valid");
   $self->register_eval_rule("check_dkim_valid_author_sig");
   $self->register_eval_rule("check_dkim_testing");
+  $self->register_eval_rule("check_dkim_valid_envelopefrom");
 
   # author domain signing practices
   $self->register_eval_rule("check_dkim_adsp");
@@ -178,13 +183,18 @@
 
 Works similarly to whitelist_from, except that in addition to matching
 an author address (From) to the pattern in the first parameter, the message
-must also carry a Domain Keys Identified Mail (DKIM) signature made by a
-signing domain (SDID, i.e. the d= tag) that is acceptable to us.
+must also carry a valid Domain Keys Identified Mail (DKIM) signature made by
+a signing domain (SDID, i.e. the d= tag) that is acceptable to us.
 
 Only one whitelist entry is allowed per line, as in C<whitelist_from_rcvd>.
 Multiple C<whitelist_from_dkim> lines are allowed. File-glob style characters
 are allowed for the From address (the first parameter), just like with
-C<whitelist_from_rcvd>. The second parameter does not accept wildcards.
+C<whitelist_from_rcvd>.
+
+The second parameter (the signing-domain) does not accept full file-glob style
+wildcards, although a simple '*.' (or just a '.') prefix to a domain name
+is recognized and implies any subdomain of the specified domain (but not
+the domain itself).
 
 If no signing-domain parameter is specified, the only acceptable signature
 will be an Author Domain Signature (sometimes called first-party signature)
@@ -205,7 +215,8 @@
   whitelist_from_dkim jane@example.net      example.org
   whitelist_from_dkim rick@info.example.net example.net
   whitelist_from_dkim *@info.example.net    example.net
-  whitelist_from_dkim *@*                   remailer.example.com
+  whitelist_from_dkim *@*                   mail7.remailer.example.com
+  whitelist_from_dkim *@*                   *.remailer.example.com
 
 =item def_whitelist_from_dkim author@example.com [signing-domain]
 
@@ -360,6 +371,25 @@
   score DKIM_ADSP_CUSTOM_MED   3.5
   score DKIM_ADSP_CUSTOM_HIGH  8
 
+
+=item dkim_minimum_key_bits n             (default: 1024)
+
+The smallest size of a signing key (in bits) for a valid signature to be
+considered for whitelisting. Additionally, the eval function check_dkim_valid()
+will return false on short keys when called with explicitly listed domains,
+and the eval function check_dkim_valid_author_sig() will return false on short
+keys (regardless of its arguments). Setting the option to 0 disables a key
+size check.
+
+Note that the option has no effect when the eval function check_dkim_valid()
+is called with no arguments (like in a rule DKIM_VALID). A mere presence of
+some valid signature on a message has no reputational value (without being
+associated with a particular domain), regardless of its key size - anyone can
+prepend its own signature on a copy of some third party mail and re-send it,
+which makes it no more trustworthy than without such signature. This is also
+a reason for a rule DKIM_VALID to have a near-zero score, i.e. a rule hit
+is only informational.
+
 =cut
 
   push (@cmds, {
@@ -450,6 +480,13 @@
     }
   });
 
+  # minimal signing key size in bits that is acceptable for whitelisting
+  push (@cmds, {
+    setting => 'dkim_minimum_key_bits',
+    default => 1024,
+    type => $Mail::SpamAssassin::Conf::CONF_TYPE_NUMERIC,
+  });
+
 =back
 
 =head1 ADMINISTRATOR SETTINGS
@@ -500,7 +537,8 @@
   if (!$pms->{dkim_valid}) {
     # don't bother
   } elsif (!@acceptable_domains) {
-    $result = 1;  # no additional constraints, any signing domain will do
+    $result = 1;  # no additional constraints, any signing domain will do,
+                  # also any signing key size will do
   } else {
     $result = $self->_check_dkim_signed_by($pms,1,0,\@acceptable_domains);
   }
@@ -513,14 +551,27 @@
   my $result = 0;
   if (!%{$pms->{dkim_has_valid_author_sig}}) {
     # don't bother
-  } elsif (!@acceptable_domains) {
-    $result = 1;  # no additional constraints, any signing domain will do
   } else {
     $result = $self->_check_dkim_signed_by($pms,1,1,\@acceptable_domains);
   }
   return $result;
 }
 
+sub check_dkim_valid_envelopefrom {
+  my ($self, $pms, $full_ref) = @_;
+  my $result = 0;
+  my $envfrom=$self->{'main'}->{'registryboundaries'}->uri_to_domain($pms->get("EnvelopeFrom"));
+  # if no envelopeFrom, it cannot be valid
+  return $result if !$envfrom;
+  $self->_check_dkim_signature($pms)  if !$pms->{dkim_checked_signature};
+  if (!$pms->{dkim_valid}) {
+    # don't bother
+  } else {
+    $result = $self->_check_dkim_signed_by($pms,1,0,[$envfrom]);
+  }
+  return $result;
+}
+
 sub check_dkim_dependable {
   my ($self, $pms) = @_;
   $self->_check_dkim_signature($pms)  if !$pms->{dkim_checked_signature};
@@ -657,6 +708,7 @@
       $acceptable_domains_ref) = @_;
   my $result = 0;
   my $verifier = $pms->{dkim_verifier};
+  my $minimum_key_bits = $pms->{conf}->{dkim_minimum_key_bits};
   foreach my $sig (@{$pms->{dkim_signatures}}) {
     next if !defined $sig;
     if ($must_be_valid) {
@@ -664,6 +716,8 @@
                 ->result ne 'pass';
       next if $sig->UNIVERSAL::can("check_expiration") &&
               !$sig->check_expiration;
+      next if $minimum_key_bits && $sig->{_spamassassin_key_size} &&
+              $sig->{_spamassassin_key_size} < $minimum_key_bits;
     }
     my $sdid = $sig->domain;
     next if !defined $sdid;  # a signature with a missing required tag 'd' ?
@@ -671,12 +725,16 @@
     if ($must_be_author_domain_signature) {
       next if !$pms->{dkim_author_domains}->{$sdid};
     }
-    foreach my $ad (@$acceptable_domains_ref) {
-      if ($ad =~ /^\*?\.(.*)\z/s) {  # domain itself or its subdomain
-        my $d = lc $1;
-        if ($sdid eq $d || $sdid =~ /\.\Q$d\E\z/s) { $result = 1; last }
-      } else {  # match on domain (not a subdomain)
-        if ($sdid eq lc $ad) { $result = 1; last }
+    if (!@$acceptable_domains_ref) {
+      $result = 1;
+    } else {
+      foreach my $ad (@$acceptable_domains_ref) {
+        if ($ad =~ /^\*?\.(.*)\z/s) {  # domain itself or its subdomain
+          my $d = lc $1;
+          if ($sdid eq $d || $sdid =~ /\.\Q$d\E\z/s) { $result = 1; last }
+        } else {  # match on domain (not a subdomain)
+          if ($sdid eq lc $ad) { $result = 1; last }
+        }
       }
     }
     last if $result;
@@ -705,7 +763,9 @@
 sub _check_dkim_signature {
   my ($self, $pms) = @_;
 
+  my $conf = $pms->{conf};
   my($verifier, @signatures, @valid_signatures);
+
   $pms->{dkim_checked_signature} = 1; # has this sub already been invoked?
   $pms->{dkim_signatures_ready} = 0;  # have we obtained & verified signatures?
   $pms->{dkim_signatures_dependable} = 0;
@@ -747,13 +807,14 @@
     my $timemethod = $self->{main}->UNIVERSAL::can("time_method") &&
                      $self->{main}->time_method("check_dkim_signature");
     if (Mail::DKIM::Verifier->VERSION >= 0.40) {
-      my $edns = $pms->{conf}->{dns_options}->{edns};
+      my $edns = $conf->{dns_options}->{edns};
       if ($edns && $edns >= 1024) {
         # Let Mail::DKIM use our interface to Net::DNS::Resolver.
         # Only do so if EDNS0 provides a reasonably-sized UDP payload size,
         # as our interface does not provide a DNS fallback to TCP, unlike
         # the Net::DNS::Resolver::send which does provide it.
-        my $res = $self->{main}->{resolver}->get_resolver;
+        my $res = $self->{main}->{resolver};
+        dbg("dkim: providing our own resolver: %s", ref $res);
         Mail::DKIM::DNS::resolver($res);
       }
     }
@@ -780,7 +841,7 @@
       return 0;           # cannot verify message
     };
 
-    my $timeout = $pms->{conf}->{dkim_timeout};
+    my $timeout = $conf->{dkim_timeout};
     my $timer = Mail::SpamAssassin::Timeout->new(
                   { secs => $timeout, deadline => $pms->{master_deadline} });
 
@@ -815,26 +876,41 @@
 
   if ($pms->{dkim_signatures_ready}) {
     my $sig_result_supported;
+    my $minimum_key_bits = $conf->{dkim_minimum_key_bits};
     foreach my $signature (@signatures) {
       # old versions of Mail::DKIM would give undef for an invalid signature
       next if !defined $signature;
+
       $sig_result_supported = $signature->UNIVERSAL::can("result_detail");
-      my $valid =
+      my($info, $valid, $expired);
+      $valid =
         ($sig_result_supported ? $signature : $verifier)->result eq 'pass';
-      my $expired = 0;
+      $info = $valid ? 'VALID' : 'FAILED';
       if ($valid && $signature->UNIVERSAL::can("check_expiration")) {
         $expired = !$signature->check_expiration;
+        $info .= ' EXPIRED'  if $expired;
+      }
+      my $key_size;
+      if ($valid && !$expired && $minimum_key_bits) {
+        $key_size = eval { my $pk = $signature->get_public_key;
+                           $pk && $pk->cork && $pk->cork->size * 8 };
+        if ($key_size) {
+          $signature->{_spamassassin_key_size} = $key_size; # stash it for later
+          $info .= " WEAK($key_size)"  if $key_size < $minimum_key_bits;
+        }
       }
       push(@valid_signatures, $signature)  if $valid && !$expired;
+
       # check if we have a potential Author Domain Signature, valid or not
       my $d = $signature->domain;
       if (!defined $d) {
-        # can be undefined on a broken signatures with missing required tags
+        # can be undefined on a broken signature with missing required tags
       } else {
         $d = lc $d;
         if ($pms->{dkim_author_domains}->{$d}) {  # SDID matches author domain
           $pms->{dkim_has_any_author_sig}->{$d} = 1;
-          if ($valid && !$expired) {
+          if ($valid && !$expired &&
+              $key_size && $key_size >= $minimum_key_bits) {
             $pms->{dkim_has_valid_author_sig}->{$d} = 1;
           } elsif ( ($sig_result_supported ? $signature
                                            : $verifier)->result_detail
@@ -844,16 +920,17 @@
         }
       }
       if (would_log("dbg","dkim")) {
-        dbg("dkim: %s, i=%s, d=%s, s=%s, a=%s, c=%s, %s%s, %s",
-          map { !defined $_ ? '(undef)' : $_ }
+        dbg("dkim: %s %s, i=%s, d=%s, s=%s, a=%s, c=%s, %s, %s, %s",
+          $info,
           $signature->isa('Mail::DKIM::DkSignature') ? 'DK' : 'DKIM',
-          $signature->identity, $d, $signature->selector,
-          $signature->algorithm, scalar($signature->canonicalization),
-          ($sig_result_supported ? $signature : $verifier)->result,
-          !$expired ? '' : ', expired',
+          map(!defined $_ ? '(undef)' : $_,
+            $signature->identity, $d, $signature->selector,
+            $signature->algorithm, scalar($signature->canonicalization),
+            $key_size ? "key_bits=$key_size" : "unknown key size",
+            ($sig_result_supported ? $signature : $verifier)->result ),
           defined $d && $pms->{dkim_author_domains}->{$d}
             ? 'matches author domain'
-            : 'does not match author domain'
+            : 'does not match author domain',
         );
       }
     }
@@ -866,15 +943,19 @@
       dbg("dkim: signature verification result: %s", uc($sig_res));
 
       # supply values for both tags
-      my(%seen1, %seen2, @identity_list, @domain_list);
+      my(%seen1, %seen2, %seen3, @identity_list, @domain_list, @selector_list);
       @identity_list = grep(defined $_ && $_ ne '' && !$seen1{$_}++,
                             map($_->identity, @valid_signatures));
       @domain_list =   grep(defined $_ && $_ ne '' && !$seen2{$_}++,
                             map($_->domain, @valid_signatures));
+      @selector_list = grep(defined $_ && $_ ne '' && !$seen3{$_}++,
+                            map($_->selector, @valid_signatures));
       $pms->set_tag('DKIMIDENTITY',
                     @identity_list == 1 ? $identity_list[0] : \@identity_list);
       $pms->set_tag('DKIMDOMAIN',
                     @domain_list == 1   ? $domain_list[0]   : \@domain_list);
+      $pms->set_tag('DKIMSELECTOR',
+                    @selector_list == 1   ? $selector_list[0]   : \@selector_list);
     } elsif (@signatures) {
       $pms->{dkim_signed} = 1;
       my $sig = $signatures[0];
@@ -1149,24 +1230,32 @@
   my %any_match_by_wl;
   my $any_match_at_all = 0;
   my $verifier = $pms->{dkim_verifier};
+  my $minimum_key_bits = $pms->{conf}->{dkim_minimum_key_bits};
 
   # walk through all signatures present in a message
   foreach my $signature (@{$pms->{dkim_signatures}}) {
     # old versions of Mail::DKIM would give undef for an invalid signature
     next if !defined $signature;
+
     my $sig_result_supported = $signature->UNIVERSAL::can("result_detail");
-    my $valid =
+    my($info, $valid, $expired, $key_size_weak);
+    $valid =
       ($sig_result_supported ? $signature : $verifier)->result eq 'pass';
-    my $expired = 0;
+    $info = $valid ? 'VALID' : 'FAILED';
     if ($valid && $signature->UNIVERSAL::can("check_expiration")) {
       $expired = !$signature->check_expiration;
+      $info .= ' EXPIRED'  if $expired;
+    }
+    if ($valid && !$expired && $minimum_key_bits) {
+      my $key_size = $signature->{_spamassassin_key_size};
+      if ($key_size && $key_size < $minimum_key_bits) {
+        $info .= " WEAK($key_size)"; $key_size_weak = 1;
+      }
     }
+
     my $sdid = $signature->domain;
     $sdid = lc $sdid  if defined $sdid;
 
-    my $info = $valid ? 'VALID' : 'FAILED';
-    $info .= ' EXPIRED'  if $expired;
-
     my %tried_authors;
     foreach my $entry (@$acceptable_sdid_tuples_ref) {
       my($author, $acceptable_sdid, $wl, $re) = @$entry;
@@ -1200,8 +1289,12 @@
         # identity (AUID). Nevertheless, be prepared to accept the full e-mail
         # address there for compatibility, and just ignore its local-part.
 
-        $acceptable_sdid = $1  if $acceptable_sdid =~ /\@([^\@]*)\z/;
-        $matches = 1  if $sdid eq lc $acceptable_sdid;
+        $acceptable_sdid = $1  if $acceptable_sdid =~ /\@([^\@]*)\z/s;
+        if ($acceptable_sdid =~ s/^\*?\.//s) {
+          $matches = 1  if $sdid =~ /\.\Q$acceptable_sdid\E\z/si;
+        } else {
+          $matches = 1  if $sdid eq lc $acceptable_sdid;
+        }
       }
       if ($matches) {
         if (would_log("dbg","dkim")) {
@@ -1218,7 +1311,7 @@
         $any_match_by_wl{$wl} = ''  if !exists $any_match_by_wl{$wl};
       }
       # only valid signature can cause whitelisting
-      $matches = 0  if !$valid || $expired;
+      $matches = 0  if !$valid || $expired || $key_size_weak;
 
       if ($matches) {
         $any_match_at_all = 1;
diff -Nru spamassassin-3.4.0/lib/Mail/SpamAssassin/Plugin/DNSEval.pm spamassassin-3.4.2/lib/Mail/SpamAssassin/Plugin/DNSEval.pm
--- spamassassin-3.4.0/lib/Mail/SpamAssassin/Plugin/DNSEval.pm	2014-02-07 03:36:27.000000000 -0500
+++ spamassassin-3.4.2/lib/Mail/SpamAssassin/Plugin/DNSEval.pm	2018-09-13 21:27:51.000000000 -0400
@@ -31,11 +31,10 @@
 
 use strict;
 use warnings;
-use bytes;
+# use bytes;
 use re 'taint';
 
-use vars qw(@ISA);
-@ISA = qw(Mail::SpamAssassin::Plugin);
+our @ISA = qw(Mail::SpamAssassin::Plugin);
 
 # constructor: register the eval rule
 sub new {
@@ -315,35 +314,34 @@
 # this only checks the address host name and not the domain name because
 # using the domain name had much worse results for dsn.rfc-ignorant.org
 sub check_rbl_from_host {
-  _check_rbl_addresses(@_, $_[1]->all_from_addrs());
+  my ($self, $pms, $rule, $set, $rbl_server, $subtest) = @_; 
+  _check_rbl_addresses($self, $pms, $rule, $set, $rbl_server, $subtest, $_[1]->all_from_addrs_domains());
 }
 
 =over 4
 
 =item check_rbl_from_domain
 
-This checks all the from addrs domain names as an alternate to check_rbl_from_host
+This checks all the from addrs domain names as an alternate to check_rbl_from_host.  As of v3.4.1, it has been improved to include a subtest for a specific octet.
+
+=back
 
 =cut
+
 sub check_rbl_from_domain {
-  _check_rbl_addresses(@_, $_[1]->all_from_addrs_domains());
+  my ($self, $pms, $rule, $set, $rbl_server, $subtest) = @_;
+  _check_rbl_addresses($self, $pms, $rule, $set, $rbl_server, $subtest, $_[1]->all_from_addrs_domains());
 }
 
-=item has_check_rbl_from_domain
-
-Adds capability check for "if can()" for check_rbl_from_domain
-
-=cut
-sub has_check_rbl_from_domain { 1 }
-
 # this only checks the address host name and not the domain name because
 # using the domain name had much worse results for dsn.rfc-ignorant.org
 sub check_rbl_envfrom {
-  _check_rbl_addresses(@_, $_[1]->get('EnvelopeFrom:addr',undef));
+  my ($self, $pms, $rule, $set, $rbl_server, $subtest) = @_; 
+  _check_rbl_addresses($self, $pms, $rule, $set, $rbl_server, $subtest, $_[1]->get('EnvelopeFrom:addr',undef));
 }
 
 sub _check_rbl_addresses {
-  my ($self, $pms, $rule, $set, $rbl_server, @addresses) = @_;
+  my ($self, $pms, $rule, $set, $rbl_server, $subtest, @addresses) = @_;
   
   return 0 if $self->{main}->{conf}->{skip_rbl_checks};
   return 0 unless $pms->is_dns_available();
@@ -371,7 +369,7 @@
 
   for my $host (keys %hosts) {
     dbg("dns: checking [$host] / $rule / $set / $rbl_server");
-    $pms->do_rbl_lookup($rule, $set, 'A', "$host.$rbl_server");
+    $pms->do_rbl_lookup($rule, $set, 'A', "$host.$rbl_server", $subtest);
   }
 }
 
diff -Nru spamassassin-3.4.0/lib/Mail/SpamAssassin/Plugin/FreeMail.pm spamassassin-3.4.2/lib/Mail/SpamAssassin/Plugin/FreeMail.pm
--- spamassassin-3.4.0/lib/Mail/SpamAssassin/Plugin/FreeMail.pm	2014-02-07 03:36:27.000000000 -0500
+++ spamassassin-3.4.2/lib/Mail/SpamAssassin/Plugin/FreeMail.pm	2018-09-13 21:27:51.000000000 -0400
@@ -1,5 +1,6 @@
 package Mail::SpamAssassin::Plugin::FreeMail;
 use strict;
+use warnings;
 my $VERSION = 2.002;
 
 ### About:
@@ -109,30 +110,11 @@
 
 use Mail::SpamAssassin::Plugin;
 use Mail::SpamAssassin::PerMsgStatus;
-use Mail::SpamAssassin::Util::RegistrarBoundaries;
-use vars qw(@ISA);
-@ISA = qw(Mail::SpamAssassin::Plugin);
-
-# List of TLDs from RegistrarBoundaries.pm
-my $tlds = $Mail::SpamAssassin::Util::RegistrarBoundaries::VALID_TLDS_RE;
-
-### Some regexp tips courtesy of http://www.regular-expressions.info/email.html
-### v 0.02
-# full email regex
-my $email_regex = qr/
-  (?=.{0,64}\@)				# limit userpart to 64 chars (and speed up searching?)
-  (?<![a-z0-9!#\$%&'*+\/=?^_`{|}~-])	# start boundary
-  (					# capture email
-  [a-z0-9!#\$%&'*+\/=?^_`{|}~-]+	# no dot in beginning
-  (?:\.[a-z0-9!#\$%&'*+\/=?^_`{|}~-]+)*	# no consecutive dots, no ending dot
-  \@
-  (?:[a-z0-9](?:[a-z0-9-]{0,59}[a-z0-9])?\.){1,4} # max 4x61 char parts (should be enough?)
-  ${tlds}				# ends with valid tld
-  )
-  (?!(?:[a-z0-9-]|\.[a-z0-9]))		# make sure domain ends here
-/xi;
+
+our @ISA = qw(Mail::SpamAssassin::Plugin);
+
 # default email whitelist
-my $email_whitelist = qr/
+our $email_whitelist = qr/
   ^(?:
       abuse|support|sales|info|helpdesk|contact|kontakt
     | (?:post|host|domain)master
@@ -146,7 +128,8 @@
 
 # skip replyto check when envelope sender is
 # allow <> for now
-my $skip_replyto_envfrom = qr/
+# no re "strict";  # since perl 5.21.8: Ranges of ASCII printables...
+our $skip_replyto_envfrom = qr/
   (?:
       ^(?:post|host|domain)master
     | ^double-bounce
@@ -157,7 +140,6 @@
   )\@
 /xi;
 
-
 sub dbg { Mail::SpamAssassin::Plugin::dbg ("FreeMail: @_"); }
 
 sub new {
@@ -174,6 +156,22 @@
     $self->register_eval_rule("check_freemail_header");
     $self->register_eval_rule("check_freemail_body");
 
+    # Need to init the regex here, utilizing registryboundaries->valid_tlds_re
+    # Some regexp tips courtesy of http://www.regular-expressions.info/email.html
+    # full email regex v0.02
+    $self->{email_regex} = qr/
+      (?=.{0,64}\@)				# limit userpart to 64 chars (and speed up searching?)
+      (?<![a-z0-9!#\$%&'*+\/=?^_`{|}~-])	# start boundary
+      (						# capture email
+      [a-z0-9!#\$%&'*+\/=?^_`{|}~-]+		# no dot in beginning
+      (?:\.[a-z0-9!#\$%&'*+\/=?^_`{|}~-]+)*	# no consecutive dots, no ending dot
+      \@
+      (?:[a-z0-9](?:[a-z0-9-]{0,59}[a-z0-9])?\.){1,4} # max 4x61 char parts (should be enough?)
+      $self->{main}->{registryboundaries}->{valid_tlds_re}	# ends with valid tld
+      )
+      (?!(?:[a-z0-9-]|\.[a-z0-9]))		# make sure domain ends here
+    /xi;
+
     return $self;
 }
 
@@ -329,7 +327,7 @@
         my $parsed = $pms->get_uri_detail_list();
         while (my($uri, $info) = each %{$parsed}) {
             if (defined $info->{types}->{a} and not defined $info->{types}->{parsed}) {
-                if ($uri =~ /^(?:(?i)mailto):${email_regex}/) {
+                if ($uri =~ /^(?:(?i)mailto):$self->{email_regex}/) {
                     my $email = lc($1);
                     push(@body_emails, $email) unless defined $seen{$email};
                     $seen{$email} = 1;
@@ -342,20 +340,21 @@
         my $body = $pms->get_decoded_stripped_body_text_array();
         BODY: foreach (@$body) {
             # strip urls with possible emails inside
-            s#<?https?://\S{0,255}(?:\@|%40)\S{0,255}# #gi;
+            s{<?https?://\S{0,255}(?:\@|%40)\S{0,255}}{ }gi;
             # strip emails contained in <>, not mailto:
             # also strip ones followed by quote-like "wrote:" (but not fax: and tel: etc)
-            s#<?(?<!mailto:)${email_regex}(?:>|\s{1,10}(?!(?:fa(?:x|csi)|tel|phone|e?-?mail))[a-z]{2,11}:)# #gi;
-            while (/$email_regex/g) {
+            s{<?(?<!mailto:)$self->{email_regex}(?:>|\s{1,10}(?!(?:fa(?:x|csi)|tel|phone|e?-?mail))[a-z]{2,11}:)}{ }gi;
+            while (/$self->{email_regex}/g) {
                 my $email = lc($1);
-                push(@body_emails, $email) unless defined $seen{$email};
+                utf8::encode($email) if utf8::is_utf8($email); # chars to UTF-8
+                push(@body_emails, $email) unless $seen{$email};
                 $seen{$email} = 1;
-                last BODY if scalar @body_emails >= 40; # sanity
+                last BODY if @body_emails >= 40; # sanity
             }
         }
         my $count_all = 0;
         my $count_fm = 0;
-        foreach my $email (@body_emails) {
+        foreach my $email (@body_emails) {  # as UTF-8 octets
             if (++$count_all == $pms->{main}->{conf}->{freemail_max_body_emails}) {
                 if ($pms->{main}->{conf}->{freemail_skip_when_over_max}) {
                     $pms->{freemail_skip_body} = 1;
@@ -425,24 +424,26 @@
         }
     }
 
-    my $email = lc($pms->get(index($header,':') >= 0 ? $header : $header.":addr"));
-
-    if ($email eq '') {
-        dbg("header $header not found from mail");
-        return 0;
-    }
-    dbg("address from header $header: $email");
+    my @emails = map (lc, $pms->{main}->find_all_addrs_in_line ($pms->get($header)));
 
-    if ($self->_is_freemail($email)) {
-        if (defined $re) {
-            return 0 unless $email =~ $re;
-            dbg("HIT! $email is freemail and matches regex");
-        }
-        else {
-            dbg("HIT! $email is freemail");
-        }
-        $self->_got_hit($pms, $email, "Header $header is freemail");
-        return 0;
+    if (!scalar (@emails)) {
+         dbg("header $header not found from mail");
+         return 0;
+    }
+    dbg("addresses from header $header: ".join(';',@emails));
+
+    foreach my $email (@emails) {    
+        if ($self->_is_freemail($email)) {
+            if (defined $re) {
+                next unless $email =~ $re;
+                dbg("HIT! $email is freemail and matches regex");
+            }
+            else {
+                dbg("HIT! $email is freemail");
+            }
+            $self->_got_hit($pms, $email, "Header $header is freemail");
+            return 1;
+         }
     }
 
     return 0;
diff -Nru spamassassin-3.4.0/lib/Mail/SpamAssassin/Plugin/FromNameSpoof.pm spamassassin-3.4.2/lib/Mail/SpamAssassin/Plugin/FromNameSpoof.pm
--- spamassassin-3.4.0/lib/Mail/SpamAssassin/Plugin/FromNameSpoof.pm	1969-12-31 19:00:00.000000000 -0500
+++ spamassassin-3.4.2/lib/Mail/SpamAssassin/Plugin/FromNameSpoof.pm	2018-09-13 21:27:51.000000000 -0400
@@ -0,0 +1,423 @@
+# <@LICENSE>
+# Licensed to the Apache Software Foundation (ASF) under one or more
+# contributor license agreements.  See the NOTICE file distributed with
+# this work for additional information regarding copyright ownership.
+# The ASF licenses this file to you under the Apache License, Version 2.0
+# (the "License"); you may not use this file except in compliance with
+# the License.  You may obtain a copy of the License at:
+#
+#     http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+# </@LICENSE>
+
+=head1 NAME
+
+FromNameSpoof - perform various tests to detect spoof attempts using the From header name section
+
+=head1 SYNOPSIS
+
+loadplugin    Mail::SpamAssassin::Plugin::FromNameSpoof
+
+ # Does the From:name look like it contains an email address
+ header   __PLUGIN_FROMNAME_EMAIL  eval:check_fromname_contains_email()
+
+ # Is the From:name different to the From:addr header
+ header   __PLUGIN_FROMNAME_DIFFERENT  eval:check_fromname_different()
+
+ # From:name and From:addr owners differ
+ header   __PLUGIN_FROMNAME_OWNERS_DIFFER  eval:check_fromname_owners_differ()
+
+ # From:name domain differs to from header
+ header   __PLUGIN_FROMNAME_DOMAIN_DIFFER  eval:check_fromname_domain_differ()
+
+ # From:name and From:address don't match and owners differ
+ header   __PLUGIN_FROMNAME_SPOOF  eval:check_fromname_spoof()
+  
+ # From:name address matches To:address
+ header __PLUGIN_FROMNAME_EQUALS_TO  eval:check_fromname_equals_to()
+
+=head1 DESCRIPTION
+
+Perform various tests against From:name header to detect spoofing. Steps in place to 
+ensure minimal FPs.
+
+=head1 CONFIGURATION
+
+The plugin allows you to skip emails that have been DKIM signed by specific senders:
+
+ fns_ignore_dkim googlegroups.com
+
+FromNameSpoof allows for a configurable closeness when matching the From:addr and From:name,
+the closeness can be adjusted with:
+
+ fns_extrachars 5
+
+B<Note> that FromNameSpoof detects the "owner" of a domain by the following search:
+
+ <owner>.<tld>
+
+By default FromNameSpoof will ignore the TLD when testing if From:addr is spoofed.
+Default 1
+
+  dns_check 1
+
+Check levels:
+
+ 0 - Strict checking of From:name != From:addr
+ 1 - Allow for different tlds
+ 2 - Allow for different aliases but same domain
+
+=head1 TAGS
+
+The following tags are added to the set if a spoof is detected. They are available for 
+use in reports, header fields, other plugins, etc.:
+
+  _FNSFNAMEADDR_
+    Detected spoof address from From:name header
+
+  _FNSFNAMEDOMAIN_
+    Detected spoof domain from From:name header
+
+  _FNSFNAMEOWNER_
+    Detected spoof owner from From:name header
+
+  _FNSFADDRADDR_
+    Actual From:addr address
+
+  _FNSFADDRDOMAIN_ 
+    Actual From:addr domain
+
+  _FNSFADDROWNER_
+    Actual From:addr detected owner
+=head1 EXAMPLE 
+
+header   __PLUGIN_FROMNAME_SPOOF eval:check_fromname_spoof()
+header   __PLUGIN_FROMNAME_EQUALS_TO eval:check_fromname_equals_to()
+
+meta     FROMNAME_SPOOF_EQUALS_TO  (__PLUGIN_FROMNAME_SPOOF && __PLUGIN_FROMNAME_EQUALS_TO)
+describe FROMNAME_SPOOF_EQUALS_TO From:name is spoof to look like To: address
+score    FROMNAME_SPOOF_EQUALS_TO 1.2
+
+=cut
+
+use strict;
+
+package Mail::SpamAssassin::Plugin::FromNameSpoof;
+my $VERSION = 0.8;
+
+use Mail::SpamAssassin::Plugin;
+use List::Util ();
+use Mail::SpamAssassin::Util;
+
+use vars qw(@ISA);
+@ISA = qw(Mail::SpamAssassin::Plugin);
+
+sub dbg { Mail::SpamAssassin::Plugin::dbg ("FromNameSpoof: @_"); }
+
+sub uri_to_domain {
+  my ($self, $domain) = @_;
+
+  return unless defined $domain;
+
+  if ($Mail::SpamAssassin::VERSION <= 3.004000) {
+    Mail::SpamAssassin::Util::uri_to_domain($domain);
+  } else {
+    $self->{main}->{registryboundaries}->uri_to_domain($domain);
+  }
+}
+
+# constructor: register the eval rule
+sub new
+{
+  my $class = shift;
+  my $mailsaobject = shift;
+
+  # some boilerplate...
+  $class = ref($class) || $class;
+  my $self = $class->SUPER::new($mailsaobject);
+  bless ($self, $class);
+
+  $self->set_config($mailsaobject->{conf});
+
+  # the important bit!
+  $self->register_eval_rule("check_fromname_spoof");
+  $self->register_eval_rule("check_fromname_different");
+  $self->register_eval_rule("check_fromname_domain_differ");
+  $self->register_eval_rule("check_fromname_contains_email");
+  $self->register_eval_rule("check_fromname_equals_to");
+  $self->register_eval_rule("check_fromname_owners_differ");
+  $self->register_eval_rule("check_fromname_equals_replyto");
+  return $self;
+}
+
+sub set_config {
+  my ($self, $conf) = @_;
+  my @cmds = ();
+
+  push (@cmds, {
+    setting => 'fns_add_addrlist',
+    type => 5,
+    code => sub {
+      my($conf, $key, $value, $line) = @_;
+      local($1,$2);
+      if ($value !~ /^ \( (.*?) \) \s+ (.*) \z/sx) {
+        return $Mail::SpamAssassin::Conf::MISSING_REQUIRED_VALUE;
+      }
+      my $listname = "FNS_$1";
+      $value = $2;
+      $conf->{parser}->add_to_addrlist ($listname, split(/\s+/, $value));
+    }
+  });
+
+  push (@cmds, {
+    setting => 'fns_remove_addrlist',
+    type => 5,
+    code => sub {
+      my($conf, $key, $value, $line) = @_;
+      local($1,$2);
+      if ($value !~ /^ \( (.*?) \) \s+ (.*) \z/sx) {
+        return $Mail::SpamAssassin::Conf::MISSING_REQUIRED_VALUE;
+      }
+      my $listname = "FNS_$1";
+      $value = $2;
+      $conf->{parser}->remove_from_addrlist ($listname, split (/\s+/, $value));
+    }
+  });
+
+  push(@cmds, {
+    setting => 'fns_extrachars',
+    default => 5,
+    type => $Mail::SpamAssassin::Conf::CONF_TYPE_NUMERIC,
+  });
+
+  push (@cmds, {
+    setting => 'fns_ignore_dkim',
+    default => [],
+    type => $Mail::SpamAssassin::Conf::CONF_TYPE_STRINGLIST,
+    code => sub {
+      my ($self, $key, $value, $line) = @_;
+      if ($value eq '') {
+        return $Mail::SpamAssassin::Conf::MISSING_REQUIRED_VALUE;
+      }
+      $self->{fns_ignore_dkim} = {};
+      $self->{fns_ignore_dkim}->{$_} = 1 for (split(/\s+/, $value));
+    }
+  });
+
+  push (@cmds, {
+    setting => 'fns_ignore_headers',
+    default => [],
+    type => $Mail::SpamAssassin::Conf::CONF_TYPE_STRINGLIST,
+    code => sub {
+      my ($self, $key, $value, $line) = @_;
+      if ($value eq '') {
+        return $Mail::SpamAssassin::Conf::MISSING_REQUIRED_VALUE;
+      }
+      $self->{fns_ignore_header} = {};
+      $self->{fns_ignore_header}->{$_} = 1 for (split(/\s+/, $value));
+    }
+  });
+
+  push(@cmds, {
+    setting => 'fns_check',
+    default => 1,
+    type => $Mail::SpamAssassin::Conf::CONF_TYPE_NUMERIC,
+  });
+
+  $conf->{parser}->register_commands(\@cmds);
+}
+
+sub parsed_metadata {
+  my ($self, $opts) = @_;
+  my $pms = $opts->{permsgstatus};
+  $pms->action_depends_on_tags('DKIMDOMAIN',
+      sub { my($pms,@args) = @_;
+        $self->_check_fromnamespoof($pms);
+      }
+  );
+  1;
+}
+
+sub check_fromname_different
+{
+  my ($self, $pms) = @_;
+  $self->_check_fromnamespoof($pms);
+  return $pms->{fromname_address_different};
+}
+
+sub check_fromname_domain_differ
+{
+  my ($self, $pms) = @_;
+  $self->_check_fromnamespoof($pms);
+  return $pms->{fromname_domain_different};
+}
+
+sub check_fromname_spoof
+{
+  my ($self, $pms, $check_lvl) = @_;
+  $self->_check_fromnamespoof($pms);
+
+  $check_lvl //= $self->{main}{conf}{fns_check};
+
+  my @array = (
+    ($pms->{fromname_address_different}) ,
+    ($pms->{fromname_address_different} && $pms->{fromname_owner_different}) ,
+    ($pms->{fromname_address_different} && $pms->{fromname_domain_different})
+  );
+
+  return $array[$check_lvl];
+
+}
+
+sub check_fromname_contains_email
+{
+  my ($self, $pms) = @_;
+  $self->_check_fromnamespoof($pms);
+  return $pms->{fromname_contains_email};
+}
+
+sub check_fromname_equals_replyto
+{
+  my ($self, $pms) = @_;
+  $self->_check_fromnamespoof($pms);
+  return $pms->{fromname_equals_replyto};
+}
+
+sub check_fromname_equals_to
+{
+  my ($self, $pms) = @_;
+  $self->_check_fromnamespoof($pms);
+  return $pms->{fromname_equals_to_addr};
+}
+
+sub check_fromname_owners_differ
+{
+  my ($self, $pms) = @_;
+  $self->_check_fromnamespoof($pms);
+  return $pms->{fromname_owner_different};
+}
+
+sub _check_fromnamespoof
+{
+  my ($self, $pms) = @_;
+
+  return if (defined $pms->{fromname_contains_email});
+
+  $pms->{fromname_contains_email} = 0;
+  $pms->{fromname_address_different} = 0;
+  $pms->{fromname_equals_to_addr} = 0;
+  $pms->{fromname_domain_different} = 0;
+  $pms->{fromname_owner_different} = 0;
+  $pms->{fromname_equals_replyto} = 0;
+
+  foreach my $addr (split / /, $pms->get_tag('DKIMDOMAIN') || '') {
+    return 0 if ($self->{main}{conf}{fns_ignore_dkim}{$addr});
+  }
+
+  foreach my $iheader (keys %{$self->{main}{conf}{fns_ignore_header}}) {
+    return 0 if ($pms->get($iheader));
+  }
+
+  my $list_refs = {};
+
+  foreach my $conf (keys %{$self->{main}{conf}}) {
+    if ($conf =~ /^FNS_/) {
+      $list_refs->{$conf} = $self->{main}{conf}{$conf};
+    }
+  }
+
+  my %fnd = ();
+  my %fad = ();
+  my %tod = ();
+
+  $fnd{'addr'} = $pms->get("From:name");
+
+  if ($fnd{'addr'} =~ /\b([\w\.\!\#\$\%\&\'\*\+\/\=\?\^\_\`\{\|\}\~\-]+@[\w\-\.]+\.[\w\-\.]++)\b/i) {
+    my $nochar = ($fnd{'addr'} =~ y/A-Za-z0-9//c);
+    $nochar -= ($1 =~ y/A-Za-z0-9//c);
+
+    return 0 unless ((length($fnd{'addr'})+$nochar) - length($1) <= $self->{main}{conf}{'fns_extrachars'});
+
+    $fnd{'addr'} = lc $1;
+  } else {
+    return 0;
+  }
+
+  my $replyto = lc $pms->get("Reply-To:addr");
+
+  $fad{'addr'} = lc $pms->get("From:addr");
+  my @toaddrs = $pms->all_to_addrs();
+
+  $tod{'addr'} = lc $toaddrs[0];
+
+  $fnd{'domain'} = $self->uri_to_domain($fnd{'addr'});
+  $fad{'domain'} = $self->uri_to_domain($fad{'addr'});
+  $tod{'domain'} = $self->uri_to_domain($tod{'addr'});
+
+  return 0 unless (defined $fnd{'domain'} && defined $fad{'domain'});
+
+  $pms->{fromname_contains_email} = 1;
+
+  $fnd{'owner'} = $self->_find_address_owner($fnd{'addr'}, $list_refs);
+
+  $fad{'owner'} = $self->_find_address_owner($fad{'addr'}, $list_refs);
+
+  $tod{'owner'} = $self->_find_address_owner($tod{'addr'}, $list_refs);
+
+  $pms->{fromname_address_different} = 1 if ($fnd{'addr'} ne $fad{'addr'});
+
+  $pms->{fromname_domain_different} = 1 if ($fnd{'domain'} ne $fad{'domain'});
+
+  $pms->{fromname_equals_to_addr} = 1 if ($fnd{'addr'} eq $tod{addr});
+
+  $pms->{fromname_equals_replyto} = 1 if ($fnd{'addr'} eq $replyto);
+
+  if ($fnd{'owner'} ne $fad{'owner'}) {
+    $pms->{fromname_owner_different} = 1;
+  }
+
+  if ($pms->{fromname_address_different}) {
+    $pms->set_tag("FNSFNAMEADDR", $fnd{'addr'});
+    $pms->set_tag("FNSFADDRADDR", $fad{'addr'});
+    $pms->set_tag("FNSFNAMEOWNER", $fnd{'owner'});
+    $pms->set_tag("FNSFADDROWNER", $fad{'owner'});
+    $pms->set_tag("FNSFNAMEDOMAIN", $fnd{'domain'});
+    $pms->set_tag("FNSFADDRDOMAIN", $fad{'domain'});
+
+    dbg("From name spoof: $fnd{'addr'} $fnd{'domain'} $fnd{'owner'}");
+    dbg("Actual From: $fad{'addr'} $fad{'domain'} $fad{'owner'}");
+    dbg("To Address: $tod{'addr'} $tod{'domain'} $tod{'owner'}");
+  }
+}
+
+sub _find_address_owner
+{
+  my ($self, $check, $list_refs) = @_;
+  foreach my $owner (keys %{$list_refs}) {
+    foreach my $white_addr (keys %{$list_refs->{$owner}}) {
+      my $regexp = qr/$list_refs->{$owner}{$white_addr}/i;
+      if ($check =~ /$regexp/)  {
+        $owner =~ s/^FNS_//i;
+        return lc $owner;
+      }
+    }
+  }
+
+  my $owner = $self->uri_to_domain($check);
+
+  $check =~ /^([^\@]+)\@(.*)$/;
+
+  if ($owner ne $2) {
+    return $self->_find_address_owner("$1\@$owner", $list_refs);
+  }
+
+  $owner =~ /^([^\.]+)\./;
+  return lc $1;
+}
+
+1;
diff -Nru spamassassin-3.4.0/lib/Mail/SpamAssassin/Plugin/HashBL.pm spamassassin-3.4.2/lib/Mail/SpamAssassin/Plugin/HashBL.pm
--- spamassassin-3.4.0/lib/Mail/SpamAssassin/Plugin/HashBL.pm	1969-12-31 19:00:00.000000000 -0500
+++ spamassassin-3.4.2/lib/Mail/SpamAssassin/Plugin/HashBL.pm	2018-09-13 21:27:51.000000000 -0400
@@ -0,0 +1,266 @@
+# Author: Steve Freegard <steve.freegard@fsl.com>
+# Copyright 2016 Steve Freegard
+#
+# <@LICENSE>
+# Licensed to the Apache Software Foundation (ASF) under one or more
+# contributor license agreements.  See the NOTICE file distributed with
+# this work for additional information regarding copyright ownership.
+# The ASF licenses this file to you under the Apache License, Version 2.0
+# (the "License"); you may not use this file except in compliance with
+# the License.  You may obtain a copy of the License at:
+#
+#     http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+# </@LICENSE>
+#
+
+=head1 NAME
+
+HashBL - seearch email addresses in HashBL blocklists
+
+=head1 SYNOPSIS
+
+  loadplugin Mail::SpamAssassin::Plugin::HashBL
+  header   HASHBL_EMAIL       eval:check_hashbl_emails('ebl.msbl.org')
+  describe HASHBL_EMAIL       Message contains email address found on EBL
+
+=head1 DESCRIPTION
+
+The Email Blocklist (EBL) contains email addresses used to receive responses to spam emails.
+These email addresses are sometimes called contact email addresses or 
+drop boxes.
+The initial target of this blocklist was "Nigerian" 419 Advance Fee Fraud spam. As time passed and more types of spam that used drop boxes was identified, 
+these drop boxes also were listed.
+The EBL now lists significant numbers of drop boxes used in spam sent 
+by Chinese manufacturers of high-tech and light industrial products, 
+SEO/web development companies, direct spam services, list sellers, and a number
+of fraudulent or outright illegal products sold by botnets.
+
+=cut
+
+package Mail::SpamAssassin::Plugin::HashBL;
+use strict;
+use warnings;
+my $VERSION = 0.001;
+
+use Mail::SpamAssassin::Plugin;
+use Mail::SpamAssassin::PerMsgStatus;
+use Mail::SpamAssassin::Util;
+use Digest::SHA qw(sha1_hex);
+use Digest::MD5 qw(md5_hex);
+
+use vars qw(@ISA $email_whitelist $skip_replyto_envfrom);
+@ISA = qw(Mail::SpamAssassin::Plugin);
+
+sub dbg { Mail::SpamAssassin::Plugin::dbg ("HashBL: @_"); }
+
+sub new {
+    my ($class, $mailsa) = @_;
+
+    $class = ref($class) || $class;
+    my $self = $class->SUPER::new($mailsa);
+    bless ($self, $class);
+
+    $self->{hashbl_available} = 1;
+    $self->set_config($mailsa->{conf});
+    $self->register_eval_rule("check_hashbl_emails");
+
+    # Need to init the regex here, utilizing registryboundaries->valid_tlds_re
+    # Some regexp tips courtesy of http://www.regular-expressions.info/email.html
+    # full email regex v0.02
+    $self->{email_regex} = qr/
+      (?=.{0,64}\@)				# limit userpart to 64 chars (and speed up searching?)
+      (?<![a-z0-9!#\$%&'*+\/=?^_`{|}~-])	# start boundary
+      (						# capture email
+      [a-z0-9!#\$%&'*+\/=?^_`{|}~-]+		# no dot in beginning
+      (?:\.[a-z0-9!#\$%&'*+\/=?^_`{|}~-]+)*	# no consecutive dots, no ending dot
+      \@
+      (?:[a-z0-9](?:[a-z0-9-]{0,59}[a-z0-9])?\.){1,4} # max 4x61 char parts (should be enough?)
+      $self->{main}->{registryboundaries}->{valid_tlds_re}	# ends with valid tld
+      )
+      (?!(?:[a-z0-9-]|\.[a-z0-9]))		# make sure domain ends here
+    /xi;
+
+    return $self;
+}
+
+sub set_config {
+    my ($self, $conf) = @_;
+    my @cmds;
+}
+
+sub parse_config {
+    my ($self, $opts) = @_;
+    return 0;
+}
+
+sub _parse_headers {
+    my ($self, $pms) = @_;
+
+    if (not defined $pms->{hashbl_email_cache}) {
+        %{$pms->{hashbl_email_cache}{'headers'}} = ();
+    }
+
+    my @headers = ('EnvelopeFrom', 'Sender', 'From', 'Reply-To');
+
+    foreach my $header (@headers) {
+        my $email = $pms->get($header . ':addr');
+        if ($email) {
+            dbg("Found email $email in header $header");
+            $pms->{hashbl_email_cache}{'headers'}{$email} = 1;
+        }
+    }
+
+    return 1;
+}
+
+sub _parse_body {
+    my ($self, $pms) = @_;
+
+    # Parse body
+    if (not defined $pms->{hashbl_email_cache}) {
+        %{$pms->{hashbl_email_cache}{'body'}} = ();
+    }
+
+    my %seen;
+    my @body_emails;
+    # get all <a href="mailto:", since they don't show up on stripped_body
+    my $parsed = $pms->get_uri_detail_list();
+    while (my($uri, $info) = each %{$parsed}) {
+        if (defined $info->{types}->{a} and not defined $info->{types}->{parsed}) {
+            if ($uri =~ /^(?:(?i)mailto):$self->{email_regex}/) {
+                my $email = lc($1);
+                push(@body_emails, $email) unless defined $seen{$email};
+                $seen{$email} = 1;
+                last if scalar @body_emails >= 20; # sanity
+            }
+        }
+    }
+    # scan stripped normalized body
+    # have to do this way since get_uri_detail_list doesn't know what mails are inside <>
+    my $body = $pms->get_decoded_stripped_body_text_array();
+    BODY: foreach (@$body) {
+        # strip urls with possible emails inside
+        s#<?https?://\S{0,255}(?:\@|%40)\S{0,255}# #gi;
+        # strip emails contained in <>, not mailto:
+        # also strip ones followed by quote-like "wrote:" (but not fax: and tel: etc)
+        s#<?(?<!mailto:)$self->{email_regex}(?:>|\s{1,10}(?!(?:fa(?:x|csi)|tel|phone|e?-?mail))[a-z]{2,11}:)# #gi;
+        while (/$self->{email_regex}/g) {
+            my $email = lc($1);
+            push(@body_emails, $email) unless defined $seen{$email};
+            $seen{$email} = 1;
+            last BODY if scalar @body_emails >= 40; # sanity
+        }
+    }
+    foreach my $email (@body_emails) {
+        dbg("Found email $email in body");
+        $pms->{hashbl_email_cache}{'body'}{$email} = 1;
+    }
+    
+    return 1;
+}
+
+sub _got_hit {
+    my ($self, $pms, $rulename, $email, $desc) = @_;
+
+    if (defined $pms->{conf}->{descriptions}->{$rulename}) {
+        $desc = $pms->{conf}->{descriptions}->{$rulename};
+    }
+
+    $email =~ s/\@/[at]/g;
+    $pms->got_hit($rulename, "", description => $desc." ($email)", ruletype => 'eval');
+}
+
+sub _submit_email_query {
+    my ($self, $pms, $list, $type, $email) = @_;
+    my $rulename = $pms->get_current_eval_rule_name();
+    my ($hash, $lookup, $key);
+    if (uc($type) eq 'SHA1') {
+        $hash = sha1_hex($email);
+    }
+    elsif (uc($type) eq 'MD5') {
+        $hash = md5_hex($email);
+    }
+    $lookup = "$hash.$list.";
+    my $obj = { email => $email };
+    dbg("list: $list, type: $type, email: $email, hash: $hash, lookup: $lookup");
+    $key = "HASHBL_EMAIL:$lookup";
+    my $ent = {
+        key => $key,
+        zone => $list,
+        obj => $obj,
+        type => 'HASHBL',
+        rulename => $rulename,
+    };
+
+    $ent = $pms->{async}->bgsend_and_start_lookup($lookup, 'A', undef, $ent, sub {
+        my ($ent2, $pkt) = @_;
+        $self->_finish_email_lookup($pms, $ent2, $pkt);
+    }, master_deadline => $pms->{master_deadline} );
+
+    return $ent;   
+}
+
+sub _finish_email_lookup {
+  my ($self, $pms, $ent, $pkt) = @_;
+
+  if (!$pkt) {
+      # $pkt will be undef if the DNS query was aborted (e.g. timed out)
+      dbg("_finish_email_lookup aborted: ",
+          $ent->{rulename}, $ent->{key});
+      return;
+  }
+
+  my $email = $ent->{obj}->{email};
+
+  dbg("_finish_email_lookup: ", $ent->{rulename}, $ent->{key}, $email);
+ 
+  my @answer = $pkt->answer;
+  foreach my $rr (@answer) {
+      if ($rr->address =~ /^127\./) {
+          $self->_got_hit($pms, $ent->{rulename}, $email);
+          $pms->register_async_rule_finish($ent->{rulename});
+      }
+  }
+}
+
+sub check_hashbl_emails {
+    my ($self, $pms, $list, $type) = @_;
+
+    return 0 unless $self->{hashbl_available};
+
+    my $rulename = $pms->get_current_eval_rule_name();
+
+    # First we lookup all unique email addresses found in the headers
+    return 0 unless $self->_parse_headers($pms);
+    foreach my $email (keys %{$pms->{hashbl_email_cache}{'headers'}}) {
+        # Remove this from the body hash
+        delete $pms->{hashbl_email_cache}{'body'}{$email};
+        dbg("HEADER: $email");
+        $self->_submit_email_query($pms, $list, (($type) ? $type : 'SHA1'), $email);
+    }
+
+    # Check any e-mail addresses found in the message body
+    return 0 unless $self->_parse_body($pms);
+
+    my (@emails) = keys %{$pms->{hashbl_email_cache}{'body'}};
+
+    # Randomize order and truncate the array to 10 items maximum
+    Mail::SpamAssassin::Util::fisher_yates_shuffle(\@emails);
+    $#emails = 9 if (scalar @emails > 10);
+
+    foreach my $email (@emails) {
+        #$self->_got_hit($pms, $email, "Email found in list $list");
+        dbg("BODY: $email");
+        $self->_submit_email_query($pms, $list, (($type) ? $type : 'SHA1'), $email);
+    }
+
+    return 0;
+}
+
+1;
diff -Nru spamassassin-3.4.0/lib/Mail/SpamAssassin/Plugin/Hashcash.pm spamassassin-3.4.2/lib/Mail/SpamAssassin/Plugin/Hashcash.pm
--- spamassassin-3.4.0/lib/Mail/SpamAssassin/Plugin/Hashcash.pm	2014-02-07 03:36:27.000000000 -0500
+++ spamassassin-3.4.2/lib/Mail/SpamAssassin/Plugin/Hashcash.pm	2018-09-13 21:27:51.000000000 -0400
@@ -85,7 +85,7 @@
 
 use strict;
 use warnings;
-use bytes;
+# use bytes;
 use re 'taint';
 
 use Mail::SpamAssassin::Plugin;
@@ -102,8 +102,7 @@
   or do { require Digest::SHA1; import Digest::SHA1 qw(sha1) }
 }
 
-use vars qw(@ISA);
-@ISA = qw(Mail::SpamAssassin::Plugin);
+our @ISA = qw(Mail::SpamAssassin::Plugin);
 
 use constant HAS_DB_FILE => eval { require DB_File; };
 
diff -Nru spamassassin-3.4.0/lib/Mail/SpamAssassin/Plugin/HeaderEval.pm spamassassin-3.4.2/lib/Mail/SpamAssassin/Plugin/HeaderEval.pm
--- spamassassin-3.4.0/lib/Mail/SpamAssassin/Plugin/HeaderEval.pm	2014-02-07 03:36:27.000000000 -0500
+++ spamassassin-3.4.2/lib/Mail/SpamAssassin/Plugin/HeaderEval.pm	2018-09-13 21:27:51.000000000 -0400
@@ -19,17 +19,17 @@
 
 use strict;
 use warnings;
-use bytes;
+# use bytes;
 use re 'taint';
 use Errno qw(EBADF);
 
 use Mail::SpamAssassin::Plugin;
 use Mail::SpamAssassin::Locales;
+use Mail::SpamAssassin::Util qw(get_my_locales parse_rfc822_date);
 use Mail::SpamAssassin::Logger;
 use Mail::SpamAssassin::Constants qw(:sa :ip);
 
-use vars qw(@ISA);
-@ISA = qw(Mail::SpamAssassin::Plugin);
+our @ISA = qw(Mail::SpamAssassin::Plugin);
 
 # constructor: register the eval rule
 sub new {
@@ -52,6 +52,7 @@
   $self->register_eval_rule("check_for_forged_eudoramail_received_headers");
   $self->register_eval_rule("check_for_forged_yahoo_received_headers");
   $self->register_eval_rule("check_for_forged_juno_received_headers");
+  $self->register_eval_rule("check_for_forged_gmail_received_headers");
   $self->register_eval_rule("check_for_matching_env_and_hdr_from");
   $self->register_eval_rule("sorted_recipients");
   $self->register_eval_rule("similar_recipients");
@@ -116,7 +117,7 @@
   my ($self, $pms) = @_;
   my $hdr;
 
-  my @locales = Mail::SpamAssassin::Util::get_my_locales($self->{main}->{conf}->{ok_locales});
+  my @locales = get_my_locales($self->{main}->{conf}->{ok_locales});
 
   return 0 if grep { $_ eq "all" } @locales;
 
@@ -267,26 +268,27 @@
 
   $header .= ":raw" unless ($header eq "ALL" || $header =~ /:raw$/);
   my $str = $pms->get($header);
-  return 0 unless $str ne '';
+  return 0 if !defined $str || $str eq '';
 
   # avoid overlap between tests
   if ($header eq "ALL") {
     # fix continuation lines, then remove Subject and From
     $str =~ s/\n[ \t]+/  /gs;
-    $str =~ s/^(?:Subject|From):.*$//gm;
+    $str =~ s/^(?:Subject|From):.*$//gmi;
   }
 
   # count illegal substrings (RFC 2045)
-  my $illegal = () = ($str =~ /[\x00-\x08\x0b\x0c\x0e-\x1f\x7f-\xff]/g);
+  # (non-ASCII + C0 controls except TAB, NL, CR)
+  my $illegal = $str =~ tr/\x00-\x08\x0b\x0c\x0e-\x1f\x7f-\xff//;
 
   # minor exemptions for Subject
-  if ($header eq "Subject:raw") {
+  if ($illegal > 0 && lc $header eq "subject:raw") {
     # only exempt a single cent sign, pound sign, or registered sign
-    my $exempt = () = ($str =~ /[\xa2\xa3\xae]/g);
+    my $exempt = $str =~ tr/\xa2\xa3\xae//;
     $illegal-- if $exempt == 1;
   }
 
-  return 0 if (length($str) == 0);
+  return 0 if $str eq '';
   return (($illegal / length($str)) >= $ratio && $illegal >= $count);
 }
 
@@ -342,17 +344,24 @@
 
   my $ip = $pms->get('X-Originating-Ip',undef);
   my $IP_ADDRESS = IP_ADDRESS;
+  my $orig = $pms->get('X-OriginatorOrg',undef);
+  my $ORIGINATOR = 'hotmail.com';
 
   if (defined $ip && $ip =~ /$IP_ADDRESS/) { $ip = 1; } else { $ip = 0; }
+  if (defined $orig && $orig =~ /$ORIGINATOR/) { $orig = 1; } else { $orig = 0; }
 
   # Hotmail formats its received headers like this:
   # Received: from hotmail.com (f135.law8.hotmail.com [216.33.241.135])
+  # or like
+  # Received: from EUR01-VE1-obe.outbound.protection.outlook.com (mail-oln040092066056.outbound.protection.outlook.com [40.92.66.56])
   # spammers do not ;)
 
   if ($self->gated_through_received_hdr_remover($pms)) { return; }
 
   if ($rcvd =~ /from (?:\S*\.)?hotmail.com \(\S+\.hotmail(?:\.msn)?\.com[ \)]/ && $ip)
                 { return; }
+  if ($rcvd =~ /from \S*\.outbound\.protection\.outlook\.com \(\S+\.outbound\.protection\.outlook\.com[ \)]/ && $orig)
+                { return; }
   if ($rcvd =~ /from \S*\.hotmail.com \(\[$IP_ADDRESS\][ \):]/ && $ip)
                 { return; }
   if ($rcvd =~ /from \S+ by \S+\.hotmail(?:\.msn)?\.com with HTTP\;/ && $ip)
@@ -572,6 +581,32 @@
   return 0;   
 }
 
+sub check_for_forged_gmail_received_headers {
+  my ($self, $pms) = @_;
+  use constant GOOGLE_MESSAGE_STATE_LENGTH_MIN => 60;
+  use constant GOOGLE_SMTP_SOURCE_LENGTH_MIN => 60;
+
+  my $from = $pms->get('From:addr');
+  if ($from !~ /\bgmail\.com$/i) { return 0; }
+
+  my $xgms = $pms->get('X-Gm-Message-State');
+  my $xss = $pms->get('X-Google-Smtp-Source');
+  my $xreceived = $pms->get('X-Received');
+  my $received = $pms->get('Received');
+
+  if ($xreceived =~ /by 10\.\S+ with SMTP id \S+/) { return 0; }
+  if ($xreceived =~ /by 2002\:\w\:\S+ with SMTP id \S+/) { return 0; }
+  if ($received =~ /by smtp\.googlemail\.com with ESMTPSA id \S+/) {
+    return 0;
+  }
+  if ( (length($xgms) >= GOOGLE_MESSAGE_STATE_LENGTH_MIN) && 
+    (length($xss) >= GOOGLE_SMTP_SOURCE_LENGTH_MIN)) {
+      return 0;
+  }
+
+  return 1;
+}
+
 sub check_for_matching_env_and_hdr_from {
   my ($self, $pms) =@_;
   # two blank headers match so don't bother checking
@@ -721,7 +756,7 @@
     for my $date (@dates) {
       if (defined($date) && length($date)) {
         chomp($date);
-        $time = Mail::SpamAssassin::Util::parse_rfc822_date($date);
+        $time = parse_rfc822_date($date);
       }
       last DATE if defined($time);
     }
@@ -772,7 +807,7 @@
       if ($rcvd =~ m/(\s.?\d+ \S\S\S \d+ \d+:\d+:\d+ \S+)/) {
 	my $date = $1;
         dbg2("eval: trying Received fetchmail header date for real time: $date");
-	my $time = Mail::SpamAssassin::Util::parse_rfc822_date($date);
+	my $time = parse_rfc822_date($date);
 	if (defined($time) && (time() >= $time)) {
           dbg2("eval: time_t from date=$time, rcvd=$date");
 	  push @fetchmail_times, $time;
@@ -792,7 +827,7 @@
     if ($rcvd =~ m/(\s.?\d+ \S\S\S \d+ \d+:\d+:\d+ \S+)/) {
       my $date = $1;
       dbg2("eval: trying Received header date for real time: $date");
-      my $time = Mail::SpamAssassin::Util::parse_rfc822_date($date);
+      my $time = parse_rfc822_date($date);
       if (defined($time)) {
         dbg2("eval: time_t from date=$time, rcvd=$date");
 	push @header_times, $time;
@@ -952,14 +987,14 @@
   my $fudge = 250;
 
   $_ = $pms->get('Date');
-  $_ = Mail::SpamAssassin::Util::parse_rfc822_date($_) || 0;
+  $_ = parse_rfc822_date($_) || 0;
   my $expected = int (($_ * $x) + $y);
   my $diff = $timetoken - $expected;
   return 0 if (abs($diff) < $fudge);
 
   $_ = $pms->get('Received');
   /(\s.?\d+ \S\S\S \d+ \d+:\d+:\d+ \S+).*?$/;
-  $_ = Mail::SpamAssassin::Util::parse_rfc822_date($_) || 0;
+  $_ = parse_rfc822_date($_) || 0;
   $expected = int(($_ * $x) + $y);
   $diff = $timetoken - $expected;
 
@@ -1036,9 +1071,9 @@
 
   if ($to =~ /^([^@]+)@(.+)$/) {
     my($user,$dom) = ($1,$2);
-    $dom = Mail::SpamAssassin::Util::RegistrarBoundaries::trim_domain($dom);
+    $dom = $self->{main}->{registryboundaries}->trim_domain($dom);
     return unless
-        (Mail::SpamAssassin::Util::RegistrarBoundaries::is_domain_valid($dom));
+        ($self->{main}->{registryboundaries}->is_domain_valid($dom));
 
     return 1 if ($from =~ /\b\Q$dom\E.\Q$user\E@/i);
   }
diff -Nru spamassassin-3.4.0/lib/Mail/SpamAssassin/Plugin/HTMLEval.pm spamassassin-3.4.2/lib/Mail/SpamAssassin/Plugin/HTMLEval.pm
--- spamassassin-3.4.0/lib/Mail/SpamAssassin/Plugin/HTMLEval.pm	2014-02-07 03:36:27.000000000 -0500
+++ spamassassin-3.4.2/lib/Mail/SpamAssassin/Plugin/HTMLEval.pm	2018-09-13 21:27:51.000000000 -0400
@@ -19,15 +19,14 @@
 
 use strict;
 use warnings;
-use bytes;
+# use bytes;
 use re 'taint';
 
 use Mail::SpamAssassin::Plugin;
 use Mail::SpamAssassin::Locales;
 use Mail::SpamAssassin::Util qw(untaint_var);
 
-use vars qw(@ISA);
-@ISA = qw(Mail::SpamAssassin::Plugin);
+our @ISA = qw(Mail::SpamAssassin::Plugin);
 
 # constructor: register the eval rule
 sub new {
diff -Nru spamassassin-3.4.0/lib/Mail/SpamAssassin/Plugin/HTTPSMismatch.pm spamassassin-3.4.2/lib/Mail/SpamAssassin/Plugin/HTTPSMismatch.pm
--- spamassassin-3.4.0/lib/Mail/SpamAssassin/Plugin/HTTPSMismatch.pm	2014-02-07 03:36:27.000000000 -0500
+++ spamassassin-3.4.2/lib/Mail/SpamAssassin/Plugin/HTTPSMismatch.pm	2018-09-13 21:27:51.000000000 -0400
@@ -19,13 +19,13 @@
 
 use Mail::SpamAssassin::Plugin;
 use Mail::SpamAssassin::Logger;
+use Mail::SpamAssassin::Constants qw(:ip);
 use strict;
 use warnings;
-use bytes;
+# use bytes;
 use re 'taint';
 
-use vars qw(@ISA);
-@ISA = qw(Mail::SpamAssassin::Plugin);
+our @ISA = qw(Mail::SpamAssassin::Plugin);
 
 # constructor: register the eval rule
 sub new {
@@ -49,35 +49,33 @@
 sub check_https_http_mismatch {
   my ($self, $permsgstatus, undef, $minanchors, $maxanchors) = @_;
 
+  my $IP_ADDRESS = IP_ADDRESS;
+
   $minanchors ||= 1;
 
   if (!exists $permsgstatus->{chhm_hit}) {
     $permsgstatus->{chhm_hit} = 0;
     $permsgstatus->{chhm_anchors} = 0;
 
-    foreach my $v ( values %{$permsgstatus->{html}->{uri_detail}} ) {
+    foreach my $k ( keys %{$permsgstatus->{html}->{uri_detail}} ) {
+      my %uri_detail = %{$permsgstatus->{html}->{uri_detail}};
+      my $v = ${uri_detail}{$k};
       # if the URI wasn't used for an anchor tag, or the anchor text didn't
       # exist, skip this.
       next unless (exists $v->{anchor_text} && @{$v->{anchor_text}});
 
       my $uri;
-      foreach (@{$v->{cleaned}}) {
-        if (m@^https?://([^/:]+)@i) {
-	  $uri = $1;
-
-	  # Skip IPs since there's another rule to catch that already
-          if ($uri =~ /^\d+\.\d+\.\d+\.\d+$/) {
-            undef $uri;
-            next;
-          }
-
-	  # want to compare whole hostnames instead of domains?
-	  # comment this next section to the blank line.
-	  $uri = Mail::SpamAssassin::Util::RegistrarBoundaries::trim_domain($uri);
-          undef $uri unless (Mail::SpamAssassin::Util::RegistrarBoundaries::is_domain_valid($uri));
-
-	  last if $uri;
-        }
+      if ($k =~ m@^https?://([^/:]+)@i) {
+        $uri = $1;
+        # Skip IPs since there's another rule to catch that already
+        if ($uri =~ /^$IP_ADDRESS+$/) {
+          undef $uri;
+          next;
+        } 
+        # want to compare whole hostnames instead of domains?
+        # comment this next section to the blank line.
+        $uri = $self->{main}->{registryboundaries}->trim_domain($uri);
+        undef $uri unless ($self->{main}->{registryboundaries}->is_domain_valid($uri));
       }
 
       next unless $uri;
@@ -89,9 +87,9 @@
 
 	  # want to compare whole hostnames instead of domains?
 	  # comment this next section to the blank line.
-          if ($https !~ /^\d+\.\d+\.\d+\.\d+$/) {
-	    $https = Mail::SpamAssassin::Util::RegistrarBoundaries::trim_domain($https);
-            undef $https unless (Mail::SpamAssassin::Util::RegistrarBoundaries::is_domain_valid($https));
+          if ($https !~ /^$IP_ADDRESS+$/) {
+	    $https = $self->{main}->{registryboundaries}->trim_domain($https);
+            undef $https unless ($self->{main}->{registryboundaries}->is_domain_valid($https));
           }
 	  next unless $https;
 
diff -Nru spamassassin-3.4.0/lib/Mail/SpamAssassin/Plugin/ImageInfo.pm spamassassin-3.4.2/lib/Mail/SpamAssassin/Plugin/ImageInfo.pm
--- spamassassin-3.4.0/lib/Mail/SpamAssassin/Plugin/ImageInfo.pm	2014-02-07 03:36:27.000000000 -0500
+++ spamassassin-3.4.2/lib/Mail/SpamAssassin/Plugin/ImageInfo.pm	2018-09-13 21:27:51.000000000 -0400
@@ -84,11 +84,10 @@
 use Mail::SpamAssassin::Logger;
 use strict;
 use warnings;
-use bytes;
+# use bytes;
 use re 'taint';
 
-use vars qw(@ISA);
-@ISA = qw(Mail::SpamAssassin::Plugin);
+our @ISA = qw(Mail::SpamAssassin::Plugin);
 
 # constructor: register the eval rule
 sub new {
diff -Nru spamassassin-3.4.0/lib/Mail/SpamAssassin/Plugin/MIMEEval.pm spamassassin-3.4.2/lib/Mail/SpamAssassin/Plugin/MIMEEval.pm
--- spamassassin-3.4.0/lib/Mail/SpamAssassin/Plugin/MIMEEval.pm	2014-02-07 03:36:27.000000000 -0500
+++ spamassassin-3.4.2/lib/Mail/SpamAssassin/Plugin/MIMEEval.pm	2018-09-13 21:27:51.000000000 -0400
@@ -15,20 +15,47 @@
 # limitations under the License.
 # </@LICENSE>
 
+=head1 NAME
+
+MIMEEval - perform various tests against MIME structure and body
+
+=head1 SYNOPSIS
+
+  loadplugin    Mail::SpamAssassin::Plugin::MIMEEval
+
+  body NAME_OF_RULE  eval:check_for_mime
+  body NAME_OF_RULE  eval:check_for_mime_html
+  body NAME_OF_RULE  eval:check_for_mime_html_only
+  body NAME_OF_RULE  eval:check_mime_multipart_ratio
+  body NAME_OF_RULE  eval:check_msg_parse_flags
+  body NAME_OF_RULE  eval:check_for_ascii_text_illegal
+  body NAME_OF_RULE  eval:check_abundant_unicode_ratio
+  body NAME_OF_RULE  eval:check_for_faraway_charset
+  body NAME_OF_RULE  eval:check_for_uppercase
+  body NAME_OF_RULE  eval:check_ma_non_text
+  body NAME_OF_RULE  eval:check_base64_length
+  body NAME_OF_RULE  eval:check_qp_ratio
+
+=head1 DESCRIPTION
+
+Perform various tests against MIME structure and body.
+
+=cut
+
 package Mail::SpamAssassin::Plugin::MIMEEval;
 
 use strict;
 use warnings;
-use bytes;
+# use bytes;
 use re 'taint';
 
 use Mail::SpamAssassin::Plugin;
 use Mail::SpamAssassin::Locales;
 use Mail::SpamAssassin::Constants qw(:sa CHARSETS_LIKELY_TO_FP_AS_CAPS);
 use Mail::SpamAssassin::Util qw(untaint_var);
+use Mail::SpamAssassin::Logger;
 
-use vars qw(@ISA);
-@ISA = qw(Mail::SpamAssassin::Plugin);
+our @ISA = qw(Mail::SpamAssassin::Plugin);
 
 # constructor: register the eval rule
 sub new {
@@ -46,10 +73,13 @@
   $self->register_eval_rule("check_for_mime_html_only");
   $self->register_eval_rule("check_mime_multipart_ratio");
   $self->register_eval_rule("check_msg_parse_flags");
+  $self->register_eval_rule("check_for_ascii_text_illegal");
+  $self->register_eval_rule("check_abundant_unicode_ratio");
   $self->register_eval_rule("check_for_faraway_charset");
   $self->register_eval_rule("check_for_uppercase");
   $self->register_eval_rule("check_ma_non_text");
   $self->register_eval_rule("check_base64_length");
+  $self->register_eval_rule("check_qp_ratio");
 
   return $self;
 }
@@ -66,6 +96,57 @@
   ($numlos <= $numhis && $numhis > 3);
 }
 
+=over 4
+
+=item has_check_for_ascii_text_illegal
+
+Adds capability check for "if can()" for check_for_ascii_text_illegal
+
+=cut
+
+sub has_check_for_ascii_text_illegal { 1 }
+
+=item check_for_ascii_text_illegal
+
+If a MIME part claims to be text/plain or text/plain;charset=us-ascii and the Content-Transfer-Encoding is 7bit (either explicitly or by default), then we should enforce the actual text being only TAB, NL, SPACE through TILDE, i.e. all 7bit characters excluding NO-WS-CTL (per RFC-2822).
+
+All mainstream MTA's get this right.
+
+=cut
+
+sub check_for_ascii_text_illegal {
+  my ($self, $pms) = @_;
+
+  $self->_check_attachments($pms) unless exists $pms->{mime_ascii_text_illegal};
+  return ($pms->{mime_ascii_text_illegal} > 0);
+}
+
+=item has_check_abundant_unicode_ratio
+
+Adds capability check for "if can()" for check_abundant_unicode_ratio
+
+=cut
+
+sub has_check_abundant_unicode_ratio { 1 }
+
+=item check_abundant_unicode_ratio
+
+A MIME part claiming to be text/plain and containing Unicode characters must be encoded as quoted-printable or base64, or use UTF data coding (typically with 8bit encoding).  Any message in 7bit or 8bit encoding containing (HTML) Unicode entities will not render them as Unicode, but literally.
+
+Thus a few such sequences might occur on a mailing list of developers discussing such characters, but a message with a high density of such characters is likely spam.
+
+=cut
+
+sub check_abundant_unicode_ratio {
+  my ($self, $pms, undef, $ratio) = @_;
+
+  # validate ratio?
+  return 0 unless ($ratio =~ /^\d{0,3}\.\d{1,3}$/);
+
+  $self->_check_attachments($pms) unless exists $pms->{mime_text_unicode_ratio};
+  return ($pms->{mime_text_unicode_ratio} >= $ratio);
+}
+
 sub check_for_faraway_charset {
   my ($self, $pms, $body) = @_;
 
@@ -220,6 +301,9 @@
   my @part_bytes;		# MIME part total bytes
   my @part_type;		# MIME part types
 
+  my $normal_chars = 0;		# MIME text bytes that aren't encoded
+  my $unicode_chars = 0;	# MIME text bytes that are unicode entities
+
   # MIME header information
   my $part = -1;		# MIME part index
 
@@ -244,6 +328,8 @@
   # $pms->{mime_qp_inline_no_charset} = 0;
   $pms->{mime_qp_long_line} = 0;
   $pms->{mime_qp_ratio} = 0;
+  $pms->{mime_ascii_text_illegal} = 0;
+  $pms->{mime_text_unicode_ratio} = 0;
 
   # Get all parts ...
   foreach my $p ($pms->{msg}->find_parts(qr/./)) {
@@ -336,12 +422,50 @@
 	  }
         }
       }
+
+      # if our charset is ASCII, this should only contain 7-bit characters
+      # except NUL or a free-standing CR. anything else is a violation of
+      # the definition of charset="us-ascii".
+      if ($ctype eq 'text/plain' && (!defined $charset || $charset eq 'us-ascii')) {
+        # no re "strict";  # since perl 5.21.8: Ranges of ASCII printables...
+        if (m/[\x00\x0d\x80-\xff]+/) {
+          if (would_log('dbg', 'eval')) {
+            my $str = $_;
+            $str =~ s/([\x00\x0d\x80-\xff]+)/'<' . unpack('H*', $1) . '>'/eg;
+            dbg("check: ascii_text_illegal: matches " . $str . "\n");
+          }
+          $pms->{mime_ascii_text_illegal}++;
+        }
+      }
+
+      # if we're text/plain, we should never see unicode escapes in this
+      # format, especially not for 7bit or 8bit.
+      if ($ctype eq 'text/plain' && ($cte eq '' || $cte eq '7bit' || $cte eq '8bit')) {
+        my ($text, $subs) = $_;
+
+        $subs = $text =~ s/&#x[0-9A-F]{4};//g;
+        $normal_chars += length($text);
+        $unicode_chars += $subs;
+
+        if ($subs && would_log('dbg', 'eval')) {
+          my $str = $_;
+          $str = substr($str, 0, 512) . '...' if (length($str) > 512);
+          dbg("check: abundant_unicode: " . $str . " (" . $subs . ")\n");
+        }
+      }
+
       $previous = $_;
     }
   }
 
   if ($qp_bytes) {
     $pms->{mime_qp_ratio} = $qp_count / $qp_bytes;
+    $pms->{mime_qp_count} = $qp_count;
+    $pms->{mime_qp_bytes} = $qp_bytes;
+  }
+
+  if ($normal_chars) {
+    $pms->{mime_text_unicode_ratio} = $unicode_chars / $normal_chars;
   }
 
   if ($pms->{mime_multipart_alternative}) {
@@ -372,6 +496,36 @@
   }
 }
 
+=item has_check_qp_ratio
+
+Adds capability check for "if can()" for check_qp_ratio
+
+=cut
+
+sub has_check_qp_ratio { 1 }
+
+=item check_qp_ratio
+
+Takes a min ratio to use in eval to see if there is an spamminess to the ratio of 
+quoted printable to total bytes in an email.
+
+=back
+
+=cut
+
+sub check_qp_ratio {
+  my ($self, $pms, undef, $min) = @_;
+
+  $self->_check_attachments($pms) unless exists $pms->{mime_checked_attachments};
+
+  my $qp_ratio = $pms->{mime_qp_ratio};
+
+  dbg("eval: qp_ratio - %s - check for min of %s", $qp_ratio, $min);
+
+  return (defined $qp_ratio && $qp_ratio >= $min) ? 1 : 0;
+}
+
+
 sub check_msg_parse_flags {
   my($self, $pms, $type, $type2) = @_;
   $type = $type2 if ref($type);
diff -Nru spamassassin-3.4.0/lib/Mail/SpamAssassin/Plugin/MIMEHeader.pm spamassassin-3.4.2/lib/Mail/SpamAssassin/Plugin/MIMEHeader.pm
--- spamassassin-3.4.0/lib/Mail/SpamAssassin/Plugin/MIMEHeader.pm	2014-02-07 03:36:27.000000000 -0500
+++ spamassassin-3.4.2/lib/Mail/SpamAssassin/Plugin/MIMEHeader.pm	2018-09-13 21:27:51.000000000 -0400
@@ -59,7 +59,7 @@
 
 use strict;
 use warnings;
-use bytes;
+# use bytes;
 use re 'taint';
 
 use Mail::SpamAssassin::Plugin;
@@ -67,10 +67,9 @@
 use Mail::SpamAssassin::Logger;
 use Mail::SpamAssassin::Util qw(untaint_var);
 
-use vars qw(@ISA @TEMPORARY_METHODS);
-@ISA = qw(Mail::SpamAssassin::Plugin);
+our @ISA = qw(Mail::SpamAssassin::Plugin);
 
-@TEMPORARY_METHODS = (); 
+our @TEMPORARY_METHODS;
 
 # ---------------------------------------------------------------------------
 
diff -Nru spamassassin-3.4.0/lib/Mail/SpamAssassin/Plugin/OneLineBodyRuleType.pm spamassassin-3.4.2/lib/Mail/SpamAssassin/Plugin/OneLineBodyRuleType.pm
--- spamassassin-3.4.0/lib/Mail/SpamAssassin/Plugin/OneLineBodyRuleType.pm	2014-02-07 03:36:27.000000000 -0500
+++ spamassassin-3.4.2/lib/Mail/SpamAssassin/Plugin/OneLineBodyRuleType.pm	2018-09-13 21:27:51.000000000 -0400
@@ -15,7 +15,7 @@
 use warnings;
 use re 'taint';
 
-use vars qw(@ISA); @ISA = qw();
+our @ISA = qw();
 
 # constructor
 sub new {
diff -Nru spamassassin-3.4.0/lib/Mail/SpamAssassin/Plugin/PDFInfo.pm spamassassin-3.4.2/lib/Mail/SpamAssassin/Plugin/PDFInfo.pm
--- spamassassin-3.4.0/lib/Mail/SpamAssassin/Plugin/PDFInfo.pm	1969-12-31 19:00:00.000000000 -0500
+++ spamassassin-3.4.2/lib/Mail/SpamAssassin/Plugin/PDFInfo.pm	2018-09-13 21:27:51.000000000 -0400
@@ -0,0 +1,754 @@
+# <@LICENSE>
+# Licensed to the Apache Software Foundation (ASF) under one or more
+# contributor license agreements.  See the NOTICE file distributed with
+# this work for additional information regarding copyright ownership.
+# The ASF licenses this file to you under the Apache License, Version 2.0
+# (the "License"); you may not use this file except in compliance with
+# the License.  You may obtain a copy of the License at:
+#
+#     http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+# </@LICENSE>
+
+=head1 NAME
+
+Mail::SpamAssassin::Plugin::PDFInfo - PDFInfo Plugin for SpamAssassin
+
+=head1 SYNOPSIS
+
+  loadplugin     Mail::SpamAssassin::Plugin::PDFInfo
+
+=head1 DESCRIPTION
+
+This plugin helps detected spam using attached PDF files
+
+=over 4
+
+=item See "Usage:" below - more documentation see 20_pdfinfo.cf
+
+ Original info kept for history. For later changes see SVN repo
+ -------------------------------------------------------
+ PDFInfo Plugin for SpamAssassin
+ Version: 0.8
+ Info: $Id: PDFInfo.pm 904 2007-08-12 01:36:23Z root $
+ Created: 2007-08-10
+ Modified: 2007-08-10
+ By: Dallas Engelken
+
+ Changes:
+   0.8 - added .fdf detection (thanks John Lundin) [axb]
+   0.7 - fixed empty body/pdf count buglet(thanks Jeremy) [axb]
+   0.6 - added support for tags - PDFCOUNT, PDFVERSION, PDFPRODUCER, etc.
+       - fixed issue on perl 5.6.1 where pdf_match_details() failed to call
+         _find_pdf_mime_parts(), resulting in no detection of pdf mime parts.
+       - quoted-printable support - requires MIME::QuotedPrint (which should be in everyones
+         install as a part of the MIME-Base64 package which is a SA req)
+       - added simple pdf_is_empty_body() function with counts the body bytes minus the
+         subject line.  can add optional <bytes> param if you need to allow for a few bytes.
+   0.5 - fix warns for undef $pdf_tags
+       - remove { } and \ before running eval in pdf_match_details to avoid eval error
+   0.4 - added pdf_is_encrypted() function
+       - added option to look for image HxW on same line
+   0.3 - added 2nd fuzzy md5 which uses pdf tag layout as data
+       - renamed pdf_image_named() to pdf_named()
+          - PDF images are encapsulated and have no names.  We are matching the PDF file name.
+       - renamed pdf_image_name_regex() to pdf_name_regex()
+          - PDF images are encapsulated and have no names.  We are matching the PDF file name.
+       - changed pdf_image_count() a bit and added pdf_count().
+          - pdf_count() checks how many pdf attachments there are on the mail
+          - pdf_image_count() checks how many images are found within all pdfs in the mail.
+       - removed the restriction of the pdf containing an image in order to md5 it.
+       - added pdf_match_details() function to check the following 'details'
+          - author: Author of PDF if specified
+          - producer: Software used to produce PDF
+          - creator: Software used to produce PDF, usually similar to producer
+          - title: Title of PDF
+          - created: Creation Date
+          - modified: Last Modified
+   0.2 - support PDF octet-stream
+   0.1 - just ported over the imageinfo code, and renamed to pdfinfo.
+         - removed all support for png, gif, and jpg from the code.
+         - prepended pdf_ to all function names to avoid conflicts with ImageInfo in SA 3.2.
+
+ Usage:
+
+  pdf_count()
+
+     body RULENAME  eval:pdf_count(<min>,[max])
+        min: required, message contains at least x pdf mime parts
+        max: optional, if specified, must not contain more than x pdf mime parts
+
+  pdf_image_count()
+
+     body RULENAME  eval:pdf_image_count(<min>,[max])
+        min: required, message contains at least x images in pdf attachments.
+        max: optional, if specified, must not contain more than x pdf images
+
+  pdf_pixel_coverage()
+
+     body RULENAME  eval:pdf_pixel_coverage(<min>,[max])
+        min: required, message contains at least this much pixel area
+        max: optional, if specified, message must not contain more than this much pixel area
+
+  pdf_named()
+
+     body RULENAME  eval:pdf_named(<string>)
+        string: exact file name match, if you need partial match, see pdf_name_regex()
+
+  pdf_name_regex()
+
+     body RULENAME  eval:pdf_name_regex(<regex>)
+        regex: regular expression, see examples in ruleset
+
+  pdf_match_md5()
+
+     body RULENAME  eval:pdf_match_md5(<string>)
+        string: 32-byte md5 hex
+
+  pdf_match_fuzzy_md5()
+
+     body RULENAME  eval:pdf_match_md5(<string>)
+        string: 32-byte md5 hex - see ruleset for obtaining the fuzzy md5
+
+  pdf_match_details()
+
+     body RULENAME  eval:pdf_match_details(<detail>,<regex>);
+        detail: author, creator, created, modified, producer, title
+        regex: regular expression, see examples in ruleset
+
+  pdf_is_encrypted()
+
+     body RULENAME eval:pdf_is_encrypted()
+
+  pdf_is_empty_body()
+
+     body RULENAME eval:pdf_is_empty_body(<bytes>)
+        bytes: maximum byte count to allow and still consider it empty
+
+  NOTE: See the ruleset for more examples that are not documented here.
+
+=back
+
+=cut
+
+# -------------------------------------------------------
+
+package Mail::SpamAssassin::Plugin::PDFInfo;
+
+use Mail::SpamAssassin::Plugin;
+use Mail::SpamAssassin::Logger;
+use Mail::SpamAssassin::Util;
+use strict;
+use warnings;
+# use bytes;
+use Digest::MD5 qw(md5_hex);
+use MIME::QuotedPrint;
+
+our @ISA = qw(Mail::SpamAssassin::Plugin);
+
+# constructor: register the eval rule
+sub new {
+  my $class = shift;
+  my $mailsaobject = shift;
+
+  # some boilerplate...
+  $class = ref($class) || $class;
+  my $self = $class->SUPER::new($mailsaobject);
+  bless ($self, $class);
+
+  $self->register_eval_rule ("pdf_count");
+  $self->register_eval_rule ("pdf_image_count");
+  $self->register_eval_rule ("pdf_pixel_coverage");
+  $self->register_eval_rule ("pdf_image_size_exact");
+  $self->register_eval_rule ("pdf_image_size_range");
+  $self->register_eval_rule ("pdf_named");
+  $self->register_eval_rule ("pdf_name_regex");
+  $self->register_eval_rule ("pdf_image_to_text_ratio");
+  $self->register_eval_rule ("pdf_match_md5");
+  $self->register_eval_rule ("pdf_match_fuzzy_md5");
+  $self->register_eval_rule ("pdf_match_details");
+  $self->register_eval_rule ("pdf_is_encrypted");
+  $self->register_eval_rule ("pdf_is_empty_body");
+
+  return $self;
+}
+
+# -----------------------------------------
+
+my %get_details = (
+  'pdf' => sub {
+    my ($self, $pms, $part) = @_;
+
+    my $type = $part->{'type'} || 'base64';
+    my $data = '';
+
+    if ($type eq 'quoted-printable') {
+      $data = decode_qp($data); # use QuotedPrint->decode_qp
+    }
+    else {
+      $data = $part->decode();  # just use built in base64 decoder
+    }
+
+    my $index = substr($data, 0, 8);
+
+    return unless ($index =~ /.PDF\-(\d\.\d)/);
+    my $version = $1;
+    $self->_set_tag($pms, 'PDFVERSION', $version);
+    # dbg("pdfinfo: pdf version = $version");
+
+    my ($height, $width, $fuzzy_data, $pdf_tags);
+    my ($producer, $created, $modified, $title, $creator, $author) = ('unknown','0','0','untitled','unknown','unknown');
+    my ($md5, $fuzzy_md5) = ('', '');
+    my ($total_height, $total_width, $total_area, $line_count) = (0,0,0,0);
+
+    my $name = $part->{'name'} || '';
+    $self->_set_tag($pms, 'PDFNAME', $name);
+
+    my $no_more_fuzzy = 0;
+    my $got_image = 0;
+    my $encrypted = 0;
+
+    while($data =~ /([^\n]+)/g) {
+      # dbg("pdfinfo: line=$1");
+      my $line = $1;
+
+      $line_count++;
+
+      # lines containing high bytes will have no data we need, so save some cycles
+      next if ($line =~ /[\x80-\xff]/);
+
+      if (!$no_more_fuzzy && $line_count < 70) {
+        if ($line !~ m/^\%/ && $line !~ m/^\/(?:Height|Width|(?:(?:Media|Crop)Box))/ && $line !~ m/^\d+\s+\d+\s+\d+\s+\d+\s+\d+\s+\d+\s+cm$/) {
+          $line =~ s/\s+$//;  # strip off whitespace at end.
+          $fuzzy_data .= $line;
+	}
+      }
+
+      if ($line =~ m/^\/([A-Za-z]+)/) {
+         $pdf_tags .= $1;
+      }
+
+      $got_image=1 if ($line =~ m/\/Image/);
+      $encrypted=1 if ($line =~ m/^\/Encrypt/);
+
+      # once we hit the first stream, we stop collecting data for fuzzy md5
+      $no_more_fuzzy = 1 if ($line =~ m/stream/);
+
+      # From a v1.3 pdf
+      # [12234] dbg: pdfinfo: line=630 0 0 149 0 0 cm
+      # [12234] dbg: pdfinfo: line=/Width 630
+      # [12234] dbg: pdfinfo: line=/Height 149
+      if ($got_image) {
+        if ($line =~ /^(\d+)\s+\d+\s+\d+\s+(\d+)\s+\d+\s+\d+\s+cm$/) {
+          $width = $1;
+          $height = $2;
+        }
+        elsif ($line =~ /^\/Width\s(\d+)/) {
+          $width = $1;
+        }
+        elsif ($line =~ /^\/Height\s(\d+)/) {
+          $height = $1;
+        }
+        elsif ($line =~ m/\/Width\s(\d+)\/Height\s(\d+)/) {
+          $width = $1;
+          $height = $2;
+        }
+      }
+
+      # did pdf contain image data?
+      if ($got_image && $width && $height) {
+        $no_more_fuzzy = 1;
+        my $area = $width * $height;
+        $total_height += $height;
+        $total_width += $width;
+        $total_area += $area;
+        $pms->{pdfinfo}->{dems_pdf}->{"${height}x${width}"} = 1;
+        $pms->{'pdfinfo'}->{"count_pdf_images"} ++;
+        dbg("pdfinfo: Found image in PDF ".($name ? $name : '')." - $height x $width pixels ($area pixels sq.)");
+        $self->_set_tag($pms, 'PDFIMGDIM', "${height}x${width}");
+        $height=0; $width=0;  # reset and check for next image
+        $got_image = 0;
+      }
+
+      # [5310] dbg: pdfinfo: line=<</Producer(GPL Ghostscript 8.15)
+      # [5310] dbg: pdfinfo: line=/CreationDate(D:20070703144220)
+      # [5310] dbg: pdfinfo: line=/ModDate(D:20070703144220)
+      # [5310] dbg: pdfinfo: line=/Title(Microsoft Word - Document1)
+      # [5310] dbg: pdfinfo: line=/Creator(PScript5.dll Version 5.2)
+      # [5310] dbg: pdfinfo: line=/Author(colet)>>endobj
+      # or all on same line inside xml - v1.6+
+      # <</CreationDate(D:20070226165054-06'00')/Creator( Adobe Photoshop CS2 Windows)/Producer(Adobe Photoshop for Windows -- Image Conversion Plug-in)/ModDate(D:20070226165100-06'00')>>
+
+      if ($line =~ /\/Producer\s?\(([^\)\\]+)/) {
+        $producer = $1;
+      }
+      if ($line =~ /\/CreationDate\s?\(D\:(\d+)/) {
+        $created = $1;
+      }
+      if ($line =~ /\/ModDate\s?\(D\:(\d+)/) {
+        $modified = $1;
+      }
+      if ($line =~ /\/Title\s?\(([^\)\\]+)/) {
+        $title = $1;
+        # Title=\376\377\000w\000w\000n\000g
+        # Title=wwng
+        $title =~ s/\\\d{3}//g;
+      }
+      if ($line =~ /\/Creator\s?\(([^\)\\]+)/) {
+        $creator = $1;
+      }
+      if ($line =~ /\/Author\s?\(([^\)]+)/) {
+        $author = $1;
+        # Author=\376\377\000H\000P\000_\000A\000d\000m\000i\000n\000i\000s\000t\000r\000a\000t\000o\000r
+        # Author=HP_Administrator
+        $author =~ s/\\\d{3}//g;
+      }
+    }
+
+    # store the file name so we can check pdf_named() or pdf_name_match() later.
+    $pms->{pdfinfo}->{names_pdf}->{$name} = 1 if $name;
+
+    # store encrypted flag.
+    $pms->{pdfinfo}->{encrypted} = $encrypted;
+
+    # if we had multiple images in the pdf, we need to store the total HxW as well.
+    # If it was a single Image PDF, then this value will already be in the hash.
+    $pms->{pdfinfo}->{dems_pdf}->{"${total_height}x${total_width}"} = 1 if ($total_height && $total_width);;
+
+    if ($total_area) {
+      $pms->{pdfinfo}->{pc_pdf} = $total_area;
+      $self->_set_tag($pms, 'PDFIMGAREA', $total_area);
+      dbg("pdfinfo: Filename=$name Total HxW: $total_height x $total_width ($total_area area)") if ($total_area);
+    }
+
+    dbg("pdfinfo: Filename=$name Title=$title Author=$author Producer=$producer Created=$created Modified=$modified");
+
+    $md5 = uc(md5_hex($data)) if $data;
+    $fuzzy_md5 = uc(md5_hex($fuzzy_data)) if $fuzzy_data;
+    my $tags_md5;
+    $tags_md5 = uc(md5_hex($pdf_tags)) if $pdf_tags;
+
+    dbg("pdfinfo: MD5 results for ".($name ? $name : '')." - md5=".($md5 ? $md5 : '')." fuzzy1=".($fuzzy_md5 ? $fuzzy_md5 : '')." fuzzy2=".($tags_md5 ? $tags_md5 : ''));
+
+    # we dont need tags for these.
+    $pms->{pdfinfo}->{details}->{created} = $created if $created;
+    $pms->{pdfinfo}->{details}->{modified} = $modified if $modified;
+
+    if ($producer) {
+      $pms->{pdfinfo}->{details}->{producer} = $producer if $producer;
+      $self->_set_tag($pms, 'PDFPRODUCER', $producer);
+    }
+    if ($title) {
+      $pms->{pdfinfo}->{details}->{title} = $title;
+      $self->_set_tag($pms, 'PDFTITLE', $title);
+    }
+    if ($creator) {
+      $pms->{pdfinfo}->{details}->{creator} = $creator;
+      $self->_set_tag($pms, 'PDFCREATOR', $creator);
+    }
+    if ($author) {
+      $pms->{pdfinfo}->{details}->{author} = $author;
+      $self->_set_tag($pms, 'PDFAUTHOR', $author);
+    }
+    if ($md5) {
+      $pms->{pdfinfo}->{md5}->{$md5} = 1;
+      $self->_set_tag($pms, 'PDFMD5', $fuzzy_md5);
+    }
+    if ($fuzzy_md5) {
+      $pms->{pdfinfo}->{fuzzy_md5}->{$fuzzy_md5} = 1;
+      $self->_set_tag($pms, 'PDFMD5FUZZY1', $fuzzy_md5);
+    }
+    if ($tags_md5) {
+      $pms->{pdfinfo}->{fuzzy_md5}->{$tags_md5} = 1;
+      $self->_set_tag($pms, 'PDFMD5FUZZY2', $tags_md5);
+    }
+  },
+
+);
+
+# ----------------------------------------
+
+sub _set_tag {
+
+  my ($self, $pms, $tag, $value) = @_;
+
+  dbg("pdfinfo: set_tag called for $tag $value");
+  return unless ($tag && $value);
+
+  if (exists $pms->{tag_data}->{$tag}) {
+    $pms->{tag_data}->{$tag} .= " $value";  # append value
+  }
+  else {
+    $pms->{tag_data}->{$tag} = $value;
+  }
+}
+
+# ----------------------------------------
+
+sub _find_pdf_mime_parts {
+  my ($self,$pms) = @_;
+
+  # bail early if message does not have pdf parts
+  return 0 if (exists $pms->{'pdfinfo'}->{'no_parts'});
+
+  # initialize
+  $pms->{'pdfinfo'}->{"pc_pdf"} = 0;
+  $pms->{'pdfinfo'}->{"count_pdf"} = 0;
+  $pms->{'pdfinfo'}->{"count_pdf_images"} = 0;
+
+  my @parts = $pms->{msg}->find_parts(qr@^(image|application)/(pdf|octet\-stream)$@, 1);
+  my $part_count = scalar @parts;
+
+  dbg("pdfinfo: Identified $part_count possible mime parts that need checked for PDF content");
+
+  # cache this so we can easily bail
+  $pms->{'pdfinfo'}->{'no_parts'} = 1 unless $part_count;
+
+  foreach my $p (@parts) {
+    my $type = $p->{'type'} =~ m@/([\w\-]+)$@;
+    my $name = $p->{'name'} || '';
+
+    my $cte = lc( $p->get_header('content-transfer-encoding') || '' );
+
+    dbg("pdfinfo: found part, type=".($type ? $type : '')." file=".($name ? $name : '')." cte=".($cte ? $cte : '')."");
+
+    # make sure its a cte we support
+    next unless ($cte =~ /^(?:base64|quoted\-printable)$/);
+
+    # filename must end with .pdf, or application type can be pdf
+    # sometimes windows muas will wrap a pdf up inside a .dat file
+    # v0.8 - Added .fdf phoney PDF detection
+    next unless ($name =~ /\.[fp]df$/ || $type eq 'pdf');
+
+    # if we get this far, make sure type is pdf for sure (not octet-stream or anything else)
+    $type='pdf';
+
+    if ($type && exists $get_details{$type}) {
+       $get_details{$type}->($self, $pms, $p);
+       $pms->{'pdfinfo'}->{"count_$type"} ++;
+    }
+  }
+
+  $self->_set_tag($pms, 'PDFCOUNT',  $pms->{'pdfinfo'}->{"count_pdf"});
+  $self->_set_tag($pms, 'PDFIMGCOUNT', $pms->{'pdfinfo'}->{"count_pdf_images"});
+
+}
+
+# ----------------------------------------
+
+sub pdf_named {
+  my ($self,$pms,$body,$name) = @_;
+  return unless (defined $name);
+
+  # make sure we have image data read in.
+  if (!exists $pms->{'pdfinfo'}) {
+    $self->_find_pdf_mime_parts($pms);
+  }
+
+  return 0 if (exists $pms->{'pdfinfo'}->{'no_parts'});
+
+  return 0 unless (exists $pms->{'pdfinfo'}->{"names_pdf"});
+  return 1 if (exists $pms->{'pdfinfo'}->{"names_pdf"}->{$name});
+  return 0;
+}
+
+# -----------------------------------------
+
+sub pdf_name_regex {
+  my ($self,$pms,$body,$re) = @_;
+  return unless (defined $re);
+
+  # make sure we have image data read in.
+  if (!exists $pms->{'pdfinfo'}) {
+    $self->_find_pdf_mime_parts($pms);
+  }
+
+  return 0 if (exists $pms->{'pdfinfo'}->{'no_parts'});
+  return 0 unless (exists $pms->{'pdfinfo'}->{"names_pdf"});
+
+  my $hit = 0;
+  foreach my $name (keys %{$pms->{'pdfinfo'}->{"names_pdf"}}) {
+    eval {
+        my $regex = Mail::SpamAssassin::Util::make_qr($re);
+        if ( $name =~ m/$regex/ ) {
+            $hit = 1;
+        }
+    };
+    dbg("pdfinfo: error in regex $re - $@") if $@;
+    if ($hit) {
+      dbg("pdfinfo: pdf_name_regex hit on $name");
+      return 1;
+    }
+  }
+  return 0;
+
+}
+
+# -----------------------------------------
+
+sub pdf_is_encrypted {
+  my ($self,$pms,$body) = @_;
+
+  # make sure we have image data read in.
+  if (!exists $pms->{'pdfinfo'}) {
+    $self->_find_pdf_mime_parts($pms);
+  }
+
+  return 0 if (exists $pms->{'pdfinfo'}->{'no_parts'});
+  return $pms->{'pdfinfo'}->{'encrypted'};
+}
+
+# -----------------------------------------
+
+sub pdf_count {
+  my ($self,$pms,$body,$min,$max) = @_;
+  return unless defined $min;
+
+  # make sure we have image data read in.
+  if (!exists $pms->{'pdfinfo'}) {
+    $self->_find_pdf_mime_parts($pms);
+  }
+
+  return 0 if (exists $pms->{'pdfinfo'}->{'no_parts'});
+  return 0 unless (exists $pms->{'pdfinfo'}->{"count_pdf"});
+  return result_check($min, $max, $pms->{'pdfinfo'}->{"count_pdf"});
+
+}
+
+# -----------------------------------------
+
+sub pdf_image_count {
+  my ($self,$pms,$body,$min,$max) = @_;
+  return unless defined $min;
+
+  # make sure we have image data read in.
+  if (!exists $pms->{'pdfinfo'}) {
+    $self->_find_pdf_mime_parts($pms);
+  }
+
+  return 0 if (exists $pms->{'pdfinfo'}->{'no_parts'});
+  return 0 unless (exists $pms->{'pdfinfo'}->{"count_pdf_images"});
+  return result_check($min, $max, $pms->{'pdfinfo'}->{"count_pdf_images"});
+
+}
+
+# -----------------------------------------
+
+sub pdf_pixel_coverage {
+  my ($self,$pms,$body,$min,$max) = @_;
+  return unless (defined $min);
+
+  # make sure we have image data read in.
+  if (!exists $pms->{'pdfinfo'}) {
+    $self->_find_pdf_mime_parts($pms);
+  }
+
+  return 0 if (exists $pms->{'pdfinfo'}->{'no_parts'});
+  return 0 unless (exists $pms->{'pdfinfo'}->{"pc_pdf"});
+
+  # dbg("pdfinfo: pc_$type: $min, ".($max ? $max:'').", $type, ".$pms->{'pdfinfo'}->{"pc_pdf"});
+  return result_check($min, $max, $pms->{'pdfinfo'}->{"pc_pdf"});
+}
+
+# -----------------------------------------
+
+sub pdf_image_to_text_ratio {
+  my ($self,$pms,$body,$min,$max) = @_;
+  return unless (defined $min && defined $max);
+
+  # make sure we have image data read in.
+  if (!exists $pms->{'pdfinfo'}) {
+    $self->_find_pdf_mime_parts($pms);
+  }
+
+  return 0 if (exists $pms->{'pdfinfo'}->{'no_parts'});
+  return 0 unless (exists $pms->{'pdfinfo'}->{"pc_pdf"});
+
+  # depending on how you call this eval (body vs rawbody),
+  # the $textlen will differ.
+  my $textlen = length(join('',@$body));
+
+  return 0 unless ( $textlen > 0 && exists $pms->{'pdfinfo'}->{"pc_pdf"} && $pms->{'pdfinfo'}->{"pc_pdf"} > 0);
+
+  my $ratio = $textlen / $pms->{'pdfinfo'}->{"pc_pdf"};
+  dbg("pdfinfo: image ratio=$ratio, min=$min max=$max");
+  return result_check($min, $max, $ratio, 1);
+}
+
+# -----------------------------------------
+
+sub pdf_is_empty_body {
+  my ($self,$pms,$body,$min) = @_;
+
+  $min ||= 0;  # default to 0 bytes
+
+  # make sure we have image data read in.
+  if (!exists $pms->{'pdfinfo'}) {
+    $self->_find_pdf_mime_parts($pms);
+  }
+
+  return 0 if (exists $pms->{'pdfinfo'}->{'no_parts'});
+  return 0 unless $pms->{'pdfinfo'}->{"count_pdf"};
+
+  # check for cached result
+  return 1 if $pms->{'pdfinfo'}->{"no_body_text"};
+
+  shift @$body;  # shift body array removes line #1 -> subject line.
+
+  my $bytes = 0;
+  my $textlen = length(join('',@$body));
+  foreach my $line (@$body) {
+    next unless ($line =~ m/\S/);
+    next if ($line =~ m/^Subject/);
+    $bytes += length($line);
+  }
+
+  dbg("pdfinfo: is_empty_body = $bytes bytes");
+
+  if ($bytes == 0 || ($bytes <= $min)) {
+    $pms->{'pdfinfo'}->{"no_body_text"} = 1;
+    return 1;
+  }
+
+  # cache it and return 0
+  $pms->{'pdfinfo'}->{"no_body_text"} = 0;
+  return 0;
+}
+
+# -----------------------------------------
+
+sub pdf_image_size_exact {
+  my ($self,$pms,$body,$height,$width) = @_;
+  return unless (defined $height && defined $width);
+
+  # make sure we have image data read in.
+  if (!exists $pms->{'pdfinfo'}) {
+    $self->_find_pdf_mime_parts($pms);
+  }
+
+  return 0 if (exists $pms->{'pdfinfo'}->{'no_parts'});
+  return 0 unless (exists $pms->{'pdfinfo'}->{"dems_pdf"});
+  return 1 if (exists $pms->{'pdfinfo'}->{"dems_pdf"}->{"${height}x${width}"});
+  return 0;
+}
+
+# -----------------------------------------
+
+sub pdf_image_size_range {
+  my ($self,$pms,$body,$minh,$minw,$maxh,$maxw) = @_;
+  return unless (defined $minh && defined $minw);
+
+  # make sure we have image data read in.
+  if (!exists $pms->{'pdfinfo'}) {
+    $self->_find_pdf_mime_parts($pms);
+  }
+
+  return 0 if (exists $pms->{'pdfinfo'}->{'no_parts'});
+  return 0 unless (exists $pms->{'pdfinfo'}->{"dems_pdf"});
+
+  foreach my $dem ( keys %{$pms->{'pdfinfo'}->{"dems_pdf"}}) {
+    my ($h,$w) = split(/x/,$dem);
+    next if ($h < $minh);  # height less than min height
+    next if ($w < $minw);  # width less than min width
+    next if (defined $maxh && $h > $maxh);  # height more than max height
+    next if (defined $maxw && $w > $maxw);  # width more than max width
+
+    # if we make it here, we have a match
+    return 1;
+  }
+
+  return 0;
+}
+
+# -----------------------------------------
+
+sub pdf_match_md5 {
+
+  my ($self,$pms,$body,$md5) = @_;
+  return unless defined $md5;
+
+  my $uc_md5 = uc($md5);  # uppercase matches only
+
+  # make sure we have pdf data read in.
+  if (!exists $pms->{'pdfinfo'}) {
+    $self->_find_pdf_mime_parts($pms);
+  }
+
+  return 0 if (exists $pms->{'pdfinfo'}->{'no_parts'});
+  return 0 unless (exists $pms->{'pdfinfo'}->{"md5"});
+  return 1 if (exists $pms->{'pdfinfo'}->{"md5"}->{$uc_md5});
+  return 0;
+}
+
+# -----------------------------------------
+
+sub pdf_match_fuzzy_md5 {
+
+  my ($self,$pms,$body,$md5) = @_;
+  return unless defined $md5;
+
+  my $uc_md5 = uc($md5);  # uppercase matches only
+
+  # make sure we have pdf data read in.
+  if (!exists $pms->{'pdfinfo'}) {
+    $self->_find_pdf_mime_parts($pms);
+  }
+
+  return 0 if (exists $pms->{'pdfinfo'}->{'no_parts'});
+  return 0 unless (exists $pms->{'pdfinfo'}->{"fuzzy_md5"});
+  return 1 if (exists $pms->{'pdfinfo'}->{"fuzzy_md5"}->{$uc_md5});
+  return 0;
+}
+
+# -----------------------------------------
+
+sub pdf_match_details {
+  my ($self, $pms, $body, $detail, $regex) = @_;
+  return unless ($detail && $regex);
+
+  # make sure we have pdf data read in.
+  if (!exists $pms->{'pdfinfo'}) {
+    $self->_find_pdf_mime_parts($pms);
+  }
+
+  return 0 if (exists $pms->{'pdfinfo'}->{'no_parts'});
+  return 0 unless (exists $pms->{'pdfinfo'}->{'details'});
+
+  my $check_value = $pms->{pdfinfo}->{details}->{$detail};
+  return unless $check_value;
+
+  my $hit = 0;
+  eval {
+      my $re = Mail::SpamAssassin::Util::make_qr($regex);
+      if ( $check_value =~ m/$re/ ) {
+          $hit = 1;
+      }
+  };
+  dbg("pdfinfo: error in regex $regex - $@") if $@;
+  if ($hit) {
+    dbg("pdfinfo: pdf_match_details $detail $regex matches $check_value");
+    return 1;
+  }
+  return 0;
+}
+
+# -----------------------------------------
+
+sub result_check {
+  my ($min, $max, $value, $nomaxequal) = @_;
+  return 0 unless defined $value;
+  return 0 if ($value < $min);
+  return 0 if (defined $max && $value > $max);
+  return 0 if (defined $nomaxequal && $nomaxequal && $value == $max);
+  return 1;
+}
+
+# -----------------------------------------
+
+1;
+
diff -Nru spamassassin-3.4.0/lib/Mail/SpamAssassin/Plugin/Phishing.pm spamassassin-3.4.2/lib/Mail/SpamAssassin/Plugin/Phishing.pm
--- spamassassin-3.4.0/lib/Mail/SpamAssassin/Plugin/Phishing.pm	1969-12-31 19:00:00.000000000 -0500
+++ spamassassin-3.4.2/lib/Mail/SpamAssassin/Plugin/Phishing.pm	2018-09-13 21:27:51.000000000 -0400
@@ -0,0 +1,207 @@
+#
+# Author: Giovanni Bechis <gbechis@apache.org>
+# Copyright 2018 Giovanni Bechis
+#
+# <@LICENSE>
+# Licensed to the Apache Software Foundation (ASF) under one or more
+# contributor license agreements.  See the NOTICE file distributed with
+# this work for additional information regarding copyright ownership.
+# The ASF licenses this file to you under the Apache License, Version 2.0
+# (the "License"); you may not use this file except in compliance with
+# the License.  You may obtain a copy of the License at:
+#
+#     http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+# </@LICENSE>
+#
+
+=head1 NAME
+
+Mail::SpamAssassin::Plugin::Phishing - check uris against phishing feed
+
+=head1 SYNOPSIS
+
+  loadplugin Mail::SpamAssassin::Plugin::Phishing
+
+  ifplugin Mail::SpamAssassin::Plugin::Phishing
+    phishing_openphish_feed /etc/mail/spamassassin/openphish-feed.txt
+    phishing_phishtank_feed /etc/mail/spamassassin/phishtank-feed.csv
+    body     URI_PHISHING      eval:check_phishing()
+    describe URI_PHISHING      Url match phishing in feed
+  endif
+
+=head1 DESCRIPTION
+
+This plugin finds uris used in phishing campaigns detected by 
+OpenPhish or PhishTank feeds.
+
+The Openphish free feed is updated every 6 hours and can be downloaded from
+https://openphish.com/feed.txt.
+The Premium Openphish feed is not currently supported.
+
+The PhishTank free feed is updated every 1 hours and can be downloaded from
+http://data.phishtank.com/data/online-valid.csv.
+To avoid download limits a registration is required.
+
+=cut
+
+package Mail::SpamAssassin::Plugin::Phishing;
+use strict;
+use warnings;
+my $VERSION = 1.0;
+
+use Errno qw(EBADF);
+use Mail::SpamAssassin::Plugin;
+use Mail::SpamAssassin::PerMsgStatus;
+
+our @ISA = qw(Mail::SpamAssassin::Plugin);
+
+sub dbg { Mail::SpamAssassin::Plugin::dbg ("Phishing: @_"); }
+
+sub new {
+    my ($class, $mailsa) = @_;
+
+    $class = ref($class) || $class;
+    my $self = $class->SUPER::new($mailsa);
+    bless ($self, $class);
+
+    $self->set_config($mailsa->{conf});
+    $self->register_eval_rule("check_phishing");
+
+    return $self;
+}
+
+sub set_config {
+    my ($self, $conf) = @_;
+    my @cmds;
+    push(@cmds, {
+        setting => 'phishing_openphish_feed',
+        type => $Mail::SpamAssassin::Conf::CONF_TYPE_STRING,
+        }
+    );
+    push(@cmds, {
+        setting => 'phishing_phishtank_feed',
+        type => $Mail::SpamAssassin::Conf::CONF_TYPE_STRING,
+        }
+    );
+    $conf->{parser}->register_commands(\@cmds);
+}
+
+#prepare the plugin
+sub check_start{
+  my ($self, $params) = @_;
+  my $pms = $params->{permsgstatus};
+
+  #initialize the PHISHING data structure for 
+  #saving configuration information
+  $pms->{PHISHING} = {};
+  $pms->{PHISHING}->{phishurl} = [];
+  $pms->{PHISHING}->{phishdomain} = [];
+  $pms->{PHISHING}->{phishinfo} = {};
+
+  #read the configuration info
+  $self->_read_configfile($params);
+}
+
+sub _read_configfile {
+  my ($self, $params) = @_;
+  my $pms = $params->{permsgstatus};
+  my @phtank_ln;
+
+  local *F;
+  if ( defined($pms->{conf}->{phishing_openphish_feed}) && ( -f $pms->{conf}->{phishing_openphish_feed} ) ) {
+    open(F, '<', $pms->{conf}->{phishing_openphish_feed});
+    for ($!=0; <F>; $!=0) {
+        chomp;
+        #lines that start with pound are comments
+        next if(/^\s*\#/);
+          my $phishdomain = $self->{main}->{registryboundaries}->uri_to_domain($_);
+          if ( defined $phishdomain ) {
+            push @{$pms->{PHISHING}->{phishurl}}, $_;
+            push @{$pms->{PHISHING}->{phishdomain}}, $phishdomain;
+            push @{$pms->{PHISHING}->{phishinfo}->{$phishdomain}}, "OpenPhish";
+          }
+    }
+
+    defined $_ || $!==0  or
+      $!==EBADF ? dbg("PHISHING: error reading config file: $!")
+                : die "error reading config file: $!";
+    close(F) or die "error closing config file: $!";
+  }
+
+  if ( defined($pms->{conf}->{phishing_phishtank_feed}) && (-f $pms->{conf}->{phishing_phishtank_feed} ) ) {
+    open(F, '<', $pms->{conf}->{phishing_phishtank_feed});
+    for ($!=0; <F>; $!=0) {
+        #skip first line
+        next if ( $. eq 1);
+        chomp;
+        #lines that start with pound are comments
+        next if(/^\s*\#/);
+
+        @phtank_ln = split(/,/, $_);
+
+        # XXX Exclude a Phishing category
+        #
+        # Count commas to get last field
+        # my $cnt_comma = ($_ =~ tr/\,//);
+        # next if( $phtank_ln[$cnt_comma] eq "Other" );
+
+        $phtank_ln[1] =~ s/\"//g;
+        my $phishdomain = $self->{main}->{registryboundaries}->uri_to_domain($phtank_ln[1]);
+        if ( defined $phishdomain ) {
+          push @{$pms->{PHISHING}->{phishurl}}, $phtank_ln[1];
+          push @{$pms->{PHISHING}->{phishdomain}}, $phishdomain;
+          push @{$pms->{PHISHING}->{phishinfo}->{$phishdomain}}, "PhishTank";
+        }
+    }
+
+    defined $_ || $!==0  or
+      $!==EBADF ? dbg("PHISHING: error reading config file: $!")
+                : die "error reading config file: $!";
+    close(F) or die "error closing config file: $!";
+  }
+}
+
+sub check_phishing {
+  my ($self, $pms) = @_;
+
+  my $desc;
+  my $feedname;
+  my $domain;
+  my $uris = $pms->get_uri_detail_list();
+
+  my $rulename = $pms->get_current_eval_rule_name();
+  if (defined $pms->{conf}->{descriptions}->{$rulename}) {
+    $desc = $pms->{conf}->{descriptions}->{$rulename};
+  }
+
+  while (my($uri, $info) = each %{$uris}) {
+    # we want to skip mailto: uris
+    next if ($uri =~ /^mailto:/i);
+
+    # no hosts/domains were found via this uri, so skip
+    next unless ($info->{hosts});
+    if (($info->{types}->{a}) || ($info->{types}->{parsed})) {
+      # check url
+      foreach my $cluri (@{$info->{cleaned}}) {
+        if (length $cluri) {
+           if ( grep { $cluri eq $_ } @{$pms->{PHISHING}->{phishurl}} ) {
+             $domain = $self->{main}->{registryboundaries}->uri_to_domain($cluri);
+             $feedname = $pms->{PHISHING}->{phishinfo}->{$domain}[0];
+             dbg("HIT! $domain [$cluri] found in $feedname feed");
+             $pms->got_hit($rulename, "", description => $desc . " $feedname ($domain)", ruletype => 'eval');
+             return 1;
+           }
+        }
+      }
+    }
+   }
+  return 0;
+}
+
+1;
diff -Nru spamassassin-3.4.0/lib/Mail/SpamAssassin/Plugin/PhishTag.pm spamassassin-3.4.2/lib/Mail/SpamAssassin/Plugin/PhishTag.pm
--- spamassassin-3.4.0/lib/Mail/SpamAssassin/Plugin/PhishTag.pm	2014-02-07 03:36:27.000000000 -0500
+++ spamassassin-3.4.2/lib/Mail/SpamAssassin/Plugin/PhishTag.pm	2018-09-13 21:27:51.000000000 -0400
@@ -25,9 +25,7 @@
 use Mail::SpamAssassin;
 use Mail::SpamAssassin::Logger;
 
-use vars qw(@ISA);
-
-our @ISA = qw(Mail::SpamAssassin::Plugin);
+our our @ISA = qw(Mail::SpamAssassin::Plugin);
 
 sub new{
   my ($class, $mailsa)=@_;
@@ -248,7 +246,7 @@
 
 =head1 DOWNLOAD
 
-The source of this plugin is avaliable at: 
+The source of this plugin is available at: 
 http://umut.topkara.org/PhishTag/PhishTag.pm
 a sample configuration file is also available:
 http://umut.topkara.org/PhishTag/PhishTag.cf
diff -Nru spamassassin-3.4.0/lib/Mail/SpamAssassin/Plugin/Pyzor.pm spamassassin-3.4.2/lib/Mail/SpamAssassin/Plugin/Pyzor.pm
--- spamassassin-3.4.0/lib/Mail/SpamAssassin/Plugin/Pyzor.pm	2014-02-07 03:36:27.000000000 -0500
+++ spamassassin-3.4.2/lib/Mail/SpamAssassin/Plugin/Pyzor.pm	2018-09-13 21:27:51.000000000 -0400
@@ -28,7 +28,7 @@
 Pyzor is a collaborative, networked system to detect and block spam
 using identifying digests of messages.
 
-See http://pyzor.sourceforge.net/ for more information about Pyzor.
+See http://pyzor.org/ for more information about Pyzor.
 
 =cut
 
@@ -41,11 +41,10 @@
                                 proc_status_ok exit_status_str);
 use strict;
 use warnings;
-use bytes;
+# use bytes;
 use re 'taint';
 
-use vars qw(@ISA);
-@ISA = qw(Mail::SpamAssassin::Plugin);
+our @ISA = qw(Mail::SpamAssassin::Plugin);
 
 sub new {
   my $class = shift;
@@ -300,13 +299,13 @@
 
     if (!@response) {
       # this exact string is needed below
-      die("no response\n");	# yes, this is possible
+      warn("no response\n");	# yes, this is possible
     }
     chomp for @response;
     dbg("pyzor: got response: " . join("\\n", @response));
 
     if ($response[0] =~ /^Traceback/) {
-      die("internal error, python traceback seen in response\n");
+      warn("internal error, python traceback seen in response\n");
     }
 
   });
diff -Nru spamassassin-3.4.0/lib/Mail/SpamAssassin/Plugin/Razor2.pm spamassassin-3.4.2/lib/Mail/SpamAssassin/Plugin/Razor2.pm
--- spamassassin-3.4.0/lib/Mail/SpamAssassin/Plugin/Razor2.pm	2014-02-07 03:36:27.000000000 -0500
+++ spamassassin-3.4.2/lib/Mail/SpamAssassin/Plugin/Razor2.pm	2018-09-13 21:27:51.000000000 -0400
@@ -45,11 +45,10 @@
 use Mail::SpamAssassin::Timeout;
 use strict;
 use warnings;
-use bytes;
+# use bytes;
 use re 'taint';
 
-use vars qw(@ISA);
-@ISA = qw(Mail::SpamAssassin::Plugin);
+our @ISA = qw(Mail::SpamAssassin::Plugin);
 
 sub new {
   my $class = shift;
@@ -115,7 +114,7 @@
     setting => 'razor_timeout',
     is_admin => 1,
     default => 5,
-    type => $Mail::SpamAssassin::Conf::CONF_TYPE_DURATIION,
+    type => $Mail::SpamAssassin::Conf::CONF_TYPE_DURATION,
   });
 
 =item razor_config filename
@@ -368,11 +367,11 @@
 
   if ($self->razor2_access($options->{text}, 'revoke', undef)) {
     $options->{revoke}->{revoke_available} = 1;
-    dbg('reporter: spam revoked from Razor');
+    info('reporter: spam revoked from Razor');
     $options->{revoke}->{revoke_return} = 1;
   }
   else {
-    dbg('reporter: could not revoke spam from Razor');
+    info('reporter: could not revoke spam from Razor');
   }
 }
 
diff -Nru spamassassin-3.4.0/lib/Mail/SpamAssassin/Plugin/RelayCountry.pm spamassassin-3.4.2/lib/Mail/SpamAssassin/Plugin/RelayCountry.pm
--- spamassassin-3.4.0/lib/Mail/SpamAssassin/Plugin/RelayCountry.pm	2014-02-07 03:36:27.000000000 -0500
+++ spamassassin-3.4.2/lib/Mail/SpamAssassin/Plugin/RelayCountry.pm	2018-09-13 21:27:51.000000000 -0400
@@ -32,8 +32,10 @@
 
 =head1 REQUIREMENT
 
-This plugin requires the Geo::IP module from CPAN. For backward
-compatibility IP::Country::Fast is used if Geo::IP is not installed.
+This plugin requires the GeoIP2, Geo::IP, IP::Country::DB_File or 
+IP::Country::Fast module from CPAN.
+For backward compatibility IP::Country::Fast is used as fallback if no db_type
+is specified in the config file.
 
 =cut
 
@@ -44,57 +46,15 @@
 use Mail::SpamAssassin::Constants qw(:ip);
 use strict;
 use warnings;
-use bytes;
+# use bytes;
 use re 'taint';
 
-use vars qw(@ISA);
-@ISA = qw(Mail::SpamAssassin::Plugin);
+our @ISA = qw(Mail::SpamAssassin::Plugin);
 
-my ($db, $dbv6);
-my $ip_to_cc; # will hold a sub() for the lookup
-my $db_info;  # will hold a sub() for database info
-
-# Try to load Geo::IP first
-eval {
-  require Geo::IP;
-  $db = Geo::IP->open_type(Geo::IP->GEOIP_COUNTRY_EDITION, Geo::IP->GEOIP_STANDARD);
-  die "GeoIP.dat not found" unless $db;
-  # IPv6 requires version Geo::IP 1.39+ with GeoIP C API 1.4.7+
-  if (Geo::IP->VERSION >= 1.39 && Geo::IP->api eq 'CAPI') {
-    $dbv6 = Geo::IP->open_type(Geo::IP->GEOIP_COUNTRY_EDITION_V6, Geo::IP->GEOIP_STANDARD);
-    if (!$dbv6) {
-      dbg("metadata: RelayCountry: IPv6 support not enabled, GeoIPv6.dat not found");
-    }
-  } else {
-    dbg("metadata: RelayCountry: IPv6 support not enabled, versions Geo::IP 1.39, GeoIP C API 1.4.7 required");
-  }
-  $ip_to_cc = sub {
-    if ($dbv6 && $_[0] =~ /:/) {
-      return $dbv6->country_code_by_addr_v6($_[0]) || "XX";
-    } else {
-      return $db->country_code_by_addr($_[0]) || "XX";
-    }
-  };
-  $db_info = sub { return "Geo::IP " . ($db->database_info || '?') };
-  1;
-} or do {
-  my $eval_stat = $@ ne '' ? $@ : "errno=$!";  chomp $eval_stat;
-  dbg("metadata: RelayCountry: failed to load 'Geo::IP', skipping: $eval_stat");
-  # Try IP::Country::Fast as backup
-  eval {
-    require IP::Country::Fast;
-    $db = IP::Country::Fast->new();
-    $ip_to_cc = sub {
-      return $db->inet_atocc($_[0]) || "XX";
-    };
-    $db_info = sub { return "IP::Country::Fast ".localtime($db->db_time()); };
-    1;
-  } or do {
-    my $eval_stat = $@ ne '' ? $@ : "errno=$!";  chomp $eval_stat;
-    dbg("metadata: RelayCountry: failed to load 'IP::Country::Fast', skipping: $eval_stat");
-    return 1;
-  };
-};
+my $db;
+my $dbv6;
+my $db_info;  # will hold database info
+my $db_type;  # will hold database type
 
 # constructor: register the eval rule
 sub new {
@@ -105,11 +65,154 @@
   $class = ref($class) || $class;
   my $self = $class->SUPER::new($mailsaobject);
   bless ($self, $class);
+
+  $self->set_config($mailsaobject->{conf});
   return $self;
 }
 
+sub set_config {
+  my ($self, $conf) = @_;
+  my @cmds;
+
+=head1 USER PREFERENCES
+
+The following options can be used in both site-wide (C<local.cf>) and
+user-specific (C<user_prefs>) configuration files to customize how
+SpamAssassin handles incoming email messages.
+
+=over 4
+
+=item country_db_type STRING
+
+This option tells SpamAssassin which type of Geo database to use.
+Valid database types are GeoIP, GeoIP2, DB_File and Fast.
+
+=back
+
+=cut
+
+  push (@cmds, {
+    setting => 'country_db_type',
+    default => "GeoIP",
+    type => $Mail::SpamAssassin::Conf::CONF_TYPE_STRING,
+    code => sub {
+      my ($self, $key, $value, $line) = @_;
+      if ( $value !~ /GeoIP|GeoIP2|DB_File|Fast/) {
+        return $Mail::SpamAssassin::Conf::INVALID_VALUE;
+      }
+
+      $self->{country_db_type} = $value;
+    }
+  });
+
+=over 4
+
+=item country_db_path STRING
+
+This option tells SpamAssassin where to find MaxMind GeoIP2 or IP::Country::DB_File database.
+
+=back
+
+=cut
+
+  push (@cmds, {
+    setting => 'country_db_path',
+    default => "",
+    type => $Mail::SpamAssassin::Conf::CONF_TYPE_STRING,
+    code => sub {
+      my ($self, $key, $value, $line) = @_;
+      if (!defined $value || !length $value) {
+        return $Mail::SpamAssassin::Conf::MISSING_REQUIRED_VALUE;
+      }
+      if (!-f $value) {
+        info("config: country_db_path \"$value\" is not accessible");
+        $self->{country_db_path} = $value;
+        return $Mail::SpamAssassin::Conf::INVALID_VALUE;
+      }
+
+      $self->{country_db_path} = $value;
+    }
+  });
+  
+  $conf->{parser}->register_commands(\@cmds);
+}
+
 sub extract_metadata {
   my ($self, $opts) = @_;
+  my $geo;
+  my $cc;
+
+  my $conf_country_db_type = $self->{'main'}{'resolver'}{'conf'}->{country_db_type};
+  my $conf_country_db_path = $self->{'main'}{'resolver'}{'conf'}->{country_db_path};
+
+  if ( $conf_country_db_type eq "GeoIP") {
+    eval {
+      require Geo::IP;
+      $db = Geo::IP->open_type(Geo::IP->GEOIP_COUNTRY_EDITION, Geo::IP->GEOIP_STANDARD);
+      die "GeoIP.dat not found" unless $db;
+      # IPv6 requires version Geo::IP 1.39+ with GeoIP C API 1.4.7+
+      if (Geo::IP->VERSION >= 1.39 && Geo::IP->api eq 'CAPI') {
+       $dbv6 = Geo::IP->open_type(Geo::IP->GEOIP_COUNTRY_EDITION_V6, Geo::IP->GEOIP_STANDARD);
+       if (!$dbv6) {
+         dbg("metadata: RelayCountry: IPv6 support not enabled, GeoIPv6.dat not found");
+       }
+       $db_info = sub { return "Geo::IP " . ($db->database_info || '?') };
+      } else {
+       dbg("metadata: RelayCountry: IPv6 support not enabled, versions Geo::IP 1.39, GeoIP C API 1.4.7 required");
+      }
+   } or do {
+     # Fallback to IP::Country::Fast
+     dbg("metadata: RelayCountry: GeoIP.dat not found, IP::Country::Fast enabled as fallback");
+     $conf_country_db_type = "Fast";
+   }
+  } elsif ( $conf_country_db_type eq "GeoIP2" ) {
+     if ( -f $conf_country_db_path ) {
+       eval {
+         require GeoIP2::Database::Reader;
+         $db = GeoIP2::Database::Reader->new(
+            file => $conf_country_db_path,
+            locales	=> [ 'en' ]
+	   );
+         die "${conf_country_db_path} not found" unless $db;
+         $db_info = sub { return "GeoIP2 " . ($db->metadata()->description()->{en} || '?') };
+         1;
+       } or do {
+         # Fallback to IP::Country::Fast
+         dbg("metadata: RelayCountry: ${conf_country_db_path} not found, IP::Country::Fast enabled as fallback");
+         $conf_country_db_type = "Fast";
+       }
+     } else {
+         # Fallback to IP::Country::Fast
+         dbg("metadata: RelayCountry: ${conf_country_db_path} not found, IP::Country::Fast enabled as fallback");
+         $conf_country_db_type = "Fast";
+     }
+  } elsif ( $conf_country_db_type eq "DB_File") {
+    if ( -f $conf_country_db_path ) {
+      require IP::Country::DB_File;
+      $db = IP::Country::DB_File->new($conf_country_db_path);
+      die "Country db not found, please see build_ipcc.pl(1)" unless $db;
+      $db_info = sub { return "IP::Country::DB_File ".localtime($db->db_time()); };
+      1;     
+    } else {
+      # Fallback to IP::Country::Fast
+      dbg("metadata: RelayCountry: ${conf_country_db_path} not found, IP::Country::Fast enabled as fallback");
+      $conf_country_db_type = "Fast";
+    }
+  } 
+  if( $conf_country_db_type eq "Fast") {
+    my $eval_stat = $@ ne '' ? $@ : "errno=$!";  chomp $eval_stat;
+    # Try IP::Country::Fast as backup
+    eval {
+      require IP::Country::Fast;
+      $db = IP::Country::Fast->new();
+      $db_info = sub { return "IP::Country::Fast ".localtime($db->db_time()); };
+      1;
+    } or do {
+      my $eval_stat = $@ ne '' ? $@ : "errno=$!";  chomp $eval_stat;
+      dbg("metadata: RelayCountry: failed to load 'IP::Country::Fast', skipping: $eval_stat");
+      return 1;
+    };
+  };
 
   return 1 unless $db;
 
@@ -118,10 +221,39 @@
 
   my $countries = '';
   my $IP_PRIVATE = IP_PRIVATE;
+  my $IPV4_ADDRESS = IPV4_ADDRESS;
   foreach my $relay (@{$msg->{metadata}->{relays_untrusted}}) {
     my $ip = $relay->{ip};
     # Private IPs will always be returned as '**'
-    my $cc = $ip =~ /^$IP_PRIVATE$/o ? '**' : $ip_to_cc->($ip);
+    if ( $conf_country_db_type eq "GeoIP" ) {
+	  if ( $ip !~ /^$IPV4_ADDRESS$/o ) {
+	    if ( defined $dbv6 ) {
+	    	$geo = $dbv6->country_code_by_addr_v6($ip) || "XX";
+	    } else {
+		$geo = "XX";
+	    }
+	  } else {
+	    $geo = $db->country_code_by_addr($ip) || "XX";
+	  }
+    } elsif ($conf_country_db_type eq "GeoIP2" ) {
+      if ( $ip !~ /^$IP_PRIVATE$/o ) {
+        my $country = $db->country( ip => $ip );
+        my $country_rec = $country->country();
+        $geo = $country_rec->iso_code() || "XX";
+        $cc = $ip =~ /^$IP_PRIVATE$/o ? '**' : $geo;
+      } else {
+        $cc = '**';
+      }
+    } elsif ( $conf_country_db_type eq "DB_File" ) {
+      if ( $ip !~ /^$IPV4_ADDRESS$/o ) {
+        $geo = $db->inet6_atocc($ip) || "XX";
+      } else {
+        $geo = $db->inet_atocc($ip) || "XX";
+      }		        
+    } elsif ( $conf_country_db_type eq "Fast" ) {
+        $geo = $db->inet_atocc($ip) || "XX";
+    }
+    $cc = $ip =~ /^$IP_PRIVATE$/o ? '**' : $geo;
     $countries .= $cc." ";
   }
 
diff -Nru spamassassin-3.4.0/lib/Mail/SpamAssassin/Plugin/RelayEval.pm spamassassin-3.4.2/lib/Mail/SpamAssassin/Plugin/RelayEval.pm
--- spamassassin-3.4.0/lib/Mail/SpamAssassin/Plugin/RelayEval.pm	2014-02-07 03:36:27.000000000 -0500
+++ spamassassin-3.4.2/lib/Mail/SpamAssassin/Plugin/RelayEval.pm	2018-09-13 21:27:51.000000000 -0400
@@ -23,11 +23,10 @@
 
 use strict;
 use warnings;
-use bytes;
+# use bytes;
 use re 'taint';
 
-use vars qw(@ISA);
-@ISA = qw(Mail::SpamAssassin::Plugin);
+our @ISA = qw(Mail::SpamAssassin::Plugin);
 
 # constructor: register the eval rule
 sub new {
@@ -88,6 +87,7 @@
     my $IP_ADDRESS = IPV4_ADDRESS;
     my $IP_PRIVATE = IP_PRIVATE;
     local $1;
+    # no re "strict";  # since perl 5.21.8: Ranges of ASCII printables...
     if ($rcvd =~ /\bhelo=($IP_ADDRESS)(?=[\000-\040,;\[()<>]|\z)/i  # Bug 5878
         && $1 !~ /$IP_PRIVATE/) {
       return 1;
diff -Nru spamassassin-3.4.0/lib/Mail/SpamAssassin/Plugin/ReplaceTags.pm spamassassin-3.4.2/lib/Mail/SpamAssassin/Plugin/ReplaceTags.pm
--- spamassassin-3.4.0/lib/Mail/SpamAssassin/Plugin/ReplaceTags.pm	2014-02-07 03:36:27.000000000 -0500
+++ spamassassin-3.4.2/lib/Mail/SpamAssassin/Plugin/ReplaceTags.pm	2018-09-13 21:27:51.000000000 -0400
@@ -55,11 +55,10 @@
 
 use strict;
 use warnings;
-use bytes;
+# use bytes;
 use re 'taint';
 
-use vars qw(@ISA);
-@ISA = qw(Mail::SpamAssassin::Plugin);
+our @ISA = qw(Mail::SpamAssassin::Plugin);
 
 sub new {
   my ($class, $mailsa) = @_;
diff -Nru spamassassin-3.4.0/lib/Mail/SpamAssassin/Plugin/ResourceLimits.pm spamassassin-3.4.2/lib/Mail/SpamAssassin/Plugin/ResourceLimits.pm
--- spamassassin-3.4.0/lib/Mail/SpamAssassin/Plugin/ResourceLimits.pm	1969-12-31 19:00:00.000000000 -0500
+++ spamassassin-3.4.2/lib/Mail/SpamAssassin/Plugin/ResourceLimits.pm	2018-09-13 21:27:51.000000000 -0400
@@ -0,0 +1,143 @@
+# <@LICENSE>
+# Licensed to the Apache Software Foundation (ASF) under one or more
+# contributor license agreements.  See the NOTICE file distributed with
+# this work for additional information regarding copyright ownership.
+# The ASF licenses this file to you under the Apache License, Version 2.0
+# (the "License"); you may not use this file except in compliance with
+# the License.  You may obtain a copy of the License at:
+#
+#     http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+# </@LICENSE>
+
+=head1 NAME
+
+Mail::SpamAssassin::Plugin::ResourceLimits - Limit the memory and/or CPU of child spamd processes
+
+=head1 SYNOPSIS
+
+  # This plugin is for admin only and cannot be specified in user config.
+  loadplugin     Mail::SpamAssassin::Plugin::ResourceLimits
+
+  # Sets to RLIMIT_CPU from BSD::Resource. The quota is based on max CPU Time seconds.
+  resource_limit_cpu 120
+
+  # Sets to RLIMIT_RSS and RLIMIT_AS via BSD::Resource.
+  resource_limit_cpu 536870912
+
+=head1 DESCRIPTION
+
+This module leverages BSD::Resource to assure your spamd child processes do not exceed
+specified CPU or memory limit. If this happens, the child process will die.
+See the L<BSD::Resource> for more details.
+
+NOTE: Because this plugin uses BSD::Resource, it will not function on Windows.
+
+=head1 ADMINISTRATOR SETTINGS
+
+=over 4
+
+=item resource_limit_cpu 120	(default: 0 or no limit)
+
+How many cpu cycles are allowed on this process before it dies.
+
+=item resource_limit_mem 536870912	(default: 0 or no limit)
+
+The maximum number of bytes of memory allowed both for:
+
+=over
+
+=item *
+
+(virtual) address space bytes
+
+=item *
+
+resident set size
+
+=back
+
+=back
+
+=cut
+
+package Mail::SpamAssassin::Plugin::ResourceLimits;
+
+use Mail::SpamAssassin::Plugin ();
+use Mail::SpamAssassin::Logger ();
+use Mail::SpamAssassin::Util   ();
+use Mail::SpamAssassin::Constants qw(:sa);
+
+use strict;
+use warnings;
+
+use BSD::Resource qw(RLIMIT_RSS RLIMIT_AS RLIMIT_CPU);
+
+our @ISA = qw(Mail::SpamAssassin::Plugin);
+
+sub new {
+    my $class        = shift;
+    my $mailsaobject = shift;
+
+    $class = ref($class) || $class;
+    my $self = $class->SUPER::new($mailsaobject);
+    bless( $self, $class );
+
+    $self->set_config( $mailsaobject->{conf} );
+    return $self;
+}
+
+sub set_config {
+    my ( $self, $conf ) = @_;
+    my @cmds = ();
+
+    push(
+        @cmds,
+        {
+            setting  => 'resource_limit_mem',
+            is_admin => 1,
+            default  => '0',
+            type     => $Mail::SpamAssassin::Conf::CONF_TYPE_NUMERIC
+        }
+    );
+
+    push(
+        @cmds,
+        {
+            setting  => 'resource_limit_cpu',
+            is_admin => 1,
+            default  => '0',
+            type     => $Mail::SpamAssassin::Conf::CONF_TYPE_NUMERIC
+        }
+    );
+
+    $conf->{parser}->register_commands( \@cmds );
+}
+
+sub spamd_child_init {
+    my ($self) = @_;
+
+    # Set CPU Resource limits if they were specified.
+    Mail::SpamAssassin::Util::dbg("resourcelimitplugin: In spamd_child_init");
+    Mail::SpamAssassin::Util::dbg( "resourcelimitplugin: cpu limit: " . $self->{main}->{conf}->{resource_limit_cpu} );
+    if ( $self->{main}->{conf}->{resource_limit_cpu} ) {
+        BSD::Resource::setrlimit( RLIMIT_CPU, $self->{main}->{conf}->{resource_limit_cpu}, $self->{main}->{conf}->{resource_limit_cpu} )
+          || info("resourcelimitplugin: Unable to set RLIMIT_CPU");
+    }
+
+    # Set  Resource limits if they were specified.
+    Mail::SpamAssassin::Util::dbg( "resourcelimitplugin: mem limit: " . $self->{main}->{conf}->{resource_limit_mem} );
+    if ( $self->{main}->{conf}->{resource_limit_mem} ) {
+        BSD::Resource::setrlimit( RLIMIT_RSS, $self->{main}->{conf}->{resource_limit_mem}, $self->{main}->{conf}->{resource_limit_mem} )
+          || info("resourcelimitplugin: Unable to set RLIMIT_RSS");
+        BSD::Resource::setrlimit( RLIMIT_AS, $self->{main}->{conf}->{resource_limit_mem}, $self->{main}->{conf}->{resource_limit_mem} )
+          || info("resourcelimitplugin: Unable to set RLIMIT_AS");
+    }
+}
+
+1;
diff -Nru spamassassin-3.4.0/lib/Mail/SpamAssassin/Plugin/Reuse.pm spamassassin-3.4.2/lib/Mail/SpamAssassin/Plugin/Reuse.pm
--- spamassassin-3.4.0/lib/Mail/SpamAssassin/Plugin/Reuse.pm	2014-02-07 03:36:27.000000000 -0500
+++ spamassassin-3.4.2/lib/Mail/SpamAssassin/Plugin/Reuse.pm	2018-09-13 21:27:51.000000000 -0400
@@ -22,15 +22,14 @@
 
 package Mail::SpamAssassin::Plugin::Reuse;
 
-use bytes;
+# use bytes;
 use strict;
 use warnings;
 
 use Mail::SpamAssassin::Conf;
 use Mail::SpamAssassin::Logger;
 
-use vars qw(@ISA);
-@ISA = qw(Mail::SpamAssassin::Plugin);
+our @ISA = qw(Mail::SpamAssassin::Plugin);
 
 # constructor
 sub new {
@@ -187,6 +186,7 @@
   my ($self, $pms, $priority, $stage) = @_;
 
   return unless exists $pms->{reuse_hits_to_add}->{"$priority $stage"};
+  return if exists $pms->{reuse_hits_done}->{"$priority $stage"};
   foreach my $rule (@{$pms->{reuse_hits_to_add}->{"$priority $stage"}}) {
     # Add hit even if rule was originally disabled
     my $ss = $pms->{conf}->get_score_set();
@@ -199,6 +199,7 @@
 
     $pms->{conf}->{scores}->{$rule} = 0;
   }
+  $pms->{reuse_hits_done}->{"$priority $stage"} = 1;
 }
 
 my %type_to_stage = (
diff -Nru spamassassin-3.4.0/lib/Mail/SpamAssassin/Plugin/Rule2XSBody.pm spamassassin-3.4.2/lib/Mail/SpamAssassin/Plugin/Rule2XSBody.pm
--- spamassassin-3.4.0/lib/Mail/SpamAssassin/Plugin/Rule2XSBody.pm	2014-02-07 03:36:27.000000000 -0500
+++ spamassassin-3.4.2/lib/Mail/SpamAssassin/Plugin/Rule2XSBody.pm	2018-09-13 21:27:51.000000000 -0400
@@ -41,11 +41,10 @@
 
 use strict;
 use warnings;
-use bytes;
+# use bytes;
 use re 'taint';
 
-use vars qw(@ISA);
-@ISA = qw(Mail::SpamAssassin::Plugin);
+our @ISA = qw(Mail::SpamAssassin::Plugin);
 
 sub new {
   my $class = shift;
diff -Nru spamassassin-3.4.0/lib/Mail/SpamAssassin/Plugin/Shortcircuit.pm spamassassin-3.4.2/lib/Mail/SpamAssassin/Plugin/Shortcircuit.pm
--- spamassassin-3.4.0/lib/Mail/SpamAssassin/Plugin/Shortcircuit.pm	2014-02-07 03:36:27.000000000 -0500
+++ spamassassin-3.4.2/lib/Mail/SpamAssassin/Plugin/Shortcircuit.pm	2018-09-13 21:27:51.000000000 -0400
@@ -45,11 +45,10 @@
 use Mail::SpamAssassin::Logger;
 use strict;
 use warnings;
-use bytes;
+# use bytes;
 use re 'taint';
 
-use vars qw(@ISA);
-@ISA = qw(Mail::SpamAssassin::Plugin);
+our @ISA = qw(Mail::SpamAssassin::Plugin);
 
 sub new {
   my $class = shift;
diff -Nru spamassassin-3.4.0/lib/Mail/SpamAssassin/Plugin/SpamCop.pm spamassassin-3.4.2/lib/Mail/SpamAssassin/Plugin/SpamCop.pm
--- spamassassin-3.4.0/lib/Mail/SpamAssassin/Plugin/SpamCop.pm	2014-02-07 03:36:27.000000000 -0500
+++ spamassassin-3.4.2/lib/Mail/SpamAssassin/Plugin/SpamCop.pm	2018-09-13 21:27:51.000000000 -0400
@@ -46,14 +46,13 @@
 use IO::Socket;
 use strict;
 use warnings;
-use bytes;
+# use bytes;
 use re 'taint';
 
 use constant HAS_NET_DNS => eval { require Net::DNS; };
 use constant HAS_NET_SMTP => eval { require Net::SMTP; };
 
-use vars qw(@ISA);
-@ISA = qw(Mail::SpamAssassin::Plugin);
+our @ISA = qw(Mail::SpamAssassin::Plugin);
 
 sub new {
   my $class = shift;
diff -Nru spamassassin-3.4.0/lib/Mail/SpamAssassin/Plugin/SPF.pm spamassassin-3.4.2/lib/Mail/SpamAssassin/Plugin/SPF.pm
--- spamassassin-3.4.0/lib/Mail/SpamAssassin/Plugin/SPF.pm	2014-02-07 03:36:27.000000000 -0500
+++ spamassassin-3.4.2/lib/Mail/SpamAssassin/Plugin/SPF.pm	2018-09-13 21:27:51.000000000 -0400
@@ -38,11 +38,10 @@
 use Mail::SpamAssassin::Timeout;
 use strict;
 use warnings;
-use bytes;
+# use bytes;
 use re 'taint';
 
-use vars qw(@ISA);
-@ISA = qw(Mail::SpamAssassin::Plugin);
+our @ISA = qw(Mail::SpamAssassin::Plugin);
 
 # constructor: register the eval rule
 sub new {
@@ -59,11 +58,15 @@
   $self->register_eval_rule ("check_for_spf_none");
   $self->register_eval_rule ("check_for_spf_fail");
   $self->register_eval_rule ("check_for_spf_softfail");
+  $self->register_eval_rule ("check_for_spf_permerror");
+  $self->register_eval_rule ("check_for_spf_temperror");
   $self->register_eval_rule ("check_for_spf_helo_pass");
   $self->register_eval_rule ("check_for_spf_helo_neutral");
   $self->register_eval_rule ("check_for_spf_helo_none");
   $self->register_eval_rule ("check_for_spf_helo_fail");
   $self->register_eval_rule ("check_for_spf_helo_softfail");
+  $self->register_eval_rule ("check_for_spf_helo_permerror");
+  $self->register_eval_rule ("check_for_spf_helo_temperror");
   $self->register_eval_rule ("check_for_spf_whitelist_from");
   $self->register_eval_rule ("check_for_def_spf_whitelist_from");
 
@@ -224,6 +227,15 @@
   $conf->{parser}->register_commands(\@cmds);
 }
 
+
+=item has_check_for_spf_errors
+
+Adds capability check for "if can()" for check_for_spf_permerror, check_for_spf_temperror, check_for_spf_helo_permerror and check_for_spf_helo_permerror
+
+=cut 
+
+sub has_check_for_spf_errors { 1 }
+
 # SPF support
 sub check_for_spf_pass {
   my ($self, $scanner) = @_;
@@ -258,6 +270,18 @@
   $scanner->{spf_softfail};
 }
 
+sub check_for_spf_permerror {
+  my ($self, $scanner) = @_;
+  $self->_check_spf ($scanner, 0) unless $scanner->{spf_checked};
+  $scanner->{spf_permerror};
+}
+
+sub check_for_spf_temperror {
+  my ($self, $scanner) = @_;
+  $self->_check_spf ($scanner, 0) unless $scanner->{spf_checked};
+  $scanner->{spf_temperror};
+}
+
 sub check_for_spf_helo_pass {
   my ($self, $scanner) = @_;
   $self->_check_spf ($scanner, 1) unless $scanner->{spf_helo_checked};
@@ -291,6 +315,18 @@
   $scanner->{spf_helo_softfail};
 }
 
+sub check_for_spf_helo_permerror {
+  my ($self, $scanner) = @_;
+  $self->_check_spf ($scanner, 1) unless $scanner->{spf_helo_checked};
+  $scanner->{spf_helo_permerror};
+}
+
+sub check_for_spf_helo_temperror {
+  my ($self, $scanner) = @_;
+  $self->_check_spf ($scanner, 1) unless $scanner->{spf_helo_checked};
+  $scanner->{spf_helo_temperror};
+}
+
 sub check_for_spf_whitelist_from {
   my ($self, $scanner) = @_;
   $self->_check_spf_whitelist($scanner) unless $scanner->{spf_whitelist_from_checked};
@@ -354,7 +390,7 @@
 
 	# http://www.openspf.org/RFC_4408#header-field
 	# wtf - for some reason something is sticking an extra space between the header name and field value
-	if ($hdr =~ /^received-spf:\s*(pass|neutral|(?:soft)?fail|none)\b(?:.*\bidentity=(\S+?);?\b)?/i) {
+	if ($hdr =~ /^received-spf:\s*(pass|neutral|(?:soft)?fail|(?:temp|perm)error|none)\b(?:.*\bidentity=(\S+?);?\b)?/i) {
 	  my $result = lc($1);
 
 	  my $identity = '';	# we assume it's a mfrom check if we can't tell otherwise
@@ -381,6 +417,8 @@
 	  $scanner->{"spf_${identity}none"} = 0;
 	  $scanner->{"spf_${identity}fail"} = 0;
 	  $scanner->{"spf_${identity}softfail"} = 0;
+	  $scanner->{"spf_${identity}temperror"} = 0;
+	  $scanner->{"spf_${identity}permerror"} = 0;
 	  $scanner->{"spf_${identity}failure_comment"} = undef;
 
 	  # and the result
@@ -402,7 +440,7 @@
         # Authentication-Results: mail.example.com; SPF=none smtp.mailfrom=example.org (comment)
 
         my $tmphdr = $1;
-        if ($tmphdr =~ /^(pass|neutral|(?:hard|soft)?fail|none)(?:[^;]*?\bsmtp\.(\S+)\s*=[^;]+)?/i) {
+        if ($tmphdr =~ /^(pass|neutral|(?:hard|soft)?fail|(?:temp|perm)error|none)(?:[^;]*?\bsmtp\.(\S+)\s*=[^;]+)?/i) {
           my $result = lc($1);
           $result = 'fail'  if $result eq 'hardfail';  # RFC5451 permits this
 
@@ -430,6 +468,8 @@
           $scanner->{"spf_${identity}none"} = 0;
           $scanner->{"spf_${identity}fail"} = 0;
           $scanner->{"spf_${identity}softfail"} = 0;
+          $scanner->{"spf_${identity}temperror"} = 0;
+          $scanner->{"spf_${identity}permerror"} = 0;
           $scanner->{"spf_${identity}failure_comment"} = undef;
 
           # and the result
@@ -468,7 +508,10 @@
       # Mail::SPF::Server can be re-used, and we get to use our own resolver object!
       $self->{spf_server} = Mail::SPF::Server->new(
 				hostname     => $scanner->get_tag('HOSTNAME'),
-				dns_resolver => $self->{main}->{resolver} );
+				dns_resolver => $self->{main}->{resolver},
+				max_dns_interactive_terms => 20);
+      # Bug 7112: max_dns_interactive_terms defaults to 10, but even 14 is
+      # not enough for ebay.com, setting it to 15 NOTE: raising to 20 per bug 7182
       1;
     } or do {
       $eval_stat = $@ ne '' ? $@ : "errno=$!";  chomp $eval_stat;
@@ -524,6 +567,8 @@
     $scanner->{spf_helo_none} = 0;
     $scanner->{spf_helo_fail} = 0;
     $scanner->{spf_helo_softfail} = 0;
+    $scanner->{spf_helo_permerror} = 0;
+    $scanner->{spf_helo_temperror} = 0;
     $scanner->{spf_helo_failure_comment} = undef;
   } else {
     # SPF on envelope sender (where possible)
@@ -533,6 +578,8 @@
     $scanner->{spf_none} = 0;
     $scanner->{spf_fail} = 0;
     $scanner->{spf_softfail} = 0;
+    $scanner->{spf_permerror} = 0;
+    $scanner->{spf_temperror} = 0;
     $scanner->{spf_failure_comment} = undef;
   }
 
@@ -679,8 +726,11 @@
     elsif ($result eq 'none') { $scanner->{spf_helo_none} = 1; }
     elsif ($result eq 'fail') { $scanner->{spf_helo_fail} = 1; }
     elsif ($result eq 'softfail') { $scanner->{spf_helo_softfail} = 1; }
+    elsif ($result eq 'permerror') { $scanner->{spf_helo_permerror} = 1; }
+    elsif ($result eq 'temperror') { $scanner->{spf_helo_temperror} = 1; }
+    elsif ($result eq 'error') { $scanner->{spf_helo_temperror} = 1; }
 
-    if ($result eq 'fail') {	# RFC 4408 6.2
+    if ($result eq 'fail') {	# RFC 7208 6.2
       $scanner->{spf_helo_failure_comment} = "SPF failed: $comment";
     }
   } else {
@@ -689,8 +739,11 @@
     elsif ($result eq 'none') { $scanner->{spf_none} = 1; }
     elsif ($result eq 'fail') { $scanner->{spf_fail} = 1; }
     elsif ($result eq 'softfail') { $scanner->{spf_softfail} = 1; }
+    elsif ($result eq 'permerror') { $scanner->{spf_permerror} = 1; }
+    elsif ($result eq 'temperror') { $scanner->{spf_temperror} = 1; }
+    elsif ($result eq 'error') { $scanner->{spf_temperror} = 1; }
 
-    if ($result eq 'fail') {	# RCF 4408 6.2
+    if ($result eq 'fail') {	# RFC 7208 6.2
       $scanner->{spf_failure_comment} = "SPF failed: $comment";
     }
   }
diff -Nru spamassassin-3.4.0/lib/Mail/SpamAssassin/Plugin/Test.pm spamassassin-3.4.2/lib/Mail/SpamAssassin/Plugin/Test.pm
--- spamassassin-3.4.0/lib/Mail/SpamAssassin/Plugin/Test.pm	2014-02-07 03:36:27.000000000 -0500
+++ spamassassin-3.4.2/lib/Mail/SpamAssassin/Plugin/Test.pm	2018-09-13 21:27:51.000000000 -0400
@@ -36,11 +36,10 @@
 use Mail::SpamAssassin::Plugin;
 use strict;
 use warnings;
-use bytes;
+# use bytes;
 use re 'taint';
 
-use vars qw(@ISA);
-@ISA = qw(Mail::SpamAssassin::Plugin);
+our @ISA = qw(Mail::SpamAssassin::Plugin);
 
 # constructor: register the eval rule
 sub new {
diff -Nru spamassassin-3.4.0/lib/Mail/SpamAssassin/Plugin/TextCat.pm spamassassin-3.4.2/lib/Mail/SpamAssassin/Plugin/TextCat.pm
--- spamassassin-3.4.0/lib/Mail/SpamAssassin/Plugin/TextCat.pm	2014-02-07 03:36:27.000000000 -0500
+++ spamassassin-3.4.2/lib/Mail/SpamAssassin/Plugin/TextCat.pm	2018-09-13 21:27:51.000000000 -0400
@@ -40,6 +40,9 @@
 Note: the language cannot always be recognized with sufficient confidence.
 In that case, no action is taken.
 
+You can use _TEXTCATRESULTS_ tag to view the internal ngram-scoring, it
+might help fine-tuning settings.
+
 =cut
 
 package Mail::SpamAssassin::Plugin::TextCat;
@@ -48,11 +51,10 @@
 use Mail::SpamAssassin::Logger;
 use strict;
 use warnings;
-use bytes;
+# use bytes;
 use re 'taint';
 
-use vars qw(@ISA);
-@ISA = qw(Mail::SpamAssassin::Plugin);
+our @ISA = qw(Mail::SpamAssassin::Plugin);
 
 # language models
 my @nm;
@@ -297,7 +299,14 @@
 =item textcat_max_languages N (default: 3)
 
 The maximum number of languages any one message can simultaneously match
-before its classification is considered unknown.
+before its classification is considered unknown.  You can try reducing this
+to 2 or possibly even 1 for more confident results, as it's unusual for a
+message to contain multiple languages.
+
+Read description for textcat_acceptable_score also, as these settings are
+closely related.  Scoring affects how many languages might be matched and
+here we set the "false positive limit" where we think the engine can't
+decide what languages message really contain.
 
 =cut
 
@@ -337,7 +346,20 @@
 =item textcat_acceptable_score N (default: 1.02)
 
 Include any language that scores at least C<textcat_acceptable_score> in the
-returned list of languages. 
+returned list of languages.
+
+This setting is basically a percentile range. Any language having internal
+ngram-score within N-percent of the best score is included into results. 
+Larger values than 1.05 are not recommended as it can generate many false
+matches.  A setting of 1.00 would mean a single best scoring language is
+always forcibly selected, but this is not recommended as then
+textcat_max_languages can't do its job classifying language as uncertain.
+
+Read the description for textcat_max_languages, as these are settings are
+closely related.
+
+You can use _TEXTCATRESULTS_ tag to view the internal ngram-scoring, it
+might help fine-tuning settings.
 
 =cut
 
@@ -356,7 +378,7 @@
   my @lm;
   my $ngram = {};
   my $rang = 1;
-  dbg("textcat: loading languages file...");
+  dbg("textcat: loading languages file %s", $languages_filename);
 
   local *LM;
   if (!open(LM, $languages_filename)) {
@@ -394,8 +416,9 @@
 }
 
 sub classify {
-  my ($inputptr, $conf, %skip) = @_;
+  my ($inputptr, $opts, %skip) = @_;
   my %results;
+  my $conf = $opts->{conf};
   my $maxp = $conf->{textcat_max_ngrams};
 
   # create ngrams for input
@@ -422,6 +445,14 @@
 
   my $best = $results{$results[0]};
 
+  # Insert first 20 results in tag for debugging purposes
+  my @results_tag;
+  foreach (@results[0..19]) {
+    last unless defined $_;
+    push @results_tag, sprintf "%s:%s(%.02f)", $_, $results{$_}, $results{$_} / $best;
+  }
+  $opts->{permsgstatus}->set_tag('TEXTCATRESULTS', join(' ', @results_tag));
+
   my @answers = (shift(@results));
   while (@results && $results{$results[0]} < ($conf->{textcat_acceptable_score} * $best)) {
     @answers = (@answers, shift(@results));
@@ -441,14 +472,22 @@
   my %ngram;
   my @sorted;
 
+  # Note that $$inputptr may or may not be in perl characters (utf8 flag set)
+  my $is_unicode = utf8::is_utf8($$inputptr);
+
   # my $non_word_characters = qr/[0-9\s]/;
-  for my $word (split(/[0-9\s]+/, ${$_[0]}))
+  for my $word (split(/[0-9\s]+/, $$inputptr))
   {
-    # Bug 6229: Current TextCat database only works well with
-    # lowercase input, lets work around it until it's properly
-    # generated and/or locale issues are resolved..
-    $word =~ tr/A-Z\xc0-\xd6\xd8-\xde/a-z\xe0-\xf6\xf8-\xfe/
-        if $word =~ /[A-Z]/ && $word =~ /[a-zA-Z\xc0-\xd6\xd8-\xde\xe0-\xf6\xf8-\xfe]{4}/;
+    # Bug 6229: Current TextCat database only works well with lowercase input
+    if ($is_unicode) {
+      # Unicode rules are used for the case change
+      $word = lc $word  if $word =~ /\w{4}/;
+      utf8::encode($word);  # encode Unicode characters to UTF-8 octets
+    } elsif ($word =~ /[A-Z]/ &&
+             $word =~ /[a-zA-Z\xc0-\xd6\xd8-\xde\xe0-\xf6\xf8-\xfe]{4}/) {
+      # assume ISO 8859-1 / Windows-1252
+      $word =~ tr/A-Z\xc0-\xd6\xd8-\xde/a-z\xe0-\xf6\xf8-\xfe/;
+    }
     $word = "\000" . $word . "\000";
     my $len = length($word);
     my $flen = $len;
@@ -506,7 +545,7 @@
     $skip{$_} = 1 for split(' ', $opts->{conf}->{inactive_languages});
     delete $skip{$_} for split(' ', $opts->{conf}->{ok_languages});
     dbg("textcat: classifying, skipping: " . join(" ", keys %skip));
-    @matches = classify(\$body, $opts->{conf}, %skip);
+    @matches = classify(\$body, $opts, %skip);
   }
   else {
     dbg("textcat: message too short for language analysis");
diff -Nru spamassassin-3.4.0/lib/Mail/SpamAssassin/Plugin/TxRep.pm spamassassin-3.4.2/lib/Mail/SpamAssassin/Plugin/TxRep.pm
--- spamassassin-3.4.0/lib/Mail/SpamAssassin/Plugin/TxRep.pm	1969-12-31 19:00:00.000000000 -0500
+++ spamassassin-3.4.2/lib/Mail/SpamAssassin/Plugin/TxRep.pm	2018-09-13 21:27:51.000000000 -0400
@@ -0,0 +1,1961 @@
+# <@LICENSE>
+# Licensed to the Apache Software Foundation (ASF) under one or more
+# contributor license agreements.  See the NOTICE file distributed with
+# this work for additional information regarding copyright ownership.
+# The ASF licenses this file to you under the Apache License, Version 2.0
+# (the "License"); you may not use this file except in compliance with
+# the License.  You may obtain a copy of the License at:
+#
+#     http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+# </@LICENSE>
+
+
+=head1 NAME
+
+Mail::SpamAssassin::Plugin::TxRep - Normalize scores with sender reputation records
+
+=head1 SYNOPSIS
+
+The TxRep (Reputation) plugin is designed as an improved replacement of the AWL
+(Auto-Whitelist) plugin. It adjusts the final message spam score by looking up 
+and taking in consideration the reputation of the sender.
+
+To try TxRep out, you B<have to> first disable the AWL plugin (if enabled), and
+back up its database. AWL is loaded in v310.pre and can be disabled by
+commenting out the loadplugin line:
+
+ # loadplugin   Mail::SpamAssassin::Plugin::AWL
+
+When AWL is not disabled, TxRep will refuse to run.
+
+TxRep should be enabled by uncommenting the following line in v341.pre:
+
+  loadplugin   Mail::SpamAssassin::Plugin::TxRep
+
+Use the supplied 60_txreputation.cf file or add these lines to a .cf file:
+
+ header         TXREP   eval:check_senders_reputation()
+ describe       TXREP   Score normalizing based on sender's reputation
+ tflags         TXREP   userconf noautolearn
+ priority       TXREP   1000
+
+
+=head1 DESCRIPTION
+
+This plugin is intended to replace the former AWL - AutoWhiteList. Although the
+concept and the scope differ, the purpose remains the same - the normalizing of spam
+score results based on previous sender's history. The name was intentionally changed
+from "whitelist" to "reputation" to avoid any confusion, since the result score can
+be adjusted in both directions.
+
+The TxRep plugin keeps track of the average SpamAssassin score for senders.
+Senders are tracked using multiple identificators, or their combinations: the  From:
+email address, the originating IP and/or an originating block of IPs, sender's domain
+name, the DKIM signature, and the HELO name. TxRep then uses the average score to reduce
+the variability in scoring from message to message, and modifies the final score by
+pushing the result towards the historical average. This improves the accuracy of
+filtering for most email.
+
+In comparison with the original AWL plugin, several conceptual changes were implemented
+in TxRep:
+
+1. B<Scoring> - at AWL, although it tracks the number of messages received from each
+respective sender, when calculating the corrective score at a new message, it does
+not take it in count in any way. So for example a sender who previously sent a single
+ham message with the score of -5, and then sends a second one with the score of +10,
+AWL will issue a corrective score bringing the score towards the -5. With the default
+C<auto_whitelist_factor> of 0.5, the resulting score would be only 2.5. And it would be
+exactly the same even if the sender previously sent 1,000 messages with the average of
+-5. TxRep tries to take the maximal advantage of the collected data, and adjusts the
+final score not only with the mean reputation score stored in the database, but also
+respecting the number of messages already seen from the sender. You can see the exact
+formula in the section L</C<txrep_factor>>.
+
+2. B<Learning> - AWL ignores any spam/ham learning. In fact it acts against it, which
+often leads to a frustrating situation, where a user repeatedly tags all messages of a
+given sender as spam (resp. ham), but at any new message from the sender, AWL will
+adjust the score of the message back to the historical average which does B<not> include
+the learned scores. This is now changed at TxRep, and every spam/ham learning will be
+recorded in the reputation database, and hence taken in consideration at future email
+from the respective sender. See the section L</"LEARNING SPAM / HAM"> for more details.
+
+3. B<Auto-Learning> - in certain situations SpamAssassin may declare a message an
+obvious spam resp. ham, and launch the auto-learning process, so that the message can be
+re-evaluated. AWL, by design, did not perform any auto-learning adjustments. This plugin
+will readjust the stored reputation by the value defined by L</C<txrep_learn_penalty>>
+resp. L</C<txrep_learn_bonus>>. Auto-learning score thresholds may be tuned, or the
+auto-learning completely disabled, through the setting L</C<txrep_autolearn>>.
+
+4. B<Relearning> - messages that were wrongly learned or auto-learned, can be relearned.
+Old reputations are removed from the database, and new ones added instead of them. The
+relearning works better when message tracking is enabled through the
+L</C<txrep_track_messages>> option. Without it, the relearned score is simply added to
+the reputation, without removing the old ones.
+
+5. B<Aging> - with AWL, any historical record of given sender has the same weight. It
+means that changes in senders behavior, or modified SA rules may take long time, or
+be virtually negated by the AWL normalization, especially at senders with high count
+of past messages, and low recent frequency. It also turns to be particularly
+counterproductive when the administrator detects new patterns in certain messages, and
+applies new rules to better tag such messages as spam or ham. AWL will practically
+eliminate the effect of the new rules, by adjusting the score back towards the (wrong)
+historical average. Only setting the C<auto_whitelist_factor> lower would help, but in
+the same time it would also reduce the overall impact of AWL, and put doubts on its
+purpose. TxRep, besides the L</C<txrep_factor>> (replacement of the C<auto_whitelist_factor>),
+introduces also the L</C<txrep_dilution_factor>> to help coping with this issue by
+progressively reducing the impact of past records. More details can be found in the
+description of the factor below.
+
+6. B<Blacklisting and Whitelisting> - when a whitelisting or blacklisting was requested
+through SpamAssassin's API, AWL adjusts the historical total score of the plain email
+address without IP (and deleted records bound to an IP), but since during the reception 
+new records with IP will be added, the blacklisted entry would cease acting during 
+scanning. TxRep always uses the record of the plain email address without IP together 
+with the one bound to an IP address, DKIM signature, or SPF pass (unless the weight 
+factor for the EMAIL reputation is set to zero). AWL uses the score of 100 (resp. -100) 
+for the blacklisting (resp. whitelisting) purposes. TxRep increases the value 
+proportionally to the weight factor of the EMAIL reputation. It is explained in details 
+in the section L<BLACKLISTING / WHITELISTING>. TxRep can blacklist or whitelist also
+IP addresses, domain names, and dotless HELO names.
+
+7. B<Sender Identification> - AWL identifies a sender on the basis of the email address
+used, and the originating IP address (better told its part defined by the mask setting).
+The main purpose of this measure is to avoid assigning false good scores to spammers who
+spoof known email addresses. The disadvantage appears at senders who send from frequently
+changing locations or even when connecting through dynamical IP addresses that are not
+within the block defined by the mask setting. Their score is difficult or sometimes
+impossible to track. Another disadvantage is, for example, at a spammer persistently
+sending spam from the same IP address, just under different email addresses. AWL will not
+find his previous scores, unless he reuses the same email address again. TxRep uses several
+identificators, and creates separate database entries for each of them. It tracks not only
+the email/IP address combination like AWL, but also the standalone email address (regardless
+of the originating IP), the standalone IP (regardless of email address used), the domain
+name of the email address, the DKIM signature, and the HELO name of the connecting PC. The
+influence of each individual identificator may be tuned up with the help of weight factors
+described in the section L</REPUTATION WEIGHTS>.
+
+8. B<Message Tracking> - TxRep (optionally) keeps track of already scanned and/or learned
+message ID's. This is useful for avoiding to strengthen the reputation score by simply
+rescanning or relearning the same message multiple times. In the same time it also allows
+the proper relearning of once wrongly learned messages, or relearning them after the
+learn penalty or bonus were changed. See the option L</C<txrep_track_messages>>.
+
+9. B<User and Global Storages> - usually it is recommended to use the per-user setup
+of SpamAssassin, because each user may have quite different requirements, and may receive
+quite different sort of email. Especially when using the Bayesian and AWL plugins,
+the efficiency is much better when SpamAssassin is learned spam and ham separately
+for each user. However, the disadvantage is that senders and emails already learned
+many times by different users, will need to be relearned without any recognized history,
+anytime they arrive to another user. TxRep uses the advantages of both systems. It can
+use dual storages: the global common storage, where all email processed by SpamAssassin
+is recorded, and a local storage separate for each user, with reputation data from his
+email only. See more details at the setting L</C<txrep_user2global_ratio>>.
+
+10. B<Outbound Whitelisting> - when a local user sends messages to an email address, we
+assume that he needs to see the eventual answer too, hence the recipient's address should
+be whitelisted. When SpamAssassin is used for scanning outgoing email too, when local
+users use the SMTP server where SA is installed, for sending email, and when internal
+networks are defined, TxREP will improve the reputation of all 'To:' and 'CC' addresses
+from messages originating in the internal networks. Details can be found at the setting
+L</C<txrep_whitelist_out>>.
+
+Both plugins (AWL and TxREP) cannot coexist. It is necessary to disable the AWL to allow
+TxRep running. TxRep reuses the database handling of the original AWL module, and some
+its parameters bound to the database handler modules. By default, TxRep creates its own
+database, but the original auto-whitelist can be reused as a starting point. The AWL
+database can be renamed to the name defined in TxRep settings, and TxRep will start
+using it. The original auto-whitelist database has to be backed up, to allow switching
+back to the original state.
+
+The spamassassin/Plugin/TxRep.pm file replaces both spamassassin/Plugin/AWL.pm and
+spamassassin/AutoWhitelist.pm. Another two AWL files, spamassassin/DBBasedAddrList.pm
+and spamassassin/SQLBasedAddrList.pm are still needed.
+
+
+=head1 TEMPLATE TAGS
+
+This plugin module adds the following C<tags> that can be used as
+placeholders in certain options.  See L<Mail::SpamAssassin::Conf>
+for more information on TEMPLATE TAGS.
+
+ _TXREP_XXX_Y_          TXREP modifier
+ _TXREP_XXX_Y_MEAN_     Mean score on which TXREP modification is based
+ _TXREP_XXX_Y_COUNT_    Number of messages on which TXREP modification is based
+ _TXREP_XXX_Y_PRESCORE_ Score before TXREP
+ _TXREP_XXX_Y_UNKNOW_   New sender (not found in the TXREP list)
+
+The XXX part of the tag takes the form of one of the following IDs, depending
+on the reputation checked: EMAIL, EMAIL_IP, IP, DOMAIN, or HELO. The _Y appendix
+ID is used only in the case of dual storage, and takes the form of either _U (for
+user storage reputations), or _G (for global storage reputations).
+
+=cut
+
+package Mail::SpamAssassin::Plugin::TxRep;
+
+use strict;
+use warnings;
+# use bytes;
+use re 'taint';
+
+use NetAddr::IP 4.000;                          # qw(:upper);
+use Mail::SpamAssassin::Plugin;
+use Mail::SpamAssassin::Plugin::Bayes;
+use Mail::SpamAssassin::Util qw(untaint_var);
+use Mail::SpamAssassin::Logger;
+
+our @ISA = qw(Mail::SpamAssassin::Plugin);
+
+
+###########################################################################
+sub new {                       # constructor: register the eval rule
+###########################################################################
+  my ($class, $main) = @_;
+
+  $class   = ref($class) || $class;
+  my $self = $class->SUPER::new($main);
+  bless($self, $class);
+
+  $self->{main}          = $main;
+  $self->{conf}          = $main->{conf};
+  $self->{factor}        = $main->{conf}->{txrep_factor};
+  $self->{ipv4_mask_len} = $main->{conf}->{txrep_ipv4_mask_len};
+  $self->{ipv6_mask_len} = $main->{conf}->{txrep_ipv6_mask_len};
+  $self->register_eval_rule("check_senders_reputation");
+  $self->set_config($main->{conf});
+
+  # only the default conf loaded here, do nothing here requiring
+  # the runtime settings
+  dbg("TxRep: new object created");
+  return $self;
+}
+
+
+###########################################################################
+sub set_config {
+###########################################################################
+  my($self, $conf) = @_;
+  my @cmds;
+
+# -------------------------------------------------------------------------
+=head1 USER PREFERENCES
+
+The following options can be used in both site-wide (C<local.cf>) and
+user-specific (C<user_prefs>) configuration files to customize how
+SpamAssassin handles incoming email messages.
+
+=over 4
+
+=item B<use_txrep>
+
+  0 | 1                 (default: 0)
+
+Whether to use TxRep reputation system.  TxRep tracks the long-term average
+score for each sender and then shifts the score of new messages toward that
+long-term average.  This can increase or decrease the score for messages,
+depending on the long-term behavior of the particular correspondent.
+
+Note that certain tests are ignored when determining the final message score:
+
+ - rules with tflags set to 'noautolearn'
+
+=cut
+
+  push (@cmds, {
+    setting     => 'use_txrep',
+    default     => 0,
+    type        => $Mail::SpamAssassin::Conf::CONF_TYPE_BOOL
+  });
+
+
+=item B<txrep_factor>
+
+ range [0..1]           (default: 0.5)
+
+How much towards the long-term mean for the sender to regress a message.
+Basically, the algorithm is to track the long-term total score and the count
+of messages for the sender (C<total> and C<count>), and then once we have
+otherwise fully calculated the score for this message (C<score>), we calculate
+the final score for the message as:
+
+ finalscore = score + factor * (total + score)/(count + 1)
+
+So if C<factor> = 0.5, then we'll move to half way between the calculated
+score and the new mean value.  If C<factor> = 0.3, then we'll move about 1/3
+of the way from the score toward the mean.  C<factor> = 1 means use the
+long-term mean including also the new unadjusted score; C<factor> = 0 mean
+just use the calculated score, disabling so the score averaging, though still
+recording the reputation to the database.
+
+=cut
+
+  push (@cmds, {
+    setting     => 'txrep_factor',
+    default     => 0.5,
+    type        => $Mail::SpamAssassin::Conf::CONF_TYPE_NUMERIC,
+    code        => sub {
+        my ($self, $key, $value, $line) = @_;
+        if ($value < 0 || $value > 1.0) {return $Mail::SpamAssassin::Conf::INVALID_VALUE;}
+        $self->{txrep_factor} = $value;
+    }
+  });
+
+
+=item B<txrep_dilution_factor>
+
+ range [0.7..1.0]               (default: 0.98)
+
+At any new email from given sender, the historical reputation records are "diluted",
+or "watered down" by certain fraction given by this factor. It means that the
+influence of old records will progressively diminish with every new message from
+given sender. This is important to allow a more flexible handling of changes in
+sender's behavior, or new improvements or changes of local SA rules.
+
+Without any dilution expiry (dilution factor set to 1), the new message score is
+simply add to the total score of given sender in the reputation database. When
+dilution is used (factor < 1), the impact of the historical reputation average is
+reduced by the factor before calculating the new average, which in turn is then
+used to adjust the new total score to be stored in the database.
+
+ newtotal = (oldcount + 1) * (newscore + dilution * oldtotal) / (dilution * oldcount + 1)
+
+In other words, it means that the older a message is, the less and less impact
+on the new average its original spam score has. For example if we set the factor
+to 0.9 (meaning dilution by 10%), the score of the new message will be recorded
+to its 100%, the last score of the same sender to 90%, the second last to 81%
+(0.9 * 0.9 = 0.81), and for example the 10th last message just to 35%.
+
+At stable systems, we recommend keeping the factor close to 1 (but still lower
+than 1). At systems where SA rules tuning and spam learning is still in progress,
+lower factors will help the reputation to quicker adapt any modifications. In
+the same time, it will also reduce the impact of the historical reputation
+though.
+
+=cut
+
+  push (@cmds, {
+    setting     => 'txrep_dilution_factor',
+    default     => 0.98,
+    type        => $Mail::SpamAssassin::Conf::CONF_TYPE_NUMERIC,
+    code        => sub {
+        my ($self, $key, $value, $line) = @_;
+        if ($value < 0.7 || $value > 1.0) {return $Mail::SpamAssassin::Conf::INVALID_VALUE;}
+        $self->{txrep_dilution_factor} = $value;
+    }
+  });
+
+
+# TODO, not implemented yet, hence no advertising until then
+# -------------------------------------------------------------------------
+#=item B<txrep_expiry_days>
+#
+# range [0..10000]              (default: 365)
+#
+#The scores of of messages can be removed from the total reputation, and the
+#message tracking entry removed from the database after given number of days.
+#It helps keeping the database growth under control, and it also reduces the
+#influence of old scores on the current reputation (both scoring methods, and
+#sender's behavior might have changed over time).
+#
+#=cut  # ...................................................................
+  push (@cmds, {
+    setting     => 'txrep_expiry_days',
+    default     => 365,
+    type        => $Mail::SpamAssassin::Conf::CONF_TYPE_NUMERIC,
+    code        => sub {
+        my ($self, $key, $value, $line) = @_;
+        if ($value < 0 || $value > 10000) {return $Mail::SpamAssassin::Conf::INVALID_VALUE;}
+        $self->{txrep_expiry_days} = $value;
+    }
+  });
+
+
+=item B<txrep_learn_penalty>
+
+ range [0..200]         (default: 20)
+
+When SpamAssassin is trained a SPAM message, the given penalty score will
+be added to the total reputation score of the sender, regardless of the real
+spam score. The impact of the penalty will be the smaller the higher is the
+number of messages that the sender already has in the TxRep database.
+
+=cut
+
+  push (@cmds, {
+    setting     => 'txrep_learn_penalty',
+    default     => 20,
+    type        => $Mail::SpamAssassin::Conf::CONF_TYPE_NUMERIC,
+    code        => sub {
+        my ($self, $key, $value, $line) = @_;
+        if ($value < 0 || $value > 200) {return $Mail::SpamAssassin::Conf::INVALID_VALUE;}
+        $self->{txrep_learn_penalty} = $value;
+    }
+  });
+
+
+=item B<txrep_learn_bonus>
+
+ range [0..200]         (default: 20)
+
+When SpamAssassin is trained a HAM message, the given penalty score will be
+deduced from the total reputation score of the sender, regardless of the real
+spam score. The impact of the penalty will be the smaller the higher is the
+number of messages that the sender already has in the TxRep database.
+
+=cut
+
+  push (@cmds, {
+    setting     => 'txrep_learn_bonus',
+    default     => 20,
+    type        => $Mail::SpamAssassin::Conf::CONF_TYPE_NUMERIC,
+    code        => sub {
+        my ($self, $key, $value, $line) = @_;
+        if ($value < 0 || $value > 200) {return $Mail::SpamAssassin::Conf::INVALID_VALUE;}
+        $self->{txrep_learn_bonus} = $value;
+    }
+  });
+
+
+=item B<txrep_autolearn>
+
+ range [0..5]                   (default: 0)
+
+When SpamAssassin declares a message a clear spam resp. ham during the message
+scan, and launches the auto-learn process, sender reputation scores of given
+message will be adjusted by the value of the option L</C<txrep_learn_penalty>>,
+resp. the L</C<txrep_learn_bonus>> in the same way as during the manual learning.
+Value 0 at this option disables the auto-learn reputation adjustment - only the
+score calculated before the auto-learn will be stored to the reputation database.
+
+=cut
+
+  push (@cmds, {
+    setting     => 'txrep_autolearn',
+    default     => 0,
+    type        => $Mail::SpamAssassin::Conf::CONF_TYPE_NUMERIC,
+    code        => sub {
+        my ($self, $key, $value, $line) = @_;
+        if ($value < 0 || $value > 5) {return $Mail::SpamAssassin::Conf::INVALID_VALUE;}
+        $self->{txrep_autolearn} = $value;
+    }
+  });
+
+
+=item B<txrep_track_messages>
+
+  0 | 1                 (default: 1)
+
+Whether TxRep should keep track of already scanned and/or learned messages.
+When enabled, an additional record in the reputation database will be created
+to avoid false score adjustments due to repeated scanning of the same message,
+and to allow proper relearning of messages that were either previously wrongly
+learned, or need to be relearned after modifying the learn penalty or bonus.
+
+=cut
+
+  push (@cmds, {
+    setting     => 'txrep_track_messages',
+    default     => 1,
+    type        => $Mail::SpamAssassin::Conf::CONF_TYPE_BOOL
+  });
+
+
+=item B<txrep_whitelist_out>
+
+ range [0..200]         (default: 10)
+
+When the value of this setting is greater than zero, recipients of messages sent from
+within the internal networks will be whitelisted through improving their total reputation
+score with the number of points defined by this setting. Since the IP address and other
+sender identificators are not known when sending the email, only the reputation of the
+standalone email is being whitelisted. The domain name is intentionally also left
+unaffected. The outbound whitelisting can only work when SpamAssassin is set up to scan
+also outgoing email, when local users use the SMTP server for sending email, and when
+C<internal_networks> are defined in SpamAssassin configuration. The improving of the
+reputation happens at every message sent from internal networks, so the more messages is
+being sent to the recipient, the better reputation his email address will have.
+
+
+=cut
+
+  push (@cmds, {
+    setting     => 'txrep_whitelist_out',
+    default     => 10,
+    type        => $Mail::SpamAssassin::Conf::CONF_TYPE_NUMERIC,
+    code        => sub {
+        my ($self, $key, $value, $line) = @_;
+        if ($value < 0 || $value > 200) {return $Mail::SpamAssassin::Conf::INVALID_VALUE;}
+        $self->{txrep_whitelist_out} = $value;
+    }
+  });
+
+
+=item B<txrep_ipv4_mask_len>
+
+ range [0..32]          (default: 16)
+
+The AWL database keeps only the specified number of most-significant bits
+of an IPv4 address in its fields, so that different individual IP addresses
+within a subnet belonging to the same owner are managed under a single
+database record. As we have no information available on the allocated
+address ranges of senders, this CIDR mask length is only an approximation.
+The default is 16 bits, corresponding to a former class B. Increase the
+number if a finer granularity is desired, e.g. to 24 (class C) or 32.
+A value 0 is allowed but is not particularly useful, as it would treat the
+whole internet as a single organization. The number need not be a multiple
+of 8, any split is allowed.
+
+=cut
+
+  push (@cmds, {
+    setting     => 'txrep_ipv4_mask_len',
+    default     => 16,
+    type        => $Mail::SpamAssassin::Conf::CONF_TYPE_NUMERIC,
+    code        => sub {
+        my ($self, $key, $value, $line) = @_;
+        if (!defined $value || $value eq '')
+            {return $Mail::SpamAssassin::Conf::MISSING_REQUIRED_VALUE;}
+        elsif ($value !~ /^\d+$/ || $value < 0 || $value > 32)
+            {return $Mail::SpamAssassin::Conf::INVALID_VALUE;}
+        $self->{txrep_ipv4_mask_len} = $value;
+    }
+  });
+
+
+=item B<txrep_ipv6_mask_len>
+
+ range [0..128]         (default: 48)
+
+The AWL database keeps only the specified number of most-significant bits
+of an IPv6 address in its fields, so that different individual IP addresses
+within a subnet belonging to the same owner are managed under a single
+database record. As we have no information available on the allocated address
+ranges of senders, this CIDR mask length is only an approximation. The default
+is 48 bits, corresponding to an address range commonly allocated to individual
+(smaller) organizations. Increase the number for a finer granularity, e.g.
+to 64 or 96 or 128, or decrease for wider ranges, e.g. 32.  A value 0 is
+allowed but is not particularly useful, as it would treat the whole internet
+as a single organization. The number need not be a multiple of 4, any split
+is allowed.
+
+=cut
+
+  push (@cmds, {
+    setting     => 'txrep_ipv6_mask_len',
+    default     => 48,
+    type        => $Mail::SpamAssassin::Conf::CONF_TYPE_NUMERIC,
+    code        => sub {
+        my ($self, $key, $value, $line) = @_;
+        if (!defined $value || $value eq '')
+            {return $Mail::SpamAssassin::Conf::MISSING_REQUIRED_VALUE;}
+        elsif ($value !~ /^\d+$/ || $value < 0 || $value > 128)
+            {return $Mail::SpamAssassin::Conf::INVALID_VALUE;}
+        $self->{txrep_ipv6_mask_len} = $value;
+    }
+  });
+
+
+=item B<user_awl_sql_override_username>
+
+  string                (default: undefined)
+
+Used by the SQLBasedAddrList storage implementation.
+
+If this option is set the SQLBasedAddrList module will override the set
+username with the value given.  This can be useful for implementing global
+or group based TxRep databases.
+
+=cut
+
+  push (@cmds, {
+    setting     => 'user_awl_sql_override_username',
+    default     => '',
+    type        => $Mail::SpamAssassin::Conf::CONF_TYPE_STRING
+  });
+
+
+=item B<txrep_user2global_ratio>
+
+ range [0..10]          (default: 0)
+
+When the option txrep_user2global_ratio is set to a value greater than zero, and
+if the server configuration allows it, two data storages will be used - user and
+global (server-wide) storages.
+
+User storage keeps only senders who send messages to the respective recipient,
+and will reflect also the corrected/learned scores, when some messages are marked
+by the user as spam or ham, or when the sender is whitelisted or blacklisted
+through the API of SpamAssassin.
+
+Global storage keeps the reputation data of all messages processed by SpamAssassin
+with their spam scores and spam/ham learning data from all users on the server.
+Hence, the module will return a reputation value even at senders not known to the
+current recipient, as long as he already sent email to anyone else on the server.
+
+The value of the txrep_user2global_ratio parameter controls the impact of each
+of the two reputations. When equal to 1, both the global and the user score will
+have the same impact on the result. When set to 2, the reputation taken from
+the user storage will have twice the impact of the global value. The final value
+of the TXREP tag will be calculated as follows:
+
+ total = ( ratio * user + global ) / ( ratio + 1 )
+
+When no reputation is found in the user storage, and a global reputation is
+available, the global storage is used fully, without applying the ratio.
+
+When the ratio is set to zero, only the default storage will be used. And it
+then depends whether you use the global, or the local user storage by default,
+which in turn is controlled either by the parameter user_awl_sql_override_username
+(in case of SQL storage), or the C</auto_whitelist_path> parameter (in case of
+Berkeley database).
+
+When this dual storage is enabled, and no global storage is defined by the
+above mentioned parameters for the Berkeley or SQL databases, TxRep will attempt
+to use a generic storage - user 'GLOBAL' in case of SQL, and in the case of
+Berkeley database it uses the path defined by '__local_state_dir__/tx-reputation',
+which typically renders into /var/db/spamassassin/tx-reputation. When the default
+storages are not available, or are not writable, you would have to set the global
+storage with the help of the C<user_awl_sql_override_username> resp.
+C<auto_whitelist_path settings>.
+
+Please note that some SpamAssassin installations run always under the same user
+ID. In such case it is pointless enabling the dual storage, because it would
+maximally lead to two identical global storages in different locations.
+
+This feature is disabled by default.
+
+=cut
+
+  push (@cmds, {
+    setting     => 'txrep_user2global_ratio',
+    default     => 0,
+    type        => $Mail::SpamAssassin::Conf::CONF_TYPE_STRING,
+    code        => sub {
+        my ($self, $key, $value, $line) = @_;
+        if ($value < 0 || $value > 10) {return $Mail::SpamAssassin::Conf::INVALID_VALUE;}
+        $self->{txrep_user2global_ratio} = $value;
+    }
+  });
+
+
+=item B<auto_whitelist_distinguish_signed>
+
+ (default: 1 - enabled)
+
+Used by the SQLBasedAddrList storage implementation.
+
+If this option is set the SQLBasedAddrList module will keep separate
+database entries for DKIM-validated e-mail addresses and for non-validated
+ones. Without this option, or for domains that do not use a DKIM signature,
+the reputation of legitimate email can get mixed with the reputation of
+forgeries. A pre-requisite when setting this option is that a field
+txrep.signedby exists in a SQL table, otherwise SQL operations will fail.
+A DKIM plugin must also be enabled in order for this option to take effect.
+This option is highly recommended. Unless you are using a pre-3.3.0 database
+schema and cannot upgrade, there is no reason to disable this option. If
+you are upgrading from AWL and using a pre-3.3.0 schema, the txrep.signedby
+column will not exist. It is recommended that you add this column, but if
+that is not possible you must set this option to 0 to avoid SQL errors.
+
+=cut
+
+  push (@cmds, {
+    setting     => 'auto_whitelist_distinguish_signed',
+    default     => 1,
+    type        => $Mail::SpamAssassin::Conf::CONF_TYPE_BOOL
+  });
+
+
+=item B<txrep_spf>
+
+  0 | 1                 (default: 1)
+
+When enabled, TxRep will treat any IP address using a given email address as
+the same authorized identity, and will not associate any IP address with it.
+(The same happens with valid DKIM signatures. No option available for DKIM).
+
+Note: at domains that define the useless SPF +all (pass all), no IP would be
+ever associated with the email address, and all addresses (incl. the froged
+ones) would be treated as coming from the authorized source. However, such
+domains are hopefuly rare, and ask for this kind of treatment anyway.
+
+=back
+
+=cut
+
+  push (@cmds, {
+    setting     => 'txrep_spf',
+    default     => 1,
+    type        => $Mail::SpamAssassin::Conf::CONF_TYPE_BOOL
+  });
+
+
+=head2 REPUTATION WEIGHTS
+
+The overall reputation of the sender comprises several elements:
+
+=over 4
+
+=item 1) The reputation of the 'From' email address bound to the originating IP
+         address fraction (see the mask parameters for details)
+
+=item 2) The reputation of the 'From' email address alone (regardless the IP
+         address being currently used)
+
+=item 3) The reputation of the domain name of the 'From' email address
+
+=item 4) The reputation of the originating IP address, regardless of sender's email address
+
+=item 5) The reputation of the HELO name of the originating computer (if available)
+
+=back
+
+Each of these partial reputations is weighted with the help of these parameters,
+and the overall reputation is calculation as the sum of the individual
+reputations divided by the sum of all their weights:
+
+ sender_reputation = weight_email    * rep_email    +
+                     weight_email_ip * rep_email_ip +
+                     weight_domain   * rep_domain   +
+                     weight_ip       * rep_ip       +
+                     weight_helo     * rep_helo
+
+You can disable the individual partial reputations by setting their respective
+weight to zero. This will also reduce the size of the database, since each
+partial reputation requires a separate entry in the database table. Disabling
+some of the partial reputations in this way may also help with the performance
+on busy servers, because the respective database lookups and processing will
+be skipped too.
+
+=over 4
+
+=item B<txrep_weight_email>
+
+ range [0..10]          (default: 3)
+
+This weight factor controls the influence of the reputation of the standalone
+email address, regardless of the originating IP address. When adjusting the
+weight, you need to keep on mind that an email address can be easily spoofed,
+and hence spammers can use 'from' email addresses belonging to senders with
+good reputation. From this point of view, the email address bound to the
+originating IP address is a more reliable indicator for the overall reputation.
+
+On the other hand, some reputable senders may be sending from a bigger number
+of IP addresses, so looking for the reputation of the standalone email address
+without regarding the originating IP has some sense too.
+
+We recommend using a relatively low value for this partial reputation.
+
+=cut
+
+  push (@cmds, {
+    setting     => 'txrep_weight_email',
+    default     => 3,
+    type        => $Mail::SpamAssassin::Conf::CONF_TYPE_NUMERIC,
+    code        => sub {
+        my ($self, $key, $value, $line) = @_;
+        if ($value < 0 || $value > 10) {return $Mail::SpamAssassin::Conf::INVALID_VALUE;}
+        $self->{txrep_weight_email} = $value;
+    }
+  });
+
+=item B<txrep_weight_email_ip>
+
+ range [0..10]          (default: 10)
+
+This is the standard reputation used in the same way as it was by the original
+AWL plugin. Each sender's email address is bound to the originating IP, or
+its part as defined by the txrep_ipv4_mask_len or txrep_ipv6_mask_len parameters.
+
+At a user sending from multiple locations, diverse mail servers, or from a dynamic
+IP range out of the masked block, his email address will have a separate reputation
+value for each of the different (partial) IP addresses.
+
+When the option auto_whitelist_distinguish_signed is enabled, in contrary to
+the original AWL module, TxRep does not record the IP address when DKIM
+signature is detected. The email address is then not bound to any IP address, but
+rather just to the DKIM signature, since it is considered that it authenticates
+the sender more reliably than the IP address (which can also vary).
+
+This is by design the most relevant reputation, and its weight should be kept
+high.
+
+=cut
+
+  push (@cmds, {
+    setting     => 'txrep_weight_email_ip',
+    default     => 10,
+    type        => $Mail::SpamAssassin::Conf::CONF_TYPE_NUMERIC,
+    code        => sub {
+        my ($self, $key, $value, $line) = @_;
+        if ($value < 0 || $value > 10) {return $Mail::SpamAssassin::Conf::INVALID_VALUE;}
+        $self->{txrep_weight_email_ip} = $value;
+    }
+  });
+
+=item B<txrep_weight_domain>
+
+ range [0..10]          (default: 2)
+
+Some spammers may use always their real domain name in the email address,
+just with multiple or changing local parts. This reputation will record the
+spam scores of all messages send from the respective domain, regardless of
+the local part (user name) used.
+
+Similarly as with the email_ip reputation, the domain reputation is also
+bound to the originating address (or a masked block, if mask parameters used).
+It avoids giving false reputation based on spoofed email addresses.
+
+In case of a DKIM signature detected, the signature signer is used instead
+of the domain name extracted from the email address. It is considered that
+the signing authority is responsible for sending email of any domain name,
+hence the same reputation applies here.
+
+The domain reputation will give relevant picture about the owner of the
+domain in case of small servers, or corporation with strict policies, but
+will be less relevant for freemailers like Gmail, Hotmail, and similar,
+because both ham and spam may be sent by their users.
+
+The default value is set relatively low. Higher weight values may be useful,
+but we recommend caution and observing the scores before increasing it.
+
+=cut
+
+  push (@cmds, {
+    setting     => 'txrep_weight_domain',
+    default     => 2,
+    type        => $Mail::SpamAssassin::Conf::CONF_TYPE_NUMERIC,
+    code        => sub {
+        my ($self, $key, $value, $line) = @_;
+        if ($value < 0 || $value > 10) {return $Mail::SpamAssassin::Conf::INVALID_VALUE;}
+        $self->{txrep_weight_domain} = $value;
+    }
+  });
+
+=item B<txrep_weight_ip>
+
+ range [0..10]          (default: 4)
+
+Spammers can send through the same relay (incl. compromised hosts) under a
+multitude of email addresses. This is the exact case when the IP reputation
+can help. This reputation is a kind of a local RBL.
+
+The weight is set by default lower than for the email_IP reputation, because
+there may be cases when the same IP address hosts both spammers and acceptable
+senders (for example the marketing department of a company sends you spam, but
+you still need to get messages from their billing address).
+
+=cut
+
+  push (@cmds, {
+    setting     => 'txrep_weight_ip',
+    default     => 4,
+    type        => $Mail::SpamAssassin::Conf::CONF_TYPE_NUMERIC,
+    code        => sub {
+        my ($self, $key, $value, $line) = @_;
+        if ($value < 0 || $value > 10) {return $Mail::SpamAssassin::Conf::INVALID_VALUE;}
+        $self->{txrep_weight_ip} = $value;
+    }
+  });
+
+=item B<txrep_weight_helo>
+
+ range [0..10]          (default: 0.5)
+
+Big number of spam messages come from compromised hosts, often personal computers,
+or top-boxes. Their NetBIOS names are usually used as the HELO name when connecting
+to your mail server. Some of the names are pretty generic and hence may be shared by
+a big number of hosts, but often the names are quite unique and may be a good
+indicator for detecting a spammer, despite that he uses different email and IP
+addresses (spam can come also from portable devices).
+
+No IP address is bound to the HELO name when stored to the reputation database.
+This is intentional, and despite the possibility that numerous devices may share
+some of the HELO names.
+
+This option is still considered experimental, hence the low weight value, but after
+some testing it could be likely at least slightly increased.
+
+=cut
+
+  push (@cmds, {
+    setting     => 'txrep_weight_helo',
+    default     => 0.5,
+    type        => $Mail::SpamAssassin::Conf::CONF_TYPE_NUMERIC,
+    code        => sub {
+        my ($self, $key, $value, $line) = @_;
+        if ($value < 0 || $value > 10) {return $Mail::SpamAssassin::Conf::INVALID_VALUE;}
+        $self->{txrep_weight_helo} = $value;
+    }
+  });
+
+
+=back
+
+=head1 ADMINISTRATOR SETTINGS
+
+These settings differ from the ones above, in that they are considered 'more
+privileged' -- even more than the ones in the B<PRIVILEGED SETTINGS> section.
+No matter what C<allow_user_rules> is set to, these can never be set from a
+user's C<user_prefs> file.
+
+=over 4
+
+=item B<txrep_factory module>
+
+ (default: Mail::SpamAssassin::DBBasedAddrList)
+
+Select alternative database factory module for the TxRep database.
+
+=cut
+
+  push (@cmds, {
+    setting      => 'txrep_factory',
+    is_admin     => 1,
+    default      => 'Mail::SpamAssassin::DBBasedAddrList',
+    type         => $Mail::SpamAssassin::Conf::CONF_TYPE_STRING
+  });
+
+
+=item B<auto_whitelist_path /path/filename>
+
+ (default: ~/.spamassassin/tx-reputation)
+
+This is the TxRep directory and filename.  By default, each user
+has their own reputation database in their C<~/.spamassassin> directory with
+mode 0700.  For system-wide SpamAssassin use, you may want to share this
+across all users.
+
+=cut
+
+  push (@cmds, {
+    setting      => 'auto_whitelist_path',
+    is_admin     => 1,
+    default      => '__userstate__/tx-reputation',
+    type         => $Mail::SpamAssassin::Conf::CONF_TYPE_STRING,
+    code         => sub {
+        my ($self, $key, $value, $line) = @_;
+        unless (defined $value && $value !~ /^$/) {return $Mail::SpamAssassin::Conf::MISSING_REQUIRED_VALUE;}
+        if (-d $value)                            {return $Mail::SpamAssassin::Conf::INVALID_VALUE; }
+        $self->{txrep_path} = $value;
+    }
+  });
+
+
+=item B<auto_whitelist_db_modules Module ...>
+
+ (default: see below)
+
+What database modules should be used for the TxRep storage database
+file.   The first named module that can be loaded from the Perl include path
+will be used.  The format is:
+
+  PreferredModuleName SecondBest ThirdBest ...
+
+ie. a space-separated list of Perl module names.  The default is:
+
+  DB_File GDBM_File SDBM_File
+
+NDBM_File is not supported (see SpamAssassin bug 4353).
+
+=cut
+
+  push (@cmds, {
+    setting      => 'auto_whitelist_db_modules',
+    is_admin     => 1,
+    default      => 'DB_File GDBM_File SDBM_File',
+    type         => $Mail::SpamAssassin::Conf::CONF_TYPE_STRING
+  });
+
+
+=item B<auto_whitelist_file_mode>
+
+ (default: 0700)
+
+The file mode bits used for the TxRep directory or file.
+
+Make sure you specify this using the 'x' mode bits set, as it may also be used
+to create directories.  However, if a file is created, the resulting file will
+not have any execute bits set (the umask is set to 0111).
+
+=cut
+
+  push (@cmds, {
+    setting      => 'auto_whitelist_file_mode',
+    is_admin     => 1,
+    default      => '0700',
+    type         => $Mail::SpamAssassin::Conf::CONF_TYPE_NUMERIC,
+    code         => sub {
+        my ($self, $key, $value, $line) = @_;
+        if ($value !~ /^0?[0-7]{3}$/) {
+            return $Mail::SpamAssassin::Conf::INVALID_VALUE;
+        }
+        $self->{txrep_file_mode} = untaint_var($value);
+    }
+  });
+
+
+=item B<user_awl_dsn DBI:databasetype:databasename:hostname:port>
+
+Used by the SQLBasedAddrList storage implementation.
+
+This will set the DSN used to connect.  Example:
+C<DBI:mysql:spamassassin:localhost>
+
+=cut
+
+  push (@cmds, {
+    setting      => 'user_awl_dsn',
+    is_admin     => 1,
+    type         => $Mail::SpamAssassin::Conf::CONF_TYPE_STRING
+  });
+
+
+=item B<user_awl_sql_username username>
+
+Used by the SQLBasedAddrList storage implementation.
+
+The authorized username to connect to the above DSN.
+
+=cut
+
+  push (@cmds, {
+    setting      => 'user_awl_sql_username',
+    is_admin     => 1,
+    type         => $Mail::SpamAssassin::Conf::CONF_TYPE_STRING
+  });
+
+
+=item B<user_awl_sql_password password>
+
+Used by the SQLBasedAddrList storage implementation.
+
+The password for the database username, for the above DSN.
+
+=cut
+
+  push (@cmds, {
+    setting      => 'user_awl_sql_password',
+    is_admin     => 1,
+    type         => $Mail::SpamAssassin::Conf::CONF_TYPE_STRING
+  });
+
+
+=item B<user_awl_sql_table tablename>
+
+ (default: txrep)
+
+Used by the SQLBasedAddrList storage implementation.
+
+The table name where reputation is to be stored in, for the above DSN.
+
+=back
+
+=cut
+
+  push (@cmds, {
+    setting      => 'user_awl_sql_table',
+    is_admin     => 1,
+    default      => 'txrep',
+    type         => $Mail::SpamAssassin::Conf::CONF_TYPE_STRING
+  });
+
+  $conf->{parser}->register_commands(\@cmds);
+}
+
+
+###########################################################################
+sub _message {
+###########################################################################
+  my ($self, $value, $msg) = @_;
+  print "SpamAssassin TxRep: $value\n" if ($msg);
+  dbg("TxRep: $value");
+}
+
+
+###########################################################################
+sub _fail_exit {
+###########################################################################
+  my ($self, $err) = @_;
+  my $eval_stat = ($err ne '') ? $err : "errno=$!";
+  chomp $eval_stat;
+  warn("TxRep: open of TxRep file failed: $eval_stat\n");
+  if (!defined $self->{txKeepStoreTied}) {$self->finish();}
+  return 0;
+}
+
+
+###########################################################################
+sub _fn_envelope {
+###########################################################################
+  my ($self, $args, $value, $msg) = @_;
+
+  unless ($self->{main}->{conf}->{use_txrep}){                                  return 0;}
+  unless ($args->{address}) {$self->_message($args->{cli_p},"failed ".$msg);    return 0;}
+
+  my $factor =	$self->{conf}->{txrep_weight_email} +
+		$self->{conf}->{txrep_weight_email_ip} +
+		$self->{conf}->{txrep_weight_domain} +
+		$self->{conf}->{txrep_weight_ip} +
+		$self->{conf}->{txrep_weight_helo};
+  my $sign = $args->{signedby};
+  my $id     = $args->{address};
+  if ($args->{address} =~ /,/) {
+    $sign = $args->{address};
+    $sign =~ s/^.*,//g;
+    $id   =~ s/,.*$//g;
+  }
+
+  # simplified regex used for IP detection (possible FP at a domain is not critical)
+  if ($id !~ /\./ && $self->{conf}->{txrep_weight_helo}) 
+	{$factor /= $self->{conf}->{txrep_weight_helo}; $sign = 'helo';}
+  elsif ($id =~ /^[a-f\d\.:]+$/ && $self->{conf}->{txrep_weight_ip})
+	{$factor /= $self->{conf}->{txrep_weight_ip};}
+  elsif ($id =~ /@/ && $self->{conf}->{txrep_weight_email})
+	{$factor /= $self->{conf}->{txrep_weight_email};}
+  elsif ($id !~ /@/ && $self->{conf}->{txrep_weight_domain})
+	{$factor /= $self->{conf}->{txrep_weight_domain};}
+  else	{$factor  = 1;}
+
+  $self->open_storages();
+  my $score  = (!defined $value)? undef : $factor * $value;
+  my $status = $self->modify_reputation($id, $score, $sign);
+  dbg("TxRep: $msg %s (score %s) %s", $id, $score || 'undef', $sign || '');
+  eval {
+    $self->_message($args->{cli_p}, ($status?"":"error ") . $msg . ": " . $id);
+    if (!defined $self->{txKeepStoreTied}) {$self->finish();}
+    1;
+  } or return $self->_fail_exit( $@ );
+  return $status;
+}
+
+
+=head1 BLACKLISTING / WHITELISTING
+
+When asked by SpamAssassin to blacklist or whitelist a user, the TxRep
+plugin adds a score of 100 (for blacklisting) or -100 (for whitelisting)
+to the given sender's email address. At a plain address without any IP
+address, the value is multiplied by the ratio of total reputation
+weight to the EMAIL reputation weight to account for the reduced impact
+of the standalone EMAIL reputation when calculating the overall reputation.
+
+   total_weight = weight_email + weight_email_ip + weight_domain + weight_ip + weight_helo
+   blacklisted_reputation = 100 * total_weight / weight_email
+
+When a standalone email address is blacklisted/whitelisted, all records
+of the email address bound to an IP address, DKIM signature, or a SPF pass
+will be removed from the database, and only the standalone record is kept.
+
+Besides blacklisting/whitelisting of standalone email addresses, the same
+method may be used also for blacklisting/whitelisting of IP addresses,
+domain names, and HELO names (only dotless Netbios HELO names can be used).
+
+When whitelisting/blacklisting an email address or domain name, you can
+bind them to a specified DKIM signature or SPF record by appending the 
+DKIM signing domain or the tag 'spf' after the ID in the following way:
+
+ spamassassin --add-addr-to-blacklist=spamming.biz,spf
+ spamassassin --add-addr-to-whitelist=friend@good.org,good.org
+
+When a message contains both a DKIM signature and an SPF pass, the DKIM
+signature takes the priority, so the record bound to the 'spf' tag won't 
+be checked. Only email addresses and domains can be bound to DKIM or SPF.
+Records of IP adresses and HELO names are always without DKIM/SPF.
+
+In case of dual storage, the black/whitelisting is performed only in the
+default storage.
+
+=cut
+
+######################################################## plugin hooks #####
+sub blacklist_address {my $self=shift; return $self->_fn_envelope(@_,  100, "blacklisting address");}
+sub whitelist_address {my $self=shift; return $self->_fn_envelope(@_, -100, "whitelisting address");}
+sub remove_address    {my $self=shift; return $self->_fn_envelope(@_,undef, "removing address");}
+###########################################################################
+
+
+=head1 REPUTATION LOGICS
+
+1. The most significant sender identificator is equally as at AWL, the
+   combination of the email address and the originating IP address, resp.
+   its part defined by the IPv4 resp. IPv6 mask setting.
+
+2. No IP checking for standalone EMAIL address reputation
+
+3. No signature checking for IP reputation, and for HELO name reputation
+
+4. The EMAIL_IP weight, and not the standalone EMAIL weight is used when
+   no IP address is available (EMAIL_IP is the main indicator, and has
+   the highest weight)
+
+5. No IP checking at signed emails (signature authenticates the email
+   instead of the IP address)
+
+6. No IP checking at SPF pass (we assume the domain owner is responsable
+   for all IP's he authorizes to send from, hence we use the same identity
+   for all of them)
+
+7. No signature used for standalone EMAIL reputation (would be redundant,
+   since no IP is used at signed EMAIL_IP reputation, and we would store
+   two identical hits)
+
+8. When available, the DKIM signer is used instead of the domain name for
+   the DOMAIN reputation
+
+9. No IP and no signature used for HELO reputation (despite the possibility
+   of the possible existence of multiple computers with the same HELO)
+
+10. The full (unmasked IP) address is used (in the address field, instead the
+    IP field) for the standalone IP reputation
+
+=cut
+
+###########################################################################
+sub check_senders_reputation {
+###########################################################################
+  my ($self, $pms) = @_;
+
+# just for the development debugging
+# use Data::Printer;
+# dbg("TxRep: DEBUG DUMP of pms: %s, %s", $pms, p($pms));
+
+  my $autolearn = defined $self->{autolearn};
+  $self->{last_pms} = $self->{autolearn} = undef;
+
+  # Cases where we would not be able to use TxRep
+  return 0 unless ($self->{conf}->{use_txrep});
+  if ($self->{conf}->{use_auto_whitelist}) {
+    warn("TxRep: cannot run when Auto-Whitelist is enabled. Please disable it!\n");
+    return 0;
+  }
+  if ($autolearn && !$self->{conf}->{txrep_autolearn}) {
+    dbg("TxRep: autolearning disabled, no more reputation adjusting, quitting");
+    return 0;
+  }
+  my @from = $pms->all_from_addrs();
+  if (@from && $from[0] eq 'ignore@compiling.spamassassin.taint.org') {
+    dbg("TxRep: no scan in lint mode, quitting");
+    return 0;
+  }
+
+  my $delta    = 0;
+  my $timer    = $self->{main}->time_method("total_txrep");
+  my $msgscore = (defined $self->{learning})? $self->{learning} : $pms->get_autolearn_points();
+  my $date     = $pms->{msg}->receive_date() || $pms->{date_header_time};
+  my $msg_id   = $self->{msgid} ||
+                 Mail::SpamAssassin::Plugin::Bayes->get_msgid($pms->{msg}) ||
+                 $pms->get('Message-Id') || $pms->get('Message-ID') || $pms->get('MESSAGE-ID') || $pms->get('MESSAGEID');
+
+  my $from   = lc $pms->get('From:addr') || $pms->get('EnvelopeFrom:addr');;
+  return 0 unless $from =~ /\S/;
+  my $domain = $from;
+  $domain =~ s/^.+@//;
+
+  # Find the last untrusted relay and populate helo and original IP
+  my ($origip, $helo);
+  if (defined $pms->{relays_trusted} || defined $pms->{relays_untrusted}) {
+    my $trusteds = @{$pms->{relays_trusted}};
+    foreach my $rly ( @{$pms->{relays_trusted}}, @{$pms->{relays_untrusted}} ) {
+	# Get the last found HELO, regardless of private/public or trusted/untrusted
+	# Avoiding a redundant duplicate entry if HELO is equal/similar to another identificator
+	if (defined $rly->{helo} &&
+            $rly->{helo} !~ /^\[?\Q$rly->{ip}\E\]?$/ &&
+            $rly->{helo} !~ /^\Q$domain\E$/i &&
+            $rly->{helo} !~ /^\Q$from\E$/i ) {
+	    $helo   = $rly->{helo};
+	}
+	# use only trusted ID, but use the first untrusted IP (if available) (AWL bug 6908)
+	# at low spam scores (<2) ignore trusted/untrusted
+	# set IP to 127.0.0.1 for any internal IP, so that it can be distinguished from none (AWL bug 6357)
+	if ((--$trusteds >=  0 || $msgscore<2) && !$msg_id && $rly->{id})            {$msg_id = $rly->{id};}
+	if (($trusteds   >= -1 || $msgscore<2) && !$rly->{ip_private} && $rly->{ip}) {$origip = $rly->{ip};}
+	if ( $trusteds   >=  0     && !$origip &&  $rly->{ip_private} && $rly->{ip}) {$origip = '127.0.0.1';}
+    }
+  }
+
+  # Look for previous scores of the same message, for instance when doing re-learning
+  if ($self->{conf}->{txrep_track_messages}) {
+    if ($msg_id) {
+        my $msg_rep = $self->check_reputations($pms, 'MSG_ID', $msg_id, undef, $date, undef);
+        if (defined $msg_rep && $self->count()) {
+            if (defined $self->{learning} && !defined $self->{forgetting}) {
+                # already learned, forget only if already learned (count>1), and relearn
+                # when only scanned (count=1), go ahead with normal rep scan
+                if ($self->count() > 1) {
+                    $self->{last_pms} = $pms;                   # cache the pmstatus
+                    $self->forget_message($pms->{msg},$msg_id); # sub reentrance OK
+                }
+            } elsif ($self->{forgetting}) {
+                $msgscore = $msg_rep;   # forget the old stored score instead of the one got now
+                dbg("TxRep: forgetting stored score %0.3f of message %s", $msgscore || 'undef', $msg_id);
+            } else {
+                # calculating the delta from the stored message reputation
+                $delta = ($msgscore + $self->{conf}->{txrep_factor}*$msg_rep) / (1+$self->{conf}->{txrep_factor}) - $msgscore;
+                if ($delta != 0) {
+                    $pms->got_hit("TXREP", "TXREP: ", ruletype => 'eval', score => sprintf("%0.3f", $delta));
+                }
+                dbg("TxRep: message %s already scanned, using old data; post-TxRep score: %0.3f", $msg_id, $pms->{score} || 'undef');
+                return 0;
+            }
+        }       # no stored reputation found, go ahead with normal rep scan
+    } else {dbg("TxRep: no message-id available, parsing forced");}
+  }             # else no message tracking, go ahead with normal rep scan
+
+  # whitelists recipients at senders from internal networks after checking MSG_ID only
+  if ( $self->{conf}->{txrep_whitelist_out} &&
+          defined $pms->{relays_internal} &&  @{$pms->{relays_internal}} &&
+        (!defined $pms->{relays_external} || !@{$pms->{relays_external}})
+     ) {
+    foreach my $rcpt ($pms->all_to_addrs()) {
+        if ($rcpt) {
+            dbg("TxRep: internal sender, whitelisting recipient: $rcpt");
+            $self->modify_reputation($rcpt, -1*$self->{conf}->{txrep_whitelist_out}, undef);
+        }
+    }
+  }
+
+  # Get the signing domain
+  my $signedby = ($self->{conf}->{auto_whitelist_distinguish_signed})? $pms->get_tag('DKIMDOMAIN') : undef;
+
+  # Summary of all information we've gathered so far
+  dbg("TxRep: active, %s pre-score: %s, autolearn score: %s, IP: %s, address: %s %s",
+    $msg_id       || '',
+    $pms->{score} || '?',
+    $msgscore     || '?',
+    $origip       || '?',
+    $from         || '?',
+    $signedby ? "signed by $signedby" : '(unsigned)'
+  );
+
+  my $ip = $origip;
+  if ($signedby) {
+    $ip       = undef;
+    $domain   = $signedby;
+  } elsif ($pms->{spf_pass} && $self->{conf}->{txrep_spf}) {
+    $ip       = undef;
+    $signedby = 'spf';
+  }
+
+  my $totalweight      = 0;
+  $self->{totalweight} = $totalweight;
+
+  # Get current reputation info
+  $delta += $self->check_reputations($pms, 'EMAIL_IP', $from, $ip, $signedby, $msgscore);
+
+  if ($domain) {
+    $delta += $self->check_reputations($pms, 'DOMAIN', $domain, $ip, $signedby, $msgscore);
+  }
+  if ($helo) {
+    $delta += $self->check_reputations($pms, 'HELO', $helo, undef, 'HELO', $msgscore);
+  }
+  if ($origip) {
+    if (!$signedby) {
+      $delta += $self->check_reputations($pms, 'EMAIL', $from, undef, undef, $msgscore);
+    }
+    $delta += $self->check_reputations($pms, 'IP', $origip, undef, undef, $msgscore);
+  }
+
+  # Learn against this message and store reputation
+  if (!defined $self->{learning}) {
+    $delta = ($self->{totalweight})? $self->{conf}->{txrep_factor} * $delta / $self->{totalweight}  :  0;
+    if ($delta) {
+      $pms->got_hit("TXREP", "TXREP: ", ruletype => 'eval', score => sprintf("%0.3f", $delta));
+    }
+    $msgscore += $delta;
+    if (defined $pms->{score}) {
+      dbg("TxRep: post-TxRep score: %.3f", $pms->{score});
+    }
+  }
+  # Track message ID
+  if ($self->{conf}->{txrep_track_messages} && $msg_id) {
+    $self->check_reputations($pms, 'MSG_ID', $msg_id, undef, $date, $msgscore);
+  }
+  # Close any open resources
+  if (!defined $self->{txKeepStoreTied}) {
+    $self->finish();
+  }
+
+  return 0;
+}
+
+
+###########################################################################
+sub check_reputations {
+###########################################################################
+  my $self = shift;
+  my $delta;
+
+  if ($self->open_storages()) {
+    if ($self->{conf}->{txrep_user2global_ratio} && $self->{user_storage} != $self->{global_storage}) {
+      my $user   = $self->check_reputation('user_storage',  @_);
+      my $global = $self->check_reputation('global_storage',@_);
+
+      if (defined $user and $user == $user) {
+        $delta = ( $self->{conf}->{txrep_user2global_ratio} * $user + $global ) / ( 1 + $self->{conf}->{txrep_user2global_ratio} );
+      } else {
+        $delta = $global;
+      }
+    } else {
+      $delta = $self->check_reputation(undef,@_);
+    }
+  }
+  return $delta;
+}
+
+
+###########################################################################
+sub check_reputation {
+###########################################################################
+  my ($self, $storage, $pms, $key, $id, $ip, $signedby, $msgscore) = @_;
+
+  my $delta  = 0;
+  my $weight = ($key eq 'MSG_ID')? 1 : eval('$pms->{main}->{conf}->{txrep_weight_'.lc($key).'}');
+
+#  {
+#    #Bug 7164, trying to find out reason for these: _WARN: Use of uninitialized value $msgscore in addition (+) at /usr/share/perl5/vendor_perl/Mail/SpamAssassin/Plugin/TxRep.pm line 1415.
+#    no warnings;
+#
+#    unless (defined $msgscore) {
+#      #Output some params and the calling function so we can identify more about this bug
+#      dbg("TxRep: MsgScore Undefined (bug 7164) - check_reputation Parameters: self: $self storage: $storage pms: $pms, key: $key, id: $id, ip: $ip, signedby: $signedby, msgscore: $msgscore");
+#      dbg("TxRep: MsgScore Undefined (bug 7164) - weight: $weight");
+#
+#      my ($package, $filename, $line) = caller();
+#
+#      chomp($package);
+#      chomp($filename);
+#      chomp($line);
+#
+#      dbg("TxRep: MsgScore Undefined (bug 7164) - Caller Info: Package: $package - Filename: $filename - Line: $line");
+#
+#      #Define $msgscore as a triage to hide warnings while we find the root cause
+#      #$msgscore = 0;
+#    }
+#  }
+
+
+  if (defined $weight && $weight) {
+    my $meanrep;
+    my $timer = $self->{main}->time_method('check_txrep_'.lc($key));
+
+    if (defined $storage) {
+        $self->{checker} = $self->{$storage};
+    }
+    my $found  = $self->get_sender($id, $ip, $signedby);
+    my $tag_id = (defined $storage)? uc($key.'_'.substr($storage,0,1)) : uc($key);
+    if (defined $found && $self->count()) {
+        $meanrep = $self->total() / $self->count();
+    }
+    if ($self->{learning} && defined $msgscore) {
+        if (defined $meanrep) {
+            # $msgscore<=>0 gives the sign of $msgscore
+            $msgscore += ($msgscore<=>0) * abs($meanrep);
+        }
+        dbg("TxRep: reputation: %s, count: %d, learning: %s, $tag_id: %s",
+            defined $meanrep? sprintf("%.3f",$meanrep) : 'none',
+            $self->count()      || 0,
+            $self->{learning}   || '',
+            $id                 || 'none'
+        );
+    } else {
+        $self->{totalweight} += $weight;
+        if ($key eq 'MSG_ID' && $self->count() > 0) {
+            $delta = $self->total() / $self->count();
+	    $pms->set_tag('TXREP'.$tag_id,              sprintf("%2.1f", $delta));
+        } elsif (defined $self->total()) {
+            #Bug 7164 - $msgscore undefined
+            if (defined $msgscore) {
+              $delta = ($self->total() + $msgscore) / (1 + $self->count()) - $msgscore;
+            } else {
+              $delta = ($self->total()) / (1 + $self->count());
+            }
+
+            $pms->set_tag('TXREP_'.$tag_id,             sprintf("%2.1f", $delta));
+            if (defined $meanrep) {
+                $pms->set_tag('TXREP_'.$tag_id.'_MEAN', sprintf("%2.1f", $meanrep));
+            }
+            $pms->set_tag('TXREP_'.$tag_id.'_COUNT',    sprintf("%2.1f", $self->count()));
+            $pms->set_tag('TXREP_'.$tag_id.'_PRESCORE', sprintf("%2.1f", $pms->{score}));
+        } else {
+            $pms->set_tag('TXREP_'.$tag_id.'_UNKNOWN', 1);
+        }
+        dbg("TxRep: reputation: %s, count: %d, weight: %.1f, delta: %.3f, $tag_id: %s",
+            defined $meanrep? sprintf("%.3f",$meanrep) : 'none',
+            $self->count()      || 0,
+            $weight             || 0,
+            $delta              || 0,
+            $id                 || 'none'
+        );
+    }
+    $timer = $self->{main}->time_method('update_txrep_'.lc($key));
+    if (defined $msgscore) {
+        if ($self->{forgetting}) {              # forgetting a message score
+            $self->remove_score($msgscore);     # remove the given score and decrement the count
+            if ($key eq 'MSG_ID') {             # remove the message ID score completely
+                $self->{checker}->remove_entry($self->{entry});
+            }
+        } else {
+            $self->add_score($msgscore);        # add the score and increment the count
+            if ($self->{learning} && $key eq 'MSG_ID' && $self->count() eq 1) {
+                $self->add_score($msgscore);    # increasing the count by 1 at a learned score (count=2)
+            }                                   # it can be distinguished from a scanned score (count=1)
+        }
+    } elsif (defined $found && $self->{forgetting} && $key eq 'MSG_ID') {
+        $self->{checker}->remove_entry($self->{entry}); #forgetting the message ID
+    }
+  }
+  if (!defined $storage) {
+    $self->{checker} = $self->{default_storage};
+  }
+
+  return ($weight || 0) * ($delta || 0);
+}
+
+
+
+#--------------------------------------------------------------------------
+# Database handler subroutines
+#--------------------------------------------------------------------------
+
+###########################################################################
+sub count {my $self=shift;  return (defined $self->{checker})? $self->{entry}->{count}    : undef;}
+sub total {my $self=shift;  return (defined $self->{checker})? $self->{entry}->{totscore} : undef;}
+###########################################################################
+
+
+###########################################################################
+sub get_sender {
+###########################################################################
+  my ($self, $addr, $origip, $signedby) = @_;
+
+  return unless (defined $self->{checker});
+
+  my $fulladdr   = $self->pack_addr($addr, $origip);
+  my $entry      = $self->{checker}->get_addr_entry($fulladdr, $signedby);
+  $self->{entry} = $entry;
+  $origip        = $origip || 'none';
+
+  if ($entry->{count}<0 || $entry->{count}=~/^(nan|)$/ || $entry->{totscore}=~/^(nan|)$/) {
+    warn "TxRep: resetting bad data for ($addr, $origip), count: $entry->{count}, totscore: $entry->{totscore}\n";
+    $self->{entry}->{count} = $self->{entry}->{totscore} = 0;
+  }
+  return $self->{entry}->{count};
+}
+
+
+###########################################################################
+sub add_score {
+###########################################################################
+  my ($self,$score) = @_;
+
+  return unless (defined $self->{checker});       # no factory defined; we can't check
+
+  if ($score != $score) {
+    warn "TxRep: attempt to add a $score to TxRep entry ignored\n";
+    return;                                       # don't try to add a NaN
+  }
+  $self->{entry}->{count} ||= 0;
+
+  # performing the dilution aging correction
+  if (defined $self->total() && defined $self->count() && defined $self->{txrep_dilution_factor}) {
+    my $diluted_total =
+        ($self->count() + 1) *
+        ($self->{txrep_dilution_factor} * $self->total() + $score) /
+        ($self->{txrep_dilution_factor} * $self->count() + 1);
+    my $corrected_score = $diluted_total - $self->total();
+    $self->{checker}->add_score($self->{entry}, $corrected_score);
+  } else {
+    $self->{checker}->add_score($self->{entry}, $score);
+  }
+}
+
+
+
+###########################################################################
+sub remove_score {
+###########################################################################
+  my ($self,$score) = @_;
+
+  return unless (defined $self->{checker});       # no factory defined; we can't check
+
+  if ($score != $score) {                               # don't try to add a NaN
+    warn "TxRep: attempt to add a $score to TxRep entry ignored\n";
+    return;
+  }
+  # no reversal dilution aging correction (not easily possible),
+  # just removing the original message score
+  if ($self->{entry}->{count} > 2)
+        {$self->{entry}->{count} -= 2;}
+  else  {$self->{entry}->{count}  = 0;}
+  # substract 2, and add a score; hence decrementing by 1
+  $self->{checker}->add_score($self->{entry}, -1*$score);
+}
+
+
+
+###########################################################################
+sub modify_reputation {
+###########################################################################
+  my ($self, $addr, $score, $signedby) = @_;
+
+  return unless (defined $self->{checker});       # no factory defined; we can't check
+  my $fulladdr = $self->pack_addr($addr, undef);
+  my $entry    = $self->{checker}->get_addr_entry($fulladdr, $signedby);
+
+  # remove any old entries (will remove per-ip entries as well)
+  # always call this regardless, as the current entry may have 0
+  # scores, but the per-ip one may have more
+  $self->{checker}->remove_entry($entry);
+
+  # remove address only, no new score to add if score NaN or undef
+  if (defined $score && $score==$score) {
+    # else add score. get a new entry first
+    $entry = $self->{checker}->get_addr_entry($fulladdr, $signedby);
+    $self->{checker}->add_score($entry, $score);
+  }
+  return 1;
+}
+
+
+# connecting the primary and the secondary storage; needed only on the first run
+# (this can't be in the constructor, since the settings are not available there)
+###########################################################################
+sub open_storages {
+###########################################################################
+  my $self = shift;
+
+  # Enabled per bug 7191 comment 18
+  return 1 unless (!defined $self->{default_storage});
+
+  return 1 if defined ($self->{checker});
+
+  my $factory;
+  if ($self->{main}->{pers_addr_list_factory}) {
+    $factory = $self->{main}->{pers_addr_list_factory};
+  } else {
+    my $type = $self->{conf}->{txrep_factory};
+    if ($type =~ /^([_A-Za-z0-9:]+)$/) {
+        $type = untaint_var($type);
+        eval 'require    '.$type.';
+            $factory = '.$type.'->new();
+            1;'
+        or do {
+            my $eval_stat = $@ ne '' ? $@ : "errno=$!";  chomp $eval_stat;
+            warn "TxRep: $eval_stat\n";
+            undef $factory;
+        };
+        $self->{main}->set_persistent_address_list_factory($factory) if $factory;
+    } else {warn "TxRep: illegal factory setting\n";}
+  }
+  if (defined $factory) {
+    $self->{checker} = $self->{default_storage} = $factory->new_checker($self->{main});
+
+    if ($self->{conf}->{txrep_user2global_ratio} && !defined $self->{global_storage}) {
+	# hack to handle the BDB and SQL factory types of the storage object
+	# TODO: add an a method to the handler class instead
+	my ($storage_type, $is_global);
+	
+	if (ref($factory) =~ /SQLBasedAddrList/) {
+	    $is_global    = defined $self->{conf}->{user_awl_sql_override_username};
+	    $storage_type = 'SQL';
+	    if ($is_global && $self->{conf}->{user_awl_sql_override_username} eq $self->{main}->{username}) {
+		# skip double storage if current user same as the global override
+		$self->{user_storage} = $self->{global_storage} = $self->{default_storage};
+	    }
+	} elsif (ref($factory) =~ /DBBasedAddrList/) {
+	    $is_global    = $self->{conf}->{auto_whitelist_path} !~ /__userstate__/;
+	    $storage_type = 'DB';
+	}
+	if (!defined $self->{global_storage}) {
+	    my $sql_override_orig = $self->{conf}->{user_awl_sql_override_username};
+	    my $awl_path_orig     = $self->{conf}->{auto_whitelist_path};
+	    if ($is_global) {
+		$self->{conf}->{user_awl_sql_override_username} = '';
+		$self->{conf}->{auto_whitelist_path}            = '__userstate__/tx-reputation';
+		$self->{global_storage} = $self->{default_storage};
+		$self->{user_storage}   = $factory->new_checker($self->{main});
+	    } else {
+		$self->{conf}->{user_awl_sql_override_username} = 'GLOBAL';
+		$self->{conf}->{auto_whitelist_path}            = '__local_state_dir__/tx-reputation';
+		$self->{global_storage} = $factory->new_checker($self->{main});
+		$self->{user_storage}   = $self->{default_storage};
+	    }
+	    $self->{conf}->{user_awl_sql_override_username} = $sql_override_orig;
+	    $self->{conf}->{auto_whitelist_path}            = $awl_path_orig;
+	
+	    # Another ugly hack to find out whether the user differs from
+	    # the global one. We need to add a method to the factory handlers
+	    if ($storage_type eq 'DB' && 
+		$self->{user_storage}->{locked_file} eq $self->{global_storage}->{locked_file}) {
+		if ($is_global) 
+		     {$self->{global_storage}->finish();}
+		else {$self->{user_storage}->finish();}
+		$self->{user_storage} = $self->{global_storage} = $self->{default_storage};
+	    }
+	}
+    }
+  } else {
+    $self->{user_storage} = $self->{global_storage} = $self->{checker} = $self->{default_storage} = undef;
+    warn("TxRep: could not open storages, quitting!\n");
+    return 0;
+  }
+  return 1;
+}
+
+
+###########################################################################
+sub finish {
+###########################################################################
+  my $self = shift;
+
+  return unless (defined $self->{checker});       # no factory defined; we can't check
+
+  if ($self->{conf}->{txrep_user2global_ratio} && defined $self->{user_storage} && ($self->{user_storage} != $self->{global_storage})) {
+    $self->{user_storage}->finish();
+    $self->{global_storage}->finish();
+    $self->{user_storage}   = undef;
+    $self->{global_storage} = undef;
+  } elsif (defined $self->{default_storage}) {
+    $self->{default_storage}->finish();
+  }
+ $self->{default_storage} = $self->{checker} = undef;
+ $self->{factory} = undef;
+}
+
+
+###########################################################################
+sub ip_to_awl_key {
+###########################################################################
+  my ($self, $origip) = @_;
+
+  my $result;
+  local $1;
+  if (!defined $origip) {
+    # could not find an IP address to use
+  } elsif ($origip =~ /^ (\d{1,3} \. \d{1,3}) \. \d{1,3} \. \d{1,3} $/xs) {
+    my $mask_len = $self->{ipv4_mask_len};
+    $mask_len = 16  if !defined $mask_len;
+    # handle the default and easy cases manually
+    if    ($mask_len == 32) {$result = $origip;}
+    elsif ($mask_len == 16) {$result = $1;}
+    else {
+      my $origip_obj = NetAddr::IP->new($origip . '/' . $mask_len);
+      if (!defined $origip_obj) {                       # invalid IPv4 address
+        dbg("TxRep: bad IPv4 address $origip");
+      } else {
+        $result =        $origip_obj->network->addr;
+        $result =~s/(\.0){1,3}\z//;                     # truncate zero tail
+      }
+    }
+  } elsif ($origip =~ /:/ &&                            # triage
+           $origip =~
+           /^ [0-9a-f]{0,4} (?: : [0-9a-f]{0,4} | \. [0-9]{1,3} ){2,9} $/xsi) {
+    # looks like an IPv6 address
+    my $mask_len = $self->{ipv6_mask_len};
+    $mask_len = 48  if !defined $mask_len;
+    my $origip_obj = NetAddr::IP->new6($origip . '/' . $mask_len);
+    if (!defined $origip_obj) {                         # invalid IPv6 address
+      dbg("TxRep: bad IPv6 address $origip");
+    } else {
+      $result = $origip_obj->network->full6;            # string in a canonical form
+      $result =~ s/(:0000){1,7}\z/::/;                  # compress zero tail
+    }
+  } else {
+    dbg("TxRep: bad IP address $origip");
+  }
+  if (defined $result && length($result) > 39) {        # just in case, keep under
+    $result = substr($result,0,39);                     # the awl.ip field size
+  }
+# if (defined $result) {dbg("TxRep: IP masking %s -> %s", $origip || '?', $result || '?');}
+  return $result;
+}
+
+
+###########################################################################
+sub pack_addr {
+###########################################################################
+  my ($self, $addr, $origip) = @_;
+
+  $addr = lc $addr;
+  $addr =~ s/[\000\;\'\"\!\|]/_/gs;                     # paranoia
+
+  if ( defined $origip) {$origip = $self->ip_to_awl_key($origip);}
+  if (!defined $origip) {$origip = 'none';}
+  return $addr . "|ip=" . $origip;
+}
+
+
+=head1 LEARNING SPAM / HAM
+
+When SpamAssassin is told to learn (or relearn) a given message as spam or
+ham, all reputations relevant to the message (email, email_ip, domain, ip, helo)
+in both global and user storages will be updated using the C<txrep_learn_penalty>
+respectively the C<rxrep_learn_bonus> values. The new reputation of given sender
+property (email, domain,...) will be the respective result of one of the following
+formulas:
+
+   new_reputation = old_reputation + learn_penalty
+   new_reputation = old_reputation - learn_bonus
+
+The TxRep plugin currently does track each message individually, hence it
+does not detect when you learn the message repeatedly. It will add/subtract
+the penalty/bonus score each time the message is fed to the spam learner.
+
+=cut
+
+######################################################### plugin hook #####
+sub learner_new {
+###########################################################################
+  my ($self) = @_;
+
+  $self->{txKeepStoreTied} = undef;
+  return $self;
+}
+
+
+######################################################### plugin hook #####
+sub autolearn {
+###########################################################################
+  my ($self, $params) = @_;
+
+  $self->{last_pms} = $params->{permsgstatus};
+  return $self->{autolearn} = 1;
+}
+
+
+######################################################### plugin hook #####
+sub learn_message {
+###########################################################################
+  my ($self, $params) = @_;
+  return 0 unless (defined $params->{isspam});
+
+  dbg("TxRep: learning a message");
+  my $pms = ($self->{last_pms})? $self->{last_pms} : Mail::SpamAssassin::PerMsgStatus->new($self->{main}, $params->{msg});
+  if (!defined $pms->{relays_internal} && !defined $pms->{relays_external}) {
+    $pms->extract_message_metadata();
+  }
+
+  if ($params->{isspam})
+        {$self->{learning} =      $self->{conf}->{txrep_learn_penalty};}
+  else  {$self->{learning} = -1 * $self->{conf}->{txrep_learn_bonus};}
+
+  my $ret = !$self->{learning} || $self->check_senders_reputation($pms);
+  $self->{learning} = undef;
+  return $ret;
+}
+
+
+######################################################### plugin hook #####
+sub forget_message {
+###########################################################################
+  my ($self, $params) = @_;
+  return 0 unless ($self->{conf}->{use_txrep});
+  my $pms = ($self->{last_pms})? $self->{last_pms} : Mail::SpamAssassin::PerMsgStatus->new($self->{main}, $params->{msg});
+
+  dbg("TxRep: forgetting a message");
+  $self->{forgetting} = 1;
+  my $ret = $self->check_senders_reputation($pms);
+  $self->{forgetting} = undef;
+  return $ret;
+}
+
+
+######################################################### plugin hook #####
+sub learner_expire_old_training {
+###########################################################################
+  my ($self, $params) = @_;
+  return 0 unless ($self->{conf}->{use_txrep} && $self->{conf}->{txrep_expiry_days});
+
+  dbg("TxRep: expiry not implemented yet");
+#  dbg("TxRep: expiry starting");
+#  my $timer = $self->{main}->time_method("expire_bayes");
+#  $self->{store}->expire_old_tokens($params);
+#  dbg("TxRep: expiry completed");
+}
+
+
+######################################################### plugin hook #####
+sub learner_close {
+###########################################################################
+  my ($self, $params) = @_;
+  my $quiet = $params->{quiet};
+  return 0 unless ($self->{conf}->{use_txrep});
+
+  $self->{txKeepStoreTied} = undef;
+  $self->finish();
+  dbg("TxRep: learner_close");
+}
+
+
+=head1 OPTIMIZING TXREP
+
+TxRep can be optimized for speed and simplicity, or for the precision in
+assigning the reputation scores.
+
+First of all TxRep can be quickly disabled and re-enabled through the option
+L</C<use_txrep>>. It can be done globally, or individually in each respective
+C<user_prefs>. Disabling TxRep will not destroy the database, so it can be
+re-enabled any time later again.
+
+On many systems, SQL-based storage may perform faster than the default
+Berkeley DB storage, so you should consider setting it up.
+
+Then there are multiple settings that can reduce the number of records stored
+in the database, hence reducing the size of the storage, and also the processing
+time:
+
+1. Setting L</C<txrep_user2global_ratio>> to zero will disable the dual storage,
+halving so the disk space requirements, and the processing times of this plugin.
+
+2. You can disable all but one of the L<REPUTATION WEIGHTS>. The EMAIL_IP is
+the most specific option, so it is the most likely choice in such case, but you
+could base the reputation system on any of the remaining scores. Each of the
+enabled reputations adds a new entry to the database for each new identificator.
+So while for example the number of recorded and scored domains may be big, the
+number of stored IP addresses will be probably higher, and would require more
+space in the storage.
+
+3. Disabling the L</C<txrep_track_messages>> avoids storing a separate entry
+for every scanned message, hence also reducing the disk space requirements, and
+the processing time.
+
+4. Disabling the option L</C<txrep_autolearn>> will save the processing time
+at messages that trigger the auto-learning process.
+
+5. Disabling L</C<txrep_whitelist_out>> will reduce the processing time at
+outbound connections.
+
+6. Keeping the option L</C<auto_whitelist_distinguish_signed>> enabled may help
+slightly reducing the size of the database, because at signed messages, the
+originating IP address is ignored, hence no additional database entries are
+needed for each separate IP address (resp. a masked block of IP addresses).
+
+
+Since TxRep reuses the storage architecture of the former AWL plugin, for
+initializing the SQL storage, the same instructions apply also to TxRep.
+Although the old AWL table can be reused for TxRep, by default TxRep expects
+the SQL table to be named "txrep".
+
+To install a new SQL table for TxRep, run the appropriate SQL file for your
+system under the /sql directory.
+
+If you get a syntax error at an older version of MySQL, use TYPE=MyISAM
+instead of ENGINE=MyISAM at the end of the command. You can also use other
+types of ENGINE (depending on what is available on your system). For example
+MEMORY engine stores the entire table in the server memory, achieving
+performance similar to Redis. You would need to care about the replication
+of the RAM table to disk through a cronjob, to avoid loss of data at reboot.
+The InnoDB engine is used by default, offering high scalability (database
+size and concurence of accesses). In conjunction with a high value of
+innodb_buffer_pool or with the memcached plugin (MySQL v5.6+) it can also
+offer performance comparable to Redis.
+
+=cut
+
+1;
diff -Nru spamassassin-3.4.0/lib/Mail/SpamAssassin/Plugin/URIDetail.pm spamassassin-3.4.2/lib/Mail/SpamAssassin/Plugin/URIDetail.pm
--- spamassassin-3.4.0/lib/Mail/SpamAssassin/Plugin/URIDetail.pm	2014-02-07 03:36:27.000000000 -0500
+++ spamassassin-3.4.2/lib/Mail/SpamAssassin/Plugin/URIDetail.pm	2018-09-13 21:27:51.000000000 -0400
@@ -72,11 +72,10 @@
 
 use strict;
 use warnings;
-use bytes;
+# use bytes;
 use re 'taint';
 
-use vars qw(@ISA);
-@ISA = qw(Mail::SpamAssassin::Plugin);
+our @ISA = qw(Mail::SpamAssassin::Plugin);
 
 # constructor
 sub new {
diff -Nru spamassassin-3.4.0/lib/Mail/SpamAssassin/Plugin/URIDNSBL.pm spamassassin-3.4.2/lib/Mail/SpamAssassin/Plugin/URIDNSBL.pm
--- spamassassin-3.4.0/lib/Mail/SpamAssassin/Plugin/URIDNSBL.pm	2014-02-07 03:36:27.000000000 -0500
+++ spamassassin-3.4.2/lib/Mail/SpamAssassin/Plugin/URIDNSBL.pm	2018-09-13 21:27:51.000000000 -0400
@@ -295,15 +295,13 @@
 use Mail::SpamAssassin::Plugin;
 use Mail::SpamAssassin::Constants qw(:ip);
 use Mail::SpamAssassin::Util;
-use Mail::SpamAssassin::Util::RegistrarBoundaries;
 use Mail::SpamAssassin::Logger;
 use strict;
 use warnings;
-use bytes;
+# use bytes;
 use re 'taint';
 
-use vars qw(@ISA);
-@ISA = qw(Mail::SpamAssassin::Plugin);
+our @ISA = qw(Mail::SpamAssassin::Plugin);
 
 use constant LOG_COMPLETION_TIMES => 0;
 
@@ -943,9 +941,8 @@
     next unless (defined($str) && defined($dom));
     dbg("uridnsbl: got($j) NS for $dom: $str");
 
-    if ($str =~ /IN\s+NS\s+(\S+)/) {
-      my $nsmatch = lc $1;
-      $nsmatch =~ s/\.$//;
+    if ($rr->type eq 'NS') {
+      my $nsmatch = lc $rr->nsdname;  # available since at least Net::DNS 0.14
       my $nsrhblstr = $nsmatch;
       my $fullnsrhblstr = $nsmatch;
 
@@ -961,7 +958,7 @@
           $seen_lookups->{'A:'.$nsmatch} = 1;
           $self->lookup_a_record($pms, $ent->{obj}, $nsmatch);
         }
-        $nsrhblstr = Mail::SpamAssassin::Util::RegistrarBoundaries::trim_domain($nsmatch);
+        $nsrhblstr = $self->{main}->{registryboundaries}->trim_domain($nsmatch);
       }
 
       foreach my $rulename (keys %{$nsrhsblrules}) {
@@ -1011,10 +1008,9 @@
     dbg("uridnsbl: complete_a_lookup aborted %s", $ent->{key});
     return;
   }
-
   dbg("uridnsbl: complete_a_lookup %s", $ent->{key});
-  my @answer = $pkt->answer;
   my $j = 0;
+  my @answer = $pkt->answer;
   foreach my $rr (@answer) {
     $j++;
     my $str = $rr->string;
@@ -1026,9 +1022,9 @@
     }
     dbg("uridnsbl: complete_a_lookup got(%d) A for %s: %s", $j,$hname,$str);
 
-    local $1;
-    if ($str =~ /IN\s+A\s+(\S+)/) {
-      $self->lookup_dnsbl_for_ip($pms, $ent->{obj}, $1);
+    if ($rr->type eq 'A') {
+      my $ip_address = $rr->rdatastr;
+      $self->lookup_dnsbl_for_ip($pms, $ent->{obj}, $ip_address);
     }
   }
 }
@@ -1101,7 +1097,9 @@
     my $rr_type = $rr->type;
 
     if ($rr_type eq 'A') {
-      $rdatastr = $rr->rdatastr;
+      # Net::DNS::RR::A::address() is available since Net::DNS 0.69
+      $rdatastr = $rr->UNIVERSAL::can('address') ? $rr->address
+                                                 : $rr->rdatastr;
       if ($rdatastr =~ m/^\d{1,3}\.\d{1,3}\.\d{1,3}\.\d{1,3}$/) {
         $rdatanum = Mail::SpamAssassin::Util::my_inet_aton($rdatastr);
       }
diff -Nru spamassassin-3.4.0/lib/Mail/SpamAssassin/Plugin/URIEval.pm spamassassin-3.4.2/lib/Mail/SpamAssassin/Plugin/URIEval.pm
--- spamassassin-3.4.0/lib/Mail/SpamAssassin/Plugin/URIEval.pm	2014-02-07 03:36:27.000000000 -0500
+++ spamassassin-3.4.2/lib/Mail/SpamAssassin/Plugin/URIEval.pm	2018-09-13 21:27:51.000000000 -0400
@@ -22,11 +22,10 @@
 
 use strict;
 use warnings;
-use bytes;
+# use bytes;
 use re 'taint';
 
-use vars qw(@ISA);
-@ISA = qw(Mail::SpamAssassin::Plugin);
+our @ISA = qw(Mail::SpamAssassin::Plugin);
 
 # constructor: register the eval rule
 sub new {
@@ -55,7 +54,7 @@
     while (s{^https?://([^/:\?]+).+?(https?:/{0,2}?([^/:\?]+).*)$}{$2}i) {
       my ($redir, $dest) = ($1, $3);
       foreach ($redir, $dest) {
-	$_ = Mail::SpamAssassin::Util::uri_to_domain(lc($_)) || $_;
+	$_ = $self->{main}->{registryboundaries}->uri_to_domain($_) || $_;
       }
       next if ($redir eq $dest);
       dbg("eval: redirect: found $redir to $dest, flagging");
diff -Nru spamassassin-3.4.0/lib/Mail/SpamAssassin/Plugin/URILocalBL.pm spamassassin-3.4.2/lib/Mail/SpamAssassin/Plugin/URILocalBL.pm
--- spamassassin-3.4.0/lib/Mail/SpamAssassin/Plugin/URILocalBL.pm	1969-12-31 19:00:00.000000000 -0500
+++ spamassassin-3.4.2/lib/Mail/SpamAssassin/Plugin/URILocalBL.pm	2018-09-13 21:27:51.000000000 -0400
@@ -0,0 +1,658 @@
+# <@LICENSE>
+# Licensed to the Apache Software Foundation (ASF) under one or more
+# contributor license agreements.  See the NOTICE file distributed with
+# this work for additional information regarding copyright ownership.
+# The ASF licenses this file to you under the Apache License, Version 2.0
+# (the "License"); you may not use this file except in compliance with
+# the License.  You may obtain a copy of the License at:
+# 
+#     http://www.apache.org/licenses/LICENSE-2.0
+# 
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+# </@LICENSE>
+
+=head1 NAME
+
+URILocalBL - blacklist URIs using local information (ISP names, address lists, and country codes)
+
+=head1 SYNOPSIS
+
+This plugin creates some new rule test types, such as "uri_block_cc",
+"uri_block_cidr", and "uri_block_isp".  These rules apply to the URIs
+found in the HTML portion of a message, i.e. <a href=...> markup.
+
+  loadplugin    Mail::SpamAssassin::Plugin::URILocalBL
+
+Why local blacklisting? There are a few excellent, effective, and
+well-maintained DNSBL's out there. But they have several drawbacks:
+
+=over 2
+
+=item * blacklists can cover tens of thousands of entries, and you can't select which ones you use;
+
+=item * verifying that it's correctly configured can be non-trivial;
+
+=item * new blacklisting entries may take a while to be detected and entered, so it's not instantaneous.
+
+=back
+
+Sometimes all you want is a quick, easy, and very surgical blacklisting of
+a particular site or a particular ISP. This plugin is defined for that
+exact usage case.
+
+=head1 RULE DEFINITIONS AND PRIVILEGED SETTINGS
+
+The format for defining a rule is as follows:
+
+  uri_block_cc SYMBOLIC_TEST_NAME cc1 cc2 cc3 cc4
+
+or:
+
+  uri_block_cont SYMBOLIC_TEST_NAME co1 co2 co3 co4
+
+or:
+
+  uri_block_cidr SYMBOLIC_TEST_NAME a.a.a.a b.b.b.b/cc d.d.d.d-e.e.e.e
+
+or:
+
+  uri_block_isp SYMBOLIC_TEST_NAME "DataRancid" "McCarrier" "Phishers-r-Us"
+
+Example rule for matching a URI in China:
+
+  uri_block_cc TEST1 cn
+
+This would block the URL http://www.baidu.com/index.htm.  Similarly, to
+match a Spam-haven netblock:
+
+  uri_block_cidr TEST2 65.181.64.0/18
+
+would match a netblock where several phishing sites were recently hosted.
+
+And to block all CIDR blocks registered to an ISP, one might use:
+
+  uri_block_isp TEST3 "ColoCrossing"
+
+if one didn't trust URL's pointing to that organization's clients.  Lastly,
+if there's a country that you want to block but there's an explicit host
+you wish to exempt from that blacklist, you can use:
+
+  uri_block_exclude TEST1 www.baidu.com
+
+if you wish to exempt URL's referring to this host. The same syntax is
+applicable to CIDR and ISP blocks as well.
+
+=head1 DEPENDENCIES
+
+The Country-Code based filtering requires the Geo::IP or GeoIP2 module, 
+which uses either the fremium GeoLiteCountry database, or the commercial 
+version of it called GeoIP from MaxMind.com.
+
+The ISP based filtering requires the same module, plus the GeoIPISP database.
+There is no fremium version of this database, so commercial licensing is
+required.
+
+=cut
+
+package Mail::SpamAssassin::Plugin::URILocalBL;
+use Mail::SpamAssassin::Plugin;
+use Mail::SpamAssassin::Logger;
+use Mail::SpamAssassin::Util qw(untaint_var);
+
+use Net::CIDR::Lite;
+use Socket;
+
+use strict;
+use warnings;
+# use bytes;
+use re 'taint';
+use version;
+
+our @ISA = qw(Mail::SpamAssassin::Plugin);
+
+use constant HAS_GEOIP => eval { require Geo::IP; };
+use constant HAS_GEOIP2 => eval { require GeoIP2::Database::Reader; };
+
+# constructor
+sub new {
+  my $class = shift;
+  my $mailsaobject = shift;
+
+  # some boilerplate...
+  $class = ref($class) || $class;
+  my $self = $class->SUPER::new($mailsaobject);
+  bless ($self, $class);
+
+  # how to handle failure to get the database handle?
+  # and we don't really have a valid return value...
+  # can we defer getting this handle until we actually see
+  # a uri_block_cc rule?
+
+  $self->register_eval_rule("check_uri_local_bl");
+
+  $self->set_config($mailsaobject->{conf});
+
+  return $self;
+}
+
+sub set_config {
+  my ($self, $conf) = @_;
+  my @cmds;
+
+  my $pluginobj = $self;        # allow use inside the closure below
+
+  push (@cmds, {
+    setting => 'uri_block_cc',
+    is_priv => 1,
+    code => sub {
+      my ($self, $key, $value, $line) = @_;
+
+      if ($value !~ /^(\S+)\s+(.+)$/) {
+	return $Mail::SpamAssassin::Conf::INVALID_VALUE;
+      }
+      my $name = $1;
+      my $def = $2;
+      my $added_criteria = 0;
+
+      $conf->{parser}->{conf}->{uri_local_bl}->{$name}->{countries} = {};
+
+      # this should match all country codes including satellite providers
+      while ($def =~ m/^\s*([a-z][a-z0-9])(\s+(.*)|)$/) {
+	my $cc = $1;
+	my $rest = $2;
+
+	#dbg("config: uri_block_cc adding %s to %s\n", $cc, $name);
+        $conf->{parser}->{conf}->{uri_local_bl}->{$name}->{countries}->{uc($cc)} = 1;
+	$added_criteria = 1;
+
+        $def = $rest;
+      }
+
+      if ($added_criteria == 0) {
+        warn "config: no arguments";
+	return $Mail::SpamAssassin::Conf::MISSING_REQUIRED_VALUE;
+      } elsif ($def ne '') {
+        warn "config: failed to add invalid rule $name";
+	return $Mail::SpamAssassin::Conf::INVALID_VALUE;
+      }
+
+      dbg("config: uri_block_cc added %s\n", $name);
+
+      $conf->{parser}->add_test($name, 'check_uri_local_bl()', $Mail::SpamAssassin::Conf::TYPE_BODY_EVALS);
+    }
+  });
+
+  push (@cmds, {
+    setting => 'uri_block_cont',
+    is_priv => 1,
+    code => sub {
+      my ($self, $key, $value, $line) = @_;
+
+      if ($value !~ /^(\S+)\s+(.+)$/) {
+	return $Mail::SpamAssassin::Conf::INVALID_VALUE;
+      }
+      my $name = $1;
+      my $def = $2;
+      my $added_criteria = 0;
+
+      $conf->{parser}->{conf}->{uri_local_bl}->{$name}->{continents} = {};
+
+      # this should match all continent codes
+      while ($def =~ m/^\s*([a-z]{2})(\s+(.*)|)$/) {
+	my $cont = $1;
+	my $rest = $2;
+
+	# dbg("config: uri_block_cont adding %s to %s\n", $cont, $name);
+        $conf->{parser}->{conf}->{uri_local_bl}->{$name}->{continents}->{uc($cont)} = 1;
+	$added_criteria = 1;
+
+        $def = $rest;
+      }
+
+      if ($added_criteria == 0) {
+        warn "config: no arguments";
+	return $Mail::SpamAssassin::Conf::MISSING_REQUIRED_VALUE;
+      } elsif ($def ne '') {
+        warn "config: failed to add invalid rule $name";
+	return $Mail::SpamAssassin::Conf::INVALID_VALUE;
+      }
+
+      dbg("config: uri_block_cont added %s\n", $name);
+
+      $conf->{parser}->add_test($name, 'check_uri_local_bl()', $Mail::SpamAssassin::Conf::TYPE_BODY_EVALS);
+    }
+  });
+  
+  push (@cmds, {
+    setting => 'uri_block_isp',
+    is_priv => 1,
+    code => sub {
+      my ($self, $key, $value, $line) = @_;
+
+      if ($value !~ /^(\S+)\s+(.+)$/) {
+	return $Mail::SpamAssassin::Conf::INVALID_VALUE;
+      }
+      my $name = $1;
+      my $def = $2;
+      my $added_criteria = 0;
+
+      $conf->{parser}->{conf}->{uri_local_bl}->{$name}->{isps} = {};
+
+      # gather up quoted strings
+      while ($def =~ m/^\s*"([^"]*)"(\s+(.*)|)$/) {
+	my $isp = $1;
+	my $rest = $2;
+
+	dbg("config: uri_block_isp adding \"%s\" to %s\n", $isp, $name);
+        $conf->{parser}->{conf}->{uri_local_bl}->{$name}->{isps}->{$isp} = 1;
+	$added_criteria = 1;
+
+        $def = $rest;
+      }
+
+      if ($added_criteria == 0) {
+        warn "config: no arguments";
+	return $Mail::SpamAssassin::Conf::MISSING_REQUIRED_VALUE;
+      } elsif ($def ne '') {
+        warn "config: failed to add invalid rule $name";
+	return $Mail::SpamAssassin::Conf::INVALID_VALUE;
+      }
+
+      $conf->{parser}->add_test($name, 'check_uri_local_bl()', $Mail::SpamAssassin::Conf::TYPE_BODY_EVALS);
+    }
+  });
+
+  push (@cmds, {
+    setting => 'uri_block_cidr',
+    is_priv => 1,
+    code => sub {
+      my ($self, $key, $value, $line) = @_;
+
+      if ($value !~ /^(\S+)\s+(.+)$/) {
+	return $Mail::SpamAssassin::Conf::INVALID_VALUE;
+      }
+      my $name = $1;
+      my $def = $2;
+      my $added_criteria = 0;
+
+      $conf->{parser}->{conf}->{uri_local_bl}->{$name}->{cidr} = new Net::CIDR::Lite;
+
+      # match individual IP's, subnets, and ranges
+      while ($def =~ m/^\s*(\d{1,3}\.\d{1,3}\.\d{1,3}\.\d{1,3}(\/\d{1,2}|-\d{1,3}\.\d{1,3}\.\d{1,3}\.\d{1,3})?)(\s+(.*)|)$/) {
+	my $addr = $1;
+	my $rest = $3;
+
+	dbg("config: uri_block_cidr adding %s to %s\n", $addr, $name);
+
+        eval { $conf->{parser}->{conf}->{uri_local_bl}->{$name}->{cidr}->add_any($addr) };
+        last if ($@);
+
+	$added_criteria = 1;
+
+        $def = $rest;
+      }
+
+      if ($added_criteria == 0) {
+        warn "config: no arguments";
+	return $Mail::SpamAssassin::Conf::MISSING_REQUIRED_VALUE;
+      } elsif ($def ne '') {
+        warn "config: failed to add invalid rule $name";
+	return $Mail::SpamAssassin::Conf::INVALID_VALUE;
+      }
+
+      # optimize the ranges
+      $conf->{parser}->{conf}->{uri_local_bl}->{$name}->{cidr}->clean();
+
+      $conf->{parser}->add_test($name, 'check_uri_local_bl()', $Mail::SpamAssassin::Conf::TYPE_BODY_EVALS);
+    }
+  });
+
+  push (@cmds, {
+    setting => 'uri_block_exclude',
+    is_priv => 1,
+    code => sub {
+      my ($self, $key, $value, $line) = @_;
+
+      if ($value !~ /^(\S+)\s+(.+)$/) {
+	return $Mail::SpamAssassin::Conf::INVALID_VALUE;
+      }
+      my $name = $1;
+      my $def = $2;
+      my $added_criteria = 0;
+
+      $conf->{parser}->{conf}->{uri_local_bl}->{$name}->{exclusions} = {};
+
+      # match individual IP's, or domain names
+      while ($def =~ m/^\s*((\d{1,3}\.\d{1,3}\.\d{1,3}\.\d{1,3})|(([a-z0-9][-a-z0-9]*[a-z0-9](\.[a-z0-9][-a-z0-9]*[a-z0-9]){1,})))(\s+(.*)|)$/) {
+	my $addr = $1;
+	my $rest = $6;
+
+	dbg("config: uri_block_exclude adding %s to %s\n", $addr, $name);
+
+        $conf->{parser}->{conf}->{uri_local_bl}->{$name}->{exclusions}->{$addr} = 1;
+
+	$added_criteria = 1;
+
+        $def = $rest;
+      }
+
+      if ($added_criteria == 0) {
+        warn "config: no arguments";
+	return $Mail::SpamAssassin::Conf::MISSING_REQUIRED_VALUE;
+      } elsif ($def ne '') {
+        warn "config: failed to add invalid rule $name";
+	return $Mail::SpamAssassin::Conf::INVALID_VALUE;
+      }
+
+      $conf->{parser}->add_test($name, 'check_uri_local_bl()', $Mail::SpamAssassin::Conf::TYPE_BODY_EVALS);
+    }
+  });
+
+=over 2  
+
+=item uri_country_db_path STRING
+
+This option tells SpamAssassin where to find the MaxMind country GeoIP2 
+database.
+
+=back
+
+=cut
+
+  push (@cmds, {
+    setting => 'uri_country_db_path',
+    is_priv => 1,
+    default => undef,
+    type => $Mail::SpamAssassin::Conf::CONF_TYPE_STRING,
+    code => sub {
+      my ($self, $key, $value, $line) = @_;
+      if (!defined $value || !length $value) {
+        return $Mail::SpamAssassin::Conf::MISSING_REQUIRED_VALUE;
+      }
+      if (!-f $value) {
+        info("config: uri_country_db_path \"$value\" is not accessible");
+        $self->{uri_country_db_path} = $value;
+        return $Mail::SpamAssassin::Conf::INVALID_VALUE;
+      }
+
+      $self->{uri_country_db_path} = $value;
+    }
+  });
+
+=over 2
+
+=item uri_country_db_isp_path STRING
+
+This option tells SpamAssassin where to find the MaxMind isp GeoIP2 database.
+
+=back
+
+=cut
+
+  push (@cmds, {
+    setting => 'uri_country_db_isp_path',
+    is_priv => 1,
+    default => undef,
+    type => $Mail::SpamAssassin::Conf::CONF_TYPE_STRING,
+    code => sub {
+      my ($self, $key, $value, $line) = @_;
+      if (!defined $value || !length $value) {
+        return $Mail::SpamAssassin::Conf::MISSING_REQUIRED_VALUE;
+      }
+      if (!-f $value) {
+        info("config: uri_country_db_isp_path \"$value\" is not accessible");
+        $self->{uri_country_db_isp_path} = $value;
+        return $Mail::SpamAssassin::Conf::INVALID_VALUE;
+      }
+
+      $self->{uri_country_db_isp_path} = $value;
+    }
+  });  
+ 
+  $conf->{parser}->register_commands(\@cmds);
+}  
+
+sub check_uri_local_bl {
+  my ($self, $permsg) = @_;
+
+  my $cc;
+  my $cont;
+  my $db_info;
+  my $isp;
+ 
+  my $conf_country_db_path = $self->{'main'}{'resolver'}{'conf'}->{uri_country_db_path};
+  my $conf_country_db_isp_path = $self->{'main'}{'resolver'}{'conf'}->{uri_country_db_isp_path};
+  # If country_db_path is set I am using GeoIP2 api
+  if ( HAS_GEOIP2 and ( ( defined $conf_country_db_path ) or ( defined $conf_country_db_isp_path ) ) ) {
+
+    $self->{geoip} = GeoIP2::Database::Reader->new(
+  		file	=> $conf_country_db_path,
+  		locales	=> [ 'en' ]
+    ) if (( defined $conf_country_db_path ) && ( -f $conf_country_db_path));
+    if ( defined ($conf_country_db_path) ) {
+      $db_info = sub { return "GeoIP2 " . ($self->{geoip}->metadata()->description()->{en} || '?') };
+      warn "$conf_country_db_path not found" unless $self->{geoip};
+    }
+
+    $self->{geoisp} = GeoIP2::Database::Reader->new(
+  		file	=> $conf_country_db_isp_path,
+  		locales	=> [ 'en' ]
+    ) if (( defined $conf_country_db_isp_path ) && ( -f $conf_country_db_isp_path));
+    if ( defined ($conf_country_db_isp_path) ) {
+      warn "$conf_country_db_isp_path not found" unless $self->{geoisp};
+    }
+    $self->{use_geoip2} = 1;
+  } elsif ( HAS_GEOIP ) {
+    BEGIN {
+      Geo::IP->import( qw(GEOIP_MEMORY_CACHE GEOIP_CHECK_CACHE GEOIP_ISP_EDITION) );
+    }
+    $self->{use_geoip2} = 0;
+    # need GeoIP C library 1.6.3 and GeoIP perl API 1.4.4 or later to avoid messages leaking - Bug 7153
+    my $gic_wanted = version->parse('v1.6.3');
+    my $gic_have = version->parse(Geo::IP->lib_version());
+    my $gip_wanted = version->parse('v1.4.4');
+    my $gip_have = version->parse($Geo::IP::VERSION);
+
+    # this code burps an ugly message if it fails, but that's redirected elsewhere
+    my $flags = 0;
+    eval '$flags = Geo::IP::GEOIP_SILENCE' if ($gip_wanted >= $gip_have);
+
+    if ($flags && $gic_wanted >= $gic_have) {
+      $self->{geoip} = Geo::IP->new(GEOIP_MEMORY_CACHE | GEOIP_CHECK_CACHE | $flags);
+      $self->{geoisp} = Geo::IP->open_type(GEOIP_ISP_EDITION, GEOIP_MEMORY_CACHE | GEOIP_CHECK_CACHE | $flags);
+    } else {
+      open(OLDERR, ">&STDERR");
+      open(STDERR, ">", "/dev/null");
+      $self->{geoip} = Geo::IP->new(GEOIP_MEMORY_CACHE | GEOIP_CHECK_CACHE);
+      $self->{geoisp} = Geo::IP->open_type(GEOIP_ISP_EDITION, GEOIP_MEMORY_CACHE | GEOIP_CHECK_CACHE);
+      open(STDERR, ">&OLDERR");
+      close(OLDERR);
+    }
+  $db_info = sub { return "Geo::IP " . ($self->{geoip}->database_info || '?') };
+  } else {
+    dbg("No GeoIP module available");
+    return 0;
+  }
+
+  my %uri_detail = %{ $permsg->get_uri_detail_list() };
+  my $test = $permsg->{current_rule_name}; 
+  my $rule = $permsg->{conf}->{uri_local_bl}->{$test};
+
+  my %hit_tests;
+  my $got_hit = 0;
+  
+  if ( defined $self->{geoip} ) {
+    dbg("check: uri_local_bl evaluating rule %s using database %s\n", $test, $db_info->());
+  } else {
+    dbg("check: uri_local_bl evaluating rule %s\n", $test);
+  }
+
+  while (my ($raw, $info) = each %uri_detail) {
+
+    next unless $info->{hosts};
+
+    # look for W3 links only
+    next unless (defined $info->{types}->{a});
+
+    while (my($host, $domain) = each %{$info->{hosts}}) {
+
+      # skip if the domain name was matched
+      if (exists $rule->{exclusions} && exists $rule->{exclusions}->{$domain}) {
+        dbg("check: uri_local_bl excludes %s as *.%s\n", $host, $domain);
+        next;
+      }
+
+      # this would be best cached from prior lookups
+      my @addrs = gethostbyname($host);
+
+      # convert to string values address list
+      @addrs = map { inet_ntoa($_); } @addrs[4..$#addrs];
+
+      dbg("check: uri_local_bl %s addrs %s\n", $host, join(', ', @addrs));
+
+      for my $ip (@addrs) {
+        # skip if the address was matched
+        if (exists $rule->{exclusions} && exists $rule->{exclusions}->{$ip}) {
+          dbg("check: uri_local_bl excludes %s(%s)\n", $host, $ip);
+          next;
+        }
+
+        if (exists $rule->{countries}) {
+          dbg("check: uri_local_bl countries %s\n", join(' ', sort keys %{$rule->{countries}}));
+
+          if ( $self->{use_geoip2} == 1 ) {
+            my $country = $self->{geoip}->country( ip => $ip );
+            my $country_rec = $country->country();
+            $cc = $country_rec->iso_code();
+          } else {
+            $cc = $self->{geoip}->country_code_by_addr($ip);
+          }
+
+          dbg("check: uri_local_bl host %s(%s) maps to %s\n", $host, $ip, (defined $cc ? $cc : "(undef)"));
+
+          # handle there being no associated country (yes, there are holes in
+          # the database).
+          next unless defined $cc;
+
+          # not in blacklist
+          next unless (exists $rule->{countries}->{$cc});
+
+          dbg("check: uri_block_cc host %s(%s) matched\n", $host, $ip);
+
+          if (would_log('dbg', 'rules') > 1) {
+            dbg("check: uri_block_cc criteria for $test met");
+          }
+      
+          $permsg->test_log("Host: $host in $cc");
+          $hit_tests{$test} = 1;
+
+          # reset hash
+          keys %uri_detail;
+        }
+
+        if (exists $rule->{continents}) {
+          dbg("check: uri_local_bl continents %s\n", join(' ', sort keys %{$rule->{continents}}));
+
+          if ( $self->{use_geoip2} == 1 ) {
+            my $country = $self->{geoip}->country( ip => $ip );
+            my $cont_rec = $country->continent();
+            $cont = $cont_rec->{code};
+          } else {
+            $cc = $self->{geoip}->country_code_by_addr($ip);
+            $cont = $self->{geoip}->continent_code_by_country_code($cc);
+          }
+          
+          dbg("check: uri_local_bl host %s(%s) maps to %s\n", $host, $ip, (defined $cont ? $cont : "(undef)"));
+
+          # handle there being no associated continent (yes, there are holes in
+          # the database).
+          next unless defined $cont;
+
+          # not in blacklist
+          next unless (exists $rule->{continents}->{$cont});
+
+          dbg("check: uri_block_cont host %s(%s) matched\n", $host, $ip);
+
+          if (would_log('dbg', 'rules') > 1) {
+            dbg("check: uri_block_cont criteria for $test met");
+          }
+
+          $permsg->test_log("Host: $host in $cont");
+          $hit_tests{$test} = 1;
+
+          # reset hash
+          keys %uri_detail;
+        }
+
+        if (exists $rule->{isps}) {
+          dbg("check: uri_local_bl isps %s\n", join(' ', map { '"' . $_ . '"'; } sort keys %{$rule->{isps}}));
+
+          if ( $self->{use_geoip2} == 1 ) {
+            $isp = $self->{geoisp}->isp(ip => $ip);
+          } else {
+            $isp = $self->{geoisp}->isp_by_name($ip);
+          }
+
+          dbg("check: uri_local_bl isp %s(%s) maps to %s\n", $host, $ip, (defined $isp ? '"' . $isp . '"' : "(undef)"));
+
+          # handle there being no associated country
+          next unless defined $isp;
+
+          # not in blacklist
+          next unless (exists $rule->{isps}->{$isp});
+
+          dbg("check: uri_block_isp host %s(%s) matched\n", $host, $ip);
+
+          if (would_log('dbg', 'rules') > 1) {
+            dbg("check: uri_block_isp criteria for $test met");
+          }
+      
+          $permsg->test_log("Host: $host in \"$isp\"");
+          $hit_tests{$test} = 1;
+
+          # reset hash
+          keys %uri_detail;
+        }
+
+        if (exists $rule->{cidr}) {
+          dbg("check: uri_block_cidr list %s\n", join(' ', $rule->{cidr}->list_range()));
+
+          next unless ($rule->{cidr}->find($ip));
+
+          dbg("check: uri_block_cidr host %s(%s) matched\n", $host, $ip);
+
+          if (would_log('dbg', 'rules') > 1) {
+            dbg("check: uri_block_cidr criteria for $test met");
+          }
+
+          $permsg->test_log("Host: $host as $ip");
+          $hit_tests{$test} = 1;
+
+          # reset hash
+          keys %uri_detail;
+        }
+      }
+    }
+    # cycle through all tests hitted by the uri
+    while((my $test_ok) = each %hit_tests) {
+      $permsg->got_hit($test_ok);
+      $got_hit = 1;
+    }
+    if($got_hit == 1) {
+      return 1;
+    } else {
+      keys %hit_tests;
+    }
+  }
+
+  dbg("check: uri_local_bl %s no match\n", $test);
+
+  return 0;
+}
+
+1;
+
diff -Nru spamassassin-3.4.0/lib/Mail/SpamAssassin/Plugin/VBounce.pm spamassassin-3.4.2/lib/Mail/SpamAssassin/Plugin/VBounce.pm
--- spamassassin-3.4.0/lib/Mail/SpamAssassin/Plugin/VBounce.pm	2014-02-07 03:36:27.000000000 -0500
+++ spamassassin-3.4.2/lib/Mail/SpamAssassin/Plugin/VBounce.pm	2018-09-13 21:27:51.000000000 -0400
@@ -162,6 +162,7 @@
 sub _relay_is_in_list {
   my ($self, $list, $pms, $relay) = @_;
   $relay = lc $relay;
+  utf8::encode($relay) if utf8::is_utf8($relay);  # encode chars to UTF-8
 
   if (defined $list->{$relay}) { return 1; }
 
diff -Nru spamassassin-3.4.0/lib/Mail/SpamAssassin/Plugin/WhiteListSubject.pm spamassassin-3.4.2/lib/Mail/SpamAssassin/Plugin/WhiteListSubject.pm
--- spamassassin-3.4.0/lib/Mail/SpamAssassin/Plugin/WhiteListSubject.pm	2014-02-07 03:36:27.000000000 -0500
+++ spamassassin-3.4.2/lib/Mail/SpamAssassin/Plugin/WhiteListSubject.pm	2018-09-13 21:27:51.000000000 -0400
@@ -46,11 +46,10 @@
 use Mail::SpamAssassin::Plugin;
 use strict;
 use warnings;
-use bytes;
+# use bytes;
 use re 'taint';
 
-use vars qw(@ISA);
-@ISA = qw(Mail::SpamAssassin::Plugin);
+our @ISA = qw(Mail::SpamAssassin::Plugin);
 
 # constructor: register the eval rule
 sub new {
diff -Nru spamassassin-3.4.0/lib/Mail/SpamAssassin/Plugin/WLBLEval.pm spamassassin-3.4.2/lib/Mail/SpamAssassin/Plugin/WLBLEval.pm
--- spamassassin-3.4.0/lib/Mail/SpamAssassin/Plugin/WLBLEval.pm	2014-02-07 03:36:27.000000000 -0500
+++ spamassassin-3.4.2/lib/Mail/SpamAssassin/Plugin/WLBLEval.pm	2018-09-13 21:27:51.000000000 -0400
@@ -17,16 +17,17 @@
 
 package Mail::SpamAssassin::Plugin::WLBLEval;
 
-use Mail::SpamAssassin::Plugin;
-use Mail::SpamAssassin::Logger;
-
 use strict;
 use warnings;
-use bytes;
+# use bytes;
 use re 'taint';
 
-use vars qw(@ISA);
-@ISA = qw(Mail::SpamAssassin::Plugin);
+use NetAddr::IP 4.000;
+
+use Mail::SpamAssassin::Plugin;
+use Mail::SpamAssassin::Logger;
+
+our @ISA = qw(Mail::SpamAssassin::Plugin);
 
 # constructor: register the eval rule
 sub new {
@@ -45,6 +46,7 @@
   $self->register_eval_rule("check_to_in_more_spam");
   $self->register_eval_rule("check_to_in_all_spam");
   $self->register_eval_rule("check_from_in_list");
+  $self->register_eval_rule("check_replyto_in_list");
   $self->register_eval_rule("check_to_in_list");
   $self->register_eval_rule("check_from_in_whitelist");
   $self->register_eval_rule("check_forged_in_whitelist");
@@ -122,6 +124,24 @@
   return 0;
 }
 
+sub check_replyto_in_list {
+  my ($self, $pms, $list) = @_;
+  my $list_ref = $self->{main}{conf}{$list};
+  unless (defined $list_ref) {
+    warn "eval: could not find list $list";
+    return;
+  }
+
+  my $replyto = $pms->get("Reply-To:addr");
+  return 0  if $replyto eq '';
+
+  if ($self->_check_whitelist ($list_ref, $replyto)) {
+    return 1;
+  }
+
+  return 0;
+}
+
 # TODO: this should be moved to a utility module off PerMsgStatus,
 # rather than a plugin API; it's used in Bayes.pm as a utility
 sub check_wb_list {
@@ -262,14 +282,14 @@
   return 0  if !@relays;
 
   my($adrh,$adrd) =
-    Mail::SpamAssassin::Util::RegistrarBoundaries::split_domain($addr_domain);
+    $self->{main}->{registryboundaries}->split_domain($addr_domain);
   my $match = 0;
   my $any_tried = 0;
   foreach my $rly (@relays) {
     my $relay_rdns = $rly->{lc_rdns};
     next  if !defined $relay_rdns || $relay_rdns eq '';
     my($rlyh,$rlyd) =
-      Mail::SpamAssassin::Util::RegistrarBoundaries::split_domain($relay_rdns);
+      $self->{main}->{registryboundaries}->split_domain($relay_rdns);
     $any_tried = 1;
     if ($adrd eq $rlyd) {
       dbg("rules: $addr MATCHES relay $relay_rdns ($adrd)");
@@ -310,23 +330,51 @@
   foreach my $white_addr (keys %{$list}) {
     my $regexp = qr/$list->{$white_addr}{re}/i;
     foreach my $domain (@{$list->{$white_addr}{domain}}) {
+      # $domain is a second param in whitelist_from_rcvd: a domain name or an IP address
       
       if ($addr =~ $regexp) {
+        # From or sender address matching the first param in whitelist_from_rcvd
         my $match;
         foreach my $lastunt (@relays) {
-          local $1;
-          if ($domain =~ m{^ \[ (.*) \] \z}sx) {  # matching by IP address
+          local($1,$2);
+          if ($domain =~ m{^ \[ (.*) \] ( / \d{1,3} )? \z}sx) {
+            # matching by IP address
             my($wl_ip, $rly_ip) = ($1, $lastunt->{ip});
+            $wl_ip .= $2  if defined $2;  # allow prefix len even after bracket
+
             if (!defined $rly_ip || $rly_ip eq '') {
               # relay's IP address not provided or unparseable
-            } elsif ($wl_ip =~ /^\d+\.\d+\.\d+\.\d+\z/) {
+
+            } elsif ($wl_ip  =~ /^\d+\.\d+\.\d+\.\d+\z/s) {
+              # an IPv4 whitelist entry can only be matched by an IPv4 relay
               if ($wl_ip eq $rly_ip) { $match = 1; last }  # exact match
-            } elsif ($wl_ip =~ /^[\d\.]+\z/) {  # assume IPv4 classful subnet
+
+            } elsif ($wl_ip =~ /^[\d\.]+\z/s) {  # an IPv4 classful subnet?
               $wl_ip =~ s/\.*\z/./;  # enforce trailing dot
-              if ($rly_ip =~ /^\Q$wl_ip\E/i) { $match = 1; last }  # subnet
+              if ($rly_ip =~ /^\Q$wl_ip\E/) { $match = 1; last }  # subnet
+
+            } else {  # either an wl entry is an IPv6 addr, or has a prefix len
+              my $rly_ip_obj = NetAddr::IP->new($rly_ip);  # TCP-info field
+              if (!defined $rly_ip_obj) {
+                dbg("rules: bad IP address in relay: %s, sender: %s",
+                    $rly_ip, $addr);
+              } else {
+                my $wl_ip_obj = NetAddr::IP->new($wl_ip); # whitelist 2nd param
+                if (!defined $wl_ip_obj) {
+                  info("rules: bad IP address in whitelist: %s", $wl_ip);
+                } elsif ($wl_ip_obj->contains($rly_ip_obj)) {
+                  # note: an IPv4-compatible IPv6 address can match an IPv4 addr
+                  dbg("rules: relay addr %s matches whitelist %s, sender: %s",
+                      $rly_ip, $wl_ip_obj, $addr);
+                  $match = 1; last;
+                } else {
+                  dbg("rules: relay addr %s does not match wl %s, sender %s",
+                      $rly_ip, $wl_ip_obj, $addr);
+                }
+              }
             }
-            # todo: handle IPv6 and CIDR notation
-          } else {  # match by a rdns name
+
+          } else {  # match by an rdns name
             my $rdns = $lastunt->{lc_rdns};
             if ($rdns =~ /(?:^|\.)\Q${domain}\E$/i) { $match=1; last }
           }
diff -Nru spamassassin-3.4.0/lib/Mail/SpamAssassin/PluginHandler.pm spamassassin-3.4.2/lib/Mail/SpamAssassin/PluginHandler.pm
--- spamassassin-3.4.0/lib/Mail/SpamAssassin/PluginHandler.pm	2014-02-07 03:36:28.000000000 -0500
+++ spamassassin-3.4.2/lib/Mail/SpamAssassin/PluginHandler.pm	2018-09-13 21:27:51.000000000 -0400
@@ -30,15 +30,11 @@
 
 use strict;
 use warnings;
-use bytes;
+# use bytes;
 use re 'taint';
 use File::Spec;
 
-use vars qw{
-  @ISA @CONFIG_TIME_HOOKS
-};
-
-@ISA = qw();
+our @ISA = qw();
 
 #Removed $VERSION per BUG 6422
 #$VERSION = 'bogus';     # avoid CPAN.pm picking up version strings later
@@ -56,7 +52,7 @@
 # Any other such hooks that may be compiled at config-parse-time should be
 # listed here.
 
-@CONFIG_TIME_HOOKS = qw( parse_config );
+our @CONFIG_TIME_HOOKS = qw( parse_config );
 
 ###########################################################################
 
diff -Nru spamassassin-3.4.0/lib/Mail/SpamAssassin/Plugin.pm spamassassin-3.4.2/lib/Mail/SpamAssassin/Plugin.pm
--- spamassassin-3.4.0/lib/Mail/SpamAssassin/Plugin.pm	2014-02-07 03:36:28.000000000 -0500
+++ spamassassin-3.4.2/lib/Mail/SpamAssassin/Plugin.pm	2018-09-13 21:27:51.000000000 -0400
@@ -99,14 +99,10 @@
 
 use strict;
 use warnings;
-use bytes;
+# use bytes;
 use re 'taint';
 
-use vars qw{
-  @ISA $VERSION
-};
-
-@ISA =                  qw();
+our @ISA = qw();
 #Removed $VERSION per BUG 6422
 #$VERSION =              'bogus';
 
diff -Nru spamassassin-3.4.0/lib/Mail/SpamAssassin/RegistryBoundaries.pm spamassassin-3.4.2/lib/Mail/SpamAssassin/RegistryBoundaries.pm
--- spamassassin-3.4.0/lib/Mail/SpamAssassin/RegistryBoundaries.pm	1969-12-31 19:00:00.000000000 -0500
+++ spamassassin-3.4.2/lib/Mail/SpamAssassin/RegistryBoundaries.pm	2018-09-13 21:27:51.000000000 -0400
@@ -0,0 +1,238 @@
+# The (extremely complex) rules for domain delegation.
+
+# <@LICENSE>
+# Licensed to the Apache Software Foundation (ASF) under one or more
+# contributor license agreements.  See the NOTICE file distributed with
+# this work for additional information regarding copyright ownership.
+# The ASF licenses this file to you under the Apache License, Version 2.0
+# (the "License"); you may not use this file except in compliance with
+# the License.  You may obtain a copy of the License at:
+#
+#     http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+# </@LICENSE>
+
+=head1 NAME
+
+Mail::SpamAssassin::RegistryBoundaries - domain delegation rules
+
+=cut
+
+package Mail::SpamAssassin::RegistryBoundaries;
+
+use strict;
+use warnings;
+# use bytes;
+use re 'taint';
+
+our @ISA = qw();
+
+# called from SpamAssassin->init() to create $self->{util_rb}
+sub new {
+  my $class = shift;
+  $class = ref($class) || $class;
+
+  my ($main) = @_;
+  my $self = {
+    'main'              => $main,
+    'conf'              => $main->{conf},
+  };
+  bless ($self, $class);
+
+  # Initialize valid_tlds_re for schemeless uri parsing, FreeMail etc
+  if ($self->{conf}->{valid_tlds}) {
+    my $tlds = join('|', keys %{$self->{conf}->{valid_tlds}});
+    # Perl 5.10+ trie optimizes lists, no need for fancy regex optimizing
+    $self->{valid_tlds_re} = qr/(?:$tlds)/i;
+  }
+  else {
+    # Failsafe in case no tlds defined, we don't want this to match everything..
+    $self->{valid_tlds_re} = qr/no_tlds_defined/;
+  }
+
+  $self;
+}
+
+# This is required because the .us domain is nuts. See split_domain.
+our %US_STATES = qw(
+  ak 1 al 1 ar 1 az 1 ca 1 co 1 ct 1 dc 1 de 1 fl 1 ga 1 gu 1 hi 1 ia 1 id 1 il 1 in 1 ks 1 ky 1 la 1 ma 1 md 1 me 1 mi 1
+  mn 1 mo 1 ms 1 mt 1 nc 1 nd 1 ne 1 nh 1 nj 1 nm 1 nv 1 ny 1 oh 1 ok 1 or 1 pa 1 pr 1 ri 1 sc 1 sd 1 tn 1 tx 1 ut 1 va 1
+  vi 1 vt 1 wa 1 wi 1 wv 1 wy 1
+  );
+
+###########################################################################
+
+=head1 METHODS
+
+=over 4
+
+=item ($hostname, $domain) = split_domain ($fqdn)
+
+Cut a fully-qualified hostname into the hostname part and the domain
+part, splitting at the DNS registry boundary.
+
+Examples:
+
+    "www.foo.com" => ( "www", "foo.com" )
+    "www.foo.co.uk" => ( "www", "foo.co.uk" )
+
+=cut
+
+sub split_domain {
+  my $self = shift;
+  my $domain = lc shift;
+
+  my $hostname = '';
+
+  if (defined $domain && $domain ne '') {
+    # www..spamassassin.org -> www.spamassassin.org
+    $domain =~ tr/././s;
+
+    # leading/trailing dots
+    $domain =~ s/^\.+//;
+    $domain =~ s/\.+$//;
+
+    # Split scalar domain into components
+    my @domparts = split(/\./, $domain);
+    my @hostname;
+
+    while (@domparts > 1) { # go until we find the TLD
+      if (@domparts == 4) {
+        if ($domparts[3] eq 'us' &&
+            (($domparts[0] eq 'pvt' && $domparts[1] eq 'k12') ||
+             ($domparts[0] =~ /^c[io]$/)))
+        {
+          # http://www.neustar.us/policies/docs/rfc_1480.txt
+          # "Fire-Dept.CI.Los-Angeles.CA.US"
+          # "<school-name>.PVT.K12.<state>.US"
+          last if ($US_STATES{$domparts[2]});
+        }
+      }
+      elsif (@domparts == 3) {
+        # http://www.neustar.us/policies/docs/rfc_1480.txt
+        # demon.co.uk
+        # esc.edu.ar
+        # [^\.]+\.${US_STATES}\.us
+        if ($domparts[2] eq 'us') {
+          last if ($US_STATES{$domparts[1]});
+        }
+        else {
+          my $temp = join(".", @domparts);
+          last if ($self->{conf}->{three_level_domains}{$temp});
+        }
+      }
+      elsif (@domparts == 2) {
+        # co.uk, etc.
+        my $temp = join(".", @domparts);
+        last if ($self->{conf}->{two_level_domains}{$temp});
+      }
+      push(@hostname, shift @domparts);
+    }
+
+    # Look for a sub-delegated TLD
+    # use @domparts to skip trying to match on TLDs that can't possibly
+    # match, but keep in mind that the hostname can be blank, so 4TLD needs 4,
+    # 3TLD needs 3, 2TLD needs 2 ...
+    #
+    unshift @domparts, pop @hostname if @hostname;
+    $domain = join(".", @domparts);
+    $hostname = join(".", @hostname);
+  }
+
+  ($hostname, $domain);
+}
+
+###########################################################################
+
+=item $domain = trim_domain($fqdn)
+
+Cut a fully-qualified hostname into the hostname part and the domain
+part, returning just the domain.
+
+Examples:
+
+    "www.foo.com" => "foo.com"
+    "www.foo.co.uk" => "foo.co.uk"
+
+=cut
+
+sub trim_domain {
+  my $self = shift;
+  my $domain = shift;
+
+  my ($host, $dom) = $self->split_domain($domain);
+  return $dom;
+}
+
+###########################################################################
+
+=item $ok = is_domain_valid($dom)
+
+Return C<1> if the domain is valid, C<undef> otherwise.  A valid domain
+(a) does not contain whitespace, (b) contains at least one dot, and (c)
+uses a valid TLD or ccTLD.
+
+=back
+
+=cut
+
+sub is_domain_valid {
+  my $self = shift;
+  my $dom = lc shift;
+
+  # domains don't have whitespace
+  return 0 if ($dom =~ /\s/);
+
+  # ensure it ends in a known-valid TLD, and has at least 1 dot
+  return 0 unless ($dom =~ /\.([^.]+)$/);
+  return 0 unless ($self->{conf}->{valid_tlds}{$1});
+
+  return 1;     # nah, it's ok.
+}
+
+#
+
+sub uri_to_domain {
+  my $self = shift;
+  my $uri = lc shift;
+
+  # Javascript is not going to help us, so return.
+  return if ($uri =~ /^javascript:/);
+
+  $uri =~ s{\#.*$}{}gs;			# drop fragment
+  $uri =~ s{^[a-z]+:/{0,2}}{}gs;	# drop the protocol
+  $uri =~ s{^[^/]*\@}{}gs;		# username/passwd
+
+  # strip path and CGI params.  note: bug 4213 shows that "&" should
+  # *not* be likewise stripped here -- it's permitted in hostnames by
+  # some common MUAs!
+  $uri =~ s{[/?].*$}{}gs;              
+
+  $uri =~ s{:\d*$}{}gs;		# port, bug 4191: sometimes the # is missing
+
+  # skip undecoded URIs if the encoded bits shouldn't be.
+  # we'll see the decoded version as well.  see url_encode()
+  return if $uri =~ /\%(?:2[1-9a-f]|[3-6][0-9a-f]|7[0-9a-e])/;
+
+  my $host = $uri;  # unstripped/full domain name
+
+  # keep IPs intact
+  if ($uri !~ /^\d+\.\d+\.\d+\.\d+$/) { 
+    # get rid of hostname part of domain, understanding delegation
+    $uri = $self->trim_domain($uri);
+
+    # ignore invalid domains
+    return unless ($self->is_domain_valid($uri));
+  }
+  
+  # $uri is now the domain only, optionally return unstripped host name
+  return !wantarray ? $uri : ($uri, $host);
+}
+
+1;
+
diff -Nru spamassassin-3.4.0/lib/Mail/SpamAssassin/Reporter.pm spamassassin-3.4.2/lib/Mail/SpamAssassin/Reporter.pm
--- spamassassin-3.4.0/lib/Mail/SpamAssassin/Reporter.pm	2014-02-07 03:36:28.000000000 -0500
+++ spamassassin-3.4.2/lib/Mail/SpamAssassin/Reporter.pm	2018-09-13 21:27:51.000000000 -0400
@@ -21,15 +21,11 @@
 
 use strict;
 use warnings;
-use bytes;
+# use bytes;
 use re 'taint';
 use Mail::SpamAssassin::Logger;
 
-use vars qw{
-  @ISA 
-};
-
-@ISA = qw();
+our @ISA = qw();
 
 #Removed $VERSION per BUG 6422
 #$VERSION = 'bogus';	# avoid CPAN.pm picking up razor ver
diff -Nru spamassassin-3.4.0/lib/Mail/SpamAssassin/SpamdForkScaling.pm spamassassin-3.4.2/lib/Mail/SpamAssassin/SpamdForkScaling.pm
--- spamassassin-3.4.0/lib/Mail/SpamAssassin/SpamdForkScaling.pm	2014-02-07 03:36:28.000000000 -0500
+++ spamassassin-3.4.2/lib/Mail/SpamAssassin/SpamdForkScaling.pm	2018-09-13 21:27:51.000000000 -0400
@@ -21,7 +21,7 @@
 
 use strict;
 use warnings;
-use bytes;
+# use bytes;
 use re 'taint';
 use Errno qw();
 
@@ -29,21 +29,17 @@
 use Mail::SpamAssassin::Logger;
 use Mail::SpamAssassin::Timeout;
 
-use vars qw {
-  @PFSTATE_VARS %EXPORT_TAGS @EXPORT_OK
-};
-
 use base qw( Exporter );
 
-@PFSTATE_VARS = qw(
+our @PFSTATE_VARS = qw(
   PFSTATE_ERROR PFSTATE_STARTING PFSTATE_IDLE PFSTATE_BUSY PFSTATE_KILLED
   PFORDER_ACCEPT PFSTATE_GOT_SIGCHLD
 );
 
-%EXPORT_TAGS = (
+our %EXPORT_TAGS = (
   'pfstates' => [ @PFSTATE_VARS ]
 );
-@EXPORT_OK = ( @PFSTATE_VARS );
+our @EXPORT_OK = ( @PFSTATE_VARS );
 
 use constant PFSTATE_ERROR       => -1;
 use constant PFSTATE_STARTING    => 0;
diff -Nru spamassassin-3.4.0/lib/Mail/SpamAssassin/SQLBasedAddrList.pm spamassassin-3.4.2/lib/Mail/SpamAssassin/SQLBasedAddrList.pm
--- spamassassin-3.4.0/lib/Mail/SpamAssassin/SQLBasedAddrList.pm	2014-02-07 03:36:28.000000000 -0500
+++ spamassassin-3.4.2/lib/Mail/SpamAssassin/SQLBasedAddrList.pm	2018-09-13 21:27:51.000000000 -0400
@@ -75,7 +75,7 @@
 
 use strict;
 use warnings;
-use bytes;
+# use bytes;
 use re 'taint';
 
 # Do this silliness to stop RPM from finding DBI as required
@@ -84,9 +84,7 @@
 use Mail::SpamAssassin::PersistentAddrList;
 use Mail::SpamAssassin::Logger;
 
-use vars qw(@ISA);
-
-@ISA = qw(Mail::SpamAssassin::PersistentAddrList);
+our @ISA = qw(Mail::SpamAssassin::PersistentAddrList);
 
 =head2 new
 
@@ -220,6 +218,7 @@
     }
     push(@args, @signedby);
   }
+  $sql .= " ORDER BY last_hit";
   my $sth = $self->{dbh}->prepare($sql);
   my $rc = $sth->execute($self->{_username}, @args);
 
@@ -236,8 +235,8 @@
     # an author domain and by a remailer)?  for now just take an average
     while ( defined($aryref = $sth->fetchrow_arrayref()) ) {
       if (defined $entry->{count} && defined $aryref->[1]) {
-        $entry->{count} += $aryref->[0];
-        $entry->{totscore} += $aryref->[1];
+        $entry->{count} = $aryref->[0];
+        $entry->{totscore} = $aryref->[1];
       }
       $entry->{exists_p} = 1;
       $cnt++;
@@ -328,9 +327,9 @@
     # insert failed, assume primary key constraint, so try the update
 
     my $sql = "UPDATE $self->{tablename} ".
-              "SET count = count + 1, totscore = totscore + ? ".
+              "SET count = ?, totscore = totscore + ? ".
               "WHERE username = ? AND email = ?";
-    my(@args) = ($score, $self->{_username}, $email);
+    my(@args) = ($entry->{count}, $score, $self->{_username}, $email);
     if ($self->{_with_awl_signer}) {
       my @signedby = !defined $signedby ? () : split(' ', lc $signedby);
       if (!@signedby) {
diff -Nru spamassassin-3.4.0/lib/Mail/SpamAssassin/SubProcBackChannel.pm spamassassin-3.4.2/lib/Mail/SpamAssassin/SubProcBackChannel.pm
--- spamassassin-3.4.0/lib/Mail/SpamAssassin/SubProcBackChannel.pm	2014-02-07 03:36:28.000000000 -0500
+++ spamassassin-3.4.2/lib/Mail/SpamAssassin/SubProcBackChannel.pm	2018-09-13 21:27:51.000000000 -0400
@@ -21,17 +21,14 @@
 
 use strict;
 use warnings;
-use bytes;
+# use bytes;
 use re 'taint';
 
 use IO::Socket;
 use Mail::SpamAssassin::Util;
 use Mail::SpamAssassin::Constants qw(:sa);
 
-use vars qw {
-};
-
-my @ISA = qw();
+our @ISA = qw();
 
 =head1 NAME
 
diff -Nru spamassassin-3.4.0/lib/Mail/SpamAssassin/Timeout.pm spamassassin-3.4.2/lib/Mail/SpamAssassin/Timeout.pm
--- spamassassin-3.4.0/lib/Mail/SpamAssassin/Timeout.pm	2014-02-07 03:36:28.000000000 -0500
+++ spamassassin-3.4.2/lib/Mail/SpamAssassin/Timeout.pm	2018-09-13 21:27:51.000000000 -0400
@@ -55,17 +55,13 @@
 
 use strict;
 use warnings;
-use bytes;
+# use bytes;
 use re 'taint';
 
 use Time::HiRes qw(time);
 use Mail::SpamAssassin::Logger;
 
-use vars qw{
-  @ISA
-};
-
-@ISA = qw();
+our @ISA = qw();
 
 ###########################################################################
 
@@ -90,9 +86,9 @@
 
 =cut
 
-use vars qw($id_gen);
-BEGIN { $id_gen = 0 }  # unique generator of IDs for timer objects
-use vars qw(@expiration);  # stack of expected expiration times, top at [0]
+our $id_gen;
+BEGIN { $id_gen = 0 } # unique generator of IDs for timer objects
+our @expiration;      # stack of expected expiration times, top at [0]
 
 sub new {
   my ($class, $opts) = @_;
diff -Nru spamassassin-3.4.0/lib/Mail/SpamAssassin/Util/DependencyInfo.pm spamassassin-3.4.2/lib/Mail/SpamAssassin/Util/DependencyInfo.pm
--- spamassassin-3.4.0/lib/Mail/SpamAssassin/Util/DependencyInfo.pm	2014-02-07 03:36:23.000000000 -0500
+++ spamassassin-3.4.2/lib/Mail/SpamAssassin/Util/DependencyInfo.pm	2018-09-13 21:27:51.000000000 -0400
@@ -31,23 +31,13 @@
 
 use strict;
 use warnings;
-use bytes;
+# use bytes;
 use re 'taint';
 
-use vars qw (
-  @MODULES @OPTIONAL_MODULES $EXIT_STATUS $WARNINGS @OPTIONAL_BINARIES @BINARIES
-);
-
-my $have_sha  = eval { require Digest::SHA  };
-my $have_sha1 = eval { require Digest::SHA1 };
+our ( $EXIT_STATUS, $WARNINGS );
 
-@MODULES = (
-$have_sha1 ? {
-  'module' => 'Digest::SHA1',
-  'version' => 0,
-  'desc' => 'The Digest::SHA1 module is used as a cryptographic hash for some
-  tests and the Bayes subsystem.  It is also required by the Razor2 plugin.',
-} : {
+our @MODULES = (
+{
   'module' => 'Digest::SHA',
   'version' => 0,
   'desc' => 'The Digest::SHA module is used as a cryptographic hash for some
@@ -102,15 +92,12 @@
 },
 );
 
-my @OPTIONAL_MODULES = (
-$have_sha ? {
+our @OPTIONAL_MODULES = (
+{
   'module' => 'Digest::SHA1',
   'version' => 0,
-  'desc' => 'The Digest::SHA1 module is required by the Razor2 plugin.',
-} : {
-  'module' => 'Digest::SHA',
-  'version' => 0,
-  'desc' => 'The Digest::SHA module is required by the DKIM plugin.',
+  'desc' => 'The Digest::SHA1 module is still required by the Razor2 plugin.
+  Other modules prefer Digest::SHA, which is a Perl base module.',
 },
 {
   module => 'MIME::Base64',
@@ -141,7 +128,13 @@
   module => 'Geo::IP',
   version => 0,
   desc => 'Used by the RelayCountry plugin (not enabled by default) to determine
-  the domain country codes of each relay in the path of an email.',
+  the domain country codes of each relay in the path of an email.  Also used by 
+  the URILocalBL plugin to provide ISP and Country code based filtering.',
+},
+{
+  module => 'Net::CIDR::Lite',
+  version => 0,
+  desc => 'Used by the URILocalBL plugin to process IP address ranges.',
 },
 {
   module => 'Razor2::Client::Agent',
@@ -184,7 +177,7 @@
 },
 {
   module => 'IO::Socket::SSL',
-  version => 0,
+  version => 1.76,
   desc => 'If you wish to use SSL encryption to communicate between spamc and
   spamd (the --ssl option to spamd), you need to install this
   module. (You will need the OpenSSL libraries and use the
@@ -235,11 +228,13 @@
   If-Modified-Since GET requests.',
 },
 {
-  module => 'Encode::Detect',
+  module => 'Encode::Detect::Detector',
   version => 0,
-  desc => 'If you plan to use the normalize_charset config setting to detect
-  charsets and convert them into Unicode, you will need to install
-  this module.',
+  desc => 'If you plan to use the normalize_charset config setting to
+  decode message parts from their declared character set into Unicode, and
+  such decoding fails, the Encode::Detect::Detector module (when available)
+  may be consulted to provide an alternative guess on a character set of a
+  problematic message part.',
 },
 {
   module => 'Net::Patricia',
@@ -254,18 +249,34 @@
   specifying more specific subnets (longest netmask) first, followed by
   wider subnets ensures predictable results.',
 },
+{
+  module => 'Net::DNS::Nameserver',
+  version => 0,
+  desc => 'Net::DNS:Nameserver is typically part of Net::DNS.  However, RHEL/
+  CentOS systems may install it using separate packages.  Because of this, we
+  check for both Net::DNS and Net::DNS::Nameserver.  However, 
+  Net::DNS::Nameserver is only used in make test as of June 2014.',
+},
+{
+  module => 'BSD::Resource',
+  version => 0,
+  desc => 'BSD::Resource provides BSD process resource limit and priority 
+  functions.  It is used by the optional ResourceLimits Plugin.',
+},
 );
 
-my @BINARIES = ();
+our @BINARIES = ();
 
 my $lwp_note = "   Sa-update will use curl, wget or fetch to download updates.  
    Because perl module LWP does not support IPv6, sa-update as of
    3.4.0 will use these standard programs to download rule updates
    leaving LWP as a fallback if none of the programs are found.
 
-   *IMPORTANT NOTE*: You only need one of these programs.";
+   *IMPORTANT NOTE*: You only need one of these programs 
+       It's only a concern if you are warned about all 3 
+       i.e. (curl, wget & fetch) missing";
 
-my @OPTIONAL_BINARIES = (
+our @OPTIONAL_BINARIES = (
 {
   binary => 'gpg',
   version => '0',
@@ -299,6 +310,13 @@
   version => '0',
   
   desc => $lwp_note,
+},
+{
+  binary => 're2c',
+  version => '0',
+
+  desc => 'The "re2c" program is used by sa-compile to compile rules 
+  for regular expressions to speed up scanning.',
 }
 );
 
diff -Nru spamassassin-3.4.0/lib/Mail/SpamAssassin/Util/Progress.pm spamassassin-3.4.2/lib/Mail/SpamAssassin/Util/Progress.pm
--- spamassassin-3.4.0/lib/Mail/SpamAssassin/Util/Progress.pm	2014-02-07 03:36:23.000000000 -0500
+++ spamassassin-3.4.2/lib/Mail/SpamAssassin/Util/Progress.pm	2018-09-13 21:27:51.000000000 -0400
@@ -44,7 +44,7 @@
 
 use strict;
 use warnings;
-use bytes;
+# use bytes;
 use re 'taint';
 
 use Time::HiRes qw(time);
diff -Nru spamassassin-3.4.0/lib/Mail/SpamAssassin/Util/RegistrarBoundaries.pm spamassassin-3.4.2/lib/Mail/SpamAssassin/Util/RegistrarBoundaries.pm
--- spamassassin-3.4.0/lib/Mail/SpamAssassin/Util/RegistrarBoundaries.pm	2014-02-07 03:36:23.000000000 -0500
+++ spamassassin-3.4.2/lib/Mail/SpamAssassin/Util/RegistrarBoundaries.pm	1969-12-31 19:00:00.000000000 -0500
@@ -1,435 +0,0 @@
-# The (extremely complex) rules for domain delegation.
-# Note that really, this should be called "RegistryBoundaries"; see bug 4605
-
-# <@LICENSE>
-# Licensed to the Apache Software Foundation (ASF) under one or more
-# contributor license agreements.  See the NOTICE file distributed with
-# this work for additional information regarding copyright ownership.
-# The ASF licenses this file to you under the Apache License, Version 2.0
-# (the "License"); you may not use this file except in compliance with
-# the License.  You may obtain a copy of the License at:
-#
-#     http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
-# </@LICENSE>
-
-=head1 NAME
-
-Mail::SpamAssassin::Util::RegistrarBoundaries - domain delegation rules
-
-=cut
-
-package Mail::SpamAssassin::Util::RegistrarBoundaries;
-
-use strict;
-use warnings;
-use bytes;
-use re 'taint';
-
-use vars qw (
-  @ISA %TWO_LEVEL_DOMAINS %THREE_LEVEL_DOMAINS %US_STATES %VALID_TLDS $VALID_TLDS_RE
-);
-
-# The list of currently-valid TLDs for the DNS system.
-#
-# When updating domain lists, also modify t/uri_text.t accordingly
-#
-# http://data.iana.org/TLD/tlds-alpha-by-domain.txt
-# Version 2008020601, Last Updated Thu Feb  7 09:07:00 2008 UTC
-# The following have been removed from the list because they are
-# inactive, as can be seen in the Wikipedia articles about them
-# as of 2008-02-08, e.g. http://en.wikipedia.org/wiki/.so_%28domain_name%29
-#     bv gb pm sj so um yt
-#
-# As per bug #6734
-# Re-enable .so .pm .yt in 2012-02-21
-#   http://www.afnic.fr/fr/produits-et-services/autres-domaines-de-premier-niveau/
-#   http://www.iana.org/domains/root/db/so.html
-#
-# Bug 5048: Re-enable .xxx 2012-04-01
-#
-# Remember to also change regexp below when updating!
-
-foreach (qw/
-  ac ad ae aero af ag ai al am an ao aq ar arpa as asia at au aw ax az
-  ba bb bd be bf bg bh bi biz bj bm bn bo br bs bt bw by bz ca cat cc
-  cd cf cg ch ci ck cl cm cn co com coop cr cu cv cx cy cz de dj dk dm
-  do dz ec edu ee eg er es et eu fi fj fk fm fo fr ga gd ge gf gg gh
-  gi gl gm gn gov gp gq gr gs gt gu gw gy hk hm hn hr ht hu id ie il im
-  in info int io iq ir is it je jm jo jobs jp ke kg kh ki km kn kp kr kw
-  ky kz la lb lc li lk lr ls lt lu lv ly ma mc md me mg mh mil mk ml mm
-  mn mo mobi mp mq mr ms mt mu museum mv mw mx my mz na name nc ne net
-  nf ng ni nl no np nr nu nz om org pa pe pf pg ph pk pl pm pn pr pro ps
-  pt pw py qa re ro rs ru rw sa sb sc sd se sg sh si sk sl sm sn so
-  sr st su sv sy sz tc td tel tf tg th tj tk tl tm tn to tp tr travel tt
-  tv tw tz ua ug uk us uy uz va vc ve vg vi vn vu wf ws xxx ye yt za
-  zm zw
-  /) {
-  $VALID_TLDS{$_} = 1;
-}
-
-# %VALID_TLDS as Regexp::List optimized regexp, for use in Plugins etc
-# Paste above list to:
-#  perl -MRegexp::List -e '$/=undef; $_=<>; $r = Regexp::List->new; push @l, $_ for (split); print $r->list2re(@l)'
-# Verified up to date 20120401
-$VALID_TLDS_RE = qr/
-  (?=[abcdefghijklmnopqrstuvwxyz])
-  (?:a(?:e(?:ro)?|r(?:pa)?|s(?:ia)?|[cdfgilmnoqtuwxz])|b(?:iz?|[abdefghjmnorstwyz])
-  |c(?:at?|o(?:m|op)?|[cdfghiklmnruvxyz])|d[ejkmoz]|e(?:[cegrst]|d?u)|f[ijkmor]
-  |g(?:[adefghilmnpqrstuwy]|ov)|h[kmnrtu]|i(?:n(?:fo|t)?|[delmoqrst])|j(?:o(?:bs)?|[emp])
-  |k[eghimnprwyz]|l[abcikrstuvy]|m(?:o(?:bi)?|u(?:seum)?|[acdeghkmnpqrstvwxyz]|i?l)
-  |n(?:a(?:me)?|et?|[cfgilopruz])|o(?:m|rg)|p(?:ro?|[aefghklmnstwy])|r[eosuw]
-  |s[abcdeghiklmnortuvyz]|t(?:r(?:avel)?|[cdfghjkmnoptvwz]|e?l)|u[agksyz]
-  |v[aceginu]|w[fs]|y[et]|z[amw]|qa|xxx
-  )/ix;
-
-# Two-Level TLDs
-#
-# to resort this, pump the whole list through:
-#  perl -e '$/=undef; $_=<>; foreach(split) { ($a,$b) = split(/\./, $_, 2); $t{$b}->{$_}=1; } foreach (sort keys %t) { print "  ",join(" ", sort keys %{$t{$_}}),"\n" }'
-#
-# http://www.neustar.us/policies/docs/rfc_1480.txt
-# data originally from http://spamcheck.freeapp.net/two-level-tlds
-# The freeapp.net site now says that information on the site is obsolete
-# See discussion and sources in comments of bug 5677
-# updated as per bug 5815
-# cleanup in progress per bug 6795 (axb)
-# Unsorted sources:
-# .ua : http://hostmaster.ua
-# .hu : http://www.domain.hu/domain/English/szabalyzat/sld.html
-#
-foreach(qw/
-
-  com.ac edu.ac gov.ac mil.ac net.ac org.ac
-  nom.ad
-  ac.ae co.ae com.ae gov.ae mil.ae name.ae net.ae org.ae pro.ae sch.ae
-  com.af edu.af gov.af net.af
-  co.ag com.ag net.ag nom.ag org.ag
-  com.ai edu.ai gov.ai net.ai off.ai org.ai
-  com.al edu.al gov.al net.al org.al
-  com.an edu.an net.an org.an
-  co.ao ed.ao gv.ao it.ao og.ao pb.ao
-  com.ar edu.ar gov.ar int.ar mil.ar net.ar org.ar
-  e164.arpa in-addr.arpa ip6.arpa iris.arpa uri.arpa urn.arpa
-  ac.at co.at gv.at or.at priv.at
-  act.au asn.au com.au conf.au csiro.au edu.au gov.au id.au info.au net.au nsw.au nt.au org.au otc.au oz.au qld.au sa.au tas.au telememo.au vic.au wa.au
-  com.aw
-  biz.az com.az edu.az gov.az info.az int.az mil.az name.az net.az org.az pp.az
-  co.ba com.ba edu.ba gov.ba mil.ba net.ba org.ba rs.ba unbi.ba unsa.ba
-  com.bb edu.bb gov.bb net.bb org.bb
-  ac.bd com.bd edu.bd gov.bd mil.bd net.bd org.bd
-  ac.be belgie.be dns.be fgov.be
-  gov.bf
-  biz.bh cc.bh com.bh edu.bh gov.bh info.bh net.bh org.bh
-  com.bm edu.bm gov.bm net.bm org.bm
-  com.bn edu.bn net.bn org.bn
-  com.bo edu.bo gob.bo gov.bo int.bo mil.bo net.bo org.bo tv.bo
-  adm.br adv.br agr.br am.br arq.br art.br ato.br bio.br bmd.br cim.br cng.br cnt.br com.br coop.br dpn.br eco.br ecn.br edu.br eng.br esp.br etc.br eti.br far.br fm.br fnd.br fot.br fst.br g12.br ggf.br gov.br imb.br ind.br inf.br jor.br lel.br mat.br med.br mil.br mus.br net.br nom.br not.br ntr.br odo.br org.br ppg.br pro.br psc.br psi.br qsl.br rec.br slg.br srv.br tmp.br trd.br tur.br tv.br vet.br zlg.br
-  com.bs net.bs org.bs
-  com.bt edu.bt gov.bt net.bt org.bt
-  co.bw org.bw
-  gov.by mil.by
-  com.bz net.bz org.bz
-  ab.ca bc.ca gc.ca mb.ca nb.ca nf.ca nl.ca ns.ca nt.ca nu.ca on.ca pe.ca qc.ca sk.ca yk.ca
-  co.ck edu.ck gov.ck net.ck org.ck
-  ac.cn ah.cn bj.cn com.cn cq.cn edu.cn fj.cn gd.cn gov.cn gs.cn gx.cn gz.cn ha.cn hb.cn he.cn hi.cn hk.cn hl.cn hn.cn jl.cn js.cn jx.cn ln.cn mo.cn net.cn nm.cn nx.cn org.cn qh.cn sc.cn sd.cn sh.cn sn.cn sx.cn tj.cn tw.cn xj.cn xz.cn yn.cn zj.cn
-  arts.co com.co edu.co firm.co gov.co info.co int.co mil.co net.co nom.co org.co rec.co web.co
-  lkd.co.im ltd.co.im plc.co.im
-  co.cm com.cm net.cm
-  au.com br.com cn.com de.com eu.com gb.com hu.com no.com qc.com ru.com sa.com se.com uk.com us.com uy.com za.com
-  ac.cr co.cr ed.cr fi.cr go.cr or.cr sa.cr
-  com.cu edu.cu gov.cu inf.cu net.cu org.cu
-  gov.cx
-  ac.cy biz.cy com.cy ekloges.cy gov.cy ltd.cy name.cy net.cy org.cy parliament.cy press.cy pro.cy tm.cy
-  co.dk
-  com.dm edu.dm gov.dm net.dm org.dm
-  art.do com.do edu.do gob.do gov.do mil.do net.do org.do sld.do web.do
-  art.dz asso.dz com.dz edu.dz gov.dz net.dz org.dz pol.dz
-  com.ec edu.ec fin.ec gov.ec info.ec k12.ec med.ec mil.ec net.ec org.ec pro.ec gob.ec
-  co.ee com.ee edu.ee fie.ee med.ee org.ee pri.ee
-  com.eg edu.eg eun.eg gov.eg mil.eg net.eg org.eg sci.eg
-  com.er edu.er gov.er ind.er mil.er net.er org.er
-  com.es edu.es gob.es nom.es org.es
-  biz.et com.et edu.et gov.et info.et name.et net.et org.et
-  aland.fi
-  ac.fj biz.fj com.fj gov.fj id.fj info.fj mil.fj name.fj net.fj org.fj pro.fj school.fj
-  ac.fk co.fk com.fk gov.fk net.fk nom.fk org.fk
-  tm.fr asso.fr nom.fr prd.fr presse.fr com.fr gouv.fr
-  com.ge edu.ge gov.ge mil.ge net.ge org.ge pvt.ge
-  ac.gg alderney.gg co.gg gov.gg guernsey.gg ind.gg ltd.gg net.gg org.gg sark.gg sch.gg
-  com.gh edu.gh gov.gh mil.gh org.gh
-  com.gi edu.gi gov.gi ltd.gi mod.gi org.gi
-  ac.gn com.gn gov.gn net.gn org.gn
-  asso.gp com.gp edu.gp net.gp org.gp
-  com.gr edu.gr gov.gr net.gr org.gr
-  com.gt edu.gt gob.gt ind.gt mil.gt net.gt org.gt
-  com.gu edu.gu gov.gu mil.gu net.gu org.gu
-  com.hk edu.hk gov.hk idv.hk net.hk org.hk
-  com.hn edu.hn gob.hn mil.hn net.hn org.hn
-  com.hr from.hr iz.hr name.hr
-  adult.ht art.ht asso.ht com.ht coop.ht edu.ht firm.ht gouv.ht info.ht med.ht net.ht org.ht perso.ht pol.ht pro.ht rel.ht shop.ht
-  2000.hu agrar.hu bolt.hu casino.hu city.hu co.hu erotica.hu erotika.hu film.hu forum.hu games.hu hotel.hu info.hu ingatlan.hu jogasz.hu konyvelo.hu lakas.hu media.hu news.hu org.hu priv.hu reklam.hu sex.hu shop.hu sport.hu suli.hu szex.hu tm.hu tozsde.hu utazas.hu video.hu
-  ac.id co.id go.id mil.id net.id or.id sch.id web.id
-  gov.ie
-  ac.il co.il gov.il idf.il k12.il muni.il net.il org.il
-  ac.im co.im gov.im net.im nic.im org.im
-  ac.in co.in edu.in ernet.in firm.in gen.in gov.in ind.in mil.in net.in nic.in org.in res.in
-  com.io gov.io mil.io net.io org.io
-  ac.ir co.ir gov.ir id.ir net.ir org.ir sch.ir
-  edu.it gov.it
-  ac.je co.je gov.je ind.je jersey.je ltd.je net.je org.je sch.je
-  com.jm edu.jm gov.jm net.jm org.jm
-  com.jo edu.jo gov.jo mil.jo net.jo org.jo
-  ac.jp ad.jp aichi.jp akita.jp aomori.jp chiba.jp co.jp ed.jp ehime.jp fukui.jp fukuoka.jp fukushima.jp gifu.jp go.jp gov.jp gr.jp gunma.jp hiroshima.jp hokkaido.jp hyogo.jp ibaraki.jp ishikawa.jp iwate.jp kagawa.jp kagoshima.jp kanagawa.jp kanazawa.jp kawasaki.jp kitakyushu.jp kobe.jp kochi.jp kumamoto.jp kyoto.jp lg.jp matsuyama.jp mie.jp miyagi.jp miyazaki.jp nagano.jp nagasaki.jp nagoya.jp nara.jp ne.jp net.jp niigata.jp oita.jp okayama.jp okinawa.jp or.jp org.jp osaka.jp saga.jp saitama.jp sapporo.jp sendai.jp shiga.jp shimane.jp shizuoka.jp takamatsu.jp tochigi.jp tokushima.jp tokyo.jp tottori.jp toyama.jp utsunomiya.jp wakayama.jp yamagata.jp yamaguchi.jp yamanashi.jp yokohama.jp
-  ac.ke co.ke go.ke ne.ke new.ke or.ke sc.ke
-  com.kg edu.kg gov.kg mil.kg net.kg org.kg
-  com.kh edu.kh gov.kh mil.kh net.kh org.kh per.kh
-  ac.kr busan.kr chungbuk.kr chungnam.kr co.kr daegu.kr daejeon.kr es.kr gangwon.kr go.kr gwangju.kr gyeongbuk.kr gyeonggi.kr gyeongnam.kr hs.kr incheon.kr jeju.kr jeonbuk.kr jeonnam.kr kg.kr kyonggi.kr mil.kr ms.kr ne.kr or.kr pe.kr re.kr sc.kr seoul.kr ulsan.kr
-  com.kw edu.kw gov.kw mil.kw net.kw org.kw
-  com.ky edu.ky gov.ky net.ky org.ky
-  com.kz edu.kz gov.kz mil.kz net.kz org.kz
-  com.la net.la org.la
-  com.lb edu.lb gov.lb mil.lb net.lb org.lb
-  com.lc edu.lc gov.lc net.lc org.lc
-  assn.lk com.lk edu.lk gov.lk grp.lk hotel.lk int.lk ltd.lk net.lk ngo.lk org.lk sch.lk soc.lk web.lk
-  com.lr edu.lr gov.lr net.lr org.lr
-  co.ls org.ls
-  gov.lt mil.lt
-  asn.lv com.lv conf.lv edu.lv gov.lv id.lv mil.lv net.lv org.lv
-  biz.ly com.ly edu.ly gov.ly id.ly med.ly net.ly org.ly plc.ly sch.ly
-  ac.ma co.ma gov.ma net.ma org.ma press.ma
-  asso.mc tm.mc
-  ac.me co.me edu.me gov.me its.me net.me org.me priv.me
-  com.mg edu.mg gov.mg mil.mg nom.mg org.mg prd.mg tm.mg
-  army.mil navy.mil
-  com.mk org.mk
-  com.mm edu.mm gov.mm net.mm org.mm
-  edu.mn gov.mn org.mn
-  com.mo edu.mo gov.mo net.mo org.mo
-  music.mobi weather.mobi
-  co.mp edu.mp gov.mp net.mp org.mp
-  com.mt edu.mt gov.mt net.mt org.mt tm.mt uu.mt
-  co.mu com.mu
-  aero.mv biz.mv com.mv coop.mv edu.mv gov.mv info.mv int.mv mil.mv museum.mv name.mv net.mv org.mv pro.mv
-  ac.mw co.mw com.mw coop.mw edu.mw gov.mw int.mw museum.mw net.mw org.mw
-  com.mx edu.mx gob.mx net.mx org.mx
-  com.my edu.my gov.my mil.my name.my net.my org.my
-  alt.na com.na cul.na edu.na net.na org.na telecom.na unam.na
-  com.nc net.nc org.nc
-  de.net gb.net uk.net
-  ac.ng com.ng edu.ng gov.ng net.ng org.ng sch.ng
-  ac.ni biz.ni com.ni edu.ni gob.ni in.ni info.ni int.ni mil.ni net.ni nom.ni org.ni web.ni
-  fhs.no folkebibl.no fylkesbibl.no herad.no idrett.no kommune.no mil.no museum.no priv.no stat.no tel.no vgs.no
-  com.np edu.np gov.np mil.np net.np org.np
-  biz.nr co.nr com.nr edu.nr fax.nr gov.nr info.nr mob.nr mobil.nr mobile.nr net.nr org.nr tel.nr tlf.nr
-  ac.nz co.nz cri.nz geek.nz gen.nz govt.nz iwi.nz maori.nz mil.nz net.nz org.nz school.nz
-  ac.om biz.om co.om com.om edu.om gov.om med.om mil.om mod.om museum.om net.om org.om pro.om sch.om
-  dk.org eu.org
-  abo.pa ac.pa com.pa edu.pa gob.pa ing.pa med.pa net.pa nom.pa org.pa sld.pa
-  com.pe edu.pe gob.pe mil.pe net.pe nom.pe org.pe
-  com.pf edu.pf org.pf
-  ac.pg com.pg net.pg
-  com.ph edu.ph gov.ph mil.ph net.ph ngo.ph org.ph
-  biz.pk com.pk edu.pk fam.pk gob.pk gok.pk gon.pk gop.pk gos.pk gov.pk net.pk org.pk web.pk
-  art.pl biz.pl com.pl edu.pl gov.pl info.pl mil.pl net.pl ngo.pl org.pl
-  biz.pr com.pr edu.pr gov.pr info.pr isla.pr name.pr net.pr org.pr pro.pr
-  cpa.pro law.pro med.pro
-  com.ps edu.ps gov.ps net.ps org.ps plo.ps sec.ps
-  com.pt edu.pt gov.pt int.pt net.pt nome.pt org.pt publ.pt
-  com.py edu.py gov.py net.py org.py
-  com.qa edu.qa gov.qa net.qa org.qa
-  asso.re com.re nom.re
-  arts.ro com.ro firm.ro info.ro nom.ro nt.ro org.ro rec.ro store.ro tm.ro www.ro
-  ac.rs co.rs edu.rs gov.rs in.rs org.rs
-  ac.ru com.ru edu.ru gov.ru int.ru mil.ru net.ru org.ru pp.ru
-  ac.rw co.rw com.rw edu.rw gouv.rw gov.rw int.rw mil.rw net.rw
-  com.sa edu.sa gov.sa med.sa net.sa org.sa pub.sa sch.sa
-  com.sb edu.sb gov.sb net.sb org.sb
-  com.sc edu.sc gov.sc net.sc org.sc
-  com.sd edu.sd gov.sd info.sd med.sd net.sd org.sd sch.sd tv.sd
-  ab.se ac.se bd.se brand.se c.se d.se e.se f.se fh.se fhsk.se fhv.se g.se h.se i.se k.se komforb.se kommunalforbund.se komvux.se lanarb.se lanbib.se m.se mil.se n.se naturbruksgymn.se o.se org.se parti.se pp.se press.se s.se sshn.se t.se tm.se u.se w.se x.se y.se z.se
-  com.sg edu.sg gov.sg idn.sg net.sg org.sg per.sg
-  com.sh edu.sh gov.sh mil.sh net.sh org.sh
-  edu.sk gov.sk mil.sk
-  co.st com.st consulado.st edu.st embaixada.st gov.st mil.st net.st org.st principe.st saotome.st store.st
-  com.sv edu.sv gob.sv org.sv red.sv
-  com.sy gov.sy net.sy org.sy
-  at.tf bg.tf ca.tf ch.tf cz.tf de.tf edu.tf eu.tf int.tf net.tf pl.tf ru.tf sg.tf us.tf
-  ac.th co.th go.th in.th mi.th net.th or.th
-  ac.tj biz.tj co.tj com.tj edu.tj go.tj gov.tj int.tj mil.tj name.tj net.tj org.tj web.tj
-  com.tn edunet.tn ens.tn fin.tn gov.tn ind.tn info.tn intl.tn nat.tn net.tn org.tn rnrt.tn rns.tn rnu.tn tourism.tn
-  gov.to
-  gov.tp
-  av.tr bbs.tr bel.tr biz.tr com.tr dr.tr edu.tr gen.tr gov.tr info.tr k12.tr mil.tr name.tr net.tr org.tr pol.tr tel.tr web.tr
-  aero.tt at.tt au.tt be.tt biz.tt ca.tt co.tt com.tt coop.tt de.tt dk.tt edu.tt es.tt eu.tt fr.tt gov.tt info.tt int.tt it.tt jobs.tt mobi.tt museum.tt name.tt net.tt nic.tt org.tt pro.tt se.tt travel.tt uk.tt us.tt
-  co.tv gov.tv
-  club.tw com.tw ebiz.tw edu.tw game.tw gov.tw idv.tw mil.tw net.tw org.tw
-  ac.tz co.tz go.tz ne.tz or.tz
-  cherkassy.ua chernigov.ua chernovtsy.ua ck.ua cn.ua co.ua com.ua crimea.ua cv.ua dn.ua dnepropetrovsk.ua donetsk.ua dp.ua edu.ua gov.ua if.ua in.ua ivano-frankivsk.ua kh.ua kharkov.ua kherson.ua khmelnitskiy.ua kiev.ua kirovograd.ua km.ua kr.ua ks.ua kv.ua lg.ua lugansk.ua lutsk.ua lviv.ua mk.ua net.ua nikolaev.ua od.ua odessa.ua org.ua pl.ua poltava.ua rovno.ua rv.ua sebastopol.ua sumy.ua te.ua ternopil.ua uzhgorod.ua vinnica.ua vn.ua zaporizhzhe.ua zhitomir.ua zp.ua zt.ua
-  ac.ug co.ug go.ug ne.ug or.ug sc.ug
-  ac.uk bl.uk british-library.uk co.uk edu.uk gov.uk icnet.uk jet.uk ltd.uk me.uk mod.uk national-library-scotland.uk net.uk nhs.uk nic.uk nls.uk org.uk parliament.uk plc.uk police.uk sch.uk
-  ak.us al.us ar.us az.us ca.us co.us ct.us dc.us de.us dni.us fed.us fl.us ga.us hi.us ia.us id.us il.us in.us isa.us kids.us ks.us ky.us la.us ma.us md.us me.us mi.us mn.us mo.us ms.us mt.us nc.us nd.us ne.us nh.us nj.us nm.us nsn.us nv.us ny.us oh.us ok.us or.us pa.us ri.us sc.us sd.us tn.us tx.us ut.us va.us vt.us wa.us wi.us wv.us wy.us
-  com.uy edu.uy gub.uy mil.uy net.uy org.uy
-  vatican.va
-  arts.ve bib.ve co.ve com.ve edu.ve firm.ve gov.ve info.ve int.ve mil.ve net.ve nom.ve org.ve rec.ve store.ve tec.ve web.ve
-  co.vi com.vi edu.vi gov.vi net.vi org.vi
-  ac.vn biz.vn com.vn edu.vn gov.vn health.vn info.vn int.vn name.vn net.vn org.vn pro.vn
-  ch.vu com.vu de.vu edu.vu fr.vu net.vu org.vu
-  com.ws edu.ws gov.ws net.ws org.ws
-  com.ye edu.ye gov.ye mil.ye net.ye org.ye
-  ac.za alt.za bourse.za city.za co.za edu.za gov.za law.za mil.za net.za ngo.za nom.za org.za school.za tm.za web.za
-  ac.zm co.zm  com.zm edu.zm gov.zm org.zm sch.zm
-  ac.zw co.zw gov.zw org.zw
-
- /) {
-  $TWO_LEVEL_DOMAINS{$_} = 1;
-}
-
-# This is required because the .us domain is nuts. See $THREE_LEVEL_DOMAINS
-# below.
-#
-foreach (qw/
-  ak al ar az ca co ct dc de fl ga gu hi ia id il in ks ky la ma md me mi
-  mn mo ms mt nc nd ne nh nj nm nv ny oh ok or pa pr ri sc sd tn tx ut va vi
-  vt wa wi wv wy
-  /) {
-  $US_STATES{$_} = 1;
-}
-
-foreach (qw/
-  demon.co.uk esc.edu.ar lkd.co.im plc.co.im
- /) {
-  $THREE_LEVEL_DOMAINS{$_} = 1;
-}
-
-###########################################################################
-
-=head1 METHODS
-
-=over 4
-
-=item ($hostname, $domain) = split_domain ($fqdn)
-
-Cut a fully-qualified hostname into the hostname part and the domain
-part, splitting at the DNS registry boundary.
-
-Examples:
-
-    "www.foo.com" => ( "www", "foo.com" )
-    "www.foo.co.uk" => ( "www", "foo.co.uk" )
-
-=cut
-
-sub split_domain {
-  my $domain = lc shift;
-  my $hostname = '';
-
-  if (defined $domain && $domain ne '') {
-    # www..spamassassin.org -> www.spamassassin.org
-    $domain =~ tr/././s;
-
-    # leading/trailing dots
-    $domain =~ s/^\.+//;
-    $domain =~ s/\.+$//;
-
-    # Split scalar domain into components
-    my @domparts = split(/\./, $domain);
-    my @hostname;
-
-    while (@domparts > 1) { # go until we find the TLD
-      if (@domparts == 4) {
-        if ($domparts[3] eq 'us' &&
-            (($domparts[0] eq 'pvt' && $domparts[1] eq 'k12') ||
-             ($domparts[0] =~ /^c[io]$/)))
-        {
-          # http://www.neustar.us/policies/docs/rfc_1480.txt
-          # "Fire-Dept.CI.Los-Angeles.CA.US"
-          # "<school-name>.PVT.K12.<state>.US"
-          last if ($US_STATES{$domparts[2]});
-        }
-      }
-      elsif (@domparts == 3) {
-        # http://www.neustar.us/policies/docs/rfc_1480.txt
-        # demon.co.uk
-        # esc.edu.ar
-        # [^\.]+\.${US_STATES}\.us
-        if ($domparts[2] eq 'us') {
-          last if ($US_STATES{$domparts[1]});
-        }
-        else {
-          my $temp = join(".", @domparts);
-          last if ($THREE_LEVEL_DOMAINS{$temp});
-        }
-      }
-      elsif (@domparts == 2) {
-        # co.uk, etc.
-        my $temp = join(".", @domparts);
-        last if ($TWO_LEVEL_DOMAINS{$temp});
-      }
-      push(@hostname, shift @domparts);
-    }
-
-    # Look for a sub-delegated TLD
-    # use @domparts to skip trying to match on TLDs that can't possibly
-    # match, but keep in mind that the hostname can be blank, so 4TLD needs 4,
-    # 3TLD needs 3, 2TLD needs 2 ...
-    #
-    unshift @domparts, pop @hostname if @hostname;
-    $domain = join(".", @domparts);
-    $hostname = join(".", @hostname);
-  }
-
-  ($hostname, $domain);
-}
-
-###########################################################################
-
-=item $domain = trim_domain($fqdn)
-
-Cut a fully-qualified hostname into the hostname part and the domain
-part, returning just the domain.
-
-Examples:
-
-    "www.foo.com" => "foo.com"
-    "www.foo.co.uk" => "foo.co.uk"
-
-=cut
-
-sub trim_domain {
-  my ($domain) = @_;
-  my ($host, $dom) = split_domain($domain);
-  return $dom;
-}
-
-###########################################################################
-
-=item $ok = is_domain_valid($dom)
-
-Return C<1> if the domain is valid, C<undef> otherwise.  A valid domain
-(a) does not contain whitespace, (b) contains at least one dot, and (c)
-uses a valid TLD or ccTLD.
-
-=back
-
-=cut
-
-sub is_domain_valid {
-  my ($dom) = @_;
-
-  # domains don't have whitespace
-  return 0 if ($dom =~ /\s/);
-
-  # ensure it ends in a known-valid TLD, and has at least 1 dot
-  return 0 unless ($dom =~ /\.([^.]+)$/);
-  return 0 unless ($VALID_TLDS{$1});
-
-  return 1;     # nah, it's ok.
-}
-
-1;
diff -Nru spamassassin-3.4.0/lib/Mail/SpamAssassin/Util/ScopedTimer.pm spamassassin-3.4.2/lib/Mail/SpamAssassin/Util/ScopedTimer.pm
--- spamassassin-3.4.0/lib/Mail/SpamAssassin/Util/ScopedTimer.pm	2014-02-07 03:36:23.000000000 -0500
+++ spamassassin-3.4.2/lib/Mail/SpamAssassin/Util/ScopedTimer.pm	2018-09-13 21:27:51.000000000 -0400
@@ -21,7 +21,7 @@
 
 use strict;
 use warnings;
-use bytes;
+# use bytes;
 use re 'taint';
 
 our @ISA = qw();
diff -Nru spamassassin-3.4.0/lib/Mail/SpamAssassin/Util/TinyRedis.pm spamassassin-3.4.2/lib/Mail/SpamAssassin/Util/TinyRedis.pm
--- spamassassin-3.4.0/lib/Mail/SpamAssassin/Util/TinyRedis.pm	2014-02-07 03:36:23.000000000 -0500
+++ spamassassin-3.4.2/lib/Mail/SpamAssassin/Util/TinyRedis.pm	2018-09-13 21:27:51.000000000 -0400
@@ -69,9 +69,12 @@
   if ($server =~ m{^/}) {
     $sock = IO::Socket::UNIX->new(
               Peer => $server, Type => SOCK_STREAM);
-  } else {
+  } elsif ($server =~ /^(?: \[ ([^\]]+) \] | ([^:]+) ) : ([^:]+) \z/xs) {
+    $server = defined $1 ? $1 : $2;  my $port = $3;
     $sock = $io_socket_module_name->new(
-              PeerAddr => $server, Proto => 'tcp');
+              PeerAddr => $server, PeerPort => $port, Proto => 'tcp');
+  } else {
+    die "Invalid 'server:port' specification: $server";
   }
   if ($sock) {
     $self->{sock} = $sock;
diff -Nru spamassassin-3.4.0/lib/Mail/SpamAssassin/Util.pm spamassassin-3.4.2/lib/Mail/SpamAssassin/Util.pm
--- spamassassin-3.4.0/lib/Mail/SpamAssassin/Util.pm	2014-02-07 03:36:28.000000000 -0500
+++ spamassassin-3.4.2/lib/Mail/SpamAssassin/Util.pm	2018-09-13 21:27:51.000000000 -0400
@@ -42,29 +42,24 @@
 
 use strict;
 use warnings;
-use bytes;
+# use bytes;
 use re 'taint';
 
-use Mail::SpamAssassin::Logger;
+require 5.008001;  # needs utf8::is_utf8()
 
-BEGIN {
-  use Exporter ();
+use Mail::SpamAssassin::Logger;
 
-  use vars qw (
-    @ISA @EXPORT @EXPORT_OK
-    $AM_TAINTED
-  );
+use Exporter ();
 
-  @ISA = qw(Exporter);
-  @EXPORT = ();
-  @EXPORT_OK = qw(&local_tz &base64_decode &untaint_var &untaint_file_path
+our @ISA = qw(Exporter);
+our @EXPORT = ();
+our @EXPORT_OK = qw(&local_tz &base64_decode &untaint_var &untaint_file_path
                   &exit_status_str &proc_status_ok &am_running_on_windows
                   &reverse_ip_address &decode_dns_question_entry
-                  &secure_tmpfile &secure_tmpdir);
-}
+                  &get_my_locales &parse_rfc822_date &get_user_groups
+                  &secure_tmpfile &secure_tmpdir &uri_list_canonicalize);
 
-use Mail::SpamAssassin;
-use Mail::SpamAssassin::Util::RegistrarBoundaries;
+our $AM_TAINTED;
 
 use Config;
 use IO::Handle;
@@ -83,12 +78,17 @@
 use constant HAS_MIME_BASE64 => eval { require MIME::Base64; };
 use constant RUNNING_ON_WINDOWS => ($^O =~ /^(?:mswin|dos|os2)/oi);
 
-# These are not implemented on windows (see bug 6798 and 6470)
+# These are only defined as stubs on Windows (see bugs 6798 and 6470).
 BEGIN {
   if (RUNNING_ON_WINDOWS) {
+    no warnings 'redefine';
+
+    # See the section on $? at
+    # http://perldoc.perl.org/perlvar.html#Error-Variables for some
+    # hints on the magic numbers that are used here.
     *WIFEXITED   = sub { not $_[0] & 127 };
     *WEXITSTATUS = sub { $_[0] >> 8 };
-    *WIFSIGNALED = sub { ($_[0] & 127) && ($_[0] & 127 != 127) };
+    *WIFSIGNALED = sub { ($_[0] & 127) && (($_[0] & 127) != 127) };
     *WTERMSIG    = sub { $_[0] & 127 };
   }
 }
@@ -222,7 +222,7 @@
 ###########################################################################
 
 # untaint a path to a file, e.g. "/home/jm/.spamassassin/foo",
-# "C:\Program Files\SpamAssassin\tmp\foo", "/home/õüt/etc".
+# "C:\Program Files\SpamAssassin\tmp\foo", "/home/��t/etc".
 #
 # TODO: this does *not* handle locales well.  We cannot use "use locale"
 # and \w, since that will not detaint the data.  So instead just allow the
@@ -236,13 +236,15 @@
   return '' if ($path eq '');
 
   local ($1);
-  # Barry Jaspan: allow ~ and spaces, good for Windows.  Also return ''
-  # if input is '', as it is a safe path.
-  my $chars = '-_A-Za-z\xA0-\xFF0-9\.\%\@\=\+\,\/\\\:';
-  my $re = qr/^\s*([$chars][${chars}~ ]*)$/o;
+  # Barry Jaspan: allow ~ and spaces, good for Windows.
+  # Also return '' if input is '', as it is a safe path.
+  # Bug 7264: allow also parenthesis, e.g. "C:\Program Files (x86)"
+  my $chars = '-_A-Za-z0-9.%=+,/:()\\@\\xA0-\\xFF\\\\';
+  my $re = qr{^\s*([$chars][${chars}~ ]*)\z}o;
 
   if ($path =~ $re) {
-    return untaint_var($1);
+    $path = $1;
+    return untaint_var($path);
   } else {
     warn "util: refusing to untaint suspicious path: \"$path\"\n";
     return $path;
@@ -281,41 +283,47 @@
 #  untaint_var(\%ENV);
 #
 sub untaint_var {
-# my $arg = $_[0];  # avoid copying unnecessarily
-  my $r = ref $_[0];
-  if (!$r) {
+  # my $arg = $_[0];  # avoid copying unnecessarily
+  if (!ref $_[0]) { # optimized by-far-the-most-common case
+    # Bug 7591 not using this faster untaint. https://bz.apache.org/SpamAssassin/show_bug.cgi?id=7591 
+      #return defined $_[0] ? scalar each %{ { $_[0] => undef } } : undef; ## no critic (ProhibitExplicitReturnUndef)  - See Bug 7120 - fast untaint (hash keys cannot be tainted)
     no re 'taint';  # override a  "use re 'taint'"  from outer scope
-    return if !defined $_[0];
+    return undef if !defined $_[0]; ## no critic (ProhibitExplicitReturnUndef)  - See Bug 7120
     local($1); # avoid Perl taint bug: tainted global $1 propagates taintedness
     $_[0] =~ /^(.*)\z/s;
     return $1;
-  }
-  elsif ($r eq 'ARRAY') {
-    my $arg = $_[0];
-    $_ = untaint_var($_)  for @{$arg};
-    return @{$arg} if wantarray;
-  }
-  elsif ($r eq 'HASH') {
-    my $arg = $_[0];
-    if ($arg == \%ENV) {  # purge undefs from %ENV, untaint the rest
-      while (my($k, $v) = each %{$arg}) {
-        # It is safe to delete the item most recently returned by each()
-        if (!defined $v) { delete ${$arg}{$k}; next }
-        ${$arg}{untaint_var($k)} = untaint_var($v);
-      }
-    } else {
-      while (my($k, $v) = each %{$arg}) {
-        ${$arg}{untaint_var($k)} = untaint_var($v);
+
+  } else {
+    my $r = ref $_[0];
+    if ($r eq 'ARRAY') {
+      my $arg = $_[0];
+      $_ = untaint_var($_)  for @{$arg};
+      return @{$arg} if wantarray;
+    }
+    elsif ($r eq 'HASH') {
+      my $arg = $_[0];
+      if ($arg == \%ENV) {  # purge undefs from %ENV, untaint the rest
+        while (my($k, $v) = each %{$arg}) {
+          # It is safe to delete the item most recently returned by each()
+          if (!defined $v) { delete ${$arg}{$k}; next }
+          ${$arg}{untaint_var($k)} = untaint_var($v);
+        }
+      } else {
+        # hash keys are never tainted,
+        # although old version of perl had some quirks there
+        while (my($k, $v) = each %{$arg}) {
+          ${$arg}{untaint_var($k)} = untaint_var($v);
+        }
       }
+      return %{$arg} if wantarray;
+    }
+    elsif ($r eq 'SCALAR' || $r eq 'REF') {
+      my $arg = $_[0];
+      ${$arg} = untaint_var(${$arg});
+    }
+    else {
+      warn "util: can't untaint a $r !\n";
     }
-    return %{$arg} if wantarray;
-  }
-  elsif ($r eq 'SCALAR' || $r eq 'REF') {
-    my $arg = $_[0];
-    ${$arg} = untaint_var(${$arg});
-  }
-  else {
-    warn "util: can't untaint a $r !\n";
   }
   return $_[0];
 }
@@ -334,7 +342,7 @@
 ###########################################################################
 
 # map process termination status number to an informative string, and
-# append optional mesage (dual-valued errno or a string or a number),
+# append optional message (dual-valued errno or a string or a number),
 # returning the resulting string
 #
 sub exit_status_str {
@@ -635,15 +643,18 @@
   my $pos = 0;
   my $pos_mod = 0;
   while ($#arr > $pos) {
-    my $len = length $arr[$pos];
-
+    my $tmpline = $arr[$pos] ;
+    $tmpline =~ s/\t/        /g;
+    my $len = length ($tmpline);
     # if we don't want to have lines > $length (overflow==0), we
     # need to verify what will happen with the next line.  if we don't
     # care if a single line goes longer, don't care about the next
     # line.
     # we also want this to be true for the first entry on the line
     if ($pos_mod != 0 && $overflow == 0) {
-      $len += length $arr[$pos+1];
+      my $tmpnext = $arr[$pos+1] ;
+      $tmpnext =~ s/\t/        /g;
+      $len += length ($tmpnext);
     }
 
     if ($len <= $length) {
@@ -686,6 +697,7 @@
       m|^(?:[A-Za-z0-9+/=]{2,}={0,2})$|s)
   {
     # only use MIME::Base64 when the XS and Perl are both correct and quiet
+    local $1;
     s/(=+)(?!=*$)/'A' x length($1)/ge;
 
     # If only a certain number of bytes are requested, truncate the encoded
@@ -701,7 +713,7 @@
   }
   tr{A-Za-z0-9+/=}{}cd;			# remove non-base64 characters
   s/=+$//;				# remove terminating padding
-  tr{A-Za-z0-9+/=}{ -_`};		# translate to uuencode
+  tr{A-Za-z0-9+/=}{ -_};		# translate to uuencode
   s/.$// if (length($_) % 4 == 1);	# unpack cannot cope with extra byte
 
   my $length;
@@ -722,11 +734,20 @@
 }
 
 sub qp_decode {
-  local $_ = shift;
+  my $str = $_[0];
 
-  s/\=\r?\n//gs;
-  s/\=([0-9a-fA-F]{2})/chr(hex($1))/ge;
-  return $_;
+  # RFC 2045: when decoding a Quoted-Printable body, any trailing
+  # white space on a line must be deleted
+  $str =~ s/[ \t]+(?=\r?\n)//gs;
+
+  $str =~ s/=\r?\n//gs;  # soft line breaks
+
+  # RFC 2045 explicitly prohibits lowercase characters a-f in QP encoding
+  # do we really want to allow them???
+  local $1;
+  $str =~ s/=([0-9a-fA-F]{2})/chr(hex($1))/ge;
+
+  return $str;
 }
 
 sub base64_encode {
@@ -792,10 +813,10 @@
   return unless defined($str);
 
   if ($str =~ /\b(
-			(?:1\d\d|2[0-4]\d|25[0-5]|\d\d|\d)\.
-			(?:1\d\d|2[0-4]\d|25[0-5]|\d\d|\d)\.
-			(?:1\d\d|2[0-4]\d|25[0-5]|\d\d|\d)\.
-			(?:1\d\d|2[0-4]\d|25[0-5]|\d\d|\d)
+			(?:1\d\d|2[0-4]\d|25[0-5]|[1-9]\d|\d)\.
+			(?:1\d\d|2[0-4]\d|25[0-5]|[1-9]\d|\d)\.
+			(?:1\d\d|2[0-4]\d|25[0-5]|[1-9]\d|\d)\.
+			(?:1\d\d|2[0-4]\d|25[0-5]|[1-9]\d|\d)
 		      )\b/ix)
   {
     if (defined $1) { return $1; }
@@ -975,6 +996,18 @@
   my($charset) = $ct =~ /\bcharset\s*=\s*["']?(.*?)["']?(?:;|$)/i;
   my($name) = $ct =~ /\b(?:file)?name\s*=\s*["']?(.*?)["']?(?:;|$)/i;
 
+  # RFC 2231 section 3: Parameter Value Continuations
+  # support continuations for name values
+  #
+  if (!$name && $ct =~ /\b(?:file)?name\*0\s*=/i) {
+
+    my @name;
+    $name[$1] = $2
+      while ($ct =~ /\b(?:file)?name\*(\d+)\s*=\s*["']?(.*?)["']?(?:;|$)/ig);
+
+    $name = join "", grep defined, @name;
+  }
+
   # Get the actual MIME type out ...
   # Note: the header content may not be whitespace unfolded, so make sure the
   # REs do /s when appropriate.
@@ -998,7 +1031,7 @@
   }
 
   # strip inappropriate chars (bug 5399: after the text/plain fixup)
-  $ct =~ tr/\000-\040\177-\377\042\050\051\054\056\072-\077\100\133-\135//d;
+  $ct =~ tr/\000-\040\177-\377\042\050\051\054\072-\077\100\133-\135//d;
 
   # Now that the header has been parsed, return the requested information.
   # In scalar context, just the MIME type, in array context the
@@ -1029,6 +1062,7 @@
     }
     # other stuff
     else {
+      # no re "strict";  # since perl 5.21.8
       # 0x00-0x20, 0x7f-0xff, ", %, <, >
       s/([\000-\040\177-\377\042\045\074\076])
 	  /push(@encoded, $1) && sprintf "%%%02x", unpack("C",$1)/egx;
@@ -1128,6 +1162,7 @@
     return;
   }
 
+  dbg("util: secure_tmpfile created a temporary file %s", $reportfile);
   return ($reportfile, $tmpfh);
 }
 
@@ -1188,44 +1223,13 @@
 
 ###########################################################################
 
-sub uri_to_domain {
-  my ($uri) = @_;
-
-  # Javascript is not going to help us, so return.
-  return if ($uri =~ /^javascript:/i);
-
-  $uri =~ s{\#.*$}{}gs;			# drop fragment
-  $uri =~ s{^[a-z]+:/{0,2}}{}gsi;	# drop the protocol
-  $uri =~ s{^[^/]*\@}{}gs;		# username/passwd
-
-  # strip path and CGI params.  note: bug 4213 shows that "&" should
-  # *not* be likewise stripped here -- it's permitted in hostnames by
-  # some common MUAs!
-  $uri =~ s{[/?].*$}{}gs;              
-
-  $uri =~ s{:\d*$}{}gs;		# port, bug 4191: sometimes the # is missing
+##
+## DEPRECATED FUNCTION, sub uri_to_domain removed.
+## Replaced with Mail::SpamAssassin::RegistryBoundaries::uri_to_domain.
+##
 
-  # skip undecoded URIs if the encoded bits shouldn't be.
-  # we'll see the decoded version as well.  see url_encode()
-  return if $uri =~ /\%(?:2[1-9a-fA-F]|[3-6][0-9a-fA-F]|7[0-9a-eA-E])/;
-
-  my $host = $uri;  # unstripped/full domain name
-
-  # keep IPs intact
-  if ($uri !~ /^\d+\.\d+\.\d+\.\d+$/) { 
-    # get rid of hostname part of domain, understanding delegation
-    $uri = Mail::SpamAssassin::Util::RegistrarBoundaries::trim_domain($uri);
-
-    # ignore invalid domains
-    return unless
-        (Mail::SpamAssassin::Util::RegistrarBoundaries::is_domain_valid($uri));
-  }
-  
-  # $uri is now the domain only, optionally return unstripped host name
-  return !wantarray ? lc $uri : (lc $uri, lc $host);
-}
-
-sub uri_list_canonify {
+*uri_list_canonify = \&uri_list_canonicalize;  # compatibility alias
+sub uri_list_canonicalize {
   my($redirector_patterns, @uris) = @_;
 
   # make sure we catch bad encoding tricks
@@ -1251,15 +1255,15 @@
     # bug 4390: certain MUAs treat back slashes as front slashes.
     # since backslashes are supposed to be encoded in a URI, swap non-encoded
     # ones with front slashes.
-    $nuri =~ tr@\\@/@;
+    $nuri =~ tr{\\}{/};
 
     # http:www.foo.biz -> http://www.foo.biz
-    $nuri =~ s#^(https?:)/{0,2}#$1//#i;
+    $nuri =~ s{^(https?:)/{0,2}}{$1//}i;
 
     # *always* make a dup with all %-encoding decoded, since
     # important parts of the URL may be encoded (such as the
     # scheme). (bug 4213)
-    if ($nuri =~ /\%[0-9a-fA-F]{2}/) {
+    if ($nuri =~ /%[0-9a-fA-F]{2}/) {
       $nuri = Mail::SpamAssassin::Util::url_encode($nuri);
     }
 
@@ -1267,15 +1271,15 @@
     # unschemed URIs: assume default of "http://" as most MUAs do
     if ($nuri !~ /^[-_a-z0-9]+:/i) {
       if ($nuri =~ /^ftp\./) {
-	$nuri =~ s@^@ftp://@g;
+	$nuri =~ s{^}{ftp://}g;
       }
       else {
-	$nuri =~ s@^@http://@g;
+	$nuri =~ s{^}{http://}g;
       }
     }
 
     # http://www.foo.biz?id=3 -> http://www.foo.biz/?id=3
-    $nuri =~ s@^(https?://[^/?]+)\?@$1/?@i;
+    $nuri =~ s{^(https?://[^/?]+)\?}{$1/?}i;
 
     # deal with encoding of chars, this is just the set of printable
     # chars minus ' ' (that is, dec 33-126, hex 21-7e)
@@ -1294,6 +1298,22 @@
       # not required
       $rest ||= '';
 
+      # Bug 6751:
+      # RFC 3490 (IDNA): Whenever dots are used as label separators, the
+      #   following characters MUST be recognized as dots: U+002E (full stop),
+      #   U+3002 (ideographic full stop), U+FF0E (fullwidth full stop),
+      #   U+FF61 (halfwidth ideographic full stop).
+      # RFC 5895: [...] the IDEOGRAPHIC FULL STOP character (U+3002)
+      #   can be mapped to the FULL STOP before label separation occurs.
+      #   [...] Only the IDEOGRAPHIC FULL STOP character (U+3002) is added in
+      #   this mapping because the authors have not fully investigated [...]
+      # Adding also 'SMALL FULL STOP' (U+FE52) as seen in the wild.
+      # Parhaps also the 'ONE DOT LEADER' (U+2024).
+      if ($host =~ s{(?: \xE3\x80\x82 | \xEF\xBC\x8E | \xEF\xBD\xA1 |
+                         \xEF\xB9\x92 | \xE2\x80\xA4 )}{.}xgs) {
+        push(@nuris, join ('', $proto, $host, $rest));
+      }
+
       # bug 4146: deal with non-US ASCII 7-bit chars in the host portion
       # of the URI according to RFC 1738 that's invalid, and the tested
       # browsers (Firefox, IE) remove them before usage...
@@ -1304,23 +1324,27 @@
       # deal with http redirectors.  strip off one level of redirector
       # and add back to the array.  the foreach loop will go over those
       # and deal appropriately.
-      # bug 3308: redirectors like yahoo only need one '/' ... <grrr>
-      if ($rest =~ m{(https?:/{0,2}.+)$}i) {
-        push(@uris, $1);
-      }
 
-      # resort to redirector pattern matching if the generic https? check
-      # doesn't result in a match -- bug 4176
-      else {
-	foreach (@{$redirector_patterns}) {
-	  if ("$proto$host$rest" =~ $_) {
-	    next unless defined $1;
-	    dbg("uri: parsed uri pattern: $_");
-	    dbg("uri: parsed uri found: $1 in redirector: $proto$host$rest");
-	    push (@uris, $1);
-	    last;
-	  }
-	}
+      # Bug 7278: try redirector pattern matching first
+      # (but see also Bug 4176)
+      my $found_redirector_match;
+      foreach my $re (@{$redirector_patterns}) {
+        if ("$proto$host$rest" =~ $re) {
+          next unless defined $1;
+          dbg("uri: parsed uri pattern: $re");
+          dbg("uri: parsed uri found: $1 in redirector: $proto$host$rest");
+          push (@uris, $1);
+          $found_redirector_match = 1;
+          last;
+        }
+      }
+      if (!$found_redirector_match) {
+        # try generic https? check if redirector pattern matching failed
+        # bug 3308: redirectors like yahoo only need one '/' ... <grrr>
+        if ($rest =~ m{(https?:/{0,2}.+)$}i) {
+          push(@uris, $1);
+          dbg("uri: parsed uri found: $1 in hard-coded redirector");
+        }
       }
 
       ########################
@@ -1457,13 +1481,43 @@
 }
 
 ###########################################################################
+sub get_user_groups {
+  my $suid = shift;
+  dbg("get_user_groups: uid is $suid\n");
+  my ( $user, $passwd, $uid, $gid, $quota, $comment, $gcos, $dir, $shell, $expire ) = getpwuid($suid);
+  my $rgids="$gid ";
+  while ( my($name,$pw,$gid,$members) = getgrent() ) {
+    if ( $members =~ m/\b$user\b/ ) {
+      $rgids .= "$gid ";
+      dbg("get_user_groups: added $gid ($name) to group list which is now: $rgids\n");
+    }
+  }
+  endgrent;
+  chop $rgids;
+  return ($rgids);
+}
+
+
 
 sub setuid_to_euid {
   return if (RUNNING_ON_WINDOWS);
 
   # remember the target uid, the first number is the important one
   my $touid = $>;
-
+  my $gids = get_user_groups($touid);
+  my ( $pgid, $supgs ) = split (' ',$gids,2);
+  defined $supgs or $supgs=$pgid;
+  if ($( != $pgid) {
+    # Gotta be root for any of this to work
+    $> = 0 ;
+    dbg("util: changing real primary gid from $( to $pgid and supplemental groups to $supgs to match effective uid $touid");
+    POSIX::setgid($pgid);
+    dbg("util: POSIX::setgid($pgid) set errno to $!");  
+    $! = 0;
+    $( = $pgid;
+    $) = "$pgid $supgs";
+    dbg("util: assignment  \$) = $pgid $supgs set errno to $!");  
+  }
   if ($< != $touid) {
     dbg("util: changing real uid from $< to match effective uid $touid");
     # bug 3586: kludges needed to work around platform dependent behavior assigning to $<
@@ -1538,7 +1592,7 @@
   eval {
     # go setuid...
     setuid_to_euid();
-    dbg("util: setuid: ruid=$< euid=$>");
+    info("util: setuid: ruid=$< euid=$> rgid=$( egid=$) ");
 
     # now set up the fds.  due to some wierdness, we may have to ensure that
     # we *really* close the correct fd number, since some other code may have
diff -Nru spamassassin-3.4.0/lib/Mail/SpamAssassin.pm spamassassin-3.4.2/lib/Mail/SpamAssassin.pm
--- spamassassin-3.4.0/lib/Mail/SpamAssassin.pm	2014-02-07 03:36:28.000000000 -0500
+++ spamassassin-3.4.2/lib/Mail/SpamAssassin.pm	2018-09-13 21:27:51.000000000 -0400
@@ -61,7 +61,7 @@
 package Mail::SpamAssassin;
 use strict;
 use warnings;
-use bytes;
+# use bytes;
 use re 'taint';
 
 require 5.006_001;
@@ -75,6 +75,7 @@
 use Mail::SpamAssassin::Message;
 use Mail::SpamAssassin::PluginHandler;
 use Mail::SpamAssassin::DnsResolver;
+use Mail::SpamAssassin::RegistryBoundaries;
 use Mail::SpamAssassin::Util qw(untaint_var am_running_on_windows);
 use Mail::SpamAssassin::Util::ScopedTimer;
 
@@ -86,37 +87,32 @@
 use Cwd;
 use Config;
 
-use vars qw{
-  @ISA $VERSION $SUB_VERSION @EXTRA_VERSION $IS_DEVEL_BUILD $HOME_URL
-  @default_rules_path @default_prefs_path
-  @default_userprefs_path @default_userstate_dir
-  @site_rules_path
-};
+our $VERSION = "3.004002";      # update after release (same format as perl $])
+#our $IS_DEVEL_BUILD = 1;        # 1 for devel build 
+our $IS_DEVEL_BUILD = 0;        # 0 for release versions including rc & pre releases
 
-$VERSION = "3.004000";      # update after release (same format as perl $])
-#$IS_DEVEL_BUILD = 1;        # change for release versions
 
 # Used during the prerelease/release-candidate part of the official release
 # process. If you hacked up your SA, you should add a version_tag to your .cf
 # files; this variable should not be modified.
-#@EXTRA_VERSION = qw(rc6);
+our @EXTRA_VERSION = qw();
 
-@ISA = qw();
+our @ISA = qw();
 
 # SUB_VERSION is now just <yyyy>-<mm>-<dd>
-$SUB_VERSION = 'svnunknown';
-if ('$LastChangedDate: 2014-02-07 02:54:52 -0500 (Fri, 07 Feb 2014) $' =~ ':') {
-  # Subversion keyword "$LastChangedDate: 2014-02-07 02:54:52 -0500 (Fri, 07 Feb 2014) $" has been successfully expanded.
+our $SUB_VERSION = 'svnunknown';
+if ('$LastChangedDate: 2018-09-13 21:25:10 -0400 (Thu, 13 Sep 2018) $' =~ ':') {
+  # Subversion keyword "$LastChangedDate: 2018-09-13 21:25:10 -0400 (Thu, 13 Sep 2018) $" has been successfully expanded.
   # Doesn't happen with automated launchpad builds:
   # https://bugs.launchpad.net/launchpad/+bug/780916
-  $SUB_VERSION = (split(/\s+/,'$LastChangedDate: 2014-02-07 02:54:52 -0500 (Fri, 07 Feb 2014) $ updated by SVN'))[1];
+  $SUB_VERSION = (split(/\s+/,'$LastChangedDate: 2018-09-13 21:25:10 -0400 (Thu, 13 Sep 2018) $ updated by SVN'))[1];
 }
 
 
 if (defined $IS_DEVEL_BUILD && $IS_DEVEL_BUILD) {
-  if ('$LastChangedRevision: 1565566 $' =~ ':') {
-    # Subversion keyword "$LastChangedRevision: 1565566 $" has been successfully expanded.
-    push(@EXTRA_VERSION, ('r' . qw{$LastChangedRevision: 1565566 $ updated by SVN}[1]));
+  if ('$LastChangedRevision: 1840870 $' =~ ':') {
+    # Subversion keyword "$LastChangedRevision: 1840870 $" has been successfully expanded.
+    push(@EXTRA_VERSION, ('r' . qw{$LastChangedRevision: 1840870 $ updated by SVN}[1]));
   } else {
     push(@EXTRA_VERSION, ('r' . 'svnunknown'));
   }
@@ -127,13 +123,14 @@
   return join('-', sprintf("%d.%d.%d", $1, $2, $3), @EXTRA_VERSION);
 }
 
-$HOME_URL = "http://spamassassin.apache.org/";
+our $HOME_URL = "http://spamassassin.apache.org/";
 
 # note that the CWD takes priority.  This is required in case a user
 # is testing a new version of SpamAssassin on a machine with an older
 # version installed.  Unless you can come up with a fix for this that
 # allows "make test" to work, don't change this.
-@default_rules_path = (
+
+our @default_rules_path = (
   './rules',              # REMOVEFORINST
   '../rules',             # REMOVEFORINST
   '__local_state_dir__/__version__',
@@ -144,7 +141,7 @@
 );
 
 # first 3 are BSDish, latter 2 Linuxish
-@site_rules_path = (
+our @site_rules_path = (
   '__local_rules_dir__',
   '__prefix__/etc/mail/spamassassin',
   '__prefix__/etc/spamassassin',
@@ -155,21 +152,23 @@
   '/etc/spamassassin',
 );
 
-@default_prefs_path = (
+our @default_prefs_path = (
   '__local_rules_dir__/user_prefs.template',
   '__prefix__/etc/mail/spamassassin/user_prefs.template',
   '__prefix__/share/spamassassin/user_prefs.template',
+  '__local_state_dir__/__version__/updates_spamassassin_org/user_prefs.template',
+  '__def_rules_dir__/user_prefs.template',
   '/etc/spamassassin/user_prefs.template',
   '/etc/mail/spamassassin/user_prefs.template',
   '/usr/local/share/spamassassin/user_prefs.template',
   '/usr/share/spamassassin/user_prefs.template',
 );
 
-@default_userprefs_path = (
+our @default_userprefs_path = (
   '~/.spamassassin/user_prefs',
 );
 
-@default_userstate_dir = (
+our @default_userstate_dir = (
   '~/.spamassassin',
 );
 
@@ -430,6 +429,7 @@
   }
 
   $self->{conf} ||= new Mail::SpamAssassin::Conf ($self);
+  $self->{registryboundaries} = Mail::SpamAssassin::RegistryBoundaries->new ($self);
   $self->{plugins} = Mail::SpamAssassin::PluginHandler->new ($self);
 
   $self->{save_pattern_hits} ||= 0;
@@ -840,7 +840,7 @@
   $self->{'learn_to_journal'} = $self->{conf}->{bayes_learn_to_journal};
 
   $set |= 1 unless $self->{local_tests_only};
-  $set |= 2 if $self->{bayes_scanner} && $self->{bayes_scanner}->is_scan_available();
+  $set |= 2 if $self->{bayes_scanner} && $self->{bayes_scanner}->is_scan_available() && $self->{conf}->{use_bayes_rules};
 
   $self->{conf}->set_score_set ($set);
 
@@ -1777,7 +1777,7 @@
   # Figure out/set our initial scoreset
   my $set = 0;
   $set |= 1 unless $self->{local_tests_only};
-  $set |= 2 if $self->{bayes_scanner} && $self->{bayes_scanner}->is_scan_available();
+  $set |= 2 if $self->{bayes_scanner} && $self->{bayes_scanner}->is_scan_available() && $self->{conf}->{use_bayes_rules};
   $self->{conf}->set_score_set ($set);
 
   if ($self->{only_these_rules}) {
diff -Nru spamassassin-3.4.0/lib/spamassassin-run.pod spamassassin-3.4.2/lib/spamassassin-run.pod
--- spamassassin-3.4.0/lib/spamassassin-run.pod	2014-02-07 03:36:28.000000000 -0500
+++ spamassassin-3.4.2/lib/spamassassin-run.pod	2018-09-13 21:27:51.000000000 -0400
@@ -122,7 +122,7 @@
 message read from STDIN to various spam-blocker databases.  Currently,
 these are the Distributed Checksum Clearinghouse
 C<http://www.dcc-servers.net/dcc/>, Pyzor
-C<http://pyzor.sourceforge.net/>, Vipul's Razor
+C<http://pyzor.org/>, Vipul's Razor
 C<http://razor.sourceforge.net/>, and SpamCop C<http://www.spamcop.net/>.
 
 If the message contains SpamAssassin markup, the markup will be stripped
diff -Nru spamassassin-3.4.0/Makefile.PL spamassassin-3.4.2/Makefile.PL
--- spamassassin-3.4.0/Makefile.PL	2014-02-07 03:36:38.000000000 -0500
+++ spamassassin-3.4.2/Makefile.PL	2018-09-13 21:27:51.000000000 -0400
@@ -7,16 +7,12 @@
 
 use ExtUtils::MakeMaker;
 
-# Store the version for later use
-my $mm_version = $ExtUtils::MakeMaker::VERSION;
-
 # avoid stupid 'Argument "6.30_01" isn't numeric in numeric ge (>=)' warnings;
-# strip off the beta subversion noise that causes the trouble.
-$mm_version =~ s/_\S+$//;      # "6.30_01" => "6.30"
-$mm_version += 0;
+my $mm_version = eval $ExtUtils::MakeMaker::VERSION;
 
-if ($mm_version < 6.17) {
-  die "SpamAssassin Makefile.PL requires at least ExtUtils::MakeMaker v6.17";
+# raising the version of makemaker to 6.46 per bug 6598 & 6131
+if ($mm_version < 6.46) {
+  die "Apache SpamAssassin Makefile.PL requires at least ExtUtils::MakeMaker v6.46";
 }
 
 use constant RUNNING_ON_WINDOWS => ($^O =~ /^(mswin|dos|os2)/oi);
@@ -30,7 +26,7 @@
   # 'vendor' to choose one explicitly (the default is 'site'). They have the
   # following meaning:
   #  * PERL:    Only essential modules shipped with Perl should be installed
-  #             there. Don't put SpamAssassin there.
+  #             there. Don't put Apache SpamAssassin there.
   #  * SITE:    The default. Normal installations via CPAN or from the sources
   #             should use these dirs.
   #  * VENDOR:  A special set of paths for packaged (RPM, deb, portage, ...)
@@ -71,12 +67,15 @@
   'SITELOCALSTATEDIR', 
   'VENDORLOCALSTATEDIR',
 
+  'RE2C_BIN',         # hard code the path for re2c if possible
+
   'PERL_BIN',         # Sets the Perl interpreter used by the scripts.
   'PERL_WARN',        # Can be used to disable warnings in the scripts
   'PERL_TAINT',       # "   "  "    "  "    taint mode for the scripts (DON'T)
 
 
-  'BUILD_SPAMC'  ,    # Set to 'no' to skip build of spamc.
+  'BUILD_SPAMC'  ,    # Set to 'no' to skip build of spamc on Windows.
+  'BUILD_SPAMD',      # Set to 'no' to skip build of spamd on Windows.
   'ENABLE_SSL',       # Set to 'yes' to build spamc with SSL support.
   'CONTACT_ADDRESS',  # To not ask for the contact address, use this.
 );
@@ -110,9 +109,11 @@
 
 my %opt = (
   'build_spamc'     => undef,
+  'build_spamd'     => undef,
   'enable_ssl'      => undef,
   'contact_address' => undef,
   'destdir'         => undef,
+  're2c_bin'        => 're2c',
 );
 ARGV: foreach (@ARGV) {
   foreach my $key (keys %opt) {
@@ -177,20 +178,21 @@
     # be quite explicit about this; afaik CPAN.pm is sensible using this
     # also see CURRENT_PM below
     'PREREQ_PM' => {
-        'Digest::SHA1'  => 0,             # 2.0 is oldest tested version
-        'File::Spec'    => 0.8,           # older versions lack some routines we need
-        'File::Copy'    => 2.02,          # this version is shipped with 5.005_03, the oldest version known to work
-        'Pod::Usage'    => 1.10,          # all versions prior to this do seem to be buggy
-        'HTML::Parser'  => 3.43,          # the HTML code is based on this parser, older versions have utf-8 bugs
-        'Archive::Tar'  => 1.23,          # for sa-update
-        'IO::Zlib'      => 1.04,          # for sa-update
-        'Mail::DKIM'    => 0.31,
-        'Net::DNS'      => (RUNNING_ON_WINDOWS ? 0.46 : 0.34), # bugs in older revs
-        'NetAddr::IP'   => 4.010,
-        'Sys::Hostname' => 0,
-        'Time::HiRes'   => 0,
-        'Time::Local'   => 0,
-        'Errno'         => 0,
+        'Digest::SHA1'         => 0,             # 2.0 is oldest tested version
+        'File::Spec'           => 0.8,           # older versions lack some routines we need
+        'File::Copy'           => 2.02,          # this version is shipped with 5.005_03, the oldest version known to work
+        'Pod::Usage'           => 1.10,          # all versions prior to this do seem to be buggy
+        'HTML::Parser'         => 3.43,          # the HTML code is based on this parser, older versions have utf-8 bugs
+        'Archive::Tar'         => 1.23,          # for sa-update
+        'IO::Zlib'             => 1.04,          # for sa-update
+        'Mail::DKIM'           => 0.31,
+        'Net::DNS'             => (RUNNING_ON_WINDOWS ? 0.46 : 0.34), # bugs in older revs
+        'NetAddr::IP'          => 4.010,
+        'Sys::Hostname'        => 0,
+        'Test::More'           => 0,
+        'Time::HiRes'          => 0,
+        'Time::Local'          => 0,
+        'Errno'                => 0,
     },
 
     'dist' => {
@@ -238,7 +240,7 @@
     },
 
     'AUTHOR'   => 'The Apache SpamAssassin Project <dev at spamassassin.apache.org>',
-    'ABSTRACT' => 'SpamAssassin is an extensible email filter which is used to identify spam',
+    'ABSTRACT' => 'Apache SpamAssassin is an extensible email filter which is used to identify spam',
 
     # We have only this Makefile.PL and this option keeps MakeMaker from
     # asking all questions twice after a 'make dist*'.
@@ -272,9 +274,19 @@
 
 # Windows platforms need some adjustments
 if (RUNNING_ON_WINDOWS) {
-  # Don't build spamd
-  delete $makefile{EXE_FILES}{'spamd/spamd.raw'};
-  delete $makefile{MAN1PODS}{'spamd/spamd'};
+  # Building spamd is optional on Windows because it still is somewhat
+  # experimental.
+  if (!defined $opt{'build_spamd'}) {
+    $opt{'build_spamd'} = bool(prompt(
+      "Build spamd.exe (experimental on windows platforms)? (y/n)",
+      'n'));
+  } else {
+    $opt{'build_spamd'} = bool($opt{'build_spamd'});
+  }
+  if (!$opt{'build_spamd'}) {
+    delete $makefile{EXE_FILES}{'spamd/spamd.raw'};
+    delete $makefile{MAN1PODS}{'spamd/spamd'};
+  }
   # building spamc is optional under Win32 because not everyone has compiler
   if (!defined $opt{'build_spamc'}) {
     $opt{'build_spamc'} = bool(prompt(
@@ -305,7 +317,7 @@
 
 print 
 'NOTE: settings for "make test" are now controlled using "t/config.dist". 
-See that file if you wish to customise what tests are run, and how.
+See that file if you wish to customize what tests are run, and how.
 
 ';
 
@@ -326,15 +338,26 @@
 
 #######################################################################
 
-# bug 6131
-($mm_version >= 6.46) and $makefile{META_MERGE} = {
-  license => 'apache',
+# See Bug 6131 & 6598 for changes to META_MERGE and increased requirement 
+# for MakeMaker version
+#
+$makefile{META_MERGE} = {
+
+  'meta-spec' => {
+    version => '2',
+    url     => 'http://search.cpan.org/perldoc?CPAN::Meta::Spec',
+  },
+
+  license => 'apache_2_0',
 
   resources => {
     license     => 'http://www.apache.org/licenses/LICENSE-2.0.html',
-    homepage    => 'http://spamassassin.apache.com/',
+    homepage    => 'http://spamassassin.apache.org/',
     bugtracker  => 'https://issues.apache.org/SpamAssassin/',
-    repository  => 'http://svn.apache.org/repos/asf/spamassassin/',
+    repository  => { 
+			url=>'http://svn.apache.org/repos/asf/spamassassin/',
+			type=>'svn'
+		   },
     MailingList => 'http://wiki.apache.org/spamassassin/MailingLists',
   },
 
@@ -347,7 +370,7 @@
     'Razor2::Client::Agent' =>     2.61,
     'Net::Ident' =>                0,
     'IO::Socket::INET6' =>         0,
-    'IO::Socket::SSL' =>           0,
+    'IO::Socket::SSL' =>           1.76,
     'Compress::Zlib' =>            0,
     'Mail::DKIM' =>                0.37,
     'DBI' =>                       0,
@@ -372,17 +395,13 @@
 
 package MY;
 
-use vars qw(
-  $MY_GLOBALS_ARE_SANE
-  $RUNNING_ON_WINDOWS
-  @REPOSITORIES
-
-  $MACRO_RE
-  $EQ_RE
-  $EQ
-
-  $SELF
-);
+our ($MY_GLOBALS_ARE_SANE,
+  $RUNNING_ON_WINDOWS,
+  @REPOSITORIES,
+  $MACRO_RE,
+  $EQ_RE,
+  $EQ,
+  $SELF);
 
 # For some reason initializing the vars on the global scope doesn't work;
 # guess its some weird Perl behaviour in combination with bless().
@@ -886,6 +905,7 @@
   {
     set_macro('SYSCONFDIR', "") unless get_macro('SYSCONFDIR');
     set_macro('LOCALSTATEDIR', "") unless get_macro('LOCALSTATEDIR');
+    set_macro('RE2C_BIN', $opt{'re2c_bin'});
 
     # Determine the correct settings for each repository...
     foreach my $r (@REPOSITORIES) {
@@ -946,6 +966,7 @@
     push(@code, macro_def('PREPROCESS'));
     push(@code, macro_def('CONFIGURE'));
     push(@code, macro_def('SYMLINK'));
+    push(@code, macro_def('RE2C_BIN'));
   }
 
   # Set some additional helper/shortcut macros; the B_FOO are the ones which
@@ -1014,7 +1035,8 @@
 		  -DLOCAL_RULES_DIR="$(I_CONFDIR)" \
 		  -DLOCAL_STATE_DIR="$(I_LOCALSTATEDIR)" \
 		  -DINSTALLSITELIB="$(I_LIBDIR)" \
-		  -DCONTACT_ADDRESS="$(CONTACT_ADDRESS)"
+		  -DCONTACT_ADDRESS="$(CONTACT_ADDRESS)" \
+		  -DRE2C_BIN="$(RE2C_BIN)"
 
 FIXBANG		= -Msharpbang \
                   -Mconditional \
@@ -1062,7 +1084,7 @@
 	$(NOECHO) echo "*** spamc now has its own directory: $(TARGET) is $(SOURCE)"
 	$(NOECHO) echo "***"
 	$(PERL) -MFile::Spec -MFile::Copy \
-	  -e "copy(q{$(SOURCE)}, q{$(TARGET)});"
+	  -e "copy(q[$(SOURCE)], q{$(TARGET)});"
 
 spamc/libspamc.so: $(SPAMC_MAKEFILE) $(LIBSPAMC_SRC)
 	$(MAKE_SPAMC) $@
@@ -1098,13 +1120,16 @@
 
 conf__install:
 	-$(MKPATH) $(B_CONFDIR)
-	$(PERL) -MFile::Copy -e "copy(q{rules/local.cf}, q{$(B_CONFDIR)/local.cf}) unless -f q{$(B_CONFDIR)/local.cf}"
-	$(PERL) -MFile::Copy -e "copy(q{rules/init.pre}, q{$(B_CONFDIR)/init.pre}) unless -f q{$(B_CONFDIR)/init.pre}"
-	$(PERL) -MFile::Copy -e "copy(q{rules/v310.pre}, q{$(B_CONFDIR)/v310.pre}) unless -f q{$(B_CONFDIR)/v310.pre}"
-	$(PERL) -MFile::Copy -e "copy(q{rules/v312.pre}, q{$(B_CONFDIR)/v312.pre}) unless -f q{$(B_CONFDIR)/v312.pre}"
-	$(PERL) -MFile::Copy -e "copy(q{rules/v320.pre}, q{$(B_CONFDIR)/v320.pre}) unless -f q{$(B_CONFDIR)/v320.pre}"
-	$(PERL) -MFile::Copy -e "copy(q{rules/v330.pre}, q{$(B_CONFDIR)/v330.pre}) unless -f q{$(B_CONFDIR)/v330.pre}"
-	$(PERL) -MFile::Copy -e "copy(q{rules/v340.pre}, q{$(B_CONFDIR)/v340.pre}) unless -f q{$(B_CONFDIR)/v340.pre}"
+	$(PERL) -MFile::Copy -e "copy(q[rules/local.cf], q{$(B_CONFDIR)/local.cf}) unless -f q{$(B_CONFDIR)/local.cf}"
+	$(PERL) -MFile::Copy -e "copy(q[rules/init.pre], q{$(B_CONFDIR)/init.pre}) unless -f q{$(B_CONFDIR)/init.pre}"
+	$(PERL) -MFile::Copy -e "copy(q[rules/v310.pre], q{$(B_CONFDIR)/v310.pre}) unless -f q{$(B_CONFDIR)/v310.pre}"
+	$(PERL) -MFile::Copy -e "copy(q[rules/v312.pre], q{$(B_CONFDIR)/v312.pre}) unless -f q{$(B_CONFDIR)/v312.pre}"
+	$(PERL) -MFile::Copy -e "copy(q[rules/v320.pre], q{$(B_CONFDIR)/v320.pre}) unless -f q{$(B_CONFDIR)/v320.pre}"
+	$(PERL) -MFile::Copy -e "copy(q[rules/v330.pre], q{$(B_CONFDIR)/v330.pre}) unless -f q{$(B_CONFDIR)/v330.pre}"
+	$(PERL) -MFile::Copy -e "copy(q[rules/v340.pre], q{$(B_CONFDIR)/v340.pre}) unless -f q{$(B_CONFDIR)/v340.pre}"
+	$(PERL) -MFile::Copy -e "copy(q[rules/v341.pre], q{$(B_CONFDIR)/v341.pre}) unless -f q{$(B_CONFDIR)/v341.pre}"
+	$(PERL) -MFile::Copy -e "copy(q[rules/v342.pre], q{$(B_CONFDIR)/v342.pre}) unless -f q{$(B_CONFDIR)/v342.pre}"
+  
 
 data__install:
 	-$(MKPATH) $(B_DATADIR)
diff -Nru spamassassin-3.4.0/MANIFEST spamassassin-3.4.2/MANIFEST
--- spamassassin-3.4.0/MANIFEST	2014-02-07 03:37:31.000000000 -0500
+++ spamassassin-3.4.2/MANIFEST	2018-09-13 21:28:18.000000000 -0400
@@ -5,7 +5,6 @@
 LICENSE
 MANIFEST
 MANIFEST.SKIP
-META.yml
 Makefile.PL
 NOTICE
 PACKAGING
@@ -16,11 +15,11 @@
 build/check_dependencies
 build/convert_pods_to_doc
 build/get_version
-build/md5sum.pl
 build/mkrules
 build/parse-rules-for-masses
 build/preprocessor
-build/sha1sum.pl
+build/sha256sum.pl
+build/sha512sum.pl
 ldap/README
 ldap/README.testing
 ldap/sa_test.ldif
@@ -84,19 +83,24 @@
 lib/Mail/SpamAssassin/Plugin/DKIM.pm
 lib/Mail/SpamAssassin/Plugin/DNSEval.pm
 lib/Mail/SpamAssassin/Plugin/FreeMail.pm
+lib/Mail/SpamAssassin/Plugin/FromNameSpoof.pm
 lib/Mail/SpamAssassin/Plugin/HTMLEval.pm
 lib/Mail/SpamAssassin/Plugin/HTTPSMismatch.pm
 lib/Mail/SpamAssassin/Plugin/Hashcash.pm
+lib/Mail/SpamAssassin/Plugin/HashBL.pm
 lib/Mail/SpamAssassin/Plugin/HeaderEval.pm
 lib/Mail/SpamAssassin/Plugin/ImageInfo.pm
 lib/Mail/SpamAssassin/Plugin/MIMEEval.pm
 lib/Mail/SpamAssassin/Plugin/MIMEHeader.pm
 lib/Mail/SpamAssassin/Plugin/OneLineBodyRuleType.pm
+lib/Mail/SpamAssassin/Plugin/Phishing.pm
 lib/Mail/SpamAssassin/Plugin/PhishTag.pm
+lib/Mail/SpamAssassin/Plugin/PDFInfo.pm
 lib/Mail/SpamAssassin/Plugin/Pyzor.pm
 lib/Mail/SpamAssassin/Plugin/Razor2.pm
 lib/Mail/SpamAssassin/Plugin/RelayCountry.pm
 lib/Mail/SpamAssassin/Plugin/RelayEval.pm
+lib/Mail/SpamAssassin/Plugin/ResourceLimits.pm
 lib/Mail/SpamAssassin/Plugin/ReplaceTags.pm
 lib/Mail/SpamAssassin/Plugin/Reuse.pm
 lib/Mail/SpamAssassin/Plugin/Rule2XSBody.pm
@@ -105,6 +109,7 @@
 lib/Mail/SpamAssassin/Plugin/SpamCop.pm
 lib/Mail/SpamAssassin/Plugin/Test.pm
 lib/Mail/SpamAssassin/Plugin/TextCat.pm
+lib/Mail/SpamAssassin/Plugin/TxRep.pm
 lib/Mail/SpamAssassin/Plugin/URIDNSBL.pm
 lib/Mail/SpamAssassin/Plugin/URIDetail.pm
 lib/Mail/SpamAssassin/Plugin/URIEval.pm
@@ -112,6 +117,8 @@
 lib/Mail/SpamAssassin/Plugin/WLBLEval.pm
 lib/Mail/SpamAssassin/Plugin/WhiteListSubject.pm
 lib/Mail/SpamAssassin/PluginHandler.pm
+lib/Mail/SpamAssassin/Plugin/URILocalBL.pm
+lib/Mail/SpamAssassin/RegistryBoundaries.pm
 lib/Mail/SpamAssassin/Reporter.pm
 lib/Mail/SpamAssassin/SQLBasedAddrList.pm
 lib/Mail/SpamAssassin/SpamdForkScaling.pm
@@ -120,11 +127,11 @@
 lib/Mail/SpamAssassin/Util.pm
 lib/Mail/SpamAssassin/Util/DependencyInfo.pm
 lib/Mail/SpamAssassin/Util/Progress.pm
-lib/Mail/SpamAssassin/Util/RegistrarBoundaries.pm
 lib/Mail/SpamAssassin/Util/ScopedTimer.pm
 lib/Mail/SpamAssassin/Util/TieOneStringHash.pm
 lib/spamassassin-run.pod
 procmailrc.example
+rules.README
 rules/active.list
 rules/init.pre
 rules/languages
@@ -137,6 +144,9 @@
 rules/v320.pre
 rules/v330.pre
 rules/v340.pre
+rules/v341.pre
+rules/v342.pre
+rules/20_aux_tlds.cf
 sa-awl.raw
 sa-check_spamd.raw
 sa-compile.raw
@@ -205,12 +215,15 @@
 sql/README
 sql/README.awl
 sql/README.bayes
+sql/README.txrep
 sql/awl_mysql.sql
 sql/awl_pg.sql
 sql/bayes_mysql.sql
 sql/bayes_pg.sql
 sql/userpref_mysql.sql
 sql/userpref_pg.sql
+sql/txrep_mysql.sql
+sql/txrep_pg.sql
 t/README
 t/SATest.pl
 t/SATest.pm
@@ -359,6 +372,8 @@
 t/data/spam/dnsbl.eml
 t/data/spam/gtube.eml
 t/data/spam/gtubedcc.eml
+t/data/spam/razor2
+t/data/spam/relayUS.eml
 t/data/spam/spf1
 t/data/spam/spf2
 t/data/spam/spf3
@@ -411,6 +426,7 @@
 t/html_colors.t
 t/html_obfu.t
 t/html_utf8.t
+t/idn_dots.t
 t/if_can.t
 t/ifversion.t
 t/ip_addrs.t
@@ -439,6 +455,8 @@
 t/recreate.t
 t/recursion.t
 t/regexp_valid.t
+t/relaycountry_fast.t
+t/relaycountry_geoip.t
 t/relative_scores.t
 t/report_safe.t
 t/reportheader.t
@@ -501,8 +519,6 @@
 t/spamd_sql_prefs.t
 t/spamd_ssl.t
 t/spamd_ssl_accept_fail.t
-t/spamd_ssl_tls.t
-t/spamd_ssl_v3.t
 t/spamd_stop.t
 t/spamd_symbols.t
 t/spamd_syslog.t
@@ -526,6 +542,7 @@
 t/uri_html.t
 t/uri_text.t
 t/uribl.t
+t/urilocalbl_geoip.t
 t/utf8.t
 t/util_wrap.t
 t/whitelist_addrs.t
@@ -539,5 +556,12 @@
 t/data/spam/dnsbl_ipsonly.eml
 t/uribl_all_types.t
 t/uribl_ips_only.t
+t/uri_list.t
 t/dnsbl_subtests.t
+powered_by/128-powered-by-spamassassin.png
+powered_by/256-powered-by-spamassassin.png
+powered_by/512-powered-by-spamassassin.png
+powered_by/LOGO_USAGE.TXT
+powered_by/powered_by_spamassassin.psd
+META.yml                                 Module YAML meta-data (added by MakeMaker)
 META.json                                Module JSON meta-data (added by MakeMaker)
diff -Nru spamassassin-3.4.0/MANIFEST.SKIP spamassassin-3.4.2/MANIFEST.SKIP
--- spamassassin-3.4.0/MANIFEST.SKIP	2014-02-07 03:36:38.000000000 -0500
+++ spamassassin-3.4.2/MANIFEST.SKIP	2018-09-13 21:27:51.000000000 -0400
@@ -10,6 +10,7 @@
 \.pid$
 \.so$
 \.svn/
+\.gitignore$
 \.swp$
 \.tmp$
 \.tst$
@@ -31,6 +32,8 @@
 ^build/replace_license_blocks$
 ^build/tag_.*$
 ^build/update_.*$
+^build/pga.*$
+^build/old/.*$
 ^debian/
 ^doc/
 ^lib/Mail/SpamAssassin/Plugin/NetCache\.pm$
@@ -115,3 +118,4 @@
 ^build/rebuild_xt$
 ^build/repackage_latest_update_rules$
 ^MYMETA.(json|yml)$
+^trunk-only.*
diff -Nru spamassassin-3.4.0/META.json spamassassin-3.4.2/META.json
--- spamassassin-3.4.0/META.json	2014-02-07 03:37:31.000000000 -0500
+++ spamassassin-3.4.2/META.json	2018-09-13 21:28:18.000000000 -0400
@@ -1,10 +1,10 @@
 {
-   "abstract" : "SpamAssassin is an extensible email filter which is used to identify spam",
+   "abstract" : "Apache SpamAssassin is an extensible email filter which is used to identify spam",
    "author" : [
       "The Apache SpamAssassin Project <dev@spamassassin.apache.org>"
    ],
    "dynamic_config" : 1,
-   "generated_by" : "ExtUtils::MakeMaker version 6.64, CPAN::Meta::Converter version 2.120921",
+   "generated_by" : "ExtUtils::MakeMaker version 6.68, CPAN::Meta::Converter version 2.120921",
    "license" : [
       "apache_2_0"
    ],
@@ -25,32 +25,7 @@
             "ExtUtils::MakeMaker" : "0"
          }
       },
-      "configure" : {
-         "requires" : {
-            "ExtUtils::MakeMaker" : "0"
-         }
-      },
       "runtime" : {
-         "recommends" : {
-            "Archive::Tar" : "1.23",
-            "Compress::Zlib" : "0",
-            "DBI" : "0",
-            "DB_File" : "0",
-            "Encode::Detect" : "0",
-            "Geo::IP" : "0",
-            "Getopt::Long" : "2.32",
-            "HTTP::Date" : "0",
-            "IO::Socket::INET6" : "0",
-            "IO::Socket::SSL" : "0",
-            "IO::Zlib" : "1.04",
-            "LWP::UserAgent" : "0",
-            "MIME::Base64" : "0",
-            "Mail::DKIM" : "0.37",
-            "Mail::SPF" : "0",
-            "Net::Ident" : "0",
-            "Net::SMTP" : "0",
-            "Razor2::Client::Agent" : "2.61"
-         },
          "requires" : {
             "Archive::Tar" : "1.23",
             "Digest::SHA1" : "0",
@@ -64,6 +39,7 @@
             "NetAddr::IP" : "4.01",
             "Pod::Usage" : "1.1",
             "Sys::Hostname" : "0",
+            "Test::More" : "0",
             "Time::HiRes" : "0",
             "Time::Local" : "0"
          }
@@ -71,17 +47,15 @@
    },
    "release_status" : "stable",
    "resources" : {
-      "bugtracker" : {
-         "web" : "https://issues.apache.org/SpamAssassin/"
-      },
-      "homepage" : "http://spamassassin.apache.com/",
+      "homepage" : "http://spamassassin.apache.org/",
       "license" : [
          "http://www.apache.org/licenses/LICENSE-2.0.html"
       ],
       "repository" : {
+         "type" : "svn",
          "url" : "http://svn.apache.org/repos/asf/spamassassin/"
       },
       "x_MailingList" : "http://wiki.apache.org/spamassassin/MailingLists"
    },
-   "version" : "3.004000"
+   "version" : "3.004002"
 }
diff -Nru spamassassin-3.4.0/META.yml spamassassin-3.4.2/META.yml
--- spamassassin-3.4.0/META.yml	2014-02-07 03:37:31.000000000 -0500
+++ spamassassin-3.4.2/META.yml	2018-09-13 21:28:18.000000000 -0400
@@ -1,13 +1,11 @@
 ---
-abstract: 'SpamAssassin is an extensible email filter which is used to identify spam'
+abstract: 'Apache SpamAssassin is an extensible email filter which is used to identify spam'
 author:
   - 'The Apache SpamAssassin Project <dev@spamassassin.apache.org>'
 build_requires:
   ExtUtils::MakeMaker: 0
-configure_requires:
-  ExtUtils::MakeMaker: 0
 dynamic_config: 1
-generated_by: 'ExtUtils::MakeMaker version 6.64, CPAN::Meta::Converter version 2.120921'
+generated_by: 'ExtUtils::MakeMaker version 6.68, CPAN::Meta::Converter version 2.120921'
 license: apache
 meta-spec:
   url: http://module-build.sourceforge.net/META-spec-v1.4.html
@@ -17,25 +15,6 @@
   directory:
     - t
     - inc
-recommends:
-  Archive::Tar: 1.23
-  Compress::Zlib: 0
-  DBI: 0
-  DB_File: 0
-  Encode::Detect: 0
-  Geo::IP: 0
-  Getopt::Long: 2.32
-  HTTP::Date: 0
-  IO::Socket::INET6: 0
-  IO::Socket::SSL: 0
-  IO::Zlib: 1.04
-  LWP::UserAgent: 0
-  MIME::Base64: 0
-  Mail::DKIM: 0.37
-  Mail::SPF: 0
-  Net::Ident: 0
-  Net::SMTP: 0
-  Razor2::Client::Agent: 2.61
 requires:
   Archive::Tar: 1.23
   Digest::SHA1: 0
@@ -49,12 +28,12 @@
   NetAddr::IP: 4.01
   Pod::Usage: 1.1
   Sys::Hostname: 0
+  Test::More: 0
   Time::HiRes: 0
   Time::Local: 0
 resources:
-  bugtracker: https://issues.apache.org/SpamAssassin/
-  homepage: http://spamassassin.apache.com/
+  homepage: http://spamassassin.apache.org/
   license: http://www.apache.org/licenses/LICENSE-2.0.html
   repository: http://svn.apache.org/repos/asf/spamassassin/
   x_MailingList: http://wiki.apache.org/spamassassin/MailingLists
-version: 3.004000
+version: 3.004002
diff -Nru spamassassin-3.4.0/pkgrules/10_hasbase.cf spamassassin-3.4.2/pkgrules/10_hasbase.cf
--- spamassassin-3.4.0/pkgrules/10_hasbase.cf	2014-02-06 22:05:55.000000000 -0500
+++ spamassassin-3.4.2/pkgrules/10_hasbase.cf	2018-09-12 23:04:39.000000000 -0400
@@ -23,6 +23,8 @@
 #
 ###########################################################################
 
+# PLEASE KEEP THIS TIDY
+
 # According to Bug 6781
 
 # Header rules
diff -Nru spamassassin-3.4.0/pkgrules/20_aux_tlds.cf spamassassin-3.4.2/pkgrules/20_aux_tlds.cf
--- spamassassin-3.4.0/pkgrules/20_aux_tlds.cf	2014-02-06 22:05:55.000000000 -0500
+++ spamassassin-3.4.2/pkgrules/20_aux_tlds.cf	2018-09-12 23:04:40.000000000 -0400
@@ -26,72 +26,373 @@
 # This file replaces the SARE http://www.rulesemporium.com/rules/90_2tld.cf
 # which will be deprecated as from 2010-05-01
 
-# util_rb_2tld 2tld-1.tld 2tld-2.tld ...
-#            This option allows the addition of new 2nd-level TLDs (2TLD) to
-#            the RegistrarBoundaries code. Updates to the list usually happen
-#            when new versions of SpamAssassin are released, but sometimes
-#            it's necessary to add in new 2TLDs faster than a release can
-#            occur.
-#
-# util_rb_3tld is supported by SA 3.3.x , eg: foo.bay.livefilestore.com
-#
-
-
-# Last Update: 2014-02-04-AXB
+# File updated 2014-09-17 to contain complete TLD lists, they are no longer
+# hardcoded into SA codebase and Util/RegistrarBoundaries.pm is deprecated
+# in favor of Mail::SpamAssassin::RegistryBoundaries.
 
 
+# Let's clear the internal TLD list, we only want to read from this config
+# file and ignore possible old hardcoded lists.
+if (can(Mail::SpamAssassin::Conf::feature_registryboundaries))
+clear_util_rb
+endif
 
-# SA > 3.3.0
-if (version >= 3.003000)
 
-util_rb_3tld bay.livefilestore.com
-util_rb_3tld blu.livefilestore.com
-util_rb_3tld groups.live.com
-util_rb_3tld spaces.live.com
-util_rb_3tld profile.live.com
-util_rb_3tld web.aplus.net
-util_rb_3tld cloud.prohosting.com
-util_rb_3tld skydrive.live.com
-util_rb_3tld docs.google.com
-util_rb_3tld spaces.msn.com
-util_rb_3tld blog.friendster.com
-util_rb_3tld sakura.ne.jp
-util_rb_3tld web.officelive.com
-util_rb_3tld com.sapo.pt
-util_rb_3tld paginas.sapo.pt
-util_rb_3tld no.sapo.pt
-util_rb_3tld home.sapo.pt
-util_rb_3tld do.sapo.pt
-util_rb_3tld homepage.t-online.de
-util_rb_3tld privat.t-online.de
-util_rb_3tld web.fc2.com
-util_rb_3tld co.uk.pn
-util_rb_3tld com.au.pn
-util_rb_3tld co.at.pn
-util_rb_3tld co.at.lv
-util_rb_3tld or.at.lv
-util_rb_3tld co.at.tc
-util_rb_3tld qld.edu.au
-util_rb_3tld perso.neuf.fr
-util_rb_3tld perso.sfr.fr
-util_rb_3tld hop.clickbank.net
-util_rb_3tld user.icpnet.pl
-util_rb_3tld en.alibaba.com
 #
-util_rb_3tld blogspot.co.nz
-util_rb_3tld blogspot.co.uk
-util_rb_3tld blogspot.com.ar
-util_rb_3tld blogspot.com.au
-util_rb_3tld blogspot.com.br
-util_rb_3tld blogspot.com.es
+# 1st level TLD list
 #
-util_rb_3tld no-ip.co.uk
-#
-util_rb_3tld mobile.web.tr
 
+# Basic list can be obtained with the following command:
+#  wget http://data.iana.org/TLD/tlds-alpha-by-domain.txt -q -O - | tail -n+2 | perl -ne 'print lc'
+# Current list may include more or less.. TODO easier maintenance?
+
+# util_rb_tld only accepts alpha (a-z) input before RegistryBoundaries was
+# implemented in 3.4.1(?), put IDN TLDs with numeric, hyphen (0-9-) etc in
+# this block
+#
+# For an up to date list of IDN TLDs that can be pasted into this block, run this command:
+#  wget http://data.iana.org/TLD/tlds-alpha-by-domain.txt -q -O - | grep -i '^xn--' | tr '\n' ' ' | fold -w 80 -s | perl -pe 'chomp; s/.*/util_rb_tld \L$_\n/'
+# Since version 4.0 the util_rb_tld also accepts Unicode IDN labels (encoded as UTF-8), e.g.:
+#  wget http://data.iana.org/TLD/tlds-alpha-by-domain.txt -q -O - | grep -i '^xn--' | idn -u | tr '\n' ' ' | fold -w 80 -s | perl -pe 'chomp; s/.*/util_rb_tld \L$_\n/'
+
+if (can(Mail::SpamAssassin::Conf::feature_registryboundaries))
+util_rb_tld xn--11b4c3d xn--1ck2e1b xn--1qqw23a xn--2scrj9c xn--30rr7y xn--3bst00m 
+util_rb_tld xn--3ds443g xn--3e0b707e xn--3hcrj9c xn--3oq18vl8pn36a xn--3pxu8k xn--42c2d9a 
+util_rb_tld xn--45br5cyl xn--45brj9c xn--45q11c xn--4gbrim xn--54b7fta0cc xn--55qw42g 
+util_rb_tld xn--55qx5d xn--5su34j936bgsg xn--5tzm5g xn--6frz82g xn--6qq986b3xl xn--80adxhks 
+util_rb_tld xn--80ao21a xn--80aqecdr1a xn--80asehdb xn--80aswg xn--8y0a063a xn--90a3ac 
+util_rb_tld xn--90ae xn--90ais xn--9dbq2a xn--9et52u xn--9krt00a xn--b4w605ferd 
+util_rb_tld xn--bck1b9a5dre4c xn--c1avg xn--c2br7g xn--cck2b3b xn--cg4bki 
+util_rb_tld xn--clchc0ea0b2g2a9gcd xn--czr694b xn--czrs0t xn--czru2d xn--d1acj3b xn--d1alf 
+util_rb_tld xn--e1a4c xn--eckvdtc9d xn--efvy88h xn--estv75g xn--fct429k xn--fhbei 
+util_rb_tld xn--fiq228c5hs xn--fiq64b xn--fiqs8s xn--fiqz9s xn--fjq720a xn--flw351e 
+util_rb_tld xn--fpcrj9c3d xn--fzc2c9e2c xn--fzys8d69uvgm xn--g2xx48c xn--gckr3f0f 
+util_rb_tld xn--gecrj9c xn--gk3at1e xn--h2breg3eve xn--h2brj9c xn--h2brj9c8c xn--hxt814e 
+util_rb_tld xn--i1b6b1a6a2e xn--imr513n xn--io0a7i xn--j1aef xn--j1amh xn--j6w193g 
+util_rb_tld xn--jlq61u9w7b xn--jvr189m xn--kcrx77d1x4a xn--kprw13d xn--kpry57d xn--kpu716f 
+util_rb_tld xn--kput3i xn--l1acc xn--lgbbat1ad8j xn--mgb9awbf xn--mgba3a3ejt 
+util_rb_tld xn--mgba3a4f16a xn--mgba7c0bbn0a xn--mgbaakc7dvf xn--mgbaam7a8h xn--mgbab2bd 
+util_rb_tld xn--mgbai9azgqp6j xn--mgbayh7gpa xn--mgbb9fbpob xn--mgbbh1a xn--mgbbh1a71e 
+util_rb_tld xn--mgbc0a9azcg xn--mgbca7dzdo xn--mgberp4a5d4ar xn--mgbgu82a xn--mgbi4ecexp 
+util_rb_tld xn--mgbpl2fh xn--mgbt3dhd xn--mgbtx2b xn--mgbx4cd0ab xn--mix891f xn--mk1bu44c 
+util_rb_tld xn--mxtq1m xn--ngbc5azd xn--ngbe9e0a xn--ngbrx xn--node xn--nqv7f 
+util_rb_tld xn--nqv7fs00ema xn--nyqy26a xn--o3cw4h xn--ogbpf8fl xn--otu796d xn--p1acf 
+util_rb_tld xn--p1ai xn--pbt977c xn--pgbs0dh xn--pssy2u xn--q9jyb4c xn--qcka1pmc xn--qxam 
+util_rb_tld xn--rhqv96g xn--rovu88b xn--rvc1e0am3e xn--s9brj9c xn--ses554g xn--t60b56a 
+util_rb_tld xn--tckwe xn--tiq49xqyj xn--unup4y xn--vermgensberater-ctb 
+util_rb_tld xn--vermgensberatung-pwb xn--vhquv xn--vuq861b xn--w4r85el8fhu5dnra xn--w4rs40l 
+util_rb_tld xn--wgbh1c xn--wgbl6a xn--xhq521b xn--xkc2al3hye2a xn--xkc2dl3a5ee0h xn--y9a3aq 
+util_rb_tld xn--yfro4i67o xn--ygbi2ammx xn--zfr164b
 endif
 
-# SA > 3.2.4
+# Standard List
+# For an up to date list of TLDs that can be pasted into this block, run this command:
+#  wget http://data.iana.org/TLD/tlds-alpha-by-domain.txt -q -O - | tail -n+2 | grep -vi '^xn--' | tr '\n' ' ' | fold -w 80 -s | perl -pe 'chomp; s/.*/util_rb_tld \L$_\n/'
+
+util_rb_tld aaa aarp abarth abb abbott abbvie abc able abogado abudhabi ac academy 
+util_rb_tld accenture accountant accountants aco active actor ad adac ads adult ae aeg aero 
+util_rb_tld aetna af afamilycompany afl africa ag agakhan agency ai aig aigo airbus 
+util_rb_tld airforce airtel akdn al alfaromeo alibaba alipay allfinanz allstate ally alsace 
+util_rb_tld alstom am americanexpress americanfamily amex amfam amica amsterdam analytics 
+util_rb_tld android anquan anz ao aol apartments app apple aq aquarelle ar arab aramco 
+util_rb_tld archi army arpa art arte as asda asia associates at athleta attorney au auction 
+util_rb_tld audi audible audio auspost author auto autos avianca aw aws ax axa az azure ba 
+util_rb_tld baby baidu banamex bananarepublic band bank bar barcelona barclaycard barclays 
+util_rb_tld barefoot bargains baseball basketball bauhaus bayern bb bbc bbt bbva bcg bcn bd 
+util_rb_tld be beats beauty beer bentley berlin best bestbuy bet bf bg bh bharti bi bible 
+util_rb_tld bid bike bing bingo bio biz bj black blackfriday blanco blockbuster blog 
+util_rb_tld bloomberg blue bm bms bmw bn bnl bnpparibas bo boats boehringer bofa bom bond 
+util_rb_tld boo book booking bosch bostik boston bot boutique box br bradesco bridgestone 
+util_rb_tld broadway broker brother brussels bs bt budapest bugatti build builders business 
+util_rb_tld buy buzz bv bw by bz bzh ca cab cafe cal call calvinklein cam camera camp 
+util_rb_tld cancerresearch canon capetown capital capitalone car caravan cards care career 
+util_rb_tld careers cars cartier casa case caseih cash casino cat catering catholic cba cbn 
+util_rb_tld cbre cbs cc cd ceb center ceo cern cf cfa cfd cg ch chanel channel charity 
+util_rb_tld chase chat cheap chintai christmas chrome chrysler church ci cipriani circle 
+util_rb_tld cisco citadel citi citic city cityeats ck cl claims cleaning click clinic 
+util_rb_tld clinique clothing cloud club clubmed cm cn co coach codes coffee college 
+util_rb_tld cologne com comcast commbank community company compare computer comsec condos 
+util_rb_tld construction consulting contact contractors cooking cookingchannel cool coop 
+util_rb_tld corsica country coupon coupons courses cr credit creditcard creditunion cricket 
+util_rb_tld crown crs cruise cruises csc cu cuisinella cv cw cx cy cymru cyou cz dabur dad 
+util_rb_tld dance data date dating datsun day dclk dds de deal dealer deals degree delivery 
+util_rb_tld dell deloitte delta democrat dental dentist desi design dev dhl diamonds diet 
+util_rb_tld digital direct directory discount discover dish diy dj dk dm dnp do docs doctor 
+util_rb_tld dodge dog doha domains dot download drive dtv dubai duck dunlop duns dupont 
+util_rb_tld durban dvag dvr dz earth eat ec eco edeka edu education ee eg email emerck 
+util_rb_tld energy engineer engineering enterprises epost epson equipment er ericsson erni 
+util_rb_tld es esq estate esurance et etisalat eu eurovision eus events everbank exchange 
+util_rb_tld expert exposed express extraspace fage fail fairwinds faith family fan fans 
+util_rb_tld farm farmers fashion fast fedex feedback ferrari ferrero fi fiat fidelity fido 
+util_rb_tld film final finance financial fire firestone firmdale fish fishing fit fitness 
+util_rb_tld fj fk flickr flights flir florist flowers fly fm fo foo food foodnetwork 
+util_rb_tld football ford forex forsale forum foundation fox fr free fresenius frl frogans 
+util_rb_tld frontdoor frontier ftr fujitsu fujixerox fun fund furniture futbol fyi ga gal 
+util_rb_tld gallery gallo gallup game games gap garden gb gbiz gd gdn ge gea gent genting 
+util_rb_tld george gf gg ggee gh gi gift gifts gives giving gl glade glass gle global globo 
+util_rb_tld gm gmail gmbh gmo gmx gn godaddy gold goldpoint golf goo goodhands goodyear 
+util_rb_tld goog google gop got gov gp gq gr grainger graphics gratis green gripe grocery 
+util_rb_tld group gs gt gu guardian gucci guge guide guitars guru gw gy hair hamburg 
+util_rb_tld hangout haus hbo hdfc hdfcbank health healthcare help helsinki here hermes hgtv 
+util_rb_tld hiphop hisamitsu hitachi hiv hk hkt hm hn hockey holdings holiday homedepot 
+util_rb_tld homegoods homes homesense honda honeywell horse hospital host hosting hot 
+util_rb_tld hoteles hotels hotmail house how hr hsbc ht hu hughes hyatt hyundai ibm icbc 
+util_rb_tld ice icu id ie ieee ifm ikano il im imamat imdb immo immobilien in inc 
+util_rb_tld industries infiniti info ing ink institute insurance insure int intel 
+util_rb_tld international intuit investments io ipiranga iq ir irish is iselect ismaili ist 
+util_rb_tld istanbul it itau itv iveco jaguar java jcb jcp je jeep jetzt jewelry jio jlc 
+util_rb_tld jll jm jmp jnj jo jobs joburg jot joy jp jpmorgan jprs juegos juniper kaufen 
+util_rb_tld kddi ke kerryhotels kerrylogistics kerryproperties kfh kg kh ki kia kim kinder 
+util_rb_tld kindle kitchen kiwi km kn koeln komatsu kosher kp kpmg kpn kr krd kred 
+util_rb_tld kuokgroup kw ky kyoto kz la lacaixa ladbrokes lamborghini lamer lancaster 
+util_rb_tld lancia lancome land landrover lanxess lasalle lat latino latrobe law lawyer lb 
+util_rb_tld lc lds lease leclerc lefrak legal lego lexus lgbt li liaison lidl life 
+util_rb_tld lifeinsurance lifestyle lighting like lilly limited limo lincoln linde link 
+util_rb_tld lipsy live living lixil lk llc loan loans locker locus loft lol london lotte 
+util_rb_tld lotto love lpl lplfinancial lr ls lt ltd ltda lu lundbeck lupin luxe luxury lv 
+util_rb_tld ly ma macys madrid maif maison makeup man management mango map market marketing 
+util_rb_tld markets marriott marshalls maserati mattel mba mc mckinsey md me med media meet 
+util_rb_tld melbourne meme memorial men menu merckmsd metlife mg mh miami microsoft mil 
+util_rb_tld mini mint mit mitsubishi mk ml mlb mls mm mma mn mo mobi mobile mobily moda moe 
+util_rb_tld moi mom monash money monster mopar mormon mortgage moscow moto motorcycles mov 
+util_rb_tld movie movistar mp mq mr ms msd mt mtn mtr mu museum mutual mv mw mx my mz na 
+util_rb_tld nab nadex nagoya name nationwide natura navy nba nc ne nec net netbank netflix 
+util_rb_tld network neustar new newholland news next nextdirect nexus nf nfl ng ngo nhk ni 
+util_rb_tld nico nike nikon ninja nissan nissay nl no nokia northwesternmutual norton now 
+util_rb_tld nowruz nowtv np nr nra nrw ntt nu nyc nz obi observer off office okinawa olayan 
+util_rb_tld olayangroup oldnavy ollo om omega one ong onl online onyourside ooo open oracle 
+util_rb_tld orange org organic origins osaka otsuka ott ovh pa page panasonic panerai paris 
+util_rb_tld pars partners parts party passagens pay pccw pe pet pf pfizer pg ph pharmacy 
+util_rb_tld phd philips phone photo photography photos physio piaget pics pictet pictures 
+util_rb_tld pid pin ping pink pioneer pizza pk pl place play playstation plumbing plus pm 
+util_rb_tld pn pnc pohl poker politie porn post pr pramerica praxi press prime pro prod 
+util_rb_tld productions prof progressive promo properties property protection pru 
+util_rb_tld prudential ps pt pub pw pwc py qa qpon quebec quest qvc racing radio raid re 
+util_rb_tld read realestate realtor realty recipes red redstone redumbrella rehab reise 
+util_rb_tld reisen reit reliance ren rent rentals repair report republican rest restaurant 
+util_rb_tld review reviews rexroth rich richardli ricoh rightathome ril rio rip rmit ro 
+util_rb_tld rocher rocks rodeo rogers room rs rsvp ru rugby ruhr run rw rwe ryukyu sa 
+util_rb_tld saarland safe safety sakura sale salon samsclub samsung sandvik sandvikcoromant 
+util_rb_tld sanofi sap sarl sas save saxo sb sbi sbs sc sca scb schaeffler schmidt 
+util_rb_tld scholarships school schule schwarz science scjohnson scor scot sd se search 
+util_rb_tld seat secure security seek select sener services ses seven sew sex sexy sfr sg 
+util_rb_tld sh shangrila sharp shaw shell shia shiksha shoes shop shopping shouji show 
+util_rb_tld showtime shriram si silk sina singles site sj sk ski skin sky skype sl sling sm 
+util_rb_tld smart smile sn sncf so soccer social softbank software sohu solar solutions 
+util_rb_tld song sony soy space spiegel sport spot spreadbetting sr srl srt st stada 
+util_rb_tld staples star starhub statebank statefarm statoil stc stcgroup stockholm storage 
+util_rb_tld store stream studio study style su sucks supplies supply support surf surgery 
+util_rb_tld suzuki sv swatch swiftcover swiss sx sy sydney symantec systems sz tab taipei 
+util_rb_tld talk taobao target tatamotors tatar tattoo tax taxi tc tci td tdk team tech 
+util_rb_tld technology tel telefonica temasek tennis teva tf tg th thd theater theatre tiaa 
+util_rb_tld tickets tienda tiffany tips tires tirol tj tjmaxx tjx tk tkmaxx tl tm tmall tn 
+util_rb_tld to today tokyo tools top toray toshiba total tours town toyota toys tr trade 
+util_rb_tld trading training travel travelchannel travelers travelersinsurance trust trv tt 
+util_rb_tld tube tui tunes tushu tv tvs tw tz ua ubank ubs uconnect ug uk unicom university 
+util_rb_tld uno uol ups us uy uz va vacations vana vanguard vc ve vegas ventures verisign 
+util_rb_tld versicherung vet vg vi viajes video vig viking villas vin vip virgin visa 
+util_rb_tld vision vista vistaprint viva vivo vlaanderen vn vodka volkswagen volvo vote 
+util_rb_tld voting voto voyage vu vuelos wales walmart walter wang wanggou warman watch 
+util_rb_tld watches weather weatherchannel webcam weber website wed wedding weibo weir wf 
+util_rb_tld whoswho wien wiki williamhill win windows wine winners wme wolterskluwer 
+util_rb_tld woodside work works world wow ws wtc wtf xbox xerox xfinity xihuan xin xxx xyz 
+util_rb_tld yachts yahoo yamaxun yandex ye yodobashi yoga yokohama you youtube yt yun za 
+util_rb_tld zappos zara zero zip zippo zm zone zuerich zw
+
+#
+# 2nd level TLD list
+#
+
+# http://www.neustar.us/policies/docs/rfc_1480.txt
+# data originally from http://spamcheck.freeapp.net/two-level-tlds
+# The freeapp.net site now says that information on the site is obsolete
+# See discussion and sources in comments of bug 5677
+# updated as per bug 5815
+# cleanup in progress per bug 6795 (axb)
+# Unsorted sources:
+# .ua : http://hostmaster.ua
+# .hu : http://www.domain.hu/domain/English/szabalyzat/sld.html
+
+util_rb_2tld com.ac edu.ac gov.ac mil.ac net.ac org.ac
+util_rb_2tld nom.ad
+util_rb_2tld ac.ae co.ae com.ae gov.ae mil.ae name.ae net.ae org.ae pro.ae sch.ae
+util_rb_2tld com.af edu.af gov.af net.af
+util_rb_2tld co.ag com.ag net.ag nom.ag org.ag
+util_rb_2tld com.ai edu.ai gov.ai net.ai off.ai org.ai
+util_rb_2tld com.al edu.al gov.al net.al org.al
+util_rb_2tld com.an edu.an net.an org.an
+util_rb_2tld co.ao ed.ao gv.ao it.ao og.ao pb.ao
+util_rb_2tld com.ar edu.ar gov.ar int.ar mil.ar net.ar org.ar
+util_rb_2tld e164.arpa in-addr.arpa ip6.arpa iris.arpa uri.arpa urn.arpa
+util_rb_2tld ac.at co.at gv.at or.at priv.at
+util_rb_2tld act.au asn.au com.au conf.au csiro.au edu.au gov.au id.au info.au net.au nsw.au nt.au org.au otc.au oz.au qld.au sa.au tas.au telememo.au vic.au wa.au
+util_rb_2tld com.aw
+util_rb_2tld biz.az com.az edu.az gov.az info.az int.az mil.az name.az net.az org.az pp.az
+util_rb_2tld co.ba com.ba edu.ba gov.ba mil.ba net.ba org.ba rs.ba unbi.ba unsa.ba
+util_rb_2tld com.bb edu.bb gov.bb net.bb org.bb
+util_rb_2tld ac.bd com.bd edu.bd gov.bd mil.bd net.bd org.bd
+util_rb_2tld ac.be belgie.be dns.be fgov.be
+util_rb_2tld gov.bf
+util_rb_2tld biz.bh cc.bh com.bh edu.bh gov.bh info.bh net.bh org.bh
+util_rb_2tld com.bm edu.bm gov.bm net.bm org.bm
+util_rb_2tld com.bn edu.bn net.bn org.bn
+util_rb_2tld com.bo edu.bo gob.bo gov.bo int.bo mil.bo net.bo org.bo tv.bo
+util_rb_2tld adm.br adv.br agr.br am.br arq.br art.br ato.br bio.br bmd.br cim.br cng.br cnt.br com.br coop.br dpn.br eco.br ecn.br edu.br eng.br esp.br etc.br eti.br far.br fm.br fnd.br fot.br fst.br g12.br ggf.br gov.br imb.br ind.br inf.br jor.br lel.br mat.br med.br mil.br mus.br net.br nom.br not.br ntr.br odo.br org.br ppg.br pro.br psc.br psi.br qsl.br rec.br slg.br srv.br tmp.br trd.br tur.br tv.br vet.br zlg.br
+util_rb_2tld com.bs net.bs org.bs
+util_rb_2tld com.bt edu.bt gov.bt net.bt org.bt
+util_rb_2tld co.bw org.bw
+util_rb_2tld gov.by mil.by
+util_rb_2tld com.bz net.bz org.bz
+util_rb_2tld ab.ca bc.ca gc.ca mb.ca nb.ca nf.ca nl.ca ns.ca nt.ca nu.ca on.ca pe.ca qc.ca sk.ca yk.ca
+util_rb_2tld co.ck edu.ck gov.ck net.ck org.ck
+util_rb_2tld ac.cn ah.cn bj.cn com.cn cq.cn edu.cn fj.cn gd.cn gov.cn gs.cn gx.cn gz.cn ha.cn hb.cn he.cn hi.cn hk.cn hl.cn hn.cn jl.cn js.cn jx.cn ln.cn mo.cn net.cn nm.cn nx.cn org.cn qh.cn sc.cn sd.cn sh.cn sn.cn sx.cn tj.cn tw.cn xj.cn xz.cn yn.cn zj.cn
+util_rb_2tld arts.co com.co edu.co firm.co gov.co info.co int.co mil.co net.co nom.co org.co rec.co web.co
+util_rb_2tld co.cm com.cm net.cm
+util_rb_2tld au.com br.com cn.com de.com eu.com gb.com hu.com no.com qc.com ru.com sa.com se.com uk.com us.com uy.com za.com
+util_rb_2tld ac.cr co.cr ed.cr fi.cr go.cr or.cr sa.cr
+util_rb_2tld com.cu edu.cu gov.cu inf.cu net.cu org.cu
+util_rb_2tld gov.cx
+util_rb_2tld ac.cy biz.cy com.cy ekloges.cy gov.cy ltd.cy name.cy net.cy org.cy parliament.cy press.cy pro.cy tm.cy
+util_rb_2tld co.dk
+util_rb_2tld com.dm edu.dm gov.dm net.dm org.dm
+util_rb_2tld art.do com.do edu.do gob.do gov.do mil.do net.do org.do sld.do web.do
+util_rb_2tld art.dz asso.dz com.dz edu.dz gov.dz net.dz org.dz pol.dz
+util_rb_2tld com.ec edu.ec fin.ec gov.ec info.ec k12.ec med.ec mil.ec net.ec org.ec pro.ec gob.ec
+util_rb_2tld co.ee com.ee edu.ee fie.ee med.ee org.ee pri.ee
+util_rb_2tld com.eg edu.eg eun.eg gov.eg mil.eg net.eg org.eg sci.eg
+util_rb_2tld com.er edu.er gov.er ind.er mil.er net.er org.er
+util_rb_2tld com.es edu.es gob.es nom.es org.es
+util_rb_2tld biz.et com.et edu.et gov.et info.et name.et net.et org.et
+util_rb_2tld aland.fi
+util_rb_2tld ac.fj biz.fj com.fj gov.fj id.fj info.fj mil.fj name.fj net.fj org.fj pro.fj school.fj
+util_rb_2tld ac.fk co.fk com.fk gov.fk net.fk nom.fk org.fk
+util_rb_2tld tm.fr asso.fr nom.fr prd.fr presse.fr com.fr gouv.fr
+util_rb_2tld com.ge edu.ge gov.ge mil.ge net.ge org.ge pvt.ge
+util_rb_2tld ac.gg alderney.gg co.gg gov.gg guernsey.gg ind.gg ltd.gg net.gg org.gg sark.gg sch.gg
+util_rb_2tld com.gh edu.gh gov.gh mil.gh org.gh
+util_rb_2tld com.gi edu.gi gov.gi ltd.gi mod.gi org.gi
+util_rb_2tld ac.gn com.gn gov.gn net.gn org.gn
+util_rb_2tld asso.gp com.gp edu.gp net.gp org.gp
+util_rb_2tld com.gr edu.gr gov.gr net.gr org.gr
+util_rb_2tld com.gt edu.gt gob.gt ind.gt mil.gt net.gt org.gt
+util_rb_2tld com.gu edu.gu gov.gu mil.gu net.gu org.gu
+util_rb_2tld com.hk edu.hk gov.hk idv.hk net.hk org.hk
+util_rb_2tld com.hn edu.hn gob.hn mil.hn net.hn org.hn
+util_rb_2tld com.hr from.hr iz.hr name.hr
+util_rb_2tld adult.ht art.ht asso.ht com.ht coop.ht edu.ht firm.ht gouv.ht info.ht med.ht net.ht org.ht perso.ht pol.ht pro.ht rel.ht shop.ht
+util_rb_2tld 2000.hu agrar.hu bolt.hu casino.hu city.hu co.hu erotica.hu erotika.hu film.hu forum.hu games.hu hotel.hu info.hu ingatlan.hu jogasz.hu konyvelo.hu lakas.hu media.hu news.hu org.hu priv.hu reklam.hu sex.hu shop.hu sport.hu suli.hu szex.hu tm.hu tozsde.hu utazas.hu video.hu
+util_rb_2tld ac.id co.id go.id mil.id net.id or.id sch.id web.id
+util_rb_2tld gov.ie
+util_rb_2tld ac.il co.il gov.il idf.il k12.il muni.il net.il org.il
+util_rb_2tld ac.im co.im com.im gov.im net.im nic.im org.im
+util_rb_2tld ac.in co.in edu.in ernet.in firm.in gen.in gov.in ind.in mil.in net.in nic.in org.in res.in
+util_rb_2tld com.io gov.io mil.io net.io org.io
+util_rb_2tld gov.iq
+util_rb_2tld ac.ir co.ir gov.ir id.ir net.ir org.ir sch.ir
+util_rb_2tld edu.it gov.it
+util_rb_2tld ac.je co.je gov.je ind.je jersey.je ltd.je net.je org.je sch.je
+util_rb_2tld com.jm edu.jm gov.jm net.jm org.jm
+util_rb_2tld com.jo edu.jo gov.jo mil.jo net.jo org.jo
+util_rb_2tld ac.jp ad.jp aichi.jp akita.jp aomori.jp chiba.jp co.jp ed.jp ehime.jp fukui.jp fukuoka.jp fukushima.jp gifu.jp go.jp gov.jp gr.jp gunma.jp hiroshima.jp hokkaido.jp hyogo.jp ibaraki.jp ishikawa.jp iwate.jp kagawa.jp kagoshima.jp kanagawa.jp kanazawa.jp kawasaki.jp kitakyushu.jp kobe.jp kochi.jp kumamoto.jp kyoto.jp lg.jp matsuyama.jp mie.jp miyagi.jp miyazaki.jp nagano.jp nagasaki.jp nagoya.jp nara.jp ne.jp net.jp niigata.jp oita.jp okayama.jp okinawa.jp or.jp org.jp osaka.jp saga.jp saitama.jp sapporo.jp sendai.jp shiga.jp shimane.jp shizuoka.jp takamatsu.jp tochigi.jp tokushima.jp tokyo.jp tottori.jp toyama.jp utsunomiya.jp wakayama.jp yamagata.jp yamaguchi.jp yamanashi.jp yokohama.jp
+util_rb_2tld ac.ke co.ke go.ke ne.ke new.ke or.ke sc.ke
+util_rb_2tld com.kg edu.kg gov.kg mil.kg net.kg org.kg
+util_rb_2tld com.kh edu.kh gov.kh mil.kh net.kh org.kh per.kh
+util_rb_2tld ac.kr busan.kr chungbuk.kr chungnam.kr co.kr daegu.kr daejeon.kr es.kr gangwon.kr go.kr gwangju.kr gyeongbuk.kr gyeonggi.kr gyeongnam.kr hs.kr incheon.kr jeju.kr jeonbuk.kr jeonnam.kr kg.kr kyonggi.kr mil.kr ms.kr ne.kr or.kr pe.kr re.kr sc.kr seoul.kr ulsan.kr
+util_rb_2tld com.kw edu.kw gov.kw mil.kw net.kw org.kw
+util_rb_2tld com.ky edu.ky gov.ky net.ky org.ky
+util_rb_2tld com.kz edu.kz gov.kz mil.kz net.kz org.kz
+util_rb_2tld com.la net.la org.la
+util_rb_2tld com.lb edu.lb gov.lb mil.lb net.lb org.lb
+util_rb_2tld com.lc edu.lc gov.lc net.lc org.lc
+util_rb_2tld assn.lk com.lk edu.lk gov.lk grp.lk hotel.lk int.lk ltd.lk net.lk ngo.lk org.lk sch.lk soc.lk web.lk
+util_rb_2tld com.lr edu.lr gov.lr net.lr org.lr
+util_rb_2tld co.ls org.ls
+util_rb_2tld gov.lt mil.lt
+util_rb_2tld asn.lv com.lv conf.lv edu.lv gov.lv id.lv mil.lv net.lv org.lv
+util_rb_2tld biz.ly com.ly edu.ly gov.ly id.ly med.ly net.ly org.ly plc.ly sch.ly
+util_rb_2tld ac.ma co.ma gov.ma net.ma org.ma press.ma
+util_rb_2tld asso.mc tm.mc
+util_rb_2tld ac.me co.me edu.me gov.me its.me net.me org.me priv.me
+util_rb_2tld com.mg edu.mg gov.mg mil.mg nom.mg org.mg prd.mg tm.mg
+util_rb_2tld army.mil navy.mil
+util_rb_2tld com.mk org.mk
+util_rb_2tld com.mm edu.mm gov.mm net.mm org.mm
+util_rb_2tld edu.mn gov.mn org.mn
+util_rb_2tld com.mo edu.mo gov.mo net.mo org.mo
+util_rb_2tld music.mobi weather.mobi
+util_rb_2tld co.mp edu.mp gov.mp net.mp org.mp
+util_rb_2tld com.mt edu.mt gov.mt net.mt org.mt tm.mt uu.mt
+util_rb_2tld co.mu com.mu
+util_rb_2tld aero.mv biz.mv com.mv coop.mv edu.mv gov.mv info.mv int.mv mil.mv museum.mv name.mv net.mv org.mv pro.mv
+util_rb_2tld ac.mw co.mw com.mw coop.mw edu.mw gov.mw int.mw museum.mw net.mw org.mw
+util_rb_2tld com.mx edu.mx gob.mx net.mx org.mx
+util_rb_2tld com.my edu.my gov.my mil.my name.my net.my org.my
+util_rb_2tld alt.na com.na cul.na edu.na net.na org.na telecom.na unam.na
+util_rb_2tld com.nc net.nc org.nc
+util_rb_2tld de.net gb.net uk.net
+util_rb_2tld ac.ng com.ng edu.ng gov.ng net.ng org.ng sch.ng
+util_rb_2tld ac.ni biz.ni com.ni edu.ni gob.ni in.ni info.ni int.ni mil.ni net.ni nom.ni org.ni web.ni
+util_rb_2tld fhs.no folkebibl.no fylkesbibl.no herad.no idrett.no kommune.no mil.no museum.no priv.no stat.no tel.no vgs.no
+util_rb_2tld com.np edu.np gov.np mil.np net.np org.np
+util_rb_2tld biz.nr co.nr com.nr edu.nr fax.nr gov.nr info.nr mob.nr mobil.nr mobile.nr net.nr org.nr tel.nr tlf.nr
+util_rb_2tld ac.nz co.nz cri.nz geek.nz gen.nz govt.nz iwi.nz kiwi.nz maori.nz mil.nz net.nz org.nz parliament.nz school.nz
+util_rb_2tld ac.om biz.om co.om com.om edu.om gov.om med.om mil.om mod.om museum.om net.om org.om pro.om sch.om
+util_rb_2tld dk.org eu.org
+util_rb_2tld abo.pa ac.pa com.pa edu.pa gob.pa ing.pa med.pa net.pa nom.pa org.pa sld.pa
+util_rb_2tld com.pe edu.pe gob.pe mil.pe net.pe nom.pe org.pe
+util_rb_2tld com.pf edu.pf org.pf
+util_rb_2tld ac.pg com.pg net.pg
+util_rb_2tld com.ph edu.ph gov.ph mil.ph net.ph ngo.ph org.ph
+util_rb_2tld biz.pk com.pk edu.pk fam.pk gob.pk gok.pk gon.pk gop.pk gos.pk gov.pk net.pk org.pk web.pk
+util_rb_2tld art.pl biz.pl com.pl edu.pl gov.pl info.pl mil.pl net.pl ngo.pl org.pl
+util_rb_2tld biz.pr com.pr edu.pr gov.pr info.pr isla.pr name.pr net.pr org.pr pro.pr
+util_rb_2tld cpa.pro law.pro med.pro
+util_rb_2tld com.ps edu.ps gov.ps net.ps org.ps plo.ps sec.ps
+util_rb_2tld com.pt edu.pt gov.pt int.pt net.pt nome.pt org.pt publ.pt
+util_rb_2tld com.py edu.py gov.py net.py org.py
+util_rb_2tld com.qa edu.qa gov.qa net.qa org.qa
+util_rb_2tld asso.re com.re nom.re
+util_rb_2tld arts.ro com.ro firm.ro info.ro nom.ro nt.ro org.ro rec.ro store.ro tm.ro www.ro
+util_rb_2tld ac.rs co.rs edu.rs gov.rs in.rs org.rs
+util_rb_2tld ac.ru com.ru edu.ru gov.ru int.ru mil.ru net.ru org.ru pp.ru
+util_rb_2tld ac.rw co.rw com.rw edu.rw gouv.rw gov.rw int.rw mil.rw net.rw
+util_rb_2tld com.sa edu.sa gov.sa med.sa net.sa org.sa pub.sa sch.sa
+util_rb_2tld com.sb edu.sb gov.sb net.sb org.sb
+util_rb_2tld com.sc edu.sc gov.sc net.sc org.sc
+util_rb_2tld com.sd edu.sd gov.sd info.sd med.sd net.sd org.sd sch.sd tv.sd
+util_rb_2tld ab.se ac.se bd.se brand.se c.se d.se e.se f.se fh.se fhsk.se fhv.se g.se h.se i.se k.se komforb.se kommunalforbund.se komvux.se lanarb.se lanbib.se m.se mil.se n.se naturbruksgymn.se o.se org.se parti.se pp.se press.se s.se sshn.se t.se tm.se u.se w.se x.se y.se z.se
+util_rb_2tld com.sg edu.sg gov.sg idn.sg net.sg org.sg per.sg
+util_rb_2tld com.sh edu.sh gov.sh mil.sh net.sh org.sh
+util_rb_2tld edu.sk gov.sk mil.sk
+util_rb_2tld co.st com.st consulado.st edu.st embaixada.st gov.st mil.st net.st org.st principe.st saotome.st store.st
+util_rb_2tld com.sv edu.sv gob.sv org.sv red.sv
+util_rb_2tld com.sy gov.sy net.sy org.sy
+util_rb_2tld at.tf bg.tf ca.tf ch.tf cz.tf de.tf edu.tf eu.tf int.tf net.tf pl.tf ru.tf sg.tf us.tf
+util_rb_2tld ac.th co.th go.th in.th mi.th net.th or.th
+util_rb_2tld ac.tj biz.tj co.tj com.tj edu.tj go.tj gov.tj int.tj mil.tj name.tj net.tj org.tj web.tj
+util_rb_2tld com.tn edunet.tn ens.tn fin.tn gov.tn ind.tn info.tn intl.tn nat.tn net.tn org.tn rnrt.tn rns.tn rnu.tn tourism.tn
+util_rb_2tld gov.to
+util_rb_2tld gov.tp
+util_rb_2tld av.tr bbs.tr bel.tr biz.tr com.tr dr.tr edu.tr gen.tr gov.tr info.tr k12.tr mil.tr name.tr net.tr org.tr pol.tr tel.tr web.tr
+util_rb_2tld aero.tt at.tt au.tt be.tt biz.tt ca.tt co.tt com.tt coop.tt de.tt dk.tt edu.tt es.tt eu.tt fr.tt gov.tt info.tt int.tt it.tt jobs.tt mobi.tt museum.tt name.tt net.tt nic.tt org.tt pro.tt se.tt travel.tt uk.tt us.tt
+util_rb_2tld co.tv gov.tv
+util_rb_2tld club.tw com.tw ebiz.tw edu.tw game.tw gov.tw idv.tw mil.tw net.tw org.tw
+util_rb_2tld ac.tz co.tz go.tz ne.tz or.tz
+util_rb_2tld cherkassy.ua chernigov.ua chernovtsy.ua ck.ua cn.ua co.ua com.ua crimea.ua cv.ua dn.ua dnepropetrovsk.ua donetsk.ua dp.ua edu.ua gov.ua if.ua in.ua ivano-frankivsk.ua kh.ua kharkov.ua kherson.ua khmelnitskiy.ua kiev.ua kirovograd.ua km.ua kr.ua ks.ua kv.ua lg.ua lugansk.ua lutsk.ua lviv.ua mk.ua net.ua nikolaev.ua od.ua odessa.ua org.ua pl.ua poltava.ua rovno.ua rv.ua sebastopol.ua sumy.ua te.ua ternopil.ua uzhgorod.ua vinnica.ua vn.ua zaporizhzhe.ua zhitomir.ua zp.ua zt.ua
+util_rb_2tld ac.ug co.ug go.ug ne.ug or.ug sc.ug
+util_rb_2tld ac.uk bl.uk british-library.uk co.uk edu.uk gov.uk icnet.uk jet.uk ltd.uk me.uk mod.uk national-library-scotland.uk net.uk nhs.uk nic.uk nls.uk org.uk parliament.uk plc.uk police.uk sch.uk
+util_rb_2tld ak.us al.us ar.us az.us ca.us co.us ct.us dc.us de.us dni.us fed.us fl.us ga.us hi.us ia.us id.us il.us in.us isa.us kids.us ks.us ky.us la.us ma.us md.us me.us mi.us mn.us mo.us ms.us mt.us nc.us nd.us ne.us nh.us nj.us nm.us nsn.us nv.us ny.us oh.us ok.us or.us pa.us ri.us sc.us sd.us tn.us tx.us ut.us va.us vt.us wa.us wi.us wv.us wy.us
+util_rb_2tld com.uy edu.uy gub.uy mil.uy net.uy org.uy
+util_rb_2tld vatican.va
+util_rb_2tld arts.ve bib.ve co.ve com.ve edu.ve firm.ve gov.ve info.ve int.ve mil.ve net.ve nom.ve org.ve rec.ve store.ve tec.ve web.ve
+util_rb_2tld co.vi com.vi edu.vi gov.vi net.vi org.vi
+util_rb_2tld ac.vn biz.vn com.vn edu.vn gov.vn health.vn info.vn int.vn name.vn net.vn org.vn pro.vn
+util_rb_2tld ch.vu com.vu de.vu edu.vu fr.vu net.vu org.vu
+util_rb_2tld com.ws edu.ws gov.ws net.ws org.ws
+util_rb_2tld com.ye edu.ye gov.ye mil.ye net.ye org.ye
+util_rb_2tld ac.za alt.za bourse.za city.za co.za edu.za gov.za law.za mil.za net.za ngo.za nom.za org.za school.za tm.za web.za
+util_rb_2tld ac.zm co.zm  com.zm edu.zm gov.zm org.zm sch.zm
+util_rb_2tld ac.zw co.zw gov.zw org.zw
 #
 util_rb_2tld 110mb.com
 util_rb_2tld 9k.com
@@ -217,7 +518,7 @@
 util_rb_2tld funpic.de
 util_rb_2tld interii.pl
 util_rb_2tld selfip.com
-util_rb_2tld livejournal.com
+#util_rb_2tld livejournal.com - Removed per bug 6662 4/7/15 - KAM
 util_rb_2tld t3.to
 util_rb_2tld fx.to
 util_rb_2tld iespana.es
@@ -324,7 +625,10 @@
 util_rb_2tld in.net
 util_rb_2tld com.de
 util_rb_2tld biz.ua
-
+util_rb_2tld azurewebsites.net
+util_rb_2tld azureedge.net
+util_rb_2tld zohosites.com
+util_rb_2tld wixsite.com
 #
 util_rb_2tld neostrada.pl
 util_rb_2tld vv.cc
@@ -334,6 +638,7 @@
 util_rb_2tld tumblr.com
 util_rb_2tld fileave.com
 util_rb_2tld de.tl
+util_rb_2tld co.com
 # Dyndns.com
 util_rb_2tld dyndns-at-home.com
 util_rb_2tld dyndns-at-work.com
@@ -364,5 +669,78 @@
 util_rb_2tld no-ip.info
 util_rb_2tld no-ip.net
 util_rb_2tld no-ip.org
+#
+util_rb_2tld gotdns.ch
+util_rb_2tld ddnsking.com
+util_rb_2tld ddns.net
+util_rb_2tld bounceme.net
+util_rb_2tld hopto.org
+util_rb_2tld serveblog.net
+util_rb_2tld myftp.org
+util_rb_2tld myftp.biz
+
+
+#
+# 3rd level TLD list (SA 3.3+)
+#
+# There was a bug before 3.4.1(?), only one 3TLD per line works!
+#
+
+if (version >= 3.003000)
+
+util_rb_3tld demon.co.uk
+util_rb_3tld esc.edu.ar
+util_rb_3tld lkd.co.im
+util_rb_3tld plc.co.im
+util_rb_3tld ltd.co.im
+#
+util_rb_3tld bay.livefilestore.com
+util_rb_3tld blu.livefilestore.com
+util_rb_3tld groups.live.com
+util_rb_3tld spaces.live.com
+util_rb_3tld profile.live.com
+util_rb_3tld web.aplus.net
+util_rb_3tld cloud.prohosting.com
+util_rb_3tld skydrive.live.com
+util_rb_3tld docs.google.com
+util_rb_3tld spaces.msn.com
+util_rb_3tld blog.friendster.com
+util_rb_3tld plc.co.im
+util_rb_3tld ltd.co.im
+util_rb_3tld sakura.ne.jp
+util_rb_3tld web.officelive.com
+util_rb_3tld com.sapo.pt
+util_rb_3tld paginas.sapo.pt
+util_rb_3tld no.sapo.pt
+util_rb_3tld home.sapo.pt
+util_rb_3tld do.sapo.pt
+util_rb_3tld homepage.t-online.de
+util_rb_3tld privat.t-online.de
+util_rb_3tld web.fc2.com
+util_rb_3tld co.uk.pn
+util_rb_3tld com.au.pn
+util_rb_3tld co.at.pn
+util_rb_3tld co.at.lv
+util_rb_3tld or.at.lv
+util_rb_3tld co.at.tc
+util_rb_3tld qld.edu.au
+util_rb_3tld perso.neuf.fr
+util_rb_3tld perso.sfr.fr
+util_rb_3tld hop.clickbank.net
+util_rb_3tld user.icpnet.pl
+util_rb_3tld en.alibaba.com
+#
+util_rb_3tld blogspot.co.nz
+util_rb_3tld blogspot.co.uk
+util_rb_3tld blogspot.com.ar
+util_rb_3tld blogspot.com.au
+util_rb_3tld blogspot.com.br
+util_rb_3tld blogspot.com.es
+#
+util_rb_3tld no-ip.co.uk
+#
+util_rb_3tld mobile.web.tr
+
+endif
 
 
diff -Nru spamassassin-3.4.0/pkgrules/20_body_tests.cf spamassassin-3.4.2/pkgrules/20_body_tests.cf
--- spamassassin-3.4.0/pkgrules/20_body_tests.cf	2014-02-06 22:05:55.000000000 -0500
+++ spamassassin-3.4.2/pkgrules/20_body_tests.cf	2018-09-12 23:04:40.000000000 -0400
@@ -97,7 +97,7 @@
 # messages where generally there are lots of spaces mean the message is spam.
 # 8.532  10.6051   0.1897    0.982   0.75    0.01  T_VERTICAL_WORDS_TVD_1
 # bug 6149: avoid common .jp false positives
-header __SUBJECT_UTF8_B_ENCODED     Subject:raw =~ /=\?UTF-8\?B\?/
+header __SUBJECT_UTF8_B_ENCODED     Subject:raw =~ /=\?UTF-?8\?B\?/i
 body __TVD_SPACE_RATIO	eval:tvd_vertical_words('0','10')
 meta TVD_SPACE_RATIO    (__TVD_SPACE_RATIO && !__ISO_2022_JP_DELIM && !__SUBJECT_UTF8_B_ENCODED && !__HIGHBITS)
 
diff -Nru spamassassin-3.4.0/pkgrules/20_dnsbl_tests.cf spamassassin-3.4.2/pkgrules/20_dnsbl_tests.cf
--- spamassassin-3.4.0/pkgrules/20_dnsbl_tests.cf	2014-02-06 22:05:55.000000000 -0500
+++ spamassassin-3.4.2/pkgrules/20_dnsbl_tests.cf	2018-09-12 23:04:40.000000000 -0400
@@ -99,9 +99,9 @@
 
 # ---------------------------------------------------------------------------
 # Spamhaus ZEN includes SBL+CSS+XBL+PBL
+# http://www.spamhaus.org/faq/section/DNSBL%20Usage#200
 #
-# Spamhaus XBL contains both the Abuseat CBL (cbl.abuseat.org) and Blitzed
-# OPM (opm.blitzed.org) lists so it's not necessary to query those as well.
+# Spamhaus XBL contains the Abuseat CBL data (cbl.abuseat.org)
 
 header __RCVD_IN_ZEN            eval:check_rbl('zen', 'zen.spamhaus.org.')
 describe __RCVD_IN_ZEN          Received via a relay in Spamhaus Zen
@@ -124,18 +124,16 @@
 header RCVD_IN_PBL              eval:check_rbl('zen-lastexternal', 'zen.spamhaus.org.', '^127\.0\.0\.1[01]$')
 describe RCVD_IN_PBL            Received via a relay in Spamhaus PBL
 tflags RCVD_IN_PBL              net
-reuse  RCVD_IN_PBL              
+reuse  RCVD_IN_PBL
 
+# CSS is the Spamhaus CSS Component of the SBL List: http://www.spamhaus.org/css/
+header RCVD_IN_SBL_CSS		eval:check_rbl_sub('zen', '127.0.0.3')
+describe RCVD_IN_SBL_CSS	Received via a relay in Spamhaus SBL-CSS
+tflags RCVD_IN_SBL_CSS		net
+reuse  RCVD_IN_SBL_CSS
 
-# ---------------------------------------------------------------------------
 # Now, single zone BLs follow:
 
-# another domain-based blacklist
-header DNS_FROM_AHBL_RHSBL      eval:check_rbl_envfrom('ahbl', 'rhsbl.ahbl.org.')
-describe DNS_FROM_AHBL_RHSBL    Envelope sender listed in dnsbl.ahbl.org
-tflags DNS_FROM_AHBL_RHSBL      net
-reuse  DNS_FROM_AHBL_RHSBL
-
 # ---------------------------------------------------------------------------
 # NOTE: donation tests, see README file for details
 
@@ -150,23 +148,28 @@
 header RCVD_IN_MAPS_RBL         eval:check_rbl('rblplus', 'activationcode.r.mail-abuse.com.', '1')
 describe RCVD_IN_MAPS_RBL       Relay in RBL, http://www.mail-abuse.com/enduserinfo_rbl.html
 tflags RCVD_IN_MAPS_RBL         net
+reuse RCVD_IN_MAPS_RBL
 
 header RCVD_IN_MAPS_DUL         eval:check_rbl('rblplus-lastexternal', 'activationcode.r.mail-abuse.com.', '2')
 describe RCVD_IN_MAPS_DUL       Relay in DUL, http://www.mail-abuse.com/enduserinfo_dul.html
 tflags RCVD_IN_MAPS_DUL         net
+reuse RCVD_IN_MAPS_DUL
 
 header RCVD_IN_MAPS_RSS         eval:check_rbl_sub('rblplus', '4')
 describe RCVD_IN_MAPS_RSS       Relay in RSS, http://www.mail-abuse.com/enduserinfo_rss.html
 tflags RCVD_IN_MAPS_RSS         net
+reuse RCVD_IN_MAPS_RSS
 
 header RCVD_IN_MAPS_OPS         eval:check_rbl_sub('rblplus', '8')
 describe RCVD_IN_MAPS_OPS       Relay in OPS, http://www.mail-abuse.com/enduserinfo_ops.html
 tflags RCVD_IN_MAPS_OPS         net
+reuse RCVD_IN_MAPS_OPS
 
 # The NML isn't part of the RBL+ and I find any documentation for it - is it dead?
 header RCVD_IN_MAPS_NML         eval:check_rbl('nml', 'nonconfirm.mail-abuse.com.')
 describe RCVD_IN_MAPS_NML       Relay in NML, http://www.mail-abuse.com/enduserinfo_nml.html
 tflags RCVD_IN_MAPS_NML         net
+reuse RCVD_IN_MAPS_NML
 
 # ---------------------------------------------------------------------------
 # Section for DNS WL related lookups below.
@@ -174,10 +177,12 @@
 # IADB support ...
 header __RCVD_IN_IADB           eval:check_rbl('iadb-firsttrusted', 'iadb.isipp.com.')
 tflags __RCVD_IN_IADB           net nice
+reuse __RCVD_IN_IADB
 
 header RCVD_IN_IADB_VOUCHED     eval:check_rbl_sub('iadb-firsttrusted', '127.0.1.255')
 describe RCVD_IN_IADB_VOUCHED   ISIPP IADB lists as vouched-for sender
 tflags RCVD_IN_IADB_VOUCHED     net nice
+reuse RCVD_IN_IADB_VOUCHED
 
 # ---------------------------------------------------------------------------
 # Return Path Certified:
@@ -186,6 +191,7 @@
 header RCVD_IN_RP_CERTIFIED     eval:check_rbl_txt('ssc-firsttrusted', 'sa-trusted.bondedsender.org.')
 describe RCVD_IN_RP_CERTIFIED   Sender in ReturnPath Certified - Contact cert-sa@returnpath.net
 tflags RCVD_IN_RP_CERTIFIED     net nice
+reuse RCVD_IN_RP_CERTIFIED
 
 # Return Path Safe:
 # http://www.returnpath.net/internetserviceprovider/certification/
@@ -193,13 +199,14 @@
 header RCVD_IN_RP_SAFE     eval:check_rbl_txt('ssc-firsttrusted','sa-accredit.habeas.com.')
 describe RCVD_IN_RP_SAFE   Sender in ReturnPath Safe - Contact safe-sa@returnpath.net
 tflags RCVD_IN_RP_SAFE     net nice
+reuse RCVD_IN_RP_SAFE
 
 # Return Path Reputation Network Blacklist (RNBL):
 # https://senderscore.org/blacklistlookup/
 header RCVD_IN_RP_RNBL         eval:check_rbl('rnbl-lastexternal','bl.score.senderscore.com.')
 describe RCVD_IN_RP_RNBL       Relay in RNBL, https://senderscore.org/blacklistlookup/
 tflags RCVD_IN_RP_RNBL         net
-
+reuse RCVD_IN_RP_RNBL
 
 endif
 
@@ -209,12 +216,14 @@
 askdns   DKIMDOMAIN_IN_DWL  _DKIMDOMAIN_._vouch.dwl.spamhaus.org TXT /^([a-z]+ )*(transaction|list|all)( [a-z]+)*$/
 tflags   DKIMDOMAIN_IN_DWL  net nice
 describe DKIMDOMAIN_IN_DWL  Signing domain listed in Spamhaus DWL
+reuse    DKIMDOMAIN_IN_DWL
 
 askdns   __DKIMDOMAIN_IN_DWL_ANY  _DKIMDOMAIN_._vouch.dwl.spamhaus.org TXT
 tflags   __DKIMDOMAIN_IN_DWL_ANY  net nice
 describe __DKIMDOMAIN_IN_DWL_ANY  Any TXT response received from a Spamhaus DWL
+reuse    __DKIMDOMAIN_IN_DWL_ANY
 
-meta DKIMDOMAIN_IN_DWL_UNKNOWN    __DKIMDOMAIN_IN_DWL_ANY && !DKIMDOMAIN_IN_DWL
+meta     DKIMDOMAIN_IN_DWL_UNKNOWN  __DKIMDOMAIN_IN_DWL_ANY && !DKIMDOMAIN_IN_DWL
 tflags   DKIMDOMAIN_IN_DWL_UNKNOWN  net nice
 describe DKIMDOMAIN_IN_DWL_UNKNOWN  Unrecognized response from Spamhaus DWL
 
diff -Nru spamassassin-3.4.0/pkgrules/20_drugs.cf spamassassin-3.4.2/pkgrules/20_drugs.cf
--- spamassassin-3.4.0/pkgrules/20_drugs.cf	2014-02-06 22:05:55.000000000 -0500
+++ spamassassin-3.4.2/pkgrules/20_drugs.cf	2018-09-12 23:04:40.000000000 -0400
@@ -37,7 +37,7 @@
 # header rules
 # (only use sufficiently long drug name to make name unique)
 
-header SUBJECT_DRUG_GAP_C	Subject =~ /\bc.{0,2}i.{0,2}a.{0,2}l.{0,2}i.{0,2}s\b/i
+header SUBJECT_DRUG_GAP_C	Subject =~ /\bc[\sc]{0,2}i[\si]{0,2}a[\sa]{0,2}l[\sl]{0,2}i[\si]{0,2}s{1,3}\b/i
 describe SUBJECT_DRUG_GAP_C	Subject contains a gappy version of 'cialis'
 
 header SUBJECT_DRUG_GAP_L	Subject =~ /l.{0,2}e.{0,2}v.{0,2}i.{0,2}t.{0,2}r.{0,2}a/i
diff -Nru spamassassin-3.4.0/pkgrules/20_dynrdns.cf spamassassin-3.4.2/pkgrules/20_dynrdns.cf
--- spamassassin-3.4.0/pkgrules/20_dynrdns.cf	2014-02-06 22:05:55.000000000 -0500
+++ spamassassin-3.4.2/pkgrules/20_dynrdns.cf	2018-09-12 23:04:40.000000000 -0400
@@ -62,7 +62,7 @@
 # 12-218-225-223.client.mchsi.com [12.218.225.223]
 # pptp-81-30-186-139.ufanet.ru [81.30.186.139]
 # (require an alpha first, as legit HELO'ing-as-IP-address is hit otherwise)
-header __RDNS_DYNAMIC_IPADDR X-Spam-Relays-External =~ /^[^\]]+ rdns=\S*\d+[^\d\s]\d+[^\d\s]\d+[^\d\s]\d+\S*\.\S+\.\S/i
+header __RDNS_DYNAMIC_IPADDR X-Spam-Relays-External =~ /^[^\]]+ rdns=(?![^\s\]]+[-.]static[-.])\S*\d+[^\d\s]\d+[^\d\s]\d+[^\d\s]\d+\S*\.\S+\.\S/i
 describe __RDNS_DYNAMIC_IPADDR Relay HELO'd using suspicious hostname (IP addr 1)
 
 # dhcp024-210-034-053.columbus.rr.com [24.210.34.53]
@@ -159,11 +159,6 @@
 header __RDNS_DYNAMIC_NTL  X-Spam-Relays-External =~ /^[^\]]+ rdns=\S+\d+-\d+-cust\d+\.[a-z]{4,6}\.broadband\.ntl\.com/i
 describe __RDNS_DYNAMIC_NTL Relay HELO'd using suspicious hostname (NTL)
 
-# cp160000-a.mill1.nb.home.nl
-# cp341468-b.venra1.lb.home.nl
-header __RDNS_DYNAMIC_HOME_NL  X-Spam-Relays-External =~ /^[^\]]+ rdns=[a-z]{2}\d+-\S\.\S+\d\.[a-z]{2}\.home\.nl/i
-describe __RDNS_DYNAMIC_HOME_NL Relay HELO'd using suspicious hostname (Home.nl)
-
 # (I'm quite sure these may be a good spamsign in future)
 # nwblwi-nrp3-l10-a671.nwblwi.tds.net
 header __RDNS_DYNAMIC_TDS X-Spam-Relays-External =~ /^[^\]]+ rdns=\S+-[a-z]\d+\.[a-z]{6}\.tds\.net/i
@@ -196,7 +191,9 @@
 header __RDNS_DYNAMIC_ASAHI   X-Spam-Relays-External =~ /^[^\]]+ rdns=[a-z][0-9]+\.ppp\.asahi-net\.or\.jp/i
 
 # exceptions (bug 5397):
-header  __RDNS_STATIC         X-Spam-Relays-External =~ /^[^\]]+ rdns=\S*(?:fix|static|fixip)/i
+# exceptions: 66-220-155-151.mail-mail.facebook.com
+# exceptions: o167-89-97-77.outbound-mail.sendgrid.net (bug 7592)
+header  __RDNS_STATIC         X-Spam-Relays-External =~ /^[^\]]+ rdns=\S*(?:fix|static|fixip|dedicated|mail\-mail|outbound-mail)/i
 
 # bug 5586:
 header __CGATE_RCVD       Received =~ /by \S+ \(CommuniGate Pro/
@@ -207,7 +204,7 @@
 
 ###########################################################################
 
-meta RDNS_DYNAMIC   (__LAST_EXTERNAL_RELAY_NO_AUTH && !__RDNS_STATIC && (__RDNS_DYNAMIC_IPADDR || __RDNS_DYNAMIC_DHCP || __RDNS_DYNAMIC_HCC || __RDNS_DYNAMIC_ATTBI || __RDNS_DYNAMIC_ROGERS || __RDNS_DYNAMIC_ADELPHIA || __RDNS_DYNAMIC_DIALIN || __RDNS_DYNAMIC_HEXIP || __RDNS_DYNAMIC_SPLIT_IP || __RDNS_DYNAMIC_YAHOOBB || __RDNS_DYNAMIC_OOL || __RDNS_DYNAMIC_RR2   || __RDNS_DYNAMIC_COMCAST || __RDNS_DYNAMIC_TELIA || __RDNS_DYNAMIC_VTR || __RDNS_DYNAMIC_CHELLO_NO  || __RDNS_DYNAMIC_CHELLO_NL  || __RDNS_DYNAMIC_VELOX  || __RDNS_DYNAMIC_NTL  || __RDNS_DYNAMIC_HOME_NL  || __RDNS_DYNAMIC_TDS || __RDNS_DYNAMIC_VIRTUA || __RDNS_DYNAMIC_SPACELAN || __RDNS_INDICATOR_DYN || __RDNS_INDICATOR_RES || __RDNS_INDICATOR_TYPE2 || __RDNS_DYNAMIC_TTNET || __RDNS_DYNAMIC_ASAHI))
+meta RDNS_DYNAMIC   (__LAST_EXTERNAL_RELAY_NO_AUTH && !__RDNS_STATIC && (__RDNS_DYNAMIC_IPADDR || __RDNS_DYNAMIC_DHCP || __RDNS_DYNAMIC_HCC || __RDNS_DYNAMIC_ATTBI || __RDNS_DYNAMIC_ROGERS || __RDNS_DYNAMIC_ADELPHIA || __RDNS_DYNAMIC_DIALIN || __RDNS_DYNAMIC_HEXIP || __RDNS_DYNAMIC_SPLIT_IP || __RDNS_DYNAMIC_YAHOOBB || __RDNS_DYNAMIC_OOL || __RDNS_DYNAMIC_RR2   || __RDNS_DYNAMIC_COMCAST || __RDNS_DYNAMIC_TELIA || __RDNS_DYNAMIC_VTR || __RDNS_DYNAMIC_CHELLO_NO  || __RDNS_DYNAMIC_CHELLO_NL  || __RDNS_DYNAMIC_VELOX  || __RDNS_DYNAMIC_NTL  || __RDNS_DYNAMIC_TDS || __RDNS_DYNAMIC_VIRTUA || __RDNS_DYNAMIC_SPACELAN || __RDNS_INDICATOR_DYN || __RDNS_INDICATOR_RES || __RDNS_INDICATOR_TYPE2 || __RDNS_DYNAMIC_TTNET || __RDNS_DYNAMIC_ASAHI))
 describe RDNS_DYNAMIC Delivered to internal network by host with dynamic-looking rDNS
 
 meta RDNS_NONE      (__RDNS_NONE && !__CGATE_RCVD && !__DOMINO_RCVD)
diff -Nru spamassassin-3.4.0/pkgrules/20_fake_helo_tests.cf spamassassin-3.4.2/pkgrules/20_fake_helo_tests.cf
--- spamassassin-3.4.0/pkgrules/20_fake_helo_tests.cf	2014-02-06 22:05:55.000000000 -0500
+++ spamassassin-3.4.2/pkgrules/20_fake_helo_tests.cf	2018-09-12 23:04:40.000000000 -0400
@@ -33,9 +33,15 @@
 # cmr-208-124-139-194.cr.net.cable.rogers.com) [208.124.139.194]
 # cmr-208-97-119-114.cr.net.cable.rogers.com) [208.97.119.114]
 header __HELO_STATIC_ROGERS X-Spam-Relays-External =~ /^[^\]]+ helo=cmr-\d{1,3}-\d{1,3}-\d{1,3}-\d{1,3}\S+\.rogers\.com[^\]]+ auth= /i
-describe HELO_STATIC_HOST Relay HELO'd using static hostname
-meta HELO_STATIC_HOST (__HELO_STATIC_ROGERS)
 
+# o167-89-97-77.outbound-mail.sendgrid.net (bug 7592)
+header __HELO_STATIC_SENDGRID X-Spam-Relays-External =~ /^[^\]]+ helo=o\d{1,3}-\d{1,3}-\d{1,3}-\d{1,3}\.outbound-mail\.sendgrid\.net\s[^\]]+ auth= /i
+
+# 50-203-126-142-static.hfc.comcastbusiness.net
+header __HELO_STATIC_COMCAST X-Spam-Relays-External =~ /^[^\]]+ helo=\d{1,3}-\d{1,3}-\d{1,3}-\d{1,3}-static\.hfc\.comcastbusiness\.net\s[^\]]+ auth= /i
+
+describe HELO_STATIC_HOST Relay HELO'd using static hostname
+meta HELO_STATIC_HOST (__HELO_STATIC_ROGERS || __HELO_STATIC_SENDGRID || __HELO_STATIC_COMCAST)
 
 # ---------------------------------------------------------------------------
 
@@ -80,7 +86,7 @@
 # 74.67-201-80.adsl.skynet.be [80.201.67.74]
 # 12-218-225-223.client.mchsi.com [12.218.225.223]
 # (require an alpha first, as legit HELO'ing-as-IP-address is hit otherwise)
-header __HELO_DYNAMIC_IPADDR X-Spam-Relays-External =~ /^[^\]]+ helo=[a-z]\S*\d+[^\d\s]\d+[^\d\s]\d+[^\d\s]\d+[^\d\s][^\.]*\.\S+\.\S+[^\]]+ auth= /i
+header __HELO_DYNAMIC_IPADDR X-Spam-Relays-External =~ /^[^\]]+ helo=(?![^\s\]]+[-.]static[-.])[a-z]\S*\d+[^\d\s]\d+[^\d\s]\d+[^\d\s]\d+[^\d\s][^\.]*\.\S+\.\S+[^\]]+ auth= /i
 meta HELO_DYNAMIC_IPADDR (__HELO_DYNAMIC_IPADDR && !HELO_STATIC_HOST)
 describe HELO_DYNAMIC_IPADDR Relay HELO'd using suspicious hostname (IP addr 1)
 
@@ -127,7 +133,7 @@
 # 113x35x70x11.ap113.ftth.ucom.ne.jp [113.35.70.11]
 # 98x9x3p5siouq.kvknv3sv1quk.3ejp4xzv.com [213.250.20.156]
 # 1.0/24.137.95.202.in-addr.arpa [202.95.137.1]
-header __HELO_DYNAMIC_IPADDR2 X-Spam-Relays-External =~ /^[^\]]+ helo=\d{1,3}(?:[\Wx_]\d{1,3}){3}[^\d\s][^\s.]*\.\S+\.\S+[^\]]+ auth= /i
+header __HELO_DYNAMIC_IPADDR2 X-Spam-Relays-External =~ /^[^\]]+ helo=(?![^\s\]]+[-.]static[-.])\d{1,3}(?:[\Wx_]\d{1,3}){3}[^\d\s][^\s.]*\.\S+\.\S+[^\]]+ auth= /i
 meta HELO_DYNAMIC_IPADDR2  (__HELO_DYNAMIC_IPADDR2 && !HELO_DYNAMIC_SPLIT_IP)
 describe HELO_DYNAMIC_IPADDR2 Relay HELO'd using suspicious hostname (IP addr 2)
 
diff -Nru spamassassin-3.4.0/pkgrules/20_freemail.cf spamassassin-3.4.2/pkgrules/20_freemail.cf
--- spamassassin-3.4.0/pkgrules/20_freemail.cf	2014-02-06 22:05:55.000000000 -0500
+++ spamassassin-3.4.2/pkgrules/20_freemail.cf	2018-09-12 23:04:40.000000000 -0400
@@ -27,7 +27,7 @@
 
 body     __freemail_safe_fwd  /---\s?(?:(?:Forwarded|Original) message|Alkuper.inen viesti)/i
 header   __freemail_safe_rls  X-Spam-Relays-External =~ /^[^\]]+ rdns=\S+\.(?:tfbnw\.net|ebay\.com|tieto\.com) /
-meta     __freemail_safe      __freemail_safe_fwd || __ML2 || __ML4 || __HAS_X_MAILING_LIST || __freemail_safe_rls
+meta     __freemail_safe      __freemail_safe_fwd || __ML2 || __ML4 || __HAS_X_MAILING_LIST || __HAS_X_MAILMAN_VERSION || __freemail_safe_rls
 
 header   __freemail_replyto  eval:check_freemail_replyto('replyto')
 meta     FREEMAIL_REPLYTO  __freemail_replyto && !__freemail_safe
diff -Nru spamassassin-3.4.0/pkgrules/20_freemail_domains.cf spamassassin-3.4.2/pkgrules/20_freemail_domains.cf
--- spamassassin-3.4.0/pkgrules/20_freemail_domains.cf	2014-02-06 22:05:55.000000000 -0500
+++ spamassassin-3.4.2/pkgrules/20_freemail_domains.cf	2018-09-12 23:04:40.000000000 -0400
@@ -31,6 +31,8 @@
 #                 for (@F) { s/\./\\./g; s/\?/./g; s/\*/[^.]*/g; print }
 #               }' rules/*.cf |grep -wvf- FILE
 
+# Updated 2016-08-18-axb
+
 ifplugin Mail::SpamAssassin::Plugin::FreeMail
 
 # Initial import from old FreeMail.pm / 090428
@@ -42,97 +44,97 @@
 freemail_domains 444.net 4email.com 4email.net 4newyork.com 50mail.com 55mail.cc 5fm.za.com
 freemail_domains 6210.hu 6sens.com 702mail.co.za 7110.hu 8848.net 8m.com 8m.net 8x.com.br 8u8.com 8u8.hk 8u8.tw 9.cn
 freemail_domains a-topmail.at about.com abv.bg acceso.or.cr access4less.net accessgcc.com
-freemail_domains accountant.com acmemail.net activist.com adexec.com adiga.com adinet.com.uy
-freemail_domains adres.nl advalvas.be aeiou.pt aeneasmail.com africamail.com afrik.com
+freemail_domains acmemail.net adiga.com adinet.com.uy
+freemail_domains adres.nl advalvas.be aeiou.pt aeneasmail.com afrik.com
 freemail_domains afropoets.com aggies.com ahaa.dk aichi.com aim.com airpost.net aiutamici.com
 freemail_domains aklan.com aknet.kg alabama.usa.com alaska.usa.com alavatotal.com
-freemail_domains albafind.com albawaba.com alburaq.net aldeax.com aldeax.com.ar alex4all.com
-freemail_domains alexandria.cc algeria.com alice.it alinto.com allergist.com allmail.net
-freemail_domains alskens.dk altavista.se altbox.org alternativagratis.com alum.com alumni.com
-freemail_domains alumnidirector.com alunos.unipar.br alvilag.hu amenworld.com america.hm
+freemail_domains albafind.com albawaba.com alburaq.net aldeax.com aldeax.com.ar alex4all.com  aliyun.com
+freemail_domains alexandria.cc algeria.com alice.it alinto.com allmail.net
+freemail_domains alskens.dk altavista.se altbox.org alternativagratis.com alum.com
+freemail_domains alunos.unipar.br alvilag.hu amenworld.com america.hm
 freemail_domains americamail.com amnetsal.com amorous.com ananzi.co.za anet.ne.jp anfmail.com
-freemail_domains angelfire.com angelic.com animail.net aniverse.com anjungcafe.com
+freemail_domains angelfire.com animail.net aniverse.com anjungcafe.com
 freemail_domains another.com antedoonsub.com antwerpen.com anunciador.net anytimenow.com
 freemail_domains aol.* aol.co*.* aon.at apexmail.com apollo.lv approvers.net aprava.com
-freemail_domains apropo.ro archaeologist.com arcor.de arcticmail.com argentina.com
+freemail_domains apropo.ro arcor.de argentina.com
 freemail_domains arizona.usa.com arkansas.usa.com armmail.com army.com arnet.com.ar aroma.com
-freemail_domains arrl.net artlover.com aruba.it asheville.com asia-links.com asia-mail.com
-freemail_domains asia.com asiamail.com assala.com assamesemail.com asurfer.com atheist.com
+freemail_domains arrl.net aruba.it asheville.com asia-links.com
+freemail_domains asiamail.com assala.com assamesemail.com asurfer.com
 freemail_domains atl.lv atlas.cz atlas.sk atozasia.com atreillou.com att.net *.att.ne.jp au.ru aubenin.com
-freemail_domains aus-city.com aussiemail.com.au australiamail.com avasmail.com.mv axarnet.com
+freemail_domains aus-city.com aussiemail.com.au avasmail.com.mv axarnet.com
 freemail_domains ayna.com azet.sk babbalu.com badgers.com bakpaka.com bakpaka.net
 freemail_domains balochistan.org baluch.com bama-fan.com bancora.net bankersmail.com
-freemail_domains barlick.net bartender.net beeebank.com beehive.org
+freemail_domains barlick.net beeebank.com beehive.org
 freemail_domains been-there.com beirut.com belizehome.com belizemail.net
-freemail_domains belizeweb.com bellsouth.net berlin.com berlin.de bestmail.us bflomail.com
+freemail_domains belizeweb.com bellsouth.net berlin.de bestmail.us bflomail.com
 freemail_domains bgnmail.com bharatmail.com big-orange.com bigboss.cz bigfoot.com bigger.com
-freemail_domains bigmailbox.com bigmir.net bigstring.com bikerider.com bip.net birdlover.com
+freemail_domains bigmailbox.com bigmir.net bigstring.com bip.net bigpond.com
 freemail_domains bitwiser.com biz.by bizhosting.com black-sea.ro blackburnmail.com
 freemail_domains blackglobalnetwork.net blink182.net blue.devils.com bluebottle.com
-freemail_domains bluemail.ch blumail.org blvds.com boardermail.com bol.com.br bolando.com
+freemail_domains bluemail.ch blumail.org blvds.com bol.com.br bolando.com
 freemail_domains bollywood2000.com bollywoodz.com bolt.com bombka.dyn.pl bonbon.net boom.com
 freemail_domains bootmail.com bostonoffice.com box.az boxbg.com boxemail.com brain.com.pk
-freemail_domains brasilia.net bravanese.com brazilmail.com brazilmail.com.br breathe.com
-freemail_domains brestonline.com brew-master.com brfree.com.br brujula.net btcc.org
+freemail_domains brasilia.net bravanese.com brazilmail.com.br breathe.com
+freemail_domains brestonline.com brfree.com.br brujula.net btcc.org
 freemail_domains buffaloes.com bulgaria.com bulldogs.com bumerang.ro burntmail.com
 freemail_domains butch-femme.net buzy.com buzzjakkerz.com c-box.cz c3.hu c4.com cadinfo.net
-freemail_domains calcfacil.com.br calcware.org california.usa.com californiamail.com
+freemail_domains calcfacil.com.br calcware.org california.usa.com
 freemail_domains callnetuk.com camaroclubsweden.com canada-11.com canada.com canal21.com
 freemail_domains canoemail.com caramail.com cardblvd.com care-mail.com care2.com caress.com
 freemail_domains carioca.net cashette.com casino.com casinomail.com cataloniamail.com
-freemail_domains catalunyamail.com cataz.com catcha.com catholic.org caths.co.uk catlover.com
+freemail_domains catalunyamail.com cataz.com catcha.com catholic.org caths.co.uk
 freemail_domains caxess.net cbrmail.com cc.lv cemelli.com centoper.it centralpets.com
-freemail_domains centrum.cz centrum.sk cercaziende.it cgac.es chaiyo.com chaiyomail.com
-freemail_domains chance2mail.com channelonetv.com chattown.com checkitmail.at cheerful.com
-freemail_domains chef.net chelny.com chemist.com cheshiremail.com chil-e.com chillimail.com
-freemail_domains china.com chinamail.com christianmail.org ciaoweb.it cine.com ciphercom.net
+freemail_domains centrum.cz centrum.sk centurylink.net cercaziende.it cgac.es chaiyo.com chaiyomail.com
+freemail_domains chance2mail.com channelonetv.com charter.net chattown.com checkitmail.at
+freemail_domains chelny.com cheshiremail.com chil-e.com chillimail.com
+freemail_domains china.com christianmail.org ciaoweb.it cine.com ciphercom.net
 freemail_domains circlemail.com cititrustbank1.cjb.net citromail.hu citynetusa.com ciudad.com.ar
-freemail_domains claramail.com classicmail.co.za clerk.com cliffhanger.com clix.pt
-freemail_domains close2you.net cluemail.com clujnapoca.ro collector.org collegeclub.com
-freemail_domains colombia.com colorado.usa.com columnist.com comcast.net comfortable.com
-freemail_domains comic.com compaqnet.fr compuserve.com computer.net computermail.net
+freemail_domains claramail.com classicmail.co.za cliffhanger.com clix.pt
+freemail_domains close2you.net cluemail.com clujnapoca.ro collegeclub.com
+freemail_domains colombia.com colorado.usa.com comcast.net comfortable.com
+freemail_domains compaqnet.fr compuserve.com computer.net computermail.net
 freemail_domains computhouse.com conevyt.org.mx connect4free.net connecticut.usa.com
-freemail_domains consultant.com contractor.net coolgoose.com coolkiwi.com coollist.com
+freemail_domains coolgoose.com coolkiwi.com coollist.com coxinet.net
 freemail_domains coolmail.com coolmail.net coolsend.com cooltoad.com cooperation.net
 freemail_domains copacabana.com copticmail.com corporateattorneys.com corporation.net
 freemail_domains correios.net.br correomagico.com cosmo.com cosmosurf.net cougars.com
-freemail_domains counsellor.com count.com countrybass.com couple.com criticalpath.net
+freemail_domains count.com countrybass.com couple.com criticalpath.net
 freemail_domains critterpost.com crosspaths.net crosswinds.net cryingmail.com cs.com
-freemail_domains csucsposta.hu cumbriamail.com curio-city.com custmail.com cutey.com
-freemail_domains cwazy.co.uk cwazy.net cww.de cyber-wizard.com cyberaccess.com.pk
-freemail_domains cyberdude.com cybergal.com cybergirls.dk cyberguys.dk cybernet.it cymail.net
-freemail_domains dabsol.net dada.net dadanet.it dailypioneer.com dallasmail.com damuc.org.br
+freemail_domains csucsposta.hu cumbriamail.com curio-city.com custmail.com
+freemail_domains cwazy.co.uk cwazy.net cww.de cyberaccess.com.pk
+freemail_domains cybergirls.dk cyberguys.dk cybernet.it cymail.net
+freemail_domains dabsol.net dada.net dadanet.it dailypioneer.com damuc.org.br
 freemail_domains dansegulvet.com darkhorsefan.net data54.com davegracey.com dayzers.com
-freemail_domains dbmail.com dbzmail.com dcemail.com dcsi.net deacons.com deadlymob.org deal-maker.com
+freemail_domains daum.net dbmail.com dcemail.com dcsi.net deacons.com deadlymob.org deal-maker.com
 freemail_domains dearriba.com degoo.com delajaonline.org delaware.usa.com delfi.lv
-freemail_domains delhimail.com deliveryman.com demon.deacons.com desertonline.com
+freemail_domains delhimail.com demon.deacons.com desertonline.com
 freemail_domains desidrivers.com deskpilot.com despammed.com detik.com devils.com dexara.net
-freemail_domains dhmail.net di-ve.com didamail.com digitaltrue.com diplomats.com
-freemail_domains direccion.com director-general.com diri.com discardmail.com disciples.com
-freemail_domains discoverymail.net disinfo.net disposable.com djmillenium.com dmailman.com
-freemail_domains dnsmadeeasy.com do.net.ar doctor.com dodgeit.com doglover.com dogmail.co.uk
+freemail_domains dhmail.net di-ve.com didamail.com digitaltrue.com
+freemail_domains direccion.com director-general.com diri.com discardmail.com
+freemail_domains discoverymail.net disinfo.net djmillenium.com dmailman.com
+freemail_domains dnsmadeeasy.com do.net.ar dodgeit.com dogmail.co.uk
 freemail_domains doityourself.com domaindiscover.com domainmanager.com doneasy.com
-freemail_domains dontexist.org doramail.com dores.com dostmail.com dot5hosting.com dotcom.fr
-freemail_domains dotnow.com dott.it doubt.com dplanet.ch dr.com dragoncon.net dragonfans.com
-freemail_domains dropzone.com dserver.org dubaiwebcity.com dublin.com dublin.ie dustdevil.com
-freemail_domains dutchmail.com dynamitemail.com dyndns.org e-apollo.lv e-hkma.com
+freemail_domains dontexist.org dores.com dostmail.com dot5hosting.com dotcom.fr
+freemail_domains dotnow.com dott.it doubt.com dplanet.ch dragoncon.net dragonfans.com
+freemail_domains dropzone.com dserver.org dubaiwebcity.com dublin.ie dustdevil.com
+freemail_domains dynamitemail.com dyndns.org e-apollo.lv e-hkma.com
 freemail_domains e-mail.cz e-mail.ph e-mailanywhere.com e-milio.com e-tapaal.com e-webtec.com earthalliance.com
 freemail_domains earthling.net eastmail.com eastrolog.com easy-pages.com easy.com
 freemail_domains easyinfomail.co.za easypeasy.com echina.com ecn.org ecplaza.net eircom.net
 freemail_domains edsamail.com.ph educacao.te.pt edumail.co.za eeism.com ego.co.th ekolay.net
-freemail_domains elforotv.com.ar elitemail.org elsitio.com eltimon.com elvis.com elvisfan.com
-freemail_domains email.com email.com.br email.cz email.bg email.it email.lu email.lviv.ua email.nu
+freemail_domains elforotv.com.ar elitemail.org elsitio.com eltimon.com elvis.com
+freemail_domains email.com.br email.cz email.bg email.it email.lu email.lviv.ua email.nu
 freemail_domains email.ro email.si email2me.com emailacc.com emailaccount.com
 freemail_domains emailaddresses.com emailchoice.com emailcorner.net emailn.de emailengine.net
 freemail_domains emailengine.org emailgaul.com emailgroups.net emailhut.net emailpinoy.com
-freemail_domains emailplanet.com emailplus.org emailuser.net ematic.com embroideryforums.com
-freemail_domains eml.cc emoka.ro emptymail.com enel.net enelpunto.net engineer.com
-freemail_domains england.com englandmail.com enterate.com.ar entryweb.it entusiastisk.com
+freemail_domains emailplanet.com emailplus.org emailuser.net ematic.com embarqmail.com
+freemail_domains embroideryforums.com eml.cc emoka.ro emptymail.com enel.net enelpunto.net
+freemail_domains england.com enterate.com.ar entryweb.it entusiastisk.com
 freemail_domains enusmail.com epatra.com epix.net epomail.com epost.de eprompter.com eqqu.com
 freemail_domains eramail.co.za eresmas.com eriga.lv ertelecom.ru esde-s.org esfera.cl estadao.com.br
-freemail_domains etllao.com euromail.net europe.com europemail.com euroseek.com
+freemail_domains etllao.com euromail.net euroseek.com
 freemail_domains euskalmail.com evafan.com everyday.com.kh everymail.net everyone.net
-freemail_domains excite.* excite.co*.* execs.com execs2k.com executivemail.co.za
+freemail_domains excite.* excite.co*.* execs2k.com executivemail.co.za
 freemail_domains expn.com ezilon.com ezrs.com f-m.fm facilmail.com fadrasha.net fadrasha.org
 freemail_domains faithhighway.com faithmail.com familymailbox.com familyroll.com
 freemail_domains familysafeweb.net fan.com fan.net faroweb.com fast-email.com fast-mail.org
@@ -140,20 +142,20 @@
 freemail_domains fastimap.com fastmail.* fastmail.co*.* fastmailbox.net
 freemail_domains fastmessaging.com fastwebmail.it fawz.net fea.st federalcontractors.com
 freemail_domains fedxmail.com feelings.com female.ru fepg.net ffanet.com fiberia.com
-freemail_domains filipinolinks.com financesource.com financier.com findmail.com fireman.net
+freemail_domains filipinolinks.com financesource.com findmail.com
 freemail_domains fiscal.net flashmail.com flipcode.com florida.usa.com floridagators.com
-freemail_domains fmail.co.uk fmailbox.com fmgirl.com fmguy.com fnmail.com footballer.com  foxmail.com
+freemail_domains fmail.co.uk fmailbox.com fmgirl.com fmguy.com fnmail.com footballer.com foxmail.com
 freemail_domains forfree.at forsythmissouri.org fortuncity.com forum.dk free.com.pe free.fr
 freemail_domains free.net.nz freeaccess.nl freegates.be freeghana.com freehosting.nl
 freemail_domains freei.co.th freeler.nl freemail.* freemail.*.* freemail.globalsite.com.br
 freemail_domains freemuslim.net freenet.de freenet.kg freeola.net freepgs.com freesbee.fr
 freemail_domains freeserve.co.uk freeservers.com freestart.hu freesurf.ch freesurf.fr
 freemail_domains freesurf.nl freeuk.com freeuk.net freeweb.it freewebemail.com freeyellow.com
-freemail_domains frisurf.no fsmail.net fsnet.co.uk ftml.net fuelie.org
+freemail_domains frisurf.no frontiernet.net fsmail.net fsnet.co.uk ftml.net fuelie.org
 freemail_domains fun-greetings-jokes.com fun.21cn.com fusemail.com fut.es gala.net
-freemail_domains galmail.co.za gamebox.net gamecocks.com gardener.com gawab.com gay.com
+freemail_domains galmail.co.za gamebox.net gamecocks.com gawab.com gay.com
 freemail_domains gaymailbox.com gaza.net gazeta.pl gci.net gdi.net geeklife.com gemari.or.id
-freemail_domains genxemail.com geologist.com geopia.com georgia.usa.com germanymail.com
+freemail_domains genxemail.com geopia.com georgia.usa.com getmail.no
 freemail_domains ggaweb.ch giga4u.de gjk.dk glay.org glendale.net globalfree.it globomail.com
 freemail_domains globalpinoy.com globalsite.com.br globalum.com globetrotter.net gmail.com
 freemail_domains gmx.* go-bama.com go-cavs.com go-chargers.com go-dawgs.com go-gators.com
@@ -165,60 +167,60 @@
 freemail_domains go.yellow-jackets.com go2net.com go4.it gofree.co.uk golfemail.com
 freemail_domains goliadtexas.com gomail.com.ua gonowmail.com gonuts4free.com googlemail.com
 freemail_domains goplay.com gorontalo.net gotmail.com gotomy.com govzone.com grad.com
-freemail_domains graduate.org graffiti.net graphic-designer.com gratisweb.com gtechnics.com
+freemail_domains graffiti.net gratisweb.com gtechnics.com
 freemail_domains guate.net guessmail.com gwalla.com h-mail.us haberx.com hailmail.net
-freemail_domains hairdresser.net halejob.com hamptonroads.com handbag.com happemail.com
+freemail_domains halejob.com hamptonroads.com handbag.com hanmail.net happemail.com
 freemail_domains happycounsel.com hawaii.com hawaii.usa.com hayahaya.tg hedgeai.com
-freemail_domains heesun.net heremail.com hetnet.nl highveldmail.co.za hilarious.com hildebrands.de
+freemail_domains heesun.net heremail.com hetnet.nl highveldmail.co.za hildebrands.de
 freemail_domains hingis.org hispavista.com hitmanrecords.com hockeyghiaccio.com
 freemail_domains hockeymail.com holapuravida.com home.no.net home.ro home.se homelocator.com
 freemail_domains homemail.co.za homenetmail.com homestead.com homosexual.net hongkong.com hong-kong-1.com
-freemail_domains hopthu.com hosanna.net hot-shot.com hot.ee hotbot.com hotbox.ru hotcoolmail.com hotdak.com
+freemail_domains hopthu.com hosanna.net hot.ee hotbot.com hotbox.ru hotcoolmail.com hotdak.com
 freemail_domains hotfire.net hotinbox.com hotmail.* hotmail.co*.*
-freemail_domains hotpop.com hotvoice.com hour.com housemail.com howling.com huhmail.com
-freemail_domains humanoid.net humour.com hurra.de hush.ai hush.com hushmail.com huskies.com
+freemail_domains hotpop.com hotvoice.com hour.com howling.com huhmail.com
+freemail_domains humour.com hurra.de hush.ai hush.com hushmail.com huskies.com
 freemail_domains hutchcity.com i-france.com i-p.com i12.com i2828.com ibatam.com ibest.com.br
-freemail_domains ibizdns.com icafe.com ice.is icestorm.com icq.com icqmail.com icrazy.com
+freemail_domains ibizdns.com icafe.com ice.is icestorm.com icloud.com icq.com icqmail.com icrazy.com
 freemail_domains id.ru idaho.usa.com idirect.com idncafe.com ieg.com.br iespalomeras.net
 freemail_domains iespana.es ifrance.com ig.com.br ignazio.it illinois.usa.com ilse.net
 freemail_domains ilse.nl imail.ru imailbox.com imap-mail.com imap.cc imapmail.org imel.org
-freemail_domains in-box.net iname.com inbox.com inbox.ge inbox.lv inbox.net inbox.ru in.com
+freemail_domains in-box.net inbox.com inbox.ge inbox.lv inbox.net inbox.ru in.com
 freemail_domains incamail.com indexa.fr india.com indiamail.com indiana.usa.com
 freemail_domains indiatimes.com induquimica.org inet.com.ua infinito.it infoapex.com
 freemail_domains infohq.com infomail.es infomart.or.jp infosat.net infovia.com.ar inicia.es
-freemail_domains inmail.sk inmail24.com innocent.com inorbit.com inoutbox.com instruction.com
-freemail_domains instructor.net insurer.com intelnet.net.gt intelnett.com interblod.com
+freemail_domains inmail.sk inmail24.com inoutbox.com
+freemail_domains intelnet.net.gt intelnett.com interblod.com
 freemail_domains interfree.it interia.pl interlap.com.ar intermail.hu internet-e-mail.com
 freemail_domains internet-mail.org internet.lu internetegypt.com internetemails.net
 freemail_domains internetmailing.net inwind.it iobox.com iobox.fi iol.it iol.pt iowa.usa.com
-freemail_domains ip3.com ipermitmail.com iqemail.com iquebec.com iran.com irangate.net irelandmail.com
+freemail_domains ip3.com ipermitmail.com iqemail.com iquebec.com iran.com irangate.net
 freemail_domains iscool.net islandmama.com ismart.net isonews2.com isonfire.com isp9.net
-freemail_domains ispey.com israelmail.com italymail.com itelgua.com itloox.com itmom.com
+freemail_domains ispey.com itelgua.com itloox.com itmom.com
 freemail_domains ivenus.com iwan-fals.com iwon.com ixp.net japan.com jaydemail.com
 freemail_domains jedrzejow.pl jetemail.net jingjo.net jippii.fi jmail.co.za jojomail.com
-freemail_domains journalist.com jovem.te.pt joymail.com jubii.dk jubiipost.dk jumpy.it
+freemail_domains jovem.te.pt joymail.com jubii.dk jubiipost.dk jumpy.it
 freemail_domains juno.com justemail.net justmailz.com k.ro kaazoo.com kabissa.org kaixo.com
 freemail_domains kalluritimes.com kalpoint.com kansas.usa.com katamail.com kataweb.it
-freemail_domains kayafmmail.co.za keko.com.ar kentucky.usa.com keptprivate.com keromail.com kittymail.com
-freemail_domains kiwitown.com klik.it klikni.cz kmtn.ru koko.com kolozsvar.ro kombud.com
-freemail_domains koreamail.com koreanmail.com kotaksuratku.info krunis.com kukamail.com
+freemail_domains kayafmmail.co.za keko.com.ar kentucky.usa.com keptprivate.com
+freemail_domains kimo.com kiwitown.com klik.it klikni.cz kmtn.ru koko.com kolozsvar.ro kombud.com
+freemail_domains koreanmail.com kotaksuratku.info krunis.com kukamail.com
 freemail_domains kuronowish.com kyokodate.com kyokofukada.net ladymail.cz lagoon.nc
 freemail_domains lahaonline.com lamalla.net lancsmail.com land.ru laposte.net latinmail.com
 freemail_domains lawyer.com lawyersmail.com lawyerzone.com lebanonatlas.com leehom.net
-freemail_domains legislator.com leonardo.it leonlai.net letsjam.com letterbox.org
+freemail_domains leonardo.it leonlai.net letsjam.com letterbox.org
 freemail_domains letterboxes.org levele.com lexpress.net libero.it liberomail.com
 freemail_domains libertysurf.net libre.net lightwines.org linkmaster.com linuxfreemail.com
-freemail_domains linuxmail.org lionsfan.com.au live.* livedoor.com llandudno.com
-freemail_domains llangollen.com lmxmail.sk lobbyist.com loggain.net loggain.nu lolnetwork.net
+freemail_domains lionsfan.com.au live.* livedoor.com llandudno.com
+freemail_domains llangollen.com lmxmail.sk loggain.net loggain.nu lolnetwork.net
 freemail_domains london.com longhorns.com look.com looksmart.co.uk looksmart.com
 freemail_domains looksmart.com.au loteria.net lotonazo.com louisiana.usa.com louiskoo.com
 freemail_domains loveable.com lovemail.com lovingjesus.com lpemail.com luckymail.com luso.pt
 freemail_domains lusoweb.pt luukku.com lycos.* lycos.co*.* lycosmail.com mac.com
-freemail_domains machinecandy.com macmail.com mad.scientist.com madcrazy.com madonnafan.com
-freemail_domains madonno.com madrid.com magicmail.co.za magik-net.com mail-atlas.net
+freemail_domains machinecandy.com macmail.com mad.scientist.com madcrazy.com
+freemail_domains madonno.com madrid.com mag2.com magicmail.co.za magik-net.com mail-atlas.net
 freemail_domains mail-awu.de mail-box.cz mail.by mail-center.com mail-central.com mail-jp.org
 freemail_domains mail-online.dk mail-page.com mail-x-change.com mail.austria.com mail.az
-freemail_domains mail.de mail.be mail.bg mail.bulgaria.com mail.co.za mail.com mail.dk mail.ee
+freemail_domains mail.de mail.be mail.bg mail.bulgaria.com mail.co.za mail.dk mail.ee
 freemail_domains mail.goo.ne.jp mail.gr mail.lawguru.com mail.md mail.mn mail.org mail.pf
 freemail_domains mail.pt mail.ru mail.yahoo.co.jp mail15.com mail2*.com mail3000.com mail333.com
 freemail_domains mail8.com mailandftp.com mailandnews.com mailas.com mailasia.com mailbg.com
@@ -232,27 +234,27 @@
 freemail_domains mailvault.com mailworks.org maine.usa.com majorana.martina-franca.ta.it
 freemail_domains maktoob.com malayalamtelevision.net malayalapathram.com male.ru manager.de
 freemail_domains manlymail.net mantrafreenet.com mantramail.com mantraonline.com
-freemail_domains marchmail.com marihuana.ro marijuana.nl marketweighton.com maryland.usa.com
-freemail_domains masrawy.com massachusetts.usa.com mauimail.com mbox.com.au mcrmail.com me.by
+freemail_domains marihuana.ro marijuana.nl marketweighton.com maryland.usa.com
+freemail_domains masrawy.com massachusetts.usa.com mauimail.com mbox.com.au mcrmail.com me.by me.com
 freemail_domains medicinatv.com meetingmall.com megamail.pt menara.ma merseymail.com mesra.net
-freemail_domains messagez.com metacrawler.com mexico.com mexicomail.com miaoweb.net
+freemail_domains messagez.com metacrawler.com mexico.com miaoweb.net
 freemail_domains michigan.usa.com micro2media.com miesto.sk mighty.co.za milacamn.net
-freemail_domains milmail.com mindless.com mindviz.com minister.com minnesota.usa.com
+freemail_domains milmail.com mindless.com mindviz.com minnesota.usa.com
 freemail_domains mississippi.usa.com missouri.usa.com mixmail.com ml1.net ml2clan.com
 freemail_domains mlanime.com mm.st mmail.com mobimail.mn mobsters.com mobstop.com
 freemail_domains modemnet.net modomail.com moldova.com moldovacc.com monarchy.com
 freemail_domains montana.usa.com montevideo.com.uy moomia.com moose-mail.com mosaicfx.com
-freemail_domains moscowmail.com motormania.com movemail.com mr.outblaze.com mrspender.com
-freemail_domains ms*.hinet.net mscold.com msn.com msn.co.uk msnzone.cn mundo-r.com munich.com musician.org muslim.com
+freemail_domains motormania.com movemail.com mr.outblaze.com mrspender.com
+freemail_domains ms*.hinet.net mscold.com msn.com msn.co.uk msnzone.cn mundo-r.com
 freemail_domains muslimsonline.com mustangs.com mxs.de myblue.cc mycabin.com mycity.com mycommail.com
 freemail_domains mycool.com mydomain.com myeweb.com myfastmail.com myfunnymail.com mykolab.com
 freemail_domains mygamingconsoles.com myiris.com myjazzmail.com mymacmail.com mymail.dk
 freemail_domains mymail.ph.inter.net mymail.ro mynet.com mynet.com.tr myotw.net myopera.com
-freemail_domains myownemail.com mypersonalemail.com myplace.com myrealbox.com myself.com
+freemail_domains myownemail.com mypersonalemail.com myplace.com myrealbox.com
 freemail_domains myspace.com myt.mu myway.com mzgchaos.de n2.com n2business.com n2mail.com
 freemail_domains n2software.com nabble.com name.com nameplanet.com nanamail.co.il
 freemail_domains nanaseaikawa.com nandomail.com naseej.com nastything.com national-champs.com
-freemail_domains nativeweb.net narod.ru naveganas.com nebraska.usa.com nemra1.com nenter.com
+freemail_domains nativeweb.net narod.ru nate.com naveganas.com naver.com nebraska.usa.com nemra1.com nenter.com
 freemail_domains nerdshack.com nervhq.org net.hr net4b.pt net4jesus.com net4you.at
 freemail_domains netbounce.com netcabo.pt netcape.net netcourrier.com netexecutive.com
 freemail_domains netfirms.com netkushi.com netmongol.com netpiper.com netposta.net
@@ -262,123 +264,124 @@
 freemail_domains newmail.ok.com newmail.ru newmexico.usa.com newspaperemail.com newyork.com
 freemail_domains newyork.usa.com newyorkcity.com nfmail.com nicegal.com nightimeuk.com
 freemail_domains nightly.com nightmail.com nightmail.ru noavar.com noemail.com nonomail.com nokiamail.com
-freemail_domains nonpartisan.com noolhar.com northcarolina.usa.com northdakota.usa.com
-freemail_domains nospammail.net nowzer.com null.net ny.com nyc.com nycmail.com nz11.com
-freemail_domains nzoomail.com o2.pl oath.com oceanfree.net ocsnet.net oddpost.com odeon.pl
+freemail_domains noolhar.com northcarolina.usa.com northdakota.usa.com
+freemail_domains nospammail.net nowzer.com ny.com nyc.com nz11.com
+freemail_domains nzoomail.com o2.pl oceanfree.net ocsnet.net oddpost.com odeon.pl
 freemail_domains odmail.com offshorewebmail.com ofir.dk ohio.usa.com oicexchange.com ok.ru
 freemail_domains oklahoma.usa.com ole.com oleco.net olympist.net omaninfo.com onatoo.com
 freemail_domains ondikoi.com onebox.com onenet.com.ar onet.pl ongc.net oninet.pt online.ie
 freemail_domains online.ru onlinewiz.com onobox.com open.by openbg.com openforyou.com
-freemail_domains opentransfer.com operamail.com oplusnet.com optician.com orange.* orangehome.co.uk
+freemail_domains opentransfer.com operamail.com oplusnet.com orange.fr orangehome.co.uk orange.es orange.jo orange.pl
 freemail_domains orbitel.bg orcon.net.nz oregon.usa.com oreka.com organizer.net orgio.net
-freemail_domains orthodontist.net orthodox.com osite.com.br oso.com ourbrisbane.com ournet.md
-freemail_domains ourprofile.net ourwest.com outgun.com outlook.com ownmail.net oxfoot.com ozu.es
-freemail_domains pacer.com pacific-ocean.com pacificwest.com paginasamarillas.com
+freemail_domains orthodox.com osite.com.br oso.com ourbrisbane.com ournet.md
+freemail_domains ourprofile.net ourwest.com outgun.com outlook.* ownmail.net oxfoot.com ozu.es
+freemail_domains pacer.com paginasamarillas.com
 freemail_domains pakistanmail.com pandawa.com pando.com pandora.be paris.com parsimail.com
 freemail_domains parspage.com patmail.com pattayacitythailand.com pc4me.us pcpostal.com
-freemail_domains pediatrician.com penguinmaster.com pennsylvania.usa.com peopleweb.com
-freemail_domains personal.ro personales.com peru.com petlover.com petml.com photographer.net
-freemail_domains phreaker.net physicist.net pigeonportal.com pilu.com pimagop.com
+freemail_domains penguinmaster.com pennsylvania.usa.com peoplepc.com peopleweb.com
+freemail_domains personal.ro personales.com peru.com petml.com
+freemail_domains phreaker.net pigeonportal.com pilu.com pimagop.com
 freemail_domains pinoymail.com pipni.cz pisem.net planet-school.de planetaccess.com
 freemail_domains planetout.com plasa.com playersodds.com playful.com pluno.com
 freemail_domains plusmail.com.br pmail.net pnetmail.co.za pobox.ru pobox.sk pochtamt.ru pochta.ru
-freemail_domains poczta.fm poetic.com pogowave.com polandmail.com polbox.com politician.com
+freemail_domains poczta.fm poetic.com pogowave.com polbox.com
 freemail_domains pop3.ru pop.co.th popmail.com poppymail.com popsmail.com popstar.com portafree.com
-freemail_domains portaldosalunos.com portugalmail.com portugalmail.pt post.com post.cz
+freemail_domains portaldosalunos.com portugalmail.com portugalmail.pt post.cz
 freemail_domains post.expart.ne.jp post.pl post.sk posta.ge postaccesslite.com postiloota.net
 freemail_domains postinbox.com postino.ch postino.it postmaster.co.uk postpro.net praize.com
-freemail_domains presidency.com press.co.jp priest.com primposta.com printesamargareta.ro
+freemail_domains press.co.jp primposta.com printesamargareta.ro
 freemail_domains private.21cn.com probemail.com profesional.com profession.freemail.com.br
-freemail_domains programmer.net proinbox.com promessage.com prontomail.com protestant.com
-freemail_domains provincial.net publicaccounting.com publicist.com punkass.com puppy.com.my
-freemail_domains qatar.io qlmail.com qq.com qrio.com qsl.net qudsmail.com queerplaces.com quepasa.com
+freemail_domains proinbox.com promessage.com prontomail.com protonmail.com protonmail.ch
+freemail_domains provincial.net publicaccounting.com punkass.com puppy.com.my
+freemail_domains q.com qatar.io qlmail.com qq.com qrio.com qsl.net qudsmail.com queerplaces.com quepasa.com
 freemail_domains quick.cz quickwebmail.com r-o-o-t.com r320.hu raakim.com rbcmail.ru racingseat.com
-freemail_domains radicalz.com radiojobbank.com radiologist.net ragingbull.com
-freemail_domains raisingadaughter.com rallye-webmail.com ranmamail.com ravearena.com
+freemail_domains radicalz.com radiojobbank.com ragingbull.com
+freemail_domains raisingadaughter.com rallye-webmail.com rambler.ru ranmamail.com ravearena.com
 freemail_domains ravemail.co.za razormail.com real.ro realemail.net reallyfast.biz
-freemail_domains reallyfast.info realtyagent.com rebels.com reborn.com recife.net recme.net
-freemail_domains rediffmail.com rediffmailpro.com redseven.de redwhitearmy.com reggaefan.com
-freemail_domains registerednurses.com relia.com religious.com repairman.com
-freemail_domains representative.com rescueteam.com revenue.com rexian.com rhodeisland.usa.com
+freemail_domains reallyfast.info rebels.com recife.net recme.net
+freemail_domains rediffmail.com rediffmailpro.com redseven.de redwhitearmy.com
+freemail_domains relia.com
+freemail_domains revenue.com rexian.com rhodeisland.usa.com
 freemail_domains ritmes.net rn.com roanokemail.com rochester-mail.com rock.com rocketmail.com
-freemail_domains rocketship.com rockfan.com rockinghamgateway.com rojname.com rol.ro
+freemail_domains rockfan.com rockinghamgateway.com rojname.com rol.ro
 freemail_domains rollin.com rome.com romymichele.com royal.net rpharmacist.com rt.nl ru.ru
 freemail_domains rushpost.com russiamail.com rxpost.net s-mail.com saabnet.com
-freemail_domains sacbeemail.com sacmail.com safe-mail.net safe-mailbox.com safrica.com
-freemail_domains saigonnet.vn saint-mike.org saintly.com salesperson.net samerica.com
-freemail_domains samilan.net sandiego.com sanfranmail.com sanook.com sanriotown.com
+freemail_domains sacbeemail.com sacmail.com safe-mail.net safe-mailbox.com
+freemail_domains saigonnet.vn saint-mike.org
+freemail_domains samilan.net sandiego.com sanook.com sanriotown.com
 freemail_domains sapibon.com sapo.pt saturnfans.com sayhi.net sbcglobal.com scfn.net
-freemail_domains schweiz.org sci.fi sciaga.pl scientist.com scotlandmail.com
+freemail_domains schweiz.org sci.fi sciaga.pl
 freemail_domains scrapbookscrapbook.com seapole.com search417.com seark.com sebil.com
-freemail_domains secretary.net secretservices.net secure-jlnet.com seductive.com sendmail.ru
+freemail_domains secretservices.net secure-jlnet.com seductive.com sendmail.ru
 freemail_domains sendme.cz sent.as sent.at sent.com serga.com.ar sermix.com server4free.de
 freemail_domains serverwench.com sesmail.com sexmagnet.com seznam.cz shadango.com she.com
 freemail_domains shuf.com siamlocalhost.com siamnow.net sify.com sinamail.com singapore.com
-freemail_domains singmail.com singnet.com.sg siraj.org sirindia.com sirunet.com sister.com
+freemail_domains singmail.com singnet.com.sg siraj.org sirindia.com sirunet.com sister.com sina.com sina.cn sinanail.com
 freemail_domains sistersbrothers.com sizzling.com slamdunkfan.com slickriffs.co.uk
 freemail_domains slingshot.com slo.net slomusic.net smartemail.co.uk smtp.ru snail-mail.net
-freemail_domains snakebite.com sndt.net sneakemail.com snoopymail.com snowboarding.com
-freemail_domains so-simple.org socamail.com socialworker.net sociologist.com softhome.net
-freemail_domains sol.dk solidmail.com songwriter.net soon.com sos.lv soundvillage.org
+freemail_domains sndt.net sneakemail.com snoopymail.com snowboarding.com
+freemail_domains so-simple.org socamail.com softhome.net sohu.com
+freemail_domains sol.dk solidmail.com soon.com sos.lv soundvillage.org
 freemail_domains southcarolina.usa.com southdakota.usa.com sp.nl space.com spacetowns.com
-freemail_domains spainmail.com spamex.com spartapiet.com speed-racer.com speedpost.net
+freemail_domains spamex.com spartapiet.com speed-racer.com speedpost.net
 freemail_domains speedymail.org spils.com spinfinder.com sportemail.com spray.net spray.no
 freemail_domains spray.se spymac.com srbbs.com srilankan.net ssan.com ssl-mail.com stade.fr
 freemail_domains stalag13.com stampmail.com starbuzz.com starline.ee starmail.com
 freemail_domains starmail.org starmedia.com starspath.com start.com.au start.no stribmail.com
 freemail_domains strompost.* student.com student.ednet.ns.ca studmail.com sudanmail.net
-freemail_domains sueddeutsche.de suisse.org sunbella.net sunmail1.com sunpoint.net sunrise.ch
+freemail_domains suisse.org sunbella.net sunmail1.com sunpoint.net sunrise.ch
 freemail_domains sunumail.sn sunuweb.net suomi24.fi superdada.it supereva.com supereva.it
 freemail_domains supermailbox.com superposta.com surf3.net surfassistant.com surfsupnet.net
-freemail_domains surfy.net surgical.net surimail.com surnet.cl sverige.nu svizzera.org
-freemail_domains sweb.cz swedenmail.com swift-mail.com swissinfo.org swissmail.com
+freemail_domains surfy.net surimail.com surnet.cl sverige.nu svizzera.org
+freemail_domains sweb.cz swift-mail.com swissinfo.org
 freemail_domains swissmail.net switzerland.org syom.com syriamail.com t-mail.com t-net.net.ve
 freemail_domains t2mail.com tabasheer.com talk21.com talkcity.com tangmonkey.com tatanova.com
-freemail_domains taxcutadvice.com teachers.org techemail.com techie.com technisamail.co.za
-freemail_domains technologist.com teenmail.co.uk teenmail.co.za tejary.com telebot.com telefonica.net
-freemail_domains telegraf.by teleline.es telinco.net telkom.net telpage.net telstra.com
+freemail_domains taxcutadvice.com techemail.com technisamail.co.za
+freemail_domains teenmail.co.uk teenmail.co.za tejary.com telebot.com telefonica.net
+freemail_domains telegraf.by teleline.es telinco.net telkom.net telpage.net telstra.com telenet.be
 freemail_domains telusplanet.net tempting.com tenchiclub.com tennessee.usa.com terra.*
 freemail_domains terra.co*.* terrapins.com texas.usa.com texascrossroads.com tfz.net thai.com
 freemail_domains thaimail.com thaimail.net the-fastest.net the-quickest.com thegame.com
-freemail_domains theinternetemail.com theoffice.net theplate.com thepostmaster.net
-freemail_domains theracetrack.com therapist.net theserverbiz.com thewatercooler.com
+freemail_domains theinternetemail.com theoffice.net thepostmaster.net
+freemail_domains theracetrack.com theserverbiz.com thewatercooler.com
 freemail_domains thewebpros.co.uk thinkpost.net thirdage.com thundermail.com tim.it
 freemail_domains timemail.com tin.it tinati.net tiscali.* tiscali.co*.* tiscalinet.it
 freemail_domains tjohoo.se tkcity.com tlcfan.com tlen.pl tmicha.net todito.com todoperros.com
-freemail_domains toke.com tokyo.com toothfairy.com topchat.com topmail.com.ar topmail.dk
-freemail_domains topsurf.com toquedequeda.com torba.com torchmail.com torontomail.com
+freemail_domains tokyo.com topchat.com topmail.com.ar topmail.dk topmail.co.ie topmail.co.in topmail.co.nz topmail.co.uk topmail.co.za
+freemail_domains topsurf.com toquedequeda.com torba.com torchmail.com
 freemail_domains totalmail.com totalsurf.com totonline.net tough.com toughguy.net trav.se
 freemail_domains trevas.net tripod-mail.com triton.net trmailbox.com tsamail.co.za
-freemail_domains turbonett.com turkey.com tvnet.lv tvstar.com typemail.com u2club.com uae.ac
+freemail_domains turbonett.com turkey.com tvnet.lv twc.com typemail.com u2club.com uae.ac
 freemail_domains ubbi.com ubbi.com.br uboot.com ugeek.com uk2.net uk2net.com ukr.net
-freemail_domains ukrpost.net ukrpost.ua uku.co.uk ulimit.com ummah.org umpire.com unbounded.com
+freemail_domains ukrpost.net ukrpost.ua uku.co.uk ulimit.com ummah.org unbounded.com
 freemail_domains unican.es unicum.de unimail.mn unitedemailsystems.com universal.pt
 freemail_domains universia.cl universia.edu.ve universia.es universia.net.co universia.net.mx
 freemail_domains universia.pr universia.pt universiabrasil.net unofree.it uol.com.ar
 freemail_domains uol.com.br uole.com uolmail.com uomail.com uraniomail.com urbi.com.br
-freemail_domains ureach.com usa.com usanetmail.com userbeam.com utah.usa.com uymail.com
+freemail_domains ureach.com usanetmail.com userbeam.com utah.usa.com
 freemail_domains uyuyuy.com v-sexi.com v3mail.com vegetarisme.be velnet.com velocall.com
 freemail_domains vercorreo.com verizonmail.com vermont.usa.com verticalheaven.com
 freemail_domains veryfast.biz veryspeedy.net vfemail.net vietmedia.com vip.gr virgilio.it
 freemail_domains virgin.net virginia.usa.com virtual-mail.com visitmail.com visto.com
-freemail_domains vivelared.com vjtimail.com vnn.vn vsnl.com vsnl.net vodamail.co.za voila.fr volkermord.com vosforums.com
-freemail_domains w.cn walla.com wallet.com wam.co.za wanadoo.co.uk wanadoo.es wanadoo.fr wanex.ge wap.hu
+freemail_domains vivelared.com vjtimail.com vnn.vn vsnl.com vsnl.net vodamail.co.za voila.fr volkermord.com vosforums.com vodafone.*
+freemail_domains w.cn walla.com walla.co.il wallet.com wam.co.za wanadoo.co.uk wanadoo.es wanadoo.fr wanex.ge wap.hu
 freemail_domains wapda.com wapicode.com wappi.com warpmail.net washington.usa.com wassup.com
 freemail_domains waterloo.com waumail.com wazmail.com wearab.net web-mail.com.ar web.de
 freemail_domains web.nl web2mail.com webaddressbook.com webbworks.com webcity.ca webdream.com
 freemail_domains webemaillist.com webindia123.com webinfo.fi webjump.com webl-3.br.inter.net
-freemail_domains webmail.co.yu webmail.co.za webmails.com webmailv.com webname.com webpim.cc
+freemail_domains webmail.co.yu webmail.co.za webmails.com webmailv.com webpim.cc
 freemail_domains webspawner.com webstation.com websurfer.co.za webtopmail.com webtribe.net
 freemail_domains webtv.net weedmail.com weekonline.com weirdness.com westvirginia.usa.com
 freemail_domains whale-mail.com whipmail.com who.net whoever.com wildcats.com wildmail.com
 freemail_domains williams.net.ar winning.com winningteam.com winwinhosting.com
-freemail_domains wisconsin.usa.com witelcom.com witty.com wolverines.com wooow.it worker.com
+freemail_domains wisconsin.usa.com witelcom.com witty.com wolverines.com wooow.it
 freemail_domains workmail.co.za worldcrossing.com worldemail.com worldmedic.com
-freemail_domains worldonline.de wowmail.com wp.pl wprost.pl writeme.com wrongmail.com
+freemail_domains worldonline.de wowmail.com wp.pl wprost.pl wrongmail.com
 freemail_domains wtonetwork.com wurtele.net www.com www.consulcredit.it wyoming.usa.com
-freemail_domains x-mail.net xasa.com xemail.* xfreehosting.com xmail.net xmsg.com xnmsn.cn xoom.com xtra.co.nz
+freemail_domains x-mail.net xasa.com xemail.* xfreehosting.com xmail.net xmsg.com xnmsn.cn xoom.com xtra.co.nz xuite.net
 freemail_domains xpectmore.com xrea.com xsmail.com xzapmail.com y7mail.com yahala.co.il
 freemail_domains yaho.com yahoo.* yahoo.co*.* yalla.com.lb
+freemail_domains ya.com yeah.net ya.ru yahoomail.com
 freemail_domains yam.com yamal.info yandex.* yapost.com yawmail.com yebox.com yehey.com
 freemail_domains yellow-jackets.com yellowstone.net yenimail.com yepmail.net yifan.net
 freemail_domains ymail.com your-mail.com yours.com yourwap.com yyhmail.com z11.com z6.com
@@ -387,8 +390,12 @@
 freemail_domains zoho.com zoomshare.com zoznam.sk zubee.com zuvio.com zwallet.com zworg.com
 freemail_domains zybermail.com zzn.com
 
-# moulds / shops / etc  2010-03-17-AXB
-freemail_domains vip.163.com vip.sina.com vip.sohu.net sohu.com vip.tom.com
+# chinese numbers
+freemail_domains 126.com 139.com 163.com 188.com 189.cn 263.net 9.cn
+
+# Vips
+freemail_domains vip.126.com vip.163.com vip.188.com
+freemail_domains vip.sina.com vip.sohu.com vip.sohu.net vip.tom.com vip.qq.com vipsohu.net
 
 # Bug 6903 -  powered by VFEmail - 2013-02-19-AXB
 freemail_domains clovermail.net mail-on.us chewiemail.com offcolormail.com powdermail.com tightmail.com toothandmail.com tushmail.com
diff -Nru spamassassin-3.4.0/pkgrules/20_freemail_mailcom_domains.cf spamassassin-3.4.2/pkgrules/20_freemail_mailcom_domains.cf
--- spamassassin-3.4.0/pkgrules/20_freemail_mailcom_domains.cf	1969-12-31 19:00:00.000000000 -0500
+++ spamassassin-3.4.2/pkgrules/20_freemail_mailcom_domains.cf	2018-09-12 23:04:40.000000000 -0400
@@ -0,0 +1,60 @@
+# SpamAssassin - Mail.com Freemail domains file
+#
+# Please don't modify this file as your changes will be overwritten with
+# the next update. Use @@LOCAL_RULES_DIR@@/local.cf instead.
+# See 'perldoc Mail::SpamAssassin::Conf' for details.
+#
+# <@LICENSE>
+# Licensed to the Apache Software Foundation (ASF) under one or more
+# contributor license agreements.  See the NOTICE file distributed with
+# this work for additional information regarding copyright ownership.
+# The ASF licenses this file to you under the Apache License, Version 2.0
+# (the "License"); you may not use this file except in compliance with
+# the License.  You may obtain a copy of the License at:
+#
+#     http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+# </@LICENSE>
+#
+###########################################################################
+
+# List contains commonly abused end user mail providers
+# "freemail" is solely used for label purposes.
+
+# This dedicated list contains domains provided by mail.com
+
+# Updated 2014-09-17-axb
+
+ifplugin Mail::SpamAssassin::Plugin::FreeMail
+
+freemail_domains accountant.com acdcfan.com activist.com adexec.com africamail.com aircraftmail.com allergist.com alumni.com alumnidirector.com angelic.com appraiser.net archaeologist.com arcticmail.com artlover.com asia-mail.com asia.com atheist.com auctioneer.net australiamail.com
+freemail_domains bartender.net bellair.net berlin.com bikerider.com birdlover.com blader.com boardermail.com brazilmail.com brew-master.com brew-meister.com bsdmail.com
+freemail_domains californiamail.com cash4u.com catlover.com cheerful.com chef.net chemist.com chinamail.com clerk.com clubmember.org collector.org columnist.com comic.com computer4u.com consultant.com contractor.net coolsite.net counsellor.com cutey.com cyber-wizard.com cyberdude.com cybergal.com cyberservices.com
+freemail_domains dallasmail.com dbzmail.com deliveryman.com diplomats.com disciples.com discofan.com disposable.com doctor.com doglover.com doramail.com dr.com dublin.com dutchmail.com
+freemail_domains elvisfan.com email.com engineer.com englandmail.com europe.com europemail.com execs.com
+freemail_domains fastservice.com financier.com fireman.net
+freemail_domains galaxyhit.com gardener.com geologist.com germanymail.com graduate.org graphic-designer.com greenmail.net groupmail.com
+freemail_domains hackermail.com hairdresser.net hilarious.com hiphopfan.com homemail.com hot-shot.com housemail.com humanoid.net
+freemail_domains iname.acom iname.com innocent.com inorbit.com instruction.com instructor.net insurer.com irelandmail.com israelmail.com italymail.com
+freemail_domains job4u.com journalist.com
+freemail_domains keromail.com kissfans.com kittymail.com koreamail.com
+freemail_domains legislator.com linuxmail.org lobbyist.com lovecat.com
+freemail_domains madonnafan.com mail-me.com mail.com marchmail.com metalfan.com mexicomail.com minister.com moscowmail.com munich.com musician.org muslim.com myself.com
+freemail_domains net-shopping.com ninfan.com nonpartisan.com null.net nycmail.com
+freemail_domains oath.com optician.com orthodontist.net
+freemail_domains pacific-ocean.com pacificwest.com pediatrician.com petlover.com photographer.net physicist.net planetmail.com planetmail.net polandmail.com politician.com post.com presidency.com priest.com programmer.net protestant.com publicist.com
+freemail_domains qualityservice.com
+freemail_domains radiologist.net ravemail.com realtyagent.com reborn.com reggaefan.com registerednurses.com reincarnate.com religious.com repairman.com representative.com rescueteam.com rocketship.com
+freemail_domains safrica.com saintly.com salesperson.net samerica.com sanfranmail.com scientist.com scotlandmail.com secretary.net snakebite.com socialworker.net sociologist.com solution4u.com songwriter.net spainmail.com surgical.net swedenmail.com swissmail.com
+freemail_domains teachers.org tech-center.com techie.com technologist.com theplate.com therapist.net toke.com toothfairy.com torontomail.com tvstar.com
+freemail_domains umpire.com usa.com uymail.com
+freemail_domains webname.com worker.com workmail.com writeme.com
+
+endif
+
+
diff -Nru spamassassin-3.4.0/pkgrules/20_head_tests.cf spamassassin-3.4.2/pkgrules/20_head_tests.cf
--- spamassassin-3.4.0/pkgrules/20_head_tests.cf	2014-02-06 22:05:55.000000000 -0500
+++ spamassassin-3.4.2/pkgrules/20_head_tests.cf	2018-09-12 23:04:40.000000000 -0400
@@ -158,8 +158,8 @@
 describe INVALID_DATE		Invalid Date: header (not RFC 2822)
 test INVALID_DATE fail    Sat, 31 Dec 2005 23:59:60 -0500
 test INVALID_DATE fail    Wed, 31 Jul 2002 16:41:57 +0200
+test INVALID_DATE fail    Sat, 31 Dec 2005 23:00:00 
 test INVALID_DATE ok      Sat, 31 Dec 2005 24:00:00 -0500
-#test INVALID_DATE ok      Sat, 31 Dec 2005 23:00:00 
 test INVALID_DATE ok      Thurs, 31 Jul 2002 16:41:57 +0200
 
 # allow +1300, NZ timezone
@@ -176,13 +176,16 @@
 ###########################################################################
 # MIME encoding with spam characteristics
 
-header __SUBJECT_NEEDS_MIME	Subject =~ /[\x00-\x08\x0b\x0c\x0e-\x1f\x7f-\xff]/
+ifplugin Mail::SpamAssassin::Plugin::HeaderEval
+meta __SUBJECT_NEEDS_MIME	__SUBJ_ILLEGAL_CHARS
+endif
+
 header __SUBJECT_ENCODED_QP	Subject:raw =~ /=\?\S+\?Q\?/i
 header __SUBJECT_ENCODED_B64	Subject:raw =~ /=\?\S+\?B\?/i
 
 
 
-header __FROM_NEEDS_MIME	From =~ /[\x00-\x08\x0b\x0c\x0e-\x1f\x7f-\xff]/
+header __FROM_NEEDS_MIME	From:name:raw =~ /[\x00-\x08\x0b\x0c\x0e-\x1f\x7f-\xff]/
 header __FROM_ENCODED_QP	From:raw =~ /=\?\S+\?Q\?/i
 header __FROM_ENCODED_B64	From:raw =~ /=\?\S+\?B\?/i
 
@@ -250,10 +253,10 @@
 describe FORGED_TELESP_RCVD	Contains forged hostname for a DSL IP in Brazil
 
 # forgery meta-rules: more reliable than their inputs
-meta CONFIRMED_FORGED		(__FORGED_RCVD_TRAIL && (__FORGED_AOL_RCVD || __FORGED_HOTMAIL_RCVD || __FORGED_EUDORAMAIL_RCVD || FORGED_YAHOO_RCVD || __FORGED_JUNO_RCVD))
+meta CONFIRMED_FORGED		(__FORGED_RCVD_TRAIL && (__FORGED_AOL_RCVD || __FORGED_HOTMAIL_RCVD || __FORGED_EUDORAMAIL_RCVD || FORGED_YAHOO_RCVD || __FORGED_JUNO_RCVD || FORGED_GMAIL_RCVD))
 describe CONFIRMED_FORGED	Received headers are forged
 
-meta MULTI_FORGED		((__FORGED_AOL_RCVD + __FORGED_HOTMAIL_RCVD + __FORGED_EUDORAMAIL_RCVD + FORGED_YAHOO_RCVD + __FORGED_JUNO_RCVD) > 1)
+meta MULTI_FORGED		((__FORGED_AOL_RCVD + __FORGED_HOTMAIL_RCVD + __FORGED_EUDORAMAIL_RCVD + FORGED_YAHOO_RCVD + __FORGED_JUNO_RCVD + FORGED_GMAIL_RCVD) > 1)
 describe MULTI_FORGED		Received headers indicate multiple forgeries
 
 header NONEXISTENT_CHARSET	Content-Type =~ /charset=.?DEFAULT/
@@ -305,8 +308,8 @@
 header   __HAS_MIMEOLE          exists:X-MimeOLE
 header   __HAS_MSMAIL_PRI       exists:X-MSMail-Priority
 header   __HAS_SQUIRRELMAIL_IN_MAILER	X-Mailer =~ /SquirrelMail\b/
-# Bug 6346
-header   __HAS_OFFICE1214_IN_MAILER	X-Mailer =~ /^Microsoft (?:Office )?Outlook 1[24]\.0/
+# Ever growing Office version list without X-MimeOLE, bug 6346, 7122, 7463.
+header   __HAS_OFFICE1214_IN_MAILER	X-Mailer =~ /^Microsoft (?:Office )?Outlook 1[2456]\.0/
 meta     MISSING_MIMEOLE	(__HAS_MSMAIL_PRI && !__HAS_MIMEOLE && !__HAS_SQUIRRELMAIL_IN_MAILER && !__HAS_OFFICE1214_IN_MAILER)
 describe MISSING_MIMEOLE	Message has X-MSMail-Priority, but no X-MimeOLE
 
@@ -472,7 +475,12 @@
 header FORGED_YAHOO_RCVD	eval:check_for_forged_yahoo_received_headers()
 describe FORGED_YAHOO_RCVD	'From' yahoo.com does not match 'Received' headers
 
-header __FORGED_JUNO_RCVD		eval:check_for_forged_juno_received_headers()
+if (version >= 3.004002)
+header FORGED_GMAIL_RCVD	eval:check_for_forged_gmail_received_headers()
+describe FORGED_GMAIL_RCVD	'From' gmail.com does not match 'Received' headers
+endif
+
+header __FORGED_JUNO_RCVD	eval:check_for_forged_juno_received_headers()
 
 
 
@@ -570,9 +578,6 @@
 header RCVD_HELO_IP_MISMATCH	eval:helo_ip_mismatch()
 describe RCVD_HELO_IP_MISMATCH	Received: HELO and IP do not match, but should
 
-header RCVD_NUMERIC_HELO	eval:check_for_numeric_helo()
-describe RCVD_NUMERIC_HELO	Received: contains an IP address used for HELO
-
 # not used directly right now due to FPs; but CONFIRMED_FORGED turns it
 # into a 1.0 S/O rule anyway, so that's not a problem ;)
 # 2.626   3.6340   1.5251    0.704   0.34    1.44  FORGED_RCVD_TRAIL
diff -Nru spamassassin-3.4.0/pkgrules/20_html_tests.cf spamassassin-3.4.2/pkgrules/20_html_tests.cf
--- spamassassin-3.4.0/pkgrules/20_html_tests.cf	2014-02-06 22:05:55.000000000 -0500
+++ spamassassin-3.4.2/pkgrules/20_html_tests.cf	2018-09-12 23:04:40.000000000 -0400
@@ -61,8 +61,12 @@
 
 rawbody __OBFUSCATING_COMMENT_A	/\w(?:<![^>]*>)+\w/
 rawbody __OBFUSCATING_COMMENT_B	/[^\s>](?:<![^>]*>)+[^\s<]/
+ifplugin Mail::SpamAssassin::Plugin::HTMLEval
+ifplugin Mail::SpamAssassin::Plugin::MIMEEval
 meta OBFUSCATING_COMMENT	((__OBFUSCATING_COMMENT_A && HTML_MESSAGE) || (__OBFUSCATING_COMMENT_B && MIME_HTML_ONLY)) && !__ISO_2022_JP_DELIM
 describe OBFUSCATING_COMMENT	HTML comments which obfuscate text
+endif
+endif
 
 # spams that are assembled from a Javascript array
 # look for the XOR op
@@ -217,6 +221,11 @@
 body HTML_IFRAME_SRC	eval:check_iframe_src()
 describe HTML_IFRAME_SRC	Message has HTML IFRAME tag with SRC URI
 
+else
+
+meta __COMMENT_EXISTS		0
+meta __TAG_EXISTS_CENTER	0
+
 endif
 
 ###########################################################################
diff -Nru spamassassin-3.4.0/pkgrules/20_imageinfo.cf spamassassin-3.4.2/pkgrules/20_imageinfo.cf
--- spamassassin-3.4.0/pkgrules/20_imageinfo.cf	2014-02-06 22:05:55.000000000 -0500
+++ spamassassin-3.4.2/pkgrules/20_imageinfo.cf	2018-09-12 23:04:40.000000000 -0400
@@ -11,9 +11,9 @@
 # The ASF licenses this file to you under the Apache License, Version 2.0
 # (the "License"); you may not use this file except in compliance with
 # the License.  You may obtain a copy of the License at:
-# 
+#
 #     http://www.apache.org/licenses/LICENSE-2.0
-# 
+#
 # Unless required by applicable law or agreed to in writing, software
 # distributed under the License is distributed on an "AS IS" BASIS,
 # WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
@@ -29,11 +29,11 @@
 ## body		DC_IMAGE001_GIF		eval:image_named('image001.gif')
 ## describe	DC_IMAGE001_GIF		Contains image named image001.gif
 
-## # you can do exact image size matches 
+## # you can do exact image size matches
 ## body	 	DC_GIF_264_127  	eval:image_size_exact('gif','264','127')
 ## describe 	DC_GIF_264_127  	Found 264x127 pixel gif, possible pillz
 
-# you can do image to text, or image to html ratios 
+# you can do image to text, or image to html ratios
 rawbody		__DC_IMG_HTML_RATIO	eval:image_to_text_ratio('all', '0.000', '0.015')
 describe	__DC_IMG_HTML_RATIO	Low rawbody to pixel area ratio
 
@@ -52,7 +52,7 @@
 # body	 	__SCREEN_1024x768 	eval:image_size_exact('all',1024,768)
 # body	 	__SCREEN_1280x1024  	eval:image_size_exact('all',1280,1024)
 # meta		DC_SCREENSHOT_JPG	( __SCREEN_640x480 || __SCREEN_800x600 || __SCREEN_1024x768 || __SCREEN_1280x1024 )
-# describe	DC_SCREENSHOT_JPG	Contains inline image matching common screen resolution
+# describe	DC_SCREENSHOT_JPG	Contains image matching common screen resolution
 # score		DC_SCREENSHOT_JPG	-0.01
 
 # you can do minimum demension matches
@@ -82,30 +82,30 @@
 
 # meta together something useful
 meta	 	DC_GIF_UNO_LARGO	( __GIF_ATTACH_1 && __GIF_AREA_180K )
-describe 	DC_GIF_UNO_LARGO  	Message contains a single large inline gif
+describe 	DC_GIF_UNO_LARGO  	Message contains a single large gif image
 
 meta		__DC_GIF_MULTI_LARGO 	( __GIF_ATTACH_2P && __GIF_AREA_180K )
 describe	__DC_GIF_MULTI_LARGO  	Message has 2+ inline gif covering lots of area
 
 meta	 	DC_PNG_UNO_LARGO	( __PNG_ATTACH_1 && __PNG_AREA_180K )
-describe 	DC_PNG_UNO_LARGO	Message contains a single large inline gif
+describe 	DC_PNG_UNO_LARGO	Message contains a single large png image
 
 meta	 	__DC_PNG_MULTI_LARGO 	( __PNG_ATTACH_2P && __PNG_AREA_180K )
-describe	__DC_PNG_MULTI_LARGO  	Message has 2+ inline png covering lots of area
+describe	__DC_PNG_MULTI_LARGO  	Message has 2+ png images covering lots of area
 
 # meta	 	DC_JPEG_UNO_LARGO 	( __JPEG_ATTACH_1 && __JPEG_AREA_180K )
-# describe	DC_JPEG_UNO_LARGO  	Message hash single large inline jpeg
+# describe	DC_JPEG_UNO_LARGO  	Message hash single large jpeg image
 
 # meta	 	DC_JPEG_MULTI_LARGO 	( __JPEG_ATTACH_2P && __JPEG_AREA_180K )
-# describe	DC_JPEG_MULTI_LARGO  	Message has 2+ inline jpeg covering lots of area
+# describe	DC_JPEG_MULTI_LARGO  	Message has 2+ jpeg images covering lots of area
 
-meta		DC_IMAGE_SPAM_TEXT		( __DC_IMG_TEXT_RATIO && ( DC_GIF_UNO_LARGO || DC_PNG_UNO_LARGO || __DC_GIF_MULTI_LARGO || __DC_PNG_MULTI_LARGO ))
+meta		DC_IMAGE_SPAM_TEXT		( !__HAS_URI && __DC_IMG_TEXT_RATIO && ( DC_GIF_UNO_LARGO || DC_PNG_UNO_LARGO || __DC_GIF_MULTI_LARGO || __DC_PNG_MULTI_LARGO ))
 describe	DC_IMAGE_SPAM_TEXT		Possible Image-only spam with little text
 
-# meta the stock rules together for HTML_IMAGE_ONLY_* 
+# meta the stock rules together for HTML_IMAGE_ONLY_*
 meta		__HTML_IMG_ONLY			( HTML_IMAGE_ONLY_04 || HTML_IMAGE_ONLY_08 || HTML_IMAGE_ONLY_12 || HTML_IMAGE_ONLY_16 || HTML_IMAGE_ONLY_20 || HTML_IMAGE_ONLY_24 || HTML_IMAGE_ONLY_28 )
 
-meta		DC_IMAGE_SPAM_HTML		( ( __HTML_IMG_ONLY  || __DC_IMG_HTML_RATIO ) && ( DC_GIF_UNO_LARGO || DC_PNG_UNO_LARGO || __DC_GIF_MULTI_LARGO || __DC_PNG_MULTI_LARGO ))
+meta		DC_IMAGE_SPAM_HTML		(!__HAS_URI && ( __HTML_IMG_ONLY  || __DC_IMG_HTML_RATIO ) && ( DC_GIF_UNO_LARGO || DC_PNG_UNO_LARGO || __DC_GIF_MULTI_LARGO || __DC_PNG_MULTI_LARGO ))
 describe	DC_IMAGE_SPAM_HTML		Possible Image-only spam
 
 endif
diff -Nru spamassassin-3.4.0/pkgrules/20_mailspike.cf spamassassin-3.4.2/pkgrules/20_mailspike.cf
--- spamassassin-3.4.0/pkgrules/20_mailspike.cf	2014-02-06 22:05:55.000000000 -0500
+++ spamassassin-3.4.2/pkgrules/20_mailspike.cf	2018-09-12 23:04:40.000000000 -0400
@@ -5,49 +5,60 @@
 ## Spam sources
 header __RCVD_IN_MSPIKE_B	eval:check_rbl('mspikeb-lastexternal', 'bl.mailspike.net.')
 tflags __RCVD_IN_MSPIKE_B	net
+reuse  __RCVD_IN_MSPIKE_B
 
 ## Ham sources
 header __RCVD_IN_MSPIKE_L	eval:check_rbl('mspikeg-firsttrusted', 'wl.mailspike.net.')
 tflags __RCVD_IN_MSPIKE_L	net
+reuse  __RCVD_IN_MSPIKE_L
 
 ##### Reputation compensations
 # Definitions - Bad senders
 header __RCVD_IN_MSPIKE_Z	eval:check_rbl_sub('mspikeb-lastexternal', '127.0.0.2')
 describe __RCVD_IN_MSPIKE_Z	Spam wave participant
 tflags __RCVD_IN_MSPIKE_Z	net
+reuse __RCVD_IN_MSPIKE_Z
 
 header RCVD_IN_MSPIKE_L5	eval:check_rbl_sub('mspikeb-lastexternal', '127.0.0.10')
 describe RCVD_IN_MSPIKE_L5	Very bad reputation (-5)
 tflags RCVD_IN_MSPIKE_L5	net
+reuse RCVD_IN_MSPIKE_L5
 
 header RCVD_IN_MSPIKE_L4	eval:check_rbl_sub('mspikeb-lastexternal', '127.0.0.11')
 describe RCVD_IN_MSPIKE_L4	Bad reputation (-4)
 tflags RCVD_IN_MSPIKE_L4	net
+reuse RCVD_IN_MSPIKE_L4
 
 header RCVD_IN_MSPIKE_L3	eval:check_rbl_sub('mspikeb-lastexternal', '127.0.0.12')
 describe RCVD_IN_MSPIKE_L3	Low reputation (-3)
 tflags RCVD_IN_MSPIKE_L3	net
+reuse RCVD_IN_MSPIKE_L3
 
 header RCVD_IN_MSPIKE_L2	eval:check_rbl_sub('mspikeb-lastexternal', '127.0.0.13')
 describe RCVD_IN_MSPIKE_L2	Suspicious reputation (-2)
 tflags RCVD_IN_MSPIKE_L2	net
+reuse RCVD_IN_MSPIKE_L2
 
 # Definitions - Good senders
 header RCVD_IN_MSPIKE_H5	eval:check_rbl_sub('mspikeg-firsttrusted', '127.0.0.20')
 describe RCVD_IN_MSPIKE_H5	Excellent reputation (+5)
 tflags RCVD_IN_MSPIKE_H5	nice net
+reuse RCVD_IN_MSPIKE_H5
 
 header RCVD_IN_MSPIKE_H4	eval:check_rbl_sub('mspikeg-firsttrusted', '127.0.0.19')
 describe RCVD_IN_MSPIKE_H4	Very Good reputation (+4)
 tflags RCVD_IN_MSPIKE_H4	nice net
+reuse RCVD_IN_MSPIKE_H4
 
 header RCVD_IN_MSPIKE_H3	eval:check_rbl_sub('mspikeg-firsttrusted', '127.0.0.18')
 describe RCVD_IN_MSPIKE_H3	Good reputation (+3)
 tflags RCVD_IN_MSPIKE_H3	nice net
+reuse RCVD_IN_MSPIKE_H3
 
 header RCVD_IN_MSPIKE_H2	eval:check_rbl_sub('mspikeg-firsttrusted', '127.0.0.17')
 describe RCVD_IN_MSPIKE_H2	Average reputation (+2)
 tflags RCVD_IN_MSPIKE_H2	nice net
+reuse RCVD_IN_MSPIKE_H2
 
 # *_L and *_Z may overlap each other, so account for that
 meta __RCVD_IN_MSPIKE_LOW	RCVD_IN_MSPIKE_L5 || RCVD_IN_MSPIKE_L4 || RCVD_IN_MSPIKE_L3
diff -Nru spamassassin-3.4.0/pkgrules/20_meta_tests.cf spamassassin-3.4.2/pkgrules/20_meta_tests.cf
--- spamassassin-3.4.0/pkgrules/20_meta_tests.cf	2014-02-06 22:05:55.000000000 -0500
+++ spamassassin-3.4.2/pkgrules/20_meta_tests.cf	2018-09-12 23:04:40.000000000 -0400
@@ -46,8 +46,10 @@
 meta INVALID_MSGID		__HAS_MSGID && !(__SANE_MSGID || __MSGID_COMMENT)
 describe INVALID_MSGID		Message-Id is not valid, according to RFC 2822
 
-header __MOZILLA_MUA		X-Mailer =~ /\bMozilla\b/
-header __MOZILLA_MSGID		MESSAGEID =~ /^<[A-F\d]{8}\.[A-F1-9][A-F\d]{0,7}\@\S+>$/m
+#See Bug 7411
+#header __MOZILLA_MUA		X-Mailer =~ /\bMozilla\b/
+header __MOZILLA_MUA            User-Agent =~ /^mozilla\b/i
+header __MOZILLA_MSGID		MESSAGEID =~ /^<(?:[a-f\d]{8}-(?:[a-f\d]{4}-){3}[a-f\d]{12}|[A-F\d]{8}\.[A-F1-9][A-F\d]{0,7})\@\S+>$/m
 meta FORGED_MUA_MOZILLA		(__MOZILLA_MUA && !__UNUSABLE_MSGID && !__MOZILLA_MSGID)
 describe FORGED_MUA_MOZILLA	Forged mail pretending to be from Mozilla
 
diff -Nru spamassassin-3.4.0/pkgrules/20_pdfinfo.cf spamassassin-3.4.2/pkgrules/20_pdfinfo.cf
--- spamassassin-3.4.0/pkgrules/20_pdfinfo.cf	1969-12-31 19:00:00.000000000 -0500
+++ spamassassin-3.4.2/pkgrules/20_pdfinfo.cf	2018-09-12 23:04:40.000000000 -0400
@@ -0,0 +1,314 @@
+# SpamAssassin rules file: Pdfinfo rules
+#
+# Please don't modify this file as your changes will be overwritten with
+# the next update. Use @@LOCAL_RULES_DIR@@/local.cf instead.
+# See 'perldoc Mail::SpamAssassin::Conf' for details.
+#
+# <@LICENSE>
+# Licensed to the Apache Software Foundation (ASF) under one or more
+# contributor license agreements.  See the NOTICE file distributed with
+# this work for additional information regarding copyright ownership.
+# The ASF licenses this file to you under the Apache License, Version 2.0
+# (the "License"); you may not use this file except in compliance with
+# the License.  You may obtain a copy of the License at:
+#
+#     http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+# </@LICENSE>
+#
+###########################################################################
+
+# 2014-12-02 - axb
+# Info and disabled rules kept for historical & documentation reasons
+# Updated rules may be added
+#
+# Original File: pdfinfo.cf
+# Original Version: 0.6
+# Info: $Id: pdfinfo.cf 895 2007-07-27 10:31:08Z alexb $
+# Created: 2007-06-25
+# Modified: 2007-07-19
+# Original / Defunct Site URL: http://www.rulesemporium.com/plugins.htm#PDFinfo
+# Author: Dallas Engelken (aka GMD :-)
+# Rules contributed by Alex Broens
+# Requires: PDFInfo.pm plugin
+# Description: This plugin/ruleset combination will help you alleviate the new
+#              PDF based stock spam which began to appear mid-June, 2007.
+#
+#
+# Changes:
+#
+#   0.6 - added easypdf producer rule and more no body text metas
+#       - tags support added, see USING TAGS below.
+#   0.5 - added fuzzy test 7
+#   0.4 - added new fuzzy for encyprted pdf image spams.
+#       - added rule to check for encryption
+#   0.3 - added rules based on the new pdf_match_details() function
+#       - added additional fuzzy md5 rules
+#       - disabled static md5 rules as they are no longer hitting.
+#   0.2 - added static md5 to hit full page stock spam.
+#   0.1 - initial ruleset.
+#
+
+############################################
+# USING TAGS
+############################################
+
+# The follow tags can be defined in an add_header line
+#
+# _PDFCOUNT_    - total number of pdf mime parts in the email
+# _PDFIMGCOUNT_ - total number of images found inside pdf mime parts
+# _PDFVERSION_  - PDF Version, space seperated if there are > 1 pdf attachments
+# _PDFNAME_     - Filenames as found in the mime headers of PDF parts
+# _PDFPRODUCER_ - Producer/Application that created the PDF(s)
+# _PDFAUTHOR_   - Author of the PDF
+# _PDFCREATOR_  - Creator/Program that created the PDF(s)
+# _PDFTITLE_    - Title of the PDF File, if available
+# _PDFIMGDIM_   - If PDF Contains images, the dimensions of them will be put here
+# _PDFIMGAREA_  - The total area of all combined images inside the PDF(s)
+# _PDFMD5_      - MD5 checksum of PDF(s) - space seperated
+# _PDFMD5FUZZY1_- Fuzzy1 MD5 checksum of PDF(s) - space seperated
+# _PDFMD5FUZZY2_- Fuzzy2 MD5 checksum of PDF(s) - space seperated
+#
+# Example add_header lines
+#
+# add_header all PDF-Info pdf=_PDFCOUNT_, pdfimg=_PDFIMGCOUNT_, ver=_PDFVERSION_, name=_PDFNAME_
+# add_header all PDF-Details producer=_PDFPRODUCER_, author=_PDFAUTHOR_, creator=_PDFCREATOR_, title=_PDFTITLE_
+# add_header all PDF-ImageInfo dim=_PDFIMGDIM_, area=_PDFIMGAREA_
+# add_header all PDF-Md5 md5=_PDFMD5_, fuzzy1=_PDFMD5FUZZY1_, fuzzy2=_PDFMD5FUZZY2_
+#
+
+############################################
+# GENERIC RULE EXAMPLES SHOWING EVAL USAGE
+############################################
+
+# you can match by name
+# body          MY_TEST_PDF             eval:pdf_named('mytest.pdf')
+
+# or you can write a regex to match dynamic file names.
+# body          MY_TEST_PDF             eval:pdf_name_regex('/^(?:my|your)test\.pdf$/')
+
+# you can make it case insensitive by using modifiers
+# body          PDF_IMGXXXXX            eval:pdf_name_regex('/^IMG\D+\.\.PDF$/i')
+
+# you can do exact image size matches
+# body          PDF_DEMS_150_400        eval:pdf_image_size_exact(150,400)
+
+# you can do image to text, or image to html ratios
+# rawbody       PDF_TO_HTML_RATIO       eval:pdf_image_to_text_ratio(0.000, 0.015)
+# body          PDF_TO_TEXT_RATIO       eval:pdf_image_to_text_ratio(0.000, 0.008)
+
+# you can do minimum demension matches
+# body          PDF_SIZE_RANGE_1        eval:pdf_image_size_range(300,300)
+
+# you can do ranged demension matches
+# body          PDF_SIZE_RANGE_2        eval:pdf_image_size_range(200, 300, 250, 350)
+
+# you can count the number of pdf mime partts
+# body          PDF_MIME_COUNT_1        eval:pdf_count(1,1)
+# body          PDF_MIME_COUNT_2_PLUS   eval:pdf_count(2)
+
+# you can count the number of images inside the pdfs
+# body          PDF_IMG_COUNT_1         eval:pdf_image_count(1,1)
+# body          PDF_IMG_COUNT_2_PLUS    eval:pdf_image_count(2)
+
+# you can determine pixel coverage
+# body          PDF_AREA_SMALL          eval:pdf_pixel_coverage(1,100000)
+
+
+# match a md5 or fuzzy md5 signature of the pdf
+
+# body          PDF_BAD_MD5             eval:pdf_match_md5('C359F8F89B290DA99DC997ED50117CDF')
+# body          PDF_BAD_FUZZY           eval:pdf_match_fuzzy_md5('7340821445D975EEF6F5BDE2EC257900')
+
+# Now you can match against certain details if they are found in the PDF.
+# A regex match is used on the value specified, so if you want to do an
+# exact match, use anchors  ^value$
+#
+# body          GMD_AUTHOR_MOBILE       eval:pdf_match_details('author','/^mobile$/')
+# body          GMD_PRODUCER_GPL        eval:pdf_match_details('producer','/(?i)^gpl ghostscript/')
+# body          GMD_CREATOR_PSCRIPT5    eval:pdf_match_details('creator','/^PScript5/')
+# body          GMD_TITLE_WORD_DOC1     eval:pdf_match_details('title','/^Microsoft Word \- Document1$/)
+# body          GMD_CREATED_JULY07      eval:pdf_match_details('created','/^200707/')
+# body          GMD_MODIFIED_JULY07     eval:pdf_match_details('modified','/^200707/')
+
+ifplugin Mail::SpamAssassin::Plugin::PDFInfo
+
+#######################################
+# DISABLED RULES, ENABLE IF YOU WANT
+#######################################
+
+# Small area
+# Disabled - Hits Ham
+# body          GMD_PDF_SMALL_AREA      eval:pdf_pixel_coverage(1,100000)
+# describe      GMD_PDF_SMALL_AREA      PDF Area covers 150k pixels or less
+# score         GMD_PDF_SMALL_AREA      0.75
+# counts        GMD_PDF_SMALL_AREA      51s/15h of 10615 corpus (5652s/4963h AxB) 06/25/07
+
+# NOTE - people do send pdf's without message bodies!
+# Disabled - Hits Ham
+# body          GMD_PDF_NO_TXT          eval:pdf_image_to_text_ratio(0.000, 0.005)
+# describe      GMD_PDF_NO_TXT          Low rawbody to pixel area ratio
+# score         GMD_PDF_NO_TXT          0.01
+# counts        GMD_PDF_NO_TXT          64s/3h of 10615 corpus (5652s/4963h AxB) 06/25/07
+
+####################################
+# HERE ARE THE LIVE RULES
+####################################
+
+
+
+######################################################################################################
+# pdf image dimensions
+
+# thin horizontal, common stox.
+body            GMD_PDF_HORIZ           eval:pdf_image_size_range(100, 450, 240, 800)
+describe        GMD_PDF_HORIZ           Contains pdf 100-240 (high) x 450-800 (wide)
+score           GMD_PDF_HORIZ           0.25
+# counts        GMD_PDF_HORIZ           135s/0h of 6132 corpus (4555s/1577h AxB-MANUAL) 07/11/07
+# counts        GMD_PDF_HORIZ           278s/0h of 34051 corpus (33259s/792h AxB2-TRAPS) 07/13/07
+
+# near square, and small.  common stox.
+body            GMD_PDF_SQUARE          eval:pdf_image_size_range(180, 180, 360, 360)
+describe        GMD_PDF_SQUARE          Contains pdf 180-360 (high) x 180-360 (wide)
+score           GMD_PDF_SQUARE          0.50
+# counts        GMD_PDF_SQUARE          36s/0h of 6132 corpus (4555s/1577h AxB-MANUAL) 07/11/07
+# counts        GMD_PDF_SQUARE          46s/0h of 34051 corpus (33259s/792h AxB2-TRAPS) 07/13/07
+
+# thin vertical, very tall.  common stox.
+body            GMD_PDF_VERT            eval:pdf_image_size_range(450, 100, 800, 240)
+describe        GMD_PDF_VERT            Contains pdf 450-800 (high) x 100-240 (wide)
+score           GMD_PDF_VERT            0.90
+# counts        GMD_PDF_VERT            24s/0h of 6132 corpus (4555s/1577h AxB-MANUAL) 07/11/07
+# counts        GMD_PDF_VERT            10s/0h of 11773 corpus (10988s/785h AxB2-TRAPS) 07/11/07
+
+######################################################################################################
+# static checksums
+
+# all static md5 spam runs are complete as of 7/11
+# if there are more, we'll add new rules.
+
+# removed fuzzy rules dated 2007
+# Get fuzzy info:
+# cat msg.eml | spamassassin --debug pdfinfo  2>&1 | grep fuzzy 2>&1
+
+# sample rules ONLY
+# fuzzy checksum for bad stox
+#body            GMD_PDF_FUZZY1_T1       eval:pdf_match_fuzzy_md5('57EBC1FFB1A24CC14AE23E1E227C3484')
+#describe        GMD_PDF_FUZZY1_T1       Fuzzy MD5 Match 57EBC1FFB1A24CC14AE23E1E227C3484
+#score           GMD_PDF_FUZZY1_T1       0.001
+
+# same as rule above using fuzzy md5 of pdf structure
+#body            GMD_PDF_FUZZY2_T1       eval:pdf_match_fuzzy_md5('653C8AA9FDFD03D382523488058360A2')
+#describe        GMD_PDF_FUZZY2_T1       Fuzzy MD5 Match 653C8AA9FDFD03D382523488058360A2
+#score           GMD_PDF_FUZZY2_T1       0.001
+
+
+######################################################################################################
+# pdf_match_details()
+
+# from embedded link spam
+#body            GMD_AUTHOR_COLET        eval:pdf_match_details('author','/^colet$/')
+#describe        GMD_AUTHOR_COLET        PDF author was 'colet'
+#score           GMD_AUTHOR_COLET        4.50
+# counts        GMD_AUTHOR_COLET        1s/0h of 10767 corpus (9986s/781h AxB2-TRAPS) 07/11/07
+# counts        GMD_AUTHOR_COLET        2s/0h of 6132 corpus (555s/1577h AxB-MANUAL) 07/11/07
+
+# from full page pdf stock spammer.
+#body            GMD_AUTHOR_MOBILE       eval:pdf_match_details('author','/^mobile$/')
+#describe        GMD_AUTHOR_MOBILE       PDF author was 'mobile'
+#score           GMD_AUTHOR_MOBILE       2.75
+# counts        GMD_AUTHOR_MOBILE       2s/0h of 6132 corpus (555s/1577h AxB-MANUAL) 07/11/07
+# counts        GMD_AUTHOR_MOBILE       55s/0h of 10767 corpus (9986s/781h AxB2-TRAPS) 07/11/07
+
+# txt only stock spam
+#body            GMD_AUTHOR_OOO          eval:pdf_match_details('author','/^openofficeuser$/')
+#describe        GMD_AUTHOR_OOO          PDF author was 'openofficeuser'
+#score           GMD_AUTHOR_OOO          1.75
+# counts        GMD_AUTHOR_OOO          1s/0h of 10767 corpus (9986s/781h AxB2-TRAPS) 07/11/07
+# counts        GMD_AUTHOR_OOO          118s/0h of 6132 corpus (555s/1577h AxB-MANUAL) 07/11/07
+
+# txt only stock spam
+#body            GMD_AUTHOR_HPADMIN      eval:pdf_match_details('author','/^HP_Administrator/')
+#describe        GMD_AUTHOR_HPADMIN      PDF author was 'HP_Administrator'
+#score           GMD_AUTHOR_HPADMIN      0.25
+# counts        GMD_AUTHOR_HPADMIN      105s/0h of 6132 corpus (4555s/1577h AxB-MANUAL) 07/11/07
+# counts        GMD_AUTHOR_HPADMIN      27s/0h of 11773 corpus (10988s/785h AxB2-TRAPS) 07/11/07
+
+# generic rule for software used to produce the pdf.
+body            GMD_PRODUCER_GPL        eval:pdf_match_details('producer','/^(?:gnu|gpl) ghostscript/i')
+describe        GMD_PRODUCER_GPL        PDF producer was GPL Ghostscript
+score           GMD_PRODUCER_GPL        0.25
+# counts        GMD_PRODUCER_GPL        227s/0h of 6132 corpus (555s/1577h AxB-MANUAL) 07/11/07
+# counts        GMD_PRODUCER_GPL        85s/0h of 10767 corpus (9986s/781h AxB2-TRAPS) 07/11/07
+
+# generic rule for software used to produce the pdf.
+body            GMD_PRODUCER_POWERPDF   eval:pdf_match_details('producer','/^PowerPdf 0\./')
+describe        GMD_PRODUCER_POWERPDF   PDF producer was PowerPDF
+score           GMD_PRODUCER_POWERPDF   0.25
+# counts        GMD_PRODUCER_POWERPDF   0s/0h of 10767 corpus (9986s/781h AxB2-TRAPS) 07/11/07
+# counts        GMD_PRODUCER_POWERPDF   0s/0h of 5641 corpus (4064s/1577h AxB-MANUAL) 07/11/07
+
+# producer is bcl
+body            GMD_PRODUCER_EASYPDF    eval:pdf_match_details('producer','/^BCL easyPDF/')
+describe        GMD_PRODUCER_EASYPDF    PDF producer was BCL easyPDF
+score           GMD_PRODUCER_EASYPDF    0.25
+
+# simple check for encryption used inside pdf.
+# recommend meta with something else...
+body            GMD_PDF_ENCRYPTED       eval:pdf_is_encrypted()
+describe        GMD_PDF_ENCRYPTED       Attached PDF is encrypted
+score           GMD_PDF_ENCRYPTED       0.60
+# counts        GMD_PDF_ENCRYPTED       13s/0h of 34051 corpus (33259s/792h AxB2-TRAPS) 07/13/07
+
+# simple check for empty msg body when there is one or more pdf attachments present.
+body            GMD_PDF_EMPTY_BODY      eval:pdf_is_empty_body()
+describe        GMD_PDF_EMPTY_BODY      Attached PDF with empty message body
+score           GMD_PDF_EMPTY_BODY      0.25
+# counts        GMD_PDF_EMPTY_BODY      1638s/20h of 27034 corpus (24636s/2398h AxB-MANUAL) 07/19/07
+
+######################################################################################################
+# metas
+#meta            __GMD_PDF_CHECKSUM      ( GMD_PDF_FUZZY1_T1 || GMD_PDF_FUZZY2_T1 || GMD_PDF_FUZZY2_T2 || GMD_PDF_FUZZY2_T3 || GMD_PDF_FUZZY2_T4 || GMD_PDF_FUZZY2_T5 || GMD_PDF_FUZZY2_T6 || GMD_PDF_FUZZY2_T7 ||GMD_PDF_FUZZY2_T9 || GMD_PDF_FUZZY2_T10 || GMD_PDF_FUZZY2_T11 || GMD_PDF_FUZZY2_T12 )
+#meta            __GMD_PDF_DETAIL        ( GMD_AUTHOR_COLET || GMD_AUTHOR_MOBILE || GMD_AUTHOR_OOO || GMD_AUTHOR_HPADMIN || GMD_PRODUCER_GPL || GMD_PRODUCER_POWERPDF || GMD_PRODUCER_EASYPDF )
+meta            __GMD_PDF_DIMS          ( GMD_PDF_VERT || GMD_PDF_HORIZ || GMD_PDF_SQUARE )
+meta            __GMD_PDF_PRODUCERS     ( GMD_PRODUCER_GPL || GMD_PRODUCER_POWERPDF || GMD_PRODUCER_EASYPDF )
+
+# rule hits ham by itself, so use just to meta.
+body            __GMD_PDF_NO_TXT        eval:pdf_image_to_text_ratio(0.000, 0.005)
+
+# meta checksum hit with image dimensions
+#meta            GMD_PDF_STOX_M1         ( __GMD_PDF_CHECKSUM && __GMD_PDF_DIMS)
+#describe        GMD_PDF_STOX_M1         PDF Stox spam
+#score           GMD_PDF_STOX_M1         3.25
+# counts        GMD_PDF_STOX_M1         159s/0h of 6132 corpus (555s/1577h AxB-MANUAL) 07/11/07
+# counts        GMD_PDF_STOX_M1         40s/0h of 11773 corpus (10988s/785h AxB2-TRAPS) 07/11/07
+
+# meta checksum hit to pdf details
+#meta            GMD_PDF_STOX_M2         ( __GMD_PDF_CHECKSUM && __GMD_PDF_DETAIL )
+#describe        GMD_PDF_STOX_M2         PDF Stox spam
+#score           GMD_PDF_STOX_M2         2.95
+# counts        GMD_PDF_STOX_M2         223s/0h of 6132 corpus (555s/1577h AxB-MANUAL) 07/11/07
+# counts        GMD_PDF_STOX_M2         29s/0h of 10767 corpus (9986s/781h AxB2-TRAPS) 07/11/07
+
+# meta dimensions and encryption
+#meta            GMD_PDF_STOX_M3         ( __GMD_PDF_DIMS && GMD_PDF_ENCRYPTED )
+#describe        GMD_PDF_STOX_M3         PDF Stox spam
+#score           GMD_PDF_STOX_M3         2.25
+# counts        GMD_PDF_STOX_M3         12s/0h of 34051 corpus (33259s/792h AxB2-TRAPS) 07/13/07
+
+# meta checksum with no text
+#meta            GMD_PDF_STOX_M4         ( __GMD_PDF_CHECKSUM && (__GMD_PDF_NO_TXT || GMD_PDF_EMPTY_BODY))
+#describe        GMD_PDF_STOX_M4         PDF Stox spam
+#score           GMD_PDF_STOX_M4         2.95
+
+# meta no body text along with automated pdf production.
+#meta            GMD_PDF_STOX_M5         ( __GMD_PDF_PRODUCERS &&  (__GMD_PDF_NO_TXT || GMD_PDF_EMPTY_BODY))
+#describe        GMD_PDF_STOX_M5         PDF Stox Spam
+#score           GMD_PDF_STOX_M5         1.00
+
+endif
diff -Nru spamassassin-3.4.0/pkgrules/20_phrases.cf spamassassin-3.4.2/pkgrules/20_phrases.cf
--- spamassassin-3.4.0/pkgrules/20_phrases.cf	2014-02-06 22:05:55.000000000 -0500
+++ spamassassin-3.4.2/pkgrules/20_phrases.cf	2018-09-12 23:04:39.000000000 -0400
@@ -15,9 +15,9 @@
 # The ASF licenses this file to you under the Apache License, Version 2.0
 # (the "License"); you may not use this file except in compliance with
 # the License.  You may obtain a copy of the License at:
-# 
+#
 #     http://www.apache.org/licenses/LICENSE-2.0
-# 
+#
 # Unless required by applicable law or agreed to in writing, software
 # distributed under the License is distributed on an "AS IS" BASIS,
 # WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
@@ -55,9 +55,6 @@
 # strange pattern because otherwise it matches the std. majordomo line
 # pls note the comment above. DO NOT just put "to" in the first group!
 
-body EXCUSE_24			/you(?:'ve|'re| have| are)? receiv(?:e|ed|ing) this (?:advertisement|offer|special|recurring|paid).{0,16}\b(?:by either|because)/i
-describe EXCUSE_24		Claims you wanted this ad
-
 body EXCUSE_REMOVE		/to be removed from.{0,20}(?:mailings|offers)/i
 describe EXCUSE_REMOVE		Talks about how to be removed from mailings
 
@@ -85,15 +82,15 @@
 
 
 
-
-body NA_DOLLARS			/\b(?:\d{1,3})?Million\b.{0,40}\b(?:Canadian Dollar?s?|US\$|U\.? ?S\.? Dollar)/i
-describe NA_DOLLARS		Talks about a million North American dollars
-
-body US_DOLLARS_3               /(?:\$|usd).?\d{1,3}[,.]\d{3}[,.]\d{3}(?:[,.]\d\d)?/i
-describe US_DOLLARS_3           Mentions millions of $ ($NN,NNN,NNN.NN)
-
-body MILLION_USD              	/Million\b.{0,40}\b(?:United States? Dollars?|USD)/i
-describe MILLION_USD 		Talks about millions of dollars
+#MOVED TO 20_rules_to_sandbox.cf - kmcgrail 2015-05-14
+#body NA_DOLLARS			/\b(?:\d{1,3})?Million\b.{0,40}\b(?:Canadian Dollar?s?|US\$|U\.? ?S\.? Dollar)/i
+#describe NA_DOLLARS		Talks about a million North American dollars
+#
+#body US_DOLLARS_3               /(?:\$|usd).?\d{1,3}[,.]\d{3}[,.]\d{3}(?:[,.]\d\d)?/i
+#describe US_DOLLARS_3           Mentions millions of $ ($NN,NNN,NNN.NN)
+#
+#body MILLION_USD              	/Million\b.{0,40}\b(?:United States? Dollars?|USD)/i
+#describe MILLION_USD 		Talks about millions of dollars
 
 
 
@@ -110,7 +107,7 @@
 body FREE_QUOTE_INSTANT		/free.{0,12}(?:(?:instant|express|online|no.?obligation).{0,4})+.{0,32}\bquote/i
 describe FREE_QUOTE_INSTANT	Free express or no-obligation quote
 
-body BAD_CREDIT		        /\b(?:bad|poor|no\b|eliminate|repair|(?:re)?establish|damag).{0,10} (?:credit|debt)\b/i
+body BAD_CREDIT		        /\b((?:bad|poor|eliminate|repair|(?:re)?establish|damag).{0,10} (?:credit|debt)|no credit (?:check|histor|need))/i
 describe BAD_CREDIT		Eliminate Bad Credit
 
 
@@ -163,10 +160,12 @@
 body MORE_SEX               /increased?.{0,9}(?:sex|stamina)/i
 describe MORE_SEX 		Talks about a bigger drive for sex
 
+# explicitly capped at 1.0 score because of FP potential
 body BANG_GUAR	         	/\bguaranteed?\!/i
 describe BANG_GUAR		Something is emphatically guaranteed
 
 
+
 body __RUDE_HTML_1	/Get a capable html e-mailer/i
 body __RUDE_HTML_2	/not support the display of HTML. Please view this message in a different/i
 body __RUDE_HTML_3	/This message contains an HTML formatted message but your email client does/i
diff -Nru spamassassin-3.4.0/pkgrules/20_ratware.cf spamassassin-3.4.2/pkgrules/20_ratware.cf
--- spamassassin-3.4.0/pkgrules/20_ratware.cf	2014-02-06 22:05:55.000000000 -0500
+++ spamassassin-3.4.2/pkgrules/20_ratware.cf	2018-09-12 23:04:40.000000000 -0400
@@ -85,12 +85,15 @@
 meta __FORGED_OUTLOOK_DOLLARS	(__OUTLOOK_DOLLARS_MUA && !__OE_MSGID_2 && !__OUTLOOK_DOLLARS_OTHER && !__VISTA_MSGID && !__IMS_MSGID && !__UNUSABLE_MSGID)
 # use new meta rules to implement FORGED_MUA_OUTLOOK rule from 2.60
 
+# bug 7567: obviously fake Outlook X-Mailer
+header __OUTLOOK_FAKE_MUA       X-Mailer =~ /^Outlook$/
+
 # bug 5496: avoid some FPs
 header __FMO_EXCL_O3416   X-Mailer =~ /^Microsoft Outlook, Build 10.0.3416$/
 header __FMO_EXCL_OE3790  X-Mailer =~ /^Microsoft Outlook Express 6.00.3790.3959$/
 # bug 5910: __VISTA_MSGID also now used by Outlook Express from XP SP3
 #
-meta FORGED_MUA_OUTLOOK         ((__FORGED_OE || __FORGED_OUTLOOK_DOLLARS) && !__FMO_EXCL_O3416 && !__FMO_EXCL_OE3790 && !__VISTA_MSGID)
+meta FORGED_MUA_OUTLOOK         ((__FORGED_OE || __FORGED_OUTLOOK_DOLLARS || __OUTLOOK_FAKE_MUA) && !__FMO_EXCL_O3416 && !__FMO_EXCL_OE3790 && !__VISTA_MSGID)
 describe FORGED_MUA_OUTLOOK	Forged mail pretending to be from MS Outlook
 
 # Outlook IMO (Internet Mail Only)
@@ -99,6 +102,16 @@
 meta FORGED_MUA_OIMO		(__OIMO_MUA && !__OIMO_MSGID && !__OE_MSGID_2 && !__UNUSABLE_MSGID)
 describe FORGED_MUA_OIMO	Forged mail pretending to be from MS Outlook IMO
 
+# Not Ratware...
+
+header __HAS_X_LOOP		exists:X-Loop
+header __HAS_X_MAILING_LIST	exists:X-Mailing-List
+header __HAS_X_MAILMAN_VERSION	exists:X-Mailman-Version
+describe MAILING_LIST_MULTI	Multiple indicators imply a widely-seen list manager
+# __ML2 and __HAS_LIST_ID are exactly equivalent, don't double-count
+meta   MAILING_LIST_MULTI	__HAS_X_LOOP + __HAS_X_MAILING_LIST + __HAS_X_MAILMAN_VERSION + __HAS_LIST_ID + __HAS_X_BEEN_THERE +__DOS_HAS_LIST_UNSUB + __ML1 + __ML3 + __ML4 + __ML5 > 2
+tflags MAILING_LIST_MULTI	nice
+
 # QUALCOMM Eudora
 # Note: uses X_LOOP and X_MAILING_LIST as subrules
 # X-Mailer: QUALCOMM Windows Eudora Version 5.0   (and 5.1)
@@ -106,11 +119,9 @@
 # updated to fix bugs 2047, 2598, 2654
 # NOTE: this is the *only* spammish Eudora MUA pattern that wasn't
 # ignored using __OLD_EUDORA1 and __OLD_EUDORA2 under previous rules.
-header __EUDORA_MUA             X-Mailer =~ /^QUALCOMM Windows Eudora (?:Pro |Light )?Version [3456]\./
+header __EUDORA_MUA             X-Mailer =~ /^QUALCOMM Windows Eudora (?:Pro |Light )?Version [34567]\./
 header __EUDORA_MSGID		MESSAGEID =~ /^<(?:\d\d?\.){3,5}\d{14}\.[a-f0-9]{8}\@\S+(?:\sport\s\d+)?>$/m
-header __HAS_X_LOOP		exists:X-Loop
-header __HAS_X_MAILING_LIST	exists:X-Mailing-List
-meta FORGED_MUA_EUDORA          (__EUDORA_MUA && !__EUDORA_MSGID && !__UNUSABLE_MSGID && !__HAS_X_LOOP && !__HAS_X_MAILING_LIST)
+meta FORGED_MUA_EUDORA          __EUDORA_MUA && !( __EUDORA_MSGID || __UNUSABLE_MSGID || MAILING_LIST_MULTI || MSGID_FROM_MTA_HEADER )
 describe FORGED_MUA_EUDORA	Forged mail pretending to be from Eudora
   
 # From private mail with developers.  Some top tips here!
diff -Nru spamassassin-3.4.0/pkgrules/20_uri_tests.cf spamassassin-3.4.2/pkgrules/20_uri_tests.cf
--- spamassassin-3.4.0/pkgrules/20_uri_tests.cf	2014-02-06 22:05:55.000000000 -0500
+++ spamassassin-3.4.2/pkgrules/20_uri_tests.cf	2018-09-12 23:04:40.000000000 -0400
@@ -116,6 +116,6 @@
 
 ###########################################################################
 
-uri NORMAL_HTTP_TO_IP          m{^https?://\d+\.\d+\.\d+\.\d+}i
-describe NORMAL_HTTP_TO_IP     Uses a dotted-decimal IP address in URL
+uri NORMAL_HTTP_TO_IP          m{^https?://(?!1(?:0|27|69\.254|72\.(?:1[6-9]|2\d|3[01])|92\.168)\.)\d+\.\d+\.\d+\.\d+\b(?![.-])}i
+describe NORMAL_HTTP_TO_IP     URI host has a public dotted-decimal IPv4 address
 
diff -Nru spamassassin-3.4.0/pkgrules/23_bayes.cf spamassassin-3.4.2/pkgrules/23_bayes.cf
--- spamassassin-3.4.0/pkgrules/23_bayes.cf	2014-02-06 22:05:55.000000000 -0500
+++ spamassassin-3.4.2/pkgrules/23_bayes.cf	2018-09-12 23:04:39.000000000 -0400
@@ -43,6 +43,9 @@
 body BAYES_95		eval:check_bayes('0.95', '0.99')
 body BAYES_99		eval:check_bayes('0.99', '1.00')
 
+#Additional rule to add more of a score to BAYES_99 FOR 99.9% to 100%
+body BAYES_999		eval:check_bayes('0.999', '1.00')
+
 tflags BAYES_00		nice learn
 tflags BAYES_05		nice learn
 tflags BAYES_20		nice learn
@@ -52,6 +55,7 @@
 tflags BAYES_80		learn
 tflags BAYES_95		learn
 tflags BAYES_99		learn
+tflags BAYES_999	learn
 
 describe BAYES_00	Bayes spam probability is 0 to 1%
 describe BAYES_05	Bayes spam probability is 1 to 5%
@@ -62,5 +66,6 @@
 describe BAYES_80	Bayes spam probability is 80 to 95%
 describe BAYES_95	Bayes spam probability is 95 to 99%
 describe BAYES_99	Bayes spam probability is 99 to 100%
+describe BAYES_999      Bayes spam probability is 99.9 to 100%
 
 endif
diff -Nru spamassassin-3.4.0/pkgrules/25_dcc.cf spamassassin-3.4.2/pkgrules/25_dcc.cf
--- spamassassin-3.4.0/pkgrules/25_dcc.cf	2014-02-06 22:05:55.000000000 -0500
+++ spamassassin-3.4.2/pkgrules/25_dcc.cf	2018-09-12 23:04:40.000000000 -0400
@@ -35,24 +35,31 @@
 full     DCC_REPUT_00_12  eval:check_dcc_reputation_range(00,12)
 describe DCC_REPUT_00_12  DCC reputation between 0 and 12 %  (mostly ham)
 tflags   DCC_REPUT_00_12  nice net noautolearn
+reuse    DCC_REPUT_00_12
 
 full     DCC_REPUT_13_19  eval:check_dcc_reputation_range(13,19)
+describe DCC_REPUT_13_19  DCC reputation between 13 and 19 %
 tflags   DCC_REPUT_13_19  net nice
+reuse    DCC_REPUT_13_19
 
 full     DCC_REPUT_70_89  eval:check_dcc_reputation_range(70,89)
 describe DCC_REPUT_70_89  DCC reputation between 70 and 89 %
 tflags   DCC_REPUT_70_89  net
+reuse    DCC_REPUT_70_89
 
 full     DCC_REPUT_90_94  eval:check_dcc_reputation_range(90,94)
 describe DCC_REPUT_90_94  DCC reputation between 90 and 94 %
 tflags   DCC_REPUT_90_94  net
+reuse    DCC_REPUT_90_94
 
 full     DCC_REPUT_95_98  eval:check_dcc_reputation_range(95,98)
 describe DCC_REPUT_95_98  DCC reputation between 95 and 98 %  (mostly spam)
 tflags   DCC_REPUT_95_98  net
+reuse    DCC_REPUT_95_98
 
 full     DCC_REPUT_99_100 eval:check_dcc_reputation_range(99)
 describe DCC_REPUT_99_100 DCC reputation between 99 % or higher (spam)
 tflags   DCC_REPUT_99_100 net
+reuse    DCC_REPUT_99_100
 
 endif
diff -Nru spamassassin-3.4.0/pkgrules/25_dkim.cf spamassassin-3.4.2/pkgrules/25_dkim.cf
--- spamassassin-3.4.0/pkgrules/25_dkim.cf	2014-02-06 22:05:55.000000000 -0500
+++ spamassassin-3.4.2/pkgrules/25_dkim.cf	2018-09-12 23:04:40.000000000 -0400
@@ -27,67 +27,103 @@
 
 ifplugin Mail::SpamAssassin::Plugin::DKIM
 
-full   DKIM_SIGNED		eval:check_dkim_signed()
-full   DKIM_VALID		eval:check_dkim_valid()
-full   DKIM_VALID_AU		eval:check_dkim_valid_author_sig()
-full   __DKIM_DEPENDABLE	eval:check_dkim_dependable()
-
-header DKIM_ADSP_NXDOMAIN	eval:check_dkim_adsp('N')
-header DKIM_ADSP_DISCARD	eval:check_dkim_adsp('D')
-header DKIM_ADSP_ALL		eval:check_dkim_adsp('A')
-header DKIM_ADSP_CUSTOM_LOW	eval:check_dkim_adsp('1')
-header DKIM_ADSP_CUSTOM_MED	eval:check_dkim_adsp('2')
-header DKIM_ADSP_CUSTOM_HIGH	eval:check_dkim_adsp('3')
-
 # Note: DKIM_SIGNED, DKIM_VALID and DKIM_VALID_AU are mainly informational
 # rules, and can serve as a basis for meta rules; it is not difficult for a
 # sender to cause hits on them or to prevent them from firing, so their score
 # should be kept low.
-tflags DKIM_SIGNED		net
-tflags DKIM_VALID		net nice
-tflags DKIM_VALID_AU		net nice
-tflags DKIM_ADSP_NXDOMAIN	net
-tflags DKIM_ADSP_DISCARD	net
-tflags DKIM_ADSP_ALL		net
-tflags DKIM_ADSP_CUSTOM_LOW	net userconf
-tflags DKIM_ADSP_CUSTOM_MED	net userconf
-tflags DKIM_ADSP_CUSTOM_HIGH	net userconf
 
+full     DKIM_SIGNED		eval:check_dkim_signed()
 describe DKIM_SIGNED		Message has a DKIM or DK signature, not necessarily valid
+tflags   DKIM_SIGNED		net
+reuse    DKIM_SIGNED
+
+full     DKIM_VALID		eval:check_dkim_valid()
 describe DKIM_VALID		Message has at least one valid DKIM or DK signature
+tflags   DKIM_VALID		net nice
+reuse    DKIM_VALID
+
+full     DKIM_VALID_AU		eval:check_dkim_valid_author_sig()
 describe DKIM_VALID_AU		Message has a valid DKIM or DK signature from author's domain
+tflags   DKIM_VALID_AU		net nice
+reuse    DKIM_VALID_AU
+
+if (version >= 3.004002)
+full     DKIM_VALID_EF		eval:check_dkim_valid_envelopefrom()
+describe DKIM_VALID_EF		Message has a valid DKIM or DK signature from envelope-from domain
+tflags   DKIM_VALID_EF		net nice
+reuse    DKIM_VALID_EF
+endif
+
+full     __DKIM_DEPENDABLE	eval:check_dkim_dependable()
 describe __DKIM_DEPENDABLE	A validation failure not attributable to truncation
+reuse    __DKIM_DEPENDABLE
 
+header   DKIM_ADSP_NXDOMAIN	eval:check_dkim_adsp('N')
 describe DKIM_ADSP_NXDOMAIN	No valid author signature and domain not in DNS
+tflags   DKIM_ADSP_NXDOMAIN	net
+reuse    DKIM_ADSP_NXDOMAIN
+
+header   DKIM_ADSP_DISCARD	eval:check_dkim_adsp('D')
 describe DKIM_ADSP_DISCARD	No valid author signature, domain signs all mail and suggests discarding the rest
+tflags   DKIM_ADSP_DISCARD	net
+reuse    DKIM_ADSP_DISCARD
+
+header   DKIM_ADSP_ALL		eval:check_dkim_adsp('A')
 describe DKIM_ADSP_ALL		No valid author signature, domain signs all mail
+tflags   DKIM_ADSP_ALL		net
+reuse    DKIM_ADSP_ALL
+
+header   DKIM_ADSP_CUSTOM_LOW	eval:check_dkim_adsp('1')
 describe DKIM_ADSP_CUSTOM_LOW	No valid author signature, adsp_override is CUSTOM_LOW
+tflags   DKIM_ADSP_CUSTOM_LOW	net userconf
+reuse    DKIM_ADSP_CUSTOM_LOW
+
+header   DKIM_ADSP_CUSTOM_MED	eval:check_dkim_adsp('2')
 describe DKIM_ADSP_CUSTOM_MED	No valid author signature, adsp_override is CUSTOM_MED
+tflags   DKIM_ADSP_CUSTOM_MED	net userconf
+reuse    DKIM_ADSP_CUSTOM_MED
+
+header   DKIM_ADSP_CUSTOM_HIGH	eval:check_dkim_adsp('3')
 describe DKIM_ADSP_CUSTOM_HIGH	No valid author signature, adsp_override is CUSTOM_HIGH
+tflags   DKIM_ADSP_CUSTOM_HIGH	net userconf
+reuse    DKIM_ADSP_CUSTOM_HIGH
 
-full     __RESIGNER1  eval:check_dkim_valid('linkedin.com')
-full     __RESIGNER2  eval:check_dkim_valid('googlegroups.com','yahoogroups.com','yahoogroups.de')
-tflags   __RESIGNER1  net
-tflags   __RESIGNER2  net
+full     __RESIGNER1     eval:check_dkim_valid('linkedin.com')
+tflags   __RESIGNER1     net
+reuse    __RESIGNER1
+full     __RESIGNER2     eval:check_dkim_valid('googlegroups.com','yahoogroups.com','yahoogroups.de')
+tflags   __RESIGNER2     net
+reuse    __RESIGNER2
 meta     __VIA_RESIGNER  __RESIGNER1 || __RESIGNER2
 describe __VIA_RESIGNER  Mail through a popular signing remailer
 
 meta     NML_ADSP_CUSTOM_LOW    DKIM_ADSP_CUSTOM_LOW  && !__VIA_ML && !__VIA_RESIGNER
-meta     NML_ADSP_CUSTOM_MED    DKIM_ADSP_CUSTOM_MED  && !__VIA_ML && !__VIA_RESIGNER
-meta     NML_ADSP_CUSTOM_HIGH   DKIM_ADSP_CUSTOM_HIGH && !__VIA_ML && !__VIA_RESIGNER
 describe NML_ADSP_CUSTOM_LOW    ADSP custom_low hit, and not from a mailing list
+
+meta     NML_ADSP_CUSTOM_MED    DKIM_ADSP_CUSTOM_MED  && !__VIA_ML && !__VIA_RESIGNER
 describe NML_ADSP_CUSTOM_MED    ADSP custom_med hit, and not from a mailing list
+
+meta     NML_ADSP_CUSTOM_HIGH   DKIM_ADSP_CUSTOM_HIGH && !__VIA_ML && !__VIA_RESIGNER
 describe NML_ADSP_CUSTOM_HIGH   ADSP custom_high hit, and not from a mailing list
 
+#
 # old, declared for compatibility with pre-3.3, should have scores 0
+#
 
 full   DKIM_VERIFIED		eval:check_dkim_valid()
+tflags DKIM_VERIFIED		net nice
+reuse  DKIM_VERIFIED
+
 header DKIM_POLICY_TESTING	eval:check_dkim_testing()
+tflags DKIM_POLICY_TESTING	net nice
+reuse  DKIM_POLICY_TESTING
+
 header DKIM_POLICY_SIGNSOME	eval:check_dkim_signsome()
-header DKIM_POLICY_SIGNALL	eval:check_dkim_signall()
-tflags DKIM_VERIFIED		net nice
 tflags DKIM_POLICY_SIGNSOME	net nice
+reuse  DKIM_POLICY_SIGNSOME
+
+header DKIM_POLICY_SIGNALL	eval:check_dkim_signall()
 tflags DKIM_POLICY_SIGNALL	net nice
-tflags DKIM_POLICY_TESTING	net nice
+reuse  DKIM_POLICY_SIGNALL
 
 endif   # Mail::SpamAssassin::Plugin::DKIM
diff -Nru spamassassin-3.4.0/pkgrules/25_pyzor.cf spamassassin-3.4.2/pkgrules/25_pyzor.cf
--- spamassassin-3.4.0/pkgrules/25_pyzor.cf	2014-02-06 22:05:55.000000000 -0500
+++ spamassassin-3.4.2/pkgrules/25_pyzor.cf	2018-09-12 23:04:40.000000000 -0400
@@ -26,7 +26,7 @@
 ifplugin Mail::SpamAssassin::Plugin::Pyzor
 
 full PYZOR_CHECK	eval:check_pyzor()
-describe PYZOR_CHECK	Listed in Pyzor (http://pyzor.sf.net/)
+describe PYZOR_CHECK	Listed in Pyzor (https://pyzor.readthedocs.io/en/latest/)
 tflags PYZOR_CHECK	net
 reuse  PYZOR_CHECK
 
diff -Nru spamassassin-3.4.0/pkgrules/25_razor2.cf spamassassin-3.4.2/pkgrules/25_razor2.cf
--- spamassassin-3.4.0/pkgrules/25_razor2.cf	2014-02-06 22:05:55.000000000 -0500
+++ spamassassin-3.4.2/pkgrules/25_razor2.cf	2018-09-12 23:04:40.000000000 -0400
@@ -56,16 +56,6 @@
 reuse 	RAZOR2_CF_RANGE_51_100
 describe RAZOR2_CF_RANGE_51_100	Razor2 gives confidence level above 50%
 
-full	RAZOR2_CF_RANGE_E4_51_100	eval:check_razor2_range('4','51','100')
-tflags  RAZOR2_CF_RANGE_E4_51_100	net
-reuse 	RAZOR2_CF_RANGE_E4_51_100
-describe RAZOR2_CF_RANGE_E4_51_100	Razor2 gives engine 4 confidence level above 50%
-
-full	RAZOR2_CF_RANGE_E8_51_100	eval:check_razor2_range('8','51','100')
-tflags  RAZOR2_CF_RANGE_E8_51_100	net
-reuse 	RAZOR2_CF_RANGE_E8_51_100
-describe RAZOR2_CF_RANGE_E8_51_100	Razor2 gives engine 8 confidence level above 50%
-
 lang de describe RAZOR2_CF_RANGE_51_100	Razor2 Spam-Bewertung liegt zwischen 51 und 100
 lang fr describe RAZOR2_CF_RANGE_51_100	Razor2 donne un indice de confiance entre 51 et 100
 lang nl describe RAZOR2_CF_RANGE_51_100	Razor2 geeft een zekerheid tussen 51 en 100
diff -Nru spamassassin-3.4.0/pkgrules/25_replace.cf spamassassin-3.4.2/pkgrules/25_replace.cf
--- spamassassin-3.4.0/pkgrules/25_replace.cf	2014-02-06 22:05:55.000000000 -0500
+++ spamassassin-3.4.2/pkgrules/25_replace.cf	2018-09-12 23:04:39.000000000 -0400
@@ -27,34 +27,35 @@
 
 ifplugin Mail::SpamAssassin::Plugin::ReplaceTags
 
-replace_tag	A	[gra\@\xc0\xc1\xc2\xc3\xc4\xc5\xc6\xe4\xe3\xe2\xe0\xe1\xe2\xe3\xe4\xe5\xe60o]
-replace_tag	B	[b8]
-replace_tag	C	[ck\xc7\xe7@]
-replace_tag	D	[d\xd0]
-replace_tag	E	[e3\xc8\xc9\xca\xcb\xe8\xe9\xea\xeb\xa4]
-replace_tag	F	f
-replace_tag	G	[gk]
-replace_tag	H	h
-replace_tag	I	[il|!1y?\xcc\xcd\xce\xcf\xec\xed\xee\xef]
-replace_tag	J	j
-replace_tag	K	k
-replace_tag	L	[il|!1\xa3]
-replace_tag	M	(?:m|rn)
-replace_tag	N	[n\xd1\xf1]
-replace_tag	O	[go0\xd2\xd3\xd4\xd5\xd6\xd8\xf0\xf2\xf3\xf4\xf5\xf6\xf8]
-replace_tag	P	[p\xfe]
-replace_tag	Q	q
-replace_tag	R	r
-replace_tag	S	[sz\xa6\xa7]
-replace_tag	T	t
-replace_tag	U	[uv\xb5\xd9\xda\xdb\xdc\xfc\xfb\xfa\xf9\xfd]
-replace_tag	V	(?:[vu]|\\\/)
-replace_tag	W	[wv]
-replace_tag	X	(?:[x\xd7]|><)
-replace_tag	Y	[y\xff\xfd\xa5j]
+replace_tag	A	(?:[gra\@\xc0\xc1\xc2\xc3\xc4\xc5\xc6\xe4\xe3\xe2\xe0\xe1\xe2\xe3\xe4\xe5\xe6o0]|[\xce][\x86\x91\x94\x9b\xac\xb1]|[\xd0][\x90\xb0]|[\xd1][\xa6\xa7]|[\xd3][\x90\x91\x92\x93]|[\xe1][\x8e][\xaa])
+replace_tag	B	(?:[b8]|[\xce][\x92\xb2]|[\xcf][\x90\xb8]|[\xd0][\x91\x92\xac\xb1\xb2]|[\xd1][\x8a\x8c\xa2\xa3]|[\xd2][\x8c\x8d])
+replace_tag	C	(?:[ck\xc7\xe7@]|[\xc3][\x87]|[\xc4][\x86\x87\x88\x89\x8a\x8b\x8c\x8d]|[\xcf][\x82\x9a\x9b\xb2\xb9\xbe]|[\xd0][\xa1]|[\xd1][\x81]|[\xd2][\x80\x81\xaa\xab]|[\xd5][\x87]|&\#(?:1(?:0(?:10|17|2[123]|57|89)|1(?:52|53|94|95)|99)|2(?:31|6[2-9])|39[12]|x(?:3(?:f2|f9|fe)|4(?:21|41|80|81|aa|ab)));)
+replace_tag	D	(?:[d\xd0]|[\xd4][\x80\x81]|[\xd5][\xaa])
+replace_tag	E	(?:[e3]|[\xc4][\x92\x93\x94\x95\x96\x97\x98\x99\x9a\x9b]|[\xc8][\x84\x85\x86\x87\xa8\xa9]|[\xce][\x88\x95\xa3\xad\xb5\xbe]|[\xcf][\xb5]|[\xd0][\x80\x81\x84\x95\xb5]|[\xd1][\x90\x91\x94\xb3]|[\xd2][\xbc\xbd\xbe\xbf]|[\xd3][\x96\x97\xa9\xab]|[\xd4][\x90\x91]|[\xc8\xc9\xca\xcb\xe8\xe9\xea\xeb\xa4]|&\#(?:1(?:0(?:13|2[458]|45|77)|108|2(?:1[2-5]|3[89]|9[67]))|2(?:0[0-3]|3[2-5]|7[4-9]|8[0-3])|400|51[6-9]|5[58][23]|603|9(?:04|17|[34]1|4[19]));)
+replace_tag	F	(?:f|[\xcf][\x9c\x9d]|[\xd2][\x92\x93]|[\xd3][\xba\xbb]|[\xd4][\xb2]|[\xd5][\xa2])
+replace_tag	G	(?:[gk]|[\xd2][\xa8\xa9]|[\xd4][\x8c\x8d]|[\xd6][\x81])
+replace_tag	H	(?:h|[\xce][\x89\x97]|[\xcf][\xa6]|[\xd0][\x8a\x8b\x9d\xbd]|[\xd1][\x92\x9b]|[\xd2][\x94\x95\xa2\xa3\xa4\xa5\xba\xbb]|[\xd3][\x87\x88\x89\x8a]|[\xd4][\xbb]|[\xd5][\xab\xb0]|&\#(?:2(?:22[3-6]|9[2-5])|54[23]|1(?:0(?:53|85)|18[6-9]|8(?:0(?:8[89]|9[0-5])|1(?:38[89]|340)))|919);)
+replace_tag	I	(?:[il|!1y?\xcc\xcd\xce\xcf\xec\xed\xee\xef]|[\xc4][\xa8]|[\xc7][\x8f\x90]|[\xce][\x8a\x90\x99\xaa\xaf\xb9]|[\xcf][\x8a]|[\xd0][\x86\x87]|[\xd1][\x96\x97]|[\xd3][\x80\x8f]|[\xd5][\xac]|&\#(?:1(?:03[01]|11[01]|216|231)|2(?:0[4-7]|16|3[6-9]|9[6-9])|3(?:0[0-5])|4(?:0[67]|6[34])|52[0-3]);)
+replace_tag	J	(?:j|[\xcf][\xb3]|[\xd0][\x88]|[\xd1][\x98]|[\xd5][\xb5])
+replace_tag	K	(?:k|[\xc7][\xa8\xa9]|[\xce][\x9a\xba]|[\xd0][\x8c\x9a\xba]|[\xd1][\x9c]|[\xd2][\x9a\x9b\x9c\x9d\x9e\x9f\xa0\xa1]|[\xd3][\x83\x84]|[\xd4][\x9e\x9f]|&\#(?:31[0-2]|4[08][89]|9(?:22|54|75)|1(?:0(?:36|50|82)|1(?:16|7[89]|8[0-5])|219|220|31[01]));)
+replace_tag	L	(?:[il|!1\xa3]|[\xc4][\xb9\xba\xbb\xbc\xbd\xbe\xbf]|[\xc5][\x80\x81\x82]|[\xc8][\xbd]|[\xd3][\x80\x8f]|[\xd4][\xbc]|[\xd5][\xac]|[\xd6][\x82]|&\#(?:1340|3(?:1[3-9]|2[0-2])|573|671|x53c|76);)
+replace_tag	M	(?:m|rn|[\xd0][\x9c\xbc]|[\xd2][\xa7]|[\xd3][\x8d\x8e])
+replace_tag	N	(?:[n\xd1\xf1]|[\xd0][\x98\x99\x9f\xb8\xb9\xbb\xbf]|[\xd1][\x9d]|[\xd2][\x8a\x8b]|[\xd3][\x86\xa2\xa3\xa4\xa5]|[\xd4][\xa5]|[\xd5][\x88\x8c\xa4\xa8\xb2\xb8\xbc]|[\xd6][\x80])
+replace_tag	O	(?:[go0\xd2\xd3\xd4\xd5\xd6\xd8\xf0\xf2\xf3\xf4\xf5\xf6\xf8]|[\xd0][\x9e\xae\xbe]|[\xd1][\xba\xbb]|[\xd3][\xa6\xa7\xa8\xaa]|[\xd4][\x9a]|[\xd5][\x95\xae]|[\xd6][\x85]|[\xd7][\xa1])
+replace_tag	P	(?:[p\xfe]|[\xd0][\xa0]|[\xd1][\x80]|[\xd2][\x8e\x8f]|[\xd4][\x97]|[\xd5][\xa9]|[\xd6][\x84])
+replace_tag	Q	(?:q|[\xd4][\x9a\x9b\xb3]|[\xd5][\xa3\xa6])
+replace_tag	R	(?:r|[\xc5][\x94\x95\x96\x97\x98\x99]|[\xc8][\x90\x91\x92\x93]|[\xd0][\x93\xaf]|[\xd1][\x8f\x93]|[\xd2][\x90\x91\x93]|[\xd3][\xb6\xb7]|[\xd4][\xb8\xbb]|[\xd5][\x90\x92]|[\xd6][\x80]|&\#(?:1(?:071|103)|34[0-5]|422|5(?:2[89]|3[01]|8[89])|6(?:3[67]|40));)
+replace_tag	S	(?:[sz\xa6\xa7]|[\xd0][\x85]|[\xd1][\x95]|[\xd5][\x8f])
+replace_tag	T	(?:t|[\xd0][\x93\xa2]|[\xd1][\x82]|[\xd2][\x90\xac\xad]|[\xd3][\xb6]|[\xd4][\xb5\xb7]|[\xd5][\x92\xa7])
+replace_tag	U	(?:[uv\xb5\xd9\xda\xdb\xdc\xfc\xfb\xfa\xf9\xfd]|[\xd0][\x8f\xa6]|[\xd1][\x86\x9f]|[\xd4][\xb1\xbf]|[\xd5][\x84\x8d\xb4\xb6\xbd\xbe]|[\xd6][\x87])
+replace_tag	V	(?:[vu]|\\\/|[\xd1][\xb4\xb5\xb6\xb7])
+replace_tag	W	(?:[wv]|[\xd0][\xa8\xa9]|[\xd1][\x88\x89\xa1\xb0\xb1\xbf]|[\xd4][\x9c\x9d]|[\xd5][\xa1\xba])
+replace_tag	X	(?:[x\xd7]|><|[\xd0][\x96\xa5\xb6]|[\xd1][\x85]|[\xd2][\x96\x97\xb2\xb3]|[\xd3][\x81\x82\x9c\x9d\xbc\xbd\xbe\xbf])
+replace_tag	Y	(?:[y\xff\xfd\xa5j]|[\xd0][\x8e\xa3]|[\xd1][\x83\x87\x9e]|[\xd2][\xae\xaf\xb0\xb1\xb6\xb7\xb8\xb9]|[\xd3][\x8b\x8c\xae\xaf\xb0\xb1\xb2\xb3\xb4\xb5]|[\xd4][\xbf]|[\xd5][\x8e\xaf\xbe])
 replace_tag	Z	[zs]
 replace_tag	IMG	(?:jpe?g|gif|png)
 replace_tag	SP	[\s\d_*\$\%(),.:;?!}{\[\]|\/?^\#~\xa1`'+-]
+replace_tag	WS	(?:=?\s|[\xe2](?:[\x80][\x80\x81\x82\x83\x84\x85\x86\x87\x88\x89\x8a\x8b\x8c\x8d\xaf]|[\x81][\x9f])|&(?:\#(?:8(?:19[2-9]|20[0-5]|239|287)|160|xa0)|(?:e[nm]|nb|thin)sp);)
 replace_tag	CUR	[\$\xa5\xa3\xa4\xa2]
 
 replace_inter	SP	[\s\d_*\$\%(),.:;?!}{\[\]|\/?^\#~\xa1`'+-]
diff -Nru spamassassin-3.4.0/pkgrules/25_spf.cf spamassassin-3.4.2/pkgrules/25_spf.cf
--- spamassassin-3.4.0/pkgrules/25_spf.cf	2014-02-06 22:05:55.000000000 -0500
+++ spamassassin-3.4.2/pkgrules/25_spf.cf	2018-09-12 23:04:40.000000000 -0400
@@ -32,12 +32,17 @@
 #   "neutral" is somewhat bad
 #   "fail" is bad
 #   "softfail" is bad, but not as bad as "fail"
+#   "permerror" is very bad, and means the domain doesn't have a valid spf record
 # These are more trustworthy results than the SPF_HELO rules.
 
 header SPF_PASS			eval:check_for_spf_pass()
 header SPF_NEUTRAL		eval:check_for_spf_neutral()
 header SPF_FAIL			eval:check_for_spf_fail()
 header SPF_SOFTFAIL		eval:check_for_spf_softfail()
+if can(Mail::SpamAssassin::Plugin::SPF::has_check_for_spf_errors)
+  header T_SPF_PERMERROR		eval:check_for_spf_permerror()
+  header T_SPF_TEMPERROR		eval:check_for_spf_temperror()
+endif
 
 # NOTE: SPF_HELO_PASS is not incredibly hard to fake, so shouldn't
 # provide much in the way of points compared to SPF_PASS et al.
@@ -47,6 +52,10 @@
 header SPF_HELO_NEUTRAL		eval:check_for_spf_helo_neutral()
 header SPF_HELO_FAIL		eval:check_for_spf_helo_fail()
 header SPF_HELO_SOFTFAIL	eval:check_for_spf_helo_softfail()
+if can(Mail::SpamAssassin::Plugin::SPF::has_check_for_spf_errors)
+  header T_SPF_HELO_PERMERROR	eval:check_for_spf_helo_permerror()
+  header T_SPF_HELO_TEMPERROR	eval:check_for_spf_helo_temperror()
+endif
 
 describe SPF_PASS		SPF: sender matches SPF record
 describe SPF_NEUTRAL		SPF: sender does not match SPF record (neutral)
@@ -56,6 +65,12 @@
 describe SPF_HELO_NEUTRAL	SPF: HELO does not match SPF record (neutral)
 describe SPF_HELO_FAIL		SPF: HELO does not match SPF record (fail)
 describe SPF_HELO_SOFTFAIL	SPF: HELO does not match SPF record (softfail)
+if can(Mail::SpamAssassin::Plugin::SPF::has_check_for_spf_errors)
+  describe T_SPF_PERMERROR        SPF: test of record failed (permerror)
+  describe T_SPF_TEMPERROR        SPF: test of record failed (temperror)
+  describe T_SPF_HELO_PERMERROR	SPF: test of HELO record failed (permerror)
+  describe T_SPF_HELO_TEMPERROR	SPF: test of HELO record failed (temperror)
+endif
 
 # these are "userconf" so that scores are set by hand
 tflags SPF_PASS			nice userconf net
@@ -66,6 +81,12 @@
 tflags SPF_HELO_NEUTRAL	        net
 tflags SPF_HELO_FAIL		net
 tflags SPF_HELO_SOFTFAIL	net
+if can(Mail::SpamAssassin::Plugin::SPF::has_check_for_spf_errors)
+  tflags T_SPF_HELO_PERMERROR	net
+  tflags T_SPF_HELO_TEMPERROR	net
+  tflags T_SPF_PERMERROR          net
+  tflags T_SPF_TEMPERROR          net
+endif
 
 # rules from earlier than current release that can be reused
 reuse  SPF_PASS
@@ -76,13 +97,22 @@
 reuse  SPF_HELO_SOFTFAIL
 reuse  SPF_NEUTRAL
 reuse  SPF_HELO_NEUTRAL
+if can(Mail::SpamAssassin::Plugin::SPF::has_check_for_spf_errors)
+  reuse  T_SPF_PERMERROR
+  reuse  T_SPF_TEMPERROR
+  reuse  T_SPF_HELO_PERMERROR
+  reuse  T_SPF_HELO_TEMPERROR
+endif
 
 # Implementing the Sender Check for No SPF REcord defaulting to disabled so Admins can override
 header		SPF_NONE    eval:check_for_spf_none()
 describe	SPF_NONE    SPF: sender does not publish an SPF Record
+tflags		SPF_NONE    net
+reuse		SPF_NONE
 
 header		SPF_HELO_NONE	eval:check_for_spf_helo_none()
 describe	SPF_HELO_NONE	SPF: HELO does not publish an SPF Record
-
+tflags		SPF_HELO_NONE   net
+reuse		SPF_HELO_NONE
 
 endif   # Mail::SpamAssassin::Plugin::SPF
diff -Nru spamassassin-3.4.0/pkgrules/25_uribl.cf spamassassin-3.4.2/pkgrules/25_uribl.cf
--- spamassassin-3.4.0/pkgrules/25_uribl.cf	2014-02-06 22:05:55.000000000 -0500
+++ spamassassin-3.4.2/pkgrules/25_uribl.cf	2018-09-12 23:04:40.000000000 -0400
@@ -35,7 +35,7 @@
 
 uridnssub       URIBL_SBL        zen.spamhaus.org.       A   127.0.0.2
 body            URIBL_SBL        eval:check_uridnsbl('URIBL_SBL')
-describe        URIBL_SBL        Contains an URL's NS IP listed in the SBL blocklist
+describe        URIBL_SBL        Contains an URL's NS IP listed in the Spamhaus SBL blocklist
 tflags          URIBL_SBL        net
 reuse           URIBL_SBL
 
@@ -44,39 +44,91 @@
 
     uridnsbl        URIBL_SBL_A    sbl.spamhaus.org.   A
     body            URIBL_SBL_A    eval:check_uridnsbl('URIBL_SBL_A')
-    describe        URIBL_SBL_A    Contains URL's A record listed in the SBL blocklist
+    describe        URIBL_SBL_A    Contains URL's A record listed in the Spamhaus SBL blocklist
     tflags          URIBL_SBL_A    net a
+    reuse           URIBL_SBL_A
   endif
 endif
 
 # DBL, http://www.spamhaus.org/dbl/
+# changes axb 05-17-2014: as per http://www.spamhaus.org/news/article/713/
+# SH changes effective 06-01-2014
 if can(Mail::SpamAssassin::Plugin::URIDNSBL::has_tflags_domains_only)
-urirhssub       URIBL_DBL_SPAM   dbl.spamhaus.org.       A   127.0.1.2
-body            URIBL_DBL_SPAM   eval:check_uridnsbl('URIBL_DBL_SPAM')
-describe        URIBL_DBL_SPAM   Contains an URL listed in the DBL blocklist
-tflags          URIBL_DBL_SPAM   net domains_only
-
-urirhssub       URIBL_DBL_REDIR  dbl.spamhaus.org.       A   127.0.1.3
-body            URIBL_DBL_REDIR  eval:check_uridnsbl('URIBL_DBL_REDIRECTOR')
-describe        URIBL_DBL_REDIR  Contains a URL listed in the DBL as a spammed redirector domain
-tflags          URIBL_DBL_REDIR  net domains_only
+
+urirhssub       URIBL_DBL_SPAM   	dbl.spamhaus.org.       A   127.0.1.2
+body            URIBL_DBL_SPAM   	eval:check_uridnsbl('URIBL_DBL_SPAM')
+describe        URIBL_DBL_SPAM   	Contains a spam URL listed in the Spamhaus DBL blocklist
+tflags          URIBL_DBL_SPAM   	net domains_only
+reuse           URIBL_DBL_SPAM
+
+urirhssub       URIBL_DBL_PHISH  	dbl.spamhaus.org.       A   127.0.1.4
+body            URIBL_DBL_PHISH	 	eval:check_uridnsbl('URIBL_DBL_PHISH')
+describe        URIBL_DBL_PHISH	 	Contains a Phishing URL listed in the Spamhaus DBL blocklist
+tflags          URIBL_DBL_PHISH  	net domains_only
+reuse           URIBL_DBL_PHISH
+
+urirhssub       URIBL_DBL_MALWARE  	dbl.spamhaus.org.       A   127.0.1.5
+body            URIBL_DBL_MALWARE  	eval:check_uridnsbl('URIBL_DBL_MALWARE')
+describe        URIBL_DBL_MALWARE  	Contains a malware URL listed in the Spamhaus DBL blocklist
+tflags          URIBL_DBL_MALWARE  	net domains_only
+reuse           URIBL_DBL_MALWARE
+
+urirhssub       URIBL_DBL_BOTNETCC  	dbl.spamhaus.org.       A   127.0.1.6
+body            URIBL_DBL_BOTNETCC	eval:check_uridnsbl('URIBL_DBL_BOTNETCC')
+describe        URIBL_DBL_BOTNETCC	Contains a botned C&C URL listed in the Spamhaus DBL blocklist
+tflags          URIBL_DBL_BOTNETCC	net domains_only
+reuse           URIBL_DBL_BOTNETCC
+
+urirhssub       URIBL_DBL_ABUSE_SPAM  	dbl.spamhaus.org.       A   127.0.1.102
+body            URIBL_DBL_ABUSE_SPAM	eval:check_uridnsbl('URIBL_DBL_ABUSE_SPAM')
+describe        URIBL_DBL_ABUSE_SPAM	Contains an abused spamvertized URL listed in the Spamhaus DBL blocklist
+tflags          URIBL_DBL_ABUSE_SPAM	net domains_only
+reuse           URIBL_DBL_ABUSE_SPAM
+
+urirhssub       URIBL_DBL_ABUSE_REDIR  	dbl.spamhaus.org.       A   127.0.1.103
+body            URIBL_DBL_ABUSE_REDIR  	eval:check_uridnsbl('URIBL_DBL_ABUSE_REDIR')
+describe        URIBL_DBL_ABUSE_REDIR  	Contains an abused redirector URL listed in the Spamhaus DBL blocklist
+tflags          URIBL_DBL_ABUSE_REDIR  	net domains_only
+reuse           URIBL_DBL_ABUSE_REDIR
+
+urirhssub       URIBL_DBL_ABUSE_PHISH  	dbl.spamhaus.org.       A   127.0.1.104
+body            URIBL_DBL_ABUSE_PHISH	eval:check_uridnsbl('URIBL_DBL_ABUSE_PHISH')
+describe        URIBL_DBL_ABUSE_PHISH	Contains an abused phishing URL listed in the Spamhaus DBL blocklist
+tflags          URIBL_DBL_ABUSE_PHISH	net domains_only
+reuse           URIBL_DBL_ABUSE_PHISH
+
+urirhssub       URIBL_DBL_ABUSE_MALW  	dbl.spamhaus.org.       A   127.0.1.105
+body            URIBL_DBL_ABUSE_MALW	eval:check_uridnsbl('URIBL_DBL_ABUSE_MALW')
+describe        URIBL_DBL_ABUSE_MALW	Contains an abused malware URL listed in the Spamhaus DBL blocklist
+tflags          URIBL_DBL_ABUSE_MALW	net domains_only
+reuse           URIBL_DBL_ABUSE_MALW
+
+urirhssub       URIBL_DBL_ABUSE_BOTCC  	dbl.spamhaus.org.       A   127.0.1.106
+body            URIBL_DBL_ABUSE_BOTCC  	eval:check_uridnsbl('URIBL_DBL_ABUSE_BOTCC')
+describe        URIBL_DBL_ABUSE_BOTCC  	Contains an abused botnet C&C URL listed in the Spamhaus DBL blocklist
+tflags          URIBL_DBL_ABUSE_BOTCC  	net domains_only
+reuse           URIBL_DBL_ABUSE_BOTCC
+
 
 # this indicates that IP-address queries were sent to DBL, and should
 # never appear; if it does, something is wrong with SpamAssassin
 urirhssub       URIBL_DBL_ERROR  dbl.spamhaus.org.       A   127.0.1.255
 body            URIBL_DBL_ERROR  eval:check_uridnsbl('URIBL_DBL_ERROR')
-describe        URIBL_DBL_ERROR  Error: queried the DBL blocklist for an IP
+describe        URIBL_DBL_ERROR  Error: queried the Spamhaus DBL blocklist for an IP
 tflags          URIBL_DBL_ERROR  net domains_only
+reuse           URIBL_DBL_ERROR
+
 endif
 
 ###########################################################################
 ## SURBL
 
-urirhssub       URIBL_SC_SURBL  multi.surbl.org.        A   2
-body            URIBL_SC_SURBL  eval:check_uridnsbl('URIBL_SC_SURBL')
-describe        URIBL_SC_SURBL  Contains an URL listed in the SC SURBL blocklist
-tflags          URIBL_SC_SURBL  net
-reuse           URIBL_SC_SURBL
+#MERGED INTO BIT 64 per bug 7279
+#urirhssub       URIBL_SC_SURBL  multi.surbl.org.        A   2
+#body            URIBL_SC_SURBL  eval:check_uridnsbl('URIBL_SC_SURBL')
+#describe        URIBL_SC_SURBL  Contains an URL listed in the SC SURBL blocklist
+#tflags          URIBL_SC_SURBL  net
+#reuse           URIBL_SC_SURBL
 
 urirhssub       URIBL_WS_SURBL  multi.surbl.org.        A   4
 body            URIBL_WS_SURBL  eval:check_uridnsbl('URIBL_WS_SURBL')
@@ -92,21 +144,36 @@
 
 urirhssub       URIBL_MW_SURBL  multi.surbl.org.        A   16
 body            URIBL_MW_SURBL  eval:check_uridnsbl('URIBL_MW_SURBL')
-describe        URIBL_MW_SURBL  Contains a Malware Domain or IP listed in the MW SURBL blocklist
+describe        URIBL_MW_SURBL  Contains a URL listed in the MW SURBL blocklist
 tflags          URIBL_MW_SURBL  net
 reuse           URIBL_MW_SURBL
 
-urirhssub       URIBL_AB_SURBL  multi.surbl.org.        A   32
-body            URIBL_AB_SURBL  eval:check_uridnsbl('URIBL_AB_SURBL')
-describe        URIBL_AB_SURBL  Contains an URL listed in the AB SURBL blocklist
-tflags          URIBL_AB_SURBL  net
-reuse           URIBL_AB_SURBL
-
-urirhssub       URIBL_JP_SURBL  multi.surbl.org.        A   64
-body            URIBL_JP_SURBL  eval:check_uridnsbl('URIBL_JP_SURBL')
-describe        URIBL_JP_SURBL  Contains an URL listed in the JP SURBL blocklist
-tflags          URIBL_JP_SURBL  net
-reuse           URIBL_JP_SURBL
+urirhssub       URIBL_CR_SURBL  multi.surbl.org.        A   128
+body            URIBL_CR_SURBL  eval:check_uridnsbl('URIBL_CR_SURBL')
+describe        URIBL_CR_SURBL  Contains an URL listed in the CR SURBL blocklist
+tflags          URIBL_CR_SURBL  net
+reuse           URIBL_CR_SURBL
+
+#MERGED INTO BIT 64 per bug 7279
+#urirhssub       URIBL_AB_SURBL  multi.surbl.org.        A   32
+#body            URIBL_AB_SURBL  eval:check_uridnsbl('URIBL_AB_SURBL')
+#describe        URIBL_AB_SURBL  Contains an URL listed in the AB SURBL blocklist
+#tflags          URIBL_AB_SURBL  net
+#reuse           URIBL_AB_SURBL
+
+#JP MOVED INTO ABUSE AS WELL AND BIT REUSED  per bug 7279
+urirhssub       URIBL_ABUSE_SURBL  multi.surbl.org.        A   64
+body            URIBL_ABUSE_SURBL  eval:check_uridnsbl('URIBL_ABUSE_SURBL')
+describe        URIBL_ABUSE_SURBL  Contains an URL listed in the ABUSE SURBL blocklist
+tflags          URIBL_ABUSE_SURBL  net
+reuse           URIBL_ABUSE_SURBL
+
+#SURBL BLOCK RULES - Bit 1 means your DNS has been blocked and this rule should be triggered to notify you.
+urirhssub       SURBL_BLOCKED   multi.surbl.org.        A   1
+body            SURBL_BLOCKED   eval:check_uridnsbl('SURBL_BLOCKED')
+describe        SURBL_BLOCKED   ADMINISTRATOR NOTICE: The query to SURBL was blocked.  See http://wiki.apache.org/spamassassin/DnsBlocklists\#dnsbl-block for more information.
+tflags          SURBL_BLOCKED   net noautolearn
+reuse           SURBL_BLOCKED
 
 ###########################################################################
 ## URIBL
@@ -136,13 +203,14 @@
 tflags          URIBL_BLOCKED   net noautolearn
 reuse           URIBL_BLOCKED
 
+
 ###########################################################################
 ## DOMAINS TO SKIP (KNOWN GOOD)
 
 # Don't bother looking for example domains as per RFC 2606.
 uridnsbl_skip_domain example.com example.net example.org
 
-uridnsbl_skip_domain local.cf 
+uridnsbl_skip_domain local.cf
 
 # MUA CSS class definitions
 uridnsbl_skip_domain div.tk p.tk li.tk no.tk
@@ -152,7 +220,7 @@
 uridnsbl_skip_domain 5iantlavalamp.com about.com adelphia.net adobe.com addthis.com
 uridnsbl_skip_domain agora-inc.com agoramedia.com akamai.net
 uridnsbl_skip_domain akamaitech.net amazon.com ancestry.com aol.com
-uridnsbl_skip_domain apache.org apple.com arcamax.com astrology.com
+uridnsbl_skip_domain apache.org apple.com arcamax.com astrology.com apple.news
 uridnsbl_skip_domain atdmt.com att.net bbc.co.uk
 uridnsbl_skip_domain bcentral.com bellsouth.net bfi0.com
 uridnsbl_skip_domain bridgetrack.com cafe24.com charter.net
@@ -197,6 +265,7 @@
 uridnsbl_skip_domain yahoo.com yahoo.com.br yahoogroups.com yimg.com
 uridnsbl_skip_domain yopi.de yoursite.com zdnet.com
 uridnsbl_skip_domain openxmlformats.org passport.com xmlsoap.org
+uridnsbl_skip_domain abc.xyz avast.com schema.org
 
 # wtogami's most frequent known good URIDNSBL lookups (1/1/2011)
 uridnsbl_skip_domain alexa.com ask.com baidu.com bing.com craigslist.org
@@ -208,5 +277,13 @@
 
 uridnsbl_skip_domain fedex.com
 uridnsbl_skip_domain openoffice.org
+uridnsbl_skip_domain vk.com
+
+# pointless footer noise
+uridnsbl_skip_domain security.cloud
+uridnsbl_skip_domain yac.mx
+
+# Microsoft on ns1.msedge.net
+uridnsbl_skip_domain microsofttranslator.com office.com microsoftonline.com bing.com msedge.net
 
 endif   # Mail::SpamAssassin::Plugin::URIDNSBL
diff -Nru spamassassin-3.4.0/pkgrules/30_text_de.cf spamassassin-3.4.2/pkgrules/30_text_de.cf
--- spamassassin-3.4.0/pkgrules/30_text_de.cf	2014-02-06 22:05:55.000000000 -0500
+++ spamassassin-3.4.2/pkgrules/30_text_de.cf	2018-09-12 23:04:40.000000000 -0400
@@ -88,7 +88,6 @@
 lang de describe RCVD_IN_SORBS_DUL SORBS: Senderechner nur temporär mit Internet verbunden
 lang de describe RCVD_IN_SBL Transportiert via Rechner in SBL-Liste (http://www.spamhaus.org/sbl/)
 lang de describe RCVD_IN_XBL Transportiert via Rechner in XBL-Liste (http://www.spamhaus.org/xbl/)
-lang de describe DNS_FROM_AHBL_RHSBL Absenderadresse in Liste von dnsbl.ahbl.org
 lang de describe RCVD_IN_BL_SPAMCOP_NET Transportiert via Rechner in Liste von www.spamcop.net
 lang de describe RCVD_IN_MAPS_RBL Transportiert via Rechner in Liste von http://www.mail-abuse.org/rbl/
 lang de describe RCVD_IN_MAPS_DUL Transportiert via Rechner in Liste von http://www.mail-abuse.org/dul/
@@ -164,7 +163,6 @@
 lang de describe KOREAN_UCE_SUBJECT Betreff enthält koreanische Werbungskennzeichnung
 lang de describe NO_DNS_FOR_FROM Domain der Absendeadresse nicht im DNS registriert (kein MX/A Eintrag)
 lang de describe RCVD_HELO_IP_MISMATCH HELO-Name und IP-Adresse in Kopfzeilen passen nicht
-lang de describe RCVD_NUMERIC_HELO "Received"-Kopfzeilen enthalten numerische HELO-Identifikation
 lang de describe RCVD_ILLEGAL_IP "Received"-Kopfzeilen enthalten ungültige IP-Adresse
 lang de describe RCVD_DOUBLE_IP_SPAM Kennzeichen von Spam-Software (doppelte IP-Adresse)
 lang de describe RCVD_DOUBLE_IP_LOOSE Empfänger/Sender in Kopfzeilen sehen aus wie IP-Adressen
@@ -260,9 +258,9 @@
 lang de describe BODY_ENHANCEMENT Informationen zur Penis-/Brustvergrößerung
 lang de describe BODY_ENHANCEMENT2 Informationen zur Penis-/Brustvergrößerung
 lang de describe IMPOTENCE Beseitigt Impotenz
-lang de describe NA_DOLLARS Handelt von einer Million Dollar aus den US oder Kanada
-lang de describe US_DOLLARS_3 Erwähnt Millonen von Dollar
-lang de describe MILLION_USD Erwähnt Millonen von Dollar
+#lang de describe NA_DOLLARS Handelt von einer Million Dollar aus den US oder Kanada
+#lang de describe US_DOLLARS_3 Erwähnt Millonen von Dollar
+#lang de describe MILLION_USD Erwähnt Millonen von Dollar
 lang de describe URG_BIZ Dringende Geschäfte
 lang de describe MONEY_BACK Mit Geld-zurück Garantie
 lang de describe FREE_QUOTE_INSTANT Kostenlos ein schnelles Preisangebot, ohne Verpflichtung
@@ -327,6 +325,7 @@
 lang de describe BAYES_80 Spamwahrscheinlichkeit nach Bayes-Test: 80-95%
 lang de describe BAYES_95 Spamwahrscheinlichkeit nach Bayes-Test: 95-99%
 lang de describe BAYES_99 Spamwahrscheinlichkeit nach Bayes-Test: 99-100%
+lang de describe BAYES_999 Spamwahrscheinlichkeit nach Bayes-Test: 99.9-100%
 endif
 #
 lang de describe USER_IN_BLACKLIST Absenderadresse steht in Ihrer persönlichen schwarzen Liste
@@ -359,12 +358,12 @@
 
 ifplugin Mail::SpamAssassin::Plugin::URIDNSBL
 lang de describe URIBL_SBL Enthält URL in SBL-Liste (http://www.spamhaus.org/sbl/)
-lang de describe URIBL_SC_SURBL Enthält URL in SC-Liste  (www.surbl.org)
+#lang de describe URIBL_SC_SURBL Enthält URL in SC-Liste  (www.surbl.org) - removed bug 7279
 lang de describe URIBL_WS_SURBL Enthält URL in WS-Liste (www.surbl.org)
 lang de describe URIBL_PH_SURBL Enthält URL in PH-Liste (www.surbl.org)
 #lang de describe URIBL_OB_SURBL Enthält URL in OB-Liste (www.surbl.org)  - REMOVED BUG 6853
-lang de describe URIBL_AB_SURBL Enthält URL in AB-Liste (www.surbl.org)
-lang de describe URIBL_JP_SURBL Enthält URL in JP-Liste (www.surbl.org)
+#lang de describe URIBL_AB_SURBL Enthält URL in AB-Liste (www.surbl.org) - removed bug 7279
+lang de describe URIBL_ABUSE_SURBL Enthält URL in ABUSE-Liste (www.surbl.org) - changed from JP to ABUSE bug 7279
 endif
 
 ifplugin Mail::SpamAssassin::Plugin::AWL
@@ -380,7 +379,7 @@
 endif
 
 ifplugin Mail::SpamAssassin::Plugin::Pyzor
-lang de describe PYZOR_CHECK Gelistet im Pyzor-System (http://pyzor.sf.net/)
+lang de describe PYZOR_CHECK Gelistet im Pyzor-System (https://pyzor.readthedocs.io/en/latest/)
 endif
 
 ifplugin Mail::SpamAssassin::Plugin::TextCat
diff -Nru spamassassin-3.4.0/pkgrules/30_text_fr.cf spamassassin-3.4.2/pkgrules/30_text_fr.cf
--- spamassassin-3.4.0/pkgrules/30_text_fr.cf	2014-02-06 22:05:55.000000000 -0500
+++ spamassassin-3.4.2/pkgrules/30_text_fr.cf	2018-09-12 23:04:40.000000000 -0400
@@ -80,6 +80,7 @@
 lang fr describe BAYES_80	L'algorithme Bayésien a évalué la probabilité de spam entre 80 et 95%
 lang fr describe BAYES_95	L'algorithme Bayésien a évalué la probabilité de spam entre 95 et 99%
 lang fr describe BAYES_99	L'algorithme Bayésien a évalué la probabilité de spam entre 99 et 100%
+lang fr describe BAYES_999      L'algorithme Bayésien a évalué la probabilité de spam entre 99.9 et 100%
 endif
 
 lang fr describe ACT_NOW_CAPS		Demande d'agir immédiatement (en majuscules)
@@ -174,7 +175,7 @@
 lang fr describe SUBJECT_DIET            Le sujet parle de perte de poids
 lang fr describe LOW_PRICE              Contient "Lowest Price" (le prix le plus bas)
 lang fr describe MARKETING_PARTNERS	Prétend que vous vous êtes enregistré auprès d'un "partenaire" quelconque
-lang fr describe MILLION_USD 		Phrase clé d'escroquerie nigérienne (millions of dollars)
+#lang fr describe MILLION_USD 		Phrase clé d'escroquerie nigérienne (millions of dollars)
 lang fr describe __MIME_BASE64		Inclut un attachement en BASE64
 lang fr describe MIME_BASE64_BLANKS	Ligne blanches surnuméraires dans l'encodage BASE64
 lang fr describe MIME_BASE64_TEXT	Texte du message camouflé par encodage en BASE64
@@ -192,7 +193,7 @@
 lang fr describe MSGID_FROM_MTA_HEADER	Message-ID ajouté par un relais
 lang fr describe MSGID_OUTLOOK_INVALID	Message-ID falsifié (fortmat Outlook Express)
 lang fr describe MULTI_FORGED		les en-têtes "Received" montrent de nombreuses falsifications
-lang fr describe NA_DOLLARS		Parle d'un million de dollars "nord-américains"
+#lang fr describe NA_DOLLARS		Parle d'un million de dollars "nord-américains"
 lang fr describe NONEXISTENT_CHARSET	Message rédigé dans un jeu de caractères inexistant
 lang fr describe NOT_ADVISOR		Contient "Not registered investment advisor"
 lang fr describe NO_DNS_FOR_FROM	Adresse From: inconnue en DNS (pas d'enregistrement MX)
@@ -225,7 +226,6 @@
 lang fr describe RCVD_IN_SORBS_SOCKS	SORBS: Envoyé par un proxy SOCKS ouvert
 lang fr describe RCVD_IN_SORBS_WEB	SORBS: Envoyé depuis un serveur web vulnérable
 lang fr describe RCVD_IN_SORBS_ZOMBIE	SORBS: Envoyé depuis un réseau IP piraté
-lang fr describe RCVD_NUMERIC_HELO	Received: contient un HELO numérique
 lang fr describe REFINANCE_NOW          Offre de refinancement immobilier
 lang fr describe REFINANCE_YOUR_HOME	Offre de refinancement immobilier
 lang fr describe SORTED_RECIPS		La liste des destinataires est triée par ordre alphabétique
@@ -252,7 +252,7 @@
 lang fr describe USER_IN_MORE_SPAM_TO	Destinataire sur la liste "more_spam_to" (config SA locale)
 lang fr describe USER_IN_WHITELIST	Expéditeur sur la liste blanche (OK) (config SA locale)
 lang fr describe USER_IN_WHITELIST_TO	Destinataire sur la liste blanche (config SA)
-lang fr describe US_DOLLARS_3           Escroq. nigérienne, version modifiée, phrase clé ($NN,NNN,NNN.NN)
+#lang fr describe US_DOLLARS_3           Escroq. nigérienne, version modifiée, phrase clé ($NN,NNN,NNN.NN)
 lang fr describe DRUG_ED_ONLINE          Vente de Viagra par correspondance
 lang fr describe WEIRD_PORT		Lien HTTP vers un numéro de port non standard
 lang fr describe WEIRD_QUOTING		Utilisation étrange de symboles de citations
@@ -267,7 +267,7 @@
 endif
 
 ifplugin Mail::SpamAssassin::Plugin::Pyzor
-lang fr describe PYZOR_CHECK		Message listé par Pyzor, voir http://pyzor.sf.net/
+lang fr describe PYZOR_CHECK		Message listé par Pyzor, voir https://pyzor.readthedocs.io/en/latest/
 endif
 
 ifplugin Mail::SpamAssassin::Plugin::TextCat
diff -Nru spamassassin-3.4.0/pkgrules/30_text_nl.cf spamassassin-3.4.2/pkgrules/30_text_nl.cf
--- spamassassin-3.4.0/pkgrules/30_text_nl.cf	2014-02-06 22:05:55.000000000 -0500
+++ spamassassin-3.4.2/pkgrules/30_text_nl.cf	2018-09-12 23:04:40.000000000 -0400
@@ -109,7 +109,6 @@
 lang nl describe JAPANESE_UCE_SUBJECT            Onderwerp: bevat een Japanese UCE tag
 lang nl describe KOREAN_UCE_SUBJECT              Onderwerp: bevat een koreaanse ongewenste email tag
 lang nl describe NO_DNS_FOR_FROM                 Domein in Van heeft geen MX of A DNS record
-lang nl describe RCVD_NUMERIC_HELO               Received: bevat een numerieke HELO
 lang nl describe RCVD_DOUBLE_IP_SPAM             Buld email vingerafdruk (dubbel IP) gevonden
 lang nl describe RCVD_DOUBLE_IP_LOOSE            Received: door en van lijken op IP adressen
 lang nl describe FORGED_TELESP_RCVD              Bevat een vervalde hostnaam voor een DSL IP in Brazilie
@@ -189,9 +188,9 @@
 lang nl describe BODY_ENHANCEMENT                Informatie over het vergroten van lichaamsdelen
 lang nl describe BODY_ENHANCEMENT2               Informatie over het vergroten van lichaamsdelen
 lang nl describe IMPOTENCE                       Medicijn voor impotentie
-lang nl describe NA_DOLLARS                      Praat over een miljoen Noord-Amerikaanse dollars
-lang nl describe US_DOLLARS_3                    Vermeldt miljoenen $ ($NN,NNN,NNN.NN)
-lang nl describe MILLION_USD                     Heeft het over miljoenen dollars
+#lang nl describe NA_DOLLARS                      Praat over een miljoen Noord-Amerikaanse dollars
+#lang nl describe US_DOLLARS_3                    Vermeldt miljoenen $ ($NN,NNN,NNN.NN)
+#lang nl describe MILLION_USD                     Heeft het over miljoenen dollars
 lang nl describe MONEY_BACK                      Niet-goed-geld-terug garantie
 lang nl describe FREE_QUOTE_INSTANT              Gratis offerte
 lang nl describe BAD_CREDIT                      Los al uw leningen op
@@ -246,6 +245,7 @@
 lang nl describe BAYES_80                        Bayesiaanse kans op spam is 80 tot 95%
 lang nl describe BAYES_95                        Bayesiaanse kans op spam is 95 tot 99%
 lang nl describe BAYES_99                        Bayesiaanse kans op spam is 99 tot 100%
+lang nl describe BAYES_999                       Bayesiaanse kans op spam is 99.9 tot 100%
 endif
 #
 lang nl describe DRUG_DOSAGE			Heeft het over een prijs per dosis
@@ -259,7 +259,7 @@
 endif
 
 ifplugin Mail::SpamAssassin::Plugin::Pyzor
-lang nl describe PYZOR_CHECK                     Gevonden in Pyzor (http://pyzor.sf.net/)
+lang nl describe PYZOR_CHECK                     Gevonden in Pyzor (https://pyzor.readthedocs.io/en/latest/)
 endif
 
 ifplugin Mail::SpamAssassin::Plugin::TextCat
diff -Nru spamassassin-3.4.0/pkgrules/30_text_pl.cf spamassassin-3.4.2/pkgrules/30_text_pl.cf
--- spamassassin-3.4.0/pkgrules/30_text_pl.cf	2014-02-06 22:05:55.000000000 -0500
+++ spamassassin-3.4.2/pkgrules/30_text_pl.cf	2018-09-12 23:04:40.000000000 -0400
@@ -74,6 +74,7 @@
 lang pl describe BAYES_80		Bayesowskie prawdopodobieñstwo spamu wynosi 80 do 95%
 lang pl describe BAYES_95		Bayesowskie prawdopodobieñstwo spamu wynosi 95 do 99%
 lang pl describe BAYES_99		Bayesowskie prawdopodobieñstwo spamu wynosi 99 do 100%
+lang pl describe BAYES_999              Bayesowskie prawdopodobieñstwo spamu wynosi 99.9 do 100%
 endif
 #
 lang pl describe BILLION_DOLLARS	Tre¶æ: o niesamowitej ilo¶ci pieniêdzy
@@ -161,7 +162,7 @@
 lang pl describe LIVE_PORN		Prawdopodobnie porno - Porno na ¿ywo
 lang pl describe LOW_PRICE		Najni¿sza cena
 lang pl describe MARKETING_PARTNERS	Twierdzi, ¿e jeste¶ zarejestrowany jako partner
-lang pl describe MILLION_USD 		O milionach dolarów
+#lang pl describe MILLION_USD 		O milionach dolarów
 lang pl describe MIME_BASE64_BLANKS	Dodatkowe puste linie kodowane w Base64
 lang pl describe MIME_BASE64_TEXT	Tekst wiadomo¶ci zakamuflowany przy u¿yciu kodowania Base64
 lang pl describe __MIME_BASE64		Zawiera za³±cznik kodowany w Base64
@@ -179,7 +180,7 @@
 lang pl describe MSGID_FROM_MTA_HEADER	Message-Id zosta³ dodany przez relay
 lang pl describe MSGID_OUTLOOK_INVALID	Sfa³szowany Message-Id (w formacie Outlook Express)
 lang pl describe MULTI_FORGED		Nag³ówki Received: wykazuj± wielokrotne fa³szowanie
-lang pl describe NA_DOLLARS		O milionie Pó³nocno Amerykañskich dolarów
+#lang pl describe NA_DOLLARS		O milionie Pó³nocno Amerykañskich dolarów
 lang pl describe NO_DNS_FOR_FROM	Domena w nag³ówku Do: nie posiada wpisu w DNS (MX lub A)
 lang pl describe NO_MEDICAL		Bez badañ medycznych
 lang pl describe NONEXISTENT_CHARSET	Nieznany zestaw znaków (jêzyk).
@@ -210,7 +211,6 @@
 lang pl describe RCVD_IN_SORBS_SOCKS	SORBS: nadawca jest otwartym serwerem SOCKS proxy
 lang pl describe RCVD_IN_SORBS_WEB	SORBS: nadawca posiada nadu¿ywany serwer WWW
 lang pl describe RCVD_IN_SORBS_ZOMBIE	SORBS: nadawca jest z sieci bez kontroli
-lang pl describe RCVD_NUMERIC_HELO	Received: zawiera numeryczne HELO
 lang pl describe REFINANCE_NOW		Refinansowanie domów
 lang pl describe REFINANCE_YOUR_HOME	Refinansowanie domów
 lang pl describe SORTED_RECIPS		Lista odbiorców posortowana wed³ug adresu
@@ -230,7 +230,7 @@
 lang pl describe UPPERCASE_50_75	Tre¶æ jest w 50-75% wielkimi literami
 lang pl describe UPPERCASE_75_100	Tre¶æ jest w 75-100% wielkimi literami
 lang pl describe URG_BIZ		Pilna sprawa
-lang pl describe US_DOLLARS_3		Wspomina miliony $ ($NN,NNN,NNN.NN)
+#lang pl describe US_DOLLARS_3		Wspomina miliony $ ($NN,NNN,NNN.NN)
 lang pl describe USER_IN_ALL_SPAM_TO	U¿ytkownik jest wymieniony w 'all_spam_to'
 lang pl describe USER_IN_BLACKLIST	Od: zawiera adres z Twojej "czarnej listy"
 lang pl describe USER_IN_BLACKLIST_TO	U¿ytkownik jest wymieniony w 'blacklist_to'
@@ -251,7 +251,7 @@
 endif
 
 ifplugin Mail::SpamAssassin::Plugin::Pyzor
-lang pl describe PYZOR_CHECK		Na li¶cie Pyzor (http://pyzor.sf.net/)
+lang pl describe PYZOR_CHECK		Na li¶cie Pyzor (https://pyzor.readthedocs.io/en/latest/)
 endif
 
 ifplugin Mail::SpamAssassin::Plugin::TextCat
diff -Nru spamassassin-3.4.0/pkgrules/30_text_pt_br.cf spamassassin-3.4.2/pkgrules/30_text_pt_br.cf
--- spamassassin-3.4.0/pkgrules/30_text_pt_br.cf	2014-02-06 22:05:55.000000000 -0500
+++ spamassassin-3.4.2/pkgrules/30_text_pt_br.cf	2018-09-12 23:04:40.000000000 -0400
@@ -110,7 +110,6 @@
 lang pt_BR describe RCVD_IN_SBL Recebida por um relay listado em Spamhaus SBL
 lang pt_BR describe RCVD_IN_XBL Recebida por um relay listado em Spamhaus XBL
 lang pt_BR describe RCVD_IN_PBL Recebida por um relay listado em Spamhaus PBL
-lang pt_BR describe DNS_FROM_AHBL_RHSBL Envelope sender consta em dnsbl.ahbl.org
 lang pt_BR describe RCVD_IN_BL_SPAMCOP_NET Recebida por um relay listado em bl.spamcop.net
 lang pt_BR describe RCVD_IN_MAPS_RBL Relay consta em RBL, http://www.mail-abuse.com/enduserinfo_rbl.html
 lang pt_BR describe RCVD_IN_MAPS_DUL Relay consta em DUL, http://www.mail-abuse.com/enduserinfo_dul.html
@@ -165,7 +164,6 @@
 lang pt_BR describe __RDNS_DYNAMIC_CHELLO_NL Comando HELO enviado usando hostname suspeito (Chello.nl)
 lang pt_BR describe __RDNS_DYNAMIC_VELOX Comando HELO enviado usando hostname suspeito (Veloxzone)
 lang pt_BR describe __RDNS_DYNAMIC_NTL Comando HELO enviado usando hostname suspeito (NTL)
-lang pt_BR describe __RDNS_DYNAMIC_HOME_NL Comando HELO enviado usando hostname suspeito (Home.nl)
 lang pt_BR describe RDNS_DYNAMIC Entregue a uma rede interna por um host com rDNS que parece ser dinâmico
 lang pt_BR describe RDNS_NONE Entregue a uma rede interna por um host sem rDNS
 
@@ -209,7 +207,6 @@
 lang pt_BR describe FORGED_MSGID_YAHOO Message-ID é forjado (yahoo.com)
 lang pt_BR describe MSGID_FROM_MTA_HEADER Message-Id foi adicionado por um relay
 lang pt_BR describe MSGID_SHORT Message-ID é curto demais
-#lang pt_BR describe MSGID_MULTIPLE_AT Message-ID contém múltiplos "@"
 lang pt_BR describe DATE_SPAMWARE_Y2K Data no cabeçalho usa formatação estranha
 lang pt_BR describe INVALID_DATE Cabeçalho Date: é inválido (não segue a RFC 2822)
 lang pt_BR describe INVALID_DATE_TZ_ABSURD Cabeçalho Date: é inválido (timezone não existe)
@@ -286,7 +283,6 @@
 lang pt_BR describe MISSING_HB_SEP Não há uma linha separando o cabeçalho do corpo da mensagem
 lang pt_BR describe UNPARSEABLE_RELAY Info: mensagem possui dados de relay que não puderam ser lidos
 lang pt_BR describe RCVD_HELO_IP_MISMATCH HELO e IP no "Received:" não conferem
-lang pt_BR describe RCVD_NUMERIC_HELO "Received:" contém um endereço IP utilizado no comando HELO
 lang pt_BR describe NO_RDNS_DOTCOM_HELO Comando HELO enviado como um provedor confiável, mas não possui rDNS
 
 # 20_html_tests.cf
@@ -380,9 +376,9 @@
 lang pt_BR describe BODY_ENHANCEMENT Informação sobre como aumentar partes do corpo
 lang pt_BR describe BODY_ENHANCEMENT2 Informação sobre como aumentar partes do corpo
 lang pt_BR describe IMPOTENCE Fala sobre cura da impotência
-lang pt_BR describe NA_DOLLARS Fala sobre milhões de dólares norte americanos ou canadenses
-lang pt_BR describe US_DOLLARS_3 Contém $($NN,NNN,NNN.NN)
-lang pt_BR describe MILLION_USD Fala sobre milhões de dólares
+#lang pt_BR describe NA_DOLLARS Fala sobre milhões de dólares norte americanos ou canadenses
+#lang pt_BR describe US_DOLLARS_3 Contém $($NN,NNN,NNN.NN)
+#lang pt_BR describe MILLION_USD Fala sobre milhões de dólares
 lang pt_BR describe URG_BIZ Contém: "urgent matter"
 lang pt_BR describe MONEY_BACK Contém: "Money back guarantee"
 lang pt_BR describe FREE_QUOTE_INSTANT Contém: "Free express or no-obligation quote"
@@ -486,6 +482,7 @@
 lang pt_BR describe BAYES_80 Probabilidade de ser spam entre 80 to 95%
 lang pt_BR describe BAYES_95 Probabilidade de ser spam entre 95 to 99%
 lang pt_BR describe BAYES_99 Probabilidade de ser spam entre 99 to 100%
+lang pt_BR describe BAYES_999 Probabilidade de ser spam entre 99.9 to 100%
 endif
 #
 # 25_accessdb.cf
@@ -538,13 +535,11 @@
 endif
 
 # 25_pyzor.cf
-lang pt_BR describe PYZOR_CHECK Listado na Pyzor (http://pyzor.sf.net/)
+lang pt_BR describe PYZOR_CHECK Listado na Pyzor (https://pyzor.readthedocs.io/en/latest/)
 
 # 25_razor2.cf
 lang pt_BR describe RAZOR2_CHECK Listado na Razor2 (http://razor.sf.net/)
 lang pt_BR describe RAZOR2_CF_RANGE_51_100 Nível de confiança na Razor2 acima de 50%
-lang pt_BR describe RAZOR2_CF_RANGE_E4_51_100 Nível de confiança na Razor2 em engine 4 acima de 50%
-lang pt_BR describe RAZOR2_CF_RANGE_E8_51_100 Nível de confiança na Razor2 em engine 4 acima de 50%
 
 # 25_replace.cf
 lang pt_BR describe SUBJECT_FUZZY_MEDS Tentativa de esconder palavras no Subject:
@@ -599,12 +594,13 @@
 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_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
+#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
-lang pt_BR describe URIBL_JP_SURBL Contém uma URL listada na blacklist JP SURBL
+#lang pt_BR describe URIBL_AB_SURBL Contém uma URL listada na blacklist 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_GREY Contém uma URL listada na greylist URIBL
 lang pt_BR describe URIBL_RED Contém uma URL listada na redlist URIBL
diff -Nru spamassassin-3.4.0/pkgrules/50_scores.cf spamassassin-3.4.2/pkgrules/50_scores.cf
--- spamassassin-3.4.0/pkgrules/50_scores.cf	2014-02-06 22:05:55.000000000 -0500
+++ spamassassin-3.4.2/pkgrules/50_scores.cf	2018-09-12 23:04:40.000000000 -0400
@@ -40,7 +40,7 @@
 score ALL_TRUSTED -1.000
 score APOSTROPHE_FROM 0.148 0.786 0.651 0.545 # n=2
 score BAD_CREDIT 2.799 1.658 1.279 2.415
-score BANG_GUAR 2.202 2.377 1.690 2.704
+score BANG_GUAR 1.0
 score BANG_OPRAH 0 # n=0 n=1 n=2 n=3
 score BANKING_LAWS 2.399 2.004 2.157 1.099 # n=2
 score BILLION_DOLLARS 0.001 1.451 1.229 1.638
@@ -96,7 +96,6 @@
 score EMPTY_MESSAGE 2.195 2.344 1.552 2.320
 score EM_ROLEX 0.595 1.309 2.068 0.618 # n=0
 score ENGLISH_UCE_SUBJECT 0.953 1.542 2.569 2.899 # n=0
-score EXCUSE_24 2.799
 score EXCUSE_4 2.399 1.687 2.399 1.325
 score EXCUSE_REMOVE 2.907 2.992 3.299 3.299
 #score FAKE_HELO_MAIL_COM_DOM 1.887 0.152 1.370 2.136
@@ -147,15 +146,12 @@
 score FROM_NO_USER 0.001 2.599 0.019 0.798
 #score FROM_OFFERS 2.699 2.699 2.510 2.699	# defer to nightly GA rescorer per bug 6580
 score FROM_STARTS_WITH_NUMS 2.801 0.553 1.201 0.738
-score FSL_FAKE_GMAIL_RCVD 3.099 2.974 1.002 2.104
 score FSL_FAKE_HOTMAIL_RVCD 2.631 1.816 2.011 2.365
-score FSL_GEO_ABUSE 2.699 2.699 2.313 2.167
 score FSL_HELO_BARE_IP_1 2.598 1.426 3.099 2.347
 score FSL_HELO_DEVICE 1.682 0.001 0.884 0.806
 score FSL_HELO_NON_FQDN_1 2.361 0.001 1.783 0.001
 score FSL_HELO_SETUP 0 # n=0 n=1 n=2
 score FSL_INTERIA_ABUSE 3.899 2.664 3.080 3.106
-score FSL_YG_ABUSE 4.199
 score GAPPY_SUBJECT 0.594 1.312 1.210 1.954
 score GEO_QUERY_STRING 0 # n=0 n=1 n=2 n=3
 score GUARANTEED_100_PERCENT 2.699 2.699 2.480 2.699
@@ -225,7 +221,7 @@
 score MALE_ENHANCE 3.100 3.099 3.099 0.851
 score MARKETING_PARTNERS 0.553 0.235 0.689 0.001
 score MID_DEGREES 0 # n=0 n=1 n=2 n=3
-score MILLION_USD 3.799 2.477 3.221 3.247
+#score MILLION_USD 3.799 2.477 3.221 3.247
 score MIME_BOUND_DD_DIGITS 3.016 0.349 2.417 1.373
 score MIME_BOUND_DIGITS_15 0.432 1.225 1.241 0.798
 score MIME_BOUND_EQ_REL 0 # n=0 n=1 n=2 n=3
@@ -249,7 +245,7 @@
 score MSGID_YAHOO_CAPS 0.797 1.413 2.278 1.411
 score MSOE_MID_WRONG_CASE 0.993 3.373 0.960 2.584 # n=2
 score MULTI_FORGED 0 # n=0 n=1 n=2 n=3
-score NA_DOLLARS 3.599
+#score NA_DOLLARS 3.599
 score NONEXISTENT_CHARSET 0 # n=0 n=1 n=2 n=3
 score NORMAL_HTTP_TO_IP 0.159 0.001 0.795 0.001
 score NOT_ADVISOR 0 # n=0 n=1 n=2 n=3
@@ -283,7 +279,7 @@
 score RCVD_FAKE_HELO_DOTCOM 2.799 2.389 2.605 1.189
 score RCVD_FORGED_WROTE 0 # n=0 n=1 n=2 n=3
 score RCVD_FORGED_WROTE2 0 # n=0 n=1 n=2 n=3
-score RCVD_IN_BRBL_LASTEXT 0 1.644 0 1.449 # n=0 n=2
+#score RCVD_IN_BRBL_LASTEXT 0 1.644 0 1.449 # n=0 n=2
 score RCVD_IN_PSBL 0 2.700 0 2.700 # n=0 n=2
 score RCVD_IN_RP_RNBL 0 1.284 0 1.310 # n=0 n=2
 score RCVD_MAIL_COM 0 # n=0 n=1 n=2 n=3
@@ -347,7 +343,7 @@
 score TVD_FLOAT_GENERAL 0 # n=0 n=1 n=2 n=3
 score TVD_INCREASE_SIZE 1.529 0.601 1.055 0.001 # n=1
 score TVD_LINK_SAVE 0 # n=0 n=1 n=2 n=3
-score TVD_PH_BODY_ACCOUNTS_PRE 1.201 1.527 1.327 2.393 # n=1
+score TVD_PH_BODY_ACCOUNTS_PRE 0.001 #changed to 0.001 due to .211 S/O on 2015-05-01 but left due to Meta Use - #1.201 1.527 1.327 2.393 # n=1
 score TVD_PH_REC 3.127 2.026 3.266 1.784 # n=2
 score TVD_PH_SEC 0.291 1.498 0.869 1.764 # n=1
 score TVD_PP_PHISH 0 # n=0 n=1 n=2 n=3
@@ -375,10 +371,9 @@
 score URI_NOVOWEL 0.500
 score URI_NO_WWW_BIZ_CGI 2.399 2.399 2.400 2.399 # n=0
 score URI_NO_WWW_INFO_CGI 2.299 2.299 0.292 2.071
-score URI_OBFU_WWW 3.099 3.099 2.306 2.475
+#score URI_OBFU_WWW 3.099 3.099 2.306 2.475
 score URI_UNSUBSCRIBE 0 # n=0 n=1 n=2 n=3
-score US_DOLLARS_3 2.599 2.523 1.780 1.754
-score VANITY 2.1
+#score US_DOLLARS_3 2.599 2.523 1.780 1.754
 score VIA_GAP_GRA 0 # n=0 n=1 n=2 n=3
 score WEIRD_PORT 0.001 0.001 0.097 0.001
 score WEIRD_QUOTING 0.001 0.001 0.001 0.001
@@ -511,11 +506,13 @@
 score RCVD_IN_SORBS_MISC 0 # n=0 n=1 n=2 n=3
 score RCVD_IN_SORBS_SMTP 0 # n=0 n=1 n=2 n=3
 score RCVD_IN_SORBS_SOCKS 0 2.443 0 1.927 # n=0 n=2
-score RCVD_IN_SORBS_WEB 0 0.614 0 0.770 # n=0 n=2
+#score RCVD_IN_SORBS_SPAM 0 0.5 0 0.5
+score RCVD_IN_SORBS_WEB  0 1.5 0 1.5
 score RCVD_IN_SORBS_ZOMBIE 0 # n=0 n=1 n=2 n=3
 score RCVD_IN_XBL 0 0.724 0 0.375 # n=0 n=2
 score RCVD_IN_PBL 0 3.558 0 3.335 # n=0 n=2
-score DNS_FROM_AHBL_RHSBL 0 2.438 0 2.699 # n=0 n=2
+score RCVD_IN_SBL_CSS 0 3.558 0 3.335 # n=0 n=2
+
 score NO_DNS_FOR_FROM 0 0.379 0 0.001 # n=0 n=2
 # </gen:mutable>
 
@@ -634,7 +631,8 @@
 # <gen:mutable>
 score NO_RDNS_DOTCOM_HELO 3.100 0.433 3.099 0.823
 score RCVD_HELO_IP_MISMATCH 1.680 1.186 2.362 2.368
-score RCVD_ILLEGAL_IP 3.399
+# score RCVD_ILLEGAL_IP 3.399
+score RCVD_ILLEGAL_IP 1.3
 score RCVD_NUMERIC_HELO 0.001 0.865 0.001 1.164
 # </gen:mutable>
 
@@ -681,6 +679,7 @@
 score BAYES_80  0  0  2.7    2.0
 score BAYES_95  0  0  3.2    3.0
 score BAYES_99  0  0  3.8    3.5
+score BAYES_999 0  0  0.2    0.2
 endif
 
 # Informational rules about Received header parsing
@@ -700,7 +699,11 @@
 score USER_IN_BLACKLIST 100.000
 score USER_IN_WHITELIST -100.000
 score USER_IN_DEF_WHITELIST -15.000
-score USER_IN_BLACKLIST_TO 10.000
+score USER_IN_BLACKLIST_TO   10.000
+score URI_HOST_IN_BLACKLIST  100.0
+score URI_HOST_IN_WHITELIST -100.0
+score HEADER_HOST_IN_BLACKLIST	100.0
+score HEADER_HOST_IN_WHITELIST -100.0
 
 # not really false positives but the user wants spam!
 score USER_IN_WHITELIST_TO -6.000
@@ -726,6 +729,11 @@
 score DKIM_SIGNED 0.1
 score DKIM_VALID -0.1
 score DKIM_VALID_AU -0.1
+
+if (version >= 3.004002)
+score DKIM_VALID_EF -0.1
+endif
+
 score DKIM_VERIFIED 0
 score DKIM_POLICY_SIGNALL 0
 score DKIM_POLICY_SIGNSOME 0
@@ -784,19 +792,29 @@
 # URIDNSBL
 ifplugin Mail::SpamAssassin::Plugin::URIDNSBL
 # <gen:mutable>
-score URIBL_AB_SURBL 0 4.499 0 4.499 # n=0 n=2
-score URIBL_JP_SURBL 0 1.948 0 1.250 # n=0 n=2
+#score URIBL_AB_SURBL 0 4.499 0 4.499 # n=0 n=2 - removed bug 7279
+#Changed below from JP to Abuse - bug 7279
+score URIBL_ABUSE_SURBL 0 1.948 0 1.250 # n=0 n=2
 score URIBL_PH_SURBL 0 0.001 0 0.610 # n=0 n=2
 score URIBL_RHS_DOB 0 0.276 0 1.514 # n=0 n=2
 score URIBL_SBL 0 0.644 0 1.623 # n=0 n=2
 score URIBL_SBL_A 0 0.1 0 0.1
-score URIBL_SC_SURBL 0 0.001 0 0.568 # n=0 n=2
+#score URIBL_SC_SURBL 0 0.001 0 0.568 # n=0 n=2 - removed bug 7279
 score URIBL_WS_SURBL 0 1.659 0 1.608 # n=0 n=2
 score URIBL_MW_SURBL 0 1.263 0 1.263
-score URIBL_BLACK 0 1.775 0 1.725 # n=0 n=2
+score URIBL_CR_SURBL 0 1.263 0 1.263
+score URIBL_BLACK 0 1.7 0 1.7 # n=0 n=2
 score URIBL_GREY 0 1.084 0 0.424 # n=0 n=2
-score URIBL_DBL_SPAM 0 1.7 0 1.7
-score URIBL_DBL_REDIR 0 0.001 0 0.001
+score URIBL_DBL_SPAM 	0 2.5 0 2.5
+score URIBL_DBL_PHISH	0 2.5 0 2.5
+score URIBL_DBL_MALWARE	0 2.5 0 2.5
+score URIBL_DBL_BOTNETCC 0 2.5 0 2.5
+score URIBL_DBL_ABUSE_SPAM 0 2.0 0 2.0
+score URIBL_DBL_ABUSE_REDIR 0 0.001 0 0.001
+score URIBL_DBL_ABUSE_PHISH 0 2.5 0 2.5
+score URIBL_DBL_ABUSE_MALW  0 2.5 0 2.5
+score URIBL_DBL_ABUSE_BOTCC 0 2.5 0 2.5
+
 # </gen:mutable>
 # score URIBL_GREY 0.25
 score URIBL_RED 0 0.001 0 0.001
@@ -870,9 +888,7 @@
 ifplugin Mail::SpamAssassin::Plugin::Razor2
 # <gen:mutable>
 score RAZOR2_CHECK 0 1.729 0 0.922 # n=0 n=2
-score RAZOR2_CF_RANGE_51_100 0 0.365 0 0.500 # n=0 n=2
-score RAZOR2_CF_RANGE_E4_51_100 0 0.467 0 0.642 # n=0 n=2
-score RAZOR2_CF_RANGE_E8_51_100 0 2.430 0 1.886 # n=0 n=2
+score RAZOR2_CF_RANGE_51_100 0 2.430 0 1.886 # n=0 n=2
 # </gen:mutable>
 endif # Mail::SpamAssassin::Plugin::Razor2
 
@@ -951,9 +967,6 @@
 # </gen:mutable>
 endif
 
-#DEMOTED TO SANDBOX
-#score MSGID_MULTIPLE_AT 0.001
-
 # Bug 6155 c115
 score KB_RATWARE_OUTLOOK_08  0
 score KB_RATWARE_OUTLOOK_12  0
diff -Nru spamassassin-3.4.0/pkgrules/60_adsp_override_dkim.cf spamassassin-3.4.2/pkgrules/60_adsp_override_dkim.cf
--- spamassassin-3.4.0/pkgrules/60_adsp_override_dkim.cf	2014-02-06 22:05:55.000000000 -0500
+++ spamassassin-3.4.2/pkgrules/60_adsp_override_dkim.cf	2018-09-12 23:04:40.000000000 -0400
@@ -123,6 +123,10 @@
 adsp_override yahoo.pl       custom_med
 adsp_override yahoo.se       custom_med
 
+
+# Ignore linting, makes unnecessary lookups
+adsp_override compiling.spamassassin.taint.org unknown
+
 # To effectively disable ADSP network DNS lookups for all other domains:
 # adsp_override *            unknown
 
diff -Nru spamassassin-3.4.0/pkgrules/60_awl.cf spamassassin-3.4.2/pkgrules/60_awl.cf
--- spamassassin-3.4.0/pkgrules/60_awl.cf	2014-02-06 22:05:55.000000000 -0500
+++ spamassassin-3.4.2/pkgrules/60_awl.cf	2018-09-12 23:04:40.000000000 -0400
@@ -24,7 +24,7 @@
 ifplugin Mail::SpamAssassin::Plugin::AWL
 
 header AWL			eval:check_from_in_auto_whitelist()
-describe AWL			From: address is in the auto white-list
+describe AWL			Adjusted score from AWL reputation of From: address
 tflags AWL			userconf noautolearn
 priority AWL                    1000
 
diff -Nru spamassassin-3.4.0/pkgrules/60_txrep.cf spamassassin-3.4.2/pkgrules/60_txrep.cf
--- spamassassin-3.4.0/pkgrules/60_txrep.cf	1969-12-31 19:00:00.000000000 -0500
+++ spamassassin-3.4.2/pkgrules/60_txrep.cf	2018-09-12 23:04:40.000000000 -0400
@@ -0,0 +1,31 @@
+# SpamAssassin rules file: TxRep reputation system
+#
+# Please don't modify this file as your changes will be overwritten with
+# the next update. Use @@LOCAL_RULES_DIR@@/local.cf instead.
+# See 'perldoc Mail::SpamAssassin::Conf' for details.
+#
+# <@LICENSE>
+# Licensed to the Apache Software Foundation (ASF) under one or more
+# contributor license agreements.  See the NOTICE file distributed with
+# this work for additional information regarding copyright ownership.
+# The ASF licenses this file to you under the Apache License, Version 2.0
+# (the "License"); you may not use this file except in compliance with
+# the License.  You may obtain a copy of the License at:
+# 
+#     http://www.apache.org/licenses/LICENSE-2.0
+# 
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+# </@LICENSE>
+
+ifplugin Mail::SpamAssassin::Plugin::TxRep
+
+header         TXREP   eval:check_senders_reputation()
+describe       TXREP   Score normalizing based on sender's reputation
+tflags         TXREP   userconf noautolearn
+priority       TXREP   1000
+
+endif # Mail::SpamAssassin::Plugin::TxRep
diff -Nru spamassassin-3.4.0/pkgrules/60_whitelist_auth.cf spamassassin-3.4.2/pkgrules/60_whitelist_auth.cf
--- spamassassin-3.4.0/pkgrules/60_whitelist_auth.cf	1969-12-31 19:00:00.000000000 -0500
+++ spamassassin-3.4.2/pkgrules/60_whitelist_auth.cf	2018-09-12 23:04:40.000000000 -0400
@@ -0,0 +1,738 @@
+# SpamAssassin rules file: default SPF and DKIM whitelists
+#
+# Please don't modify this file as your changes will be overwritten with
+# the next update. Use @@LOCAL_RULES_DIR@@/local.cf instead.
+# See 'perldoc Mail::SpamAssassin::Conf' for details.
+#
+# <@LICENSE>
+# Licensed to the Apache Software Foundation (ASF) under one or more
+# contributor license agreements.  See the NOTICE file distributed with
+# this work for additional information regarding copyright ownership.
+# The ASF licenses this file to you under the Apache License, Version 2.0
+# (the "License"); you may not use this file except in compliance with
+# the License.  You may obtain a copy of the License at:
+# 
+#     http://www.apache.org/licenses/LICENSE-2.0
+# 
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+# </@LICENSE>
+
+###########################################################################
+# SPF and DKIM whitelist rules
+
+if (version >= 3.0030000)
+
+ifplugin Mail::SpamAssassin::Plugin::SPF
+
+###########################################################################
+# These should be primarily envelope-from addresses which send mail that is
+# often tagged (incorrectly) as spam or high-profile domains that are common
+# targets of spoofing.
+# These senders should be considered trusted following proper opt-in and
+# opt-out practices, publish abuse reporting procedures, and handle reports
+# of abuse promptly.
+#
+# Whitelist and blacklist addresses are now file-glob-style patterns, so
+# "friend@somewhere.com", "*@isp.com", or "*.domain.net" will all work.
+
+def_whitelist_auth *@apache.org
+def_whitelist_auth *@*.apache.org
+
+# Lists with good SPF
+def_whitelist_auth *@lists.in.gov
+def_whitelist_auth *@listserv.syr.edu
+def_whitelist_auth *@list.indiana.edu
+def_whitelist_auth *@lists.asu.edu
+def_whitelist_auth *@lists.mailscanner.info
+def_whitelist_auth *@lists.wisc.edu
+
+# High profile targets for spoofing
+def_whitelist_auth *@facebookmail.com
+def_whitelist_auth *@*.facebookmail.com
+def_whitelist_auth *@google.com
+def_whitelist_auth *@accounts.google.com
+def_whitelist_auth *@walmart.com
+def_whitelist_auth *@*.walmart.com
+def_whitelist_auth *@*.usaa.com
+def_whitelist_auth *@citi.com
+def_whitelist_auth *@*.citi.com
+def_whitelist_auth *@chase.com
+def_whitelist_auth *@*.chase.com
+def_whitelist_auth *@*.dropboxmail.com
+def_whitelist_auth *@wellsfargo.com
+def_whitelist_auth *@*.wellsfargo.com
+def_whitelist_auth *@bankofamerica.com
+def_whitelist_auth *@*.bankofamerica.com
+def_whitelist_auth *@ally.com
+def_whitelist_auth *@*.ally.com
+def_whitelist_auth *@postmaster.aol.com
+def_whitelist_auth *@usbank.com
+def_whitelist_auth *@*.usbank.com
+def_whitelist_auth *@firsttennessee.com
+def_whitelist_auth *@usps.gov
+def_whitelist_auth *@*.usda.gov
+def_whitelist_auth *@instagram.com
+def_whitelist_auth *@*.instagram.com
+def_whitelist_auth *@indeedemail.com
+def_whitelist_auth *=pkginfo@ups.com
+def_whitelist_auth *@fedex.com
+def_whitelist_auth *@*.fedex.com
+def_whitelist_auth *@capitalone.com
+def_whitelist_auth *@*.capitalone.com
+def_whitelist_auth *@*.capitaloneemail.com
+def_whitelist_auth *@*.khanacademy.org
+def_whitelist_auth *@*.wordpress.com
+def_whitelist_auth *@statefarm.com
+def_whitelist_auth *@*.statefarminfo.com
+def_whitelist_auth *@*.visa.com
+def_whitelist_auth *@visapayablesautomation.com
+def_whitelist_auth *@visadpsmessage.com
+def_whitelist_auth *@*.pinterest.com
+def_whitelist_auth *@indeed.com
+def_whitelist_auth *@docusign.net
+def_whitelist_auth *@*.docusign.com
+
+# Senders consistently scoring low with advanced tuned SA to help default SA configurations
+def_whitelist_auth *@*.indeed.com
+def_whitelist_auth *@*.hyatt.com
+def_whitelist_auth *@*.sears.com
+def_whitelist_auth *@*.jcpenney.com
+def_whitelist_auth *@*.landsend.com
+def_whitelist_auth *@squaretrade.com
+def_whitelist_auth *@bn.com
+def_whitelist_auth *@emailbedbathandbeyond.com
+def_whitelist_auth *@*.joann.com
+def_whitelist_auth *@*.dollargeneral.com
+def_whitelist_auth *@*.talbots.com
+def_whitelist_auth *@*.wayfair.com
+def_whitelist_auth *@*.nordstrom.com
+def_whitelist_auth *@*.zillow.com
+def_whitelist_auth dillards@dillards.com
+def_whitelist_auth *@mktgdillards.com
+def_whitelist_auth *@*.hollisterco.com
+def_whitelist_auth *@*.us-cert.gov
+def_whitelist_auth *@*.rei.com
+def_whitelist_auth *@duluthtradingemail.com
+def_whitelist_auth *@hilton.com
+def_whitelist_auth *@*.hilton.com
+def_whitelist_auth *@*.starwoodhotels.com
+def_whitelist_auth *@craigslist.org
+def_whitelist_auth *@*.macys.com
+def_whitelist_auth *@*.staples.com
+def_whitelist_auth *@*.fandango.com
+def_whitelist_auth *@*.fandangonow.com
+def_whitelist_auth *@*.eddiebauer.com
+def_whitelist_auth *@*.eastbay.com
+def_whitelist_auth *@*.samsclub.com
+def_whitelist_auth *@*.potterybarn.com
+def_whitelist_auth *@*.travelocity.com
+def_whitelist_auth *@*.oriental-trading.com
+def_whitelist_auth *@*.efax.com
+def_whitelist_auth *@*.spamcop.net
+def_whitelist_auth noreply@apple.com
+def_whitelist_auth do_not_reply@apple.com
+def_whitelist_auth *@*.apple.com
+def_whitelist_auth *@*.insideapple.com
+def_whitelist_auth *@*.itunes.com
+def_whitelist_auth *@*.att-mail.com
+def_whitelist_auth *@*.vzw.com
+def_whitelist_auth *@*.vzwshop.com
+def_whitelist_auth *@*.fandango.com
+def_whitelist_auth *@*.aa.com
+def_whitelist_auth *@*.delta.com
+def_whitelist_auth *@*.southwest.com
+def_whitelist_auth *@*.southwestvacations.com
+def_whitelist_auth *@*.spirit-airlines.com
+def_whitelist_auth *@*.youversion.com
+def_whitelist_auth *@*.ashleystewart.com
+def_whitelist_auth *@*.creditkarma.com
+def_whitelist_auth *@*.creditsesame.com
+def_whitelist_auth *@*.amazon.com
+def_whitelist_auth *@*.livingsocial.com
+def_whitelist_auth *@*.yelp.com
+def_whitelist_auth *@*.opentable.com
+def_whitelist_auth *@*.pier1.com
+def_whitelist_auth *@*.nationalgeographic.com
+def_whitelist_auth *@*.lessonplanet.com
+def_whitelist_auth *@*.teacherspayteachers.com
+def_whitelist_auth *@*.childrensplace.com
+def_whitelist_auth *@*.uber.com
+def_whitelist_auth *@*.foxnews.com
+def_whitelist_auth *@*.cnn.com
+def_whitelist_auth *@*.walgreens.com
+def_whitelist_auth *@*.cvs.com
+def_whitelist_auth *@*.hgtv.com
+def_whitelist_auth *@*.starz.com
+def_whitelist_auth *@*.golfballs.com
+def_whitelist_auth *@*.zales.com
+def_whitelist_auth *@*.partycity.com
+def_whitelist_auth *@*.petco.com
+def_whitelist_auth *@*.nyandcompany.com
+def_whitelist_auth *@*.govdelivery.com
+def_whitelist_auth *@*.us-cert.gov
+def_whitelist_auth *@*.senate.gov
+def_whitelist_auth *@*.priceline.com
+def_whitelist_auth *@*.travelzoo.com
+def_whitelist_auth *@*.uso.org
+def_whitelist_auth *@*.checksunlimited.com
+def_whitelist_auth *@*.nytimes.com
+def_whitelist_auth *@slickdeals.net
+def_whitelist_auth *@*.cancer.org
+def_whitelist_auth *@*.pinterest.com
+def_whitelist_auth *@*.hotwire.com
+def_whitelist_auth *@*.dominos.com
+def_whitelist_auth *@*.potterybarn.com
+def_whitelist_auth *@*.shopstyle.com
+def_whitelist_auth *@*.mealtrain.com
+def_whitelist_auth *@*.zazzle.com
+def_whitelist_auth *@*.finishline.com
+def_whitelist_auth *@*.rover.com
+def_whitelist_auth *@*.pandora.com
+def_whitelist_auth *@*.jcrew.com
+def_whitelist_auth *@*.lifeway.com
+def_whitelist_auth *@*.jossandmain.com
+def_whitelist_auth *@*.maurices.com
+def_whitelist_auth *@*.flipboard.com
+def_whitelist_auth *@*.nhl.com
+def_whitelist_auth *@*.nfl.com
+def_whitelist_auth *@*.nflshop.com
+def_whitelist_auth *@*.nba.com
+def_whitelist_auth *@*.mlb.com
+def_whitelist_auth *@*.mlblists.com
+def_whitelist_auth *@*.containerstore.com
+def_whitelist_auth *@*.fitbit.com
+def_whitelist_auth *@*.justfab.com
+def_whitelist_auth *@*.tripadvisor.com
+def_whitelist_auth *@*.care.com
+def_whitelist_auth *@*.tommiecopper.com
+def_whitelist_auth *@*.education.com
+def_whitelist_auth *@*.target.com
+def_whitelist_auth *@*.fanatics.com
+def_whitelist_auth *@*.loft.com
+def_whitelist_auth *@*.gymboree.com
+def_whitelist_auth *@*.craylola.com
+def_whitelist_auth *@*.bathandbodyworks.com
+def_whitelist_auth *@*.carters.com
+def_whitelist_auth *@*.fansedge.com
+def_whitelist_auth *@*.gap.com
+def_whitelist_auth *@*.gapfactory.com
+def_whitelist_auth *@*.carnivalcruiselineemail.com
+def_whitelist_auth *@*.carhartt-email.com
+def_whitelist_auth *@*.journeys.com
+def_whitelist_auth *@*.ashleystewart.com
+def_whitelist_auth *@*.grandhomefurnishings.com
+def_whitelist_auth *@*.americangreetings.com
+def_whitelist_auth *@*.ralphlauren.com
+def_whitelist_auth *@*.catofashions.com
+def_whitelist_auth *@*.tjmaxx.tjx.com
+def_whitelist_auth *@*.uso.org
+def_whitelist_auth *@*.sallybeauty.com
+def_whitelist_auth *@*.oshkosh.com
+def_whitelist_auth *@*.dealnews.com
+def_whitelist_auth *@*.victoriassecret.com
+def_whitelist_auth *@*.northerntoolemail.com
+def_whitelist_auth *@*.golfnow.com
+def_whitelist_auth *@*.keurig.com
+def_whitelist_auth *@*.bannanarepublicfactory.com
+def_whitelist_auth *@*.girlscouts.org
+def_whitelist_auth *@*.zumiez.com
+def_whitelist_auth *@*.cabelas.com
+def_whitelist_auth *@*.hbonow.com
+def_whitelist_auth *@*.menswearhouse.com
+def_whitelist_auth *@*.brecks.com
+def_whitelist_auth *@*.jostens.com
+def_whitelist_auth *@*.josabank.com
+def_whitelist_auth *@*.charteremails.com
+def_whitelist_auth *@*.golfdigest.com
+def_whitelist_auth *@*.neimanmarcusemail.com
+def_whitelist_auth *@*.bucklemail.com
+def_whitelist_auth *@*.baskinrobbins.com
+def_whitelist_auth *@*.draftkings.com
+def_whitelist_auth *@*.krogeremail.com
+def_whitelist_auth *@*.lowesforpros.com
+def_whitelist_auth *@*.campingworld.com
+def_whitelist_auth *@accountprotection.microsoft.com
+def_whitelist_auth *@*.dickies.com
+def_whitelist_auth *@*.stewardship.com
+def_whitelist_auth *@*.bridgestonegolf.com
+def_whitelist_auth *@*.military.com
+def_whitelist_auth *@*.basecamp.com
+def_whitelist_auth *@*.savethechildren.org
+def_whitelist_auth *@*.anthem.com
+def_whitelist_auth *@*.nyandcompany.com
+def_whitelist_auth *@*.chicagotribune.com
+def_whitelist_auth *@*.underarmour.com
+def_whitelist_auth *@*.discounttire-email.com
+def_whitelist_auth *@*.mozilla.org
+def_whitelist_auth *@*.experian.com
+def_whitelist_auth *@*.wrangler.com
+def_whitelist_auth *@*.callofduty.com
+def_whitelist_auth *@*.davidsbridal.com
+def_whitelist_auth *@*.email-carmax.com
+def_whitelist_auth *@*.dunkindonuts.com
+def_whitelist_auth *@*.seaworld.com
+def_whitelist_auth *@*.lordandtaylor.com
+def_whitelist_auth *@*.vizio.com
+def_whitelist_auth *@*.wyndhamrewards.com
+def_whitelist_auth *@*.hallmark.com
+def_whitelist_auth *@*.thisoldhouse.com
+def_whitelist_auth *@*.grubhub.com
+def_whitelist_auth *@*.saks.com
+def_whitelist_auth *@*.saksoff5th.com
+def_whitelist_auth *@*.adidas.com
+def_whitelist_auth *@*.crocs-email.com
+def_whitelist_auth *@*.siriusxm.com
+def_whitelist_auth *@*.officedepot.com
+def_whitelist_auth *@*.thepamperedchef.com
+def_whitelist_auth *@*.kirklands.com
+def_whitelist_auth *@*.biglots.com
+def_whitelist_auth *@*.hulumail.com
+def_whitelist_auth *@*.homedepotemail.com
+def_whitelist_auth *@*.cisco.com
+def_whitelist_auth *@*.angieslist.com
+def_whitelist_auth *@*.livingsocial.com
+def_whitelist_auth *@*.channing-bete.com
+def_whitelist_auth *@*.accor-mail.com
+def_whitelist_auth *@*.highlights.com
+def_whitelist_auth *@*.scholastic.com
+def_whitelist_auth *@*.olivegarden.com
+def_whitelist_auth *@*.themailbox.com
+def_whitelist_auth *@*.steinmart.com
+def_whitelist_auth *@*.quill.com
+def_whitelist_auth *@*.netflix.com
+def_whitelist_auth *@*.expediamail.com
+def_whitelist_auth *@*.generalmills.com
+def_whitelist_auth *@*.overstock.com
+def_whitelist_auth *@*.grammarly.com
+def_whitelist_auth *@*.tractorsupply.com
+def_whitelist_auth *@*.hcahealthcare.com
+def_whitelist_auth *@*.foodservicedirector.com
+def_whitelist_auth *@*.suntrust.com
+def_whitelist_auth *@*.doverpublishing.com
+def_whitelist_auth *@*.thelimited.com
+def_whitelist_auth *@*.meetup.com
+def_whitelist_auth *@*.columbia.com
+def_whitelist_auth *@*.ocharleys.com
+def_whitelist_auth *@*.ancestry.com
+def_whitelist_auth *@*.shoecarnival.com
+def_whitelist_auth *@*.mattel.com
+def_whitelist_auth *@*.smilereminder.com
+def_whitelist_auth *@*.newyorktimes.com
+def_whitelist_auth *@*.booking.com
+def_whitelist_auth *@*.lids.com
+def_whitelist_auth *@*.macmillan.com
+def_whitelist_auth *@*.costco.com
+def_whitelist_auth *@*.nike.com
+def_whitelist_auth *@*.xbox.com
+def_whitelist_auth *@*.politicoemail.com
+def_whitelist_auth *@*.gamestop.com
+def_whitelist_auth *@*.dropbox.com
+def_whitelist_auth *@*.dcsg.com
+def_whitelist_auth *@*.robly.com
+def_whitelist_auth *@*.ncaa.com
+def_whitelist_auth *@*.lendingclub.com
+def_whitelist_auth *@*.hotels.com
+def_whitelist_auth *@*.michaels.com
+def_whitelist_auth *@*.vistaprint.com
+def_whitelist_auth *@*.regions.com
+def_whitelist_auth *@*.dollywood.com
+def_whitelist_auth *@*.sears-optical.com
+def_whitelist_auth *@*.e-lenscrafters.com
+def_whitelist_auth *@*.email-advanceautoparts.com
+def_whitelist_auth *@*.evernote.com
+def_whitelist_auth *@*.ebates.com
+def_whitelist_auth *@*.sylvanlearning.com
+def_whitelist_auth *@*.ebay.com
+def_whitelist_auth *@*.officesupply.com
+def_whitelist_auth *@*.dsw.com
+def_whitelist_auth *@*.quicken.com
+def_whitelist_auth *@*.quickenloans.com
+def_whitelist_auth *@*.harpercollins.com
+def_whitelist_auth *@*.gofundme.com
+def_whitelist_auth *@*.peachjar.com
+def_whitelist_auth *@*.mystubhub.com
+def_whitelist_auth *@*.hertz.com
+def_whitelist_auth *@theupsstore.com
+def_whitelist_auth *@vocabulary.com
+def_whitelist_auth *@*.spotify.com
+def_whitelist_auth *@*.musiciansfriend.com
+def_whitelist_auth *@*.longhornsteakhouse.com
+def_whitelist_auth *@*.abercrombie.com
+def_whitelist_auth *@*.lakeside.com
+def_whitelist_auth *@*.dccc.org
+def_whitelist_auth *@*.remind.com
+def_whitelist_auth *@*.swimoutlet.com
+def_whitelist_auth *@*.visionworks.com
+def_whitelist_auth *@*.kraftrecipes.com
+def_whitelist_auth *@*.ebth.com
+def_whitelist_auth *@*.baker-taylor.com
+def_whitelist_auth *@*.usafootball.com
+def_whitelist_auth *@*.ikea-usa.com
+def_whitelist_auth *@*.jet.com
+def_whitelist_auth *@*.ezchildtrack.com
+def_whitelist_auth *@*.twinkl.co.uk
+def_whitelist_auth *@*.tgw.com
+def_whitelist_auth *@*.airbnb.com
+def_whitelist_auth *@*.nea.org
+def_whitelist_auth *@*.bhg.com
+def_whitelist_auth *@*.nest.com
+def_whitelist_auth *@*.colehaan.com
+def_whitelist_auth *@*.microsoft.com
+def_whitelist_auth *@*.vanheusen.com
+def_whitelist_auth *@*.shoppbs.org
+def_whitelist_auth *@*.roku.com
+def_whitelist_auth *@*.hearstmags.com
+def_whitelist_auth *@*.carlsonhotels.com
+def_whitelist_auth *@*.marykay.com
+def_whitelist_auth *@*.publix.com
+def_whitelist_auth *@*.eharmony.com
+def_whitelist_auth *@*.powerschool.com
+def_whitelist_auth *@*.dell.com
+def_whitelist_auth *@*.hp.com
+def_whitelist_auth *@*.microsoftrewards.com
+def_whitelist_auth *@*.untuckit.com
+def_whitelist_auth *@*.adobesystems.com
+def_whitelist_auth *@*.pumpitupfun.com
+def_whitelist_auth *@*.payless.com
+def_whitelist_auth *@*.consumerreports.org
+def_whitelist_auth *@*.blueapron.com
+def_whitelist_auth *@*.email-libertymutual.com
+def_whitelist_auth *@*.marthastewart.com
+def_whitelist_auth *@*.nm.com
+def_whitelist_auth *@*.nissanusa.com
+def_whitelist_auth *@*.discountschoolsupply.com
+def_whitelist_auth *@*.destinationmaternity.com
+def_whitelist_auth *@*.calendly.com
+def_whitelist_auth *@*.healthequity.com
+def_whitelist_auth *@investordelivery.com
+def_whitelist_auth *@*.topgolf.com
+def_whitelist_auth *@logmein.com
+def_whitelist_auth *@lastpass.com
+def_whitelist_auth *@*.seabourn.com
+def_whitelist_auth *@*.execucar.com
+def_whitelist_auth *@*.intuit.com
+def_whitelist_auth *@*.build.com
+def_whitelist_auth *@*.trulia.com
+def_whitelist_auth *@*.rentalcars.com
+def_whitelist_auth *@recommendedjobs.com
+def_whitelist_auth *@*.zendesk.com
+def_whitelist_auth *@*.advocareemail.com
+def_whitelist_auth *@*.plenti.com
+def_whitelist_auth *@*.amolatina.com
+def_whitelist_auth *@*.accutrain.com
+def_whitelist_auth *@*.barnesandnoble.com
+def_whitelist_auth *@*.bookbub.com
+def_whitelist_auth *@*.gnc.com
+def_whitelist_auth *@*.avon.com
+def_whitelist_auth *@*.mymapcorewards.com
+def_whitelist_auth *@*.teespring.com
+def_whitelist_auth *@*.bpdriverrewards.com
+def_whitelist_auth *@*.aenetworks.com
+def_whitelist_auth *@*.wellsfargoemail.com
+def_whitelist_auth *@*.ixl.com
+def_whitelist_auth *@*.digitalocean.com
+def_whitelist_auth *@*.mohela.com
+def_whitelist_auth *@*.wish.com
+def_whitelist_auth *@*.frontrowed.com
+def_whitelist_auth *@*.goodreads.com
+def_whitelist_auth *@*.myschoolcast.com
+def_whitelist_auth *@*.airfarewatchdog.com
+def_whitelist_auth *@*.express.com
+def_whitelist_auth *@*.ulta.com
+def_whitelist_auth *@*.bradsdeals.com
+def_whitelist_auth *@*.edlio.com
+def_whitelist_auth *@*.soma.com
+def_whitelist_auth *@*.mycollegeoptions.org
+def_whitelist_auth *@*.pch.com
+def_whitelist_auth *@*.lormanonlinelearning.com
+def_whitelist_auth *@*.jetsetter.com
+def_whitelist_auth *@*.ebags.com
+def_whitelist_auth *@*.titanlamco.com
+def_whitelist_auth *@*.understood.org
+def_whitelist_auth *@cvent-planner.com
+def_whitelist_auth *@remindmemd.com
+def_whitelist_auth *@*.wizehive.com
+def_whitelist_auth *@*.potterybarnkids.com
+def_whitelist_auth *@*.zoosk.com
+def_whitelist_auth *@*.whitehouseblackmarket.com
+def_whitelist_auth *@*.iheart.com
+def_whitelist_auth *@*.testout.com
+def_whitelist_auth *@*.surveymonkeyuser.com
+def_whitelist_auth *@*.lumosity.com
+def_whitelist_auth *@kayak.com
+def_whitelist_auth *@*.kayak.com
+def_whitelist_auth *@*.smartertravel.com
+def_whitelist_auth *@*.discover.com
+def_whitelist_auth *@*.neamemberbenefits.com
+def_whitelist_auth *@*.enterprise.com
+def_whitelist_auth *@*.jessicalondon.com
+def_whitelist_auth *@*.geico.com
+def_whitelist_auth *@*.tommy.com
+def_whitelist_auth *@cignasecure.com
+def_whitelist_auth *@*.aarp.org
+def_whitelist_auth *@*.aeropostale.com
+def_whitelist_auth *@*.zappos.com
+def_whitelist_auth *@*.redhat.com
+def_whitelist_auth *@*.freshdesk.com
+def_whitelist_auth *@*.planningcenteronline.com
+def_whitelist_auth *@*.ihg.com
+def_whitelist_auth *@*.opendns.com
+def_whitelist_auth *@*.loftoutlet.com
+def_whitelist_auth *@*.hrblock.com
+def_whitelist_auth *@secureworks.com
+def_whitelist_auth *@*.secureworks.com
+def_whitelist_auth *@*.crateandbarrel.com
+def_whitelist_auth *@*.redbox.com
+def_whitelist_auth *@*.lowfares.com
+def_whitelist_auth *@*.rocketloans.com
+def_whitelist_auth *@*.ganderoutdoors.com
+def_whitelist_auth *@*.mandarinoriental.com
+def_whitelist_auth *@*.retailmenot.com
+def_whitelist_auth *@*.overdrive.com
+def_whitelist_auth *@*.snapchat.com
+def_whitelist_auth *@*.cheaptickets.com
+def_whitelist_auth *@*.1800flowers.com
+def_whitelist_auth *@*.guitarcenter.com
+def_whitelist_auth *@*.vmware.com
+def_whitelist_auth *@*.katespade.com
+def_whitelist_auth *@*.gerber.com
+def_whitelist_auth *@*.pandora.net
+def_whitelist_auth *@*.alibaba.com
+def_whitelist_auth *@*.kahoot.com
+def_whitelist_auth *@email-od.com
+def_whitelist_auth *@gallupmail.com
+def_whitelist_auth *@*.stenhouse.com
+def_whitelist_auth *@*.horacemann.com
+def_whitelist_auth *@bmwusa.com
+def_whitelist_auth *@*.thumbtack.com
+def_whitelist_auth *@*.brylanehome.com
+def_whitelist_auth *@*.bradfordexchange.com
+def_whitelist_auth *@*.touchofmodern.com
+def_whitelist_auth *@*.berries.com
+def_whitelist_auth *@*.reddressboutique.com
+def_whitelist_auth *@*.progressive.com
+def_whitelist_auth *@*.forever21.com
+def_whitelist_auth *@*.consumercrafts.com
+def_whitelist_auth *@*.epriority.com
+def_whitelist_auth *@*.schwab.com
+def_whitelist_auth *@*.wwe.com
+def_whitelist_auth *@*.coldwatercreek.com
+def_whitelist_auth *@*.homechef.com
+def_whitelist_auth *@*.flyfrontier.com
+def_whitelist_auth *@*.charbroil.com
+def_whitelist_auth *@*.bludot.com
+def_whitelist_auth *@*.directgeneral.com
+def_whitelist_auth *@*.subaru.com
+def_whitelist_auth *@*.aexp.com
+def_whitelist_auth *@*.usssa.com
+def_whitelist_auth *@*.bestwesternrewards.com
+def_whitelist_auth *@*.email-weightwatchers.com
+def_whitelist_auth *@*.email-allstate.com
+def_whitelist_auth *@*.dove.com
+def_whitelist_auth *@*.teamusa.org
+def_whitelist_auth *@*.mylife.com
+def_whitelist_auth *@*.cbssports.com
+def_whitelist_auth *@*.fingerhut.com
+def_whitelist_auth *@*.fossil.com
+def_whitelist_auth *@*.adt.com
+def_whitelist_auth *@*.23andme.com
+def_whitelist_auth *@*.fashionnova.com
+def_whitelist_auth *@*.myfitnesspal.com
+def_whitelist_auth *@*.zayconfoods.com
+def_whitelist_auth *@*.housershoes.com
+def_whitelist_auth *@*.prepsportswear.com
+def_whitelist_auth *@*.freebiesfrenzy.com
+def_whitelist_auth *@*.minted.com
+def_whitelist_auth *@*.kickstarter.com
+def_whitelist_auth *@*.bluebellwholesale.com
+def_whitelist_auth tickets@amtrak.com
+def_whitelist_auth *@*.tyndale.com
+def_whitelist_auth reservations@druryhotels.com
+def_whitelist_auth *@*.autopartswarehouse.com
+def_whitelist_auth *@*.levi.com
+def_whitelist_auth *@*.echosign.com
+def_whitelist_auth *@*.carparts.com
+def_whitelist_auth *@*.jared.com
+def_whitelist_auth *@*.superjeweler.com
+def_whitelist_auth *@*.ticketnetwork.com
+def_whitelist_auth *@*.kay.com
+def_whitelist_auth *@*.grainger.com
+def_whitelist_auth *@*.fivebelow.com
+def_whitelist_auth *@*.destinationxl.com
+def_whitelist_auth *@*.perfectdeliver.com
+def_whitelist_auth *@*.buffalowildwings.com
+def_whitelist_auth *@*.macaronikid.com
+def_whitelist_auth *@*.marshallsonline.com
+def_whitelist_auth *@*.nordstromrack.com
+def_whitelist_auth *@*.kyliecosmetics.com
+def_whitelist_auth *@*.midwestsports.com
+def_whitelist_auth *@*.deluxe.com
+def_whitelist_auth *@*.fidelity.com
+def_whitelist_auth *@ticketmaster.com
+def_whitelist_auth *@mozillafoundation.org
+def_whitelist_auth *@*.uhc.com
+def_whitelist_auth *@*.sprint.com
+def_whitelist_auth *@*.rxhealthalerts.com
+def_whitelist_auth *@*.eventtracker.com
+def_whitelist_auth *@*.horoscope.com
+def_whitelist_auth *@*.email-lifetouch.com
+def_whitelist_auth *@*.evine.com
+def_whitelist_auth *@*.donorschoose.org
+def_whitelist_auth noreply@adt.com
+def_whitelist_auth *@tmomail.net
+def_whitelist_auth donotreply@dhl.com
+def_whitelist_auth *@travelodge.co.uk
+def_whitelist_auth bounce@ryanairemail.com
+def_whitelist_auth *@*.tpr.gov.uk
+def_whitelist_auth homedepotreceipt@homedepot.com
+def_whitelist_auth *@*.lifewaystores.com
+def_whitelist_auth *@*.paypalcredit.com
+def_whitelist_auth *@paypal-customerfeedback.com
+def_whitelist_auth no-reply@flyfrontier.com
+def_whitelist_auth *@*.canon.com
+def_whitelist_auth *@*.techtrnds.com
+def_whitelist_auth *@*.realsimple.com
+def_whitelist_auth *@espnmail.com
+def_whitelist_auth *@*.nickjr.com
+def_whitelist_auth *@*.eschoolnews.com
+def_whitelist_auth *@*.motosnap.com
+def_whitelist_auth *@*.gsnutsandmags.com
+def_whitelist_auth *@*.shutterfly.com
+def_whitelist_auth *@*.edgenuity.com
+def_whitelist_auth *@*.goodreads.com
+def_whitelist_auth *@*.shrm.org
+def_whitelist_auth *@*.mtshrm.org
+def_whitelist_auth *@*.gynzy.com
+def_whitelist_auth *@*.actionnetwork.org
+def_whitelist_auth *@*.teacherfindr.com
+def_whitelist_auth *@*.tladoonline.com
+def_whitelist_auth *@*.aaa.com
+def_whitelist_auth *@*.woot.com
+def_whitelist_auth *@*.nsba.org
+def_whitelist_auth *@*.teamapp.com
+def_whitelist_auth *@*.act.org
+def_whitelist_auth *@*.vetsandfamily.com
+def_whitelist_auth *@*.jeansforvets.org
+def_whitelist_auth *@*.welcomehomevet.org
+def_whitelist_auth *@*.readingeggs.com
+def_whitelist_auth *@*.myschoolcast.com
+def_whitelist_auth *@*.takethemameal.com
+def_whitelist_auth *@*.shape.com
+def_whitelist_auth *@*.videoblocks.com
+def_whitelist_auth *@*.wifeteachermommy.com
+def_whitelist_auth *@*.darice.com
+def_whitelist_auth *@*.everfi.net
+def_whitelist_auth *@godvinemail.com
+def_whitelist_auth *@*.doheny.com
+def_whitelist_auth *@*.nyansa.com
+def_whitelist_auth *@*.submittable.com
+def_whitelist_auth *@*.slideshare.net
+def_whitelist_auth *@*.ocm.com
+def_whitelist_auth *@*.dji.com
+def_whitelist_auth *@*.zyngamail.com
+def_whitelist_auth *@*.costasunglasses.com
+def_whitelist_auth *@*.baseballexpress.com
+def_whitelist_auth *@dishemail.com
+def_whitelist_auth *@*.promgirl.com
+def_whitelist_auth *@*.ed.gov
+def_whitelist_auth *@*.carecredit.com
+def_whitelist_auth *@*.trello.com
+def_whitelist_auth *@*.shopify.com
+def_whitelist_auth *@*.iclasspro.com
+def_whitelist_auth *@mail-fellowesbrands.com
+def_whitelist_auth *@*.planetfitness.com
+def_whitelist_auth *@*.shoppinkblush.com
+def_whitelist_auth *@*.webmdprofessional.com
+def_whitelist_auth *@*.omadahealth.com
+def_whitelist_auth *@*.vividseats.com
+def_whitelist_auth *@*.avis.com
+def_whitelist_auth *@*.square.com
+def_whitelist_auth *@*.ruthschris-email.com
+def_whitelist_auth *@*.zearn.org
+def_whitelist_auth *@*.careerbuilder.com
+def_whitelist_auth *@*.kelloggs.com
+def_whitelist_auth *@*.wunderground.com
+def_whitelist_auth *@*.silpada.com
+def_whitelist_auth *@*.toofaced.com
+def_whitelist_auth *@*.sonicwall.com
+def_whitelist_auth *@*.bebe.com
+def_whitelist_auth *@*.discoveryeducation.com
+def_whitelist_auth *@*.alison.com
+def_whitelist_auth *@*.livestream.com
+def_whitelist_auth *@*.rockauto.com
+def_whitelist_auth *@*.elfcosmetics.com
+def_whitelist_auth *@*.cars.com
+def_whitelist_auth *@*.puritan.com
+def_whitelist_auth *@*.cheddars.com
+def_whitelist_auth *@*.schoolmessenger.com
+def_whitelist_auth *@*.pinchme.com
+def_whitelist_auth *@*.clarksusa.com
+def_whitelist_auth *@*.smore.com
+def_whitelist_auth *@*.softball.com
+def_whitelist_auth *@*.commonsense-email.org
+def_whitelist_auth *@*.onekingslane.com
+def_whitelist_auth *@*.elfcosmetics.com
+def_whitelist_auth *@*.aclj.org
+def_whitelist_auth *@*.darice.com
+def_whitelist_auth *@*.shopify.com
+def_whitelist_auth *@*.doheny.com
+def_whitelist_auth *@*.improvementscatalog-email.com
+def_whitelist_auth *@*.promgirl.com
+def_whitelist_auth *@*.webmdprofessional.com
+def_whitelist_auth *@*.thrivecausemetics.com
+def_whitelist_auth *@*.toofaced.com
+def_whitelist_auth *@*.evanmoor-alerts.com
+def_whitelist_auth *@*.livestream.com
+def_whitelist_auth *@*.customerville.com
+def_whitelist_auth *@*.lmscheckout.com
+def_whitelist_auth *@*.shop-explorers.com
+def_whitelist_auth *@*.helpavet.co
+def_whitelist_auth *@*.aidtroops.com
+def_whitelist_auth *@*.denindays.org
+def_whitelist_auth *@*.helpourvets.us
+def_whitelist_auth *@*.denim-day.com
+def_whitelist_auth *@*.eldarion.com
+def_whitelist_auth *@*.wunderground.com
+def_whitelist_auth *@*.kelloggs.com
+def_whitelist_auth *@*.portfolium.com
+def_whitelist_auth *@*.iclasspro.com
+def_whitelist_auth *@*.socrative.com
+def_whitelist_auth *@*.vnnsports.net
+def_whitelist_auth *@*.americauncensored.com
+def_whitelist_auth *@*.email-allstate.com
+def_whitelist_auth *@*.omadahealth.com
+def_whitelist_auth *@*.rei.com
+def_whitelist_auth *@*.research.net
+def_whitelist_auth *@*.allinlearning.com
+def_whitelist_auth *@*.energage.com
+def_whitelist_auth *@*.aasa.org
+def_whitelist_auth *@*.constructionclaims.com
+def_whitelist_auth *@*.nsba.org
+def_whitelist_auth *@*.jeansdays.com
+def_whitelist_auth *@*.servicemansupport.org
+def_whitelist_auth *@*.learningally.org
+def_whitelist_auth *@*.quill.org
+def_whitelist_auth *@*.funrewardsforyou.com
+def_whitelist_auth *@*.digicert.com
+def_whitelist_auth *@*.venmo.com
+def_whitelist_auth *@*.bestbuddies.org
+def_whitelist_auth *@*.ashleydsg.com
+def_whitelist_auth *@*.homechef.com
+def_whitelist_auth *@*.morningconsult.com
+def_whitelist_auth *@*.stewardship.com
+def_whitelist_auth *@*.salsalabs.org
+def_whitelist_auth *@*.shop-backinthesaddle.com
+def_whitelist_auth *@*.bounceexchange.com
+def_whitelist_auth *@*.tobi.com
+def_whitelist_auth *@*.makermedia.com
+def_whitelist_auth *@*.adoptapet.com
+def_whitelist_auth *@*.wested.org
+def_whitelist_auth *@*.sfsdata.com
+
+endif # Mail::SpamAssassin::Plugin::SPF
+
+endif # version >= 3.3.0
diff -Nru spamassassin-3.4.0/pkgrules/60_whitelist.cf spamassassin-3.4.2/pkgrules/60_whitelist.cf
--- spamassassin-3.4.0/pkgrules/60_whitelist.cf	2014-02-06 22:05:55.000000000 -0500
+++ spamassassin-3.4.2/pkgrules/60_whitelist.cf	2018-09-12 23:04:40.000000000 -0400
@@ -11,9 +11,9 @@
 # The ASF licenses this file to you under the Apache License, Version 2.0
 # (the "License"); you may not use this file except in compliance with
 # the License.  You may obtain a copy of the License at:
-# 
+#
 #     http://www.apache.org/licenses/LICENSE-2.0
-# 
+#
 # Unless required by applicable law or agreed to in writing, software
 # distributed under the License is distributed on an "AS IS" BASIS,
 # WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
@@ -59,6 +59,27 @@
 describe USER_IN_ALL_SPAM_TO    User is listed in 'all_spam_to'
 tflags USER_IN_ALL_SPAM_TO      userconf nice noautolearn
 
+if (version >= 3.004000)
+body      URI_HOST_IN_BLACKLIST eval:check_uri_host_in_blacklist()
+describe  URI_HOST_IN_BLACKLIST Host or Domain is listed in the user's URI black-list
+tflags    URI_HOST_IN_BLACKLIST userconf noautolearn
+
+body      URI_HOST_IN_WHITELIST eval:check_uri_host_in_whitelist()
+describe  URI_HOST_IN_WHITELIST Host or Domain is listed in the user's URI white-list
+tflags    URI_HOST_IN_WHITELIST userconf nice noautolearn
+
+# Bug 7256, using a header rule with an eval() function does not work the way
+# this was intended.
+
+# header    HEADER_HOST_IN_BLACKLIST eval:check_uri_host_listed('BLACK')
+# describe  HEADER_HOST_IN_BLACKLIST Host or Domain in header is listed in the user's URI black-list
+# tflags    HEADER_HOST_IN_BLACKLIST userconf noautolearn
+
+# header    HEADER_HOST_IN_WHITELIST eval:check_uri_host_listed('WHITE')
+# describe  HEADER_HOST_IN_WHITELIST Host or Domain in header is listed in the user's URI white-list
+# tflags    HEADER_HOST_IN_WHITELIST userconf nice noautolearn
+endif
+
 ###########################################################################
 # Default whitelists.  These should be addresses which send mail that is often
 # tagged (incorrectly) as spam; it also helps that they be addresses of big
diff -Nru spamassassin-3.4.0/pkgrules/60_whitelist_dkim.cf spamassassin-3.4.2/pkgrules/60_whitelist_dkim.cf
--- spamassassin-3.4.0/pkgrules/60_whitelist_dkim.cf	2014-02-06 22:05:55.000000000 -0500
+++ spamassassin-3.4.2/pkgrules/60_whitelist_dkim.cf	2018-09-12 23:04:40.000000000 -0400
@@ -29,10 +29,12 @@
 header USER_IN_DKIM_WHITELIST	eval:check_for_dkim_whitelist_from()
 describe USER_IN_DKIM_WHITELIST	From: address is in the user's DKIM whitelist
 tflags USER_IN_DKIM_WHITELIST	nice noautolearn net userconf
+reuse USER_IN_DKIM_WHITELIST
 
 header USER_IN_DEF_DKIM_WL	eval:check_for_def_dkim_whitelist_from()
 describe USER_IN_DEF_DKIM_WL	From: address is in the default DKIM white-list
 tflags USER_IN_DEF_DKIM_WL	nice noautolearn net
+reuse USER_IN_DEF_DKIM_WL
 
 ###########################################################################
 # Default whitelists.  These should be e-mail addresses of authors (i.e.
@@ -107,6 +109,7 @@
 def_whitelist_from_dkim  *@cc.yahoo-inc.com	yahoo-inc.com
 def_whitelist_from_dkim  *@cc.yahoo-inc.com
 def_whitelist_from_dkim  googlealerts-noreply@google.com
+def_whitelist_from_dkim  *@*.google.com
 
 def_whitelist_from_dkim  *@springer.delivery.net
 def_whitelist_from_dkim  *@sci.scientific-direct.net
@@ -146,4 +149,11 @@
 # def_whitelist_from_dkim  *@amazon.de
 # def_whitelist_from_dkim  *@amazon.fr
 
+def_whitelist_from_dkim *@imdb.com amazonses.com
+def_whitelist_from_dkim *@dhl.com
+def_whitelist_from_dkim *@tumblr.com
+def_whitelist_from_dkim *@fisglobal.com
+def_whitelist_from_dkim *@*.msgfocus.com
+def_whitelist_from_dkim *@boredpanda.com mailersend.com
+
 endif # Mail::SpamAssassin::Plugin::DKIM
diff -Nru spamassassin-3.4.0/pkgrules/60_whitelist_spf.cf spamassassin-3.4.2/pkgrules/60_whitelist_spf.cf
--- spamassassin-3.4.0/pkgrules/60_whitelist_spf.cf	2014-02-06 22:05:55.000000000 -0500
+++ spamassassin-3.4.2/pkgrules/60_whitelist_spf.cf	2018-09-12 23:04:40.000000000 -0400
@@ -28,15 +28,17 @@
 
 header USER_IN_SPF_WHITELIST	eval:check_for_spf_whitelist_from()
 describe USER_IN_SPF_WHITELIST	From: address is in the user's SPF whitelist
-tflags USER_IN_SPF_WHITELIST	userconf nice noautolearn
+tflags USER_IN_SPF_WHITELIST	userconf nice noautolearn net
+reuse USER_IN_SPF_WHITELIST
 
 header USER_IN_DEF_SPF_WL	eval:check_for_def_spf_whitelist_from()
 describe USER_IN_DEF_SPF_WL	From: address is in the default SPF white-list
-tflags USER_IN_DEF_SPF_WL	userconf nice noautolearn
+tflags USER_IN_DEF_SPF_WL	userconf nice noautolearn net
+reuse USER_IN_DEF_SPF_WL
 
 meta ENV_AND_HDR_SPF_MATCH	(USER_IN_DEF_SPF_WL && __ENV_AND_HDR_FROM_MATCH)
 describe ENV_AND_HDR_SPF_MATCH	Env and Hdr From used in default SPF WL Match
-tflags ENV_AND_HDR_SPF_MATCH	userconf nice noautolearn
+tflags ENV_AND_HDR_SPF_MATCH	userconf nice noautolearn net
 
 ###########################################################################
 # Default whitelists.  These should be addresses which send mail that is often
diff -Nru spamassassin-3.4.0/pkgrules/72_active.cf spamassassin-3.4.2/pkgrules/72_active.cf
--- spamassassin-3.4.0/pkgrules/72_active.cf	2014-02-06 22:06:56.000000000 -0500
+++ spamassassin-3.4.2/pkgrules/72_active.cf	2018-09-12 23:05:21.000000000 -0400
@@ -25,6 +25,22 @@
 
 require_version @@VERSION@@
 
+##{ AC_BR_BONANZA
+
+rawbody AC_BR_BONANZA   /(?:<br>\s*){30}/i
+describe AC_BR_BONANZA  Too many newlines in a row... spammy template
+#score AC_BR_BONANZA     0.001
+tflags AC_BR_BONANZA	publish
+##} AC_BR_BONANZA
+
+##{ AC_DIV_BONANZA
+
+rawbody AC_DIV_BONANZA  /(?:<div>(?:\s*<\/div>)?\s*){10}/i
+describe AC_DIV_BONANZA Too many divs in a row... spammy template
+#score AC_DIV_BONANZA    0.001
+tflags AC_DIV_BONANZA	publish
+##} AC_DIV_BONANZA
+
 ##{ AC_HTML_NONSENSE_TAGS
 
 rawbody 	AC_HTML_NONSENSE_TAGS	/(?:<[A-Za-z0-9]{4,}>\s*){10}/
@@ -33,91 +49,136 @@
 tflags		AC_HTML_NONSENSE_TAGS	publish
 ##} AC_HTML_NONSENSE_TAGS
 
+##{ AC_SPAMMY_URI_PATTERNS1
+
+meta 		AC_SPAMMY_URI_PATTERNS1 (__AC_OUTL_URI && __AC_OUTI_URI)
+describe 	AC_SPAMMY_URI_PATTERNS1	link combos match highly spammy template
+#score 		AC_SPAMMY_URI_PATTERNS1	4.0
+tflags 		AC_SPAMMY_URI_PATTERNS1	publish
+##} AC_SPAMMY_URI_PATTERNS1
+
+##{ AC_SPAMMY_URI_PATTERNS10
+
+meta 		AC_SPAMMY_URI_PATTERNS10 __AC_PUNCTNUMS_URI
+describe 	AC_SPAMMY_URI_PATTERNS10 link combos match highly spammy template
+#score 		AC_SPAMMY_URI_PATTERNS10 4.0
+tflags 		AC_SPAMMY_URI_PATTERNS10 publish
+##} AC_SPAMMY_URI_PATTERNS10
+
+##{ AC_SPAMMY_URI_PATTERNS11
+
+meta 		AC_SPAMMY_URI_PATTERNS11 __AC_NDOMLONGNASPX_URI
+describe 	AC_SPAMMY_URI_PATTERNS11 link combos match highly spammy template
+#score 		AC_SPAMMY_URI_PATTERNS11 4.0
+tflags 		AC_SPAMMY_URI_PATTERNS11 publish
+##} AC_SPAMMY_URI_PATTERNS11
+
+##{ AC_SPAMMY_URI_PATTERNS12
+
+meta 		AC_SPAMMY_URI_PATTERNS12 (__AC_CHDSEQ_URI && __AC_MHDSEQ_URI && __AC_UHDSEQ_URI)
+describe 	AC_SPAMMY_URI_PATTERNS12 link combos match highly spammy template
+#score 		AC_SPAMMY_URI_PATTERNS12 4.0
+tflags 		AC_SPAMMY_URI_PATTERNS12 publish
+##} AC_SPAMMY_URI_PATTERNS12
+
+##{ AC_SPAMMY_URI_PATTERNS2
+
+meta 		AC_SPAMMY_URI_PATTERNS2 (__AC_LAND_URI && __AC_UNSUB_URI && __AC_REPORT_URI)
+describe 	AC_SPAMMY_URI_PATTERNS2	link combos match highly spammy template
+#score 		AC_SPAMMY_URI_PATTERNS2	4.0
+tflags 		AC_SPAMMY_URI_PATTERNS2	publish
+##} AC_SPAMMY_URI_PATTERNS2
+
+##{ AC_SPAMMY_URI_PATTERNS3
+
+meta 		AC_SPAMMY_URI_PATTERNS3 (__AC_PHPOFFTOP_URI && __AC_PHPOFFSUB_URI)
+describe 	AC_SPAMMY_URI_PATTERNS3	link combos match highly spammy template
+#score 		AC_SPAMMY_URI_PATTERNS3	4.0
+tflags 		AC_SPAMMY_URI_PATTERNS3	publish
+##} AC_SPAMMY_URI_PATTERNS3
+
+##{ AC_SPAMMY_URI_PATTERNS4
+
+meta 		AC_SPAMMY_URI_PATTERNS4 __AC_NUMS_URI
+describe 	AC_SPAMMY_URI_PATTERNS4	link combos match highly spammy template
+#score 		AC_SPAMMY_URI_PATTERNS4	4.0
+tflags 		AC_SPAMMY_URI_PATTERNS4	publish
+##} AC_SPAMMY_URI_PATTERNS4
+
+##{ AC_SPAMMY_URI_PATTERNS8
+
+meta 		AC_SPAMMY_URI_PATTERNS8 __AC_LONGSEQ_URI
+describe 	AC_SPAMMY_URI_PATTERNS8	link combos match highly spammy template
+#score 		AC_SPAMMY_URI_PATTERNS8	4.0
+tflags 		AC_SPAMMY_URI_PATTERNS8	publish
+##} AC_SPAMMY_URI_PATTERNS8
+
+##{ AC_SPAMMY_URI_PATTERNS9
+
+meta 		AC_SPAMMY_URI_PATTERNS9 (__AC_1SEQC_URI && (__AC_1SEQV_URI || __AC_RMOVE_URI))
+describe 	AC_SPAMMY_URI_PATTERNS9	link combos match highly spammy template
+#score 		AC_SPAMMY_URI_PATTERNS9	4.0
+tflags 		AC_SPAMMY_URI_PATTERNS9	publish
+##} AC_SPAMMY_URI_PATTERNS9
+
+##{ ADMAIL
+
+meta        ADMAIL            __ADMAIL && !__DKIM_EXISTS && !__COMMENT_EXISTS 
+describe    ADMAIL            "admail" and variants
+tflags      ADMAIL            publish
+##} ADMAIL
+
 ##{ ADVANCE_FEE_2_NEW_FORM
 
-meta      ADVANCE_FEE_2_NEW_FORM    __ADVANCE_FEE_2_NEW_FORM && !__COMMENT_EXISTS && !__THREADED && !__HTML_LINK_IMAGE && !__HDRS_LCASE && !__DOS_HAS_LIST_UNSUB && !__HAS_SENDER && !__HAS_X_LOOP
+meta      ADVANCE_FEE_2_NEW_FORM    (__ADVANCE_FEE_2_NEW_FORM && !__ADVANCE_FEE_3_NEW_FORM && !__ADVANCE_FEE_4_NEW_FORM && !__ADVANCE_FEE_5_NEW_FORM) && !__COMMENT_EXISTS && !__THREADED && !__HTML_LINK_IMAGE && !__HDRS_LCASE && !__DOS_HAS_LIST_UNSUB && !__HAS_SENDER && !__HAS_X_LOOP
 describe  ADVANCE_FEE_2_NEW_FORM    Advance Fee fraud and a form
+#score     ADVANCE_FEE_2_NEW_FORM    2.000  # limit
 tflags    ADVANCE_FEE_2_NEW_FORM     publish
 ##} ADVANCE_FEE_2_NEW_FORM
 
-##{ ADVANCE_FEE_2_NEW_FRM_MNY
-
-meta      ADVANCE_FEE_2_NEW_FRM_MNY    __ADVANCE_FEE_2_NEW_FRM_MNY && !__HTML_LINK_IMAGE && !__HDRS_LCASE && !__DOS_HAS_LIST_UNSUB && !__THREADED && !__HAS_SENDER && !__HAS_X_LOOP
-describe  ADVANCE_FEE_2_NEW_FRM_MNY    Advance Fee fraud form and lots of money
-##} ADVANCE_FEE_2_NEW_FRM_MNY
-
 ##{ ADVANCE_FEE_2_NEW_MONEY
 
-meta      ADVANCE_FEE_2_NEW_MONEY    __ADVANCE_FEE_2_NEW_MONEY && !__DOS_HAS_LIST_UNSUB && !__TAG_EXISTS_CENTER && !__LYRIS_EZLM_REMAILER && !__COMMENT_EXISTS && !__UNSUB_LINK && !__VIA_ML && !__HTML_LINK_IMAGE && !__HDRS_LCASE && !__NAME_EQ_EMAIL && !__URI_MAILTO_MANY && !__RP_MATCHES_RCVD && !__THREADED && !__HAS_SENDER && !__HAS_X_LOOP
+meta      ADVANCE_FEE_2_NEW_MONEY    (__ADVANCE_FEE_2_NEW_MONEY && !__ADVANCE_FEE_3_NEW_MONEY && !__ADVANCE_FEE_4_NEW_MONEY && !__ADVANCE_FEE_5_NEW_MONEY) && !__DOS_HAS_LIST_UNSUB && !__TAG_EXISTS_CENTER && !__LYRIS_EZLM_REMAILER && !__COMMENT_EXISTS && !__UNSUB_LINK && !__VIA_ML && !__HTML_LINK_IMAGE && !__HDRS_LCASE && !__NAME_EQ_EMAIL && !__URI_MAILTO_MANY && !__RP_MATCHES_RCVD && !__THREADED && !__HAS_SENDER && !__HAS_X_LOOP
 describe  ADVANCE_FEE_2_NEW_MONEY    Advance Fee fraud and lots of money
+#score     ADVANCE_FEE_2_NEW_MONEY    2.000  # limit
 tflags    ADVANCE_FEE_2_NEW_MONEY    publish
 ##} ADVANCE_FEE_2_NEW_MONEY
 
 ##{ ADVANCE_FEE_3_NEW
 
-meta      ADVANCE_FEE_3_NEW  __ADVANCE_FEE_3_NEW && !__HTML_LINK_IMAGE && !__TAG_EXISTS_CENTER && !__COMMENT_EXISTS && !__VIA_ML && !__THREADED && !__UNSUB_LINK && !__UPPERCASE_URI && !__SURVEY && !__HAS_SENDER && !__HAS_X_LOOP
-describe  ADVANCE_FEE_3_NEW  Appears to be advance fee fraud (Nigerian 419)
-#score     ADVANCE_FEE_3_NEW  3.5		# limit
+meta      ADVANCE_FEE_3_NEW    (__ADVANCE_FEE_3_NEW && !__FILL_THIS_FORM && !LOTS_OF_MONEY && !__ADVANCE_FEE_4_NEW && !__ADVANCE_FEE_5_NEW) && !__HTML_LINK_IMAGE && !__TAG_EXISTS_CENTER && !__COMMENT_EXISTS && !__VIA_ML && !__THREADED && !__UNSUB_LINK && !__UPPERCASE_URI && !__SURVEY && !__HAS_SENDER && !__HAS_X_LOOP && !__TO_YOUR_ORG
+describe  ADVANCE_FEE_3_NEW    Appears to be advance fee fraud (Nigerian 419)
+#score     ADVANCE_FEE_3_NEW    3.5		# limit
 tflags    ADVANCE_FEE_3_NEW          publish
 ##} ADVANCE_FEE_3_NEW
 
 ##{ ADVANCE_FEE_3_NEW_FORM
 
-meta      ADVANCE_FEE_3_NEW_FORM    __ADVANCE_FEE_3_NEW_FORM && !__HTML_LINK_IMAGE && !__THREADED && !__HAS_SENDER && !__HAS_X_LOOP
+meta      ADVANCE_FEE_3_NEW_FORM    (__ADVANCE_FEE_3_NEW_FORM && !__ADVANCE_FEE_4_NEW_FORM && !__ADVANCE_FEE_5_NEW_FORM) && !__HTML_LINK_IMAGE && !__THREADED && !__HAS_SENDER && !__HAS_X_LOOP
 describe  ADVANCE_FEE_3_NEW_FORM    Advance Fee fraud and a form
 tflags    ADVANCE_FEE_3_NEW_FORM     publish
 ##} ADVANCE_FEE_3_NEW_FORM
 
 ##{ ADVANCE_FEE_3_NEW_FRM_MNY
 
-meta      ADVANCE_FEE_3_NEW_FRM_MNY    __ADVANCE_FEE_3_NEW_FRM_MNY && !__HTML_LINK_IMAGE && !__THREADED && !__HAS_SENDER && !__HAS_X_LOOP
+meta      ADVANCE_FEE_3_NEW_FRM_MNY    (__ADVANCE_FEE_3_NEW_FRM_MNY && !__ADVANCE_FEE_4_NEW_FRM_MNY && !__ADVANCE_FEE_5_NEW_FRM_MNY) && !__HTML_LINK_IMAGE && !__THREADED && !__HAS_SENDER && !__HAS_X_LOOP
 describe  ADVANCE_FEE_3_NEW_FRM_MNY    Advance Fee fraud form and lots of money
 ##} ADVANCE_FEE_3_NEW_FRM_MNY
 
 ##{ ADVANCE_FEE_3_NEW_MONEY
 
-meta      ADVANCE_FEE_3_NEW_MONEY    __ADVANCE_FEE_3_NEW_MONEY && !__HTML_LINK_IMAGE && !__UPPERCASE_URI && !__UNSUB_LINK && !__VIA_ML && !__THREADED && !__HAS_SENDER && !__HAS_X_LOOP
+meta      ADVANCE_FEE_3_NEW_MONEY    (__ADVANCE_FEE_3_NEW_MONEY && !__ADVANCE_FEE_4_NEW_MONEY && !__ADVANCE_FEE_5_NEW_MONEY) && !__HTML_LINK_IMAGE && !__UPPERCASE_URI && !__UNSUB_LINK && !__VIA_ML && !__THREADED && !__HAS_SENDER && !__HAS_X_LOOP
 describe  ADVANCE_FEE_3_NEW_MONEY    Advance Fee fraud and lots of money
 tflags    ADVANCE_FEE_3_NEW_MONEY    publish
 ##} ADVANCE_FEE_3_NEW_MONEY
 
 ##{ ADVANCE_FEE_4_NEW
 
-meta      ADVANCE_FEE_4_NEW  __ADVANCE_FEE_4_NEW && !__COMMENT_EXISTS && !__TAG_EXISTS_CENTER && !__HAS_ERRORS_TO
-describe  ADVANCE_FEE_4_NEW  Appears to be advance fee fraud (Nigerian 419)
+meta      ADVANCE_FEE_4_NEW    (__ADVANCE_FEE_4_NEW && !__FILL_THIS_FORM && !LOTS_OF_MONEY && !__ADVANCE_FEE_5_NEW) && !__COMMENT_EXISTS && !__TAG_EXISTS_CENTER && !__HAS_ERRORS_TO && !__DOS_HAS_LIST_UNSUB 
+describe  ADVANCE_FEE_4_NEW    Appears to be advance fee fraud (Nigerian 419)
 tflags    ADVANCE_FEE_4_NEW          publish
 ##} ADVANCE_FEE_4_NEW
 
-##{ ADVANCE_FEE_4_NEW_FORM
-
-meta      ADVANCE_FEE_4_NEW_FORM    __ADVANCE_FEE_4_NEW_FORM
-describe  ADVANCE_FEE_4_NEW_FORM    Advance Fee fraud and a form
-##} ADVANCE_FEE_4_NEW_FORM
-
-##{ ADVANCE_FEE_4_NEW_FRM_MNY
-
-meta      ADVANCE_FEE_4_NEW_FRM_MNY    __ADVANCE_FEE_4_NEW_FRM_MNY
-describe  ADVANCE_FEE_4_NEW_FRM_MNY    Advance Fee fraud form and lots of money
-##} ADVANCE_FEE_4_NEW_FRM_MNY
-
-##{ ADVANCE_FEE_4_NEW_MONEY
-
-meta      ADVANCE_FEE_4_NEW_MONEY    __ADVANCE_FEE_4_NEW_MONEY && !__HTML_LINK_IMAGE && !__TAG_EXISTS_CENTER && !__HAS_SENDER && !__HAS_X_LOOP
-describe  ADVANCE_FEE_4_NEW_MONEY    Advance Fee fraud and lots of money
-##} ADVANCE_FEE_4_NEW_MONEY
-
-##{ ADVANCE_FEE_5_NEW
-
-meta      ADVANCE_FEE_5_NEW  __ADVANCE_FEE_5_NEW
-describe  ADVANCE_FEE_5_NEW  Appears to be advance fee fraud (Nigerian 419)
-##} ADVANCE_FEE_5_NEW
-
-##{ ADVANCE_FEE_5_NEW_FORM
-
-meta      ADVANCE_FEE_5_NEW_FORM    __ADVANCE_FEE_5_NEW_FORM
-describe  ADVANCE_FEE_5_NEW_FORM    Advance Fee fraud and a form
-##} ADVANCE_FEE_5_NEW_FORM
-
 ##{ ADVANCE_FEE_5_NEW_FRM_MNY
 
 meta      ADVANCE_FEE_5_NEW_FRM_MNY    __ADVANCE_FEE_5_NEW_FRM_MNY
@@ -126,67 +187,53 @@
 
 ##{ ADVANCE_FEE_5_NEW_MONEY
 
-meta      ADVANCE_FEE_5_NEW_MONEY    __ADVANCE_FEE_5_NEW_MONEY
+meta      ADVANCE_FEE_5_NEW_MONEY    __ADVANCE_FEE_5_NEW_MONEY && !__BOUNCE_CTYPE
 describe  ADVANCE_FEE_5_NEW_MONEY    Advance Fee fraud and lots of money
 ##} ADVANCE_FEE_5_NEW_MONEY
 
+##{ AD_PREFS
+
+body        AD_PREFS          /(?:\b|_)(?:ad(?:vert[i1l]s[i1l]ng)?|promo(?:tion)?|marketing)[- _](?:pref(?:s|erences)|settings)(?:\b|_)/i
+describe    AD_PREFS          Advertising preferences
+tflags      AD_PREFS          publish
+##} AD_PREFS
+
 ##{ APOSTROPHE_FROM
 
 header		APOSTROPHE_FROM	From:addr =~ /'/
 describe	APOSTROPHE_FROM	From address contains an apostrophe
 ##} APOSTROPHE_FROM
 
-##{ AXB_3LITTLE_PIGS
+##{ APP_DEVELOPMENT_FREEM if can(Mail::SpamAssassin::Conf::feature_bug6558_free)
 
-body		AXB_3LITTLE_PIGS	/\bwas sent by third-party independent marketing agent\./
-describe	AXB_3LITTLE_PIGS	chinny chin chin
-##} AXB_3LITTLE_PIGS
-
-##{ AXB_3LITTLE_PIGS if (version >= 3.004000)
-
-if (version >= 3.004000)
-tflags		AXB_3LITTLE_PIGS	autolearn_force	
+if can(Mail::SpamAssassin::Conf::feature_bug6558_free)
+  meta       APP_DEVELOPMENT_FREEM       __APP_DEVELOPMENT_MANY && (__REPTO_CHN_FREEM || __freemail_hdr_replyto)
+  describe   APP_DEVELOPMENT_FREEM       App development pitch, freemail or CHN replyto
+#  score      APP_DEVELOPMENT_FREEM       3.500	# limit
+  tflags     APP_DEVELOPMENT_FREEM       publish
 endif
-##} AXB_3LITTLE_PIGS if (version >= 3.004000)
-
-##{ AXB_BODYMAIL_SBL112884
+##} APP_DEVELOPMENT_FREEM if can(Mail::SpamAssassin::Conf::feature_bug6558_free)
 
-body            AXB_BODYMAIL_SBL112884  /\@yeah\.net\b/
-describe        AXB_BODYMAIL_SBL112884  Spammer dropbox SBL112884
-##} AXB_BODYMAIL_SBL112884
+##{ APP_DEVELOPMENT_NORDNS if can(Mail::SpamAssassin::Conf::feature_bug6558_free)
 
-##{ AXB_ONMS_LEAKS
-
-meta	 AXB_ONMS_LEAKS		(__FROM_ONMS && __TO_ONMS && __TO_ONMS_RCPTS)
-describe AXB_ONMS_LEAKS		Onmicrosoft Leak Party
-##} AXB_ONMS_LEAKS
+if can(Mail::SpamAssassin::Conf::feature_bug6558_free)
+  meta       APP_DEVELOPMENT_NORDNS      __APP_DEVELOPMENT && __RDNS_NONE 
+  describe   APP_DEVELOPMENT_NORDNS      App development pitch, no rDNS
+#  score      APP_DEVELOPMENT_NORDNS      2.000	# limit
+  tflags     APP_DEVELOPMENT_NORDNS      publish
+endif
+##} APP_DEVELOPMENT_NORDNS if can(Mail::SpamAssassin::Conf::feature_bug6558_free)
 
 ##{ AXB_XMAILER_MIMEOLE_OL_024C2
 
 meta   AXB_XMAILER_MIMEOLE_OL_024C2  (__AXB_XM_OL_024C2 && __AXB_MO_OL_024C2)
+describe AXB_XMAILER_MIMEOLE_OL_024C2 Yet another X header trait
 ##} AXB_XMAILER_MIMEOLE_OL_024C2
 
 ##{ AXB_XMAILER_MIMEOLE_OL_1ECD5
 
-meta   AXB_XMAILER_MIMEOLE_OL_1ECD5  (__AXB_XM_OL_1ECD5 && __AXB_MO_OL_1ECD5)##} AXB_XMAILER_MIMEOLE_OL_1ECD5
-
-##{ AXB_XMA_BASP
-
-header          AXB_XMA_BASP            X-Mail-Agent =~ /^BASP21/
-describe        AXB_XMA_BASP            Mailer fingerprint
-##} AXB_XMA_BASP
-
-##{ AXB_XM_FORGED_OL2600
-
-meta            AXB_XM_FORGED_OL2600    (__AXB_XM_OL_2600  && !__AXB_MO_OL_2600 )
-describe        AXB_XM_FORGED_OL2600     Forged OE v. 6.2600
-##} AXB_XM_FORGED_OL2600
-
-##{ AXB_X_FF_SEZ_S
-
-header          AXB_X_FF_SEZ_S          X-Forefront-Antispam-Report =~ /^SFV\:SPM/
-describe        AXB_X_FF_SEZ_S          Forefront sez this is spam
-##} AXB_X_FF_SEZ_S
+meta   AXB_XMAILER_MIMEOLE_OL_1ECD5  (__AXB_XM_OL_1ECD5 && __AXB_MO_OL_1ECD5)
+describe AXB_XMAILER_MIMEOLE_OL_1ECD5   Yet another X header trait##} AXB_XMAILER_MIMEOLE_OL_1ECD5
 
 ##{ BANKING_LAWS
 
@@ -204,7 +251,9 @@
 ##{ BASE64_LENGTH_79_INF ifplugin Mail::SpamAssassin::Plugin::MIMEEval
 
 ifplugin Mail::SpamAssassin::Plugin::MIMEEval
+describe BASE64_LENGTH_79_INF   base64 encoded email part uses line length of 78 or 79 characters
 body BASE64_LENGTH_79_INF       eval:check_base64_length('79')
+describe BASE64_LENGTH_79_INF   base64 encoded email part uses line length greater than 79 characters
 endif
 ##} BASE64_LENGTH_79_INF ifplugin Mail::SpamAssassin::Plugin::MIMEEval
 
@@ -212,35 +261,51 @@
 
 meta           BIGNUM_EMAILS              __BIGNUM_EMAILS && !__SPOOFED_URL && !__BUGGED_IMG
 describe       BIGNUM_EMAILS              Lots of email addresses/leads
-#score          BIGNUM_EMAILS              3.00		# limti
+#score          BIGNUM_EMAILS              3.00		# limit
 ##} BIGNUM_EMAILS
 
-##{ BILLION_OVERLAP
+##{ BODY_SINGLE_WORD
 
-meta BILLION_OVERLAP    	(BILLION_DOLLARS + US_DOLLARS_3 >= 2)
-#score BILLION_OVERLAP   	-1.0
-describe BILLION_OVERLAP 	Reducing score for overlap of similar rules 
-##} BILLION_OVERLAP
-
-##{ BITLY_URI
-
-meta            BITLY_URI               __BITLY_URI && !__SUBSCRIPTION_INFO && !__HAS_ANY_EMAIL && !__HAS_REPLY_TO && !__UNSUB_LINK && !__RCD_RDNS_MAIL_MESSY && !__RP_MATCHES_RCVD && !__COMMENT_EXISTS && !__TO_NO_BRKTS_HTML_ONLY && !__NOT_SPOOFED 
-describe        BITLY_URI               URI contains bit.ly
-#score           BITLY_URI               2.25	# limit
-##} BITLY_URI
-
-##{ BODY_EMPTY
-
-meta        BODY_EMPTY           __EMPTY_BODY && !__NUMBERS_IN_SUBJ && !__CTE && !__RP_MATCHES_RCVD && !__VIA_ML && !__MIME_ATTACHMENT && !__HAS_THREAD_INDEX && !__TO_EQ_FROM_DOM && !__ENV_AND_HDR_FROM_MATCH && !__FROM_LOWER && !__NOT_SPOOFED && !__MSGID_APPLEMAIL && !__RCD_RDNS_MAIL_MESSY && !NO_RELAYS && !__NOT_A_PERSON 
-describe    BODY_EMPTY           No body text in message
-#score       BODY_EMPTY           3.00	# limit
-##} BODY_EMPTY
+meta        BODY_SINGLE_WORD    __BODY_SINGLE_WORD && !ALL_TRUSTED && !__HDRS_LCASE_KNOWN && !__FROM_ALL_NUMS && !__RCD_RDNS_SMTP
+describe    BODY_SINGLE_WORD    Message body is only one word (no spaces)
+#score       BODY_SINGLE_WORD    2.500	# limit
+##} BODY_SINGLE_WORD
+
+##{ BODY_URI_ONLY
+
+meta        BODY_URI_ONLY        __BODY_URI_ONLY && !__NOT_SPOOFED && !__LCL__ENV_AND_HDR_FROM_MATCH && !__TO_EQ_FROM_DOM && !__X_CRON_ENV 
+describe    BODY_URI_ONLY        Message body is only a URI in one line of text or for an image
+#score       BODY_URI_ONLY        1.000   # limit
+tflags      BODY_URI_ONLY        publish
+##} BODY_URI_ONLY
+
+##{ BOGUS_MSM_HDRS
+
+meta       BOGUS_MSM_HDRS               __BOGUS_MSM_HDRS
+describe   BOGUS_MSM_HDRS               Apparently bogus Microsoft email headers
+#score      BOGUS_MSM_HDRS               3.000	# limit
+tflags     BOGUS_MSM_HDRS               publish
+##} BOGUS_MSM_HDRS
+
+##{ BTC_ORG
+
+meta           BTC_ORG          __BITCOIN_ID && __HAS_ORGANIZATION
+describe       BTC_ORG          Bitcoin wallet ID + unusual header
+##} BTC_ORG
 
 ##{ BUG6152_INVALID_DATE_TZ_ABSURD
 
 header BUG6152_INVALID_DATE_TZ_ABSURD   Date =~ /[-+](?!(?:0\d|1[0-4])(?:[03]0|[14]5))\d{4}/
 ##} BUG6152_INVALID_DATE_TZ_ABSURD
 
+##{ CANT_SEE_AD
+
+meta        CANT_SEE_AD       (__CANT_SEE_AD_1 || __CANT_SEE_AD_2) && !__DOS_HAS_LIST_UNSUB
+describe    CANT_SEE_AD       You really want to see our spam.
+#score       CANT_SEE_AD       2.500	# limit
+tflags      CANT_SEE_AD       publish
+##} CANT_SEE_AD
+
 ##{ CK_HELO_DYNAMIC_SPLIT_IP
 
 header 		CK_HELO_DYNAMIC_SPLIT_IP 	X-Spam-Relays-Untrusted =~ /^[^\]]+helo=(?!(?:\d+\.){4})\d+[^\d\s]+\d+[^\d\s]\d+[^\d\s]\d+[^\d\s]/i
@@ -257,37 +322,19 @@
 
 ##{ CN_B2B_SPAMMER
 
-body        CN_B2B_SPAMMER         /\bWe are (?:(?:a )?(?:China|Taiwan)[-\s]based|(?:one of (?:the )?best|(?:a )?leading) [^\.]{10,90} (?:in|from) (?:China|Taiwan))\b/i
+body        CN_B2B_SPAMMER         /\bWe are (?:(?:a )?(?:China|Taiwan)[-\s]based|(?:one of (?:the )?best|(?:a )?leading) (?:international|[^\.]{10,90} (?:in|from) (?:\w+, )?(?:China|Taiwan)))\b/i
 describe    CN_B2B_SPAMMER         Chinese company introducing itself
+tflags      CN_B2B_SPAMMER         publish
 ##} CN_B2B_SPAMMER
 
 ##{ COMMENT_GIBBERISH
 
-meta           COMMENT_GIBBERISH        __COMMENT_GIBBERISH && !__JM_REACTOR_DATE && !__RCD_RDNS_MTA_MESSY && !__SENDER_BOT 
+meta           COMMENT_GIBBERISH        __COMMENT_GIBBERISH && !__JM_REACTOR_DATE && !__RCD_RDNS_MTA_MESSY && !__SENDER_BOT
 describe       COMMENT_GIBBERISH        Nonsense in long HTML comment
-#score          COMMENT_GIBBERISH        1.00	# limit
+#score          COMMENT_GIBBERISH        1.50	# limit
+tflags         COMMENT_GIBBERISH        publish
 ##} COMMENT_GIBBERISH
 
-##{ COMPENSATION
-
-describe COMPENSATION     "Compensation"
-#score    COMPENSATION     1.50	# limit
-##} COMPENSATION
-
-##{ COMPENSATION if !plugin(Mail::SpamAssassin::Plugin::DKIM)
-
-if !plugin(Mail::SpamAssassin::Plugin::DKIM)
-  meta   COMPENSATION     __COMPENSATION && !__DOS_HAS_LIST_UNSUB && !__HAS_X_LOOP && !__HAS_ERRORS_TO && !__UNSUB_LINK && !__OPERA_MID_NON_OP && !__FB_S_STOCK && !__COMMENT_EXISTS && !__NOT_SPOOFED && !__LOCAL_PP_NONPPURL && !__NOT_A_PERSON && !__SUBSCRIPTION_INFO && !__DKIM_EXISTS && !__HAS_SENDER && !__RP_MATCHES_RCVD
-endif
-##} COMPENSATION if !plugin(Mail::SpamAssassin::Plugin::DKIM)
-
-##{ COMPENSATION ifplugin Mail::SpamAssassin::Plugin::DKIM
-
-ifplugin Mail::SpamAssassin::Plugin::DKIM
-  meta   COMPENSATION     __COMPENSATION && !__DOS_HAS_LIST_UNSUB && !__HAS_X_LOOP && !__HAS_ERRORS_TO && !__UNSUB_LINK && !__OPERA_MID_NON_OP && !__FB_S_STOCK && !__COMMENT_EXISTS && !__NOT_SPOOFED && !__LOCAL_PP_NONPPURL && !__NOT_A_PERSON && !__SUBSCRIPTION_INFO && !__DKIM_EXISTS && !__HAS_SENDER && !__RP_MATCHES_RCVD && !__DKIM_DEPENDABLE
-endif
-##} COMPENSATION ifplugin Mail::SpamAssassin::Plugin::DKIM
-
 ##{ CORRUPT_FROM_LINE_IN_HDRS
 
 meta CORRUPT_FROM_LINE_IN_HDRS (MISSING_HEADERS && __BODY_STARTS_WITH_FROM_LINE && MISSING_DATE && NO_RELAYS)
@@ -319,12 +366,6 @@
 body CURR_PRICE         /\bCurrent Price:/
 ##} CURR_PRICE
 
-##{ DATE_DOTS
-
-header          DATE_DOTS               Date =~ /\d\d\.\d\d\.\d\d/
-describe        DATE_DOTS               Periods in date header
-##} DATE_DOTS
-
 ##{ DATE_IN_FUTURE_96_Q ifplugin Mail::SpamAssassin::Plugin::HeaderEval
 
 ifplugin Mail::SpamAssassin::Plugin::HeaderEval
@@ -333,31 +374,53 @@
 endif
 ##} DATE_IN_FUTURE_96_Q ifplugin Mail::SpamAssassin::Plugin::HeaderEval
 
-##{ DATE_IN_FUTURE_Q_PLUS ifplugin Mail::SpamAssassin::Plugin::HeaderEval
-
-ifplugin Mail::SpamAssassin::Plugin::HeaderEval
-header   DATE_IN_FUTURE_Q_PLUS  eval:check_for_shifted_date('2920', 'undef')
-describe DATE_IN_FUTURE_Q_PLUS  Date: is over 4 months after Received: date
-endif
-##} DATE_IN_FUTURE_Q_PLUS ifplugin Mail::SpamAssassin::Plugin::HeaderEval
-
 ##{ DEAR_BENEFICIARY
 
 body     DEAR_BENEFICIARY         /\b(?:De[ae]r\s|At+(?:ention|n):?\s?)(?:\S+\s)?Ben[ei]ficiary\b/i
 describe DEAR_BENEFICIARY         Dear Beneficiary:
 ##} DEAR_BENEFICIARY
 
-##{ DEAR_EMAIL_USER
+##{ DEAR_NOBODY
 
-body           DEAR_EMAIL_USER          /^\s?(?:Dear\s|Attention:?\s?)(?:E|Web)-?mail\s(?:account\s)?User\b/i
-describe       DEAR_EMAIL_USER          Dear Email User:
-##} DEAR_EMAIL_USER
+rawbody	 DEAR_NOBODY	/^\s*Dear\b[^a-zA-Z]{1,70}\n/mi
+describe DEAR_NOBODY	Message contains Dear but with no name
+##} DEAR_NOBODY
 
 ##{ DEAR_WINNER
 
 body DEAR_WINNER /\bdear.{1,20}winner/i
+describe DEAR_WINNER   Spam with generic salutation of "dear winner"
 ##} DEAR_WINNER
 
+##{ DKIMWL_BL ifplugin Mail::SpamAssassin::Plugin::AskDNS
+
+ifplugin Mail::SpamAssassin::Plugin::AskDNS
+tflags		DKIMWL_BL	nice net
+describe	DKIMWL_BL	DKIMwl.org - Blacklisted sender
+#score		DKIMWL_BL	7.5
+endif
+##} DKIMWL_BL ifplugin Mail::SpamAssassin::Plugin::AskDNS
+
+##{ DKIMWL_WL_HIGH ifplugin Mail::SpamAssassin::Plugin::AskDNS
+
+ifplugin Mail::SpamAssassin::Plugin::AskDNS
+meta		DKIMWL_WL_HIGH	__DKIMWL_WL_HI && !(FREEMAIL_FROM || FREEMAIL_REPLYTO || FREEMAIL_FORGED_REPLYTO)
+tflags		DKIMWL_WL_HIGH	nice net
+describe	DKIMWL_WL_HIGH	DKIMwl.org - Whitelisted High sender
+#score		DKIMWL_WL_HIGH	-7.5
+endif
+##} DKIMWL_WL_HIGH ifplugin Mail::SpamAssassin::Plugin::AskDNS
+
+##{ DKIMWL_WL_MED ifplugin Mail::SpamAssassin::Plugin::AskDNS
+
+ifplugin Mail::SpamAssassin::Plugin::AskDNS
+meta		DKIMWL_WL_MED	__DKIMWL_WL_MED && !(FREEMAIL_FROM || FREEMAIL_REPLYTO || FREEMAIL_FORGED_REPLYTO)
+tflags		DKIMWL_WL_MED	nice net
+describe	DKIMWL_WL_MED	DKIMwl.org - Whitelisted Medium sender
+#score		DKIMWL_WL_MED	-3.5
+endif
+##} DKIMWL_WL_MED ifplugin Mail::SpamAssassin::Plugin::AskDNS
+
 ##{ DOS_ANAL_SPAM_MAILER
 
 header DOS_ANAL_SPAM_MAILER	X-mailer =~ /^[A-Z][a-z]{6}e \d\.\d{2}$/
@@ -433,6 +496,7 @@
 ##{ DRUGS_HDIA
 
 header DRUGS_HDIA       Subject =~ /\bhoodia\b/i
+describe DRUGS_HDIA     Subject mentions "hoodia"
 ##} DRUGS_HDIA
 
 ##{ DRUGS_STOCK_MIMEOLE
@@ -441,12 +505,19 @@
 describe DRUGS_STOCK_MIMEOLE Stock-spam forged headers found (5510)
 ##} DRUGS_STOCK_MIMEOLE
 
-##{ DSN_NO_MIMEVERSION
+##{ DX_TEXT_02
 
-meta DSN_NO_MIMEVERSION (__BOUNCE_RPATH_NULL && !__MIME_VERSION)
-describe DSN_NO_MIMEVERSION Return-Path <> and no MIME-Version: header
-#score DSN_NO_MIMEVERSION 2
-##} DSN_NO_MIMEVERSION
+body       DX_TEXT_02       /\b(?:change|modif(?:y|ications?)) (?:of|to|(?:yo)?ur) (?:message|sub|comm) stat/i
+describe   DX_TEXT_02       "change your message stat"
+tflags     DX_TEXT_02       publish
+##} DX_TEXT_02
+
+##{ DX_TEXT_03
+
+body       DX_TEXT_03       /\b[A-Z]{3} Media (?:Group|Relations)\b/
+describe   DX_TEXT_03       "XXX Media Group"
+tflags     DX_TEXT_03       publish
+##} DX_TEXT_03
 
 ##{ DYN_RDNS_AND_INLINE_IMAGE
 
@@ -466,32 +537,19 @@
 describe DYN_RDNS_SHORT_HELO_IMAGE    Short HELO string, dynamic rDNS, inline image
 ##} DYN_RDNS_SHORT_HELO_IMAGE
 
-##{ EMAIL_URI_PHISH
-
-#score       EMAIL_URI_PHISH      4.00	# limit
-describe    EMAIL_URI_PHISH      Email account phishing using web form
-tflags      EMAIL_URI_PHISH      publish	# Force publication - very good S/O, hits mainly <= 3 points
-##} EMAIL_URI_PHISH
+##{ ENCRYPTED_MESSAGE
 
-##{ EMAIL_URI_PHISH if !plugin(Mail::SpamAssassin::Plugin::MIMEHeader)
-
-if !plugin(Mail::SpamAssassin::Plugin::MIMEHeader)
-  meta      EMAIL_URI_PHISH      __EMAIL_URI_PHISH && !ALL_TRUSTED && !__UNSUB_LINK && !__TAG_EXISTS_CENTER && !__HAS_SENDER && !__CAN_HELP && !__VIA_ML && !__UPPERCASE_URI && !__HAS_CC && !__NUMBERS_IN_SUBJ && !__PCT_FOR_YOU && !__MOZILLA_MSGID && !__FB_COST && !__hk_bigmoney
-endif
-##} EMAIL_URI_PHISH if !plugin(Mail::SpamAssassin::Plugin::MIMEHeader)
-
-##{ EMAIL_URI_PHISH ifplugin Mail::SpamAssassin::Plugin::MIMEHeader
-
-ifplugin Mail::SpamAssassin::Plugin::MIMEHeader
-  meta      EMAIL_URI_PHISH      __EMAIL_URI_PHISH && !ALL_TRUSTED && !__UNSUB_LINK && !__TAG_EXISTS_CENTER && !__HAS_SENDER && !__CAN_HELP && !__VIA_ML && !__UPPERCASE_URI && !__HAS_CC && !__NUMBERS_IN_SUBJ && !__PCT_FOR_YOU && !__MOZILLA_MSGID && !__FB_COST && !__hk_bigmoney && !__REMOTE_IMAGE
-endif
-##} EMAIL_URI_PHISH ifplugin Mail::SpamAssassin::Plugin::MIMEHeader
-
-##{ EMRCP
-
-body     EMRCP            /\bExcess Maximum Return Capital Profit\b/i
-describe EMRCP            "Excess Maximum Return Capital Profit" Fidelity scam
-##} EMRCP
+meta       ENCRYPTED_MESSAGE           __CT_ENCRYPTED
+describe   ENCRYPTED_MESSAGE           Message is encrypted, not likely to be spam
+#score      ENCRYPTED_MESSAGE           -1.000
+tflags     ENCRYPTED_MESSAGE           nice,publish
+##} ENCRYPTED_MESSAGE
+
+##{ EXCUSE_24
+
+body EXCUSE_24                  /you(?:'ve|'re| have| are)? receiv(?:e|ed|ing) this (?:advertisement|offer|special|recurring|paid).{0,16}\b(?:by either|because)/i
+describe EXCUSE_24              Claims you wanted this ad
+##} EXCUSE_24
 
 ##{ FAKE_REPLY_C
 
@@ -503,6 +561,7 @@
 meta        FBI_MONEY            __FBI_SPOOF && LOTS_OF_MONEY
 describe    FBI_MONEY            The FBI wants to give you lots of money?
 #score       FBI_MONEY            2.00	# limit
+tflags      FBI_MONEY            publish
 ##} FBI_MONEY
 
 ##{ FBI_SPOOF
@@ -510,32 +569,9 @@
 meta        FBI_SPOOF            __FBI_SPOOF
 describe    FBI_SPOOF            Claims to be FBI, but not from FBI domain
 #score       FBI_SPOOF            2.00	# limit
+tflags      FBI_SPOOF            publish
 ##} FBI_SPOOF
 
-##{ FH_FAKE_RCVD_LINE
-
-header   FH_FAKE_RCVD_LINE      Received =~ /from\s*\d{1,3}\.\d{1,3}\.\d{1,3}\.\d{1,3}\s*by\s*\d{1,3}\.\d{1,3}\.\d{1,3}\.\d{1,3};\s*[SMTWF].{2},\s*\d{1,2}\s*[JFMASOND].{2,5}\s*\d{4}\s*\d{2}:\d{2}:\d{2}\s*[-+]\d{4}/
-describe FH_FAKE_RCVD_LINE      RCVD line looks faked (A)
-##} FH_FAKE_RCVD_LINE
-
-##{ FH_FROM_START_YOU
-
-header   FH_FROM_START_YOU      From =~ /^You\b/i
-describe FH_FROM_START_YOU      From starts with you.
-##} FH_FROM_START_YOU
-
-##{ FH_HELO_ALMOST_IP
-
-header   FH_HELO_ALMOST_IP      X-Spam-Relays-External =~ /^[^\]]+ helo=[^ ]+[a-z][-.]\d{1,3}[-.]\d{1,3}[-.]\d{1,3}[-.][a-z][^ ]+ /i
-describe FH_HELO_ALMOST_IP      Helo is almost an IP addr.
-##} FH_HELO_ALMOST_IP
-
-##{ FH_HOST_EQ_DYNAMICIP
-
-header   FH_HOST_EQ_DYNAMICIP   X-Spam-Relays-External =~ /^[^\]]+ rdns=[^ ]{0,25}[dD][yY][nN][aA][mM][iI][cC][iI][pP][^ ]{5,25} helo=/
-describe FH_HOST_EQ_DYNAMICIP   Host is dynamicip
-##} FH_HOST_EQ_DYNAMICIP
-
 ##{ FILL_THIS_FORM ifplugin Mail::SpamAssassin::Plugin::ReplaceTags
 
 ifplugin Mail::SpamAssassin::Plugin::ReplaceTags
@@ -545,22 +581,6 @@
 endif
 ##} FILL_THIS_FORM ifplugin Mail::SpamAssassin::Plugin::ReplaceTags
 
-##{ FILL_THIS_FORM_FRAUD_PHISH ifplugin Mail::SpamAssassin::Plugin::ReplaceTags
-
-ifplugin Mail::SpamAssassin::Plugin::ReplaceTags
-  meta     FILL_THIS_FORM_FRAUD_PHISH     __FILL_THIS_FORM_FRAUD_PHISH && !__UNSUB_LINK && !__SPOOFED_URL && !__DOS_LINK && !__CAN_HELP && !__VIA_ML && !__COMMENT_EXISTS && !__HAS_IN_REPLY_TO && !__THREADED 
-  describe FILL_THIS_FORM_FRAUD_PHISH     Answer suspicious question(s)
-endif
-##} FILL_THIS_FORM_FRAUD_PHISH ifplugin Mail::SpamAssassin::Plugin::ReplaceTags
-
-##{ FILL_THIS_FORM_LOAN ifplugin Mail::SpamAssassin::Plugin::ReplaceTags
-
-ifplugin Mail::SpamAssassin::Plugin::ReplaceTags
-  meta     FILL_THIS_FORM_LOAN            __FILL_THIS_FORM_LOAN && !__COMMENT_EXISTS && !__HTML_LINK_IMAGE
-  describe FILL_THIS_FORM_LOAN            Answer loan question(s)
-endif
-##} FILL_THIS_FORM_LOAN ifplugin Mail::SpamAssassin::Plugin::ReplaceTags
-
 ##{ FILL_THIS_FORM_LONG ifplugin Mail::SpamAssassin::Plugin::ReplaceTags
 
 ifplugin Mail::SpamAssassin::Plugin::ReplaceTags
@@ -570,51 +590,98 @@
 endif
 ##} FILL_THIS_FORM_LONG ifplugin Mail::SpamAssassin::Plugin::ReplaceTags
 
-##{ FM_LOTTO_MONEY
-
-meta     FM_LOTTO_MONEY         (__FM_LARGE_MONEY && __FM_NAT_LOTTERY)
-describe FM_LOTTO_MONEY         Talks about lotto and large money!
-##} FM_LOTTO_MONEY
+##{ FORM_FRAUD
 
-##{ FM_LOTTO_YOU_WON
-
-meta     FM_LOTTO_YOU_WON       (__FM_LARGE_MONEY && __FM_NAT_LOTTERY && __YOU_WON_SOMTIN)
-describe FM_LOTTO_YOU_WON       Talks about lotto and you won!
-##} FM_LOTTO_YOU_WON
+meta     FORM_FRAUD       (__FORM_FRAUD && !__FORM_FRAUD_3 && !__FORM_FRAUD_5) && !__DOS_HAS_LIST_UNSUB && !__THREADED && !__HAS_THREAD_INDEX && !__VIA_ML && !__HTML_LINK_IMAGE && !__COMMENT_EXISTS && !__NOT_SPOOFED && !__UPPERCASE_URI && !__UNSUB_LINK
+describe FORM_FRAUD       Fill a form and a fraud phrase
+#score    FORM_FRAUD       1.000   # limit
+tflags   FORM_FRAUD       publish
+##} FORM_FRAUD
 
 ##{ FORM_FRAUD_3
 
-meta     FORM_FRAUD_3    __FORM_FRAUD_3 && !__DOS_HAS_LIST_UNSUB && !__THREADED && !__HAS_THREAD_INDEX && !__VIA_ML && !__HTML_LINK_IMAGE && !__MIME_QP && !__DOS_BODY_FRI && !__UNSUB_LINK && !__BUGGED_IMG && !__NOT_SPOOFED
+meta     FORM_FRAUD_3    (__FORM_FRAUD_3 && !__FORM_FRAUD_5 && !__ADVANCE_FEE_3_NEW_FORM && !__ADVANCE_FEE_3_NEW_FRM_MNY) && !__DOS_HAS_LIST_UNSUB && !__THREADED && !__HAS_THREAD_INDEX && !__VIA_ML && !__HTML_LINK_IMAGE && !__MIME_QP && !__DOS_BODY_FRI && !__UNSUB_LINK && !__BUGGED_IMG && !__NOT_SPOOFED
 describe FORM_FRAUD_3    Fill a form and several fraud phrases
 tflags   FORM_FRAUD_3    publish
 ##} FORM_FRAUD_3
 
 ##{ FORM_FRAUD_5
 
-meta     FORM_FRAUD_5    __FORM_FRAUD_5 && !__DOS_HAS_LIST_UNSUB && !__THREADED && !__HAS_THREAD_INDEX && !__VIA_ML
+meta     FORM_FRAUD_5    (__FORM_FRAUD_5 && !__ADVANCE_FEE_5_NEW_FORM && !__ADVANCE_FEE_5_NEW_FRM_MNY) && !__DOS_HAS_LIST_UNSUB && !__THREADED && !__HAS_THREAD_INDEX && !__VIA_ML && !__BOUNCE_CTYPE 
 describe FORM_FRAUD_5    Fill a form and many fraud phrases
 tflags   FORM_FRAUD_5    publish
 ##} FORM_FRAUD_5
 
-##{ FROM_12LTRDOM
+##{ FORM_LOW_CONTRAST
 
-describe       FROM_12LTRDOM       From a 12-letter domain
-#score          FROM_12LTRDOM       0.10  	# limit
-##} FROM_12LTRDOM
+meta        FORM_LOW_CONTRAST     __FORM_LOW_CONTRAST && !__BUGGED_IMG && !__HAS_REPLY_TO && !__DKIM_EXISTS && !__DOS_HAS_LIST_UNSUB && !__MSGID_JAVAMAIL
+describe    FORM_LOW_CONTRAST     Fill in a form with hidden text
+#score       FORM_LOW_CONTRAST     2.500	# Limit
+tflags      FORM_LOW_CONTRAST     publish
+##} FORM_LOW_CONTRAST
+
+##{ FOUND_YOU
+
+meta        FOUND_YOU          __FOUND_YOU && !__DKIM_EXISTS && !__SUBJ_RE && !__HAS_X_REF && !__RP_MATCHES_RCVD && !__COMMENT_EXISTS && !__HAS_ERRORS_TO && !__HAS_IN_REPLY_TO
+#score       FOUND_YOU          3.25	# limit
+describe    FOUND_YOU          I found you...
+tflags      FOUND_YOU          publish
+##} FOUND_YOU
 
-##{ FROM_12LTRDOM if !plugin(Mail::SpamAssassin::Plugin::FreeMail)
+##{ FREEMAIL_DISPTO ifplugin Mail::SpamAssassin::Plugin::FreeMail
 
-if !plugin(Mail::SpamAssassin::Plugin::FreeMail)
-  meta         FROM_12LTRDOM       __FROM_12LTRDOM_1 && !__VIA_ML && !__TO___LOWER && !__FS_SUBJ_RE && !__RCD_RDNS_MAIL_MESSY && !__UNSUB_LINK && !NO_RELAYS && !__UNUSABLE_MSGID && !DATE_IN_PAST_96_XX && !ALL_TRUSTED && !__MSGID_APPLEMAIL && !__RCD_RDNS_SMTP_MESSY && !__FB_NATIONAL && !__MAIL_LINK && !__NAME_EMAIL_DIFF && !__RCD_RDNS_MX_MESSY && !__RCD_RDNS_MX && !__SENDER_BOT && !__IMS_MSGID && !__HS_SUBJ_RE_FW && !__DOS_HAS_LIST_UNSUB && !__THREAD_INDEX_GOOD && !__TO_EQ_FROM_DOM && !__URI_MAILTO && !__SUBSCRIPTION_INFO
+ifplugin Mail::SpamAssassin::Plugin::FreeMail
+  meta     FREEMAIL_DISPTO  ( __freemail_dispto && !__freemail_safe )
+  describe FREEMAIL_DISPTO  Disposition-Notification-To/From or Disposition-Notification-To/body contain different freemails
+#  score    FREEMAIL_DISPTO  0.25
 endif
-##} FROM_12LTRDOM if !plugin(Mail::SpamAssassin::Plugin::FreeMail)
+##} FREEMAIL_DISPTO ifplugin Mail::SpamAssassin::Plugin::FreeMail
 
-##{ FROM_12LTRDOM ifplugin Mail::SpamAssassin::Plugin::FreeMail
+##{ FREEMAIL_FORGED_FROMDOMAIN ifplugin Mail::SpamAssassin::Plugin::FreeMail ifplugin Mail::SpamAssassin::Plugin::HeaderEval if (version >= 3.004000)
 
 ifplugin Mail::SpamAssassin::Plugin::FreeMail
-  meta         FROM_12LTRDOM       __FROM_12LTRDOM_1 && !__VIA_ML && !__TO___LOWER && !__FS_SUBJ_RE && !__RCD_RDNS_MAIL_MESSY && !__freemail_safe && !__UNSUB_LINK && !NO_RELAYS && !__UNUSABLE_MSGID && !DATE_IN_PAST_96_XX && !ALL_TRUSTED && !__MSGID_APPLEMAIL && !__RCD_RDNS_SMTP_MESSY && !__FB_NATIONAL && !__MAIL_LINK && !__NAME_EMAIL_DIFF && !__RCD_RDNS_MX_MESSY && !__RCD_RDNS_MX && !__SENDER_BOT && !__IMS_MSGID && !__HS_SUBJ_RE_FW && !__DOS_HAS_LIST_UNSUB && !__THREAD_INDEX_GOOD && !__TO_EQ_FROM_DOM && !__URI_MAILTO && !__SUBSCRIPTION_INFO
+  ifplugin Mail::SpamAssassin::Plugin::HeaderEval 
+    if (version >= 3.004000)
+      meta     FREEMAIL_FORGED_FROMDOMAIN FREEMAIL_FROM && HEADER_FROM_DIFFERENT_DOMAINS
+      describe FREEMAIL_FORGED_FROMDOMAIN 2nd level domains in From and EnvelopeFrom freemail headers are different
+#      score    FREEMAIL_FORGED_FROMDOMAIN 0.25
+      tflags   FREEMAIL_FORGED_FROMDOMAIN publish
+endif
+endif
 endif
-##} FROM_12LTRDOM ifplugin Mail::SpamAssassin::Plugin::FreeMail
+##} FREEMAIL_FORGED_FROMDOMAIN ifplugin Mail::SpamAssassin::Plugin::FreeMail ifplugin Mail::SpamAssassin::Plugin::HeaderEval if (version >= 3.004000)
+
+##{ FREEM_FRNUM_UNICD_EMPTY
+
+meta       FREEM_FRNUM_UNICD_EMPTY    __FREEM_FRNUM_UNICD_EMPTY
+describe   FREEM_FRNUM_UNICD_EMPTY    Numeric freemail From address, unicode From name and Subject, empty body
+#score      FREEM_FRNUM_UNICD_EMPTY    3.750	# limit
+tflags     FREEM_FRNUM_UNICD_EMPTY    publish
+##} FREEM_FRNUM_UNICD_EMPTY
+
+##{ FRNAME_IN_MSG_NO_SUBJ
+
+meta       FRNAME_IN_MSG_NO_SUBJ      __FROM_NAME_IN_MSG && (__SUBJECT_EMPTY || __XPRIO_SHORT_SUBJ) && !__DKIM_EXISTS && !__ANY_IMAGE_ATTACH 
+describe   FRNAME_IN_MSG_NO_SUBJ      From name in message + short or no subject
+#score      FRNAME_IN_MSG_NO_SUBJ      2.500	# limit
+tflags     FRNAME_IN_MSG_NO_SUBJ      publish
+##} FRNAME_IN_MSG_NO_SUBJ
+
+##{ FRNAME_IN_MSG_XPRIO
+
+meta       FRNAME_IN_MSG_XPRIO        (__FROM_NAME_IN_MSG && __XPRIO) && !__DKIM_EXISTS  && !__SUBJ_NOT_SHORT 
+describe   FRNAME_IN_MSG_XPRIO        From name in message + X-Priority
+#score      FRNAME_IN_MSG_XPRIO        2.500	# limit
+tflags     FRNAME_IN_MSG_XPRIO        publish
+##} FRNAME_IN_MSG_XPRIO
+
+##{ FROM_ADDR_WS
+
+meta       FROM_ADDR_WS                __FROM_ADDR_WS && !__RCD_RDNS_MTA_MESSY && !ANY_BOUNCE_MESSAGE && !__FROM_ENCODED_QP && !__RCD_RDNS_MAIL 
+describe   FROM_ADDR_WS                Malformed From address
+#score      FROM_ADDR_WS                3.000	# limit
+tflags     FROM_ADDR_WS                publish
+##} FROM_ADDR_WS
 
 ##{ FROM_IN_TO_AND_SUBJ
 
@@ -623,13 +690,6 @@
 tflags         FROM_IN_TO_AND_SUBJ  publish
 ##} FROM_IN_TO_AND_SUBJ
 
-##{ FROM_MISSPACED
-
-meta           FROM_MISSPACED        __FROM_MISSPACED && !__RCD_RDNS_MTA_MESSY && !__CTYPE_MULTIPART_ALT && !__REPTO_QUOTE && !__MIME_QP && !__UNSUB_LINK && !__TO___LOWER && !__BUGGED_IMG && !__DOS_HAS_LIST_UNSUB && !__TO_EQ_FROM_DOM && !__MAIL_LINK && !__MTLANDROID_MUA && !__XEROXWORKCTR_MUA && !__PHP_MUA && !__AMADEUSMS_MUA && !__FLASHMAIL_MUA
-describe       FROM_MISSPACED        From: missing whitespace
-#score          FROM_MISSPACED        2.00
-##} FROM_MISSPACED
-
 ##{ FROM_MISSP_DYNIP
 
 meta           FROM_MISSP_DYNIP      __FROM_RUNON && RDNS_DYNAMIC
@@ -661,13 +721,14 @@
 
 meta        FROM_MISSP_PHISH     __FROM_MISSP_PHISH
 describe    FROM_MISSP_PHISH     Malformed, claims to be from financial organization - possible phish
-#score       FROM_MISSP_PHISH     4.75	# limit
+#score       FROM_MISSP_PHISH     3.500	# limit
 ##} FROM_MISSP_PHISH
 
 ##{ FROM_MISSP_REPLYTO
 
 meta           FROM_MISSP_REPLYTO    __FROM_MISSP_REPLYTO && !__NOT_SPOOFED && !__RCD_RDNS_MTA_MESSY && !__TO___LOWER && !__COMMENT_EXISTS && !__UNSUB_LINK && !__MIME_QP && !__CTYPE_MULTIPART_ALT && !__JM_REACTOR_DATE && !__PLING_QUERY
 describe       FROM_MISSP_REPLYTO    From misspaced, has Reply-To
+#score          FROM_MISSP_REPLYTO    2.500	# limit
 ##} FROM_MISSP_REPLYTO
 
 ##{ FROM_MISSP_SPF_FAIL ifplugin Mail::SpamAssassin::Plugin::SPF
@@ -685,97 +746,34 @@
 describe       FROM_MISSP_TO_UNDISC  From misspaced, To undisclosed
 ##} FROM_MISSP_TO_UNDISC
 
-##{ FROM_MISSP_USER
+##{ FROM_MISSP_XPRIO
 
-meta           FROM_MISSP_USER       (__FROM_RUNON && NSL_RCVD_FROM_USER)
-describe       FROM_MISSP_USER       From misspaced, from "User"
-##} FROM_MISSP_USER
-
-##{ FROM_WSP_LEAD
-
-header   FROM_WSP_LEAD 	From:raw =~ /< \s+ [^>\s] [^>]* > [^<>]* \z/xm
-describe FROM_WSP_LEAD	Leading whitespace after '<' in From header field
-##} FROM_WSP_LEAD
-
-##{ FRT_ADOBE2 ifplugin Mail::SpamAssassin::Plugin::ReplaceTags
-
-ifplugin Mail::SpamAssassin::Plugin::ReplaceTags
-body     FRT_ADOBE2             /<inter W0><post P2>\b(?!adobe)<A><D><O><B><E>\b/i
-describe FRT_ADOBE2             ReplaceTags: Adobe
-endif
-##} FRT_ADOBE2 ifplugin Mail::SpamAssassin::Plugin::ReplaceTags
-
-##{ FRT_APPROV ifplugin Mail::SpamAssassin::Plugin::ReplaceTags
-
-ifplugin Mail::SpamAssassin::Plugin::ReplaceTags
-body     FRT_APPROV             /<inter sP2><post P2>\b(?!approu?v)<A><P><P><R><O><V>/i
-describe FRT_APPROV             ReplaceTags: Approve
-endif
-##} FRT_APPROV ifplugin Mail::SpamAssassin::Plugin::ReplaceTags
-
-##{ FRT_BIGGERMEM1 ifplugin Mail::SpamAssassin::Plugin::ReplaceTags
-
-ifplugin Mail::SpamAssassin::Plugin::ReplaceTags
-body     FRT_BIGGERMEM1         /<inter SP2><post P2>(?:<B><IX><GX><GX><E><R>|<L><A><R><GX><E><R>).{1,8}(?:<P><E><N><IX><SX>|<B><R><E><A><SX><TX>|<M><E><M><B><E><R>)/i
-describe FRT_BIGGERMEM1         ReplaceTags: Bigger / Larger, Penis / Member
-endif
-##} FRT_BIGGERMEM1 ifplugin Mail::SpamAssassin::Plugin::ReplaceTags
-
-##{ FRT_OFFER2 ifplugin Mail::SpamAssassin::Plugin::ReplaceTags
-
-ifplugin Mail::SpamAssassin::Plugin::ReplaceTags
-body     FRT_OFFER2             /<inter W0><post P2>\b(?!offer)<O><F><F><E><R>/i
-describe FRT_OFFER2             ReplaceTags: Offer (2)
-endif
-##} FRT_OFFER2 ifplugin Mail::SpamAssassin::Plugin::ReplaceTags
-
-##{ FRT_PENIS1 ifplugin Mail::SpamAssassin::Plugin::ReplaceTags
-
-ifplugin Mail::SpamAssassin::Plugin::ReplaceTags
-body     FRT_PENIS1             /<inter SP2><post P2>\b(?!pen\s?(?:ie?s|ny[ ']?s))<P><E><N><IX><SX>\b/i
-describe FRT_PENIS1             ReplaceTags: Penis
-endif
-##} FRT_PENIS1 ifplugin Mail::SpamAssassin::Plugin::ReplaceTags
-
-##{ FRT_PRICE ifplugin Mail::SpamAssassin::Plugin::ReplaceTags
-
-ifplugin Mail::SpamAssassin::Plugin::ReplaceTags
-body     FRT_PRICE              /<inter SP2><post P2>\b(?!price)<P><R><IX><C><E>\b/i
-describe FRT_PRICE              ReplaceTags: Price
-endif
-##} FRT_PRICE ifplugin Mail::SpamAssassin::Plugin::ReplaceTags
-
-##{ FRT_ROLEX ifplugin Mail::SpamAssassin::Plugin::ReplaceTags
-
-ifplugin Mail::SpamAssassin::Plugin::ReplaceTags
-body     FRT_ROLEX              /<inter SP2><post P2>\b(?!rolex)<R><O><L><E><X>/i
-describe FRT_ROLEX              ReplaceTags: Rolex
-endif
-##} FRT_ROLEX ifplugin Mail::SpamAssassin::Plugin::ReplaceTags
-
-##{ FR_3TAG_3TAG
-
-rawbody  FR_3TAG_3TAG           m'<[abcefghijklmnoqstuvwxz]{3}></[abcefghijklmnoqstuvwxz]{3}>'i
-describe FR_3TAG_3TAG           Looks like 3 <e> small tags.
-##} FR_3TAG_3TAG
-
-##{ FR_ALMOST_VIAG2
-
-rawbody  FR_ALMOST_VIAG2        /[^a-z](?!viagra)v?ia.?g.?ra/i
-describe FR_ALMOST_VIAG2        Almost looks like viagra.
-##} FR_ALMOST_VIAG2
-
-##{ FR_MIDER
-
-rawbody  FR_MIDER               m'http[^ ]{5,30}/gall?/'
-describe FR_MIDER               Sign often seen in spams
-##} FR_MIDER
-
-##{ FR_TITLE_NUMS
-
-rawbody  FR_TITLE_NUMS          m'<title>\d+</title>'i
-describe FR_TITLE_NUMS          HTML Title is only numbers
-##} FR_TITLE_NUMS
+meta        FROM_MISSP_XPRIO   (__XPRIO && __FROM_MISSPACED) && !__LYRIS_EZLM_REMAILER 
+describe    FROM_MISSP_XPRIO   Misspaced FROM + X-Priority
+#score       FROM_MISSP_XPRIO   2.500   # limit
+##} FROM_MISSP_XPRIO
+
+##{ FROM_WORDY
+
+meta       FROM_WORDY                  ((__FROM_WORDY_SONLY || __FROM_WORDY_3) && !__HTML_LENGTH_0000_1024) && !__HAS_TNEF && !__USING_VERP1 && !__HDRS_LCASE_KNOWN 
+describe   FROM_WORDY                  From address looks like a sentence
+#score      FROM_WORDY                  2.500	# limit
+tflags     FROM_WORDY                  publish
+##} FROM_WORDY
+
+##{ FROM_WORDY_SHORT
+
+meta       FROM_WORDY_SHORT            ((__FROM_WORDY_SONLY || __FROM_WORDY_3) && __HTML_LENGTH_0000_1024) && !__HAS_TNEF && !__USING_VERP1 
+describe   FROM_WORDY_SHORT            From address looks like a sentence + short message
+#score      FROM_WORDY_SHORT            2.500	# limit
+tflags     FROM_WORDY_SHORT            publish
+##} FROM_WORDY_SHORT
+
+##{ FROM_WSP_TRAIL
+
+header   FROM_WSP_TRAIL	From:raw =~ /< [^>]* \s > [^<>]* \z/xm
+describe FROM_WSP_TRAIL	Trailing whitespace before '>' in From header field
+##} FROM_WSP_TRAIL
 
 ##{ FSL_CTYPE_WIN1251
 
@@ -783,32 +781,16 @@
 describe FSL_CTYPE_WIN1251   Content-Type only seen in 419 spam
 ##} FSL_CTYPE_WIN1251
 
-##{ FSL_FAKE_GMAIL_RCVD
-
-header  FSL_FAKE_GMAIL_RCVD     X-Spam-Relays-External =~ /gmail-smtp-in\.l\.google\.com/
-##} FSL_FAKE_GMAIL_RCVD
-
 ##{ FSL_FAKE_HOTMAIL_RVCD
 
 header  FSL_FAKE_HOTMAIL_RVCD   X-Spam-Relays-External =~ /mx[1234]\.hotmail\.com/
 ##} FSL_FAKE_HOTMAIL_RVCD
 
-##{ FSL_GEO_ABUSE
-
-uri FSL_GEO_ABUSE /\/geocities\.com\/\S+$/
-##} FSL_GEO_ABUSE
-
 ##{ FSL_HELO_BARE_IP_1
 
-meta    FSL_HELO_BARE_IP_1        __FSL_HELO_BARE_IP_1 && !FSL_HELO_BARE_IP_2
+meta    FSL_HELO_BARE_IP_1        __FSL_HELO_BARE_IP_1 && !ALL_TRUSTED
 ##} FSL_HELO_BARE_IP_1
 
-##{ FSL_HELO_BARE_IP_2
-
-meta    FSL_HELO_BARE_IP_2      __FSL_HELO_BARE_IP_2 && !__VIA_ML && !__HAS_ERRORS_TO
-#score   FSL_HELO_BARE_IP_2      2.000
-##} FSL_HELO_BARE_IP_2
-
 ##{ FSL_HELO_DEVICE
 
 header  FSL_HELO_DEVICE         X-Spam-Relays-External =~ /\bhelo=(?:(?:dsl)?device|speedtouch)\.lan\b/i
@@ -819,11 +801,6 @@
 header  FSL_HELO_FAKE           X-Spam-Relays-External =~ /\bhelo=(?:yandex.ru|(?:hotmail|gmail|google|yahoo|msn|microsoft)\.com)\b/i
 ##} FSL_HELO_FAKE
 
-##{ FSL_HELO_FIREWALL
-
-header  FSL_HELO_FIREWALL       X-Spam-Relays-External =~ /\bhelo=\S+\.firewall\b/i
-##} FSL_HELO_FIREWALL
-
 ##{ FSL_HELO_NON_FQDN_1
 
 header  FSL_HELO_NON_FQDN_1     X-Spam-Relays-External =~ /^[^\]]+ helo=[a-zA-Z0-9-_]+ /i
@@ -839,244 +816,148 @@
 uri FSL_INTERIA_ABUSE /\/\S+\.(?:w|eu|fm)\.interia\.pl/
 ##} FSL_INTERIA_ABUSE
 
-##{ FSL_MID_419
-
-header   FSL_MID_419   MESSAGE-ID =~ /\@User>$/
-describe FSL_MID_419   Spam signature in Message-ID
-##} FSL_MID_419
-
-##{ FSL_MISSP_REPLYTO
-
-meta     FSL_MISSP_REPLYTO   (__FROM_MISSPACED && __HAS_REPLY_TO)
-describe FSL_MISSP_REPLYTO   Mis-spaced from and Reply-to
-##} FSL_MISSP_REPLYTO
-
 ##{ FSL_NEW_HELO_USER
 
 meta    FSL_NEW_HELO_USER   (__FSL_HELO_USER_1 || __FSL_HELO_USER_2 || __FSL_HELO_USER_3)
+describe  FSL_NEW_HELO_USER Spam's using Helo and User
+#score   FSL_NEW_HELO_USER   2.0
+tflags  FSL_NEW_HELO_USER   publish
 ##} FSL_NEW_HELO_USER
 
-##{ FSL_YG_ABUSE
-
-uri FSL_YG_ABUSE /\/groups\.yahoo\.com\/group\/\S+\/message\/1$/
-##} FSL_YG_ABUSE
-
-##{ FS_ABIGGER
-
-header   FS_ABIGGER     Subject =~ /a bigger/i
-describe FS_ABIGGER     Subject has "a bigger"
-##} FS_ABIGGER
-
-##{ FS_APPROVE_YOU
-
-header   FS_APPROVE_YOU         Subject =~ /approve you/i
-describe FS_APPROVE_YOU         Subject says approve you
-##} FS_APPROVE_YOU
-
-##{ FS_AT_NO_COST
-
-header   FS_AT_NO_COST          Subject =~ /\bat no cost/i
-describe FS_AT_NO_COST          Subject says "At No Cost"
-##} FS_AT_NO_COST
-
-##{ FS_CHEAP_CAP
-
-header   FS_CHEAP_CAP           Subject =~ /CHEAP/
-describe FS_CHEAP_CAP           Phrase: Cheap in Caps in Subject.
-##} FS_CHEAP_CAP
-
-##{ FS_DOLLAR_BONUS
-
-header   FS_DOLLAR_BONUS        Subject =~ /\$\d\d\d?\.?\d?\d? bonus/i
-describe FS_DOLLAR_BONUS        Subject talks about money bonus!
-##} FS_DOLLAR_BONUS
-
-##{ FS_EJACULA
-
-header   FS_EJACULA             Subject =~ /ejaculat(?:[io01][o0i1]n|e)/i
-describe FS_EJACULA             Phrase: ejaculation in subject.
-##} FS_EJACULA
-
-##{ FS_ERECTION
-
-header   FS_ERECTION            Subject =~ / erection /i
-describe FS_ERECTION            Phrase: erection in subject.
-##} FS_ERECTION
-
-##{ FS_HUGECOCK
-
-header   FS_HUGECOCK            Subject =~ /(?:huge|tiny|small) (?:c[o0]ck|d[i1]ck|p[e3]n[1i]s)/i
-describe FS_HUGECOCK            Phrase: Huge Cock
-##} FS_HUGECOCK
-
-##{ FS_LARGE_PERCENT2
-
-header   FS_LARGE_PERCENT2      Subject =~ /(?!100%)\d[0-9oi][0-9oi]%/i
-describe FS_LARGE_PERCENT2      Larger than 100% in subj.
-##} FS_LARGE_PERCENT2
-
-##{ FS_LOW_RATES
-
-header   FS_LOW_RATES           Subject =~ / low rates/i
-describe FS_LOW_RATES           Subject says low rates
-##} FS_LOW_RATES
-
-##{ FS_NEW_SOFT_UPLOAD
-
-header   FS_NEW_SOFT_UPLOAD     Subject =~ /^New software uploaded by/
-describe FS_NEW_SOFT_UPLOAD     Subj starts with New software uploaded
-##} FS_NEW_SOFT_UPLOAD
-
-##{ FS_NEW_XXX
-
-header   FS_NEW_XXX             Subject =~ /^Re: news? [a-z]{1,5}$/
-describe FS_NEW_XXX             Subject looks like Fharmacy spams.
-##} FS_NEW_XXX
-
-##{ FS_NO_SCRIP
-
-header   FS_NO_SCRIP            Subject =~ /n[o0O] p[reRE][erER]scr[i1I]pt[i1I][o0O]n/i
-describe FS_NO_SCRIP            Subject almost says No prescription
-##} FS_NO_SCRIP
-
-##{ FS_NUDE
-
-header   FS_NUDE                Subject =~ /\bnude\b/i
-describe FS_NUDE                Subject says Nude
-##} FS_NUDE
-
-##{ FS_OBFU_PRMCY
+##{ FUZZY_ANDROID ifplugin Mail::SpamAssassin::Plugin::ReplaceTags
 
-header   FS_OBFU_PRMCY          Subject =~ /\b(?!(?:pharmacy|primacy))p[ph]{0,4}\S{1,3}r\S{0,2}m\S{0,3}c\S{0,2}y\b/i
-describe FS_OBFU_PRMCY          what could this word be?
-##} FS_OBFU_PRMCY
-
-##{ FS_PERSCRIPTION
-
-header   FS_PERSCRIPTION        Subject =~ /perscr[i1]pt[i1][o0]n/i
-describe FS_PERSCRIPTION        Subject mis-spelled prescription
-##} FS_PERSCRIPTION
-
-##{ FS_PHARMASUB2
-
-header   FS_PHARMASUB2          Subject =~ /PH[A-Za-z]{2,7}MA/
-describe FS_PHARMASUB2          Looks like Phramacy subject.
-##} FS_PHARMASUB2
-
-##{ FS_RAMROD
-
-header   FS_RAMROD              Subject =~ /ramrod/i
-describe FS_RAMROD              Subject says Ramrod
-##} FS_RAMROD
-
-##{ FS_RE_APPROV
-
-header   FS_RE_APPROV           Subject =~ /re approved/i
-describe FS_RE_APPROV           Phrase: re approved
-##} FS_RE_APPROV
-
-##{ FS_START_DOYOU2
-
-header   FS_START_DOYOU2        Subject =~ /^Do you (?:dream|have|want|love|like|wanna)/i
-describe FS_START_DOYOU2        Subject starts with Do you dream,have,want,love, etc.
-##} FS_START_DOYOU2
+ifplugin Mail::SpamAssassin::Plugin::ReplaceTags
+  body          FUZZY_ANDROID       /<A>(?!ndroid)<N><D><R><O><I><D>/i
+  describe      FUZZY_ANDROID       Obfuscated "android"
+  tflags        FUZZY_ANDROID       publish
+endif
+##} FUZZY_ANDROID ifplugin Mail::SpamAssassin::Plugin::ReplaceTags
 
-##{ FS_START_LOSE
+##{ FUZZY_BITCOIN ifplugin Mail::SpamAssassin::Plugin::ReplaceTags
 
-header   FS_START_LOSE          Subject =~ /^Lose /i
-describe FS_START_LOSE          Subject starts with Lose
-##} FS_START_LOSE
+ifplugin Mail::SpamAssassin::Plugin::ReplaceTags
+  body          FUZZY_BITCOIN       /<B>(?!itcoin)<I><T><C><O><I><N>/i
+  describe      FUZZY_BITCOIN       Obfuscated "Bitcoin"
+  tflags        FUZZY_BITCOIN       publish
+endif
+##} FUZZY_BITCOIN ifplugin Mail::SpamAssassin::Plugin::ReplaceTags
 
-##{ FS_TEEN_BAD
+##{ FUZZY_BROWSER ifplugin Mail::SpamAssassin::Plugin::ReplaceTags
 
-header   FS_TEEN_BAD            Subject =~ /teen.{1,15}(?:pussy|sex|slut|ass|fuck|rape)/i
-describe FS_TEEN_BAD            Subject says something bad about teens
-##} FS_TEEN_BAD
+ifplugin Mail::SpamAssassin::Plugin::ReplaceTags
+  body          FUZZY_BROWSER       /<B>(?!rowser)<R><O><W><S><E><R>/i
+  describe      FUZZY_BROWSER       Obfuscated "browser"
+  tflags        FUZZY_BROWSER       publish
+endif
+##} FUZZY_BROWSER ifplugin Mail::SpamAssassin::Plugin::ReplaceTags
 
-##{ FS_TIP_DDD
+##{ FUZZY_BTC_WALLET ifplugin Mail::SpamAssassin::Plugin::ReplaceTags
 
-header   FS_TIP_DDD             Subject =~ /(?:tip|good) \d\d\d?\d?/i
-describe FS_TIP_DDD             Phrase: subject = tip ddd
-##} FS_TIP_DDD
+ifplugin Mail::SpamAssassin::Plugin::ReplaceTags
+  meta          FUZZY_BTC_WALLET    FUZZY_BITCOIN && FUZZY_WALLET
+  describe      FUZZY_BTC_WALLET    Heavily obfuscated "bitcoin wallet"
+  tflags        FUZZY_BTC_WALLET    publish
+endif
+##} FUZZY_BTC_WALLET ifplugin Mail::SpamAssassin::Plugin::ReplaceTags
 
-##{ FS_WEIGHT_LOSS
+##{ FUZZY_CLICK_HERE ifplugin Mail::SpamAssassin::Plugin::ReplaceTags
 
-header   FS_WEIGHT_LOSS         Subject =~ /weight loss/i
-describe FS_WEIGHT_LOSS         Subject says Weight Loss
-##} FS_WEIGHT_LOSS
+ifplugin Mail::SpamAssassin::Plugin::ReplaceTags
+  body          FUZZY_CLICK_HERE    /<C>(?!lick(?:\s|&nbsp;)here)<WS>*<L><WS>*<I><WS>*<C><WS>*<K><WS>+<H><WS>*<E><WS>*<R><WS>*<E>/i
+  describe      FUZZY_CLICK_HERE    Obfuscated "click here"
+  tflags        FUZZY_CLICK_HERE    publish
+endif
+##} FUZZY_CLICK_HERE ifplugin Mail::SpamAssassin::Plugin::ReplaceTags
 
-##{ FS_WILL_HELP
+##{ FUZZY_DR_OZ ifplugin Mail::SpamAssassin::Plugin::ReplaceTags
 
-header   FS_WILL_HELP           Subject =~ /will help/
-describe FS_WILL_HELP           Subject says will help
-##} FS_WILL_HELP
+ifplugin Mail::SpamAssassin::Plugin::ReplaceTags
+  meta          FUZZY_DR_OZ         __FUZZY_DR_OZ && !__VIA_ML && !__DKIM_EXISTS && !__RP_MATCHES_RCVD 
+  describe      FUZZY_DR_OZ         Obfuscated Doctor Oz
+  tflags        FUZZY_DR_OZ         publish
+endif
+##} FUZZY_DR_OZ ifplugin Mail::SpamAssassin::Plugin::ReplaceTags
 
-##{ FS_WITH_SMALL
+##{ FUZZY_IMPORTANT ifplugin Mail::SpamAssassin::Plugin::ReplaceTags
 
-header   FS_WITH_SMALL          Subject =~ /with (?:\w+\s)?(?:small|short)/i
-describe FS_WITH_SMALL          Subject says With ... small
-##} FS_WITH_SMALL
+ifplugin Mail::SpamAssassin::Plugin::ReplaceTags
+  body          FUZZY_IMPORTANT     /<I>(?!mportant)<M><P><O><R><T><A><N><T>/i
+  describe      FUZZY_IMPORTANT     Obfuscated "important"
+  tflags        FUZZY_IMPORTANT     publish
+endif
+##} FUZZY_IMPORTANT ifplugin Mail::SpamAssassin::Plugin::ReplaceTags
 
 ##{ FUZZY_MERIDIA ifplugin Mail::SpamAssassin::Plugin::ReplaceTags
 
 ifplugin Mail::SpamAssassin::Plugin::ReplaceTags
 body FUZZY_MERIDIA      /<inter W3><post P2>\b(?!meridia)<M><E><R><I><D><I><A>\b/i
+describe FUZZY_MERIDIA  Obfuscation of the word "meridia"
 endif
 ##} FUZZY_MERIDIA ifplugin Mail::SpamAssassin::Plugin::ReplaceTags
 
-##{ FU_COMMON_SUBS2
-
-uri      FU_COMMON_SUBS2        m'/(?:[2w]m|7d|b|ee|lj|j|o|u)/[,.]?$'
-describe FU_COMMON_SUBS2        Sub-dir seen often in spam (2).
-##} FU_COMMON_SUBS2
-
-##{ FU_ENDS_NUMS_DOTS_CLK
-
-uri      FU_ENDS_NUMS_DOTS_CLK  m'(?:clk|uns)/\d+\.\d+\.\d+'i
-describe FU_ENDS_NUMS_DOTS_CLK  Ends with clk/d+.d+.d+
-##} FU_ENDS_NUMS_DOTS_CLK
+##{ FUZZY_PRIVACY ifplugin Mail::SpamAssassin::Plugin::ReplaceTags
 
-##{ FU_ENDS_SG
-
-uri      FU_ENDS_SG             m'/sg$'i
-describe FU_ENDS_SG             URL ends with /sg
-##} FU_ENDS_SG
+ifplugin Mail::SpamAssassin::Plugin::ReplaceTags
+  body          FUZZY_PRIVACY       /<P>(?!rivacy)<R><I><V><A><C><Y>/i
+  describe      FUZZY_PRIVACY       Obfuscated "privacy"
+  tflags        FUZZY_PRIVACY       publish
+endif
+##} FUZZY_PRIVACY ifplugin Mail::SpamAssassin::Plugin::ReplaceTags
 
-##{ FU_END_ET
+##{ FUZZY_PROMOTION ifplugin Mail::SpamAssassin::Plugin::ReplaceTags
 
-uri      FU_END_ET              m'/et/$'i
-describe FU_END_ET              ET Phone Home?
-##} FU_END_ET
+ifplugin Mail::SpamAssassin::Plugin::ReplaceTags
+  body          FUZZY_PROMOTION     /<P>(?!romotion)<R><O><M><O><T><I><O><N>/i
+  describe      FUZZY_PROMOTION     Obfuscated "promotion"
+  tflags        FUZZY_PROMOTION     publish
+endif
+##} FUZZY_PROMOTION ifplugin Mail::SpamAssassin::Plugin::ReplaceTags
 
-##{ FU_HOODIA
+##{ FUZZY_SAVINGS ifplugin Mail::SpamAssassin::Plugin::ReplaceTags
 
-uri      FU_HOODIA              /hoodia/i
-describe FU_HOODIA              URL has hoodia in it.
-##} FU_HOODIA
+ifplugin Mail::SpamAssassin::Plugin::ReplaceTags
+  body          FUZZY_SAVINGS       /<S>(?!avings)<A><V><I><N><G><S>/i
+  describe      FUZZY_SAVINGS       Obfuscated "savings"
+  tflags        FUZZY_SAVINGS       publish
+endif
+##} FUZZY_SAVINGS ifplugin Mail::SpamAssassin::Plugin::ReplaceTags
 
-##{ FU_LONG_QUERY3
+##{ FUZZY_SECURITY ifplugin Mail::SpamAssassin::Plugin::ReplaceTags
 
-uri      FU_LONG_QUERY3         m'[A-F0-9]{30}\.aspx'
-describe FU_LONG_QUERY3         URL has a long file name with .aspx extension.
-##} FU_LONG_QUERY3
+ifplugin Mail::SpamAssassin::Plugin::ReplaceTags
+  body          FUZZY_SECURITY      /<S>(?!ecurity)(?!eguridad)<E>(?:<C>|<G>)<U><R><I>(?:<T><Y>|<D><A><D>)/i
+  describe      FUZZY_SECURITY      Obfuscated "security"
+  tflags        FUZZY_SECURITY      publish
+endif
+##} FUZZY_SECURITY ifplugin Mail::SpamAssassin::Plugin::ReplaceTags
 
-##{ FU_MIDER
+##{ FUZZY_UNSUBSCRIBE ifplugin Mail::SpamAssassin::Plugin::ReplaceTags
 
-uri      FU_MIDER               m'/gall?/'
-describe FU_MIDER               URL has /gal/
-##} FU_MIDER
+ifplugin Mail::SpamAssassin::Plugin::ReplaceTags
+  body          FUZZY_UNSUBSCRIBE   /<U>(?!nsubscribe)<N><S><U><B><S><C><R><I><B><E>/i
+  describe      FUZZY_UNSUBSCRIBE   Obfuscated "unsubscribe"
+  tflags        FUZZY_UNSUBSCRIBE   publish
+endif
+##} FUZZY_UNSUBSCRIBE ifplugin Mail::SpamAssassin::Plugin::ReplaceTags
 
-##{ FU_UKGEOCITIES
+##{ FUZZY_WALLET ifplugin Mail::SpamAssassin::Plugin::ReplaceTags
 
-uri      FU_UKGEOCITIES         /\b[a-z]{2}\.geocities\.com/i
-describe FU_UKGEOCITIES         URL with [a-z]{2}.geocities.com
-##} FU_UKGEOCITIES
+ifplugin Mail::SpamAssassin::Plugin::ReplaceTags
+  body          FUZZY_WALLET        /<W>(?!allet)<A><L><L><E><T>/i
+  describe      FUZZY_WALLET        Obfuscated "Wallet"
+  tflags        FUZZY_WALLET        publish
+endif
+##} FUZZY_WALLET ifplugin Mail::SpamAssassin::Plugin::ReplaceTags
 
-##{ FU_URI_TRACKER_T
+##{ GAPPY_SALES_LEADS_FREEM if can(Mail::SpamAssassin::Conf::feature_bug6558_free)
 
-uri      FU_URI_TRACKER_T       m'/[yi]/(?:sp|et|vm|xl2)/'i
-describe FU_URI_TRACKER_T       URI style tracker (T)
-##} FU_URI_TRACKER_T
+if can(Mail::SpamAssassin::Conf::feature_bug6558_free)
+  meta       GAPPY_SALES_LEADS_FREEM     __GAPPY_SALES_LEADS_MANY && (__REPTO_CHN_FREEM || __freemail_hdr_replyto)
+  describe   GAPPY_SALES_LEADS_FREEM     Obfuscated marketing text, freemail or CHN replyto
+#  score      GAPPY_SALES_LEADS_FREEM     3.500	# limit
+  tflags     GAPPY_SALES_LEADS_FREEM     publish
+endif
+##} GAPPY_SALES_LEADS_FREEM if can(Mail::SpamAssassin::Conf::feature_bug6558_free)
 
 ##{ GEO_QUERY_STRING
 
@@ -1086,19 +967,41 @@
 ##{ GOOGLE_DOCS_PHISH
 
 meta        GOOGLE_DOCS_PHISH    (__GOOGLE_DOCS_PHISH_1 || __GOOGLE_DOCS_PHISH_2)
-describe    GOOGLE_DOCS_PHISH    E-mail account phishing via a Google Docs form
-#score       GOOGLE_DOCS_PHISH    4.00	# limit
-tflags      GOOGLE_DOCS_PHISH    publish	# Force publication - great S/O, hits only <= 6 points
+describe    GOOGLE_DOCS_PHISH    Possible phishing via a Google Docs form
+#score       GOOGLE_DOCS_PHISH    3.00	# limit
+tflags      GOOGLE_DOCS_PHISH    publish
 ##} GOOGLE_DOCS_PHISH
 
 ##{ GOOGLE_DOCS_PHISH_MANY
 
-meta        GOOGLE_DOCS_PHISH_MANY  __URI_GOOGLE_DOC && __EMAIL_PHISH_MANY
-describe    GOOGLE_DOCS_PHISH_MANY  E-mail account phishing via a Google Docs form
-#score       GOOGLE_DOCS_PHISH_MANY  5.50	# limit
-tflags      GOOGLE_DOCS_PHISH_MANY  publish	# Force publication - great S/O, hits only <= 6 points
+meta        GOOGLE_DOCS_PHISH_MANY  __URI_GOOGLE_DOC && (__EMAIL_PHISH_MANY || __ACCT_PHISH_MANY)
+describe    GOOGLE_DOCS_PHISH_MANY  Phishing via a Google Docs form
+#score       GOOGLE_DOCS_PHISH_MANY  4.00	# limit
+tflags      GOOGLE_DOCS_PHISH_MANY  publish
 ##} GOOGLE_DOCS_PHISH_MANY
 
+##{ GOOG_MALWARE_DNLD
+
+meta      GOOG_MALWARE_DNLD             __GOOG_MALWARE_DNLD
+describe  GOOG_MALWARE_DNLD             File download via Google - Malware?
+#score     GOOG_MALWARE_DNLD             5.000   # limit
+tflags    GOOG_MALWARE_DNLD             publish
+##} GOOG_MALWARE_DNLD
+
+##{ GOOG_REDIR_SHORT
+
+meta      GOOG_REDIR_SHORT              __GOOG_REDIR && __LCL__KAM_BODY_LENGTH_LT_512 
+describe  GOOG_REDIR_SHORT              Google redirect to obscure spamvertised website + short message
+tflags    GOOG_REDIR_SHORT              publish
+##} GOOG_REDIR_SHORT
+
+##{ HDRS_MISSP
+
+meta           HDRS_MISSP            __HDRS_MISSP && !__TAG_EXISTS_HEAD && !__DKIM_EXISTS && !__RP_MATCHES_RCVD && !__NOT_SPOOFED && !__LCL__ENV_AND_HDR_FROM_MATCH 
+describe       HDRS_MISSP            Misspaced headers
+#score          HDRS_MISSP            2.000	# limit
+##} HDRS_MISSP
+
 ##{ HDR_ORDER_FTSDMCXX_001C
 
 meta HDR_ORDER_FTSDMCXX_001C  (__HDR_ORDER_FTSDMCXXXX && __MID_START_001C)
@@ -1111,6 +1014,22 @@
 describe HDR_ORDER_FTSDMCXX_BAT   Header order similar to spam (FTSDMCXX/boundary variant)
 ##} HDR_ORDER_FTSDMCXX_BAT
 
+##{ HDR_ORDER_FTSDMCXX_DIRECT
+
+meta       HDR_ORDER_FTSDMCXX_DIRECT  (__HDR_ORDER_FTSDMCXXXX && __DOS_SINGLE_EXT_RELAY) && !ALL_TRUSTED && !__VIA_ML
+describe   HDR_ORDER_FTSDMCXX_DIRECT  Header order similar to spam (FTSDMCXX/boundary variant) + direct-to-MX
+#score      HDR_ORDER_FTSDMCXX_DIRECT  2.000	# limit
+tflags     HDR_ORDER_FTSDMCXX_DIRECT  publish
+##} HDR_ORDER_FTSDMCXX_DIRECT
+
+##{ HDR_ORDER_FTSDMCXX_NORDNS
+
+meta       HDR_ORDER_FTSDMCXX_NORDNS  (__HDR_ORDER_FTSDMCXXXX && __RDNS_NONE) && !ALL_TRUSTED
+describe   HDR_ORDER_FTSDMCXX_NORDNS  Header order similar to spam (FTSDMCXX/boundary variant) + no rDNS
+#score      HDR_ORDER_FTSDMCXX_NORDNS  3.500	# limit
+tflags     HDR_ORDER_FTSDMCXX_NORDNS  publish
+##} HDR_ORDER_FTSDMCXX_NORDNS
+
 ##{ HEADER_COUNT_SUBJECT ifplugin Mail::SpamAssassin::Plugin::HeaderEval
 
 ifplugin Mail::SpamAssassin::Plugin::HeaderEval
@@ -1119,6 +1038,20 @@
 endif
 ##} HEADER_COUNT_SUBJECT ifplugin Mail::SpamAssassin::Plugin::HeaderEval
 
+##{ HEADER_FROM_DIFFERENT_DOMAINS ifplugin Mail::SpamAssassin::Plugin::FreeMail ifplugin Mail::SpamAssassin::Plugin::HeaderEval if (version >= 3.004000)
+
+ifplugin Mail::SpamAssassin::Plugin::FreeMail
+  ifplugin Mail::SpamAssassin::Plugin::HeaderEval 
+    if (version >= 3.004000)
+      header   HEADER_FROM_DIFFERENT_DOMAINS eval:check_equal_from_domains()
+      describe HEADER_FROM_DIFFERENT_DOMAINS From and EnvelopeFrom 2nd level mail domains are different
+#      score    HEADER_FROM_DIFFERENT_DOMAINS 0.25
+      tflags   HEADER_FROM_DIFFERENT_DOMAINS publish
+endif
+endif
+endif
+##} HEADER_FROM_DIFFERENT_DOMAINS ifplugin Mail::SpamAssassin::Plugin::FreeMail ifplugin Mail::SpamAssassin::Plugin::HeaderEval if (version >= 3.004000)
+
 ##{ HELO_FRIEND
 
 header HELO_FRIEND  X-Spam-Relays-External =~ /^[^\]]+ helo=friend /i
@@ -1139,25 +1072,32 @@
 header HELO_LOCALHOST   X-Spam-Relays-External =~ /^[^\]]+ helo=localhost /i
 ##} HELO_LOCALHOST
 
+##{ HELO_MISC_IP
+
+meta     	HELO_MISC_IP          	(__HELO_MISC_IP && !HELO_DYNAMIC_IPADDR && !HELO_DYNAMIC_IPADDR2 && !HELO_DYNAMIC_SPLIT_IP && !HELO_DYNAMIC_HCC && !HELO_DYNAMIC_DIALIN && ((TVD_RCVD_IP4 + TVD_RCVD_IP + __FSL_HELO_BARE_IP_2) <2))
+describe	HELO_MISC_IP		Looking for more Dynamic IP Relays
+#score		HELO_MISC_IP		0.25
+##} HELO_MISC_IP
+
 ##{ HELO_OEM
 
 header HELO_OEM  X-Spam-Relays-External =~ /^[^\]]+ helo=(?:pc|oem\S*) /i
 ##} HELO_OEM
 
+##{ HEXHASH_WORD
+
+meta        HEXHASH_WORD       (__HEXHASHWORD_S2EU > 1) && !ALL_TRUSTED && !__DKIM_EXISTS && !__RP_MATCHES_RCVD && !__LCL__ENV_AND_HDR_FROM_MATCH && !__LYRIS_EZLM_REMAILER && !__THREADED && !__HDRS_LCASE && !__MSGID_HEXISH && !__RDNS_SHORT 
+describe    HEXHASH_WORD       Multiple instances of word + hexadecimal hash
+#score       HEXHASH_WORD       3.000	# limit
+tflags      HEXHASH_WORD       publish
+##} HEXHASH_WORD
+
 ##{ HK_LOTTO
 
 meta		HK_LOTTO		__HK_LOTTO_1 || __HK_LOTTO_2 || __HK_LOTTO_JACKPOT || __HK_LOTTO_STAATS || __HK_LOTTO_BALLOT
 #score		HK_LOTTO		1
 ##} HK_LOTTO
 
-##{ HK_NAME_DR ifplugin Mail::SpamAssassin::Plugin::FreeMail
-
-ifplugin Mail::SpamAssassin::Plugin::FreeMail
-meta		HK_NAME_DR		__HK_NAME_DR && !FREEMAIL_FROM
-#score           HK_NAME_DR	        1.0
-endif
-##} HK_NAME_DR ifplugin Mail::SpamAssassin::Plugin::FreeMail
-
 ##{ HK_NAME_DRUGS
 
 header		HK_NAME_DRUGS		From:name =~ /(viagra|\bcialis|cialis\b)/mi
@@ -1165,22 +1105,6 @@
 #score		HK_NAME_DRUGS		2
 ##} HK_NAME_DRUGS
 
-##{ HK_NAME_FM_DR ifplugin Mail::SpamAssassin::Plugin::FreeMail
-
-ifplugin Mail::SpamAssassin::Plugin::FreeMail
-meta		HK_NAME_FM_DR		__HK_NAME_DR && FREEMAIL_FROM
-#score           HK_NAME_FM_DR           1.5
-endif
-##} HK_NAME_FM_DR ifplugin Mail::SpamAssassin::Plugin::FreeMail
-
-##{ HK_NAME_FM_FROM ifplugin Mail::SpamAssassin::Plugin::FreeMail
-
-ifplugin Mail::SpamAssassin::Plugin::FreeMail
-meta		HK_NAME_FM_FROM		__HK_NAME_FROM && FREEMAIL_FROM
-#score           HK_NAME_FM_FROM         1.5
-endif
-##} HK_NAME_FM_FROM ifplugin Mail::SpamAssassin::Plugin::FreeMail
-
 ##{ HK_NAME_FM_MR_MRS ifplugin Mail::SpamAssassin::Plugin::FreeMail if (version >= 3.004000)
 
 ifplugin Mail::SpamAssassin::Plugin::FreeMail
@@ -1199,16 +1123,6 @@
 endif
 ##} HK_NAME_FROM ifplugin Mail::SpamAssassin::Plugin::FreeMail
 
-##{ HK_NAME_MR_MRS ifplugin Mail::SpamAssassin::Plugin::FreeMail if (version >= 3.004000)
-
-ifplugin Mail::SpamAssassin::Plugin::FreeMail
-if (version >= 3.004000)
-  meta            HK_NAME_MR_MRS          __HK_NAME_MR_MRS && !FREEMAIL_FROM
-#  score           HK_NAME_MR_MRS          1.0
-endif
-endif
-##} HK_NAME_MR_MRS ifplugin Mail::SpamAssassin::Plugin::FreeMail if (version >= 3.004000)
-
 ##{ HK_RANDOM_ENVFROM
 
 header		HK_RANDOM_ENVFROM	EnvelopeFrom =~ /^(?!(?:mail|bounce)[_.-]|[^@]*(?:[+=^~\#]|mcgr|kpmg|nlpbr|ndqv|lcgc|cplpr|-mailer@)|[^@]{20})[^@]*(?:[bcdfgjklmnpqrtvwxz]{5}|[aeiouy]{5}|([a-z]{1,2})(?:\1){3})/mi
@@ -1216,62 +1130,28 @@
 #score		HK_RANDOM_ENVFROM	1
 ##} HK_RANDOM_ENVFROM
 
-##{ HK_SCAM_N1
-
-body		HK_SCAM_N1		/\b(?:widow|son|daughter|husband|wife|brother|sister) of (?:the )?(?:late|sacked|dead|passed)\b/i
-##} HK_SCAM_N1
-
-##{ HK_SCAM_N13
-
-body		HK_SCAM_N13		/\b(?:business|important|discreet) transaction\b/i
-##} HK_SCAM_N13
-
-##{ HK_SCAM_N15
-
-body		HK_SCAM_N15		/\b(?:account (?:overseas?|offshore)|(?:overseas?|offshore) account)\b/i
-##} HK_SCAM_N15
-
 ##{ HK_SCAM_N2
 
 body		HK_SCAM_N2		/\bnext of kin\b/i
 ##} HK_SCAM_N2
 
-##{ HK_SCAM_N3
-
-body		HK_SCAM_N3		/\bdirect telephone numbers?\b/i
-##} HK_SCAM_N3
-
 ##{ HK_SCAM_N8
 
 body		HK_SCAM_N8		/\byour compensation\b/i
 ##} HK_SCAM_N8
 
-##{ HK_SCAM_S15
-
-body		HK_SCAM_S15		/(?:discovered a dormant account|can you be my partner)/i
-##} HK_SCAM_S15
-
-##{ HK_SCAM_S25
-
-body		HK_SCAM_S25		/\bbank (?:in|of) ghana/i
-##} HK_SCAM_S25
-
-##{ HK_SCAM_S4
-
-body		HK_SCAM_S4		/transfer (?:this|my|of )?funds?/i
-##} HK_SCAM_S4
-
 ##{ HK_SCAM_S7
 
 body		HK_SCAM_S7		/(?:(?:investment|proposed|lucrative) (?:business|venture)|(?:business|venture) (?:enterprise|propos(?:al|ition)))/i
 ##} HK_SCAM_S7
 
-##{ HK_SPAMMY_FILENAME ifplugin Mail::SpamAssassin::Plugin::MIMEHeader
+##{ HTML_OFF_PAGE
 
-ifplugin Mail::SpamAssassin::Plugin::MIMEHeader
-meta		HK_SPAMMY_FILENAME	__HK_SPAMMY_CTFN || __HK_SPAMMY_CDFN
-endif
-##} HK_SPAMMY_FILENAME ifplugin Mail::SpamAssassin::Plugin::MIMEHeader
+meta        HTML_OFF_PAGE     __HTML_OFF_PAGE && !__RP_MATCHES_RCVD && !__LONGLINE && !__DKIM_EXISTS
+describe    HTML_OFF_PAGE     HTML element rendered well off the displayed page
+#score       HTML_OFF_PAGE     3.000	# limit
+tflags      HTML_OFF_PAGE     publish
+##} HTML_OFF_PAGE
 
 ##{ HTTPS_HTTP_MISMATCH ifplugin Mail::SpamAssassin::Plugin::HTTPSMismatch
 
@@ -1280,6 +1160,14 @@
 endif
 ##} HTTPS_HTTP_MISMATCH ifplugin Mail::SpamAssassin::Plugin::HTTPSMismatch
 
+##{ IMG_ONLY_FM_DOM_INFO
+
+meta       IMG_ONLY_FM_DOM_INFO       __HTML_IMG_ONLY && __FROM_DOM_INFO
+describe   IMG_ONLY_FM_DOM_INFO       HTML image-only message from .info domain
+#score      IMG_ONLY_FM_DOM_INFO       2.500	# limit
+tflags     IMG_ONLY_FM_DOM_INFO       publish
+##} IMG_ONLY_FM_DOM_INFO
+
 ##{ JM_I_FEEL_LUCKY
 
 uri JM_I_FEEL_LUCKY         /(?:\&|\?)btnI=ec(?:$|\&)/
@@ -1337,17 +1225,50 @@
 header  KB_RATWARE_OUTLOOK_MID  ALL =~ /^Message-Id: <....([0-9a-f]{8})\$([0-9a-f]{8})\$[0-9a-f]{8}\@.{100,400}boundary="----=_NextPart_000_...._\1\.\2"/msi
 ##} KB_RATWARE_OUTLOOK_MID
 
-##{ KHOP_BIG_TO_CC
+##{ KHOP_DYNAMIC
 
-header	 KHOP_BIG_TO_CC      ToCc =~ /(?:[^,\@]{1,60}\@[^,]{4,25},){10}/
-describe KHOP_BIG_TO_CC      Sent to 10+ recipients instaed of Bcc or a list
-##} KHOP_BIG_TO_CC
+meta	 KHOP_DYNAMIC	__LAST_EXTERNAL_RELAY_NO_AUTH && !ALL_TRUSTED && (__5_SUBDOM || __RDNS_HEX || __S25R_4 || __S25R_6 || __RCD_RDNS_DYN_MESSY || __RCD_RDNS_PPP_MESSY || __RCD_RDNS_PPOE_MESSY) && !__RCD_RDNS_MAIL_MESSY
+describe KHOP_DYNAMIC	Relay looks like a dynamic address
+#score	 KHOP_DYNAMIC	2.0
+##} KHOP_DYNAMIC
+
+##{ LIST_PRTL_PUMPDUMP
+
+meta        LIST_PRTL_PUMPDUMP     __LIST_PRTL_PUMPDUMP && !__DKIM_EXISTS 
+describe    LIST_PRTL_PUMPDUMP     Incomplete List-* headers and stock pump-and-dump
+#score       LIST_PRTL_PUMPDUMP     2.000   # limit
+tflags      LIST_PRTL_PUMPDUMP     publish
+##} LIST_PRTL_PUMPDUMP
+
+##{ LIST_PRTL_SAME_USER
+
+meta        LIST_PRTL_SAME_USER    __LIST_PRTL_SAME_USER && !__BUGGED_IMG && !__DKIM_EXISTS && !__RP_MATCHES_RCVD && !__HAS_ERRORS_TO 
+describe    LIST_PRTL_SAME_USER    Incomplete List-* headers and from+to user the same
+#score       LIST_PRTL_SAME_USER    3.000   # limit
+tflags      LIST_PRTL_SAME_USER    publish
+##} LIST_PRTL_SAME_USER
 
 ##{ LIVEFILESTORE
 
 uri  LIVEFILESTORE       m~livefilestore.com/~
 ##} LIVEFILESTORE
 
+##{ LONG_HEX_URI
+
+meta        LONG_HEX_URI      __128_HEX_URI && !__LCL__KAM_BODY_LENGTH_LT_1024
+describe    LONG_HEX_URI      Very long purely hexadecimal URI
+#score       LONG_HEX_URI      3.000	# limit
+tflags      LONG_HEX_URI      publish
+##} LONG_HEX_URI
+
+##{ LONG_IMG_URI
+
+meta        LONG_IMG_URI        __45_ALNUM_IMG && !ALL_TRUSTED && !__HAS_ERRORS_TO 
+describe    LONG_IMG_URI        Image URI with very long path component - web bug?
+#score       LONG_IMG_URI        3.000	# limit
+tflags      LONG_IMG_URI        publish
+##} LONG_IMG_URI
+
 ##{ LONG_TERM_PRICE
 
 body LONG_TERM_PRICE  /long\W+term\W+(target|projected)(\W+price)?/i
@@ -1362,7 +1283,7 @@
 ##{ LOTS_OF_MONEY ifplugin Mail::SpamAssassin::Plugin::ReplaceTags
 
 ifplugin Mail::SpamAssassin::Plugin::ReplaceTags
-  meta     LOTS_OF_MONEY    (__LOTSA_MONEY_00 || __LOTSA_MONEY_01 || __LOTSA_MONEY_02 || __LOTSA_MONEY_03 || __LOTSA_MONEY_04 || __LOTSA_MONEY_05)
+  meta     LOTS_OF_MONEY    (__LOTSA_MONEY_00 || __LOTSA_MONEY_01 || __LOTSA_MONEY_02 || __LOTSA_MONEY_03 || __LOTSA_MONEY_04 || __LOTSA_MONEY_05) && !__TRAVEL_ITINERARY
   describe LOTS_OF_MONEY    Huge... sums of money
 #  score    LOTS_OF_MONEY    0.01
   tflags   LOTS_OF_MONEY    publish
@@ -1381,29 +1302,32 @@
 
 ##{ LOTTO_AGENT
 
-meta     LOTTO_AGENT      __LOTTO_AGENT_01 || __LOTTO_AGENT_02
+meta     LOTTO_AGENT      __LOTTO_AGENT && !__HAS_IN_REPLY_TO && !__THREADED && !__TO_YOUR_ORG && !__DKIM_EXISTS && !__TRAVEL_ITINERARY && !__AUTO_ACCIDENT && !__HAS_ERRORS_TO && !__RP_MATCHES_RCVD 
 describe LOTTO_AGENT      Claims Agent
-#score    LOTTO_AGENT      3.50		# limit
+#score    LOTTO_AGENT      1.50		# limit
 ##} LOTTO_AGENT
 
-##{ LOTTO_AGENT_RPLY
+##{ LUCRATIVE
 
-header   LOTTO_AGENT_RPLY Reply-To =~ /(?:claim(?:s|ing)?(?:[\s_.]processing)?|fiducia\w+|dispatch|reimbursement|payout|prize\stransfer|(?:international|foreign|win+ing)[\s_.]rem+it+ance)[\s_.]?(?:agent|manager|officer|secretary|director|department|dept)/i
-describe LOTTO_AGENT_RPLY Claims Agent
-##} LOTTO_AGENT_RPLY
-
-##{ LOTTO_DEPT
-
-meta     LOTTO_DEPT       __LOTTO_DEPT && !__COMMENT_EXISTS && !__HAS_IN_REPLY_TO && !__THREADED && !__VIA_ML
-describe LOTTO_DEPT       Claims Department
-#score    LOTTO_DEPT       2.00		# limit
-##} LOTTO_DEPT
+meta     LUCRATIVE        __LUCRATIVE && !ALL_TRUSTED && !__ANY_TEXT_ATTACH && !__REPLYTO_EXISTS && !__LCL__ENV_AND_HDR_FROM_MATCH 
+describe LUCRATIVE        Make lots of money!
+#score    LUCRATIVE        2.00	# limit
+tflags   LUCRATIVE        publish
+##} LUCRATIVE
 
 ##{ L_SPAM_TOOL_13
 
 header L_SPAM_TOOL_13   Date =~ /\s[+-]\d(?![2358]45)\d[124-9]\d$/
 ##} L_SPAM_TOOL_13
 
+##{ MALF_HTML_B64
+
+meta       MALF_HTML_B64               MIME_BASE64_TEXT && HTML_MIME_NO_HTML_TAG 
+describe   MALF_HTML_B64               Malformatted base64-encoded HTML content
+#score      MALF_HTML_B64               3.500	# limit
+tflags     MALF_HTML_B64               publish
+##} MALF_HTML_B64
+
 ##{ MANY_SPAN_IN_TEXT
 
 meta           MANY_SPAN_IN_TEXT   __MANY_SPAN_IN_TEXT && !__VIA_ML
@@ -1416,15 +1340,33 @@
 header MID_DEGREES  Message-ID =~ /^<\d{14}\.[A-F0-9]{10}\@[A-Z0-9]+>$/
 ##} MID_DEGREES
 
+##{ MIMEOLE_DIRECT_TO_MX
+
+meta       MIMEOLE_DIRECT_TO_MX        __MIMEOLE_DIRECT_TO_MX && !__ANY_IMAGE_ATTACH && !__DKIM_EXISTS 
+describe   MIMEOLE_DIRECT_TO_MX        MIMEOLE + direct-to-MX
+#score      MIMEOLE_DIRECT_TO_MX        2.000	# limit
+tflags     MIMEOLE_DIRECT_TO_MX        publish
+##} MIMEOLE_DIRECT_TO_MX
+
 ##{ MIME_BOUND_EQ_REL
 
 header MIME_BOUND_EQ_REL    Content-Type =~ /boundary="=====================_\d+==\.REL"/s
 ##} MIME_BOUND_EQ_REL
 
+##{ MIME_NO_TEXT ifplugin Mail::SpamAssassin::Plugin::MIMEHeader
+
+ifplugin Mail::SpamAssassin::Plugin::MIMEHeader
+  meta        MIME_NO_TEXT      __MIME_NO_TEXT && !__BOUNCE_CTYPE && !__CT_ENCRYPTED && !ALL_TRUSTED && !__MSGID_APPLEMAIL && !__USER_AGENT_APPLEMAIL && !__HAS_IN_REPLY_TO && !__HAS_X_REF && !__HS_SUBJ_RE_FW && !__LCL__ENV_AND_HDR_FROM_MATCH
+#  score       MIME_NO_TEXT      2.00	# limit
+  describe    MIME_NO_TEXT      No (properly identified) text body parts
+  tflags      MIME_NO_TEXT      publish
+endif
+##} MIME_NO_TEXT ifplugin Mail::SpamAssassin::Plugin::MIMEHeader
+
 ##{ MIME_PHP_NO_TEXT ifplugin Mail::SpamAssassin::Plugin::MIMEHeader
 
 ifplugin Mail::SpamAssassin::Plugin::MIMEHeader
-  meta        MIME_PHP_NO_TEXT  (T_MIME_NO_TEXT && __PHP_MUA)
+  meta        MIME_PHP_NO_TEXT  (MIME_NO_TEXT && __PHP_MUA)
   describe    MIME_PHP_NO_TEXT  No text body parts, X-Mailer: PHP
 endif
 ##} MIME_PHP_NO_TEXT ifplugin Mail::SpamAssassin::Plugin::MIMEHeader
@@ -1445,22 +1387,30 @@
 
 meta     MONEY_FORM_SHORT    __MONEY_FORM_SHORT && !__DOS_HAS_LIST_UNSUB && !__VIA_ML && !__HTML_LINK_IMAGE && !__UPPERCASE_URI && !__THREADED && !__COMMENT_EXISTS && !__TAG_EXISTS_CENTER && !__THREAD_INDEX_GOOD 
 describe MONEY_FORM_SHORT    Lots of money if you fill out a short form
+#score    MONEY_FORM_SHORT    2.500	# limit
 ##} MONEY_FORM_SHORT
 
 ##{ MONEY_FRAUD_3
 
-meta     MONEY_FRAUD_3    __MONEY_FRAUD_3 && !__COMMENT_EXISTS && !__TAG_EXISTS_CENTER && !__IS_EXCH && !__VIA_ML && !__HAS_THREAD_INDEX && !__UNSUB_LINK && !__DOS_HAS_LIST_UNSUB && !__HTML_LINK_IMAGE && !__THREADED && !__DOS_BODY_THU && !__URL_SHORTENER && !__TAG_EXISTS_STYLE
+meta     MONEY_FRAUD_3    (__MONEY_FRAUD_3 && !__MONEY_FRAUD_5 && !__MONEY_FRAUD_8 && !__ADVANCE_FEE_3_NEW_MONEY) && !__COMMENT_EXISTS && !__TAG_EXISTS_CENTER && !__IS_EXCH && !__VIA_ML && !__HAS_THREAD_INDEX && !__UNSUB_LINK && !__DOS_HAS_LIST_UNSUB && !__HTML_LINK_IMAGE && !__THREADED && !__DOS_BODY_THU && !__URL_SHORTENER && !__TAG_EXISTS_STYLE
 describe MONEY_FRAUD_3    Lots of money and several fraud phrases
 tflags   MONEY_FRAUD_3    publish
 ##} MONEY_FRAUD_3
 
 ##{ MONEY_FRAUD_5
 
-meta     MONEY_FRAUD_5    __MONEY_FRAUD_5 && !__VIA_ML && !__HAS_THREAD_INDEX && !__COMMENT_EXISTS && !__UNSUB_LINK && !__TAG_EXISTS_CENTER && !__URL_SHORTENER && !__TAG_EXISTS_STYLE
+meta     MONEY_FRAUD_5    (__MONEY_FRAUD_5 && !__MONEY_FRAUD_8 && !__ADVANCE_FEE_5_NEW_MONEY) && !__VIA_ML && !__HAS_THREAD_INDEX && !__COMMENT_EXISTS && !__UNSUB_LINK && !__TAG_EXISTS_CENTER && !__URL_SHORTENER && !__TAG_EXISTS_STYLE
 describe MONEY_FRAUD_5    Lots of money and many fraud phrases
 tflags   MONEY_FRAUD_5    publish
 ##} MONEY_FRAUD_5
 
+##{ MONEY_FRAUD_8
+
+meta     MONEY_FRAUD_8    __MONEY_FRAUD_8 && !__VIA_ML && !__HAS_THREAD_INDEX && !__BUGGED_IMG 
+describe MONEY_FRAUD_8    Lots of money and very many fraud phrases
+tflags   MONEY_FRAUD_8    publish
+##} MONEY_FRAUD_8
+
 ##{ MONEY_FROM_41
 
 meta            MONEY_FROM_41             __MONEY_FROM_41
@@ -1482,22 +1432,26 @@
 #score 		MSGID_MULTIPLE_AT	0.001
 ##} MSGID_MULTIPLE_AT
 
-##{ MSGID_NOFQDN1
+##{ MSM_PRIO_REPTO
 
-header   MSGID_NOFQDN1  Message-ID =~ /<[^\@]*>/m
-describe MSGID_NOFQDN1  Message-ID with no domain name
-##} MSGID_NOFQDN1
+meta       MSM_PRIO_REPTO              __MSM_PRIO_REPTO && !__ENV_AND_HDR_FROM_MATCH 
+describe   MSM_PRIO_REPTO              MSMail priority header + Reply-to + short subject
+#score      MSM_PRIO_REPTO              2.500	# limit
+tflags     MSM_PRIO_REPTO              publish
+##} MSM_PRIO_REPTO
 
 ##{ MSOE_MID_WRONG_CASE
 
 meta MSOE_MID_WRONG_CASE  (__XM_OUTLOOK_EXPRESS && __MSOE_MID_WRONG_CASE && !__MIMEOLE_1106)
 ##} MSOE_MID_WRONG_CASE
 
-##{ NSL_RCVD_FROM_USER
+##{ NO_FM_NAME_IP_HOSTN
 
-header         NSL_RCVD_FROM_USER       Received =~ /from User [\[\(]/
-describe       NSL_RCVD_FROM_USER       Received from User
-##} NSL_RCVD_FROM_USER
+meta       NO_FM_NAME_IP_HOSTN        (__KHOP_NO_FULL_NAME && __IP_IN_RELAY) && !__DOS_RELAYED_EXT 
+describe   NO_FM_NAME_IP_HOSTN        No From name + hostname using IP address
+#score      NO_FM_NAME_IP_HOSTN        2.500	# limit
+tflags     NO_FM_NAME_IP_HOSTN        publish
+##} NO_FM_NAME_IP_HOSTN
 
 ##{ NSL_RCVD_HELO_USER
 
@@ -1511,22 +1465,6 @@
 describe NULL_IN_BODY   Message has NUL (ASCII 0) byte in message
 ##} NULL_IN_BODY
 
-##{ OBFU_ATTACH_MISSP ifplugin Mail::SpamAssassin::Plugin::MIMEHeader
-
-ifplugin Mail::SpamAssassin::Plugin::MIMEHeader
-  meta         OBFU_ATTACH_MISSP   __FROM_RUNON && (OBFU_HTML_ATTACH || OBFU_TEXT_ATTACH || T_OBFU_DOC_ATTACH || T_OBFU_PDF_ATTACH || T_OBFU_JPG_ATTACH || T_OBFU_GIF_ATTACH)
-  describe     OBFU_ATTACH_MISSP   Obfuscated attachment type and misspaced From
-endif
-##} OBFU_ATTACH_MISSP ifplugin Mail::SpamAssassin::Plugin::MIMEHeader
-
-##{ OBFU_HTML_ATTACH ifplugin Mail::SpamAssassin::Plugin::MIMEHeader
-
-ifplugin Mail::SpamAssassin::Plugin::MIMEHeader
-  mimeheader   OBFU_HTML_ATTACH    Content-Type =~ m,\bapplication/octet-stream\b.+\.html?\b,i
-  describe     OBFU_HTML_ATTACH    HTML attachment with non-text MIME type
-endif
-##} OBFU_HTML_ATTACH ifplugin Mail::SpamAssassin::Plugin::MIMEHeader
-
 ##{ OBFU_JVSCR_ESC
 
 rawbody     OBFU_JVSCR_ESC         /document\.write\(unescape\("(?:%[0-9a-f]{2}){10}/i
@@ -1559,31 +1497,146 @@
 endif
 ##} PART_CID_STOCK_LESS ifplugin Mail::SpamAssassin::Plugin::MIMEHeader
 
+##{ PDS_FROM_2_EMAILS if can(Mail::SpamAssassin::Conf::perl_min_version_5010000)
+
+if can(Mail::SpamAssassin::Conf::perl_min_version_5010000)
+  meta       PDS_FROM_2_EMAILS        __PDS_FROM_2_EMAILS && !__VIA_ML && !__VIA_RESIGNER && !__CLICK_HERE && !__BUGGED_IMG && !__RP_MATCHES_RCVD 
+endif
+##} PDS_FROM_2_EMAILS if can(Mail::SpamAssassin::Conf::perl_min_version_5010000)
+
+##{ PHOTO_EDITING_FREEM if can(Mail::SpamAssassin::Conf::feature_bug6558_free)
+
+if can(Mail::SpamAssassin::Conf::feature_bug6558_free)
+  meta       PHOTO_EDITING_FREEM        __PHOTO_RETOUCHING > 4 && (__REPTO_CHN_FREEM || __freemail_hdr_replyto)
+  describe   PHOTO_EDITING_FREEM        Image editing service, freemail or CHN replyto
+#  score      PHOTO_EDITING_FREEM        3.750	# limit
+endif
+##} PHOTO_EDITING_FREEM if can(Mail::SpamAssassin::Conf::feature_bug6558_free)
+
 ##{ PHP_NOVER_MUA
 
-#score     PHP_NOVER_MUA       3.50	# limit
 describe  PHP_NOVER_MUA       Mail from PHP with no version number
+#score     PHP_NOVER_MUA       3.000	# limit
+tflags    PHP_NOVER_MUA       publish
 ##} PHP_NOVER_MUA
 
 ##{ PHP_NOVER_MUA if !plugin(Mail::SpamAssassin::Plugin::DKIM)
 
 if !plugin(Mail::SpamAssassin::Plugin::DKIM)
-  meta    PHP_NOVER_MUA       __PHP_NOVER_MUA && !__TO_NO_BRKTS_HTML_ONLY && !__MSGID_OK_DIGITS && !__UPPERCASE_25_50 && !__RP_MATCHES_RCVD && !__GIF_ATTACH 
+  meta    PHP_NOVER_MUA       __PHP_NOVER_MUA && !__TO_NO_BRKTS_HTML_ONLY && !__MSGID_OK_DIGITS && !__UPPERCASE_25_50 && !__RP_MATCHES_RCVD && !__GIF_ATTACH
 endif
 ##} PHP_NOVER_MUA if !plugin(Mail::SpamAssassin::Plugin::DKIM)
 
 ##{ PHP_NOVER_MUA ifplugin Mail::SpamAssassin::Plugin::DKIM
 
 ifplugin Mail::SpamAssassin::Plugin::DKIM
-  meta    PHP_NOVER_MUA       __PHP_NOVER_MUA && !__DKIM_DEPENDABLE && !__TO_NO_BRKTS_HTML_ONLY && !__MSGID_OK_DIGITS && !__UPPERCASE_25_50 && !__RP_MATCHES_RCVD && !__GIF_ATTACH 
+  meta    PHP_NOVER_MUA       __PHP_NOVER_MUA && !__DKIM_DEPENDABLE && !__TO_NO_BRKTS_HTML_ONLY && !__MSGID_OK_DIGITS && !__UPPERCASE_25_50 && !__RP_MATCHES_RCVD && !__GIF_ATTACH
 endif
 ##} PHP_NOVER_MUA ifplugin Mail::SpamAssassin::Plugin::DKIM
 
+##{ PHP_ORIG_SCRIPT
+
+meta       PHP_ORIG_SCRIPT             __PHP_ORIG_SCRIPT_SONLY && !ALL_TRUSTED && !__SUBSCRIPTION_INFO 
+describe   PHP_ORIG_SCRIPT             Sent by bot & other signs
+#score      PHP_ORIG_SCRIPT             2.500	# limit
+tflags     PHP_ORIG_SCRIPT             publish
+##} PHP_ORIG_SCRIPT
+
+##{ PHP_SCRIPT_MUA
+
+meta       PHP_SCRIPT_MUA              __HAS_PHP_SCRIPT && __PHP_NOVER_MUA 
+describe   PHP_SCRIPT_MUA              Sent by PHP script, no version number
+#score      PHP_SCRIPT_MUA              2.000	# limit
+tflags     PHP_SCRIPT_MUA              publish
+##} PHP_SCRIPT_MUA
+
+##{ PP_MIME_FAKE_ASCII_TEXT ifplugin Mail::SpamAssassin::Plugin::MIMEEval if can(Mail::SpamAssassin::Plugin::MIMEEval::has_check_for_ascii_text_illegal)
+
+ifplugin Mail::SpamAssassin::Plugin::MIMEEval
+  if can(Mail::SpamAssassin::Plugin::MIMEEval::has_check_for_ascii_text_illegal)
+    body     PP_MIME_FAKE_ASCII_TEXT  eval:check_for_ascii_text_illegal()
+    describe PP_MIME_FAKE_ASCII_TEXT  MIME text/plain claims to be ASCII but isn't
+#    score    PP_MIME_FAKE_ASCII_TEXT  1.0
+    tflags   PP_MIME_FAKE_ASCII_TEXT  publish
+endif
+endif
+##} PP_MIME_FAKE_ASCII_TEXT ifplugin Mail::SpamAssassin::Plugin::MIMEEval if can(Mail::SpamAssassin::Plugin::MIMEEval::has_check_for_ascii_text_illegal)
+
+##{ PP_TOO_MUCH_UNICODE02 ifplugin Mail::SpamAssassin::Plugin::MIMEEval if can(Mail::SpamAssassin::Plugin::MIMEEval::has_check_abundant_unicode_ratio)
+
+ifplugin Mail::SpamAssassin::Plugin::MIMEEval
+  if can(Mail::SpamAssassin::Plugin::MIMEEval::has_check_abundant_unicode_ratio)
+    body     PP_TOO_MUCH_UNICODE02      eval:check_abundant_unicode_ratio(0.02)
+    describe PP_TOO_MUCH_UNICODE02      Is text/plain but has many unicode escapes
+#    score    PP_TOO_MUCH_UNICODE02      0.5
+    tflags   PP_TOO_MUCH_UNICODE02      publish
+endif
+endif
+##} PP_TOO_MUCH_UNICODE02 ifplugin Mail::SpamAssassin::Plugin::MIMEEval if can(Mail::SpamAssassin::Plugin::MIMEEval::has_check_abundant_unicode_ratio)
+
+##{ PP_TOO_MUCH_UNICODE05 ifplugin Mail::SpamAssassin::Plugin::MIMEEval if can(Mail::SpamAssassin::Plugin::MIMEEval::has_check_abundant_unicode_ratio)
+
+ifplugin Mail::SpamAssassin::Plugin::MIMEEval
+  if can(Mail::SpamAssassin::Plugin::MIMEEval::has_check_abundant_unicode_ratio)
+    body     PP_TOO_MUCH_UNICODE05	eval:check_abundant_unicode_ratio(0.05)
+    describe PP_TOO_MUCH_UNICODE05	Is text/plain but has many unicode escapes
+#    score    PP_TOO_MUCH_UNICODE05	1.0
+    tflags   PP_TOO_MUCH_UNICODE05	publish
+endif
+endif
+##} PP_TOO_MUCH_UNICODE05 ifplugin Mail::SpamAssassin::Plugin::MIMEEval if can(Mail::SpamAssassin::Plugin::MIMEEval::has_check_abundant_unicode_ratio)
+
+##{ PUMPDUMP
+
+meta        PUMPDUMP          (__PUMPDUMP_01 || __PUMPDUMP_02 || __PUMPDUMP_03 || __PUMPDUMP_04 || __PUMPDUMP_05 || __PUMPDUMP_06 || __PUMPDUMP_07 || __PUMPDUMP_08 || __PUMPDUMP_09 || __PUMPDUMP_10) && !PUMPDUMP_MULTI
+describe    PUMPDUMP          Pump-and-dump stock scam phrase
+#score       PUMPDUMP          1.000	# limit
+tflags      PUMPDUMP          publish
+##} PUMPDUMP
+
+##{ PUMPDUMP_MULTI
+
+meta        PUMPDUMP_MULTI    (__PUMPDUMP_01+__PUMPDUMP_02+__PUMPDUMP_03+__PUMPDUMP_04+__PUMPDUMP_05+__PUMPDUMP_06+__PUMPDUMP_07+__PUMPDUMP_08+__PUMPDUMP_09+__PUMPDUMP_10) > 1
+describe    PUMPDUMP_MULTI    Pump-and-dump stock scam phrases
+#score       PUMPDUMP_MULTI    3.500	# limit
+tflags      PUMPDUMP_MULTI    publish
+##} PUMPDUMP_MULTI
+
+##{ PUMPDUMP_TIP
+
+meta        PUMPDUMP_TIP      __PD_CNT_1 && __STOCK_TIP
+describe    PUMPDUMP_TIP      Pump-and-dump stock tip
+tflags      PUMPDUMP_TIP      publish
+##} PUMPDUMP_TIP
+
+##{ RAND_HEADER_MANY
+
+meta      RAND_HEADER_MANY             __RAND_HEADER > 3
+describe  RAND_HEADER_MANY             Many random gibberish message headers
+#score     RAND_HEADER_MANY             3.000   # limit
+tflags    RAND_HEADER_MANY             publish
+##} RAND_HEADER_MANY
+
+##{ RATWARE_NO_RDNS
+
+meta       RATWARE_NO_RDNS            __RATWARE_BOUND_A && __RDNS_NONE && __MIME_HTML && __MISSING_REF 
+describe   RATWARE_NO_RDNS            Suspicious MsgID and MIME boundary + no rDNS
+#score      RATWARE_NO_RDNS            3.000	# limit
+##} RATWARE_NO_RDNS
+
 ##{ RCVD_BAD_ID
 
 header RCVD_BAD_ID      Received =~ /\bid\s+[a-zA-Z0-9_+\/\\,-]+(?:[!"\#\$\%&'()*<=>?\@\[\]^\`{|}~]|;\S)/
+describe RCVD_BAD_ID    Received header contains id field with bad characters
 ##} RCVD_BAD_ID
 
+##{ RCVD_DBL_DQ
+
+header      RCVD_DBL_DQ                Received =~ /(?:\[\d+\.\d+\.\d+\.\d+\]){2}/
+describe    RCVD_DBL_DQ                Malformatted message header
+tflags      RCVD_DBL_DQ                publish
+##} RCVD_DBL_DQ
+
 ##{ RCVD_FORGED_WROTE
 
 header RCVD_FORGED_WROTE    Received =~ / by \S+ with esmtp \([^a-z ]{6,} [^a-z ]{3,}\) id/
@@ -1595,14 +1648,6 @@
 header RCVD_FORGED_WROTE2 Received =~ /from [0-9.]+ \(HELO \S+[A-Za-z]+\) by (\S+) with esmtp \(\S+\s\S+\) id \S{6}-\S{6}-\S\S for \S+@\1;/s
 ##} RCVD_FORGED_WROTE2
 
-##{ RCVD_IN_BRBL_LASTEXT ifplugin Mail::SpamAssassin::Plugin::DNSEval
-
-ifplugin Mail::SpamAssassin::Plugin::DNSEval
-header RCVD_IN_BRBL_LASTEXT   eval:check_rbl('brbl-lastexternal','bb.barracudacentral.org')
-tflags RCVD_IN_BRBL_LASTEXT   net
-endif
-##} RCVD_IN_BRBL_LASTEXT ifplugin Mail::SpamAssassin::Plugin::DNSEval
-
 ##{ RCVD_IN_DNSWL_BLOCKED ifplugin Mail::SpamAssassin::Plugin::DNSEval
 
 ifplugin Mail::SpamAssassin::Plugin::DNSEval
@@ -1912,38 +1957,48 @@
 describe       RDNS_LOCALHOST  Sender's public rDNS is "localhost"
 ##} RDNS_LOCALHOST
 
+##{ RDNS_NUM_TLD_ATCHNX
+
+meta       RDNS_NUM_TLD_ATCHNX         __RDNS_NUMERIC_TLD && __ATTACH_NAME_NO_EXT
+describe   RDNS_NUM_TLD_ATCHNX         Relay rDNS has numeric TLD + suspicious attachment
+#score      RDNS_NUM_TLD_ATCHNX         3.000	# limit
+tflags     RDNS_NUM_TLD_ATCHNX         publish
+##} RDNS_NUM_TLD_ATCHNX
+
+##{ RDNS_NUM_TLD_XM
+
+meta       RDNS_NUM_TLD_XM             __RDNS_NUMERIC_TLD && (__HAS_XM_SID || __HAS_XM_LID || __HAS_XM_RECPTID || __HAS_XM_SENTBY)
+describe   RDNS_NUM_TLD_XM             Relay rDNS has numeric TLD + suspicious headers
+#score      RDNS_NUM_TLD_XM             3.000	# limit
+tflags     RDNS_NUM_TLD_XM             publish
+##} RDNS_NUM_TLD_XM
+
 ##{ REPLYTO_WITHOUT_TO_CC
 
 meta REPLYTO_WITHOUT_TO_CC     (__REPLYTO_EXISTS && !__TOCC_EXISTS)
 ##} REPLYTO_WITHOUT_TO_CC
 
-##{ RISK_FREE
+##{ SB_GIF_AND_NO_URIS
 
-meta     RISK_FREE      __FRAUD_IOV && !__UNSUB_LINK && !__VIA_ML && !__HTML_LINK_IMAGE && !__SUBSCRIPTION_INFO && !__HS_SUBJ_RE_FW && !__ENV_AND_HDR_FROM_MATCH 
-describe RISK_FREE      No risk!
-##} RISK_FREE
+meta SB_GIF_AND_NO_URIS (__GIF_ATTACH&&!__HAS_ANY_URI&&!__HAS_ANY_EMAIL)
+##} SB_GIF_AND_NO_URIS
 
-##{ RP_MATCHES_RCVD if version >= 3.003000 ifplugin Mail::SpamAssassin::Plugin::WLBLEval
+##{ SERGIO_SUBJECT_PORN014
 
-if version >= 3.003000
-ifplugin Mail::SpamAssassin::Plugin::WLBLEval
-header   RP_MATCHES_RCVD  eval:check_mailfrom_matches_rcvd()
-describe RP_MATCHES_RCVD  Envelope sender domain matches handover relay domain
-tflags   RP_MATCHES_RCVD  nice
-endif
-endif
-##} RP_MATCHES_RCVD if version >= 3.003000 ifplugin Mail::SpamAssassin::Plugin::WLBLEval
+header   SERGIO_SUBJECT_PORN014     Subject =~ /f[^a-zA-Z0-9]{0,3}[uv][^a-zA-Z0-9]{0,3}c[^a-zA-Z0-9]{0,3}k/i
+describe SERGIO_SUBJECT_PORN014     F\*\*\* garbled subject
+##} SERGIO_SUBJECT_PORN014
 
-##{ SB_GIF_AND_NO_URIS
+##{ SERGIO_SUBJECT_VIAGRA01
 
-meta SB_GIF_AND_NO_URIS (__GIF_ATTACH&&!__HAS_ANY_URI&&!__HAS_ANY_EMAIL)
-##} SB_GIF_AND_NO_URIS
+header   SERGIO_SUBJECT_VIAGRA01   Subject =~ /v[^a-zA-Z0-9]{0,3}[i1l][^a-zA-Z0-9]{0,3}a[^a-zA-Z0-9 ]{0,3}g[^a-zA-Z0-9]{0,3}r[^a-zA-Z0-9]{0,3}a/i
+describe SERGIO_SUBJECT_VIAGRA01   Viagra garbled subject
+##} SERGIO_SUBJECT_VIAGRA01
 
-##{ SHARE_50_50
+##{ SHORTENED_URL_SRC
 
-meta     SHARE_50_50     (__SHARE_IT || __AGREED_RATIO) && __FIFTY_FIFTY
-describe SHARE_50_50     Share the money 50/50
-##} SHARE_50_50
+rawbody	 SHORTENED_URL_SRC	/<[^>]{1,99}\ssrc=\W?http:\/\/(?:bit\.ly|tinyurl\.com|ow\.ly|is\.gd|tumblr\.com|formspring\.me|ff\.im|youtu\.be|tl\.gd|plurk\.com|migre\.me|j\.mp|cli\.gs|goo\.gl|yfrog\.com|lnk\.ms|su\.pr|fb\.me|alturl\.com|wp\.me|ping\.fm|chatter\.com|post\.ly|twurl\.nl|tiny\.cc|4sq\.com|ustre\.am|short\.to|u\.nu|flic\.kr|budurl\.com|digg\.com|twitvid\.com|gowal\.la|om\.ly|justin\.tv|icio\.us|p\.gs|loopt\.us|tcrn\.ch|xrl\.us|wpo\.st|bkite\.com)\/[^\/]{3}/
+##} SHORTENED_URL_SRC
 
 ##{ SHORT_HELO_AND_INLINE_IMAGE
 
@@ -1956,17 +2011,12 @@
 body SHORT_TERM_PRICE /short\W+term\W+(target|projected)(\W+price)?/i
 ##} SHORT_TERM_PRICE
 
-##{ SINGLE_HEADER_3K
-
-header   SINGLE_HEADER_3K	ALL:raw =~ /(?-xim:(?=(?:^|\n)[^\s\n]+:(?:.(?!\n\S)){3072,4095}.(?:\n\S|$)))/s
-describe SINGLE_HEADER_3K	A single header contains 3K-4K characters
-##} SINGLE_HEADER_3K
-
-##{ SINGLE_HEADER_4K
+##{ SINGLETS_LOW_CONTRAST
 
-header   SINGLE_HEADER_4K	ALL:raw =~ /(?-xim:(?=(?:^|\n)[^\s\n]+:(?:.(?!\n\S)){4096,5119}.(?:\n\S|$)))/s
-describe SINGLE_HEADER_4K	A single header contains 4K-5K characters
-##} SINGLE_HEADER_4K
+meta      SINGLETS_LOW_CONTRAST         __HTML_SINGLET_MANY && __HTML_FONT_LOW_CONTRAST_MINFP
+describe  SINGLETS_LOW_CONTRAST         Single-letter formatted HTML + hidden text
+tflags    SINGLETS_LOW_CONTRAST         publish
+##} SINGLETS_LOW_CONTRAST
 
 ##{ SPAMMY_XMAILER
 
@@ -1974,6 +2024,38 @@
 describe SPAMMY_XMAILER X-Mailer string is common in spam and not in ham
 ##} SPAMMY_XMAILER
 
+##{ SPOOFED_FREEM_REPTO
+
+meta      SPOOFED_FREEM_REPTO           __SPOOFED_FREEM_REPTO && !__THREADED
+describe  SPOOFED_FREEM_REPTO           Forged freemail sender with freemail reply-to
+#score     SPOOFED_FREEM_REPTO           2.500
+tflags    SPOOFED_FREEM_REPTO           publish
+##} SPOOFED_FREEM_REPTO
+
+##{ SPOOFED_FREEM_REPTO_CHN
+
+meta      SPOOFED_FREEM_REPTO_CHN       (__SPOOFED_FREEM_REPTO || FORGED_YAHOO_RCVD) && __REPTO_CHN_FREEM
+describe  SPOOFED_FREEM_REPTO_CHN       Forged freemail sender with Chinese freemail reply-to
+#score     SPOOFED_FREEM_REPTO_CHN       3.500
+tflags    SPOOFED_FREEM_REPTO_CHN       publish
+##} SPOOFED_FREEM_REPTO_CHN
+
+##{ SPOOFED_FREEM_REPTO_RUS
+
+meta      SPOOFED_FREEM_REPTO_RUS       (__SPOOFED_FREEM_REPTO || FORGED_YAHOO_RCVD) && __REPTO_RUS_FREEM
+describe  SPOOFED_FREEM_REPTO_RUS       Forged freemail sender with Russian freemail reply-to
+#score     SPOOFED_FREEM_REPTO_RUS       3.500
+tflags    SPOOFED_FREEM_REPTO_RUS       publish
+##} SPOOFED_FREEM_REPTO_RUS
+
+##{ STATIC_XPRIO_OLE
+
+meta        STATIC_XPRIO_OLE     __STATIC_XPRIO_OLE
+describe    STATIC_XPRIO_OLE     Static RDNS + X-Priority + MIMEOLE
+#score       STATIC_XPRIO_OLE     2.000   # limit
+tflags      STATIC_XPRIO_OLE     publish
+##} STATIC_XPRIO_OLE
+
 ##{ STOCK_IMG_CTYPE
 
 meta STOCK_IMG_CTYPE (__ANY_IMAGE_ATTACH&&__ENV_AND_HDR_FROM_MATCH&&__CTYPE_ONETAB_GIF&&__HTML_IMG_ONLY)
@@ -1998,11 +2080,27 @@
 describe STOCK_IMG_OUTLOOK  Stock spam image part, with Outlook-like features
 ##} STOCK_IMG_OUTLOOK
 
+##{ STOCK_LOW_CONTRAST
+
+meta        STOCK_LOW_CONTRAST    (__HTML_FONT_LOW_CONTRAST_MINFP && __FB_S_STOCK) && !__BUGGED_IMG 
+describe    STOCK_LOW_CONTRAST    Stocks + hidden text
+#score       STOCK_LOW_CONTRAST    2.500   # limit
+tflags      STOCK_LOW_CONTRAST    publish
+##} STOCK_LOW_CONTRAST
+
 ##{ STOCK_PRICES
 
 meta STOCK_PRICES (SHORT_TERM_PRICE && LONG_TERM_PRICE)
 ##} STOCK_PRICES
 
+##{ STOCK_TIP
+
+meta        STOCK_TIP         __STOCK_TIP && !__DKIM_EXISTS 
+describe    STOCK_TIP         Stock tips
+#score       STOCK_TIP         3.000	# limit
+tflags      STOCK_TIP         publish
+##} STOCK_TIP
+
 ##{ STOX_AND_PRICE
 
 meta STOX_AND_PRICE     CURR_PRICE && STOX_REPLY_TYPE
@@ -2020,29 +2118,25 @@
 
 ##{ STYLE_GIBBERISH
 
-meta           STYLE_GIBBERISH          __STYLE_GIBBERISH && (__BODY_XHTML || !__STYLE_TAG_IN_BODY) && !__THREADED && !__RCD_RDNS_MAIL_MESSY && !__RCD_RDNS_DIAL_MESSY && !__HAS_REPLY_TO && !MIME_HTML_MOSTLY
+meta           STYLE_GIBBERISH          __STYLE_GIBBERISH && (__BODY_XHTML || !__STYLE_TAG_IN_BODY) && !__RCD_RDNS_MX_MESSY && !__HAS_THREAD_INDEX && !__ANY_OUTLOOK_MUA && !__MIME_QP && !ALL_TRUSTED
 describe       STYLE_GIBBERISH          Nonsense in HTML <STYLE> tag
-#score          STYLE_GIBBERISH          4.00	# limit
+#score          STYLE_GIBBERISH          3.50	# limit
+tflags         STYLE_GIBBERISH          publish
 ##} STYLE_GIBBERISH
 
 ##{ SUBJECT_NEEDS_ENCODING
 
 meta SUBJECT_NEEDS_ENCODING    (!__SUBJECT_ENCODED_B64 && !__SUBJECT_ENCODED_QP) && __SUBJECT_NEEDS_MIME
+describe SUBJECT_NEEDS_ENCODING  Subject is encoded but does not specify the encoding
 ##} SUBJECT_NEEDS_ENCODING
 
-##{ SUBJ_ATTENTION
+##{ SYSADMIN
 
-meta        SUBJ_ATTENTION       __SUBJ_ATTENTION && !ALL_TRUSTED
-describe    SUBJ_ATTENTION       ATTENTION in Subject
-#score       SUBJ_ATTENTION       0.500	# limit
-##} SUBJ_ATTENTION
-
-##{ TAB_IN_FROM
-
-meta		TAB_IN_FROM		__TAB_IN_FROM && !__ML_TURNS_SP_TO_TAB 
-describe	TAB_IN_FROM		From starts with a tab
-#score		TAB_IN_FROM		0.5
-##} TAB_IN_FROM
+meta        SYSADMIN             __SYSADMIN && !ALL_TRUSTED && !__ANY_TEXT_ATTACH && !__DKIM_EXISTS && !__LCL__ENV_AND_HDR_FROM_MATCH && !__MSGID_OK_DIGITS 
+describe    SYSADMIN             Supposedly from your IT department
+#score       SYSADMIN             3.500	# limit
+tflags      SYSADMIN             publish
+##} SYSADMIN
 
 ##{ TBIRD_SUSP_MIME_BDRY
 
@@ -2050,11 +2144,39 @@
 describe       TBIRD_SUSP_MIME_BDRY  Unlikely Thunderbird MIME boundary
 ##} TBIRD_SUSP_MIME_BDRY
 
+##{ TEQF_USR_IMAGE
+
+meta      TEQF_USR_IMAGE                __TO_EQ_FROM_USR_NN_MINFP && __ANY_IMAGE_ATTACH 
+describe  TEQF_USR_IMAGE                To and from user nearly same + image
+tflags    TEQF_USR_IMAGE                publish
+##} TEQF_USR_IMAGE
+
+##{ TEQF_USR_MSGID_HEX
+
+meta      TEQF_USR_MSGID_HEX            __TO_EQ_FROM_USR_NN_MINFP && __MSGID_OK_HEX && !__MSGID_NOFQDN2
+describe  TEQF_USR_MSGID_HEX            To and from user nearly same + unusual message ID
+tflags    TEQF_USR_MSGID_HEX            publish
+##} TEQF_USR_MSGID_HEX
+
+##{ TEQF_USR_MSGID_MALF
+
+meta      TEQF_USR_MSGID_MALF           __TO_EQ_FROM_USR_NN_MINFP && __MSGID_NOFQDN2 
+describe  TEQF_USR_MSGID_MALF           To and from user nearly same + malformed message ID
+tflags    TEQF_USR_MSGID_MALF           publish
+##} TEQF_USR_MSGID_MALF
+
 ##{ THEBAT_UNREG
 
 header  THEBAT_UNREG  X-Mailer =~ /^The Bat! .{0,20} UNREG$/
 ##} THEBAT_UNREG
 
+##{ THIS_AD
+
+meta        THIS_AD           __THIS_AD && !__MOZILLA_MSGID && !__FROM_ENCODED_QP && !__CR_IN_SUBJ && !__RP_MATCHES_RCVD 
+describe    THIS_AD           "This ad" and variants
+tflags      THIS_AD           publish
+##} THIS_AD
+
 ##{ TO_EQ_FM_DOM_SPF_FAIL ifplugin Mail::SpamAssassin::Plugin::SPF
 
 ifplugin Mail::SpamAssassin::Plugin::SPF
@@ -2064,12 +2186,6 @@
 endif
 ##} TO_EQ_FM_DOM_SPF_FAIL ifplugin Mail::SpamAssassin::Plugin::SPF
 
-##{ TO_EQ_FM_HTML_ONLY
-
-meta           TO_EQ_FM_HTML_ONLY   __TO_EQ_FM_HTML_ONLY && !ALL_TRUSTED && !__RCD_RDNS_MAIL_MESSY && !__RCD_RDNS_SMTP_MESSY && !__NOT_SPOOFED && !__DKIM_EXISTS && !__ANY_IMAGE_ATTACH && !__FROM_LOWER && !__TAG_EXISTS_CENTER
-describe       TO_EQ_FM_HTML_ONLY   To == From and HTML only
-##} TO_EQ_FM_HTML_ONLY
-
 ##{ TO_EQ_FM_SPF_FAIL ifplugin Mail::SpamAssassin::Plugin::SPF
 
 ifplugin Mail::SpamAssassin::Plugin::SPF
@@ -2081,29 +2197,64 @@
 
 ##{ TO_IN_SUBJ
 
-meta           TO_IN_SUBJ           __SUBJ_HAS_TO_1 && !__VIA_ML && !MISSING_MIMEOLE && !__THREAD_INDEX_GOOD
+meta           TO_IN_SUBJ           __TO_IN_SUBJ && !__VIA_ML && !MISSING_MIMEOLE && !__THREAD_INDEX_GOOD && !__FSL_RELAY_GOOGLE && !__LCL__ENV_AND_HDR_FROM_MATCH && !__HS_SUBJ_RE_FW
 describe       TO_IN_SUBJ           To address is in Subject
+tflags         TO_IN_SUBJ           publish
+#score          TO_IN_SUBJ           0.1
 ##} TO_IN_SUBJ
 
+##{ TO_NAME_SUBJ_NO_RDNS
+
+meta       TO_NAME_SUBJ_NO_RDNS        LOCALPART_IN_SUBJECT && __RDNS_NONE 
+describe   TO_NAME_SUBJ_NO_RDNS        Recipient username in subject + no rDNS
+#score      TO_NAME_SUBJ_NO_RDNS        3.000	# limit
+tflags     TO_NAME_SUBJ_NO_RDNS        publish
+##} TO_NAME_SUBJ_NO_RDNS
+
 ##{ TO_NO_BRKTS_FROM_MSSP
 
 meta       TO_NO_BRKTS_FROM_MSSP     __TO_NO_BRKTS_FROM_RUNON && !__RCD_RDNS_MTA_MESSY && !__CTYPE_MULTIPART_ALT && !__REPTO_QUOTE && !__MIME_QP && !__TO___LOWER && !__BUGGED_IMG && !__SUBJECT_ENCODED_QP && !__VIA_ML && !__FR_SPACING_8 && !__TAG_EXISTS_CENTER && !__RCVD_ZIXMAIL && !__RP_MATCHES_RCVD && !__HAS_SENDER 
 #score      TO_NO_BRKTS_FROM_MSSP     2.50	# max
-describe   TO_NO_BRKTS_FROM_MSSP     Multiple formatting errors
+describe   TO_NO_BRKTS_FROM_MSSP     Multiple header formatting problems
 ##} TO_NO_BRKTS_FROM_MSSP
 
+##{ TO_NO_BRKTS_HTML_IMG
+
+meta       TO_NO_BRKTS_HTML_IMG    __TO_NO_BRKTS_HTML_IMG && !__FM_TO_ALL_NUMS && !__FROM_FULL_NAME && !__HAS_THREAD_INDEX && !__DKIM_EXISTS && !__HAS_SENDER && !__THREADED && !__LONGLINE 
+describe   TO_NO_BRKTS_HTML_IMG    To: lacks brackets and HTML and one image
+#score      TO_NO_BRKTS_HTML_IMG    2.000   # limit
+tflags     TO_NO_BRKTS_HTML_IMG    publish
+##} TO_NO_BRKTS_HTML_IMG
+
+##{ TO_NO_BRKTS_HTML_ONLY
+
+meta       TO_NO_BRKTS_HTML_ONLY   __TO_NO_BRKTS_HTML_ONLY && !RDNS_NONE && !__MIME_QP && !__MSGID_JAVAMAIL && !__CTYPE_CHARSET_QUOTED && !__SUBJECT_ENCODED_B64 && !__VIA_ML && !__MSGID_BEFORE_RECEIVED && !__MIME_BASE64 && !__RCD_RDNS_MAIL_MESSY && !__COMMENT_EXISTS && !LOTS_OF_MONEY && !__TAG_EXISTS_CENTER && !__UPPERCASE_URI && !__UNSUB_LINK && !__RCD_RDNS_MX_MESSY && !__DKIM_EXISTS && !__BUGGED_IMG && !__FM_TO_ALL_NUMS && !__URI_12LTRDOM && !__RDNS_NO_SUBDOM && !__HDRS_LCASE && !__LCL__ENV_AND_HDR_FROM_MATCH 
+#score      TO_NO_BRKTS_HTML_ONLY   2.00	# limit
+describe   TO_NO_BRKTS_HTML_ONLY   To: lacks brackets and HTML only
+tflags     TO_NO_BRKTS_HTML_ONLY   publish
+##} TO_NO_BRKTS_HTML_ONLY
+
 ##{ TO_NO_BRKTS_MSFT
 
-meta       TO_NO_BRKTS_MSFT         __TO_NO_BRKTS_MSFT && !__VIA_ML && !__LYRIS_EZLM_REMAILER && !__THREAD_INDEX_GOOD && !__IS_EXCH && !__UNSUB_LINK && !__NOT_SPOOFED && !__DOS_HAS_LIST_UNSUB && !__NAME_EQ_EMAIL && !__SUBJECT_ENCODED_QP && !__THREADED && !__HAS_THREAD_INDEX && !__HAS_X_REF && !__HAS_IN_REPLY_TO && !__FROM_ENCODED_QP && !__RP_MATCHES_RCVD && !__SUBJECT_UTF8_B_ENCODED
-describe   TO_NO_BRKTS_MSFT         To: misformatted and supposed Microsoft tool
-#score      TO_NO_BRKTS_MSFT         3.50	# limit
+meta       TO_NO_BRKTS_MSFT         __TO_NO_BRKTS_MSFT && !__VIA_ML && !__LYRIS_EZLM_REMAILER && !__THREAD_INDEX_GOOD && !__IS_EXCH && !__UNSUB_LINK && !__NOT_SPOOFED && !__DOS_HAS_LIST_UNSUB && !__NAME_EQ_EMAIL && !__SUBJECT_ENCODED_QP && !__THREADED && !__HAS_THREAD_INDEX && !__HAS_X_REF && !__HAS_IN_REPLY_TO && !__FROM_ENCODED_QP && !__RP_MATCHES_RCVD
+describe   TO_NO_BRKTS_MSFT         To: lacks brackets and supposed Microsoft tool
+#score      TO_NO_BRKTS_MSFT         2.50	# limit
 ##} TO_NO_BRKTS_MSFT
 
+##{ TO_NO_BRKTS_NORDNS_HTML
+
+meta       TO_NO_BRKTS_NORDNS_HTML      __TO_NO_BRKTS_NORDNS_HTML && !ALL_TRUSTED && !__MSGID_JAVAMAIL && !__MSGID_BEFORE_RECEIVED && !__VIA_ML && !__UA_MUTT && !__COMMENT_EXISTS && !__HTML_LENGTH_384 && !__MIME_BASE64 && !__UPPERCASE_URI && !__TO___LOWER && !__TAG_EXISTS_CENTER && !__LONGLINE && !__DKIM_EXISTS 
+#score      TO_NO_BRKTS_NORDNS_HTML      2.00	# limit
+describe   TO_NO_BRKTS_NORDNS_HTML      To: lacks brackets and no rDNS and HTML only
+tflags     TO_NO_BRKTS_NORDNS_HTML      publish
+##} TO_NO_BRKTS_NORDNS_HTML
+
 ##{ TO_NO_BRKTS_PCNT
 
-meta       TO_NO_BRKTS_PCNT         __TO_NO_BRKTS_PCNT && !__SUBJECT_ENCODED_B64 && !__DOS_HAS_LIST_UNSUB && !__VIA_ML && !__ISO_2022_JP_DELIM && !__IMS_MSGID && !__THREAD_INDEX_GOOD && !__RCD_RDNS_MX_MESSY && !__UNSUB_LINK && !__LONGLINE && !URI_HEX && !__RP_MATCHES_RCVD && !__MAIL_LINK && !__BUGGED_IMG && !__MIME_QP && !__COMMENT_EXISTS && !__TAG_EXISTS_STYLE && !__ENV_AND_HDR_FROM_MATCH && !__HAS_X_MAILER && !__HTML_LINK_IMAGE && !__SENDER_BOT && !__DKIM_EXISTS 
-describe   TO_NO_BRKTS_PCNT         To: misformatted + percentage
-#score      TO_NO_BRKTS_PCNT         3.00	# limit
+meta       TO_NO_BRKTS_PCNT         __TO_NO_BRKTS_PCNT && !__SUBJECT_ENCODED_B64 && !__DOS_HAS_LIST_UNSUB && !__VIA_ML && !__ISO_2022_JP_DELIM && !__IMS_MSGID && !__THREAD_INDEX_GOOD && !__RCD_RDNS_MX_MESSY && !__UNSUB_LINK && !__LONGLINE && !URI_HEX && !__RP_MATCHES_RCVD && !__MAIL_LINK && !__BUGGED_IMG && !__MIME_QP && !__COMMENT_EXISTS && !__TAG_EXISTS_STYLE && !__LCL__ENV_AND_HDR_FROM_MATCH && !__HAS_X_MAILER && !__HTML_LINK_IMAGE && !__SENDER_BOT && !__DKIM_EXISTS && !__KHOP_NO_FULL_NAME && !__THREADED 
+describe   TO_NO_BRKTS_PCNT         To: lacks brackets + percentage
+#score      TO_NO_BRKTS_PCNT         2.50	# limit
+tflags     TO_NO_BRKTS_PCNT         publish
 ##} TO_NO_BRKTS_PCNT
 
 ##{ TT_MSGID_TRUNC
@@ -2127,16 +2278,19 @@
 ##{ TVD_ACT_193
 
 body TVD_ACT_193                /\bact of (?:193|nineteen thirty)/i
+describe TVD_ACT_193            Message refers to an act passed in the 1930s
 ##} TVD_ACT_193
 
 ##{ TVD_APPROVED
 
 body TVD_APPROVED               /you.{1,2}re .{0,20}approved/i
+describe TVD_APPROVED           Body states that the recipient has been approved
 ##} TVD_APPROVED
 
 ##{ TVD_DEAR_HOMEOWNER
 
 body TVD_DEAR_HOMEOWNER         /^dear homeowner/i
+describe TVD_DEAR_HOMEOWNER     Spam with generic salutation of "dear homeowner"
 ##} TVD_DEAR_HOMEOWNER
 
 ##{ TVD_EB_PHISH
@@ -2147,6 +2301,7 @@
 ##{ TVD_ENVFROM_APOST
 
 header TVD_ENVFROM_APOST        EnvelopeFrom =~ /\'/
+describe TVD_ENVFROM_APOST      Envelope From contains single-quote
 ##} TVD_ENVFROM_APOST
 
 ##{ TVD_FINGER_02
@@ -2157,18 +2312,14 @@
 ##{ TVD_FLOAT_GENERAL
 
 rawbody TVD_FLOAT_GENERAL       /\bstyle\s*=\s*"[^"]*\bfloat\s*:\s*[a-z]+\s*">\s*[a-zA-Z]+\s*</i
+describe TVD_FLOAT_GENERAL      Message uses CSS float style
 ##} TVD_FLOAT_GENERAL
 
-##{ TVD_FROM_1
-
-header TVD_FROM_1       From:addr =~ /[^\@0-9]{2}\d{3}\.(?:com|net|org|info|biz)$/i
-#score  TVD_FROM_1	1.0
-##} TVD_FROM_1
-
 ##{ TVD_FUZZY_DEGREE ifplugin Mail::SpamAssassin::Plugin::ReplaceTags
 
 ifplugin Mail::SpamAssassin::Plugin::ReplaceTags
 body TVD_FUZZY_DEGREE   /<inter W1><post P1>\b(?!degree)<D><E><G><R><E><E>\b/i
+describe TVD_FUZZY_DEGREE  Obfuscation of the word "degree"
 endif
 ##} TVD_FUZZY_DEGREE ifplugin Mail::SpamAssassin::Plugin::ReplaceTags
 
@@ -2176,6 +2327,7 @@
 
 ifplugin Mail::SpamAssassin::Plugin::ReplaceTags
 body TVD_FUZZY_FINANCE  /(?!finance)<F><I><N><A><N><C><E>/i
+describe TVD_FUZZY_FINANCE  Obfuscation of the word "finance"
 endif
 ##} TVD_FUZZY_FINANCE ifplugin Mail::SpamAssassin::Plugin::ReplaceTags
 
@@ -2183,6 +2335,7 @@
 
 ifplugin Mail::SpamAssassin::Plugin::ReplaceTags
 body TVD_FUZZY_FIXED_RATE       /<inter W2><post P2>(?!fixed rate)<F><I><X><E><D>\s+<R><A><T><E>/i
+describe TVD_FUZZY_FIXED_RATE   Obfuscation of the phrase "fixed rate"
 endif
 ##} TVD_FUZZY_FIXED_RATE ifplugin Mail::SpamAssassin::Plugin::ReplaceTags
 
@@ -2190,6 +2343,7 @@
 
 ifplugin Mail::SpamAssassin::Plugin::ReplaceTags
 body TVD_FUZZY_MICROCAP /<inter W2><post P2>(?!microcap)(?!micro-cap)<M><I><C><R><O>-?<C><A><P>/i
+describe TVD_FUZZY_MICROCAP  Obfuscation of the word "micro-cap"
 endif
 ##} TVD_FUZZY_MICROCAP ifplugin Mail::SpamAssassin::Plugin::ReplaceTags
 
@@ -2197,13 +2351,15 @@
 
 ifplugin Mail::SpamAssassin::Plugin::ReplaceTags
 body TVD_FUZZY_PHARMACEUTICAL   /<inter W2><post P2>(?!pharmaceutical)<P><H><A><R><M><A><C><E><U><T><I><C><A><L>/i
+describe TVD_FUZZY_PHARMACEUTICAL  Obfuscation of the word "pharmaceutical"
 endif
 ##} TVD_FUZZY_PHARMACEUTICAL ifplugin Mail::SpamAssassin::Plugin::ReplaceTags
 
 ##{ TVD_FUZZY_SYMBOL ifplugin Mail::SpamAssassin::Plugin::ReplaceTags
 
 ifplugin Mail::SpamAssassin::Plugin::ReplaceTags
-body TVD_FUZZY_SYMBOL   /<inter W2><post P2>(?!symbol)<S><Y><M><B><O><L>/i
+body TVD_FUZZY_SYMBOL   /<inter W2><post P2>(?!symboo?l)<S><Y><M><B><O><L>/i
+describe TVD_FUZZY_SYMBOL  Obfuscation of the word "symbol"
 endif
 ##} TVD_FUZZY_SYMBOL ifplugin Mail::SpamAssassin::Plugin::ReplaceTags
 
@@ -2211,6 +2367,7 @@
 
 ifplugin Mail::SpamAssassin::Plugin::MIMEHeader
 mimeheader TVD_FW_GRAPHIC_NAME_LONG     Content-Type =~ /\bname="[a-z]{8,}\.gif/
+describe   TVD_FW_GRAPHIC_NAME_LONG     Long image attachment name
 endif
 ##} TVD_FW_GRAPHIC_NAME_LONG ifplugin Mail::SpamAssassin::Plugin::MIMEHeader
 
@@ -2218,17 +2375,20 @@
 
 ifplugin Mail::SpamAssassin::Plugin::MIMEHeader
 mimeheader TVD_FW_GRAPHIC_NAME_MID      Content-Type =~ /\bname="[a-z]{6,7}\.gif/
+describe   TVD_FW_GRAPHIC_NAME_MID      Medium sized image attachment name
 endif
 ##} TVD_FW_GRAPHIC_NAME_MID ifplugin Mail::SpamAssassin::Plugin::MIMEHeader
 
 ##{ TVD_INCREASE_SIZE
 
 body TVD_INCREASE_SIZE          /\bsize of .{1,20}(?:penis|dick|manhood)/i
+describe TVD_INCREASE_SIZE      Advertising for penis enlargement
 ##} TVD_INCREASE_SIZE
 
 ##{ TVD_LINK_SAVE
 
 body TVD_LINK_SAVE              /\blink to save\b/i
+describe TVD_LINK_SAVE          Spam with the text "link to save"
 ##} TVD_LINK_SAVE
 
 ##{ TVD_PH_BODY_ACCOUNTS_PRE
@@ -2262,62 +2422,87 @@
 ##{ TVD_QUAL_MEDS
 
 body TVD_QUAL_MEDS              /\bquality med(?:ication)?s\b/i
+describe TVD_QUAL_MEDS          The body matches phrases such as "quality meds" or "quality medication"
 ##} TVD_QUAL_MEDS
 
 ##{ TVD_RATWARE_CB
 
 header TVD_RATWARE_CB           Content-Type =~ /\bboundary\b.{1,40}qzsoft_directmail_seperator/i
+describe TVD_RATWARE_CB         Content-Type header that is commonly indicative of ratware
 ##} TVD_RATWARE_CB
 
 ##{ TVD_RATWARE_CB_2
 
 header TVD_RATWARE_CB_2         Content-Type =~ /\bboundary\s*=\s*"?-+\d+=+\.MRA/
+describe TVD_RATWARE_CB_2       Content-Type header that is commonly indicative of ratware
 ##} TVD_RATWARE_CB_2
 
 ##{ TVD_RATWARE_MSGID_02
 
 header TVD_RATWARE_MSGID_02     Message-ID =~ /^[^<]*<[a-z]+\@/
+describe TVD_RATWARE_MSGID_02   Ratware with a Message-ID header that is entirely lower-case
 ##} TVD_RATWARE_MSGID_02
 
 ##{ TVD_RCVD_IP
 
 header TVD_RCVD_IP  Received =~ /^from\s+(?:\d+[^0-9a-zA-Z\s]){3}\d+[.\s]/
+describe TVD_RCVD_IP  Message was received from an IP address
 ##} TVD_RCVD_IP
 
 ##{ TVD_RCVD_IP4
 
 header TVD_RCVD_IP4 Received =~ /^from\s+(?:\d+\.){3}\d+\s/
+describe TVD_RCVD_IP4  Message was received from an IPv4 address
 ##} TVD_RCVD_IP4
 
 ##{ TVD_RCVD_SINGLE
 
 header TVD_RCVD_SINGLE Received =~ /^from\s+(?!localhost)[^\s.a-z0-9-]+\s/
+describe TVD_RCVD_SINGLE  Message was received from localhost
 ##} TVD_RCVD_SINGLE
 
 ##{ TVD_RCVD_SPACE_BRACKET
 
-header TVD_RCVD_SPACE_BRACKET Received =~ /\(\[(?!UNIX:)[^\[\]]*\s/
+header TVD_RCVD_SPACE_BRACKET Received =~ /\(\[(?!unix)[^\[\]]*\s/i
 ##} TVD_RCVD_SPACE_BRACKET
 
 ##{ TVD_SECTION
 
 body TVD_SECTION                /\bSection (?:27A|21B)/i
+describe TVD_SECTION            References to specific legal codes
 ##} TVD_SECTION
 
 ##{ TVD_SILLY_URI_OBFU
 
 body TVD_SILLY_URI_OBFU         m!https?://[a-z0-9-]+\.[a-z0-9-]*\.?[^a-z0-9.:/\s"'\@?\)>-]+[a-z0-9.-]*[a-z]{3}(?:\s|$)!i
+describe TVD_SILLY_URI_OBFU     URI obfuscation that can fool a URIBL or a uri rule
 ##} TVD_SILLY_URI_OBFU
 
 ##{ TVD_SPACED_SUBJECT_WORD3
 
 header TVD_SPACED_SUBJECT_WORD3 Subject =~ /^(?:(?:Re|Fw)[^:]{0,5}: )?[A-Z]+[a-z]+[A-Z]+$/
+describe TVD_SPACED_SUBJECT_WORD3  Entire subject is "UPPERlowerUPPER" with no whitespace
 ##} TVD_SPACED_SUBJECT_WORD3
 
+##{ TVD_SPACE_ENCODED
+
+meta        TVD_SPACE_ENCODED      __TVD_SPACE_ENCODED && !__NOT_SPOOFED && !__VIA_ML && !__HS_SUBJ_RE_FW && !__SUBSCRIPTION_INFO && !__TO_EQ_FROM_DOM && !__RCD_RDNS_MAIL && !__ISO_2022_JP_DELIM
+#score       TVD_SPACE_ENCODED      2.500   # limit
+describe    TVD_SPACE_ENCODED      Space ratio & encoded subject
+##} TVD_SPACE_ENCODED
+
+##{ TVD_SPACE_RATIO_MINFP
+
+meta        TVD_SPACE_RATIO_MINFP  __TVD_SPACE_RATIO && !__CT_ENCRYPTED && !__LCL__ENV_AND_HDR_FROM_MATCH && !__SUBSCRIPTION_INFO && !__RCD_RDNS_MAIL && !__SUBJECT_ENCODED_QP && !__THREADED && !__TO_EQ_FROM_DOM && !__BOTH_INR_AND_REF && !__X_CRON_ENV && !__HAS_THREAD_INDEX && !__HDRS_LCASE_KNOWN && !__ISO_2022_JP_DELIM && !__DOS_HAS_LIST_UNSUB && !__RP_MATCHES_RCVD 
+#score       TVD_SPACE_RATIO_MINFP  2.500   # limit
+describe    TVD_SPACE_RATIO_MINFP  Space ratio
+##} TVD_SPACE_RATIO_MINFP
+
 ##{ TVD_STOCK1 ifplugin Mail::SpamAssassin::Plugin::BodyEval
 
 ifplugin Mail::SpamAssassin::Plugin::BodyEval
 body TVD_STOCK1    eval:check_stock_info('2')
+describe TVD_STOCK1  Spam related to stock trading
 endif
 ##} TVD_STOCK1 ifplugin Mail::SpamAssassin::Plugin::BodyEval
 
@@ -2330,28 +2515,41 @@
 ##{ TVD_SUBJ_FINGER_03
 
 header TVD_SUBJ_FINGER_03       Subject =~ /^\s*\*\s+(?:\w+\W+)+\*\s*$/
+describe TVD_SUBJ_FINGER_03     Entire subject is enclosed in asterisks "* like so *"
 ##} TVD_SUBJ_FINGER_03
 
 ##{ TVD_SUBJ_OWE
 
 header TVD_SUBJ_OWE Subject =~ /^\s*(?:\w+\s+)+you\s+(?:\w+\s+)*(?:owe|indebted)\s+(?:\w+\s+)+an\s*other/i
+describe TVD_SUBJ_OWE  Subject line states that the recipieint is in debt
 ##} TVD_SUBJ_OWE
 
 ##{ TVD_SUBJ_WIPE_DEBT
 
 header TVD_SUBJ_WIPE_DEBT       Subject =~ /(?:wipe out|remove|get (?:rid|out) of|eradicate) .{0,20}(?:owe|debt|obligation)/i
+describe TVD_SUBJ_WIPE_DEBT     Spam advertising a way to eliminate debt
 ##} TVD_SUBJ_WIPE_DEBT
 
 ##{ TVD_VISIT_PHARMA
 
 body TVD_VISIT_PHARMA           /Online Ph.rmacy/i
+describe TVD_VISIT_PHARMA       Body mentions online pharmacy
 ##} TVD_VISIT_PHARMA
 
 ##{ TVD_VIS_HIDDEN
 
 rawbody TVD_VIS_HIDDEN /<TEXTAREA[^>]+style\s*=\s*"visibility:\s*hidden\b/i
+describe TVD_VIS_HIDDEN Invisible textarea HTML tags
 ##} TVD_VIS_HIDDEN
 
+##{ TW_GIBBERISH_MANY
+
+meta           TW_GIBBERISH_MANY      __TENWORD_GIBBERISH > 20
+describe       TW_GIBBERISH_MANY      Lots of gibberish text to spoof pattern matching filters
+#score          TW_GIBBERISH_MANY      2.000   # limit
+tflags         TW_GIBBERISH_MANY      publish
+##} TW_GIBBERISH_MANY
+
 ##{ T_ACH_CANCELLED_EXE ifplugin Mail::SpamAssassin::Plugin::MIMEHeader
 
 ifplugin Mail::SpamAssassin::Plugin::MIMEHeader
@@ -2377,6 +2575,26 @@
 endif
 ##} T_CDISP_SZ_MANY ifplugin Mail::SpamAssassin::Plugin::MIMEHeader
 
+##{ T_COMPENSATION
+
+describe T_COMPENSATION     "Compensation"
+#score    T_COMPENSATION     1.50	# limit
+##} T_COMPENSATION
+
+##{ T_COMPENSATION if !plugin(Mail::SpamAssassin::Plugin::DKIM)
+
+if !plugin(Mail::SpamAssassin::Plugin::DKIM)
+  meta   T_COMPENSATION     __COMPENSATION && !__DOS_HAS_LIST_UNSUB && !__HAS_X_LOOP && !__HAS_ERRORS_TO && !__UNSUB_LINK && !__OPERA_MID_NON_OP && !__FB_S_STOCK && !__COMMENT_EXISTS && !__NOT_SPOOFED && !__LOCAL_PP_NONPPURL && !__NOT_A_PERSON && !__SUBSCRIPTION_INFO && !__DKIM_EXISTS && !__HAS_SENDER && !__RP_MATCHES_RCVD
+endif
+##} T_COMPENSATION if !plugin(Mail::SpamAssassin::Plugin::DKIM)
+
+##{ T_COMPENSATION ifplugin Mail::SpamAssassin::Plugin::DKIM
+
+ifplugin Mail::SpamAssassin::Plugin::DKIM
+  meta   T_COMPENSATION     __COMPENSATION && !__DOS_HAS_LIST_UNSUB && !__HAS_X_LOOP && !__HAS_ERRORS_TO && !__UNSUB_LINK && !__OPERA_MID_NON_OP && !__FB_S_STOCK && !__COMMENT_EXISTS && !__NOT_SPOOFED && !__LOCAL_PP_NONPPURL && !__NOT_A_PERSON && !__SUBSCRIPTION_INFO && !__DKIM_EXISTS && !__HAS_SENDER && !__RP_MATCHES_RCVD && !__DKIM_DEPENDABLE
+endif
+##} T_COMPENSATION ifplugin Mail::SpamAssassin::Plugin::DKIM
+
 ##{ T_CTYPE_NULL ifplugin Mail::SpamAssassin::Plugin::MIMEHeader
 
 ifplugin Mail::SpamAssassin::Plugin::MIMEHeader
@@ -2385,6 +2603,14 @@
 endif
 ##} T_CTYPE_NULL ifplugin Mail::SpamAssassin::Plugin::MIMEHeader
 
+##{ T_DATE_IN_FUTURE_Q_PLUS ifplugin Mail::SpamAssassin::Plugin::HeaderEval
+
+ifplugin Mail::SpamAssassin::Plugin::HeaderEval
+header   T_DATE_IN_FUTURE_Q_PLUS  eval:check_for_shifted_date('2920', 'undef')
+describe T_DATE_IN_FUTURE_Q_PLUS  Date: is over 4 months after Received: date
+endif
+##} T_DATE_IN_FUTURE_Q_PLUS ifplugin Mail::SpamAssassin::Plugin::HeaderEval
+
 ##{ T_DKIM_INVALID ifplugin Mail::SpamAssassin::Plugin::DKIM
 
 ifplugin Mail::SpamAssassin::Plugin::DKIM
@@ -2416,6 +2642,49 @@
 endif
 ##} T_DOS_ZIP_HARDCORE ifplugin Mail::SpamAssassin::Plugin::MIMEHeader
 
+##{ T_EMRCP
+
+body     T_EMRCP            /\bExcess (?:Maximum )?Return Capital (?:Profits?|Funds?)\b/i
+describe T_EMRCP            "Excess Maximum Return Capital Profit" scam
+##} T_EMRCP
+
+##{ T_END_FUTURE_EMAILS
+
+describe       T_END_FUTURE_EMAILS   Spammy unsubscribe
+#score          T_END_FUTURE_EMAILS   2.500	# limit
+##} T_END_FUTURE_EMAILS
+
+##{ T_END_FUTURE_EMAILS if !plugin(Mail::SpamAssassin::Plugin::DKIM)
+
+if !plugin(Mail::SpamAssassin::Plugin::DKIM)
+  meta         T_END_FUTURE_EMAILS   __END_FUTURE_EMAILS && !__SUBJECT_ENCODED_B64 && !__HDRS_LCASE && !__HDRS_LCASE_KNOWN && !__TO___LOWER
+endif
+##} T_END_FUTURE_EMAILS if !plugin(Mail::SpamAssassin::Plugin::DKIM)
+
+##{ T_END_FUTURE_EMAILS ifplugin Mail::SpamAssassin::Plugin::DKIM
+
+ifplugin Mail::SpamAssassin::Plugin::DKIM
+  meta         T_END_FUTURE_EMAILS   __END_FUTURE_EMAILS && !__SUBJECT_ENCODED_B64 && !__HDRS_LCASE && !__HDRS_LCASE_KNOWN && !__TO___LOWER && !__DKIM_DEPENDABLE && !DKIM_SIGNED
+endif
+##} T_END_FUTURE_EMAILS ifplugin Mail::SpamAssassin::Plugin::DKIM
+
+##{ T_FILL_THIS_FORM_FRAUD_PHISH ifplugin Mail::SpamAssassin::Plugin::ReplaceTags
+
+ifplugin Mail::SpamAssassin::Plugin::ReplaceTags
+  meta     T_FILL_THIS_FORM_FRAUD_PHISH     __FILL_THIS_FORM_FRAUD_PHISH && !__UNSUB_LINK && !__SPOOFED_URL && !__DOS_LINK && !__CAN_HELP && !__VIA_ML && !__COMMENT_EXISTS && !__HAS_IN_REPLY_TO && !__THREADED 
+  describe T_FILL_THIS_FORM_FRAUD_PHISH     Answer suspicious question(s)
+endif
+##} T_FILL_THIS_FORM_FRAUD_PHISH ifplugin Mail::SpamAssassin::Plugin::ReplaceTags
+
+##{ T_FILL_THIS_FORM_LOAN ifplugin Mail::SpamAssassin::Plugin::ReplaceTags
+
+ifplugin Mail::SpamAssassin::Plugin::ReplaceTags
+  meta     T_FILL_THIS_FORM_LOAN            __FILL_THIS_FORM_LOAN && !__COMMENT_EXISTS && !__HTML_LINK_IMAGE
+  describe T_FILL_THIS_FORM_LOAN            Answer loan question(s)
+#  score    T_FILL_THIS_FORM_LOAN            2.0
+endif
+##} T_FILL_THIS_FORM_LOAN ifplugin Mail::SpamAssassin::Plugin::ReplaceTags
+
 ##{ T_FILL_THIS_FORM_SHORT ifplugin Mail::SpamAssassin::Plugin::ReplaceTags
 
 ifplugin Mail::SpamAssassin::Plugin::ReplaceTags
@@ -2436,343 +2705,27 @@
 ##{ T_FREEMAIL_DOC_PDF ifplugin Mail::SpamAssassin::Plugin::FreeMail
 
 ifplugin Mail::SpamAssassin::Plugin::FreeMail
-  meta         T_FREEMAIL_DOC_PDF     (__DOC_ATTACH || __PDF_ATTACH) && (FREEMAIL_FROM || FREEMAIL_REPLYTO)
-  describe     T_FREEMAIL_DOC_PDF     MS document or PDF attachment, from freemail
+  meta         T_FREEMAIL_DOC_PDF       __FREEMAIL_DOC_PDF
+  describe     T_FREEMAIL_DOC_PDF       MS document or PDF attachment, from freemail
 endif
 ##} T_FREEMAIL_DOC_PDF ifplugin Mail::SpamAssassin::Plugin::FreeMail
 
-##{ T_FREEMAIL_FORGED_FROMDOMAIN ifplugin Mail::SpamAssassin::Plugin::FreeMail if (version >= 3.004000)
+##{ T_FREEMAIL_DOC_PDF_BCC ifplugin Mail::SpamAssassin::Plugin::FreeMail
 
 ifplugin Mail::SpamAssassin::Plugin::FreeMail
-  if (version >= 3.004000)
-    meta     T_FREEMAIL_FORGED_FROMDOMAIN FREEMAIL_FROM && T_HEADER_FROM_DIFFERENT_DOMAINS
-    describe T_FREEMAIL_FORGED_FROMDOMAIN 2nd level domains in From and EnvelopeFrom freemail headers are different
-#    score    T_FREEMAIL_FORGED_FROMDOMAIN 0.25
+  meta         T_FREEMAIL_DOC_PDF_BCC   __FREEMAIL_DOC_PDF && __TO_UNDISCLOSED
+  describe     T_FREEMAIL_DOC_PDF_BCC   MS document or PDF attachment, from freemail, all recipients hidden
 endif
-endif
-##} T_FREEMAIL_FORGED_FROMDOMAIN ifplugin Mail::SpamAssassin::Plugin::FreeMail if (version >= 3.004000)
+##} T_FREEMAIL_DOC_PDF_BCC ifplugin Mail::SpamAssassin::Plugin::FreeMail
 
 ##{ T_FREEMAIL_RVW_ATTCH ifplugin Mail::SpamAssassin::Plugin::FreeMail
 
 ifplugin Mail::SpamAssassin::Plugin::FreeMail
-  meta         T_FREEMAIL_RVW_ATTCH   (__PLS_REVIEW || __DLND_ATTACH) && T_FREEMAIL_DOC_PDF
-  describe     T_FREEMAIL_RVW_ATTCH   Please review attached document, from freemail
+  meta         T_FREEMAIL_RVW_ATTCH     (__PLS_REVIEW || __DLND_ATTACH) && __FREEMAIL_DOC_PDF
+  describe     T_FREEMAIL_RVW_ATTCH     Please review attached document, from freemail
 endif
 ##} T_FREEMAIL_RVW_ATTCH ifplugin Mail::SpamAssassin::Plugin::FreeMail
 
-##{ T_FRM_SILVER_GOLD ifplugin Mail::SpamAssassin::Plugin::ReplaceTags
-
-ifplugin Mail::SpamAssassin::Plugin::ReplaceTags
-meta     T_FRM_SILVER_GOLD        (__FRT_SILVER && __FRT_GOLD)
-describe T_FRM_SILVER_GOLD        ReplaceTags: Silver & Gold
-endif
-##} T_FRM_SILVER_GOLD ifplugin Mail::SpamAssassin::Plugin::ReplaceTags
-
-##{ T_FROM_MISSP_DKIM ifplugin Mail::SpamAssassin::Plugin::DKIM
-
-ifplugin Mail::SpamAssassin::Plugin::DKIM
-  meta         T_FROM_MISSP_DKIM       __FROM_MISSP_DKIM && !__CTYPE_MULTIPART_ALT && !__MIME_QP && !__BUGGED_IMG && !__DOS_HAS_LIST_UNSUB && !__MIME_BASE64 && !__MTLANDROID_MUA && !__XEROXWORKCTR_MUA && !__PHP_MUA && !__AMADEUSMS_MUA && !__FLASHMAIL_MUA
-  describe     T_FROM_MISSP_DKIM       From misspaced, DKIM dependable
-endif
-##} T_FROM_MISSP_DKIM ifplugin Mail::SpamAssassin::Plugin::DKIM
-
-##{ T_FRT_ABSOLUT ifplugin Mail::SpamAssassin::Plugin::ReplaceTags
-
-ifplugin Mail::SpamAssassin::Plugin::ReplaceTags
-body     T_FRT_ABSOLUT            /<inter SP2><post P2>\b(?!absolutely)<A><B><SX><O><L><U><TX><E><L><Y>/i
-describe T_FRT_ABSOLUT            ReplaceTags: Absolutely
-endif
-##} T_FRT_ABSOLUT ifplugin Mail::SpamAssassin::Plugin::ReplaceTags
-
-##{ T_FRT_ADULT2 ifplugin Mail::SpamAssassin::Plugin::ReplaceTags
-
-ifplugin Mail::SpamAssassin::Plugin::ReplaceTags
-body     T_FRT_ADULT2             /<inter W0><post P2>\b(?!adult)<A><D><UX><L><TX>/i
-describe T_FRT_ADULT2             ReplaceTags: Adult
-endif
-##} T_FRT_ADULT2 ifplugin Mail::SpamAssassin::Plugin::ReplaceTags
-
-##{ T_FRT_BEFORE ifplugin Mail::SpamAssassin::Plugin::ReplaceTags
-
-ifplugin Mail::SpamAssassin::Plugin::ReplaceTags
-body     T_FRT_BEFORE             /<inter SP2><post P2>\b(?!before)<B><E><F><O><R><E>\b/i
-describe T_FRT_BEFORE             ReplaceTags: Before
-endif
-##} T_FRT_BEFORE ifplugin Mail::SpamAssassin::Plugin::ReplaceTags
-
-##{ T_FRT_BELOW2 ifplugin Mail::SpamAssassin::Plugin::ReplaceTags
-
-ifplugin Mail::SpamAssassin::Plugin::ReplaceTags
-body     T_FRT_BELOW2             /<inter W0><post P2>\b(?!below)<B><E><L><O><WX>\b/i
-describe T_FRT_BELOW2             ReplaceTags: Below (2)
-endif
-##} T_FRT_BELOW2 ifplugin Mail::SpamAssassin::Plugin::ReplaceTags
-
-##{ T_FRT_CANSPAM ifplugin Mail::SpamAssassin::Plugin::ReplaceTags
-
-ifplugin Mail::SpamAssassin::Plugin::ReplaceTags
-body     T_FRT_CANSPAM            /<inter SP2><post P2>\b(?!CAN<SP>SPAM)<C><A><N><SP><SX><P><A><M>/i
-describe T_FRT_CANSPAM            ReplaceTags: Can Spam
-endif
-##} T_FRT_CANSPAM ifplugin Mail::SpamAssassin::Plugin::ReplaceTags
-
-##{ T_FRT_CLICK ifplugin Mail::SpamAssassin::Plugin::ReplaceTags
-
-ifplugin Mail::SpamAssassin::Plugin::ReplaceTags
-body     T_FRT_CLICK              /<post P2>\b(?!click)<C><L><IX><C><K>\b/i
-describe T_FRT_CLICK              ReplaceTags: Click
-endif
-##} T_FRT_CLICK ifplugin Mail::SpamAssassin::Plugin::ReplaceTags
-
-##{ T_FRT_COCK ifplugin Mail::SpamAssassin::Plugin::ReplaceTags
-
-ifplugin Mail::SpamAssassin::Plugin::ReplaceTags
-body     T_FRT_COCK               /<inter SP2><post P2>\b(?![cs]ock)<C><O><C><K>/i
-describe T_FRT_COCK               ReplaceTags: Cock
-endif
-##} T_FRT_COCK ifplugin Mail::SpamAssassin::Plugin::ReplaceTags
-
-##{ T_FRT_CONTACT ifplugin Mail::SpamAssassin::Plugin::ReplaceTags
-
-ifplugin Mail::SpamAssassin::Plugin::ReplaceTags
-body     T_FRT_CONTACT            /<inter SP2><post P2>\b(?!contr?act)<C><O><N><TX><A><C><TX>/i
-describe T_FRT_CONTACT            ReplaceTags: Contact
-endif
-##} T_FRT_CONTACT ifplugin Mail::SpamAssassin::Plugin::ReplaceTags
-
-##{ T_FRT_ERECTION ifplugin Mail::SpamAssassin::Plugin::ReplaceTags
-
-ifplugin Mail::SpamAssassin::Plugin::ReplaceTags
-body     T_FRT_ERECTION           /<inter SP2><post P2>(?!erection)<E><R><E><C><TX><IX><O><N>/i
-describe T_FRT_ERECTION           ReplaceTags: Erection
-endif
-##} T_FRT_ERECTION ifplugin Mail::SpamAssassin::Plugin::ReplaceTags
-
-##{ T_FRT_ESTABLISH ifplugin Mail::SpamAssassin::Plugin::ReplaceTags
-
-ifplugin Mail::SpamAssassin::Plugin::ReplaceTags
-body     T_FRT_ESTABLISH          /<inter SP2><post P2>\b(?!estabi?lish)<E><SX><TX><A><B><L><IX><SX><H>/i
-describe T_FRT_ESTABLISH          ReplaceTags: Establish
-endif
-##} T_FRT_ESTABLISH ifplugin Mail::SpamAssassin::Plugin::ReplaceTags
-
-##{ T_FRT_EXPERIENCE ifplugin Mail::SpamAssassin::Plugin::ReplaceTags
-
-ifplugin Mail::SpamAssassin::Plugin::ReplaceTags
-body     T_FRT_EXPERIENCE         /<inter SP2><post P2>\b(?!exp[e\xe9\xc9]rience)<E><X><P><E><R><IX><E><N><C><E>\b/i
-describe T_FRT_EXPERIENCE         ReplaceTags: Experience
-endif
-##} T_FRT_EXPERIENCE ifplugin Mail::SpamAssassin::Plugin::ReplaceTags
-
-##{ T_FRT_FOLLOW1 ifplugin Mail::SpamAssassin::Plugin::ReplaceTags
-
-ifplugin Mail::SpamAssassin::Plugin::ReplaceTags
-body     T_FRT_FOLLOW1            /<inter SP2><post P2>\b(?!follow)<F><O><L><L><O><WX>/i
-describe T_FRT_FOLLOW1            ReplaceTags: Follow
-endif
-##} T_FRT_FOLLOW1 ifplugin Mail::SpamAssassin::Plugin::ReplaceTags
-
-##{ T_FRT_FOLLOW2 ifplugin Mail::SpamAssassin::Plugin::ReplaceTags
-
-ifplugin Mail::SpamAssassin::Plugin::ReplaceTags
-body     T_FRT_FOLLOW2            /<inter W0><post P2>\b(?!follow)<F><O><L><L><O><WX>/i
-describe T_FRT_FOLLOW2            ReplaceTags: Follow (2)
-endif
-##} T_FRT_FOLLOW2 ifplugin Mail::SpamAssassin::Plugin::ReplaceTags
-
-##{ T_FRT_FREE ifplugin Mail::SpamAssassin::Plugin::ReplaceTags
-
-ifplugin Mail::SpamAssassin::Plugin::ReplaceTags
-body     T_FRT_FREE               /<inter SP2><post P2>\b(?!free)<F><R><E><E>\b/i
-describe T_FRT_FREE               ReplaceTags: Free
-endif
-##} T_FRT_FREE ifplugin Mail::SpamAssassin::Plugin::ReplaceTags
-
-##{ T_FRT_FRIEND ifplugin Mail::SpamAssassin::Plugin::ReplaceTags
-
-ifplugin Mail::SpamAssassin::Plugin::ReplaceTags
-body     T_FRT_FRIEND             /<inter SP2><post P2>\b(?!friend)<F><R><IX><E><N><D>/i
-describe T_FRT_FRIEND             ReplaceTags: Friend
-endif
-##} T_FRT_FRIEND ifplugin Mail::SpamAssassin::Plugin::ReplaceTags
-
-##{ T_FRT_FUCK1 ifplugin Mail::SpamAssassin::Plugin::ReplaceTags
-
-ifplugin Mail::SpamAssassin::Plugin::ReplaceTags
-body     T_FRT_FUCK1              /<inter SP2><post P2>\b(?!fuck)<F><U><C><K>/i
-describe T_FRT_FUCK1              ReplaceTags: Fuck (1)
-endif
-##} T_FRT_FUCK1 ifplugin Mail::SpamAssassin::Plugin::ReplaceTags
-
-##{ T_FRT_HEALTH ifplugin Mail::SpamAssassin::Plugin::ReplaceTags
-
-ifplugin Mail::SpamAssassin::Plugin::ReplaceTags
-body     T_FRT_HEALTH             /<inter SP2><post P2>\b(?!health)<H><E><A><L><TX><H>\b/i
-describe T_FRT_HEALTH             ReplaceTags: Health
-endif
-##} T_FRT_HEALTH ifplugin Mail::SpamAssassin::Plugin::ReplaceTags
-
-##{ T_FRT_HOUR ifplugin Mail::SpamAssassin::Plugin::ReplaceTags
-
-ifplugin Mail::SpamAssassin::Plugin::ReplaceTags
-body     T_FRT_HOUR               /<inter SP2><post P2>\b(?!hour)<H><O><U><R>\b/i
-describe T_FRT_HOUR               ReplaceTags: Hour
-endif
-##} T_FRT_HOUR ifplugin Mail::SpamAssassin::Plugin::ReplaceTags
-
-##{ T_FRT_INCOME ifplugin Mail::SpamAssassin::Plugin::ReplaceTags
-
-ifplugin Mail::SpamAssassin::Plugin::ReplaceTags
-body     T_FRT_INCOME             /<inter SP2><post P2>\b(?!income)<IX><N><C><O><M><E>\b/i
-describe T_FRT_INCOME             ReplaceTags: Income
-endif
-##} T_FRT_INCOME ifplugin Mail::SpamAssassin::Plugin::ReplaceTags
-
-##{ T_FRT_INTEREST ifplugin Mail::SpamAssassin::Plugin::ReplaceTags
-
-ifplugin Mail::SpamAssassin::Plugin::ReplaceTags
-body     T_FRT_INTEREST           /<inter SP2><post P2>\b(?!interest)<IX><N><TX><E><R><E><SX><TX>\b/i
-describe T_FRT_INTEREST           ReplaceTags: Interest
-endif
-##} T_FRT_INTEREST ifplugin Mail::SpamAssassin::Plugin::ReplaceTags
-
-##{ T_FRT_LITTLE ifplugin Mail::SpamAssassin::Plugin::ReplaceTags
-
-ifplugin Mail::SpamAssassin::Plugin::ReplaceTags
-body     T_FRT_LITTLE             /<inter SP2><post P2>\b(?!little)<L><IX><TX><TX><L><E>/i
-describe T_FRT_LITTLE             ReplaceTags: Little
-endif
-##} T_FRT_LITTLE ifplugin Mail::SpamAssassin::Plugin::ReplaceTags
-
-##{ T_FRT_LOLITA1 ifplugin Mail::SpamAssassin::Plugin::ReplaceTags
-
-ifplugin Mail::SpamAssassin::Plugin::ReplaceTags
-body     T_FRT_LOLITA1            /<inter SP2><post P2>\b(?!lolita)<L><O><L><IX><TX><A>/i
-describe T_FRT_LOLITA1            ReplaceTags: Lolita (1)
-endif
-##} T_FRT_LOLITA1 ifplugin Mail::SpamAssassin::Plugin::ReplaceTags
-
-##{ T_FRT_OPPORTUN1 ifplugin Mail::SpamAssassin::Plugin::ReplaceTags
-
-ifplugin Mail::SpamAssassin::Plugin::ReplaceTags
-body     T_FRT_OPPORTUN1          /<inter SP2><post P2>(?!opportun)<O><P><P><O><R><TX><U><N>/i
-describe T_FRT_OPPORTUN1          ReplaceTags: Oppertun (1)
-endif
-##} T_FRT_OPPORTUN1 ifplugin Mail::SpamAssassin::Plugin::ReplaceTags
-
-##{ T_FRT_PACKAGE ifplugin Mail::SpamAssassin::Plugin::ReplaceTags
-
-ifplugin Mail::SpamAssassin::Plugin::ReplaceTags
-body     T_FRT_PACKAGE            /<inter SP2><post P2>\b(?!package)<P><A><C><K><A><GX><E>/i
-describe T_FRT_PACKAGE            ReplaceTags: Package
-endif
-##} T_FRT_PACKAGE ifplugin Mail::SpamAssassin::Plugin::ReplaceTags
-
-##{ T_FRT_PAYMENT ifplugin Mail::SpamAssassin::Plugin::ReplaceTags
-
-ifplugin Mail::SpamAssassin::Plugin::ReplaceTags
-body     T_FRT_PAYMENT            /<inter W0>\b(?!payment)<P><A><Y><M><E><N><TX>/i
-describe T_FRT_PAYMENT            ReplaceTags: Payment
-endif
-##} T_FRT_PAYMENT ifplugin Mail::SpamAssassin::Plugin::ReplaceTags
-
-##{ T_FRT_PHARMAC ifplugin Mail::SpamAssassin::Plugin::ReplaceTags
-
-ifplugin Mail::SpamAssassin::Plugin::ReplaceTags
-body     T_FRT_PHARMAC            /<inter W0><post P2>(?!pharma[c\@])<P><H><A><R><M><A><C>/i
-describe T_FRT_PHARMAC            ReplaceTags: Pharmac
-endif
-##} T_FRT_PHARMAC ifplugin Mail::SpamAssassin::Plugin::ReplaceTags
-
-##{ T_FRT_POSSIBLE ifplugin Mail::SpamAssassin::Plugin::ReplaceTags
-
-ifplugin Mail::SpamAssassin::Plugin::ReplaceTags
-body     T_FRT_POSSIBLE           /<inter SP2><post P2>\b(?!possible)<P><O><SX><SX><IX><B><L><E>\b/i
-describe T_FRT_POSSIBLE           ReplaceTags: Possible
-endif
-##} T_FRT_POSSIBLE ifplugin Mail::SpamAssassin::Plugin::ReplaceTags
-
-##{ T_FRT_PROFILE1 ifplugin Mail::SpamAssassin::Plugin::ReplaceTags
-
-ifplugin Mail::SpamAssassin::Plugin::ReplaceTags
-body     T_FRT_PROFILE1           /<inter SP2><post P2>\b(?!profile)<P><R><O><F><IX><L><E>/i
-describe T_FRT_PROFILE1           ReplaceTags: Profile (1)
-endif
-##} T_FRT_PROFILE1 ifplugin Mail::SpamAssassin::Plugin::ReplaceTags
-
-##{ T_FRT_PROFILE2 ifplugin Mail::SpamAssassin::Plugin::ReplaceTags
-
-ifplugin Mail::SpamAssassin::Plugin::ReplaceTags
-body     T_FRT_PROFILE2           /<inter W0><post P2>\b(?!profile)<P><R><O><F><IX><L><E>/i
-describe T_FRT_PROFILE2           ReplaceTags: Profile (2)
-endif
-##} T_FRT_PROFILE2 ifplugin Mail::SpamAssassin::Plugin::ReplaceTags
-
-##{ T_FRT_PROFIT1 ifplugin Mail::SpamAssassin::Plugin::ReplaceTags
-
-ifplugin Mail::SpamAssassin::Plugin::ReplaceTags
-body     T_FRT_PROFIT1            /<inter SP2><post P2>\b(?!profit)<P><R><O><F><IX><TX>/i
-describe T_FRT_PROFIT1            ReplaceTags: Profit (1)
-endif
-##} T_FRT_PROFIT1 ifplugin Mail::SpamAssassin::Plugin::ReplaceTags
-
-##{ T_FRT_PROFIT2 ifplugin Mail::SpamAssassin::Plugin::ReplaceTags
-
-ifplugin Mail::SpamAssassin::Plugin::ReplaceTags
-body     T_FRT_PROFIT2            /<inter W0><post P2>\b(?!profit)<P><R><O><F><IX><TX>/i
-describe T_FRT_PROFIT2            ReplaceTags: Profit (2)
-endif
-##} T_FRT_PROFIT2 ifplugin Mail::SpamAssassin::Plugin::ReplaceTags
-
-##{ T_FRT_PUSSY ifplugin Mail::SpamAssassin::Plugin::ReplaceTags
-
-ifplugin Mail::SpamAssassin::Plugin::ReplaceTags
-body     T_FRT_PUSSY              /<inter SP2><post P2>\b(?!pussy)<P><U><SX><SX><Y>/i
-describe T_FRT_PUSSY              ReplaceTags: Pussy
-endif
-##} T_FRT_PUSSY ifplugin Mail::SpamAssassin::Plugin::ReplaceTags
-
-##{ T_FRT_SLUT ifplugin Mail::SpamAssassin::Plugin::ReplaceTags
-
-ifplugin Mail::SpamAssassin::Plugin::ReplaceTags
-body     T_FRT_SLUT               /<inter SP2><post P2>\b(?!slut)<SX><L><U><TX>/
-describe T_FRT_SLUT               ReplaceTags: Slut
-endif
-##} T_FRT_SLUT ifplugin Mail::SpamAssassin::Plugin::ReplaceTags
-
-##{ T_FRT_STOCK1 ifplugin Mail::SpamAssassin::Plugin::ReplaceTags
-
-ifplugin Mail::SpamAssassin::Plugin::ReplaceTags
-body     T_FRT_STOCK1             /<inter SP2><post P2>\b(?!stock)<SX><TX><O><C><K>/i
-describe T_FRT_STOCK1             ReplaceTags: Stock (1)
-endif
-##} T_FRT_STOCK1 ifplugin Mail::SpamAssassin::Plugin::ReplaceTags
-
-##{ T_FRT_STOCK2 ifplugin Mail::SpamAssassin::Plugin::ReplaceTags
-
-ifplugin Mail::SpamAssassin::Plugin::ReplaceTags
-body     T_FRT_STOCK2             /<inter W0><post P2>\b(?!stor?ck)<SX><TX><O><C><K>/i
-describe T_FRT_STOCK2             ReplaceTags: Stock (2)
-endif
-##} T_FRT_STOCK2 ifplugin Mail::SpamAssassin::Plugin::ReplaceTags
-
-##{ T_FRT_VIRGIN1 ifplugin Mail::SpamAssassin::Plugin::ReplaceTags
-
-ifplugin Mail::SpamAssassin::Plugin::ReplaceTags
-body     T_FRT_VIRGIN1            /<inter SP2><post P2>(?!virgin)<V><IX><R><GX><IX><N><SX>?\b/i
-describe T_FRT_VIRGIN1            ReplaceTags: Virgin (1)
-endif
-##} T_FRT_VIRGIN1 ifplugin Mail::SpamAssassin::Plugin::ReplaceTags
-
-##{ T_FSL_OPEN_ATTACH_MH ifplugin Mail::SpamAssassin::Plugin::MIMEHeader
-
-ifplugin Mail::SpamAssassin::Plugin::MIMEHeader
-mimeheader T_FSL_OPEN_ATTACH_MH   Content-Disposition =~ /\b(?:OPEN|VIEW|READ|SEE|YOUR|ARE)\s*(?:THE\s*)?ATTACH(?:ED|MENT)\b?/
-#score      T_FSL_OPEN_ATTACH_MH   2.0
-describe   T_FSL_OPEN_ATTACH_MH   Filename demands that you open the attachment!
-endif
-##} T_FSL_OPEN_ATTACH_MH ifplugin Mail::SpamAssassin::Plugin::MIMEHeader
-
 ##{ T_FUZZY_OPTOUT ifplugin Mail::SpamAssassin::Plugin::ReplaceTags
 
 ifplugin Mail::SpamAssassin::Plugin::ReplaceTags
@@ -2808,16 +2761,46 @@
 endif
 ##} T_HDRS_LCASE ifplugin Mail::SpamAssassin::Plugin::FreeMail
 
-##{ T_HEADER_FROM_DIFFERENT_DOMAINS ifplugin Mail::SpamAssassin::Plugin::FreeMail if (version >= 3.004000)
+##{ T_HK_NAME_DR ifplugin Mail::SpamAssassin::Plugin::FreeMail
 
 ifplugin Mail::SpamAssassin::Plugin::FreeMail
-  if (version >= 3.004000)
-    header T_HEADER_FROM_DIFFERENT_DOMAINS eval:check_equal_from_domains()
-    describe T_HEADER_FROM_DIFFERENT_DOMAINS From and EnvelopeFrom 2nd level mail domains are different
-#    score T_HEADER_FROM_DIFFERENT_DOMAINS 0.25
+meta		T_HK_NAME_DR		__HK_NAME_DR && !FREEMAIL_FROM
+#score           T_HK_NAME_DR	        1.0
 endif
+##} T_HK_NAME_DR ifplugin Mail::SpamAssassin::Plugin::FreeMail
+
+##{ T_HK_NAME_FM_DR ifplugin Mail::SpamAssassin::Plugin::FreeMail
+
+ifplugin Mail::SpamAssassin::Plugin::FreeMail
+meta		T_HK_NAME_FM_DR		__HK_NAME_DR && FREEMAIL_FROM
+#score           T_HK_NAME_FM_DR           1.5
 endif
-##} T_HEADER_FROM_DIFFERENT_DOMAINS ifplugin Mail::SpamAssassin::Plugin::FreeMail if (version >= 3.004000)
+##} T_HK_NAME_FM_DR ifplugin Mail::SpamAssassin::Plugin::FreeMail
+
+##{ T_HK_NAME_FM_FROM ifplugin Mail::SpamAssassin::Plugin::FreeMail
+
+ifplugin Mail::SpamAssassin::Plugin::FreeMail
+meta		T_HK_NAME_FM_FROM		__HK_NAME_FROM && FREEMAIL_FROM
+#score           T_HK_NAME_FM_FROM         1.5
+endif
+##} T_HK_NAME_FM_FROM ifplugin Mail::SpamAssassin::Plugin::FreeMail
+
+##{ T_HK_NAME_MR_MRS ifplugin Mail::SpamAssassin::Plugin::FreeMail if (version >= 3.004000)
+
+ifplugin Mail::SpamAssassin::Plugin::FreeMail
+if (version >= 3.004000)
+  meta            T_HK_NAME_MR_MRS          __HK_NAME_MR_MRS && !FREEMAIL_FROM
+#  score           T_HK_NAME_MR_MRS          1.0
+endif
+endif
+##} T_HK_NAME_MR_MRS ifplugin Mail::SpamAssassin::Plugin::FreeMail if (version >= 3.004000)
+
+##{ T_HK_SPAMMY_FILENAME ifplugin Mail::SpamAssassin::Plugin::MIMEHeader
+
+ifplugin Mail::SpamAssassin::Plugin::MIMEHeader
+meta		T_HK_SPAMMY_FILENAME	__HK_SPAMMY_CTFN || __HK_SPAMMY_CDFN
+endif
+##} T_HK_SPAMMY_FILENAME ifplugin Mail::SpamAssassin::Plugin::MIMEHeader
 
 ##{ T_HTML_ATTACH ifplugin Mail::SpamAssassin::Plugin::MIMEHeader
 
@@ -2827,6 +2810,23 @@
 endif
 ##} T_HTML_ATTACH ifplugin Mail::SpamAssassin::Plugin::MIMEHeader
 
+##{ T_HTML_TAG_BALANCE_CENTER ifplugin Mail::SpamAssassin::Plugin::HTMLEval
+
+ifplugin Mail::SpamAssassin::Plugin::HTMLEval
+  meta       T_HTML_TAG_BALANCE_CENTER       __HTML_TAG_BALANCE_CENTER && !__RCD_RDNS_MAIL_MESSY && !__RCD_RDNS_SMTP_MESSY 
+  describe   T_HTML_TAG_BALANCE_CENTER       Malformatted HTML
+endif
+##} T_HTML_TAG_BALANCE_CENTER ifplugin Mail::SpamAssassin::Plugin::HTMLEval
+
+##{ T_ISO_ATTACH ifplugin Mail::SpamAssassin::Plugin::MIMEHeader
+
+ifplugin Mail::SpamAssassin::Plugin::MIMEHeader
+  meta         T_ISO_ATTACH          __ISO_ATTACH
+  describe     T_ISO_ATTACH          ISO attachment - possible malware delivery
+#  score        T_ISO_ATTACH          3.000	# limit
+endif
+##} T_ISO_ATTACH ifplugin Mail::SpamAssassin::Plugin::MIMEHeader
+
 ##{ T_KAM_HTML_FONT_INVALID ifplugin Mail::SpamAssassin::Plugin::HTMLEval
 
 ifplugin Mail::SpamAssassin::Plugin::HTMLEval
@@ -2836,13 +2836,6 @@
 endif
 ##} T_KAM_HTML_FONT_INVALID ifplugin Mail::SpamAssassin::Plugin::HTMLEval
 
-##{ T_KHOP_FOREIGN_CLICK if ! plugin (Mail::SpamAssassin::Plugin::URIDetail)
-
-if ! plugin (Mail::SpamAssassin::Plugin::URIDetail)
-  rawbody    T_KHOP_FOREIGN_CLICK	m{\bhref=[^>]{9,199}>[^<]{0,80}(?:<(?!/a\b)[^>]{0,299}>[^<]{0,80}){0,9}[^<]{0,80}\b(?:cli(?:quez\W|ck\Wa)ici\b|cli(?:cca\W|c\Wa|que\Wa)qu[^<.,a ]|klie?k(?:\Whi?er|ni(?:j|nite)\Wtu[tk]aj)\b)}si
-endif
-##} T_KHOP_FOREIGN_CLICK if ! plugin (Mail::SpamAssassin::Plugin::URIDetail)
-
 ##{ T_LARGE_PCT_AFTER_MANY if can(Mail::SpamAssassin::Conf::feature_bug6558_free)
 
 if can(Mail::SpamAssassin::Conf::feature_bug6558_free)
@@ -2864,12 +2857,26 @@
 describe T_LOTTO_AGENT_FM   Claims Agent
 ##} T_LOTTO_AGENT_FM
 
+##{ T_LOTTO_AGENT_RPLY
+
+meta     T_LOTTO_AGENT_RPLY __LOTTO_AGENT_RPLY && !__TO_YOUR_ORG
+describe T_LOTTO_AGENT_RPLY Claims Agent
+##} T_LOTTO_AGENT_RPLY
+
 ##{ T_LOTTO_URI
 
 uri      T_LOTTO_URI       /(?:claim(?:s|ing)?(?:[-_]?processing)?|fiducia\w+|reimbursement|(?:international|foreign|win+ing)?[-_]?rem+it+ance|award)[-_]?(?:department|dept|unit|group|committee|office|agent|manager|secretary)/i
-describe T_LOTTO_URI       Claims Department
+describe T_LOTTO_URI       Claims Department URL
 ##} T_LOTTO_URI
 
+##{ T_MALW_ATTACH ifplugin Mail::SpamAssassin::Plugin::MIMEHeader
+
+ifplugin Mail::SpamAssassin::Plugin::MIMEHeader
+  meta         T_MALW_ATTACH         __MALW_ATTACH_01_01 || __MALW_ATTACH_01_02
+  describe     T_MALW_ATTACH         Attachment filename suspicious, probable malware exploit
+endif
+##} T_MALW_ATTACH ifplugin Mail::SpamAssassin::Plugin::MIMEHeader
+
 ##{ T_MANY_HDRS_LCASE
 
 describe       T_MANY_HDRS_LCASE       Odd capitalization of multiple message headers
@@ -2898,14 +2905,14 @@
 endif
 ##} T_MANY_PILL_PRICE if can(Mail::SpamAssassin::Conf::feature_bug6558_free)
 
-##{ T_MIME_NO_TEXT ifplugin Mail::SpamAssassin::Plugin::MIMEHeader
+##{ T_MIME_MALF if (version >= 3.004000)
 
-ifplugin Mail::SpamAssassin::Plugin::MIMEHeader
-  meta        T_MIME_NO_TEXT      __MIME_NO_TEXT && !__MSGID_APPLEMAIL && !__USER_AGENT_APPLEMAIL && !__HAS_IN_REPLY_TO && !__HAS_X_REF && !__HS_SUBJ_RE_FW
-#  score       T_MIME_NO_TEXT      2.00	# limit
-  describe    T_MIME_NO_TEXT      No (properly identified) text body parts
+if (version >= 3.004000)
+	meta        T_MIME_MALF        __MIME_MALF && !ALL_TRUSTED
+	describe    T_MIME_MALF        Malformed MIME: headers in body
+#	score       T_MIME_MALF        2.00	# limit
 endif
-##} T_MIME_NO_TEXT ifplugin Mail::SpamAssassin::Plugin::MIMEHeader
+##} T_MIME_MALF if (version >= 3.004000)
 
 ##{ T_MONEY_PERCENT ifplugin Mail::SpamAssassin::Plugin::ReplaceTags
 
@@ -2915,6 +2922,14 @@
 endif
 ##} T_MONEY_PERCENT ifplugin Mail::SpamAssassin::Plugin::ReplaceTags
 
+##{ T_OBFU_ATTACH_MISSP ifplugin Mail::SpamAssassin::Plugin::MIMEHeader
+
+ifplugin Mail::SpamAssassin::Plugin::MIMEHeader
+  meta         T_OBFU_ATTACH_MISSP   __FROM_RUNON && (T_OBFU_HTML_ATTACH || OBFU_TEXT_ATTACH || T_OBFU_DOC_ATTACH || T_OBFU_PDF_ATTACH || T_OBFU_JPG_ATTACH || T_OBFU_GIF_ATTACH)
+  describe     T_OBFU_ATTACH_MISSP   Obfuscated attachment type and misspaced From
+endif
+##} T_OBFU_ATTACH_MISSP ifplugin Mail::SpamAssassin::Plugin::MIMEHeader
+
 ##{ T_OBFU_DOC_ATTACH ifplugin Mail::SpamAssassin::Plugin::MIMEHeader
 
 ifplugin Mail::SpamAssassin::Plugin::MIMEHeader
@@ -2931,6 +2946,14 @@
 endif
 ##} T_OBFU_GIF_ATTACH ifplugin Mail::SpamAssassin::Plugin::MIMEHeader
 
+##{ T_OBFU_HTML_ATTACH ifplugin Mail::SpamAssassin::Plugin::MIMEHeader
+
+ifplugin Mail::SpamAssassin::Plugin::MIMEHeader
+  mimeheader   T_OBFU_HTML_ATTACH    Content-Type =~ m,\bapplication/octet-stream\b.+\.html?\b,i
+  describe     T_OBFU_HTML_ATTACH    HTML attachment with non-text MIME type
+endif
+##} T_OBFU_HTML_ATTACH ifplugin Mail::SpamAssassin::Plugin::MIMEHeader
+
 ##{ T_OBFU_HTML_ATT_MALW ifplugin Mail::SpamAssassin::Plugin::MIMEHeader
 
 ifplugin Mail::SpamAssassin::Plugin::MIMEHeader
@@ -2955,6 +2978,14 @@
 endif
 ##} T_OBFU_PDF_ATTACH ifplugin Mail::SpamAssassin::Plugin::MIMEHeader
 
+##{ T_PDS_TO_EQ_FROM_NAME if can(Mail::SpamAssassin::Conf::perl_min_version_5010000)
+
+if can(Mail::SpamAssassin::Conf::perl_min_version_5010000)
+  meta       T_PDS_TO_EQ_FROM_NAME      (__PDS_TO_EQ_FROM_NAME_1 || __PDS_TO_EQ_FROM_NAME_2)
+  describe   T_PDS_TO_EQ_FROM_NAME      From: name same as To: address
+endif
+##} T_PDS_TO_EQ_FROM_NAME if can(Mail::SpamAssassin::Conf::perl_min_version_5010000)
+
 ##{ T_REMOTE_IMAGE ifplugin Mail::SpamAssassin::Plugin::MIMEHeader # {
 
 ifplugin Mail::SpamAssassin::Plugin::MIMEHeader # {
@@ -2963,6 +2994,12 @@
 endif
 ##} T_REMOTE_IMAGE ifplugin Mail::SpamAssassin::Plugin::MIMEHeader # {
 
+##{ T_SHARE_50_50
+
+meta     T_SHARE_50_50     (__SHARE_IT || __AGREED_RATIO) && __FIFTY_FIFTY
+describe T_SHARE_50_50     Share the money 50/50
+##} T_SHARE_50_50
+
 ##{ T_SUBJ_BRKN_WORDNUMS ifplugin Mail::SpamAssassin::Plugin::DKIM
 
 ifplugin Mail::SpamAssassin::Plugin::DKIM
@@ -2981,7 +3018,7 @@
 ##{ T_TVD_FUZZY_SECURITIES ifplugin Mail::SpamAssassin::Plugin::ReplaceTags
 
 ifplugin Mail::SpamAssassin::Plugin::ReplaceTags
-body T_TVD_FUZZY_SECURITIES       /<inter W2><post P2>(?!securities)<S><E><C><U><R><I><T><I><E><S>/i
+body T_TVD_FUZZY_SECURITIES       /<inter W2><post P2>(?!securities)(?!security es)<S><E><C><U><R><I><T><I><E><S>/i
 endif
 ##} T_TVD_FUZZY_SECURITIES ifplugin Mail::SpamAssassin::Plugin::ReplaceTags
 
@@ -3022,6 +3059,21 @@
 endif
 ##} T_WON_NBDY_ATTACH ifplugin Mail::SpamAssassin::Plugin::MIMEHeader
 
+##{ UC_GIBBERISH_OBFU
+
+meta        UC_GIBBERISH_OBFU  (__UC_GIBB_OBFU > 1) && !__RP_MATCHES_RCVD && !__VIA_ML && !__DKIM_EXISTS && !ALL_TRUSTED
+describe    UC_GIBBERISH_OBFU  Multiple instances of "word VERYLONGGIBBERISH word"
+#score       UC_GIBBERISH_OBFU  3.000	# Limit
+tflags      UC_GIBBERISH_OBFU  publish
+##} UC_GIBBERISH_OBFU
+
+##{ UNICODE_OBFU_DOM_NO_BODY
+
+meta       UNICODE_OBFU_DOM_NO_BODY   __UNICODE_OBFU_URI_DOM && __EMPTY_BODY
+#score      UNICODE_OBFU_DOM_NO_BODY   3.750	# limit
+describe   UNICODE_OBFU_DOM_NO_BODY   Unicode/chinese obfuscated domain + no body
+##} UNICODE_OBFU_DOM_NO_BODY
+
 ##{ URIBL_RHS_DOB ifplugin Mail::SpamAssassin::Plugin::URIDNSBL
 
 ifplugin Mail::SpamAssassin::Plugin::URIDNSBL
@@ -3032,44 +3084,475 @@
 endif
 ##} URIBL_RHS_DOB ifplugin Mail::SpamAssassin::Plugin::URIDNSBL
 
-##{ URI_OBFU_WWW ifplugin Mail::SpamAssassin::Plugin::ReplaceTags
+##{ URI_DATA
 
-ifplugin Mail::SpamAssassin::Plugin::ReplaceTags
-body          URI_OBFU_WWW  /(?<!http:\/\/)\b_*w{2,3}(?!\.[-\w]+\.(?:com|net|org|biz|info))[^[:alnum:]]{1,3}(?:<D><O><T>+[^[:alnum:]]{1,3})?[[:alnum:]][-\w]{1,20}[[:alnum:]][^[:alnum:]]{1,3}(?:<D><O><T>+[^[:alnum:]]{1,3})?(?:c\s?o\s?m|n\s?e\s?t|o\s?r\s?g|b\s?i\s?z|i\s?n\s?f\s?o)_*\b/i
-describe      URI_OBFU_WWW  Obfuscated URI
+meta        URI_DATA           __URI_DATA && !ALL_TRUSTED && !__RCD_RDNS_MAIL_MESSY && !__HAS_ERRORS_TO && !__VIA_ML && !__ENV_AND_HDR_FROM_MATCH && !__DOS_HAS_LIST_UNSUB 
+describe    URI_DATA           "data:" URI - possible malware or phish
+#score       URI_DATA           3.250	# limit
+tflags      URI_DATA           publish
+##} URI_DATA
+
+##{ URI_DQ_UNSUB
+
+uri            URI_DQ_UNSUB     m;^[a-z]+://(?:\d+\.){3}\d+/.*unsubscribe;i
+describe       URI_DQ_UNSUB     IP-address unsubscribe URI
+tflags         URI_DQ_UNSUB     publish
+##} URI_DQ_UNSUB
+
+##{ URI_GOOGLE_PROXY
+
+meta           URI_GOOGLE_PROXY       __URI_GOOGLE_PROXY && !__LONGLINE && !__ML1 && !__FSL_RELAY_GOOGLE && !__FROM_LOWER && !__RCD_RDNS_MAIL 
+describe       URI_GOOGLE_PROXY       Accessing a blacklisted URI or obscuring source of phish via Google proxy?
+tflags         URI_GOOGLE_PROXY       publish
+##} URI_GOOGLE_PROXY
+
+##{ URI_ONLY_MSGID_MALF
+
+  meta      URI_ONLY_MSGID_MALF           __URI_ONLY_MSGID_MALF && !__RP_MATCHES_RCVD && !__URI_MAILTO && !__NOT_SPOOFED && !__DKIM_EXISTS && !__MSGID_JAVAMAIL && !__HAS_REPLY_TO && !RCVD_IN_DNSWL_LOW
+  tflags    URI_ONLY_MSGID_MALF           net
+  meta      URI_ONLY_MSGID_MALF           __URI_ONLY_MSGID_MALF && !__RP_MATCHES_RCVD && !__URI_MAILTO && !__NOT_SPOOFED && !__DKIM_EXISTS && !__MSGID_JAVAMAIL && !__HAS_REPLY_TO
+describe  URI_ONLY_MSGID_MALF           URI only + malformed message ID
+#score     URI_ONLY_MSGID_MALF           2.000	# limit
+tflags    URI_ONLY_MSGID_MALF           publish
+##} URI_ONLY_MSGID_MALF
+
+##{ URI_OPTOUT_3LD
+
+uri         URI_OPTOUT_3LD    m,^https?://(?:quit|bye|remove|exit|leave|disallow|halt|stop|end|herego|out|discontinue)\d*\.[^/]+\.(?:com|net)\b,i
+describe    URI_OPTOUT_3LD    Opt-out URI, suspicious hostname
+#score       URI_OPTOUT_3LD    2.000   # limit
+tflags      URI_OPTOUT_3LD    publish
+##} URI_OPTOUT_3LD
+
+##{ URI_OPTOUT_USME
+
+uri         URI_OPTOUT_USME   m,^https?://(?:quit|bye|remove|exit|leave|disallow|halt|stop|end|herego|out|discontinue)\d*\.[^/]+\.(?:us|me|mobi|club)\b,i
+describe    URI_OPTOUT_USME   Opt-out URI, unusual TLD
+tflags      URI_OPTOUT_USME   publish
+##} URI_OPTOUT_USME
+
+##{ URI_PHISH
+
+describe    URI_PHISH            Phishing using web form
+#score       URI_PHISH            4.00   # limit
+tflags      URI_PHISH            publish
+##} URI_PHISH
+
+##{ URI_PHISH if !plugin(Mail::SpamAssassin::Plugin::MIMEHeader)
+
+if !plugin(Mail::SpamAssassin::Plugin::MIMEHeader)
+  meta      URI_PHISH      __URI_PHISH && !ALL_TRUSTED && !__UNSUB_LINK && !__TAG_EXISTS_CENTER && !__HAS_SENDER && !__CAN_HELP && !__VIA_ML && !__UPPERCASE_URI && !__HAS_CC && !__NUMBERS_IN_SUBJ && !__PCT_FOR_YOU && !__MOZILLA_MSGID && !__FB_COST && !__hk_bigmoney
+endif
+##} URI_PHISH if !plugin(Mail::SpamAssassin::Plugin::MIMEHeader)
+
+##{ URI_PHISH ifplugin Mail::SpamAssassin::Plugin::MIMEHeader
+
+ifplugin Mail::SpamAssassin::Plugin::MIMEHeader
+  meta      URI_PHISH      __URI_PHISH && !ALL_TRUSTED && !__UNSUB_LINK && !__TAG_EXISTS_CENTER && !__HAS_SENDER && !__CAN_HELP && !__VIA_ML && !__UPPERCASE_URI && !__HAS_CC && !__NUMBERS_IN_SUBJ && !__PCT_FOR_YOU && !__MOZILLA_MSGID && !__FB_COST && !__hk_bigmoney && !__REMOTE_IMAGE
 endif
-##} URI_OBFU_WWW ifplugin Mail::SpamAssassin::Plugin::ReplaceTags
+##} URI_PHISH ifplugin Mail::SpamAssassin::Plugin::MIMEHeader
+
+##{ URI_TRY_3LD
 
-##{ VANITY
+uri         URI_TRY_3LD       m,^https?://(?:try|start|get(?!\.adobe)|save|check(?!out)|act|compare|join|learn|request|visit(?!or)|my(?!sub|turbotax)\w)[^.]*\.[^/]+\.(?:com|net)\b,i
+describe    URI_TRY_3LD       "Try it" URI, suspicious hostname
+#score       URI_TRY_3LD       2.000   # limit
+tflags      URI_TRY_3LD       publish
+##} URI_TRY_3LD
 
-meta VANITY		(__V_KNOWN_VANITY && (__V_NO_COST + __V_INFORM_YOU + __V_INNERCIRCLE + __V_SHMUCK + __V_EXECS_PROS + __V_PUB_DEADLINE + __V_REGISTRY + __V_NOMINATION + __V_BIOGRAPHY + __V_ACCOLADES + __V_RECOGNITION + __V_DISTINGUISHED + __V_EXCELLENCE + __V_ACHIEVEMENT > 3)) || (__V_BESTOFAWARD && (__V_SBCAVANITY || __V_USCAVANITY))
-describe VANITY Vanity or fake awards
-#score VANITY 2.3
-##} VANITY
+##{ URI_TRY_USME
+
+meta        URI_TRY_USME      __URI_TRY_USME && !__DKIM_EXISTS 
+describe    URI_TRY_USME      "Try it" URI, unusual TLD
+tflags      URI_TRY_USME      publish
+##} URI_TRY_USME
+
+##{ URI_WPADMIN
+
+meta        URI_WPADMIN        __URI_WPADMIN
+describe    URI_WPADMIN        WordPress login/admin URI, possible phishing
+tflags      URI_WPADMIN        publish
+##} URI_WPADMIN
+
+##{ URI_WP_DIRINDEX
+
+meta        URI_WP_DIRINDEX    __URI_WPDIRINDEX
+describe    URI_WP_DIRINDEX    URI for compromised WordPress site, possible malware
+#score       URI_WP_DIRINDEX    3.500   # limit
+tflags      URI_WP_DIRINDEX    publish
+##} URI_WP_DIRINDEX
+
+##{ URI_WP_HACKED
+
+meta        URI_WP_HACKED      (__URI_WPCONTENT || __URI_WPINCLUDES) && !__VIA_ML && !__HAS_ERRORS_TO && !__RCD_RDNS_SMTP && !__THREADED && !ALL_TRUSTED && !__NOT_SPOOFED 
+describe    URI_WP_HACKED      URI for compromised WordPress site, possible malware
+#score       URI_WP_HACKED      3.500   # limit
+tflags      URI_WP_HACKED      publish
+##} URI_WP_HACKED
+
+##{ URI_WP_HACKED_2
+
+meta        URI_WP_HACKED_2    (__PS_TEST_LOC_WP && !URI_WP_HACKED) && !__TO_EQ_FROM && !__THREADED 
+describe    URI_WP_HACKED_2    URI for compromised WordPress site, possible malware
+#score       URI_WP_HACKED_2    2.500   # limit
+tflags      URI_WP_HACKED_2    publish
+##} URI_WP_HACKED_2
+
+##{ USB_DRIVES
+
+meta       USB_DRIVES                 __SUBJ_USB_DRIVES
+describe   USB_DRIVES                 Trying to sell custom USB flash drives
+#score      USB_DRIVES                 2.000	# limit
+tflags     USB_DRIVES                 publish
+##} USB_DRIVES
 
 ##{ XM_PHPMAILER_FORGED
 
 meta        XM_PHPMAILER_FORGED    __XM_PHPMAILER_FORGED
 describe    XM_PHPMAILER_FORGED    Apparently forged header
+tflags      XM_PHPMAILER_FORGED    publish
 ##} XM_PHPMAILER_FORGED
 
+##{ XPRIO
+
+describe    XPRIO              Has X-Priority header
+#score       XPRIO              2.250	# limit
+tflags      XPRIO              publish
+##} XPRIO
+
+##{ XPRIO if !plugin(Mail::SpamAssassin::Plugin::DKIM)
+
+if !plugin(Mail::SpamAssassin::Plugin::DKIM)
+  meta      XPRIO              __XPRIO_MINFP
+endif
+##} XPRIO if !plugin(Mail::SpamAssassin::Plugin::DKIM)
+
+##{ XPRIO ifplugin Mail::SpamAssassin::Plugin::DKIM
+
+ifplugin Mail::SpamAssassin::Plugin::DKIM
+  tflags    XPRIO              net
+endif
+##} XPRIO ifplugin Mail::SpamAssassin::Plugin::DKIM
+
+##{ XPRIO ifplugin Mail::SpamAssassin::Plugin::DKIM if !plugin(Mail::SpamAssassin::Plugin::SPF)
+
+ifplugin Mail::SpamAssassin::Plugin::DKIM
+if !plugin(Mail::SpamAssassin::Plugin::SPF)
+    meta    XPRIO              __XPRIO_MINFP && !DKIM_SIGNED && !__DKIM_DEPENDABLE && !DKIM_VALID && !DKIM_VALID_AU && !RCVD_IN_DNSWL_NONE 
+endif
+endif
+##} XPRIO ifplugin Mail::SpamAssassin::Plugin::DKIM if !plugin(Mail::SpamAssassin::Plugin::SPF)
+
+##{ XPRIO ifplugin Mail::SpamAssassin::Plugin::DKIM ifplugin Mail::SpamAssassin::Plugin::SPF
+
+ifplugin Mail::SpamAssassin::Plugin::DKIM
+  ifplugin Mail::SpamAssassin::Plugin::SPF
+    meta    XPRIO              __XPRIO_MINFP && !DKIM_SIGNED && !__DKIM_DEPENDABLE && !DKIM_VALID && !DKIM_VALID_AU && !RCVD_IN_DNSWL_NONE && !SPF_PASS 
+endif
+endif
+##} XPRIO ifplugin Mail::SpamAssassin::Plugin::DKIM ifplugin Mail::SpamAssassin::Plugin::SPF
+
+##{ XPRIO_SHORT_SUBJ
+
+meta        XPRIO_SHORT_SUBJ   __XPRIO_SHORT_SUBJ && !__UNPARSEABLE_RELAY_COUNT && !__DKIM_EXISTS && !__RP_MATCHES_RCVD && !__SUBSCRIPTION_INFO && !__FROM_ENCODED_QP 
+describe    XPRIO_SHORT_SUBJ   Has X-Priority header + short subject
+#score       XPRIO_SHORT_SUBJ   2.500	# limit
+tflags      XPRIO_SHORT_SUBJ   publish
+##} XPRIO_SHORT_SUBJ
+
 ##{ X_MAILER_CME_6543_MSN
 
 header X_MAILER_CME_6543_MSN	X-Mailer =~ /^CME-V6\.5\.4\.3; MSN\s*$/
 ##} X_MAILER_CME_6543_MSN
 
-##{ YOUR_PERMISSION
-
-meta     YOUR_PERMISSION  __YOUR_PERM && !__CTYPE_HAS_BOUNDARY && !__DKIM_EXISTS && !__DOS_HAS_LIST_UNSUB && !__CT_TEXT_PLAIN && !__BUGGED_IMG && !__COMMENT_EXISTS
-describe YOUR_PERMISSION  With your permission...
-##} YOUR_PERMISSION
+##{ YOU_INHERIT
 
-##{ if !(! plugin (Mail::SpamAssassin::Plugin::URIDetail))_sandbox
-
-if !(! plugin (Mail::SpamAssassin::Plugin::URIDetail))
-  uri_detail T_KHOP_FOREIGN_CLICK	text =~ /\b(?:cli(?:quez\W|ck\Wa)ici\b|cli(?:cca\W|c\Wa|que\Wa)qu[^<.,a ]|klie?k(?:\Whi?er|ni(?:j|nite)\Wtu[tk]aj)\b)/i
+meta     YOU_INHERIT      __YOU_INHERIT
+describe YOU_INHERIT      Discussing your inheritance
+##} YOU_INHERIT
+
+##{ bayes_ignore_header_sandbox
+
+bayes_ignore_header X-ACL-Warn
+bayes_ignore_header X-Alimail-AntiSpam
+bayes_ignore_header X-Amavis-Modified
+bayes_ignore_header X-Anti-Spam
+bayes_ignore_header X-Anti-Virus
+bayes_ignore_header X-Anti-Virus-Version
+bayes_ignore_header X-AntiAbuse
+bayes_ignore_header X-Antispam
+bayes_ignore_header X-Antivirus
+bayes_ignore_header X-Antivirus-Code
+bayes_ignore_header X-Antivirus-Status
+bayes_ignore_header X-Antivirus-Version
+bayes_ignore_header x-aol-global-disposition
+bayes_ignore_header X-ASF-Spam-Status
+bayes_ignore_header X-ASG-Debug-ID
+bayes_ignore_header X-ASG-Orig-Subj
+bayes_ignore_header X-ASG-Recipient-Whitelist
+bayes_ignore_header X-ASG-Tag
+bayes_ignore_header X-Assp-Version
+bayes_ignore_header X-Authority-Analysis
+bayes_ignore_header X-Authvirus
+bayes_ignore_header X-Auto-Response-Suppress
+bayes_ignore_header X-AV-Do-Run
+bayes_ignore_header X-AV-Status
+bayes_ignore_header x-avast-antispam
+bayes_ignore_header X-Backend
+bayes_ignore_header X-Barracuda-Apparent-Source-IP
+bayes_ignore_header X-Barracuda-Bayes
+bayes_ignore_header X-Barracuda-BBL-IP
+bayes_ignore_header X-Barracuda-BRTS-Status
+bayes_ignore_header X-Barracuda-BRTS-URL-Found
+bayes_ignore_header X-Barracuda-Connect
+bayes_ignore_header X-Barracuda-Encrypted
+bayes_ignore_header X-Barracuda-Envelope-From
+bayes_ignore_header X-Barracuda-Fingerprint-Found
+bayes_ignore_header X-Barracuda-Orig-Rcpt
+bayes_ignore_header X-Barracuda-RBL-IP
+bayes_ignore_header X-Barracuda-RBL-Trusted-Forwarder
+bayes_ignore_header X-Barracuda-Spam-Report
+bayes_ignore_header X-Barracuda-Spam-Score
+bayes_ignore_header X-Barracuda-Spam-Status
+bayes_ignore_header X-Barracuda-Start-Time
+bayes_ignore_header X-Barracuda-UID
+bayes_ignore_header X-Barracuda-URL
+bayes_ignore_header X-Barracuda-Virus-Alert
+bayes_ignore_header X-Bayes-Prob
+bayes_ignore_header X-Bayesian-Result
+bayes_ignore_header X-BitDefender-Spam
+bayes_ignore_header X-BitDefender-SpamStamp
+bayes_ignore_header X-BL
+bayes_ignore_header X-Bogosity
+bayes_ignore_header X-Boxtrapper
+bayes_ignore_header X-Brightmail-Tracker
+bayes_ignore_header X-BTI-AntiSpam
+bayes_ignore_header X-Bugzilla-Version
+bayes_ignore_header X-CanIt-Geo
+bayes_ignore_header X-Canit-Stats-ID
+bayes_ignore_header X-CanItPRO-Stream
+bayes_ignore_header X-Clapf-spamicity
+bayes_ignore_header X-Cloud-Security
+bayes_ignore_header X-CM-Score
+bayes_ignore_header X-CMAE-Analysis
+bayes_ignore_header X-CMAE-Match
+bayes_ignore_header X-CMAE-Score
+bayes_ignore_header X-CMAE-Verdict
+bayes_ignore_header X-CNFS-Analysis
+bayes_ignore_header X-Company
+bayes_ignore_header X-Coremail-Antispam
+bayes_ignore_header X-CRM114-CacheID
+bayes_ignore_header X-CRM114-Status
+bayes_ignore_header X-CRM114-Version
+bayes_ignore_header X-CT-Spam
+bayes_ignore_header X-CTCH-SenderID
+bayes_ignore_header X-CTCH-SenderID-TotalBulk
+bayes_ignore_header X-CTCH-SenderID-TotalConfirmed
+bayes_ignore_header X-CTCH-SenderID-TotalMessages
+bayes_ignore_header X-CTCH-SenderID-TotalRecipients
+bayes_ignore_header X-CTCH-SenderID-TotalSpam
+bayes_ignore_header X-CTCH-SenderID-TotalSuspected
+bayes_ignore_header X-CTCH-SenderID-TotalVirus
+bayes_ignore_header X-CTCH-Spam
+bayes_ignore_header X-CTCH-VOD
+bayes_ignore_header X-Drweb-SpamState
+bayes_ignore_header X-DSPAM-Confidence
+bayes_ignore_header X-DSPAM-Factors
+bayes_ignore_header X-DSPAM-Improbability
+bayes_ignore_header X-DSPAM-Probability
+bayes_ignore_header X-DSPAM-Processed
+bayes_ignore_header X-DSPAM-Result
+bayes_ignore_header X-DSPAM-Signature
+bayes_ignore_header x-eavas
+bayes_ignore_header x-eavas-action
+bayes_ignore_header x-eavas-eavasid
+bayes_ignore_header X-Enigmail-Version
+bayes_ignore_header X-EsetId
+bayes_ignore_header X-EsetResult
+bayes_ignore_header X-Exchange-Antispam-Report
+bayes_ignore_header X-ExtloopSabreCommercials1
+bayes_ignore_header X-EYOU-SPAMVALUE
+bayes_ignore_header X-FB-OUTBOUND-SPAM
+bayes_ignore_header X-FEAS-SBL
+bayes_ignore_header X-FILTER-SCORE
+bayes_ignore_header X-Forefront-Antispam-Report
+bayes_ignore_header X-Forefront-PRVS
+bayes_ignore_header X-Fuglu-Spamstatus
+bayes_ignore_header X-Fuglu-Suspect
+bayes_ignore_header X-getmail-filter-classifier
+bayes_ignore_header X-GFIME-MASPAM
+bayes_ignore_header X-Gmane-NNTP-Posting-Host
+bayes_ignore_header X-GMX-Antispam
+bayes_ignore_header X-GMX-Antivirus
+bayes_ignore_header X-He-Spam
+bayes_ignore_header X-hMailServer-Spam
+bayes_ignore_header X-IAS
+bayes_ignore_header X-iGspam-global
+bayes_ignore_header X-Injected-Via-Gmane
+bayes_ignore_header X-Interia-Antivirus
+bayes_ignore_header X-IP-Spam-Verdict
+bayes_ignore_header X-Ironport
+bayes_ignore_header X-IronPort-Anti-Spam-Filtered
+bayes_ignore_header X-IronPort-Anti-Spam-Result
+bayes_ignore_header X-IronPort-AV
+bayes_ignore_header X-Ironport-HAT
+bayes_ignore_header X-Ironport-HOSTNAME
+bayes_ignore_header X-Ironport-LNR
+bayes_ignore_header X-Ironport-MessageFilter
+bayes_ignore_header X-Ironport-MFP
+bayes_ignore_header X-Ironport-MID
+bayes_ignore_header X-IronPort-Outgoing-Antispam
+bayes_ignore_header X-Ironport-RIF
+bayes_ignore_header X-Ironport-SBRS
+bayes_ignore_header X-Ironport-SENDER
+bayes_ignore_header X-Ironport-SUBJECT
+bayes_ignore_header X-Junk-Score
+bayes_ignore_header X-Junkmail
+bayes_ignore_header X-KLMS-AntiPhishing
+bayes_ignore_header X-Klms-Antispam
+bayes_ignore_header X-KLMS-AntiSpam-Info
+bayes_ignore_header X-KLMS-AntiSpam-Interceptor-Info
+bayes_ignore_header X-KLMS-AntiSpam-Lua-Profiles
+bayes_ignore_header X-KLMS-AntiSpam-Method
+bayes_ignore_header X-KLMS-AntiSpam-Moebius-Timestamps
+bayes_ignore_header X-KLMS-AntiSpam-Rate
+bayes_ignore_header X-KLMS-AntiSpam-Status
+bayes_ignore_header X-KLMS-AntiSpam-Version
+bayes_ignore_header X-KLMS-AntiVirus
+bayes_ignore_header X-KLMS-AntiVirus-Status
+bayes_ignore_header X-KLMS-Message-Action
+bayes_ignore_header X-KLMS-Rule-ID
+bayes_ignore_header X-KMail-EncryptionState
+bayes_ignore_header X-KMail-MDN-Sent
+bayes_ignore_header X-KMail-SignatureState
+bayes_ignore_header X-MailCleaner-SpamChec
+bayes_ignore_header X-MailCleaner-SpamCheck
+bayes_ignore_header X-MailFoundry
+bayes_ignore_header X-MDMailLookup-Result
+bayes_ignore_header X-ME-Bayesian
+bayes_ignore_header X-ME-Content
+bayes_ignore_header X-MessageFilter
+bayes_ignore_header X-Microsoft-Antispam
+bayes_ignore_header X-Mlf-Version
+bayes_ignore_header X-MXScan-AntiSpam
+bayes_ignore_header X-MXScan-AntiVirus
+bayes_ignore_header X-MXScan-Country-Sequence
+bayes_ignore_header X-MXScan-License
+bayes_ignore_header X-MXScan-Msgid
+bayes_ignore_header X-MXScan-ProcessingTime
+bayes_ignore_header X-MXScan-Scan
+bayes_ignore_header X-NAI-Spam-Flag
+bayes_ignore_header X-NAI-Spam-Rules
+bayes_ignore_header X-NAI-Spam-Score
+bayes_ignore_header X-NAI-Spam-Threshold
+bayes_ignore_header X-NetStation-Status
+bayes_ignore_header X-OVH-SPAMCAUSE
+bayes_ignore_header X-OVH-SPAMCAUSE:
+bayes_ignore_header X-OVH-SPAMSCORE
+bayes_ignore_header X-OVH-SPAMSTATE
+bayes_ignore_header X-PerlMx-Spam
+bayes_ignore_header X-PerlMx-Virus-Scanned
+bayes_ignore_header X-PFSI-Info
+bayes_ignore_header X-PMX-Spam
+bayes_ignore_header X-PMX-Version
+bayes_ignore_header X-Policy-Service
+bayes_ignore_header X-policyd-weight
+bayes_ignore_header X-PreRBLs
+bayes_ignore_header X-Probable-Spam
+bayes_ignore_header X-PROLinux-SpamCheck
+bayes_ignore_header X-Proofpoint-Spam-Reason
+bayes_ignore_header X-Proofpoint-Virus-Version
+bayes_ignore_header x-purgate-eavas: clean
+bayes_ignore_header x-purgate-id
+bayes_ignore_header x-purgate-size
+bayes_ignore_header x-purgate-type
+bayes_ignore_header X-Qmail-Scanner-Diagnostics
+bayes_ignore_header X-Qmail-Scanner-MOVED-X-Spam-Status
+bayes_ignore_header X-Quarantine-ID
+bayes_ignore_header X-RSpam-Report
+bayes_ignore_header X-SA-Do-Not-Run
+bayes_ignore_header X-SA-Exim-Version
+bayes_ignore_header X-Scanned-by
+bayes_ignore_header X-SmarterMail-CustomSpamHeader
+bayes_ignore_header X-Spam
+bayes_ignore_header X-Spam-Action
+bayes_ignore_header X-SPAM-AISP
+bayes_ignore_header X-Spam-Check-By
+bayes_ignore_header X-Spam-Checker-Version
+bayes_ignore_header X-Spam-CMAE-Analysis
+bayes_ignore_header X-Spam-CMAESCORE
+bayes_ignore_header X-Spam-CTCH-RefID
+bayes_ignore_header X-Spam-Flag
+bayes_ignore_header X-Spam-Level
+bayes_ignore_header X-Spam-Processed
+bayes_ignore_header X-Spam-Report
+bayes_ignore_header X-Spam-Scanned
+bayes_ignore_header X-Spam-Score
+bayes_ignore_header X-Spam-Score-Int
+bayes_ignore_header X-Spam-SmartLearn
+bayes_ignore_header X-Spam-Status
+bayes_ignore_header X-Spam-Threshold
+bayes_ignore_header X-Spam_bar
+bayes_ignore_header X-Spambayes-Classification
+bayes_ignore_header X-SpamExperts-Domain
+bayes_ignore_header X-SpamExperts-Outgoing-Class
+bayes_ignore_header X-SpamExperts-Outgoing-Evidence
+bayes_ignore_header X-SpamExperts-Username
+bayes_ignore_header X-Spamfilter-host
+bayes_ignore_header X-Spamina-Bogosity
+bayes_ignore_header X-Spamina-Spam-Report
+bayes_ignore_header X-Spamina-Spam-Score
+bayes_ignore_header X-SpamInfo
+bayes_ignore_header X-Spamsave
+bayes_ignore_header X-SpamTest-Group-ID
+bayes_ignore_header X-SpamTest-Info
+bayes_ignore_header X-SpamTest-Method
+bayes_ignore_header X-SpamTest-Rate
+bayes_ignore_header X-SpamTest-SPF
+bayes_ignore_header X-SpamTest-Status
+bayes_ignore_header X-SpamTest-Status-Extended
+bayes_ignore_header X-SPF-Scan-By
+bayes_ignore_header X-STA-Metric
+bayes_ignore_header X-STA-NotSpam
+bayes_ignore_header X-STA-Spam
+bayes_ignore_header X-StarScan-Version
+bayes_ignore_header X-SurGATE-Result
+bayes_ignore_header X-SWITCHham-Score
+bayes_ignore_header X-UI-Filterresults
+bayes_ignore_header X-UI-Loop
+bayes_ignore_header X-UI-Out-Filterresults
+bayes_ignore_header X-Univie-Spam-Checker-Version
+bayes_ignore_header X-Univie-Virus-Scan
+bayes_ignore_header X-Virus
+bayes_ignore_header X-Virus-Checker-Version
+bayes_ignore_header X-Virus-Scanned
+bayes_ignore_header X-Virus-Scanner-Result
+bayes_ignore_header X-Virus-Scanner-Version
+bayes_ignore_header X-Virus-Status
+bayes_ignore_header X-VirusChecked
+bayes_ignore_header X-VR-SCORE
+bayes_ignore_header X-VR-SPAMCAUSE
+bayes_ignore_header X-VR-STATUS
+bayes_ignore_header X-WatchGuard-Mail-Client-IP
+bayes_ignore_header X-WatchGuard-Mail-From
+bayes_ignore_header X-WatchGuard-Mail-Recipients
+bayes_ignore_header X-WatchGuard-Spam-ID
+bayes_ignore_header X-WatchGuard-Spam-Score
+bayes_ignore_header X-Whitelist-Domain
+bayes_ignore_header X-WUM-CCI
+bayes_ignore_header X_CMAE_Category##} bayes_ignore_header_sandbox
+
+##{ ifplugin Mail::SpamAssassin::Plugin::AskDNS_sandbox
+
+ifplugin Mail::SpamAssassin::Plugin::AskDNS
+askdns		__DKIMWL_WL_HI	_DKIMDOMAIN_.lookup.dkimwl.org A /^127\.\d+\.\d+\.5$/
+reuse		DKIMWL_WL_HIGH
+askdns		__DKIMWL_WL_MED	_DKIMDOMAIN_.lookup.dkimwl.org A /^127\.\d+\.\d+\.3$/
+reuse		DKIMWL_WL_MED
+askdns		DKIMWL_BL	_DKIMDOMAIN_.lookup.dkimwl.org A /^127\.\d+\.\d+\.0$/
+reuse		DKIMWL_BL
 endif
-##} if !(! plugin (Mail::SpamAssassin::Plugin::URIDetail))_sandbox
+##} ifplugin Mail::SpamAssassin::Plugin::AskDNS_sandbox
 
 ##{ ifplugin Mail::SpamAssassin::Plugin::DNSEval # {_sandbox
 
@@ -3120,60 +3603,6 @@
 ##{ ifplugin Mail::SpamAssassin::Plugin::ReplaceTags_sandbox
 
 ifplugin Mail::SpamAssassin::Plugin::ReplaceTags
-replace_rules __FRT_GOLD
-replace_rules __FRT_SILVER
-replace_inter W0 \w?
-replace_inter SP2 [\s\d_*\$\%(),.:;?!}{\[\]|\/?^\#~\xa1`'+-]?
-replace_tag   GX  [gk6]
-replace_tag   IX  [ilt|!1y?\xcc\xcd\xce\xcf\xec\xed\xee\xef]
-replace_tag   SX  [sz5\xa6\xa7]
-replace_tag   TX  [t|]
-replace_tag   UX [u\xb5\xd9\xda\xdb\xdc\xfc\xfb\xfa\xf9\xfd]
-replace_tag   WX  (?:[wv]|vv)
-replace_rules T_FRT_ABSOLUT
-replace_rules FRT_ADOBE2
-replace_rules T_FRT_ADULT2
-replace_rules FRT_APPROV
-replace_rules T_FRT_BEFORE
-replace_rules T_FRT_BELOW2
-replace_rules FRT_BIGGERMEM1
-replace_rules T_FRT_CANSPAM
-replace_rules T_FRT_CLICK
-replace_rules T_FRT_COCK
-replace_rules T_FRT_CONTACT
-replace_rules FRT_DISCOUNT
-replace_rules T_FRT_ERECTION
-replace_rules T_FRT_ESTABLISH
-replace_rules T_FRT_EXPERIENCE
-replace_rules T_FRT_FOLLOW1
-replace_rules T_FRT_FOLLOW2
-replace_rules T_FRT_FREE
-replace_rules T_FRT_FRIEND
-replace_rules T_FRT_FUCK1
-replace_rules T_FRT_HEALTH
-replace_rules T_FRT_HOUR
-replace_rules T_FRT_INCOME
-replace_rules T_FRT_INTEREST
-replace_rules T_FRT_LITTLE
-replace_rules T_FRT_LOLITA1
-replace_rules FRT_OFFER2
-replace_rules T_FRT_OPPORTUN1
-replace_rules T_FRT_PACKAGE
-replace_rules T_FRT_PAYMENT
-replace_rules FRT_PENIS1
-replace_rules T_FRT_PHARMAC
-replace_rules T_FRT_POSSIBLE
-replace_rules FRT_PRICE
-replace_rules T_FRT_PROFILE1
-replace_rules T_FRT_PROFILE2
-replace_rules T_FRT_PROFIT1
-replace_rules T_FRT_PROFIT2
-replace_rules T_FRT_PUSSY
-replace_rules FRT_ROLEX
-replace_rules T_FRT_SLUT
-replace_rules T_FRT_STOCK1
-replace_rules T_FRT_STOCK2
-replace_rules T_FRT_VIRGIN1
 replace_rules T_FUZZY_SPRM
 replace_rules FUZZY_MERIDIA
 replace_rules TVD_FUZZY_PHARMACEUTICAL
@@ -3187,17 +3616,17 @@
   replace_tag FF_LNNO   (?:(?:\d{1,3}(?:[)}\]:.,]{1,80}|(?:st|nd|rd|th)[)}\]:.,]{0,3})|\W?\([\div]{1,5}\)|\W?\{\d{1,3}\}|\[\d{1,3}\]|\*{1,5}|\#{1,5}|\(?[A-K][)}\]:.,]{1,3})\s?)
   replace_tag FF_YOUR   (?:a?\s?copy\sof\s)?(?:(?:your|din|seu|twoje)[\s,:]{1,5})?(?:present\s|c[uo]rrent\s|full(?:st[\xe4]ndigt)?\s?|complete\s|direct\s|private?\s|valid\s|personal\s|nuvarande\s|vollst[\xe4]ndige\s|aktuelle\s|pe\s(?:ne\s)?){0,3}
   replace_tag ANDOR     (?:\s?[\/&+,]\s?|\sor\s|\sand?\s)
-  replace_tag NUMBER    (?:(?:ruf)?num(?:[bm]er)?s?|nos?\.|no\b|n[\xb0]|\#s?|nbrs?\.?)
+  replace_tag NUMBER    (?:(?:ruf)?num(?:[bm]er)?\(?s?\)?|nos?\.|no\b|n[\xb0]|\#s?|nbrs?\.?)
   replace_tag FF_SUFFIX (?:\sin\s(?:full|words)|\scompleto)?:?(?:\s?[({][^)}]{1,30}[)}])?
   replace_tag FF_BLANK1 (?:[\s:;]{0,4}(?:(?:[-=_.,:;*\s\x85]|&\#\d{1,3};|[\xe2][\x80][\xa6]){3,100}))
   replace_tag FF_BLANK2 (?:[^-=_.,:;*\w]{0,3}(?:[-=_.,:;*\s\x85]|&\#\d{1,3};|[\xe2][\x80][\xa6]){1,100})
-  replace_tag FF_A1 (?:(?:countr?y|city|province|ter+itory|(?:zip|postal)(?:\s?code)?|st?ates?|ad+res+e?)<ANDOR>?){1,3}(?:\sof\s(?:residence|birth|employment|citizenship|origin))?
+  replace_tag FF_A1 (?:(?:countr?y|city|province|ter+itory|(?:zip|post(?:al)?)(?:\s?code)?|st?ates?|ad+res+e?)<ANDOR>?){1,3}(?:\sof\s(?:residence|birth|employment|citizenship|origin))?
   replace_tag FF_A2 (?:(?:contact|full|house|home|resident[ia]+l|busines+|mailing|work|delivery|ship+ing|post(?:al)?|of+ice|e-?mail|bostads|wohn)<ANDOR>?){0,3}\s?(?:ad+res+[es]{0,2}|location|endere[\xe7]o)(?:\sline)?(?:\s[0-9])?
   replace_tag FF_N1 (?:company|first|last|all|busines+|legal|ben[ei]ficiary|user|vollstaendigen)?\s?(?:name?[sn]?|navne|nome|nazwy)(?:<ANDOR>ad+res+)?
   replace_tag FF_P1 (?:(?:(?:busines+|contact|fax|voice|house|home|mobile?|cel+(?:ular)?|of+ice|tel+e?(?:\s?(?:ph|f)one?)?|(?:ph|f)one|private)(?:\s(?:ph|f)one)?<ANDOR>?){1,3}(?:\s?<NUMBER>)?<ANDOR>?){1,3}
   replace_tag FF_M1 (?:(?:ages?|marital\s?statu[se]|sex|gender|male\sor\sfemale|(?:date\s(?:of\s)?)?birth|religion|nationality|(?:user )?email|next\sof\skin|alter|staatsangehoerigkeit|nationalitet|idade|weik)<ANDOR>?){1,3}
   replace_tag FF_L1 (?:(?:previous\s)?work(?:ing)\s?experience|employment|position|profes+ion|(?:monthly|an+ual)?\s?income|purpose\sof\sl(?:oa|ao)n|an+ual\sturn\s?over|l(?:oa|ao)n\sduration|oc+up[ae]tion(?:\/position)?s?|(?:l(?:oa|ao)n\s|the\s)?amount(?:\sneed(ed)?|\sdesired)?(?:\s(?:as|of)\sloan)?|beruf|zaw(?:=F3|[\xf3])d)
-  replace_tag FF_F1 (?:(?:bank|beneficiary|billing|acc(?:oun)?t|rout(?:ing)?|swift|receiver|user)<ANDOR>?){1,3}\s(?:(?:name|ad+res+(?:es)?|location|code|details|a\/c|<NUMBER>)<ANDOR>?){1,3}
+  replace_tag FF_F1 (?:(?:bank(?:ing)?|beneficiary|billing|acc(?:oun)?t|rout(?:ing)?|swift|receiver|user)<ANDOR>?){1,3}\s(?:(?:name|ad+res+(?:es)?|location|code|details|institution|a\/c|<NUMBER>)<ANDOR>?){1,3}
   replace_tag FF_F2 (?:(?:(?:international\s)?driver'?s?\sli[sc]+(?:en[sc]e)?|pas+\s?port|id\scard|[ia]d(?:entification|entity)(?:\s(?:card|<NUMBER>|papers?))?)<ANDOR>?){1,3}(?:\s<NUMBER>)?
   replace_tag FF_F3 (?:picture|zdj\scie|test\squestion|answer|amount\swon|(?:inheritance\s)?funds?\svalue|(?:e-?mail\s)?pas+word|e-?mai?l\sid|amount\s[\w\s]{0,30}lost[\w\s]{0,15})
   replace_tag FF_F4 (?:log[-\s]?in|(?:e-?mail\s)?user)\s?names?
@@ -3211,31 +3640,73 @@
   replace_rules   __FILL_THIS_FORM_SHORT2
   replace_rules   __FILL_THIS_FORM_LOAN1
   replace_rules   __FILL_THIS_FORM_FRAUD_PHISH1
-  replace_tag  CURRENCY   [\(\[]?(?:\bU[Ss][D\$]{0,2}|\$(?:US)?|usd|GBP|=[Aa][34]|\xa3|&\#16[34];|(?i:pounds\ssterling)|\xa4|EUR(?:OS)?|(?:d')?[Ee]uro?s?|(?i:eur)\sde|CHF|FCFA|d[\xf3]lares\sde\slos\sE+\.\s?U+\.)[\]\)]?
+  replace_tag  CURRENCY   [\(\[]?(?:\bU[Ss][D\$]{0,2}|\$(?:US)?|usd|CAD|GBP|=[Aa][34]|\xa3|&\#16[34];|(?i:pounds\ssterling)|\xa4|EUR(?:OS)?|(?:d')?[Ee]uro?s?|(?i:eur)\sde|CHF|FCFA|d[\xf3]lares\sde\slos\sE+\.\s?U+\.)[\]\)]?
   replace_tag  GB_UK      \b(?:U\.?K\.?|(?:Great\s)?Brit(?:ain|ish)|G\.?B\.?)\b
   replace_rules   __LOTSA_MONEY_00 __LOTSA_MONEY_01 __LOTSA_MONEY_02 __LOTSA_MONEY_03 __LOTSA_MONEY_04
   replace_tag  PERCENT      \b(?:\d\d|ten|[a-z]+teen|(?:twen|thir|fou?r|fif)ty(?:-?[a-z]+)?)\s?(?:%|percent)
   replace_rules  __PCT_FOR_YOU_1 __PCT_FOR_YOU_2 __PCT_FOR_YOU_3 __PCT_OF_PMTS
   replace_rules  T_FUZZY_OPTOUT
 	replace_rules                  __FRT_PRICE
-replace_rules URI_OBFU_WWW
+  replace_rules FUZZY_UNSUBSCRIBE
+  replace_rules FUZZY_ANDROID
+  replace_rules FUZZY_PROMOTION
+  replace_rules FUZZY_PRIVACY
+  replace_rules FUZZY_BROWSER
+  replace_rules FUZZY_SAVINGS
+  replace_rules FUZZY_IMPORTANT
+  replace_rules FUZZY_SECURITY
+  replace_rules __FUZZY_DR_OZ
+  replace_rules FUZZY_CLICK_HERE
+  replace_rules FUZZY_BITCOIN   
+  replace_rules FUZZY_WALLET    
 replace_rules T_LFUZ_PWRMALE
 endif
 ##} ifplugin Mail::SpamAssassin::Plugin::ReplaceTags_sandbox
 
+##{ ifplugin Mail::SpamAssassin::Plugin::URIDNSBL_sandbox
+
+ifplugin Mail::SpamAssassin::Plugin::URIDNSBL
+reuse URIBL_RHS_DOB
+endif
+##} ifplugin Mail::SpamAssassin::Plugin::URIDNSBL_sandbox
+
 ##{ redirector_pattern_sandbox
 
 redirector_pattern m'/(?:index.php)?\?.*(?<=[?&])URL=(.*?)(?:$|[&\#])'i
-redirector_pattern m'^http:/*(?:\w+\.)?google(?:\.\w{2,3}){1,2}/url\?.*?(?<=[?&])q=(.*?)(?:$|[&\#])'i
-redirector_pattern m'^http:/*(?:\w+\.)?google(?:\.\w{2,3}){1,2}/search\?.*?(?<=[?&])q=[^&]*?(?<=%20|..[=+\s])(?:site|inurl):(.*?)(?:$|%20|[\s+&\#])'i
-redirector_pattern m'^http:/*(?:\w+\.)?google(?:\.\w{2,3}){1,2}/search\?.*?(?<=[?&])q=[^&]*?(?<=%20|..[=+\s])(?:"|%22)(.*?)(?:$|%22|["\s+&\#])'i
-redirector_pattern m'^http:/*(?:\w+\.)?google(?:\.\w{2,3}){1,2}/translate\?.*?(?<=[?&])u=(.*?)(?:$|[&\#])'i
-redirector_pattern m'^http:/*(?:\w+\.)?google(?:\.\w{2,3}){1,2}/pagead/iclk\?.*?(?<=[?&])adurl=(.*?)(?:$|[&\#])'i
-redirector_pattern m'^http:/*(?:\w+\.)?aol\.com/redir\.adp\?.*(?<=[?&])_url=(.*?)(?:$|[&\#])'i
+redirector_pattern m'^https?:/*(?:\w+\.)?google(?:\.\w{2,3}){1,2}/url\?.*?(?<=[?&])q=(.*?)(?:$|[&\#])'i
+redirector_pattern m'^https?:/*(?:\w+\.)?google(?:\.\w{2,3}){1,2}/search\?.*?(?<=[?&])q=[^&]*?(?<=%20|..[=+\s])(?:site|inurl):(.*?)(?:$|%20|[\s+&\#])'i
+redirector_pattern m'^https?:/*(?:\w+\.)?google(?:\.\w{2,3}){1,2}/search\?.*?(?<=[?&])q=[^&]*?(?<=%20|..[=+\s])(?:"|%22)(.*?)(?:$|%22|["\s+&\#])'i
+redirector_pattern m'^https?:/*(?:\w+\.)?google(?:\.\w{2,3}){1,2}/translate\?.*?(?<=[?&])u=(.*?)(?:$|[&\#])'i
+redirector_pattern m'^https?:/*(?:\w+\.)?google(?:\.\w{2,3}){1,2}/pagead/iclk\?.*?(?<=[?&])adurl=(.*?)(?:$|[&\#])'i
+redirector_pattern m'^https?:/*(?:\w+\.)?aol\.com/redir\.adp\?.*(?<=[?&])_url=(.*?)(?:$|[&\#])'i
 redirector_pattern m'^https?/*(?:\w+\.)?facebook\.com/l/;(.*)'i
 ##} redirector_pattern_sandbox
 
 
+uri         __128_HEX_URI     m,/[0-9a-f]{128},
+
+uri         __45_ALNUM_IMG      m;/[0-9a-z]{45,}/\w+\.(?:png|gif|jpe?g)$;i
+
+header __5_SUBDOM X-Spam-Relays-External =~ /^[^\]]+ rdns=(?:[^. ]*\.){6,}\w+ /
+
+body        __ACCESS_RESTORE     /\bto (?:(?:restore|regain) access|(?:remove|uplift) (?:the|this) suspens|continue using your (?:account|online))/i
+
+body        __ACCESS_REVOKE      /(?:temporary|permanent) (?:de-?activation|removal) of your (?:\w{1,30} )?(?:access|account)/i
+
+body        __ACCESS_SUSPENDED   /\b?(:(?:access|account) has been (?:temporar(?:il)?y )(?:suspended|blocked|locked)|suspend (?:you from|your) access(?:ing)?)\b/i
+
+body        __ACCOUNT_DISRUPT    /ensure (?:that )?your (?:account|access) is not (?:disrupted|suspended|interrupted)/i
+
+body        __ACCOUNT_ERROR      /your account (?:is|appears to be) (?:incorrect|missing|in error|invalid)/i
+
+body        __ACCOUNT_REACTIV    /(?:(?:account|access) (?:has been )?(?:successfully )?(?:reviewed and )?re-?(?:activat(?:ion|ed)|new(?:al|ed))|(?:unlock|re-?activate|restore|recover) (?:your|the|this) (?:account|access))/i
+
+body        __ACCOUNT_UPGRADE    /(?:upgrade (?:of )your (?:account|access)|your (?:access|account) is[\w\s]{0,40}being upgraded)/i
+
+meta        __ACCT_PHISH         (__ACCESS_SUSPENDED + __ACCESS_RESTORE + __ACCESS_REVOKE + __VERIFY_ACCOUNT + __FAILED_LOGINS + __ACCOUNT_REACTIV + __SECURITY_DEPT + __ACCOUNT_ERROR + __ACCOUNT_DISRUPT + __ACCOUNT_UPGRADE) > 1 && !__ACCT_PHISH_MANY
+
+meta        __ACCT_PHISH_MANY    (__ACCESS_SUSPENDED + __ACCESS_RESTORE + __ACCESS_REVOKE + __VERIFY_ACCOUNT + __FAILED_LOGINS + __ACCOUNT_REACTIV + __SECURITY_DEPT + __ACCOUNT_ERROR + __ACCOUNT_DISRUPT + __ACCOUNT_UPGRADE) > 3
+
 body        __ACH_CANCELLED_01     /\b(?:(?-i:ACH)|dividend)[-_ ](?:payment|transfer|transaction|was)[-_ ](?:(?:was|is)[-_ ])?(?:rejected|cancel+ed|declined|disabled|not[-_ ]accepted|(?:technical )?error)/i
 
 body        __ACH_CANCELLED_02     /(?:rejected|cancel+ed|declined|your)[-_ ](?:(?-i:ACH)|direct[-_ ]deposit)[-_ ](?:payment|transfer|transaction|declin(?:ed|ing))/i
@@ -3248,37 +3719,71 @@
 	meta         __ACH_CANCELLED_EXE (__ACH_CANCELLED_01 || __ACH_CANCELLED_02 || __ACH_CANCELLED_03 || __ACH_CANCELLED_04) && __EXE_ATTACH
 endif
 
-meta      __ADVANCE_FEE_2_NEW  (__AFRICAN_STATE + __ATM_CARD + __BACK_SCRATCH +  __CONTACT_YOU + __COURIER + __DEAD_PARENT + __DEAL + DEAR_BENEFICIARY + DEAR_WINNER + __DECEASED + __DESTROY_ME + __DIPLOMATIC + __DORMANT_ACCT + __EARLY_DEMISE + __EX_CUSTOMER + __FOUND_YOU + __FRAUD_AON + __FRAUD_AUM + __FRAUD_AXF + __FRAUD_BEP + __FRAUD_BGP + __FRAUD_CKF + __FRAUD_DPR + __FRAUD_FVU + __FRAUD_GBW + __FRAUD_IPK + __FRAUD_IRT + __FRAUD_JNB + __FRAUD_JYG + __FRAUD_MCQ + __FRAUD_MLY + __FRAUD_MQO + __FRAUD_NEB + __FRAUD_QFY + __FRAUD_QXX + __FRAUD_SNT + __FRAUD_ULK + __FRAUD_UOQ + __FRAUD_VQE + __FRAUD_WDR + __FRAUD_WFC + __FRAUD_XJR + __FRAUD_XWW + __FRAUD_YPO + __FRAUD_YQV + __I_INHERIT + __INTL_BANK + __INVEST_MONEY + __IS_LEGAL + __I_WILL_YOU + __KAM_LOTTO2 + LOTTO_AGENT + LOTTO_AGENT_RPLY + __LOTTO_DEPT + __LOTTO_RELATED + T_LOTTO_URI + __LOTTO_WIN_01 + __LOTTO_WINNINGS + __LUCKY_WINNER + __NEXT_OF_KIN + __NOT_DEAD_YET + __PCT_OF_PMTS + __SCAM + __SHARE_IT + __THEY_INHERIT +  UNCLAIMED_MONEY + __WIDOW + __WILL_LEGAL + __XFER_MONEY + __YOU_ASSIST + __YOU_INHERIT + __YOUR_FUND + __YOUR_PERM + __YOU_WON > 1) && !__THREAD_INDEX_GOOD
+uri __AC_1SEQC_URI	/\/1[a-z0-9]8[a-z0-9_]{20,}\/C\//
+
+uri __AC_1SEQV_URI	/\/1[a-z0-9]8[a-z0-9_]{20,}\/V\//
 
-meta      __ADVANCE_FEE_2_NEW_FORM  __FILL_THIS_FORM && __ADVANCE_FEE_2_NEW
+uri __AC_CHDSEQ_URI	/\/chd[a-z0-9]{20,}/
 
-meta      __ADVANCE_FEE_2_NEW_FRM_MNY  __FILL_THIS_FORM && LOTS_OF_MONEY && __ADVANCE_FEE_2_NEW
+uri __AC_LAND_URI	/\/land\//
 
-meta      __ADVANCE_FEE_2_NEW_MONEY  LOTS_OF_MONEY && __ADVANCE_FEE_2_NEW
+uri __AC_LONGSEQ_URI	/\/[A-Z0-9]{50,}\.(?:php|html|cgi)\b/
 
-meta      __ADVANCE_FEE_3_NEW  (__AFRICAN_STATE + __ATM_CARD + __BACK_SCRATCH +  __CONTACT_YOU + __COURIER + __DEAD_PARENT + __DEAL + DEAR_BENEFICIARY + DEAR_WINNER + __DECEASED + __DESTROY_ME + __DIPLOMATIC + __DORMANT_ACCT + __EARLY_DEMISE + __EX_CUSTOMER + __FOUND_YOU + __FRAUD_AON + __FRAUD_AUM + __FRAUD_AXF + __FRAUD_BEP + __FRAUD_BGP + __FRAUD_CKF + __FRAUD_DPR + __FRAUD_FVU + __FRAUD_GBW + __FRAUD_IPK + __FRAUD_IRT + __FRAUD_JNB + __FRAUD_JYG + __FRAUD_MCQ + __FRAUD_MLY + __FRAUD_MQO + __FRAUD_NEB + __FRAUD_QFY + __FRAUD_QXX + __FRAUD_SNT + __FRAUD_ULK + __FRAUD_UOQ + __FRAUD_VQE + __FRAUD_WDR + __FRAUD_WFC + __FRAUD_XJR + __FRAUD_XWW + __FRAUD_YPO + __FRAUD_YQV + __I_INHERIT + __INTL_BANK + __INVEST_MONEY + __IS_LEGAL + __I_WILL_YOU + __KAM_LOTTO2 + LOTTO_AGENT + LOTTO_AGENT_RPLY + __LOTTO_DEPT + __LOTTO_RELATED + T_LOTTO_URI + __LOTTO_WIN_01 + __LOTTO_WINNINGS + __LUCKY_WINNER + __NEXT_OF_KIN + __NOT_DEAD_YET + __PCT_OF_PMTS + __SCAM + __SHARE_IT + __THEY_INHERIT +  UNCLAIMED_MONEY + __WIDOW + __WILL_LEGAL + __XFER_MONEY + __YOU_ASSIST + __YOU_INHERIT + __YOUR_FUND + __YOUR_PERM + __YOU_WON > 2) && !__THREAD_INDEX_GOOD
+uri __AC_MHDSEQ_URI	/\/mhd[a-z0-9]{20,}/
 
-meta      __ADVANCE_FEE_3_NEW_FORM  __FILL_THIS_FORM && __ADVANCE_FEE_3_NEW
+uri __AC_NDOMLONGNASPX_URI	/[A-Za-z]+[0-9]{2}\.[A-Za-z0-9-]+\.me\/(?:[A-Za-z0-9-]{10,}\/){2}[0-9]{8,}\/[A-Za-z]+\.aspx/
+
+uri __AC_NUMS_URI	/(?:\/[0-9]+){5}\.[0-9a-zA-Z]+\.(:?php|html)\b/
+
+uri __AC_OUTI_URI	/\/outi\b/
+
+uri __AC_OUTL_URI	/\/outl\b/
+
+uri __AC_PHPOFFSUB_URI	/\/php\/off\/[0-9.]+\/sub\//
+
+uri __AC_PHPOFFTOP_URI	/\/php\/off\/[0-9.]+\/top\//
+
+uri __AC_PUNCTNUMS_URI	/\.com\/[A-Za-z+=\/.?_-]{4,}[0-9]{9,12}[a-z0-9]{1,2}[A-Za-z+=\/.?_-]+[0-9]{7,9}[A-Za-z+=\/.?_-]{6,}[0-9]{7,9}\b/
+
+uri __AC_REPORT_URI	/\/report\//
+
+uri __AC_RMOVE_URI	/\/r\/move\/[0-9]+\//
+
+uri __AC_UHDSEQ_URI	/\/uhd[a-z0-9]{20,}/
+
+uri __AC_UNSUB_URI	/\/unsub\//
+
+body        __ADMAIL          /(?:\b|_)ad-?(?:mail|message)s?(?:\b|_)/i
+
+meta      __ADVANCE_FEE_2_NEW  (__AFRICAN_STATE + __ATM_CARD + __BACK_SCRATCH +  __CONTACT_YOU + __COURIER + __DEAD_PARENT + __DEAL + DEAR_BENEFICIARY + DEAR_WINNER + __DECEASED + __DESTROY_ME + __DIPLOMATIC + __DORMANT_ACCT + __EARLY_DEMISE + __EX_CUSTOMER + __FOUND_YOU + __FRAUD_AON + __FRAUD_AUM + __FRAUD_AXF + __FRAUD_BEP + __FRAUD_BGP + __FRAUD_CKF + __FRAUD_DPR + __FRAUD_FVU + __FRAUD_GBW + __FRAUD_IPK + __FRAUD_IRT + __FRAUD_JNB + __FRAUD_JYG + __FRAUD_MCQ + __FRAUD_MLY + __FRAUD_MQO + __FRAUD_NEB + __FRAUD_QFY + __FRAUD_QXX + __FRAUD_SNT + __FRAUD_ULK + __FRAUD_UOQ + __FRAUD_VQE + __FRAUD_WDR + __FRAUD_WFC + __FRAUD_XJR + __FRAUD_XWW + __FRAUD_YPO + __FRAUD_YQV + __I_INHERIT + __INTL_BANK + __INVEST_MONEY + __IS_LEGAL + __I_WILL_YOU + __KAM_LOTTO2 + LOTTO_AGENT + T_LOTTO_AGENT_RPLY + __LOTTO_DEPT + __LOTTO_RELATED + T_LOTTO_URI + __LOTTO_WIN_01 + __LOTTO_WINNINGS + __LUCKY_WINNER + __NEXT_OF_KIN + __NOT_DEAD_YET + __PCT_OF_PMTS + __SCAM + __SHARE_IT + __THEY_INHERIT +  UNCLAIMED_MONEY + __WIDOW + __WILL_LEGAL + __XFER_MONEY + __YOU_ASSIST + __YOU_INHERIT + __YOUR_FUND + __YOUR_PERM + __YOU_WON > 1) && !__THREAD_INDEX_GOOD
+
+meta      __ADVANCE_FEE_2_NEW_FORM  __FILL_THIS_FORM && !LOTS_OF_MONEY && __ADVANCE_FEE_2_NEW
+
+meta      __ADVANCE_FEE_2_NEW_MONEY  !__FILL_THIS_FORM && LOTS_OF_MONEY && __ADVANCE_FEE_2_NEW
+
+meta      __ADVANCE_FEE_3_NEW  (__AFRICAN_STATE + __ATM_CARD + __BACK_SCRATCH +  __CONTACT_YOU + __COURIER + __DEAD_PARENT + __DEAL + DEAR_BENEFICIARY + DEAR_WINNER + __DECEASED + __DESTROY_ME + __DIPLOMATIC + __DORMANT_ACCT + __EARLY_DEMISE + __EX_CUSTOMER + __FOUND_YOU + __FRAUD_AON + __FRAUD_AUM + __FRAUD_AXF + __FRAUD_BEP + __FRAUD_BGP + __FRAUD_CKF + __FRAUD_DPR + __FRAUD_FVU + __FRAUD_GBW + __FRAUD_IPK + __FRAUD_IRT + __FRAUD_JNB + __FRAUD_JYG + __FRAUD_MCQ + __FRAUD_MLY + __FRAUD_MQO + __FRAUD_NEB + __FRAUD_QFY + __FRAUD_QXX + __FRAUD_SNT + __FRAUD_ULK + __FRAUD_UOQ + __FRAUD_VQE + __FRAUD_WDR + __FRAUD_WFC + __FRAUD_XJR + __FRAUD_XWW + __FRAUD_YPO + __FRAUD_YQV + __I_INHERIT + __INTL_BANK + __INVEST_MONEY + __IS_LEGAL + __I_WILL_YOU + __KAM_LOTTO2 + LOTTO_AGENT + T_LOTTO_AGENT_RPLY + __LOTTO_DEPT + __LOTTO_RELATED + T_LOTTO_URI + __LOTTO_WIN_01 + __LOTTO_WINNINGS + __LUCKY_WINNER + __NEXT_OF_KIN + __NOT_DEAD_YET + __PCT_OF_PMTS + __SCAM + __SHARE_IT + __THEY_INHERIT +  UNCLAIMED_MONEY + __WIDOW + __WILL_LEGAL + __XFER_MONEY + __YOU_ASSIST + __YOU_INHERIT + __YOUR_FUND + __YOUR_PERM + __YOU_WON > 2) && !__THREAD_INDEX_GOOD
+
+meta      __ADVANCE_FEE_3_NEW_FORM  __FILL_THIS_FORM && !LOTS_OF_MONEY && __ADVANCE_FEE_3_NEW
 
 meta      __ADVANCE_FEE_3_NEW_FRM_MNY  __FILL_THIS_FORM && LOTS_OF_MONEY && __ADVANCE_FEE_3_NEW
 
-meta      __ADVANCE_FEE_3_NEW_MONEY  LOTS_OF_MONEY && __ADVANCE_FEE_3_NEW
+meta      __ADVANCE_FEE_3_NEW_MONEY  !__FILL_THIS_FORM && LOTS_OF_MONEY && __ADVANCE_FEE_3_NEW
 
-meta      __ADVANCE_FEE_4_NEW  (__AFRICAN_STATE + __ATM_CARD + __BACK_SCRATCH +  __CONTACT_YOU + __COURIER + __DEAD_PARENT + __DEAL + DEAR_BENEFICIARY + DEAR_WINNER + __DECEASED + __DESTROY_ME + __DIPLOMATIC + __DORMANT_ACCT + __EARLY_DEMISE + __EX_CUSTOMER + __FOUND_YOU + __FRAUD_AON + __FRAUD_AUM + __FRAUD_AXF + __FRAUD_BEP + __FRAUD_BGP + __FRAUD_CKF + __FRAUD_DPR + __FRAUD_FVU + __FRAUD_GBW + __FRAUD_IPK + __FRAUD_IRT + __FRAUD_JNB + __FRAUD_JYG + __FRAUD_MCQ + __FRAUD_MLY + __FRAUD_MQO + __FRAUD_NEB + __FRAUD_QFY + __FRAUD_QXX + __FRAUD_SNT + __FRAUD_ULK + __FRAUD_UOQ + __FRAUD_VQE + __FRAUD_WDR + __FRAUD_WFC + __FRAUD_XJR + __FRAUD_XWW + __FRAUD_YPO + __FRAUD_YQV + __I_INHERIT + __INTL_BANK + __INVEST_MONEY + __IS_LEGAL + __I_WILL_YOU + __KAM_LOTTO2 + LOTTO_AGENT + LOTTO_AGENT_RPLY + __LOTTO_DEPT + __LOTTO_RELATED + T_LOTTO_URI + __LOTTO_WIN_01 + __LOTTO_WINNINGS + __LUCKY_WINNER + __NEXT_OF_KIN + __NOT_DEAD_YET + __PCT_OF_PMTS + __SCAM + __SHARE_IT + __THEY_INHERIT +  UNCLAIMED_MONEY + __WIDOW + __WILL_LEGAL + __XFER_MONEY + __YOU_ASSIST + __YOU_INHERIT + __YOUR_FUND + __YOUR_PERM + __YOU_WON > 3) && !__THREAD_INDEX_GOOD
+meta      __ADVANCE_FEE_4_NEW  (__AFRICAN_STATE + __ATM_CARD + __BACK_SCRATCH +  __CONTACT_YOU + __COURIER + __DEAD_PARENT + __DEAL + DEAR_BENEFICIARY + DEAR_WINNER + __DECEASED + __DESTROY_ME + __DIPLOMATIC + __DORMANT_ACCT + __EARLY_DEMISE + __EX_CUSTOMER + __FOUND_YOU + __FRAUD_AON + __FRAUD_AUM + __FRAUD_AXF + __FRAUD_BEP + __FRAUD_BGP + __FRAUD_CKF + __FRAUD_DPR + __FRAUD_FVU + __FRAUD_GBW + __FRAUD_IPK + __FRAUD_IRT + __FRAUD_JNB + __FRAUD_JYG + __FRAUD_MCQ + __FRAUD_MLY + __FRAUD_MQO + __FRAUD_NEB + __FRAUD_QFY + __FRAUD_QXX + __FRAUD_SNT + __FRAUD_ULK + __FRAUD_UOQ + __FRAUD_VQE + __FRAUD_WDR + __FRAUD_WFC + __FRAUD_XJR + __FRAUD_XWW + __FRAUD_YPO + __FRAUD_YQV + __I_INHERIT + __INTL_BANK + __INVEST_MONEY + __IS_LEGAL + __I_WILL_YOU + __KAM_LOTTO2 + LOTTO_AGENT + T_LOTTO_AGENT_RPLY + __LOTTO_DEPT + __LOTTO_RELATED + T_LOTTO_URI + __LOTTO_WIN_01 + __LOTTO_WINNINGS + __LUCKY_WINNER + __NEXT_OF_KIN + __NOT_DEAD_YET + __PCT_OF_PMTS + __SCAM + __SHARE_IT + __THEY_INHERIT +  UNCLAIMED_MONEY + __WIDOW + __WILL_LEGAL + __XFER_MONEY + __YOU_ASSIST + __YOU_INHERIT + __YOUR_FUND + __YOUR_PERM + __YOU_WON > 3) && !__THREAD_INDEX_GOOD
 
-meta      __ADVANCE_FEE_4_NEW_FORM  __FILL_THIS_FORM && __ADVANCE_FEE_4_NEW
+meta      __ADVANCE_FEE_4_NEW_FORM  __FILL_THIS_FORM && !LOTS_OF_MONEY && __ADVANCE_FEE_4_NEW
 
 meta      __ADVANCE_FEE_4_NEW_FRM_MNY  __FILL_THIS_FORM && LOTS_OF_MONEY && __ADVANCE_FEE_4_NEW
 
-meta      __ADVANCE_FEE_4_NEW_MONEY  LOTS_OF_MONEY && __ADVANCE_FEE_4_NEW
+meta      __ADVANCE_FEE_4_NEW_MONEY  !__FILL_THIS_FORM && LOTS_OF_MONEY && __ADVANCE_FEE_4_NEW
 
-meta      __ADVANCE_FEE_5_NEW  (__AFRICAN_STATE + __ATM_CARD + __BACK_SCRATCH +  __CONTACT_YOU + __COURIER + __DEAD_PARENT + __DEAL + DEAR_BENEFICIARY + DEAR_WINNER + __DECEASED + __DESTROY_ME + __DIPLOMATIC + __DORMANT_ACCT + __EARLY_DEMISE + __EX_CUSTOMER + __FOUND_YOU + __FRAUD_AON + __FRAUD_AUM + __FRAUD_AXF + __FRAUD_BEP + __FRAUD_BGP + __FRAUD_CKF + __FRAUD_DPR + __FRAUD_FVU + __FRAUD_GBW + __FRAUD_IPK + __FRAUD_IRT + __FRAUD_JNB + __FRAUD_JYG + __FRAUD_MCQ + __FRAUD_MLY + __FRAUD_MQO + __FRAUD_NEB + __FRAUD_QFY + __FRAUD_QXX + __FRAUD_SNT + __FRAUD_ULK + __FRAUD_UOQ + __FRAUD_VQE + __FRAUD_WDR + __FRAUD_WFC + __FRAUD_XJR + __FRAUD_XWW + __FRAUD_YPO + __FRAUD_YQV + __I_INHERIT + __INTL_BANK + __INVEST_MONEY + __IS_LEGAL + __I_WILL_YOU + __KAM_LOTTO2 + LOTTO_AGENT + LOTTO_AGENT_RPLY + __LOTTO_DEPT + __LOTTO_RELATED + T_LOTTO_URI + __LOTTO_WIN_01 + __LOTTO_WINNINGS + __LUCKY_WINNER + __NEXT_OF_KIN + __NOT_DEAD_YET + __PCT_OF_PMTS + __SCAM + __SHARE_IT + __THEY_INHERIT +  UNCLAIMED_MONEY + __WIDOW + __WILL_LEGAL + __XFER_MONEY + __YOU_ASSIST + __YOU_INHERIT + __YOUR_FUND + __YOUR_PERM + __YOU_WON > 4) && !__THREAD_INDEX_GOOD
+meta      __ADVANCE_FEE_5_NEW  (__AFRICAN_STATE + __ATM_CARD + __BACK_SCRATCH +  __CONTACT_YOU + __COURIER + __DEAD_PARENT + __DEAL + DEAR_BENEFICIARY + DEAR_WINNER + __DECEASED + __DESTROY_ME + __DIPLOMATIC + __DORMANT_ACCT + __EARLY_DEMISE + __EX_CUSTOMER + __FOUND_YOU + __FRAUD_AON + __FRAUD_AUM + __FRAUD_AXF + __FRAUD_BEP + __FRAUD_BGP + __FRAUD_CKF + __FRAUD_DPR + __FRAUD_FVU + __FRAUD_GBW + __FRAUD_IPK + __FRAUD_IRT + __FRAUD_JNB + __FRAUD_JYG + __FRAUD_MCQ + __FRAUD_MLY + __FRAUD_MQO + __FRAUD_NEB + __FRAUD_QFY + __FRAUD_QXX + __FRAUD_SNT + __FRAUD_ULK + __FRAUD_UOQ + __FRAUD_VQE + __FRAUD_WDR + __FRAUD_WFC + __FRAUD_XJR + __FRAUD_XWW + __FRAUD_YPO + __FRAUD_YQV + __I_INHERIT + __INTL_BANK + __INVEST_MONEY + __IS_LEGAL + __I_WILL_YOU + __KAM_LOTTO2 + LOTTO_AGENT + T_LOTTO_AGENT_RPLY + __LOTTO_DEPT + __LOTTO_RELATED + T_LOTTO_URI + __LOTTO_WIN_01 + __LOTTO_WINNINGS + __LUCKY_WINNER + __NEXT_OF_KIN + __NOT_DEAD_YET + __PCT_OF_PMTS + __SCAM + __SHARE_IT + __THEY_INHERIT +  UNCLAIMED_MONEY + __WIDOW + __WILL_LEGAL + __XFER_MONEY + __YOU_ASSIST + __YOU_INHERIT + __YOUR_FUND + __YOUR_PERM + __YOU_WON > 4) && !__THREAD_INDEX_GOOD
 
-meta      __ADVANCE_FEE_5_NEW_FORM  __FILL_THIS_FORM && __ADVANCE_FEE_5_NEW
+meta      __ADVANCE_FEE_5_NEW_FORM  __FILL_THIS_FORM && !LOTS_OF_MONEY && __ADVANCE_FEE_5_NEW
 
 meta      __ADVANCE_FEE_5_NEW_FRM_MNY  __FILL_THIS_FORM && LOTS_OF_MONEY && __ADVANCE_FEE_5_NEW
 
-meta      __ADVANCE_FEE_5_NEW_MONEY  LOTS_OF_MONEY && __ADVANCE_FEE_5_NEW
+meta      __ADVANCE_FEE_5_NEW_MONEY  !__FILL_THIS_FORM && LOTS_OF_MONEY && __ADVANCE_FEE_5_NEW
 
 body __AFF_004470_NUMBER  /(?:\+|00|011)\W{0,3}44\W{0,3}0?\W{0,3}70/
 
@@ -3298,6 +3803,10 @@
 mimeheader __ANY_IMAGE_ATTACH Content-Type =~ /image\/(?:gif|jpeg|png)/
 endif
 
+if !plugin(Mail::SpamAssassin::Plugin::MIMEHeader)
+  meta        __ANY_TEXT_ATTACH 0
+endif
+
 ifplugin Mail::SpamAssassin::Plugin::MIMEHeader
   mimeheader  __ANY_TEXT_ATTACH Content-Type =~ /text\/\w+/i
 endif
@@ -3306,7 +3815,20 @@
 mimeheader __ANY_TEXT_ATTACH_DOC     Content-Type =~ /text\/\w+/i
 endif
 
-body     __ATM_CARD       /\b(?:your|the|this|through|via|by\smeans\sof\|that\sa)[\s\(](?:\w{1,20}\s)?(?:atm|debit|(?:money[\s-]?gram\s)?fast\scash)(?:\smaster|swift|value?|cash)?[\s\)]card/i
+if can(Mail::SpamAssassin::Conf::feature_bug6558_free)
+  body       __APP_DEVELOPMENT           /\b(?:mobile apps|(?:apps?|portal) (?:dev(?:elop(?:ment|ed))?|design|test(?:ing)?|U[IX]|maintenance|support)|(?:we |can |have )+(?:design(?:ed)?|buil[dt]|maintain(?:ed)?|created?)(?: over| more than)?[\s0-9]+apps|different platforms|we are (?:[-a-z]+ ){1,4}(?:software|apps?) (?:company|develop(?:ers|ment)))\b/i
+  tflags     __APP_DEVELOPMENT           multiple maxhits=6
+endif
+
+if can(Mail::SpamAssassin::Conf::feature_bug6558_free)
+  meta       __APP_DEVELOPMENT_MANY      __APP_DEVELOPMENT > 5
+endif
+
+body     __ATM_CARD       /\b(?:your|the|this|through|via|by\smeans\sof\|that\sa|issue\s(?:(?:to|for)\s)?you\sa)[\s\(](?:\w{1,20}\s)?(?:atm|debit|(?:money[\s-]?gram\s)?fast\scash)(?:\smaster|swift|value?|cash)?[\s\)]card/i
+
+if !plugin(Mail::SpamAssassin::Plugin::MIMEHeader)
+  meta         __ATTACH_NAME_NO_EXT 0
+endif
 
 ifplugin Mail::SpamAssassin::Plugin::MIMEHeader
   mimeheader   __ATTACH_NAME_NO_EXT Content-Type =~ m,\bname\s?=\s?"(?!=\?)[^."]+",i
@@ -3314,18 +3836,16 @@
 
 body        __ATTN_MAIL_USER     /\b(?:att(?:entio)?n|dear|caro) (?:web ?(?:mail)?\s\S\s)?(?:web ?|e-?)?mail (?:user|DO USU(?:=E1|[\xe1]|[\xc3][\xa1])RIO)[:;,]/i
 
+body     __AUTO_ACCIDENT     /auto(?:mobile)? accident/i
+
 header __AXB_MO_OL_024C2  X-MimeOLE =~ /Produced\ By\ Microsoft\ MimeOLE\ V6\.00\.2600\.0000/
 
 header __AXB_MO_OL_1ECD5  X-MimeOLE =~ /Produced\ By\ Microsoft\ MimeOLE\ V6\.00\.2800\.1081/
 
-header          __AXB_MO_OL_2600  X-MimeOLE =~ /Produced\ By\ Microsoft\ MimeOLE\ V6\.00\.2600\.0000/
-
 header __AXB_XM_OL_024C2  X-Mailer =~ /Microsoft\ Outlook\ Express\ 6\.00\.2600\.0000/
 
 header __AXB_XM_OL_1ECD5  X-Mailer =~ /Microsoft\ Outlook\ Express\ 6\.00\.2800\.1081/
 
-header          __AXB_XM_OL_2600  X-Mailer =~ /Microsoft\ Outlook\ Express\ 6\.00\.2600\.0000/
-
 body     __BACK_SCRATCH   /\bmutual+y?\s(?:benefi(?:t|cial)|interest)\b/i
 
 body     __BANK_DRAFT     /\bbank\sdraft/i
@@ -3340,21 +3860,33 @@
 
 body     __BENIN          /\bb(?:e|=E9|[\xe9]|[\xc3][\xa9])nin\b/i
 
-body           __BIGNUM_EMAILS            /\b(?:thousand|million|\d[,\d]{4,})\s(?:(?!and|or|your)\w+\s)?(?:e-?mail\saddresses|leads|names)\b/i
+body           __BIGNUM_EMAILS            /\b(?:thousand|million|\d[,\d]{4,})\s(?:(?!and|or|your|place|baby)\w+\s)?(?:e-?mail\saddresses|leads|names)\b/i
+
+body           __BITCOIN_ID     /\b(?<!=)[13][a-km-zA-HJ-NP-Z1-9]{25,34}\b/
 
-uri             __BITLY_URI             /\/\/bit\.ly\//i
+meta        __BODY_SINGLE_WORD    __BODY_TEXT_LINE < 3 && !__EMPTY_BODY && !__SMIME_MESSAGE && ((__SINGLE_WORD_LINE && !__SINGLE_WORD_SUBJ) || __SINGLE_WORD_LINE > 1)
 
 body __BODY_STARTS_WITH_FROM_LINE /^From \S+ \S\S\S \S\S\S .. ..:..:.. \S+\s+\S+\: /s
 
 body        __BODY_TEXT_LINE     /^\s*\S/
 tflags      __BODY_TEXT_LINE     multiple maxhits=3
 
+meta        __BODY_URI_ONLY      __BODY_TEXT_LINE < 3 && __HAS_ANY_URI && !__SMIME_MESSAGE
+
 body           __BODY_XHTML             /<x-html>/i
 
+meta       __BOGUS_MSM_HDRS             __HAS_MSMAIL_PRI && __MSOE_MID_WRONG_CASE && __HDR_ORDER_FTSDMCXXXX
+
+meta     __BOTH_INR_AND_REF	(__XM_BALSA || __XM_CALYPSO || __XM_FORTE || __XM_MHE || __XM_SQRLMAIL || __XM_SYLPHEED || __XM_THEBAT || __XM_VM || __XM_XIMEVOL || __UA_KMAIL || __UA_MOZ5 || __UA_OPERA7)
+
 rawbody  __BUGGED_IMG	m{<img\b[^>]{0,100}\ssrc=.?https?://[^>]{6,80}(?:\?[^>]{8}|[^a-z](?![a-f]{3}|20\d\d[01]\d[0-3]\d)[0-9a-f]{8})}i
 
 body     __BURKINA_FASO   /\bburkina\s?faso\b/i
 
+body        __CANT_SEE_AD_1   /\b(?:can(?:no|')?t|(?:aren'?t[-,!\s]{1,3}|not[-,!\s]{1,3}|un)able[-,!\s]{1,3}to)[-,!\s]{1,3}(?:(?!our|this|the)\w{1,12}[-,\s]{1,3}){1,2}(?:our|this|the)[-.,\s*]{1,3}(?:commercial[-.,\s]{1,3}|ad(?:v[-.]?ert[i1l]se-?ment)?[-.,\s]{1,3}|images |newsletter |mailing ){1,2}(?:at all|(?:(?:down )?(?:below|underneath))|in (?:your|this) mail|(?:due to|because(?: of)?|as|from) (?:no |missing |unloaded |blocked )?(?:images|graphics))\b/i
+
+body        __CANT_SEE_AD_2   /\b(?:issue|problem|trouble) (?:getting|viewing|with) (?:(?:our|the) )?(?:message|content|e-?mail|details)(?: below)?[.?] (?:please|go ahead and) (?:click|browse)\b/i
+
 body        __CAN_HELP         /\bcan help\b/i
 
 body __CASHPRZ      /cash prize of/
@@ -3363,6 +3895,8 @@
 
 body        __CLEAN_MAILBOX      /\b(?:(?:e-?mail|mail\s?box|violation:|(?-i:CLICK)) (?:quota size|clean(?:-?up))|clean ?up click ?here)\b/i
 
+body        __CLICK_HERE       /\bclick\shere\b/i
+
 rawbody        __COMMENT_GIBBERISH      /<!--(?:\s{1,10}[-\w'"]{1,40}){100}/im
 
 body     __COMPENSATION   /\b(?:compensat(?:e|ion)|recompensed?|ausgleich)\b/i
@@ -3373,8 +3907,14 @@
 
 body     __COURIER        /\bcourier\s(?:company|service)\b/i
 
+header      __CR_IN_SUBJ      Subject:raw =~ /\015/
+
 header  __CTYPE_MULTIPART_ANY Content-Type =~ /multipart\/\w+/i
 
+if !plugin(Mail::SpamAssassin::Plugin::MIMEHeader)
+  meta         __CTYPE_NULL        0
+endif
+
 ifplugin Mail::SpamAssassin::Plugin::MIMEHeader
   mimeheader   __CTYPE_NULL        Content-Type =~ /^\s*;/
 endif
@@ -3383,13 +3923,15 @@
 mimeheader __CTYPE_ONETAB_GIF Content-Type:raw =~ /^image\/gif;\n\tname=\".+?\"$/s
 endif
 
+header     __CT_ENCRYPTED              Content-Type =~ /^multipart\/(?:x-)?(?:pgp-)?encrypted|application\/(?:x-)?pkcs7-mime/
+
 body __DBLCLAIM     /avoid double claiming/
 
 body     __DEAD_PARENT    /\b(?:my|meu)\s(?:(?:deceased|dead)\s(?:father|mother|husband)|(?:father|dad|mother|mom|husband|marido)(?:'?s)?\s(?:death|died|passed\saway|murder|was\s(?:killed|murdered|poisoned)|faleceu))/i
 
 body     __DEAL           /\b(?:(?:business|financial|this|the|mutual|die(?:se)?r?|cette|profitable)\s(?:deal|transa[ck]tion|proposal|off[er]{2}|venture|suggestion|partnership)|your\spartnership)/i
 
-body     __DECEASED       /\b(?:the|my|der|du|le|meu?)\s(?:deceased|late|verstorbenen|d(?:i|e|=E9|[\xe9]|[\xc3][\xa9])funto?|d(?:e|=E9|[\xe9]|[\xc3][\xa9])nt|falecido)\b/i
+body     __DECEASED       /\b(?:the|my|your|der|du|le|meu?)\s(?:deceased|late|verstorbenen|d(?:i|e|=E9|[\xe9]|[\xc3][\xa9])funto?|d(?:e|=E9|[\xe9]|[\xc3][\xa9])nt|falecido)\b/i
 
 body     __DESTROY_ME     /\b(?:destroy|hunt|quemar)\sm[eyi]\b/i
 
@@ -3402,18 +3944,34 @@
 
 body           __DLND_ATTACH      /\bdownload\sthe\sattach(?:ed|ment)\b/i
 
+if !plugin(Mail::SpamAssassin::Plugin::MIMEHeader)
+  meta         __DOC_ATTACH       0
+endif
+
 ifplugin Mail::SpamAssassin::Plugin::MIMEHeader
   meta         __DOC_ATTACH       (__DOC_ATTACH_MT || __DOC_ATTACH_FN1 || __DOC_ATTACH_FN2)
 endif
 
+if !plugin(Mail::SpamAssassin::Plugin::MIMEHeader)
+  meta         __DOC_ATTACH_FN1   0
+endif
+
 ifplugin Mail::SpamAssassin::Plugin::MIMEHeader
   mimeheader   __DOC_ATTACH_FN1   Content-Type =~ /="[^"]+\.(?:docx?|rtf)"/i
 endif
 
+if !plugin(Mail::SpamAssassin::Plugin::MIMEHeader)
+  meta         __DOC_ATTACH_FN2   0
+endif
+
 ifplugin Mail::SpamAssassin::Plugin::MIMEHeader
   mimeheader   __DOC_ATTACH_FN2   Content-Disposition =~ /="[^"]+\.(?:docx?|rtf)"/i
 endif
 
+if !plugin(Mail::SpamAssassin::Plugin::MIMEHeader)
+  meta         __DOC_ATTACH_MT    0
+endif
+
 ifplugin Mail::SpamAssassin::Plugin::MIMEHeader
   mimeheader   __DOC_ATTACH_MT    Content-Type =~ m,\bapplication/(?:msword|rtf|vnd\.ms-word|vnd\.openxmlformats-officedocument\.wordprocessingml\.document)\b,i
 endif
@@ -3450,7 +4008,7 @@
 
 body		__DOS_FIN_ADVANTAGE	/\bfinancial advantage/i
 
-uri __DOS_HAS_ANY_URI		/./
+uri __DOS_HAS_ANY_URI		/^\w+:\/\//
 
 header __DOS_HAS_LIST_ID	exists:List-ID
 
@@ -3508,20 +4066,26 @@
 
 body     __EARLY_DEMISE   /\buntimely\sdeath\b/i
 
-meta        __EMAIL_PHISH        (__WEBMAIL_ACCT + __MAILBOX_FULL + __MAILBOX_FULL_SE + __CLEAN_MAILBOX + __VALIDATE_MAILBOX + __VALIDATE_MBOX_SE + __UPGR_MAILBOX + __LOCK_MAILBOX + __SYSADMIN + __ATTN_MAIL_USER + __MAIL_ACCT_ACCESS1 + __MAIL_ACCT_ACCESS2 + (__TVD_PH_SUBJ_META || __TVD_PH_BODY_META || __TVD_PH_BODY_ACCOUNTS_PRE || __TVD_PH_BODY_ACCOUNTS_POST) > 1)
-
-meta        __EMAIL_PHISH_MANY   (__WEBMAIL_ACCT + __MAILBOX_FULL + __MAILBOX_FULL_SE + __CLEAN_MAILBOX + __VALIDATE_MAILBOX + __VALIDATE_MBOX_SE + __UPGR_MAILBOX + __LOCK_MAILBOX + __SYSADMIN + __ATTN_MAIL_USER + __MAIL_ACCT_ACCESS1 + __MAIL_ACCT_ACCESS2 + (__TVD_PH_SUBJ_META || __TVD_PH_BODY_META || __TVD_PH_BODY_ACCOUNTS_PRE || __TVD_PH_BODY_ACCOUNTS_POST) > 3)
+meta        __EMAIL_PHISH        (__WEBMAIL_ACCT + __MAILBOX_FULL + __MAILBOX_FULL_SE + __CLEAN_MAILBOX + __VALIDATE_MAILBOX + __VALIDATE_MBOX_SE + __UPGR_MAILBOX + __LOCK_MAILBOX + __SYSADMIN + __ATTN_MAIL_USER + __MAIL_ACCT_ACCESS1 + __MAIL_ACCT_ACCESS2 + __ACCESS_REVOKE + (__TVD_PH_SUBJ_META || __TVD_PH_BODY_META || __TVD_PH_BODY_ACCOUNTS_PRE || __TVD_PH_BODY_ACCOUNTS_POST) > 1)
 
-meta        __EMAIL_URI_PHISH    __HAS_ANY_URI && !__URI_GOOGLE_DOC && __EMAIL_PHISH
+meta        __EMAIL_PHISH_MANY   (__WEBMAIL_ACCT + __MAILBOX_FULL + __MAILBOX_FULL_SE + __CLEAN_MAILBOX + __VALIDATE_MAILBOX + __VALIDATE_MBOX_SE + __UPGR_MAILBOX + __LOCK_MAILBOX + __SYSADMIN + __ATTN_MAIL_USER + __MAIL_ACCT_ACCESS1 + __MAIL_ACCT_ACCESS2 + __ACCESS_REVOKE + (__TVD_PH_SUBJ_META || __TVD_PH_BODY_META || __TVD_PH_BODY_ACCOUNTS_PRE || __TVD_PH_BODY_ACCOUNTS_POST) > 3)
 
 meta        __EMPTY_BODY         __BODY_TEXT_LINE < 2 && !__SMIME_MESSAGE
 
+body           __END_FUTURE_EMAILS /\b(?:end|stop(?! receiving these (?:alerts|emails))|cease|discontinue|removed?|(?:do(?! not wish to receive [\w\s]{0,20}emails)|would|you(?:'d)?) (?:not (?:wish|want|like|desire)|(?:prefer|wish|want|like|desire) not) to|exclude yourself|fore?go)[- ](?:get |receiv(?:ing|e) |or |(?:a-z{1,30} ){0,4}from )?(?:these|our|(?:any )?(?:future|further)) (?:(?:e|ad)?-?m(?:ail(?:ing)?|es+[age]{3})|alert|PSA|marketing|notice)[- ]?(?:ad|update)?s?\b/i
+
+if !plugin(Mail::SpamAssassin::Plugin::MIMEHeader)
+	meta         __EXE_ATTACH        0
+endif
+
 ifplugin Mail::SpamAssassin::Plugin::MIMEHeader
 	mimeheader   __EXE_ATTACH        Content-Type =~ /\.exe\b/i
 endif
 
 body     __EX_CUSTOMER    /\b(?:(?:dead|deceased|late|verstorbenen|death\sof\sthe)\s(?:[ck]lient|customer|ac+ount|invest[eo]r|beneficiary|depositor|mr\.|kunde|engr?\.?)|titulaire\sdu\scompte\sest\sd(?:e|=E9|[\xe9]|[\xc3][\xa9])c(?:e|=E9|[\xe9]|[\xc3][\xa9])d(?:e|=E9|[\xe9]|[\xc3][\xa9])|invest[eo]r\sdied|(?:e|=E9|[\xe9]|[\xc3][\xa9])tranger\sd(?:e|=E9|[\xe9]|[\xc3][\xa9])c(?:e|=E9|[\xe9]|[\xc3][\xa9])d(?:e|=E9|[\xe9]|[\xc3][\xa9])|(?:[ck]lient|customer|ac+ount|invest[eo]r|beneficiary|mr\.|kunde|engr?\.?)\s(?:[a-z]{1,10}\s)?(?:dead|deceased|verstorbenen))/i
 
+body        __FAILED_LOGINS      /unsuc+es+ful log-?[io]n at+empts/i
+
 body        __FBI_BODY_SHOUT_1   /^FEDERAL BUREAU OF INVESTIGATIONS?\b/
 
 rawbody     __FBI_BODY_SHOUT_2   /^FEDERAL BUREAU OF INVESTIGATIONS?\b/m
@@ -3534,14 +4098,8 @@
 
 meta        __FBI_SPOOF          (__FBI_FM_NAME || __FBI_FM_DOM || __FBI_BODY_SHOUT_1 || __FBI_BODY_SHOUT_2) && !__FBI_RCVD_DOM && __REPLYTO_EXISTS
 
-body     __FB_CONGRADS          /Congratulations/i
-
 body        __FB_COST          /\bcost\b/i
 
-body     __FB_LOTTERY           /lottery/i
-
-body        __FB_NATIONAL      /national/i
-
 body        __FB_NUM_PERCNT    /\d\s?\%/
 
 body        __FB_S_PRICE       /pri{1,2}c[a-z]?e/i
@@ -3554,64 +4112,114 @@
 
 body     __FIFTY_FIFTY    /\b(?:50|fifty)(?:%?[\/:]50%?|%|\spercent)/i
 
+if !plugin(Mail::SpamAssassin::Plugin::ReplaceTags)
+  meta     __FILL_THIS_FORM               0
+endif
+
 ifplugin Mail::SpamAssassin::Plugin::ReplaceTags
   meta     __FILL_THIS_FORM               (__FILL_THIS_FORM_LONG || __FILL_THIS_FORM_PARTIAL > 4 || __FILL_THIS_FORM_PARTIAL_RAW > 4)
 endif
 
+if !plugin(Mail::SpamAssassin::Plugin::ReplaceTags)
+  meta     __FILL_THIS_FORM_FRAUD_PHISH   0
+endif
+
 ifplugin Mail::SpamAssassin::Plugin::ReplaceTags
   meta     __FILL_THIS_FORM_FRAUD_PHISH   (__FILL_THIS_FORM || __FILL_THIS_FORM_SHORT) && (__FILL_THIS_FORM_FRAUD_PHISH1 || __EMAIL_PHISH)
 endif
 
+if !plugin(Mail::SpamAssassin::Plugin::ReplaceTags)
+  meta     __FILL_THIS_FORM_FRAUD_PHISH1  0
+endif
+
 ifplugin Mail::SpamAssassin::Plugin::ReplaceTags
   body     __FILL_THIS_FORM_FRAUD_PHISH1   /<FF_YOUR>(?:<FF_F1>|<FF_F2>|<FF_F3>|<FF_F4>|<FF_F5>)<FF_SUFFIX>(?:<FF_BLANK1>|<FF_BLANK2>$)/i
 endif
 
+if !plugin(Mail::SpamAssassin::Plugin::ReplaceTags)
+  meta     __FILL_THIS_FORM_LOAN          0
+endif
+
 ifplugin Mail::SpamAssassin::Plugin::ReplaceTags
   meta     __FILL_THIS_FORM_LOAN          __FILL_THIS_FORM && __FILL_THIS_FORM_LOAN1
 endif
 
+if !plugin(Mail::SpamAssassin::Plugin::ReplaceTags)
+  meta     __FILL_THIS_FORM_LOAN1         0
+endif
+
 ifplugin Mail::SpamAssassin::Plugin::ReplaceTags
   body     __FILL_THIS_FORM_LOAN1         /<FF_YOUR><FF_L1><FF_SUFFIX>(?:<FF_BLANK1>|<FF_BLANK2>$)/i
 endif
 
+if !plugin(Mail::SpamAssassin::Plugin::ReplaceTags)
+  meta     __FILL_THIS_FORM_LONG          0
+endif
+
 ifplugin Mail::SpamAssassin::Plugin::ReplaceTags
   meta     __FILL_THIS_FORM_LONG          __FILL_THIS_FORM_LONG1 || __FILL_THIS_FORM_LONG2
 endif
 
+if !plugin(Mail::SpamAssassin::Plugin::ReplaceTags)
+  meta     __FILL_THIS_FORM_LONG1         0
+endif
+
 ifplugin Mail::SpamAssassin::Plugin::ReplaceTags
   body     __FILL_THIS_FORM_LONG1         /(?:<FF_LNNO><FF_YOUR><FF_ALL><FF_SUFFIX>(?:<FF_BLANK2>(?:P[a-z\.\s]{10,30})?|<ANDOR>)){5}/i
 endif
 
+if !plugin(Mail::SpamAssassin::Plugin::ReplaceTags)
+  meta     __FILL_THIS_FORM_LONG2         0
+endif
+
 ifplugin Mail::SpamAssassin::Plugin::ReplaceTags
   body     __FILL_THIS_FORM_LONG2         /(?:<FF_YOUR><FF_ALL><FF_SUFFIX>(?:<FF_BLANK2>(?:P[a-z\.\s]{10,30})?|<ANDOR>)){5}/i
 endif
 
+if !plugin(Mail::SpamAssassin::Plugin::ReplaceTags)
+  meta     __FILL_THIS_FORM_PARTIAL       0
+endif
+
 ifplugin Mail::SpamAssassin::Plugin::ReplaceTags
   body     __FILL_THIS_FORM_PARTIAL       /^\s?<FF_LNNO>?<FF_YOUR>(?:<FF_ALL><ANDOR>?){1,3}<FF_SUFFIX>(?:<FF_BLANK1>|(?:[-=_.,:;*\s]|=20){1,4}$)/im
   tflags   __FILL_THIS_FORM_PARTIAL       multiple maxhits=5
 endif
 
+if !plugin(Mail::SpamAssassin::Plugin::ReplaceTags)
+  meta     __FILL_THIS_FORM_PARTIAL_RAW   0
+endif
+
 ifplugin Mail::SpamAssassin::Plugin::ReplaceTags
   rawbody  __FILL_THIS_FORM_PARTIAL_RAW   /^(?>\s{0,50})<FF_LNNO>?<FF_YOUR>(?:<FF_ALL><ANDOR>?){1,3}<FF_SUFFIX>(?:<FF_BLANK1>|(?:[-=_.,:;*\s]|=20|&nbsp;|<\/\w+>){0,4}$)/im
   tflags   __FILL_THIS_FORM_PARTIAL_RAW   multiple maxhits=5
 endif
 
+if !plugin(Mail::SpamAssassin::Plugin::ReplaceTags)
+  meta     __FILL_THIS_FORM_SHORT         0
+endif
+
 ifplugin Mail::SpamAssassin::Plugin::ReplaceTags
   meta     __FILL_THIS_FORM_SHORT         !__FILL_THIS_FORM && (__FILL_THIS_FORM_SHORT1 || __FILL_THIS_FORM_SHORT2 || __FILL_THIS_FORM_PARTIAL > 2 || __FILL_THIS_FORM_PARTIAL_RAW > 2)
 endif
 
+if !plugin(Mail::SpamAssassin::Plugin::ReplaceTags)
+  meta     __FILL_THIS_FORM_SHORT1        0
+endif
+
 ifplugin Mail::SpamAssassin::Plugin::ReplaceTags
   body     __FILL_THIS_FORM_SHORT1        /(?:<FF_LNNO><FF_YOUR><FF_ALL><FF_SUFFIX>(?:<FF_BLANK2>|<ANDOR>)){3}/i
 endif
 
+if !plugin(Mail::SpamAssassin::Plugin::ReplaceTags)
+  meta     __FILL_THIS_FORM_SHORT2        0
+endif
+
 ifplugin Mail::SpamAssassin::Plugin::ReplaceTags
   body     __FILL_THIS_FORM_SHORT2        /(?:<FF_YOUR><FF_ALL><FF_SUFFIX>(?:<FF_BLANK2>|<ANDOR>)){3}/i
 endif
 
 header         __FLASHMAIL_MUA     X-Mailer =~ /^NetEase Flash Mail \d/
 
-meta     __FM_LARGE_MONEY       (__F_LARGE_MONEY || __F_LARGE_MONEY_2)
-
 if !plugin(Mail::SpamAssassin::Plugin::ReplaceTags)
 	meta        __FM_MY_PRICE      __FB_S_PRICE
 endif
@@ -3620,14 +4228,27 @@
 	meta        __FM_MY_PRICE      (__FB_S_PRICE || __FRT_PRICE)
 endif
 
-meta     __FM_NAT_LOTTERY       (__FB_NATIONAL && __FB_LOTTERY)
+meta           __FM_TO_ALL_NUMS     __FROM_ALL_NUMS && __TO_ALL_NUMS
+
+if can(Mail::SpamAssassin::Conf::feature_bug6558_free)
+  rawbody   __FONT_INVIS                  /<font\s[^>]{1,80}(?:font-size\s*:\s*[01]px\s*;|color\s*:\s*transparent\s*;)[^>]{1,80}>\w/i
+  tflags    __FONT_INVIS                  multiple, maxhits=6
+endif
+
+if can(Mail::SpamAssassin::Conf::feature_bug6558_free)
+  meta      __FONT_INVIS_MANY             __FONT_INVIS > 5
+endif
 
 meta       __FORGED_TBIRD_IMG      __MUA_TBIRD && __JPEG_ATTACH && __MIME_BDRY_0D0D
 describe   __FORGED_TBIRD_IMG      Possibly forged Thunderbird image spam
 
-meta     __FORM_FRAUD_3  (__FILL_THIS_FORM || __FILL_THIS_FORM_SHORT) && (__FRAUD_VQE + __FRAUD_KJV + __FRAUD_IRJ + __FRAUD_NEB + __FRAUD_XJR + __FRAUD_DPR + __FRAUD_BEP + __FRAUD_TDP + __FRAUD_GAN + __FRAUD_IRT + __FRAUD_AON + __FRAUD_WNY + __FRAUD_IPK + __FRAUD_QXX + __FRAUD_IOV + __FRAUD_MLY + __FRAUD_ULK + __FRAUD_BGP + __FRAUD_YWW + __FRAUD_JYG + __FRAUD_XWW + __FRAUD_UUY + __FRAUD_SNT + __FRAUD_JNB + __FRAUD_QFY + __FRAUD_WDR + __FRAUD_WFC + __FRAUD_AUM + __FRAUD_MCQ + __FRAUD_PVN + __FRAUD_FVU + __FRAUD_CKF + __FRAUD_MQO + __FRAUD_TCC + __FRAUD_GBW + __FRAUD_AXF + __FRAUD_THJ + __FRAUD_YQV + __FRAUD_YJA + __FRAUD_YPO + __FRAUD_UOQ + __AFRICAN_STATE + __AGREED_RATIO + __AM_DYING + __ATM_CARD + __BACK_SCRATCH +  __BARRISTER + __BENEFICIARY + __COMPENSATION + __CONTACT_ATTY + __CONTACT_YOU + __COURIER + __DEAD_PARENT + __DEAL + DEAR_BENEFICIARY + DEAR_WINNER + __DECEASED + __DESTROY_ME + __DIED_IN + __DIPLOMATIC + __DORMANT_ACCT + __EARLY_DEMISE + EMRCP + __EX_CUSTOMER + __FEES + __FIFTY_FIFTY + __FOUND_YOU + __FRAUD + __FRAUD_PTX + __HUSH_HUSH + __I_INHERIT + __INHERIT_PMT + __INTL_BANK + __INVEST_COUNTRY + __INVEST_MONEY + __IS_LEGAL + __I_WILL_YOU + __KAM_LOTTO2 + __LOTTO_ADMITS + LOTTO_AGENT + __LOTTO_DEPT + __LOTTO_RELATED + __LOTTO_VERIFY + T_LOTTO_URI + __LOTTO_WIN_01 + __LOTTO_WINNINGS + __LUCKY_WINNER + __LUCRATIVE + __MILLIONS + __MY_FORTUNE + __NEXT_OF_KIN + __NOT_DEAD_YET + __NOT_SCAM + __OUR_BEHALF + __SCAM + __SHARE_IT + __SUM_OF_FUND + __SURVIVORS + __THEY_INHERIT + __TRTMT_DEFILED + __TRUNK_BOX +  __UN + UNCLAIMED_MONEY + __WIDOW + __WILL_LEGAL + __XFER_MONEY + __YOU_ASSIST + __YOU_INHERIT + __YOUR_BANK + __YOUR_FUND + __YOUR_PERM + __YOUR_PROFIT + __YOU_WON + T_LOTTO_AGENT_FM + LOTTO_AGENT_RPLY + __PCT_FOR_YOU + __PCT_OF_PMTS + __RANDOM_PICK + __CHARITY > 3)
+meta     __FORM_FRAUD     (__FILL_THIS_FORM || __FILL_THIS_FORM_SHORT) && (__FRAUD_VQE + __FRAUD_KJV + __FRAUD_IRJ + __FRAUD_NEB + __FRAUD_XJR + __FRAUD_DPR + __FRAUD_BEP + __FRAUD_TDP + __FRAUD_GAN + __FRAUD_IRT + __FRAUD_AON + __FRAUD_WNY + __FRAUD_IPK + __FRAUD_QXX + __FRAUD_IOV + __FRAUD_MLY + __FRAUD_ULK + __FRAUD_BGP + __FRAUD_YWW + __FRAUD_JYG + __FRAUD_XWW + __FRAUD_UUY + __FRAUD_SNT + __FRAUD_JNB + __FRAUD_QFY + __FRAUD_WDR + __FRAUD_WFC + __FRAUD_AUM + __FRAUD_MCQ + __FRAUD_PVN + __FRAUD_FVU + __FRAUD_CKF + __FRAUD_MQO + __FRAUD_TCC + __FRAUD_GBW + __FRAUD_AXF + __FRAUD_THJ + __FRAUD_YQV + __FRAUD_YJA + __FRAUD_YPO + __FRAUD_UOQ + __AFRICAN_STATE + __AGREED_RATIO + __AM_DYING + __ATM_CARD + __BACK_SCRATCH +  __BARRISTER + __BENEFICIARY + __COMPENSATION + __CONTACT_ATTY + __CONTACT_YOU + __COURIER + __DEAD_PARENT + __DEAL + DEAR_BENEFICIARY + DEAR_WINNER + __DECEASED + __DESTROY_ME + __DIED_IN + __DIPLOMATIC + __DORMANT_ACCT + __EARLY_DEMISE + T_EMRCP + __EX_CUSTOMER + __FEES + __FIFTY_FIFTY + __FOUND_YOU + __FRAUD + __FRAUD_PTX + __HUSH_HUSH + __I_INHERIT + __INHERIT_PMT + __INTL_BANK + __INVEST_COUNTRY + __INVEST_MONEY + __IS_LEGAL + __I_WILL_YOU + __KAM_LOTTO2 + __LOTTO_ADMITS + LOTTO_AGENT + __LOTTO_DEPT + __LOTTO_RELATED + __LOTTO_VERIFY + T_LOTTO_URI + __LOTTO_WIN_01 + __LOTTO_WINNINGS + __LUCKY_WINNER + __LUCRATIVE + __MILLIONS + __MY_FORTUNE + __NEXT_OF_KIN + __NOT_DEAD_YET + __NOT_SCAM + __OUR_BEHALF + __SCAM + __SHARE_IT + __SUM_OF_FUND + __SURVIVORS + __THEY_INHERIT + __TRTMT_DEFILED + __TRUNK_BOX +  __UN + UNCLAIMED_MONEY + __WIDOW + __WILL_LEGAL + __XFER_MONEY + __YOU_ASSIST + __YOU_INHERIT + __YOUR_BANK + __YOUR_FUND + __YOUR_PERM + __YOUR_PROFIT + __YOU_WON + T_LOTTO_AGENT_FM + T_LOTTO_AGENT_RPLY + __PCT_FOR_YOU + __PCT_OF_PMTS + __RANDOM_PICK + __CHARITY > 1)
+
+meta     __FORM_FRAUD_3  (__FILL_THIS_FORM || __FILL_THIS_FORM_SHORT) && (__FRAUD_VQE + __FRAUD_KJV + __FRAUD_IRJ + __FRAUD_NEB + __FRAUD_XJR + __FRAUD_DPR + __FRAUD_BEP + __FRAUD_TDP + __FRAUD_GAN + __FRAUD_IRT + __FRAUD_AON + __FRAUD_WNY + __FRAUD_IPK + __FRAUD_QXX + __FRAUD_IOV + __FRAUD_MLY + __FRAUD_ULK + __FRAUD_BGP + __FRAUD_YWW + __FRAUD_JYG + __FRAUD_XWW + __FRAUD_UUY + __FRAUD_SNT + __FRAUD_JNB + __FRAUD_QFY + __FRAUD_WDR + __FRAUD_WFC + __FRAUD_AUM + __FRAUD_MCQ + __FRAUD_PVN + __FRAUD_FVU + __FRAUD_CKF + __FRAUD_MQO + __FRAUD_TCC + __FRAUD_GBW + __FRAUD_AXF + __FRAUD_THJ + __FRAUD_YQV + __FRAUD_YJA + __FRAUD_YPO + __FRAUD_UOQ + __AFRICAN_STATE + __AGREED_RATIO + __AM_DYING + __ATM_CARD + __BACK_SCRATCH +  __BARRISTER + __BENEFICIARY + __COMPENSATION + __CONTACT_ATTY + __CONTACT_YOU + __COURIER + __DEAD_PARENT + __DEAL + DEAR_BENEFICIARY + DEAR_WINNER + __DECEASED + __DESTROY_ME + __DIED_IN + __DIPLOMATIC + __DORMANT_ACCT + __EARLY_DEMISE + T_EMRCP + __EX_CUSTOMER + __FEES + __FIFTY_FIFTY + __FOUND_YOU + __FRAUD + __FRAUD_PTX + __HUSH_HUSH + __I_INHERIT + __INHERIT_PMT + __INTL_BANK + __INVEST_COUNTRY + __INVEST_MONEY + __IS_LEGAL + __I_WILL_YOU + __KAM_LOTTO2 + __LOTTO_ADMITS + LOTTO_AGENT + __LOTTO_DEPT + __LOTTO_RELATED + __LOTTO_VERIFY + T_LOTTO_URI + __LOTTO_WIN_01 + __LOTTO_WINNINGS + __LUCKY_WINNER + __LUCRATIVE + __MILLIONS + __MY_FORTUNE + __NEXT_OF_KIN + __NOT_DEAD_YET + __NOT_SCAM + __OUR_BEHALF + __SCAM + __SHARE_IT + __SUM_OF_FUND + __SURVIVORS + __THEY_INHERIT + __TRTMT_DEFILED + __TRUNK_BOX +  __UN + UNCLAIMED_MONEY + __WIDOW + __WILL_LEGAL + __XFER_MONEY + __YOU_ASSIST + __YOU_INHERIT + __YOUR_BANK + __YOUR_FUND + __YOUR_PERM + __YOUR_PROFIT + __YOU_WON + T_LOTTO_AGENT_FM + T_LOTTO_AGENT_RPLY + __PCT_FOR_YOU + __PCT_OF_PMTS + __RANDOM_PICK + __CHARITY > 3)
 
-meta     __FORM_FRAUD_5  (__FILL_THIS_FORM || __FILL_THIS_FORM_SHORT) && (__FRAUD_VQE + __FRAUD_KJV + __FRAUD_IRJ + __FRAUD_NEB + __FRAUD_XJR + __FRAUD_DPR + __FRAUD_BEP + __FRAUD_TDP + __FRAUD_GAN + __FRAUD_IRT + __FRAUD_AON + __FRAUD_WNY + __FRAUD_IPK + __FRAUD_QXX + __FRAUD_IOV + __FRAUD_MLY + __FRAUD_ULK + __FRAUD_BGP + __FRAUD_YWW + __FRAUD_JYG + __FRAUD_XWW + __FRAUD_UUY + __FRAUD_SNT + __FRAUD_JNB + __FRAUD_QFY + __FRAUD_WDR + __FRAUD_WFC + __FRAUD_AUM + __FRAUD_MCQ + __FRAUD_PVN + __FRAUD_FVU + __FRAUD_CKF + __FRAUD_MQO + __FRAUD_TCC + __FRAUD_GBW + __FRAUD_AXF + __FRAUD_THJ + __FRAUD_YQV + __FRAUD_YJA + __FRAUD_YPO + __FRAUD_UOQ + __AFRICAN_STATE + __AGREED_RATIO + __AM_DYING + __ATM_CARD + __BACK_SCRATCH +  __BARRISTER + __BENEFICIARY + __COMPENSATION + __CONTACT_ATTY + __CONTACT_YOU + __COURIER + __DEAD_PARENT + __DEAL + DEAR_BENEFICIARY + DEAR_WINNER + __DECEASED + __DESTROY_ME + __DIED_IN + __DIPLOMATIC + __DORMANT_ACCT + __EARLY_DEMISE + EMRCP + __EX_CUSTOMER + __FEES + __FIFTY_FIFTY + __FOUND_YOU + __FRAUD + __FRAUD_PTX + __HUSH_HUSH + __I_INHERIT + __INHERIT_PMT + __INTL_BANK + __INVEST_COUNTRY + __INVEST_MONEY + __IS_LEGAL + __I_WILL_YOU + __KAM_LOTTO2 + __LOTTO_ADMITS + LOTTO_AGENT + __LOTTO_DEPT + __LOTTO_RELATED + __LOTTO_VERIFY + T_LOTTO_URI + __LOTTO_WIN_01 + __LOTTO_WINNINGS + __LUCKY_WINNER + __LUCRATIVE + __MILLIONS + __MY_FORTUNE + __NEXT_OF_KIN + __NOT_DEAD_YET + __NOT_SCAM + __OUR_BEHALF + __SCAM + __SHARE_IT + __SUM_OF_FUND + __SURVIVORS + __THEY_INHERIT + __TRTMT_DEFILED + __TRUNK_BOX +  __UN + UNCLAIMED_MONEY + __WIDOW + __WILL_LEGAL + __XFER_MONEY + __YOU_ASSIST + __YOU_INHERIT + __YOUR_BANK + __YOUR_FUND + __YOUR_PERM + __YOUR_PROFIT + __YOU_WON + T_LOTTO_AGENT_FM + LOTTO_AGENT_RPLY + __PCT_FOR_YOU + __PCT_OF_PMTS + __RANDOM_PICK + __CHARITY > 5)
+meta     __FORM_FRAUD_5  (__FILL_THIS_FORM || __FILL_THIS_FORM_SHORT) && (__FRAUD_VQE + __FRAUD_KJV + __FRAUD_IRJ + __FRAUD_NEB + __FRAUD_XJR + __FRAUD_DPR + __FRAUD_BEP + __FRAUD_TDP + __FRAUD_GAN + __FRAUD_IRT + __FRAUD_AON + __FRAUD_WNY + __FRAUD_IPK + __FRAUD_QXX + __FRAUD_IOV + __FRAUD_MLY + __FRAUD_ULK + __FRAUD_BGP + __FRAUD_YWW + __FRAUD_JYG + __FRAUD_XWW + __FRAUD_UUY + __FRAUD_SNT + __FRAUD_JNB + __FRAUD_QFY + __FRAUD_WDR + __FRAUD_WFC + __FRAUD_AUM + __FRAUD_MCQ + __FRAUD_PVN + __FRAUD_FVU + __FRAUD_CKF + __FRAUD_MQO + __FRAUD_TCC + __FRAUD_GBW + __FRAUD_AXF + __FRAUD_THJ + __FRAUD_YQV + __FRAUD_YJA + __FRAUD_YPO + __FRAUD_UOQ + __AFRICAN_STATE + __AGREED_RATIO + __AM_DYING + __ATM_CARD + __BACK_SCRATCH +  __BARRISTER + __BENEFICIARY + __COMPENSATION + __CONTACT_ATTY + __CONTACT_YOU + __COURIER + __DEAD_PARENT + __DEAL + DEAR_BENEFICIARY + DEAR_WINNER + __DECEASED + __DESTROY_ME + __DIED_IN + __DIPLOMATIC + __DORMANT_ACCT + __EARLY_DEMISE + T_EMRCP + __EX_CUSTOMER + __FEES + __FIFTY_FIFTY + __FOUND_YOU + __FRAUD + __FRAUD_PTX + __HUSH_HUSH + __I_INHERIT + __INHERIT_PMT + __INTL_BANK + __INVEST_COUNTRY + __INVEST_MONEY + __IS_LEGAL + __I_WILL_YOU + __KAM_LOTTO2 + __LOTTO_ADMITS + LOTTO_AGENT + __LOTTO_DEPT + __LOTTO_RELATED + __LOTTO_VERIFY + T_LOTTO_URI + __LOTTO_WIN_01 + __LOTTO_WINNINGS + __LUCKY_WINNER + __LUCRATIVE + __MILLIONS + __MY_FORTUNE + __NEXT_OF_KIN + __NOT_DEAD_YET + __NOT_SCAM + __OUR_BEHALF + __SCAM + __SHARE_IT + __SUM_OF_FUND + __SURVIVORS + __THEY_INHERIT + __TRTMT_DEFILED + __TRUNK_BOX +  __UN + UNCLAIMED_MONEY + __WIDOW + __WILL_LEGAL + __XFER_MONEY + __YOU_ASSIST + __YOU_INHERIT + __YOUR_BANK + __YOUR_FUND + __YOUR_PERM + __YOUR_PROFIT + __YOU_WON + T_LOTTO_AGENT_FM + T_LOTTO_AGENT_RPLY + __PCT_FOR_YOU + __PCT_OF_PMTS + __RANDOM_PICK + __CHARITY > 5)
+
+meta        __FORM_LOW_CONTRAST   (__FILL_THIS_FORM_SHORT2 || __FILL_THIS_FORM_SHORT2) && __HTML_FONT_LOW_CONTRAST_MINFP
 
 if can(Mail::SpamAssassin::Conf::feature_bug6558_free)
   body        __FOR_SALE_LTP            /00\.? (?:less 10%|LTP)/i
@@ -3706,13 +4327,25 @@
 
 body __FRAUD_XWW	/\b(?:honest(?:ly)?\sco(?:-?operat(?:e|ion)|llaborat(?:e|ion))|ehrliche\szusammenarbeit|sichere [kc]o+p[eo]ration|col+aboration\swith\sme)\b/i
 
-header         __FROM_12LTRDOM_1   From =~ /\@(?!facebookmail)[a-z]{12}\./
+ifplugin Mail::SpamAssassin::Plugin::FreeMail
+  meta         __FREEMAIL_DOC_PDF     (__DOC_ATTACH || __PDF_ATTACH) && (FREEMAIL_FROM || FREEMAIL_REPLYTO)
+endif
+
+meta       __FREEM_FRNUM_UNICD_EMPTY  FREEMAIL_FROM && __FROM_ALL_NUMS && __FROM_ENCODED_B64 && __SUBJECT_ENCODED_B64 && __EMPTY_BODY
+
+if !plugin(Mail::SpamAssassin::Plugin::FreeMail)
+  meta         __FROM_41_FREEMAIL         0
+endif
 
 ifplugin Mail::SpamAssassin::Plugin::FreeMail
   meta         __FROM_41_FREEMAIL         (__NSL_ORIG_FROM_41 || __NSL_RCVD_FROM_41) && (FREEMAIL_FROM || FREEMAIL_REPLYTO) && !__THREADED
   describe     __FROM_41_FREEMAIL         Sent from Africa + freemail provider
 endif
 
+header     __FROM_ADDR_WS              From:addr =~ /\s/
+
+header         __FROM_ALL_NUMS      From:addr =~ /^\d+@/
+
 header      __FROM_AMEX          From =~ /american\s?express/i
 
 header      __FROM_ASB_BANK      From:addr =~ /\basb\.co\.nz$/i
@@ -3721,34 +4354,44 @@
 
 header      __FROM_CHASE         From:addr =~ /chase(?:2?-?paymentech)\.com$/i
 
+header      __FROM_CMNWLTH_BANK  From:addr =~ /\bcommonwealth\.com\.au$/i
+
+header	 __FROM_DNS		From =~ /(?<![^\w.-])dns(?:admin)?\@/i
+
+header      __FROM_DOM_INFO    From:addr =~ /\.info$/i
+
 header __FROM_EBAY	From:addr =~ /\@ebay\.com$/i
 
 header      __FROM_EBAY_LOOSE    From =~ /\be-?bay\b/i
 
+header	 __FROM_FULL_NAME	From:name =~ /^[^a-z[:punct:][:cntrl:]\d\s][^[:punct:][:cntrl:]\d\s]*[[:punct:]\s]+[^a-z[:punct:][:cntrl:]\d\s]/
+tflags	 __FROM_FULL_NAME	nice
+
 header      __FROM_HSBC          From:addr =~ /\bhsbc\.co\.uk$/i
 
+header	 __FROM_INFO		From =~ /(?<![^\w.-])info\@/i
+
 header      __FROM_LLOYDSTSB     From:addr =~ /\blloyds(?:tsb)\.(?:co\.uk|com)$/i
 
-header      __FROM_LOWER       ALL =~ /from:\s\S{5}/ 
+header      __FROM_LOWER       ALL =~ /from:\s\S{5}/
 
 header         __FROM_MISSPACED      From =~ /^\s*"[^"]*"</
 
-ifplugin Mail::SpamAssassin::Plugin::DKIM
-  meta         __FROM_MISSP_DKIM     (__FROM_RUNON_UNCODED && __DKIM_DEPENDABLE)
-  tflags       __FROM_MISSP_DKIM     net
-endif
+meta           __FROM_MISSP_EH_MATCH __FROM_RUNON_UNCODED && __LCL__ENV_AND_HDR_FROM_MATCH
 
-meta           __FROM_MISSP_EH_MATCH __FROM_RUNON_UNCODED && __ENV_AND_HDR_FROM_MATCH
+if !plugin(Mail::SpamAssassin::Plugin::FreeMail)
+  meta         __FROM_MISSP_FREEMAIL 0
+endif
 
 ifplugin Mail::SpamAssassin::Plugin::FreeMail
   meta         __FROM_MISSP_FREEMAIL __FROM_RUNON && (FREEMAIL_FROM || FREEMAIL_REPLYTO)
 endif
 
-meta        __FROM_MISSP_PHISH   __FROM_MISSPACED && (__FROM_ASB_BANK || __FROM_AMEX || __FROM_BANK_LOOSE || __FROM_CHASE || __FROM_EBAY_LOOSE || __FROM_HSBC || __FROM_LLOYDSTSB || __FROM_PAYPAL_LOOSE || __FROM_WELLSFARGO || __FROM_WESTERNUNION)
+meta        __FROM_MISSP_PHISH   __FROM_MISSPACED && (__FROM_ASB_BANK || __FROM_AMEX || __FROM_BANK_LOOSE || __FROM_CHASE || __FROM_CMNWLTH_BANK || __FROM_EBAY_LOOSE || __FROM_HSBC || __FROM_LLOYDSTSB || __FROM_PAYPAL_LOOSE || __FROM_WELLSFARGO || __FROM_WESTERNUNION)
 
 meta           __FROM_MISSP_REPLYTO  __FROM_RUNON && __REPLYTO_EXISTS
 
-header	__FROM_ONMS		From =~	 /\.onmicrosoft\.com/
+full       __FROM_NAME_IN_MSG         /^From:\s+([^<]\S+\s\S+)\s(?=.{1,1024}^\1$)/sm
 
 header __FROM_PAYPAL	From:addr =~ /\@paypal\.com$/i
 
@@ -3762,35 +4405,46 @@
 
 header      __FROM_WESTERNUNION  From:addr =~ /westernunion\.com$/i
 
-ifplugin Mail::SpamAssassin::Plugin::ReplaceTags
-body     __FRT_GOLD             /<inter SP2><post P2>\b(?!gold)<G><O><L><D>\b/i
+header     __FROM_WORDY                From:addr =~ /^(?:(?:[A-Z][A-Za-z]+|or|&)\.)+[A-Z][A-Za-z]+\@/
+
+header     __FROM_WORDY_3              From:addr =~ /(?:(?:[A-Z][A-Za-z]+|or|&)\.){2,}[A-Z][A-Za-z]+\@/
+
+meta       __FROM_WORDY_SONLY          __FROM_WORDY && (__XPRIO_MINFP || __TO_NO_BRKTS_MSFT || __FILL_THIS_FORM_SHORT || __HAS_MSMAIL_PRI || DEAR_FRIEND ||  __TO_NO_BRKTS_FROM_MSSP || FREEMAIL_REPLYTO )
+
+if !plugin(Mail::SpamAssassin::Plugin::ReplaceTags)
+	meta        __FRT_PRICE        0
 endif
 
 ifplugin Mail::SpamAssassin::Plugin::ReplaceTags
 	body        __FRT_PRICE        /<inter SP2><post P2>\b(?!price)<P><R><IX><C><E>\b/i
 endif
 
-ifplugin Mail::SpamAssassin::Plugin::ReplaceTags
-body     __FRT_SILVER           /<inter SP2><post P2>\b(?!s[il][li]ver)<S><I><L><V><E><R>\b/i
-endif
-
 rawbody     __FR_SPACING_8     /[a-z0-9]{6}\s{8}[a-z0-9]{5}/i
 
-header  __FSL_HELO_BARE_IP_1      X-Spam-Relays-External =~ /^[^\]]+ helo=\d{1,3}\.\d{1,3}\.\d{1,3}\.\d{1,3} /i
+header  __FSL_HELO_BARE_IP_1      X-Spam-Relays-External =~ /^[^\]]+ helo=(?!127)\d{1,3}\.\d{1,3}\.\d{1,3}\.\d{1,3} [^\]]*auth= /i
 
-header  __FSL_HELO_BARE_IP_2    X-Spam-Relays-External =~ /helo=\d{1,3}\.\d{1,3}\.\d{1,3}\.\d{1,3} /i
+header  __FSL_HELO_BARE_IP_2    X-Spam-Relays-Untrusted =~ /helo=(?!127)\d{1,3}\.\d{1,3}\.\d{1,3}\.\d{1,3} /i
 
 header  __FSL_HELO_USER_1   X-Spam-Relays-External =~ / helo=user /i
 
-header  __FSL_HELO_USER_2   Received =~ /from User(?:\s+by|\s*\(|$)/i
+header  __FSL_HELO_USER_2   Received =~ /from User(?:\s+by|\s*[\[\(]|$)/i
 
-header  __FSL_HELO_USER_3   Received =~ /helo(?:=|\s)User/i
+header  __FSL_HELO_USER_3   Received =~ /(?:eh|he)lo(?:=|\s)User\)/i
 
-header      __FS_SUBJ_RE       Subject =~ /^Re: /
+header   __FSL_RELAY_GOOGLE	X-Spam-Relays-External =~ /^[^\]]+ rdns=[^ ]+\.google\.com /i
 
-body     __F_LARGE_MONEY        /\d\d\d,\d\d\d/
+ifplugin Mail::SpamAssassin::Plugin::ReplaceTags
+  body          __FUZZY_DR_OZ       /\bD(?!(?-i:(?:r.|octor)(?:\s|&nbsp;)Oz))(?:<R>|<O><C>(?:<T><O><R>)?)\.?<WS>*<O><Z>(?:$|\W)/i
+endif
 
-body     __F_LARGE_MONEY_2      /\d\d?\s?(?:thousand|(?:m|b|tr)illion)/i
+if can(Mail::SpamAssassin::Conf::feature_bug6558_free)
+  body       __GAPPY_SALES_LEADS         /\b(?:business|e?-?mail|your|marketing|advertising)\s(?!sales|leads|campaign)(?:s\s?a\s?l\s?e\s?s|l\s?e\s?a\s?d\s?s|c\s?a\s?m\s?p\s?a\s?i\s?g\s?n)\b/i
+  tflags     __GAPPY_SALES_LEADS         multiple maxhits=3
+endif
+
+if can(Mail::SpamAssassin::Conf::feature_bug6558_free)
+  meta       __GAPPY_SALES_LEADS_MANY    __GAPPY_SALES_LEADS > 2
+endif
 
 body     __GHANA          /\bghana\b/i
 
@@ -3802,25 +4456,58 @@
 
 meta        __GOOGLE_DOCS_PHISH_1  __URI_GOOGLE_DOC && (__TVD_PH_SUBJ_META || __TVD_PH_BODY_META || __TVD_PH_BODY_ACCOUNTS_PRE || __TVD_PH_BODY_ACCOUNTS_POST)
 
-meta        __GOOGLE_DOCS_PHISH_2  __URI_GOOGLE_DOC && __EMAIL_PHISH
+meta        __GOOGLE_DOCS_PHISH_2  __URI_GOOGLE_DOC && (__EMAIL_PHISH || __ACCT_PHISH)
+
+uri       __GOOG_MALWARE_DNLD           m;^https?://[^/]*\.google\.com/[^?]*url\?.*[\?&/]download;i
+
+uri       __GOOG_REDIR                  m;^https?://[^/]*\.google\.com/url\?;i
 
 body __HAS_ANY_EMAIL /\w@\S+\.\w/
 
-uri __HAS_ANY_URI   /./
+uri __HAS_ANY_URI   /^\w+:\/\//
+
+header     __HAS_DOMAINKEY_SIG         exists:DomainKey-Signature
+
+describe	__HAS_HREF	Has an anchor tag with a href attribute in non-quoted line
+rawbody		__HAS_HREF	/^[^>].*<a href=/i
+tflags		__HAS_HREF	multiple
+
+describe	__HAS_IMG_SRC	Has an img tag on a non-quoted line
+rawbody		__HAS_IMG_SRC	/^[^>].*<img src=/i
+tflags		__HAS_IMG_SRC	multiple
+
+header     __HAS_PHP_ORIG_SCRIPT       exists:X-PHP-Originating-Script
+
+header     __HAS_PHP_SCRIPT            exists:X-PHP-Script
 
 header __HAS_THREAD_INDEX  exists:Thread-Index
 
 body     __HAS_WON_01    /\bque ha ganado\b/i
 
+header     __HAS_XM_LID                exists:X-Mailer-LID
+
+header     __HAS_XM_RECPTID            exists:X-Mailer-RecptId
+
+header     __HAS_XM_SENTBY             exists:X-Mailer-Sent-By
+
+header     __HAS_XM_SID                exists:X-Mailer-SID
+
 header         __HDRS_LCASE          ALL =~ /\n(?:Message-id|Content-type|X-MSMail-priority|from|subject|to|cc|Disposition-notification-to):/sm
 tflags         __HDRS_LCASE          multiple maxhits=3
 
 meta           __HDRS_LCASE_KNOWN    __MSGID_JAVAMAIL || __UA_MSOEMAC || __UA_MSOMAC || __MSGID_APPLEMAIL || __MSGID_HEX_UID || __MSGID_HEXISH
 
+header         __HDRS_MISSP          ALL =~ /\n(?:Subject|From|To):\S/ism
+
 header __HDR_ORDER_FTSDMCXXXX ALL =~ /\nFrom: .{1,80}?\nTo: .{1,80}?\nSubject: .{1,200}?\nDate: .{1,40}?\nMIME-Version: .{1,40}?\nContent-Type: .{1,120}?\nX-Priority: .{1,40}?\nX-MSMail-Priority: .{1,40}?\nX-Mailer: .{1,80}?\nX-MimeOLE:/s
 
+header   __HELO_MISC_IP        	X-Spam-Relays-Untrusted =~ /^[^\]]+ helo=[^a-z\?]\S{0,30}(?:\d{1,3}[^\d]){4}[^\]]+ auth= /i
+
 header __HELO_NO_DOMAIN   X-Spam-Relays-External =~ /^[^\]]+ helo=[^\.]+ /
 
+body        __HEXHASHWORD_S2EU /\s[A-Z]?[a-z]{1,15}\s(?![a-z]{10,20}\s)[a-z]{0,10}(?!-?\d{1,5}-)(?!\d{10}\s)(?:(?!--)[-0-9a-f]){10,64}(?:[g-z][a-z]{0,10})?\s[A-Z]?[a-z]{1,15}\b/
+tflags      __HEXHASHWORD_S2EU multiple maxhits=4
+
 body		__HK_LOTTO_1		/\b(?:(?:inter)?national|foundation|mercato|univers|euro ?million|e-?mail|euro-pw|bill ?gates|swiss|prestige|cristal|am.ricaine|coca.?cola|fiduciary|department) ?lot(?:eri[ej]|t(?:ery|o))/i
 
 body		__HK_LOTTO_2		/\blot(?:eri[ej]|t(?:ery|o)) ?(?:(?:inter)?national|foundation|mercato|univers|euro ?million|e-?mail|euro-pw|bill ?gates|swiss|prestige|cristal|am.ricaine|coca.?cola|fiduciary|department)/i
@@ -3857,10 +4544,18 @@
 
 header __HS_SUBJ_RE_FW Subject =~ /^(?i:re|fw):/
 
+if !plugin(Mail::SpamAssassin::Plugin::MIMEHeader)
+  meta         __HTML_ATTACH_01    0
+endif
+
 ifplugin Mail::SpamAssassin::Plugin::MIMEHeader
   mimeheader   __HTML_ATTACH_01    Content-Type =~ m,\btext/html\b.+\.html?\b,i
 endif
 
+if !plugin(Mail::SpamAssassin::Plugin::MIMEHeader)
+  meta         __HTML_ATTACH_02    0
+endif
+
 ifplugin Mail::SpamAssassin::Plugin::MIMEHeader
   mimeheader   __HTML_ATTACH_02    Content-Disposition =~ m,\bfilename="?[^"]+\.html?\b,i
 endif
@@ -3881,8 +4576,37 @@
 body __HTML_COMMENT_50000 eval:html_text_match('comment', '(?s)^(?=(?:.{25000}){2})')
 endif
 
+meta        __HTML_FONT_LOW_CONTRAST_MINFP	HTML_FONT_LOW_CONTRAST && !__HAS_SENDER && !__VIA_ML && !__RP_MATCHES_RCVD && !__THREADED && !__HAS_THREAD_INDEX && !ALL_TRUSTED && !__NOT_SPOOFED && !__HDRS_LCASE_KNOWN && !__DKIM_EXISTS && !__SENDER_BOT 
+
+rawbody     __HTML_OFF_PAGE   /;(?:top|left):-\d{3,9}px;/i
+
+if can(Mail::SpamAssassin::Conf::feature_bug6558_free)
+  rawbody    __HTML_SHRT_CMNT_OBFU       /\w<!--\s*\w+\s*-->\w/
+  tflags     __HTML_SHRT_CMNT_OBFU       multiple maxhits=10
+endif
+
+if can(Mail::SpamAssassin::Conf::feature_bug6558_free)
+  meta       __HTML_SHRT_CMNT_OBFU_MANY  __HTML_SHRT_CMNT_OBFU > 9 && HTML_MESSAGE
+endif
+
+rawbody   __HTML_SINGLET                />\s*(?:[a-z"]|&\#(?:\d+|x[0-9a-f]+);)\s*</i
+tflags    __HTML_SINGLET                multiple, maxhits=21
+
+meta      __HTML_SINGLET_MANY           __HTML_SINGLET > 20
+
+ifplugin Mail::SpamAssassin::Plugin::HTMLEval
+  body       __HTML_TAG_BALANCE_CENTER     eval:html_tag_balance('center', '!= 0')
+endif
+
+rawbody    __HTTP_REFRESH             /<meta\s[^>]{0,200}"refresh"/ism
+tflags     __HTTP_REFRESH             publish
+
 body     __HUSH_HUSH      /\b(?:confiden[tc]i[ae]l(?:\b|ity\b|it(?:=E9|[\xe9]|[\xc3][\xa9]))|private\b|secr[e\xe8](?:te?|cy)\b|sensitive\b|concealed\b|obscured?\b|discre(?:et|tion)\b|very\sdiscrete|top\ssecret|vertraulich(?:en)?\b|geheim\b|priv(?:e|=E9|[\xe9]|[\xc3][\xa9]))/i
 
+if !plugin(Mail::SpamAssassin::Plugin::ImageInfo)
+  meta       __IMG_LE_300K           0
+endif
+
 ifplugin Mail::SpamAssassin::Plugin::ImageInfo
   body       __IMG_LE_300K           eval:pixel_coverage('all',62500,300000)
 endif
@@ -3895,6 +4619,16 @@
 
 body     __INVEST_MONEY   /\binvest(?:ir)?\s(?:this|ces|d[ae]s|sur ce|de ces)\s(?:money|f[ou]nds?)\b/i
 
+header __IP_IN_RELAY  X-Spam-Relays-External =~ /^\[ ip=(\d+)\.(\d+)\.(\d+)\.(\d+) (?:[^\]]* )?(?:rdns|helo)=\S*(?:\1\D\2\D\3\D\4|\4\D\3\D\2\D\1)/
+
+if !plugin(Mail::SpamAssassin::Plugin::MIMEHeader)
+  meta         __ISO_ATTACH        0
+endif
+
+ifplugin Mail::SpamAssassin::Plugin::MIMEHeader
+  mimeheader   __ISO_ATTACH        Content-Disposition =~ m,\bfilename="?[^"]+\.iso[";$],i
+endif
+
 body     __IS_LEGAL       /\b(?:(?:(this|esta)\s(?:deal|offer|transac[tc]i(?:o|[\xc3][\xb3])n|proposal|exchange|arrangement|work)|it)?\s[ie]s\s(?:(?:guaranteed|completely|absolutely|perfectly|100%|very|fully)\s)?(?:legal|hitch-free|seguro|legitimate)|legitimate\sarrangement|toute?\sl(?:e|=E9|[\xe9]|[\xc3][\xa9])gale)\b/i
 
 body     __IVORY_COAST    /\b(?:Cote\s?D.Ivoire|Ivory\s?Coast|Costa\sde\sMarfil)\b/i
@@ -3947,39 +4681,131 @@
 
 header __KB_MSGID_OUTLOOK_888  Message-Id =~ /^<[0-9a-f]{8}(?:\$[0-9a-f]{8}){2}\@/
 
+meta	 __KHOP_NO_FULL_NAME	!(__NOT_A_PERSON || __FROM_ENCODED_QP || __FROM_NEEDS_MIME || __FROM_FULL_NAME)
+
+if !(can(Mail::SpamAssassin::Conf::feature_bug6558_free))
+   meta        __LARGE_PERCENT_AFTER  0
+endif
+
 if can(Mail::SpamAssassin::Conf::feature_bug6558_free)
    body        __LARGE_PERCENT_AFTER  /\d{3}% after/i
    tflags      __LARGE_PERCENT_AFTER  multiple maxhits=4
 endif
 
+if !plugin(Mail::SpamAssassin::Plugin::HeaderEval)
+  meta      __LCL__ENV_AND_HDR_FROM_MATCH     0
+endif
+
+ifplugin Mail::SpamAssassin::Plugin::HeaderEval
+  meta      __LCL__ENV_AND_HDR_FROM_MATCH     __ENV_AND_HDR_FROM_MATCH
+endif
+
+if !plugin(Mail::SpamAssassin::Plugin::BodyEval)
+  meta      __LCL__KAM_BODY_LENGTH_LT_1024    0
+endif
+
+ifplugin Mail::SpamAssassin::Plugin::BodyEval
+if !(can(Mail::SpamAssassin::Plugin::BodyEval::has_check_body_length))
+    meta      __LCL__KAM_BODY_LENGTH_LT_1024    0
+endif
+endif
+
+ifplugin Mail::SpamAssassin::Plugin::BodyEval
+  if can(Mail::SpamAssassin::Plugin::BodyEval::has_check_body_length)
+    meta      __LCL__KAM_BODY_LENGTH_LT_1024    __KAM_BODY_LENGTH_LT_1024
+endif
+endif
+
+if !plugin(Mail::SpamAssassin::Plugin::BodyEval)
+  meta      __LCL__KAM_BODY_LENGTH_LT_128     0
+endif
+
+ifplugin Mail::SpamAssassin::Plugin::BodyEval
+if !(can(Mail::SpamAssassin::Plugin::BodyEval::has_check_body_length))
+    meta      __LCL__KAM_BODY_LENGTH_LT_128     0
+endif
+endif
+
+ifplugin Mail::SpamAssassin::Plugin::BodyEval
+  if can(Mail::SpamAssassin::Plugin::BodyEval::has_check_body_length)
+    meta      __LCL__KAM_BODY_LENGTH_LT_128     __KAM_BODY_LENGTH_LT_128
+endif
+endif
+
+if !plugin(Mail::SpamAssassin::Plugin::BodyEval)
+  meta      __LCL__KAM_BODY_LENGTH_LT_512     0
+endif
+
+ifplugin Mail::SpamAssassin::Plugin::BodyEval
+if !(can(Mail::SpamAssassin::Plugin::BodyEval::has_check_body_length))
+    meta      __LCL__KAM_BODY_LENGTH_LT_512     0
+endif
+endif
+
+ifplugin Mail::SpamAssassin::Plugin::BodyEval
+  if can(Mail::SpamAssassin::Plugin::BodyEval::has_check_body_length)
+    meta      __LCL__KAM_BODY_LENGTH_LT_512     __KAM_BODY_LENGTH_LT_512
+endif
+endif
+
+meta        __LIST_PARTIAL         __DOS_HAS_LIST_UNSUB && !__DOS_HAS_LIST_ID
+
+meta        __LIST_PRTL_PUMPDUMP   __LIST_PARTIAL && __PD_CNT_1
+
+meta        __LIST_PRTL_SAME_USER  __LIST_PARTIAL && __TO_EQ_FROM_USR
+
 uri __LOCAL_PP_NONPPURL		m'https?://(?:[A-Za-z0-9-_]+)\.(?!paypal\.com)(?:[A-Za-z0-9-_\.]+)'i
 
-body        __LOCK_MAILBOX       /\b(?:(?:deactivate|lock|lose ac+ess to|los[se] (?:of )?(?:important )?(?:information|mail|messages) in) (?:your )?(?:mail\s?box|(?:web ?|e-?)mail)|your (?:mail\s?box|(?:(?:web ?|e-?)mail)(?: account)?) (?:(?:will|may) be(?:come)? )?(?:in-?a(?:ctive|cess[ia]ble)|locked|disabled|deleted|removed)\b|ditt konto vara "?deaktiverad"?|begr(?:=E4|\xe4|[\xc3][\xa4])nsad tillg(?:=E5|[\xe5]|[\xc3][\xa5])ng till din brevl(?:=E5|[\xe5]|[\xc3][\xa5])da|contas? de (?:web ?|e-?)mail (?:ser(?:=E1|[\xe1]|[\xc3][\xa1]) (?:desativado|exclu(?:=ED|[\xed]|[\xc3][\xad])do)|(?:=E9|[\xe9]|[\xc3][\xa9]) exclu(?:=ED|[\xed]|[\xc3][\xad])do)|destruir a sua caixa de (?:correio|entrada)|tw(?:=F3|[\xf3])j konto zostalo ograniczone|straci swoje e-?mail na sta[\xc5][\x82]e|konto zostanie automatycznie wy[\xc5][\x82][\xc4][\x85]czona)/i
+body        __LOCK_MAILBOX       /\b(?:(?:deactivate|lock|lose ac+ess to|los[se] (?:of )?(?:important )?(?:information|mail|messages) in) (?:your )?(?:mail\s?box|(?:web ?|e-?)mail)|your (?:mail\s?box|(?:(?:web ?|e-?)mail)(?: account)?) (?:(?:will|may) be(?:come)? )?(?:in-?a(?:ctive|cess[ia]ble)|locked|disabled|deleted|removed)\b|ditt konto vara "?deaktiverad"?|begr(?:=E4|\xe4|[\xc3][\xa4])nsad tillg(?:=E5|[\xe5]|[\xc3][\xa5])ng till din brevl(?:=E5|[\xe5]|[\xc3][\xa5])da|contas? de (?:web ?|e-?)mail (?:ser(?:=E1|[\xe1]|[\xc3][\xa1]) (?:desativado|exclu(?:=ED|[\xed]|[\xc3][\xad])do)|(?:=E9|[\xe9]|[\xc3][\xa9]) exclu(?:=ED|[\xed]|[\xc3][\xad])do)|destruir a sua caixa de (?:correio|entrada)|tw(?:=F3|[\xf3])j konto zostalo ograniczone|straci swoje e-?mail na sta[\xc5][\x82]e|konto zostanie automatycznie wy[\xc5][\x82][\xc4][\x85]czona|e-?mail account[^.]{0,30}deactivated (?:in|from) our (?:database|system|server))/i
 
 rawbody  __LONGLINE	/^.{998}[^\r\n]/
 
+if !plugin(Mail::SpamAssassin::Plugin::ReplaceTags)
+  meta     __LOTSA_MONEY_00   0
+endif
+
 ifplugin Mail::SpamAssassin::Plugin::ReplaceTags
-  body     __LOTSA_MONEY_00   /<CURRENCY>[\s\.]?\d[\dOo][,\.][\dOo]{3}(?:(?!\d)|\b)/
+  body     __LOTSA_MONEY_00   /<CURRENCY>[\s\.]?[1-9][\dOo][,\.][\dOo]{3}(?:(?!\d)|\b)/
+endif
+
+if !plugin(Mail::SpamAssassin::Plugin::ReplaceTags)
+  meta     __LOTSA_MONEY_01   0
 endif
 
 ifplugin Mail::SpamAssassin::Plugin::ReplaceTags
-  body     __LOTSA_MONEY_01   /(?:(?i:sum\sof\s)[\(\[]?|<CURRENCY>\s?)[\s\.]?\d[\d.,\sOo]{5,20}[\dOo](?<!\.00)/
+  body     __LOTSA_MONEY_01   /(?:(?i:sum\sof\s)[\(\[]?|<CURRENCY>\s?)[\s\.]?[1-9][\d.,\sOo]{5,20}[\dOo](?<!\.00)/
+endif
+
+if !plugin(Mail::SpamAssassin::Plugin::ReplaceTags)
+  meta     __LOTSA_MONEY_02   0
 endif
 
 ifplugin Mail::SpamAssassin::Plugin::ReplaceTags
-  body     __LOTSA_MONEY_02   /\d[\d.,\sOo]{5,20}[\dOo][\)\]\(]?\s?(?:<CURRENCY>|Pounds|(?i:dollars?|bucks))\b/
+  body     __LOTSA_MONEY_02   /(?<!\d)[1-9][\d.,\sOo]{5,20}[\dOo][\)\]\(]?\s?(?:<CURRENCY>|Pounds|(?i:dollars?|bucks))\b/
+endif
+
+if !plugin(Mail::SpamAssassin::Plugin::ReplaceTags)
+  meta     __LOTSA_MONEY_03   0
 endif
 
 ifplugin Mail::SpamAssassin::Plugin::ReplaceTags
-  body     __LOTSA_MONEY_03   /(?:(?i:sum\sof\s)[\(\[]?|<CURRENCY>\s?)\d[\d.,\sOo]{0,5}[\)\]]?\s?(?i:M(?i:il)?\b|mil+(?i:io|<O>)n|hund?[re]+a?[dt]|thousand|tausend|milh[\xf5]es)/
+  body     __LOTSA_MONEY_03   /(?:(?i:sum\sof\s)[\(\[]?|<CURRENCY>\s?)[1-9][\d.,\sOo]{0,5}[\)\]]?\s?(?i:M(?i:il)?\b|mil+(?i:io|<O>)n|hund?[re]+a?[dt]|thousand|tausend|milh[\xf5]es)/
+endif
+
+if !plugin(Mail::SpamAssassin::Plugin::ReplaceTags)
+  meta     __LOTSA_MONEY_04   0
 endif
 
 ifplugin Mail::SpamAssassin::Plugin::ReplaceTags
-  body     __LOTSA_MONEY_04   /(?:\d[\d\.,]{0,4}(?:M|\smilli?one?s|\s?mln)|million(?!s)|mill<O>n|hund?rea?d(?!s)[^\.]{1,25}thousand(?!s)|cents?[^\.]{1,25}mille|hundert[^\.]{1,30}tausend|ientos?[^\.]{1,20}mil|cent[a-z\s]{1,20}mil\s[a-z]{1,20}centos)[^\.\$]{0,50}?(?:(?:U\.?\s?S\.?\s?(?:A\.?\s?)?|united\s?states\s|E\.\s?U\.\s|canad(?:ian|a)\s|(?:ia\s)?de\s)?d(?:[o\xf3]|[\xc3][\xb3])l+are?s?|bucks|USD|GBP|<GB_UK>\spounds?|(?:<GB_UK>\s)?pounds?\ssterling|pounds(?!\sof)|(?:d'\s?)?euros?|francs?)\b/i
+  body     __LOTSA_MONEY_04   /(?:(?<!\d)[1-9][\d\.,]{0,4}(?:M|\smilli?one?s|\s?mln)|million(?!s)|mill<O>n|hund?rea?d(?!s)[^\.]{1,25}thousand(?!s)|cents?[^\.]{1,25}mille|hundert[^\.]{1,30}tausend|ientos?[^\.]{1,20}mil|cent[a-z\s]{1,20}mil\s[a-z]{1,20}centos)[^\.\$]{0,50}?(?:(?:U\.?\s?S\.?\s?(?:A\.?\s?)?|united\s?states\s|E\.\s?U\.\s|canad(?:ian|a)\s|(?:ia\s)?de\s)?d(?:[o\xf3]|[\xc3][\xb3])l+are?s?|\bbucks|USD|GBP|<GB_UK>\spounds?|(?:<GB_UK>\s)?pounds?\ssterling|pounds(?!\sof)|(?:d'\s?)?euros?|francs?)\b/i
+endif
+
+if !plugin(Mail::SpamAssassin::Plugin::ReplaceTags)
+  meta     __LOTSA_MONEY_05   0
 endif
 
 ifplugin Mail::SpamAssassin::Plugin::ReplaceTags
-  body     __LOTSA_MONEY_05   /(?:(?:sum|value|amount)\sof\s)\d[\d.,\sO]{7,20}[\dO\.][\)\]\(\s]{0,3}(?:pounds?|dollars?|euros?|bucks)\b/i
+  body     __LOTSA_MONEY_05   /(?:(?:sum|value|amount)\sof\s)[1-9][\d.,\sO]{7,20}[\dO\.][\)\]\(\s]{0,3}(?:pounds?|dollars?|euros?|bucks)\b/i
 endif
 
 meta     __LOTTO_ADMITS     __LOTTO_ADMITS_1 || __LOTTO_ADMITS_2 || __LOTTO_ADMITS_3 || __LOTTO_ATTACH_1 || __LOTTO_ATTACH_2
@@ -3990,10 +4816,14 @@
 
 uri      __LOTTO_ADMITS_3 /lott+ery/i
 
-body     __LOTTO_AGENT_01 /\b(?:(?:(?:the|y?our)(?:\s\w{1,20})?|contact|accredited|listed)\sclaim(?:s|ing)?(?:\sprocessing)?|fiducia\w+|reimbursement|(?:prize|international|intl|foreign|win+ing)(?:[\s,.]+(?:rem+it+ance|settlement|payment|payout|award|transfer))+|payment|payout|immunity|(?<!memory\s)grants?)\s?(?:agent|manager|officer|secretary|director|mgr\b)/i
+meta     __LOTTO_AGENT    __LOTTO_AGENT_01 || __LOTTO_AGENT_02
+
+body     __LOTTO_AGENT_01 /\b(?:(?:(?:the|y?our)(?:\s\w{1,20})?|contact|accredited|listed)\sclaim(?:s|ing)?(?:\sprocessing)?|fiducia\w+|reimbursement|(?:prize|international|intl|foreign|win+ing)(?:[\s,.]+(?:rem+it+ance|settlement|payment|payout|award|transfer))+|payment|payout|immunity|(?<!memory\s)grants?(?!\smanager))\s?(?:agent|manager|officer|secretary|director|mgr\b)/i
 
 body     __LOTTO_AGENT_02 /\blot+ery[^\.]{1,40} ticket agent/i
 
+header   __LOTTO_AGENT_RPLY Reply-To =~ /(?:claim(?:s|ing)?(?:[\s_.]processing)?|fiducia\w+|dispatch|reimbursement|payout|prize\stransfer|(?:international|foreign|win+ing)[\s_.]rem+it+ance)[\s_.]?(?:agent|manager|officer|secretary|director|department|dept)/i
+
 if !plugin(Mail::SpamAssassin::Plugin::MIMEHeader)
   meta         __LOTTO_ATTACH_1   0
 endif
@@ -4024,7 +4854,7 @@
 
 body     __LUCRATIVE      /\b(?:lucrative|profitable|tr[\xe8]s\ssalutaire)\b/i
 
-body        __MAILBOX_FULL       /\b(?:you(?:r (?:mail\s?box|(?:e-?|web ?)mail))? (?:is (?:almost )?full|(?:quota )?ha(?:s|ve) (?:reached|exceeded|passed) (?:the|your|it'?s?) (?:size|storage|set|(?:e-?|web ?)mail|quota|folder|mail ?box)[\/\s](?:limit|quota))|over your mail\s?box (?:size )?(?:limit|quota)|maximum mail\s?box (?:size )?(?:limit|quota) exceeded|sua (?:conta|caixa) de (?:(?:e-?|web ?)mail|correio) (?:excedeu (?:sua|o) limite|est(?:=E1|[\xe1]|[\xc3][\xa1]) quase cheio))\b/i
+body        __MAILBOX_FULL       /\b(?:you(?:r (?:mail\s?box|(?:e-?|web ?)mail))? (?:is (?:almost )?full|(?:quota )?ha(?:s|ve) (?:reached|exceeded|passed) (?:the|your|it'?s?) (?:university )?(?:size|storage|set|(?:e-?|web ?)mail|quota|folder|mail ?box)[\/\s](?:limit |quota |account )+)|over your mail\s?box (?:size )?(?:limit|quota)|maximum mail\s?box (?:size )?(?:limit|quota) exceeded|sua (?:conta|caixa) de (?:(?:e-?|web ?)mail|correio) (?:excedeu (?:sua|o) limite|est(?:=E1|[\xe1]|[\xc3][\xa1]) quase cheio))\b/i
 
 body        __MAILBOX_FULL_SE    /(?:\b=F6|[\xf6]|[\xc3][\xb6])verskridit gr(?:=E4|[\xe4]|[\xc3][\xa4])nsen f(?:=F6|[\xf6]|[\xc3][\xb6])r din postl(?:=E5|[\xe5]|[\xc3][\xa5])da\b/i
 
@@ -4039,9 +4869,23 @@
 uri	 __MAIL_LINK	/\?.{0,200}\w\@[\w-]{1,20}.\w\w\w?\b/i
 tflags	 __MAIL_LINK	nice
 
-meta           __MANY_HDRS_LCASE     __HDRS_LCASE > 1
+if !plugin(Mail::SpamAssassin::Plugin::MIMEHeader)
+  meta         __MALW_ATTACH_01_01 0
+endif
 
-header   __MANY_RECIPS          ToCc =~ /(?:\@[^@]{5,100}){3}/
+ifplugin Mail::SpamAssassin::Plugin::MIMEHeader
+  mimeheader   __MALW_ATTACH_01_01 Content-Disposition =~ /\bfilename="?[^"]+\.SettingContent-ms\b/i
+endif
+
+if !plugin(Mail::SpamAssassin::Plugin::MIMEHeader)
+  meta         __MALW_ATTACH_01_02 0
+endif
+
+ifplugin Mail::SpamAssassin::Plugin::MIMEHeader
+  mimeheader   __MALW_ATTACH_01_02 Content-Type =~ /\bname="?[^"]+\.SettingContent-ms\b/i
+endif
+
+meta           __MANY_HDRS_LCASE     __HDRS_LCASE > 1
 
 meta           __MANY_SPAN_IN_TEXT   (__SPAN_BEG_TEXT > 4) && (__SPAN_END_TEXT > 4)
 
@@ -4051,8 +4895,30 @@
 
 header __MIMEOLE_1106   X-MimeOLE =~ /^Produced By Microsoft MimeOLE V6.00.2800.1106$/
 
+meta       __MIMEOLE_DIRECT_TO_MX      __HAS_MIMEOLE && __DOS_DIRECT_TO_MX 
+
 header     __MIME_BDRY_0D0D        Content-Type =~ /boundary="-{12}(?:0[1-9]){12}/
 
+if !((version >= 3.004000))
+	meta        __MIME_CTYPE_IN_BODY    0
+endif
+
+if (version >= 3.004000)
+	body        __MIME_CTYPE_IN_BODY    /^Content-Type:\s/
+endif
+
+if !((version >= 3.004000))
+	meta        __MIME_MALF      0
+endif
+
+if (version >= 3.004000)
+	meta        __MIME_MALF      __CTYPE_MULTIPART_ANY && __MIME_CTYPE_IN_BODY
+endif
+
+if !plugin(Mail::SpamAssassin::Plugin::MIMEHeader)
+  meta        __MIME_NO_TEXT    0
+endif
+
 ifplugin Mail::SpamAssassin::Plugin::MIMEHeader
   meta        __MIME_NO_TEXT    (__CTYPE_MULTIPART_ANY && !__ANY_TEXT_ATTACH)
 endif
@@ -4069,9 +4935,11 @@
 
 meta     __MONEY_FORM_SHORT  LOTS_OF_MONEY && __FILL_THIS_FORM_SHORT
 
-meta     __MONEY_FRAUD_3  LOTS_OF_MONEY && (__FRAUD_VQE + __FRAUD_KJV + __FRAUD_IRJ + __FRAUD_NEB + __FRAUD_XJR + __FRAUD_DPR + __FRAUD_BEP + __FRAUD_TDP + __FRAUD_GAN + __FRAUD_IRT + __FRAUD_AON + __FRAUD_WNY + __FRAUD_IPK + __FRAUD_QXX + __FRAUD_IOV + __FRAUD_MLY + __FRAUD_ULK + __FRAUD_BGP + __FRAUD_YWW + __FRAUD_JYG + __FRAUD_XWW + __FRAUD_UUY + __FRAUD_SNT + __FRAUD_JNB + __FRAUD_QFY + __FRAUD_WDR + __FRAUD_WFC + __FRAUD_AUM + __FRAUD_MCQ + __FRAUD_PVN + __FRAUD_FVU + __FRAUD_CKF + __FRAUD_MQO + __FRAUD_TCC + __FRAUD_GBW + __FRAUD_AXF + __FRAUD_THJ + __FRAUD_YQV + __FRAUD_YJA + __FRAUD_YPO + __FRAUD_UOQ + __AFRICAN_STATE + __AGREED_RATIO + __AM_DYING + __ATM_CARD + __BACK_SCRATCH +  __BARRISTER + __BENEFICIARY + __COMPENSATION + __CONTACT_ATTY + __CONTACT_YOU + __COURIER + __DEAD_PARENT + __DEAL + DEAR_BENEFICIARY + DEAR_WINNER + __DECEASED + __DESTROY_ME + __DIED_IN + __DIPLOMATIC + __DORMANT_ACCT + __EARLY_DEMISE + EMRCP + __EX_CUSTOMER + __FEES + __FIFTY_FIFTY + __FOUND_YOU + __FRAUD + __FRAUD_PTX + __HUSH_HUSH + __I_INHERIT + __INHERIT_PMT + __INTL_BANK + __INVEST_COUNTRY + __INVEST_MONEY + __IS_LEGAL + __I_WILL_YOU + __KAM_LOTTO2 + __LOTTO_ADMITS + LOTTO_AGENT + __LOTTO_DEPT + __LOTTO_RELATED + __LOTTO_VERIFY + T_LOTTO_URI + __LOTTO_WIN_01 + __LOTTO_WINNINGS +  __LUCKY_WINNER + __LUCRATIVE + __MILLIONS + __MY_FORTUNE + __NEXT_OF_KIN + __NOT_DEAD_YET + __NOT_SCAM + __OUR_BEHALF + __SCAM + __SHARE_IT + __SUM_OF_FUND + __SURVIVORS + __THEY_INHERIT + __TRTMT_DEFILED + __TRUNK_BOX +  __UN + UNCLAIMED_MONEY + __WIDOW + __WILL_LEGAL + __XFER_MONEY + __YOU_ASSIST + __YOU_INHERIT + __YOUR_BANK + __YOUR_FUND + __YOUR_PERM + __YOUR_PROFIT + __YOU_WON + T_LOTTO_AGENT_FM + LOTTO_AGENT_RPLY + __PCT_FOR_YOU + __PCT_OF_PMTS + __RANDOM_PICK + __CHARITY > 3)
+meta     __MONEY_FRAUD_3  LOTS_OF_MONEY && (__FRAUD_VQE + __FRAUD_KJV + __FRAUD_IRJ + __FRAUD_NEB + __FRAUD_XJR + __FRAUD_DPR + __FRAUD_BEP + __FRAUD_TDP + __FRAUD_GAN + __FRAUD_IRT + __FRAUD_AON + __FRAUD_WNY + __FRAUD_IPK + __FRAUD_QXX + __FRAUD_IOV + __FRAUD_MLY + __FRAUD_ULK + __FRAUD_BGP + __FRAUD_YWW + __FRAUD_JYG + __FRAUD_XWW + __FRAUD_UUY + __FRAUD_SNT + __FRAUD_JNB + __FRAUD_QFY + __FRAUD_WDR + __FRAUD_WFC + __FRAUD_AUM + __FRAUD_MCQ + __FRAUD_PVN + __FRAUD_FVU + __FRAUD_CKF + __FRAUD_MQO + __FRAUD_TCC + __FRAUD_GBW + __FRAUD_AXF + __FRAUD_THJ + __FRAUD_YQV + __FRAUD_YJA + __FRAUD_YPO + __FRAUD_UOQ + __AFRICAN_STATE + __AGREED_RATIO + __AM_DYING + __ATM_CARD + __BACK_SCRATCH +  __BARRISTER + __BENEFICIARY + __COMPENSATION + __CONTACT_ATTY + __CONTACT_YOU + __COURIER + __DEAD_PARENT + __DEAL + DEAR_BENEFICIARY + DEAR_WINNER + __DECEASED + __DESTROY_ME + __DIED_IN + __DIPLOMATIC + __DORMANT_ACCT + __EARLY_DEMISE + T_EMRCP + __EX_CUSTOMER + __FEES + __FIFTY_FIFTY + __FOUND_YOU + __FRAUD + __FRAUD_PTX + __HUSH_HUSH + __I_INHERIT + __INHERIT_PMT + __INTL_BANK + __INVEST_COUNTRY + __INVEST_MONEY + __IS_LEGAL + __I_WILL_YOU + __KAM_LOTTO2 + __LOTTO_ADMITS + LOTTO_AGENT + __LOTTO_DEPT + __LOTTO_RELATED + __LOTTO_VERIFY + T_LOTTO_URI + __LOTTO_WIN_01 + __LOTTO_WINNINGS +  __LUCKY_WINNER + __LUCRATIVE + __MILLIONS + __MY_FORTUNE + __NEXT_OF_KIN + __NOT_DEAD_YET + __NOT_SCAM + __OUR_BEHALF + __SCAM + __SHARE_IT + __SUM_OF_FUND + __SURVIVORS + __THEY_INHERIT + __TRTMT_DEFILED + __TRUNK_BOX +  __UN + UNCLAIMED_MONEY + __WIDOW + __WILL_LEGAL + __XFER_MONEY + __YOU_ASSIST + __YOU_INHERIT + __YOUR_BANK + __YOUR_FUND + __YOUR_PERM + __YOUR_PROFIT + __YOU_WON + T_LOTTO_AGENT_FM + T_LOTTO_AGENT_RPLY + __PCT_FOR_YOU + __PCT_OF_PMTS + __RANDOM_PICK + __CHARITY > 3)
 
-meta     __MONEY_FRAUD_5  LOTS_OF_MONEY && (__FRAUD_VQE + __FRAUD_KJV + __FRAUD_IRJ + __FRAUD_NEB + __FRAUD_XJR + __FRAUD_DPR + __FRAUD_BEP + __FRAUD_TDP + __FRAUD_GAN + __FRAUD_IRT + __FRAUD_AON + __FRAUD_WNY + __FRAUD_IPK + __FRAUD_QXX + __FRAUD_IOV + __FRAUD_MLY + __FRAUD_ULK + __FRAUD_BGP + __FRAUD_YWW + __FRAUD_JYG + __FRAUD_XWW + __FRAUD_UUY + __FRAUD_SNT + __FRAUD_JNB + __FRAUD_QFY + __FRAUD_WDR + __FRAUD_WFC + __FRAUD_AUM + __FRAUD_MCQ + __FRAUD_PVN + __FRAUD_FVU + __FRAUD_CKF + __FRAUD_MQO + __FRAUD_TCC + __FRAUD_GBW + __FRAUD_AXF + __FRAUD_THJ + __FRAUD_YQV + __FRAUD_YJA + __FRAUD_YPO + __FRAUD_UOQ + __AFRICAN_STATE + __AGREED_RATIO + __AM_DYING + __ATM_CARD + __BACK_SCRATCH +  __BARRISTER + __BENEFICIARY + __COMPENSATION + __CONTACT_ATTY + __CONTACT_YOU + __COURIER + __DEAD_PARENT + __DEAL + DEAR_BENEFICIARY + DEAR_WINNER + __DECEASED + __DESTROY_ME + __DIED_IN + __DIPLOMATIC + __DORMANT_ACCT + __EARLY_DEMISE + EMRCP + __EX_CUSTOMER + __FEES + __FIFTY_FIFTY + __FOUND_YOU + __FRAUD + __FRAUD_PTX + __HUSH_HUSH + __I_INHERIT + __INHERIT_PMT + __INTL_BANK + __INVEST_COUNTRY + __INVEST_MONEY + __IS_LEGAL + __I_WILL_YOU + __KAM_LOTTO2 + __LOTTO_ADMITS + LOTTO_AGENT + __LOTTO_DEPT + __LOTTO_RELATED + __LOTTO_VERIFY + T_LOTTO_URI + __LOTTO_WIN_01 + __LOTTO_WINNINGS +  __LUCKY_WINNER + __LUCRATIVE + __MILLIONS + __MY_FORTUNE + __NEXT_OF_KIN + __NOT_DEAD_YET + __NOT_SCAM + __OUR_BEHALF + __SCAM + __SHARE_IT + __SUM_OF_FUND + __SURVIVORS + __THEY_INHERIT + __TRTMT_DEFILED + __TRUNK_BOX +  __UN + UNCLAIMED_MONEY + __WIDOW + __WILL_LEGAL + __XFER_MONEY + __YOU_ASSIST + __YOU_INHERIT + __YOUR_BANK + __YOUR_FUND + __YOUR_PERM + __YOUR_PROFIT + __YOU_WON + T_LOTTO_AGENT_FM + LOTTO_AGENT_RPLY + __PCT_FOR_YOU + __PCT_OF_PMTS + __RANDOM_PICK + __CHARITY > 5)
+meta     __MONEY_FRAUD_5  LOTS_OF_MONEY && (__FRAUD_VQE + __FRAUD_KJV + __FRAUD_IRJ + __FRAUD_NEB + __FRAUD_XJR + __FRAUD_DPR + __FRAUD_BEP + __FRAUD_TDP + __FRAUD_GAN + __FRAUD_IRT + __FRAUD_AON + __FRAUD_WNY + __FRAUD_IPK + __FRAUD_QXX + __FRAUD_IOV + __FRAUD_MLY + __FRAUD_ULK + __FRAUD_BGP + __FRAUD_YWW + __FRAUD_JYG + __FRAUD_XWW + __FRAUD_UUY + __FRAUD_SNT + __FRAUD_JNB + __FRAUD_QFY + __FRAUD_WDR + __FRAUD_WFC + __FRAUD_AUM + __FRAUD_MCQ + __FRAUD_PVN + __FRAUD_FVU + __FRAUD_CKF + __FRAUD_MQO + __FRAUD_TCC + __FRAUD_GBW + __FRAUD_AXF + __FRAUD_THJ + __FRAUD_YQV + __FRAUD_YJA + __FRAUD_YPO + __FRAUD_UOQ + __AFRICAN_STATE + __AGREED_RATIO + __AM_DYING + __ATM_CARD + __BACK_SCRATCH +  __BARRISTER + __BENEFICIARY + __COMPENSATION + __CONTACT_ATTY + __CONTACT_YOU + __COURIER + __DEAD_PARENT + __DEAL + DEAR_BENEFICIARY + DEAR_WINNER + __DECEASED + __DESTROY_ME + __DIED_IN + __DIPLOMATIC + __DORMANT_ACCT + __EARLY_DEMISE + T_EMRCP + __EX_CUSTOMER + __FEES + __FIFTY_FIFTY + __FOUND_YOU + __FRAUD + __FRAUD_PTX + __HUSH_HUSH + __I_INHERIT + __INHERIT_PMT + __INTL_BANK + __INVEST_COUNTRY + __INVEST_MONEY + __IS_LEGAL + __I_WILL_YOU + __KAM_LOTTO2 + __LOTTO_ADMITS + LOTTO_AGENT + __LOTTO_DEPT + __LOTTO_RELATED + __LOTTO_VERIFY + T_LOTTO_URI + __LOTTO_WIN_01 + __LOTTO_WINNINGS +  __LUCKY_WINNER + __LUCRATIVE + __MILLIONS + __MY_FORTUNE + __NEXT_OF_KIN + __NOT_DEAD_YET + __NOT_SCAM + __OUR_BEHALF + __SCAM + __SHARE_IT + __SUM_OF_FUND + __SURVIVORS + __THEY_INHERIT + __TRTMT_DEFILED + __TRUNK_BOX +  __UN + UNCLAIMED_MONEY + __WIDOW + __WILL_LEGAL + __XFER_MONEY + __YOU_ASSIST + __YOU_INHERIT + __YOUR_BANK + __YOUR_FUND + __YOUR_PERM + __YOUR_PROFIT + __YOU_WON + T_LOTTO_AGENT_FM + T_LOTTO_AGENT_RPLY + __PCT_FOR_YOU + __PCT_OF_PMTS + __RANDOM_PICK + __CHARITY > 5)
+
+meta     __MONEY_FRAUD_8  LOTS_OF_MONEY && (__FRAUD_VQE + __FRAUD_KJV + __FRAUD_IRJ + __FRAUD_NEB + __FRAUD_XJR + __FRAUD_DPR + __FRAUD_BEP + __FRAUD_TDP + __FRAUD_GAN + __FRAUD_IRT + __FRAUD_AON + __FRAUD_WNY + __FRAUD_IPK + __FRAUD_QXX + __FRAUD_IOV + __FRAUD_MLY + __FRAUD_ULK + __FRAUD_BGP + __FRAUD_YWW + __FRAUD_JYG + __FRAUD_XWW + __FRAUD_UUY + __FRAUD_SNT + __FRAUD_JNB + __FRAUD_QFY + __FRAUD_WDR + __FRAUD_WFC + __FRAUD_AUM + __FRAUD_MCQ + __FRAUD_PVN + __FRAUD_FVU + __FRAUD_CKF + __FRAUD_MQO + __FRAUD_TCC + __FRAUD_GBW + __FRAUD_AXF + __FRAUD_THJ + __FRAUD_YQV + __FRAUD_YJA + __FRAUD_YPO + __FRAUD_UOQ + __AFRICAN_STATE + __AGREED_RATIO + __AM_DYING + __ATM_CARD + __BACK_SCRATCH +  __BARRISTER + __BENEFICIARY + __COMPENSATION + __CONTACT_ATTY + __CONTACT_YOU + __COURIER + __DEAD_PARENT + __DEAL + DEAR_BENEFICIARY + DEAR_WINNER + __DECEASED + __DESTROY_ME + __DIED_IN + __DIPLOMATIC + __DORMANT_ACCT + __EARLY_DEMISE + T_EMRCP + __EX_CUSTOMER + __FEES + __FIFTY_FIFTY + __FOUND_YOU + __FRAUD + __FRAUD_PTX + __HUSH_HUSH + __I_INHERIT + __INHERIT_PMT + __INTL_BANK + __INVEST_COUNTRY + __INVEST_MONEY + __IS_LEGAL + __I_WILL_YOU + __KAM_LOTTO2 + __LOTTO_ADMITS + LOTTO_AGENT + __LOTTO_DEPT + __LOTTO_RELATED + __LOTTO_VERIFY + T_LOTTO_URI + __LOTTO_WIN_01 + __LOTTO_WINNINGS +  __LUCKY_WINNER + __LUCRATIVE + __MILLIONS + __MY_FORTUNE + __NEXT_OF_KIN + __NOT_DEAD_YET + __NOT_SCAM + __OUR_BEHALF + __SCAM + __SHARE_IT + __SUM_OF_FUND + __SURVIVORS + __THEY_INHERIT + __TRTMT_DEFILED + __TRUNK_BOX +  __UN + UNCLAIMED_MONEY + __WIDOW + __WILL_LEGAL + __XFER_MONEY + __YOU_ASSIST + __YOU_INHERIT + __YOUR_BANK + __YOUR_FUND + __YOUR_PERM + __YOUR_PROFIT + __YOU_WON + T_LOTTO_AGENT_FM + T_LOTTO_AGENT_RPLY + __PCT_FOR_YOU + __PCT_OF_PMTS + __RANDOM_PICK + __CHARITY > 8)
 
 meta            __MONEY_FROM_41           __NSL_RCVD_FROM_41 && LOTS_OF_MONEY
 
@@ -4087,21 +4955,21 @@
 header	 __MSGID_LIST	Message-ID =~ /-\w+\#[\w.]+\.\w{2,4}\@/
 tflags	 __MSGID_LIST	nice
 
+header   __MSGID_NOFQDN2  Message-ID =~ /<.*\@[A-Za-z0-9]+>/m
+
+meta       __MSM_PRIO_REPTO             __HAS_MSMAIL_PRI && __REPLYTO_EXISTS && __SUBJ_SHORT 
+
 header __MSOE_MID_WRONG_CASE   ALL =~ /\nMessage-Id: /
 
 header         __MTLANDROID_MUA    X-Mailer =~ /\bMotorola android mail \d+\.\d/
 
-header     __MUA_TBIRD             User-Agent =~ /Thunderbird/
+header     __MUA_TBIRD             User-Agent =~ /^Mozilla\/(.*) Thunderbird/
 
 body     __MY_FORTUNE     /\b(?:my|his|her)\s(?:fortune|heritage)\b/i
 
 header __NAKED_TO   To =~ /^[^\s<>]+\@[^\s<>]+$/
 
-meta           __NAME_EMAIL_DIFF   __NAME_IS_EMAIL && ! __NAME_EQ_EMAIL
-
-header __NAME_EQ_EMAIL	From:raw =~ /([\w+.-]+\@[\w.-]+\.\w\w+)["'`\s]*<\s*\1>/
-
-header __NAME_IS_EMAIL	From:raw =~ /\w\@[\w.-]+\.\w\w+["'`]*\s*<\w+\@\w/
+header __NAME_EQ_EMAIL	From:raw =~ /([\w+.-]+\@[\w.-]+\.\w\w+)["'`\s]*<\s*\1>/i
 
 body     __NEXT_OF_KIN    /\bnext[-\s]of[-\s]kin\b/i
 
@@ -4150,6 +5018,10 @@
 
 header      __NUMBERS_IN_SUBJ  Subject =~ /\d{3}/
 
+if !plugin(Mail::SpamAssassin::Plugin::ImageInfo)
+  meta       __ONE_IMG               0
+endif
+
 ifplugin Mail::SpamAssassin::Plugin::ImageInfo
   body       __ONE_IMG               eval:image_count('all',1,1)
 endif
@@ -4176,43 +5048,101 @@
 
 body     __PAY_YOU        /\bpay\syou\b/
 
+if !plugin(Mail::SpamAssassin::Plugin::ReplaceTags)
+  meta     __PCT_FOR_YOU    0
+endif
+
 ifplugin Mail::SpamAssassin::Plugin::ReplaceTags
-  meta     __PCT_FOR_YOU    __PCT_FOR_YOU_1 || __PCT_FOR_YOU_2 || __PCT_FOR_YOU_3 || SHARE_50_50
+  meta     __PCT_FOR_YOU    __PCT_FOR_YOU_1 || __PCT_FOR_YOU_2 || __PCT_FOR_YOU_3 || T_SHARE_50_50
+endif
+
+if !plugin(Mail::SpamAssassin::Plugin::ReplaceTags)
+  meta     __PCT_FOR_YOU_1  0
 endif
 
 ifplugin Mail::SpamAssassin::Plugin::ReplaceTags
   body     __PCT_FOR_YOU_1  /<PERCENT>[\s)]{0,3}(?:(?:of\s[\w\s]{0,35}?)?(?:for|to|as)\syour?|(?:[^\s.]{1,15}\s)?an uns beide)/i
 endif
 
+if !plugin(Mail::SpamAssassin::Plugin::ReplaceTags)
+  meta     __PCT_FOR_YOU_2  0
+endif
+
 ifplugin Mail::SpamAssassin::Plugin::ReplaceTags
   body     __PCT_FOR_YOU_2  /\b(?:(?:give|offer)\syou|vous\s(?:aurez\sdroit\s(?:=E0|[\xe0])|donnerai|all(?:e|=E9|[\xe9]|[\xc3][\xa9])\srecevoir\sautour\sde)|ihnen)\s<PERCENT>/i
 endif
 
+if !plugin(Mail::SpamAssassin::Plugin::ReplaceTags)
+  meta     __PCT_FOR_YOU_3  0
+endif
+
 ifplugin Mail::SpamAssassin::Plugin::ReplaceTags
   body     __PCT_FOR_YOU_3  /\byour?\s(?!can)(?:(?!you)\w{1,15}\s){0,10}(?:(?:share|entiti?le(?:d|ment)?|percentage|fee|assist(?:ance)?|comp[ea]nsat(?:ed?|tion)|reward(?:ed)?|renumerat(?:e|tion)|com+is+ion|paid|deduct|account|tage|(?:will|shall|would|(?:are|stand|going)\sto)\s(?:be\s)?(?:tak(?:e|ing)|earn|get(?:ting)?|remit|subtract|with+old)|(?:deduct|taken?|subtract(?:ed)?)\syour|keep(?:ing)?|receiv(?:e|ing)|retain(?:ing)?|have|half|giv(?:en|ing)|paid|(?:give|pay|offer)\s(?:me|you|him)|bank\saccount|to\s(?:take|use)|(?:time|country)\sand|ratio\sof)(?:\s(?!you)\w{1,15}){0,10})\s(?<!by\s)(?<!up\sto\s)<PERCENT>/i
 endif
 
+if !plugin(Mail::SpamAssassin::Plugin::ReplaceTags)
+  meta     __PCT_OF_PMTS    0
+endif
+
 ifplugin Mail::SpamAssassin::Plugin::ReplaceTags
   body     __PCT_OF_PMTS    /<PERCENT>[\s)]+(?:of\s[\w\s]{0,35}?)?(?:of|du|de)\s(?:(?:the|la)\s)?(?:total\s)?(?:payments?|rem+it+ances?|capital|chec(?:k|que)s?|mon(?:ey|ies)|suma?)/i
 endif
 
+if !plugin(Mail::SpamAssassin::Plugin::MIMEHeader)
+  meta         __PDF_ATTACH        0
+  meta         __PDF_ATTACH       0
+endif
+
 ifplugin Mail::SpamAssassin::Plugin::MIMEHeader
   mimeheader   __PDF_ATTACH        Content-Type =~ m,\bapplication/pdf\b,i
   meta         __PDF_ATTACH       (__PDF_ATTACH_MT || __PDF_ATTACH_FN1 || __PDF_ATTACH_FN2)
 endif
 
+if !plugin(Mail::SpamAssassin::Plugin::MIMEHeader)
+  meta         __PDF_ATTACH_FN1   0
+endif
+
 ifplugin Mail::SpamAssassin::Plugin::MIMEHeader
   mimeheader   __PDF_ATTACH_FN1   Content-Type =~ /="[^"]+\.pdf"/i
 endif
 
+if !plugin(Mail::SpamAssassin::Plugin::MIMEHeader)
+  meta         __PDF_ATTACH_FN2   0
+endif
+
 ifplugin Mail::SpamAssassin::Plugin::MIMEHeader
   mimeheader   __PDF_ATTACH_FN2   Content-Disposition =~ /="[^"]+\.pdf"/i
 endif
 
+if !plugin(Mail::SpamAssassin::Plugin::MIMEHeader)
+  meta         __PDF_ATTACH_MT    0
+endif
+
 ifplugin Mail::SpamAssassin::Plugin::MIMEHeader
   mimeheader   __PDF_ATTACH_MT    Content-Type =~ m,\bapplication/pdf\b,i
 endif
 
+if can(Mail::SpamAssassin::Conf::perl_min_version_5010000)
+  header     __PDS_FROM_2_EMAILS      From =~ /^\W+([\w+.-]+\@[\w.-]+\.\w\w++)(?:[^\n\w<]{0,80})?<(?!\1)[^\n\s]*\@/i
+endif
+
+if can(Mail::SpamAssassin::Conf::perl_min_version_5010000)
+  header     __PDS_TO_EQ_FROM_NAME_1  ALL =~ /\nTo:\s+(?:[^\n<]{0,80}<)?([^\n\s>]+)>?\n(?:[^\n]{1,100}\n)*From:\W+(\1)([^\n\w<]++<)?((?!\1)[^\n">]++)>?\n/ism
+endif
+
+if can(Mail::SpamAssassin::Conf::perl_min_version_5010000)
+  header     __PDS_TO_EQ_FROM_NAME_2  ALL =~ /\nFrom:\W+"([\w+.-]+\@[\w.-]+\.\w\w+)(?:[^\n\w<]{0,80}<)?((?!\1)[^\n">]++)>?\n(?:[^\n]{1,100}\n)*To:\s+(?:[^\n<]{0,80}<)?(\1)>?/ism
+endif
+
+meta        __PD_CNT_1        (__PUMPDUMP_01+__PUMPDUMP_02+__PUMPDUMP_03+__PUMPDUMP_04+__PUMPDUMP_05+__PUMPDUMP_06+__PUMPDUMP_07+__PUMPDUMP_08+__PUMPDUMP_09+__PUMPDUMP_10) > 0
+
+if can(Mail::SpamAssassin::Conf::feature_bug6558_free)
+  body       __PHOTO_RETOUCHING         /\b(?:(?:retouching|(?:image|photo|pic)s? (?:[a-z]{1,15} ){0,3}(?:edit(?:ing|ors)|team|(?:cut+|mask|clip+|clean|crop+|resiz|enhanc)ing|cut+(?:ing)?[-\s]?out|enhancement|manipulation|restoration|compositing|working|(?:color|contrast|brightnes+|background|make-?up) (?:cor+ection|change)|solution|work|services?)|your (?:imag(?:es|ing)|pics)|photo\s?shop experts?|(?:deliver (?:the|your) |(?:(?:send|throw|ship|drop|deliver|give|provide|e-?mail) us|(?:cut+(?:ing)?[-\s]?out|masking|(?:test|edit)(?:ing)?) (?:for|of|on|with)) (?:(?:an?|one|your|some|sample|test|example|the) )+)(?:image|photo|pic)s?|(?:proces+|edit)(?:\sover|\smore th[ae]n)? \d{2,5}\D? (?:image|photo|pic)s|improv(?:e|ing) (?:(?:image|photo|picture|pic) (?:quality|lighting)|(?:(?:image|photo|picture|pic) )?(?:resolution|contrast|background|color))|cor+ecting (?:color|contrast|brightnes+|background))\b|(?:e-?com+erce|jew[el]+r(?:[y's]+|ies)|model+(?:s|ing)?|products?|portraits?|graduation['s]*|school['s]*|bab(?:[y's]+|ies)|famil(?:[y's]+|ies)|kids|wedding|beauty|glamou?r|catalog['s]*|store['s]*|shop['s]*|(?:cut+(?:ing)?[-\s]?out|clip+ing\spath|(?:all|any) kinds? of|enhance|retouch|edit(?:ing)?)[,;]?(?:\s[a-z]{1,15}){0,4})\s(?:image|photo|pic)s?(?:[.,?]|\sand\b|\setc\b))/i
+  tflags     __PHOTO_RETOUCHING         multiple maxhits=5
+endif
+
+header  __PHPMAILER_MUA       X-Mailer =~ /^PHPMailer\b/
+
 meta    __PHP_MUA             __PHP_MUA_1 || __PHP_MUA_2
 
 header  __PHP_MUA_1           X-Mailer =~ /^PHP\s?v?\/?\d\./
@@ -4221,11 +5151,21 @@
 
 header  __PHP_NOVER_MUA       X-Mailer =~ /^PHP$/
 
+meta       __PHP_ORIG_SCRIPT_SONLY     __HAS_PHP_ORIG_SCRIPT && (__TVD_SPACE_RATIO || __SINGLE_WORD_SUBJ || __OBFUSCATING_COMMENT_B)
+
+if !(can(Mail::SpamAssassin::Conf::feature_bug6558_free))
+  meta        __PILL_PRICE_01        0
+endif
+
 if can(Mail::SpamAssassin::Conf::feature_bug6558_free)
   body        __PILL_PRICE_01        m;(?=[\d .f])(?:free|[\d .]{3}(?:/|per|each)) ?(?=[ptc])(?:pill|tablet|cap(?:sule|let))s?\b;i
   tflags      __PILL_PRICE_01        multiple maxhits=3
 endif
 
+if !(can(Mail::SpamAssassin::Conf::feature_bug6558_free))
+  meta        __PILL_PRICE_02        0
+endif
+
 if can(Mail::SpamAssassin::Conf::feature_bug6558_free)
   body        __PILL_PRICE_02        /(?=[ptc])(?:pill|tablet|cap(?:sule|let))s[-= :]{1,5}\$?[\d .]{3}/i
   tflags      __PILL_PRICE_02        multiple maxhits=3
@@ -4233,13 +5173,41 @@
 
 body           __PLS_REVIEW       /\b(?:please|kindly)\s(?:(?:re)?view|see)(?:\s\w+)?\sattach(?:ed|ment)\b/i
 
+uri         __PS_TEST_LOC_WP   m;/(?:wp-content/plugins|wp-content/themes|wp-includes|modules/mod_wdbanners|includes/|google_recommends|mt-static|data/module)/.{1,128}(?!\.gif|\.jpg|\.png|\.bmp|\.ico|\.pdf)[^?]{4}(?:\?[^?]{1,5})?$;i
+
+body        __PUMPDUMP_01     /\b(?:times|multiply|tripl(?:e|ing)|quadrupl(?:e|ing)|quintupl(?:e|ing)) (?:your|an) (?:princip(?:al|le)|investment)\b/i
+
+body        __PUMPDUMP_02     /\b(?:sto[ck]{2}|share price) (?:will |may |is (?:(?:about|poised|positioned|ready) to |gonna ))?(?:triple|quadruple|quintuple|soar|go(?:es?) (?:nuts|crazy|sky high|way up))\b/i
+
+body        __PUMPDUMP_03     /\bbuy (?:[^.!]{1,30} )?(?:(?:(?:mon|tues|wednes|thurs|fri)day|tomorrow) (?:first thing|open|morning)|(?:first thing|opens|before) (?:(?:mon|tues|wednes|thurs|fri)day|tomorrow))/i
+
+body        __PUMPDUMP_04     /\bmake you (?:big bucks|hundreds|thousands)\b/i
+
+body        __PUMPDUMP_05     /\b(?:tripled|quadrupled|quintupled|(?:shares|value|company) (?:go up|increase|has (?:increased|gained)) (?:by|more than) [a-z\s]{0,20}\d+(?: times| percent| ?%)) (?:and that )?in (?:(?:\d|a (?:span of|few)) days|a very short period)\b/i
+
+body        __PUMPDUMP_06     /\brecommend(?:ed|s)? (?:a|this) (?:company|stock)\b/i
+
+body        __PUMPDUMP_07     /\b(?:buy|grab it) for (?:around |about |less than )?\d+ cents\b/i
+
+body        __PUMPDUMP_08     /\b?(:sto[ck]{2}|sotk) of the year/i
+
+body        __PUMPDUMP_09     /\b(?:buy|get|snap up|grab) as many shares (?:of it )?as (?:you|I) can\b/i
+
+body        __PUMPDUMP_10     /\btrading at (?:such )?a (?:bargain|cheap|low)\b/i
+
 body     __RANDOM_PICK    /\b(?:random(?:ly)?\s(?:\w+\s)?(?:select(?:ion|ed)|pick(?:ed)?|computer)|(?:select|pick)ed\s(?:at\s)?random(?:ly)?|(?:esco(?:g|lh)idos|seleccion) (?:aleatoria(?:mente)?|al azar))\b/i
 
+header    __RAND_HEADER                ALL =~ /^(?!Accept-Language|Authentication-Results|Content-|DomainKey-Signature|DKIM-|List-|MIME-|Received-SPF|Return-Path|Thread-|User-Agent)(?:[a-z]{4,}-[a-z]{3,}|[a-z]{3,}-[a-z]{4,}):\s+\d(?=\S{6,}\s*$)[\da-f]*(?:[-.]\w+)*\s*$/ism
+tflags    __RAND_HEADER                multiple, maxhits=4
+
 header __RATWARE_BOUND_A  ALL =~ /^Message-Id: <....([0-9a-f]{8})\$[0-9a-f]{8}\$.{10,400}boundary="----=_NextPart_000_...._\1\./msi # "
 
 header __RATWARE_BOUND_B  ALL =~ /boundary="----=_NextPart_000_...._([0-9a-f]{8})\..{10,400}^Message-Id: <....\1\$[0-9a-f]{8}\$/msi # "
 
-header __RCD_RDNS_DIAL_MESSY X-Spam-Relays-External =~ /^[^\]]+ rdns=\S*dial/i
+header __RCD_RDNS_DYN_MESSY X-Spam-Relays-External =~ /^[^\]]+ rdns=\S*dyn/i
+
+header __RCD_RDNS_MAIL X-Spam-Relays-External =~ /^[^\]]+ rdns=\S*\bmail[^a-z]/i
+tflags __RCD_RDNS_MAIL nice
 
 header __RCD_RDNS_MAIL_MESSY X-Spam-Relays-External =~ /^[^\]]+ rdns=\S*mail/i
 tflags __RCD_RDNS_MAIL_MESSY nice
@@ -4247,12 +5215,16 @@
 header __RCD_RDNS_MTA_MESSY X-Spam-Relays-External =~ /^[^\]]+ rdns=\S*mta/i
 tflags __RCD_RDNS_MTA_MESSY nice
 
-header __RCD_RDNS_MX X-Spam-Relays-External =~ /^[^\]]+ rdns=\S*\bmx[^a-z]/i
-tflags __RCD_RDNS_MX nice
-
 header __RCD_RDNS_MX_MESSY X-Spam-Relays-External =~ /^[^\]]+ rdns=\S*mx/
 tflags __RCD_RDNS_MX_MESSY nice
 
+header __RCD_RDNS_PPOE_MESSY X-Spam-Relays-External =~ /^[^\]]+ rdns=\S*ppoe/i
+
+header __RCD_RDNS_PPP_MESSY X-Spam-Relays-External =~ /^[^\]]+ rdns=\S*ppp/i
+
+header __RCD_RDNS_SMTP X-Spam-Relays-External =~ /^[^\]]+ rdns=\S*\bsmtps?[^a-z]/i
+tflags __RCD_RDNS_SMTP nice
+
 header __RCD_RDNS_SMTP_MESSY X-Spam-Relays-External =~ /^[^\]]+ rdns=\S*smtp/
 tflags __RCD_RDNS_SMTP_MESSY nice
 
@@ -4263,6 +5235,12 @@
 
 header         __RCVD_ZIXMAIL        X-Spam-Relays-Untrusted =~ / helo=smtpout\.zixmail\.net /
 
+header __RDNS_HEX X-Spam-Relays-External =~ /^[^\]]+ rdns=[^ .]*\d(?![0-9a-f]*[a-f]{3})[0-9a-f]{7}/
+
+header __RDNS_NO_SUBDOM	X-Spam-Relays-External =~ /^[^\]]+ rdns=[^. ]*\.\w+ /
+
+header     __RDNS_NUMERIC_TLD          X-Spam-Relays-External =~ /\srdns=\S+\.\d+\s/
+
 header __RDNS_SHORT	X-Spam-Relays-External =~ /^[^\]]+ rdns=\S{4,14} /
 
 ifplugin Mail::SpamAssassin::Plugin::MIMEHeader # {
@@ -4271,6 +5249,10 @@
 
 header __REPLYTO_EXISTS             exists:Reply-To
 
+header    __REPTO_CHN_FREEM             Reply-To =~ /\@(?:sina|aliyun)\.com/i
+
+header    __REPTO_RUS_FREEM             Reply-To =~ /\@mail\.ru/i
+
 if !(version >= 3.003000)
   meta        __RP_MATCHES_RCVD      0
 endif
@@ -4287,13 +5269,24 @@
 endif
 endif
 
+header __S25R_4 X-Spam-Relays-External =~ /^[^\]]+ rdns=[^. ]*\d\.[^. ]*\d-\d/
+
+header __S25R_6 X-Spam-Relays-External =~ /^[^\]]+ rdns=(?:dhcp|dialup|ppp|[achrsvx]?dsl)[^. ]*\d/
+
 body     __SCAM           /\bscam(?:m?e[dr])?s?\b/i
 
+body        __SECURITY_DEPT      /\bsecurity dep(?:artmen)?t\b/i
+
 header	 __SENDER_BOT	ALL =~ /(?:not?\W?repl[yi]|bounce|contact|daemon|subscri|report|respon[ds]e?r?s?\b|\b(?:root|news|nobody|agent|(?:post|web)?master|manag|send(?:er|ing)?|out|(?:bot|web|www)\b))[^\@ >]{0,5}s?\@\w/i
 tflags	 __SENDER_BOT	nice
 
 body     __SHARE_IT       /\b(?:(?:share|allocate|teilen|parteger(?:ez|ons)?|partage)\s(?:th(?:e|is)|das|les?|des)\s(?:proceeds|funds?|money|balance|account|geld|compte|fonds)|partager(?:ez|ons)? (?:avec (?:vous|moi)|ratio|suivant un pourcentage))\b/i
 
+body        __SINGLE_WORD_LINE  /^\s?\S{1,60}\s?$/
+tflags      __SINGLE_WORD_LINE  multiple maxhits=2
+
+header      __SINGLE_WORD_SUBJ  Subject =~ /^\s*\S{1,60}\s*$/
+
 header      __SMIME_MESSAGE    Content-Type =~ /application\/pkcs7-mime;/i
 
 rawbody        __SPAN_BEG_TEXT     /[a-z]{2}<(?i:span)\s/
@@ -4302,41 +5295,82 @@
 rawbody        __SPAN_END_TEXT     /[^;>]<\/(?i:span)>[a-z]{3}/
 tflags         __SPAN_END_TEXT     multiple maxhits=5
 
+if !plugin(Mail::SpamAssassin::Plugin::SPF)
+  meta            __SPF_FULL_PASS         0
+endif
+
 ifplugin Mail::SpamAssassin::Plugin::SPF
   meta            __SPF_FULL_PASS         (SPF_PASS && SPF_HELO_PASS)
   tflags          __SPF_FULL_PASS         net
 endif
 
+if !plugin(Mail::SpamAssassin::Plugin::SPF)
+  meta            __SPF_RANDOM_SENDER     0
+endif
+
 ifplugin Mail::SpamAssassin::Plugin::SPF
   meta            __SPF_RANDOM_SENDER     (SPF_HELO_PASS && !SPF_PASS)
   tflags          __SPF_RANDOM_SENDER     net
 endif
 
+meta	 __SPOOFED_FREEMAIL	!__NOT_SPOOFED && FREEMAIL_FROM
+
+meta      __SPOOFED_FREEM_REPTO         __SPOOFED_FREEMAIL && FREEMAIL_REPLYTO
+
 rawbody  __SPOOFED_URL	m/<a\s[^>]{0,2048}\bhref=(?:3D)?.?(https?:[^>"'\# ]{8,29}[^>"'\# :\/?&=])[^>]{0,2048}>(?:[^<]{0,1024}<(?!\/a)[^>]{1,1024}>){0,99}\s{0,10}(?!\1)https?[^\w<]{1,3}[^<]{5}/i
 
+meta        __STATIC_XPRIO_OLE   __XPRIO && __RDNS_STATIC && __HAS_MIMEOLE
+
+body        __STOCK_TIP       /\bsto[ck]{2}\s?tip\b/i
+
 meta           __STYLE_GIBBERISH        (__STYLE_GIBBERISH_1 || __STYLE_GIBBERISH_2 || __STYLE_GIBBERISH_3)
 
-rawbody        __STYLE_GIBBERISH_1      /<style[^>]{0,30}>(?:\s{0,80}[^\s:;<]){150}/im
+if !(can(Mail::SpamAssassin::Conf::perl_min_version_5010000))
+  rawbody        __STYLE_GIBBERISH_1      /<style(?:\s[^>]{0,40})?>(?:\s{0,100}(?!<\/style>|\/\*)[^\s:;,]){150}/im
+endif
+
+if can(Mail::SpamAssassin::Conf::perl_min_version_5010000)
+  rawbody        __STYLE_GIBBERISH_1      /<style(?:\s[^>]{0,40})?>(?:\s{0,100}(?!<\/style>)(?:(?:\/\*(?:\s|[^*<]|\*(?!\/)|<(?!\/style>)){0,200}\*\/)|\#[^{<]{1,50}\{[^}<]{4,100}\})){0,4}+(?:\s{0,100}(?!<\/style>|\/\*)(?:\/{3,}+\*|,{2,}+|;{2,}+|:{2,}+|\|{2,}+|[^\s:;,\|]|[:;,\|\/]{2})){150}/im
+endif
 
 rawbody        __STYLE_GIBBERISH_2      /\.style\w{0,20}\s{1,10}\{[^:;]{200}/im
 
-rawbody        __STYLE_GIBBERISH_3      /<style[^>]{0,30}>\s{0,30}(?:[\w:]{1,30}\s{0,10}\{[^}]{1,50}\}\s{0,80}){1,5}(?:[\w,.']{1,30}\s{1,10}){40}/im
+rawbody        __STYLE_GIBBERISH_3      /<style(?:\s[^>]{0,40})?>\s{0,80}(?:[\w:]{1,30}\s{0,10}\{[^}]{1,50}\}\s{0,80}){1,5}(?:[\w,.']{1,30}\s{1,10}){40}/im
 
 body           __STYLE_TAG_IN_BODY      /<style(?:[^>]{0,30})?>/i
 
-header      __SUBJ_ATTENTION     Subject =~ /ATTENTION/
+if can(Mail::SpamAssassin::Conf::feature_bug6558_free)
+  rawbody   __STY_INVIS                   /\bstyle\s*=\s*"[^">]{0,80}(?:visibility\s*:\s*hidden\s*;|display\s*:\s*none\s*;)/i
+  tflags    __STY_INVIS                   multiple, maxhits=6
+endif
+
+if can(Mail::SpamAssassin::Conf::feature_bug6558_free)
+  meta      __STY_INVIS_MANY              __STY_INVIS > 5
+endif
+
+header     __SUBJECT_EMPTY              Subject:raw =~ /^\s*$/
 
 meta        __SUBJ_BRKN_WORDNUMS   __SUBJ_BROKEN_WORD && __TVD_SUBJ_NUM_OBFU
 
-header      __SUBJ_BROKEN_WORD     Subject =~ /\s(?!i[PTM][aoh][bcdou])[a-z]{1,3}[A-Z][a-z]{2}/
+header      __SUBJ_BROKEN_WORD     Subject =~ /\s(?!i[PTM][aoh][bcdou]|e[MP]a[is])[a-z]{1,3}[A-Z][a-z]{2}/
 tflags      __SUBJ_BROKEN_WORD     multiple maxhits=2
 
 header         __SUBJ_HAS_FROM_1    ALL =~ /\nFrom:\s+(?:[^\n<]{0,80}<)?([^\n\s>]+)>?\n(?:[^\n]{1,100}\n)*Subject:\s+[^\n]{0,100}\1[>,\s\n]/ism
 
-header         __SUBJ_HAS_TO_1      ALL =~ /\nTo:\s+(?:[^\n<]{0,80}<)?([^\n\s>,]+)>?\n(?:[^\n]{1,100}\n)*Subject:\s+[^\n]{0,100}\1[>,\s\n]/ism
+header         __SUBJ_HAS_TO_1      ALL =~ /\nTo:\s+(?:[^\n<]{0,80}<)?([^\n\s>,]+)>?\n(?:[^\n]{1,200}\n)*Subject:\s+[^\n]{0,100}\1[^a-z0-9]/ism
+
+header         __SUBJ_HAS_TO_2      ALL =~ /\nReceived:[^\n]{0,200} for <?([^\n\s>;]+)>?;(?:[^\n]+\n)*Subject:\s+[^\n]{0,100}\1[^a-z0-9]/ism
+
+header         __SUBJ_HAS_TO_3      ALL =~ /\nSubject:(?=[^\n]{0,200}@)[^\n]{0,200}([a-z][a-z0-9_.]{3,80}@(?:[a-z0-9_]{1,80}\.){1,4}[a-z]{2,30})(?:[^\n]+\n)*To:\s+[^\n]{0,100}\1[^a-z0-9.]/ism
+
+header	 __SUBJ_NOT_SHORT	Subject =~ /^.{16}/
 
 header   __SUBJ_RE		Subject =~ /^R[eE]:/
 
+header __SUBJ_SHORT	Subject =~ /^.{0,8}$/
+
+header     __SUBJ_USB_DRIVES          Subject =~ /\bUSB (?:[Ff]lash )?[Dd]rives\b/
+
 body	 __SUBSCRIPTION_INFO	/\b(?:e?newsletters?|(?:un)?(?:subscrib|register)|you(?:r| are) subscri(?:b|ption)|opt(?:.|ing)?out\b|further info|you do ?n[o']t w(?:ish|ant)|remov\w{1,3}.{1,9}\blists?\b|to your white.?list)/i
 tflags	 __SUBSCRIPTION_INFO	nice
 
@@ -4348,24 +5382,34 @@
 
 body        __SYSADMIN           /\b(?:help?[- ]?desk|(?:(?:web ?)?mail ?|sys(?:tem )?)admin(?:istrator)|local[- ]host|(?:support|upgrade|management) (?:team|center)|message from administrator|university mail server copyright|suporte t(?:=E9|[\xe9]|[\xc3][\xa9])cnico|administrador do sistema)\b/i
 
-header		__TAB_IN_FROM		From:raw =~ /^\t/s
-describe	__TAB_IN_FROM		From starts with a tab
-
 header         __TB_MIME_BDRY_NO_Z   Content-Type =~ /boundary="-{8,}(?:[1-9]){16}/
 
+rawbody        __TENWORD_GIBBERISH    /^\s*(?:[a-z]+\s+){10}\.$/m
+tflags         __TENWORD_GIBBERISH    multiple maxhits=21
+
 body     __THEY_INHERIT   /\b(?:inherit\sth(?:e|is)\smoney|herede\sest[ea]\sdinero)\b/i
 
+body        __THIS_AD         /(?:\b|_)this[- _]+(?:ad(?:vert[i1l]sement)?|promo(?:tion)?)s?(?:\b|_)/i
+
 meta    __THREADED     (!__MISSING_REPLY && !__NO_INR_YES_REF) || (__MISSING_REPLY && !__MISSING_REF)
 tflags  __THREADED     nice
 
 header __THREAD_INDEX_GOOD  Thread-Index =~ m,^A[a-z0-9][A-Za-z0-9+/]{27}(?:[A-Za-z0-9+/]{20})?(?:[AQgw]==|[A-Za-z0-9+/]{7}|[A-Za-z0-9+/]{13}[AEIMQUYcgkosw048]=)$,
 
+header         __TO_ALL_NUMS        To:addr =~ /^\d+@/
+
+if !plugin(Mail::SpamAssassin::Plugin::SPF)
+  meta           __TO_EQ_FM_DOM_SPF_FAIL  0
+endif
+
 ifplugin Mail::SpamAssassin::Plugin::SPF
   meta           __TO_EQ_FM_DOM_SPF_FAIL  __TO_EQ_FROM_DOM && SPF_FAIL
   tflags         __TO_EQ_FM_DOM_SPF_FAIL  net
 endif
 
-meta           __TO_EQ_FM_HTML_ONLY __TO_EQ_FROM && MIME_HTML_ONLY
+if !plugin(Mail::SpamAssassin::Plugin::SPF)
+  meta           __TO_EQ_FM_SPF_FAIL  0
+endif
 
 ifplugin Mail::SpamAssassin::Plugin::SPF
   meta           __TO_EQ_FM_SPF_FAIL  __TO_EQ_FROM && SPF_FAIL
@@ -4386,34 +5430,62 @@
 
 header         __TO_EQ_FROM_DOM_2   ALL =~ /\nTo:\s+[^\n@]{0,80}@([^\n\s>]+)>?\n(?:[^\n]{1,100}\n)*From:\s+[^\n]+@\1[>,\s\n]/ism
 
+meta	 __TO_EQ_FROM_USR	(__TO_EQ_FROM_USR_1 || __TO_EQ_FROM_USR_2) && !(__FROM_DNS || __FROM_INFO || __SENDER_BOT)
+describe __TO_EQ_FROM_USR	To: username same as From: username
+
+header	 __TO_EQ_FROM_USR_1	ALL =~ /\nFrom:\s+(?:[^\n<]{0,80}<)?([^\n\s\@>]+)\@[^\n\s]+>?\n(?:[^\n]{1,100}\n)*To:\s+(?:[^\n]{0,80}<)?\1[\@>,\s\n]/ism
+
+header	 __TO_EQ_FROM_USR_2	ALL =~ /\nTo:\s+(?:[^\n<]{0,80}<)?([^\n\s\@>]+)\@[^\n\s]+>?\n(?:[^\n]{1,100}\n)*From:\s+(?:[^\n]{0,80}<)?\1[\@>,\s\n]/ism
+
+meta	 __TO_EQ_FROM_USR_NN	(__TO_EQ_FROM_USR_NN_1 || __TO_EQ_FROM_USR_NN_2) && !(__FROM_DNS || __FROM_INFO || __SENDER_BOT)
+describe __TO_EQ_FROM_USR_NN	To: username same as From: username sans trailing nums
+
+header	 __TO_EQ_FROM_USR_NN_1	ALL =~ /\nFrom:\s+(?:[^\n<]{0,80}<)?([^\n\s\@>]{4,80}?)\d*\@[^\n\s]+>?\n(?:[^\n]{1,100}\n)*To:\s+(?:[^\n]{0,80}<)?\1\d*[\@>,\s\n]/ism
+
+header	 __TO_EQ_FROM_USR_NN_2	ALL =~ /\nTo:\s+(?:[^\n<]{0,80}<)?([^\n\s\@>]{4,80}?)\d*\@[^\n\s]+>?\n(?:[^\n]{1,100}\n)*From:\s+(?:[^\n]{0,80}<)?\1\d*[\@>,\s\n]/ism
+
+meta	 __TO_EQ_FROM_USR_NN_MINFP	__TO_EQ_FROM_USR_NN && !__TO_EQ_FROM_USR_1 && !__TO_EQ_FROM && !__TO_EQ_FROM_DOM && !__LCL__ENV_AND_HDR_FROM_MATCH && !__DKIM_EXISTS && !__NOT_SPOOFED && !__RCD_RDNS_SMTP && !__RCD_RDNS_MX_MESSY && !__THREADED
+
+meta           __TO_IN_SUBJ         (__SUBJ_HAS_TO_1 || __SUBJ_HAS_TO_2 || __SUBJ_HAS_TO_3)
+
 header     __TO_NO_ARROWS_R        To !~ /(?:>$|>,)/
 
+if !plugin(Mail::SpamAssassin::Plugin::FreeMail)
+  meta       __TO_NO_BRKTS_FREEMAIL  0
+endif
+
 ifplugin Mail::SpamAssassin::Plugin::FreeMail
   meta       __TO_NO_BRKTS_FREEMAIL  __TO_NO_ARROWS_R && (FREEMAIL_FROM || FREEMAIL_REPLYTO)
 endif
 
+meta       __TO_NO_BRKTS_FROM_MSSP   __TO_NO_ARROWS_R && !__TO_UNDISCLOSED && __FROM_MISSPACED
+
 meta       __TO_NO_BRKTS_FROM_RUNON  __TO_NO_ARROWS_R && !__TO_UNDISCLOSED && __FROM_RUNON
 
+meta       __TO_NO_BRKTS_HTML_IMG  __TO_NO_ARROWS_R && !__TO_UNDISCLOSED && HTML_MESSAGE && __ONE_IMG
+
 meta       __TO_NO_BRKTS_HTML_ONLY __TO_NO_ARROWS_R && !__TO_UNDISCLOSED && MIME_HTML_ONLY
 
 meta       __TO_NO_BRKTS_MSFT       __TO_NO_ARROWS_R && !__TO_UNDISCLOSED && (__ANY_OUTLOOK_MUA || __MIMEOLE_MS)
 
-meta       __TO_NO_BRKTS_PCNT       __TO_NO_ARROWS_R && __FB_NUM_PERCNT
+meta       __TO_NO_BRKTS_NORDNS_HTML    __TO_NO_BRKTS_HTML_ONLY && RDNS_NONE
 
-header	__TO_ONMS		To =~	 /\.onmicrosoft\.com/
+meta       __TO_NO_BRKTS_PCNT       __TO_NO_ARROWS_R && __FB_NUM_PERCNT
 
-header	__TO_ONMS_RCPTS		To:name =~ /\bRecipients\b/
+header     __TO_UNDISCLOSED        To =~ /\b(?:undisclosed[-\s]recipients|destinataires inconnus|destinatari nascosti)\b/i
 
-header     __TO_UNDISCLOSED        To =~ /(?:undisclosed-recipients|destinataires inconnus):/i
+body     __TO_YOUR_ACCT   /\b(?:(?:f[uo]nds|money|f[uo]ndo|dinheiro|bank)\s(?:\w{1,10}\s){0,4}(?:transfer(?:red)?|transferido|sont)|\d+)\s(?:to|para|en)\s(?:your?|sua|votre)\s(?:account|conta|pos+es+ion)/i
 
-body     __TO_YOUR_ACCT   /\b(?:f[uo]nds|money|f[uo]ndo|dinheiro|bank)\s(?:\w{1,10}\s){0,4}(?:transfer(?:red)?|transferido|sont)\s(?:to|para|en)\s(?:your|sua|votre)\s(?:account|conta|pos+es+ion)/i
+body     __TO_YOUR_ORG       /\b(?:to|for) your organi[sz]ation\b/i
 
-header      __TO___LOWER       ALL =~ /to:\s\S{5}/ 
+header      __TO___LOWER       ALL =~ /to:\s\S{5}/
 
 body        __TRAVEL_AGENT     /\btravel\sagen(?:t|cy)\b/i
 
 body        __TRAVEL_BUSINESS  /\bbusiness\stravel\b/i
 
+body     __TRAVEL_ITINERARY  /(?:travel|ticketed|your|current) itinerary/i
+
 meta        __TRAVEL_MANY      (__TRAVEL_PROFILE + __TRAVEL_RESERV + __TRAVEL_BUSINESS + __TRAVEL_AGENT) > 2
 
 body        __TRAVEL_PROFILE   /\btravel+er\sprofile\b/i
@@ -4442,15 +5514,15 @@
 mimeheader __TVD_FW_GRAPHIC_ID1 Content-Id =~ /<[0-9a-f]{12}(?:\$[0-9a-f]{8}){2}\@/
 endif
 
-ifplugin Mail::SpamAssassin::Plugin::MIMEEval
+ifplugin Mail::SpamAssassin::Plugin::MIMEHeader
 mimeheader __TVD_MIME_ATT_AOPDF Content-Type =~ /^application\/octet-stream.*\.pdf/i
 endif
 
-ifplugin Mail::SpamAssassin::Plugin::MIMEEval
+ifplugin Mail::SpamAssassin::Plugin::MIMEHeader
 mimeheader __TVD_MIME_ATT_AP    Content-Type =~ /^application\/pdf/i
 endif
 
-ifplugin Mail::SpamAssassin::Plugin::MIMEEval
+ifplugin Mail::SpamAssassin::Plugin::MIMEHeader
 mimeheader __TVD_MIME_ATT_TP    Content-Type =~ /^text\/plain/i
 endif
 
@@ -4522,95 +5594,90 @@
 
 meta __TVD_PH_SUBJ_META		__TVD_PH_SUBJ_00 || __TVD_PH_SUBJ_02 || __TVD_PH_SUBJ_04 || __TVD_PH_SUBJ_15 || __TVD_PH_SUBJ_17 || __TVD_PH_SUBJ_18 || __TVD_PH_SUBJ_19 || __TVD_PH_SUBJ_29 || __TVD_PH_SUBJ_31 || __TVD_PH_SUBJ_36 || __TVD_PH_SUBJ_37 || __TVD_PH_SUBJ_38 || __TVD_PH_SUBJ_39 || __TVD_PH_SUBJ_41 || __TVD_PH_SUBJ_52 || __TVD_PH_SUBJ_54 || __TVD_PH_SUBJ_56 || __TVD_PH_SUBJ_58 || __TVD_PH_SUBJ_59 || __TVD_PH_SUBJ_ACCESS_POST
 
+meta        __TVD_SPACE_ENCODED    (__TVD_SPACE_RATIO && __SUBJECT_ENCODED_B64 && !__SUBJECT_UTF8_B_ENCODED)
+
+if !plugin(Mail::SpamAssassin::Plugin::BodyEval)
+  meta      __TVD_SPACE_RATIO      0
+endif
+
 header      __TVD_SUBJ_NUM_OBFU    Subject =~ /[a-z]{3,}\d+[a-z]{2,}/i
 
 header   __UA_GNUS		User-Agent =~ /^Gnus/
 
+header   __UA_KMAIL		User-Agent =~ /^KMail/
+
 header   __UA_KNODE		User-Agent =~ /^KNode/
 
+header   __UA_MOZ5		User-Agent =~ /^Mozilla\/5/
+
 header   __UA_MSOEMAC		User-Agent =~ /^Microsoft-Outlook-Express-Mac/
 
 header         __UA_MSOMAC           User-Agent =~ /^Microsoft-MacOutlook\/(?:\d+\.){3}/
 
 header   __UA_MUTT		User-Agent =~ /^Mutt/
 
+header   __UA_OPERA7		User-Agent =~ /^Opera7/
+
 header   __UA_PAN		User-Agent =~ /^Pan/
 
 header   __UA_XNEWS		User-Agent =~ /^Xnews/
 
+body        __UC_GIBB_OBFU     /\b[A-Za-z][a-z]{0,20}[,;)]?\s[A-Z]{16,}[a-z]?\s[A-Za-z][a-z]{1,15}\b/
+tflags      __UC_GIBB_OBFU     multiple maxhits=2
+
 body     __UN             /\bunited\snations?\b/i
 
+body       __UNICODE_OBFU_URI_DOM     /[0-9a-z]{3,10}(?:\xe3\x80\x82|\xe7\x82\xb9)(?:c[o0]m|net|inf[o0]|biz|cn)\b/i
+
 body	 __UNSUB_EMAIL	/\b(?:(?:un)?subscri(?:ber?|ptions?)|abuses?|opt(?:ing)?.?out)\b[-a-z_0-9.+=]{0,60}\@[a-z0-9][-a-z_0-9.]{4,20}(?:[^a-z_0-9.-]|$)/i
 tflags	 __UNSUB_EMAIL	nice
 
 uri	 __UNSUB_LINK	/\b(?:(?:un)?subscri(?:ber?|ptions?)|abuses?|opt(?:ing)?.?out)\b/i
 tflags	 __UNSUB_LINK	nice
 
-body        __UPGR_MAILBOX       /\b(?:up(?:g[ra]+d(?:e|ing)|date) (?:[hw]as\s(?:[a-z]+\s){1,5})?(?:o[nf] )?(?:your )?(?:mail\s?box|(?:web ?|e-?)mail)|(?:web ?|e-?)mail Upgrade cuenta|atualiz(?:e|ar) (?:a|sua) caixa de correio|click\S{0,10} (?:here(?:[:\.\s]{0,5}\S{0,10}http\S{10,80})?|below)(?: link)? to (?:(?:complete|finish|increase) )?(?:(?:the|this|your)\s)?(?:up(?:date|grade)|(?:web ?|e-?)?mail(?:\s?box)? (?:size|quota|limit))|utrzymania aktywnego konta)\b/i
+body        __UPGR_MAILBOX       /\b(?:up(?:g[ra]+d(?:e|ing)|date) (?:[hw]as\s(?:[a-z]+\s){1,5})?(?:o[nf] )?(?:your )?(?:mail\s?box|(?:web ?|e-?)mail)|(?:web ?|e-?)mail Upgrade cuenta|atualiz(?:e|ar) (?:a|sua) caixa de correio|click\S{0,10} (?:here(?:[:\.\s]{0,5}\S{0,10}http\S{10,80})?|below)(?: link)? to (?:(?:complete|finish|increase) )?(?:(?:the|this|your)\s)?(?:up(?:date|grade)|(?:web ?|e-?)?mail(?:\s?box)? (?:size|quota|limit))|utrzymania aktywnego konta|request (?:for )additional storage)\b/i
 
 uri         __UPPERCASE_URI        /^[^:A-Z]+[A-Z]/
 
+uri            __URI_12LTRDOM      m,://(?:[^./]+\.)*[a-z]{12}\.[^./]+/,i
+
+uri         __URI_DATA         /^data:(?!image\/)[a-z]/i
+
 uri         __URI_GOOGLE_DOC     m,^https?://docs\.google\.com/(?:[^/]+/)*view(?:form)?\?(?:id|formkey)=,i
 
+uri            __URI_GOOGLE_PROXY     m;^https?://[^.]+\.googleusercontent\.com/proxy/;i
+
 uri         __URI_MAILTO              /^mailto:/i
 tflags      __URI_MAILTO              multiple maxhits=16
 
 meta        __URI_MAILTO_MANY         __URI_MAILTO > 15
 
-uri	 __URL_SHORTENER	/^http:\/\/(?:bit\.ly|tinyurl\.com|ow\.ly|is\.gd|tumblr\.com|formspring\.me|ff\.im|youtu\.be|tl\.gd|plurk\.com|migre\.me|j\.mp|cli\.gs|goo\.gl|yfrog\.com|lnk\.ms|su\.pr|fb\.me|alturl\.com|wp\.me|ping\.fm|chatter\.com|post\.ly|twurl\.nl|tiny\.cc|4sq\.com|ustre\.am|short\.to|u\.nu|flic\.kr|budurl\.com|digg\.com|twitvid\.com|gowal\.la|om\.ly|justin\.tv|icio\.us|p\.gs|loopt\.us|tcrn\.ch|xrl\.us|wpo\.st|bkite\.com)\/[^\/]{3}\/?/
-
-header __VACATION Subject =~ /\b(?:vacatio|away|out.of.offic|auto.?re|confirm)/i
-tflags __VACATION nice
-
-body        __VALIDATE_MAILBOX   /\b(?:(?:re-?)?(?:valida(?:te|r)|confirm|set)(?:\S?(?:increase|raise))? (?:your|(?:a )?sua) (?:mail\s?box|(?:e-?)?mail quota|caixa)|confirmar (?:que )?a sua conta (?:de e-?mail|ainda est(?:=E1|[\xe1]|[\xc3][\xa1]) ativa)|wprowadz dane konta ponizej|utrzymania aktywnego konta e-?mail|weryfikacji konta)\b/i
-
-body        __VALIDATE_MBOX_SE   /(?:\b=E5|[\xe5]|[\xc3][\xa5])terst(?:=E4|\xe4|[\xc3][\xa4])lla ditt konto\b/i
-
-body __V_ACCOLADES	/\baccolades?\b/i
-
-body __V_ACHIEVEMENT	/\bbenchmark of achievement\b/i
-
-body __V_BESTOFAWARD	/\bBest of \w+ Award/
-
-body __V_BIOGRAPHY	/\b(?:biography|biographies|biographical)\b/i
-
-body __V_CBNVANITY	/\bContinental Broadcasting Network\b/
-
-body __V_DISTINGUISHED	/\bdistinguished\b/i
-
-body __V_DPHPVANITY	/\bDistinguished Professionals Hardcover Publication\b/
+meta      __URI_ONLY_MSGID_MALF         __BODY_URI_ONLY && __MSGID_NOFQDN2
 
-body __V_EXCELLENCE	/\b(?:demonstrated|commitment to) excellence\b/i
+meta        __URI_PHISH    __HAS_ANY_URI && !__URI_GOOGLE_DOC && (__EMAIL_PHISH || __ACCT_PHISH)
 
-body __V_EXECS_PROS	/\bexecutives? (?:and|&) professionals?\b/i
+uri         __URI_TRY_USME    m,^https?://(?:try|start|get|save|check|act|compare|join|learn|request|visit|my)[^.]*\.[^/]+\.(?:us|me|mobi|club)\b,i
 
-body __V_HONOR_SOCIETY /\bHonor Society\b/
+uri         __URI_WPADMIN      m,/wp-admin/\w+/,i
 
-body __V_INFORM_YOU	/\b(?:pleased?|pleasure) to inform you\b/
+uri         __URI_WPCONTENT    m,/wp-content/.*\.(?:php|html?)\b,i
 
-body __V_INNERCIRCLE	/\bInner Circle\b/
+uri         __URI_WPDIRINDEX   m,/wp-(?:content|includes)/.*/$,i
 
-meta __V_KNOWN_VANITY	__V_PRINCETONPRE || __V_WHOSWHO || __V_DPHPVANITY || __V_CBNVANITY || __V_HONOR_SOCIETY
+uri         __URI_WPINCLUDES   m,/wp-includes/.*\.(?:php|html?)\b,i
 
-body __V_NOMINATION	/\b(?:nominated|nomination|potential candidate)\b/i
+uri	 __URL_SHORTENER	/^http:\/\/(?:bit\.ly|tinyurl\.com|ow\.ly|is\.gd|tumblr\.com|formspring\.me|ff\.im|youtu\.be|tl\.gd|plurk\.com|migre\.me|j\.mp|cli\.gs|goo\.gl|yfrog\.com|lnk\.ms|su\.pr|fb\.me|alturl\.com|wp\.me|ping\.fm|chatter\.com|post\.ly|twurl\.nl|tiny\.cc|4sq\.com|ustre\.am|short\.to|u\.nu|flic\.kr|budurl\.com|digg\.com|twitvid\.com|gowal\.la|om\.ly|justin\.tv|icio\.us|p\.gs|loopt\.us|tcrn\.ch|xrl\.us|wpo\.st|bkite\.com|t\.co)\/[^\/]{3}\/?/
 
-body __V_NO_COST		/\b(?:no costs?|cost-? *free|free of costs?|no fees?|neither cost nor obligation)\b/i
+header __USING_VERP1 Return-Path =~ /[+-].*=/
 
-body __V_PRINCETONPRE	/\bPrinceton Premier/
-
-body __V_PUB_DEADLINE	/\bpublication deadlines?\b/i
-
-body __V_RECOGNITION	/\brecognition\b/i
-
-body __V_REGISTRY	/\bregistry\b/i
-
-body __V_SBCAVANITY	/\bSmall Business Commerce Association/
+header __VACATION Subject =~ /\b(?:vacatio|away|out.of.offic|auto.?re|confirm)/i
+tflags __VACATION nice
 
-body __V_SHMUCK		/\b(?:accomplished|distinguished|exceptional|talented|calibre of) +(?:professionals?|individuals?)\b/i
+body        __VALIDATE_MAILBOX   /\b(?:(?:re-?)?(?:valida(?:te|r)|confirm|set)(?:\S?(?:increase|raise))? (?:your|(?:a )?sua) (?:mail\s?box|(?:e-?)?mail quota|caixa)|confirmar (?:que )?a sua conta (?:de e-?mail|ainda est(?:=E1|[\xe1]|[\xc3][\xa1]) ativa)|wprowadz dane konta ponizej|utrzymania aktywnego konta e-?mail|weryfikacji konta)\b/i
 
-body __V_USCAVANITY	/\bUS Commerce Association/
+body        __VALIDATE_MBOX_SE   /(?:\b=E5|[\xe5]|[\xc3][\xa5])terst(?:=E4|\xe4|[\xc3][\xa4])lla ditt konto\b/i
 
-body __V_WHOSWHO		/\bWho.s Who\b/
+body        __VERIFY_ACCOUNT     /(?:confirm|updated?|verify) (?:your|the) (?:account|current|billing|personal|online)? ?(?:records?|information|account|identity|access|data|login)/i
 
 body        __WEBMAIL_ACCT       /\byour web ?mail account/i
 
@@ -4624,8 +5691,16 @@
 
 meta     __XFER_MONEY     (__WIRE_XFR || __TRUSTED_CHECK || __BANK_DRAFT || __MOVE_MONEY || __TO_YOUR_ACCT || __PAY_YOU || __GIVE_MONEY)
 
+header   __XM_BALSA		X-Mailer =~ /^Balsa \d/
+
+header   __XM_CALYPSO		X-Mailer =~ /^Calypso/
+
+header   __XM_FORTE		X-Mailer =~ /^Forte Agent \d/
+
 header   __XM_GNUS		X-Mailer =~ /^Gnus v/
 
+header   __XM_MHE		X-Mailer =~ /^mh-e \d/
+
 header   __XM_MOZ4		X-Mailer =~ /^Mozilla 4/
 
 header   __XM_MSOE5		X-Mailer =~ /^Microsoft Outlook Express 5/
@@ -4650,8 +5725,22 @@
 
 header   __XM_SKYRI		X-Mailer =~ /^SKYRiXgreen/
 
+header   __XM_SQRLMAIL		X-Mailer =~ /^SquirrelMail/
+
+header   __XM_SYLPHEED		X-Mailer =~ /^Sylpheed/
+
+header   __XM_THEBAT		X-Mailer =~ /^The Bat!/
+
+header   __XM_VM		X-Mailer =~ /^VM \d/
+
 header   __XM_WWWMAIL		X-Mailer =~ /^WWW-Mail \d/
 
+header   __XM_XIMEVOL		X-Mailer =~ /^Ximian Evolution/
+
+meta        __XPRIO_MINFP      __XPRIO && !__CT_ENCRYPTED && !ALL_TRUSTED && !__HAS_ERRORS_TO && !__THREADED && !__LONGLINE && !__MAIL_LINK && !__RCD_RDNS_SMTP && !__PDF_ATTACH && !__USING_VERP1 && !__HAS_DOMAINKEY_SIG && !__LIST_PARTIAL && !__RCD_RDNS_MX_MESSY && !__XM_VBULLETIN && !__PHPMAILER_MUA && !__HAS_HREF && !__HAS_IMG_SRC && !__SURVEY && !__RCD_RDNS_MAIL_MESSY && !__HAS_DKIM_SIGHD && !__SUBSCRIPTION_INFO 
+
+meta        __XPRIO_SHORT_SUBJ __XPRIO && __SUBJ_SHORT 
+
 body     __YOUR_BANK      /\byour?\s(?:full\s)?bank(?:ing)?\sinformations?\b/i
 
 body     __YOUR_FUND      /\b(?:your|ihr)\s(?:unpaid\s|win+ing\s|ap+roved\s|foreign\s|overdue\s|outstanding\s|contract\s|inheritance\s|nicht\sausbezahlten\s){0,3}(?:fund|payment|geld)\b/i
@@ -4662,8 +5751,6 @@
 
 body     __YOU_ASSIST     /\b(?:your\sas+istan(?:ce|t)|votre\s(?:as+istance|aide))\b/i
 
-body     __YOU_HAVE_WON         /you(?: \w+)? won/i
-
 body     __YOU_INHERIT    /\byour\s[a-z\s]{0,30}inherit+ance\b/i
 
 meta     __YOU_WON       __YOU_WON_01 || __YOU_WON_02 || __YOU_WON_03 || __YOU_WON_04 || __HAS_WON_01 || (__YOU_WON_05 && (__MOVE_MONEY || __GIVE_MONEY))
@@ -4678,10 +5765,28 @@
 
 body     __YOU_WON_05    /\bI won\b/i
 
-meta     __YOU_WON_SOMTIN       (__YOU_HAVE_WON || __FB_CONGRADS)
+if !plugin(Mail::SpamAssassin::Plugin::MIMEHeader)
+  meta         __ZIP_ATTACH_MT     0
+endif
 
 ifplugin Mail::SpamAssassin::Plugin::MIMEHeader
-  mimeheader   __ZIP_ATTACH_NOFN   Content-Type =~ m,\bapplication/zip[;\s]*$,i
+  mimeheader   __ZIP_ATTACH_MT     Content-Type =~ m,\bapplication/(?:zip|x-(?:zip-)?compress(?:ed)?)\b,i
+endif
+
+if !plugin(Mail::SpamAssassin::Plugin::MIMEHeader)
+  meta         __ZIP_ATTACH_NOFN   0
+endif
+
+ifplugin Mail::SpamAssassin::Plugin::MIMEHeader
+  mimeheader   __ZIP_ATTACH_NOFN   Content-Type =~ m,\bapplication/(?:zip|x-(?:zip-)?compress(?:ed)?)[;\s]*$,i
+endif
+
+ifplugin Mail::SpamAssassin::Plugin::FreeMail
+  header   __freemail_dispto  eval:check_freemail_header('Disposition-Notification-To')
 endif
 
 body		__hk_bigmoney		/(?:EURO?|USD?|GBP|CFA|\&\#163;|[\xa3\xa4]|\$|sum of).{0,4}(?:[0-9]{3}[^0-9a-z]?[0-9]{3}|[0-9.,]{1,4}(?: ?M\b| ?(?:de )?Mil))/i
+
+ifplugin Mail::SpamAssassin::Plugin::FreeMail
+header   __smf_freemail_hdr_replyto  eval:check_freemail_header('Reply-To:addr')
+endif
diff -Nru spamassassin-3.4.0/pkgrules/72_scores.cf spamassassin-3.4.2/pkgrules/72_scores.cf
--- spamassassin-3.4.0/pkgrules/72_scores.cf	2014-02-06 22:07:00.000000000 -0500
+++ spamassassin-3.4.2/pkgrules/72_scores.cf	2018-09-12 23:05:35.000000000 -0400
@@ -1,145 +1,180 @@
-score AC_HTML_NONSENSE_TAGS                 0.510 0.001 0.510 0.001
-score ADVANCE_FEE_2_NEW_FORM                0.844 1.500 0.844 1.500
-score ADVANCE_FEE_2_NEW_FRM_MNY             1.382 0.351 1.382 0.351
-score ADVANCE_FEE_2_NEW_MONEY               3.753 2.257 3.753 2.257
-score ADVANCE_FEE_3_NEW                     1.801 0.001 1.801 0.001
-score ADVANCE_FEE_3_NEW_FORM                1.940 2.324 1.940 2.324
-score ADVANCE_FEE_3_NEW_FRM_MNY             3.421 1.353 3.421 1.353
-score ADVANCE_FEE_3_NEW_MONEY               0.905 0.001 0.905 0.001
-score ADVANCE_FEE_4_NEW                     0.001 0.001 0.001 0.001
-score ADVANCE_FEE_4_NEW_FORM                0.001 0.001 0.001 0.001
-score ADVANCE_FEE_4_NEW_FRM_MNY             2.070 0.001 2.070 0.001
-score ADVANCE_FEE_4_NEW_MONEY               2.759 2.198 2.759 2.198
-score ADVANCE_FEE_5_NEW                     0.001 0.001 0.001 0.001
-score ADVANCE_FEE_5_NEW_FORM                0.001 0.001 0.001 0.001
-score ADVANCE_FEE_5_NEW_FRM_MNY             3.482 0.761 3.482 0.761
-score ADVANCE_FEE_5_NEW_MONEY               1.178 1.472 1.178 1.472
-score AXB_3LITTLE_PIGS                      1.291 1.297 1.291 1.297
-score AXB_BODYMAIL_SBL112884                2.696 2.699 2.696 2.699
-score AXB_ONMS_LEAKS                        3.795 3.799 3.795 3.799
-score AXB_XMAILER_MIMEOLE_OL_024C2          1.697 2.201 1.697 2.201
-score AXB_XMAILER_MIMEOLE_OL_1ECD5          2.611 2.018 2.611 2.018
-score AXB_XMA_BASP                          2.599 2.599 2.599 2.599
-score AXB_XM_FORGED_OL2600                  0.268 1.370 0.268 1.370
-score AXB_X_FF_SEZ_S                        3.795 3.800 3.795 3.800
-score BIGNUM_EMAILS                         0.001 0.327 0.001 0.327
-score BILLION_OVERLAP                       -0.999 -0.536 -0.999 -0.536
-score BITLY_URI                             2.247 2.249 2.247 2.249
-score BODY_EMPTY                            2.996 2.999 2.996 2.999
-score CK_HELO_DYNAMIC_SPLIT_IP              1.499 0.001 1.499 0.001
-score CK_HELO_GENERIC                       0.248 0.249 0.248 0.249
-score CN_B2B_SPAMMER                        2.796 2.799 2.796 2.799
-score COMMENT_GIBBERISH                     0.999 0.999 0.999 0.999
-score COMPENSATION                          1.498 1.499 1.498 1.499
-score DATE_DOTS                             1.530 3.052 1.530 3.052
-score DATE_IN_FUTURE_96_Q                   2.696 2.599 2.696 2.599
-score DATE_IN_FUTURE_Q_PLUS                 2.497 2.399 2.497 2.399
-score DEAR_BENEFICIARY                      3.996 3.490 3.996 3.490
-score DEAR_EMAIL_USER                       2.597 0.001 2.597 0.001
-score DEAR_NOBODY                           0.001 2.620 0.001 2.620
-score DSN_NO_MIMEVERSION                    1.998 1.999 1.998 1.999
-score EMAIL_URI_PHISH                       3.996 3.999 3.996 3.999
-score EMRCP                                 3.595 2.254 3.595 2.254
-score FBI_MONEY                             0.311 1.263 0.311 1.263
-score FBI_SPOOF                             1.999 1.981 1.999 1.981
-score FH_FAKE_RCVD_LINE                     2.830 2.299 2.830 2.299
-score FH_FROM_START_YOU                     2.596 1.848 2.596 1.848
-score FH_HELO_ALMOST_IP                     2.796 2.700 2.796 2.700
-score FH_HOST_EQ_DYNAMICIP                  2.499 1.091 2.499 1.091
+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_HTML_NONSENSE_TAGS                 1.000 1.000 1.000 1.000
+score AC_SPAMMY_URI_PATTERNS1               1.000 1.000 1.000 1.000
+score AC_SPAMMY_URI_PATTERNS10              1.000 1.000 1.000 1.000
+score AC_SPAMMY_URI_PATTERNS11              1.000 1.000 1.000 1.000
+score AC_SPAMMY_URI_PATTERNS12              1.000 1.000 1.000 1.000
+score AC_SPAMMY_URI_PATTERNS2               1.000 1.000 1.000 1.000
+score AC_SPAMMY_URI_PATTERNS3               1.000 1.000 1.000 1.000
+score AC_SPAMMY_URI_PATTERNS4               1.000 1.000 1.000 1.000
+score AC_SPAMMY_URI_PATTERNS8               1.000 1.000 1.000 1.000
+score AC_SPAMMY_URI_PATTERNS9               1.000 1.000 1.000 1.000
+score ADVANCE_FEE_2_NEW_FORM                1.000 1.000 1.000 1.000
+score ADVANCE_FEE_2_NEW_MONEY               1.999 1.999 1.999 1.999
+score ADVANCE_FEE_3_NEW                     2.998 3.466 2.998 3.466
+score ADVANCE_FEE_3_NEW_FRM_MNY             0.136 0.001 0.136 0.001
+score ADVANCE_FEE_3_NEW_MONEY               3.099 2.691 3.099 2.691
+score ADVANCE_FEE_4_NEW                     2.799 2.399 2.799 2.399
+score ADVANCE_FEE_5_NEW_FRM_MNY             0.001 0.001 0.001 0.001
+score ADVANCE_FEE_5_NEW_MONEY               2.833 0.001 2.833 0.001
+score AD_PREFS                              0.001 1.352 0.001 1.352
+score APP_DEVELOPMENT_FREEM                 1.000 1.000 1.000 1.000
+score APP_DEVELOPMENT_NORDNS                1.000 1.999 1.000 1.999
+score AXB_XMAILER_MIMEOLE_OL_024C2          0.001 0.001 0.001 0.001
+score AXB_XMAILER_MIMEOLE_OL_1ECD5          0.166 0.001 0.166 0.001
+score BIGNUM_EMAILS                         1.343 0.001 1.343 0.001
+score BODY_SINGLE_WORD                      2.500 0.689 2.500 0.689
+score BODY_URI_ONLY                         0.001 0.001 0.001 0.001
+score BOGUS_MSM_HDRS                        1.778 1.115 1.778 1.115
+score BTC_ORG                               2.700 2.599 2.700 2.599
+score CANT_SEE_AD                           1.000 1.000 1.000 1.000
+score CK_HELO_DYNAMIC_SPLIT_IP              1.499 0.710 1.499 0.710
+score CK_HELO_GENERIC                       0.250 0.001 0.250 0.001
+score COMMENT_GIBBERISH                     1.000 1.000 1.000 1.000
+score DATE_IN_FUTURE_96_Q                   3.100 0.001 3.100 0.001
+score DEAR_BENEFICIARY                      0.001 0.001 0.001 0.001
+score DEAR_NOBODY                           2.748 2.442 2.748 2.442
+score DKIMWL_BL                             1.000 0.001 1.000 0.001
+score DKIMWL_WL_HIGH                        0.001 0.001 0.001 0.001
+score DKIMWL_WL_MED                         0.001 0.001 0.001 0.001
+score ENCRYPTED_MESSAGE                     -1.000 -1.000 -1.000 -1.000
+score FBI_MONEY                             1.999 0.001 1.999 0.001
+score FBI_SPOOF                             1.633 0.001 1.633 0.001
 score FILL_THIS_FORM                        0.001 0.001 0.001 0.001
-score FM_LOTTO_MONEY                        0.001 0.001 0.001 0.001
-score FM_LOTTO_YOU_WON                      2.979 1.492 2.979 1.492
-score FORM_FRAUD_3                          2.418 2.517 2.418 2.517
+score FORM_FRAUD                            0.999 1.000 0.999 1.000
+score FORM_FRAUD_3                          0.001 0.001 0.001 0.001
 score FORM_FRAUD_5                          0.001 0.001 0.001 0.001
-score FROM_12LTRDOM                         0.099 0.100 0.099 0.100
-score FROM_MISSPACED                        0.330 1.167 0.330 1.167
-score FROM_MISSP_DYNIP                      1.459 3.599 1.459 3.599
-score FROM_MISSP_EH_MATCH                   0.912 1.795 0.912 1.795
-score FROM_MISSP_FREEMAIL                   4.295 4.300 4.295 4.300
-score FROM_MISSP_MSFT                       1.972 2.323 1.972 2.323
-score FROM_MISSP_PHISH                      3.709 0.141 3.709 0.141
-score FROM_MISSP_REPLYTO                    3.624 1.337 3.624 1.337
-score FROM_MISSP_SPF_FAIL                   0.001 1.802 0.001 1.802
-score FROM_MISSP_TO_UNDISC                  4.395 4.500 4.395 4.500
-score FROM_MISSP_USER                       1.160 0.719 1.160 0.719
-score FROM_WSP_LEAD                         3.396 2.999 3.396 2.999
-score FR_ALMOST_VIAG2                       2.696 2.212 2.696 2.212
-score FSL_CTYPE_WIN1251                     4.495 4.499 4.495 4.499
-score FSL_HELO_BARE_IP_2                    1.997 1.539 1.997 1.539
-score FSL_HELO_FAKE                         2.896 2.799 2.896 2.799
-score FSL_HELO_FIREWALL                     2.696 2.599 2.696 2.599
-score FSL_MID_419                           1.557 2.040 1.557 2.040
-score FSL_MISSP_REPLYTO                     2.045 2.501 2.045 2.501
-score FSL_MY_NAME_IS                        0.001 2.613 0.001 2.613
-score FSL_NEW_HELO_USER                     2.086 0.808 2.086 0.808
-score FS_CHEAP_CAP                          2.596 1.280 2.596 1.280
-score FU_ENDS_SG                            2.697 2.599 2.697 2.599
+score FORM_LOW_CONTRAST                     1.000 1.000 1.000 1.000
+score FOUND_YOU                             3.249 3.249 3.249 3.249
+score FREEMAIL_DISPTO                       0.250 0.250 0.250 0.250
+score FREEMAIL_FORGED_FROMDOMAIN            0.149 0.001 0.149 0.001
+score FREEM_FRNUM_UNICD_EMPTY               2.477 3.181 2.477 3.181
+score FRNAME_IN_MSG_NO_SUBJ                 2.499 2.499 2.499 2.499
+score FRNAME_IN_MSG_XPRIO                   2.441 0.259 2.441 0.259
+score FROM_ADDR_WS                          2.999 2.999 2.999 2.999
+score FROM_IN_TO_AND_SUBJ                   0.369 0.500 0.369 0.500
+score FROM_MISSP_DYNIP                      2.258 0.001 2.258 0.001
+score FROM_MISSP_EH_MATCH                   0.001 0.001 0.001 0.001
+score FROM_MISSP_FREEMAIL                   2.799 0.001 2.799 0.001
+score FROM_MISSP_MSFT                       0.001 0.001 0.001 0.001
+score FROM_MISSP_PHISH                      0.001 3.499 0.001 3.499
+score FROM_MISSP_REPLYTO                    0.001 2.499 0.001 2.499
+score FROM_MISSP_SPF_FAIL                   0.001 1.000 0.001 1.000
+score FROM_MISSP_TO_UNDISC                  1.451 0.001 1.451 0.001
+score FROM_MISSP_XPRIO                      0.001 0.001 0.001 0.001
+score FROM_WORDY                            1.000 1.000 1.000 1.000
+score FROM_WORDY_SHORT                      1.000 0.594 1.000 0.594
+score FROM_WSP_TRAIL                        1.222 0.001 1.222 0.001
+score FSL_CTYPE_WIN1251                     0.001 0.001 0.001 0.001
+score FSL_HELO_FAKE                         3.400 3.399 3.400 3.399
+score FSL_NEW_HELO_USER                     0.001 0.001 0.001 0.001
+score GAPPY_SALES_LEADS_FREEM               1.000 0.001 1.000 0.001
 score GOOGLE_DOCS_PHISH                     1.000 1.000 1.000 1.000
 score GOOGLE_DOCS_PHISH_MANY                1.000 1.000 1.000 1.000
-score HK_LOTTO                              0.602 0.593 0.602 0.593
-score HK_LOTTO_NAME                         0.001 0.999 0.001 0.999
-score HK_NAME_FM_DR                         1.498 1.499 1.498 1.499
-score HK_NAME_FM_FROM                       1.315 1.500 1.315 1.500
-score HK_NAME_FM_MR_MRS                     1.498 1.500 1.498 1.500
-score HK_NAME_FROM                          0.998 0.999 0.998 0.999
-score HK_NAME_MR_MRS                        0.998 0.001 0.998 0.001
-score HK_SCAM_N1                            1.501 2.458 1.501 2.458
-score HK_SCAM_N13                           3.496 0.001 3.496 0.001
-score HK_SCAM_N15                           0.869 0.542 0.869 0.542
-score HK_SCAM_N2                            3.556 2.953 3.556 2.953
-score HK_SCAM_N3                            0.001 2.608 0.001 2.608
-score HK_SCAM_N8                            0.393 0.001 0.393 0.001
-score HK_SCAM_S15                           2.599 0.743 2.599 0.743
-score HK_SCAM_S25                           1.028 2.040 1.028 2.040
-score HK_SCAM_S7                            3.496 2.401 3.496 2.401
-score HK_SPAMMY_FILENAME                    2.082 2.063 2.082 2.063
-score KHOP_BIG_TO_CC                        2.897 0.001 2.897 0.001
-score LOTS_OF_MONEY                         0.001 0.001 0.001 0.001
-score LOTTO_AGENT                           0.001 3.499 0.001 3.499
-score LOTTO_AGENT_RPLY                      1.159 0.345 1.159 0.345
-score LOTTO_DEPT                            0.001 0.001 0.001 0.001
-score MANY_SPAN_IN_TEXT                     0.001 0.001 0.001 0.001
-score MONEY_ATM_CARD                        2.711 2.529 2.711 2.529
+score GOOG_MALWARE_DNLD                     1.000 1.000 1.000 1.000
+score HDRS_MISSP                            2.000 1.000 2.000 1.000
+score HDR_ORDER_FTSDMCXX_DIRECT             2.000 1.999 2.000 1.999
+score HDR_ORDER_FTSDMCXX_NORDNS             1.254 1.700 1.254 1.700
+score HEADER_FROM_DIFFERENT_DOMAINS         0.001 0.249 0.001 0.249
+score HELO_MISC_IP                          0.250 0.250 0.250 0.250
+score HEXHASH_WORD                          1.000 1.000 1.000 1.000
+score HK_LOTTO                              0.999 0.999 0.999 0.999
+score HK_NAME_FM_MR_MRS                     1.499 1.499 1.499 1.499
+score HK_NAME_FROM                          0.999 0.001 0.999 0.001
+score HK_SCAM_N2                            0.001 0.001 0.001 0.001
+score HK_SCAM_N8                            0.387 0.828 0.387 0.828
+score HK_SCAM_S7                            1.685 0.001 1.685 0.001
+score HTML_OFF_PAGE                         2.999 2.999 2.999 2.999
+score IMG_ONLY_FM_DOM_INFO                  2.201 2.499 2.201 2.499
+score KHOP_DYNAMIC                          2.000 0.001 2.000 0.001
+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 LONG_HEX_URI                          1.884 0.870 1.884 0.870
+score LONG_IMG_URI                          0.001 0.001 0.001 0.001
+score LOTS_OF_MONEY                         0.001 0.010 0.001 0.010
+score LOTTO_AGENT                           1.499 0.001 1.499 0.001
+score LUCRATIVE                             1.000 1.000 1.000 1.000
+score MALF_HTML_B64                         3.027 2.982 3.027 2.982
+score MIMEOLE_DIRECT_TO_MX                  1.999 0.001 1.999 0.001
+score MIME_NO_TEXT                          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                      2.249 1.000 2.249 1.000
-score MONEY_FRAUD_3                         3.472 4.399 3.472 4.399
-score MONEY_FRAUD_5                         2.863 4.299 2.863 4.299
-score MONEY_FROM_41                         1.997 1.999 1.997 1.999
-score MONEY_FROM_MISSP                      1.997 1.651 1.997 1.651
-score MSGID_NOFQDN1                         1.104 3.199 1.104 3.199
-score NSL_RCVD_FROM_USER                    0.898 3.134 0.898 3.134
-score NSL_RCVD_HELO_USER                    3.341 3.409 3.341 3.409
-score OBFU_ATTACH_MISSP                     2.812 1.668 2.812 1.668
-score OBFU_TEXT_ATTACH                      2.506 3.299 2.506 3.299
-score PHP_NOVER_MUA                         3.496 3.499 3.496 3.499
-score RCVD_IN_MSPIKE_BL                     0.001 0.010 0.001 0.010
+score MONEY_FORM_SHORT                      2.500 2.499 2.500 2.499
+score MONEY_FRAUD_3                         0.803 0.001 0.803 0.001
+score MONEY_FRAUD_5                         1.299 1.210 1.299 1.210
+score MONEY_FRAUD_8                         0.001 1.203 0.001 1.203
+score MONEY_FROM_41                         1.999 2.000 1.999 2.000
+score MONEY_FROM_MISSP                      0.001 0.001 0.001 0.001
+score MSM_PRIO_REPTO                        1.000 1.000 1.000 1.000
+score NO_FM_NAME_IP_HOSTN                   2.499 2.500 2.499 2.500
+score NSL_RCVD_HELO_USER                    2.424 0.001 2.424 0.001
+score PDS_FROM_2_EMAILS                     0.001 0.001 0.001 0.001
+score PHOTO_EDITING_FREEM                   3.749 3.085 3.749 3.085
+score PHP_NOVER_MUA                         1.000 1.000 1.000 1.000
+score PHP_ORIG_SCRIPT                       2.499 2.039 2.499 2.039
+score PHP_SCRIPT_MUA                        1.000 1.000 1.000 1.000
+score PP_MIME_FAKE_ASCII_TEXT               1.000 0.999 1.000 0.999
+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_MANY                      1.000 1.000 1.000 1.000
+score RATWARE_NO_RDNS                       2.721 2.872 2.721 2.872
+score RCVD_IN_MSPIKE_BL                     0.001 0.001 0.001 0.001
 score RCVD_IN_MSPIKE_H2                     0.001 -0.001 0.001 -0.001
-score RCVD_IN_MSPIKE_H3                     0.001 -0.010 0.001 -0.010
-score RCVD_IN_MSPIKE_H4                     0.001 -0.010 0.001 -0.010
-score RCVD_IN_MSPIKE_H5                     0.001 -1.000 0.001 -1.000
+score RCVD_IN_MSPIKE_H3                     0.001 0.001 0.001 0.001
+score RCVD_IN_MSPIKE_H4                     0.001 0.001 0.001 0.001
+score RCVD_IN_MSPIKE_H5                     0.001 0.001 0.001 0.001
 score RCVD_IN_MSPIKE_L2                     0.001 0.001 0.001 0.001
 score RCVD_IN_MSPIKE_L3                     0.001 0.001 0.001 0.001
 score RCVD_IN_MSPIKE_L4                     0.001 0.001 0.001 0.001
-score RCVD_IN_MSPIKE_L5                     0.001 2.373 0.001 2.373
-score RCVD_IN_MSPIKE_WL                     0.001 -0.010 0.001 -0.010
+score RCVD_IN_MSPIKE_L5                     0.001 0.001 0.001 0.001
+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 RISK_FREE                             2.594 3.499 2.594 3.499
-score RP_MATCHES_RCVD                       -1.501 -0.550 -1.501 -0.550
-score SHARE_50_50                           0.001 1.924 0.001 1.924
-score SINGLE_HEADER_2K                      0.001 1.717 0.001 1.717
-score SINGLE_HEADER_3K                      0.001 3.015 0.001 3.015
-score SINGLE_HEADER_4K                      0.001 1.981 0.001 1.981
-score STYLE_GIBBERISH                       1.794 3.013 1.794 3.013
-score SUBJ_ATTENTION                        0.001 0.001 0.001 0.001
-score TAB_IN_FROM                           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                       1.000 1.000 1.000 1.000
+score SERGIO_SUBJECT_PORN014                0.154 2.899 0.154 2.899
+score SERGIO_SUBJECT_VIAGRA01               0.001 0.001 0.001 0.001
+score SHORTENED_URL_SRC                     3.000 2.699 3.000 2.699
+score SPOOFED_FREEM_REPTO                   2.499 2.499 2.499 2.499
+score SPOOFED_FREEM_REPTO_CHN               2.715 1.000 2.715 1.000
+score SPOOFED_FREEM_REPTO_RUS               1.000 1.000 1.000 1.000
+score STATIC_XPRIO_OLE                      0.001 0.001 0.001 0.001
+score STOCK_LOW_CONTRAST                    1.000 1.000 1.000 1.000
+score STOCK_TIP                             1.000 1.000 1.000 1.000
+score STYLE_GIBBERISH                       1.000 2.769 1.000 2.769
+score SURBL_BLOCKED                         0.001 0.001 0.001 0.001
+score SYSADMIN                              1.000 1.000 1.000 1.000
+score THIS_AD                               0.001 0.001 0.001 0.001
 score TO_EQ_FM_DOM_SPF_FAIL                 0.001 0.001 0.001 0.001
-score TO_EQ_FM_HTML_ONLY                    2.785 2.999 2.785 2.999
 score TO_EQ_FM_SPF_FAIL                     0.001 0.001 0.001 0.001
-score TO_IN_SUBJ                            2.996 2.899 2.996 2.899
-score TO_NO_BRKTS_FROM_MSSP                 2.497 2.499 2.497 2.499
-score TO_NO_BRKTS_MSFT                      3.497 3.499 3.497 3.499
-score TO_NO_BRKTS_PCNT                      1.082 1.647 1.082 1.647
-score TVD_FROM_1                            0.998 0.999 0.998 0.999
-score TVD_PH_BODY_META                      1.501 3.499 1.501 3.499
-score XM_PHPMAILER_FORGED                   2.497 0.001 2.497 0.001
-score YOUR_PERMISSION                       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                  1.000 2.676 1.000 2.676
+score TO_NO_BRKTS_FROM_MSSP                 0.001 0.001 0.001 0.001
+score TO_NO_BRKTS_HTML_IMG                  0.001 1.999 0.001 1.999
+score TO_NO_BRKTS_HTML_ONLY                 0.601 1.400 0.601 1.400
+score TO_NO_BRKTS_MSFT                      0.001 1.888 0.001 1.888
+score TO_NO_BRKTS_NORDNS_HTML               0.001 1.000 0.001 1.000
+score TO_NO_BRKTS_PCNT                      1.000 2.499 1.000 2.499
+score TVD_PH_BODY_META                      0.001 0.001 0.001 0.001
+score TVD_SPACE_ENCODED                     2.499 2.499 2.499 2.499
+score TVD_SPACE_RATIO_MINFP                 2.500 0.001 2.500 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 UNICODE_OBFU_DOM_NO_BODY              3.150 3.749 3.150 3.749
+score URI_DATA                              1.000 1.000 1.000 1.000
+score URI_DQ_UNSUB                          3.100 3.000 3.100 3.000
+score URI_GOOGLE_PROXY                      2.299 2.399 2.299 2.399
+score URI_ONLY_MSGID_MALF                   2.000 1.000 2.000 1.000
+score URI_OPTOUT_3LD                        1.000 1.000 1.000 1.000
+score URI_PHISH                             3.999 3.544 3.999 3.544
+score URI_TRY_3LD                           0.001 0.001 0.001 0.001
+score URI_WPADMIN                           2.499 2.399 2.499 2.399
+score URI_WP_DIRINDEX                       1.000 1.000 1.000 1.000
+score URI_WP_HACKED                         3.500 3.069 3.500 3.069
+score URI_WP_HACKED_2                       1.478 1.629 1.478 1.629
+score USB_DRIVES                            1.000 1.000 1.000 1.000
+score XPRIO                                 2.250 0.763 2.250 0.763
+score XPRIO_SHORT_SUBJ                      2.500 2.500 2.500 2.500
+score YOU_INHERIT                           2.699 2.600 2.699 2.600
diff -Nru spamassassin-3.4.0/pkgrules/73_sandbox_manual_scores.cf spamassassin-3.4.2/pkgrules/73_sandbox_manual_scores.cf
--- spamassassin-3.4.0/pkgrules/73_sandbox_manual_scores.cf	2014-02-06 22:05:55.000000000 -0500
+++ spamassassin-3.4.2/pkgrules/73_sandbox_manual_scores.cf	2018-09-12 23:04:40.000000000 -0400
@@ -26,6 +26,7 @@
 
 # jhardin
 # things depend on these
+# score as informative just for the hits header
 score LOTS_OF_MONEY            0.001
 score FILL_THIS_FORM           0.001
 
@@ -78,3 +79,8 @@
 # score HK_FAKENAME_MICROSOFT    2.50
 # RULE DISABLED IN 20_hk.cf
 
+# jhardin for mmartinec
+# Lots of hate; score as informative hammy, may override locally
+score RP_MATCHES_RCVD           -0.001
+
+
diff -Nru spamassassin-3.4.0/pkgrules/local.cf spamassassin-3.4.2/pkgrules/local.cf
--- spamassassin-3.4.0/pkgrules/local.cf	2014-02-06 22:05:55.000000000 -0500
+++ spamassassin-3.4.2/pkgrules/local.cf	2018-09-12 23:04:40.000000000 -0400
@@ -52,6 +52,11 @@
 # bayes_ignore_header X-Spam-Status
 
 
+#   Whether to decode non- UTF-8 and non-ASCII textual parts and recode
+#   them to UTF-8 before the text is given over to rules processing.
+#
+# normalize_charset 1
+
 #   Some shortcircuiting, if the plugin is enabled
 # 
 ifplugin Mail::SpamAssassin::Plugin::Shortcircuit
diff -Nru spamassassin-3.4.0/pkgrules/STATISTICS-set0-72_scores.cf.txt spamassassin-3.4.2/pkgrules/STATISTICS-set0-72_scores.cf.txt
--- spamassassin-3.4.0/pkgrules/STATISTICS-set0-72_scores.cf.txt	2014-02-06 22:07:00.000000000 -0500
+++ spamassassin-3.4.2/pkgrules/STATISTICS-set0-72_scores.cf.txt	2018-09-12 23:05:35.000000000 -0400
@@ -1,40 +1,40 @@
 ##### WITH NEW RULES AND SCORES #####
 
 # SUMMARY for threshold 5.0:
-# Correctly non-spam: 183523  30.804%  (94.714% of non-spam corpus)
-# Correctly spam:     249418  41.865%  (62.044% of spam corpus)
-# False positives:     10243  1.719%  (5.286% of nonspam, 648294 weighted)
-# False negatives:    152587  25.612%  (37.956% of spam, 248219 weighted)
-# Average score for spam:  13.8    nonspam: 1.1
-# Average for false-pos:   6.1  false-neg: 1.6
-# TOTAL:              595771  100.00%
+# Correctly non-spam: 173702  35.219%  (96.361% of non-spam corpus)
+# Correctly spam:     256238  51.953%  (81.879% of spam corpus)
+# False positives:      6559  1.330%  (3.639% of nonspam, 331718 weighted)
+# False negatives:     56708  11.498%  (18.121% of spam, 162059 weighted)
+# Average score for spam:  9.1    nonspam: 1.3
+# Average for false-pos:   5.8  false-neg: 2.9
+# TOTAL:              493207  100.00%
 
 Reading scores from "tmprules"...
 Reading per-message hit stat logs and scores...
 
 # SUMMARY for threshold 5.0:
-# Correctly non-spam:  22953  94.55%
-# Correctly spam:      31095  62.00%
-# False positives:      1323  5.45%
-# False negatives:     19058  38.00%
-# TCR(l=50): 0.588595  SpamRecall: 62.000%  SpamPrec: 95.919%
+# Correctly non-spam:  21731  96.04%
+# Correctly spam:      31961  81.86%
+# False positives:       896  3.96%
+# False negatives:      7082  18.14%
+# TCR(l=50): 0.752535  SpamRecall: 81.861%  SpamPrec: 97.273%
 
 ##### WITHOUT NEW RULES AND SCORES #####
 Reading scores from "../rules-base"...
 Reading per-message hit stat logs and scores...
 
 # SUMMARY for threshold 5.0:
-# Correctly non-spam: 183675  94.79%
-# Correctly spam:     173242  43.09%
-# False positives:     10091  5.21%
-# False negatives:    228763  56.91%
-# TCR(l=50): 0.548204  SpamRecall: 43.094%  SpamPrec: 94.496%
+# Correctly non-spam: 173653  96.33%
+# Correctly spam:     176014  56.24%
+# False positives:      6608  3.67%
+# False negatives:    136932  43.76%
+# TCR(l=50): 0.669644  SpamRecall: 56.244%  SpamPrec: 96.382%
 Reading scores from "../rules-base"...
 Reading per-message hit stat logs and scores...
 
 # SUMMARY for threshold 5.0:
-# Correctly non-spam:  23005  94.76%
-# Correctly spam:      21652  43.17%
-# False positives:      1271  5.24%
-# False negatives:     28501  56.83%
-# TCR(l=50): 0.544839  SpamRecall: 43.172%  SpamPrec: 94.455%
+# Correctly non-spam:  21800  96.35%
+# Correctly spam:      21922  56.15%
+# False positives:       827  3.65%
+# False negatives:     17121  43.85%
+# TCR(l=50): 0.667733  SpamRecall: 56.148%  SpamPrec: 96.365%
diff -Nru spamassassin-3.4.0/pkgrules/STATISTICS-set1-72_scores.cf.txt spamassassin-3.4.2/pkgrules/STATISTICS-set1-72_scores.cf.txt
--- spamassassin-3.4.0/pkgrules/STATISTICS-set1-72_scores.cf.txt	2014-02-06 22:07:00.000000000 -0500
+++ spamassassin-3.4.2/pkgrules/STATISTICS-set1-72_scores.cf.txt	2018-09-12 23:05:35.000000000 -0400
@@ -1,40 +1,40 @@
 ##### WITH NEW RULES AND SCORES #####
 
 # SUMMARY for threshold 5.0:
-# Correctly non-spam: 177547  33.517%  (99.263% of non-spam corpus)
-# Correctly spam:     254566  48.056%  (72.555% of spam corpus)
-# False positives:      1319  0.249%  (0.737% of nonspam, 166642 weighted)
-# False negatives:     96293  18.178%  (27.445% of spam, 246995 weighted)
-# Average score for spam:  16.4    nonspam: -0.4
-# Average for false-pos:   6.4  false-neg: 2.6
-# TOTAL:              529725  100.00%
+# Correctly non-spam: 180741  38.212%  (99.664% of non-spam corpus)
+# Correctly spam:     257033  54.342%  (88.132% of spam corpus)
+# False positives:       609  0.129%  (0.336% of nonspam,  65581 weighted)
+# False negatives:     34612  7.318%  (11.868% of spam,  92358 weighted)
+# Average score for spam:  15.4    nonspam: -2.3
+# Average for false-pos:   6.7  false-neg: 2.7
+# TOTAL:              472995  100.00%
 
 Reading scores from "tmprules"...
 Reading per-message hit stat logs and scores...
 
 # SUMMARY for threshold 5.0:
-# Correctly non-spam:  22289  99.22%
-# Correctly spam:      31771  72.63%
-# False positives:       175  0.78%
-# False negatives:     11971  27.37%
-# TCR(l=50): 2.110999  SpamRecall: 72.633%  SpamPrec: 99.452%
+# Correctly non-spam:  22696  99.65%
+# Correctly spam:      32178  88.34%
+# False positives:        80  0.35%
+# False negatives:      4246  11.66%
+# TCR(l=50): 4.417172  SpamRecall: 88.343%  SpamPrec: 99.752%
 
 ##### WITHOUT NEW RULES AND SCORES #####
 Reading scores from "../rules-base"...
 Reading per-message hit stat logs and scores...
 
 # SUMMARY for threshold 5.0:
-# Correctly non-spam: 177905  99.46%
-# Correctly spam:     232320  66.21%
-# False positives:       961  0.54%
-# False negatives:    118539  33.79%
-# TCR(l=50): 2.106135  SpamRecall: 66.215%  SpamPrec: 99.588%
+# Correctly non-spam: 180210  99.37%
+# Correctly spam:     209123  71.70%
+# False positives:      1140  0.63%
+# False negatives:     82522  28.30%
+# TCR(l=50): 2.090316  SpamRecall: 71.705%  SpamPrec: 99.458%
 Reading scores from "../rules-base"...
 Reading per-message hit stat logs and scores...
 
 # SUMMARY for threshold 5.0:
-# Correctly non-spam:  22334  99.42%
-# Correctly spam:      28928  66.13%
-# False positives:       130  0.58%
-# False negatives:     14814  33.87%
-# TCR(l=50): 2.052266  SpamRecall: 66.133%  SpamPrec: 99.553%
+# Correctly non-spam:  22641  99.41%
+# Correctly spam:      26214  71.97%
+# False positives:       135  0.59%
+# False negatives:     10210  28.03%
+# TCR(l=50): 2.147642  SpamRecall: 71.969%  SpamPrec: 99.488%
Les fichiers binaires /tmp/EgAefq7Sgf/spamassassin-3.4.0/powered_by/128-powered-by-spamassassin.png et /tmp/cjz0UrC4iD/spamassassin-3.4.2/powered_by/128-powered-by-spamassassin.png sont différents
Les fichiers binaires /tmp/EgAefq7Sgf/spamassassin-3.4.0/powered_by/256-powered-by-spamassassin.png et /tmp/cjz0UrC4iD/spamassassin-3.4.2/powered_by/256-powered-by-spamassassin.png sont différents
Les fichiers binaires /tmp/EgAefq7Sgf/spamassassin-3.4.0/powered_by/512-powered-by-spamassassin.png et /tmp/cjz0UrC4iD/spamassassin-3.4.2/powered_by/512-powered-by-spamassassin.png sont différents
diff -Nru spamassassin-3.4.0/powered_by/LOGO_USAGE.TXT spamassassin-3.4.2/powered_by/LOGO_USAGE.TXT
--- spamassassin-3.4.0/powered_by/LOGO_USAGE.TXT	1969-12-31 19:00:00.000000000 -0500
+++ spamassassin-3.4.2/powered_by/LOGO_USAGE.TXT	2018-09-13 21:27:51.000000000 -0400
@@ -0,0 +1,22 @@
+Source: http://www.apache.org/foundation/press/kit/
+
+SpamAssassin Powered By Apache Logo
+
+The "Powered By Apache" logo was created to celebrate The Apache Software Foundation's 15th Anniversary and promote the ASF's more than 200 projects.
+
+The logo was specially created to maintain the unique identity of each Apache project whilst identifying all projects under the Apache umbrella. The Apache community at-large are encouraged to proudly display "Powered By Apache" assets on their Websites, documentation, marketing materials, etc.
+
+Guidelines for the appropriate use of the "Powered By Apache" logo include:
+
+    The "Powered By Apache" circular banded logo may be used standalone with just the Apache feather (denoting general use of an Apache project) or in combination with an official/authorized ASF Project logo;
+    The official/authorized Project logo may not be altered in any way other than removing/separating the name(s) where applicable as approved by the associated Project Management Committee;
+    The appropriate trademark symbol(s), such as ® or tm, associated with the project's logo must be included in the logo;
+    The logo's circular band format, font, and color must not be altered in any way;
+    The logo and/or its contents must not be rotated, animated, distorted, or otherwise altered, nor should it be used as a graphic element, background, or pattern;
+    The logo and/or its contents must not be translated or localized, nor should it have versioning numbers or other unauthorized words added to it;
+    The preferred background color for the logo is white, however, the logo may appear on colored, black, or image/photographic backgrounds providing the logo's legibility is not compromised;
+    The logo may be sized and produced in multiple file formats as required by the Project Management Committee, with a preferred minimum size of 80 pixels high in Web/online applications (where possible) to ensure legibility;
+    The logo may not, under any circumstances, be incorporated with a third party's company name, product name, or logo(s), or adopt marks and/or logos that are confusingly similar to or imply improper association with The Apache Software Foundation;
+    Third parties and programs are not allowed to use official Apache project logos and/or create alternate logos or identifying marks relating to any Apache project without written permission from the associated Project Management Committee and/or ASF Brand Management.
+
+In addition, official Apache Project pages and documentation on apache.org must utilize the appropriate trademark symbols on the respective Project logo, along with the following footnote: "Apache, Apache SpamAssassin, and the Apache SpamAssassin logo are registered trademarks or trademarks of The Apache Software Foundation in the U.S. and/or other countries."
Les fichiers binaires /tmp/EgAefq7Sgf/spamassassin-3.4.0/powered_by/powered_by_spamassassin.psd et /tmp/cjz0UrC4iD/spamassassin-3.4.2/powered_by/powered_by_spamassassin.psd sont différents
diff -Nru spamassassin-3.4.0/README spamassassin-3.4.2/README
--- spamassassin-3.4.0/README	2014-02-07 03:36:38.000000000 -0500
+++ spamassassin-3.4.2/README	2018-09-13 21:27:52.000000000 -0400
@@ -1,67 +1,70 @@
-Welcome to SpamAssassin!
-------------------------
+Welcome to Apache SpamAssassin!
+-------------------------------
 
-What SpamAssassin Is
---------------------
+What is Apache SpamAssassin 
+---------------------------
 
-SpamAssassin is a mail filter which attempts to identify spam using
-a variety of mechanisms including text analysis, Bayesian filtering,
-DNS blocklists, and collaborative filtering databases.
+Apache SpamAssassin is the #1 Open Source anti-spam platform giving
+system administrators a filter to classify email and block "spam"
+(unsolicited bulk email).  It uses a robust scoring framework and plug-ins
+to integrate a wide range of advanced heuristic and statistical analysis
+tests on email headers and body text including text analysis, Bayesian 
+filtering, DNS blocklists, and collaborative filtering databases.
 
-SpamAssassin is a project of the Apache Software Foundation (ASF).
+Apache SpamAssassin is a project of the Apache Software Foundation (ASF).
 
 
-What SpamAssassin Is Not
-------------------------
+What Apache SpamAssassin Is Not
+-------------------------------
 
-SpamAssassin is not a program to delete spam, route spam and ham to
+Apache SpamAssassin is not a program to delete spam, route spam and ham to
 separate mailboxes or folders, or send bounces when you receive spam.
-Those are mail routing functions, and SpamAssassin is not a mail
-router.  SpamAssassin is a mail filter or classifier.  It will examine
+Those are mail routing functions, and Apache SpamAssassin is not a mail
+router.  Apache SpamAssassin is a mail filter or classifier.  It will examine
 each message presented to it, and assign a score indicating the
 likelihood that the mail is spam.  An external program must then
 examine this score and do any routing the user wants done.  There are
 many programs that will easily perform these functions after examining
-the score assigned by SpamAssassin.
+the score assigned by Apache SpamAssassin.
 
 
-How SpamAssassin Works
-----------------------
+How Apache SpamAssassin Works
+-----------------------------
 
-SpamAssassin uses a wide range of heuristic tests on mail headers and
+Apache SpamAssassin uses a wide range of heuristic tests on mail headers and
 body text to identify "spam", also known as unsolicited commercial
 email.
 
 Once identified, the mail can then be optionally tagged as spam for
 later filtering using the user's own mail user-agent application.
 
-SpamAssassin typically differentiates successfully between spam and
+Apache SpamAssassin typically differentiates successfully between spam and
 non-spam in between 95% and 100% of cases, depending on what kind of mail
 you get and your training of its Bayesian filter.  Specifically,
-SpamAssassin has been shown to produce around 1.5% false negatives (spam
+Apache SpamAssassin has been shown to produce around 1.5% false negatives (spam
 that was missed) and around 0.06% false positives (ham incorrectly marked
 as spam).  See the rules/STATISTICS*.txt files for more information.
 
-SpamAssassin also includes plugins to support reporting spam messages
+Apache SpamAssassin also includes plugins to support reporting spam messages
 automatically or manually to collaborative filtering databases such as
 Pyzor, DCC, and Vipul's Razor.
 
 The distribution provides "spamassassin", a command line tool to
 perform filtering, along with the "Mail::SpamAssassin" module set
-which allows SpamAssassin to be used in spam-protection proxy SMTP or
+which allows Apache SpamAssassin to be used in spam-protection proxy SMTP or
 POP/IMAP server, or a variety of different spam-blocking scenarios.
 
-In addition, "spamd", a daemonized version of SpamAssassin which
+In addition, "spamd", a daemonized version of Apache SpamAssassin which
 runs persistently, is available.  Using its counterpart, "spamc",
 a lightweight client written in C, an MTA can process large volumes of
-mail through SpamAssassin without having to fork/exec a perl interpreter
+mail through Apache SpamAssassin without having to fork/exec a perl interpreter
 for each message.
 
 
 Questions? Need Help?
 ---------------------
 
-If you have questions about SpamAssassin, please check the Wiki[1] to
+If you have questions about Apache SpamAssassin, please check the Wiki[1] to
 see if someone has already posted an answer to your question. (The
 Wiki doubles as a FAQ.) Failing that, post a message to the
 spamassassin-users mailing list[2]. If you've found a bug (and you're
@@ -75,29 +78,29 @@
 Please also be sure to read the man pages.
 
 
-Upgrading SpamAssassin
-----------------------
+Upgrading Apache SpamAssassin
+-----------------------------
 
-IMPORTANT: If you are upgrading from a previous major version of
+IMPORTANT: If you are upgrading from a previous major version of Apache 
 SpamAssassin, please be sure to read the notes in UPGRADE to find out
 what has changed in a non- backward compatible way.
 
 
-Installing SpamAssassin
------------------------
+Installing Apache SpamAssassin
+------------------------------
 
 See the INSTALL file.
 
 
-Customising SpamAssassin
-------------------------
+Customizing Apache SpamAssassin
+-------------------------------
 
-These are the configuration files installed by SpamAssassin.  The commands
+These are the configuration files installed by Apache SpamAssassin.  The commands
 that can be used therein are listed in the POD documentation for the
 Mail::SpamAssassin::Conf class (run the following command to read it:
 "perldoc Mail::SpamAssassin::Conf").  Note: The following directories are
 the standard defaults that people use.  There is an explanation of all the
-default locations that SpamAssassin will look at the end.
+default locations that Apache SpamAssassin will look at the end.
 
   - /usr/share/spamassassin/*.cf:
 
@@ -166,7 +169,7 @@
   - $USER_HOME/.spamassassin/bayes*
 
 	Statistics databases used for Bayesian filtering.  If they do
-	not exist, they will be created by SpamAssassin.
+	not exist, they will be created by Apache SpamAssassin.
 
 	Spamd users may wish to create a shared set of bayes databases;
 	the "bayes_path" and "bayes_file_mode" configuration settings
@@ -177,7 +180,7 @@
 
 File Locations:
 
-SpamAssassin will look in a number of areas to find the default
+Apache SpamAssassin will look in a number of areas to find the default
 configuration files that are used.  The "__*__" text are variables
 whose value you can see by looking at the first several lines of the
 "spamassassin" or "spamd" scripts.
@@ -236,7 +239,7 @@
 
 This is normally written to by the "sa-update" script.  "__version__" is
 replaced by a representation of the version number, so that multiple
-versions of SpamAssassin will not interfere with each other's rulesets.
+versions of Apache SpamAssassin will not interfere with each other's rulesets.
 
 
 After installation, try "perldoc Mail::SpamAssassin::Conf" to see what
@@ -244,8 +247,8 @@
 
   - required_score
 
-	Set this higher to make SpamAssassin less sensitive.
-        If you are installing SpamAssassin system-wide, this is
+	Set this higher to make Apache SpamAssassin less sensitive.
+        If you are installing Apache SpamAssassin system-wide, this is
         **strongly** recommended!
 
         Statistics on how many false positives to expect at various
@@ -266,8 +269,8 @@
 Learning
 --------
 
-SpamAssassin includes a Bayesian learning filter, so it is worthwhile
-training SpamAssassin with your collection of non-spam and spam,
+Apache SpamAssassin includes a Bayesian learning filter, so it is worthwhile
+training Apache SpamAssassin with your collection of non-spam and spam,
 if possible.  This will make it more accurate for your incoming mail.
 Do this using the "sa-learn" tools, like so:
 
@@ -279,12 +282,12 @@
 If these are mail folders in mbox format, use the --mbox switch, for
 Maildirs use a trailing slash, like Maildir/cur/.
 
-Use as many mailboxes as you like.  Note that SpamAssassin will remember
+Use as many mailboxes as you like.  Note that Apache SpamAssassin will remember
 what mails it has learnt from, so you can re-run this as often as you like.
 
 
-Locali[sz]ation
----------------
+Localization
+------------
 
 All text displayed to users is taken from the configuration files.  This
 means that you can translate messages, test descriptions, and templates
@@ -301,7 +304,7 @@
 Disabled code
 -------------
 
-There are some tests and code in SpamAssassin that are turned off by
+There are some tests and code in Apache SpamAssassin that are turned off by
 default: experimental code, slow code, or code that depends on
 non-open-source software or services that are not always free.  These
 disabled tests include:
@@ -319,35 +322,19 @@
 prerequisites for proper operation of the plugin are present.
 
 
-Automatic Whitelist System
+Automatic Reputation System
 --------------------------
 
-SpamAssassin includes automatic whitelisting; The current iteration is
-considerably more complex than the original version.  The way it works is
-by tracking for each sender address the average score of messages so far
-seen from there.  Then, it combines this long-term average score for the
-sender with the score for the particular message being evaluated, after
-all other rules have been applied.
-
-This functionality is on by default, and is enabled or disabled with the
-"use_auto_whitelist" option.
-
-A system-wide auto-whitelist can be used, by setting the
-auto_whitelist_path and auto_whitelist_file_mode configuration commands
-appropriately, e.g.
-
-    auto_whitelist_path        /var/spool/spamassassin/auto-whitelist
-    auto_whitelist_file_mode   0666
-
-The spamassassin -W and -R command line flags provide an API to add and
-remove entries 'manually', if you so desire.  They operate based on an
-input mail message, to allow them to be set up as aliases which users can
-simply forward their mails to.  See the spamassassin manual page for more
-details.
-
-The default address-list implementation,
-Mail::SpamAssassin::DBBasedAddrList, uses Berkeley DB files to store
-the addresses.
+Apache SpamAssassin includes an automatic reputation system. The way it works is
+by tracking for each sender address a rolling average score of messages
+so far seen from there.  Then, it combines this long-term average score
+for the sender with the score for the particular message being evaluated,
+after all other rules have been applied.
+
+This functionality can be enabled or disabled with the
+"use_txrep" option.
+
+For more information, read sql/README.txrep
 
 (end of README)
 
diff -Nru spamassassin-3.4.0/rules/20_aux_tlds.cf spamassassin-3.4.2/rules/20_aux_tlds.cf
--- spamassassin-3.4.0/rules/20_aux_tlds.cf	1969-12-31 19:00:00.000000000 -0500
+++ spamassassin-3.4.2/rules/20_aux_tlds.cf	2018-05-06 11:42:27.000000000 -0400
@@ -0,0 +1,746 @@
+# SpamAssassin - Auxiliary TLD Definitions
+#
+# Please don't modify this file as your changes will be overwritten with
+# the next update. Use @@LOCAL_RULES_DIR@@/local.cf instead.
+# See 'perldoc Mail::SpamAssassin::Conf' for details.
+#
+# <@LICENSE>
+# Licensed to the Apache Software Foundation (ASF) under one or more
+# contributor license agreements.  See the NOTICE file distributed with
+# this work for additional information regarding copyright ownership.
+# The ASF licenses this file to you under the Apache License, Version 2.0
+# (the "License"); you may not use this file except in compliance with
+# the License.  You may obtain a copy of the License at:
+#
+#     http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+# </@LICENSE>
+#
+###########################################################################
+
+# This file replaces the SARE http://www.rulesemporium.com/rules/90_2tld.cf
+# which will be deprecated as from 2010-05-01
+
+# File updated 2014-09-17 to contain complete TLD lists, they are no longer
+# hardcoded into SA codebase and Util/RegistrarBoundaries.pm is deprecated
+# in favor of Mail::SpamAssassin::RegistryBoundaries.
+
+
+# Let's clear the internal TLD list, we only want to read from this config
+# file and ignore possible old hardcoded lists.
+if (can(Mail::SpamAssassin::Conf::feature_registryboundaries))
+clear_util_rb
+endif
+
+
+#
+# 1st level TLD list
+#
+
+# Basic list can be obtained with the following command:
+#  wget http://data.iana.org/TLD/tlds-alpha-by-domain.txt -q -O - | tail -n+2 | perl -ne 'print lc'
+# Current list may include more or less.. TODO easier maintenance?
+
+# util_rb_tld only accepts alpha (a-z) input before RegistryBoundaries was
+# implemented in 3.4.1(?), put IDN TLDs with numeric, hyphen (0-9-) etc in
+# this block
+#
+# For an up to date list of IDN TLDs that can be pasted into this block, run this command:
+#  wget http://data.iana.org/TLD/tlds-alpha-by-domain.txt -q -O - | grep -i '^xn--' | tr '\n' ' ' | fold -w 80 -s | perl -pe 'chomp; s/.*/util_rb_tld \L$_\n/'
+# Since version 4.0 the util_rb_tld also accepts Unicode IDN labels (encoded as UTF-8), e.g.:
+#  wget http://data.iana.org/TLD/tlds-alpha-by-domain.txt -q -O - | grep -i '^xn--' | idn -u | tr '\n' ' ' | fold -w 80 -s | perl -pe 'chomp; s/.*/util_rb_tld \L$_\n/'
+
+if (can(Mail::SpamAssassin::Conf::feature_registryboundaries))
+util_rb_tld xn--11b4c3d xn--1ck2e1b xn--1qqw23a xn--2scrj9c xn--30rr7y xn--3bst00m 
+util_rb_tld xn--3ds443g xn--3e0b707e xn--3hcrj9c xn--3oq18vl8pn36a xn--3pxu8k xn--42c2d9a 
+util_rb_tld xn--45br5cyl xn--45brj9c xn--45q11c xn--4gbrim xn--54b7fta0cc xn--55qw42g 
+util_rb_tld xn--55qx5d xn--5su34j936bgsg xn--5tzm5g xn--6frz82g xn--6qq986b3xl xn--80adxhks 
+util_rb_tld xn--80ao21a xn--80aqecdr1a xn--80asehdb xn--80aswg xn--8y0a063a xn--90a3ac 
+util_rb_tld xn--90ae xn--90ais xn--9dbq2a xn--9et52u xn--9krt00a xn--b4w605ferd 
+util_rb_tld xn--bck1b9a5dre4c xn--c1avg xn--c2br7g xn--cck2b3b xn--cg4bki 
+util_rb_tld xn--clchc0ea0b2g2a9gcd xn--czr694b xn--czrs0t xn--czru2d xn--d1acj3b xn--d1alf 
+util_rb_tld xn--e1a4c xn--eckvdtc9d xn--efvy88h xn--estv75g xn--fct429k xn--fhbei 
+util_rb_tld xn--fiq228c5hs xn--fiq64b xn--fiqs8s xn--fiqz9s xn--fjq720a xn--flw351e 
+util_rb_tld xn--fpcrj9c3d xn--fzc2c9e2c xn--fzys8d69uvgm xn--g2xx48c xn--gckr3f0f 
+util_rb_tld xn--gecrj9c xn--gk3at1e xn--h2breg3eve xn--h2brj9c xn--h2brj9c8c xn--hxt814e 
+util_rb_tld xn--i1b6b1a6a2e xn--imr513n xn--io0a7i xn--j1aef xn--j1amh xn--j6w193g 
+util_rb_tld xn--jlq61u9w7b xn--jvr189m xn--kcrx77d1x4a xn--kprw13d xn--kpry57d xn--kpu716f 
+util_rb_tld xn--kput3i xn--l1acc xn--lgbbat1ad8j xn--mgb9awbf xn--mgba3a3ejt 
+util_rb_tld xn--mgba3a4f16a xn--mgba7c0bbn0a xn--mgbaakc7dvf xn--mgbaam7a8h xn--mgbab2bd 
+util_rb_tld xn--mgbai9azgqp6j xn--mgbayh7gpa xn--mgbb9fbpob xn--mgbbh1a xn--mgbbh1a71e 
+util_rb_tld xn--mgbc0a9azcg xn--mgbca7dzdo xn--mgberp4a5d4ar xn--mgbgu82a xn--mgbi4ecexp 
+util_rb_tld xn--mgbpl2fh xn--mgbt3dhd xn--mgbtx2b xn--mgbx4cd0ab xn--mix891f xn--mk1bu44c 
+util_rb_tld xn--mxtq1m xn--ngbc5azd xn--ngbe9e0a xn--ngbrx xn--node xn--nqv7f 
+util_rb_tld xn--nqv7fs00ema xn--nyqy26a xn--o3cw4h xn--ogbpf8fl xn--p1acf xn--p1ai 
+util_rb_tld xn--pbt977c xn--pgbs0dh xn--pssy2u xn--q9jyb4c xn--qcka1pmc xn--qxam 
+util_rb_tld xn--rhqv96g xn--rovu88b xn--rvc1e0am3e xn--s9brj9c xn--ses554g xn--t60b56a 
+util_rb_tld xn--tckwe xn--tiq49xqyj xn--unup4y xn--vermgensberater-ctb 
+util_rb_tld xn--vermgensberatung-pwb xn--vhquv xn--vuq861b xn--w4r85el8fhu5dnra xn--w4rs40l 
+util_rb_tld xn--wgbh1c xn--wgbl6a xn--xhq521b xn--xkc2al3hye2a xn--xkc2dl3a5ee0h xn--y9a3aq 
+util_rb_tld xn--yfro4i67o xn--ygbi2ammx xn--zfr164b
+endif
+
+# Standard List
+# For an up to date list of TLDs that can be pasted into this block, run this command:
+#  wget http://data.iana.org/TLD/tlds-alpha-by-domain.txt -q -O - | tail -n+2 | grep -vi '^xn--' | tr '\n' ' ' | fold -w 80 -s | perl -pe 'chomp; s/.*/util_rb_tld \L$_\n/'
+
+util_rb_tld aaa aarp abarth abb abbott abbvie abc able abogado abudhabi ac academy 
+util_rb_tld accenture accountant accountants aco active actor ad adac ads adult ae aeg aero 
+util_rb_tld aetna af afamilycompany afl africa ag agakhan agency ai aig aigo airbus 
+util_rb_tld airforce airtel akdn al alfaromeo alibaba alipay allfinanz allstate ally alsace 
+util_rb_tld alstom am americanexpress americanfamily amex amfam amica amsterdam analytics 
+util_rb_tld android anquan anz ao aol apartments app apple aq aquarelle ar arab aramco 
+util_rb_tld archi army arpa art arte as asda asia associates at athleta attorney au auction 
+util_rb_tld audi audible audio auspost author auto autos avianca aw aws ax axa az azure ba 
+util_rb_tld baby baidu banamex bananarepublic band bank bar barcelona barclaycard barclays 
+util_rb_tld barefoot bargains baseball basketball bauhaus bayern bb bbc bbt bbva bcg bcn bd 
+util_rb_tld be beats beauty beer bentley berlin best bestbuy bet bf bg bh bharti bi bible 
+util_rb_tld bid bike bing bingo bio biz bj black blackfriday blanco blockbuster blog 
+util_rb_tld bloomberg blue bm bms bmw bn bnl bnpparibas bo boats boehringer bofa bom bond 
+util_rb_tld boo book booking boots bosch bostik boston bot boutique box br bradesco 
+util_rb_tld bridgestone broadway broker brother brussels bs bt budapest bugatti build 
+util_rb_tld builders business buy buzz bv bw by bz bzh ca cab cafe cal call calvinklein cam 
+util_rb_tld camera camp cancerresearch canon capetown capital capitalone car caravan cards 
+util_rb_tld care career careers cars cartier casa case caseih cash casino cat catering 
+util_rb_tld catholic cba cbn cbre cbs cc cd ceb center ceo cern cf cfa cfd cg ch chanel 
+util_rb_tld channel chase chat cheap chintai christmas chrome chrysler church ci cipriani 
+util_rb_tld circle cisco citadel citi citic city cityeats ck cl claims cleaning click 
+util_rb_tld clinic clinique clothing cloud club clubmed cm cn co coach codes coffee college 
+util_rb_tld cologne com comcast commbank community company compare computer comsec condos 
+util_rb_tld construction consulting contact contractors cooking cookingchannel cool coop 
+util_rb_tld corsica country coupon coupons courses cr credit creditcard creditunion cricket 
+util_rb_tld crown crs cruise cruises csc cu cuisinella cv cw cx cy cymru cyou cz dabur dad 
+util_rb_tld dance data date dating datsun day dclk dds de deal dealer deals degree delivery 
+util_rb_tld dell deloitte delta democrat dental dentist desi design dev dhl diamonds diet 
+util_rb_tld digital direct directory discount discover dish diy dj dk dm dnp do docs doctor 
+util_rb_tld dodge dog doha domains dot download drive dtv dubai duck dunlop duns dupont 
+util_rb_tld durban dvag dvr dz earth eat ec eco edeka edu education ee eg email emerck 
+util_rb_tld energy engineer engineering enterprises epost epson equipment er ericsson erni 
+util_rb_tld es esq estate esurance et etisalat eu eurovision eus events everbank exchange 
+util_rb_tld expert exposed express extraspace fage fail fairwinds faith family fan fans 
+util_rb_tld farm farmers fashion fast fedex feedback ferrari ferrero fi fiat fidelity fido 
+util_rb_tld film final finance financial fire firestone firmdale fish fishing fit fitness 
+util_rb_tld fj fk flickr flights flir florist flowers fly fm fo foo food foodnetwork 
+util_rb_tld football ford forex forsale forum foundation fox fr free fresenius frl frogans 
+util_rb_tld frontdoor frontier ftr fujitsu fujixerox fun fund furniture futbol fyi ga gal 
+util_rb_tld gallery gallo gallup game games gap garden gb gbiz gd gdn ge gea gent genting 
+util_rb_tld george gf gg ggee gh gi gift gifts gives giving gl glade glass gle global globo 
+util_rb_tld gm gmail gmbh gmo gmx gn godaddy gold goldpoint golf goo goodhands goodyear 
+util_rb_tld goog google gop got gov gp gq gr grainger graphics gratis green gripe grocery 
+util_rb_tld group gs gt gu guardian gucci guge guide guitars guru gw gy hair hamburg 
+util_rb_tld hangout haus hbo hdfc hdfcbank health healthcare help helsinki here hermes hgtv 
+util_rb_tld hiphop hisamitsu hitachi hiv hk hkt hm hn hockey holdings holiday homedepot 
+util_rb_tld homegoods homes homesense honda honeywell horse hospital host hosting hot 
+util_rb_tld hoteles hotels hotmail house how hr hsbc ht hu hughes hyatt hyundai ibm icbc 
+util_rb_tld ice icu id ie ieee ifm ikano il im imamat imdb immo immobilien in industries 
+util_rb_tld infiniti info ing ink institute insurance insure int intel international intuit 
+util_rb_tld investments io ipiranga iq ir irish is iselect ismaili ist istanbul it itau itv 
+util_rb_tld iveco iwc jaguar java jcb jcp je jeep jetzt jewelry jio jlc jll jm jmp jnj jo 
+util_rb_tld jobs joburg jot joy jp jpmorgan jprs juegos juniper kaufen kddi ke kerryhotels 
+util_rb_tld kerrylogistics kerryproperties kfh kg kh ki kia kim kinder kindle kitchen kiwi 
+util_rb_tld km kn koeln komatsu kosher kp kpmg kpn kr krd kred kuokgroup kw ky kyoto kz la 
+util_rb_tld lacaixa ladbrokes lamborghini lamer lancaster lancia lancome land landrover 
+util_rb_tld lanxess lasalle lat latino latrobe law lawyer lb lc lds lease leclerc lefrak 
+util_rb_tld legal lego lexus lgbt li liaison lidl life lifeinsurance lifestyle lighting 
+util_rb_tld like lilly limited limo lincoln linde link lipsy live living lixil lk loan 
+util_rb_tld loans locker locus loft lol london lotte lotto love lpl lplfinancial lr ls lt 
+util_rb_tld ltd ltda lu lundbeck lupin luxe luxury lv ly ma macys madrid maif maison makeup 
+util_rb_tld man management mango map market marketing markets marriott marshalls maserati 
+util_rb_tld mattel mba mc mckinsey md me med media meet melbourne meme memorial men menu 
+util_rb_tld meo merckmsd metlife mg mh miami microsoft mil mini mint mit mitsubishi mk ml 
+util_rb_tld mlb mls mm mma mn mo mobi mobile mobily moda moe moi mom monash money monster 
+util_rb_tld mopar mormon mortgage moscow moto motorcycles mov movie movistar mp mq mr ms 
+util_rb_tld msd mt mtn mtr mu museum mutual mv mw mx my mz na nab nadex nagoya name 
+util_rb_tld nationwide natura navy nba nc ne nec net netbank netflix network neustar new 
+util_rb_tld newholland news next nextdirect nexus nf nfl ng ngo nhk ni nico nike nikon 
+util_rb_tld ninja nissan nissay nl no nokia northwesternmutual norton now nowruz nowtv np 
+util_rb_tld nr nra nrw ntt nu nyc nz obi observer off office okinawa olayan olayangroup 
+util_rb_tld oldnavy ollo om omega one ong onl online onyourside ooo open oracle orange org 
+util_rb_tld organic origins osaka otsuka ott ovh pa page panasonic panerai paris pars 
+util_rb_tld partners parts party passagens pay pccw pe pet pf pfizer pg ph pharmacy phd 
+util_rb_tld philips phone photo photography photos physio piaget pics pictet pictures pid 
+util_rb_tld pin ping pink pioneer pizza pk pl place play playstation plumbing plus pm pn 
+util_rb_tld pnc pohl poker politie porn post pr pramerica praxi press prime pro prod 
+util_rb_tld productions prof progressive promo properties property protection pru 
+util_rb_tld prudential ps pt pub pw pwc py qa qpon quebec quest qvc racing radio raid re 
+util_rb_tld read realestate realtor realty recipes red redstone redumbrella rehab reise 
+util_rb_tld reisen reit reliance ren rent rentals repair report republican rest restaurant 
+util_rb_tld review reviews rexroth rich richardli ricoh rightathome ril rio rip rmit ro 
+util_rb_tld rocher rocks rodeo rogers room rs rsvp ru rugby ruhr run rw rwe ryukyu sa 
+util_rb_tld saarland safe safety sakura sale salon samsclub samsung sandvik sandvikcoromant 
+util_rb_tld sanofi sap sapo sarl sas save saxo sb sbi sbs sc sca scb schaeffler schmidt 
+util_rb_tld scholarships school schule schwarz science scjohnson scor scot sd se search 
+util_rb_tld seat secure security seek select sener services ses seven sew sex sexy sfr sg 
+util_rb_tld sh shangrila sharp shaw shell shia shiksha shoes shop shopping shouji show 
+util_rb_tld showtime shriram si silk sina singles site sj sk ski skin sky skype sl sling sm 
+util_rb_tld smart smile sn sncf so soccer social softbank software sohu solar solutions 
+util_rb_tld song sony soy space spiegel sport spot spreadbetting sr srl srt st stada 
+util_rb_tld staples star starhub statebank statefarm statoil stc stcgroup stockholm storage 
+util_rb_tld store stream studio study style su sucks supplies supply support surf surgery 
+util_rb_tld suzuki sv swatch swiftcover swiss sx sy sydney symantec systems sz tab taipei 
+util_rb_tld talk taobao target tatamotors tatar tattoo tax taxi tc tci td tdk team tech 
+util_rb_tld technology tel telecity telefonica temasek tennis teva tf tg th thd theater 
+util_rb_tld theatre tiaa tickets tienda tiffany tips tires tirol tj tjmaxx tjx tk tkmaxx tl 
+util_rb_tld tm tmall tn to today tokyo tools top toray toshiba total tours town toyota toys 
+util_rb_tld tr trade trading training travel travelchannel travelers travelersinsurance 
+util_rb_tld trust trv tt tube tui tunes tushu tv tvs tw tz ua ubank ubs uconnect ug uk 
+util_rb_tld unicom university uno uol ups us uy uz va vacations vana vanguard vc ve vegas 
+util_rb_tld ventures verisign versicherung vet vg vi viajes video vig viking villas vin vip 
+util_rb_tld virgin visa vision vista vistaprint viva vivo vlaanderen vn vodka volkswagen 
+util_rb_tld volvo vote voting voto voyage vu vuelos wales walmart walter wang wanggou 
+util_rb_tld warman watch watches weather weatherchannel webcam weber website wed wedding 
+util_rb_tld weibo weir wf whoswho wien wiki williamhill win windows wine winners wme 
+util_rb_tld wolterskluwer woodside work works world wow ws wtc wtf xbox xerox xfinity 
+util_rb_tld xihuan xin xperia xxx xyz yachts yahoo yamaxun yandex ye yodobashi yoga 
+util_rb_tld yokohama you youtube yt yun za zappos zara zero zip zippo zm zone zuerich zw 
+
+#
+# 2nd level TLD list
+#
+
+# http://www.neustar.us/policies/docs/rfc_1480.txt
+# data originally from http://spamcheck.freeapp.net/two-level-tlds
+# The freeapp.net site now says that information on the site is obsolete
+# See discussion and sources in comments of bug 5677
+# updated as per bug 5815
+# cleanup in progress per bug 6795 (axb)
+# Unsorted sources:
+# .ua : http://hostmaster.ua
+# .hu : http://www.domain.hu/domain/English/szabalyzat/sld.html
+
+util_rb_2tld com.ac edu.ac gov.ac mil.ac net.ac org.ac
+util_rb_2tld nom.ad
+util_rb_2tld ac.ae co.ae com.ae gov.ae mil.ae name.ae net.ae org.ae pro.ae sch.ae
+util_rb_2tld com.af edu.af gov.af net.af
+util_rb_2tld co.ag com.ag net.ag nom.ag org.ag
+util_rb_2tld com.ai edu.ai gov.ai net.ai off.ai org.ai
+util_rb_2tld com.al edu.al gov.al net.al org.al
+util_rb_2tld com.an edu.an net.an org.an
+util_rb_2tld co.ao ed.ao gv.ao it.ao og.ao pb.ao
+util_rb_2tld com.ar edu.ar gov.ar int.ar mil.ar net.ar org.ar
+util_rb_2tld e164.arpa in-addr.arpa ip6.arpa iris.arpa uri.arpa urn.arpa
+util_rb_2tld ac.at co.at gv.at or.at priv.at
+util_rb_2tld act.au asn.au com.au conf.au csiro.au edu.au gov.au id.au info.au net.au nsw.au nt.au org.au otc.au oz.au qld.au sa.au tas.au telememo.au vic.au wa.au
+util_rb_2tld com.aw
+util_rb_2tld biz.az com.az edu.az gov.az info.az int.az mil.az name.az net.az org.az pp.az
+util_rb_2tld co.ba com.ba edu.ba gov.ba mil.ba net.ba org.ba rs.ba unbi.ba unsa.ba
+util_rb_2tld com.bb edu.bb gov.bb net.bb org.bb
+util_rb_2tld ac.bd com.bd edu.bd gov.bd mil.bd net.bd org.bd
+util_rb_2tld ac.be belgie.be dns.be fgov.be
+util_rb_2tld gov.bf
+util_rb_2tld biz.bh cc.bh com.bh edu.bh gov.bh info.bh net.bh org.bh
+util_rb_2tld com.bm edu.bm gov.bm net.bm org.bm
+util_rb_2tld com.bn edu.bn net.bn org.bn
+util_rb_2tld com.bo edu.bo gob.bo gov.bo int.bo mil.bo net.bo org.bo tv.bo
+util_rb_2tld adm.br adv.br agr.br am.br arq.br art.br ato.br bio.br bmd.br cim.br cng.br cnt.br com.br coop.br dpn.br eco.br ecn.br edu.br eng.br esp.br etc.br eti.br far.br fm.br fnd.br fot.br fst.br g12.br ggf.br gov.br imb.br ind.br inf.br jor.br lel.br mat.br med.br mil.br mus.br net.br nom.br not.br ntr.br odo.br org.br ppg.br pro.br psc.br psi.br qsl.br rec.br slg.br srv.br tmp.br trd.br tur.br tv.br vet.br zlg.br
+util_rb_2tld com.bs net.bs org.bs
+util_rb_2tld com.bt edu.bt gov.bt net.bt org.bt
+util_rb_2tld co.bw org.bw
+util_rb_2tld gov.by mil.by
+util_rb_2tld com.bz net.bz org.bz
+util_rb_2tld ab.ca bc.ca gc.ca mb.ca nb.ca nf.ca nl.ca ns.ca nt.ca nu.ca on.ca pe.ca qc.ca sk.ca yk.ca
+util_rb_2tld co.ck edu.ck gov.ck net.ck org.ck
+util_rb_2tld ac.cn ah.cn bj.cn com.cn cq.cn edu.cn fj.cn gd.cn gov.cn gs.cn gx.cn gz.cn ha.cn hb.cn he.cn hi.cn hk.cn hl.cn hn.cn jl.cn js.cn jx.cn ln.cn mo.cn net.cn nm.cn nx.cn org.cn qh.cn sc.cn sd.cn sh.cn sn.cn sx.cn tj.cn tw.cn xj.cn xz.cn yn.cn zj.cn
+util_rb_2tld arts.co com.co edu.co firm.co gov.co info.co int.co mil.co net.co nom.co org.co rec.co web.co
+util_rb_2tld co.cm com.cm net.cm
+util_rb_2tld au.com br.com cn.com de.com eu.com gb.com hu.com no.com qc.com ru.com sa.com se.com uk.com us.com uy.com za.com
+util_rb_2tld ac.cr co.cr ed.cr fi.cr go.cr or.cr sa.cr
+util_rb_2tld com.cu edu.cu gov.cu inf.cu net.cu org.cu
+util_rb_2tld gov.cx
+util_rb_2tld ac.cy biz.cy com.cy ekloges.cy gov.cy ltd.cy name.cy net.cy org.cy parliament.cy press.cy pro.cy tm.cy
+util_rb_2tld co.dk
+util_rb_2tld com.dm edu.dm gov.dm net.dm org.dm
+util_rb_2tld art.do com.do edu.do gob.do gov.do mil.do net.do org.do sld.do web.do
+util_rb_2tld art.dz asso.dz com.dz edu.dz gov.dz net.dz org.dz pol.dz
+util_rb_2tld com.ec edu.ec fin.ec gov.ec info.ec k12.ec med.ec mil.ec net.ec org.ec pro.ec gob.ec
+util_rb_2tld co.ee com.ee edu.ee fie.ee med.ee org.ee pri.ee
+util_rb_2tld com.eg edu.eg eun.eg gov.eg mil.eg net.eg org.eg sci.eg
+util_rb_2tld com.er edu.er gov.er ind.er mil.er net.er org.er
+util_rb_2tld com.es edu.es gob.es nom.es org.es
+util_rb_2tld biz.et com.et edu.et gov.et info.et name.et net.et org.et
+util_rb_2tld aland.fi
+util_rb_2tld ac.fj biz.fj com.fj gov.fj id.fj info.fj mil.fj name.fj net.fj org.fj pro.fj school.fj
+util_rb_2tld ac.fk co.fk com.fk gov.fk net.fk nom.fk org.fk
+util_rb_2tld tm.fr asso.fr nom.fr prd.fr presse.fr com.fr gouv.fr
+util_rb_2tld com.ge edu.ge gov.ge mil.ge net.ge org.ge pvt.ge
+util_rb_2tld ac.gg alderney.gg co.gg gov.gg guernsey.gg ind.gg ltd.gg net.gg org.gg sark.gg sch.gg
+util_rb_2tld com.gh edu.gh gov.gh mil.gh org.gh
+util_rb_2tld com.gi edu.gi gov.gi ltd.gi mod.gi org.gi
+util_rb_2tld ac.gn com.gn gov.gn net.gn org.gn
+util_rb_2tld asso.gp com.gp edu.gp net.gp org.gp
+util_rb_2tld com.gr edu.gr gov.gr net.gr org.gr
+util_rb_2tld com.gt edu.gt gob.gt ind.gt mil.gt net.gt org.gt
+util_rb_2tld com.gu edu.gu gov.gu mil.gu net.gu org.gu
+util_rb_2tld com.hk edu.hk gov.hk idv.hk net.hk org.hk
+util_rb_2tld com.hn edu.hn gob.hn mil.hn net.hn org.hn
+util_rb_2tld com.hr from.hr iz.hr name.hr
+util_rb_2tld adult.ht art.ht asso.ht com.ht coop.ht edu.ht firm.ht gouv.ht info.ht med.ht net.ht org.ht perso.ht pol.ht pro.ht rel.ht shop.ht
+util_rb_2tld 2000.hu agrar.hu bolt.hu casino.hu city.hu co.hu erotica.hu erotika.hu film.hu forum.hu games.hu hotel.hu info.hu ingatlan.hu jogasz.hu konyvelo.hu lakas.hu media.hu news.hu org.hu priv.hu reklam.hu sex.hu shop.hu sport.hu suli.hu szex.hu tm.hu tozsde.hu utazas.hu video.hu
+util_rb_2tld ac.id co.id go.id mil.id net.id or.id sch.id web.id
+util_rb_2tld gov.ie
+util_rb_2tld ac.il co.il gov.il idf.il k12.il muni.il net.il org.il
+util_rb_2tld ac.im co.im com.im gov.im net.im nic.im org.im
+util_rb_2tld ac.in co.in edu.in ernet.in firm.in gen.in gov.in ind.in mil.in net.in nic.in org.in res.in
+util_rb_2tld com.io gov.io mil.io net.io org.io
+util_rb_2tld gov.iq
+util_rb_2tld ac.ir co.ir gov.ir id.ir net.ir org.ir sch.ir
+util_rb_2tld edu.it gov.it
+util_rb_2tld ac.je co.je gov.je ind.je jersey.je ltd.je net.je org.je sch.je
+util_rb_2tld com.jm edu.jm gov.jm net.jm org.jm
+util_rb_2tld com.jo edu.jo gov.jo mil.jo net.jo org.jo
+util_rb_2tld ac.jp ad.jp aichi.jp akita.jp aomori.jp chiba.jp co.jp ed.jp ehime.jp fukui.jp fukuoka.jp fukushima.jp gifu.jp go.jp gov.jp gr.jp gunma.jp hiroshima.jp hokkaido.jp hyogo.jp ibaraki.jp ishikawa.jp iwate.jp kagawa.jp kagoshima.jp kanagawa.jp kanazawa.jp kawasaki.jp kitakyushu.jp kobe.jp kochi.jp kumamoto.jp kyoto.jp lg.jp matsuyama.jp mie.jp miyagi.jp miyazaki.jp nagano.jp nagasaki.jp nagoya.jp nara.jp ne.jp net.jp niigata.jp oita.jp okayama.jp okinawa.jp or.jp org.jp osaka.jp saga.jp saitama.jp sapporo.jp sendai.jp shiga.jp shimane.jp shizuoka.jp takamatsu.jp tochigi.jp tokushima.jp tokyo.jp tottori.jp toyama.jp utsunomiya.jp wakayama.jp yamagata.jp yamaguchi.jp yamanashi.jp yokohama.jp
+util_rb_2tld ac.ke co.ke go.ke ne.ke new.ke or.ke sc.ke
+util_rb_2tld com.kg edu.kg gov.kg mil.kg net.kg org.kg
+util_rb_2tld com.kh edu.kh gov.kh mil.kh net.kh org.kh per.kh
+util_rb_2tld ac.kr busan.kr chungbuk.kr chungnam.kr co.kr daegu.kr daejeon.kr es.kr gangwon.kr go.kr gwangju.kr gyeongbuk.kr gyeonggi.kr gyeongnam.kr hs.kr incheon.kr jeju.kr jeonbuk.kr jeonnam.kr kg.kr kyonggi.kr mil.kr ms.kr ne.kr or.kr pe.kr re.kr sc.kr seoul.kr ulsan.kr
+util_rb_2tld com.kw edu.kw gov.kw mil.kw net.kw org.kw
+util_rb_2tld com.ky edu.ky gov.ky net.ky org.ky
+util_rb_2tld com.kz edu.kz gov.kz mil.kz net.kz org.kz
+util_rb_2tld com.la net.la org.la
+util_rb_2tld com.lb edu.lb gov.lb mil.lb net.lb org.lb
+util_rb_2tld com.lc edu.lc gov.lc net.lc org.lc
+util_rb_2tld assn.lk com.lk edu.lk gov.lk grp.lk hotel.lk int.lk ltd.lk net.lk ngo.lk org.lk sch.lk soc.lk web.lk
+util_rb_2tld com.lr edu.lr gov.lr net.lr org.lr
+util_rb_2tld co.ls org.ls
+util_rb_2tld gov.lt mil.lt
+util_rb_2tld asn.lv com.lv conf.lv edu.lv gov.lv id.lv mil.lv net.lv org.lv
+util_rb_2tld biz.ly com.ly edu.ly gov.ly id.ly med.ly net.ly org.ly plc.ly sch.ly
+util_rb_2tld ac.ma co.ma gov.ma net.ma org.ma press.ma
+util_rb_2tld asso.mc tm.mc
+util_rb_2tld ac.me co.me edu.me gov.me its.me net.me org.me priv.me
+util_rb_2tld com.mg edu.mg gov.mg mil.mg nom.mg org.mg prd.mg tm.mg
+util_rb_2tld army.mil navy.mil
+util_rb_2tld com.mk org.mk
+util_rb_2tld com.mm edu.mm gov.mm net.mm org.mm
+util_rb_2tld edu.mn gov.mn org.mn
+util_rb_2tld com.mo edu.mo gov.mo net.mo org.mo
+util_rb_2tld music.mobi weather.mobi
+util_rb_2tld co.mp edu.mp gov.mp net.mp org.mp
+util_rb_2tld com.mt edu.mt gov.mt net.mt org.mt tm.mt uu.mt
+util_rb_2tld co.mu com.mu
+util_rb_2tld aero.mv biz.mv com.mv coop.mv edu.mv gov.mv info.mv int.mv mil.mv museum.mv name.mv net.mv org.mv pro.mv
+util_rb_2tld ac.mw co.mw com.mw coop.mw edu.mw gov.mw int.mw museum.mw net.mw org.mw
+util_rb_2tld com.mx edu.mx gob.mx net.mx org.mx
+util_rb_2tld com.my edu.my gov.my mil.my name.my net.my org.my
+util_rb_2tld alt.na com.na cul.na edu.na net.na org.na telecom.na unam.na
+util_rb_2tld com.nc net.nc org.nc
+util_rb_2tld de.net gb.net uk.net
+util_rb_2tld ac.ng com.ng edu.ng gov.ng net.ng org.ng sch.ng
+util_rb_2tld ac.ni biz.ni com.ni edu.ni gob.ni in.ni info.ni int.ni mil.ni net.ni nom.ni org.ni web.ni
+util_rb_2tld fhs.no folkebibl.no fylkesbibl.no herad.no idrett.no kommune.no mil.no museum.no priv.no stat.no tel.no vgs.no
+util_rb_2tld com.np edu.np gov.np mil.np net.np org.np
+util_rb_2tld biz.nr co.nr com.nr edu.nr fax.nr gov.nr info.nr mob.nr mobil.nr mobile.nr net.nr org.nr tel.nr tlf.nr
+util_rb_2tld ac.nz co.nz cri.nz geek.nz gen.nz govt.nz iwi.nz kiwi.nz maori.nz mil.nz net.nz org.nz parliament.nz school.nz
+util_rb_2tld ac.om biz.om co.om com.om edu.om gov.om med.om mil.om mod.om museum.om net.om org.om pro.om sch.om
+util_rb_2tld dk.org eu.org
+util_rb_2tld abo.pa ac.pa com.pa edu.pa gob.pa ing.pa med.pa net.pa nom.pa org.pa sld.pa
+util_rb_2tld com.pe edu.pe gob.pe mil.pe net.pe nom.pe org.pe
+util_rb_2tld com.pf edu.pf org.pf
+util_rb_2tld ac.pg com.pg net.pg
+util_rb_2tld com.ph edu.ph gov.ph mil.ph net.ph ngo.ph org.ph
+util_rb_2tld biz.pk com.pk edu.pk fam.pk gob.pk gok.pk gon.pk gop.pk gos.pk gov.pk net.pk org.pk web.pk
+util_rb_2tld art.pl biz.pl com.pl edu.pl gov.pl info.pl mil.pl net.pl ngo.pl org.pl
+util_rb_2tld biz.pr com.pr edu.pr gov.pr info.pr isla.pr name.pr net.pr org.pr pro.pr
+util_rb_2tld cpa.pro law.pro med.pro
+util_rb_2tld com.ps edu.ps gov.ps net.ps org.ps plo.ps sec.ps
+util_rb_2tld com.pt edu.pt gov.pt int.pt net.pt nome.pt org.pt publ.pt
+util_rb_2tld com.py edu.py gov.py net.py org.py
+util_rb_2tld com.qa edu.qa gov.qa net.qa org.qa
+util_rb_2tld asso.re com.re nom.re
+util_rb_2tld arts.ro com.ro firm.ro info.ro nom.ro nt.ro org.ro rec.ro store.ro tm.ro www.ro
+util_rb_2tld ac.rs co.rs edu.rs gov.rs in.rs org.rs
+util_rb_2tld ac.ru com.ru edu.ru gov.ru int.ru mil.ru net.ru org.ru pp.ru
+util_rb_2tld ac.rw co.rw com.rw edu.rw gouv.rw gov.rw int.rw mil.rw net.rw
+util_rb_2tld com.sa edu.sa gov.sa med.sa net.sa org.sa pub.sa sch.sa
+util_rb_2tld com.sb edu.sb gov.sb net.sb org.sb
+util_rb_2tld com.sc edu.sc gov.sc net.sc org.sc
+util_rb_2tld com.sd edu.sd gov.sd info.sd med.sd net.sd org.sd sch.sd tv.sd
+util_rb_2tld ab.se ac.se bd.se brand.se c.se d.se e.se f.se fh.se fhsk.se fhv.se g.se h.se i.se k.se komforb.se kommunalforbund.se komvux.se lanarb.se lanbib.se m.se mil.se n.se naturbruksgymn.se o.se org.se parti.se pp.se press.se s.se sshn.se t.se tm.se u.se w.se x.se y.se z.se
+util_rb_2tld com.sg edu.sg gov.sg idn.sg net.sg org.sg per.sg
+util_rb_2tld com.sh edu.sh gov.sh mil.sh net.sh org.sh
+util_rb_2tld edu.sk gov.sk mil.sk
+util_rb_2tld co.st com.st consulado.st edu.st embaixada.st gov.st mil.st net.st org.st principe.st saotome.st store.st
+util_rb_2tld com.sv edu.sv gob.sv org.sv red.sv
+util_rb_2tld com.sy gov.sy net.sy org.sy
+util_rb_2tld at.tf bg.tf ca.tf ch.tf cz.tf de.tf edu.tf eu.tf int.tf net.tf pl.tf ru.tf sg.tf us.tf
+util_rb_2tld ac.th co.th go.th in.th mi.th net.th or.th
+util_rb_2tld ac.tj biz.tj co.tj com.tj edu.tj go.tj gov.tj int.tj mil.tj name.tj net.tj org.tj web.tj
+util_rb_2tld com.tn edunet.tn ens.tn fin.tn gov.tn ind.tn info.tn intl.tn nat.tn net.tn org.tn rnrt.tn rns.tn rnu.tn tourism.tn
+util_rb_2tld gov.to
+util_rb_2tld gov.tp
+util_rb_2tld av.tr bbs.tr bel.tr biz.tr com.tr dr.tr edu.tr gen.tr gov.tr info.tr k12.tr mil.tr name.tr net.tr org.tr pol.tr tel.tr web.tr
+util_rb_2tld aero.tt at.tt au.tt be.tt biz.tt ca.tt co.tt com.tt coop.tt de.tt dk.tt edu.tt es.tt eu.tt fr.tt gov.tt info.tt int.tt it.tt jobs.tt mobi.tt museum.tt name.tt net.tt nic.tt org.tt pro.tt se.tt travel.tt uk.tt us.tt
+util_rb_2tld co.tv gov.tv
+util_rb_2tld club.tw com.tw ebiz.tw edu.tw game.tw gov.tw idv.tw mil.tw net.tw org.tw
+util_rb_2tld ac.tz co.tz go.tz ne.tz or.tz
+util_rb_2tld cherkassy.ua chernigov.ua chernovtsy.ua ck.ua cn.ua co.ua com.ua crimea.ua cv.ua dn.ua dnepropetrovsk.ua donetsk.ua dp.ua edu.ua gov.ua if.ua in.ua ivano-frankivsk.ua kh.ua kharkov.ua kherson.ua khmelnitskiy.ua kiev.ua kirovograd.ua km.ua kr.ua ks.ua kv.ua lg.ua lugansk.ua lutsk.ua lviv.ua mk.ua net.ua nikolaev.ua od.ua odessa.ua org.ua pl.ua poltava.ua rovno.ua rv.ua sebastopol.ua sumy.ua te.ua ternopil.ua uzhgorod.ua vinnica.ua vn.ua zaporizhzhe.ua zhitomir.ua zp.ua zt.ua
+util_rb_2tld ac.ug co.ug go.ug ne.ug or.ug sc.ug
+util_rb_2tld ac.uk bl.uk british-library.uk co.uk edu.uk gov.uk icnet.uk jet.uk ltd.uk me.uk mod.uk national-library-scotland.uk net.uk nhs.uk nic.uk nls.uk org.uk parliament.uk plc.uk police.uk sch.uk
+util_rb_2tld ak.us al.us ar.us az.us ca.us co.us ct.us dc.us de.us dni.us fed.us fl.us ga.us hi.us ia.us id.us il.us in.us isa.us kids.us ks.us ky.us la.us ma.us md.us me.us mi.us mn.us mo.us ms.us mt.us nc.us nd.us ne.us nh.us nj.us nm.us nsn.us nv.us ny.us oh.us ok.us or.us pa.us ri.us sc.us sd.us tn.us tx.us ut.us va.us vt.us wa.us wi.us wv.us wy.us
+util_rb_2tld com.uy edu.uy gub.uy mil.uy net.uy org.uy
+util_rb_2tld vatican.va
+util_rb_2tld arts.ve bib.ve co.ve com.ve edu.ve firm.ve gov.ve info.ve int.ve mil.ve net.ve nom.ve org.ve rec.ve store.ve tec.ve web.ve
+util_rb_2tld co.vi com.vi edu.vi gov.vi net.vi org.vi
+util_rb_2tld ac.vn biz.vn com.vn edu.vn gov.vn health.vn info.vn int.vn name.vn net.vn org.vn pro.vn
+util_rb_2tld ch.vu com.vu de.vu edu.vu fr.vu net.vu org.vu
+util_rb_2tld com.ws edu.ws gov.ws net.ws org.ws
+util_rb_2tld com.ye edu.ye gov.ye mil.ye net.ye org.ye
+util_rb_2tld ac.za alt.za bourse.za city.za co.za edu.za gov.za law.za mil.za net.za ngo.za nom.za org.za school.za tm.za web.za
+util_rb_2tld ac.zm co.zm  com.zm edu.zm gov.zm org.zm sch.zm
+util_rb_2tld ac.zw co.zw gov.zw org.zw
+#
+util_rb_2tld 110mb.com
+util_rb_2tld 9k.com
+util_rb_2tld addr.com
+util_rb_2tld altervista.org
+util_rb_2tld biz.tm
+util_rb_2tld blogger.ca
+util_rb_2tld blogger.cf
+util_rb_2tld blogger.ch
+util_rb_2tld blogspot.com
+util_rb_2tld blogger.cv
+util_rb_2tld blogger.jp
+util_rb_2tld blogger.pl
+util_rb_2tld blogger.re
+util_rb_2tld blogger.se
+util_rb_2tld blogspot.ca
+util_rb_2tld blogspot.cv
+util_rb_2tld blogspot.de
+util_rb_2tld blogspot.fr
+util_rb_2tld blogspot.in
+util_rb_2tld blogspot.it
+util_rb_2tld blogspot.jp
+util_rb_2tld blogspot.mx
+util_rb_2tld blogspot.pt
+util_rb_2tld blogspot.re
+util_rb_2tld blogspot.se
+util_rb_2tld bravehost.com
+util_rb_2tld bravejournal.com
+util_rb_2tld by.ru
+util_rb_2tld chat.ru
+util_rb_2tld cjb.net
+util_rb_2tld es.tl
+util_rb_2tld extra.hu
+util_rb_2tld freehostia.com
+util_rb_2tld front.ru
+util_rb_2tld geocities.com
+util_rb_2tld getmyip.com
+util_rb_2tld googlepages.com
+util_rb_2tld helloweb.eu
+util_rb_2tld host.sk
+util_rb_2tld hotbox.ru
+util_rb_2tld hotmail.ru
+util_rb_2tld hu2.ru
+util_rb_2tld hut2.ru
+util_rb_2tld iblogger.org
+util_rb_2tld ic.cz
+util_rb_2tld id.ru
+util_rb_2tld kwik.to
+util_rb_2tld land.ru
+util_rb_2tld mine.nu
+util_rb_2tld mooo.com
+util_rb_2tld narod.ru
+util_rb_2tld netsolhost.com
+util_rb_2tld na.by
+util_rb_2tld newmail.ru
+util_rb_2tld nextmail.ru
+util_rb_2tld nightmail.ru
+util_rb_2tld nm.ru
+util_rb_2tld notlong.com
+util_rb_2tld page.tl
+util_rb_2tld pochta.ru
+util_rb_2tld pochtamt.ru
+util_rb_2tld pop3.ru
+util_rb_2tld proboards.com
+util_rb_2tld rbcmail.ru
+util_rb_2tld rm.ru
+util_rb_2tld smtp.ru
+util_rb_2tld sol.ru
+util_rb_2tld t35.com
+util_rb_2tld tripod.com
+util_rb_2tld uk.to
+util_rb_2tld unblog.fr
+util_rb_2tld us.to
+util_rb_2tld web-soft.ru
+util_rb_2tld wz.cz
+util_rb_2tld zmail.ru
+util_rb_2tld t35.net
+util_rb_2tld t35.com
+util_rb_2tld wordpress.com
+util_rb_2tld jino-net.ru
+util_rb_2tld 6a.org
+util_rb_2tld xf.cz
+util_rb_2tld fr.tc
+util_rb_2tld googlegroups.com
+util_rb_2tld 150m.com
+util_rb_2tld bravepages.com
+util_rb_2tld ucoz.ru
+util_rb_2tld ucoz.com
+util_rb_2tld ucoz.net
+util_rb_2tld szm.com
+util_rb_2tld geocities.jp
+util_rb_2tld gmxhome.de
+util_rb_2tld freeservercity.com
+util_rb_2tld iquebec.com
+util_rb_2tld mail2k.ru
+util_rb_2tld mail.ru
+util_rb_2tld ath.cx
+util_rb_2tld go.ro
+util_rb_2tld z8.ru
+util_rb_2tld appspot.com
+util_rb_2tld gigazu.net
+util_rb_2tld weebly.com
+util_rb_2tld ifrance.com
+util_rb_2tld jimdo.com
+util_rb_2tld kimsufi.com
+util_rb_2tld mail333.su
+util_rb_2tld pisem.su
+util_rb_2tld mail15.su
+util_rb_2tld prserv.net
+util_rb_2tld angelfire.com
+util_rb_2tld 163.to
+util_rb_2tld home.pl
+util_rb_2tld redirectme.net
+util_rb_2tld interia.pl
+util_rb_2tld co.kg
+util_rb_2tld ning.com
+util_rb_2tld xorg.pl
+util_rb_2tld free.fr
+util_rb_2tld we.bs
+util_rb_2tld net.tc
+util_rb_2tld isuisse.com
+util_rb_2tld de.ki
+util_rb_2tld funpic.de
+util_rb_2tld interii.pl
+util_rb_2tld selfip.com
+#util_rb_2tld livejournal.com - Removed per bug 6662 4/7/15 - KAM
+util_rb_2tld t3.to
+util_rb_2tld fx.to
+util_rb_2tld iespana.es
+util_rb_2tld go.com
+util_rb_2tld hostevo.com
+util_rb_2tld iwebsource.com
+util_rb_2tld one.pl
+util_rb_2tld gratishost.com
+util_rb_2tld netfirms.com
+util_rb_2tld ibelgique.com
+util_rb_2tld to.it
+util_rb_2tld whsites.net
+util_rb_2tld home.ro
+util_rb_2tld 1blu.de
+util_rb_2tld co.cc
+util_rb_2tld cc.cc
+util_rb_2tld webs.com
+util_rb_2tld webcindario.com
+util_rb_2tld idoo.com
+util_rb_2tld selfip.net
+util_rb_2tld ovh.net
+util_rb_2tld sapo.pt
+util_rb_2tld homeip.net
+util_rb_2tld unlugar.com
+util_rb_2tld nov.ru
+util_rb_2tld republika.pl
+util_rb_2tld blog.com
+util_rb_2tld sosblog.com
+util_rb_2tld servebbs.com
+util_rb_2tld serveftp.com
+util_rb_2tld gob.ve
+util_rb_2tld xanga.com
+util_rb_2tld com.vc
+util_rb_2tld net.vc
+util_rb_2tld org.vc
+util_rb_2tld kickme.to
+util_rb_2tld asso.ws
+util_rb_2tld url.st
+util_rb_2tld at.pn
+util_rb_2tld au.pn
+util_rb_2tld ca.pn
+util_rb_2tld ch.pn
+util_rb_2tld cn.pn
+util_rb_2tld co.pn
+util_rb_2tld corp.st
+util_rb_2tld societe.st
+util_rb_2tld de.pn
+util_rb_2tld es.pn
+util_rb_2tld eu.pn
+util_rb_2tld euro.tm
+util_rb_2tld fr.pn
+util_rb_2tld gov.pn
+util_rb_2tld government.pn
+util_rb_2tld it.pn
+util_rb_2tld jp.pn
+util_rb_2tld perso.tc
+util_rb_2tld site.tc
+util_rb_2tld societe.st
+util_rb_2tld url.st
+util_rb_2tld blog.ru
+util_rb_2tld eu.tc
+util_rb_2tld us.tc
+util_rb_2tld pro.tc
+util_rb_2tld de.tc
+util_rb_2tld at.tc
+util_rb_2tld it.tc
+util_rb_2tld es.tc
+util_rb_2tld ru.tc
+util_rb_2tld se.tc
+util_rb_2tld dk.tc
+util_rb_2tld be.tc
+util_rb_2tld no.tc
+util_rb_2tld int.tc
+util_rb_2tld pl.tc
+util_rb_2tld bg.tc
+util_rb_2tld cz.tc
+util_rb_2tld mx.tc
+util_rb_2tld br.tc
+util_rb_2tld hk.tc
+util_rb_2tld kr.tc
+util_rb_2tld th.tc
+util_rb_2tld ph.tc
+util_rb_2tld at.lv
+util_rb_2tld de.lv
+util_rb_2tld ch.lv
+util_rb_2tld org.rw
+util_rb_2tld myvnc.com
+util_rb_2tld blog4ever.com
+util_rb_2tld sytes.net
+util_rb_2tld multiply.com
+util_rb_2tld 80.hk
+util_rb_2tld shutterfly.com
+util_rb_2tld chez.com
+util_rb_2tld ce.ms
+util_rb_2tld zapto.org
+util_rb_2tld cz.cc
+util_rb_2tld fromru.su
+util_rb_2tld krovatka.su
+util_rb_2tld pochta.com
+util_rb_2tld 5ballov.ru
+util_rb_2tld usa.cc
+util_rb_2tld jpn.com
+util_rb_2tld yolasite.com
+util_rb_2tld in.net
+util_rb_2tld com.de
+util_rb_2tld biz.ua
+util_rb_2tld azurewebsites.net
+util_rb_2tld azureedge.net
+util_rb_2tld zohosites.com
+util_rb_2tld wixsite.com
+#
+util_rb_2tld neostrada.pl
+util_rb_2tld vv.cc
+util_rb_2tld co.be
+util_rb_2tld uni.cc
+util_rb_2tld shop.co
+util_rb_2tld tumblr.com
+util_rb_2tld fileave.com
+util_rb_2tld de.tl
+util_rb_2tld co.com
+# Dyndns.com
+util_rb_2tld dyndns-at-home.com
+util_rb_2tld dyndns-at-work.com
+util_rb_2tld dyndns-blog.com
+util_rb_2tld dyndns-free.com
+util_rb_2tld dyndns-home.com
+util_rb_2tld dyndns-ip.com
+util_rb_2tld dyndns-mail.com
+util_rb_2tld dyndns-office.com
+util_rb_2tld dyndns-pics.com
+util_rb_2tld dyndns-remote.com
+util_rb_2tld dyndns-server.com
+util_rb_2tld dyndns-web.com
+util_rb_2tld dyndns-wiki.com
+util_rb_2tld dyndns-work.com
+util_rb_2tld dyndns.biz
+util_rb_2tld dyndns.info
+util_rb_2tld dyndns.org
+util_rb_2tld dyndns.tv
+util_rb_2tld dyndns.dk
+util_rb_2tld dyndns.ws
+util_rb_2tld mydyndns.org
+util_rb_2tld qip.ru
+#
+util_rb_2tld no-ip.biz
+util_rb_2tld no-ip.ca
+util_rb_2tld no-ip.com
+util_rb_2tld no-ip.info
+util_rb_2tld no-ip.net
+util_rb_2tld no-ip.org
+#
+util_rb_2tld gotdns.ch
+util_rb_2tld ddnsking.com
+util_rb_2tld ddns.net
+util_rb_2tld bounceme.net
+util_rb_2tld hopto.org
+util_rb_2tld serveblog.net
+util_rb_2tld myftp.org
+util_rb_2tld myftp.biz
+
+
+#
+# 3rd level TLD list (SA 3.3+)
+#
+# There was a bug before 3.4.1(?), only one 3TLD per line works!
+#
+
+if (version >= 3.003000)
+
+util_rb_3tld demon.co.uk
+util_rb_3tld esc.edu.ar
+util_rb_3tld lkd.co.im
+util_rb_3tld plc.co.im
+util_rb_3tld ltd.co.im
+#
+util_rb_3tld bay.livefilestore.com
+util_rb_3tld blu.livefilestore.com
+util_rb_3tld groups.live.com
+util_rb_3tld spaces.live.com
+util_rb_3tld profile.live.com
+util_rb_3tld web.aplus.net
+util_rb_3tld cloud.prohosting.com
+util_rb_3tld skydrive.live.com
+util_rb_3tld docs.google.com
+util_rb_3tld spaces.msn.com
+util_rb_3tld blog.friendster.com
+util_rb_3tld plc.co.im
+util_rb_3tld ltd.co.im
+util_rb_3tld sakura.ne.jp
+util_rb_3tld web.officelive.com
+util_rb_3tld com.sapo.pt
+util_rb_3tld paginas.sapo.pt
+util_rb_3tld no.sapo.pt
+util_rb_3tld home.sapo.pt
+util_rb_3tld do.sapo.pt
+util_rb_3tld homepage.t-online.de
+util_rb_3tld privat.t-online.de
+util_rb_3tld web.fc2.com
+util_rb_3tld co.uk.pn
+util_rb_3tld com.au.pn
+util_rb_3tld co.at.pn
+util_rb_3tld co.at.lv
+util_rb_3tld or.at.lv
+util_rb_3tld co.at.tc
+util_rb_3tld qld.edu.au
+util_rb_3tld perso.neuf.fr
+util_rb_3tld perso.sfr.fr
+util_rb_3tld hop.clickbank.net
+util_rb_3tld user.icpnet.pl
+util_rb_3tld en.alibaba.com
+#
+util_rb_3tld blogspot.co.nz
+util_rb_3tld blogspot.co.uk
+util_rb_3tld blogspot.com.ar
+util_rb_3tld blogspot.com.au
+util_rb_3tld blogspot.com.br
+util_rb_3tld blogspot.com.es
+#
+util_rb_3tld no-ip.co.uk
+#
+util_rb_3tld mobile.web.tr
+
+endif
+
+
diff -Nru spamassassin-3.4.0/rules/active.list spamassassin-3.4.2/rules/active.list
--- spamassassin-3.4.0/rules/active.list	2014-02-07 03:36:32.000000000 -0500
+++ spamassassin-3.4.2/rules/active.list	2018-09-05 08:12:59.000000000 -0400
@@ -1,83 +1,80 @@
 # active ruleset list, automatically generated from http://ruleqa.spamassassin.org/
-# with results from: day 1: axb-8mile axb-coi-bulk axb-generic axb-ham-misc axb-sa-users axb-trash bb-guenther_fraud bb-jhardin bb-jhardin_fraud bb-jm bb-kmcgrail bb-zmi bernie-fsf bernie-it_batt bpoliakoff grenier jarif kpg-core mas-cps mas-mas zmi; day 2: axb-8mile axb-coi-bulk axb-generic axb-ham-misc axb-sa-users axb-trash bernie-fsf bernie-it_batt bpoliakoff grenier jarif kpg-core llanga mas-cps mas-mas zmi; day 3: axb-8mile axb-coi-bulk axb-generic axb-ham-misc axb-sa-users bb-guenther_fraud bb-jhardin bb-jhardin_fraud bb-jm bb-kmcgrail bb-zmi bernie-fsf bernie-it_batt bpoliakoff grenier jarif kpg-core llanga mas-cps mas-mas zmi
+# with results from: day 1: axb-coi-bulk axb-generic axb-ham-misc axb-ninja darxus ena-week0 ena-week1 ena-week2 ena-week3 ena-week4 giovanni grenier jarif jbrooks mmiroslaw-mails-ham mmiroslaw-mails-spam sihde thendrikx; day 2: axb-coi-bulk axb-generic axb-ham-misc axb-ninja ena-week2 hege llanga mmiroslaw-mails-ham mmiroslaw-mails-spam; day 3: axb-coi-bulk axb-generic axb-ham-misc axb-ninja ena-week0 ena-week1 ena-week2 ena-week3 ena-week4 jbrooks llanga mmiroslaw-mails-ham mmiroslaw-mails-spam sihde
 
 # tflags publish
-AC_HTML_NONSENSE_TAGS
+AC_BR_BONANZA
 
 # tflags publish
-ADVANCE_FEE_2_NEW_FORM
-
-# good enough
-ADVANCE_FEE_2_NEW_FRM_MNY
+AC_DIV_BONANZA
 
 # tflags publish
-ADVANCE_FEE_2_NEW_MONEY
+AC_HTML_NONSENSE_TAGS
 
 # tflags publish
-ADVANCE_FEE_3_NEW
+AC_SPAMMY_URI_PATTERNS1
 
 # tflags publish
-ADVANCE_FEE_3_NEW_FORM
+AC_SPAMMY_URI_PATTERNS10
 
-# good enough
-ADVANCE_FEE_3_NEW_FRM_MNY
+# tflags publish
+AC_SPAMMY_URI_PATTERNS11
 
 # tflags publish
-ADVANCE_FEE_3_NEW_MONEY
+AC_SPAMMY_URI_PATTERNS12
 
 # tflags publish
-ADVANCE_FEE_4_NEW
+AC_SPAMMY_URI_PATTERNS2
 
-# good enough
-ADVANCE_FEE_4_NEW_FORM
+# tflags publish
+AC_SPAMMY_URI_PATTERNS3
 
-# good enough
-ADVANCE_FEE_4_NEW_FRM_MNY
+# tflags publish
+AC_SPAMMY_URI_PATTERNS4
 
-# good enough
-ADVANCE_FEE_4_NEW_MONEY
+# tflags publish
+AC_SPAMMY_URI_PATTERNS8
 
-# good enough
-ADVANCE_FEE_5_NEW
+# tflags publish
+AC_SPAMMY_URI_PATTERNS9
 
-# good enough
-ADVANCE_FEE_5_NEW_FORM
+# tflags publish
+ADMAIL
 
-# good enough
-ADVANCE_FEE_5_NEW_FRM_MNY
+# tflags publish
+ADVANCE_FEE_2_NEW_FORM
 
-# good enough
-ADVANCE_FEE_5_NEW_MONEY
+# tflags publish
+ADVANCE_FEE_2_NEW_MONEY
 
-# tflags userconf
-ALL_TRUSTED
+# tflags publish
+ADVANCE_FEE_3_NEW
 
-# good enough
-AXB_3LITTLE_PIGS
+# tflags publish
+ADVANCE_FEE_3_NEW_FORM
 
-# good enough
-AXB_BODYMAIL_SBL112884
+# tflags publish
+ADVANCE_FEE_3_NEW_MONEY
 
-# good enough
-AXB_ONMS_LEAKS
+# tflags publish
+ADVANCE_FEE_4_NEW
 
 # good enough
-AXB_XMAILER_MIMEOLE_OL_024C2
+ADVANCE_FEE_5_NEW_MONEY
 
-# good enough
-AXB_XMAILER_MIMEOLE_OL_1ECD5
+# tflags publish
+AD_PREFS
 
-# good enough
-AXB_XMA_BASP
+# tflags userconf
+ALL_TRUSTED
 
-# good enough
-AXB_XM_FORGED_OL2600
+# tflags publish
+APP_DEVELOPMENT_FREEM
 
-# good enough
-AXB_X_FF_SEZ_S
+# tflags publish
+APP_DEVELOPMENT_NORDNS
 
 # good enough
-BANKING_LAWS
+AXB_XMAILER_MIMEOLE_OL_024C2
 
 # tflags learn
 BAYES_00
@@ -106,20 +103,23 @@
 # tflags learn
 BAYES_99
 
-# good enough
-BIGNUM_EMAILS
+# tflags learn
+BAYES_999
 
 # good enough
-BILLION_OVERLAP
+BODY_SINGLE_WORD
 
-# good enough
-BITLY_URI
+# tflags publish
+BODY_URI_ONLY
 
-# good enough
-BODY_EMPTY
+# tflags publish
+BOGUS_MSM_HDRS
 
 # good enough
-BUG6152_INVALID_DATE_TZ_ABSURD
+BTC_ORG
+
+# tflags publish
+CANT_SEE_AD
 
 # tflags userconf
 CHARSET_FARAWAY
@@ -133,34 +133,16 @@
 # good enough
 CK_HELO_GENERIC
 
-# good enough
+# tflags publish
 CN_B2B_SPAMMER
 
-# good enough
+# tflags publish
 COMMENT_GIBBERISH
 
-# good enough
-COMPENSATION
-
 # tflags publish
 CORRUPT_FROM_LINE_IN_HDRS
 
 # good enough
-DATE_DOTS
-
-# good enough
-DATE_IN_FUTURE_96_Q
-
-# good enough
-DATE_IN_FUTURE_Q_PLUS
-
-# good enough
-DEAR_BENEFICIARY
-
-# good enough
-DEAR_EMAIL_USER
-
-# good enough
 DEAR_WINNER
 
 # tflags net
@@ -199,9 +181,6 @@
 # tflags net
 DKIM_VALID_AU
 
-# tflags net
-DNS_FROM_AHBL_RHSBL
-
 # tflags publish
 DOS_ANAL_SPAM_MAILER
 
@@ -209,64 +188,70 @@
 DOS_OE_TO_MX
 
 # good enough
-DSN_NO_MIMEVERSION
+DOS_OUTLOOK_TO_MX
 
 # tflags publish
-EMAIL_URI_PHISH
+DX_TEXT_02
+
+# tflags publish
+DX_TEXT_03
 
 # good enough
-EMRCP
+DYN_RDNS_AND_INLINE_IMAGE
+
+# tflags publish
+ENCRYPTED_MESSAGE
 
 # tflags userconf
 ENV_AND_HDR_SPF_MATCH
 
 # good enough
+FAKE_REPLY_C
+
+# tflags publish
 FBI_MONEY
 
-# good enough
+# tflags publish
 FBI_SPOOF
 
-# good enough
-FH_FAKE_RCVD_LINE
-
-# good enough
-FH_FROM_START_YOU
+# tflags publish
+FILL_THIS_FORM
 
-# good enough
-FH_HELO_ALMOST_IP
+# tflags publish
+FORM_FRAUD
 
-# good enough
-FH_HOST_EQ_DYNAMICIP
+# tflags publish
+FORM_FRAUD_3
 
 # tflags publish
-FILL_THIS_FORM
+FORM_FRAUD_5
 
-# good enough
-FILL_THIS_FORM_FRAUD_PHISH
+# tflags publish
+FORM_LOW_CONTRAST
 
-# good enough
-FILL_THIS_FORM_LOAN
+# tflags publish
+FOUND_YOU
 
-# good enough
-FILL_THIS_FORM_LONG
+# tflags userconf
+FRAGMENTED_MESSAGE
 
 # good enough
-FM_LOTTO_MONEY
+FREEMAIL_DISPTO
 
-# good enough
-FM_LOTTO_YOU_WON
+# tflags publish
+FREEMAIL_FORGED_FROMDOMAIN
 
 # tflags publish
-FORM_FRAUD_3
+FREEM_FRNUM_UNICD_EMPTY
 
 # tflags publish
-FORM_FRAUD_5
+FRNAME_IN_MSG_NO_SUBJ
 
-# tflags userconf
-FRAGMENTED_MESSAGE
+# tflags publish
+FRNAME_IN_MSG_XPRIO
 
-# good enough
-FROM_12LTRDOM
+# tflags publish
+FROM_ADDR_WS
 
 # tflags userconf
 FROM_DOMAIN_NOVOWEL
@@ -278,12 +263,6 @@
 FROM_LOCAL_NOVOWEL
 
 # good enough
-FROM_MISSPACED
-
-# good enough
-FROM_MISSP_DYNIP
-
-# good enough
 FROM_MISSP_EH_MATCH
 
 # good enough
@@ -302,49 +281,67 @@
 FROM_MISSP_SPF_FAIL
 
 # good enough
-FROM_MISSP_TO_UNDISC
-
-# good enough
-FROM_MISSP_USER
+FROM_MISSP_XPRIO
 
-# good enough
-FROM_WSP_LEAD
+# tflags publish
+FROM_WORDY
 
-# good enough
-FR_ALMOST_VIAG2
+# tflags publish
+FROM_WORDY_SHORT
 
 # good enough
 FSL_CTYPE_WIN1251
 
 # good enough
-FSL_FAKE_HOTMAIL_RVCD
+FSL_HELO_BARE_IP_1
 
 # good enough
-FSL_HELO_BARE_IP_2
+FSL_HELO_FAKE
 
-# good enough
-FSL_HELO_DEVICE
+# tflags publish
+FSL_NEW_HELO_USER
 
-# good enough
-FSL_HELO_FAKE
+# tflags publish
+FUZZY_ANDROID
 
-# good enough
-FSL_HELO_FIREWALL
+# tflags publish
+FUZZY_BITCOIN
 
-# good enough
-FSL_MID_419
+# tflags publish
+FUZZY_BROWSER
 
-# good enough
-FSL_MISSP_REPLYTO
+# tflags publish
+FUZZY_BTC_WALLET
 
-# good enough
-FSL_NEW_HELO_USER
+# tflags publish
+FUZZY_CLICK_HERE
 
-# good enough
-FS_CHEAP_CAP
+# tflags publish
+FUZZY_DR_OZ
 
-# good enough
-FU_ENDS_SG
+# tflags publish
+FUZZY_IMPORTANT
+
+# tflags publish
+FUZZY_PRIVACY
+
+# tflags publish
+FUZZY_PROMOTION
+
+# tflags publish
+FUZZY_SAVINGS
+
+# tflags publish
+FUZZY_SECURITY
+
+# tflags publish
+FUZZY_UNSUBSCRIBE
+
+# tflags publish
+FUZZY_WALLET
+
+# tflags publish
+GAPPY_SALES_LEADS_FREEM
 
 # tflags publish
 GOOGLE_DOCS_PHISH
@@ -352,6 +349,12 @@
 # tflags publish
 GOOGLE_DOCS_PHISH_MANY
 
+# tflags publish
+GOOG_MALWARE_DNLD
+
+# tflags publish
+GOOG_REDIR_SHORT
+
 # tflags userconf
 GTUBE
 
@@ -379,103 +382,88 @@
 # tflags userconf
 HASHCASH_HIGH
 
-# tflags userconf
-HEAD_LONG
-
 # good enough
-HK_LOTTO
+HDRS_MISSP
 
-# good enough
-HK_NAME_DRUGS
+# tflags publish
+HDR_ORDER_FTSDMCXX_DIRECT
 
-# good enough
-HK_NAME_FM_DR
+# tflags publish
+HDR_ORDER_FTSDMCXX_NORDNS
 
-# good enough
-HK_NAME_FM_FROM
+# tflags publish
+HEADER_FROM_DIFFERENT_DOMAINS
 
-# good enough
-HK_NAME_FM_MR_MRS
+# tflags userconf
+HEAD_LONG
 
 # good enough
-HK_NAME_FROM
+HELO_LOCALHOST
 
 # good enough
-HK_NAME_MR_MRS
+HELO_MISC_IP
 
-# good enough
-HK_SCAM_N1
+# tflags publish
+HEXHASH_WORD
 
 # good enough
-HK_SCAM_N13
+HK_NAME_FM_DR
 
 # good enough
-HK_SCAM_N15
+HK_NAME_FM_MR_MRS
 
 # good enough
 HK_SCAM_N2
 
 # good enough
-HK_SCAM_N3
-
-# good enough
 HK_SCAM_N8
 
-# good enough
-HK_SCAM_S15
-
-# good enough
-HK_SCAM_S25
-
-# good enough
-HK_SCAM_S7
-
-# good enough
-HK_SPAMMY_FILENAME
-
 # tflags userconf
 HTML_CHARSET_FARAWAY
 
-# good enough
-KB_DATE_CONTAINS_TAB
+# tflags publish
+HTML_OFF_PAGE
 
-# good enough
-KB_FAKED_THE_BAT
+# tflags publish
+IMG_ONLY_FM_DOM_INFO
 
-# good enough
-KB_RATWARE_MSGID
+# tflags publish
+LIST_PRTL_PUMPDUMP
 
-# good enough
-KHOP_BIG_TO_CC
+# tflags publish
+LIST_PRTL_SAME_USER
 
 # tflags publish
-LOTS_OF_MONEY
+LONG_HEX_URI
 
-# good enough
-LOTTERY_PH_004470
+# tflags publish
+LONG_IMG_URI
 
-# good enough
-LOTTO_AGENT
+# tflags publish
+LOTS_OF_MONEY
 
-# good enough
-LOTTO_AGENT_RPLY
+# tflags publish
+LUCRATIVE
 
-# good enough
-LOTTO_DEPT
+# tflags publish
+MALF_HTML_B64
 
 # tflags publish
 MANY_SPAN_IN_TEXT
 
+# tflags publish
+MIMEOLE_DIRECT_TO_MX
+
 # tflags userconf
 MIME_CHARSET_FARAWAY
 
+# tflags publish
+MIME_NO_TEXT
+
 # tflags userconf
 MISSING_HB_SEP
 
 # good enough
-MONEY_ATM_CARD
-
-# good enough
 MONEY_FORM
 
 # good enough
@@ -487,14 +475,17 @@
 # tflags publish
 MONEY_FRAUD_5
 
+# tflags publish
+MONEY_FRAUD_8
+
 # good enough
 MONEY_FROM_41
 
 # good enough
 MONEY_FROM_MISSP
 
-# good enough
-MSGID_NOFQDN1
+# tflags publish
+MSM_PRIO_REPTO
 
 # good enough
 MSOE_MID_WRONG_CASE
@@ -502,21 +493,15 @@
 # tflags net
 NO_DNS_FOR_FROM
 
+# tflags publish
+NO_FM_NAME_IP_HOSTN
+
 # tflags userconf
 NO_RECEIVED
 
 # tflags userconf
 NO_RELAYS
 
-# good enough
-NSL_RCVD_FROM_USER
-
-# good enough
-NSL_RCVD_HELO_USER
-
-# good enough
-OBFU_ATTACH_MISSP
-
 # tflags publish
 OBFU_JVSCR_ESC
 
@@ -524,23 +509,53 @@
 OBFU_TEXT_ATTACH
 
 # good enough
+PHOTO_EDITING_FREEM
+
+# tflags publish
 PHP_NOVER_MUA
 
+# tflags publish
+PHP_ORIG_SCRIPT
+
+# tflags publish
+PHP_SCRIPT_MUA
+
+# tflags publish
+PP_MIME_FAKE_ASCII_TEXT
+
+# tflags publish
+PP_TOO_MUCH_UNICODE02
+
+# tflags publish
+PP_TOO_MUCH_UNICODE05
+
+# tflags publish
+PUMPDUMP
+
+# tflags publish
+PUMPDUMP_MULTI
+
+# tflags publish
+PUMPDUMP_TIP
+
 # tflags net
 PYZOR_CHECK
 
-# tflags net
-RAZOR2_CF_RANGE_51_100
+# tflags publish
+RAND_HEADER_MANY
 
-# tflags net
-RAZOR2_CF_RANGE_E4_51_100
+# good enough
+RATWARE_NO_RDNS
 
 # tflags net
-RAZOR2_CF_RANGE_E8_51_100
+RAZOR2_CF_RANGE_51_100
 
 # tflags net
 RAZOR2_CHECK
 
+# tflags publish
+RCVD_DBL_DQ
+
 # tflags net
 RCVD_IN_BL_SPAMCOP_NET
 
@@ -710,6 +725,9 @@
 RCVD_IN_SBL
 
 # tflags net
+RCVD_IN_SBL_CSS
+
+# tflags net
 RCVD_IN_SORBS_BLOCK
 
 # tflags net
@@ -736,26 +754,23 @@
 # tflags net
 RCVD_IN_XBL
 
-# good enough
-REPLYTO_WITHOUT_TO_CC
-
-# good enough
-RISK_FREE
+# tflags publish
+RDNS_NUM_TLD_ATCHNX
 
-# good enough
-RP_MATCHES_RCVD
+# tflags publish
+RDNS_NUM_TLD_XM
 
 # good enough
-SHARE_50_50
+REPLYTO_WITHOUT_TO_CC
 
 # good enough
-SHORT_HELO_AND_INLINE_IMAGE
+SERGIO_SUBJECT_PORN014
 
 # good enough
-SINGLE_HEADER_3K
+SHORTENED_URL_SRC
 
-# good enough
-SINGLE_HEADER_4K
+# tflags publish
+SINGLETS_LOW_CONTRAST
 
 # tflags net
 SPF_FAIL
@@ -781,7 +796,25 @@
 # tflags net
 SPF_SOFTFAIL
 
-# good enough
+# tflags publish
+SPOOFED_FREEM_REPTO
+
+# tflags publish
+SPOOFED_FREEM_REPTO_CHN
+
+# tflags publish
+SPOOFED_FREEM_REPTO_RUS
+
+# tflags publish
+STATIC_XPRIO_OLE
+
+# tflags publish
+STOCK_LOW_CONTRAST
+
+# tflags publish
+STOCK_TIP
+
+# tflags publish
 STYLE_GIBBERISH
 
 # tflags userconf
@@ -790,74 +823,143 @@
 # tflags userconf
 SUBJECT_IN_WHITELIST
 
-# good enough
-SUBJ_ATTENTION
+# tflags net
+SURBL_BLOCKED
 
-# good enough
-TAB_IN_FROM
+# tflags publish
+SYSADMIN
+
+# tflags publish
+TEQF_USR_IMAGE
+
+# tflags publish
+TEQF_USR_MSGID_HEX
+
+# tflags publish
+TEQF_USR_MSGID_MALF
+
+# tflags publish
+THIS_AD
 
 # tflags net
 TO_EQ_FM_DOM_SPF_FAIL
 
-# good enough
-TO_EQ_FM_HTML_ONLY
-
 # tflags net
 TO_EQ_FM_SPF_FAIL
 
-# good enough
+# tflags publish
 TO_IN_SUBJ
 
+# tflags publish
+TO_NAME_SUBJ_NO_RDNS
+
 # good enough
 TO_NO_BRKTS_FROM_MSSP
 
+# tflags publish
+TO_NO_BRKTS_HTML_IMG
+
+# tflags publish
+TO_NO_BRKTS_HTML_ONLY
+
 # good enough
 TO_NO_BRKTS_MSFT
 
-# good enough
+# tflags publish
+TO_NO_BRKTS_NORDNS_HTML
+
+# tflags publish
 TO_NO_BRKTS_PCNT
 
 # good enough
-TT_MSGID_TRUNC
+TVD_RCVD_IP
+
+# good enough
+TVD_SPACE_ENCODED
 
 # good enough
-TVD_APPROVED
+TVD_VISIT_PHARMA
+
+# tflags publish
+TW_GIBBERISH_MANY
+
+# good enough
+ADVANCE_FEE_3_NEW_FRM_MNY
 
 # good enough
-TVD_FINGER_02
+ADVANCE_FEE_5_NEW_FRM_MNY
 
 # good enough
-TVD_FROM_1
+AXB_XMAILER_MIMEOLE_OL_1ECD5
 
 # good enough
-TVD_PH_BODY_META
+BIGNUM_EMAILS
 
 # good enough
-TVD_PH_REC
+BODY_EMPTY
 
 # good enough
-TVD_RCVD_IP
+BODY_SINGLE_URI
 
 # good enough
-BODY_URI_ONLY
+DATE_IN_FUTURE_96_Q
+
+# good enough
+DEAR_BENEFICIARY
+
+# tflags net
+DKIMWL_BL
+
+# tflags net
+DKIMWL_WL_HIGH
+
+# tflags net
+DKIMWL_WL_MED
+
+# good enough
+FILL_THIS_FORM_LONG
+
+# good enough
+FROM_MISSP_DYNIP
+
+# good enough
+FROM_MISSP_TO_UNDISC
+
+# good enough
+HDRS_LCASE
 
 # good enough
-DEAR_NOBODY
+HDRS_LCASE_IMGONLY
 
 # good enough
-FSL_MY_NAME_IS
+LOTTO_AGENT
+
+# good enough
+MONEY_ATM_CARD
+
+# good enough
+NSL_RCVD_HELO_USER
 
 # good enough
-HK_LOTTO_NAME
+SERGIO_SUBJECT_PORN011
 
 # good enough
-SINGLE_HEADER_2K
+SERGIO_SUBJECT_VIAGRA01
+
+# good enough
+TVD_SPACE_RATIO_MINFP
+
+# tflags publish
+UC_GIBBERISH_OBFU
+
+# good enough
+UNICODE_OBFU_DOM_NO_BODY
 
 # tflags userconf
 UNPARSEABLE_RELAY
 
 # tflags net
-URIBL_AB_SURBL
+URIBL_ABUSE_SURBL
 
 # tflags net
 URIBL_BLACK
@@ -866,19 +968,40 @@
 URIBL_BLOCKED
 
 # tflags net
+URIBL_CR_SURBL
+
+# tflags net
+URIBL_DBL_ABUSE_BOTCC
+
+# tflags net
+URIBL_DBL_ABUSE_MALW
+
+# tflags net
+URIBL_DBL_ABUSE_PHISH
+
+# tflags net
+URIBL_DBL_ABUSE_REDIR
+
+# tflags net
+URIBL_DBL_ABUSE_SPAM
+
+# tflags net
+URIBL_DBL_BOTNETCC
+
+# tflags net
 URIBL_DBL_ERROR
 
 # tflags net
-URIBL_DBL_REDIR
+URIBL_DBL_MALWARE
 
 # tflags net
-URIBL_DBL_SPAM
+URIBL_DBL_PHISH
 
 # tflags net
-URIBL_GREY
+URIBL_DBL_SPAM
 
 # tflags net
-URIBL_JP_SURBL
+URIBL_GREY
 
 # tflags net
 URIBL_MW_SURBL
@@ -899,14 +1022,59 @@
 URIBL_SBL_A
 
 # tflags net
-URIBL_SC_SURBL
-
-# tflags net
 URIBL_WS_SURBL
 
+# tflags publish
+URI_DATA
+
+# tflags publish
+URI_DQ_UNSUB
+
+# tflags publish
+URI_GOOGLE_PROXY
+
+# tflags userconf
+URI_HOST_IN_BLACKLIST
+
+# tflags userconf
+URI_HOST_IN_WHITELIST
+
 # tflags userconf
 URI_NOVOWEL
 
+# tflags publish
+URI_ONLY_MSGID_MALF
+
+# tflags publish
+URI_OPTOUT_3LD
+
+# tflags publish
+URI_OPTOUT_USME
+
+# tflags publish
+URI_PHISH
+
+# tflags publish
+URI_TRY_3LD
+
+# tflags publish
+URI_TRY_USME
+
+# tflags publish
+URI_WPADMIN
+
+# tflags publish
+URI_WP_DIRINDEX
+
+# tflags publish
+URI_WP_HACKED
+
+# tflags publish
+URI_WP_HACKED_2
+
+# tflags publish
+USB_DRIVES
+
 # tflags userconf
 USER_IN_ALL_SPAM_TO
 
@@ -940,17 +1108,23 @@
 # tflags userconf
 USER_IN_WHITELIST_TO
 
-# good enough
+# tflags publish
 XM_PHPMAILER_FORGED
 
+# tflags publish
+XPRIO
+
+# tflags publish
+XPRIO_SHORT_SUBJ
+
 # good enough
-YOUR_PERMISSION
+YOU_INHERIT
 
 # tflags net
 __DKIMDOMAIN_IN_DWL_ANY
 
-# tflags net
-__FROM_MISSP_DKIM
+# tflags publish
+__HTTP_REFRESH
 
 # tflags net
 __RCVD_IN_DNSWL
diff -Nru spamassassin-3.4.0/rules/local.cf spamassassin-3.4.2/rules/local.cf
--- spamassassin-3.4.0/rules/local.cf	2014-02-07 03:36:32.000000000 -0500
+++ spamassassin-3.4.2/rules/local.cf	2017-03-18 09:05:04.000000000 -0400
@@ -52,6 +52,11 @@
 # bayes_ignore_header X-Spam-Status
 
 
+#   Whether to decode non- UTF-8 and non-ASCII textual parts and recode
+#   them to UTF-8 before the text is given over to rules processing.
+#
+# normalize_charset 1
+
 #   Some shortcircuiting, if the plugin is enabled
 # 
 ifplugin Mail::SpamAssassin::Plugin::Shortcircuit
diff -Nru spamassassin-3.4.0/rules/v341.pre spamassassin-3.4.2/rules/v341.pre
--- spamassassin-3.4.0/rules/v341.pre	1969-12-31 19:00:00.000000000 -0500
+++ spamassassin-3.4.2/rules/v341.pre	2017-03-18 09:05:04.000000000 -0400
@@ -0,0 +1,28 @@
+# This is the right place to customize your installation of SpamAssassin.
+#
+# See 'perldoc Mail::SpamAssassin::Conf' for details of what can be
+# tweaked.
+#
+# This file was installed during the installation of SpamAssassin 3.4.1,
+# and contains plugin loading commands for the new plugins added in that
+# release.  It will not be overwritten during future SpamAssassin installs,
+# so you can modify it to enable some disabled-by-default plugins below,
+# if you so wish.
+#
+# There are now multiple files read to enable plugins in the
+# /etc/mail/spamassassin directory; previously only one, "init.pre" was
+# read.  Now both "init.pre", "v310.pre", and any other files ending in
+# ".pre" will be read.  As future releases are made, new plugins will be
+# added to new files, named according to the release they're added in.
+###########################################################################
+
+# TxRep - Reputation database that replaces AWL
+# loadplugin Mail::SpamAssassin::Plugin::TxRep
+
+# URILocalBL - Provides ISP and Country code based filtering as well as
+# quick IP based blocks without a full RBL implementation - Bug 7060
+
+# loadplugin Mail::SpamAssassin::Plugin::URILocalBL
+
+# PDFInfo - Use several methods to detect a PDF file's ham/spam traits
+# loadplugin Mail::SpamAssassin::Plugin::PDFInfo
diff -Nru spamassassin-3.4.0/rules/v342.pre spamassassin-3.4.2/rules/v342.pre
--- spamassassin-3.4.0/rules/v342.pre	1969-12-31 19:00:00.000000000 -0500
+++ spamassassin-3.4.2/rules/v342.pre	2018-08-31 23:55:41.000000000 -0400
@@ -0,0 +1,36 @@
+# This is the right place to customize your installation of SpamAssassin.
+#
+# See 'perldoc Mail::SpamAssassin::Conf' for details of what can be
+# tweaked.
+#
+# This file was installed during the installation of SpamAssassin 3.4.1,
+# and contains plugin loading commands for the new plugins added in that
+# release.  It will not be overwritten during future SpamAssassin installs,
+# so you can modify it to enable some disabled-by-default plugins below,
+# if you so wish.
+#
+# There are now multiple files read to enable plugins in the
+# /etc/mail/spamassassin directory; previously only one, "init.pre" was
+# read.  Now both "init.pre", "v310.pre", and any other files ending in
+# ".pre" will be read.  As future releases are made, new plugins will be
+# added to new files, named according to the release they're added in.
+###########################################################################
+
+# HashBL - Use EBL email blocklist
+# loadplugin Mail::SpamAssassin::Plugin::HashBL
+
+# ResourceLimits - assure your spamd child processes
+# do not exceed specified CPU or memory limit
+# loadplugin Mail::SpamAssassin::Plugin::ResourceLimits
+
+
+# FromNameSpoof - help stop spam that tries to spoof other domains using 
+# the from name
+# loadplugin Mail::SpamAssassin::Plugin::FromNameSpoof
+
+# Phishing - finds uris used in phishing campaigns detected by
+# OpenPhish or PhishTank feeds.
+# loadplugin Mail::SpamAssassin::Plugin::Phishing
+
+# allow URI rules to look at DKIM headers if they exist
+parse_dkim_uris 1
diff -Nru spamassassin-3.4.0/rules.README spamassassin-3.4.2/rules.README
--- spamassassin-3.4.0/rules.README	1969-12-31 19:00:00.000000000 -0500
+++ spamassassin-3.4.2/rules.README	2018-09-13 21:27:51.000000000 -0400
@@ -0,0 +1,33 @@
+From build/README:
+
+- Rule Source is only in trunk.  If you are building a branch, checkout
+  trunk as well and symlink it, i.e. rulesrc -> ../trunk/rulesrc/
+
+- t.rule Source is only in trunk.  If you are building a branch, checkout
+  trunk as well and symlink it, i.e. t.rules -> ../trunk/t.rules/
+
+- Rules are ONLY published from trunk.  Rule development should use plugin
+  and version conditions to make it so one ruleset works on all modern
+  versions of SA. If you are building a branch, checkout trunk as well and
+  symlink the rules from trunk, i.e. rules -> ../trunk/rules/
+
+  With the rules in trunk symlinked, you can expect MANIFEST warnings when
+  running things such as make distclean such as:
+
+    No such file: rules/20_aux_tlds.cf
+    No such file: rules/active.list
+    No such file: rules/init.pre
+    No such file: rules/languages
+    No such file: rules/local.cf
+    No such file: rules/regression_tests.cf
+    No such file: rules/sa-update-pubkey.txt
+    No such file: rules/user_prefs.template
+    No such file: rules/v310.pre
+    No such file: rules/v312.pre
+    No such file: rules/v320.pre
+    No such file: rules/v330.pre
+    No such file: rules/v340.pre
+    No such file: rules/v341.pre
+    No such file: rules/v342.pre
+
+  NOTE: Don't remove the lines from the MANIFEST though!
diff -Nru spamassassin-3.4.0/sa-awl.raw spamassassin-3.4.2/sa-awl.raw
--- spamassassin-3.4.0/sa-awl.raw	2014-02-07 03:36:38.000000000 -0500
+++ spamassassin-3.4.2/sa-awl.raw	2018-09-13 21:27:55.000000000 -0400
@@ -16,7 +16,7 @@
 
 BEGIN {                          # see comments in "spamassassin.raw" for doco
   my @bin = File::Spec->splitpath($0);
-  my $bin = ($bin[0] ? File::Spec->catpath(@bin[0..1]) : $bin[1])
+  my $bin = ($bin[0] ? File::Spec->catpath(@bin[0..1], '') : $bin[1])
             || File::Spec->curdir;
 
   if (-e $bin.'/lib/Mail/SpamAssassin.pm'
@@ -47,10 +47,11 @@
 
 use Fcntl;
 use Getopt::Long;
+use POSIX qw(locale_h setsid sigprocmask _exit);
 
-use vars qw(
-		$opt_clean $opt_min $opt_help
-	);
+POSIX::setlocale(LC_TIME,'C');
+
+our ( $opt_clean, $opt_min, $opt_help );
 
 GetOptions(
   'clean'		=> \$opt_clean,
diff -Nru spamassassin-3.4.0/sa-check_spamd.raw spamassassin-3.4.2/sa-check_spamd.raw
--- spamassassin-3.4.0/sa-check_spamd.raw	2014-02-07 03:36:38.000000000 -0500
+++ spamassassin-3.4.2/sa-check_spamd.raw	2018-09-13 21:27:51.000000000 -0400
@@ -37,10 +37,13 @@
 use Errno qw(EBADF);
 use File::Spec;
 use Config;
+use POSIX qw(locale_h setsid sigprocmask _exit);
+
+POSIX::setlocale(LC_TIME,'C');
 
 BEGIN {                          # see comments in "spamassassin.raw" for doco
   my @bin = File::Spec->splitpath($0);
-  my $bin = ($bin[0] ? File::Spec->catpath(@bin[0..1]) : $bin[1])
+  my $bin = ($bin[0] ? File::Spec->catpath(@bin[0..1], '') : $bin[1])
             || File::Spec->curdir;
 
   if (-e $bin.'/lib/Mail/SpamAssassin.pm'
@@ -419,21 +422,21 @@
 
 =over 4
 
-=item 0
+=item C<0>
 
 OK: A spamd ping response was received within all threshold times.
 
-=item 1
+=item C<1>
 
 WARNING: A spamd ping response exceeded the warning threshold but not the
 critical threshold.
 
-=item 2
+=item C<2>
 
 CRITICAL: A spamd ping response exceeded either the critical threshold or the
 timeout value.
 
-=item 3
+=item C<3>
 
 UNKNOWN: An error, probably caused by a missing dependency or an invalid
 configuration parameter being supplied, occurred in the sa-check_spamd program.
@@ -454,10 +457,12 @@
 
 Daryl C. W. O'Shea, DOS Technologies <spamassassin@dostech.ca>
 
-=head1 LICENSE
+=head1 COPYRIGHT AND LICENSE
 
 sa-check_spamd is distributed under the Apache License, Version 2.0, as
 described in the file C<LICENSE> included with the Apache SpamAssassin
 distribution and available at http://www.apache.org/licenses/LICENSE-2.0
 
+Copyright (C) 2015 The Apache Software Foundation
+
 =cut
diff -Nru spamassassin-3.4.0/sa-compile.raw spamassassin-3.4.2/sa-compile.raw
--- spamassassin-3.4.0/sa-compile.raw	2014-02-07 03:36:38.000000000 -0500
+++ spamassassin-3.4.2/sa-compile.raw	2018-09-13 21:27:51.000000000 -0400
@@ -25,15 +25,19 @@
 my $DEF_RULES_DIR   = '@@DEF_RULES_DIR@@';      # substituted at 'make' time
 my $LOCAL_RULES_DIR = '@@LOCAL_RULES_DIR@@';    # substituted at 'make' time
 my $LOCAL_STATE_DIR = '@@LOCAL_STATE_DIR@@';    # substituted at 'make' time
+my $RE2C_BIN        = '@@RE2C_BIN@@';           # substituted at 'make' time
 use lib '@@INSTALLSITELIB@@';                   # substituted at 'make' time
 
 use Errno qw(EBADF);
 use File::Spec;
 use Config;
+use POSIX qw(locale_h setsid sigprocmask _exit);
+
+POSIX::setlocale(LC_TIME,'C');
 
 BEGIN {                          # see comments in "spamassassin.raw" for doco
   my @bin = File::Spec->splitpath($0);
-  my $bin = ($bin[0] ? File::Spec->catpath(@bin[0..1]) : $bin[1])
+  my $bin = ($bin[0] ? File::Spec->catpath(@bin[0..1], '') : $bin[1])
             || File::Spec->curdir;
 
   if (-e $bin.'/lib/Mail/SpamAssassin.pm'
@@ -65,7 +69,7 @@
 use Pod::Usage;
 use Data::Dumper;
 
-use vars qw( %opt );
+our %opt;
 Mail::SpamAssassin::Util::clean_path_in_taint_mode();
 untaint_var( \%ENV );
 
@@ -108,8 +112,8 @@
     or die "error writing: $!";
   exit 1;
 }
-unless (qx(re2c -V)) {
-  print "$0 requires re2c for proper operation.\n"
+unless (qx($RE2C_BIN -V)) {
+  print "$0 requires $RE2C_BIN for proper operation.\n"
     or die "error writing: $!";
   exit 1;
 }
@@ -283,8 +287,8 @@
     run(get_perl()." Makefile.PL ".
           "PREFIX=$dirpath/ignored INSTALLSITEARCH=$installdir $log");
 
-    run("make $log");
-    run($sudo."make install $log");	# into $installdir
+    run($Config{make}." PREFIX=$dirpath/ignored INSTALLSITEARCH=$installdir $log"); #change to $Config{make}. bug 7294
+    run($sudo.$Config{make}." install PREFIX=$dirpath/ignored INSTALLSITEARCH=$installdir $log");	# into $installdir
 
     # and generate the bases.pl file, for perl consumers
 
@@ -451,13 +455,13 @@
   }
 
   for (1..$numscans) {
-    my $cmd = "re2c -i -b -o scanner$_.c scanner$_.re";
+    my $cmd = "$RE2C_BIN -i -b -o scanner$_.c scanner$_.re";
     if (!run($cmd)) {
       # this must be fatal; it can result in corrupt output modules missing
       # scannerN() functions
       my $cwd = `pwd`; chop $cwd;
       die "'$cmd' failed, dying!\n".
-          "Have you got a sufficiently-recent version of re2c?\n".
+          "Have you got a sufficiently-recent version of $RE2C_BIN?\n".
 	  "see $cwd/scanner$_.re\n";
     }
   }
@@ -602,14 +606,13 @@
 package $modname;
 
 use strict;
-use vars qw(\$VERSION \@ISA \@EXPORT_OK);
 
 use XSLoader ();
 
 BEGIN {
-\$VERSION = '1.0';
-\@ISA = qw(XSLoader);
-\@EXPORT_OK = qw();
+our \$VERSION = '1.0';
+our \@ISA = qw(XSLoader);
+our \@EXPORT_OK = qw();
 
 our \$HAS_RULES = {
   $has_rules
@@ -675,7 +678,7 @@
   -p prefs, --prefspath=file, --prefs-file=file
                                 Set user preferences file
   --siteconfigpath=path         Path for site configs
-                                (default: /etc/mail/spamassassin)
+                                (default: @@PREFIX@@/etc/mail/spamassassin)
   --updatedir=path              Directory to place updates
           (default: @@LOCAL_STATE_DIR@@/compiled/<perlversion>/@@VERSION@@)
   --cf='config line'            Additional line of configuration
@@ -806,10 +809,13 @@
 
 The Apache SpamAssassin(tm) Project <http://spamassassin.apache.org/>
 
-=head1 COPYRIGHT
+=head1 LICENSE AND COPYRIGHT
 
 SpamAssassin is distributed under the Apache License, Version 2.0, as
 described in the file C<LICENSE> included with the distribution.
 
+Copyright (C) 2015 The Apache Software Foundation
+
+
 =cut
 
diff -Nru spamassassin-3.4.0/sa-learn.raw spamassassin-3.4.2/sa-learn.raw
--- spamassassin-3.4.0/sa-learn.raw	2014-02-07 03:36:38.000000000 -0500
+++ spamassassin-3.4.2/sa-learn.raw	2018-09-13 21:27:56.000000000 -0400
@@ -17,19 +17,19 @@
 # </@LICENSE>
 
 use strict;
-use bytes;
+use warnings;
+# use bytes;
 
 use Errno qw(EBADF);
 use Getopt::Long;
 use Pod::Usage;
 use File::Spec;
+use POSIX qw(locale_h setsid sigprocmask _exit);
 
-use vars qw(
-  $spamtest %opt $isspam $forget
-  $messagecount $learnedcount $messagelimit
-  $progress $total_messages $init_results $start_time
-  $synconly $learnprob @targets $bayes_override_path
-);
+POSIX::setlocale(LC_TIME,'C');
+
+our ( $spamtest, %opt, $isspam, $forget, $messagecount, $learnedcount, $messagelimit, $progress,
+      $total_messages, $init_results, $start_time, $synconly, $learnprob, @targets, $bayes_override_path );
 
 my $PREFIX = '@@PREFIX@@';  # substituted at 'make' time
 my $DEF_RULES_DIR = '@@DEF_RULES_DIR@@';  # substituted at 'make' time
@@ -39,7 +39,7 @@
 
 BEGIN {                          # see comments in "spamassassin.raw" for doco
   my @bin = File::Spec->splitpath($0);
-  my $bin = ($bin[0] ? File::Spec->catpath(@bin[0..1]) : $bin[1])
+  my $bin = ($bin[0] ? File::Spec->catpath(@bin[0..1], '') : $bin[1])
             || File::Spec->curdir;
 
   if (-e $bin.'/lib/Mail/SpamAssassin.pm'
@@ -79,6 +79,7 @@
   'force-expire' => 0,
   'use-ignores'  => 0,
   'nosync'       => 0,
+  'quiet'        => 0,
   'cf'           => []
 );
 
@@ -94,6 +95,7 @@
   'sync'        => \$synconly,
   'rebuild'     => sub { $synconly = 1; warn "The --rebuild option has been deprecated.  Please use --sync instead.\n" },
 
+  'q|quiet'     => \$opt{'quiet'},
   'username|u=s'    => \$opt{'username'},
   'configpath|config-file|config-dir|c|C=s' => \$opt{'configpath'},
   'prefspath|prefs-file|p=s'                => \$opt{'prefspath'},
@@ -355,7 +357,7 @@
 if ($synconly) {
   $spamtest->rebuild_learner_caches(
     {
-      verbose  => 1,
+      verbose  => !$opt{'quiet'},
       showdots => $opt{'showdots'}
     }
   );
@@ -395,8 +397,11 @@
     for ($!=0; <F>; $!=0) {
       chomp;
       next if /^\s*$/;
-      if (/^(?:ham|spam):\w*:/) {
-        push ( @targets, $_ );
+      if (/^(ham|spam):(\w*):(.*)/) {
+        my $class  = $1;
+        my $format = $2 || "detect";
+        my $target = $3;
+        push ( @targets, "$class:$format:$target" );
       }
       else {
         target($_);
@@ -457,7 +462,7 @@
   my $iter = new Mail::SpamAssassin::ArchiveIterator(
     {
         # skip messages larger than max-size bytes,
-        # 0 for no limit, undef defaults to 256 KiB
+        # 0 for no limit, undef defaults to 256 KB
       'opt_max_size' => $opt{'max-size'},
       'opt_want_date' => 0,
       'opt_from_regex' => $spamtest->{conf}->{mbox_format_from_regex},
@@ -479,7 +484,8 @@
   $progress->final() if ($opt{progress} && $progress);
 
   my $phrase = defined $forget ? "Forgot" : "Learned";
-  print "$phrase tokens from $learnedcount message(s) ($messagecount message(s) examined)\n";
+  print "$phrase tokens from $learnedcount message(s) ($messagecount message(s) examined)\n"
+    if !$opt{'quiet'};
 
   # If we needed to make a tempfile, go delete it.
   if (defined $tempfile) {
@@ -630,7 +636,7 @@
  --mbox                Input sources are in mbox format
  --mbx                 Input sources are in mbx format
  --max-size <b>        Skip messages larger than b bytes;
-                       defaults to 256 KiB, 0 implies no limit
+                       defaults to 256 KB, 0 implies no limit
  --showdots            Show progress using dots
  --progress            Show progress using progress bar
  --no-sync             Skip synchronizing the database and journal
@@ -649,7 +655,7 @@
  -p prefs, --prefspath=file, --prefs-file=file
                        Set user preferences file
  --siteconfigpath=path Path for site configs
-                       (default: /etc/mail/spamassassin)
+                       (default:  @@PREFIX@@/etc/mail/spamassassin)
  --cf='config line'    Additional line of configuration
  -D, --debug [area=n,...]  Print debugging messages
  -V, --version         Print version
@@ -669,6 +675,9 @@
 in other words, listing a folder name as C<*> will scan every folder
 that matches.  See C<Mail::SpamAssassin::ArchiveIterator> for more details.
 
+If you are using mail boxes in format other than maildir you should use
+the B<--mbox> or B<--mbx> parameters.
+
 SpamAssassin remembers which mail messages it has learnt already, and will not
 re-learn those messages again, unless you use the B<--forget> option. Messages
 learnt as spam will have SpamAssassin markup removed, on the fly.
diff -Nru spamassassin-3.4.0/sa-update.raw spamassassin-3.4.2/sa-update.raw
--- spamassassin-3.4.0/sa-update.raw	2014-02-07 03:36:38.000000000 -0500
+++ spamassassin-3.4.2/sa-update.raw	2018-09-13 21:27:51.000000000 -0400
@@ -22,11 +22,11 @@
 use re 'taint';
 
 my $VERSION = 'svnunknown';
-if ('$Id: sa-update.raw 1475932 2013-04-25 19:56:34Z mmartinec $' =~ ':') {
-  # Subversion keyword "$Id: sa-update.raw 1475932 2013-04-25 19:56:34Z mmartinec $" has been successfully expanded.
+if ('$Id: sa-update.raw 1840377 2018-09-08 20:40:12Z kmcgrail $' =~ ':') {
+  # Subversion keyword "$Id: sa-update.raw 1840377 2018-09-08 20:40:12Z kmcgrail $" has been successfully expanded.
   # Doesn't happen with automated launchpad builds:
   # https://bugs.launchpad.net/launchpad/+bug/780916
-  $VERSION = 'svn' . (split(/\s+/, '$Id: sa-update.raw 1475932 2013-04-25 19:56:34Z mmartinec $'))[2];
+  $VERSION = &Mail::SpamAssassin::Version . ' / svn' . (split(/\s+/, '$Id: sa-update.raw 1840377 2018-09-08 20:40:12Z kmcgrail $'))[2];
 }
 
 my $PREFIX          = '@@PREFIX@@';             # substituted at 'make' time
@@ -55,10 +55,13 @@
 use Getopt::Long;
 use Pod::Usage;
 use Config;
+use POSIX qw(locale_h setsid sigprocmask _exit);
+ 
+POSIX::setlocale(LC_TIME,'C');
 
 BEGIN {                          # see comments in "spamassassin.raw" for doco
   my @bin = File::Spec->splitpath($0);
-  my $bin = ($bin[0] ? File::Spec->catpath(@bin[0..1]) : $bin[1])
+  my $bin = ($bin[0] ? File::Spec->catpath(@bin[0..1], '') : $bin[1])
             || File::Spec->curdir;
 
   if (-e $bin.'/lib/Mail/SpamAssassin.pm'
@@ -86,22 +89,22 @@
 use HTTP::Date qw(time2str);
 use Archive::Tar 1.23;
 use IO::Zlib 1.04;
+use Mail::SpamAssassin::Logger qw(:DEFAULT info log_message);
 
-use vars qw($have_lwp $io_socket_module_name $have_inet4 $have_inet6);
+our ($have_lwp, $io_socket_module_name, $have_inet4, $have_inet6, $have_sha256, $have_sha512);
 
 BEGIN {
   # Deal with optional modules
 
-  eval { require Digest::SHA; import Digest::SHA qw(sha1_hex); 1 }
-  or do { require Digest::SHA1; import Digest::SHA1 qw(sha1_hex) };
-
-  $have_lwp = eval {
+  eval { require Digest::SHA; import Digest::SHA qw(sha256_hex sha512_hex); 1 } and do { $have_sha256=1; $have_sha512=1 }
+  or die "Unable to verify file hashes! You must install a modern version of Digest::SHA.";
+  
+    $have_lwp = eval {
     require LWP::UserAgent;
   };
 
   if (eval { require IO::Socket::IP }) {  # handles IPv6 and IPv4
     $io_socket_module_name = 'IO::Socket::IP';
- 
   } elsif (eval { require IO::Socket::INET6 }) {  # handles IPv6 and IPv4
     $io_socket_module_name = 'IO::Socket::INET6';
 
@@ -110,7 +113,7 @@
   }
 
   $have_inet4 =  # can we create a PF_INET socket?
-    defined $io_socket_module_name && eval {  
+    defined $io_socket_module_name && eval {
       my $sock =
         $io_socket_module_name->new(LocalAddr => '0.0.0.0', Proto => 'tcp');
       $sock->close or die "error closing socket: $!"  if $sock;
@@ -138,6 +141,7 @@
 *dbg=\&Mail::SpamAssassin::dbg;
 sub dbg;
 
+
 $| = 1;  # autoflushing STDOUT makes verbose output consistent with warnings
 
 # Clean up PATH appropriately
@@ -237,7 +241,6 @@
 }
 my $RevSAVersion = join(".", reverse split(/\./, $SAVersion));
 
-  
 # set debug areas, if any specified (only useful for command-line tools)
 $SAVersion =~ /^(\d+\.\d+)/;
 if ($1+0 > 3.0) {
@@ -247,7 +250,6 @@
   $opt{'debug'} = defined $opt{'debug'};
 }
 
-
 # Find the default site rule directory, also setup debugging and other M::SA bits
 my $SA = Mail::SpamAssassin->new({
   debug => $opt{'debug'},
@@ -518,6 +520,7 @@
 
     if ( defined $opt{'checkonly'} ) {            
       dbg("channel: $channel: --install and --checkonly, claiming update available");
+      $channel_successes++;
       next;
     }
 
@@ -558,6 +561,7 @@
     if ( defined $opt{'checkonly'} ) {            
       dbg("channel: $channel: update available, not downloading ".
           "in checkonly mode");
+      $channel_successes++;
       next;
     }
 
@@ -592,13 +596,15 @@
   }
 
   my $content;
-  my $SHA1;
+  my $SHA512;
+  my $SHA256;
   my $GPG;
 
   if ($instfile) {
-    dbg("channel: using --install files $instfile\{,.sha1,.asc\}");
+    dbg("channel: using --install files $instfile\{,.sha256,.sha512,.asc\}");
     $content = read_install_file($instfile);
-    $SHA1 = read_install_file($instfile.".sha1");
+    if ( -s "$instfile.sha512" ) { $SHA512 = read_install_file($instfile.".sha512"); }
+    if ( -s "$instfile.sha256" ) { $SHA256 = read_install_file($instfile.".sha256"); }
     $GPG = read_install_file($instfile.".asc") if $GPG_ENABLED;
 
   } else {  # not an install file, obtain fresh rules from network
@@ -647,8 +653,9 @@
       }
       foreach my $mirror (@mirrors) {
         my $result_fname;
-        ($mirby, $result_fname) =
+        $result_fname =
           http_get($mirror, $UPDDir, $mirby_path, $mirby_force_reload);
+        $mirby = read_content($result_fname, 0);
 
         if ($mirby) {
           dbg("channel: MIRRORED.BY file for channel %s retrieved", $channel);
@@ -731,58 +738,98 @@
 
     # Loop through all available mirrors, choose from them randomly
     # if the archive get fails, choose another mirror,
-    # if the get for the sha1 or gpg signature files, the channel fails
+    # if the get for the hash or gpg signature files fails, the channel fails
     while (my $mirror = choose_mirror(\%mirrors)) {
       my $result_fname;
       # Grab the data hash for this mirror, then remove it from the list
       my $mirror_info = $mirrors{$mirror};
       delete $mirrors{$mirror};
 
+      if (!check_mirror_af($mirror)) {
+        my @my_af;
+        push(@my_af, "IPv4") if $have_inet4;
+        push(@my_af, "IPv6") if $have_inet6;
+        push(@my_af, "no IP service") if !@my_af;
+        dbg("reject mirror %s: no common address family (%s)",
+            $mirror, join(" ", @my_af));
+        next;
+      }
+
       dbg("channel: selected mirror $mirror");
 
       # Actual archive file
-      ($content, $result_fname) =
-        http_get("$mirror/$newV.tar.gz", $UPDDir);
+      $result_fname = http_get("$mirror/$newV.tar.gz", $UPDDir);
+      $content = read_content($result_fname, 1);
       next unless $content;
       $preserve_files{$result_fname} = 1;
 
-      # SHA1 of the archive file
-      ($SHA1, $result_fname) =
-        http_get("$mirror/$newV.tar.gz.sha1", $UPDDir);
-      last unless $SHA1;
-      $preserve_files{$result_fname} = 1;
+      # SHA512 of the archive file
+      $result_fname = http_get("$mirror/$newV.tar.gz.sha512", $UPDDir);
+      if ( -s $result_fname) {
+        $SHA512 = read_content($result_fname, 0);
+        last unless $SHA512;
+        $preserve_files{$result_fname} = 1;
+      } else {
+        undef $SHA512;
+        dbg("channel: No sha512 file available from $mirror");
+      }
+
+      # SHA256 of the archive file
+      $result_fname = http_get("$mirror/$newV.tar.gz.sha256", $UPDDir);
+      if ( -s $result_fname) {
+        $SHA256 = read_content($result_fname, 0);
+        last unless $SHA256;
+        $preserve_files{$result_fname} = 1;
+      } else {
+        undef $SHA256;
+        dbg("channel: No sha256 file available from $mirror");
+      }
 
       # if GPG is enabled, the GPG detached signature of the archive file
       if ($GPG_ENABLED) {
-        ($GPG, $result_fname) =
-          http_get("$mirror/$newV.tar.gz.asc", $UPDDir);
+        $result_fname = http_get("$mirror/$newV.tar.gz.asc", $UPDDir);
+        $GPG = read_content($result_fname, 0);
         last unless $GPG;
         $preserve_files{$result_fname} = 1;
       }
-
       last;
     }
 
   }
 
-  unless ($content && $SHA1 && (!$GPG_ENABLED || $GPG)) {
+  unless ($content && ( $SHA512 || $SHA256 ) && (!$GPG_ENABLED || $GPG)) {
     channel_failed("channel: could not find working mirror");
     next;
   }
 
-  # Validate the SHA1 signature before going forward with more complicated
-  # operations.
-  # The SHA1 file may be "signature filename" ala sha1sum, just use the signature
-  { local($1);
-    $SHA1 =~ /^([a-fA-F0-9]{40})/;
-    $SHA1 = $1 || 'INVALID';
-  }
-  my $digest = sha1_hex($content);
-  dbg("sha1: verification wanted: $SHA1");
-  dbg("sha1: verification result: $digest");
-  unless ($digest eq $SHA1) {
-    channel_failed("channel: SHA1 verification failed");
-    next;
+  if ( $SHA512 ) {
+    # Validate the SHA512 signature
+    { local($1);
+      $SHA512 =~ /^([a-fA-F0-9]{128})/;
+      $SHA512 = $1 || 'INVALID';
+    }
+    my $digest = sha512_hex($content);
+    dbg("sha512: verification wanted: $SHA512");
+    dbg("sha512: verification result: $digest");
+    unless ($digest eq $SHA512) {
+      channel_failed("channel: SHA512 verification failed");
+      next;
+    }
+  }
+
+  if ( $SHA256 ) {
+    # Validate the SHA256 signature
+    { local($1);
+      $SHA256 =~ /^([a-fA-F0-9]{64})/;
+      $SHA256 = $1 || 'INVALID';
+    }
+    my $digest = sha256_hex($content);
+    dbg("sha256: verification wanted: $SHA256");
+    dbg("sha256: verification result: $digest");
+    unless ($digest eq $SHA256) {
+      channel_failed("channel: SHA256 verification failed");
+      next;
+    }
   }
 
   # Write the content out to a temp file for GPG/Archive::Tar interaction
@@ -854,7 +901,7 @@
       }
 
       # use the longest match we can find
-      $signer = $key if (length $key > length $signer);
+      $signer = $key if length $key > length $signer;
     }
 
     my $errno = 0;  close CMD or $errno = $!;
@@ -1073,7 +1120,7 @@
           return 0;
         }
 
-        # if all went fine, remove the .tar.gz, .sha1 and .asc files
+        # if all went fine, remove the .tar.gz, .sha* and .asc files
         delete_files( grep(!m{/\QMIRRORED.BY\E\z}, keys %preserve_files) );
 
         $channel_successes++;
@@ -1470,10 +1517,10 @@
                    --fail -o), $out_fname_short);
     push(@args, '-z', $out_fname_short)  if $out_fname_exists && !$force_reload;
   } elsif (defined $ext_prog && $ext_prog eq 'wget') {
-    push(@args, qw(-q -N --max-redirect=2 --tries=3
-                   --dns-timeout=20 --connect-timeout=30 --read-timeout=300
-                   -o), $out_fname_short);
-    #*** ???  if $out_fname_exists && !$force_reload;
+    push(@args, qw(-q --max-redirect=2 --tries=3
+                   --dns-timeout=20 --connect-timeout=30 --read-timeout=300));
+    push(@args, defined $suggested_out_fname ? ('-O', $out_fname_short)
+                : $force_reload ? () : ('-N') );
   } elsif (defined $ext_prog && $ext_prog eq 'fetch') {
     push(@args, qw(-q -n -a -w 20 -m -o), $out_fname_short);
     push(@args, '-m')  if $out_fname_exists && !$force_reload;
@@ -1496,7 +1543,7 @@
       $out_fh->print($content) or die "Error writing to $out_fname: $!";
     }
     $out_fh->close or die "Error closing file $out_fname: $!";
-    return ($content, $out_fname);
+    return $out_fname;
   } else {
     die "http: no downloading tool available";
   }
@@ -1527,7 +1574,8 @@
   # parent
   waitpid($pid,0);
   my $child_stat = $?;
-  dbg("http: process [%s], exit status: %s", $pid, $child_stat);
+  dbg("http: process [%s], exit status: %s",
+      $pid, exit_status_str($child_stat,0));
 
   if (!$opt{'verbose'}) {
     # silent
@@ -1535,19 +1583,34 @@
     printf("http: (%s) GET %s, success\n", $ext_prog, $url);
   } else {
     printf("http: (%s) GET %s, FAILED, status: %s\n",
-           $ext_prog, $url, $child_stat);
+           $ext_prog, $url, exit_status_str($child_stat,0));
   }
 
-  if ($child_stat == 0) {
-    my $inp = IO::File->new;
-    $inp->open($out_fname,'<') or die "Cannot open file $out_fname: $!";
-    my($nbytes,$buff); $content = '';
-    while (($nbytes=$inp->read($buff,16384)) > 0) { $content .= $buff }
-    defined $nbytes or die "Error reading from file $out_fname: $!";
-    $inp->close or die "Error closing $out_fname: $!";
+  return $out_fname;
+}
+
+# Read the content of a (downloaded) file. The subroutine expects a file name
+# and a boolean value. The boolean value indicates whether the file should be
+# opened in "text" mode or in "binary" mode. Pass 0 for text mode, 1 for binary
+# mode. Returns the content of the file as a string.
+sub read_content {
+  my ($file_name, $binary_mode) = @_;
+  my $content;
+
+  my $file = IO::File->new;
+  $file->open($file_name, '<') or die "Cannot open file $file_name: $!";
+  if ($binary_mode) {
+    binmode $file;
+  }
+  my($number_of_bytes,$buffer);
+  $content = '';
+  while (($number_of_bytes = $file->read($buffer, 16384)) > 0) {
+    $content .= $buffer;
   }
+  defined $number_of_bytes or die "Error reading from file $file_name: $!";
+  $file->close or die "Error closing $file_name: $!";
 
-  return ($content, $out_fname);
+  return $content;
 }
 
 ##############################################################################
@@ -1591,9 +1654,21 @@
 
 ##############################################################################
 
+sub check_mirror_af {
+    my ($mirror) = @_;
+    my($a_rr, $aaaa_rr);
+      # RFC 3986:  scheme = ALPHA *( ALPHA / DIGIT / "+" / "-" / "." )
+    $mirror =~ s{^[a-z][a-z0-9.+-]*://}{}si;  # strip scheme like http://
+    return 1 if $have_inet4 && do_dns_query($mirror, "A");
+    return 1 if $have_inet6 && do_dns_query($mirror, "AAAA");
+    return 0;
+}
+
+##############################################################################
+
 sub print_version {
-  print "sa-update version $VERSION\n"
-      . "  running on Perl version " . join(".", map { $_||=0; $_*1 } ($] =~ /(\d)\.(\d{3})(\d{3})?/ )) . "\n";
+  printf("sa-update version %s\n  running on Perl version %s\n", $VERSION, 
+         join(".", map( 0+($_||0), ( $] =~ /(\d)\.(\d{3})(\d{3})?/ ))));
 }
 
 ##############################################################################
@@ -1791,7 +1866,8 @@
   --channelfile file      Retrieve updates from the channels in the file
   --checkonly             Check for update availability, do not install
   --install filename      Install updates directly from this file. Signature
-                          verification will use "file.asc" and "file.sha1"
+                          verification will use "file.asc", "file.sha256",
+                          and "file.sha512".
   --allowplugins          Allow updates to load plugin code
   --gpgkey key            Trust the key id to sign releases
                           Use multiple times for multiple keys
@@ -1821,7 +1897,8 @@
 I<updates.spamassassin.org>, which has updated rules since the previous
 release.
 
-Update archives are verified using SHA1 hashes and GPG signatures, by default.
+Update archives are verified using SHA256 and SHA512 hashes and GPG signatures,
+by default.
 
 Note that C<sa-update> will not restart C<spamd> or otherwise cause
 a scanner to reload the now-updated ruleset automatically.  Instead,
@@ -1869,10 +1946,10 @@
 Install updates "offline", from the named tar.gz file, instead of performing
 DNS lookups and HTTP invocations.
 
-Files named B<file>.sha1 and B<file>.asc will be used for the SHA-1 and GPG
-signature, respectively.  The filename provided must contain a version number
-of at least 3 digits, which will be used as the channel's update version
-number.
+Files named B<file>.sha256, B<file>.sha512, and B<file>.asc will be used for
+the SHA256 and SHA512 hashes and the GPG signature, respectively.  The filename
+provided must contain a version number of at least 3 digits, which will be used
+as the channel's update version number.
 
 Multiple B<--channel> switches cannot be used with B<--install>.  To install
 multiple channels from tarballs, run C<sa-update> multiple times with different
@@ -1889,11 +1966,11 @@
 
 =item B<--gpg>, B<--nogpg>
 
-sa-update by default will verify update archives by use of a SHA1 checksum
-and GPG signature.  SHA1 hashes can verify whether or not the downloaded
-archive has been corrupted, but it does not offer any form of security
-regarding whether or not the downloaded archive is legitimate (aka:
-non-modifed by evildoers).  GPG verification of the archive is used to
+sa-update by default will verify update archives by use of SHA256 and SHA512
+checksums and GPG signature.  SHA* hashes can verify whether or not the
+downloaded archive has been corrupted, but it does not offer any form of
+security regarding whether or not the downloaded archive is legitimate
+(aka: non-modifed by evildoers).  GPG verification of the archive is used to
 solve that problem.
 
 If you wish to skip GPG verification, you can use the B<--nogpg> option
@@ -1994,8 +2071,10 @@
 
 =head1 EXIT CODES
 
-An exit code of C<0> means an update was available, and was downloaded and
-installed successfully if --checkonly was not specified.
+In absence of a --checkonly option, an exit code of C<0> means:
+an update was available, and was downloaded and installed successfully.
+If --checkonly was specified, an exit code of C<0> means: an update was
+available.
 
 An exit code of C<1> means no fresh updates were available.
 
@@ -2029,10 +2108,13 @@
 
 The Apache SpamAssassin(tm) Project <http://spamassassin.apache.org/>
 
-=head1 COPYRIGHT
+=head1 LICENSE AND COPYRIGHT
 
 SpamAssassin is distributed under the Apache License, Version 2.0, as
 described in the file C<LICENSE> included with the distribution.
 
+Copyright (C) 2015 The Apache Software Foundation
+
+
 =cut
 
diff -Nru spamassassin-3.4.0/spamassassin.raw spamassassin-3.4.2/spamassassin.raw
--- spamassassin-3.4.0/spamassassin.raw	2014-02-07 03:36:38.000000000 -0500
+++ spamassassin-3.4.2/spamassassin.raw	2018-09-13 21:27:52.000000000 -0400
@@ -37,7 +37,7 @@
   my @bin = File::Spec->splitpath($0);
   my $bin = (
     $bin[0]
-    ? File::Spec->catpath( @bin[ 0 .. 1 ] )
+    ? File::Spec->catpath( @bin[ 0 .. 1 ], '' )
     : $bin[1]
     )                                           # /home/jm/foo -> /home/jm
     || File::Spec->curdir;                      # foo          -> .
@@ -75,6 +75,7 @@
 
 use Getopt::Long;
 use Pod::Usage;
+use POSIX qw(locale_h setsid sigprocmask _exit);
 use Mail::SpamAssassin;
 use Mail::SpamAssassin::ArchiveIterator;
 use Mail::SpamAssassin::Util::Progress;
@@ -90,6 +91,8 @@
   };
 };
 
+POSIX::setlocale(LC_TIME,'C');
+
 my %resphash = (
   EX_OK          => 0,     # no problems
   EX_USAGE       => 64,    # command line usage error
@@ -111,8 +114,9 @@
 
 
 sub print_version {
-  print "SpamAssassin version " . Mail::SpamAssassin::Version() . "\n"
-      . "  running on Perl version " . join(".", map { $_||=0; $_*1 } ($] =~ /(\d)\.(\d{3})(\d{3})?/ )) . "\n"
+  printf("SpamAssassin version %s\n  running on Perl version %s\n",
+         Mail::SpamAssassin::Version(),
+         join(".", map( 0+($_||0), ($] =~ /(\d)\.(\d{3})(\d{3})?/ ))))
     or die "error writing: $!";
 }
 
@@ -344,9 +348,14 @@
       binmode $handle  or die "cannot set binmode on file $tempfile: $!";
 
       # avoid slurping the whole file into memory, copy chunk by chunk
-      my($inbuf,$nread);
-      while ( $nread=sysread(STDIN,$inbuf,16384) )
-        { print {$handle} $inbuf  or die "error writing to $tempfile: $!" }
+      my($inbuf,$nread,$nwrites);
+      while ( $nread = sysread(STDIN, $inbuf, 32*1024) ) {
+        for (my $ofs = 0; $ofs < length($inbuf); $ofs += $nwrites) {
+          $nwrites = $handle->syswrite($inbuf, length($inbuf)-$ofs, $ofs);
+          defined $nwrites  or die "error writing to $tempfile: $!";
+        }
+      }
+      undef $inbuf;  # release storage
       defined $nread  or die "error reading from STDIN: $!";
       close $handle   or die "cannot close $tempfile: $!";
 
@@ -470,7 +479,10 @@
 
     # If we're not going to retest, just remove the markup and print it out
     if ( !$opt{'test-mode'} ) {
-      print $spamtest->remove_spamassassin_markup ($mail);
+      my $report = $spamtest->remove_spamassassin_markup ($mail);
+      # encode Unicode characters to UTF-8 octets
+      utf8::encode($report) if utf8::is_utf8($report);
+      print $report;
       $mail->finish();
       $mail = undef;
       return 1;
@@ -519,11 +531,17 @@
 
   # OK, do checks and put out the message.
   my $status = $spamtest->check($mail);
-  print $status->rewrite_mail()  or die "error writing: $!";
+  { my $report = $status->rewrite_mail();
+    # encode Unicode characters to UTF-8 octets
+    utf8::encode($report) if utf8::is_utf8($report);
+    print $report  or die "error writing: $!";
+  }
 
   if ( $opt{'test-mode'} ) {
-    use bytes;
-    print $status->get_report()  or die "error writing: $!";
+    my $report = $status->get_report();
+    # encode Unicode characters to UTF-8 octets
+    utf8::encode($report) if utf8::is_utf8($report);
+    print $report  or die "error writing: $!";
   }
 
   # if this message was spam, set the exit value appropriately.
@@ -883,8 +901,10 @@
 
 The SpamAssassin(tm) Project <http://spamassassin.apache.org/>
 
-=head1 COPYRIGHT
+=head1 COPYRIGHT AND LICENSE
 
 SpamAssassin is distributed under the Apache License, Version 2.0, as
 described in the file C<LICENSE> included with the distribution.
 
+Copyright (C) 2015 The Apache Software Foundation
+
diff -Nru spamassassin-3.4.0/spamc/configure spamassassin-3.4.2/spamc/configure
--- spamassassin-3.4.0/spamc/configure	2014-02-07 03:36:38.000000000 -0500
+++ spamassassin-3.4.2/spamc/configure	2018-09-13 21:27:52.000000000 -0400
@@ -1874,7 +1874,8 @@
   cat conftest.err >&5
   echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); } &&
-	 { ac_try='test -z "$ac_c_werror_flag"			 || test ! -s conftest.err'
+	 { ac_try='test -z "$ac_c_werror_flag"
+			 || test ! -s conftest.err'
   { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
@@ -1932,7 +1933,8 @@
   cat conftest.err >&5
   echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); } &&
-	 { ac_try='test -z "$ac_c_werror_flag"			 || test ! -s conftest.err'
+	 { ac_try='test -z "$ac_c_werror_flag"
+			 || test ! -s conftest.err'
   { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
@@ -2048,7 +2050,8 @@
   cat conftest.err >&5
   echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); } &&
-	 { ac_try='test -z "$ac_c_werror_flag"			 || test ! -s conftest.err'
+	 { ac_try='test -z "$ac_c_werror_flag"
+			 || test ! -s conftest.err'
   { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
@@ -2102,7 +2105,8 @@
   cat conftest.err >&5
   echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); } &&
-	 { ac_try='test -z "$ac_c_werror_flag"			 || test ! -s conftest.err'
+	 { ac_try='test -z "$ac_c_werror_flag"
+			 || test ! -s conftest.err'
   { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
@@ -2147,7 +2151,8 @@
   cat conftest.err >&5
   echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); } &&
-	 { ac_try='test -z "$ac_c_werror_flag"			 || test ! -s conftest.err'
+	 { ac_try='test -z "$ac_c_werror_flag"
+			 || test ! -s conftest.err'
   { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
@@ -2191,7 +2196,8 @@
   cat conftest.err >&5
   echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); } &&
-	 { ac_try='test -z "$ac_c_werror_flag"			 || test ! -s conftest.err'
+	 { ac_try='test -z "$ac_c_werror_flag"
+			 || test ! -s conftest.err'
   { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
@@ -2523,7 +2529,8 @@
   cat conftest.err >&5
   echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); } &&
-	 { ac_try='test -z "$ac_c_werror_flag"			 || test ! -s conftest.err'
+	 { ac_try='test -z "$ac_c_werror_flag"
+			 || test ! -s conftest.err'
   { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
@@ -2693,7 +2700,8 @@
   cat conftest.err >&5
   echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); } &&
-	 { ac_try='test -z "$ac_c_werror_flag"			 || test ! -s conftest.err'
+	 { ac_try='test -z "$ac_c_werror_flag"
+			 || test ! -s conftest.err'
   { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
@@ -2764,7 +2772,8 @@
   cat conftest.err >&5
   echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); } &&
-	 { ac_try='test -z "$ac_c_werror_flag"			 || test ! -s conftest.err'
+	 { ac_try='test -z "$ac_c_werror_flag"
+			 || test ! -s conftest.err'
   { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
@@ -2917,7 +2926,8 @@
   cat conftest.err >&5
   echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); } &&
-	 { ac_try='test -z "$ac_c_werror_flag"			 || test ! -s conftest.err'
+	 { ac_try='test -z "$ac_c_werror_flag"
+			 || test ! -s conftest.err'
   { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
@@ -3069,7 +3079,8 @@
   cat conftest.err >&5
   echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); } &&
-	 { ac_try='test -z "$ac_c_werror_flag"			 || test ! -s conftest.err'
+	 { ac_try='test -z "$ac_c_werror_flag"
+			 || test ! -s conftest.err'
   { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
@@ -3260,7 +3271,8 @@
   cat conftest.err >&5
   echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); } &&
-	 { ac_try='test -z "$ac_c_werror_flag"			 || test ! -s conftest.err'
+	 { ac_try='test -z "$ac_c_werror_flag"
+			 || test ! -s conftest.err'
   { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
@@ -3323,7 +3335,8 @@
   cat conftest.err >&5
   echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); } &&
-	 { ac_try='test -z "$ac_c_werror_flag"			 || test ! -s conftest.err'
+	 { ac_try='test -z "$ac_c_werror_flag"
+			 || test ! -s conftest.err'
   { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
@@ -3388,7 +3401,8 @@
   cat conftest.err >&5
   echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); } &&
-	 { ac_try='test -z "$ac_c_werror_flag"			 || test ! -s conftest.err'
+	 { ac_try='test -z "$ac_c_werror_flag"
+			 || test ! -s conftest.err'
   { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
@@ -3491,7 +3505,8 @@
   cat conftest.err >&5
   echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); } &&
-	 { ac_try='test -z "$ac_c_werror_flag"			 || test ! -s conftest.err'
+	 { ac_try='test -z "$ac_c_werror_flag"
+			 || test ! -s conftest.err'
   { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
@@ -3557,7 +3572,8 @@
   cat conftest.err >&5
   echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); } &&
-	 { ac_try='test -z "$ac_c_werror_flag"			 || test ! -s conftest.err'
+	 { ac_try='test -z "$ac_c_werror_flag"
+			 || test ! -s conftest.err'
   { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
@@ -3628,7 +3644,8 @@
   cat conftest.err >&5
   echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); } &&
-	 { ac_try='test -z "$ac_c_werror_flag"			 || test ! -s conftest.err'
+	 { ac_try='test -z "$ac_c_werror_flag"
+			 || test ! -s conftest.err'
   { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
@@ -3666,9 +3683,9 @@
 SSLLIBS=""
 SSLCFLAGS=""
 if test yes = "$sa_ssl_enabled"; then
-	echo "$as_me:$LINENO: checking for CRYPTO_lock in -lcrypto" >&5
-echo $ECHO_N "checking for CRYPTO_lock in -lcrypto... $ECHO_C" >&6
-if test "${ac_cv_lib_crypto_CRYPTO_lock+set}" = set; then
+	echo "$as_me:$LINENO: checking for CRYPTO_malloc in -lcrypto" >&5
+echo $ECHO_N "checking for CRYPTO_malloc in -lcrypto... $ECHO_C" >&6
+if test "${ac_cv_lib_crypto_CRYPTO_malloc+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
 else
   ac_check_lib_save_LIBS=$LIBS
@@ -3686,11 +3703,11 @@
 #endif
 /* We use char because int might match the return type of a gcc2
    builtin and then its argument prototype would still apply.  */
-char CRYPTO_lock ();
+char CRYPTO_malloc ();
 int
 main ()
 {
-CRYPTO_lock ();
+CRYPTO_malloc ();
   ;
   return 0;
 }
@@ -3704,7 +3721,8 @@
   cat conftest.err >&5
   echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); } &&
-	 { ac_try='test -z "$ac_c_werror_flag"			 || test ! -s conftest.err'
+	 { ac_try='test -z "$ac_c_werror_flag"
+			 || test ! -s conftest.err'
   { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
@@ -3716,20 +3734,20 @@
   ac_status=$?
   echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
-  ac_cv_lib_crypto_CRYPTO_lock=yes
+  ac_cv_lib_crypto_CRYPTO_malloc=yes
 else
   echo "$as_me: failed program was:" >&5
 sed 's/^/| /' conftest.$ac_ext >&5
 
-ac_cv_lib_crypto_CRYPTO_lock=no
+ac_cv_lib_crypto_CRYPTO_malloc=no
 fi
 rm -f conftest.err conftest.$ac_objext \
       conftest$ac_exeext conftest.$ac_ext
 LIBS=$ac_check_lib_save_LIBS
 fi
-echo "$as_me:$LINENO: result: $ac_cv_lib_crypto_CRYPTO_lock" >&5
-echo "${ECHO_T}$ac_cv_lib_crypto_CRYPTO_lock" >&6
-if test $ac_cv_lib_crypto_CRYPTO_lock = yes; then
+echo "$as_me:$LINENO: result: $ac_cv_lib_crypto_CRYPTO_malloc" >&5
+echo "${ECHO_T}$ac_cv_lib_crypto_CRYPTO_malloc" >&6
+if test $ac_cv_lib_crypto_CRYPTO_malloc = yes; then
   SSLLIBS="-lcrypto $SSLLIBS"
 fi
 
@@ -3771,7 +3789,8 @@
   cat conftest.err >&5
   echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); } &&
-	 { ac_try='test -z "$ac_c_werror_flag"			 || test ! -s conftest.err'
+	 { ac_try='test -z "$ac_c_werror_flag"
+			 || test ! -s conftest.err'
   { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
@@ -3804,7 +3823,7 @@
 	# before defining SPAMC_SSL check that all its requirements are
 	# actually available
 	if test yes = "$ac_cv_header_openssl_crypto_h" && \
-	   test yes = "$ac_cv_lib_crypto_CRYPTO_lock" && \
+	   test yes = "$ac_cv_lib_crypto_CRYPTO_malloc" && \
 	   test yes = "$ac_cv_lib_ssl_SSL_CTX_free"; then
 		SSLCFLAGS="-DSPAMC_SSL"
 	else
@@ -3854,7 +3873,8 @@
   cat conftest.err >&5
   echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); } &&
-	 { ac_try='test -z "$ac_c_werror_flag"			 || test ! -s conftest.err'
+	 { ac_try='test -z "$ac_c_werror_flag"
+			 || test ! -s conftest.err'
   { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
@@ -3927,7 +3947,8 @@
   cat conftest.err >&5
   echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); } &&
-	 { ac_try='test -z "$ac_c_werror_flag"			 || test ! -s conftest.err'
+	 { ac_try='test -z "$ac_c_werror_flag"
+			 || test ! -s conftest.err'
   { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
@@ -4000,7 +4021,8 @@
   cat conftest.err >&5
   echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); } &&
-	 { ac_try='test -z "$ac_c_werror_flag"			 || test ! -s conftest.err'
+	 { ac_try='test -z "$ac_c_werror_flag"
+			 || test ! -s conftest.err'
   { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
@@ -4073,7 +4095,8 @@
   cat conftest.err >&5
   echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); } &&
-	 { ac_try='test -z "$ac_c_werror_flag"			 || test ! -s conftest.err'
+	 { ac_try='test -z "$ac_c_werror_flag"
+			 || test ! -s conftest.err'
   { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
@@ -4182,7 +4205,8 @@
   cat conftest.err >&5
   echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); } &&
-	 { ac_try='test -z "$ac_c_werror_flag"			 || test ! -s conftest.err'
+	 { ac_try='test -z "$ac_c_werror_flag"
+			 || test ! -s conftest.err'
   { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
@@ -4246,7 +4270,8 @@
   cat conftest.err >&5
   echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); } &&
-	 { ac_try='test -z "$ac_c_werror_flag"			 || test ! -s conftest.err'
+	 { ac_try='test -z "$ac_c_werror_flag"
+			 || test ! -s conftest.err'
   { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
@@ -4311,7 +4336,8 @@
   cat conftest.err >&5
   echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); } &&
-	 { ac_try='test -z "$ac_c_werror_flag"			 || test ! -s conftest.err'
+	 { ac_try='test -z "$ac_c_werror_flag"
+			 || test ! -s conftest.err'
   { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
@@ -4368,7 +4394,8 @@
   cat conftest.err >&5
   echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); } &&
-	 { ac_try='test -z "$ac_c_werror_flag"			 || test ! -s conftest.err'
+	 { ac_try='test -z "$ac_c_werror_flag"
+			 || test ! -s conftest.err'
   { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
@@ -4435,7 +4462,8 @@
   cat conftest.err >&5
   echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); } &&
-	 { ac_try='test -z "$ac_c_werror_flag"			 || test ! -s conftest.err'
+	 { ac_try='test -z "$ac_c_werror_flag"
+			 || test ! -s conftest.err'
   { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
@@ -4500,7 +4528,8 @@
   cat conftest.err >&5
   echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); } &&
-	 { ac_try='test -z "$ac_c_werror_flag"			 || test ! -s conftest.err'
+	 { ac_try='test -z "$ac_c_werror_flag"
+			 || test ! -s conftest.err'
   { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
@@ -4564,7 +4593,8 @@
   cat conftest.err >&5
   echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); } &&
-	 { ac_try='test -z "$ac_c_werror_flag"			 || test ! -s conftest.err'
+	 { ac_try='test -z "$ac_c_werror_flag"
+			 || test ! -s conftest.err'
   { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
@@ -4628,7 +4658,8 @@
   cat conftest.err >&5
   echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); } &&
-	 { ac_try='test -z "$ac_c_werror_flag"			 || test ! -s conftest.err'
+	 { ac_try='test -z "$ac_c_werror_flag"
+			 || test ! -s conftest.err'
   { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
@@ -4692,7 +4723,8 @@
   cat conftest.err >&5
   echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); } &&
-	 { ac_try='test -z "$ac_c_werror_flag"			 || test ! -s conftest.err'
+	 { ac_try='test -z "$ac_c_werror_flag"
+			 || test ! -s conftest.err'
   { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
@@ -5527,6 +5559,11 @@
 
 
 
+  if test x"$ac_file" != x-; then
+    { echo "$as_me:$LINENO: creating $ac_file" >&5
+echo "$as_me: creating $ac_file" >&6;}
+    rm -f "$ac_file"
+  fi
   # Let's still pretend it is `configure' which instantiates (i.e., don't
   # use $as_me), people would be surprised to read:
   #    /* config.h.  Generated by config.status.  */
@@ -5565,12 +5602,6 @@
 	 fi;;
       esac
     done` || { (exit 1); exit 1; }
-
-  if test x"$ac_file" != x-; then
-    { echo "$as_me:$LINENO: creating $ac_file" >&5
-echo "$as_me: creating $ac_file" >&6;}
-    rm -f "$ac_file"
-  fi
 _ACEOF
 cat >>$CONFIG_STATUS <<_ACEOF
   sed "$ac_vpsub
diff -Nru spamassassin-3.4.0/spamc/configure.in spamassassin-3.4.2/spamc/configure.in
--- spamassassin-3.4.0/spamc/configure.in	2014-02-07 03:36:38.000000000 -0500
+++ spamassassin-3.4.2/spamc/configure.in	2018-09-13 21:27:52.000000000 -0400
@@ -64,13 +64,13 @@
 SSLLIBS=""
 SSLCFLAGS=""
 if test yes = "$sa_ssl_enabled"; then
-	AC_CHECK_LIB(crypto, CRYPTO_lock,[SSLLIBS="-lcrypto $SSLLIBS"])
+	AC_CHECK_LIB(crypto, CRYPTO_malloc,[SSLLIBS="-lcrypto $SSLLIBS"])
 	AC_CHECK_LIB(ssl, SSL_CTX_free,[SSLLIBS="-lssl $SSLLIBS"],,-lcrypto)
 
 	# before defining SPAMC_SSL check that all its requirements are
 	# actually available
 	if test yes = "$ac_cv_header_openssl_crypto_h" && \
-	   test yes = "$ac_cv_lib_crypto_CRYPTO_lock" && \
+	   test yes = "$ac_cv_lib_crypto_CRYPTO_malloc" && \
 	   test yes = "$ac_cv_lib_ssl_SSL_CTX_free"; then
 		SSLCFLAGS="-DSPAMC_SSL"
 	else
diff -Nru spamassassin-3.4.0/spamc/configure.pl spamassassin-3.4.2/spamc/configure.pl
--- spamassassin-3.4.0/spamc/configure.pl	2014-02-07 03:36:38.000000000 -0500
+++ spamassassin-3.4.2/spamc/configure.pl	2018-09-13 21:27:52.000000000 -0400
@@ -66,7 +66,7 @@
   # Do the same thing as for the preprocessor below.
   package version_h;
   my $Z = $0;
-  local $0    = "version.h.pl";
+  local $0    = "./version.h.pl";
   local @ARGV = ();
   # Got to check for defined because the script returns shell error level!
   unless (defined do $0) {
diff -Nru spamassassin-3.4.0/spamc/getopt.c spamassassin-3.4.2/spamc/getopt.c
--- spamassassin-3.4.0/spamc/getopt.c	2014-02-07 03:36:38.000000000 -0500
+++ spamassassin-3.4.2/spamc/getopt.c	2018-09-13 21:27:52.000000000 -0400
@@ -21,6 +21,7 @@
 #include <string.h>
 #include <assert.h>
 #include <stdlib.h>
+#include <err.h>
 #include "getopt.h"
 
 #ifdef WIN32
@@ -244,18 +245,26 @@
       longoptlen = strlen(longopt) - 2;
       if((bp = strchr(longopt, '='))) {
          opt = strdup(bp+1);
+         if (opt == NULL) {
+            err(1, NULL);
+         }  
          longoptlen -= strlen(bp);
       }
 
       for(i=0; ; i++) {
-         if((longopts[i].name == NULL) || (longopts[i].name == 0))
+	 /* changed to longopts[i].name[0] == 0 - bug 7148 */
+         if((longopts[i].name == NULL) || (longopts[i].name[0] == 0)) {
+            free(opt);
             return(longoptiserr(argc, argv, spamc_optind-1, OPTERRNF));
-         if((memcmp(longopt+2, longopts[i].name, longoptlen)) == 0) {
+         }
+         if(((strncmp(longopt+2, longopts[i].name, longoptlen)) == 0) && (strlen(longopts[i].name) == longoptlen)) {
             *longindex = i;
             if(longopts[i].has_arg == required_argument) {
                if(((spamc_optind >= argc) || (!argv[spamc_optind]) || (argv[spamc_optind][0] == '-')) && 
-                   (opt == NULL))
+                   (opt == NULL)) {
+                  free(opt);
                   return(longoptiserr(argc, argv, spamc_optind-1, OPTERRARG));
+               }
                if(opt != NULL) {
                   spamc_optarg = opt;
                } else {
@@ -264,6 +273,7 @@
             } else if(longopts[i].has_arg == optional_argument) {
                if(((spamc_optind < argc) && (argv[spamc_optind]) && (argv[spamc_optind][0] != '-')) || 
                      (opt != NULL)) {
+		  free(opt);
                   if(opt != NULL) {
                      spamc_optarg = opt;
                   } else {
diff -Nru spamassassin-3.4.0/spamc/libspamc.c spamassassin-3.4.2/spamc/libspamc.c
--- spamassassin-3.4.0/spamc/libspamc.c	2014-02-07 03:36:38.000000000 -0500
+++ spamassassin-3.4.2/spamc/libspamc.c	2018-09-13 21:27:52.000000000 -0400
@@ -38,6 +38,7 @@
 #define sleep Sleep
 #include <io.h>
 #else
+#include <strings.h>
 #include <syslog.h>
 #include <unistd.h>
 #include <sys/types.h>
@@ -1187,7 +1188,7 @@
     unsigned int throwaway;
     SSL_CTX *ctx = NULL;
     SSL *ssl = NULL;
-    SSL_METHOD *meth;
+    const SSL_METHOD *meth;
     char zlib_on = 0;
     unsigned char *zlib_buf = NULL;
     int zlib_bufsiz = 0;
@@ -1213,11 +1214,7 @@
     if (flags & SPAMC_USE_SSL) {
 #ifdef SPAMC_SSL
 	SSLeay_add_ssl_algorithms();
-	if (flags & SPAMC_TLSV1) {
-	    meth = TLSv1_client_method();
-	} else {
-	    meth = SSLv3_client_method(); /* default */
-	}
+	meth = SSLv23_client_method();
 	SSL_load_error_strings();
 	ctx = SSL_CTX_new(meth);
 #else
@@ -1596,7 +1593,7 @@
     int failureval;
     SSL_CTX *ctx = NULL;
     SSL *ssl = NULL;
-    SSL_METHOD *meth;
+    const SSL_METHOD *meth;
 
     assert(tp != NULL);
     assert(m != NULL);
@@ -1604,7 +1601,7 @@
     if (flags & SPAMC_USE_SSL) {
 #ifdef SPAMC_SSL
 	SSLeay_add_ssl_algorithms();
-	meth = SSLv3_client_method();
+	meth = SSLv23_client_method();
 	SSL_load_error_strings();
 	ctx = SSL_CTX_new(meth);
 #else
diff -Nru spamassassin-3.4.0/spamc/README.win spamassassin-3.4.2/spamc/README.win
--- spamassassin-3.4.0/spamc/README.win	2014-02-07 03:36:38.000000000 -0500
+++ spamassassin-3.4.2/spamc/README.win	2018-09-13 21:27:52.000000000 -0400
@@ -3,7 +3,11 @@
 
 Spamd currently does not run under Windows, but spamc does.
 
-Spamd does work when built and run in the Cygwin unix emulation
+With SpamAssassin 3.4.2, spamd has been made available for Windows. Note
+that this is still experimental. In terms of stability and perfomance it
+heavily depends on which Perl distribution and/or module versions you
+are using. So do not use it in a production environment. Alternatively,
+spamd also works when built and run in the Cygwin Unix emulation
 environment, and a pure Windows spamc can be used with it. You can also
 run a pure Windows spamc that communicates with spamd running on any
 network accessible computer. The unix sockets option is not supported
@@ -27,8 +31,7 @@
 
 To build SpamAssassin you must have installed a Windows version of Perl
 and the modules that are listed as required in the general SpamAssassin
-documentation. So far the only Windows version of perl this has been
-tested with is ActivePerl.
+documentation.
 
 Building spamc for Windows has been tested with Microsoft Visual C++ 6.0
 and with Microsoft Visual C++ Toolkit 2003. It will probably just work
diff -Nru spamassassin-3.4.0/spamc/spamc.c spamassassin-3.4.2/spamc/spamc.c
--- spamassassin-3.4.0/spamc/spamc.c	2014-02-07 03:36:38.000000000 -0500
+++ spamassassin-3.4.2/spamc/spamc.c	2018-09-13 21:27:52.000000000 -0400
@@ -368,16 +368,11 @@
             case 'S':
             {
                 flags |= SPAMC_USE_SSL;
-		if (!spamc_optarg || (strcmp(spamc_optarg,"sslv3") == 0)) {
-		    flags |= SPAMC_SSLV3;
-		}
-		else if (strcmp(spamc_optarg,"tlsv1") == 0) {
-		    flags |= SPAMC_TLSV1;
-		}
-		else {
-		    libspamc_log(flags, LOG_ERR, "Please specify a legal ssl version (%s)", spamc_optarg);
-		    ret = EX_USAGE;
-		}
+                if(spamc_optarg) {
+                    libspamc_log(flags, LOG_ERR,
+                        "Explicit specification of an SSL/TLS version no longer supported.");
+                    ret = EX_USAGE;
+                }
                 break;
             }
 #endif
diff -Nru spamassassin-3.4.0/spamc/spamc.pod spamassassin-3.4.2/spamc/spamc.pod
--- spamassassin-3.4.0/spamc/spamc.pod	2014-02-07 03:36:38.000000000 -0500
+++ spamassassin-3.4.2/spamc/spamc.pod	2018-09-13 21:27:52.000000000 -0400
@@ -74,6 +74,18 @@
 Note that this fail-over behaviour is incompatible with B<-x>; if that
 switch is used, fail-over will not occur.
 
+=item B<-4>
+
+Use IPv4 only for connecting to server. Restricts domain name resolution of
+spamd server host(s) to address family AF_INET through the C<hints.ai_family>
+flag in the call to getaddrinfo(3).
+
+=item B<-6>
+
+Use IPv6 only for connecting to server. Restricts domain name resolution of
+spamd server host(s) to address family AF_INET6 through the C<hints.ai_family>
+flag in the call to getaddrinfo(3).
+
 =item B<-e> I<command> I<[args]>, B<--pipe-to> I<command> I<[args]>
 
 Instead of writing to stdout, pipe the output to I<command>'s standard input.
@@ -177,12 +189,10 @@
 Sleep for I<sleep> seconds between failed spamd filtering attempts.
 The default is 1 second.
 
-=item B<-S>, B<--ssl>, B<--ssl>=I<sslversion>
+=item B<-S>, B<--ssl>, B<--ssl>
 
 If spamc was built with support for SSL, encrypt data to and from the
 spamd process with SSL; spamd must support SSL as well.
-I<sslversion> specifies the SSL protocol version to use, either
-C<sslv3>, or C<tlsv1>. The default, is C<sslv3>.
 
 =item B<-t> I<timeout>, B<--timeout>=I<timeout>
 
diff -Nru spamassassin-3.4.0/spamd/spamd.raw spamassassin-3.4.2/spamd/spamd.raw
--- spamassassin-3.4.0/spamd/spamd.raw	2014-02-07 03:36:38.000000000 -0500
+++ spamassassin-3.4.2/spamd/spamd.raw	2018-09-13 21:27:54.000000000 -0400
@@ -38,16 +38,11 @@
   }                                                 # REMOVEFORINST
 }
 
-use vars qw($have_getaddrinfo_in_core $have_getaddrinfo_legacy
-            $io_socket_module_name $have_inet4 $have_inet6
-            $ai_addrconfig_flag);
+our ($have_getaddrinfo_in_core, $have_getaddrinfo_legacy, $io_socket_module_name,
+     $have_inet4, $have_inet6, $ai_addrconfig_flag);
+
 # don't force requirement on IO::Socket::IP or IO::Socket::INET6
 BEGIN {
-  use Socket qw(:DEFAULT IPPROTO_TCP);
-
-  # AUTOLOADing 'constants' here enables inlining - see Exporter man page
-  &SOCK_STREAM; &IPPROTO_TCP; &SOMAXCONN;
-
   $have_getaddrinfo_in_core = eval {
     # The Socket module (1.94) bundled with Perl 5.14.* provides
     # new affordances for IPv6, including implementations of the
@@ -59,7 +54,9 @@
     Socket->VERSION(1.96);  # provides NIx_NOSERV, and Exporter tag :addrinfo
   # Socket->VERSION(1.97);  # IO::Socket::IP depends on Socket 1.97
     import Socket qw(/^(?:AI|NI|NIx|EAI)_/);
-    &AI_ADDRCONFIG; &AI_PASSIVE;  # enable inlining
+
+    # AUTOLOADing 'constants' here enables inlining - see Exporter man page
+    &AI_ADDRCONFIG; &AI_PASSIVE;
     &NI_NUMERICHOST, &NI_NUMERICSERV; &NIx_NOSERV; 1;
   };
 
@@ -72,6 +69,11 @@
     &NI_NUMERICHOST; &NI_NUMERICSERV; &NI_NAMEREQD; 1;
   };
 
+  require Socket;
+  import Socket qw(:DEFAULT IPPROTO_TCP);
+
+  &SOCK_STREAM; &IPPROTO_TCP; &SOMAXCONN; # enable inlining
+
   &AF_UNSPEC; &AF_INET; &AF_INET6;  # enable inlining
 
   $ai_addrconfig_flag = 0;
@@ -245,8 +247,9 @@
 use Mail::SpamAssassin::SubProcBackChannel;
 use Mail::SpamAssassin::SpamdForkScaling qw(:pfstates);
 use Mail::SpamAssassin::Logger qw(:DEFAULT log_message);
-use Mail::SpamAssassin::Util qw(untaint_var untaint_file_path
-                                exit_status_str am_running_on_windows);
+use Mail::SpamAssassin::Util qw(untaint_var untaint_file_path secure_tmpdir
+                                exit_status_str am_running_on_windows
+                                get_user_groups);
 use Mail::SpamAssassin::Timeout;
 
 use Getopt::Long;
@@ -293,8 +296,9 @@
 );
 
 sub print_version {
-  printf("%s version %s\n", "SpamAssassin Server", Mail::SpamAssassin::Version());
-  printf("  running on Perl %s\n", join(".", map { $_||=0; $_*1 } ($] =~ /(\d)\.(\d{3})(\d{3})?/)));
+  printf("SpamAssassin Server version %s\n", Mail::SpamAssassin::Version());
+  printf("  running on Perl %s\n",
+         join(".", map( 0+($_||0), ($] =~ /(\d)\.(\d{3})(\d{3})?/) )));
   eval { require IO::Socket::SSL; };
   printf("  with SSL support (%s %s)\n", "IO::Socket::SSL", $IO::Socket::SSL::VERSION) unless ($@);
   eval { require Compress::Zlib; };
@@ -408,12 +412,12 @@
   'sql-config!'              => \$opt{'sql-config'},
   'ssl'                      => \$opt{'ssl'},
   'ssl-port=s'               => \$opt{'ssl-port'},
-  'ssl-version=s'            => \$opt{'ssl-version'},
   'syslog-socket=s'          => \$opt{'syslog-socket'},
   'syslog|s=s'               => \$opt{'syslog'},
   'log-timestamp-fmt:s'      => \$opt{'log-timestamp-fmt'},
   'timeout-tcp|T=i'          => \$opt{'timeout-tcp'},
   'timeout-child|t=i'        => \$opt{'timeout-child'},
+  'timing'                   => \$opt{'timing'},
   'user-config'              => \$opt{'user-config'},
   'username|u=s'             => \$opt{'username'},
   'version|V'                => \$opt{'version'},
@@ -688,21 +692,25 @@
   $clients_per_child = undef if ( $clients_per_child < 1 );
 }
 
-if (defined $opt{'timeout-tcp'}) {
+# Set some "sane" limits for defaults
+$childlimit        ||= 5;
+$clients_per_child ||= 200;
+
+if (defined $opt{'timeout-tcp'} && $opt{'timeout-tcp'} >= 0) {
   $timeout_tcp = $opt{'timeout-tcp'};
-  $timeout_tcp = undef if ($timeout_tcp < 1);
+  $timeout_tcp = undef if ($timeout_tcp == 0);
+}
+else {
+  $timeout_tcp = 30;
 }
 
-if (defined $opt{'timeout-child'}) {
+if (defined $opt{'timeout-child'} && $opt{'timeout-child'} >= 0) {
   $timeout_child = $opt{'timeout-child'};
-  $timeout_child = undef if ($timeout_child < 1);
+  $timeout_child = undef if ($timeout_child == 0);
+}
+else {
+  $timeout_child = 300;
 }
-
-# Set some "sane" limits for defaults
-$childlimit        ||= 5;
-$clients_per_child ||= 200;
-$timeout_child     ||= 300;
-$timeout_tcp       ||= 30;
 
 # ensure scaling parameters are logical
 if ($opt{'min-children'} < 1) {
@@ -742,11 +750,6 @@
 
 # Do whitelist later in tmp dir. Side effect: this will be done as -u user.
 
-my $sslversion = $opt{'ssl-version'} || 'sslv3';
-if ($sslversion !~ /^(?:sslv3|tlsv1)$/) {
-  die "spamd: invalid ssl-version: $opt{'ssl-version'}\n";
-}
-
 $opt{'server-key'}  ||= "$LOCAL_RULES_DIR/certs/server-key.pem";
 $opt{'server-cert'} ||= "$LOCAL_RULES_DIR/certs/server-cert.pem";
 
@@ -804,7 +807,8 @@
            m{^ (?: (ssl) : )?
                (?: \[ ( [^\]]* ) \]
                  | ( [a-z0-9._-]* )
-                 | ( [a-f0-9]* : [a-f0-9]* : [a-f0-9:]* \z )
+                 | ( [a-f0-9]* : [a-f0-9]* : [a-f0-9:]*
+                     (?: % [a-z0-9._~-]* )? \z )
                  | ( \* )
                )?
                (?: : ( [a-z0-9-]* ) )? \z }xsi) {
@@ -896,9 +900,8 @@
                       $socket_info->{ip_addr}, $socket_info->{port}));
 
     } elsif ($socket->isa('IO::Socket::SSL')) {
-      push(@listeninfo, sprintf("SSL [%s]:%s, ssl version %s",
-                      $socket_info->{ip_addr}, $socket_info->{port},
-                      $opt{'ssl-version'}||'sslv3'));
+      push(@listeninfo, sprintf("SSL [%r]:%s", $socket_info->{ip_addr},
+                      $socket_info->{port}));
     }
   }
 
@@ -1037,15 +1040,15 @@
   }
   my($error, @addresses);
   if (!defined $addr || lc $addr eq 'localhost') {  # loopback interface
-    push(@addresses, '127.0.0.1')
-      if $ai_family == &AF_UNSPEC || $ai_family == &AF_INET;
     push(@addresses, '::1')
       if $ai_family == &AF_UNSPEC || $ai_family == &AF_INET6;
-  } elsif ($addr eq '*' || $addr eq '') {  # any address
-    push(@addresses, '0.0.0.0')
+    push(@addresses, '127.0.0.1')
       if $ai_family == &AF_UNSPEC || $ai_family == &AF_INET;
+  } elsif ($addr eq '*' || $addr eq '') {  # any address
     push(@addresses, '::')
       if $ai_family == &AF_UNSPEC || $ai_family == &AF_INET6;
+    push(@addresses, '0.0.0.0')
+      if $ai_family == &AF_UNSPEC || $ai_family == &AF_INET;
   } else {
     ($error, @addresses) = ip_or_name_to_ip_addresses($addr, $ai_family);
   }
@@ -1056,6 +1059,7 @@
 
   dbg("spamd: attempting to listen on IP addresses: %s, port %d",
       join(', ',@addresses), $port);
+  my(@diag_succ, @diag_fail);
   for my $adr (@addresses) {
     my %sockopt = (
       LocalAddr => $adr,
@@ -1068,7 +1072,6 @@
     $sockopt{V6Only} = 1  if $io_socket_module_name eq 'IO::Socket::IP'
                              && IO::Socket::IP->VERSION >= 0.09;
     %sockopt = (%sockopt, (
-      SSL_version     => $sslversion,
       SSL_verify_mode => 0x00,
       SSL_key_file    => $opt{'server-key'},
       SSL_cert_file   => $opt{'server-cert'},
@@ -1085,15 +1088,36 @@
     }
     my $server_inet = $ssl ? IO::Socket::SSL->new(%sockopt)
                            : $io_socket_module_name->new(%sockopt);
-    $server_inet
-      or die sprintf("spamd: could not create %s socket on [%s]:%s: %s\n",
-                     $ssl ? 'IO::Socket::SSL' : $io_socket_module_name,
-                     $adr, $port, $!);
-    push(@listen_sockets, { specs => $socket_specs,
-                            ip_addr => $adr, port => $port,
-                            socket => $server_inet,
-                            fd => $server_inet->fileno }) if $server_inet;
+    my $diag;
+    if (!$server_inet) {
+      $diag = sprintf("could not create %s socket on [%s]:%s: %s",
+                      $ssl ? 'IO::Socket::SSL' : $io_socket_module_name,
+                      $adr, $port, $ssl && $IO::Socket::SSL::SSL_ERROR ?
+                      "$!,$IO::Socket::SSL::SSL_ERROR" : $!);
+      push(@diag_fail, $diag);
+    } else {
+      $diag = sprintf("created %s socket on [%s]:%s",
+                      $ssl ? 'IO::Socket::SSL' : $io_socket_module_name,
+                      $adr, $port);
+      push(@diag_succ, $diag);
+      push(@listen_sockets, { specs => $socket_specs,
+                              ip_addr => $adr, port => $port,
+                              socket => $server_inet,
+                              fd => $server_inet->fileno });
+    }
+    dbg("spamd: %s", $diag);
+  }
+  if (!@diag_fail) {
+    # no failures, nothing to report
+  } elsif (@diag_succ) {  # some failures and some success
+    # just warn of all attempts, successful and failed
+    warn "spamd: $_\n"  for @diag_succ;
+    warn "spamd: $_\n"  for @diag_fail;
+  } else {  # all failed, no success
+    warn "spamd: $_\n"  for @diag_fail[0 .. $#diag_fail-1];
+    die  "spamd: $_\n"  for $diag_fail[-1];
   }
+
   1;
 }
 
@@ -1148,6 +1172,11 @@
   }
 );
 
+#Enable Timing?
+if ($opt{'timing'}) {
+  $spamtest->timer_enable();
+}
+
 # if $clients_per_child == 1, there's no point in copying configs around
 unless ($clients_per_child > 1) {
   # unset $copy_config_p so we don't bother trying to copy things back
@@ -1346,9 +1375,19 @@
       # bug 5518: assignments to $) and $( don't always work on all platforms
       # bug 3900: assignments to $> and $< problems with BSD perl bug
       # use the POSIX functions to hide the platform specific workarounds 
+      dbg("spamd: Privilege de-escalation from user $< and groups $(\n");
+      $! = 0;
       POSIX::setgid($ugid);  # set effective and real gid
+      dbg("spamd: setgid ERRNO is $!\n");
+      $( = $ugid;
+      $) = "$ugid ".(get_user_groups($uuid));  # set effective and real gid/grouplist another way because we lack initgroups in Perl
+      dbg("spamd: group assignment ERRNO is $!\n");
       POSIX::setuid($uuid);  # set effective and real UID
+      dbg("spamd: setuid ERRNO is $!\n");
       $< = $uuid; $> = $uuid;   # bug 5574
+      dbg("spamd: uid assignment ERRNO is $!\n");
+      dbg("spamd: real user is $< \neff user is $> \nreal groups are $( \neff groups are $) \n");
+
 
       # keep the sanity check to catch problems like bug 3900 just in case
       if ( $> != $uuid and $> != ( $uuid - 2**32 ) ) {
@@ -1433,7 +1472,12 @@
       }
       undef $current_user;
 
-      dbg("timing: " . $spamtest->timer_report()) if would_log('dbg', 'timing');
+      #LOG TIMING
+      if ($opt{'timing'}) {
+        info("timing: " . $spamtest->timer_report());
+      } else {
+        dbg("timing: " . $spamtest->timer_report()) if would_log('dbg', 'timing');
+      }
     }
 
     # If the child lives to get here, it will die ...  Muhaha.
@@ -1521,10 +1565,16 @@
     flock($sockets_access_lock_fh, LOCK_UN)
       or die "Can't release sockets-access lock: $!";
   }
-  $client or die sprintf("accept_a_conn: %s accept failed: %s",
+  if(!defined $client) {
+    if(defined($socket)) {
+      die sprintf("accept_a_conn: %s accept failed: %s",
                          ref $socket,
                          !$socket->isa('IO::Socket::SSL') ? $!
                            : $socket->errstr.", $!");
+    } else {
+      die sprintf("accept_a_conn: no socket available");
+    }
+  }
   return ($client, $selected_socket_info);
 }
 
@@ -1703,7 +1753,7 @@
     my ($name, $pwd, $uid, $gid, $quota, $comment, $gcos, $dir, $etc) =
         getpwnam('nobody');
   
-    $) = "$gid $gid";                   # eGID
+    $) = (get_user_groups($uid));       # eGID
     $> = $uid;                          # eUID
     if (!defined($uid) || ($> != $uid and $> != ($uid - 2**32))) {
       die("spamd: setuid to nobody failed");
@@ -1809,6 +1859,7 @@
   my $rmsgid = $mail->get_pristine_header("Resent-Message-Id");
   foreach my $id ((\$msgid, \$rmsgid)) {
     if ( $$id ) {
+      # no re "strict";  # since perl 5.21.8: Ranges of ASCII printables...
       while ( $$id =~ s/\([^\(\)]*\)// )
          { }                           # remove comments and
       $$id =~ s/^\s+|\s+$//g;          # leading and trailing spaces
@@ -1986,9 +2037,11 @@
             "rport=".$remote_port);
 
   {
+    # no re "strict";  # since perl 5.21.8: Ranges of ASCII printables...
     my $safe = $msgid; $safe =~ s/[\x00-\x20\s,]/_/gs; push(@extra, "mid=$safe");
   }
   if ($rmsgid) {
+    # no re "strict";  # since perl 5.21.8: Ranges of ASCII printables...
     my $safe = $rmsgid; $safe =~ s/[\x00-\x20\s,]/_/gs; push(@extra, "rmid=$safe");
   }
   if (defined $status->{bayes_score}) {
@@ -2272,12 +2325,15 @@
 sub got_user_header {
   my ( $client, $header, $value ) = @_;
 
-  if ( $value !~ /^([\x20-\xFF]*)$/ ) {
-    protocol_error("(User header contains control chars)");
-    return 0;
+  { # no re "strict";  # since perl 5.21.8: Ranges of ASCII printables...
+    local $1;
+    if ( $value !~ /^([\x20-\xFF]*)$/ ) {
+      protocol_error("(User header contains control chars)");
+      return 0;
+    }
+    $current_user = $1;
   }
 
-  $current_user = $1;
   if ($opt{'auth-ident'} && !auth_ident($current_user)) {
     return 0;
   }
@@ -2388,6 +2444,7 @@
       return 0;
     }
     $hdrs->{compress_zlib} = 1;
+    dbg("spamd: compress header received\n");
   }
   else {
     protocol_error("(compression type not supported)");
@@ -2459,7 +2516,7 @@
   }
 
   if ($setuid_to_user) {
-    $) = "$gid $gid";                 # change eGID
+    $) = (get_user_groups($uid));     # change eGID
     $> = $uid;                        # change eUID
     if ( !defined($uid) || ( $> != $uid and $> != ( $uid - 2**32 ) ) ) {
       # make it fatal to avoid security breaches
@@ -2603,13 +2660,33 @@
     my $domain    = '';
     if ( $safename =~ /^(.*)\@(.*)$/ ) { $localpart = $1; $domain = $2; }
 
-    $dir =~ s/\%u/${safename}/g;
-    $dir =~ s/\%l/${localpart}/g;
-    $dir =~ s/\%d/${domain}/g;
-    $dir =~ s/\%\%/\%/g;
+    # Do userdir lookup exim-style. 
+    # If a config for the full address exists, use that one
+    # else look for a domain default
+    if ($dir=~/%x/) {
+      ($userdir=$dir)=~s/%x/${safename}/g;
+
+      $prefsfile=$userdir.'/user_prefs';
+      if (-f $prefsfile) {
+        $dir = $userdir;
 
-    $userdir   = $dir;
-    $prefsfile = $dir . '/user_prefs';
+      } else {
+        $dir =~ s/%x/${domain}/g;
+
+        $prefsfile = $dir.'/user_prefs';
+        $userdir   = $dir;
+      }
+
+    # Use the normal escaping
+    } else { 
+      $dir =~ s/\%u/${safename}/g;
+      $dir =~ s/\%l/${localpart}/g;
+      $dir =~ s/\%d/${domain}/g;
+      $dir =~ s/\%\%/\%/g;
+
+      $userdir   = $dir;
+      $prefsfile = $dir . '/user_prefs';
+    }
 
     # Log that the default configuration is being used for a user.
     info("spamd: using default config for $username: $prefsfile");
@@ -2681,7 +2758,7 @@
   }
 
   if ($setuid_to_user) {
-    $) = "$gid $gid";                 # change eGID
+    $) = (get_user_groups($uid));     # change eGID
     $> = $uid;                        # change eUID
     if (!defined($uid) || ($> != $uid and $> != ($uid - 2**32))) {
       # make it fatal to avoid security breaches
@@ -2726,7 +2803,7 @@
   }
 
   if ($setuid_to_user) {
-    $) = "$gid $gid";    # change eGID
+    $) = (get_user_groups($uid));    # change eGID
     $> = $uid;           # change eUID
     if (!defined($uid) || ($> != $uid and $> != ($uid - 2**32))) {
       # make it fatal to avoid security breaches
@@ -2929,8 +3006,8 @@
 }
 
 sub daemonize {
-  # Pretty command line in ps
-  $0 = join (' ', $ORIG_ARG0, @ORIG_ARGV) unless would_log("dbg");
+  # removed bug 7594 # Pretty command line in ps
+    #$0 = join (' ', $ORIG_ARG0, @ORIG_ARGV) unless would_log("dbg");
 
   # be a nice daemon and chdir to the root so we don't block any
   # unmount attempts
@@ -2992,33 +3069,27 @@
 
 sub preload_modules_with_tmp_homedir {
 
-  # set $ENV{HOME} in /tmp while we compile and preload everything.
-  # File::Spec->tmpdir uses TMPDIR, TMP, TEMP, C:/temp, /tmp etc.
-  my $tmpdir = File::Spec->tmpdir();
-  if ( !$tmpdir ) {
-    die "spamd: cannot find writable tmp dir, set TMP or TMPDIR in environment";
-  }
+  # set $ENV{HOME} in a temp directory while we compile and preload everything.
+  my $tmphome = secure_tmpdir();
 
-  # If TMPDIR isn't set, File::Spec->tmpdir() will set it to undefined.
+  # If TMPDIR isn't set, File::Spec->tmpdir() called by secure_tmpdir() may set it to undefined.
   # that then breaks other things ...
+  # If this is really necessary shouldn't secure_tmpdir() be doing it?
   delete $ENV{'TMPDIR'} if ( !defined $ENV{'TMPDIR'} );
 
-  my $tmphome = File::Spec->catdir( $tmpdir, "spamd-$$-init" );
-  $tmphome = untaint_file_path($tmphome);
-
   my $tmpsadir = File::Spec->catdir( $tmphome, ".spamassassin" );
 
   dbg("spamd: Preloading modules with HOME=$tmphome");
 
-  # bug 5379: spamd won't start if the temp preloading dir exists;
-  # be sure to remove it just in case 
+  if (!-d $tmphome) {
+    die "spamd: cannot create temp directory $tmphome: $!";
+  }
+
+  # bug 5379: spamd won't start if the temp preloading dir exists; check if exists and remove it
+  # This check should be unnecessary now that $tmphome created using File::Temp, but leave it just in case
   if (-d $tmpsadir) {
     rmdir( $tmpsadir ) or die "spamd: $tmpsadir not empty: $!";
   }
-  if (-d $tmphome) {
-    rmdir( $tmphome ) or die "spamd: $tmphome not empty: $!";
-  }
-  mkdir( $tmphome,  0700 ) or die "spamd: cannot create $tmphome: $!";
   mkdir( $tmpsadir, 0700 ) or die "spamd: cannot create $tmpsadir: $!";
   $ENV{HOME} = $tmphome;
 
@@ -3203,13 +3274,13 @@
  -H [dir], --helper-home-dir[=dir] Specify a different HOME directory
  --ssl                             Enable SSL on TCP connections
  --ssl-port port                   Override --port setting for SSL connections
- --ssl-version sslversion          Specify SSL protocol version to use
  --server-key keyfile              Specify an SSL keyfile
  --server-cert certfile            Specify an SSL certificate
  --socketpath=path                 Listen on a given UNIX domain socket
  --socketowner=name                Set UNIX domain socket file's owner
  --socketgroup=name                Set UNIX domain socket file's group
  --socketmode=mode                 Set UNIX domain socket file's mode
+ --timing                          Enable timing and logging
  -V, --version                     Print version and exit
 
 The --listen option (or -i) may be specified multiple times, its syntax
@@ -3379,6 +3450,10 @@
 words, if the username is an email address, this is the part after the C<@>
 sign.
 
+=item %x -- replaced with the full name of the current user, as sent by spamc.
+If the resulting config directory does not exist, replace with the domain part 
+to use a domain-wide default.   
+
 =item %% -- replaced with a single percent sign (%).
 
 =back
@@ -3691,14 +3766,6 @@
 SSL connections (default: whatever --port uses).  See B<--ssl> for
 more details.
 
-=item B<--ssl-version>=I<sslversion>
-
-Specify the SSL protocol version to use, one of B<sslv3> or B<tlsv1>.
-The default, B<sslv3>, is the most flexible, accepting a SSLv3 or
-higher hello handshake, then negotiating use of SSLv3 or TLSv1
-protocol if the client can accept it.  Specifying B<--ssl-version>
-implies B<--ssl>.
-
 =item B<--server-key> I<keyfile>
 
 Specify the SSL key file to use for SSL connections.
@@ -3745,6 +3812,12 @@
 used, that user should have write permissions to unlink the file later, for
 when the C<spamd> server is killed.
 
+
+=item B<--timing>
+
+  Enable timing measurements and output the information for logging.  This
+  is the same information as provided by the TIMING tag.
+
 =back
 
 =head1 SEE ALSO
diff -Nru spamassassin-3.4.0/spamd-apache2/bin/apache-spamd.pl spamassassin-3.4.2/spamd-apache2/bin/apache-spamd.pl
--- spamassassin-3.4.0/spamd-apache2/bin/apache-spamd.pl	2014-02-07 03:36:22.000000000 -0500
+++ spamassassin-3.4.2/spamd-apache2/bin/apache-spamd.pl	2018-09-13 21:27:51.000000000 -0400
@@ -297,7 +297,7 @@
 }
 
 # as above, cached version
-use vars '$apache_module_path';
+our $apache_module_path;
 sub apache_module_path {
 	my $modname = shift;
 	$apache_module_path ||= get_libexecdir();    # path is cached
diff -Nru spamassassin-3.4.0/spamd-apache2/lib/Mail/SpamAssassin/Spamd/Apache2/AclIP.pm spamassassin-3.4.2/spamd-apache2/lib/Mail/SpamAssassin/Spamd/Apache2/AclIP.pm
--- spamassassin-3.4.0/spamd-apache2/lib/Mail/SpamAssassin/Spamd/Apache2/AclIP.pm	2014-02-07 03:36:22.000000000 -0500
+++ spamassassin-3.4.2/spamd-apache2/lib/Mail/SpamAssassin/Spamd/Apache2/AclIP.pm	2018-09-13 21:27:51.000000000 -0400
@@ -6,6 +6,9 @@
 use Apache2::Module    ();
 use Apache2::ServerRec ();
 
+use Apache::Test;
+use constant APACHE24   => have_min_apache_version('2.4.0');
+
 use Mail::SpamAssassin::Logger;
 
 =head1 NAME
@@ -40,7 +43,7 @@
 
 =head1 SEE ALSO
 
-L<Mail::SpamAssassin::Spamd::Apache2::Config(3)>
+C<Mail::SpamAssassin::Spamd::Apache2::Config(3)>
 
 =cut
 
@@ -61,14 +64,17 @@
   # my $ip = NetAddr::IP::Lite->new($c->remote_ip)
   #   or return Apache2::Const::SERVER_ERROR;   # log it, shouldn't happen
 
-  my $remote = $c->remote_addr;
+  #use Apache::Test have_min_apache_version to support MP under Apache 2.2 and 2.4
+  my $remote = APACHE24 ? $c->client_addr : $c->remote_addr;
+
   for my $allowed (@{ $srv_cfg->{allowed_networks} }) {
     # depends on allowed_ips format; TODO; if NetAddr::IP::Lite:
     # return Apache2::Const::OK if $allowed->contains($ip);
     return Apache2::Const::OK if $allowed->test($remote);
   }
 
-  info(sprintf "access denied for '%s'", $c->remote_ip);
+  info(sprintf "access denied for '%s'", APACHE24 ? $c->client_ip : $c->remote_ip);
+
   return Apache2::Const::FORBIDDEN;
 }
 
diff -Nru spamassassin-3.4.0/spamd-apache2/lib/Mail/SpamAssassin/Spamd/Apache2/AclRFC1413.pm spamassassin-3.4.2/spamd-apache2/lib/Mail/SpamAssassin/Spamd/Apache2/AclRFC1413.pm
--- spamassassin-3.4.0/spamd-apache2/lib/Mail/SpamAssassin/Spamd/Apache2/AclRFC1413.pm	2014-02-07 03:36:22.000000000 -0500
+++ spamassassin-3.4.2/spamd-apache2/lib/Mail/SpamAssassin/Spamd/Apache2/AclRFC1413.pm	2018-09-13 21:27:51.000000000 -0400
@@ -7,6 +7,9 @@
 use Apache2::RequestRec  ();
 use Apache2::Access      ();    # $r->get_remote_logname
 
+use Apache::Test;
+use constant APACHE24   => have_min_apache_version('2.4.0');
+
 use APR::SockAddr ();           # $c->remote_addr->...
 use APR::Table    ();           # $c->notes
 
@@ -69,8 +72,8 @@
 
   unless (defined $remote_user && length $remote_user) {
     warn 'rfc1413 check: failed to obtain info for '
-      . $c->remote_addr->ip_get() . ':'
-      . $c->remote_addr->port() . "\n";
+      . APACHE24 ? $c->client_addr->ip_get() : $c->remote_addr->ip_get() . ':'
+      . APACHE24 ? $c->client_addr->port() : $c->remote_addr->port() . "\n";
     return Apache2::Const::FORBIDDEN;
   }
 
@@ -93,14 +96,14 @@
   my ($c, $user) = @_;
   my $remote_user = $c->notes->{remote_user};
   die "rfc1413 check: no query result for user=$user ip="
-    . $c->remote_addr->ip_get()
+    . APACHE24 ? $c->client_addr->ip_get() : $c->remote_addr->ip_get()
     . ' port='
-    . $c->remote_addr->port()
+    . APACHE24 ? $c->client_addr->port() : $c->remote_addr->port()
     unless defined $remote_user && length $remote_user;
   return $remote_user if $user eq $remote_user;
   warn "ident mismatch for [$user] from "
-    . $c->remote_addr->ip_get() . ':'
-    . $c->remote_addr->port()
+    . APACHE24 ? $c->client_addr->ip_get() : $c->remote_addr->ip_get() . ':'
+    . APACHE24 ? $c->client_addr->port() : $c->remote_addr->port()
     . "; remote identd returned [$remote_user]\n";
   0;
 }
@@ -126,7 +129,7 @@
 
 =head1 SEE ALSO
 
-L<Mail::SpamAssassin::Spamd::Apache2::Config(3)>
+C<Mail::SpamAssassin::Spamd::Apache2::Config(3)>
 
 =cut
 
diff -Nru spamassassin-3.4.0/spamd-apache2/lib/Mail/SpamAssassin/Spamd/Apache2/Config.pm spamassassin-3.4.2/spamd-apache2/lib/Mail/SpamAssassin/Spamd/Apache2/Config.pm
--- spamassassin-3.4.0/spamd-apache2/lib/Mail/SpamAssassin/Spamd/Apache2/Config.pm	2014-02-07 03:36:22.000000000 -0500
+++ spamassassin-3.4.2/spamd-apache2/lib/Mail/SpamAssassin/Spamd/Apache2/Config.pm	2018-09-13 21:27:51.000000000 -0400
@@ -26,10 +26,10 @@
 =head1 DESCRIPTION
 
 Provides Apache config directives for configuring spamd.  Initializes the
-L<Mail::SpamAssassin> object.
+C<Mail::SpamAssassin> object.
 
-Note, that the defaults here apply to *this* code; L<apache-spamd.pl(1)>
-sets different ones to be compatible with L<spamd(1)>.
+Note, that the defaults here apply to *this* code; C<apache-spamd.pl(1)>
+sets different ones to be compatible with C<spamd(1)>.
 
 =head1 DIRECTIVES
 
@@ -84,7 +84,7 @@
 
 Enables RFC 1413 (ident) checks incoming connections.  Note, that checking
 if a *remote* login matches a *local* one is usually pointless.  See
-L<Mail::SpamAssassin::Apache2::AclRFC1413(3)> for more details.
+C<Mail::SpamAssassin::Apache2::AclRFC1413(3)> for more details.
 
 Adds a handler:
 
@@ -162,7 +162,7 @@
 =item C<SANew key "value">
 
 Additional arguments to C<Mail::SpamAssassin->new()>.  Refer to
-L<Mail::SpamAssassin(3)>.
+C<Mail::SpamAssassin(3)>.
 
 =cut
 
@@ -563,12 +563,12 @@
 
 =head1 SEE ALSO
 
-L<httpd(8)>,
-L<spamd(1)>,
-L<apache-spamd(1)>,
-L<Mail::SpamAssassin::Spamd::Apache2(3)>,
-L<Mail::SpamAssassin::Spamd::Apache2::AclIP(3)>,
-L<Mail::SpamAssassin::Spamd::Apache2::AclRFC1413(3)>
+C<httpd(8)>,
+C<spamd(1)>,
+C<apache-spamd(1)>,
+C<Mail::SpamAssassin::Spamd::Apache2(3)>,
+C<Mail::SpamAssassin::Spamd::Apache2::AclIP(3)>,
+C<Mail::SpamAssassin::Spamd::Apache2::AclRFC1413(3)>
 
 =cut
 
diff -Nru spamassassin-3.4.0/spamd-apache2/lib/Mail/SpamAssassin/Spamd/Apache2.pm spamassassin-3.4.2/spamd-apache2/lib/Mail/SpamAssassin/Spamd/Apache2.pm
--- spamassassin-3.4.0/spamd-apache2/lib/Mail/SpamAssassin/Spamd/Apache2.pm	2014-02-07 03:36:22.000000000 -0500
+++ spamassassin-3.4.2/spamd-apache2/lib/Mail/SpamAssassin/Spamd/Apache2.pm	2018-09-13 21:27:51.000000000 -0400
@@ -17,10 +17,12 @@
 use APR::SockAddr ();
 use APR::Socket   ();
 use APR::Status   ();
+use Apache::Test;
+use constant APACHE24   => have_min_apache_version('2.4.0');
 
 eval { use Time::HiRes qw(time); };
 
-use vars qw($spamtest);
+our $spamtest;
 
 use Mail::SpamAssassin ();
 use Mail::SpamAssassin::Message ();
@@ -159,8 +161,8 @@
 
 sub _server      { $_[0]->c->base_server }          # -: a
 sub _remote_host { $_[0]->c->get_remote_host }      # -: a
-sub _remote_ip   { $_[0]->c->remote_ip }            # -: a
-sub _remote_port { $_[0]->c->remote_addr->port }    # -: a
+sub _remote_ip   { APACHE24 ? $_[0]->c->client_ip : $_[0]->c->remote_ip; }            # -: a
+sub _remote_port { APACHE24 ? $_[0]->c->client_addr->port : $_[0]->c->remote_addr->port }    # -: a
 
 
 sub send_buffer { # -: A
@@ -379,10 +381,10 @@
 
 =head1 SEE ALSO
 
-L<httpd(8)>,
-L<spamd(1)>,
-L<apache-spamd(1)>,
-L<Mail::SpamAssassin::Spamd::Apache2::Config(3)>
+C<httpd(8)>,
+C<spamd(1)>,
+C<apache-spamd(1)>,
+C<Mail::SpamAssassin::Spamd::Apache2::Config(3)>
 
 =cut
 
diff -Nru spamassassin-3.4.0/spamd-apache2/lib/Mail/SpamAssassin/Spamd/Config.pm spamassassin-3.4.2/spamd-apache2/lib/Mail/SpamAssassin/Spamd/Config.pm
--- spamassassin-3.4.0/spamd-apache2/lib/Mail/SpamAssassin/Spamd/Config.pm	2014-02-07 03:36:22.000000000 -0500
+++ spamassassin-3.4.2/spamd-apache2/lib/Mail/SpamAssassin/Spamd/Config.pm	2018-09-13 21:27:51.000000000 -0400
@@ -26,14 +26,14 @@
 Returns blessed hash reference, containing coherent set of options.
 Dies on error.
 
-See source and L<spamd(1)> for list of valid options.
+See source and C<spamd(1)> for list of valid options.
 
 =head1 WARNING
 
 This interface is considered experimental and likely to change.  Notify the dev
 list if you're planning to rely on it.
 
-Getopt::Long::Configure is used to modify global L<Getopt::Long(3)>
+Getopt::Long::Configure is used to modify global C<Getopt::Long(3)>
 configuration.  If you don't want C<:bundling> and / or wish to enable /
 disable something else for whatever reason... well, keep that in mind.
 
@@ -45,8 +45,8 @@
 
 =head1 SEE ALSO
 
-L<spamd(1)>,
-L<apache-spamd(1)>
+C<spamd(1)>,
+C<apache-spamd(1)>
 
 =cut
 
diff -Nru spamassassin-3.4.0/spamd-apache2/lib/Mail/SpamAssassin/Spamd.pm spamassassin-3.4.2/spamd-apache2/lib/Mail/SpamAssassin/Spamd.pm
--- spamassassin-3.4.0/spamd-apache2/lib/Mail/SpamAssassin/Spamd.pm	2014-02-07 03:36:22.000000000 -0500
+++ spamassassin-3.4.2/spamd-apache2/lib/Mail/SpamAssassin/Spamd.pm	2018-09-13 21:27:51.000000000 -0400
@@ -1,6 +1,6 @@
 package Mail::SpamAssassin::Spamd;
 
-use vars qw(%conf_backup %msa_backup);
+our (%conf_backup, %msa_backup);
 
 use Mail::SpamAssassin::Logger;
 eval { use Time::HiRes qw(time); };
@@ -45,7 +45,16 @@
 
 Interface is likely to change.
 
-See the source code of L<spamd(1)> and L<Mail::SpamAssassin::Spamd::Apache2(3)>.
+See the source code of C<spamd(1)> and C<Mail::SpamAssassin::Spamd::Apache2(3)>.
+
+=head1 AUTHORS
+
+The SpamAssassin(tm) Project E<lt>http://spamassassin.apache.org/E<gt>
+
+=head1 COPYRIGHT
+
+SpamAssassin is distributed under the Apache License, Version 2.0, as
+described in the file C<LICENSE> included with the distribution.
 
 =head2 METHODS
 
diff -Nru spamassassin-3.4.0/spamd-apache2/Makefile.PL spamassassin-3.4.2/spamd-apache2/Makefile.PL
--- spamassassin-3.4.0/spamd-apache2/Makefile.PL	2014-02-07 03:36:22.000000000 -0500
+++ spamassassin-3.4.2/spamd-apache2/Makefile.PL	2018-09-13 21:27:51.000000000 -0400
@@ -20,7 +20,7 @@
 	VERSION   => '0.03',
 	NAME      => 'Mail::SpamAssassin::Spamd::Apache2',
 	ABSTRACT  => 'mod_perl2 module implementing spamd in Apache2',
-	AUTHOR    => 'Radoslaw Zielinski <radek@pld-linux.org>',
+	AUTHOR    => 'The Apache SpamAssassin Project <dev at spamassassin.apache.org>',
 	EXE_FILES => [qw(bin/apache-spamd.pl)],
 	PREREQ_PM => {
 		'mod_perl2'          => 2,
diff -Nru spamassassin-3.4.0/spamd-apache2/README.apache spamassassin-3.4.2/spamd-apache2/README.apache
--- spamassassin-3.4.0/spamd-apache2/README.apache	2014-02-07 03:36:22.000000000 -0500
+++ spamassassin-3.4.2/spamd-apache2/README.apache	2018-09-13 21:27:51.000000000 -0400
@@ -45,28 +45,20 @@
 
 
 BUGS
+  
+See <http://issues.apache.org/SpamAssassin/> to report a bug.
 
-For now, report to me directly or to the SpamAssassin dev list.
+Please include perl, Apache and mod_perl versions. 
 
-Include perl, Apache and mod_perl versions.  `httpd -V` shouldn't hurt
-(unless you know it doesn't matter in your case).  `httpd -l` might also
-be handy, if you're reporting an apache-spamd.pl issue.  Don't forget
-relevant lines from logs/error_log.
+`httpd -V` shouldn't hurt (unless you know it doesn't matter in your case).  
+`httpd -l` might also be handy, if you're reporting an apache-spamd.pl issue.
+Don't forget relevant lines from logs/error_log.
 
-Known bugs: worker (and other threading MPMs) probably will cause
+Known bugs: 
+
+Worker (and other threading MPMs) probably will cause
 problems.  SA isn't really thread-safe; one example is using umask().
 Some helpers like Razor / Pyzor / DCC probably do chdir().  I consider
 this a problem of SA, not this code.
 
-
-COPYRIGHT AND LICENCE
-
-Copyright (C) 2006 by Radosław Zieliński <radek@pld-linux.org>
-
-Based on spamd code, (C) by The SpamAssassin(tm) Project
-
-This library is free software; you can redistribute it and/or modify it
-under the terms of the Apache License, Version 2.0.
-
-
 # vim: encoding=utf8
diff -Nru spamassassin-3.4.0/sql/awl_pg.sql spamassassin-3.4.2/sql/awl_pg.sql
--- spamassassin-3.4.0/sql/awl_pg.sql	2014-02-07 03:36:33.000000000 -0500
+++ spamassassin-3.4.2/sql/awl_pg.sql	2018-09-13 21:27:52.000000000 -0400
@@ -7,3 +7,6 @@
   signedby varchar(255) NOT NULL default '',
   PRIMARY KEY (username,email,signedby,ip)
 );
+
+ALTER TABLE awl SET (fillfactor=95);
+
diff -Nru spamassassin-3.4.0/sql/bayes_pg.sql spamassassin-3.4.2/sql/bayes_pg.sql
--- spamassassin-3.4.0/sql/bayes_pg.sql	2014-02-07 03:36:33.000000000 -0500
+++ spamassassin-3.4.2/sql/bayes_pg.sql	2018-09-13 21:27:52.000000000 -0400
@@ -32,6 +32,8 @@
 
 CREATE INDEX bayes_token_idx1 ON bayes_token (token);
 
+ALTER TABLE bayes_token SET (fillfactor=95);
+
 CREATE TABLE bayes_vars (
   id serial NOT NULL,
   username varchar(200) NOT NULL default '',
diff -Nru spamassassin-3.4.0/sql/README.bayes spamassassin-3.4.2/sql/README.bayes
--- spamassassin-3.4.0/sql/README.bayes	2014-02-07 03:36:33.000000000 -0500
+++ spamassassin-3.4.2/sql/README.bayes	2018-09-13 21:27:52.000000000 -0400
@@ -149,10 +149,10 @@
 
 GRANT SELECT, UPDATE, DELETE, INSERT ON TABLE bayes_token TO <username>;
 GRANT SELECT, UPDATE, DELETE, INSERT ON TABLE bayes_vars TO <username>;
-GRANT SELECT, DELETE, INSERT ON TABLE bayes_seen TO <username>;
+GRANT SELECT, UPDATE, DELETE, INSERT ON TABLE bayes_seen TO <username>;
 GRANT SELECT, DELETE, INSERT ON TABLE bayes_expire TO <username>;
 GRANT SELECT ON TABLE bayes_global_vars TO <username>;
-GRANT UPDATE, SELECT, INSERT ON bayes_vars_id_seq TO <username>;
+GRANT USAGE, SELECT, UPDATE ON SEQUENCE bayes_vars_id_seq TO <username>;
 
 Once you have created the database and added the tables, just add the
 required lines to your global configuration file (local.cf).
diff -Nru spamassassin-3.4.0/sql/README.txrep spamassassin-3.4.2/sql/README.txrep
--- spamassassin-3.4.0/sql/README.txrep	1969-12-31 19:00:00.000000000 -0500
+++ spamassassin-3.4.2/sql/README.txrep	2018-09-13 21:27:52.000000000 -0400
@@ -0,0 +1,101 @@
+
+Using SpamAssassin Automatic Reputation With An SQL Database
+-------------------------------------------------------
+
+The TxRep plugin improves on the earlier Auto-Whitelist plugin.
+The most common use for a system like this would be for tracking
+the expected spam score (or reputation) of frequent senders. A
+domain that sends frequent spam will lose reputation (or gain
+spam score) over time.
+
+In order to activate the SQL based reputation system you have to
+configure spamassassin and spamd to use the appropriate storage
+backend. This is done with the txrep_factory config variable,
+like so:
+
+txrep_factory Mail::SpamAssassin::SQLBasedAddrList
+
+SpamAssassin will check the global configuration file (ie. any file
+matching /etc/mail/spamassassin/*.cf) for the following settings:
+
+user_awl_dsn                 DBI:driver:database:hostname[:port]
+user_awl_sql_username        dbusername
+user_awl_sql_password        dbpassword
+
+These settings are identical to those for the AWL plugin, so you
+do not need to change these if you are upgrading.
+
+The first option, user_awl_dsn, describes the data source name that
+will be used to create the connection to your SQL server.  It MUST be
+in the format as listed above.  <driver> should be the DBD driver that
+you have installed to access your database (the most common being
+MySQL (driver is 'mysql'), PostgreSQL ('Pg') and SQLite ('SQLite')).
+<database> must be the name of the database that you created to store
+the txrep table. <hostname> is the name of the host that contains
+the SQL database server.  <port> is the optional port number where your
+database server is listening.
+
+user_awl_dsn                DBI:mysql:spamassassin:localhost
+
+Would tell SpamAssassin to connect to the database named spamassassin using
+MySQL on the local server, and since <port> is omitted, the driver will use
+the default port number.  The other two required options tells SpamAssassin
+to use the defined username and password to establish the connection.
+
+If the user_awl_dsn option does not exist, SpamAssassin will not attempt
+to use SQL for tracking reputations.
+
+One additional configuration option exists that allows you to set the
+table name for the txrep table.
+
+user_awl_sql_table           txrep
+
+For an example of connecting to a PostgreSQL database, see the README file.
+
+Requirements
+------------
+
+In order for SpamAssassin to work with your SQL database, you must have
+the perl DBI module installed, AS WELL AS the DBD driver/module for your
+specific database.  For example, if using MySQL as your RDBMS, you must have
+the Msql-Mysql (DBD::mysql) module installed.  Check CPAN for the latest
+versions of DBI and your database driver/module.
+
+Database Schema
+---------------
+
+The database must contain a table named by 'user_awl_sql_table' (default
+setting: "txrep") with at least the fields specified in the accompanying
+SQL files.
+
+You can add as many other fields you wish as long as the required fields
+are contained in the table.
+
+To install the table, use the following command:
+
+mysql -h <hostname> -u <adminusername> -p <databasename> < txrep_mysql.sql
+Enter password: <adminpassword>
+
+For PostgreSQL, use the following:
+
+psql -U <username> -f txrep_pg.sql <databasename>
+
+Once you have created the database and added the table, just add the
+required lines to your global configuration file (local.cf).  Note that
+you must specify the proper storage backend in the config file in order
+for this to work and the current username must be passed to spamd.
+
+Maintenance
+---------------
+
+It is recommended to keep user_awl_sql_table clear of stale data, for
+performance reasons. A sample query that can be run on a regular
+schedule is below:
+
+DELETE FROM txrep WHERE last_hit <= (now() - INTERVAL 120 day);
+
+For PostgreSQL, use the following:
+
+DELETE FROM txrep WHERE last_hit <= (now() - INTERVAL '120 day');
+
+
diff -Nru spamassassin-3.4.0/sql/txrep_mysql.sql spamassassin-3.4.2/sql/txrep_mysql.sql
--- spamassassin-3.4.0/sql/txrep_mysql.sql	1969-12-31 19:00:00.000000000 -0500
+++ spamassassin-3.4.2/sql/txrep_mysql.sql	2018-09-13 21:27:52.000000000 -0400
@@ -0,0 +1,11 @@
+CREATE TABLE txrep (
+  username varchar(100) NOT NULL default '',
+  email varchar(255) NOT NULL default '',
+  ip varchar(40) NOT NULL default '',
+  count int(11) NOT NULL default '0',
+  totscore float NOT NULL default '0',
+  signedby varchar(255) NOT NULL default '',
+  last_hit timestamp NOT NULL default CURRENT_TIMESTAMP ON UPDATE CURRENT_TIMESTAMP,
+  PRIMARY KEY (username,email,signedby,ip),
+  KEY last_hit (last_hit)
+) ENGINE=InnoDB;
diff -Nru spamassassin-3.4.0/sql/txrep_pg.sql spamassassin-3.4.2/sql/txrep_pg.sql
--- spamassassin-3.4.0/sql/txrep_pg.sql	1969-12-31 19:00:00.000000000 -0500
+++ spamassassin-3.4.2/sql/txrep_pg.sql	2018-09-13 21:27:52.000000000 -0400
@@ -0,0 +1,27 @@
+CREATE TABLE txrep (
+  username varchar(100) NOT NULL default '',
+  email varchar(255) NOT NULL default '',
+  ip varchar(40) NOT NULL default '',
+  count int(11) NOT NULL default '0',
+  totscore float NOT NULL default '0',
+  signedby varchar(255) NOT NULL default '',
+  last_hit timestamp NOT NULL default CURRENT_TIMESTAMP,
+  PRIMARY KEY (username,email,signedby,ip)
+);
+
+create index txrep_last_hit on txrep (last_hit);
+
+create OR REPLACE function update_txrep_last_hit()
+RETURNS TRIGGER AS $$
+BEGIN
+  NEW.last_hit = CURRENT_TIMESTAMP;
+  RETURN NEW;
+END;
+$$ language 'plpgsql';
+
+create TRIGGER update_txrep_update_last_hit BEFORE UPDATE
+ON txrep FOR EACH ROW EXECUTE PROCEDURE
+update_txrep_last_hit();
+
+ALTER TABLE txrep SET (fillfactor=95);
+
diff -Nru spamassassin-3.4.0/t/autolearn_force_fail.t spamassassin-3.4.2/t/autolearn_force_fail.t
--- spamassassin-3.4.0/t/autolearn_force_fail.t	2014-02-07 03:36:38.000000000 -0500
+++ spamassassin-3.4.2/t/autolearn_force_fail.t	2018-09-13 21:27:54.000000000 -0400
@@ -2,17 +2,13 @@
 
 use lib '.'; use lib 't';
 use SATest; sa_t_init("autolearn_force_fail");
-use Test; 
 
-use Test;
+use constant HAS_DB_FILE => eval { require DB_File; };
 
-use constant TEST_ENABLED => eval { require DB_File; };
+use Test::More;
 
-BEGIN {
-  plan tests => (TEST_ENABLED ? 3 : 0);
-};
-
-exit unless TEST_ENABLED;
+plan skip_all => 'Need DB_File for this test' unless HAS_DB_FILE;
+plan tests => 3;
 
 # ---------------------------------------------------------------------------
 
diff -Nru spamassassin-3.4.0/t/autolearn_force.t spamassassin-3.4.2/t/autolearn_force.t
--- spamassassin-3.4.0/t/autolearn_force.t	2014-02-07 03:36:37.000000000 -0500
+++ spamassassin-3.4.2/t/autolearn_force.t	2018-09-13 21:27:54.000000000 -0400
@@ -2,16 +2,13 @@
 
 use lib '.'; use lib 't';
 use SATest; sa_t_init("autolearn_force");
-use Test;
 
-use constant TEST_ENABLED => eval { require DB_File; };
+use constant HAS_DB_FILE => eval { require DB_File; };
 
-BEGIN {
-  plan tests => (TEST_ENABLED ? 2 : 0);
-};
-
-exit unless TEST_ENABLED;
+use Test::More;
 
+plan skip_all => 'Need DB_File for this test' unless HAS_DB_FILE;
+plan tests => 2;
 
 # ---------------------------------------------------------------------------
 
diff -Nru spamassassin-3.4.0/t/autolearn.t spamassassin-3.4.2/t/autolearn.t
--- spamassassin-3.4.0/t/autolearn.t	2014-02-07 03:36:37.000000000 -0500
+++ spamassassin-3.4.2/t/autolearn.t	2018-09-13 21:27:54.000000000 -0400
@@ -2,16 +2,13 @@
 
 use lib '.'; use lib 't';
 use SATest; sa_t_init("autolearn");
-use Test;
 
-use constant TEST_ENABLED => eval { require DB_File; };
+use constant HAS_DB_FILE => eval { require DB_File; };
 
-BEGIN {
-  plan tests => (TEST_ENABLED ? 2 : 0);
-};
-
-exit unless TEST_ENABLED;
+use Test::More;
 
+plan skip_all => 'Need DB_File for this test' unless HAS_DB_FILE;
+plan tests => 2;
 
 # ---------------------------------------------------------------------------
 
diff -Nru spamassassin-3.4.0/t/basic_lint.t spamassassin-3.4.2/t/basic_lint.t
--- spamassassin-3.4.0/t/basic_lint.t	2014-02-07 03:36:38.000000000 -0500
+++ spamassassin-3.4.2/t/basic_lint.t	2018-09-13 21:27:53.000000000 -0400
@@ -2,7 +2,7 @@
 
 use lib '.'; use lib 't';
 use SATest; sa_t_init("basic_lint");
-use Test; BEGIN { plan tests => 1 };
+use Test::More tests => 1;
 
 # ---------------------------------------------------------------------------
 
diff -Nru spamassassin-3.4.0/t/basic_lint_without_sandbox.t spamassassin-3.4.2/t/basic_lint_without_sandbox.t
--- spamassassin-3.4.0/t/basic_lint_without_sandbox.t	2014-02-07 03:36:37.000000000 -0500
+++ spamassassin-3.4.2/t/basic_lint_without_sandbox.t	2018-09-13 21:27:54.000000000 -0400
@@ -4,7 +4,7 @@
 
 use lib '.'; use lib 't';
 use SATest; sa_t_init("basic_lint_without_sandbox");
-use Test; BEGIN { plan tests => 3 };
+use Test::More tests => 3;
 
 # ---------------------------------------------------------------------------
 
@@ -23,9 +23,12 @@
 # when running from the built tarball or make disttest, we will not have a full
 # rules dir -- therefore no 70_sandbox.cf.  We will also have no 50_scores.cf,
 # so we can use that to tell if this is the case
-skip (!-f $scoresfile, -f $sandboxfile);
-unlink $sandboxfile;
-skip (!-f $scoresfile, !-f $sandboxfile);
+SKIP: {
+    skip( "Not on a sandbox", 2 ) unless -f $scoresfile;
+    ok -f $sandboxfile;
+    unlink $sandboxfile;
+    ok !-f $sandboxfile;
+}
 
 sarun ("-L --lint", \&patterns_run_cb);
 ok_all_patterns();
diff -Nru spamassassin-3.4.0/t/basic_meta.t spamassassin-3.4.2/t/basic_meta.t
--- spamassassin-3.4.0/t/basic_meta.t	2014-02-07 03:36:38.000000000 -0500
+++ spamassassin-3.4.2/t/basic_meta.t	2018-09-13 21:27:54.000000000 -0400
@@ -16,19 +16,21 @@
 }
 
 use strict;
+use lib '.'; use lib 't';
 use SATest; sa_t_init("meta");
-use Test;
+
 use Mail::SpamAssassin;
 
 use vars qw( %rules %scores $perl_path);
 
 # "parse-rules-for-masses" requires Data::Dumper
 use constant HAS_DATADUMPER => eval 'use Data::Dumper; 1;';
-use constant IS_WINDOWS => ($^O =~ /^(mswin|dos|os2)/oi);
-use constant DO_RUN     => HAS_DATADUMPER && !IS_WINDOWS;
 
-plan tests => (DO_RUN ? 2 : 0);
-exit unless DO_RUN;
+use Test::More;
+
+plan skip_all => "Needs Data::Dumper" unless HAS_DATADUMPER;
+plan skip_all => "Tests don't work on Windows" if $^O =~ /^(mswin|dos|os2)/i;
+plan tests => 2;
 
 # meta failures
 my $meta_dependency_disabled = 0;
diff -Nru spamassassin-3.4.0/t/basic_obj_api.t spamassassin-3.4.2/t/basic_obj_api.t
--- spamassassin-3.4.0/t/basic_obj_api.t	2014-02-07 03:36:37.000000000 -0500
+++ spamassassin-3.4.2/t/basic_obj_api.t	2018-09-13 21:27:54.000000000 -0400
@@ -18,7 +18,7 @@
 
 use lib '.'; use lib 't';
 use SATest; sa_t_init("basic_obj_api");
-use Test; BEGIN { plan tests => 4 };
+use Test::More tests => 4;
 
 # ---------------------------------------------------------------------------
 
diff -Nru spamassassin-3.4.0/t/bayesbdb.t spamassassin-3.4.2/t/bayesbdb.t
--- spamassassin-3.4.0/t/bayesbdb.t	2014-02-07 03:36:38.000000000 -0500
+++ spamassassin-3.4.2/t/bayesbdb.t	2018-09-13 21:27:54.000000000 -0400
@@ -3,12 +3,10 @@
 use Data::Dumper;
 use lib '.'; use lib 't';
 use SATest; sa_t_init("bayes");
-use Test;
 
-use constant TEST_ENABLED => conf_bool('run_long_tests') && eval {
-  require BerkeleyDB; no warnings qw(once); $BerkeleyDB::db_version >= 4.6;
-};
+use constant HAS_BDB => eval { require BerkeleyDB };
 
+use Test::More;
 BEGIN { 
   if (-e 't/test_dir') {
     chdir 't';
@@ -17,11 +15,18 @@
   if (-e 'test_dir') {
     unshift(@INC, '../blib/lib');
   }
+}
 
-  plan tests => (TEST_ENABLED ? 42 : 0);
-};
+plan skip_all => "Long running tests disabled" unless conf_bool('run_long_tests');
+plan skip_all => "BerkeleyDB is unavailable" unless HAS_BDB;
+
+{
+  no warnings 'once';
+  plan skip_all => "BerkeleyDB >= 4.6 is required" unless $BerkeleyDB::db_version >= 4.6;
+}
+
+plan tests => 42;
 
-exit unless TEST_ENABLED;
 
 tstlocalrules ("
         bayes_store_module Mail::SpamAssassin::BayesStore::BDB
diff -Nru spamassassin-3.4.0/t/bayesdbm_flock.t spamassassin-3.4.2/t/bayesdbm_flock.t
--- spamassassin-3.4.0/t/bayesdbm_flock.t	2014-02-07 03:36:38.000000000 -0500
+++ spamassassin-3.4.2/t/bayesdbm_flock.t	2018-09-13 21:27:54.000000000 -0400
@@ -3,11 +3,10 @@
 use Data::Dumper;
 use lib '.'; use lib 't';
 use SATest; sa_t_init("bayesdbm_flock");
-use Test;
 
-use constant TEST_ENABLED => conf_bool('run_long_tests') &&
-                        eval { require DB_File; };
+use constant HAS_DB_FILE => eval { require DB_File };
 
+use Test::More;
 BEGIN { 
   if (-e 't/test_dir') {
     chdir 't';
@@ -16,11 +15,12 @@
   if (-e 'test_dir') {
     unshift(@INC, '../blib/lib');
   }
+}
 
-  plan tests => ((TEST_ENABLED && !$RUNNING_ON_WINDOWS) ? 48 : 0);
-};
-
-exit unless (TEST_ENABLED && !$RUNNING_ON_WINDOWS);
+plan skip_all => "Long running tests disabled" unless conf_bool('run_long_tests');
+plan skip_all => "Tests don't work on windows" if $RUNNING_ON_WINDOWS;
+plan skip_all => "DB_File is unavailable" unless HAS_DB_FILE;
+plan tests => 48;
 
 tstlocalrules ("
         bayes_learn_to_journal 0
diff -Nru spamassassin-3.4.0/t/bayesdbm.t spamassassin-3.4.2/t/bayesdbm.t
--- spamassassin-3.4.0/t/bayesdbm.t	2014-02-07 03:36:38.000000000 -0500
+++ spamassassin-3.4.2/t/bayesdbm.t	2018-09-13 21:27:54.000000000 -0400
@@ -3,11 +3,10 @@
 use Data::Dumper;
 use lib '.'; use lib 't';
 use SATest; sa_t_init("bayes");
-use Test;
-
-use constant TEST_ENABLED => conf_bool('run_long_tests') &&
-                            eval { require DB_File; };
 
+use constant HAS_DB_FILE => eval { require DB_File };
+ 
+use Test::More;
 BEGIN { 
   if (-e 't/test_dir') {
     chdir 't';
@@ -16,11 +15,11 @@
   if (-e 'test_dir') {
     unshift(@INC, '../blib/lib');
   }
+}
 
-  plan tests => (TEST_ENABLED ? 48 : 0);
-};
-
-exit unless TEST_ENABLED;
+plan skip_all => "Long running tests disabled" unless conf_bool('run_long_tests');
+plan skip_all => "DB_File is unavailable" unless HAS_DB_FILE;
+plan tests => 48;
 
 tstlocalrules ("
         bayes_learn_to_journal 0
diff -Nru spamassassin-3.4.0/t/bayessdbm_seen_delete.t spamassassin-3.4.2/t/bayessdbm_seen_delete.t
--- spamassassin-3.4.0/t/bayessdbm_seen_delete.t	2014-02-07 03:36:38.000000000 -0500
+++ spamassassin-3.4.2/t/bayessdbm_seen_delete.t	2018-09-13 21:27:54.000000000 -0400
@@ -3,12 +3,15 @@
 use Data::Dumper;
 use lib '.'; use lib 't';
 use SATest; sa_t_init("bayessdbm_seen_delete");
-use Test;
 
-use constant TEST_ENABLED => conf_bool('run_long_tests') &&
-                    eval { require SDBM_File; };
+use constant HAS_SDBM_FILE => eval { require SDBM_File };
 
-BEGIN { 
+use Test::More;
+plan skip_all => "Long running tests disabled" unless conf_bool('run_long_tests');
+plan skip_all => "No SDBM_File" unless HAS_SDBM_FILE;
+plan tests => 54;
+
+BEGIN {
   if (-e 't/test_dir') {
     chdir 't';
   }
@@ -16,11 +19,7 @@
   if (-e 'test_dir') {
     unshift(@INC, '../blib/lib');
   }
-
-  plan tests => (TEST_ENABLED ? 54 : 0);
-};
-
-exit unless TEST_ENABLED;
+}
 
 tstlocalrules ("
         bayes_store_module Mail::SpamAssassin::BayesStore::SDBM
diff -Nru spamassassin-3.4.0/t/bayessdbm.t spamassassin-3.4.2/t/bayessdbm.t
--- spamassassin-3.4.0/t/bayessdbm.t	2014-02-07 03:36:38.000000000 -0500
+++ spamassassin-3.4.2/t/bayessdbm.t	2018-09-13 21:27:52.000000000 -0400
@@ -3,12 +3,11 @@
 use Data::Dumper;
 use lib '.'; use lib 't';
 use SATest; sa_t_init("bayes");
-use Test;
 
-use constant TEST_ENABLED => conf_bool('run_long_tests') &&
-                            eval { require SDBM_File; };
+use constant HAS_SDBM_FILE => eval { require SDBM_File };
 
-BEGIN { 
+use Test::More;
+BEGIN {
   if (-e 't/test_dir') {
     chdir 't';
   }
@@ -16,11 +15,11 @@
   if (-e 'test_dir') {
     unshift(@INC, '../blib/lib');
   }
+}
 
-  plan tests => (TEST_ENABLED ? 52 : 0);
-};
-
-exit unless TEST_ENABLED;
+plan skip_all => "Long running tests disabled" unless conf_bool('run_long_tests');
+plan skip_all => "No SDBM_File" unless HAS_SDBM_FILE;
+plan tests => 52;
 
 tstlocalrules ("
         bayes_store_module Mail::SpamAssassin::BayesStore::SDBM
diff -Nru spamassassin-3.4.0/t/bayessql.t spamassassin-3.4.2/t/bayessql.t
--- spamassassin-3.4.0/t/bayessql.t	2014-02-07 03:36:38.000000000 -0500
+++ spamassassin-3.4.2/t/bayessql.t	2018-09-13 21:27:54.000000000 -0400
@@ -2,12 +2,15 @@
 
 use lib '.'; use lib 't';
 use SATest;
-use Test;
 
-use constant TEST_ENABLED => conf_bool('run_bayes_sql_tests');
 use constant HAS_DBI => eval { require DBI; }; # for our cleanup stuff
 
-BEGIN { 
+use Test::More;
+plan skip_all => "Bayes SQL tests are disabled" unless conf_bool('run_bayes_sql_tests');
+plan skip_all => "DBI is unavailable on this system" unless HAS_DBI;
+plan tests => 53;
+
+BEGIN {
   if (-e 't/test_dir') {
     chdir 't';
   }
@@ -15,15 +18,9 @@
   if (-e 'test_dir') {
     unshift(@INC, '../blib/lib');
   }
+}
 
-  plan tests => ((TEST_ENABLED && HAS_DBI) ? 53 : 0);
-
-  onfail => sub {
-    warn "\n\nNote: Failure may be due to an incorrect config.";
-  }
-};
-
-exit unless TEST_ENABLED;
+diag "Note: Failure may be due to an incorrect config.";
 
 my $dbdsn = conf('bayes_sql_dsn');
 my $dbusername = conf('bayes_sql_username');
diff -Nru spamassassin-3.4.0/t/blacklist_autolearn.t spamassassin-3.4.2/t/blacklist_autolearn.t
--- spamassassin-3.4.0/t/blacklist_autolearn.t	2014-02-07 03:36:38.000000000 -0500
+++ spamassassin-3.4.2/t/blacklist_autolearn.t	2018-09-13 21:27:54.000000000 -0400
@@ -2,7 +2,7 @@
 
 use lib '.'; use lib 't';
 use SATest; sa_t_init("blacklist_autolearn");
-use Test; BEGIN { plan tests => 3 };
+use Test::More tests => 3;
 
 # ---------------------------------------------------------------------------
 
diff -Nru spamassassin-3.4.0/t/body_mod.t spamassassin-3.4.2/t/body_mod.t
--- spamassassin-3.4.0/t/body_mod.t	2014-02-07 03:36:37.000000000 -0500
+++ spamassassin-3.4.2/t/body_mod.t	2018-09-13 21:27:52.000000000 -0400
@@ -16,8 +16,9 @@
 }
 
 use strict;
+use lib '.'; use lib 't';
 use SATest; sa_t_init("body_mod");
-use Test; BEGIN { plan tests => 3 };
+use Test::More tests => 3;
 
 use Mail::SpamAssassin;
 
diff -Nru spamassassin-3.4.0/t/check_implemented.t spamassassin-3.4.2/t/check_implemented.t
--- spamassassin-3.4.0/t/check_implemented.t	2014-02-07 03:36:37.000000000 -0500
+++ spamassassin-3.4.2/t/check_implemented.t	2018-09-13 21:27:54.000000000 -0400
@@ -21,12 +21,10 @@
 
 use lib '.'; use lib 't';
 use SATest; sa_t_init("check_implemented");
-use Test;
+
 use Carp qw(croak);
 
-BEGIN {
-  plan tests => 2;
-};
+use Test::More tests => 2;
 
 # ---------------------------------------------------------------------------
 
diff -Nru spamassassin-3.4.0/t/cidrs.t spamassassin-3.4.2/t/cidrs.t
--- spamassassin-3.4.0/t/cidrs.t	2014-02-07 03:36:38.000000000 -0500
+++ spamassassin-3.4.2/t/cidrs.t	2018-09-13 21:27:54.000000000 -0400
@@ -16,9 +16,8 @@
 }
 
 use strict;
-use Test;
 
-plan tests => 51;
+use Test::More tests => 51;
 
 use Mail::SpamAssassin;
 use Mail::SpamAssassin::NetSet;
diff -Nru spamassassin-3.4.0/t/config_errs.t spamassassin-3.4.2/t/config_errs.t
--- spamassassin-3.4.0/t/config_errs.t	2014-02-07 03:36:38.000000000 -0500
+++ spamassassin-3.4.2/t/config_errs.t	2018-09-13 21:27:52.000000000 -0400
@@ -1,13 +1,10 @@
 #!/usr/bin/perl -w
 
-# TODO: this script does not work yet.  There are (a) lots of failures
-# and (b) the 'plan' line means all tests are effectively ignored from
-# 'make test'.
+use Test::More;
 
-use Test;
-
-plan tests => 0;
-exit 0;     
+# TODO: Now we're using Test::More, we could choose to make the failing tests TODO tests so we know if they start passing.
+plan skip_all => q{This script does not work yet. There are (a) lots of failures and (b) the 'plan' line means all tests are effectively ignored from 'make test'.};
+exit 0;
 
 # ---------------------------------------------------------------------------
 
@@ -41,8 +38,8 @@
 }
 
 use strict;
+use lib '.'; use lib 't';
 use SATest; sa_t_init("config_errs");
-use Test;
 use Mail::SpamAssassin;
 
 # initialize SpamAssassin
diff -Nru spamassassin-3.4.0/t/config_text.t spamassassin-3.4.2/t/config_text.t
--- spamassassin-3.4.0/t/config_text.t	2014-02-07 03:36:37.000000000 -0500
+++ spamassassin-3.4.2/t/config_text.t	2018-09-13 21:27:54.000000000 -0400
@@ -1,14 +1,14 @@
 #!/usr/bin/perl
 
-use constant IS_WINDOWS => ($^O =~ /^(mswin|dos|os2)/oi);
-
 use lib '.'; use lib 't';
 use SATest; sa_t_init("config_text");
 
 # skip the test on Windows; the switches contain spaces, which does not
 # work too well with win32 CMD.EXE
-use Test; BEGIN { plan tests => IS_WINDOWS ? 0 : 2 };
-exit if IS_WINDOWS;
+
+use Test::More;
+plan skip_all => "These tests don't work on windows" if $^O =~ /^(mswin|dos|os2)/i;
+plan tests => 2;
 
 # ---------------------------------------------------------------------------
 
diff -Nru spamassassin-3.4.0/t/config_tree_recurse.t spamassassin-3.4.2/t/config_tree_recurse.t
--- spamassassin-3.4.0/t/config_tree_recurse.t	2014-02-07 03:36:37.000000000 -0500
+++ spamassassin-3.4.2/t/config_tree_recurse.t	2018-09-13 21:27:54.000000000 -0400
@@ -23,7 +23,7 @@
 
 use lib '.'; use lib 't';
 use SATest; sa_t_init("basic_obj_api");
-use Test; BEGIN { plan tests => 4 };
+use Test::More tests => 4;
 
 # ---------------------------------------------------------------------------
 
diff -Nru spamassassin-3.4.0/t/cpp_comments_in_spamc.t spamassassin-3.4.2/t/cpp_comments_in_spamc.t
--- spamassassin-3.4.0/t/cpp_comments_in_spamc.t	2014-02-07 03:36:38.000000000 -0500
+++ spamassassin-3.4.2/t/cpp_comments_in_spamc.t	2018-09-13 21:27:54.000000000 -0400
@@ -2,7 +2,7 @@
 
 use lib '.'; use lib 't';
 use SATest; sa_t_init("cpp_comments_in_spamc");
-use Test; BEGIN { plan tests => 1 };
+use Test::More tests => 1;
 
 # ---------------------------------------------------------------------------
 # by simply reading the files directly in perl, we avoid all sorts
diff -Nru spamassassin-3.4.0/t/cross_user_config_leak.t spamassassin-3.4.2/t/cross_user_config_leak.t
--- spamassassin-3.4.0/t/cross_user_config_leak.t	2014-02-07 03:36:38.000000000 -0500
+++ spamassassin-3.4.2/t/cross_user_config_leak.t	2018-09-13 21:27:54.000000000 -0400
@@ -18,7 +18,7 @@
 
 use lib '.'; use lib 't';
 use SATest; sa_t_init("cross_user_config_leak");
-use Test; BEGIN { plan tests => 6 };
+use Test::More tests => 6;
 
 # ---------------------------------------------------------------------------
 # bug 6003
diff -Nru spamassassin-3.4.0/t/data/spam/razor2 spamassassin-3.4.2/t/data/spam/razor2
--- spamassassin-3.4.0/t/data/spam/razor2	1969-12-31 19:00:00.000000000 -0500
+++ spamassassin-3.4.2/t/data/spam/razor2	2018-09-13 21:27:52.000000000 -0400
@@ -0,0 +1,345 @@
+From justinec@usbusinessfund.com Mon Aug 20 10:23:02 2018
+DKIM-Signature: v=1; a=rsa-sha1; c=relaxed/relaxed; 
+	d=go.net-results.com; 
+	h=from:reply-to:to:subject:content-type:mime-version; s=smtpapi; 
+	bh=9UjMHBEnh2c4l2GTSHWXBIbK7Rc=; b=V2G5BPO8qKkGko+lcEmszPiJ0Axq0
+	cVUld06BWTnQuHXrFSvJPVKT9Z8A+z7Gbq60QXPdvNhZcrO8ksIcOMqmYrd0pe7S
+	4be/XA3DhVE2+Q5yQahYvZgT8IoQHwxIczTfi+AFF+JhnEjNy2Wf0uKM1tT9u87Y
+	y69Asqr8O+yisg=
+Received: by filter1834p1mdw1.sendgrid.net with SMTP id filter1834p1mdw1-32073-5B7ACEC6-B
+        2018-08-20 14:23:02.736644296 +0000 UTC m=+231411.025806713
+Received: from apps.net-results.com (135.110.198.104.bc.googleusercontent.com [104.198.110.135])
+	by ismtpd0006p1sjc2.sendgrid.net (SG) with ESMTP id _QQ7dsbzQKqLEFSIQLdHVw
+	for <justinec@usbusinessfund.com>; Mon, 20 Aug 2018 14:23:02.306 +0000 (UTC)
+X-MA-ID: MA1-7d54da344b7f86d0
+From: Justine Craine <justinec@usbusinessfund.com>
+Reply-to: Justine Craine <justinec@usbusinessfund.com>
+To: redacted@gmail.com
+Subject: Redacted Line of Credit - 3.5% - Expiring TODAY
+Date: Mon, 20 Aug 2018 14:23:46 +0000 (UTC)
+Content-Type: multipart/alternative;
+ boundary="=_5a36252c3c98214b21efce6ffaf37035"
+MIME-Version: 1.0
+Message-ID: <_QQ7dsbzQKqLEFSIQLdHVw@ismtpd0006p1sjc2.sendgrid.net>
+X-SG-EID: BgIdHtUktYE9aRLBUUdStN4sy8cLAU9EjexejtKwHGGsGYYQamAMbHuMgjZCiubDjk2DDR5xHsqOA6
+ 7OJrNn4O0R4s5gB6e8MylOXw7B6uvZUJTE3Vzq+1itSwTSkftcIWR9Lf1LhB/HhlFkWJcTI8A8LCwA
+ HLXSB2M09gC/NHPJ67XVpQHJIKVpPJICSU9B+EjQ2FjVfoh0FpN5SMtbXO1y4T5wBPBwRqU4pLA81u
+ w=
+X-SG-ID: SmDFk6fVVFXrSNgMN4Q94eTYvDJsRNEuT6KG3wiSWLybff8JtZS+MdjXLHov1krR
+X-KAM-Reverse: Passed - Reverse DNS of o24.whitelabel.net-results.com/167.89.16.100
+X-Relay-Addr: 167.89.16.100
+X-Relay-Host: o24.whitelabel.net-results.com
+X-Relay-Time: Mon Aug 20 10:24:05 2018
+Status: RO
+
+--=_5a36252c3c98214b21efce6ffaf37035
+Content-Type: text/plain; charset=utf-8
+Content-Transfer-Encoding: quoted-printable
+
+Redacted
+
+Good morning. Wanted to follow-up in regards to your upcoming projects, I r=
+an
+your current business score with D&B and its a 78 out of 80 which is tops in
+your industry. We have pre-approved Redacted for a line of
+credit at 3.50% with access to funds for at least $219,344.00 The funds can=
+ be
+used for unsecured working capital lines of credit or new and used equipment
+purchases. Call me anytime to further discuss
+
+Or click here to get a free quote. https://usbfund.com/?ref=3D1AUG#li=3DMA1=
+-36018e82c3855749a4e26bed7f4c1491&cs=3DMA1-f5d6f79e08a2f1dfa3c74584ea0fadbf
+
+My best,
+
+
+Justine Craine
+Credit Officer
+[https://debrjehuga0z2.cloudfront.net/18595/images/usbf-logo.png]#li=3DMA1-=
+3afd5f09c41eb9374be473522ac7a9fd&cs=3DMA1-f5d6f79e08a2f1dfa3c74584ea0fadbf
+
+(949) 390-5410 Office
+(949) 258-5018 Fax
+justinec@usbusinessfund.com
+
+
+1 MacArthur Place
+Suite #350
+Santa Ana, CA 92707
+US
+If you no longer wish to receive these emails, simply click on the following
+link: Click here to unsubscribe. http://host-0.net-results.com/subscription=
+_preferences.php?utm_campaign=3DCampaign%3A%20942OIJSD%20-%20USBFUND&utm_me=
+dium=3Demail&utm_source=3DNet-Results&li=3DMA1-3afd5f09c41eb9371bd6d2c3d40f=
+bc6b&cs=3DMA1-f5d6f79e08a2f1dfa3c74584ea0fadbf
+
+--=_5a36252c3c98214b21efce6ffaf37035
+Content-Type: text/html; charset=utf-8
+Content-Transfer-Encoding: quoted-printable
+
+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org=
+/TR/xhtml1/DTD/xhtml1-strict.dtd">
+<html xmlns=3D"http://www.w3.org/1999/xhtml" xmlns:v=3D"urn:schemas-microso=
+ft-com:vml" xmlns:o=3D"urn:schemas-microsoft-com:office:office" style=3D"">=
+<head><meta content=3D"text/html; charset=3Dutf-8" http-equiv=3D"Content-Ty=
+pe"><title>Redacted Line of Credit - 3.5% - Expiring TODAY</t=
+itle><style type=3D"text/css">table{border-collapse:collapse;table-layout:f=
+ixed}a img,img{border:0;outline:0;height:auto;text-decoration:none}h1,h2,h3=
+,h4,h5,h6{display:block!important;margin:0!important;padding:0!important;li=
+ne-height:125%;font-weight:700;text-align:left;font-style:normal}h1{font-si=
+ze:40px}h2{font-size:26px}h3{font-size:18px}h4{font-size:16px}p{margin:1em =
+0}body,html{height:100%;width:100%}#emlTbl,#emlWrp,body{height:100%!importa=
+nt;margin:0;padding:0;width:100%!important}table,td{mso-table-lspace:0;mso-=
+table-rspace:0;border-collapse:collapse!important}a,blockquote,body,li,p,ta=
+ble,td{-ms-text-size-adjust:100%;-webkit-text-size-adjust:100%}.maUserConte=
+nt{color:#5d5d5d;line-height:150%}#regionFooter .maUserContent,#regionPrevi=
+ew .maUserContent{line-height:125%}.ExternalClass,.ExternalClass div,.Exter=
+nalClass font,.ExternalClass p,.ExternalClass span,.ExternalClass td{line-h=
+eight:100%}#outlook a{padding:0}img{-ms-interpolation-mode:bicubic;height:a=
+uto!important}a{word-wrap:break-word;-ms-word-break:break-all}.maImageGroup=
+Left table,.maImageGroupRight table{table-layout:auto}.imgGroupImgContainer=
+ img{max-width:inherit!important}.maUserContent sub,.maUserContent sup{line=
+-height:0}* div * center .widthSixHundred{width:100%;max-width:600px}.Exter=
+nalClass center .widthSixHundred{width:100%;max-width:600px}body{margin:0!i=
+mportant}div[style*=3D"margin: 16px 0"]{margin:0!important;font-size:100%!i=
+mportant}#MessageViewBody,#MessageWebViewDiv{width:100%!important}#MessageV=
+iewBody a{color:inherit;text-decoration:none;font-size:inherit;font-family:=
+inherit;font-weight:inherit;line-height:inherit}a[x-apple-data-detectors]{c=
+olor:inherit!important;text-decoration:none!important;font-size:inherit!imp=
+ortant;font-family:inherit!important;font-weight:inherit!important;line-hei=
+ght:inherit!important}a{text-decoration:none}@media only screen and (min-wi=
+dth:480px){.gmailfix{display:none;display:none!important}}@media only scree=
+n and (max-width:480px){a,blockquote,body,li,p,table,td{-webkit-text-size-a=
+djust:none!important}#regionPreview{display:block!important}h1{font-size:24=
+px!important;line-height:125%!important}h2{font-size:20px!important;line-he=
+ight:125%!important}h3{font-size:18px!important;line-height:125%!important}=
+h4{font-size:16px!important;line-height:125%!important}#emlWrp{padding:10px=
+!important}#emlCanvas{width:100%!important;max-width:600px!important}.width=
+SixHundred{width:100%!important}.maAdaptWidth{width:100%!important}.rowCont=
+entContainer{display:block!important;max-width:600px!important;width:100%!i=
+mportant;min-width:0!important}.maImageCaptionColumn .maImageGroupLeft .maT=
+extAlignLeft,.maImageCaptionColumn .maImageGroupRight .maTextAlignRight,.ma=
+ImageCardColumn .maImageGroupLeft .maTextAlignLeft,.maImageCardColumn .maIm=
+ageGroupRight .maTextAlignRight{padding-top:9px!important}.maBoxedTextColum=
+n .maTextAlignLeft,.maBoxedTextColumn .maTextAlignRight,.maFooterColumn .ma=
+TextAlignLeft,.maFooterColumn .maTextAlignRight,.maMultiTextColumn .maTextA=
+lignLeft,.maMultiTextColumn .maTextAlignRight{padding-left:18px!important;p=
+adding-right:18px!important}.maBoxedTextColumn .maTextAlignRight{padding-le=
+ft:18px!important;padding-right:18px!important}#regionFooter .maUserContent=
+,#regionPreview .maUserContent{line-height:115%}.maImageColumn img{max-widt=
+h:100%!important}.maImageGroupColumn .maImageAlignRight .imgGroupImgContain=
+er{padding-left:9px!important;padding-top:9px!important}.maImageGroupColumn=
+ .maImageAlignLeft .imgGroupImgContainer{padding-right:9px!important;paddin=
+g-bottom:9px!important}u+.body .gmail{min-width:100vw}div>u+.body .gmail{mi=
+n-width:initial!important}.gmailfix{display:none;display:none!important}}</=
+style><!--[if gte mso 9]>
+  <xml>
+   <o:OfficeDocumentSettings>
+    <o:AllowPNG/>
+    <o:PixelsPerInch>96</o:PixelsPerInch>
+   </o:OfficeDocumentSettings>
+  </xml>
+ <![endif]--><style type=3D"text/css" id=3D"builderInlineStyles">td[class~=
+=3DmaUserContent]{font-family:arial,'helvetica neue',helvetica,sans-serif;f=
+ont-size:14px}td[class~=3DmaUserContent] h5{color:#7c7b7b}td[class~=3DmaUse=
+rContent] h4{color:#7c7b7b}td[class~=3DmaUserContent] h3{color:#5d5d5d}td[c=
+lass~=3DmaUserContent] h2{color:#545454}td[class~=3DmaUserContent] h1{color=
+:#5d5d5d}a{text-decoration:none}</style></head><body id=3D"body" class=3D"b=
+ody">
+  <div class=3D"gmail" style=3D"">
+   <center class=3D"inbox">
+    <table id=3D"emlTbl" align=3D"center" border=3D"0" cellspacing=3D"0" ce=
+llpadding=3D"0" width=3D"100%" style=3D"margin:0;height:100%!important;widt=
+h:100%!important;font-family:arial,'helvetica neue',helvetica,sans-serif;fo=
+nt-size:14px;background-color:#fff" bgcolor=3D"#ffffff"><tbody><tr><td id=
+=3D"emlWrp" valign=3D"top" align=3D"center" style=3D"margin:0;padding:20px;=
+border-top:0;height:100%!important;width:100%!important">
+        <table id=3D"emlCanvas" border=3D"0" cellspacing=3D"0" cellpadding=
+=3D"0" class=3D"widthSixHundred" width=3D"600" lang=3D"x-gmail-width" style=
+=3D"width:600px"><tbody><tr style=3D""><td valign=3D"top" align=3D"center" =
+class=3D"regionContainer">
+            <table border=3D"0" cellspacing=3D"0" cellpadding=3D"0" class=
+=3D"regionTable widthSixHundred" width=3D"600" lang=3D"x-gmail-width" style=
+=3D"width:600px;background-color:#fff"><tbody><tr><td valign=3D"top" class=
+=3D"regionWrapper regionPreviewWrapper" id=3D"regionPreview">
+                <table border=3D"0" cellspacing=3D"0" cellpadding=3D"0" cla=
+ss=3D"widthSixHundred" width=3D"600" lang=3D"x-gmail-width" style=3D"width:=
+600px"><tbody><tr><td valign=3D"top" class=3D"rowContentContainer">
+                    <table border=3D"0" cellspacing=3D"0" cellpadding=3D"0"=
+ width=3D"100%" style=3D"" align=3D""><tbody><tr><td valign=3D"top" class=
+=3D"blockContentContainer">
+                        <table border=3D"0" cellspacing=3D"0" cellpadding=
+=3D"0" class=3D"maAdaptWidth" width=3D"100%" style=3D""><tbody><tr><td vali=
+gn=3D"top" style=3D"padding:0" class=3D"maMultiTextColumn">
+                            <table align=3D"left" border=3D"0" cellspacing=
+=3D"0" cellpadding=3D"0" width=3D"100%"><tbody><tr><td valign=3D"top" style=
+=3D"padding:0;background-color:transparent">
+                                <table border=3D"0" cellspacing=3D"0" cellp=
+adding=3D"0" class=3D"maAdaptWidth" width=3D"100%" style=3D"" align=3D"left=
+"><tbody><tr><td valign=3D"top" width=3D"100%" style=3D"padding:9px 18px" c=
+lass=3D"maTextAlignLeft">
+                                    <table border=3D"0" cellspacing=3D"0" c=
+ellpadding=3D"0" width=3D"100%" style=3D""><tbody><tr><td valign=3D"top" cl=
+ass=3D"maUserContent" style=3D"font-family: arial,'helvetica neue',helvetic=
+a,sans-serif; font-size: 14px; font-weight: 400; padding: 0; text-align: le=
+ft;">
+                                        <p><span style=3D"color:#000">Redac=
+,=C2=A0</span>
+                                        </p>
+                                        <p><span style=3D"color:#000">Good =
+morning.=C2=A0 Wanted to follow-up in regards to your upcoming projects, I =
+ran your current business score with D&amp;B and its a 78 out of 80 which i=
+s tops in your=C2=A0industry. We have pre-approved Redacted              =
+=C2=A0for a line of credit at 3.50% with access to=C2=A0funds for at least =
+$219,344.00 The funds can be used for unsecured working capital lines of=C2=
+=A0credit or new and used equipment purchases. Call me anytime to further d=
+iscuss</span>
+                                         <br><br>Or <a href=3D"http://link.=
+usbusinessfund.com/wf/click?upn=3DW4brReBhLiuN2VUs54Q0GPbGvPNswuAjcfzzcUeqf=
+NnzNsRWPXO61OGJHUdwkeUePpaCq-2BfnLLVjt5R4-2BHzin3-2FEVq7jCDwey3zulR82JukQfj=
+B8VuMtsD8YKNPCWxYTzfyr6GybV3gmUwVf3RkW2YDlAELsthV4mKPZeh-2BnNaI-3D_YGt1Lokl=
+uyQvbdToNVmLk5ufOsjUTej34vIiTEYFn6Ros4vHqs498-2Bd-2B-2FEuaYuLHUR7RIkCFSU3Y2=
+srZxJ6CjKmG2dktoD6H9rJHcg7Y715-2BwpDMydiK7psgNfbp6yIywZjqSBLvtL8EFUGiVNpzBH=
+jFl4OBwVJhm0iUk5RjhnXa2ypsS8XtHoS-2FcgcEPkBHy70DiGmjttJ6APvgc73-2BvTmR8LrZK=
+IKOX3OW9oOAdU0tJ4i-2F5pIxx-2FlBMM9mSKfs2TZHjGC17gl17xL0bATOyQ-3D-3D" style=
+=3D"text-decoration: none;">click here to get a free quote.</a>
+                                        </p>
+                                        <p><span style=3D"color:#000"><span=
+ style=3D"font-family:arial,helvetica neue,helvetica,sans-serif">My best,</=
+span></span>
+                                        </p>
+                                        <p>
+                                         <br><span style=3D"color:#000"><b>=
+Justine Craine</b><br><i><b>Credit Officer</b></i></span><span style=3D"fon=
+t-size:12px"><span style=3D"font-family:arial,helvetica neue,helvetica,sans=
+-serif"><b><i></i></b></span></span>
+                                         <br><img src=3D"http://18595.1.hos=
+ted.cdnma.com/18595/images/usbf-logo.png"></p>
+                                        <p><span style=3D"color:#000">(949)=
+ 390-5410=C2=A0Office=C2=A0<br>
+(949) 258-5018=C2=A0Fax<br>
+justinec@usbusinessfund.com</span>
+                                         <br>=C2=A0</p>
+                                       </td>
+                                      </tr></tbody></table></td>
+                                  </tr></tbody></table></td>
+                              </tr></tbody></table></td>
+                          </tr></tbody></table></td>
+                      </tr></tbody></table></td>
+                  </tr></tbody></table></td>
+              </tr></tbody></table></td>
+          </tr><tr style=3D""><td valign=3D"top" align=3D"center" class=3D"=
+regionContainer">
+            <table border=3D"0" cellspacing=3D"0" cellpadding=3D"0" class=
+=3D"regionTable widthSixHundred" width=3D"600" lang=3D"x-gmail-width" style=
+=3D"width:600px;background-color:#fff"><tbody><tr><td valign=3D"top" class=
+=3D"regionWrapper regionHeaderWrapper" id=3D"regionHeader">
+                <table border=3D"0" cellspacing=3D"0" cellpadding=3D"0" cla=
+ss=3D"widthSixHundred" width=3D"600" lang=3D"x-gmail-width" style=3D"width:=
+600px"><tbody><tr><td valign=3D"top" class=3D"rowContentContainer">
+                    <table border=3D"0" cellspacing=3D"0" cellpadding=3D"0"=
+ width=3D"100%" style=3D"" align=3D""><tbody><tr><td valign=3D"top" class=
+=3D"blockContentContainer"></td>
+                      </tr></tbody></table></td>
+                  </tr></tbody></table></td>
+              </tr></tbody></table></td>
+          </tr><tr style=3D""><td valign=3D"top" align=3D"center" class=3D"=
+regionContainer">
+            <table border=3D"0" cellspacing=3D"0" cellpadding=3D"0" class=
+=3D"regionTable widthSixHundred" width=3D"600" lang=3D"x-gmail-width" style=
+=3D"width:600px;background-color:#fff"><tbody><tr><td valign=3D"top" class=
+=3D"regionWrapper regionBodyWrapper" id=3D"regionBody">
+                <table border=3D"0" cellspacing=3D"0" cellpadding=3D"0" cla=
+ss=3D"widthSixHundred" width=3D"600" lang=3D"x-gmail-width" style=3D"width:=
+600px"><tbody><tr><td valign=3D"top" class=3D"rowContentContainer">
+                    <table border=3D"0" cellspacing=3D"0" cellpadding=3D"0"=
+ width=3D"100%" style=3D"" align=3D""><tbody><tr><td valign=3D"top" class=
+=3D"blockContentContainer"></td>
+                      </tr></tbody></table></td>
+                  </tr></tbody></table></td>
+              </tr></tbody></table></td>
+          </tr><tr style=3D""><td valign=3D"top" align=3D"center" class=3D"=
+regionContainer">
+            <table border=3D"0" cellspacing=3D"0" cellpadding=3D"0" class=
+=3D"regionTable widthSixHundred" width=3D"600" lang=3D"x-gmail-width" style=
+=3D"width:600px;background-color:#fff"><tbody><tr><td valign=3D"top" class=
+=3D"regionWrapper regionFooterWrapper" id=3D"regionFooter">
+                <table border=3D"0" cellspacing=3D"0" cellpadding=3D"0" cla=
+ss=3D"widthSixHundred" width=3D"600" lang=3D"x-gmail-width" style=3D"width:=
+600px"><tbody><tr><td valign=3D"top" class=3D"rowContentContainer">
+                    <table border=3D"0" cellspacing=3D"0" cellpadding=3D"0"=
+ width=3D"100%" style=3D"" align=3D""><tbody><tr><td valign=3D"top" class=
+=3D"blockContentContainer">
+                        <table border=3D"0" cellspacing=3D"0" cellpadding=
+=3D"0" class=3D"maAdaptWidth" width=3D"100%" style=3D""><tbody><tr><td vali=
+gn=3D"top" style=3D"padding:0" class=3D"maMultiTextColumn">
+                            <table align=3D"left" border=3D"0" cellspacing=
+=3D"0" cellpadding=3D"0" width=3D"100%"><tbody><tr><td valign=3D"top" style=
+=3D"padding:0;background-color:transparent">
+                                <table border=3D"0" cellspacing=3D"0" cellp=
+adding=3D"0" class=3D"maAdaptWidth" width=3D"100%" style=3D"" align=3D"left=
+"><tbody><tr><td valign=3D"top" width=3D"100%" style=3D"padding:9px 18px" c=
+lass=3D"maTextAlignLeft">
+                                    <table border=3D"0" cellspacing=3D"0" c=
+ellpadding=3D"0" width=3D"100%" style=3D""><tbody><tr><td valign=3D"top" cl=
+ass=3D"maUserContent" style=3D"font-family: arial,'helvetica neue',helvetic=
+a,sans-serif; font-size: 14px; font-weight: 400; padding: 0; text-align: le=
+ft;">
+                                        <div style=3D"text-align:center">=
+=C2=A0
+                                         <div class=3D"__ma__postal_address=
+"><span style=3D"font-family:arial,helvetica neue,helvetica,sans-serif">1 M=
+acArthur Place<br>
+Suite #350<br>
+Santa Ana, CA 92707<br>
+US</span>
+                                         </div>
+                                         <br><span style=3D"font-family:ari=
+al,helvetica neue,helvetica,sans-serif">If you no longer wish to receive th=
+ese emails, simply click on the following link:=C2=A0<a class=3D"__ma__unsu=
+bscribe" href=3D"http://link.usbusinessfund.com/wf/click?upn=3Dy538qPeYJFjl=
+Fy4kUPPVRfm3HPU5aLDk-2Brg8JeYuuBwG3WGO8ksgj3NZYh7Eq2kpMK-2FBWhSdALl4ernQE9w=
+HSJm9L6-2B2wFpjvYurDo0IMb8ib2V-2B97ccpINoa3riwTcYUXKyCgfJe0CPq8JEsujczxozsV=
+fqShcRMul83ZF6nKjT7oRJbongR5MTz1zE7K-2FbDtmCiRTuOAfS5uasWQFqk-2F-2B-2BNInHz=
+mh1pEmXM-2BbU-2B-2B8EyoeS8WZbKIVxRi2y8TxMrSwJUyhuPNHvayBBlwW8B3KJy6whrxG-2B=
+6MBNSYs0Xt2s3sZsARcmSqI-2Fs2H0qYjF_YGt1LokluyQvbdToNVmLk5ufOsjUTej34vIiTEYF=
+n6Ros4vHqs498-2Bd-2B-2FEuaYuLHUR7RIkCFSU3Y2srZxJ6CjKmG2dktoD6H9rJHcg7Y715-2=
+BwpDMydiK7psgNfbp6yIy9nkzNmHEUog-2BTkCMOL79PE2LfuOOcdEZpJwfn0J9xI6TGYsbOHLX=
+NFpBUY83JAnRu1-2FIIqyN2bhrKlyYRcNQHvE2pOb-2FuGThmgUGSpkHjN4rVekZ-2FyB3L1ex5=
+rbviq0QQQ-2Fh7Dq2VAyYO4Cjp-2FYgoA-3D-3D" title=3D"Click here to unsubscribe=
+." style=3D"text-decoration: none;">Click here to unsubscribe.</a></span>
+                                        </div>
+                                       </td>
+                                      </tr></tbody></table></td>
+                                  </tr></tbody></table></td>
+                              </tr></tbody></table></td>
+                          </tr></tbody></table></td>
+                      </tr></tbody></table></td>
+                  </tr></tbody></table></td>
+              </tr></tbody></table></td>
+          </tr></tbody></table></td>
+      </tr></tbody></table></center>
+  </div>
+  <div class=3D"gmailfix" style=3D"white-space:nowrap;font:15px courier;lin=
+e-height:0;height:0">=C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=
+=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =
+=C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=
+=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =
+=C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0</div>
+=20
+<img src=3D"http://link.usbusinessfund.com/wf/open?upn=3DYGt1LokluyQvbdToNV=
+mLk5ufOsjUTej34vIiTEYFn6Ros4vHqs498-2Bd-2B-2FEuaYuLHUR7RIkCFSU3Y2srZxJ6CjKm=
+G2dktoD6H9rJHcg7Y715-2BwpDMydiK7psgNfbp6yIyxvH3wlBqpx2sv8sHjsUOMCU4DuGQHL3G=
+JZ-2Fs1AiIO08z73y3oa5DJraDLWfz-2B4b99x3PwDglO3ile-2Bk5-2FecuQVI1We3Fzmy73Ev=
+kRty9-2BtCcf9-2FWqqvLaqH-2BfLJqogTmjG1Cx3zKMn29LyHfMK9E8RGJn3H-2Fg6flO3naKc=
+CP2zQ-3D" alt=3D"" width=3D"1" height=3D"1" border=3D"0" style=3D"height:1p=
+x !important;width:1px !important;border-width:0 !important;margin-top:0 !i=
+mportant;margin-bottom:0 !important;margin-right:0 !important;margin-left:0=
+ !important;padding-top:0 !important;padding-bottom:0 !important;padding-ri=
+ght:0 !important;padding-left:0 !important;"/>
+</body></html>
+
+
+
+--=_5a36252c3c98214b21efce6ffaf37035--
+
diff -Nru spamassassin-3.4.0/t/data/spam/relayUS.eml spamassassin-3.4.2/t/data/spam/relayUS.eml
--- spamassassin-3.4.0/t/data/spam/relayUS.eml	1969-12-31 19:00:00.000000000 -0500
+++ spamassassin-3.4.2/t/data/spam/relayUS.eml	2018-09-13 21:27:52.000000000 -0400
@@ -0,0 +1,17 @@
+Received: from mail-wm0-f66.google.com (mail-wm0-f66.google.com [74.125.82.66])
+	by in.example.com (Postfix) with ESMTPS
+	for <test@example.com>; Wed, 18 Jul 2018 21:12:22 +0200 (CEST)
+Received: by mail-wm0-f66.google.com with SMTP id f21-v6so3811271wmc.5
+        for <test@example.com>; Wed, 18 Jul 2018 12:12:22 -0700 (PDT)
+From: <test@gmail.com>
+To: test@example.com
+Subject: Relay Country Test
+Date: Wed, 18 Jul 2018 12:12:00 -0700 (PDT)
+MIME-Version: 1.0
+Message-Id: <20011206235802.4FD6F1143D6@gmail.com>
+
+<html>
+<body>
+<a href="https://www.google.com">Search here</a>
+</body>
+</html>
diff -Nru spamassassin-3.4.0/t/date.t spamassassin-3.4.2/t/date.t
--- spamassassin-3.4.0/t/date.t	2014-02-07 03:36:38.000000000 -0500
+++ spamassassin-3.4.2/t/date.t	2018-09-13 21:27:52.000000000 -0400
@@ -16,11 +16,11 @@
 }
 
 use strict;
-use Test;
+
 use Mail::SpamAssassin;
 use Mail::SpamAssassin::Util;
 
-plan tests => 14;
+use Test::More tests => 14;
 
 sub try {
   my ($data, $want) = @_;
diff -Nru spamassassin-3.4.0/t/db_awl_path.t spamassassin-3.4.2/t/db_awl_path.t
--- spamassassin-3.4.0/t/db_awl_path.t	2014-02-07 03:36:38.000000000 -0500
+++ spamassassin-3.4.2/t/db_awl_path.t	2018-09-13 21:27:52.000000000 -0400
@@ -2,7 +2,7 @@
 
 use lib '.'; use lib 't';
 use SATest; sa_t_init("db_awl_path");
-use Test; BEGIN { plan tests => 4 };
+use Test::More tests => 4;
 use IO::File;
 
 # ---------------------------------------------------------------------------
@@ -36,8 +36,8 @@
   <$fh>;
 };
 
-print "# $error\n";
-ok($error, qr/(cannot create tmp lockfile)|(unlink of lock file.*failed)/, "Check we get the right error back");
+diag $error;
+like($error, qr/(cannot create tmp lockfile)|(unlink of lock file.*failed)/, "Check we get the right error back");
 
 # and this mail should *not* be whitelisted as a result.
 %patterns = %is_spam_patterns;
diff -Nru spamassassin-3.4.0/t/db_awl_perms.t spamassassin-3.4.2/t/db_awl_perms.t
--- spamassassin-3.4.0/t/db_awl_perms.t	2014-02-07 03:36:38.000000000 -0500
+++ spamassassin-3.4.2/t/db_awl_perms.t	2018-09-13 21:27:54.000000000 -0400
@@ -2,7 +2,7 @@
 
 use lib '.'; use lib 't';
 use SATest; sa_t_init("db_awl_perms");
-use Test; BEGIN { plan tests => 5 };
+use Test::More tests => 5;
 use IO::File;
 
 # ---------------------------------------------------------------------------
diff -Nru spamassassin-3.4.0/t/db_based_whitelist_ips.t spamassassin-3.4.2/t/db_based_whitelist_ips.t
--- spamassassin-3.4.0/t/db_based_whitelist_ips.t	2014-02-07 03:36:37.000000000 -0500
+++ spamassassin-3.4.2/t/db_based_whitelist_ips.t	2018-09-13 21:27:53.000000000 -0400
@@ -3,13 +3,10 @@
 use lib '.'; use lib 't';
 
 use SATest; sa_t_init("db_based_whitelist_ips");
-use Test;
 
-use constant TEST_ENABLED => conf_bool('run_long_tests');
-BEGIN { 
-  plan tests => (TEST_ENABLED ? 8 : 0);
-};
-exit unless TEST_ENABLED;
+use Test::More;
+plan skip_all => "Long running tests disabled" unless conf_bool('run_long_tests');
+plan tests => 8;
 
 # ---------------------------------------------------------------------------
 
diff -Nru spamassassin-3.4.0/t/db_based_whitelist.t spamassassin-3.4.2/t/db_based_whitelist.t
--- spamassassin-3.4.0/t/db_based_whitelist.t	2014-02-07 03:36:38.000000000 -0500
+++ spamassassin-3.4.2/t/db_based_whitelist.t	2018-09-13 21:27:54.000000000 -0400
@@ -3,13 +3,10 @@
 use lib '.'; use lib 't';
 
 use SATest; sa_t_init("db_based_whitelist");
-use Test;
 
-use constant TEST_ENABLED => conf_bool('run_long_tests');
-BEGIN { 
-  plan tests => (TEST_ENABLED ? 8 : 0);
-};
-exit unless TEST_ENABLED;
+use Test::More;
+plan skip_all => "Long running tests disabled" unless conf_bool('run_long_tests');
+plan tests => 8;
 
 # ---------------------------------------------------------------------------
 
diff -Nru spamassassin-3.4.0/t/dcc.t spamassassin-3.4.2/t/dcc.t
--- spamassassin-3.4.0/t/dcc.t	2014-02-07 03:36:38.000000000 -0500
+++ spamassassin-3.4.2/t/dcc.t	2018-09-13 21:27:53.000000000 -0400
@@ -3,19 +3,12 @@
 use lib '.'; use lib 't';
 use SATest; sa_t_init("dcc");
 
-use constant TEST_ENABLED => conf_bool('run_dcc_tests');
+use Test::More;
+plan skip_all => "DCC tests disabled" unless conf_bool('run_dcc_tests');
+plan tests => 4;
 
-use Test;
+diag('Note: Failure may not be an SpamAssassin bug, as DCC tests can fail due to problems with the DCC servers.');
 
-BEGIN {
-  plan tests => (TEST_ENABLED ? 4 : 0),
-  onfail => sub {
-    warn "\n\nNote: this may not be an SpamAssassin bug, as DCC tests can" .
-	"\nfail due to problems with the DCC servers.\n\n";
-  }
-};
-
-exit unless TEST_ENABLED;
 
 # ---------------------------------------------------------------------------
 
diff -Nru spamassassin-3.4.0/t/debug.t spamassassin-3.4.2/t/debug.t
--- spamassassin-3.4.0/t/debug.t	2014-02-07 03:36:38.000000000 -0500
+++ spamassassin-3.4.2/t/debug.t	2018-09-13 21:27:54.000000000 -0400
@@ -16,25 +16,23 @@
 }
 
 use strict;
+use lib '.'; use lib 't';
 use SATest; sa_t_init("debug");
-use Test;
-use Mail::SpamAssassin;
 
-use constant TEST_ENABLED => conf_bool('run_long_tests');
+use Mail::SpamAssassin;
 
-BEGIN { 
-  plan tests => (TEST_ENABLED ? 3 : 0);
-};
-exit unless TEST_ENABLED;
+use Test::More;
+plan skip_all => "Long running tests disabled" unless conf_bool('run_long_tests');
+plan tests => 3;
 
 # list of known debug facilities
 my %facility = map( ($_, 1),
   qw( accessdb archive-iterator async auto-whitelist bayes check config daemon
-      dcc dkim dns eval generic https_http_mismatch facility FreeMail
+      dcc dkim askdns dns eval generic https_http_mismatch facility FreeMail
       hashcash ident ignore info ldap learn locker log logger markup
       message metadata mimeheader netset plugin prefork progress pyzor razor2
       received-header replacetags reporter rules rules-all spamd spf textcat
-      timing uri uridnsbl util ));
+      timing TxRep uri uridnsbl util ));
 
 my $fh = IO::File->new_tmpfile();
 open(STDERR, ">&=".fileno($fh)) || die "Cannot reopen STDERR";
diff -Nru spamassassin-3.4.0/t/desc_wrap.t spamassassin-3.4.2/t/desc_wrap.t
--- spamassassin-3.4.0/t/desc_wrap.t	2014-02-07 03:36:38.000000000 -0500
+++ spamassassin-3.4.2/t/desc_wrap.t	2018-09-13 21:27:53.000000000 -0400
@@ -2,7 +2,7 @@
 
 use lib '.'; use lib 't';
 use SATest; sa_t_init("desc_wrap");
-use Test; BEGIN { plan tests => 10 };
+use Test::More tests => 10;
 
 # ---------------------------------------------------------------------------
 
diff -Nru spamassassin-3.4.0/t/dkim.t spamassassin-3.4.2/t/dkim.t
--- spamassassin-3.4.0/t/dkim.t	2014-02-07 03:36:38.000000000 -0500
+++ spamassassin-3.4.2/t/dkim.t	2018-09-13 21:27:54.000000000 -0400
@@ -6,19 +6,18 @@
 use lib '.'; use lib 't';
 
 use SATest; sa_t_init("dkim");
-use Test;
 
 use vars qw(%patterns %anti_patterns);
 
-use constant num_tests => 199;
-
-use constant TEST_ENABLED => conf_bool('run_net_tests');
-use constant HAS_MODULES => eval {
+use constant HAS_DKIM_VERIFIER => eval {
   require Mail::DKIM::Verifier;
   Mail::DKIM::Verifier->VERSION >= 0.31;
 };
 
-use constant DO_RUN => TEST_ENABLED && HAS_MODULES;
+use Test::More;
+plan skip_all => "Net tests disabled" unless conf_bool('run_net_tests');
+plan skip_all => "Needs Mail::DKIM::Verifier >= 0.31" unless HAS_DKIM_VERIFIER ;
+plan tests => 199;
 
 BEGIN {
   if (-e 't/test_dir') {
@@ -28,11 +27,7 @@
   if (-e 'test_dir') {
     unshift(@INC, '../blib/lib');
   }
-  
-  plan tests => (DO_RUN ? num_tests : 0);
-};
-
-exit unless (DO_RUN);
+}
 
 my $prefix = '.';
 if (-e 'test_dir') {            # running from test directory, not ..
@@ -89,6 +84,7 @@
 
 # ensure rules will fire, and disable some expensive ones
 tstlocalrules("
+  dkim_minimum_key_bits 512
   score DKIM_SIGNED          -0.1
   score DKIM_VALID           -0.1
   score DKIM_VALID_AU        -0.1
diff -Nru spamassassin-3.4.0/t/dnsbl_sc_meta.t spamassassin-3.4.2/t/dnsbl_sc_meta.t
--- spamassassin-3.4.0/t/dnsbl_sc_meta.t	2014-02-07 03:36:38.000000000 -0500
+++ spamassassin-3.4.2/t/dnsbl_sc_meta.t	2018-09-13 21:27:54.000000000 -0400
@@ -3,15 +3,10 @@
 use lib '.'; use lib 't';
 use SATest; sa_t_init("dnsbl_sc_meta");
 
-use constant TEST_ENABLED => conf_bool('run_net_tests');
-use constant DO_RUN => TEST_ENABLED && can_use_net_dns_safely();
-use Test;
-
-BEGIN {
-  plan tests => (DO_RUN ? 2 : 0),
-};
-
-exit unless (DO_RUN);
+use Test::More;
+plan skip_all => "Net tests disabled" unless conf_bool('run_net_tests');
+plan skip_all => "Can't use Net::DNS Safely" unless can_use_net_dns_safely();
+plan tests => 2;
 
 # ---------------------------------------------------------------------------
 
diff -Nru spamassassin-3.4.0/t/dnsbl_subtests.t spamassassin-3.4.2/t/dnsbl_subtests.t
--- spamassassin-3.4.0/t/dnsbl_subtests.t	2014-02-07 03:36:38.000000000 -0500
+++ spamassassin-3.4.2/t/dnsbl_subtests.t	2018-09-13 21:27:54.000000000 -0400
@@ -8,17 +8,19 @@
 use lib '.'; use lib 't';
 
 use SATest; sa_t_init("dnsbl_subtests");
-use Test;
 
 use vars qw(%patterns %anti_patterns);
-use constant num_tests => 46;
-use constant DO_RUN => 1;
+use Test::More tests => 46;
 
 BEGIN {
-  plan tests => (DO_RUN ? num_tests : 0);
-};
+  if (-e 't/test_dir') { # if we are running "t/rule_tests.t", kluge around ...
+    chdir 't';
+  }
 
-exit unless DO_RUN;
+  if (-e 'test_dir') {            # running from test directory, not ..
+    unshift(@INC, '../blib/lib');
+  }
+}
 
 my $prefix = '.';
 if (-e 'test_dir') {            # running from test directory, not ..
@@ -365,7 +367,22 @@
 
 if ($pid) {
   kill('TERM',$pid) or die "Cannot stop a DNS server [$pid]: $!";
-  waitpid($pid,0);
+
+# Bug 7000: Seems like a DNS server process can't be terminated. [...]
+# Reason is "waitpid($pid,0)". If commented out, it does not hang.
+# There are no extra processes after end of this test.
+#
+# perlfunc: waitpid - waiting for a particular pid with FLAGS of 0 is
+# implemented everywhere
+#
+# perlport: (Win32) waitpid Can only be applied to process handles returned
+# for processes spawned using "system(1, ...)" or pseudo processes created
+# with "fork()".
+#
+# so ... waitpid($pid,0) should work on Windows, but it doesn't - nevermind:
+
+  waitpid($pid,0) unless $RUNNING_ON_WINDOWS;
+
   undef $pid;
 }
 
diff -Nru spamassassin-3.4.0/t/dnsbl.t spamassassin-3.4.2/t/dnsbl.t
--- spamassassin-3.4.0/t/dnsbl.t	2014-02-07 03:36:37.000000000 -0500
+++ spamassassin-3.4.2/t/dnsbl.t	2018-09-13 21:27:53.000000000 -0400
@@ -3,15 +3,11 @@
 use lib '.'; use lib 't';
 use SATest; sa_t_init("dns");
 
-use constant TEST_ENABLED => conf_bool('run_net_tests') && conf_bool('run_long_tests');
-use constant DO_RUN => TEST_ENABLED && can_use_net_dns_safely();
-use Test;
-
-BEGIN {
-  plan tests => (DO_RUN ? 23 : 0),
-};
-
-exit unless (DO_RUN);
+use Test::More;
+plan skip_all => "Long running tests disabled" unless conf_bool('run_long_tests');
+plan skip_all => "Net tests disabled" unless conf_bool('run_net_tests');
+plan skip_all => "Can't use Net::DNS Safely" unless can_use_net_dns_safely();
+plan tests => 23;
 
 # ---------------------------------------------------------------------------
 # bind configuration currently used to support this test
@@ -59,24 +55,24 @@
  q{ <dns:226.149.120.193.dnsbltest.spamassassin.org> [127.0.0.1] } => 'P_5',
  q{ <dns:example.com.dnsbltest.spamassassin.org> [127.0.0.2] } => 'P_6',
  q{ <dns:134.88.73.210.sb.dnsbltest.spamassassin.org?type=TXT> } => 'P_7',
- q{ DNSBL_TEST_TOP } => 'P_8',
- q{ DNSBL_TEST_WHITELIST } => 'P_9',
- q{ DNSBL_TEST_DYNAMIC } => 'P_10',
- q{ DNSBL_TEST_SPAM } => 'P_11',
- q{ DNSBL_TEST_RELAY } => 'P_12',
- q{ DNSBL_TXT_TOP } => 'P_13',
- q{ DNSBL_TXT_RE } => 'P_14',
- q{ DNSBL_RHS } => 'P_15',
- q{ DNSBL_SB_TIME } => 'P_16',
- q{ DNSBL_SB_FLOAT } => 'P_17',
- q{ DNSBL_SB_STR } => 'P_18',
+ q{,DNSBL_TEST_TOP,} => 'P_8',
+ q{,DNSBL_TEST_WHITELIST,} => 'P_9',
+ q{,DNSBL_TEST_DYNAMIC,} => 'P_10',
+ q{,DNSBL_TEST_SPAM,} => 'P_11',
+ q{,DNSBL_TEST_RELAY,} => 'P_12',
+ q{,DNSBL_TXT_TOP,} => 'P_13',
+ q{,DNSBL_TXT_RE,} => 'P_14',
+ q{,DNSBL_RHS,} => 'P_15',
+ q{,DNSBL_SB_TIME,} => 'P_16',
+ q{,DNSBL_SB_FLOAT,} => 'P_17',
+ q{,DNSBL_SB_STR,} => 'P_18',
 );
 
 %anti_patterns = (
- q{ DNSBL_TEST_MISS } => 'P_19',
- q{ DNSBL_TXT_MISS } => 'P_20',
- q{ DNSBL_SB_UNDEF } => 'P_21',
- q{ DNSBL_SB_MISS } => 'P_22',
+ q{,DNSBL_TEST_MISS,} => 'P_19',
+ q{,DNSBL_TXT_MISS,} => 'P_20',
+ q{,DNSBL_SB_UNDEF,} => 'P_21',
+ q{,DNSBL_SB_MISS,} => 'P_22',
  q{ launching DNS A query for 14.35.17.212.untrusted.dnsbltest.spamassassin.org. } => 'untrusted',
 );
 
@@ -164,5 +160,6 @@
 tflags DNSBL_SB_MISS	net
 ");
 
+# The -D clobbers test performance but some patterns & antipatterns depend on debug output
 sarun ("-D -t < data/spam/dnsbl.eml 2>&1", \&patterns_run_cb);
 ok_all_patterns();
diff -Nru spamassassin-3.4.0/t/duplicates.t spamassassin-3.4.2/t/duplicates.t
--- spamassassin-3.4.0/t/duplicates.t	2014-02-07 03:36:38.000000000 -0500
+++ spamassassin-3.4.2/t/duplicates.t	2018-09-13 21:27:52.000000000 -0400
@@ -2,7 +2,7 @@
 
 use lib '.'; use lib 't';
 use SATest; sa_t_init("duplicates");
-use Test; BEGIN { plan tests => 21 };
+use Test::More tests => 21;
 
 $ENV{'LANGUAGE'} = $ENV{'LC_ALL'} = 'C';             # a cheat, but we need the patterns to work
 
diff -Nru spamassassin-3.4.0/t/get_all_headers.t spamassassin-3.4.2/t/get_all_headers.t
--- spamassassin-3.4.0/t/get_all_headers.t	2014-02-07 03:36:38.000000000 -0500
+++ spamassassin-3.4.2/t/get_all_headers.t	2018-09-13 21:27:54.000000000 -0400
@@ -2,7 +2,7 @@
 
 use lib '.'; use lib 't';
 use SATest; sa_t_init("get_all_headers");
-use Test; BEGIN { plan tests => 5 };
+use Test::More tests => 5;
 
 # ---------------------------------------------------------------------------
 
diff -Nru spamassassin-3.4.0/t/get_headers.t spamassassin-3.4.2/t/get_headers.t
--- spamassassin-3.4.0/t/get_headers.t	2014-02-07 03:36:37.000000000 -0500
+++ spamassassin-3.4.2/t/get_headers.t	2018-09-13 21:27:54.000000000 -0400
@@ -16,11 +16,12 @@
 }
 
 use strict;
-use Test;
+
+use lib '.'; use lib 't';
 use SATest; sa_t_init("get_headers");
 use Mail::SpamAssassin;
 
-plan tests => 16;
+use Test::More tests => 16;
 
 ##############################################
 
diff -Nru spamassassin-3.4.0/t/gtube.t spamassassin-3.4.2/t/gtube.t
--- spamassassin-3.4.0/t/gtube.t	2014-02-07 03:36:38.000000000 -0500
+++ spamassassin-3.4.2/t/gtube.t	2018-09-13 21:27:54.000000000 -0400
@@ -2,7 +2,7 @@
 
 use lib '.'; use lib 't';
 use SATest; sa_t_init("spam");
-use Test; BEGIN { plan tests => 4 };
+use Test::More tests => 4;
 
 # ---------------------------------------------------------------------------
 
diff -Nru spamassassin-3.4.0/t/hashcash.t spamassassin-3.4.2/t/hashcash.t
--- spamassassin-3.4.0/t/hashcash.t	2014-02-07 03:36:38.000000000 -0500
+++ spamassassin-3.4.2/t/hashcash.t	2018-09-13 21:27:52.000000000 -0400
@@ -4,11 +4,11 @@
 use SATest; sa_t_init("hashcash");
 
 # we need DB_File to support the double-spend db.
-use constant HAS_DB_FILE => eval { require DB_File; };
+use constant HAS_DB_FILE => eval { require DB_File };
 
-use Test; BEGIN { plan tests => HAS_DB_FILE ? 4 : 0 };
-
-exit unless HAS_DB_FILE;
+use Test::More;
+plan skip_all => "This test requires DB_File" unless HAS_DB_FILE;
+plan tests => 4;
 
 # ---------------------------------------------------------------------------
 
diff -Nru spamassassin-3.4.0/t/html_colors.t spamassassin-3.4.2/t/html_colors.t
--- spamassassin-3.4.0/t/html_colors.t	2014-02-07 03:36:37.000000000 -0500
+++ spamassassin-3.4.2/t/html_colors.t	2018-09-13 21:27:54.000000000 -0400
@@ -16,12 +16,10 @@
 }
 
 use strict;
-use Test;
+use Test::More tests => 28;
 use Mail::SpamAssassin;
 use Mail::SpamAssassin::HTML;
 
-plan tests => 28;
-
 sub try {
   my ($data, $want) = @_;
 
diff -Nru spamassassin-3.4.0/t/html_obfu.t spamassassin-3.4.2/t/html_obfu.t
--- spamassassin-3.4.0/t/html_obfu.t	2014-02-07 03:36:38.000000000 -0500
+++ spamassassin-3.4.2/t/html_obfu.t	2018-09-13 21:27:52.000000000 -0400
@@ -2,7 +2,7 @@
 
 use lib '.'; use lib 't';
 use SATest; sa_t_init("html_obfu");
-use Test; BEGIN { plan tests => 9 };
+use Test::More tests => 9;
 
 # ---------------------------------------------------------------------------
 
diff -Nru spamassassin-3.4.0/t/html_utf8.t spamassassin-3.4.2/t/html_utf8.t
--- spamassassin-3.4.0/t/html_utf8.t	2014-02-07 03:36:38.000000000 -0500
+++ spamassassin-3.4.2/t/html_utf8.t	2018-09-13 21:27:54.000000000 -0400
@@ -3,11 +3,9 @@
 use lib '.'; use lib 't';
 use SATest; sa_t_init("html_obfu");
 
-use constant TEST_ENABLED => ($] > 5.008004);
-
-use Test; BEGIN { plan tests => (TEST_ENABLED ? 2 : 0) };
-
-exit unless (TEST_ENABLED);
+use Test::More;
+plan skip_all => "Test requires Perl 5.8.5" unless $] > 5.008004;
+plan tests => 2;
 
 # ---------------------------------------------------------------------------
 
@@ -21,7 +19,8 @@
 
 tstlocalrules ('
 body OPPORTUNITY	/OPPORTUNITY/
-body QUOTE_YOUR /\x{201c}Your/
+# body QUOTE_YOUR /\x{201c}Your/
+body QUOTE_YOUR /\xE2\x80\x9CYour/
 ');
 sarun ("-L -t < data/spam/009", \&patterns_run_cb);
 ok_all_patterns();
diff -Nru spamassassin-3.4.0/t/idn_dots.t spamassassin-3.4.2/t/idn_dots.t
--- spamassassin-3.4.0/t/idn_dots.t	1969-12-31 19:00:00.000000000 -0500
+++ spamassassin-3.4.2/t/idn_dots.t	2018-09-13 21:27:54.000000000 -0400
@@ -0,0 +1,101 @@
+#!/usr/bin/perl -w
+
+# test URIs with UTF8 IDNA-equivalent dots between domains instead of ordinary '.'
+
+BEGIN {
+  if (-e 't/test_dir') { # if we are running "t/rule_names.t", kluge around ...
+    chdir 't';
+  }
+
+  if (-e 'test_dir') {            # running from test directory, not ..
+    unshift(@INC, '../blib/lib');
+  }
+}
+
+my $prefix = '.';
+if (-e 'test_dir') {            # running from test directory, not ..
+  $prefix = '..';
+}
+
+use strict;
+use lib '.'; use lib 't';
+use SATest; sa_t_init("idn_dots.t");
+use Test::More tests => 6;
+use Mail::SpamAssassin;
+use vars qw(%patterns %anti_patterns);
+
+# initialize SpamAssassin
+my $sa = create_saobj({dont_copy_prefs => 1});
+$sa->init(0); # parse rules
+
+# load tests and write mail
+%patterns = ();
+%anti_patterns = ();
+my $message = write_mail();
+
+my $mail = $sa->parse($message);
+my $msg = Mail::SpamAssassin::PerMsgStatus->new($sa, $mail);
+
+my $uris = join("\n", $msg->get_uri_list(), "");
+
+# run patterns and anti-patterns
+my $failures = 0;
+for my $pattern (keys %patterns) {
+  if (!ok($uris =~ /${pattern}/m)) {
+    warn "failure: did not find /$pattern/\n";
+    $failures++;
+  #} else {
+  #  warn "OK: did find /$pattern/\n";
+  }
+}
+
+for my $anti_pattern (keys %anti_patterns) {
+  if (!ok($uris !~ /${anti_pattern}/m)) {
+    warn "failure: did find /$anti_pattern/\n";
+    $failures++;
+  }
+}
+
+if ($failures) {
+  print "URIs in email from get_uri_list:\n$uris";
+}
+
+# function to write test email
+sub write_mail {
+  my $message = <<'EOF';
+Message-ID: <clean.1010101@example.com>
+Date: Mon, 07 Oct 2002 09:00:00 +0000
+From: Sender <sender@example.com>
+MIME-Version: 1.0
+To: Recipient <recipient@example.com>
+Subject: this is a trivial message
+Content-Type: text/plain; charset="UTF-8"
+Content-Transfer-Encoding: 8bit
+
+EOF
+
+  # Characters that look like a fullstop
+  my @delims = split(//, "\x{002E}\x{3002}\x{FF0E}\x{FF61}\x{FE52}\x{2024}");
+  my $i = 0;
+
+  foreach my $delim (@delims) {
+    $i++;
+    utf8::encode($delim);  # to UTF-8 octets
+    my $string = "http://utf$i" . $delim . "example" . $delim . "com";
+    my @patterns = ("^http://utf$i\\.example\\.com\$");
+
+    if ($string && @patterns) {
+      $message .= "$string\n";
+      for my $pattern (@patterns) {
+        if ($pattern =~ /^!(.*)/) {
+          $anti_patterns{$1} = 1;
+        }
+        else {
+          $patterns{$pattern} = 1;
+        }
+      }
+    }
+  }
+
+  return $message;
+}
diff -Nru spamassassin-3.4.0/t/if_can.t spamassassin-3.4.2/t/if_can.t
--- spamassassin-3.4.0/t/if_can.t	2014-02-07 03:36:37.000000000 -0500
+++ spamassassin-3.4.2/t/if_can.t	2018-09-13 21:27:53.000000000 -0400
@@ -2,7 +2,7 @@
 
 use lib '.'; use lib 't';
 use SATest; sa_t_init("if_can");
-use Test; BEGIN { plan tests => 13 };
+use Test::More tests => 13;
 
 # ---------------------------------------------------------------------------
 
diff -Nru spamassassin-3.4.0/t/ifversion.t spamassassin-3.4.2/t/ifversion.t
--- spamassassin-3.4.0/t/ifversion.t	2014-02-07 03:36:38.000000000 -0500
+++ spamassassin-3.4.2/t/ifversion.t	2018-09-13 21:27:54.000000000 -0400
@@ -2,7 +2,7 @@
 
 use lib '.'; use lib 't';
 use SATest; sa_t_init("ifversion");
-use Test; BEGIN { plan tests => 4 };
+use Test::More tests => 4;
 
 # ---------------------------------------------------------------------------
 
diff -Nru spamassassin-3.4.0/t/ip_addrs.t spamassassin-3.4.2/t/ip_addrs.t
--- spamassassin-3.4.0/t/ip_addrs.t	2014-02-07 03:36:37.000000000 -0500
+++ spamassassin-3.4.2/t/ip_addrs.t	2018-09-13 21:27:54.000000000 -0400
@@ -17,7 +17,7 @@
 }
 
 use strict;
-use Test;
+use Test::More tests => 105;
 use Mail::SpamAssassin;
 
 use Mail::SpamAssassin::NetSet;
@@ -26,8 +26,6 @@
     rules_filename => "$prefix/rules",
 });
 
-plan tests => 105;
-
 sub tryone ($$) {
   my ($pat, $testip) = @_;
 #warn "matching $testip gainst $pat\n";
@@ -140,7 +138,7 @@
 sub tsttrim ($$) {
   my $dom = shift;
   my $want = shift;
-  my $got = Mail::SpamAssassin::Util::RegistrarBoundaries::trim_domain ($dom);
+  my $got = $sa->{registryboundaries}->trim_domain ($dom);
   if ($got eq $want) {
     return 1;
   } else {
diff -Nru spamassassin-3.4.0/t/lang_lint.t spamassassin-3.4.2/t/lang_lint.t
--- spamassassin-3.4.0/t/lang_lint.t	2014-02-07 03:36:38.000000000 -0500
+++ spamassassin-3.4.2/t/lang_lint.t	2018-09-13 21:27:54.000000000 -0400
@@ -1,19 +1,15 @@
 #!/usr/bin/perl
 
 use lib '.'; use lib 't';
-use vars qw(@locales);
 use SATest; sa_t_init("lang_lint");
 
-use constant TEST_ENABLED => conf_bool('run_long_tests');
-
-use Test; BEGIN {
-  @locales = qw( de es fr it nl pl pl pt_BR );
-  plan tests => (TEST_ENABLED ? scalar(@locales) : 0);
-};
-exit unless TEST_ENABLED;
+use Test::More;
+plan skip_all => "Long running tests disabled" unless conf_bool('run_long_tests');
+plan tests => 8;
 
 # ---------------------------------------------------------------------------
 
+my  @locales = qw( de es fr it nl pl pl pt_BR );
 %patterns = ( q{  }, 'anything', );
 
 for $locale (@locales) {
diff -Nru spamassassin-3.4.0/t/lang_pl_tests.t spamassassin-3.4.2/t/lang_pl_tests.t
--- spamassassin-3.4.0/t/lang_pl_tests.t	2014-02-07 03:36:38.000000000 -0500
+++ spamassassin-3.4.2/t/lang_pl_tests.t	2018-09-13 21:27:54.000000000 -0400
@@ -1,16 +1,13 @@
 #!/usr/bin/perl
 
-use lib '.'; 
+use lib '.';
 use lib 't';
-use SATest; 
+use SATest;
 sa_t_init("lang_pl_tests");
-use Test; 
 
-use constant TEST_ENABLED => conf_bool('run_pl_tests');
-
-BEGIN { plan tests => (TEST_ENABLED ? 1 : 0) };
-
-exit unless TEST_ENABLED;
+use Test::More;
+plan skip_all => "pl tests disabled" unless conf_bool('run_pl_tests');
+plan tests => 1;
 
 # ---------------------------------------------------------------------------
 
diff -Nru spamassassin-3.4.0/t/line_endings.t spamassassin-3.4.2/t/line_endings.t
--- spamassassin-3.4.0/t/line_endings.t	2014-02-07 03:36:38.000000000 -0500
+++ spamassassin-3.4.2/t/line_endings.t	2018-09-13 21:27:53.000000000 -0400
@@ -3,12 +3,9 @@
 use lib '.'; use lib 't';
 use SATest; sa_t_init("line_endings");
 
-use constant TEST_ENABLED => conf_bool('run_long_tests');
-
-use Test; BEGIN {
-  plan tests => (TEST_ENABLED ? 26 : 0);
-};
-exit unless TEST_ENABLED;
+use Test::More;
+plan skip_all => "Long running tests disabled" unless conf_bool('run_long_tests');
+plan tests => 26;
 
 # ---------------------------------------------------------------------------
 
diff -Nru spamassassin-3.4.0/t/lint_nocreate_prefs.t spamassassin-3.4.2/t/lint_nocreate_prefs.t
--- spamassassin-3.4.0/t/lint_nocreate_prefs.t	2014-02-07 03:36:38.000000000 -0500
+++ spamassassin-3.4.2/t/lint_nocreate_prefs.t	2018-09-13 21:27:54.000000000 -0400
@@ -2,7 +2,7 @@
 
 use lib '.'; use lib 't';
 use SATest; sa_t_init("lint_nocreate_prefs");
-use Test; BEGIN { plan tests => 2 };
+use Test::More tests => 2;
 
 # ---------------------------------------------------------------------------
 
diff -Nru spamassassin-3.4.0/t/memory_cycles.t spamassassin-3.4.2/t/memory_cycles.t
--- spamassassin-3.4.0/t/memory_cycles.t	2014-02-07 03:36:37.000000000 -0500
+++ spamassassin-3.4.2/t/memory_cycles.t	2018-09-13 21:27:53.000000000 -0400
@@ -20,13 +20,9 @@
 use lib '.'; use lib 't';
 use SATest; sa_t_init("memory_cycles");
 
-use Test; BEGIN {
-  plan tests => (HAVE_DEVEL_CYCLE ? 4 : 0);
-}
-unless (HAVE_DEVEL_CYCLE) {
-  print "# Devel::Cycle module required for this test, skipped\n";
-  exit 0;
-}
+use Test::More;
+plan skip_all => "Devel::Cycle module required for this test" unless HAVE_DEVEL_CYCLE;
+plan tests => 4;
 
 use strict;
 use Mail::SpamAssassin;
diff -Nru spamassassin-3.4.0/t/metadata.t spamassassin-3.4.2/t/metadata.t
--- spamassassin-3.4.0/t/metadata.t	2014-02-07 03:36:38.000000000 -0500
+++ spamassassin-3.4.2/t/metadata.t	2018-09-13 21:27:54.000000000 -0400
@@ -2,7 +2,7 @@
 
 use lib '.'; use lib 't';
 use SATest; sa_t_init("metadata");
-use Test; BEGIN { plan tests => 3 };
+use Test::More tests => 3;
 
 # ---------------------------------------------------------------------------
 
diff -Nru spamassassin-3.4.0/t/mimeheader.t spamassassin-3.4.2/t/mimeheader.t
--- spamassassin-3.4.0/t/mimeheader.t	2014-02-07 03:36:38.000000000 -0500
+++ spamassassin-3.4.2/t/mimeheader.t	2018-09-13 21:27:53.000000000 -0400
@@ -2,7 +2,7 @@
 
 use lib '.'; use lib 't';
 use SATest; sa_t_init("mimeheader");
-use Test; BEGIN { plan tests => 4 };
+use Test::More tests => 4;
 
 $ENV{'LANGUAGE'} = $ENV{'LC_ALL'} = 'C';             # a cheat, but we need the patterns to work
 
diff -Nru spamassassin-3.4.0/t/mimeparse.t spamassassin-3.4.2/t/mimeparse.t
--- spamassassin-3.4.0/t/mimeparse.t	2014-02-07 03:36:37.000000000 -0500
+++ spamassassin-3.4.2/t/mimeparse.t	2018-09-13 21:27:54.000000000 -0400
@@ -17,7 +17,8 @@
 }
 
 use strict;
-use Test;
+
+use Test::More tests => 33;
 use Mail::SpamAssassin;
 
 BEGIN {
@@ -107,13 +108,6 @@
     dont_copy_prefs   => 1,
 });
 
-my $numtests = 5;
-while ( my($k,$v) = each %files ) {
-  $numtests += @{$v};
-}
-
-plan tests => $numtests;
-
 foreach my $k ( sort keys %files ) {
   open(INP, $k) || die "Can't find $k:$!";
   my $mail = $sa->parse(\*INP, 1);
diff -Nru spamassassin-3.4.0/t/missing_hb_separator.t spamassassin-3.4.2/t/missing_hb_separator.t
--- spamassassin-3.4.0/t/missing_hb_separator.t	2014-02-07 03:36:38.000000000 -0500
+++ spamassassin-3.4.2/t/missing_hb_separator.t	2018-09-13 21:27:52.000000000 -0400
@@ -16,11 +16,12 @@
 }
 
 use strict;
-use Test;
+
+use lib '.'; use lib 't';
 use SATest; sa_t_init("missing_hb_separator");
 use Mail::SpamAssassin;
 
-plan tests => 13;
+use Test::More tests => 13;
 
 # initialize SpamAssassin
 my $sa = create_saobj({
diff -Nru spamassassin-3.4.0/t/mkrules_else.t spamassassin-3.4.2/t/mkrules_else.t
--- spamassassin-3.4.0/t/mkrules_else.t	2014-02-07 03:36:38.000000000 -0500
+++ spamassassin-3.4.2/t/mkrules_else.t	2018-09-13 21:27:53.000000000 -0400
@@ -3,7 +3,7 @@
 
 use lib '.'; use lib 't';
 use SATest; sa_t_init("mkrules_else");
-use Test; BEGIN { plan tests => 18 };
+use Test::More tests => 18;
 use File::Copy;
 use File::Path;
 
@@ -170,17 +170,21 @@
 
   my $scrargs = "$perl_path -I../lib ../build/mkrules $args";
   print ("\t$scrargs\n");
-  system ("$scrargs > log/$testname.${Test::ntest} $post_redir");
+
+  my $test_number = test_number();
+  system ("$scrargs > log/$testname.$test_number $post_redir");
   $mk_exitcode = ($?>>8);
   if ($mk_exitcode != 0) { return undef; }
-  &checkfile ("$testname.${Test::ntest}", $read_sub) if (defined $read_sub);
+  &checkfile ("$testname.$test_number", $read_sub) if (defined $read_sub);
   1;
 }
 
 sub save_tdir {
-  rmtree("$tdir.${Test::ntest}");
-  if (move( "$tdir", "$tdir.${Test::ntest}")) {
-    print "\ttest output tree copied to $tdir.${Test::ntest}\n";
+  my $test_number = test_number();
+
+  rmtree("$tdir.$test_number");
+  if (move( "$tdir", "$tdir.$test_number")) {
+    print "\ttest output tree copied to $tdir.$test_number\n";
   }
 }
 
diff -Nru spamassassin-3.4.0/t/mkrules.t spamassassin-3.4.2/t/mkrules.t
--- spamassassin-3.4.0/t/mkrules.t	2014-02-07 03:36:37.000000000 -0500
+++ spamassassin-3.4.2/t/mkrules.t	2018-09-13 21:27:52.000000000 -0400
@@ -2,7 +2,7 @@
 
 use lib '.'; use lib 't';
 use SATest; sa_t_init("mkrules");
-use Test; BEGIN { plan tests => 97 };
+use Test::More tests => 97;
 use File::Copy;
 use File::Path;
 
@@ -455,17 +455,21 @@
 
   my $scrargs = "$perl_path -I../lib ../build/mkrules $args";
   print ("\t$scrargs\n");
-  system ("$scrargs > log/$testname.${Test::ntest} $post_redir");
+
+  my $test_number = test_number();
+  system ("$scrargs > log/$testname.$test_number $post_redir");
   $mk_exitcode = ($?>>8);
   if ($mk_exitcode != 0) { return undef; }
-  &checkfile ("$testname.${Test::ntest}", $read_sub) if (defined $read_sub);
+  &checkfile ("$testname.$test_number", $read_sub) if (defined $read_sub);
   1;
 }
 
 sub save_tdir {
-  rmtree("$tdir.${Test::ntest}");
-  if (move( "$tdir", "$tdir.${Test::ntest}")) {
-    print "\ttest output tree copied to $tdir.${Test::ntest}\n";
+  my $test_number = test_number();
+
+  rmtree("$tdir.$test_number");
+  if (move( "$tdir", "$tdir.$test_number")) {
+    print "\ttest output tree copied to $tdir.$test_number\n";
   }
 }
 
diff -Nru spamassassin-3.4.0/t/nonspam.t spamassassin-3.4.2/t/nonspam.t
--- spamassassin-3.4.0/t/nonspam.t	2014-02-07 03:36:38.000000000 -0500
+++ spamassassin-3.4.2/t/nonspam.t	2018-09-13 21:27:53.000000000 -0400
@@ -2,7 +2,7 @@
 
 use lib '.'; use lib 't';
 use SATest; sa_t_init("nonspam");
-use Test; BEGIN { plan tests => 1 };
+use Test::More tests => 1;
 
 # ---------------------------------------------------------------------------
 
diff -Nru spamassassin-3.4.0/t/originating_ip_hdr.t spamassassin-3.4.2/t/originating_ip_hdr.t
--- spamassassin-3.4.0/t/originating_ip_hdr.t	2014-02-07 03:36:38.000000000 -0500
+++ spamassassin-3.4.2/t/originating_ip_hdr.t	2018-09-13 21:27:54.000000000 -0400
@@ -2,7 +2,7 @@
 
 use lib '.'; use lib 't';
 use SATest; sa_t_init("if_can");
-use Test; BEGIN { plan tests => 9 };
+use Test::More tests => 9;
 
 # ---------------------------------------------------------------------------
 
diff -Nru spamassassin-3.4.0/t/plugin_file.t spamassassin-3.4.2/t/plugin_file.t
--- spamassassin-3.4.0/t/plugin_file.t	2014-02-07 03:36:38.000000000 -0500
+++ spamassassin-3.4.2/t/plugin_file.t	2018-09-13 21:27:54.000000000 -0400
@@ -2,7 +2,7 @@
 
 use lib '.'; use lib 't';
 use SATest; sa_t_init("plugin_file");
-use Test; BEGIN { plan tests => 9 };
+use Test::More tests => 9;
 
 # ---------------------------------------------------------------------------
 
diff -Nru spamassassin-3.4.0/t/plugin_priorities.t spamassassin-3.4.2/t/plugin_priorities.t
--- spamassassin-3.4.0/t/plugin_priorities.t	2014-02-07 03:36:37.000000000 -0500
+++ spamassassin-3.4.2/t/plugin_priorities.t	2018-09-13 21:27:54.000000000 -0400
@@ -2,7 +2,7 @@
 
 use lib '.'; use lib 't';
 use SATest; sa_t_init("plugin_priorities");
-use Test; BEGIN { plan tests => 2 };
+use Test::More tests => 2;
 
 # ---------------------------------------------------------------------------
 
diff -Nru spamassassin-3.4.0/t/plugin.t spamassassin-3.4.2/t/plugin.t
--- spamassassin-3.4.0/t/plugin.t	2014-02-07 03:36:38.000000000 -0500
+++ spamassassin-3.4.2/t/plugin.t	2018-09-13 21:27:54.000000000 -0400
@@ -2,7 +2,7 @@
 
 use lib '.'; use lib 't';
 use SATest; sa_t_init("plugin");
-use Test; BEGIN { plan tests => 6 };
+use Test::More tests => 6;
 
 # ---------------------------------------------------------------------------
 
diff -Nru spamassassin-3.4.0/t/prefs_include.t spamassassin-3.4.2/t/prefs_include.t
--- spamassassin-3.4.0/t/prefs_include.t	2014-02-07 03:36:38.000000000 -0500
+++ spamassassin-3.4.2/t/prefs_include.t	2018-09-13 21:27:54.000000000 -0400
@@ -2,7 +2,7 @@
 
 use lib '.'; use lib 't';
 use SATest; sa_t_init("prefs_include");
-use Test; BEGIN { plan tests => 2 };
+use Test::More tests => 2;
 
 $ENV{'LANGUAGE'} = $ENV{'LC_ALL'} = 'C';             # a cheat, but we need the patterns to work
 
diff -Nru spamassassin-3.4.0/t/priorities.t spamassassin-3.4.2/t/priorities.t
--- spamassassin-3.4.0/t/priorities.t	2014-02-07 03:36:37.000000000 -0500
+++ spamassassin-3.4.2/t/priorities.t	2018-09-13 21:27:54.000000000 -0400
@@ -1,7 +1,5 @@
 #!/usr/bin/perl
 
-use constant NUM_TESTS => 10;
-
 BEGIN {
   if (-e 't/test_dir') { # if we are running "t/priorities.t", kluge around ...
     chdir 't';
@@ -17,9 +15,10 @@
   $prefix = '..';
 }
 
+use lib '.'; use lib 't';
 use SATest; sa_t_init("priorities");
 use strict;
-use Test; BEGIN { plan tests => NUM_TESTS };
+use Test::More tests => 10;
 
 use Mail::SpamAssassin;
 
diff -Nru spamassassin-3.4.0/t/razor2.t spamassassin-3.4.2/t/razor2.t
--- spamassassin-3.4.0/t/razor2.t	2014-02-07 03:36:38.000000000 -0500
+++ spamassassin-3.4.2/t/razor2.t	2018-09-13 21:27:54.000000000 -0400
@@ -1,50 +1,44 @@
 #!/usr/bin/perl
 
-use lib '.'; use lib 't';
-use SATest; sa_t_init("razor2");
+use lib '.'; 
+use lib 't';
+use SATest; 
+sa_t_init("razor2");
 
-use constant TEST_ENABLED => conf_bool('run_net_tests');
 use constant HAS_RAZOR2 => eval { require Razor2::Client::Agent; };
+use constant HAS_RAZOR2_IDENT => eval { -r $ENV{'HOME'}.'/.razor/identity'; };
 
-use Test;
+use Test::More;
+plan skip_all => "Net tests disabled" unless conf_bool('run_net_tests');
+plan skip_all => "Needs Razor2" unless HAS_RAZOR2;
+plan skip_all => "Needs Razor2 Identity File Needed. razor-register / razor-admin -register has not been run, or identity file ($ENV{'HOME'}/.razor/identity) is unreadable." unless HAS_RAZOR2_IDENT;
+plan tests => 2;
 
-BEGIN {
-  plan tests => ((TEST_ENABLED && HAS_RAZOR2) ? 2 : 0),
-  onfail => sub {
-    warn "\n\nNote: this may not be an SpamAssassin bug, as Razor tests can" .
-	"\nfail due to problems with the Razor servers.\n\n";
-  }
-};
-
-exit unless (TEST_ENABLED && HAS_RAZOR2);
+diag('Note: Failures may not be an SpamAssassin bug, as Razor tests can fail due to problems with the Razor servers.');
 
 # ---------------------------------------------------------------------------
 
-my $ident = $ENV{'HOME'}.'/.razor/identity';
-if (! -r $ident) {
-  $razor_not_available = "razor-register / razor-admin -register has not been run, or $ident is unreadable.";
-  warn "$razor_not_available\n";
-}
-
-if (! $razor_not_available) {
-  system ("razor-report < data/spam/001");
-  if (($? >> 8) != 0) {
-    warn "'razor-report < data/spam/001' failed. This may cause this test to fail.\n";
-  }
-}
+#report the email as spam so it fails below.  This process is not likely to work and I can't find a test point for razor. KAM 2018-08-20
+#unless (HAS_RAZOR2 or HAS_RAZOR2_IDENT) {
+#  system ("razor-report < data/spam/001");
+#  if (($? >> 8) != 0) {
+#    warn "'razor-report < data/spam/001' failed. This may cause this test to fail.\n";
+#  }
+#}
 
 tstpre ("
 loadplugin Mail::SpamAssassin::Plugin::Razor2
 ");
 
+#RAZOR2 file was from real-world spam in August 2018
 
 #TESTING FOR SPAM
 %patterns = (
         q{ Listed in Razor2 }, 'spam',
             );
 
-sarun ("-t < data/spam/001", \&patterns_run_cb);
-skip_all_patterns($razor_not_available);
+sarun ("-t < data/spam/razor2", \&patterns_run_cb);
+ok_all_patterns();
 
 #TESTING FOR HAM
 %patterns = ();
@@ -53,4 +47,4 @@
 		 );
 
 sarun ("-t < data/nice/001", \&patterns_run_cb);
-skip_all_patterns($razor_not_available);
+ok_all_patterns();
diff -Nru spamassassin-3.4.0/t/rcvd_parser.t spamassassin-3.4.2/t/rcvd_parser.t
--- spamassassin-3.4.0/t/rcvd_parser.t	2014-02-07 03:36:38.000000000 -0500
+++ spamassassin-3.4.2/t/rcvd_parser.t	2018-09-13 21:27:54.000000000 -0400
@@ -18,7 +18,7 @@
 
 use lib '.'; use lib 't';
 use SATest; sa_t_init("rcvd_parser");
-use Test; BEGIN { plan tests => 145 };
+use Test::More tests => 147;
 use strict;
 
 # format is:
@@ -475,6 +475,14 @@
   'from unknown (HELO ?151.80.38.67?) (myuser@mydomain.it@151.80.38.67) by mail.it-connect.it with SMTP; 28 Jan 2013 21:50:51 +0100' => 
   '[ ip=151.80.38.67 rdns= helo=?151.80.38.67? by=mail.it-connect.it ident=myuser@mydomain.it envfrom= id= auth= msa=0 ]',
 
+  #Bug 7101
+  'from [94.79.161.130] by 3capp-webde-bs01.dlan.cinetic.de (via HTTP); Tue, 11 Nov 2014 20:32:34 +0100' => 
+  '[ ip=94.79.161.130 rdns= helo= by=3capp-webde-bs01.dlan.cinetic.de ident= envfrom= id= auth=HTTP msa=0 ]',
+
+  #Bug 7213
+  'from mail1-backend.DDDD.com (LHLO mail2-backend.DDDD.com) (10.2.2.20) by mail3-backend.DDDD.com with LMTP; Thu, 18 Jun 2015 16:50:56 -0700 (PDT)' =>
+  '[ ip=10.2.2.20 rdns=mail1-backend.DDDD.com helo=mail2-backend.DDDD.com by=mail3-backend.DDDD.com ident= envfrom= id= auth= msa=0 ]',
+
 );
 
 my $sa = create_saobj();
diff -Nru spamassassin-3.4.0/t/README spamassassin-3.4.2/t/README
--- spamassassin-3.4.0/t/README	2014-02-07 03:36:38.000000000 -0500
+++ spamassassin-3.4.2/t/README	2018-09-13 21:27:54.000000000 -0400
@@ -80,7 +80,7 @@
 SPAMD_HOST
 SPAMD_PORT
 SPAMD_LOCALHOST
-SCRIPT
+SPAMASSASSIN_SCRIPT
 SPAMC_SCRIPT
 SALEARN_SCRIPT
 SA_ARGS
diff -Nru spamassassin-3.4.0/t/re_base_extraction.t spamassassin-3.4.2/t/re_base_extraction.t
--- spamassassin-3.4.0/t/re_base_extraction.t	2014-02-07 03:36:38.000000000 -0500
+++ spamassassin-3.4.2/t/re_base_extraction.t	2018-09-13 21:27:54.000000000 -0400
@@ -5,7 +5,7 @@
 
 use lib '.'; use lib 't'; use lib '../lib';
 use SATest; sa_t_init("re_base_extraction");
-use Test;
+
 use strict;
 use warnings;
 
@@ -21,10 +21,9 @@
 BEGIN { 
   if (-e 't/test_dir') { chdir 't'; } 
   if (-e 'test_dir') { unshift(@INC, '../blib/lib'); }
+}
 
-  plan tests => 128;
-
-};
+use Test::More tests => 128;
 use lib '../lib';
 
 # ---------------------------------------------------------------------------
diff -Nru spamassassin-3.4.0/t/recips.t spamassassin-3.4.2/t/recips.t
--- spamassassin-3.4.0/t/recips.t	2014-02-07 03:36:38.000000000 -0500
+++ spamassassin-3.4.2/t/recips.t	2018-09-13 21:27:54.000000000 -0400
@@ -2,7 +2,8 @@
 
 use lib '.'; use lib 't';
 use SATest; sa_t_init("recips");
-use Test; BEGIN { plan tests => 6 };
+
+use Test::More tests => 6;
 
 # ---------------------------------------------------------------------------
 
diff -Nru spamassassin-3.4.0/t/recreate.t spamassassin-3.4.2/t/recreate.t
--- spamassassin-3.4.0/t/recreate.t	2014-02-07 03:36:38.000000000 -0500
+++ spamassassin-3.4.2/t/recreate.t	2018-09-13 21:27:54.000000000 -0400
@@ -3,7 +3,7 @@
 use Data::Dumper;
 use lib '.'; use lib 't';
 use SATest; sa_t_init("recreate");
-use Test;
+use Test::More tests => 9;
 
 BEGIN { 
   if (-e 't/test_dir') {
@@ -13,8 +13,6 @@
   if (-e 'test_dir') {
     unshift(@INC, '../blib/lib');
   }
-
-  plan tests => 9;
 };
 
 use strict;
@@ -32,7 +30,9 @@
   print STDERR @_;
 
   # certain warnings can be ignored for this test
-  if ($_[0] =~ m{plugin: failed to parse plugin.*: Can.t locate })
+  if ($_[0] =~ m{plugin: failed to parse plugin.*: Can.t locate } ||
+      $_[0] =~ m{is more clearly written simply as .* in regex} ||
+      $_[0] =~ m{Ranges of ASCII printables should be some subset of .* in regex})
   {
     print STDERR "[ignored warning, not recreate-related]\n";
   } else {
diff -Nru spamassassin-3.4.0/t/recursion.t spamassassin-3.4.2/t/recursion.t
--- spamassassin-3.4.0/t/recursion.t	2014-02-07 03:36:38.000000000 -0500
+++ spamassassin-3.4.2/t/recursion.t	2018-09-13 21:27:54.000000000 -0400
@@ -2,7 +2,7 @@
 
 use lib '.'; use lib 't';
 use SATest; sa_t_init("recursion");
-use Test; BEGIN { plan tests => 10 };
+use Test::More tests => 10;
 use IO::File;
 
 # ---------------------------------------------------------------------------
diff -Nru spamassassin-3.4.0/t/regexp_valid.t spamassassin-3.4.2/t/regexp_valid.t
--- spamassassin-3.4.0/t/regexp_valid.t	2014-02-07 03:36:38.000000000 -0500
+++ spamassassin-3.4.2/t/regexp_valid.t	2018-09-13 21:27:54.000000000 -0400
@@ -16,11 +16,10 @@
 }
 
 use strict;
+use lib '.'; use lib 't';
 use SATest; sa_t_init("regexp_valid");
-use Test;
 
-# settings
-plan tests => 24;
+use Test::More tests => 24;
 
 # initialize SpamAssassin
 use Mail::SpamAssassin;
diff -Nru spamassassin-3.4.0/t/relative_scores.t spamassassin-3.4.2/t/relative_scores.t
--- spamassassin-3.4.0/t/relative_scores.t	2014-02-07 03:36:38.000000000 -0500
+++ spamassassin-3.4.2/t/relative_scores.t	2018-09-13 21:27:54.000000000 -0400
@@ -11,8 +11,9 @@
   }
 }
 
+use lib '.'; use lib 't';
 use SATest; sa_t_init("relative_scores");
-use Test;
+
 use strict;
 use vars qw/ $error /;
 
@@ -38,7 +39,7 @@
 
 $sa->init(0); # parse rules
 
-plan tests => 4;
+use Test::More tests => 4;
 
 ok($sa);
 
diff -Nru spamassassin-3.4.0/t/relaycountry_fast.t spamassassin-3.4.2/t/relaycountry_fast.t
--- spamassassin-3.4.0/t/relaycountry_fast.t	1969-12-31 19:00:00.000000000 -0500
+++ spamassassin-3.4.2/t/relaycountry_fast.t	2018-09-13 21:27:54.000000000 -0400
@@ -0,0 +1,42 @@
+#!/usr/bin/perl
+
+BEGIN {
+  if (-e 't/test_dir') { # if we are running "t/rule_tests.t", kluge around ...
+    chdir 't';
+  }
+
+  if (-e 'test_dir') {            # running from test directory, not ..
+    unshift(@INC, '../blib/lib');
+    unshift(@INC, '../lib');
+  }
+}
+
+use lib '.'; use lib 't';
+use SATest; sa_t_init("relaycountry");
+
+use constant HAS_COUNTRY_FAST => eval { require IP::Country::Fast; };
+
+use Test::More;
+
+plan skip_all => "IP::Country::Fast not installed" unless HAS_COUNTRY_FAST;
+plan tests => 2;
+
+# ---------------------------------------------------------------------------
+
+tstpre ("
+loadplugin Mail::SpamAssassin::Plugin::RelayCountry
+");
+
+tstprefs ("
+        $default_cf_lines
+        country_db_type Fast
+        add_header all Relay-Country _RELAYCOUNTRY_
+        ");
+
+# Check for country of gmail.com mail server
+%patterns = (
+        q{ X-Spam-Relay-Country: US },
+            );
+
+ok sarun ("-t < data/spam/relayUS.eml", \&patterns_run_cb);
+ok_all_patterns();
diff -Nru spamassassin-3.4.0/t/relaycountry_geoip.t spamassassin-3.4.2/t/relaycountry_geoip.t
--- spamassassin-3.4.0/t/relaycountry_geoip.t	1969-12-31 19:00:00.000000000 -0500
+++ spamassassin-3.4.2/t/relaycountry_geoip.t	2018-09-13 21:27:54.000000000 -0400
@@ -0,0 +1,45 @@
+#!/usr/bin/perl
+
+BEGIN {
+  if (-e 't/test_dir') { # if we are running "t/rule_tests.t", kluge around ...
+    chdir 't';
+  }
+
+  if (-e 'test_dir') {            # running from test directory, not ..
+    unshift(@INC, '../blib/lib');
+    unshift(@INC, '../lib');
+  }
+}
+
+use lib '.'; use lib 't';
+use SATest; sa_t_init("relaycountry");
+
+use constant HAS_GEOIP => eval { require Geo::IP; };
+use constant HAS_GEOIP_CONF => eval { Geo::IP->new(GEOIP_MEMORY_CACHE | GEOIP_CHECK_CACHE); };
+
+use Test::More;
+
+plan skip_all => "Geo::IP not installed" unless HAS_GEOIP;
+plan skip_all => "Geo::IP not configured" unless HAS_GEOIP_CONF;
+
+plan tests => 2;
+
+# ---------------------------------------------------------------------------
+
+tstpre ("
+loadplugin Mail::SpamAssassin::Plugin::RelayCountry
+");
+
+tstprefs ("
+        $default_cf_lines
+        country_db_type GeoIP
+        add_header all Relay-Country _RELAYCOUNTRY_
+        ");
+
+# Check for country of gmail.com mail server
+%patterns = (
+        q{ X-Spam-Relay-Country: US },
+            );
+
+ok sarun ("-t < data/spam/relayUS.eml", \&patterns_run_cb);
+ok_all_patterns();
diff -Nru spamassassin-3.4.0/t/reportheader_8bit.t spamassassin-3.4.2/t/reportheader_8bit.t
--- spamassassin-3.4.0/t/reportheader_8bit.t	2014-02-07 03:36:38.000000000 -0500
+++ spamassassin-3.4.2/t/reportheader_8bit.t	2018-09-13 21:27:53.000000000 -0400
@@ -2,7 +2,7 @@
 
 use lib '.'; use lib 't';
 use SATest; sa_t_init("reportheader");
-use Test; BEGIN { plan tests => 2 };
+use Test::More tests => 2;
 
 $ENV{'LANGUAGE'} = $ENV{'LC_ALL'} = 'C';             # a cheat, but we need the patterns to work
 
diff -Nru spamassassin-3.4.0/t/reportheader.t spamassassin-3.4.2/t/reportheader.t
--- spamassassin-3.4.0/t/reportheader.t	2014-02-07 03:36:38.000000000 -0500
+++ spamassassin-3.4.2/t/reportheader.t	2018-09-13 21:27:53.000000000 -0400
@@ -2,7 +2,8 @@
 
 use lib '.'; use lib 't';
 use SATest; sa_t_init("reportheader");
-use Test; BEGIN { plan tests => 11 };
+
+use Test::More tests => 11;
 
 $ENV{'LANGUAGE'} = $ENV{'LC_ALL'} = 'C';             # a cheat, but we need the patterns to work
 
diff -Nru spamassassin-3.4.0/t/report_safe.t spamassassin-3.4.2/t/report_safe.t
--- spamassassin-3.4.0/t/report_safe.t	2014-02-07 03:36:38.000000000 -0500
+++ spamassassin-3.4.2/t/report_safe.t	2018-09-13 21:27:53.000000000 -0400
@@ -2,7 +2,8 @@
 
 use lib '.'; use lib 't';
 use SATest; sa_t_init("report_safe");
-use Test; BEGIN { plan tests => 8 };
+
+use Test::More tests => 8;
 
 # ---------------------------------------------------------------------------
 
diff -Nru spamassassin-3.4.0/t/reuse.t spamassassin-3.4.2/t/reuse.t
--- spamassassin-3.4.0/t/reuse.t	2014-02-07 03:36:38.000000000 -0500
+++ spamassassin-3.4.2/t/reuse.t	2018-09-13 21:27:54.000000000 -0400
@@ -16,20 +16,16 @@
 }
 
 use strict;
+use lib '.'; use lib 't';
 use SATest; sa_t_init("reuse");
-use Test;
 
 use vars qw(%patterns %anti_patterns $perl_path &patterns_run_cb);
 
 use Mail::SpamAssassin;
 
-if (-e '../masses/mass-check') {
-  plan tests => 37;
-}
-else {
-  plan tests => 0;
-  exit;
-}
+use Test::More;
+plan skip_all => "no mass check" unless (-e '../masses/mass-check');
+plan tests => 37;
 
 # Tests the following cases:
 # - No reuse: no change
diff -Nru spamassassin-3.4.0/t/root_spamd.t spamassassin-3.4.2/t/root_spamd.t
--- spamassassin-3.4.0/t/root_spamd.t	2014-02-07 03:36:38.000000000 -0500
+++ spamassassin-3.4.2/t/root_spamd.t	2018-09-13 21:27:52.000000000 -0400
@@ -4,14 +4,11 @@
 
 use lib '.'; use lib 't';
 use SATest; sa_t_init("root_spamd");
-use Test;
 
-use constant TEST_ENABLED => conf_bool('run_root_tests');
-use constant IS_ROOT => eval { ($> == 0); };
-use constant RUN_TESTS => (TEST_ENABLED && IS_ROOT);
-
-BEGIN { plan tests => (RUN_TESTS ? 14 : 0) };
-exit unless RUN_TESTS;
+use Test::More;
+plan skip_all => "root tests disabled" unless conf_bool('run_root_tests');
+plan skip_all => "not running tests as root" unless eval { ($> == 0); };
+plan tests => 14;
 
 # ---------------------------------------------------------------------------
 
diff -Nru spamassassin-3.4.0/t/root_spamd_tell_paranoid.t spamassassin-3.4.2/t/root_spamd_tell_paranoid.t
--- spamassassin-3.4.0/t/root_spamd_tell_paranoid.t	2014-02-07 03:36:38.000000000 -0500
+++ spamassassin-3.4.2/t/root_spamd_tell_paranoid.t	2018-09-13 21:27:54.000000000 -0400
@@ -2,14 +2,11 @@
 
 use lib '.'; use lib 't';
 use SATest; sa_t_init("root_spamd_tell_paranoid");
-use Test;
 
-use constant TEST_ENABLED => conf_bool('run_root_tests');
-use constant IS_ROOT => eval { ($> == 0); };
-use constant RUN_TESTS => (TEST_ENABLED && IS_ROOT);
-
-BEGIN { plan tests => (RUN_TESTS ? 6 : 0) };
-exit unless RUN_TESTS;
+use Test::More;
+plan skip_all => "root tests disabled" unless conf_bool('run_root_tests');
+plan skip_all => "not running tests as root" unless eval { ($> == 0); };
+plan tests => 6;
 
 # ---------------------------------------------------------------------------
 
diff -Nru spamassassin-3.4.0/t/root_spamd_tell.t spamassassin-3.4.2/t/root_spamd_tell.t
--- spamassassin-3.4.0/t/root_spamd_tell.t	2014-02-07 03:36:38.000000000 -0500
+++ spamassassin-3.4.2/t/root_spamd_tell.t	2018-09-13 21:27:54.000000000 -0400
@@ -2,14 +2,11 @@
 
 use lib '.'; use lib 't';
 use SATest; sa_t_init("root_spamd_tell");
-use Test;
 
-use constant TEST_ENABLED => conf_bool('run_root_tests');
-use constant IS_ROOT => eval { ($> == 0); };
-use constant RUN_TESTS => (TEST_ENABLED && IS_ROOT);
-
-BEGIN { plan tests => (RUN_TESTS ? 6 : 0) };
-exit unless RUN_TESTS;
+use Test::More;
+plan skip_all => "root tests disabled" unless conf_bool('run_root_tests');
+plan skip_all => "not running tests as root" unless eval { ($> == 0); };
+plan tests => 6;
 
 # ---------------------------------------------------------------------------
 
diff -Nru spamassassin-3.4.0/t/root_spamd_tell_x_paranoid.t spamassassin-3.4.2/t/root_spamd_tell_x_paranoid.t
--- spamassassin-3.4.0/t/root_spamd_tell_x_paranoid.t	2014-02-07 03:36:37.000000000 -0500
+++ spamassassin-3.4.2/t/root_spamd_tell_x_paranoid.t	2018-09-13 21:27:54.000000000 -0400
@@ -2,14 +2,11 @@
 
 use lib '.'; use lib 't';
 use SATest; sa_t_init("root_spamd_tell_x_paranoid");
-use Test;
 
-use constant TEST_ENABLED => conf_bool('run_root_tests');
-use constant IS_ROOT => eval { ($> == 0); };
-use constant RUN_TESTS => (TEST_ENABLED && IS_ROOT);
-
-BEGIN { plan tests => (RUN_TESTS ? 6 : 0) };
-exit unless RUN_TESTS;
+use Test::More;
+plan skip_all => "root tests disabled" unless conf_bool('run_root_tests');
+plan skip_all => "not running tests as root" unless eval { ($> == 0); };
+plan tests => 6;
 
 # ---------------------------------------------------------------------------
 
diff -Nru spamassassin-3.4.0/t/root_spamd_tell_x.t spamassassin-3.4.2/t/root_spamd_tell_x.t
--- spamassassin-3.4.0/t/root_spamd_tell_x.t	2014-02-07 03:36:37.000000000 -0500
+++ spamassassin-3.4.2/t/root_spamd_tell_x.t	2018-09-13 21:27:54.000000000 -0400
@@ -2,14 +2,11 @@
 
 use lib '.'; use lib 't';
 use SATest; sa_t_init("root_spamd_tell_x");
-use Test;
 
-use constant TEST_ENABLED => conf_bool('run_root_tests');
-use constant IS_ROOT => eval { ($> == 0); };
-use constant RUN_TESTS => (TEST_ENABLED && IS_ROOT);
-
-BEGIN { plan tests => (RUN_TESTS ? 6 : 0) };
-exit unless RUN_TESTS;
+use Test::More;
+plan skip_all => "root tests disabled" unless conf_bool('run_root_tests');
+plan skip_all => "not running tests as root" unless eval { ($> == 0); };
+plan tests => 6;
 
 # ---------------------------------------------------------------------------
 
diff -Nru spamassassin-3.4.0/t/root_spamd_u_dcc.t spamassassin-3.4.2/t/root_spamd_u_dcc.t
--- spamassassin-3.4.0/t/root_spamd_u_dcc.t	2014-02-07 03:36:38.000000000 -0500
+++ spamassassin-3.4.2/t/root_spamd_u_dcc.t	2018-09-13 21:27:54.000000000 -0400
@@ -5,15 +5,12 @@
 
 use lib '.'; use lib 't';
 use SATest; sa_t_init("root_spamd_u_dcc");
-use Test;
 
-use constant TEST_ENABLED => conf_bool('run_root_tests');
-use constant DCC_TEST_ENABLED => conf_bool('run_dcc_tests');
-use constant IS_ROOT => eval { ($> == 0); };
-use constant RUN_TESTS => (TEST_ENABLED && DCC_TEST_ENABLED && IS_ROOT);
-
-BEGIN { plan tests => (RUN_TESTS ? 23 : 0) };
-exit unless RUN_TESTS;
+use Test::More;
+plan skip_all => "root tests disabled" unless conf_bool('run_root_tests');
+plan skip_all => "DCC tests disabled" unless conf_bool('run_dcc_tests');
+plan skip_all => "not running tests as root" unless eval { ($> == 0); };
+plan tests => 23;
 
 # ---------------------------------------------------------------------------
 
diff -Nru spamassassin-3.4.0/t/root_spamd_u.t spamassassin-3.4.2/t/root_spamd_u.t
--- spamassassin-3.4.0/t/root_spamd_u.t	2014-02-07 03:36:38.000000000 -0500
+++ spamassassin-3.4.2/t/root_spamd_u.t	2018-09-13 21:27:54.000000000 -0400
@@ -4,14 +4,11 @@
 
 use lib '.'; use lib 't';
 use SATest; sa_t_init("root_spamd_u");
-use Test;
 
-use constant TEST_ENABLED => conf_bool('run_root_tests');
-use constant IS_ROOT => eval { ($> == 0); };
-use constant RUN_TESTS => (TEST_ENABLED && IS_ROOT);
-
-BEGIN { plan tests => (RUN_TESTS ? 11 : 0) };
-exit unless RUN_TESTS;
+use Test::More;
+plan skip_all => "root tests disabled" unless conf_bool('run_root_tests');
+plan skip_all => "not running tests as root" unless eval { ($> == 0); };
+plan tests => 11;
 
 # ---------------------------------------------------------------------------
 
diff -Nru spamassassin-3.4.0/t/root_spamd_virtual.t spamassassin-3.4.2/t/root_spamd_virtual.t
--- spamassassin-3.4.0/t/root_spamd_virtual.t	2014-02-07 03:36:38.000000000 -0500
+++ spamassassin-3.4.2/t/root_spamd_virtual.t	2018-09-13 21:27:52.000000000 -0400
@@ -4,14 +4,11 @@
 
 use lib '.'; use lib 't';
 use SATest; sa_t_init("root_spamd_virtual");
-use Test;
 
-use constant TEST_ENABLED => conf_bool('run_root_tests');
-use constant IS_ROOT => eval { ($> == 0); };
-use constant RUN_TESTS => (TEST_ENABLED && IS_ROOT);
-
-BEGIN { plan tests => (RUN_TESTS ? 14 : 0) };
-exit unless RUN_TESTS;
+use Test::More;
+plan skip_all => "root tests disabled" unless conf_bool('run_root_tests');
+plan skip_all => "not running tests as root" unless eval { ($> == 0); };
+plan tests => 14;
 
 # ---------------------------------------------------------------------------
 
diff -Nru spamassassin-3.4.0/t/root_spamd_x_paranoid.t spamassassin-3.4.2/t/root_spamd_x_paranoid.t
--- spamassassin-3.4.0/t/root_spamd_x_paranoid.t	2014-02-07 03:36:38.000000000 -0500
+++ spamassassin-3.4.2/t/root_spamd_x_paranoid.t	2018-09-13 21:27:54.000000000 -0400
@@ -2,14 +2,11 @@
 
 use lib '.'; use lib 't';
 use SATest; sa_t_init("root_spamd_x_paranoid");
-use Test;
 
-use constant TEST_ENABLED => conf_bool('run_root_tests');
-use constant IS_ROOT => eval { ($> == 0); };
-use constant RUN_TESTS => (TEST_ENABLED && IS_ROOT);
-
-BEGIN { plan tests => (RUN_TESTS ? 14 : 0) };
-exit unless RUN_TESTS;
+use Test::More;
+plan skip_all => "root tests disabled" unless conf_bool('run_root_tests');
+plan skip_all => "not running tests as root" unless eval { ($> == 0); };
+plan tests => 14;
 
 # ---------------------------------------------------------------------------
 
diff -Nru spamassassin-3.4.0/t/root_spamd_x.t spamassassin-3.4.2/t/root_spamd_x.t
--- spamassassin-3.4.0/t/root_spamd_x.t	2014-02-07 03:36:37.000000000 -0500
+++ spamassassin-3.4.2/t/root_spamd_x.t	2018-09-13 21:27:54.000000000 -0400
@@ -2,14 +2,11 @@
 
 use lib '.'; use lib 't';
 use SATest; sa_t_init("root_spamd_x");
-use Test;
 
-use constant TEST_ENABLED => conf_bool('run_root_tests');
-use constant IS_ROOT => eval { ($> == 0); };
-use constant RUN_TESTS => (TEST_ENABLED && IS_ROOT);
-
-BEGIN { plan tests => (RUN_TESTS ? 14 : 0) };
-exit unless RUN_TESTS;
+use Test::More;
+plan skip_all => "root tests disabled" unless conf_bool('run_root_tests');
+plan skip_all => "not running tests as root" unless eval { ($> == 0); };
+plan tests => 14;
 
 # ---------------------------------------------------------------------------
 
diff -Nru spamassassin-3.4.0/t/root_spamd_x_u.t spamassassin-3.4.2/t/root_spamd_x_u.t
--- spamassassin-3.4.0/t/root_spamd_x_u.t	2014-02-07 03:36:38.000000000 -0500
+++ spamassassin-3.4.2/t/root_spamd_x_u.t	2018-09-13 21:27:54.000000000 -0400
@@ -4,14 +4,11 @@
 
 use lib '.'; use lib 't';
 use SATest; sa_t_init("root_spamd_x_u");
-use Test;
 
-use constant TEST_ENABLED => conf_bool('run_root_tests');
-use constant IS_ROOT => eval { ($> == 0); };
-use constant RUN_TESTS => (TEST_ENABLED && IS_ROOT);
-
-BEGIN { plan tests => (RUN_TESTS ? 14 : 0) };
-exit unless RUN_TESTS;
+use Test::More;
+plan skip_all => "root tests disabled" unless conf_bool('run_root_tests');
+plan skip_all => "not running tests as root" unless eval { ($> == 0); };
+plan tests => 14;
 
 # ---------------------------------------------------------------------------
 
diff -Nru spamassassin-3.4.0/t/rule_multiple.t spamassassin-3.4.2/t/rule_multiple.t
--- spamassassin-3.4.0/t/rule_multiple.t	2014-02-07 03:36:38.000000000 -0500
+++ spamassassin-3.4.2/t/rule_multiple.t	2018-09-13 21:27:54.000000000 -0400
@@ -2,7 +2,7 @@
 
 use lib '.'; use lib 't';
 use SATest; sa_t_init("rule_multiple");
-use Test; BEGIN { plan tests => 20 };
+use Test::More tests => 20;
 
 # ---------------------------------------------------------------------------
 
diff -Nru spamassassin-3.4.0/t/rule_names.t spamassassin-3.4.2/t/rule_names.t
--- spamassassin-3.4.0/t/rule_names.t	2014-02-07 03:36:37.000000000 -0500
+++ spamassassin-3.4.2/t/rule_names.t	2018-09-13 21:27:54.000000000 -0400
@@ -28,17 +28,8 @@
 
 our $RUN_THIS_TEST;
 
-use Test;
-BEGIN {
-  $RUN_THIS_TEST = conf_bool('run_rule_name_tests');
-
-  plan tests => 0  if !$RUN_THIS_TEST;
-};
-
-if (!$RUN_THIS_TEST) {
-  print "NOTE: this test requires 'run_rule_name_tests' set to 'y'.\n";
-  exit;
-}
+use Test::More;
+plan skip_all => "This test requires 'run_rule_name_tests' set to 'y'." unless conf_bool('run_rule_name_tests');
 
 use vars qw(%patterns %anti_patterns);
 
@@ -77,12 +68,9 @@
 { # couldn't call Test::plan in a BEGIN phase, the %patterns and %anti_patterns
   # must be assembled first in order to get the planned test count
 
-  plan tests => scalar(keys %anti_patterns) + scalar(keys %patterns),
+  plan tests => scalar(keys %anti_patterns) + scalar(keys %patterns);
 
-  onfail => sub {
-      warn "\n\n   Note: rule_name failures may be only cosmetic" .
-      "\n        but must be fixed before release\n\n";
-  };
+  diag "Note: rule_name failures may be only cosmetic but must be fixed before release";
 };
 
 # ---------------------------------------------------------------------------
diff -Nru spamassassin-3.4.0/t/rule_types.t spamassassin-3.4.2/t/rule_types.t
--- spamassassin-3.4.0/t/rule_types.t	2014-02-07 03:36:38.000000000 -0500
+++ spamassassin-3.4.2/t/rule_types.t	2018-09-13 21:27:54.000000000 -0400
@@ -2,7 +2,8 @@
 
 use lib '.'; use lib 't';
 use SATest; sa_t_init("rule_types");
-use Test; BEGIN { plan tests => 9 };
+
+use Test::More tests => 9;
 
 # ---------------------------------------------------------------------------
 
diff -Nru spamassassin-3.4.0/t/sa_awl.t spamassassin-3.4.2/t/sa_awl.t
--- spamassassin-3.4.0/t/sa_awl.t	2014-02-07 03:36:38.000000000 -0500
+++ spamassassin-3.4.2/t/sa_awl.t	2018-09-13 21:27:52.000000000 -0400
@@ -2,7 +2,8 @@
 
 use lib '.'; use lib 't';
 use SATest; sa_t_init("sa_awl");
-use Test; BEGIN { plan tests => 1 };
+
+use Test::More tests => 1;
 
 # ---------------------------------------------------------------------------
 
diff -Nru spamassassin-3.4.0/t/sa_check_spamd.t spamassassin-3.4.2/t/sa_check_spamd.t
--- spamassassin-3.4.0/t/sa_check_spamd.t	2014-02-07 03:36:38.000000000 -0500
+++ spamassassin-3.4.2/t/sa_check_spamd.t	2018-09-13 21:27:54.000000000 -0400
@@ -2,9 +2,10 @@
 
 use lib '.'; use lib 't';
 use SATest; sa_t_init("sa-check_spamd");
-use Test; BEGIN { plan tests => ($SKIP_SPAMD_TESTS ? 0 : 7) };
 
-exit if $SKIP_SPAMD_TESTS;
+use Test::More;
+plan skip_all => "Spamd tests disabled" if $SKIP_SPAMD_TESTS;
+plan tests => 7;
 
 # ---------------------------------------------------------------------------
 
diff -Nru spamassassin-3.4.0/t/sa_compile.t spamassassin-3.4.2/t/sa_compile.t
--- spamassassin-3.4.0/t/sa_compile.t	2014-02-07 03:36:38.000000000 -0500
+++ spamassassin-3.4.2/t/sa_compile.t	2018-09-13 21:27:53.000000000 -0400
@@ -1,78 +1,141 @@
 #!/usr/bin/perl
 
-use lib '.'; use lib 't';
+use lib '.'; 
+use lib 't';
+
 $ENV{'TEST_PERL_TAINT'} = 'no';     # inhibit for this test
-use SATest; sa_t_init("sa_compile");
-use Test;
+use SATest; 
 
-# called from BEGIN
-sub re2c_version_new_enough {
+sa_t_init("sa_compile");
 
-  my $re2c_ver = `re2c -V 2>&1`;
-  if (!defined $re2c_ver || $re2c_ver =~ /^$/) {
-    print "re2c not found, or 're2c -V' not supported, skipping test\n";
-    return;
-  }
+use Config;
+use File::Basename;
+use File::Path qw/mkpath/;
 
-  chop $re2c_ver;
-  my $newenough = ($re2c_ver+0 >= 001200);   # 0.12.0 seems safe enough as a baseline
-  print "re2c version ($re2c_ver) new enough? ".($newenough ? "yes" : "no")."\n";
-  return $newenough;
-}
+my $temp_binpath = $Config{sitebinexp};
+$temp_binpath =~ s|^\Q$Config{siteprefixexp}\E/||;
 
-use constant TEST_ENABLED => conf_bool('run_long_tests')
-                                && re2c_version_new_enough();
+use Test::More;
+plan skip_all => "Long running tests disabled" unless conf_bool('run_long_tests');
+plan skip_all => "Tests don't work on windows" if $RUNNING_ON_WINDOWS;
+plan skip_all => "RE2C isn't new enough" unless re2c_version_new_enough();
+plan tests => 5;
 
-BEGIN { 
+BEGIN {
   if (-e 't/test_dir') {
     chdir 't';
   }
   if (-e 'test_dir') {
     unshift(@INC, '../blib/lib');
   }
-
-  plan tests => ((TEST_ENABLED && !$RUNNING_ON_WINDOWS) ? 5 : 0);
-};
-
-exit unless (TEST_ENABLED && !$RUNNING_ON_WINDOWS);
+}
 
 # -------------------------------------------------------------------
 
-my $INST_FROM_SCRATCH = 1;      # set to 0 to short-circuit
-#my $INST_FROM_SCRATCH = 0;      # set to 0 to short-circuit
-
-sub system_or_die;
 use Cwd;
 my $cwd = getcwd;
 my $builddir = "$cwd/log/d.$testname/build";
 my $instbase = "$cwd/log/d.$testname/inst";
 
-if ($INST_FROM_SCRATCH) {
-  system_or_die "cd .. && make tardist";
-  system("rm -rf $builddir");
-  system("mkdir -p $builddir");
-  system_or_die "cd $builddir && gunzip -c $cwd/../Mail-SpamAssassin-*.tar.gz | tar xf -";
-  system_or_die "cd $builddir && mv Mail-SpamAssassin-* x";
+print "\nMaking tar dist file and then untarring it.\n";
+
+system_or_die "cd .. && make tardist 2>&1 > /dev/null";
+system("rm -rf $builddir");
+system("mkdir -p $builddir");
+system_or_die "cd $builddir && gunzip -c $cwd/../Mail-SpamAssassin-*.tar.gz | tar xf - ";
+system_or_die "cd $builddir && mv Mail-SpamAssassin-* x";
+
+&new_instdir("basic");
+&run_makefile_pl ("PREFIX=$instdir SYSCONFDIR=$instdir/etc DATADIR=$instdir/share/spamassassin LOCALSTATEDIR=$instdir/var/spamassassin CONFDIR=$instdir/etc/mail/spamassassin");
+
+# we now have an "installed" version we can run sa-compile with.  Ensure
+# sarun() will use it appropriately
+$scr = "$instdir/$temp_binpath/spamassassin";
+$scr_localrules_args = $scr_cf_args = "";      # use the default rules dir, from our "install"
+
+&set_rules("body FOO /You have been selected to receive/");
+
+# ensure we don't use compiled rules
+system("rm -rf $instdir/var/spamassassin/compiled");
+
+%patterns = (
+
+  q{ check: tests=FOO }, 'FOO'
+
+);
+
+print "\nRunning spam checks uncompiled\n";
+ok sarun ("-D -Lt < $cwd/data/spam/001 2>&1", \&patterns_run_cb);
+ok_all_patterns();
+
+clear_pattern_counters();
+
+# -------------------------------------------------------------------
+
+print "\nRunning spam checks compiled\n";
+system_or_die "$instdir/$temp_binpath/sa-compile --keep-tmps 2>&1";  # --debug
+%patterns = (
+
+  q{ able to use 1/1 'body_0' compiled rules }, 'able-to-use',
+  q{ check: tests=FOO }, 'FOO'
+
+);
+$scr = "$instdir/$temp_binpath/spamassassin";
+$scr_localrules_args = $scr_cf_args = "";      # use the default rules dir, from our "install"
+
+ok sarun ("-D -Lt < $cwd/data/spam/001 2>&1", \&patterns_run_cb);
+ok_all_patterns();
+
+# -------------------------------------------------------------------
+
+sub re2c_version_new_enough {
+  #check if re2c exiss and if it is 0.12.0 or greater
+
+  my $re2c_ver = `re2c -V 2>&1`;
+  if (!defined $re2c_ver || $re2c_ver =~ /^$/) {
+    print "re2c not found, or 're2c -V' not supported, skipping test\n";
+    return;
+  }
+
+  chop $re2c_ver;
+  my $newenough = ($re2c_ver+0 >= 001200);   # 0.12.0 seems safe enough as a baseline
+  print "re2c version ($re2c_ver) new enough? ".($newenough ? "yes" : "no")."\n";
+  return $newenough;
 }
 
 sub new_instdir {
   $instdir = $instbase.".".(shift);
   print "\nsetting new instdir: $instdir\n";
-  $INST_FROM_SCRATCH and system("rm -rf $instdir; mkdir $instdir");
+  system("rm -rf $instdir; mkdir $instdir");
 }
 
 sub run_makefile_pl {
   my $args = $_[0];
-  system_or_die "cd $builddir/x && $perl_cmd Makefile.PL ".
-          "$args < /dev/null 2>&1";
-  system_or_die "cd $builddir/x && make install 2>&1";
-  print "current instdir: $instdir\n";
+
+  foreach (sort keys %ENV) { 
+    print "ENV: $_  =  $ENV{$_}\n"; 
+  }
+
+  print "DEBUG: Arguments are $args\n";
+  &system_or_die("cd $builddir/x && $perl_cmd Makefile.PL $args < /dev/null 2>&1");
+  print "DEBUG: making\n";
+  &system_or_die("cd $builddir/x && MAKEFLAGS='' make 2>&1");
+  print "DEBUG: Install\n";
+  &system_or_die("cd $builddir/x && MAKEFLAGS='' make install 2>&1");
+
+  
 }
 
 sub set_rules {
   my $rules = shift;
-  open RULES, ">$instdir/foo/share/spamassassin/20_testrules.cf"
-          or die "cannot write $instdir/foo/share/spamassassin/20_testrules.cf";
+
+  #Create the dir for the cf file
+  my $file = "$instdir/share/spamassassin/20_testrules.cf";
+  my $dir = dirname($file);
+  mkpath($dir);
+
+  open RULES, ">$file"
+          or die "cannot write $file - $!";
   print RULES qq{
 
     use_bayes 0
@@ -82,8 +145,14 @@
   };
   close RULES or die;
 
-  open RULES, ">$instdir/foo/etc/mail/spamassassin/v330.pre"
-          or die "cannot write $instdir/foo/etc/mail/spamassassin/v330.pre";
+  #Create the dir for the pre file
+
+  $file = "$instdir/etc/mail/spamassassin/v330.pre";
+  $dir = dirname($file);
+  mkpath($dir);
+
+  open RULES, ">$file"
+          or die "cannot write $file - $!";
   print RULES qq{
 
     loadplugin Mail::SpamAssassin::Plugin::MIMEHeader
@@ -105,47 +174,3 @@
   };
   close RULES or die;
 }
-
-# -------------------------------------------------------------------
-
-new_instdir("basic");
-$INST_FROM_SCRATCH and run_makefile_pl "PREFIX=$instdir/foo";
-
-# we now have an "installed" version we can run sa-compile with.  Ensure
-# sarun() will use it appropriately
-$scr = "$instdir/foo/bin/spamassassin";
-$scr_localrules_args = $scr_cf_args = "";      # use the default rules dir, from our "install"
-
-set_rules q{
-
-  body FOO /You have been selected to receive/
-
-};
-
-# ensure we don't use compiled rules
-system("rm -rf $instdir/foo/var/spamassassin/compiled");
-%patterns = (
-
-  q{ check: tests=FOO }, 'FOO'
-
-);
-ok sarun ("-D -Lt < $cwd/data/spam/001 2>&1", \&patterns_run_cb);
-ok_all_patterns();
-clear_pattern_counters();
-
-# -------------------------------------------------------------------
-
-system_or_die "$instdir/foo/bin/sa-compile --keep-tmps";  # --debug
-%patterns = (
-
-  q{ able to use 1/1 'body_0' compiled rules }, 'able-to-use',
-  q{ check: tests=FOO }, 'FOO'
-
-);
-$scr = "$instdir/foo/bin/spamassassin";
-$scr_localrules_args = $scr_cf_args = "";      # use the default rules dir, from our "install"
-ok sarun ("-D -Lt < $cwd/data/spam/001 2>&1", \&patterns_run_cb);
-ok_all_patterns();
-
-# -------------------------------------------------------------------
-
diff -Nru spamassassin-3.4.0/t/SATest.pm spamassassin-3.4.2/t/SATest.pm
--- spamassassin-3.4.0/t/SATest.pm	2014-02-07 03:36:38.000000000 -0500
+++ spamassassin-3.4.2/t/SATest.pm	2018-09-13 21:27:54.000000000 -0400
@@ -12,31 +12,36 @@
 use File::Copy;
 use File::Path;
 use File::Spec;
+
+use Test::Builder ();
+use Test::More    ();
+
 use POSIX qw(WIFEXITED WIFSIGNALED WIFSTOPPED WEXITSTATUS WTERMSIG WSTOPSIG);
 
+use vars qw($RUNNING_ON_WINDOWS $SSL_AVAILABLE
+            $SKIP_SPAMD_TESTS $SKIP_SPAMC_TESTS $NO_SPAMC_EXE
+            $SKIP_SETUID_NOBODY_TESTS $SKIP_DNSBL_TESTS
+            $have_inet4 $have_inet6 $spamdhost $spamdport);
+
 BEGIN {
   require Exporter;
   use vars qw(@ISA @EXPORT @EXPORT_OK);
   @ISA = qw(Exporter);
 
-  use vars qw($have_inet4 $have_inet6 $spamdhost $spamdport);
   @EXPORT = qw($have_inet4 $have_inet6 $spamdhost $spamdport);
 
   # No spamd test in Windows unless env override says user figured out a way
   # If you want to know why these are vars and no constants, read this thread:
   #   <http://www.mail-archive.com/dev%40perl.apache.org/msg05466.html>
   #  -- mss, 2004-01-13
-  our $RUNNING_ON_WINDOWS = ($^O =~ /^(mswin|dos|os2)/oi);
-  our $SKIP_SPAMD_TESTS =
+  $RUNNING_ON_WINDOWS = ($^O =~ /^(mswin|dos|os2)/oi);
+  $SKIP_SPAMD_TESTS =
         $RUNNING_ON_WINDOWS ||
         ( $ENV{'SPAMD_HOST'} && !($ENV{'SPAMD_HOST'} eq '127.0.0.1' ||
                                   $ENV{'SPAMD_HOST'} eq '::1' ||
                                   $ENV{'SPAMD_HOST'} eq 'localhost') );
-  our $NO_SPAMC_EXE;
-  our $SKIP_SPAMC_TESTS;
-  our $SSL_AVAILABLE;
-  our $SKIP_SETUID_NOBODY_TESTS = 0;
-  our $SKIP_DNSBL_TESTS = 0;
+  $SKIP_SETUID_NOBODY_TESTS = 0;
+  $SKIP_DNSBL_TESTS = 0;
 
   $have_inet4 = eval {
     require IO::Socket::INET;
@@ -90,7 +95,7 @@
   $perl_cmd .= " -T" if !defined($ENV{'TEST_PERL_TAINT'}) or $ENV{'TEST_PERL_TAINT'} ne 'no';
   $perl_cmd .= " -w" if !defined($ENV{'TEST_PERL_WARN'})  or $ENV{'TEST_PERL_WARN'}  ne 'no';
 
-  $scr = $ENV{'SCRIPT'};
+  $scr = $ENV{'SPAMASSASSIN_SCRIPT'};
   $scr ||= "$perl_cmd ../spamassassin.raw";
 
   $spamd = "$perl_cmd ../spamd/spamd.raw";
@@ -165,8 +170,11 @@
   # do not remove prior test results!
   # rmtree ("log");
 
-  mkdir ("log", 0755);
+  unless (-d "log") {
+    mkdir ("log", 0755) or die ("Error creating log dir: $!");
+  }
   chmod (0755, "log"); # set in case log already exists with wrong permissions
+  system("chacl -B log 2>/dev/null || setfacl -b log 2>/dev/null"); # remove acls that confuse test
 
   rmtree ("log/user_state");
   rmtree ("log/outputdir.tmp");
@@ -334,10 +342,13 @@
   $scrargs =~ s!/!\\!g if ($^O =~ /^MS(DOS|Win)/i);
   print ("\t$scrargs\n");
   (-d "log/d.$testname") or mkdir ("log/d.$testname", 0755);
-  system ("$scrargs > log/d.$testname/${Test::ntest} $post_redir");
+  
+  my $test_number = test_number();
+
+  system ("$scrargs > log/d.$testname/$test_number $post_redir");
   $sa_exitcode = ($?>>8);
   if ($sa_exitcode != 0) { return undef; }
-  &checkfile ("d.$testname/${Test::ntest}", $read_sub) if (defined $read_sub);
+  &checkfile ("d.$testname/$test_number", $read_sub) if (defined $read_sub);
   1;
 }
 
@@ -368,10 +379,13 @@
   $salearnargs =~ s!/!\\!g if ($^O =~ /^MS(DOS|Win)/i);
   print ("\t$salearnargs\n");
   (-d "log/d.$testname") or mkdir ("log/d.$testname", 0755);
-  system ("$salearnargs > log/d.$testname/${Test::ntest}");
+
+  my $test_number = test_number();
+
+  system ("$salearnargs > log/d.$testname/$test_number");
   $salearn_exitcode = ($?>>8);
   if ($salearn_exitcode != 0) { return undef; }
-  &checkfile ("d.$testname/${Test::ntest}", $read_sub) if (defined $read_sub);
+  &checkfile ("d.$testname/$test_number", $read_sub) if (defined $read_sub);
   1;
 }
 
@@ -412,10 +426,13 @@
 
   print ("\t$spamcargs\n");
   (-d "log/d.$testname") or mkdir ("log/d.$testname", 0755);
+
+  my $test_number = test_number();
+
   if ($capture_stderr) {
-    system ("$spamcargs > log/d.$testname/out.${Test::ntest} 2>&1");
+    system ("$spamcargs > log/d.$testname/out.$test_number 2>&1");
   } else {
-    system ("$spamcargs > log/d.$testname/out.${Test::ntest}");
+    system ("$spamcargs > log/d.$testname/out.$test_number");
   }
 
   $sa_exitcode = ($?>>8);
@@ -425,7 +442,7 @@
 
   %found = ();
   %found_anti = ();
-  &checkfile ("d.$testname/out.${Test::ntest}", $read_sub) if (defined $read_sub);
+  &checkfile ("d.$testname/out.$test_number", $read_sub) if (defined $read_sub);
 
   if ($expect_failure) {
     ($sa_exitcode != 0);
@@ -455,7 +472,9 @@
 
   print ("\t$spamcargs &\n");
   (-d "log/d.$testname") or mkdir ("log/d.$testname", 0755);
-  system ("$spamcargs > log/d.$testname/bg.${Test::ntest} &") and return 0;
+  
+  my $test_number = test_number();
+  system ("$spamcargs > log/d.$testname/bg.$test_number &") and return 0;
 
   1;
 }
@@ -527,10 +546,12 @@
   }
 
   (-d "log/d.$testname") or mkdir ("log/d.$testname", 0755);
-  my $spamd_stdout = "log/d.$testname/spamd.out.${Test::ntest}";
-     $spamd_stderr = "log/d.$testname/spamd.err.${Test::ntest}";    #  global
-  my $spamd_stdlog = "log/d.$testname/spamd.log.${Test::ntest}";
-
+  
+  my $test_number = test_number();
+  my $spamd_stdout = "log/d.$testname/spamd.out.$test_number";
+     $spamd_stderr = "log/d.$testname/spamd.err.$test_number";    #  global
+  my $spamd_stdlog = "log/d.$testname/spamd.log.$test_number";
+  my $spamd_pidfile = "log/spamd.pid";
   my $spamd_forker = $ENV{'SPAMD_FORKER'}   ?
                        $ENV{'SPAMD_FORKER'} :
                      $RUNNING_ON_WINDOWS    ?
@@ -546,36 +567,44 @@
                        @spamd_args,
                        $spamd_extra_args,
                        qq{-s ${spamd_stderr}.timestamped},
+                       qq{-r ${spamd_pidfile}},
                        qq{&},
                     );
 
   # DEBUG instrumentation to trace spamd processes. See bug 5731 for history
   # if (-f "/home/jm/capture_spamd_straces") {
-  # $spamd_cmd = "strace -ttt -fo log/d.$testname/spamd.strace.${Test::ntest} $spamd_cmd";
+  # $spamd_cmd = "strace -ttt -fo log/d.$testname/spamd.strace.$test_number $spamd_cmd";
   # }
 
-  unlink ($spamd_stdout, $spamd_stderr, $spamd_stdlog);
+  unlink ($spamd_stdout, $spamd_stderr, $spamd_stdlog, $spamd_pidfile);
   print ("\t${spamd_cmd}\n");
   my $startat = time;
   system ($spamd_cmd);
 
-  # now find the PID
   $spamd_pid = 0;
+  # Find the PID, either in the pidfile or the log... 
   # note that the wait period increases the longer it takes,
   # 20 retries works out to a total of 60 seconds
   my $retries = 30;
-  my $wait = 0;
+  my $wait = 7;
+  sleep $wait ;
   while ($spamd_pid <= 0) {
     my $spamdlog = '';
-
+    my $pidstr = `cat $spamd_pidfile 2>/dev/null` ;
+    if ($pidstr) {
+       chomp $pidstr;
+       $spamd_pid = $pidstr;
+       dbgprint("Found PID $spamd_pid in pidfile\n");
+       last
+    }
     if (open (IN, "<${spamd_stderr}")) {
       while (<IN>) {
         # Yes, DO retry on this error. I'm getting test failures otherwise
         # /Address already in use/ and $retries = 0;
-	/server pid: (\d+)/ and $spamd_pid = $1;
+	/server pid: (\d+)/ and $spamd_pid = "$1" and dbgprint("Found PID $spamd_pid in stderr logfile\n");
 
-        if (/ERROR/) {
-          warn "spamd error! $_";
+        if ( !(/dbg: config: .*rulename/) && (/\bERROR/) ){
+          warn "spamd start failed - spamd error! $_\nExiting test with debug output";
           $retries = 0; last;
         }
 
@@ -585,12 +614,15 @@
       last if ($spamd_pid);
     }
 
-    sleep (int($wait++ / 4) + 1) if $retries > 0;
+    my $sleep = (int($wait++ / 4) + 1);
+    warn "spam_pid not found: Sleeping $sleep - Retry # $retries\n";
+
+    sleep $sleep if $retries > 0;
 
     if ($retries-- <= 0) {
-      warn "spamd start failed: log: $spamdlog";
+      warn "spamd start failed - Could not find a valid PID.\nEnd Debug log -------------------\n$spamdlog\nEnd Debug log -------------------";
       warn "\n\nMaybe you need to kill a running spamd process?\n";
-      warn "started at $startat, gave up at ".time."\n\n";
+      warn "Or the start took too long. Started at $startat, gave up at ".time."\n\n";
       return 0;
     }
   }
@@ -989,7 +1021,7 @@
 
 # (sub exit_status_str copied from Util.pm)
 # map process termination status number to an informative string, and
-# append optional mesage (dual-valued errno or a string or a number),
+# append optional message (dual-valued errno or a string or a number),
 # returning the resulting string
 #
 sub exit_status_str($;$) {
@@ -1023,7 +1055,7 @@
   # (which is used by Net::DNS)
 
   return 1 if ($< != 0);
-  return 1 if ($^O =~ /^(linux|mswin|dos|os2)/oi);
+  return 1 if ($^O =~ /^(linux|mswin|dos|os2|openbsd)/oi);
 
   my $has_unsafe_hostname =
     eval { require Sys::Hostname::Long && Sys::Hostname::Long->VERSION < 1.4 };
@@ -1068,4 +1100,8 @@
   return $string;
 }
 
+sub test_number {
+  return Test::More->builder->current_test;
+}
+
 1;
diff -Nru spamassassin-3.4.0/t/sha1.t spamassassin-3.4.2/t/sha1.t
--- spamassassin-3.4.0/t/sha1.t	2014-02-07 03:36:38.000000000 -0500
+++ spamassassin-3.4.2/t/sha1.t	2018-09-13 21:27:54.000000000 -0400
@@ -16,7 +16,7 @@
 }
 
 use strict;
-use Test;
+
 use Mail::SpamAssassin;
 
 BEGIN {
@@ -24,7 +24,7 @@
   or do { require Digest::SHA1; import Digest::SHA1 qw(sha1_hex) }
 }
 
-plan tests => 15;
+use Test::More tests => 15;
 
 sub try {
   my ($data, $want) = @_;
diff -Nru spamassassin-3.4.0/t/shortcircuit.t spamassassin-3.4.2/t/shortcircuit.t
--- spamassassin-3.4.0/t/shortcircuit.t	2014-02-07 03:36:37.000000000 -0500
+++ spamassassin-3.4.2/t/shortcircuit.t	2018-09-13 21:27:54.000000000 -0400
@@ -2,7 +2,8 @@
 
 use lib '.'; use lib 't';
 use SATest; sa_t_init("shortcircuit");
-use Test; BEGIN { plan tests => 18 };
+
+use Test::More tests => 18;
 
 # ---------------------------------------------------------------------------
 
diff -Nru spamassassin-3.4.0/t/spamc_B.t spamassassin-3.4.2/t/spamc_B.t
--- spamassassin-3.4.0/t/spamc_B.t	2014-02-07 03:36:38.000000000 -0500
+++ spamassassin-3.4.2/t/spamc_B.t	2018-09-13 21:27:54.000000000 -0400
@@ -3,9 +3,10 @@
 use lib '.'; use lib 't';
 use SATest; sa_t_init("spamc_B");
 
-use Test; plan tests => ($SKIP_SPAMC_TESTS ? 0 : 9);
+use Test::More;
+plan skip_all => "No SPAMC exe" if $SKIP_SPAMC_TESTS;
+plan tests => 9;
 
-exit if $SKIP_SPAMC_TESTS;
 # ---------------------------------------------------------------------------
 
 %patterns = (
diff -Nru spamassassin-3.4.0/t/spamc_bug6176.t spamassassin-3.4.2/t/spamc_bug6176.t
--- spamassassin-3.4.0/t/spamc_bug6176.t	2014-02-07 03:36:38.000000000 -0500
+++ spamassassin-3.4.2/t/spamc_bug6176.t	2018-09-13 21:27:54.000000000 -0400
@@ -4,9 +4,11 @@
 
 use lib '.'; use lib 't';
 use SATest; sa_t_init("spamc_bug6176");
-use Test; plan tests => ($NO_SPAMC_EXE ? 0 : 2);
 
-exit if $NO_SPAMC_EXE;
+use Test::More;
+plan skip_all => "No SPAMC exe" if $SKIP_SPAMC_TESTS;
+plan tests => 2;
+
 # ---------------------------------------------------------------------------
 
 %patterns = (
diff -Nru spamassassin-3.4.0/t/spamc_cf.t spamassassin-3.4.2/t/spamc_cf.t
--- spamassassin-3.4.0/t/spamc_cf.t	2014-02-07 03:36:37.000000000 -0500
+++ spamassassin-3.4.2/t/spamc_cf.t	2018-09-13 21:27:54.000000000 -0400
@@ -2,9 +2,10 @@
 
 use lib '.'; use lib 't';
 use SATest; sa_t_init("spamc_cf");
-use Test; plan tests => ($SKIP_SPAMC_TESTS ? 0 : 4);
 
-exit if $SKIP_SPAMC_TESTS;
+use Test::More;
+plan skip_all => "No SPAMC exe" if $SKIP_SPAMC_TESTS;
+plan tests => 4;
 
 # ---------------------------------------------------------------------------
 
diff -Nru spamassassin-3.4.0/t/spamc_c_stdout_closed.t spamassassin-3.4.2/t/spamc_c_stdout_closed.t
--- spamassassin-3.4.0/t/spamc_c_stdout_closed.t	2014-02-07 03:36:38.000000000 -0500
+++ spamassassin-3.4.2/t/spamc_c_stdout_closed.t	2018-09-13 21:27:54.000000000 -0400
@@ -2,9 +2,10 @@
 
 use lib '.'; use lib 't';
 use SATest; sa_t_init("spamc_c_stdout_closed");
-use Test; plan tests => ($SKIP_SPAMC_TESTS ? 0 : 2);
 
-exit if $SKIP_SPAMC_TESTS;
+use Test::More;
+plan skip_all => "No SPAMC exe" if $SKIP_SPAMC_TESTS;
+plan tests => 2;
 
 # ---------------------------------------------------------------------------
 
diff -Nru spamassassin-3.4.0/t/spamc_c.t spamassassin-3.4.2/t/spamc_c.t
--- spamassassin-3.4.0/t/spamc_c.t	2014-02-07 03:36:38.000000000 -0500
+++ spamassassin-3.4.2/t/spamc_c.t	2018-09-13 21:27:54.000000000 -0400
@@ -2,9 +2,10 @@
 
 use lib '.'; use lib 't';
 use SATest; sa_t_init("spamc_c");
-use Test; plan tests => ($SKIP_SPAMC_TESTS ? 0 : 2);
 
-exit if $SKIP_SPAMC_TESTS;
+use Test::More;
+plan skip_all => "No SPAMC exe" if $SKIP_SPAMC_TESTS;
+plan tests => 2;
 
 # ---------------------------------------------------------------------------
 
diff -Nru spamassassin-3.4.0/t/spamc_E.t spamassassin-3.4.2/t/spamc_E.t
--- spamassassin-3.4.0/t/spamc_E.t	2014-02-07 03:36:38.000000000 -0500
+++ spamassassin-3.4.2/t/spamc_E.t	2018-09-13 21:27:53.000000000 -0400
@@ -2,9 +2,10 @@
 
 use lib '.'; use lib 't';
 use SATest; sa_t_init("spamc_E");
-use Test; plan tests => ($SKIP_SPAMC_TESTS ? 0 : 2);
 
-exit if $SKIP_SPAMC_TESTS;
+use Test::More;
+plan skip_all => "No SPAMC exe" if $SKIP_SPAMC_TESTS;
+plan tests => 2;
 
 # ---------------------------------------------------------------------------
 
diff -Nru spamassassin-3.4.0/t/spamc_headers.t spamassassin-3.4.2/t/spamc_headers.t
--- spamassassin-3.4.0/t/spamc_headers.t	2014-02-07 03:36:37.000000000 -0500
+++ spamassassin-3.4.2/t/spamc_headers.t	2018-09-13 21:27:54.000000000 -0400
@@ -3,8 +3,9 @@
 use lib '.'; use lib 't';
 use SATest; sa_t_init("spamc_headers");
 
-use Test; plan tests => ($SKIP_SPAMC_TESTS ? 0 : 5);
-exit if $NO_SPAMC_EXE;
+use Test::More;
+plan skip_all => "No SPAMC exe" if $SKIP_SPAMC_TESTS;
+plan tests => 5;
 
 # ---------------------------------------------------------------------------
 
diff -Nru spamassassin-3.4.0/t/spamc_H.t spamassassin-3.4.2/t/spamc_H.t
--- spamassassin-3.4.0/t/spamc_H.t	2014-02-07 03:36:37.000000000 -0500
+++ spamassassin-3.4.2/t/spamc_H.t	2018-09-13 21:27:54.000000000 -0400
@@ -3,14 +3,11 @@
 use lib '.'; use lib 't';
 use SATest; sa_t_init("spamc_H");
 
-# only run for localhost!
-our $DO_RUN = conf_bool('run_net_tests')
-                    && !$SKIP_SPAMD_TESTS
-                    && ($spamdhost eq '127.0.0.1');
-
-use Test; plan tests => ($DO_RUN ? 5 : 0);
-
-exit unless $DO_RUN;
+use Test::More;
+plan skip_all => "Spamd tests disabled" if $SKIP_SPAMD_TESTS;
+plan skip_all => "Net tests disabled" unless conf_bool('run_net_tests');
+plan skip_all => "Spam host is not loopback" if $spamdhost ne '127.0.0.1';
+plan tests => 5;
 
 # ---------------------------------------------------------------------------
 
diff -Nru spamassassin-3.4.0/t/spamc_l.t spamassassin-3.4.2/t/spamc_l.t
--- spamassassin-3.4.0/t/spamc_l.t	2014-02-07 03:36:37.000000000 -0500
+++ spamassassin-3.4.2/t/spamc_l.t	2018-09-13 21:27:52.000000000 -0400
@@ -2,11 +2,12 @@
 
 use lib '.'; use lib 't';
 use SATest; sa_t_init("spamc_l");
-use Test; plan tests => ($NO_SPAMC_EXE ? 0 : 4),
-               onfail => sub { warn "FAIL: Some other process running on port 8?  Test assumes nothing is listening on port 8." };
 
+use Test::More;
+plan skip_all => "No SPAMC exe" if $NO_SPAMC_EXE;
+plan tests => 4;
 
-exit if $NO_SPAMC_EXE;
+diag("NOTE: Failure might be because some other process is running on port 8.  Test assumes nothing is listening on port 8.");
 
 # ---------------------------------------------------------------------------
 
diff -Nru spamassassin-3.4.0/t/spamc_optC.t spamassassin-3.4.2/t/spamc_optC.t
--- spamassassin-3.4.0/t/spamc_optC.t	2014-02-07 03:36:38.000000000 -0500
+++ spamassassin-3.4.2/t/spamc_optC.t	2018-09-13 21:27:54.000000000 -0400
@@ -3,9 +3,9 @@
 use lib '.'; use lib 't';
 use SATest; sa_t_init("spamc_optC");
 
-use Test; plan tests => $SKIP_SPAMC_TESTS ? 0 : 9;
-
-exit if $SKIP_SPAMC_TESTS;
+use Test::More;
+plan skip_all => "No SPAMC exe" if $SKIP_SPAMC_TESTS;
+plan tests => 9;
 
 # ---------------------------------------------------------------------------
 
diff -Nru spamassassin-3.4.0/t/spamc_optL.t spamassassin-3.4.2/t/spamc_optL.t
--- spamassassin-3.4.0/t/spamc_optL.t	2014-02-07 03:36:37.000000000 -0500
+++ spamassassin-3.4.2/t/spamc_optL.t	2018-09-13 21:27:54.000000000 -0400
@@ -4,9 +4,10 @@
 use SATest; sa_t_init("spamc_optL");
 use constant HAS_SDBM_FILE => eval { require SDBM_File; };
 
-use Test; plan tests => (!HAS_SDBM_FILE || $SKIP_SPAMC_TESTS ? 0 : 16);
-
-exit if (!HAS_SDBM_FILE || $SKIP_SPAMC_TESTS);
+use Test::More;
+plan skip_all => "No SPAMC exe" if $SKIP_SPAMC_TESTS;
+plan skip_all => "No SDBM_File" unless HAS_SDBM_FILE;
+plan tests => 18;
 
 # ---------------------------------------------------------------------------
 
@@ -28,6 +29,11 @@
 ok(salearnrun("--dump magic", \&patterns_run_cb));
 ok_all_patterns();
 
+# Test option=value
+%patterns = ( '1 0  non-token data: nspam' => 'spam in database' );
+ok(salearnrun("--dump=magic", \&patterns_run_cb));
+ok_all_patterns();
+
 %patterns = ( 'Message successfully un/learned' => 'forget spam' );
 ok (spamcrun ("-L forget < data/spam/001", \&patterns_run_cb));
 ok_all_patterns();
diff -Nru spamassassin-3.4.0/t/spamc.t spamassassin-3.4.2/t/spamc.t
--- spamassassin-3.4.0/t/spamc.t	2014-02-07 03:36:38.000000000 -0500
+++ spamassassin-3.4.2/t/spamc.t	2018-09-13 21:27:54.000000000 -0400
@@ -2,9 +2,11 @@
 
 use lib '.'; use lib 't';
 use SATest; sa_t_init("spamc");
-use Test; plan tests => ($NO_SPAMC_EXE ? 0 : 2);
 
-exit if $NO_SPAMC_EXE;
+use Test::More;
+plan skip_all => "No SPAMC exe" if $SKIP_SPAMC_TESTS;
+plan tests => 2;
+
 # ---------------------------------------------------------------------------
 
 %patterns = (
diff -Nru spamassassin-3.4.0/t/spamc_x_E_R.t spamassassin-3.4.2/t/spamc_x_E_R.t
--- spamassassin-3.4.0/t/spamc_x_E_R.t	2014-02-07 03:36:38.000000000 -0500
+++ spamassassin-3.4.2/t/spamc_x_E_R.t	2018-09-13 21:27:54.000000000 -0400
@@ -3,11 +3,10 @@
 use lib '.'; use lib 't';
 use SATest; sa_t_init("spamc_x_E_R");
 
-use constant TEST_ENABLED => conf_bool('run_long_tests');
-our $DO_RUN = !$SKIP_SPAMD_TESTS && TEST_ENABLED;
-
-use Test; plan tests => ($DO_RUN ? 49 : 0);
-exit unless $DO_RUN;
+use Test::More;
+plan skip_all => "Long running tests disabled" unless conf_bool('run_long_tests');
+plan skip_all => "Spamd tests disabled" if $SKIP_SPAMD_TESTS;
+plan tests => 49;
 
 # ---------------------------------------------------------------------------
 # test case for bug 5412; exit status with -x/-E/-R combos
diff -Nru spamassassin-3.4.0/t/spamc_x_e.t spamassassin-3.4.2/t/spamc_x_e.t
--- spamassassin-3.4.0/t/spamc_x_e.t	2014-02-07 03:36:38.000000000 -0500
+++ spamassassin-3.4.2/t/spamc_x_e.t	2018-09-13 21:27:54.000000000 -0400
@@ -3,12 +3,10 @@
 use lib '.'; use lib 't';
 use SATest; sa_t_init("spamc_x_e");
 
-our $DO_RUN = !$SKIP_SPAMD_TESTS;
-
-use Test; plan tests => ($DO_RUN ? 7 : 0);
-
-exit unless $DO_RUN;
-
+use Test::More;
+plan skip_all => "Spamd tests disabled" if $SKIP_SPAMD_TESTS;
+plan tests => 7;
+diag "Failure may indicate some other process running on port 8.  Test assumes nothing is listening on port 8.";
 # ---------------------------------------------------------------------------
 # test case for bug 5478: spamc -x -e
 
diff -Nru spamassassin-3.4.0/t/spamc_y.t spamassassin-3.4.2/t/spamc_y.t
--- spamassassin-3.4.0/t/spamc_y.t	2014-02-07 03:36:38.000000000 -0500
+++ spamassassin-3.4.2/t/spamc_y.t	2018-09-13 21:27:54.000000000 -0400
@@ -2,11 +2,10 @@
 
 use lib '.'; use lib 't';
 use SATest; sa_t_init("spamc_y");
-use Test; plan tests => ($NO_SPAMC_EXE ? 0 : 2),
-               onfail => sub { warn "FAIL: Some other process running on port 8?  Test assumes nothing is listening on port 8." };
 
-
-exit if $NO_SPAMC_EXE;
+use Test::More;
+plan skip_all => "No SPAMC exe" if $NO_SPAMC_EXE;
+plan tests => 2;
 
 # ---------------------------------------------------------------------------
 
diff -Nru spamassassin-3.4.0/t/spamc_z.t spamassassin-3.4.2/t/spamc_z.t
--- spamassassin-3.4.0/t/spamc_z.t	2014-02-07 03:36:38.000000000 -0500
+++ spamassassin-3.4.2/t/spamc_z.t	2018-09-13 21:27:54.000000000 -0400
@@ -8,9 +8,11 @@
 system("$spamc -z < /dev/null");
 my $SPAMC_Z_AVAILABLE = ($? >> 8 == 0);
 
-use Test;
-plan tests => (($SKIP_SPAMD_TESTS || !HAVE_ZLIB || !$SPAMC_Z_AVAILABLE) ? 0 : 9);
-exit if ($SKIP_SPAMD_TESTS || !HAVE_ZLIB || !$SPAMC_Z_AVAILABLE);
+use Test::More;
+plan skip_all => "Spamd tests disabled" if $SKIP_SPAMD_TESTS;
+plan skip_all => "ZLIB REQUIRED" unless HAVE_ZLIB;
+plan skip_all => "SPAMC Z unavailable" unless $SPAMC_Z_AVAILABLE;
+plan tests => 9;
 
 # ---------------------------------------------------------------------------
 
diff -Nru spamassassin-3.4.0/t/spamd_allow_user_rules.t spamassassin-3.4.2/t/spamd_allow_user_rules.t
--- spamassassin-3.4.0/t/spamd_allow_user_rules.t	2014-02-07 03:36:38.000000000 -0500
+++ spamassassin-3.4.2/t/spamd_allow_user_rules.t	2018-09-13 21:27:53.000000000 -0400
@@ -2,15 +2,10 @@
 
 use lib '.'; use lib 't';
 use SATest; sa_t_init("spamd_allow_user_rules");
-use Test;
 
-BEGIN { 
-
-  plan tests => ($SKIP_SPAMD_TESTS ? 0 : 5)
-
-};
-
-exit if $SKIP_SPAMD_TESTS;
+use Test::More;
+plan skip_all => "Spamd tests disabled" if $SKIP_SPAMD_TESTS;
+plan tests => 5;
 
 # ---------------------------------------------------------------------------
 
diff -Nru spamassassin-3.4.0/t/spamd_client.t spamassassin-3.4.2/t/spamd_client.t
--- spamassassin-3.4.0/t/spamd_client.t	2014-02-07 03:36:38.000000000 -0500
+++ spamassassin-3.4.2/t/spamd_client.t	2018-09-13 21:27:54.000000000 -0400
@@ -19,11 +19,13 @@
 use lib '.'; use lib 't';
 use SATest; sa_t_init("spamd_client");
 
-use constant TEST_ENABLED => conf_bool('run_long_tests');
 use constant HAS_SDBM_FILE => eval { require SDBM_File; };
 
-our $DO_RUN = !$SKIP_SPAMD_TESTS && TEST_ENABLED;
+use Test::More;
+plan skip_all => "Spamd tests disabled" if $SKIP_SPAMD_TESTS;
+plan skip_all => "Long running tests disabled" unless conf_bool('run_long_tests');
 
+# TODO: These should be skips down in the code, not changing the test count.
 my $num_tests = 18;
 
 # UNIX socket tests
@@ -36,9 +38,7 @@
   $num_tests += 21;
 }
 
-use Test; plan tests => ($DO_RUN ? $num_tests : 0);
-
-exit unless $DO_RUN;
+plan tests => $num_tests;
 
 # ---------------------------------------------------------------------------
 
diff -Nru spamassassin-3.4.0/t/spamd_hup.t spamassassin-3.4.2/t/spamd_hup.t
--- spamassassin-3.4.0/t/spamd_hup.t	2014-02-07 03:36:38.000000000 -0500
+++ spamassassin-3.4.2/t/spamd_hup.t	2018-09-13 21:27:54.000000000 -0400
@@ -4,11 +4,11 @@
 use SATest; sa_t_init("spamd_hup");
 use File::Spec;
 
-use constant TEST_ENABLED => conf_bool('run_long_tests') &&
-                                !$SKIP_SPAMD_TESTS && !$RUNNING_ON_WINDOWS;
-
-use Test; BEGIN { plan tests => (TEST_ENABLED ? 110 : 0) };
-exit unless TEST_ENABLED;
+use Test::More;
+plan skip_all => "Spamd tests disabled" if $SKIP_SPAMD_TESTS;
+plan skip_all => "Long running tests disabled" unless conf_bool('run_long_tests');
+plan skip_all => "Tests don't work on windows" if $RUNNING_ON_WINDOWS;
+plan tests => 110;
 
 # ---------------------------------------------------------------------------
 
diff -Nru spamassassin-3.4.0/t/spamd_kill_restart_rr.t spamassassin-3.4.2/t/spamd_kill_restart_rr.t
--- spamassassin-3.4.0/t/spamd_kill_restart_rr.t	2014-02-07 03:36:37.000000000 -0500
+++ spamassassin-3.4.2/t/spamd_kill_restart_rr.t	2018-09-13 21:27:54.000000000 -0400
@@ -3,15 +3,14 @@
 use lib '.'; use lib 't';
 use SATest; sa_t_init("spamd_kill_restart_rr");
 
-use constant TEST_ENABLED => conf_bool('run_long_tests') &&
-                                !$SKIP_SPAMD_TESTS && !$RUNNING_ON_WINDOWS;
-
-use Test; BEGIN { plan tests => (TEST_ENABLED? 93 : 0) };
+use Test::More;
+plan skip_all => "Spamd tests disabled" if $SKIP_SPAMD_TESTS;
+plan skip_all => "Long running tests disabled" unless conf_bool('run_long_tests');
+plan skip_all => "Tests don't work on windows" if $RUNNING_ON_WINDOWS;
+plan tests => 93;
 
 use File::Spec;
 
-exit unless TEST_ENABLED;
-
 # ---------------------------------------------------------------------------
 
 my $pid_file = "log/spamd.pid";
diff -Nru spamassassin-3.4.0/t/spamd_kill_restart.t spamassassin-3.4.2/t/spamd_kill_restart.t
--- spamassassin-3.4.0/t/spamd_kill_restart.t	2014-02-07 03:36:38.000000000 -0500
+++ spamassassin-3.4.2/t/spamd_kill_restart.t	2018-09-13 21:27:54.000000000 -0400
@@ -3,15 +3,14 @@
 use lib '.'; use lib 't';
 use SATest; sa_t_init("spamd_kill_restart");
 
-use constant TEST_ENABLED => conf_bool('run_long_tests') &&
-                                !$SKIP_SPAMD_TESTS && !$RUNNING_ON_WINDOWS;
-
-use Test; BEGIN { plan tests => (TEST_ENABLED? 93 : 0) };
+use Test::More;
+plan skip_all => "Spamd tests disabled" if $SKIP_SPAMD_TESTS;
+plan skip_all => "Long running tests disabled" unless conf_bool('run_long_tests');
+plan skip_all => "Tests don't work on windows" if $RUNNING_ON_WINDOWS;
+plan tests => 93;
 
 use File::Spec;
 
-exit unless TEST_ENABLED;
-
 # ---------------------------------------------------------------------------
 
 my $pid_file = "log/spamd.pid";
diff -Nru spamassassin-3.4.0/t/spamd_ldap.t spamassassin-3.4.2/t/spamd_ldap.t
--- spamassassin-3.4.0/t/spamd_ldap.t	2014-02-07 03:36:37.000000000 -0500
+++ spamassassin-3.4.2/t/spamd_ldap.t	2018-09-13 21:27:54.000000000 -0400
@@ -5,11 +5,9 @@
 use lib '.'; use lib 't';
 use SATest; sa_t_init("spamd_ldap");
 
-use constant TEST_ENABLED => (-e 't/do_ldap' || -e 'do_ldap');
-
-use Test; BEGIN { plan tests => (TEST_ENABLED ? 8 : 0) };
-
-exit unless (TEST_ENABLED);
+use Test::More;
+plan skip_all => "LDAP tests disabled" unless (-e 't/do_ldap' || -e 'do_ldap');
+plan tests => 8;
 
 # ---------------------------------------------------------------------------
 
diff -Nru spamassassin-3.4.0/t/spamd_maxchildren.t spamassassin-3.4.2/t/spamd_maxchildren.t
--- spamassassin-3.4.0/t/spamd_maxchildren.t	2014-02-07 03:36:37.000000000 -0500
+++ spamassassin-3.4.2/t/spamd_maxchildren.t	2018-09-13 21:27:54.000000000 -0400
@@ -2,9 +2,10 @@
 
 use lib '.'; use lib 't';
 use SATest; sa_t_init("spamd_maxchildren");
-use Test; BEGIN { plan tests => ($SKIP_SPAMD_TESTS ? 0 : 22) };
 
-exit if $SKIP_SPAMD_TESTS;
+use Test::More;
+plan skip_all => "Spamd tests disabled" if $SKIP_SPAMD_TESTS;
+plan tests => 22;
 
 # ---------------------------------------------------------------------------
 
diff -Nru spamassassin-3.4.0/t/spamd_maxsize.t spamassassin-3.4.2/t/spamd_maxsize.t
--- spamassassin-3.4.0/t/spamd_maxsize.t	2014-02-07 03:36:38.000000000 -0500
+++ spamassassin-3.4.2/t/spamd_maxsize.t	2018-09-13 21:27:54.000000000 -0400
@@ -5,9 +5,9 @@
 
 # this test was disabled, probably due to Bug 5731; re-enabling it for SA 3.4.0
 # (was: TODO JMD remove once DB_File bug is fixed)
-use Test; BEGIN { plan tests => ($SKIP_SPAMD_TESTS ? 0 : 1) };
-
-exit if $SKIP_SPAMD_TESTS;
+use Test::More;
+plan skip_all => "Spamd tests disabled" if $SKIP_SPAMD_TESTS;
+plan tests => 1;
 
 # ---------------------------------------------------------------------------
 # test for size limit issues like in Bug 5412
diff -Nru spamassassin-3.4.0/t/spamd_parallel.t spamassassin-3.4.2/t/spamd_parallel.t
--- spamassassin-3.4.0/t/spamd_parallel.t	2014-02-07 03:36:38.000000000 -0500
+++ spamassassin-3.4.2/t/spamd_parallel.t	2018-09-13 21:27:53.000000000 -0400
@@ -2,9 +2,10 @@
 
 use lib '.'; use lib 't';
 use SATest; sa_t_init("spamd_parallel");
-use Test; BEGIN { plan tests => ($SKIP_SPAMD_TESTS ? 0 : 20) };
 
-exit if $SKIP_SPAMD_TESTS;
+use Test::More;
+plan skip_all => "Spamd tests disabled" if $SKIP_SPAMD_TESTS;
+plan tests => 20;
 
 # ---------------------------------------------------------------------------
 
diff -Nru spamassassin-3.4.0/t/spamd_plugin.t spamassassin-3.4.2/t/spamd_plugin.t
--- spamassassin-3.4.0/t/spamd_plugin.t	2014-02-07 03:36:38.000000000 -0500
+++ spamassassin-3.4.2/t/spamd_plugin.t	2018-09-13 21:27:53.000000000 -0400
@@ -3,11 +3,11 @@
 use lib '.'; use lib 't';
 use SATest; sa_t_init("spamd_plugin");
 
-use constant numtests => 6;
-use Test; plan tests => (($SKIP_SPAMD_TESTS || $RUNNING_ON_WINDOWS || $SKIP_SETUID_NOBODY_TESTS) ?
-                        0 : numtests);
-
-exit unless !($SKIP_SPAMD_TESTS || $RUNNING_ON_WINDOWS || $SKIP_SETUID_NOBODY_TESTS);
+use Test::More;
+plan skip_all => "Spamd tests disabled" if $SKIP_SPAMD_TESTS;
+plan skip_all => "Tests don't work on windows" if $RUNNING_ON_WINDOWS;
+plan skip_all => "UID nobody tests" if $SKIP_SETUID_NOBODY_TESTS;
+plan tests => 6;
 
 # ---------------------------------------------------------------------------
 
diff -Nru spamassassin-3.4.0/t/spamd_port.t spamassassin-3.4.2/t/spamd_port.t
--- spamassassin-3.4.0/t/spamd_port.t	2014-02-07 03:36:38.000000000 -0500
+++ spamassassin-3.4.2/t/spamd_port.t	2018-09-13 21:27:53.000000000 -0400
@@ -2,9 +2,10 @@
 
 use lib '.'; use lib 't';
 use SATest; sa_t_init("spamd_port");
-use Test; BEGIN { plan tests => ($SKIP_SPAMD_TESTS ? 0 : 4) };
 
-exit if $SKIP_SPAMD_TESTS;
+use Test::More;
+plan skip_all => "Spamd tests disabled" if $SKIP_SPAMD_TESTS;
+plan tests => 4;
 
 # ---------------------------------------------------------------------------
 
diff -Nru spamassassin-3.4.0/t/spamd_prefork_stress_2.t spamassassin-3.4.2/t/spamd_prefork_stress_2.t
--- spamassassin-3.4.0/t/spamd_prefork_stress_2.t	2014-02-07 03:36:37.000000000 -0500
+++ spamassassin-3.4.2/t/spamd_prefork_stress_2.t	2018-09-13 21:27:53.000000000 -0400
@@ -5,28 +5,22 @@
 
 use lib '.'; use lib 't';
 use SATest; sa_t_init("spamd_prefork_stress_2");
-use Test;
+use Test::More;
 
-use constant TEST_ENABLED => conf_bool('run_long_tests');
-our $RUN_THIS_TEST;
-
-my $pgrep;
-my $pkill;
+plan skip_all => "Long running tests disabled" unless conf_bool('run_long_tests');
+plan skip_all => "Spamd tests disabled" if $SKIP_SPAMD_TESTS;
+plan skip_all => "Spamd prefork stress tests disabled" unless conf_bool('run_spamd_prefork_stress_test');
 
 # require pkill and pgrep be installed to run this test
-BEGIN {
-  $RUN_THIS_TEST = conf_bool('run_spamd_prefork_stress_test') && TEST_ENABLED;
-  $pkill = locate_command("pkill");
-  $pgrep = locate_command("pgrep");
-  $RUN_THIS_TEST = 0 if !$pkill || !$pgrep;
-  plan tests => ($SKIP_SPAMD_TESTS || !$RUN_THIS_TEST ? 0 : 14)
-};
-
-exit if $SKIP_SPAMD_TESTS;
-
-print "NOTE: this test requires /usr/bin/pkill, /usr/bin/pgrep, and both\n".
-    "'run_spamd_prefork_stress_test' and 'run_long_tests' set to 'y'.\n";
-exit unless $RUN_THIS_TEST;
+my $note = "NOTE: this test requires /usr/bin/pkill, /usr/bin/pgrep, and both\n".
+           "'run_spamd_prefork_stress_test' and 'run_long_tests' set to 'y'.\n";
+
+my $pkill = locate_command("pkill");
+my $pgrep = locate_command("pgrep");
+plan skip_all => "No pkill available - $note" unless $pkill;
+plan skip_all => "No pgrep available - $note" unless $pgrep;
+
+plan tests => 14;
 
 system($pgrep, "spamd child");
 if ($? >> 8 == 0) {
diff -Nru spamassassin-3.4.0/t/spamd_prefork_stress_3.t spamassassin-3.4.2/t/spamd_prefork_stress_3.t
--- spamassassin-3.4.0/t/spamd_prefork_stress_3.t	2014-02-07 03:36:38.000000000 -0500
+++ spamassassin-3.4.2/t/spamd_prefork_stress_3.t	2018-09-13 21:27:54.000000000 -0400
@@ -2,19 +2,14 @@
 
 use lib '.'; use lib 't';
 use SATest; sa_t_init("spamd_prefork_stress_3");
-use Test;
 
-our $RUN_THIS_TEST;
-BEGIN {
-  $RUN_THIS_TEST = conf_bool('run_spamd_prefork_stress_test') &&
-                        conf_bool('run_long_tests');
-  plan tests => ($SKIP_SPAMD_TESTS || !$RUN_THIS_TEST ? 0 : 291)
-};
-exit if $SKIP_SPAMD_TESTS;
+use Test::More;
+diag("NOTE: this test requires both 'run_spamd_prefork_stress_test' and 'run_long_tests' set to 'y'.");
 
-print "NOTE: this test requires both 'run_spamd_prefork_stress_test'\n".
-    "and 'run_long_tests' set to 'y'.\n";
-exit unless $RUN_THIS_TEST;
+plan skip_all => "Spamd tests disabled" if $SKIP_SPAMD_TESTS;
+plan skip_all => "Long running tests disabled" unless conf_bool('run_long_tests');
+plan skip_all => "Spamd prefork stress tests disabled" unless conf_bool('run_spamd_prefork_stress_test');
+plan tests => 291;
 
 # ---------------------------------------------------------------------------
 
diff -Nru spamassassin-3.4.0/t/spamd_prefork_stress_4.t spamassassin-3.4.2/t/spamd_prefork_stress_4.t
--- spamassassin-3.4.0/t/spamd_prefork_stress_4.t	2014-02-07 03:36:38.000000000 -0500
+++ spamassassin-3.4.2/t/spamd_prefork_stress_4.t	2018-09-13 21:27:54.000000000 -0400
@@ -2,19 +2,13 @@
 
 use lib '.'; use lib 't';
 use SATest; sa_t_init("spamd_prefork_stress_4");
-use Test;
 
-our $RUN_THIS_TEST;
-BEGIN {
-  $RUN_THIS_TEST = conf_bool('run_spamd_prefork_stress_test') &&
-                        conf_bool('run_long_tests');
-  plan tests => ($SKIP_SPAMD_TESTS || !$RUN_THIS_TEST ? 0 : 43)
-};
-exit if $SKIP_SPAMD_TESTS;
-
-print "NOTE: this test requires both 'run_spamd_prefork_stress_test'\n".
-    "and 'run_long_tests' set to 'y'.\n";
-exit unless $RUN_THIS_TEST;
+use Test::More;
+diag("NOTE: this test requires both 'run_spamd_prefork_stress_test' and 'run_long_tests' set to 'y'.");
+plan skip_all => "Spamd tests disabled" if $SKIP_SPAMD_TESTS;
+plan skip_all => "Long running tests disabled" unless conf_bool('run_long_tests');
+plan skip_all => "Spamd prefork stress tests disabled" unless conf_bool('run_spamd_prefork_stress_test');
+plan tests => 43;
 
 # ---------------------------------------------------------------------------
 
diff -Nru spamassassin-3.4.0/t/spamd_prefork_stress.t spamassassin-3.4.2/t/spamd_prefork_stress.t
--- spamassassin-3.4.0/t/spamd_prefork_stress.t	2014-02-07 03:36:37.000000000 -0500
+++ spamassassin-3.4.2/t/spamd_prefork_stress.t	2018-09-13 21:27:54.000000000 -0400
@@ -5,28 +5,24 @@
 
 use lib '.'; use lib 't';
 use SATest; sa_t_init("spamd_prefork_stress");
-use Test;
 
-use constant TEST_ENABLED => conf_bool('run_long_tests');
-our $RUN_THIS_TEST;
+use Test::More;
 
-my $pgrep;
-my $pkill;
+
+plan skip_all => "Long running tests disabled" unless conf_bool('run_long_tests');
+plan skip_all => "Spamd tests disabled" if $SKIP_SPAMD_TESTS;
+plan skip_all => "Spamd prefork stress tests disabled" unless conf_bool('run_spamd_prefork_stress_test');
 
 # require pkill and pgrep be installed to run this test
-BEGIN {
-  $RUN_THIS_TEST = conf_bool('run_spamd_prefork_stress_test') && TEST_ENABLED;
-  $pkill = locate_command("pkill");
-  $pgrep = locate_command("pgrep");
-  $RUN_THIS_TEST = 0 if !$pkill || !$pgrep;
-  plan tests => ($SKIP_SPAMD_TESTS || !$RUN_THIS_TEST ? 0 : 14) 
-};
-
-exit if $SKIP_SPAMD_TESTS;
-
-print "NOTE: this test requires /usr/bin/pkill, /usr/bin/pgrep, and both\n".
-    "'run_spamd_prefork_stress_test' and 'run_long_tests' set to 'y'.\n";
-exit unless $RUN_THIS_TEST;
+my $pkill = locate_command("pkill");
+my $pgrep = locate_command("pgrep");
+
+my $note = "NOTE: this test requires /usr/bin/pkill, /usr/bin/pgrep, and both\n".
+           "'run_spamd_prefork_stress_test' and 'run_long_tests' set to 'y'.\n";
+
+plan skip_all => "No pkill available - $note" unless $pkill;
+plan skip_all => "No pgrep available - $note" unless $pgrep;
+plan tests => 14;
 
 system($pgrep, "spamd child");
 if ($? >> 8 == 0) {
diff -Nru spamassassin-3.4.0/t/spamd_protocol_10.t spamassassin-3.4.2/t/spamd_protocol_10.t
--- spamassassin-3.4.0/t/spamd_protocol_10.t	2014-02-07 03:36:38.000000000 -0500
+++ spamassassin-3.4.2/t/spamd_protocol_10.t	2018-09-13 21:27:54.000000000 -0400
@@ -2,9 +2,10 @@
 
 use lib '.'; use lib 't';
 use SATest; sa_t_init("spamd_protocol_10");
-use Test; BEGIN { plan tests => ($SKIP_SPAMD_TESTS ? 0 : 10) };
 
-exit if $SKIP_SPAMD_TESTS;
+use Test::More;
+plan skip_all => "Spamd tests disabled" if $SKIP_SPAMD_TESTS;
+plan tests => 10;
 
 use File::Path;
 use IO::Socket;
diff -Nru spamassassin-3.4.0/t/spamd_report_ifspam.t spamassassin-3.4.2/t/spamd_report_ifspam.t
--- spamassassin-3.4.0/t/spamd_report_ifspam.t	2014-02-07 03:36:38.000000000 -0500
+++ spamassassin-3.4.2/t/spamd_report_ifspam.t	2018-09-13 21:27:54.000000000 -0400
@@ -2,9 +2,10 @@
 
 use lib '.'; use lib 't';
 use SATest; sa_t_init("spamd_report_ifspam");
-use Test; BEGIN { plan tests => ($SKIP_SPAMD_TESTS ? 0 : 10) };
 
-exit if $SKIP_SPAMD_TESTS;
+use Test::More;
+plan skip_all => "Spamd tests disabled" if $SKIP_SPAMD_TESTS;
+plan tests => 10;
 
 # ---------------------------------------------------------------------------
 
diff -Nru spamassassin-3.4.0/t/spamd_report.t spamassassin-3.4.2/t/spamd_report.t
--- spamassassin-3.4.0/t/spamd_report.t	2014-02-07 03:36:37.000000000 -0500
+++ spamassassin-3.4.2/t/spamd_report.t	2018-09-13 21:27:54.000000000 -0400
@@ -2,9 +2,10 @@
 
 use lib '.'; use lib 't';
 use SATest; sa_t_init("spamd_report");
-use Test; BEGIN { plan tests => ($SKIP_SPAMD_TESTS ? 0 : 6) };
 
-exit if $SKIP_SPAMD_TESTS;
+use Test::More;
+plan skip_all => "Spamd tests disabled" if $SKIP_SPAMD_TESTS;
+plan tests => 6;
 
 # ---------------------------------------------------------------------------
 
diff -Nru spamassassin-3.4.0/t/spamd_sql_prefs.t spamassassin-3.4.2/t/spamd_sql_prefs.t
--- spamassassin-3.4.0/t/spamd_sql_prefs.t	2014-02-07 03:36:38.000000000 -0500
+++ spamassassin-3.4.2/t/spamd_sql_prefs.t	2018-09-13 21:27:54.000000000 -0400
@@ -5,12 +5,12 @@
 use constant HAS_DBI => eval { require DBI; };
 use constant HAS_DBD_SQLITE => eval { require DBD::SQLite; };
 
-our $DO_RUN = !$SKIP_SPAMD_TESTS && conf_bool('run_sql_pref_tests')
-    && HAS_DBI && HAS_DBD_SQLITE;
-
-use Test; plan tests => ($DO_RUN ? 32 : 0);
-
-exit unless $DO_RUN;
+use Test::More;
+plan skip_all => "Spamd tests disabled" if $SKIP_SPAMD_TESTS;
+plan skip_all => "SQL Pref tests disabled" unless conf_bool('run_sql_pref_tests');
+plan skip_all => "DBI is unavailble" unless HAS_DBI;
+plan skip_all => "SQLite is unavailble" unless HAS_DBD_SQLITE;
+plan tests => 32;
 
 # ---------------------------------------------------------------------------
 
diff -Nru spamassassin-3.4.0/t/spamd_ssl_accept_fail.t spamassassin-3.4.2/t/spamd_ssl_accept_fail.t
--- spamassassin-3.4.0/t/spamd_ssl_accept_fail.t	2014-02-07 03:36:38.000000000 -0500
+++ spamassassin-3.4.2/t/spamd_ssl_accept_fail.t	2018-09-13 21:27:54.000000000 -0400
@@ -3,9 +3,11 @@
 
 use lib '.'; use lib 't';
 use SATest; sa_t_init("spamd_ssl_accept_fail");
-use Test; plan tests => (($SKIP_SPAMD_TESTS || !$SSL_AVAILABLE) ? 0 : 12);
 
-exit if ($SKIP_SPAMD_TESTS || !$SSL_AVAILABLE);
+use Test::More;
+plan skip_all => "Spamd tests disabled" if $SKIP_SPAMD_TESTS;
+plan skip_all => "SSL is unavailble" unless $SSL_AVAILABLE;
+plan tests => 12;
 
 # ---------------------------------------------------------------------------
 
@@ -23,9 +25,9 @@
 
 );
 
-ok (start_spamd ("-L --ssl --ssl-version=sslv3 --server-key data/etc/testhost.key --server-cert data/etc/testhost.cert"));
+ok (start_spamd ("-L --ssl --server-key data/etc/testhost.key --server-cert data/etc/testhost.cert"));
 ok (spamcrun ("< data/spam/001", \&patterns_run_cb));
-ok (spamcrun ("--ssl=sslv3  < data/spam/001", \&patterns_run_cb));
+ok (spamcrun ("--ssl < data/spam/001", \&patterns_run_cb));
 ok (stop_spamd ());
 
 ok_all_patterns();
diff -Nru spamassassin-3.4.0/t/spamd_ssl.t spamassassin-3.4.2/t/spamd_ssl.t
--- spamassassin-3.4.0/t/spamd_ssl.t	2014-02-07 03:36:38.000000000 -0500
+++ spamassassin-3.4.2/t/spamd_ssl.t	2018-09-13 21:27:52.000000000 -0400
@@ -2,12 +2,11 @@
 
 use lib '.'; use lib 't';
 use SATest; sa_t_init("spamd_ssl");
-use Test; plan tests => (($SKIP_SPAMD_TESTS || !$SSL_AVAILABLE) ? 0 : 9),
-    onfail => sub {
-	warn "\n\nNote: This may not be a SpamAssassin bug, as some platforms require that you" .
-	    "\nspecify a protocol in spamc --ssl option, and possibly in spamd --ssl-version.\n\n" };
 
-exit if ($SKIP_SPAMD_TESTS || !$SSL_AVAILABLE);
+use Test::More;
+plan skip_all => "Spamd tests disabled" if $SKIP_SPAMD_TESTS;
+plan skip_all => "SSL is unavailble" unless $SSL_AVAILABLE;
+plan tests => 9;
 
 # ---------------------------------------------------------------------------
 
diff -Nru spamassassin-3.4.0/t/spamd_ssl_tls.t spamassassin-3.4.2/t/spamd_ssl_tls.t
--- spamassassin-3.4.0/t/spamd_ssl_tls.t	2014-02-07 03:36:38.000000000 -0500
+++ spamassassin-3.4.2/t/spamd_ssl_tls.t	1969-12-31 19:00:00.000000000 -0500
@@ -1,28 +0,0 @@
-#!/usr/bin/perl
-
-use lib '.'; use lib 't';
-use SATest; sa_t_init("spamd_ssl_tls");
-use Test; plan tests => (($SKIP_SPAMD_TESTS || !$SSL_AVAILABLE) ? 0 : 9);
-
-exit if ($SKIP_SPAMD_TESTS || !$SSL_AVAILABLE);
-
-# ---------------------------------------------------------------------------
-
-%patterns = (
-
-q{ Return-Path: sb55sb55@yahoo.com}, 'firstline',
-q{ Subject: There yours for FREE!}, 'subj',
-q{ X-Spam-Status: Yes, score=}, 'status',
-q{ X-Spam-Flag: YES}, 'flag',
-q{ X-Spam-Level: **********}, 'stars',
-q{ TEST_ENDSNUMS}, 'endsinnums',
-q{ TEST_NOREALNAME}, 'noreal',
-q{ This must be the very last line}, 'lastline',
-
-
-);
-
-ok (sdrun ("-L --ssl --ssl-version=tlsv1 --server-key data/etc/testhost.key --server-cert data/etc/testhost.cert",
-           "--ssl=tlsv1 < data/spam/001",
-           \&patterns_run_cb));
-ok_all_patterns();
diff -Nru spamassassin-3.4.0/t/spamd_ssl_v3.t spamassassin-3.4.2/t/spamd_ssl_v3.t
--- spamassassin-3.4.0/t/spamd_ssl_v3.t	2014-02-07 03:36:37.000000000 -0500
+++ spamassassin-3.4.2/t/spamd_ssl_v3.t	1969-12-31 19:00:00.000000000 -0500
@@ -1,28 +0,0 @@
-#!/usr/bin/perl
-
-use lib '.'; use lib 't';
-use SATest; sa_t_init("spamd_sslv3");
-use Test; plan tests => (($SKIP_SPAMD_TESTS || !$SSL_AVAILABLE) ? 0 : 9);
-
-exit if ($SKIP_SPAMD_TESTS || !$SSL_AVAILABLE);
-
-# ---------------------------------------------------------------------------
-
-%patterns = (
-
-q{ Return-Path: sb55sb55@yahoo.com}, 'firstline',
-q{ Subject: There yours for FREE!}, 'subj',
-q{ X-Spam-Status: Yes, score=}, 'status',
-q{ X-Spam-Flag: YES}, 'flag',
-q{ X-Spam-Level: **********}, 'stars',
-q{ TEST_ENDSNUMS}, 'endsinnums',
-q{ TEST_NOREALNAME}, 'noreal',
-q{ This must be the very last line}, 'lastline',
-
-
-);
-
-ok (sdrun ("-L --ssl --ssl-version=sslv3 --server-key data/etc/testhost.key --server-cert data/etc/testhost.cert",
-           "--ssl=sslv3 < data/spam/001",
-           \&patterns_run_cb));
-ok_all_patterns();
diff -Nru spamassassin-3.4.0/t/spamd_stop.t spamassassin-3.4.2/t/spamd_stop.t
--- spamassassin-3.4.0/t/spamd_stop.t	2014-02-07 03:36:38.000000000 -0500
+++ spamassassin-3.4.2/t/spamd_stop.t	2018-09-13 21:27:54.000000000 -0400
@@ -2,9 +2,10 @@
 
 use lib '.'; use lib 't';
 use SATest; sa_t_init("spamd_stop");
-use Test; BEGIN { plan tests => ($SKIP_SPAMD_TESTS ? 0 : 2) };
 
-exit if $SKIP_SPAMD_TESTS;
+use Test::More;
+plan skip_all => "Spamd tests disabled" if $SKIP_SPAMD_TESTS;
+plan tests => 2;
 
 # ---------------------------------------------------------------------------
 
diff -Nru spamassassin-3.4.0/t/spamd_symbols.t spamassassin-3.4.2/t/spamd_symbols.t
--- spamassassin-3.4.0/t/spamd_symbols.t	2014-02-07 03:36:38.000000000 -0500
+++ spamassassin-3.4.2/t/spamd_symbols.t	2018-09-13 21:27:54.000000000 -0400
@@ -2,9 +2,10 @@
 
 use lib '.'; use lib 't';
 use SATest; sa_t_init("spamd_symbols");
-use Test; BEGIN { plan tests => ($SKIP_SPAMD_TESTS ? 0 : 3) };
 
-exit if $SKIP_SPAMD_TESTS;
+use Test::More;
+plan skip_all => "Spamd tests disabled" if $SKIP_SPAMD_TESTS;
+plan tests => 3;
 
 # ---------------------------------------------------------------------------
 
diff -Nru spamassassin-3.4.0/t/spamd_syslog.t spamassassin-3.4.2/t/spamd_syslog.t
--- spamassassin-3.4.0/t/spamd_syslog.t	2014-02-07 03:36:37.000000000 -0500
+++ spamassassin-3.4.2/t/spamd_syslog.t	2018-09-13 21:27:54.000000000 -0400
@@ -2,9 +2,10 @@
 
 use lib '.'; use lib 't';
 use SATest; sa_t_init("spamd_syslog");
-use Test; BEGIN { plan tests => ($SKIP_SPAMD_TESTS ? 0 : 7) };
 
-exit if $SKIP_SPAMD_TESTS;
+use Test::More;
+plan skip_all => "Spamd tests disabled" if $SKIP_SPAMD_TESTS;
+plan tests => 7;
 
 # ---------------------------------------------------------------------------
 
diff -Nru spamassassin-3.4.0/t/spamd.t spamassassin-3.4.2/t/spamd.t
--- spamassassin-3.4.0/t/spamd.t	2014-02-07 03:36:38.000000000 -0500
+++ spamassassin-3.4.2/t/spamd.t	2018-09-13 21:27:54.000000000 -0400
@@ -2,9 +2,10 @@
 
 use lib '.'; use lib 't';
 use SATest; sa_t_init("spamd");
-use Test; BEGIN { plan tests => ($SKIP_SPAMD_TESTS ? 0 : 14) };
 
-exit if $SKIP_SPAMD_TESTS;
+use Test::More;
+plan skip_all => "Spamd tests disabled" if $SKIP_SPAMD_TESTS;
+plan tests => 14;
 
 # ---------------------------------------------------------------------------
 
diff -Nru spamassassin-3.4.0/t/spamd_unix_and_tcp.t spamassassin-3.4.2/t/spamd_unix_and_tcp.t
--- spamassassin-3.4.0/t/spamd_unix_and_tcp.t	2014-02-07 03:36:38.000000000 -0500
+++ spamassassin-3.4.2/t/spamd_unix_and_tcp.t	2018-09-13 21:27:53.000000000 -0400
@@ -3,9 +3,10 @@
 use lib '.'; use lib 't';
 use SATest; sa_t_init("spamd_unix_and_tcp");
 
-use Test; BEGIN { plan tests => ((!$SKIP_SPAMD_TESTS && !$RUNNING_ON_WINDOWS)? 10 : 0) };
-
-exit unless (!$SKIP_SPAMD_TESTS && !$RUNNING_ON_WINDOWS);
+use Test::More;
+plan skip_all => "Spamd tests disabled"        if $SKIP_SPAMD_TESTS;
+plan skip_all => "Tests don't work on windows" if $RUNNING_ON_WINDOWS;
+plan tests => 10;
 
 # ---------------------------------------------------------------------------
 
diff -Nru spamassassin-3.4.0/t/spamd_unix.t spamassassin-3.4.2/t/spamd_unix.t
--- spamassassin-3.4.0/t/spamd_unix.t	2014-02-07 03:36:38.000000000 -0500
+++ spamassassin-3.4.2/t/spamd_unix.t	2018-09-13 21:27:54.000000000 -0400
@@ -3,9 +3,10 @@
 use lib '.'; use lib 't';
 use SATest; sa_t_init("spamd_unix");
 
-use Test; BEGIN { plan tests => ((!$SKIP_SPAMD_TESTS && !$RUNNING_ON_WINDOWS)? 4 : 0) };
-
-exit unless (!$SKIP_SPAMD_TESTS && !$RUNNING_ON_WINDOWS);
+use Test::More;
+plan skip_all => "Spamd tests disabled"        if $SKIP_SPAMD_TESTS;
+plan skip_all => "Tests don't work on windows" if $RUNNING_ON_WINDOWS;
+plan tests => 4;
 
 # ---------------------------------------------------------------------------
 
diff -Nru spamassassin-3.4.0/t/spamd_user_rules_leak.t spamassassin-3.4.2/t/spamd_user_rules_leak.t
--- spamassassin-3.4.0/t/spamd_user_rules_leak.t	2014-02-07 03:36:38.000000000 -0500
+++ spamassassin-3.4.2/t/spamd_user_rules_leak.t	2018-09-13 21:27:52.000000000 -0400
@@ -3,13 +3,10 @@
 
 use lib '.'; use lib 't';
 use SATest; sa_t_init("spamd_user_rules_leak");
-use Test;
-BEGIN { 
 
-  plan tests => ($SKIP_SPAMD_TESTS ? 0 : 28)
-
-};
-exit if $SKIP_SPAMD_TESTS;
+use Test::More;
+plan skip_all => 'Spamd tests disabled' if $SKIP_SPAMD_TESTS;
+plan tests => 28;
 
 # ---------------------------------------------------------------------------
 # If user A defines a user rule (when allow_user_rules is enabled) it affects
diff -Nru spamassassin-3.4.0/t/spamd_utf8.t spamassassin-3.4.2/t/spamd_utf8.t
--- spamassassin-3.4.0/t/spamd_utf8.t	2014-02-07 03:36:38.000000000 -0500
+++ spamassassin-3.4.2/t/spamd_utf8.t	2018-09-13 21:27:52.000000000 -0400
@@ -2,10 +2,12 @@
 
 use lib '.'; use lib 't';
 use SATest; sa_t_init("spamd_utf8");
-my $am_running;
+
 my $testlocale;
 
-use Test; BEGIN {
+use Test::More;
+
+BEGIN {
   $testlocale = 'en_US.UTF-8';
 
   my $havelocale = 1;
@@ -15,11 +17,12 @@
   }
   close IN;
 
-  $am_running = (!$SKIP_SPAMD_TESTS && $havelocale);
-  plan tests => ($am_running ? 3 : 0);
+  plan skip_all => "Spamd tests disabled" if $SKIP_SPAMD_TESTS;
+  plan skip_all => "No locale?"           unless $havelocale;
+
+  plan tests => 3;
 };
 
-exit unless $am_running;
 $ENV{'LANG'} = $testlocale;
 
 # ---------------------------------------------------------------------------
diff -Nru spamassassin-3.4.0/t/spamd_whitelist_leak.t spamassassin-3.4.2/t/spamd_whitelist_leak.t
--- spamassassin-3.4.0/t/spamd_whitelist_leak.t	2014-02-07 03:36:38.000000000 -0500
+++ spamassassin-3.4.2/t/spamd_whitelist_leak.t	2018-09-13 21:27:54.000000000 -0400
@@ -3,13 +3,10 @@
 
 use lib '.'; use lib 't';
 use SATest; sa_t_init("spamd_whitelist_leak");
-use Test;
-BEGIN { 
 
-  plan tests => ($SKIP_SPAMD_TESTS ? 0 : 8)
-
-};
-exit if $SKIP_SPAMD_TESTS;
+use Test::More;
+plan skip_all => 'Spamd tests disabled.' if $SKIP_SPAMD_TESTS;
+plan tests => 8;
 
 # ---------------------------------------------------------------------------
 # bug 6003
diff -Nru spamassassin-3.4.0/t/spam.t spamassassin-3.4.2/t/spam.t
--- spamassassin-3.4.0/t/spam.t	2014-02-07 03:36:38.000000000 -0500
+++ spamassassin-3.4.2/t/spam.t	2018-09-13 21:27:54.000000000 -0400
@@ -2,7 +2,8 @@
 
 use lib '.'; use lib 't';
 use SATest; sa_t_init("spam");
-use Test; BEGIN { plan tests => 7 };
+
+use Test::More tests => 7;
 
 # ---------------------------------------------------------------------------
 
diff -Nru spamassassin-3.4.0/t/spf.t spamassassin-3.4.2/t/spf.t
--- spamassassin-3.4.0/t/spf.t	2014-02-07 03:36:37.000000000 -0500
+++ spamassassin-3.4.2/t/spf.t	2018-09-13 21:27:54.000000000 -0400
@@ -2,34 +2,36 @@
 
 use lib '.'; use lib 't';
 use SATest; sa_t_init("spf");
-use Test;
+use Test::More;
 
-use constant TEST_ENABLED => conf_bool('run_long_tests') && conf_bool('run_net_tests');
 use constant HAS_SPFQUERY => eval { require Mail::SPF::Query; };
 use constant HAS_MAILSPF => eval { require Mail::SPF; };
+
 # bug 3806:
 # Do not run this test with version of Sys::Hostname::Long older than 1.4
 # on non-Linux unices as root, due to a bug in Sys::Hostname::Long
 # (it is used by Mail::SPF::Query, which is now obsoleted by Mail::SPF)
 use constant IS_LINUX   => $^O eq 'linux';
-use constant IS_WINDOWS => ($^O =~ /^(mswin|dos|os2)/oi);
+use constant IS_OPENBSD => $^O eq 'openbsd';
+use constant IS_WINDOWS => ($^O =~ /^(mswin|dos|os2)/i);
 use constant AM_ROOT    => $< == 0;
 
 use constant HAS_UNSAFE_HOSTNAME =>  # Bug 3806 - module exists and is old
   eval { require Sys::Hostname::Long && Sys::Hostname::Long->VERSION < 1.4 };
 
-use constant DO_RUN =>
-  TEST_ENABLED && (HAS_SPFQUERY || HAS_MAILSPF) &&
-  (!HAS_UNSAFE_HOSTNAME || !AM_ROOT || IS_LINUX || IS_WINDOWS);
-
-BEGIN {
-
-  # some tests are run once for each SPF module, others are only run once
-  plan tests => (DO_RUN ? (HAS_SPFQUERY && HAS_MAILSPF ? 106 : (HAS_SPFQUERY ? 58 : 58)) : 0);
-
-};
-
-exit unless (DO_RUN);
+plan skip_all => "Long running tests disabled" unless conf_bool('run_long_tests');
+plan skip_all => "Net tests disabled" unless conf_bool('run_net_tests');
+plan skip_all => "Need Mail::SPF or Mail::SPF::Query" unless (HAS_SPFQUERY || HAS_MAILSPF);
+plan skip_all => "root required" unless AM_ROOT;
+plan skip_all => "Sys::Hostname::Long > 1.4 required." if HAS_UNSAFE_HOSTNAME;
+plan skip_all => "Test only designed for Windows, Linux or OpenBSD" unless (IS_LINUX || IS_OPENBSD || IS_WINDOWS);
+
+if(HAS_SPFQUERY && HAS_MAILSPF) {
+  plan tests => 106;
+}
+else {
+  plan tests => 58; # TODO: These should be skips down in the code, not changing the test count.
+}
 
 # ---------------------------------------------------------------------------
 
diff -Nru spamassassin-3.4.0/t/sql_based_whitelist.t spamassassin-3.4.2/t/sql_based_whitelist.t
--- spamassassin-3.4.0/t/sql_based_whitelist.t	2014-02-07 03:36:38.000000000 -0500
+++ spamassassin-3.4.2/t/sql_based_whitelist.t	2018-09-13 21:27:54.000000000 -0400
@@ -3,17 +3,10 @@
 use lib '.'; use lib 't';
 use SATest;
 
-use constant TEST_ENABLED => conf_bool('run_awl_sql_tests');
-
-use Test;
-
-BEGIN { plan tests => (TEST_ENABLED ? 11 : 0),
-        onfail => sub {
-            warn "\n\nNote: Failure may be due to an incorrect config";
-        }
-    };
-
-exit unless TEST_ENABLED;
+use Test::More;
+plan skip_all => 'AWL SQL Tests not enabled.' if conf_bool('run_awl_sql_tests');
+plan tests => 11;
+diag "Note: Failure may be due to an incorrect config";
 
 sa_t_init("sql_based_whitelist");
 
diff -Nru spamassassin-3.4.0/t/stop_always_matching_regexps.t spamassassin-3.4.2/t/stop_always_matching_regexps.t
--- spamassassin-3.4.0/t/stop_always_matching_regexps.t	2014-02-07 03:36:38.000000000 -0500
+++ spamassassin-3.4.2/t/stop_always_matching_regexps.t	2018-09-13 21:27:54.000000000 -0400
@@ -13,7 +13,7 @@
 
 use lib '.'; use lib 't';
 use SATest; sa_t_init("stop_always_matching_regexps");
-use Test; BEGIN { plan tests => 13 };
+use Test::More tests => 13;
 
 # ---------------------------------------------------------------------------
 
diff -Nru spamassassin-3.4.0/t/strip2.t spamassassin-3.4.2/t/strip2.t
--- spamassassin-3.4.0/t/strip2.t	2014-02-07 03:36:38.000000000 -0500
+++ spamassassin-3.4.2/t/strip2.t	2018-09-13 21:27:54.000000000 -0400
@@ -2,12 +2,10 @@
 
 use lib '.'; use lib 't';
 use SATest; sa_t_init("strip2");
-use Test;
 
-use constant TEST_ENABLED => conf_bool('run_long_tests');
-
-BEGIN { plan tests => TEST_ENABLED ? 98 : 0 };
-exit unless TEST_ENABLED;
+use Test::More;
+plan skip_all => 'Long running tests disabled' if conf_bool('run_long_tests');
+plan tests => 98;
 
 # ---------------------------------------------------------------------------
 
@@ -37,7 +35,8 @@
 	");
 
   # create report_safe 0 output
-  my $d_input = "log/d.$testname/${Test::ntest}";
+  my $test_number = test_number();
+  my $d_input = "log/d.$testname/$test_number";
   unlink $d_input;
   ok sarun ("-L < $input");
 
@@ -46,7 +45,8 @@
 
   {
     print "output: $d_input\n";
-    my $d_output = "log/d.$testname/${Test::ntest}";
+		$test_number = test_number();
+    my $d_output = "log/d.$testname/$test_number";
     unlink $d_output;
     ok sarun ("-d < $d_input");
     ok (-f $d_output);
@@ -62,13 +62,15 @@
 	");
 
   # create report_safe 1 and -t output
-  $d_input = "log/d.$testname/${Test::ntest}";
+	$test_number = test_number();
+  $d_input = "log/d.$testname/$test_number";
   unlink $d_input;
   ok sarun ("-L -t < $input");
   ok (-f $d_input);
   {
     print "output: $d_input\n";
-    my $d_output = "log/d.$testname/${Test::ntest}";
+		$test_number = test_number();
+    my $d_output = "log/d.$testname/$test_number";
     unlink $d_output;
     ok sarun ("-d < $d_input");
     ok (-f $d_output);
@@ -89,13 +91,15 @@
 	");
 
 # create report_safe 2 output
-$d_input = "log/d.$testname/${Test::ntest}";
+my $test_number = test_number();
+$d_input = "log/d.$testname/$test_number";
 unlink $d_input;
 ok sarun ("-L < $input");
 ok (-f $d_input);
 {
   print "output: $d_input\n";
-  my $d_output = "log/d.$testname/${Test::ntest}";
+  $test_number = test_number();
+  my $d_output = "log/d.$testname/$test_number";
   unlink $d_output;
   ok sarun ("-d < $d_input");
   ok (-f $d_output);
@@ -104,7 +108,8 @@
 }
 
 # Work directly on regular message, as though it was not spam
-my $d_output = "log/d.$testname/${Test::ntest}";
+$test_number = test_number();
+my $d_output = "log/d.$testname/$test_number";
 unlink $d_output;
 ok sarun ("-d < $input");
 ok (-f $d_output);
diff -Nru spamassassin-3.4.0/t/stripmarkup.t spamassassin-3.4.2/t/stripmarkup.t
--- spamassassin-3.4.0/t/stripmarkup.t	2014-02-07 03:36:38.000000000 -0500
+++ spamassassin-3.4.2/t/stripmarkup.t	2018-09-13 21:27:54.000000000 -0400
@@ -2,7 +2,7 @@
 
 use lib '.'; use lib 't';
 use SATest; sa_t_init("stripmarkup");
-use Test; BEGIN { plan tests => 4 };
+use Test::More tests => 4;
 
 # ---------------------------------------------------------------------------
 
diff -Nru spamassassin-3.4.0/t/strip_no_subject.t spamassassin-3.4.2/t/strip_no_subject.t
--- spamassassin-3.4.0/t/strip_no_subject.t	2014-02-07 03:36:38.000000000 -0500
+++ spamassassin-3.4.2/t/strip_no_subject.t	2018-09-13 21:27:54.000000000 -0400
@@ -2,12 +2,10 @@
 
 use lib '.'; use lib 't';
 use SATest; sa_t_init("strip_no_subject");
-use Test;
 
-use constant TEST_ENABLED => conf_bool('run_long_tests');
-
-BEGIN { plan tests => TEST_ENABLED ? 4 : 0 };
-exit unless TEST_ENABLED;
+use Test::More;
+plan skip_all => "Long running tests disabled" unless conf_bool('run_long_tests');
+plan tests => 4;
 
 # ---------------------------------------------------------------------------
 
@@ -25,9 +23,10 @@
 
 # create report_safe 1 and -t output
 sarun ("-L -t < $INPUT");
-if (move("log/d.$testname/${Test::ntest}", $MUNGED)) {
+my $test_number = test_number();
+if (move("log/d.$testname/$test_number", $MUNGED)) {
   sarun ("-d < $MUNGED");
-  ok(!compare_text($INPUT,"log/d.$testname/${Test::ntest}"));
+  ok(!compare_text($INPUT,"log/d.$testname/$test_number"));
 }
 else {
   warn "move failed: $!\n";
@@ -42,9 +41,10 @@
 
 # create report_safe 2 output
 sarun ("-L < $INPUT");
-if (move("log/d.$testname/${Test::ntest}", $MUNGED)) {
+$test_number = test_number();
+if (move("log/d.$testname/$test_number", $MUNGED)) {
   sarun ("-d < $MUNGED");
-  ok(!compare_text($INPUT,"log/d.$testname/${Test::ntest}"));
+  ok(!compare_text($INPUT,"log/d.$testname/$test_number"));
 }
 else {
   warn "move failed: $!\n";
@@ -59,9 +59,10 @@
 
 # create report_safe 0 output
 sarun ("-L < $INPUT");
-if (move("log/d.$testname/${Test::ntest}", $MUNGED)) {
+$test_number = test_number();
+if (move("log/d.$testname/$test_number", $MUNGED)) {
   sarun ("-d < $MUNGED");
-  ok(!compare_text($INPUT,"log/d.$testname/${Test::ntest}"));
+  ok(!compare_text($INPUT,"log/d.$testname/$test_number"));
 }
 else {
   warn "move failed: $!\n";
@@ -70,4 +71,5 @@
 
 # Work directly on regular message, as though it was not spam
 sarun ("-d < $INPUT");
-ok(!compare_text($INPUT,"log/d.$testname/${Test::ntest}"));
+$test_number = test_number();
+ok(!compare_text($INPUT,"log/d.$testname/$test_number"));
diff -Nru spamassassin-3.4.0/t/tainted_msg.t spamassassin-3.4.2/t/tainted_msg.t
--- spamassassin-3.4.0/t/tainted_msg.t	2014-02-07 03:36:38.000000000 -0500
+++ spamassassin-3.4.2/t/tainted_msg.t	2018-09-13 21:27:53.000000000 -0400
@@ -17,9 +17,9 @@
 
 use constant AM_TAINTED => (!defined($ENV{'TEST_PERL_TAINT'}) or $ENV{'TEST_PERL_TAINT'} ne 'no');
 
-use Test; BEGIN { plan tests => AM_TAINTED ? 9 : 0 };
-
-exit unless AM_TAINTED;
+use Test::More;
+plan skip_all => "Not Tainted" unless AM_TAINTED;
+plan tests => 9;
 
 # ---------------------------------------------------------------------------
 
diff -Nru spamassassin-3.4.0/t/text_bad_ctype.t spamassassin-3.4.2/t/text_bad_ctype.t
--- spamassassin-3.4.0/t/text_bad_ctype.t	2014-02-07 03:36:38.000000000 -0500
+++ spamassassin-3.4.2/t/text_bad_ctype.t	2018-09-13 21:27:54.000000000 -0400
@@ -2,7 +2,7 @@
 
 use lib '.'; use lib 't';
 use SATest; sa_t_init("text_bad_ctype");
-use Test; BEGIN { plan tests => 2 };
+use Test::More tests => 2;
 
 # ---------------------------------------------------------------------------
 
diff -Nru spamassassin-3.4.0/t/timeout.t spamassassin-3.4.2/t/timeout.t
--- spamassassin-3.4.0/t/timeout.t	2014-02-07 03:36:38.000000000 -0500
+++ spamassassin-3.4.2/t/timeout.t	2018-09-13 21:27:54.000000000 -0400
@@ -18,7 +18,7 @@
 
 use lib '.'; use lib 't';
 use SATest; sa_t_init("timeout");
-use Test; BEGIN { plan tests => 33 };
+use Test::More tests => 33;
 
 use strict;
 use Time::HiRes qw(time);
diff -Nru spamassassin-3.4.0/t/trust_path.t spamassassin-3.4.2/t/trust_path.t
--- spamassassin-3.4.0/t/trust_path.t	2014-02-07 03:36:38.000000000 -0500
+++ spamassassin-3.4.2/t/trust_path.t	2018-09-13 21:27:54.000000000 -0400
@@ -27,11 +27,9 @@
 use lib '.'; use lib 't';
 use SATest; sa_t_init("trust_path");
 
-use constant TEST_ENABLED => conf_bool('run_long_tests');
-use Test;
-
-BEGIN { plan tests => TEST_ENABLED ? 96 : 0 };
-exit unless TEST_ENABLED;
+use Test::More;
+plan skip_all => "Long running tests disabled" unless conf_bool('run_long_tests');
+plan tests => 96;
 
 use IO::File;
 use strict;
diff -Nru spamassassin-3.4.0/t/uribl_all_types.t spamassassin-3.4.2/t/uribl_all_types.t
--- spamassassin-3.4.0/t/uribl_all_types.t	2014-02-07 03:36:37.000000000 -0500
+++ spamassassin-3.4.2/t/uribl_all_types.t	2018-09-13 21:27:52.000000000 -0400
@@ -5,15 +5,11 @@
 use lib '.'; use lib 't';
 use SATest; sa_t_init("uribl_all_types");
 
-use constant TEST_ENABLED => conf_bool('run_net_tests') && conf_bool('run_long_tests');
-use constant DO_RUN => TEST_ENABLED && can_use_net_dns_safely();
-use Test;
-
-BEGIN {
-  plan tests => (DO_RUN ? 3 : 0),
-};
-
-exit unless (DO_RUN);
+use Test::More;
+plan skip_all => "Long running tests disabled" unless conf_bool('run_long_tests');
+plan skip_all => "Net tests disabled"                unless conf_bool('run_net_tests');
+plan skip_all => "Can't use Net::DNS Safely"   unless can_use_net_dns_safely();
+plan tests => 3;
 
 # ---------------------------------------------------------------------------
 
diff -Nru spamassassin-3.4.0/t/uribl_domains_only.t spamassassin-3.4.2/t/uribl_domains_only.t
--- spamassassin-3.4.0/t/uribl_domains_only.t	2014-02-07 03:36:37.000000000 -0500
+++ spamassassin-3.4.2/t/uribl_domains_only.t	2018-09-13 21:27:54.000000000 -0400
@@ -4,15 +4,11 @@
 use lib '.'; use lib 't';
 use SATest; sa_t_init("uribl_domains_only");
 
-use constant TEST_ENABLED => conf_bool('run_net_tests') && conf_bool('run_long_tests');
-use constant DO_RUN => TEST_ENABLED && can_use_net_dns_safely();
-use Test;
-
-BEGIN {
-  plan tests => (DO_RUN ? 4 : 0),
-};
-
-exit unless (DO_RUN);
+use Test::More;
+plan skip_all => "Long running tests disabled" unless conf_bool('run_long_tests');
+plan skip_all => "Net tests disabled"          unless conf_bool('run_net_tests');
+plan skip_all => "Can't use Net::DNS Safely"   unless can_use_net_dns_safely();
+plan tests => 4;
 
 # ---------------------------------------------------------------------------
 
diff -Nru spamassassin-3.4.0/t/uribl_ips_only.t spamassassin-3.4.2/t/uribl_ips_only.t
--- spamassassin-3.4.0/t/uribl_ips_only.t	2014-02-07 03:36:38.000000000 -0500
+++ spamassassin-3.4.2/t/uribl_ips_only.t	2018-09-13 21:27:54.000000000 -0400
@@ -4,15 +4,11 @@
 use lib '.'; use lib 't';
 use SATest; sa_t_init("uribl_ips_only");
 
-use constant TEST_ENABLED => conf_bool('run_net_tests') && conf_bool('run_long_tests');
-use constant DO_RUN => TEST_ENABLED && can_use_net_dns_safely();
-use Test;
-
-BEGIN {
-  plan tests => (DO_RUN ? 4 : 0),
-};
-
-exit unless (DO_RUN);
+use Test::More;
+plan skip_all => "Long running tests disabled" unless conf_bool('run_long_tests');
+plan skip_all => "Net tests disabled"          unless conf_bool('run_net_tests');
+plan skip_all => "Can't use Net::DNS Safely"   unless can_use_net_dns_safely();
+plan tests => 4;
 
 # ---------------------------------------------------------------------------
 
diff -Nru spamassassin-3.4.0/t/uribl.t spamassassin-3.4.2/t/uribl.t
--- spamassassin-3.4.0/t/uribl.t	2014-02-07 03:36:38.000000000 -0500
+++ spamassassin-3.4.2/t/uribl.t	2018-09-13 21:27:54.000000000 -0400
@@ -3,15 +3,11 @@
 use lib '.'; use lib 't';
 use SATest; sa_t_init("uribl");
 
-use constant TEST_ENABLED => conf_bool('run_net_tests') && conf_bool('run_long_tests');
-use constant DO_RUN => TEST_ENABLED && can_use_net_dns_safely();
-use Test;
-
-BEGIN {
-  plan tests => (DO_RUN ? 6 : 0),
-};
-
-exit unless (DO_RUN);
+use Test::More;
+plan skip_all => "Long running tests disabled" unless conf_bool('run_long_tests');
+plan skip_all => "Net tests disabled"          unless conf_bool('run_net_tests');
+plan skip_all => "Can't use Net::DNS Safely"   unless can_use_net_dns_safely();
+plan tests => 6;
 
 # ---------------------------------------------------------------------------
 
diff -Nru spamassassin-3.4.0/t/uri_html.t spamassassin-3.4.2/t/uri_html.t
--- spamassassin-3.4.0/t/uri_html.t	2014-02-07 03:36:38.000000000 -0500
+++ spamassassin-3.4.2/t/uri_html.t	2018-09-13 21:27:54.000000000 -0400
@@ -18,14 +18,12 @@
 }
 
 use strict;
+use lib '.'; use lib 't';
 use SATest; sa_t_init("uri_html");
-use Test;
+use Test::More tests => 2;
 use Mail::SpamAssassin;
 use vars qw(%patterns %anti_patterns);
 
-# settings
-plan tests => 2;
-
 # initialize SpamAssassin
 my $sa = create_saobj({'dont_copy_prefs' => 1});
 
diff -Nru spamassassin-3.4.0/t/uri_list.t spamassassin-3.4.2/t/uri_list.t
--- spamassassin-3.4.0/t/uri_list.t	1969-12-31 19:00:00.000000000 -0500
+++ spamassassin-3.4.2/t/uri_list.t	2018-09-13 21:27:52.000000000 -0400
@@ -0,0 +1,160 @@
+#!/usr/bin/perl
+
+# Tests for Bug #7591, which is actually a bug seen in the EL7 build of Perl.
+# The real root cause is obscure, so we test for the bug not the Perl version.
+ 
+BEGIN {
+  if (-e 't/test_dir') { # if we are running "t/rule_names.t", kluge around ...
+    chdir 't';
+  }
+
+  if (-e 'test_dir') {            # running from test directory, not ..
+    unshift(@INC, '../blib/lib');
+  }
+}
+
+my $prefix = '.';
+if (-e 'test_dir') {            # running from test directory, not ..
+  $prefix = '..';
+}
+
+use lib '.'; use lib 't';
+use strict;
+use Test::More tests=> 12;
+use Mail::SpamAssassin::Util;
+use SATest; sa_t_init("uri_list");
+use warnings;
+use Cwd;
+
+my $twoplus = <<'EOT';
+Message-ID: <clean.1010101@x.com>
+Date: Mon, 07 Oct 2002 09:00:00 +0000
+From: Sender <sender@x.com>
+MIME-Version: 1.0
+To: Recipient <recipient@x.com>
+Subject: this is a trivial message
+Content-Type: text/plain; charset="UTF-8"
+Content-Transfer-Encoding: 8bit
+
+ an url: http://host1.example.com
+ an url: http://host2.example.com
+
+EOT
+
+my $threeurls = <<'EOT';
+Message-ID: <clean.1010101@x.com>
+Date: Mon, 07 Oct 2002 09:00:00 +0000
+From: Sender <sender@x.com>
+MIME-Version: 1.0
+To: Recipient <recipient@x.com>
+Subject: this is a trivial message
+Content-Type: text/plain; charset="UTF-8"
+Content-Transfer-Encoding: 8bit
+
+http://host1.example.com
+http://host2.example.com
+http://host3.example.com
+
+EOT
+
+my $threeplus = <<'EOT';
+Message-ID: <clean.1010101@x.com>
+Date: Mon, 07 Oct 2002 09:00:00 +0000
+From: Sender <sender@x.com>
+MIME-Version: 1.0
+To: Recipient <recipient@x.com>
+Subject: this is a trivial message
+Content-Type: text/plain; charset="UTF-8"
+Content-Transfer-Encoding: 8bit
+
+ an url: http://host1.example.com
+ an url: http://host2.example.com
+ an url: http://host3.example.com
+
+EOT
+
+my $foururls = <<'EOT';
+Message-ID: <clean.1010101@x.com>
+Date: Mon, 07 Oct 2002 09:00:00 +0000
+From: Sender <sender@x.com>
+MIME-Version: 1.0
+To: Recipient <recipient@x.com>
+Subject: this is a trivial message
+Content-Type: text/plain; charset="UTF-8"
+Content-Transfer-Encoding: 8bit
+
+ an url: http://host1.example.com
+ an url: http://host2.example.com
+ an url: http://host3.example.com
+ an url: http://host4.example.com
+
+EOT
+
+my $fiveurls = <<'EOT';
+Message-ID: <clean.1010101@x.com>
+Date: Mon, 07 Oct 2002 09:00:00 +0000
+From: Sender <sender@x.com>
+MIME-Version: 1.0
+To: Recipient <recipient@x.com>
+Subject: this is a trivial message
+Content-Type: text/plain; charset="UTF-8"
+Content-Transfer-Encoding: 8bit
+
+ an url: http://host1.example.com
+ an url: http://host2.example.com
+ an url: http://host3.example.com
+ an url: http://host4.example.com
+ an url: http://host5.example.com
+
+EOT
+
+my $sixurls = <<'EOT';
+Message-ID: <clean.1010101@example.com>
+Date: Mon, 07 Oct 2002 09:00:00 +0000
+From: Sender <sender@example.com>
+MIME-Version: 1.0
+To: Recipient <recipient@example.com>
+Subject: this is a trivial message
+Content-Type: text/plain; charset="UTF-8"
+Content-Transfer-Encoding: 8bit
+
+http://host1.example.com
+http://host2.example.com
+http://host3.example.com
+http://host4.example.com
+http://host5.example.com
+http://host6.example.com
+
+EOT
+my $tmpdir = mk_safe_tmpdir();
+warn "temp dir is $tmpdir\n";
+
+for my $mail  ($twoplus, $threeurls, $threeplus, $foururls, $fiveurls, $sixurls) {
+  my @urls = grep(/\bhttp:/m,$mail);
+  my $count = () = $mail =~ /\bhttp:\/\//g;
+  #warn "$count urls in message\n";
+  # initialize SpamAssassin
+  my $sa = create_saobj({dont_copy_prefs => 1});
+  $sa->init(0); # parse rules
+  my $mailobj = $sa->parse($mail);
+  my $msg = Mail::SpamAssassin::PerMsgStatus->new($sa, $mailobj);
+  my @urilist = $msg->get_uri_list();
+  my $ulcnt = $#urilist + 1 ;
+  #warn "$ulcnt urls in parselist\n";
+  ok ( $count == $ulcnt );
+  $sa->finish();
+  # this is ugly, but it actually demos the bug. 
+  open (my $mfh, ">", "$tmpdir/msg");
+  print $mfh "$mail";
+  my $haverules = (  -f "../rules/25_uribl.cf" ) ;
+  my  $sarcnt = qx/..\/spamassassin -D all < $tmpdir\/msg 2>&1 |grep -c 'uridnsbl:.*skip'/;
+  # test isn't very useful without this component, but this will at least skip the subtest when it can't be run
+  SKIP: {
+    skip  "No rules found!\n", 1 if (! $haverules ); 
+    if (!ok ( $count == $sarcnt )) {
+      warn "Simple grep for http:// found $count URLs, get_uri_list found $ulcnt URLs, spamassassin script found $sarcnt\n";
+    }
+  }
+}
+
+cleanup_safe_tmpdir();
diff -Nru spamassassin-3.4.0/t/urilocalbl_geoip.t spamassassin-3.4.2/t/urilocalbl_geoip.t
--- spamassassin-3.4.0/t/urilocalbl_geoip.t	1969-12-31 19:00:00.000000000 -0500
+++ spamassassin-3.4.2/t/urilocalbl_geoip.t	2018-09-13 21:27:54.000000000 -0400
@@ -0,0 +1,46 @@
+#!/usr/bin/perl
+
+BEGIN {
+  if (-e 't/test_dir') { # if we are running "t/rule_tests.t", kluge around ...
+    chdir 't';
+  }
+
+  if (-e 'test_dir') {            # running from test directory, not ..
+    unshift(@INC, '../blib/lib');
+    unshift(@INC, '../lib');
+  }
+}
+
+use lib '.'; use lib 't';
+use SATest; sa_t_init("urilocalbl");
+
+use constant HAS_GEOIP => eval { require Geo::IP; };
+use constant HAS_GEOIP_CONF => eval { Geo::IP->new(GEOIP_MEMORY_CACHE | GEOIP_CHECK_CACHE); };
+
+use Test::More;
+
+plan skip_all => "Geo::IP not installed" unless HAS_GEOIP;
+plan skip_all => "Geo::IP not configured" unless HAS_GEOIP_CONF;
+plan tests => 3;
+
+# ---------------------------------------------------------------------------
+
+tstpre ("
+loadplugin Mail::SpamAssassin::Plugin::URILocalBL
+");
+
+%patterns = (
+  q{ X_URIBL_USA } => 'USA',
+  q{ X_URIBL_NA } => 'north America',
+);
+
+tstlocalrules (q{
+  uri_block_cc X_URIBL_USA us
+  describe X_URIBL_USA uri located in USA
+  
+  uri_block_cont X_URIBL_NA na
+  describe X_URIBL_NA uri located in north America
+});
+
+ok sarun ("-t < data/spam/relayUS.eml", \&patterns_run_cb);
+ok_all_patterns();
diff -Nru spamassassin-3.4.0/t/uri.t spamassassin-3.4.2/t/uri.t
--- spamassassin-3.4.0/t/uri.t	2014-02-07 03:36:38.000000000 -0500
+++ spamassassin-3.4.2/t/uri.t	2018-09-13 21:27:52.000000000 -0400
@@ -16,15 +16,14 @@
 }
 
 use strict;
-use Test;
+use Test::More tests => 95;
+use lib '.'; use lib 't';
 use SATest; sa_t_init("uri");
 
 use Mail::SpamAssassin;
 use Mail::SpamAssassin::HTML;
 use Mail::SpamAssassin::Util;
 
-plan tests => 95;
-
 ##############################################
 
 
@@ -64,7 +63,7 @@
 
 sub try_domains {
   my($try, $expect) = @_;
-  my $result = Mail::SpamAssassin::Util::uri_to_domain($try);
+  my $result = $sa->{registryboundaries}->uri_to_domain($try);
 
   # undef is valid in some situations, so deal with it...
   if (!defined $expect) {
diff -Nru spamassassin-3.4.0/t/uri_text.t spamassassin-3.4.2/t/uri_text.t
--- spamassassin-3.4.0/t/uri_text.t	2014-02-07 03:36:37.000000000 -0500
+++ spamassassin-3.4.2/t/uri_text.t	2018-09-13 21:27:54.000000000 -0400
@@ -18,16 +18,14 @@
 }
 
 use strict;
+use lib '.'; use lib 't';
 use SATest; sa_t_init("uri_text");
-use Test;
+use Test::More tests => 683;
 use Mail::SpamAssassin;
 use vars qw(%patterns %anti_patterns);
 
-# settings
-plan tests => 682;
-
 # initialize SpamAssassin
-my $sa = create_saobj({'dont_copy_prefs' => 1});
+my $sa = create_saobj({dont_copy_prefs => 1});
 
 $sa->init(0); # parse rules
 
@@ -114,47 +112,47 @@
 www5.poh6feib.info	poh6feib
 Haegh3de.co.uk		Haegh3de
 
-ftp.yeinaix3.co.uk	ftp://ftp.yeinaix3.co.uk !http://ftp.yeinaix3.co.uk
-ftp5.riexai5r.co.uk	http://ftp5.riexai5r.co.uk !ftp://ftp5.riexai5r.co.uk
+ftp.yeinaix3.co.uk	ftp://ftp\.yeinaix3\.co\.uk !http://ftp\.yeinaix3\.co\.uk
+ftp5.riexai5r.co.uk	http://ftp5\.riexai5r\.co\.uk !ftp://ftp5\.riexai5r\.co\.uk
 
-10.1.1.1		!10.1.1.1
-10.1.2.1/		!10.1.2.1
-http://10.1.3.1/	10.1.3.1
+10.1.1.1		!10\.1\.1\.1
+10.1.2.1/		!10\.1\.2\.1
+http://10.1.3.1/	10\.1\.3\.1
 
 quau0wig.quau0wig	!quau0wig
 foo.Cahl1goo.php	!Cahl1goo
 www5.mi1coozu.php	!mi1coozu
 www.mezeel0P.php	!mezeel0P
 bar.neih6fee.com.php	!neih6fee
-www.zai6Vuwi.com.bar	!zai6Vuwi
+www.zai6Vuwi.com.invalid	!zai6Vuwi
 
-=www.deiJ1pha.com	www.deiJ1pha.com
-@www.Te0xohxu.com	www.Te0xohxu.com
-.www.kuiH5sai.com	www.kuiH5sai.com
-
-a=www.zaiNgoo7.com	www.zaiNgoo7.com
-b@www.vohWais0.com	mailto:b@www.vohWais0.com	!http://www.vohWais0.com
-c.www.moSaoga8.com	www.moSaoga8.com
+=www.deiJ1pha.com	www\.deiJ1pha\.com
+@www.Te0xohxu.com	www\.Te0xohxu\.com
+.www.kuiH5sai.com	www\.kuiH5sai\.com
+
+a=www.zaiNgoo7.com	www\.zaiNgoo7\.com
+b@www.vohWais0.com	mailto:b\@www\.vohWais0\.com	!http://www\.vohWais0\.com
+c.www.moSaoga8.com	www\.moSaoga8\.com
 
 xyz..geifoza0.com	!geifoza0
-xyz.geifoza1.com/..xyz	xyz.geifoza1.com	!xyz.geifoza1.com/..xyz
-xyz.geifoza2.CoM	xyz.geifoza2.CoM
+xyz.geifoza1.com/..xyz	xyz\.geifoza1\.com	!xyz\.geifoza1\.com/\.\.xyz
+xyz.geifoza2.CoM	xyz\.geifoza2\.CoM
 http://xyz..geifoza3.com	!geifoza3
-http://xyz.geifoza4.com/..xyz	xyz.geifoza4.com/..xyz
-http://xyz.geifoza5.CoM	xyz.geifoza5.CoM
+http://xyz.geifoza4.com/..xyz	xyz\.geifoza4\.com/\.\.xyz
+http://xyz.geifoza5.CoM	xyz\.geifoza5\.CoM
 
 joe@koja3fui.koja3fui	!koja3fui
 
-<xuq@dsj.x.thriyi.com>	mailto:xuq@dsj.x.thriyi.com	!http\S*thriyi
+<xuq@dsj.x.thriyi.com>	mailto:xuq\@dsj\.x\.thriyi\.com	!http\S*thriyi
 
 http://www.example.com/about/wahfah7d.html	wahfah7d
 http://www.example.com?xa1kaLuo			\?xa1kaLuo
-http://www.lap7thob.com/			^http://www.lap7thob.com/$
+http://www.lap7thob.com/			^http://www\.lap7thob\.com/$
 
-www.phoh1Koh.com/			^www.phoh1Koh.com/$
-www.Tar4caeg.com:80			http://www.Tar4caeg.com:80
-www.Coo4mowe.com:80/foo/foo.html	^www.Coo4mowe.com:80/foo/foo.html
-www.Nee2quae.com:80/			^www.Nee2quae.com:80/$
+www.phoh1Koh.com/			^www\.phoh1Koh\.com/$
+www.Tar4caeg.com:80			http://www\.Tar4caeg\.com:80
+www.Coo4mowe.com:80/foo/foo.html	^www\.Coo4mowe\.com:80/foo/foo\.html
+www.Nee2quae.com:80/			^www\.Nee2quae\.com:80/$
 
 HAETEI3D.com	HAETEI3D
 CUK3VEIZ.us	CUK3VEIZ
@@ -175,666 +173,669 @@
 chae2shi.CN	chae2shi
 roo7kiey.TW	roo7kiey
 
-www.Chiew0ch.COM	www.Chiew0ch.COM
-www.thohY2qu.US		www.thohY2qu.US
-www.teiP7gei.BIZ	www.teiP7gei.BIZ
-www.xohThai8.INFO	www.xohThai8.INFO
-www.haik7Ram.NET	www.haik7Ram.NET
-www.Quaes3se.ORG	www.Quaes3se.ORG
-www.Chai6tah.WS		www.Chai6tah.WS
-www.Thuoth1y.NAME	www.Thuoth1y.NAME
-www.Chieb8ge.TV		www.Chieb8ge.TV
-WWW.quus4Rok.cc		WWW.quus4Rok.cc
-WWW.maic6Hei.de		WWW.maic6Hei.de
-WWW.he4Hiize.jp		WWW.he4Hiize.jp
-WWW.Soh1toob.be		WWW.Soh1toob.be
-WWW.chahMee5.at		WWW.chahMee5.at
-WWW.peepooN0.uk		WWW.peepooN0.uk
-WWW.Kiox3phi.nz		WWW.Kiox3phi.nz
-WWW.jong3Xou.cn		WWW.jong3Xou.cn
-WWW.waeShoe0.tw		WWW.waeShoe0.tw
+www.Chiew0ch.COM	www\.Chiew0ch\.COM
+www.thohY2qu.US		www\.thohY2qu\.US
+www.teiP7gei.BIZ	www\.teiP7gei\.BIZ
+www.xohThai8.INFO	www\.xohThai8\.INFO
+www.haik7Ram.NET	www\.haik7Ram\.NET
+www.Quaes3se.ORG	www\.Quaes3se\.ORG
+www.Chai6tah.WS		www\.Chai6tah\.WS
+www.Thuoth1y.NAME	www\.Thuoth1y\.NAME
+www.Chieb8ge.TV		www\.Chieb8ge\.TV
+WWW.quus4Rok.cc		WWW\.quus4Rok\.cc
+WWW.maic6Hei.de		WWW\.maic6Hei\.de
+WWW.he4Hiize.jp		WWW\.he4Hiize\.jp
+WWW.Soh1toob.be		WWW\.Soh1toob\.be
+WWW.chahMee5.at		WWW\.chahMee5\.at
+WWW.peepooN0.uk		WWW\.peepooN0\.uk
+WWW.Kiox3phi.nz		WWW\.Kiox3phi\.nz
+WWW.jong3Xou.cn		WWW\.jong3Xou\.cn
+WWW.waeShoe0.tw		WWW\.waeShoe0\.tw
 
-invalid_ltd.foo		!invalid_tld
-invalid_ltd.bar		!invalid_tld
+invalid_ltd.notword	!invalid_tld
+invalid_ltd.invalid	!invalid_tld
 invalid_ltd.xyzzy	!invalid_tld
 invalid_ltd.co.zz	!invalid_tld
 
-www.invalid_ltd.foo	!invalid_tld
-www.invalid_ltd.bar	!invalid_tld
+www.invalid_ltd.notword	!invalid_tld
+www.invalid_ltd.invalid	!invalid_tld
 www.invalid_ltd.xyzzy	!invalid_tld
 www.invalid_ltd.co.zz	!invalid_tld
 
-command.com		command.com
-cmd.exe			!cmd.exe
+command.com		command\.com
+cmd.exe			!cmd\.exe
 
 commander		!commander
 aaacomaaa		!aaacomaaa
-aaa.com.aaa		!aaa.com.aaa
-com.foo.web		!com.foo.web
+aaa.com.aaa		!aaa\.com\.aaa
+com.foo.web		!com\.foo\.web
 
 # IPs for www.yahoo.com
-66.94.230.32		!66.94.230.32
-http://66.94.230.33	http://66.94.230.33
-http://1113515555	http://66.94.230.35
-
-gooboo4k@xieyohy0.com		mailto:gooboo4k@xieyohy0.com
-mailto:baeb1fai@quo6puyo.com	mailto:baeb1fai@quo6puyo.com
-
-http://www.luzoop5k.com		http://www.luzoop5k.com
-https://www.luzoop5k.com	https://www.luzoop5k.com
-ftp://www.luzoop5k.com		ftp://www.luzoop5k.com
-
-Mailto:aaeb1fai@quo6puyo.com	Mailto:aaeb1fai@quo6puyo.com
-Http://www.auzoop5k.com		Http://www.auzoop5k.com
-Https://www.auzoop5k.com	Https://www.auzoop5k.com
-Ftp://www.auzoop5k.com		Ftp://www.auzoop5k.com
+66.94.230.32		!66\.94\.230\.32
+http://66.94.230.33	http://66\.94\.230\.33
+http://1113515555	http://66\.94\.230\.35
+
+gooboo4k@xieyohy0.com		mailto:gooboo4k\@xieyohy0\.com
+mailto:baeb1fai@quo6puyo.com	mailto:baeb1fai\@quo6puyo\.com
+
+http://www.luzoop5k.com		http://www\.luzoop5k\.com
+https://www.luzoop5k.com	https://www\.luzoop5k\.com
+ftp://www.luzoop5k.com		ftp://www\.luzoop5k\.com
+
+Mailto:aaeb1fai@quo6puyo.com	Mailto:aaeb1fai\@quo6puyo\.com
+Http://www.auzoop5k.com		Http://www\.auzoop5k\.com
+Https://www.auzoop5k.com	Https://www\.auzoop5k\.com
+Ftp://www.auzoop5k.com		Ftp://www\.auzoop5k\.com
 
-mailto:www.luzoop5k.com		!mailto:www.luzoop5k.com
+mailto:www.luzoop5k.com		!mailto:www\.luzoop5k\.com
 # no longer accept file: scheme
-file://www.luzoop5k.com		!file://www.luzoop5k.com
+file://www.luzoop5k.com		!file://www\.luzoop5k\.com
 
 # //<user>:<password>@<host>:<port>/<url-path>
-http://user:pass@jiefeet4.com:80/x/y	http://user:pass@jiefeet4.com:80/x/y
+http://user:pass@jiefeet4.com:80/x/y	http://user:pass\@jiefeet4\.com:80/x/y
 
 www.liy8quei:80				!liy8quei
 www.veibi6cu:443			!veibi6cu
-puahi8si.com:80				!puahi8si.com:80
-chop8tan.com:443			!chop8tan.com:443
-www.puahi9si.com:80		puahi9si.com:80
-www.chop9tan.com:443	chop9tan.com:443
-
-ftp://name@su5queib.ca//etc/motd	ftp://name@su5queib.ca//etc/motd
-ftp://name@faikaj4t.dom/%2Fetc/motd	!ftp://name@faikaj4t.dom//etc/motd
-ftp://name@faikaj4t.com/%2Fetc/motd	ftp://name@faikaj4t.com//etc/motd
+puahi8si.com:80				!puahi8si\.com:80
+chop8tan.com:443			!chop8tan\.com:443
+www.puahi9si.com:80		puahi9si\.com:80
+www.chop9tan.com:443	chop9tan\.com:443
+
+ftp://name@su5queib.ca//etc/motd	ftp://name\@su5queib\.ca//etc/motd
+ftp://name@faikaj4t.dom/%2Fetc/motd	!ftp://name\@faikaj4t\.dom//etc/motd
+ftp://name@faikaj4t.com/%2Fetc/motd	ftp://name\@faikaj4t\.com//etc/motd
 
 keyword:sportscar		!sportscar
 
 # questionable tests
-mailto://cah3neun@thaihe4d.com		mailto://cah3neun@thaihe4d.com
+mailto://cah3neun@thaihe4d.com		mailto://cah3neun\@thaihe4d\.com
 
-mailto://jicu8vah@another@jicu8vah	!jicu8vah@another@jicu8vah
-baeb1fai@@example.com			!baeb1fai@@example.com
+mailto://jicu8vah@another@jicu8vah	!jicu8vah\@another\@jicu8vah
+baeb1fai@@example.com			!baeb1fai\@\@example\.com
 mailto://yie6xuna		!yie6xuna
-mailto://yie6xuna@nottld		!yie6xuna@nottld
+mailto://yie6xuna@nottld		!yie6xuna\@nottld
 
-<sentto-4934-foo=addr.com@verper.com>	!^http://.*addr.com@verper.com
-<sentto-4934-foo=addr.com@verper.com>	mailto:sentto-4934-foo=addr.com@verper.com
+<sentto-4934-foo=addr.com@verper.com>	!^http://.*addr\.com\@verper\.com
+<sentto-4934-foo=addr.com@verper.com>	mailto:sentto-4934-foo=addr\.com\@verper\.com
 
-http://foo23498.com/{ESC}(B	^http://foo23498.com/$
-{ESC}(Bhttp://foo23499.com/	^http://foo23499.com/$
-http://foo23500.com{ESC}(B/	^http://foo23500.com(?:/?)$
+http://foo23498.com/{ESC}(B	^http://foo23498\.com/$
+{ESC}(Bhttp://foo23499.com/	^http://foo23499\.com/$
+http://foo23500.com{ESC}(B/	^http://foo23500\.com(?:/?)$
 
 M0"-AE/9Y.KN:_0D2F:95^H*:I,8	!9Y\.KN
->delimtest1.com	http://delimtest1.com
-<delimtest2.com	http://delimtest2.com
-"delimtest3.com	http://delimtest3.com
-\delimtest4.com	http://delimtest4.com
-'delimtest5.com	http://delimtest5.com
-`delimtest6.com	http://delimtest6.com
-,delimtest7.com	http://delimtest7.com
-{delimtest8.com	http://delimtest8.com
-[delimtest9.com	http://delimtest9.com
-(delimtest10.com	http://delimtest10.com
-|delimtest11.com	http://delimtest11.com
- delimtest12.com	http://delimtest12.com
-ignorethishttp://delimtest13.org	http://delimtest13.org
-donotignorethiswww.delimtest14.com	donotignorethiswww.delimtest14.com
-<www.delimtest15.com/foo-~!@#^&*()_+=:;'?,.xyz-~!@#^&*()_+=:;'?,.>	^http://www.delimtest15.com/foo-~!@#\^&\*\(\)_\+=:;'\?,\.xyz$
-.....www.delimtest16.com..........	^http://www.delimtest16.com$
------www.delimtest17.com----------	^http://www.delimtest17.com$
-.....http://www.delimtest18.com..........	^http://www.delimtest18.com$
------http://www.delimtest19.com----------	^http://www.delimtest19.com$
+>delimtest1.com	http://delimtest1\.com
+<delimtest2.com	http://delimtest2\.com
+"delimtest3.com	http://delimtest3\.com
+\delimtest4.com	http://delimtest4\.com
+'delimtest5.com	http://delimtest5\.com
+`delimtest6.com	http://delimtest6\.com
+,delimtest7.com	http://delimtest7\.com
+{delimtest8.com	http://delimtest8\.com
+[delimtest9.com	http://delimtest9\.com
+(delimtest10.com	http://delimtest10\.com
+|delimtest11.com	http://delimtest11\.com
+ delimtest12.com	http://delimtest12\.com
+ignorethishttp://delimtest13.org	http://delimtest13\.org
+donotignorethiswww.delimtest14.com	donotignorethiswww\.delimtest14\.com
+<www.delimtest15.com/foo-~!@#^&*()_+=:;'?,.xyz-~!@#^&*()_+=:;'?,.>	^http://www\.delimtest15\.com/foo-~!\@#\^&\*\(\)_\+=:;'\?,\.xyz$
+.....www.delimtest16.com..........	^http://www\.delimtest16\.com$
+-----www.delimtest17.com----------	^http://www\.delimtest17\.com$
+.....http://www.delimtest18.com..........	^http://www\.delimtest18\.com$
+-----http://www.delimtest19.com----------	^http://www\.delimtest19\.com$
+
+# emails with a comma at the end
+test@delimtest20.com,stuff stuff		delimtest20\.com
 
 # check all the TLDs (might as well be thorough)
 # the inactive TLDs have negative checks
 
 # first confirm that it will not match on not a TLD
-example.foo	!^http://example.foo$
-example.zzf	!^http://example.zzf$
+example.invalid	!^http://example\.invalid$
+example.zzf	!^http://example\.zzf$
 
-example.ac	^http://example.ac$
-example.ad	^http://example.ad$
-example.ae	^http://example.ae$
-example.aero	^http://example.aero$
-example.af	^http://example.af$
-example.ag	^http://example.ag$
-example.ai	^http://example.ai$
-example.al	^http://example.al$
-example.am	^http://example.am$
-example.an	^http://example.an$
-example.ao	^http://example.ao$
-example.aq	^http://example.aq$
-example.ar	^http://example.ar$
-example.arpa	^http://example.arpa$
-example.as	^http://example.as$
-example.asia	^http://example.asia$
-example.at	^http://example.at$
-example.au	^http://example.au$
-example.aw	^http://example.aw$
-example.ax	^http://example.ax$
-example.az	^http://example.az$
-example.ba	^http://example.ba$
-example.bb	^http://example.bb$
-example.bd	^http://example.bd$
-example.be	^http://example.be$
-example.bf	^http://example.bf$
-example.bg	^http://example.bg$
-example.bh	^http://example.bh$
-example.bi	^http://example.bi$
-example.biz	^http://example.biz$
-example.bj	^http://example.bj$
-example.bm	^http://example.bm$
-example.bn	^http://example.bn$
-example.bo	^http://example.bo$
-example.br	^http://example.br$
-example.bs	^http://example.bs$
-example.bt	^http://example.bt$
-example.bv	!^http://example.bv$
-example.bw	^http://example.bw$
-example.by	^http://example.by$
-example.bz	^http://example.bz$
-example.ca	^http://example.ca$
-example.cat	^http://example.cat$
-example.cc	^http://example.cc$
-example.cd	^http://example.cd$
-example.cf	^http://example.cf$
-example.cg	^http://example.cg$
-example.ch	^http://example.ch$
-example.ci	^http://example.ci$
-example.ck	^http://example.ck$
-example.cl	^http://example.cl$
-example.cm	^http://example.cm$
-example.cn	^http://example.cn$
-example.co	^http://example.co$
-example.com	^http://example.com$
-example.coop	^http://example.coop$
-example.cr	^http://example.cr$
-example.cu	^http://example.cu$
-example.cv	^http://example.cv$
-example.cx	^http://example.cx$
-example.cy	^http://example.cy$
-example.cz	^http://example.cz$
-example.de	^http://example.de$
-example.dj	^http://example.dj$
-example.dk	^http://example.dk$
-example.dm	^http://example.dm$
-example.do	^http://example.do$
-example.dz	^http://example.dz$
-example.ec	^http://example.ec$
-example.edu	^http://example.edu$
-example.ee	^http://example.ee$
-example.eg	^http://example.eg$
-example.er	^http://example.er$
-example.es	^http://example.es$
-example.et	^http://example.et$
-example.eu	^http://example.eu$
-example.fi	^http://example.fi$
-example.fj	^http://example.fj$
-example.fk	^http://example.fk$
-example.fm	^http://example.fm$
-example.fo	^http://example.fo$
-example.fr	^http://example.fr$
-example.ga	^http://example.ga$
-example.gb	!^http://example.gb$
-example.gd	^http://example.gd$
-example.ge	^http://example.ge$
-example.gf	^http://example.gf$
-example.gg	^http://example.gg$
-example.gh	^http://example.gh$
-example.gi	^http://example.gi$
-example.gl	^http://example.gl$
-example.gm	^http://example.gm$
-example.gn	^http://example.gn$
-example.gov	^http://example.gov$
-example.gp	^http://example.gp$
-example.gq	^http://example.gq$
-example.gr	^http://example.gr$
-example.gs	^http://example.gs$
-example.gt	^http://example.gt$
-example.gu	^http://example.gu$
-example.gw	^http://example.gw$
-example.gy	^http://example.gy$
-example.hk	^http://example.hk$
-example.hm	^http://example.hm$
-example.hn	^http://example.hn$
-example.hr	^http://example.hr$
-example.ht	^http://example.ht$
-example.hu	^http://example.hu$
-example.id	^http://example.id$
-example.ie	^http://example.ie$
-example.il	^http://example.il$
-example.im	^http://example.im$
-example.in	^http://example.in$
-example.info	^http://example.info$
-example.int	^http://example.int$
-example.io	^http://example.io$
-example.iq	^http://example.iq$
-example.ir	^http://example.ir$
-example.is	^http://example.is$
-example.it	^http://example.it$
-example.je	^http://example.je$
-example.jm	^http://example.jm$
-example.jo	^http://example.jo$
-example.jobs	^http://example.jobs$
-example.jp	^http://example.jp$
-example.ke	^http://example.ke$
-example.kg	^http://example.kg$
-example.kh	^http://example.kh$
-example.ki	^http://example.ki$
-example.km	^http://example.km$
-example.kn	^http://example.kn$
-example.kp	^http://example.kp$
-example.kr	^http://example.kr$
-example.kw	^http://example.kw$
-example.ky	^http://example.ky$
-example.kz	^http://example.kz$
-example.la	^http://example.la$
-example.lb	^http://example.lb$
-example.lc	^http://example.lc$
-example.li	^http://example.li$
-example.lk	^http://example.lk$
-example.lr	^http://example.lr$
-example.ls	^http://example.ls$
-example.lt	^http://example.lt$
-example.lu	^http://example.lu$
-example.lv	^http://example.lv$
-example.ly	^http://example.ly$
-example.ma	^http://example.ma$
-example.mc	^http://example.mc$
-example.md	^http://example.md$
-example.me	^http://example.me$
-example.mg	^http://example.mg$
-example.mh	^http://example.mh$
-example.mil	^http://example.mil$
-example.mk	^http://example.mk$
-example.ml	^http://example.ml$
-example.mm	^http://example.mm$
-example.mn	^http://example.mn$
-example.mo	^http://example.mo$
-example.mobi	^http://example.mobi$
-example.mp	^http://example.mp$
-example.mq	^http://example.mq$
-example.mr	^http://example.mr$
-example.ms	^http://example.ms$
-example.mt	^http://example.mt$
-example.mu	^http://example.mu$
-example.museum	^http://example.museum$
-example.mv	^http://example.mv$
-example.mw	^http://example.mw$
-example.mx	^http://example.mx$
-example.my	^http://example.my$
-example.mz	^http://example.mz$
-example.na	^http://example.na$
-example.name	^http://example.name$
-example.nc	^http://example.nc$
-example.ne	^http://example.ne$
-example.net	^http://example.net$
-example.nf	^http://example.nf$
-example.ng	^http://example.ng$
-example.ni	^http://example.ni$
-example.nl	^http://example.nl$
-example.no	^http://example.no$
-example.np	^http://example.np$
-example.nr	^http://example.nr$
-example.nu	^http://example.nu$
-example.nz	^http://example.nz$
-example.om	^http://example.om$
-example.org	^http://example.org$
-example.pa	^http://example.pa$
-example.pe	^http://example.pe$
-example.pf	^http://example.pf$
-example.pg	^http://example.pg$
-example.ph	^http://example.ph$
-example.pk	^http://example.pk$
-example.pl	^http://example.pl$
-example.pm	^http://example.pm$
-example.pn	^http://example.pn$
-example.pr	^http://example.pr$
-example.pro	^http://example.pro$
-example.ps	^http://example.ps$
-example.pt	^http://example.pt$
-example.pw	^http://example.pw$
-example.py	^http://example.py$
-example.qa	^http://example.qa$
-example.re	^http://example.re$
-example.ro	^http://example.ro$
-example.rs	^http://example.rs$
-example.ru	^http://example.ru$
-example.rw	^http://example.rw$
-example.sa	^http://example.sa$
-example.sb	^http://example.sb$
-example.sc	^http://example.sc$
-example.sd	^http://example.sd$
-example.se	^http://example.se$
-example.sg	^http://example.sg$
-example.sh	^http://example.sh$
-example.si	^http://example.si$
-example.sj	!^http://example.sj$
-example.sk	^http://example.sk$
-example.sl	^http://example.sl$
-example.sm	^http://example.sm$
-example.sn	^http://example.sn$
-example.so	^http://example.so$
-example.sr	^http://example.sr$
-example.st	^http://example.st$
-example.su	^http://example.su$
-example.sv	^http://example.sv$
-example.sy	^http://example.sy$
-example.sz	^http://example.sz$
-example.tc	^http://example.tc$
-example.td	^http://example.td$
-example.tel	^http://example.tel$
-example.tf	^http://example.tf$
-example.tg	^http://example.tg$
-example.th	^http://example.th$
-example.tj	^http://example.tj$
-example.tk	^http://example.tk$
-example.tl	^http://example.tl$
-example.tm	^http://example.tm$
-example.tn	^http://example.tn$
-example.to	^http://example.to$
-example.tp	^http://example.tp$
-example.tr	^http://example.tr$
-example.travel	^http://example.travel$
-example.tt	^http://example.tt$
-example.tv	^http://example.tv$
-example.tw	^http://example.tw$
-example.tz	^http://example.tz$
-example.ua	^http://example.ua$
-example.ug	^http://example.ug$
-example.uk	^http://example.uk$
-example.um	!^http://example.um$
-example.us	^http://example.us$
-example.uy	^http://example.uy$
-example.uz	^http://example.uz$
-example.va	^http://example.va$
-example.vc	^http://example.vc$
-example.ve	^http://example.ve$
-example.vg	^http://example.vg$
-example.vi	^http://example.vi$
-example.vn	^http://example.vn$
-example.vu	^http://example.vu$
-example.wf	^http://example.wf$
-example.ws	^http://example.ws$
-example.ye	^http://example.ye$
-example.yt	^http://example.yt$
-example.yu	!^http://example.yu$
-example.za	^http://example.za$
-example.zm	^http://example.zm$
-example.zw	^http://example.zw$
+example.ac	^http://example\.ac$
+example.ad	^http://example\.ad$
+example.ae	^http://example\.ae$
+example.aero	^http://example\.aero$
+example.af	^http://example\.af$
+example.ag	^http://example\.ag$
+example.ai	^http://example\.ai$
+example.al	^http://example\.al$
+example.am	^http://example\.am$
+example.an	!^http://example\.an$
+example.ao	^http://example\.ao$
+example.aq	^http://example\.aq$
+example.ar	^http://example\.ar$
+example.arpa	^http://example\.arpa$
+example.as	^http://example\.as$
+example.asia	^http://example\.asia$
+example.at	^http://example\.at$
+example.au	^http://example\.au$
+example.aw	^http://example\.aw$
+example.ax	^http://example\.ax$
+example.az	^http://example\.az$
+example.ba	^http://example\.ba$
+example.bb	^http://example\.bb$
+example.bd	^http://example\.bd$
+example.be	^http://example\.be$
+example.bf	^http://example\.bf$
+example.bg	^http://example\.bg$
+example.bh	^http://example\.bh$
+example.bi	^http://example\.bi$
+example.biz	^http://example\.biz$
+example.bj	^http://example\.bj$
+example.bm	^http://example\.bm$
+example.bn	^http://example\.bn$
+example.bo	^http://example\.bo$
+example.br	^http://example\.br$
+example.bs	^http://example\.bs$
+example.bt	^http://example\.bt$
+example.bv	^http://example\.bv$
+example.bw	^http://example\.bw$
+example.by	^http://example\.by$
+example.bz	^http://example\.bz$
+example.ca	^http://example\.ca$
+example.cat	^http://example\.cat$
+example.cc	^http://example\.cc$
+example.cd	^http://example\.cd$
+example.cf	^http://example\.cf$
+example.cg	^http://example\.cg$
+example.ch	^http://example\.ch$
+example.ci	^http://example\.ci$
+example.ck	^http://example\.ck$
+example.cl	^http://example\.cl$
+example.cm	^http://example\.cm$
+example.cn	^http://example\.cn$
+example.co	^http://example\.co$
+example.com	^http://example\.com$
+example.coop	^http://example\.coop$
+example.cr	^http://example\.cr$
+example.cu	^http://example\.cu$
+example.cv	^http://example\.cv$
+example.cx	^http://example\.cx$
+example.cy	^http://example\.cy$
+example.cz	^http://example\.cz$
+example.de	^http://example\.de$
+example.dj	^http://example\.dj$
+example.dk	^http://example\.dk$
+example.dm	^http://example\.dm$
+example.do	^http://example\.do$
+example.dz	^http://example\.dz$
+example.ec	^http://example\.ec$
+example.edu	^http://example\.edu$
+example.ee	^http://example\.ee$
+example.eg	^http://example\.eg$
+example.er	^http://example\.er$
+example.es	^http://example\.es$
+example.et	^http://example\.et$
+example.eu	^http://example\.eu$
+example.fi	^http://example\.fi$
+example.fj	^http://example\.fj$
+example.fk	^http://example\.fk$
+example.fm	^http://example\.fm$
+example.fo	^http://example\.fo$
+example.fr	^http://example\.fr$
+example.ga	^http://example\.ga$
+example.gb	^http://example\.gb$
+example.gd	^http://example\.gd$
+example.ge	^http://example\.ge$
+example.gf	^http://example\.gf$
+example.gg	^http://example\.gg$
+example.gh	^http://example\.gh$
+example.gi	^http://example\.gi$
+example.gl	^http://example\.gl$
+example.gm	^http://example\.gm$
+example.gn	^http://example\.gn$
+example.gov	^http://example\.gov$
+example.gp	^http://example\.gp$
+example.gq	^http://example\.gq$
+example.gr	^http://example\.gr$
+example.gs	^http://example\.gs$
+example.gt	^http://example\.gt$
+example.gu	^http://example\.gu$
+example.gw	^http://example\.gw$
+example.gy	^http://example\.gy$
+example.hk	^http://example\.hk$
+example.hm	^http://example\.hm$
+example.hn	^http://example\.hn$
+example.hr	^http://example\.hr$
+example.ht	^http://example\.ht$
+example.hu	^http://example\.hu$
+example.id	^http://example\.id$
+example.ie	^http://example\.ie$
+example.il	^http://example\.il$
+example.im	^http://example\.im$
+example.in	^http://example\.in$
+example.info	^http://example\.info$
+example.int	^http://example\.int$
+example.io	^http://example\.io$
+example.iq	^http://example\.iq$
+example.ir	^http://example\.ir$
+example.is	^http://example\.is$
+example.it	^http://example\.it$
+example.je	^http://example\.je$
+example.jm	^http://example\.jm$
+example.jo	^http://example\.jo$
+example.jobs	^http://example\.jobs$
+example.jp	^http://example\.jp$
+example.ke	^http://example\.ke$
+example.kg	^http://example\.kg$
+example.kh	^http://example\.kh$
+example.ki	^http://example\.ki$
+example.km	^http://example\.km$
+example.kn	^http://example\.kn$
+example.kp	^http://example\.kp$
+example.kr	^http://example\.kr$
+example.kw	^http://example\.kw$
+example.ky	^http://example\.ky$
+example.kz	^http://example\.kz$
+example.la	^http://example\.la$
+example.lb	^http://example\.lb$
+example.lc	^http://example\.lc$
+example.li	^http://example\.li$
+example.lk	^http://example\.lk$
+example.lr	^http://example\.lr$
+example.ls	^http://example\.ls$
+example.lt	^http://example\.lt$
+example.lu	^http://example\.lu$
+example.lv	^http://example\.lv$
+example.ly	^http://example\.ly$
+example.ma	^http://example\.ma$
+example.mc	^http://example\.mc$
+example.md	^http://example\.md$
+example.me	^http://example\.me$
+example.mg	^http://example\.mg$
+example.mh	^http://example\.mh$
+example.mil	^http://example\.mil$
+example.mk	^http://example\.mk$
+example.ml	^http://example\.ml$
+example.mm	^http://example\.mm$
+example.mn	^http://example\.mn$
+example.mo	^http://example\.mo$
+example.mobi	^http://example\.mobi$
+example.mp	^http://example\.mp$
+example.mq	^http://example\.mq$
+example.mr	^http://example\.mr$
+example.ms	^http://example\.ms$
+example.mt	^http://example\.mt$
+example.mu	^http://example\.mu$
+example.museum	^http://example\.museum$
+example.mv	^http://example\.mv$
+example.mw	^http://example\.mw$
+example.mx	^http://example\.mx$
+example.my	^http://example\.my$
+example.mz	^http://example\.mz$
+example.na	^http://example\.na$
+example.name	^http://example\.name$
+example.nc	^http://example\.nc$
+example.ne	^http://example\.ne$
+example.net	^http://example\.net$
+example.nf	^http://example\.nf$
+example.ng	^http://example\.ng$
+example.ni	^http://example\.ni$
+example.nl	^http://example\.nl$
+example.no	^http://example\.no$
+example.np	^http://example\.np$
+example.nr	^http://example\.nr$
+example.nu	^http://example\.nu$
+example.nz	^http://example\.nz$
+example.om	^http://example\.om$
+example.org	^http://example\.org$
+example.pa	^http://example\.pa$
+example.pe	^http://example\.pe$
+example.pf	^http://example\.pf$
+example.pg	^http://example\.pg$
+example.ph	^http://example\.ph$
+example.pk	^http://example\.pk$
+example.pl	^http://example\.pl$
+example.pm	^http://example\.pm$
+example.pn	^http://example\.pn$
+example.pr	^http://example\.pr$
+example.pro	^http://example\.pro$
+example.ps	^http://example\.ps$
+example.pt	^http://example\.pt$
+example.pw	^http://example\.pw$
+example.py	^http://example\.py$
+example.qa	^http://example\.qa$
+example.re	^http://example\.re$
+example.ro	^http://example\.ro$
+example.rs	^http://example\.rs$
+example.ru	^http://example\.ru$
+example.rw	^http://example\.rw$
+example.sa	^http://example\.sa$
+example.sb	^http://example\.sb$
+example.sc	^http://example\.sc$
+example.sd	^http://example\.sd$
+example.se	^http://example\.se$
+example.sg	^http://example\.sg$
+example.sh	^http://example\.sh$
+example.si	^http://example\.si$
+example.sj	^http://example\.sj$
+example.sk	^http://example\.sk$
+example.sl	^http://example\.sl$
+example.sm	^http://example\.sm$
+example.sn	^http://example\.sn$
+example.so	^http://example\.so$
+example.sr	^http://example\.sr$
+example.st	^http://example\.st$
+example.su	^http://example\.su$
+example.sv	^http://example\.sv$
+example.sy	^http://example\.sy$
+example.sz	^http://example\.sz$
+example.tc	^http://example\.tc$
+example.td	^http://example\.td$
+example.tel	^http://example\.tel$
+example.tf	^http://example\.tf$
+example.tg	^http://example\.tg$
+example.th	^http://example\.th$
+example.tj	^http://example\.tj$
+example.tk	^http://example\.tk$
+example.tl	^http://example\.tl$
+example.tm	^http://example\.tm$
+example.tn	^http://example\.tn$
+example.to	^http://example\.to$
+example.tp	!^http://example\.tp$
+example.tr	^http://example\.tr$
+example.travel	^http://example\.travel$
+example.tt	^http://example\.tt$
+example.tv	^http://example\.tv$
+example.tw	^http://example\.tw$
+example.tz	^http://example\.tz$
+example.ua	^http://example\.ua$
+example.ug	^http://example\.ug$
+example.uk	^http://example\.uk$
+example.um	!^http://example\.um$
+example.us	^http://example\.us$
+example.uy	^http://example\.uy$
+example.uz	^http://example\.uz$
+example.va	^http://example\.va$
+example.vc	^http://example\.vc$
+example.ve	^http://example\.ve$
+example.vg	^http://example\.vg$
+example.vi	^http://example\.vi$
+example.vn	^http://example\.vn$
+example.vu	^http://example\.vu$
+example.wf	^http://example\.wf$
+example.ws	^http://example\.ws$
+example.ye	^http://example\.ye$
+example.yt	^http://example\.yt$
+example.yu	!^http://example\.yu$
+example.za	^http://example\.za$
+example.zm	^http://example\.zm$
+example.zw	^http://example\.zw$
 
 # with www. prefix tests a different table of TLDs
 
-www.example.foo	!^http://www.example.foo$
-www.example.zzf	!^http://www.example.zzf$
+www.example.foo	^http://www\.example\.foo$
+www.example.zzf	!^http://www\.example\.zzf$
 
-www.example.ac	^http://www.example.ac$
-www.example.ad	^http://www.example.ad$
-www.example.ae	^http://www.example.ae$
-www.example.aero	^http://www.example.aero$
-www.example.af	^http://www.example.af$
-www.example.ag	^http://www.example.ag$
-www.example.ai	^http://www.example.ai$
-www.example.al	^http://www.example.al$
-www.example.am	^http://www.example.am$
-www.example.an	^http://www.example.an$
-www.example.ao	^http://www.example.ao$
-www.example.aq	^http://www.example.aq$
-www.example.ar	^http://www.example.ar$
-www.example.arpa	^http://www.example.arpa$
-www.example.as	^http://www.example.as$
-www.example.asia	^http://www.example.asia$
-www.example.at	^http://www.example.at$
-www.example.au	^http://www.example.au$
-www.example.aw	^http://www.example.aw$
-www.example.ax	^http://www.example.ax$
-www.example.az	^http://www.example.az$
-www.example.ba	^http://www.example.ba$
-www.example.bb	^http://www.example.bb$
-www.example.bd	^http://www.example.bd$
-www.example.be	^http://www.example.be$
-www.example.bf	^http://www.example.bf$
-www.example.bg	^http://www.example.bg$
-www.example.bh	^http://www.example.bh$
-www.example.bi	^http://www.example.bi$
-www.example.biz	^http://www.example.biz$
-www.example.bj	^http://www.example.bj$
-www.example.bm	^http://www.example.bm$
-www.example.bn	^http://www.example.bn$
-www.example.bo	^http://www.example.bo$
-www.example.br	^http://www.example.br$
-www.example.bs	^http://www.example.bs$
-www.example.bt	^http://www.example.bt$
-www.example.bv	!^http://www.example.bv$
-www.example.bw	^http://www.example.bw$
-www.example.by	^http://www.example.by$
-www.example.bz	^http://www.example.bz$
-www.example.ca	^http://www.example.ca$
-www.example.cat	^http://www.example.cat$
-www.example.cc	^http://www.example.cc$
-www.example.cd	^http://www.example.cd$
-www.example.cf	^http://www.example.cf$
-www.example.cg	^http://www.example.cg$
-www.example.ch	^http://www.example.ch$
-www.example.ci	^http://www.example.ci$
-www.example.ck	^http://www.example.ck$
-www.example.cl	^http://www.example.cl$
-www.example.cm	^http://www.example.cm$
-www.example.cn	^http://www.example.cn$
-www.example.co	^http://www.example.co$
-www.example.com	^http://www.example.com$
-www.example.coop	^http://www.example.coop$
-www.example.cr	^http://www.example.cr$
-www.example.cu	^http://www.example.cu$
-www.example.cv	^http://www.example.cv$
-www.example.cx	^http://www.example.cx$
-www.example.cy	^http://www.example.cy$
-www.example.cz	^http://www.example.cz$
-www.example.de	^http://www.example.de$
-www.example.dj	^http://www.example.dj$
-www.example.dk	^http://www.example.dk$
-www.example.dm	^http://www.example.dm$
-www.example.do	^http://www.example.do$
-www.example.dz	^http://www.example.dz$
-www.example.ec	^http://www.example.ec$
-www.example.edu	^http://www.example.edu$
-www.example.ee	^http://www.example.ee$
-www.example.eg	^http://www.example.eg$
-www.example.er	^http://www.example.er$
-www.example.es	^http://www.example.es$
-www.example.et	^http://www.example.et$
-www.example.eu	^http://www.example.eu$
-www.example.fi	^http://www.example.fi$
-www.example.fj	^http://www.example.fj$
-www.example.fk	^http://www.example.fk$
-www.example.fm	^http://www.example.fm$
-www.example.fo	^http://www.example.fo$
-www.example.fr	^http://www.example.fr$
-www.example.ga	^http://www.example.ga$
-www.example.gb	!^http://www.example.gb$
-www.example.gd	^http://www.example.gd$
-www.example.ge	^http://www.example.ge$
-www.example.gf	^http://www.example.gf$
-www.example.gg	^http://www.example.gg$
-www.example.gh	^http://www.example.gh$
-www.example.gi	^http://www.example.gi$
-www.example.gl	^http://www.example.gl$
-www.example.gm	^http://www.example.gm$
-www.example.gn	^http://www.example.gn$
-www.example.gov	^http://www.example.gov$
-www.example.gp	^http://www.example.gp$
-www.example.gq	^http://www.example.gq$
-www.example.gr	^http://www.example.gr$
-www.example.gs	^http://www.example.gs$
-www.example.gt	^http://www.example.gt$
-www.example.gu	^http://www.example.gu$
-www.example.gw	^http://www.example.gw$
-www.example.gy	^http://www.example.gy$
-www.example.hk	^http://www.example.hk$
-www.example.hm	^http://www.example.hm$
-www.example.hn	^http://www.example.hn$
-www.example.hr	^http://www.example.hr$
-www.example.ht	^http://www.example.ht$
-www.example.hu	^http://www.example.hu$
-www.example.id	^http://www.example.id$
-www.example.ie	^http://www.example.ie$
-www.example.il	^http://www.example.il$
-www.example.im	^http://www.example.im$
-www.example.in	^http://www.example.in$
-www.example.info	^http://www.example.info$
-www.example.int	^http://www.example.int$
-www.example.io	^http://www.example.io$
-www.example.iq	^http://www.example.iq$
-www.example.ir	^http://www.example.ir$
-www.example.is	^http://www.example.is$
-www.example.it	^http://www.example.it$
-www.example.je	^http://www.example.je$
-www.example.jm	^http://www.example.jm$
-www.example.jo	^http://www.example.jo$
-www.example.jobs	^http://www.example.jobs$
-www.example.jp	^http://www.example.jp$
-www.example.ke	^http://www.example.ke$
-www.example.kg	^http://www.example.kg$
-www.example.kh	^http://www.example.kh$
-www.example.ki	^http://www.example.ki$
-www.example.km	^http://www.example.km$
-www.example.kn	^http://www.example.kn$
-www.example.kp	^http://www.example.kp$
-www.example.kr	^http://www.example.kr$
-www.example.kw	^http://www.example.kw$
-www.example.ky	^http://www.example.ky$
-www.example.kz	^http://www.example.kz$
-www.example.la	^http://www.example.la$
-www.example.lb	^http://www.example.lb$
-www.example.lc	^http://www.example.lc$
-www.example.li	^http://www.example.li$
-www.example.lk	^http://www.example.lk$
-www.example.lr	^http://www.example.lr$
-www.example.ls	^http://www.example.ls$
-www.example.lt	^http://www.example.lt$
-www.example.lu	^http://www.example.lu$
-www.example.lv	^http://www.example.lv$
-www.example.ly	^http://www.example.ly$
-www.example.ma	^http://www.example.ma$
-www.example.mc	^http://www.example.mc$
-www.example.md	^http://www.example.md$
-www.example.me	^http://www.example.me$
-www.example.mg	^http://www.example.mg$
-www.example.mh	^http://www.example.mh$
-www.example.mil	^http://www.example.mil$
-www.example.mk	^http://www.example.mk$
-www.example.ml	^http://www.example.ml$
-www.example.mm	^http://www.example.mm$
-www.example.mn	^http://www.example.mn$
-www.example.mo	^http://www.example.mo$
-www.example.mobi	^http://www.example.mobi$
-www.example.mp	^http://www.example.mp$
-www.example.mq	^http://www.example.mq$
-www.example.mr	^http://www.example.mr$
-www.example.ms	^http://www.example.ms$
-www.example.mt	^http://www.example.mt$
-www.example.mu	^http://www.example.mu$
-www.example.museum	^http://www.example.museum$
-www.example.mv	^http://www.example.mv$
-www.example.mw	^http://www.example.mw$
-www.example.mx	^http://www.example.mx$
-www.example.my	^http://www.example.my$
-www.example.mz	^http://www.example.mz$
-www.example.na	^http://www.example.na$
-www.example.name	^http://www.example.name$
-www.example.nc	^http://www.example.nc$
-www.example.ne	^http://www.example.ne$
-www.example.net	^http://www.example.net$
-www.example.nf	^http://www.example.nf$
-www.example.ng	^http://www.example.ng$
-www.example.ni	^http://www.example.ni$
-www.example.nl	^http://www.example.nl$
-www.example.no	^http://www.example.no$
-www.example.np	^http://www.example.np$
-www.example.nr	^http://www.example.nr$
-www.example.nu	^http://www.example.nu$
-www.example.nz	^http://www.example.nz$
-www.example.om	^http://www.example.om$
-www.example.org	^http://www.example.org$
-www.example.pa	^http://www.example.pa$
-www.example.pe	^http://www.example.pe$
-www.example.pf	^http://www.example.pf$
-www.example.pg	^http://www.example.pg$
-www.example.ph	^http://www.example.ph$
-www.example.pk	^http://www.example.pk$
-www.example.pl	^http://www.example.pl$
-www.example.pm	^http://www.example.pm$
-www.example.pn	^http://www.example.pn$
-www.example.pr	^http://www.example.pr$
-www.example.pro	^http://www.example.pro$
-www.example.ps	^http://www.example.ps$
-www.example.pt	^http://www.example.pt$
-www.example.pw	^http://www.example.pw$
-www.example.py	^http://www.example.py$
-www.example.qa	^http://www.example.qa$
-www.example.re	^http://www.example.re$
-www.example.ro	^http://www.example.ro$
-www.example.rs	^http://www.example.rs$
-www.example.ru	^http://www.example.ru$
-www.example.rw	^http://www.example.rw$
-www.example.sa	^http://www.example.sa$
-www.example.sb	^http://www.example.sb$
-www.example.sc	^http://www.example.sc$
-www.example.sd	^http://www.example.sd$
-www.example.se	^http://www.example.se$
-www.example.sg	^http://www.example.sg$
-www.example.sh	^http://www.example.sh$
-www.example.si	^http://www.example.si$
-www.example.sj	!^http://www.example.sj$
-www.example.sk	^http://www.example.sk$
-www.example.sl	^http://www.example.sl$
-www.example.sm	^http://www.example.sm$
-www.example.sn	^http://www.example.sn$
-www.example.so	^http://www.example.so$
-www.example.sr	^http://www.example.sr$
-www.example.st	^http://www.example.st$
-www.example.su	^http://www.example.su$
-www.example.sv	^http://www.example.sv$
-www.example.sy	^http://www.example.sy$
-www.example.sz	^http://www.example.sz$
-www.example.tc	^http://www.example.tc$
-www.example.td	^http://www.example.td$
-www.example.tel	^http://www.example.tel$
-www.example.tf	^http://www.example.tf$
-www.example.tg	^http://www.example.tg$
-www.example.th	^http://www.example.th$
-www.example.tj	^http://www.example.tj$
-www.example.tk	^http://www.example.tk$
-www.example.tl	^http://www.example.tl$
-www.example.tm	^http://www.example.tm$
-www.example.tn	^http://www.example.tn$
-www.example.to	^http://www.example.to$
-www.example.tp	^http://www.example.tp$
-www.example.tr	^http://www.example.tr$
-www.example.travel	^http://www.example.travel$
-www.example.tt	^http://www.example.tt$
-www.example.tv	^http://www.example.tv$
-www.example.tw	^http://www.example.tw$
-www.example.tz	^http://www.example.tz$
-www.example.ua	^http://www.example.ua$
-www.example.ug	^http://www.example.ug$
-www.example.uk	^http://www.example.uk$
-www.example.um	!^http://www.example.um$
-www.example.us	^http://www.example.us$
-www.example.uy	^http://www.example.uy$
-www.example.uz	^http://www.example.uz$
-www.example.va	^http://www.example.va$
-www.example.vc	^http://www.example.vc$
-www.example.ve	^http://www.example.ve$
-www.example.vg	^http://www.example.vg$
-www.example.vi	^http://www.example.vi$
-www.example.vn	^http://www.example.vn$
-www.example.vu	^http://www.example.vu$
-www.example.wf	^http://www.example.wf$
-www.example.ws	^http://www.example.ws$
-www.example.ye	^http://www.example.ye$
-www.example.yt	^http://www.example.yt$
-www.example.yu	!^http://www.example.yu$
-www.example.za	^http://www.example.za$
-www.example.zm	^http://www.example.zm$
-www.example.zw	^http://www.example.zw$
+www.example.ac	^http://www\.example\.ac$
+www.example.ad	^http://www\.example\.ad$
+www.example.ae	^http://www\.example\.ae$
+www.example.aero	^http://www\.example\.aero$
+www.example.af	^http://www\.example\.af$
+www.example.ag	^http://www\.example\.ag$
+www.example.ai	^http://www\.example\.ai$
+www.example.al	^http://www\.example\.al$
+www.example.am	^http://www\.example\.am$
+www.example.an	!^http://www\.example\.an$
+www.example.ao	^http://www\.example\.ao$
+www.example.aq	^http://www\.example\.aq$
+www.example.ar	^http://www\.example\.ar$
+www.example.arpa	^http://www\.example\.arpa$
+www.example.as	^http://www\.example\.as$
+www.example.asia	^http://www\.example\.asia$
+www.example.at	^http://www\.example\.at$
+www.example.au	^http://www\.example\.au$
+www.example.aw	^http://www\.example\.aw$
+www.example.ax	^http://www\.example\.ax$
+www.example.az	^http://www\.example\.az$
+www.example.ba	^http://www\.example\.ba$
+www.example.bb	^http://www\.example\.bb$
+www.example.bd	^http://www\.example\.bd$
+www.example.be	^http://www\.example\.be$
+www.example.bf	^http://www\.example\.bf$
+www.example.bg	^http://www\.example\.bg$
+www.example.bh	^http://www\.example\.bh$
+www.example.bi	^http://www\.example\.bi$
+www.example.biz	^http://www\.example\.biz$
+www.example.bj	^http://www\.example\.bj$
+www.example.bm	^http://www\.example\.bm$
+www.example.bn	^http://www\.example\.bn$
+www.example.bo	^http://www\.example\.bo$
+www.example.br	^http://www\.example\.br$
+www.example.bs	^http://www\.example\.bs$
+www.example.bt	^http://www\.example\.bt$
+www.example.bv	^http://www\.example\.bv$
+www.example.bw	^http://www\.example\.bw$
+www.example.by	^http://www\.example\.by$
+www.example.bz	^http://www\.example\.bz$
+www.example.ca	^http://www\.example\.ca$
+www.example.cat	^http://www\.example\.cat$
+www.example.cc	^http://www\.example\.cc$
+www.example.cd	^http://www\.example\.cd$
+www.example.cf	^http://www\.example\.cf$
+www.example.cg	^http://www\.example\.cg$
+www.example.ch	^http://www\.example\.ch$
+www.example.ci	^http://www\.example\.ci$
+www.example.ck	^http://www\.example\.ck$
+www.example.cl	^http://www\.example\.cl$
+www.example.cm	^http://www\.example\.cm$
+www.example.cn	^http://www\.example\.cn$
+www.example.co	^http://www\.example\.co$
+www.example.com	^http://www\.example\.com$
+www.example.coop	^http://www\.example\.coop$
+www.example.cr	^http://www\.example\.cr$
+www.example.cu	^http://www\.example\.cu$
+www.example.cv	^http://www\.example\.cv$
+www.example.cx	^http://www\.example\.cx$
+www.example.cy	^http://www\.example\.cy$
+www.example.cz	^http://www\.example\.cz$
+www.example.de	^http://www\.example\.de$
+www.example.dj	^http://www\.example\.dj$
+www.example.dk	^http://www\.example\.dk$
+www.example.dm	^http://www\.example\.dm$
+www.example.do	^http://www\.example\.do$
+www.example.dz	^http://www\.example\.dz$
+www.example.ec	^http://www\.example\.ec$
+www.example.edu	^http://www\.example\.edu$
+www.example.ee	^http://www\.example\.ee$
+www.example.eg	^http://www\.example\.eg$
+www.example.er	^http://www\.example\.er$
+www.example.es	^http://www\.example\.es$
+www.example.et	^http://www\.example\.et$
+www.example.eu	^http://www\.example\.eu$
+www.example.fi	^http://www\.example\.fi$
+www.example.fj	^http://www\.example\.fj$
+www.example.fk	^http://www\.example\.fk$
+www.example.fm	^http://www\.example\.fm$
+www.example.fo	^http://www\.example\.fo$
+www.example.fr	^http://www\.example\.fr$
+www.example.ga	^http://www\.example\.ga$
+www.example.gb	^http://www\.example\.gb$
+www.example.gd	^http://www\.example\.gd$
+www.example.ge	^http://www\.example\.ge$
+www.example.gf	^http://www\.example\.gf$
+www.example.gg	^http://www\.example\.gg$
+www.example.gh	^http://www\.example\.gh$
+www.example.gi	^http://www\.example\.gi$
+www.example.gl	^http://www\.example\.gl$
+www.example.gm	^http://www\.example\.gm$
+www.example.gn	^http://www\.example\.gn$
+www.example.gov	^http://www\.example\.gov$
+www.example.gp	^http://www\.example\.gp$
+www.example.gq	^http://www\.example\.gq$
+www.example.gr	^http://www\.example\.gr$
+www.example.gs	^http://www\.example\.gs$
+www.example.gt	^http://www\.example\.gt$
+www.example.gu	^http://www\.example\.gu$
+www.example.gw	^http://www\.example\.gw$
+www.example.gy	^http://www\.example\.gy$
+www.example.hk	^http://www\.example\.hk$
+www.example.hm	^http://www\.example\.hm$
+www.example.hn	^http://www\.example\.hn$
+www.example.hr	^http://www\.example\.hr$
+www.example.ht	^http://www\.example\.ht$
+www.example.hu	^http://www\.example\.hu$
+www.example.id	^http://www\.example\.id$
+www.example.ie	^http://www\.example\.ie$
+www.example.il	^http://www\.example\.il$
+www.example.im	^http://www\.example\.im$
+www.example.in	^http://www\.example\.in$
+www.example.info	^http://www\.example\.info$
+www.example.int	^http://www\.example\.int$
+www.example.io	^http://www\.example\.io$
+www.example.iq	^http://www\.example\.iq$
+www.example.ir	^http://www\.example\.ir$
+www.example.is	^http://www\.example\.is$
+www.example.it	^http://www\.example\.it$
+www.example.je	^http://www\.example\.je$
+www.example.jm	^http://www\.example\.jm$
+www.example.jo	^http://www\.example\.jo$
+www.example.jobs	^http://www\.example\.jobs$
+www.example.jp	^http://www\.example\.jp$
+www.example.ke	^http://www\.example\.ke$
+www.example.kg	^http://www\.example\.kg$
+www.example.kh	^http://www\.example\.kh$
+www.example.ki	^http://www\.example\.ki$
+www.example.km	^http://www\.example\.km$
+www.example.kn	^http://www\.example\.kn$
+www.example.kp	^http://www\.example\.kp$
+www.example.kr	^http://www\.example\.kr$
+www.example.kw	^http://www\.example\.kw$
+www.example.ky	^http://www\.example\.ky$
+www.example.kz	^http://www\.example\.kz$
+www.example.la	^http://www\.example\.la$
+www.example.lb	^http://www\.example\.lb$
+www.example.lc	^http://www\.example\.lc$
+www.example.li	^http://www\.example\.li$
+www.example.lk	^http://www\.example\.lk$
+www.example.lr	^http://www\.example\.lr$
+www.example.ls	^http://www\.example\.ls$
+www.example.lt	^http://www\.example\.lt$
+www.example.lu	^http://www\.example\.lu$
+www.example.lv	^http://www\.example\.lv$
+www.example.ly	^http://www\.example\.ly$
+www.example.ma	^http://www\.example\.ma$
+www.example.mc	^http://www\.example\.mc$
+www.example.md	^http://www\.example\.md$
+www.example.me	^http://www\.example\.me$
+www.example.mg	^http://www\.example\.mg$
+www.example.mh	^http://www\.example\.mh$
+www.example.mil	^http://www\.example\.mil$
+www.example.mk	^http://www\.example\.mk$
+www.example.ml	^http://www\.example\.ml$
+www.example.mm	^http://www\.example\.mm$
+www.example.mn	^http://www\.example\.mn$
+www.example.mo	^http://www\.example\.mo$
+www.example.mobi	^http://www\.example\.mobi$
+www.example.mp	^http://www\.example\.mp$
+www.example.mq	^http://www\.example\.mq$
+www.example.mr	^http://www\.example\.mr$
+www.example.ms	^http://www\.example\.ms$
+www.example.mt	^http://www\.example\.mt$
+www.example.mu	^http://www\.example\.mu$
+www.example.museum	^http://www\.example\.museum$
+www.example.mv	^http://www\.example\.mv$
+www.example.mw	^http://www\.example\.mw$
+www.example.mx	^http://www\.example\.mx$
+www.example.my	^http://www\.example\.my$
+www.example.mz	^http://www\.example\.mz$
+www.example.na	^http://www\.example\.na$
+www.example.name	^http://www\.example\.name$
+www.example.nc	^http://www\.example\.nc$
+www.example.ne	^http://www\.example\.ne$
+www.example.net	^http://www\.example\.net$
+www.example.nf	^http://www\.example\.nf$
+www.example.ng	^http://www\.example\.ng$
+www.example.ni	^http://www\.example\.ni$
+www.example.nl	^http://www\.example\.nl$
+www.example.no	^http://www\.example\.no$
+www.example.np	^http://www\.example\.np$
+www.example.nr	^http://www\.example\.nr$
+www.example.nu	^http://www\.example\.nu$
+www.example.nz	^http://www\.example\.nz$
+www.example.om	^http://www\.example\.om$
+www.example.org	^http://www\.example\.org$
+www.example.pa	^http://www\.example\.pa$
+www.example.pe	^http://www\.example\.pe$
+www.example.pf	^http://www\.example\.pf$
+www.example.pg	^http://www\.example\.pg$
+www.example.ph	^http://www\.example\.ph$
+www.example.pk	^http://www\.example\.pk$
+www.example.pl	^http://www\.example\.pl$
+www.example.pm	^http://www\.example\.pm$
+www.example.pn	^http://www\.example\.pn$
+www.example.pr	^http://www\.example\.pr$
+www.example.pro	^http://www\.example\.pro$
+www.example.ps	^http://www\.example\.ps$
+www.example.pt	^http://www\.example\.pt$
+www.example.pw	^http://www\.example\.pw$
+www.example.py	^http://www\.example\.py$
+www.example.qa	^http://www\.example\.qa$
+www.example.re	^http://www\.example\.re$
+www.example.ro	^http://www\.example\.ro$
+www.example.rs	^http://www\.example\.rs$
+www.example.ru	^http://www\.example\.ru$
+www.example.rw	^http://www\.example\.rw$
+www.example.sa	^http://www\.example\.sa$
+www.example.sb	^http://www\.example\.sb$
+www.example.sc	^http://www\.example\.sc$
+www.example.sd	^http://www\.example\.sd$
+www.example.se	^http://www\.example\.se$
+www.example.sg	^http://www\.example\.sg$
+www.example.sh	^http://www\.example\.sh$
+www.example.si	^http://www\.example\.si$
+www.example.sj	^http://www\.example\.sj$
+www.example.sk	^http://www\.example\.sk$
+www.example.sl	^http://www\.example\.sl$
+www.example.sm	^http://www\.example\.sm$
+www.example.sn	^http://www\.example\.sn$
+www.example.so	^http://www\.example\.so$
+www.example.sr	^http://www\.example\.sr$
+www.example.st	^http://www\.example\.st$
+www.example.su	^http://www\.example\.su$
+www.example.sv	^http://www\.example\.sv$
+www.example.sy	^http://www\.example\.sy$
+www.example.sz	^http://www\.example\.sz$
+www.example.tc	^http://www\.example\.tc$
+www.example.td	^http://www\.example\.td$
+www.example.tel	^http://www\.example\.tel$
+www.example.tf	^http://www\.example\.tf$
+www.example.tg	^http://www\.example\.tg$
+www.example.th	^http://www\.example\.th$
+www.example.tj	^http://www\.example\.tj$
+www.example.tk	^http://www\.example\.tk$
+www.example.tl	^http://www\.example\.tl$
+www.example.tm	^http://www\.example\.tm$
+www.example.tn	^http://www\.example\.tn$
+www.example.to	^http://www\.example\.to$
+www.example.tp	!^http://www\.example\.tp$
+www.example.tr	^http://www\.example\.tr$
+www.example.travel	^http://www\.example\.travel$
+www.example.tt	^http://www\.example\.tt$
+www.example.tv	^http://www\.example\.tv$
+www.example.tw	^http://www\.example\.tw$
+www.example.tz	^http://www\.example\.tz$
+www.example.ua	^http://www\.example\.ua$
+www.example.ug	^http://www\.example\.ug$
+www.example.uk	^http://www\.example\.uk$
+www.example.um	!^http://www\.example\.um$
+www.example.us	^http://www\.example\.us$
+www.example.uy	^http://www\.example\.uy$
+www.example.uz	^http://www\.example\.uz$
+www.example.va	^http://www\.example\.va$
+www.example.vc	^http://www\.example\.vc$
+www.example.ve	^http://www\.example\.ve$
+www.example.vg	^http://www\.example\.vg$
+www.example.vi	^http://www\.example\.vi$
+www.example.vn	^http://www\.example\.vn$
+www.example.vu	^http://www\.example\.vu$
+www.example.wf	^http://www\.example\.wf$
+www.example.ws	^http://www\.example\.ws$
+www.example.ye	^http://www\.example\.ye$
+www.example.yt	^http://www\.example\.yt$
+www.example.yu	!^http://www\.example\.yu$
+www.example.za	^http://www\.example\.za$
+www.example.zm	^http://www\.example\.zm$
+www.example.zw	^http://www\.example\.zw$
diff -Nru spamassassin-3.4.0/t/utf8.t spamassassin-3.4.2/t/utf8.t
--- spamassassin-3.4.0/t/utf8.t	2014-02-07 03:36:38.000000000 -0500
+++ spamassassin-3.4.2/t/utf8.t	2018-09-13 21:27:54.000000000 -0400
@@ -2,7 +2,7 @@
 
 use lib '.'; use lib 't';
 use SATest; sa_t_init("utf8");
-use Test; BEGIN { plan tests => 4 };
+use Test::More tests => 4;
 
 # ---------------------------------------------------------------------------
 
diff -Nru spamassassin-3.4.0/t/util_wrap.t spamassassin-3.4.2/t/util_wrap.t
--- spamassassin-3.4.0/t/util_wrap.t	2014-02-07 03:36:38.000000000 -0500
+++ spamassassin-3.4.2/t/util_wrap.t	2018-09-13 21:27:53.000000000 -0400
@@ -18,8 +18,7 @@
 
 use lib '.'; use lib 't';
 use SATest; sa_t_init("util_wrap");
-use Test; BEGIN { plan tests => 5 };
-
+use Test::More tests => 5;
 
 use strict;
 require Mail::SpamAssassin::Util;
@@ -97,7 +96,7 @@
 
   }, q{
     
-    X-Spam-Relays-External!![ ip=209.226.175.110 rdns=tomts43-srv.bellnexxia.net\n\thelo=tomts43-srv.bellnexxia.net by=dogma.boxhost.net ident= envfrom= intl=0\n\tid=0A3C83100DF auth= ] [ ip=70.51.181.195 rdns=\n\thelo=bas1-montreal45-1177793987.dsl.bell.ca by=tomts43-srv.bellnexxia.net\n\tident= envfrom= intl=0\n\tid=20070103201045.LPQE11361.tomts43-srv.bellnexxia.net@bas1-montreal45-1177793987.dsl.bell.ca\n\tauth= ]
+    X-Spam-Relays-External!![ ip=209.226.175.110 rdns=tomts43-srv.bellnexxia.net\n\thelo=tomts43-srv.bellnexxia.net by=dogma.boxhost.net ident= envfrom=\n\tintl=0 id=0A3C83100DF auth= ] [ ip=70.51.181.195 rdns=\n\thelo=bas1-montreal45-1177793987.dsl.bell.ca\n\tby=tomts43-srv.bellnexxia.net ident= envfrom= intl=0\n\tid=20070103201045.LPQE11361.tomts43-srv.bellnexxia.net@bas1-montreal45-1177793987.dsl.bell.ca\n\tauth= ]
 
   },
 
diff -Nru spamassassin-3.4.0/t/whitelist_addrs.t spamassassin-3.4.2/t/whitelist_addrs.t
--- spamassassin-3.4.0/t/whitelist_addrs.t	2014-02-07 03:36:38.000000000 -0500
+++ spamassassin-3.4.2/t/whitelist_addrs.t	2018-09-13 21:27:53.000000000 -0400
@@ -4,16 +4,9 @@
 use SATest; sa_t_init("whitelist_addrs");
 use IO::File;
 
-use constant HAS_MODULES => eval {
-  require DB_File;
-};
+use constant HAS_DB_FILE => eval { require DB_File };
 
-use constant TEST_ENABLED => conf_bool('run_long_tests');
-
-use constant DO_RUN => TEST_ENABLED && HAS_MODULES;
-
-use Test;
-BEGIN { 
+BEGIN {
   if (-e 't/test_dir') {
     chdir 't';
   }
@@ -21,11 +14,12 @@
   if (-e 'test_dir') {
     unshift(@INC, '../blib/lib');
   }
+}
 
-  plan tests => (DO_RUN ? 35 : 0);
- };
-
-exit unless DO_RUN;
+use Test::More;
+plan skip_all => 'Long running tests disabled' unless conf_bool('run_long_tests');
+plan skip_all => 'Need DB_File for this test'  unless HAS_DB_FILE;
+plan tests => 35;
 
 # ---------------------------------------------------------------------------
 
diff -Nru spamassassin-3.4.0/t/whitelist_from.t spamassassin-3.4.2/t/whitelist_from.t
--- spamassassin-3.4.0/t/whitelist_from.t	2014-02-07 03:36:38.000000000 -0500
+++ spamassassin-3.4.2/t/whitelist_from.t	2018-09-13 21:27:54.000000000 -0400
@@ -3,11 +3,9 @@
 use lib '.'; use lib 't';
 use SATest; sa_t_init("whitelist_from");
 
-use constant TEST_ENABLED => conf_bool('run_long_tests');
-
-use Test;
-BEGIN { plan tests => TEST_ENABLED ? 32 : 0 };
-exit unless TEST_ENABLED;
+use Test::More;
+plan skip_all => 'Long running tests disabled' unless conf_bool('run_long_tests');
+plan tests => 32;
 
 # ---------------------------------------------------------------------------
 
diff -Nru spamassassin-3.4.0/t/whitelist_subject.t spamassassin-3.4.2/t/whitelist_subject.t
--- spamassassin-3.4.0/t/whitelist_subject.t	2014-02-07 03:36:38.000000000 -0500
+++ spamassassin-3.4.2/t/whitelist_subject.t	2018-09-13 21:27:52.000000000 -0400
@@ -2,7 +2,7 @@
 
 use lib '.'; use lib 't';
 use SATest; sa_t_init("whitelist_subject");
-use Test; BEGIN { plan tests => 4 };
+use Test::More tests => 4;
 
 # ---------------------------------------------------------------------------
 
diff -Nru spamassassin-3.4.0/t/whitelist_to.t spamassassin-3.4.2/t/whitelist_to.t
--- spamassassin-3.4.0/t/whitelist_to.t	2014-02-07 03:36:38.000000000 -0500
+++ spamassassin-3.4.2/t/whitelist_to.t	2018-09-13 21:27:54.000000000 -0400
@@ -2,7 +2,7 @@
 
 use lib '.'; use lib 't';
 use SATest; sa_t_init("whitelist_to");
-use Test; BEGIN { plan tests => 1 };
+use Test::More tests => 1;
 
 # ---------------------------------------------------------------------------
 
diff -Nru spamassassin-3.4.0/t/zz_cleanup.t spamassassin-3.4.2/t/zz_cleanup.t
--- spamassassin-3.4.0/t/zz_cleanup.t	2014-02-07 03:36:38.000000000 -0500
+++ spamassassin-3.4.2/t/zz_cleanup.t	2018-09-13 21:27:54.000000000 -0400
@@ -2,7 +2,7 @@
 
 use lib '.'; use lib 't';
 use SATest; sa_t_init("zz_cleanup");
-use Test; BEGIN { plan tests => 1 };
+use Test::More tests => 1;
 
 use File::Path;
 
diff -Nru spamassassin-3.4.0/UPGRADE spamassassin-3.4.2/UPGRADE
--- spamassassin-3.4.0/UPGRADE	2014-02-07 03:36:38.000000000 -0500
+++ spamassassin-3.4.2/UPGRADE	2018-09-13 21:27:56.000000000 -0400
@@ -1,3 +1,207 @@
+Note for Users Upgrading to SpamAssassin 3.4.2
+----------------------------------------------
+
+- We now support SHA-512 and SHA-256 signatures for our rules updates.
+
+- We may stop producing SHA-1 signatures in the near future so upgrading
+to 3.4.2 is important.  sa-update no longer uses these signatures.
+
+See https://bz.apache.org/SpamAssassin/show_bug.cgi?id=7614
+
+New plugins
+-----------
+
+There are four new plugins added with this release:
+
+  Mail::SpamAssassin::Plugin::HashBL
+
+The HashBL plugin is the interface to The Email Blocklist (EBL).
+The EBL is intended to filter spam that is sent from IP addresses 
+and domains that cannot be blocked without causing significant 
+numbers of false positives.
+
+  Mail::SpamAssassin::Plugin::ResourceLimits
+
+This plugin leverages BSD::Resource to assure your spamd child processes
+do not exceed specified CPU or memory limit. If this happens, the child
+process will die. See the BSD::Resource for more details.
+
+  Mail::SpamAssassin::Plugin::FromNameSpoof
+
+This plugin allows for detection of the From:name field being used to mislead 
+recipients into thinking an email is from another address.  The man page 
+includes examples and we expect to put test rules for this plugin into 
+rulesrc soon!
+
+  Mail::SpamAssassin::Plugin::Phishing
+
+This plugin finds uris used in phishing campaigns detected by
+OpenPhish (https://openphish.com) or PhishTank (https://phishtank.com) feeds.
+
+These plugins are disabled by default. To enable, uncomment
+the loadplugin configuration options in file v342.pre, or add it to
+some local .pre file such as local.pre .
+
+Notable changes
+---------------
+
+For security reasons SSLv3 support has been removed from spamc(1).
+
+GeoIP2 support has been added to RelayCountry and URILocalBL plugins due
+to GeoIP legacy api deprecations.
+
+New configuration options
+-------------------------
+
+A new template tag _DKIMSELECTOR_ that maps to the DKIM selector (the 's' tag) 
+from valid signatures has been added.
+
+A 'uri_block_cont' option to URILocalBL plugin to score uris per continent has been added.
+Possible continent codes are:
+af, as, eu, na, oc, sa for Africa, Asia, Europe, North America, 
+Oceania and South America.
+
+The 'country_db_type' and 'country_db_path' options has been added to be able 
+to choose in RelayCountry plugin between GeoIP legacy 
+(discontinued from 04/01/2018), GeoIP2, IP::Country::Fast 
+and IP::Country::DB_File.
+GeoIP legacy is still the default option but it will be deprecated 
+in future releases.
+
+A config option 'uri_country_db_path' has been added to be able to choose 
+in URILocalBL plugin between GeoIP legacy and new GeoIP2 api.
+
+A config option 'resource_limit_cpu' (default: 0 or no limit) has been added
+to configure how many cpu cycles are allowed on a child process before it dies.
+
+A config option 'resource_limit_mem' (default: 0 or no limit) has been added
+to configure the maximum number of bytes of memory allowed both for 
+(virtual) address space bytes and resident set size.
+
+A new config option 'report_wrap_width' (default: 70) has been added
+to set the wrap width for description lines in the X-Spam-Report header.
+
+Notable Internal changes
+------------------------
+
+SpamAssassin can cope with new Net::DNS module versions.
+
+The "bytes" pragma has been remove from both core modules and plugins for
+better utf-8 compatibility, there has been also some other utf-8 related fixes.
+
+The spamc(1) client can now be build against OpenSSL 1.1.0.
+
+The test framework has been switched to Test::More module.
+
+Other updates
+-------------
+
+A list of top-level domains in registrar boundaries was updated.
+
+
+Note for Users Upgrading to SpamAssassin 3.4.1
+----------------------------------------------
+
+- The TxRep plugin is now included and disabled by default for new installs.
+  To replace an existing AWL configuration with TxRep, follow the steps below:
+  - Disable AWL
+  - Enable TxRep
+  - Set txrep_factor equal to your previous AWL factor
+  - Set use_txrep to 1
+
+  For more detailed information and more configuration options, consult the
+  documentation in Mail::SpamAssassin::Plugin::TxRep.
+
+- The $VALID_TLDS_RE global in registrar boundaries is deprecated but kept for 
+  third-party plugin compatibility.  It will become increasingly out of date
+  and may be removed in a future release. 
+
+  See lib/Mail/SpamAssassin/Plugin/FreeMail.pm for an example of the new way
+  to obtain a valid list of TLDs, i.e. 
+
+    $self->{main}->{registryboundaries}->{valid_tlds_re} 
+
+- Mail::SpamAssassin::Util::RegistrarBoundaries is being replaced by 
+  Mail::SpamAssassin::RegistryBoundaries so that new TLDs can be updated via 
+  20_aux_tlds.cf delivered via sa-update.
+
+  ***3rd Party Plugin Authors, Please Note***
+  
+  The following functions will be removed in the next release after 3.4.1 
+  excepting any emergency break/fix releases immediately after 3.4.1:
+  
+  Mail::SpamAssassin::Util::RegistrarBoundaries::is_domain_valid 
+  Mail::SpamAssassin::Util::RegistrarBoundaries::trim_domain
+  Mail::SpamAssassin::Util::RegistrarBoundaries::split_domain 
+  Mail::SpamAssassin::Util::uri_to_domain 
+  
+  And the following variables will also be removed:
+  
+  Mail::SpamAssassin::Util::RegistrarBoundaries::US_STATES
+  Mail::SpamAssassin::Util::RegistrarBoundaries::THREE_LEVEL_DOMAINS
+  Mail::SpamAssassin::Util::RegistrarBoundaries::TWO_LEVEL_DOMAINS
+  Mail::SpamAssassin::Util::RegistrarBoundaries::VALID_TLDS_RE
+  Mail::SpamAssassin::Util::RegistrarBoundaries::VALID_TLDS
+  
+  
+  This change should only affect 3rd party plugin authors who will need to 
+  update their code to utilize Mail::SpamAssassin::RegistryBoundaries 
+  instead of the functions and variables in 
+  Mail::SpamAssassin::Util::RegistrarBoundaries and the function 
+  Mail::SpamAssassin::Util::uri_to_domain which are deprecated and will be 
+  removed.
+
+  For example, the $VALID_TLDS_RE global in registrar boundaries is 
+  deprecated but kept for third-party plugin compatibility.  It will become 
+  increasingly out of date and may be removed in a future release.
+
+  See lib/Mail/SpamAssassin/Plugin/FreeMail.pm for an example of the new way
+  to obtain a valid list of TLDs, i.e.
+
+    $self->{main}->{registryboundaries}->{valid_tlds_re}
+
+- It is now recommended that users uncomment "normalize_charset 1" in
+  local.cf. It will break rules that depend on messages being in non-UTF8
+  encodings, but going forward this will enable more robust unicode rules and
+  will eventually become the default.
+
+
+
+Note for Users Upgrading to SpamAssassin 3.4.0
+----------------------------------------------
+
+- When Bayes classification is in use and messages are 'learned' as spam
+  or ham and stored in a database, the Bayes plugin generates internal
+  message IDs of learned messages and stores them in a 'seen' database to
+  avoid re-learning duplicates and accidental un-learning messages that
+  were not previously learned. With changes in bug 5185, the calculation
+  of message IDs in a bayes 'seen' database has changed, so new code can
+  no longer associate new messages with those learned before the change.
+
+- Note that this change does not affect recognition of old tokens and the
+  classification algorithm, only duplicate detection and unlearning of old
+  messages is affected.
+
+- Because of this change, if you use Bayes and you are upgrading from a
+  version prior to 3.4.0, you may consider wiping your Bayes database
+  and starting fresh.
+
+- There is a new optional dependency on Net::Patricia to speed up lookups
+  on internal_networks, trusted_networks or msa_networks when these lists
+  contain a larger number of entries. Consider installing this module to
+  speed up classification.
+
+- The minimal required version of NetAddr::IP was bumped to 4.010
+
+- In addition to existing backends, the 3.4.0 introduces support for keeping
+  a Bayes database on a Redis server, either running locally, or accessed
+  over network. Similar to SQL backends, the database may be concurrently
+  used by several hosts running SpamAssassin.
+
+- For more detail on these and other changes, please see the Announcement
+  file at:
+   http://svn.apache.org/repos/asf/spamassassin/branches/3.4/build/announcements/3.4.0.txt
+
 Note for Users Upgrading to SpamAssassin 3.3.0
 -----------------------------------------------
 
diff -Nru spamassassin-3.4.0/USAGE spamassassin-3.4.2/USAGE
--- spamassassin-3.4.0/USAGE	2014-02-07 03:36:38.000000000 -0500
+++ spamassassin-3.4.2/USAGE	2018-09-13 21:27:55.000000000 -0400
@@ -223,20 +223,21 @@
 
 
   - Scores and other user preferences can now be loaded from, and Bayes
-    and auto-whitelist data can be stored in, an SQL database; see the
-    'sql' subdirectory for more details.
+    and automatic reputation data can be stored in, an SQL database; see
+    the 'sql' subdirectory for more details.
 
     If you are setting up a large 'spamd' system-wide installation, with
-    Bayes and/or auto-whitelists, we strongly recommend using SQL as
+    Bayes and/or automatic reputation, we strongly recommend using SQL as
     storage.  It has proven more reliable than the default DB_File storage
     backend at several large sites.
 
 
   - If you are running SpamAssassin under a disk quota, or are setting up
     'spamd' with users with disk quotas, be warned that the DB_File
-    database module used by SpamAssassin for Bayes and AWL storage seems
-    to be unreliable in the face of quotas (bug 3796). In this situation,
-    we recommend using SQL storage for those databases, instead of DB_File.
+    database module used by SpamAssassin for Bayes, TxRep, and AWL storage
+    seems to be unreliable in the face of quotas (bug 3796). In this
+    situation, we recommend using SQL storage for those databases, instead
+    of DB_File.
 
 
   - Lots more ways to integrate SpamAssassin can be read at