File: rules-refresh-svn1926576.patch

package info (click to toggle)
spamassassin 4.0.1-5
  • links: PTS, VCS
  • area: main
  • in suites: trixie
  • size: 22,960 kB
  • sloc: perl: 86,207; ansic: 5,193; sh: 3,710; javascript: 339; sql: 279; makefile: 209; python: 49
file content (2360 lines) | stat: -rw-r--r-- 89,163 bytes parent folder | download
1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
45
46
47
48
49
50
51
52
53
54
55
56
57
58
59
60
61
62
63
64
65
66
67
68
69
70
71
72
73
74
75
76
77
78
79
80
81
82
83
84
85
86
87
88
89
90
91
92
93
94
95
96
97
98
99
100
101
102
103
104
105
106
107
108
109
110
111
112
113
114
115
116
117
118
119
120
121
122
123
124
125
126
127
128
129
130
131
132
133
134
135
136
137
138
139
140
141
142
143
144
145
146
147
148
149
150
151
152
153
154
155
156
157
158
159
160
161
162
163
164
165
166
167
168
169
170
171
172
173
174
175
176
177
178
179
180
181
182
183
184
185
186
187
188
189
190
191
192
193
194
195
196
197
198
199
200
201
202
203
204
205
206
207
208
209
210
211
212
213
214
215
216
217
218
219
220
221
222
223
224
225
226
227
228
229
230
231
232
233
234
235
236
237
238
239
240
241
242
243
244
245
246
247
248
249
250
251
252
253
254
255
256
257
258
259
260
261
262
263
264
265
266
267
268
269
270
271
272
273
274
275
276
277
278
279
280
281
282
283
284
285
286
287
288
289
290
291
292
293
294
295
296
297
298
299
300
301
302
303
304
305
306
307
308
309
310
311
312
313
314
315
316
317
318
319
320
321
322
323
324
325
326
327
328
329
330
331
332
333
334
335
336
337
338
339
340
341
342
343
344
345
346
347
348
349
350
351
352
353
354
355
356
357
358
359
360
361
362
363
364
365
366
367
368
369
370
371
372
373
374
375
376
377
378
379
380
381
382
383
384
385
386
387
388
389
390
391
392
393
394
395
396
397
398
399
400
401
402
403
404
405
406
407
408
409
410
411
412
413
414
415
416
417
418
419
420
421
422
423
424
425
426
427
428
429
430
431
432
433
434
435
436
437
438
439
440
441
442
443
444
445
446
447
448
449
450
451
452
453
454
455
456
457
458
459
460
461
462
463
464
465
466
467
468
469
470
471
472
473
474
475
476
477
478
479
480
481
482
483
484
485
486
487
488
489
490
491
492
493
494
495
496
497
498
499
500
501
502
503
504
505
506
507
508
509
510
511
512
513
514
515
516
517
518
519
520
521
522
523
524
525
526
527
528
529
530
531
532
533
534
535
536
537
538
539
540
541
542
543
544
545
546
547
548
549
550
551
552
553
554
555
556
557
558
559
560
561
562
563
564
565
566
567
568
569
570
571
572
573
574
575
576
577
578
579
580
581
582
583
584
585
586
587
588
589
590
591
592
593
594
595
596
597
598
599
600
601
602
603
604
605
606
607
608
609
610
611
612
613
614
615
616
617
618
619
620
621
622
623
624
625
626
627
628
629
630
631
632
633
634
635
636
637
638
639
640
641
642
643
644
645
646
647
648
649
650
651
652
653
654
655
656
657
658
659
660
661
662
663
664
665
666
667
668
669
670
671
672
673
674
675
676
677
678
679
680
681
682
683
684
685
686
687
688
689
690
691
692
693
694
695
696
697
698
699
700
701
702
703
704
705
706
707
708
709
710
711
712
713
714
715
716
717
718
719
720
721
722
723
724
725
726
727
728
729
730
731
732
733
734
735
736
737
738
739
740
741
742
743
744
745
746
747
748
749
750
751
752
753
754
755
756
757
758
759
760
761
762
763
764
765
766
767
768
769
770
771
772
773
774
775
776
777
778
779
780
781
782
783
784
785
786
787
788
789
790
791
792
793
794
795
796
797
798
799
800
801
802
803
804
805
806
807
808
809
810
811
812
813
814
815
816
817
818
819
820
821
822
823
824
825
826
827
828
829
830
831
832
833
834
835
836
837
838
839
840
841
842
843
844
845
846
847
848
849
850
851
852
853
854
855
856
857
858
859
860
861
862
863
864
865
866
867
868
869
870
871
872
873
874
875
876
877
878
879
880
881
882
883
884
885
886
887
888
889
890
891
892
893
894
895
896
897
898
899
900
901
902
903
904
905
906
907
908
909
910
911
912
913
914
915
916
917
918
919
920
921
922
923
924
925
926
927
928
929
930
931
932
933
934
935
936
937
938
939
940
941
942
943
944
945
946
947
948
949
950
951
952
953
954
955
956
957
958
959
960
961
962
963
964
965
966
967
968
969
970
971
972
973
974
975
976
977
978
979
980
981
982
983
984
985
986
987
988
989
990
991
992
993
994
995
996
997
998
999
1000
1001
1002
1003
1004
1005
1006
1007
1008
1009
1010
1011
1012
1013
1014
1015
1016
1017
1018
1019
1020
1021
1022
1023
1024
1025
1026
1027
1028
1029
1030
1031
1032
1033
1034
1035
1036
1037
1038
1039
1040
1041
1042
1043
1044
1045
1046
1047
1048
1049
1050
1051
1052
1053
1054
1055
1056
1057
1058
1059
1060
1061
1062
1063
1064
1065
1066
1067
1068
1069
1070
1071
1072
1073
1074
1075
1076
1077
1078
1079
1080
1081
1082
1083
1084
1085
1086
1087
1088
1089
1090
1091
1092
1093
1094
1095
1096
1097
1098
1099
1100
1101
1102
1103
1104
1105
1106
1107
1108
1109
1110
1111
1112
1113
1114
1115
1116
1117
1118
1119
1120
1121
1122
1123
1124
1125
1126
1127
1128
1129
1130
1131
1132
1133
1134
1135
1136
1137
1138
1139
1140
1141
1142
1143
1144
1145
1146
1147
1148
1149
1150
1151
1152
1153
1154
1155
1156
1157
1158
1159
1160
1161
1162
1163
1164
1165
1166
1167
1168
1169
1170
1171
1172
1173
1174
1175
1176
1177
1178
1179
1180
1181
1182
1183
1184
1185
1186
1187
1188
1189
1190
1191
1192
1193
1194
1195
1196
1197
1198
1199
1200
1201
1202
1203
1204
1205
1206
1207
1208
1209
1210
1211
1212
1213
1214
1215
1216
1217
1218
1219
1220
1221
1222
1223
1224
1225
1226
1227
1228
1229
1230
1231
1232
1233
1234
1235
1236
1237
1238
1239
1240
1241
1242
1243
1244
1245
1246
1247
1248
1249
1250
1251
1252
1253
1254
1255
1256
1257
1258
1259
1260
1261
1262
1263
1264
1265
1266
1267
1268
1269
1270
1271
1272
1273
1274
1275
1276
1277
1278
1279
1280
1281
1282
1283
1284
1285
1286
1287
1288
1289
1290
1291
1292
1293
1294
1295
1296
1297
1298
1299
1300
1301
1302
1303
1304
1305
1306
1307
1308
1309
1310
1311
1312
1313
1314
1315
1316
1317
1318
1319
1320
1321
1322
1323
1324
1325
1326
1327
1328
1329
1330
1331
1332
1333
1334
1335
1336
1337
1338
1339
1340
1341
1342
1343
1344
1345
1346
1347
1348
1349
1350
1351
1352
1353
1354
1355
1356
1357
1358
1359
1360
1361
1362
1363
1364
1365
1366
1367
1368
1369
1370
1371
1372
1373
1374
1375
1376
1377
1378
1379
1380
1381
1382
1383
1384
1385
1386
1387
1388
1389
1390
1391
1392
1393
1394
1395
1396
1397
1398
1399
1400
1401
1402
1403
1404
1405
1406
1407
1408
1409
1410
1411
1412
1413
1414
1415
1416
1417
1418
1419
1420
1421
1422
1423
1424
1425
1426
1427
1428
1429
1430
1431
1432
1433
1434
1435
1436
1437
1438
1439
1440
1441
1442
1443
1444
1445
1446
1447
1448
1449
1450
1451
1452
1453
1454
1455
1456
1457
1458
1459
1460
1461
1462
1463
1464
1465
1466
1467
1468
1469
1470
1471
1472
1473
1474
1475
1476
1477
1478
1479
1480
1481
1482
1483
1484
1485
1486
1487
1488
1489
1490
1491
1492
1493
1494
1495
1496
1497
1498
1499
1500
1501
1502
1503
1504
1505
1506
1507
1508
1509
1510
1511
1512
1513
1514
1515
1516
1517
1518
1519
1520
1521
1522
1523
1524
1525
1526
1527
1528
1529
1530
1531
1532
1533
1534
1535
1536
1537
1538
1539
1540
1541
1542
1543
1544
1545
1546
1547
1548
1549
1550
1551
1552
1553
1554
1555
1556
1557
1558
1559
1560
1561
1562
1563
1564
1565
1566
1567
1568
1569
1570
1571
1572
1573
1574
1575
1576
1577
1578
1579
1580
1581
1582
1583
1584
1585
1586
1587
1588
1589
1590
1591
1592
1593
1594
1595
1596
1597
1598
1599
1600
1601
1602
1603
1604
1605
1606
1607
1608
1609
1610
1611
1612
1613
1614
1615
1616
1617
1618
1619
1620
1621
1622
1623
1624
1625
1626
1627
1628
1629
1630
1631
1632
1633
1634
1635
1636
1637
1638
1639
1640
1641
1642
1643
1644
1645
1646
1647
1648
1649
1650
1651
1652
1653
1654
1655
1656
1657
1658
1659
1660
1661
1662
1663
1664
1665
1666
1667
1668
1669
1670
1671
1672
1673
1674
1675
1676
1677
1678
1679
1680
1681
1682
1683
1684
1685
1686
1687
1688
1689
1690
1691
1692
1693
1694
1695
1696
1697
1698
1699
1700
1701
1702
1703
1704
1705
1706
1707
1708
1709
1710
1711
1712
1713
1714
1715
1716
1717
1718
1719
1720
1721
1722
1723
1724
1725
1726
1727
1728
1729
1730
1731
1732
1733
1734
1735
1736
1737
1738
1739
1740
1741
1742
1743
1744
1745
1746
1747
1748
1749
1750
1751
1752
1753
1754
1755
1756
1757
1758
1759
1760
1761
1762
1763
1764
1765
1766
1767
1768
1769
1770
1771
1772
1773
1774
1775
1776
1777
1778
1779
1780
1781
1782
1783
1784
1785
1786
1787
1788
1789
1790
1791
1792
1793
1794
1795
1796
1797
1798
1799
1800
1801
1802
1803
1804
1805
1806
1807
1808
1809
1810
1811
1812
1813
1814
1815
1816
1817
1818
1819
1820
1821
1822
1823
1824
1825
1826
1827
1828
1829
1830
1831
1832
1833
1834
1835
1836
1837
1838
1839
1840
1841
1842
1843
1844
1845
1846
1847
1848
1849
1850
1851
1852
1853
1854
1855
1856
1857
1858
1859
1860
1861
1862
1863
1864
1865
1866
1867
1868
1869
1870
1871
1872
1873
1874
1875
1876
1877
1878
1879
1880
1881
1882
1883
1884
1885
1886
1887
1888
1889
1890
1891
1892
1893
1894
1895
1896
1897
1898
1899
1900
1901
1902
1903
1904
1905
1906
1907
1908
1909
1910
1911
1912
1913
1914
1915
1916
1917
1918
1919
1920
1921
1922
1923
1924
1925
1926
1927
1928
1929
1930
1931
1932
1933
1934
1935
1936
1937
1938
1939
1940
1941
1942
1943
1944
1945
1946
1947
1948
1949
1950
1951
1952
1953
1954
1955
1956
1957
1958
1959
1960
1961
1962
1963
1964
1965
1966
1967
1968
1969
1970
1971
1972
1973
1974
1975
1976
1977
1978
1979
1980
1981
1982
1983
1984
1985
1986
1987
1988
1989
1990
1991
1992
1993
1994
1995
1996
1997
1998
1999
2000
2001
2002
2003
2004
2005
2006
2007
2008
2009
2010
2011
2012
2013
2014
2015
2016
2017
2018
2019
2020
2021
2022
2023
2024
2025
2026
2027
2028
2029
2030
2031
2032
2033
2034
2035
2036
2037
2038
2039
2040
2041
2042
2043
2044
2045
2046
2047
2048
2049
2050
2051
2052
2053
2054
2055
2056
2057
2058
2059
2060
2061
2062
2063
2064
2065
2066
2067
2068
2069
2070
2071
2072
2073
2074
2075
2076
2077
2078
2079
2080
2081
2082
2083
2084
2085
2086
2087
2088
2089
2090
2091
2092
2093
2094
2095
2096
2097
2098
2099
2100
2101
2102
2103
2104
2105
2106
2107
2108
2109
2110
2111
2112
2113
2114
2115
2116
2117
2118
2119
2120
2121
2122
2123
2124
2125
2126
2127
2128
2129
2130
2131
2132
2133
2134
2135
2136
2137
2138
2139
2140
2141
2142
2143
2144
2145
2146
2147
2148
2149
2150
2151
2152
2153
2154
2155
2156
2157
2158
2159
2160
2161
2162
2163
2164
2165
2166
2167
2168
2169
2170
2171
2172
2173
2174
2175
2176
2177
2178
2179
2180
2181
2182
2183
2184
2185
2186
2187
2188
2189
2190
2191
2192
2193
2194
2195
2196
2197
2198
2199
2200
2201
2202
2203
2204
2205
2206
2207
2208
2209
2210
2211
2212
2213
2214
2215
2216
2217
2218
2219
2220
2221
2222
2223
2224
2225
2226
2227
2228
2229
2230
2231
2232
2233
2234
2235
2236
2237
2238
2239
2240
2241
2242
2243
2244
2245
2246
2247
2248
2249
2250
2251
2252
2253
2254
2255
2256
2257
2258
2259
2260
2261
2262
2263
2264
2265
2266
2267
2268
2269
2270
2271
2272
2273
2274
2275
2276
2277
2278
2279
2280
2281
2282
2283
2284
2285
2286
2287
2288
2289
2290
2291
2292
2293
2294
2295
2296
2297
2298
2299
2300
2301
2302
2303
2304
2305
2306
2307
2308
2309
2310
2311
2312
2313
2314
2315
2316
2317
2318
2319
2320
2321
2322
2323
2324
2325
2326
2327
2328
2329
2330
2331
2332
2333
2334
2335
2336
2337
2338
2339
2340
2341
2342
2343
2344
2345
2346
2347
2348
2349
2350
2351
2352
2353
2354
2355
2356
2357
2358
2359
2360
Index: spamassassin/rules/20_aux_tlds.cf
===================================================================
--- spamassassin.orig/rules/20_aux_tlds.cf
+++ spamassassin/rules/20_aux_tlds.cf
@@ -56,7 +56,7 @@ endif
 #  wget https://data.iana.org/TLD/tlds-alpha-by-domain.txt -q -O - | grep -i '^xn--' | idn -u | tr '\n' ' ' | fold -w 80 -s | perl -pe 's/\s+$//; s/.*/util_rb_tld \L$_\n/'
 
 if can(Mail::SpamAssassin::Conf::feature_registryboundaries)
-# Updated 2023-11-17
+# Updated 2025-01-03
 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--3pxu8k xn--42c2d9a xn--45br5cyl
 util_rb_tld xn--45brj9c xn--45q11c xn--4dbrk0ce xn--4gbrim xn--54b7fta0cc xn--55qw42g
@@ -72,25 +72,25 @@ util_rb_tld xn--h2breg3eve xn--h2brj9c x
 util_rb_tld xn--imr513n xn--io0a7i xn--j1aef xn--j1amh xn--j6w193g xn--jlq480n2rg
 util_rb_tld xn--jvr189m xn--kcrx77d1x4a xn--kprw13d xn--kpry57d xn--kput3i xn--l1acc
 util_rb_tld xn--lgbbat1ad8j xn--mgb9awbf xn--mgba3a3ejt xn--mgba3a4f16a xn--mgba7c0bbn0a
-util_rb_tld xn--mgbaakc7dvf xn--mgbaam7a8h xn--mgbab2bd xn--mgbah1a3hjkrd xn--mgbai9azgqp6j
-util_rb_tld xn--mgbayh7gpa xn--mgbbh1a xn--mgbbh1a71e xn--mgbc0a9azcg xn--mgbca7dzdo
-util_rb_tld xn--mgbcpq6gpa1a xn--mgberp4a5d4ar xn--mgbgu82a xn--mgbi4ecexp xn--mgbpl2fh
-util_rb_tld xn--mgbt3dhd xn--mgbtx2b xn--mgbx4cd0ab xn--mix891f xn--mk1bu44c xn--mxtq1m
-util_rb_tld xn--ngbc5azd xn--ngbe9e0a xn--ngbrx xn--node xn--nqv7f xn--nqv7fs00ema
-util_rb_tld xn--nyqy26a xn--o3cw4h xn--ogbpf8fl xn--otu796d xn--p1acf xn--p1ai xn--pgbs0dh
-util_rb_tld xn--pssy2u xn--q7ce6a xn--q9jyb4c xn--qcka1pmc xn--qxa6a xn--qxam xn--rhqv96g
-util_rb_tld xn--rovu88b xn--rvc1e0am3e xn--s9brj9c xn--ses554g xn--t60b56a xn--tckwe
-util_rb_tld xn--tiq49xqyj xn--unup4y xn--vermgensberater-ctb xn--vermgensberatung-pwb
-util_rb_tld xn--vhquv xn--vuq861b xn--w4r85el8fhu5dnra xn--w4rs40l xn--wgbh1c xn--wgbl6a
-util_rb_tld xn--xhq521b xn--xkc2al3hye2a xn--xkc2dl3a5ee0h xn--y9a3aq xn--yfro4i67o
-util_rb_tld xn--ygbi2ammx xn--zfr164b
+util_rb_tld xn--mgbaam7a8h xn--mgbab2bd xn--mgbah1a3hjkrd xn--mgbai9azgqp6j xn--mgbayh7gpa
+util_rb_tld xn--mgbbh1a xn--mgbbh1a71e xn--mgbc0a9azcg xn--mgbca7dzdo xn--mgbcpq6gpa1a
+util_rb_tld xn--mgberp4a5d4ar xn--mgbgu82a xn--mgbi4ecexp xn--mgbpl2fh xn--mgbt3dhd
+util_rb_tld xn--mgbtx2b xn--mgbx4cd0ab xn--mix891f xn--mk1bu44c xn--mxtq1m xn--ngbc5azd
+util_rb_tld xn--ngbe9e0a xn--ngbrx xn--node xn--nqv7f xn--nqv7fs00ema xn--nyqy26a
+util_rb_tld xn--o3cw4h xn--ogbpf8fl xn--otu796d xn--p1acf xn--p1ai xn--pgbs0dh xn--pssy2u
+util_rb_tld xn--q7ce6a xn--q9jyb4c xn--qcka1pmc xn--qxa6a xn--qxam xn--rhqv96g xn--rovu88b
+util_rb_tld xn--rvc1e0am3e xn--s9brj9c xn--ses554g xn--t60b56a xn--tckwe xn--tiq49xqyj
+util_rb_tld xn--unup4y xn--vermgensberater-ctb xn--vermgensberatung-pwb xn--vhquv
+util_rb_tld xn--vuq861b xn--w4r85el8fhu5dnra xn--w4rs40l xn--wgbh1c xn--wgbl6a xn--xhq521b
+util_rb_tld xn--xkc2al3hye2a xn--xkc2dl3a5ee0h xn--y9a3aq xn--yfro4i67o xn--ygbi2ammx
+util_rb_tld xn--zfr164b
 endif
 
 # Standard List
 # For an up to date list of TLDs that can be pasted into this block, run this command:
 #  wget https://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 's/\s+$//; s/.*/util_rb_tld \L$_\n/'
 
-# Updated 2023-11-17
+# Updated 2025-01-03
 util_rb_tld aaa aarp abb abbott abbvie abc able abogado abudhabi ac academy accenture
 util_rb_tld accountant accountants aco actor ad ads adult ae aeg aero aetna af afl africa
 util_rb_tld ag agakhan agency ai aig airbus airforce airtel akdn al alibaba alipay
@@ -98,30 +98,29 @@ util_rb_tld allfinanz allstate ally alsa
 util_rb_tld amex amfam amica amsterdam analytics android anquan anz ao aol apartments app
 util_rb_tld apple aq aquarelle ar arab aramco archi army arpa art arte as asda asia
 util_rb_tld associates at athleta attorney au auction audi audible audio auspost author
-util_rb_tld auto autos avianca aw aws ax axa az azure ba baby baidu banamex bananarepublic
-util_rb_tld band bank bar barcelona barclaycard barclays barefoot bargains baseball
-util_rb_tld basketball bauhaus bayern bb bbc bbt bbva bcg bcn bd be beats beauty beer
-util_rb_tld bentley berlin best bestbuy bet bf bg bh bharti bi bible bid bike bing bingo
-util_rb_tld bio biz bj black blackfriday blockbuster blog bloomberg blue bm bms bmw bn
-util_rb_tld bnpparibas bo boats boehringer bofa bom bond boo book booking bosch bostik
-util_rb_tld boston bot boutique box br bradesco bridgestone broadway broker brother
-util_rb_tld brussels bs bt build builders business buy buzz bv bw by bz bzh ca cab cafe cal
-util_rb_tld call calvinklein cam camera camp canon capetown capital capitalone car caravan
-util_rb_tld cards care career careers cars casa case cash casino cat catering catholic cba
-util_rb_tld cbn cbre cc cd center ceo cern cf cfa cfd cg ch chanel channel charity chase
-util_rb_tld chat cheap chintai christmas chrome church ci cipriani circle cisco citadel
-util_rb_tld citi citic city ck cl claims cleaning click clinic clinique clothing cloud club
-util_rb_tld clubmed cm cn co coach codes coffee college cologne com comcast commbank
-util_rb_tld community company compare computer comsec condos construction consulting
-util_rb_tld contact contractors cooking cool coop corsica country coupon coupons courses
-util_rb_tld cpa cr credit creditcard creditunion cricket crown crs cruise cruises cu
-util_rb_tld cuisinella cv cw cx cy cymru cyou cz dabur dad dance data date dating datsun
-util_rb_tld day dclk dds de deal dealer deals degree delivery dell deloitte delta democrat
-util_rb_tld dental dentist desi design dev dhl diamonds diet digital direct directory
-util_rb_tld discount discover dish diy dj dk dm dnp do docs doctor dog domains dot download
-util_rb_tld drive dtv dubai dunlop dupont durban dvag dvr dz earth eat ec eco edeka edu
-util_rb_tld education ee eg email emerck energy engineer engineering enterprises epson
-util_rb_tld equipment er ericsson erni es esq estate et etisalat eu eurovision eus events
+util_rb_tld auto autos aw aws ax axa az azure ba baby baidu banamex band bank bar barcelona
+util_rb_tld barclaycard barclays barefoot bargains baseball basketball bauhaus bayern bb
+util_rb_tld bbc bbt bbva bcg bcn bd be beats beauty beer bentley berlin best bestbuy bet bf
+util_rb_tld bg bh bharti bi bible bid bike bing bingo bio biz bj black blackfriday
+util_rb_tld blockbuster blog bloomberg blue bm bms bmw bn bnpparibas bo boats boehringer
+util_rb_tld bofa bom bond boo book booking bosch bostik boston bot boutique box br bradesco
+util_rb_tld bridgestone broadway broker brother brussels bs bt build builders business buy
+util_rb_tld buzz bv bw by bz bzh ca cab cafe cal call calvinklein cam camera camp canon
+util_rb_tld capetown capital capitalone car caravan cards care career careers cars casa
+util_rb_tld case cash casino cat catering catholic cba cbn cbre cc cd center ceo cern cf
+util_rb_tld cfa cfd cg ch chanel channel charity chase chat cheap chintai christmas chrome
+util_rb_tld church ci cipriani circle cisco citadel citi citic city ck cl claims cleaning
+util_rb_tld click clinic clinique clothing cloud club clubmed cm cn co coach codes coffee
+util_rb_tld college cologne com commbank community company compare computer comsec condos
+util_rb_tld construction consulting contact contractors cooking cool coop corsica country
+util_rb_tld coupon coupons courses cpa cr credit creditcard creditunion cricket crown crs
+util_rb_tld cruise cruises cu cuisinella cv cw cx cy cymru cyou cz dad dance data date
+util_rb_tld dating datsun day dclk dds de deal dealer deals degree delivery dell deloitte
+util_rb_tld delta democrat dental dentist desi design dev dhl diamonds diet digital direct
+util_rb_tld directory discount discover dish diy dj dk dm dnp do docs doctor dog domains
+util_rb_tld dot download drive dtv dubai dunlop dupont durban dvag dvr dz earth eat ec eco
+util_rb_tld edeka edu education ee eg email emerck energy engineer engineering enterprises
+util_rb_tld epson equipment er ericsson erni es esq estate et eu eurovision eus events
 util_rb_tld exchange expert exposed express extraspace fage fail fairwinds faith family fan
 util_rb_tld fans farm farmers fashion fast fedex feedback ferrari ferrero fi fidelity fido
 util_rb_tld film final finance financial fire firestone firmdale fish fishing fit fitness
@@ -131,50 +130,49 @@ util_rb_tld fujitsu fun fund furniture f
 util_rb_tld gap garden gay gb gbiz gd gdn ge gea gent genting george gf gg ggee gh gi gift
 util_rb_tld gifts gives giving gl glass gle global globo gm gmail gmbh gmo gmx gn godaddy
 util_rb_tld gold goldpoint golf goo goodyear goog google gop got gov gp gq gr grainger
-util_rb_tld graphics gratis green gripe grocery group gs gt gu guardian gucci guge guide
-util_rb_tld guitars guru gw gy hair hamburg hangout haus hbo hdfc hdfcbank health
-util_rb_tld healthcare help helsinki here hermes hiphop hisamitsu hitachi hiv hk hkt hm hn
-util_rb_tld hockey holdings holiday homedepot homegoods homes homesense honda horse
-util_rb_tld hospital host hosting hot hotels hotmail house how hr hsbc ht hu hughes hyatt
-util_rb_tld hyundai ibm icbc ice icu id ie ieee ifm ikano il im imamat imdb immo immobilien
-util_rb_tld in inc industries infiniti info ing ink institute insurance insure int
-util_rb_tld international intuit investments io ipiranga iq ir irish is ismaili ist
-util_rb_tld istanbul it itau itv jaguar java jcb je jeep jetzt jewelry jio jll jm jmp jnj
-util_rb_tld jo jobs joburg jot joy jp jpmorgan jprs juegos juniper kaufen kddi ke
-util_rb_tld kerryhotels kerrylogistics kerryproperties kfh kg kh ki kia kids kim kindle
-util_rb_tld kitchen kiwi km kn koeln komatsu kosher kp kpmg kpn kr krd kred kuokgroup kw ky
-util_rb_tld kyoto kz la lacaixa lamborghini lamer lancaster land landrover lanxess lasalle
-util_rb_tld lat latino latrobe law lawyer lb lc lds lease leclerc lefrak legal lego lexus
-util_rb_tld lgbt li lidl life lifeinsurance lifestyle lighting like lilly limited limo
-util_rb_tld lincoln link lipsy live living lk llc llp loan loans locker locus lol london
-util_rb_tld lotte lotto love lpl lplfinancial lr ls lt ltd ltda lu lundbeck luxe luxury lv
-util_rb_tld ly ma madrid maif maison makeup man management mango map market marketing
-util_rb_tld markets marriott marshalls mattel mba mc mckinsey md me med media meet
-util_rb_tld melbourne meme memorial men menu merckmsd mg mh miami microsoft mil mini mint
-util_rb_tld mit mitsubishi mk ml mlb mls mm mma mn mo mobi mobile moda moe moi mom monash
-util_rb_tld money monster mormon mortgage moscow moto motorcycles mov movie mp mq mr ms msd
-util_rb_tld mt mtn mtr mu museum music mv mw mx my mz na nab nagoya name natura navy nba nc
-util_rb_tld ne nec net netbank netflix network neustar new news next nextdirect nexus nf
-util_rb_tld nfl ng ngo nhk ni nico nike nikon ninja nissan nissay nl no nokia norton now
-util_rb_tld nowruz nowtv np nr nra nrw ntt nu nyc nz obi observer office okinawa olayan
-util_rb_tld olayangroup oldnavy ollo om omega one ong onl online ooo open oracle orange org
-util_rb_tld organic origins osaka otsuka ott ovh pa page panasonic paris pars partners
-util_rb_tld parts party pay pccw pe pet pf pfizer pg ph pharmacy phd philips phone photo
-util_rb_tld photography photos physio pics pictet pictures pid pin ping pink pioneer pizza
-util_rb_tld pk pl place play playstation plumbing plus pm pn pnc pohl poker politie porn
-util_rb_tld post pr pramerica praxi press prime pro prod productions prof progressive promo
-util_rb_tld properties property protection pru prudential ps pt pub pw pwc py qa qpon
-util_rb_tld quebec quest racing radio re read realestate realtor realty recipes red
-util_rb_tld redstone redumbrella rehab reise reisen reit reliance ren rent rentals repair
-util_rb_tld report republican rest restaurant review reviews rexroth rich richardli ricoh
-util_rb_tld ril rio rip ro rocks rodeo rogers room rs rsvp ru rugby ruhr run rw rwe ryukyu
-util_rb_tld sa saarland safe safety sakura sale salon samsclub samsung sandvik
-util_rb_tld sandvikcoromant sanofi sap sarl sas save saxo sb sbi sbs sc sca scb schaeffler
-util_rb_tld schmidt scholarships school schule schwarz science scot sd se search seat
-util_rb_tld secure security seek select sener services seven sew sex sexy sfr sg sh
-util_rb_tld shangrila sharp shaw shell shia shiksha shoes shop shopping shouji show si silk
-util_rb_tld sina singles site sj sk ski skin sky skype sl sling sm smart smile sn sncf so
-util_rb_tld soccer social softbank software sohu solar solutions song sony soy spa space
+util_rb_tld graphics gratis green gripe grocery group gs gt gu gucci guge guide guitars
+util_rb_tld guru gw gy hair hamburg hangout haus hbo hdfc hdfcbank health healthcare help
+util_rb_tld helsinki here hermes hiphop hisamitsu hitachi hiv hk hkt hm hn hockey holdings
+util_rb_tld holiday homedepot homegoods homes homesense honda horse hospital host hosting
+util_rb_tld hot hotels hotmail house how hr hsbc ht hu hughes hyatt hyundai ibm icbc ice
+util_rb_tld icu id ie ieee ifm ikano il im imamat imdb immo immobilien in inc industries
+util_rb_tld infiniti info ing ink institute insurance insure int international intuit
+util_rb_tld investments io ipiranga iq ir irish is ismaili ist istanbul it itau itv jaguar
+util_rb_tld java jcb je jeep jetzt jewelry jio jll jm jmp jnj jo jobs joburg jot joy jp
+util_rb_tld jpmorgan jprs juegos juniper kaufen kddi ke kerryhotels kerrylogistics
+util_rb_tld kerryproperties kfh kg kh ki kia kids kim kindle kitchen kiwi km kn koeln
+util_rb_tld komatsu kosher kp kpmg kpn kr krd kred kuokgroup kw ky kyoto kz la lacaixa
+util_rb_tld lamborghini lamer lancaster land landrover lanxess lasalle lat latino latrobe
+util_rb_tld law lawyer lb lc lds lease leclerc lefrak legal lego lexus lgbt li lidl life
+util_rb_tld lifeinsurance lifestyle lighting like lilly limited limo lincoln link lipsy
+util_rb_tld live living lk llc llp loan loans locker locus lol london lotte lotto love lpl
+util_rb_tld lplfinancial lr ls lt ltd ltda lu lundbeck luxe luxury lv ly ma madrid maif
+util_rb_tld maison makeup man management mango map market marketing markets marriott
+util_rb_tld marshalls mattel mba mc mckinsey md me med media meet melbourne meme memorial
+util_rb_tld men menu merckmsd mg mh miami microsoft mil mini mint mit mitsubishi mk ml mlb
+util_rb_tld mls mm mma mn mo mobi mobile moda moe moi mom monash money monster mormon
+util_rb_tld mortgage moscow moto motorcycles mov movie mp mq mr ms msd mt mtn mtr mu museum
+util_rb_tld music mv mw mx my mz na nab nagoya name navy nba nc ne nec net netbank netflix
+util_rb_tld network neustar new news next nextdirect nexus nf nfl ng ngo nhk ni nico nike
+util_rb_tld nikon ninja nissan nissay nl no nokia norton now nowruz nowtv np nr nra nrw ntt
+util_rb_tld nu nyc nz obi observer office okinawa olayan olayangroup ollo om omega one ong
+util_rb_tld onl online ooo open oracle orange org organic origins osaka otsuka ott ovh pa
+util_rb_tld page panasonic paris pars partners parts party pay pccw pe pet pf pfizer pg ph
+util_rb_tld pharmacy phd philips phone photo photography photos physio 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 racing radio re read
+util_rb_tld realestate realtor realty recipes red redstone redumbrella rehab reise reisen
+util_rb_tld reit reliance ren rent rentals repair report republican rest restaurant review
+util_rb_tld reviews rexroth rich richardli ricoh ril rio rip ro rocks rodeo rogers room rs
+util_rb_tld rsvp ru rugby ruhr run rw rwe ryukyu sa saarland safe safety sakura sale salon
+util_rb_tld samsclub samsung sandvik sandvikcoromant sanofi sap sarl sas save saxo sb sbi
+util_rb_tld sbs sc scb schaeffler schmidt scholarships school schule schwarz science scot
+util_rb_tld sd se search seat secure security seek select sener services seven sew sex sexy
+util_rb_tld sfr sg sh shangrila sharp shell shia shiksha shoes shop shopping shouji show si
+util_rb_tld silk sina singles site sj sk ski skin sky skype sl sling sm smart smile sn sncf
+util_rb_tld so soccer social softbank software sohu solar solutions song sony soy spa space
 util_rb_tld sport spot sr srl ss st stada staples star statebank statefarm stc stcgroup
 util_rb_tld stockholm storage store stream studio study style su sucks supplies supply
 util_rb_tld support surf surgery suzuki sv swatch swiss sx sy sydney systems sz tab taipei
@@ -185,13 +183,13 @@ util_rb_tld tools top toray toshiba tota
 util_rb_tld travel travelers travelersinsurance trust trv tt tube tui tunes tushu tv tvs tw
 util_rb_tld tz ua ubank ubs ug uk unicom university uno uol ups us uy uz va vacations vana
 util_rb_tld vanguard vc ve vegas ventures verisign versicherung vet vg vi viajes video vig
-util_rb_tld viking villas vin vip virgin visa vision viva vivo vlaanderen vn vodka
-util_rb_tld volkswagen volvo vote voting voto voyage vu wales walmart walter wang wanggou
-util_rb_tld watch watches weather weatherchannel webcam weber website wed wedding weibo
-util_rb_tld 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 xxx xyz yachts yahoo yamaxun yandex ye yodobashi yoga yokohama you
-util_rb_tld youtube yt yun za zappos zara zero zip zm zone zuerich zw
+util_rb_tld viking villas vin vip virgin visa vision viva vivo vlaanderen vn vodka volvo
+util_rb_tld vote voting voto voyage vu wales walmart walter wang wanggou watch watches
+util_rb_tld weather weatherchannel webcam weber website wed wedding weibo weir wf whoswho
+util_rb_tld wien wiki williamhill win windows wine winners wme wolterskluwer woodside work
+util_rb_tld works world wow ws wtc wtf xbox xerox xihuan xin xxx xyz yachts yahoo yamaxun
+util_rb_tld yandex ye yodobashi yoga yokohama you youtube yt yun za zappos zara zero zip zm
+util_rb_tld zone zuerich zw
 
 #
 # 2nd level TLD list
@@ -389,303 +387,439 @@ util_rb_2tld ac.za alt.za bourse.za city
 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 150m.com
+util_rb_2tld 163.to
+util_rb_2tld 1blu.de
+util_rb_2tld 42web.io
+util_rb_2tld 5ballov.ru
+util_rb_2tld 6a.org
+util_rb_2tld 80.hk
 util_rb_2tld 9k.com
+util_rb_2tld a2hosted.com
+util_rb_2tld acemlna.com
+util_rb_2tld acemlnb.com
+util_rb_2tld acemlnc.com
 util_rb_2tld addr.com
 util_rb_2tld altervista.org
+util_rb_2tld amplifyapp.com
+util_rb_2tld angelfire.com
+util_rb_2tld app.link
+util_rb_2tld appspot.com
+util_rb_2tld armenia.su
+util_rb_2tld ashbagad.su
+util_rb_2tld ashgabad.su
+util_rb_2tld asso.ws
+util_rb_2tld ath.cx
+util_rb_2tld at.lv
+util_rb_2tld at.pn
+util_rb_2tld at.tc
+util_rb_2tld au.pn
+util_rb_2tld awsapps.com
+util_rb_2tld azerbaijan.su
+util_rb_2tld azureedge.net
+util_rb_2tld azurewebsites.net
+util_rb_2tld b-cdn.net
+util_rb_2tld benchmarkurl.com
+util_rb_2tld benchurl.com
+util_rb_2tld be.tc
+util_rb_2tld bg.tc
 util_rb_2tld biz.tm
+util_rb_2tld biz.ua
+util_rb_2tld blog4ever.com
+util_rb_2tld blog.com
 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 blog.ru
+
+# Blogspot
+util_rb_2tld blogspot.ba
+util_rb_2tld blogspot.be
 util_rb_2tld blogspot.ca
+util_rb_2tld blogspot.com
 util_rb_2tld blogspot.cv
 util_rb_2tld blogspot.de
+util_rb_2tld blogspot.fi
 util_rb_2tld blogspot.fr
+util_rb_2tld blogspot.hu
 util_rb_2tld blogspot.in
 util_rb_2tld blogspot.it
 util_rb_2tld blogspot.jp
+util_rb_2tld blogspot.li
+util_rb_2tld blogspot.mk
 util_rb_2tld blogspot.mx
+util_rb_2tld blogspot.no
 util_rb_2tld blogspot.pt
 util_rb_2tld blogspot.re
+util_rb_2tld blogspot.ro
 util_rb_2tld blogspot.se
+util_rb_2tld blogspot.tw
+
+util_rb_2tld bmecurl.co
+util_rb_2tld bounceme.net
+util_rb_2tld boxmode.io
 util_rb_2tld bravehost.com
 util_rb_2tld bravejournal.com
+util_rb_2tld bravepages.com
+util_rb_2tld br.tc
 util_rb_2tld by.ru
+util_rb_2tld campaign-view.com
+util_rb_2tld ca.pn
+util_rb_2tld carrd.co
+util_rb_2tld caspio.com
+util_rb_2tld cc.cc
+util_rb_2tld ce.ms
+util_rb_2tld cere.network
+util_rb_2tld cfolks.pl
 util_rb_2tld chat.ru
+util_rb_2tld chez.com
+util_rb_2tld ch.lv
+util_rb_2tld ch.pn
 util_rb_2tld cjb.net
+util_rb_2tld cleverapps.io
+util_rb_2tld cloudwaysapps.com
+util_rb_2tld cn.com
+util_rb_2tld cn.pn
+util_rb_2tld co.be
+util_rb_2tld co.cc
+util_rb_2tld co.com
+util_rb_2tld codeanyapp.com
+util_rb_2tld codesandbox.io
+util_rb_2tld co.in
+util_rb_2tld co.kg
+util_rb_2tld com.de
+util_rb_2tld com.vc
+util_rb_2tld conohawing.com
+util_rb_2tld co.pn
+util_rb_2tld corp.st
+util_rb_2tld corvar.pe
+util_rb_2tld cu-portland.edu
+util_rb_2tld cz.cc
+util_rb_2tld cz-emails.es
+util_rb_2tld cz.tc
+util_rb_2tld ddnsking.com
+util_rb_2tld ddns.net
+util_rb_2tld de.ki
+util_rb_2tld de.lv
+util_rb_2tld de.pn
+util_rb_2tld de.tc
+util_rb_2tld de.tl
+util_rb_2tld dk.tc
+util_rb_2tld dnsdojo.org
+util_rb_2tld doesphotography.com
+util_rb_2tld dreamhost.com
+util_rb_2tld dreamhosters.com
+util_rb_2tld duckdns.org
+
+# Dyndns
+util_rb_2tld dyndns-at-home.com
+util_rb_2tld dyndns-at-work.com
+util_rb_2tld dyndns.biz
+util_rb_2tld dyndns-blog.com
+util_rb_2tld dyndns.dk
+util_rb_2tld dyndns-free.com
+util_rb_2tld dyndns-home.com
+util_rb_2tld dyndns.info
+util_rb_2tld dyndns-ip.com
+util_rb_2tld dyndns-mail.com
+util_rb_2tld dyndns-office.com
+util_rb_2tld dyndns.org
+util_rb_2tld dyndns-pics.com
+util_rb_2tld dyndns-remote.com
+util_rb_2tld dyndns-server.com
+util_rb_2tld dyndns.tv
+util_rb_2tld dyndns-web.com
+util_rb_2tld dyndns-wiki.com
+util_rb_2tld dyndns-work.com
+util_rb_2tld dyndns.ws
+
+util_rb_2tld east-kazakhstan.su
+util_rb_2tld emlnk9.com
+util_rb_2tld emlnk.com
+util_rb_2tld endrowl.com
+util_rb_2tld es.pn
+util_rb_2tld es.tc
 util_rb_2tld es.tl
+util_rb_2tld eu.pn
+util_rb_2tld euro.tm
+util_rb_2tld eu.tc
+util_rb_2tld exnet.su
 util_rb_2tld extra.hu
+util_rb_2tld fameup.net
+util_rb_2tld fanlink.tv
+util_rb_2tld fere.top
+util_rb_2tld fileave.com
+util_rb_2tld firebaseapp.com
+util_rb_2tld fly.dev
+util_rb_2tld formstack.com
+util_rb_2tld framer.app
+util_rb_2tld free.fr
 util_rb_2tld freehostia.com
+util_rb_2tld free.hr
+util_rb_2tld freeservercity.com
+util_rb_2tld fromru.su
+util_rb_2tld from-tn.com
 util_rb_2tld front.ru
+util_rb_2tld fr.pn
+util_rb_2tld fr.tc
+util_rb_2tld funpic.de
+util_rb_2tld fx.to
 util_rb_2tld geocities.com
+util_rb_2tld geocities.jp
+util_rb_2tld georgia.su
 util_rb_2tld getmyip.com
+util_rb_2tld gigazu.net
+util_rb_2tld github.io
+util_rb_2tld glitch.me
+util_rb_2tld glueup.com
+util_rb_2tld gmxhome.de
+util_rb_2tld gob.ve
+util_rb_2tld go.com
+util_rb_2tld googleapis.com
+util_rb_2tld googlegroups.com
 util_rb_2tld googlepages.com
+util_rb_2tld go.ro
+util_rb_2tld gotdns.ch
+util_rb_2tld government.pn
+util_rb_2tld gov.pn
+util_rb_2tld gr8.com
+util_rb_2tld gratishost.com
+util_rb_2tld great-site.net
 util_rb_2tld helloweb.eu
+util_rb_2tld helpjuice.com
+util_rb_2tld herokuapp.com
+util_rb_2tld hk.tc
+util_rb_2tld homeip.net
+util_rb_2tld home.pl
+util_rb_2tld home.ro
+util_rb_2tld hopto.org
+util_rb_2tld hoster-test.ru
+util_rb_2tld hostevo.com
 util_rb_2tld host.sk
 util_rb_2tld hotbox.ru
 util_rb_2tld hotmail.ru
 util_rb_2tld hu2.ru
+util_rb_2tld hubspot-inbox.com
 util_rb_2tld hut2.ru
+util_rb_2tld iamallama.com
+util_rb_2tld ibelgique.com
 util_rb_2tld iblogger.org
 util_rb_2tld ic.cz
+util_rb_2tld i-cosysteme.com
+util_rb_2tld idoo.com
 util_rb_2tld id.ru
+util_rb_2tld iespana.es
+util_rb_2tld ifrance.com
+util_rb_2tld infinityfreeapp.com
+util_rb_2tld in.net
+util_rb_2tld interia.pl
+util_rb_2tld interii.pl
+util_rb_2tld int.tc
+util_rb_2tld iquebec.com
+util_rb_2tld is-a-cpa.com
+util_rb_2tld is-a-nascarfan.com
+util_rb_2tld isteaching.com
+util_rb_2tld isuisse.com
+util_rb_2tld it.pn
+util_rb_2tld it.tc
+util_rb_2tld iwebsource.com
+util_rb_2tld jimdo.com
+util_rb_2tld jino-net.ru
+util_rb_2tld jpn.com
+util_rb_2tld jp.pn
+util_rb_2tld lpages.co
+util_rb_2tld kalmykia.su
+util_rb_2tld kickme.to
+util_rb_2tld kimsufi.com
+util_rb_2tld kriya.ai
+util_rb_2tld krovatka.su
+util_rb_2tld kr.tc
 util_rb_2tld kwik.to
 util_rb_2tld land.ru
+#util_rb_2tld livejournal.com - Removed per bug 6662 4/7/15 - KAM
+util_rb_2tld lovestoblog.com
+util_rb_2tld mail15.su
+util_rb_2tld mail2k.ru
+util_rb_2tld mail333.su
+util_rb_2tld mail.ru
+util_rb_2tld mangyshlak.su
+util_rb_2tld marssociety.org
+util_rb_2tld mex.com
 util_rb_2tld mine.nu
+util_rb_2tld mjt.lu
 util_rb_2tld mooo.com
+util_rb_2tld msgfocus.com
+util_rb_2tld multiply.com
+util_rb_2tld mx.tc
+util_rb_2tld mybluehost.me
+util_rb_2tld myclickfunnels.com
+util_rb_2tld mydyndns.org
+util_rb_2tld myftp.biz
+util_rb_2tld myftp.org
+util_rb_2tld mygbiz.com
+util_rb_2tld mypi.co
+util_rb_2tld myshopify.com
+util_rb_2tld myvnc.com
+util_rb_2tld na.by
 util_rb_2tld narod.ru
+util_rb_2tld neostrada.pl
+util_rb_2tld netart.com
+util_rb_2tld netdna-cdn.com
+util_rb_2tld netfirms.com
+util_rb_2tld netgroup.de
+util_rb_2tld netlify.app
 util_rb_2tld netsolhost.com
-util_rb_2tld na.by
+util_rb_2tld net.tc
+util_rb_2tld net.vc
 util_rb_2tld newmail.ru
+util_rb_2tld newsmemory.com
 util_rb_2tld nextmail.ru
 util_rb_2tld nightmail.ru
+util_rb_2tld ning.com
 util_rb_2tld nm.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 noip.us
+util_rb_2tld north-kazakhstan.su
+util_rb_2tld no.tc
 util_rb_2tld notlong.com
+util_rb_2tld nov.ru
+util_rb_2tld nov.su
+util_rb_2tld on-fleek.app
+util_rb_2tld onelink.me
+util_rb_2tld one.pl
+util_rb_2tld onfobu.ru
+util_rb_2tld online.de
+util_rb_2tld oplimisme.com
+util_rb_2tld org.rw
+util_rb_2tld org.vc
+util_rb_2tld outrch.com
+util_rb_2tld ovh.net
+util_rb_2tld pages.dev
 util_rb_2tld page.tl page.link
-util_rb_2tld pochta.ru
+util_rb_2tld perso.tc
+util_rb_2tld phpartners.org
+util_rb_2tld ph.tc
+util_rb_2tld pila.pl
+util_rb_2tld pisem.su
+util_rb_2tld plan-net.technology
+util_rb_2tld pl.tc
+util_rb_2tld pochta.com
 util_rb_2tld pochtamt.ru
+util_rb_2tld pochta.ru
 util_rb_2tld pop3.ru
 util_rb_2tld proboards.com
+util_rb_2tld pro.tc
+util_rb_2tld prserv.net
+util_rb_2tld psee.io
+util_rb_2tld qip.ru
+util_rb_2tld qualtrics.com
+util_rb_2tld r2.dev
+util_rb_2tld radio.am
 util_rb_2tld rbcmail.ru
+util_rb_2tld redirectme.net
+util_rb_2tld replit.app
+util_rb_2tld replit.dev
+util_rb_2tld republika.pl
+util_rb_2tld reservemeeting.co
+util_rb_2tld reviewwave.com
 util_rb_2tld rm.ru
+util_rb_2tld ru.com
+util_rb_2tld ru.tc
+util_rb_2tld sa.com
+util_rb_2tld sankung.com
+util_rb_2tld sapo.pt
+util_rb_2tld selfip.com
+util_rb_2tld selfip.net
+util_rb_2tld sendpul.se
+util_rb_2tld sentieo.com
+util_rb_2tld servebbs.com
+util_rb_2tld serveblog.net
+util_rb_2tld serveftp.com
+util_rb_2tld servsocgen.com
+util_rb_2tld se.tc
+util_rb_2tld shop.co
+util_rb_2tld shutterfly.com
+util_rb_2tld site.pro
+util_rb_2tld site.tc
 util_rb_2tld smtp.ru
+util_rb_2tld societe.st
 util_rb_2tld sol.ru
+util_rb_2tld sosblog.com
+util_rb_2tld surge.sh
+util_rb_2tld sytes.net
+util_rb_2tld szm.com
 util_rb_2tld t35.com
+util_rb_2tld t35.net
+util_rb_2tld t3.to
+util_rb_2tld tashkent.su
+util_rb_2tld tempurl.host
+util_rb_2tld test-google-a.com
+util_rb_2tld thrivecart.com
+util_rb_2tld th.tc
+util_rb_2tld to.it
+util_rb_2tld translate.goog
 util_rb_2tld tripod.com
+util_rb_2tld trykalendarai.com
+util_rb_2tld tumblr.com
+util_rb_2tld ucoz.com
+util_rb_2tld ucoz.net
+util_rb_2tld ucoz.ru
 util_rb_2tld uk.to
 util_rb_2tld unblog.fr
+util_rb_2tld uni.cc
+util_rb_2tld unlugar.com
+util_rb_2tld url.st
+util_rb_2tld usa.cc
+util_rb_2tld usedpanda.com
+util_rb_2tld usekalendarai.com
+util_rb_2tld us.tc
 util_rb_2tld us.to
+util_rb_2tld vercel.app
+util_rb_2tld vv.cc
+util_rb_2tld web.app
+util_rb_2tld webcindario.com
+util_rb_2tld web.com
+util_rb_2tld webd.pl
+util_rb_2tld webflow.io
+util_rb_2tld webhop.info
+util_rb_2tld webhop.me
+util_rb_2tld webhop.net
+util_rb_2tld webhop.org
+util_rb_2tld we.bs
+util_rb_2tld webs.com
 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 azerbaijan.su
-util_rb_2tld east-kazakhstan.su
-util_rb_2tld exnet.su
-util_rb_2tld georgia.su
-util_rb_2tld kalmykia.su
-util_rb_2tld mail15.su
-util_rb_2tld mail333.su
-util_rb_2tld mangyshlak.su
-util_rb_2tld nov.su
-util_rb_2tld pisem.su
-util_rb_2tld tashkent.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 wix.com
+util_rb_2tld wixsite.com
+util_rb_2tld wordpress.com
+util_rb_2tld workers.dev
+util_rb_2tld wpenginepowered.com
+util_rb_2tld wufoo.com
+util_rb_2tld wz.cz
 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 xf.cz
+util_rb_2tld xorg.pl
 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 z8.ru
+util_rb_2tld za.com
+util_rb_2tld zapto.org
+util_rb_2tld zendesk.com
+util_rb_2tld zmail.ru
 util_rb_2tld zohosites.com
-util_rb_2tld wixsite.com
-util_rb_2tld firebaseapp.com
-util_rb_2tld web.app
-#
-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
-util_rb_2tld sendpul.se
-util_rb_2tld amplifyapp.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
-
+util_rb_2tld zoom.us
 
 #
 # 3rd level TLD list (SA 3.3+)
@@ -695,61 +829,63 @@ util_rb_2tld myftp.biz
 
 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 blog.friendster.com
+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 blogspot.co.nz
+util_rb_3tld blogspot.co.uk
 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 callback.cloudses.com
 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 cloud.z.com
+util_rb_3tld co.at.lv
+util_rb_3tld co.at.pn
+util_rb_3tld co.at.tc
+util_rb_3tld com.au.pn
 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 co.uk.pn
+util_rb_3tld ct.sendgrid.net
+util_rb_3tld demon.co.uk
+util_rb_3tld docs.google.com
 util_rb_3tld do.sapo.pt
+util_rb_3tld dsasoftweb.com.br
+util_rb_3tld en.alibaba.com
+util_rb_3tld esc.edu.ar
+util_rb_3tld fr-par-1.linodeobjects.com
+util_rb_3tld groups.live.com
 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 home.sapo.pt
+util_rb_3tld hop.clickbank.net
+util_rb_3tld hosted.phplist.com
+util_rb_3tld host.secureserver.net
+util_rb_3tld ipfs.dweb.link
+util_rb_3tld ipfs.flk-ipfs.xyz
+util_rb_3tld lkd.co.im
+util_rb_3tld ltd.co.im
+util_rb_3tld mobile.web.tr
+util_rb_3tld no-ip.co.uk
+util_rb_3tld no.sapo.pt
+util_rb_3tld on.fleek.co
 util_rb_3tld or.at.lv
-util_rb_3tld co.at.tc
-util_rb_3tld qld.edu.au
+util_rb_3tld paginas.sapo.pt
 util_rb_3tld perso.neuf.fr
 util_rb_3tld perso.sfr.fr
-util_rb_3tld hop.clickbank.net
+util_rb_3tld plc.co.im
+util_rb_3tld privat.t-online.de
+util_rb_3tld profile.live.com
+util_rb_3tld qiye.163.com
+util_rb_3tld qld.edu.au
+util_rb_3tld robsonhost.com.br
+util_rb_3tld sakura.ne.jp
+util_rb_3tld skydrive.live.com
+util_rb_3tld spaces.live.com
+util_rb_3tld spaces.msn.com
 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
-util_rb_3tld ct.sendgrid.net
-util_rb_3tld on.fleek.co
+util_rb_3tld web.aplus.net
+util_rb_3tld web.fc2.com
+util_rb_3tld web.officelive.com
 
 endif
-
-
Index: spamassassin/rules/20_dnsbl_tests.cf
===================================================================
--- spamassassin.orig/rules/20_dnsbl_tests.cf
+++ spamassassin/rules/20_dnsbl_tests.cf
@@ -147,31 +147,52 @@ reuse RCVD_IN_IADB_VOUCHED
 
 # ---------------------------------------------------------------------------
 # Validity (née Return Path, SenderScore) reputation DNSBLs
-# https://issues.apache.org/SpamAssassin/show_bug.cgi?id=6247
+# https://bz.apache.org/SpamAssassin/show_bug.cgi?id=6247
 # Certified:
 # https://www.validity.com/resource-center/fact-sheet-certification/
 # (replaces RCVD_IN_BSP_TRUSTED, RCVD_IN_BSP_OTHER, RCVD_IN_SSC_TRUSTED_COI, RCVD_IN_RP_CERTIFIED)
-header RCVD_IN_VALIDITY_CERTIFIED     eval:check_rbl_txt('ssc-firsttrusted', 'sa-trusted.bondedsender.org.')
+header RCVD_IN_VALIDITY_CERTIFIED     eval:check_rbl('ssc-firsttrusted', 'sa-trusted.bondedsender.org.', '^127\.0\.0\.')
 describe RCVD_IN_VALIDITY_CERTIFIED   Sender in Validity Certification - Contact certification@validity.com
 tflags RCVD_IN_VALIDITY_CERTIFIED     net nice publish
 reuse RCVD_IN_VALIDITY_CERTIFIED      RCVD_IN_RP_CERTIFIED
 
+header RCVD_IN_VALIDITY_CERTIFIED_BLOCKED    eval:check_rbl('ssc-firsttrusted', 'sa-trusted.bondedsender.org.', '127.255.255.255')
+describe RCVD_IN_VALIDITY_CERTIFIED_BLOCKED  ADMINISTRATOR NOTICE: The query to Validity was blocked.  See https://knowledge.validity.com/hc/en-us/articles/20961730681243 for more information.
+tflags RCVD_IN_VALIDITY_CERTIFIED_BLOCKED    net publish
+reuse RCVD_IN_VALIDITY_CERTIFIED_BLOCKED     RCVD_IN_VALIDITY_CERTIFIED_BLOCKED
+
 # Safe:
 # https://www.validity.com/resource-center/fact-sheet-certification/
 # (replaces HABEAS_ACCREDITED_COI, HABEAS_ACCREDITED_SOI, HABEAS_CHECKED, RCVD_IN_RP_SAFE)
-header RCVD_IN_VALIDITY_SAFE     eval:check_rbl_txt('ssc-firsttrusted','sa-accredit.habeas.com.')
+header RCVD_IN_VALIDITY_SAFE     eval:check_rbl('ssc-firsttrusted', 'sa-accredit.habeas.com.', '^127\.0\.0\.')
 describe RCVD_IN_VALIDITY_SAFE   Sender in Validity Safe - Contact certification@validity.com
 tflags RCVD_IN_VALIDITY_SAFE     net nice publish
 reuse RCVD_IN_VALIDITY_SAFE      RCVD_IN_RP_SAFE
 
+header RCVD_IN_VALIDITY_SAFE_BLOCKED    eval:check_rbl('ssc-firsttrusted', 'sa-accredit.habeas.com.', '127.255.255.255')
+describe RCVD_IN_VALIDITY_SAFE_BLOCKED  ADMINISTRATOR NOTICE: The query to Validity was blocked.  See https://knowledge.validity.com/hc/en-us/articles/20961730681243 for more information.
+tflags RCVD_IN_VALIDITY_SAFE_BLOCKED    net publish
+reuse RCVD_IN_VALIDITY_SAFE_BLOCKED     RCVD_IN_VALIDITY_SAFE_BLOCKED
+
 # Validity RPBL (née Return Path Reputation Network Blacklist - RNBL):
 # https://www.senderscore.org/blocklistlookup/
 # (replaces RCVD_IN_RP_RNBL)
-header RCVD_IN_VALIDITY_RPBL     eval:check_rbl('rnbl-lastexternal','bl.score.senderscore.com.')
+header RCVD_IN_VALIDITY_RPBL     eval:check_rbl('rnbl-lastexternal', 'bl.score.senderscore.com.', '^127\.0\.0\.')
 describe RCVD_IN_VALIDITY_RPBL   Relay in Validity RPBL, https://senderscore.org/blocklistlookup/
 tflags RCVD_IN_VALIDITY_RPBL     net publish
 reuse RCVD_IN_VALIDITY_RPBL      RCVD_IN_RP_RNBL
 
+header RCVD_IN_VALIDITY_RPBL_BLOCKED    eval:check_rbl('rnbl-lastexternal', 'bl.score.senderscore.com.', '127.255.255.255')
+describe RCVD_IN_VALIDITY_RPBL_BLOCKED  ADMINISTRATOR NOTICE: The query to Validity was blocked.  See https://knowledge.validity.com/hc/en-us/articles/20961730681243 for more information.
+tflags RCVD_IN_VALIDITY_RPBL_BLOCKED    net publish
+reuse RCVD_IN_VALIDITY_RPBL_BLOCKED     RCVD_IN_VALIDITY_RPBL_BLOCKED
+
+if can(Mail::SpamAssassin::Conf::feature_dns_block_rule)
+dns_block_rule RCVD_IN_VALIDITY_CERTIFIED_BLOCKED sa-trusted.bondedsender.org
+dns_block_rule RCVD_IN_VALIDITY_SAFE_BLOCKED sa-accredit.habeas.com
+dns_block_rule RCVD_IN_VALIDITY_RPBL_BLOCKED bl.score.senderscore.com
+endif
+
 endif
 
 #These are old and useless - The zones are no longer supported by SpamHaus 2018-12-12
Index: spamassassin/rules/20_freemail_domains.cf
===================================================================
--- spamassassin.orig/rules/20_freemail_domains.cf
+++ spamassassin/rules/20_freemail_domains.cf
@@ -36,7 +36,7 @@
 ifplugin Mail::SpamAssassin::Plugin::FreeMail
 
 # Initial import from old FreeMail.pm / 090428
-freemail_domains 020.co.uk 123.com 123box.net 123india.com 123mail.cl
+freemail_domains 020.co.uk 123.com 123box.net 123india.com 123mail.cl 111.com
 freemail_domains 123mail.org 123qwe.co.uk 138mail.com 141.ro 150mail.com 150ml.com 16mail.com
 freemail_domains 1963chevrolet.com 1963pontiac.com 1netdrive.com 1st-website.com 1stpd.net
 freemail_domains 2-mail.com 20after4.com 21cn.com 24h.co.jp 24horas.com 271soundview.com
@@ -220,9 +220,9 @@ freemail_domains machinecandy.com macmai
 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.dk mail.ee
+freemail_domains mail.co.uk 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 mail.pt mail.ru mail.uk 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
 freemail_domains mailblocks.com mailbolt.com mailbox.as mailbox.co.za mailbox.gr mailbox.hu
 freemail_domains mailbox.sk mailc.net mailcan.com mailcircuit.com mailclub.fr mailclub.net
@@ -304,7 +304,7 @@ 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 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 rollin.com rome.com romymichele.com royal.net rpharmacist.com *.rr.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
 freemail_domains saigonnet.vn saint-mike.org
@@ -363,7 +363,7 @@ freemail_domains uyuyuy.com v-sexi.com v
 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 vodafone.*
+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 walla.co.il wallet.com wam.co.za 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
@@ -491,7 +491,7 @@ freemail_domains grapemail.net greatauto
 freemail_domains happyhippo.com hateinthebox.com houseofhorrors.com hugkiss.com
 freemail_domains hullnumber.com idunno4recipes.com ihatenetscape.com
 freemail_domains intimatefire.com irow.com jazzemail.com juanitabynum.com
-freemail_domains kanoodle.com kickboxing.com kidrock.com kinkyemail.com
+freemail_domains kakao.com kanoodle.com kickboxing.com kidrock.com kinkyemail.com
 freemail_domains kool-things.com latinabarbie.com latinogreeks.com leesville.com
 freemail_domains loveemail.com lowrider.com lucky7lotto.net madeniggaz.net
 freemail_domains mailbomb.com marillion.net megarave.com mofa.com motley.com
@@ -540,6 +540,8 @@ freemail_domains latchess.com loveis.lv
 # Microsoft's new service 2013-10-18-khopesh
 freemail_domains *.onmicrosoft.com
 
+# Google test domains
+freemail_domains *.test-google-a.com
 
 endif
 
Index: spamassassin/rules/20_phrases.cf
===================================================================
--- spamassassin.orig/rules/20_phrases.cf
+++ spamassassin/rules/20_phrases.cf
@@ -154,7 +154,7 @@ describe OBSCURED_EMAIL		Message seems t
 body BANG_OPRAH      		/\boprah!/i
 describe BANG_OPRAH      	Talks about Oprah with an exclamation!
 
-#adding boundary checks: https://issues.apache.org/SpamAssassin/show_bug.cgi?id=6870
+#adding boundary checks: https://bz.apache.org/SpamAssassin/show_bug.cgi?id=6870
 body ACT_NOW_CAPS               /\bA(?i:ct) N(?i:ow)\b/
 describe ACT_NOW_CAPS		Talks about 'acting now' with capitals
 
Index: spamassassin/rules/20_uri_tests.cf
===================================================================
--- spamassassin.orig/rules/20_uri_tests.cf
+++ spamassassin/rules/20_uri_tests.cf
@@ -101,7 +101,7 @@ describe SPOOF_NET2COM 	URI contains ".n
 uri URI_HEX		m%^https?://[^/?&\#]*\b(?![0-9a-f]{0,12}[a-f]{3})[0-9a-f]{6,}\b%i
 describe URI_HEX	URI hostname has long hexadecimal sequence
 
-uri URI_NOVOWEL		m%^https?://[^/?&\#]*[bcdfgjklmnpqrstvwxz]{7}%i
+uri URI_NOVOWEL		m%^https?://[^/?&\#]*[bcdfgjklmnpqrstvwxz]{7}(?!.{8,32}awstrack\.me).{8,32}%i
 describe URI_NOVOWEL	URI hostname has long non-vowel sequence
 tflags URI_NOVOWEL      userconf     # lock scores low
 
Index: spamassassin/rules/25_dnswl.cf
===================================================================
--- spamassassin.orig/rules/25_dnswl.cf
+++ spamassassin/rules/25_dnswl.cf
@@ -59,7 +59,7 @@ reuse  RCVD_IN_DNSWL_HI
 ## score RCVD_IN_DNSWL_HI		-8
 
 header	RCVD_IN_DNSWL_BLOCKED	eval:check_rbl_sub('dnswl-firsttrusted', '^127\.0\.\d+\.255$')
-describe RCVD_IN_DNSWL_BLOCKED	ADMINISTRATOR NOTICE: The query to DNSWL was blocked.  See http://wiki.apache.org/spamassassin/DnsBlocklists\#dnsbl-block for more information.
+describe RCVD_IN_DNSWL_BLOCKED	ADMINISTRATOR NOTICE: The query to DNSWL was blocked.  See http://wiki.apache.org/spamassassin/DnsBlocklists\#DnsBlocklists-dnsbl-block for more information.
 tflags RCVD_IN_DNSWL_BLOCKED	net noautolearn
 reuse  RCVD_IN_DNSWL_BLOCKED
 
Index: spamassassin/rules/25_uribl.cf
===================================================================
--- spamassassin.orig/rules/25_uribl.cf
+++ spamassassin/rules/25_uribl.cf
@@ -213,6 +213,25 @@ describe        URIBL_ABUSE_SURBL  Conta
 tflags          URIBL_ABUSE_SURBL  net notrim
 reuse           URIBL_ABUSE_SURBL
 
+# New datasets Bug #8134
+# DM - Disposable mail domains
+urirhssub       URIBL_DM_SURBL  multi.surbl.org.        A   4
+body            URIBL_DM_SURBL  eval:check_uridnsbl('URIBL_DM_SURBL')
+describe        URIBL_DM_SURBL  Contains an URL listed in the DM SURBL blocklist
+tflags          URIBL_DM_SURBL  net notrim
+reuse           URIBL_DM_SURBL
+
+#CT - Click tracker domains
+# This list contains domains used for tracking clicks in emails.
+# We only list domains used by senders that send emails to mailboxes
+# without confirmed opt-in (e.g. emails also sent to spamtraps).
+
+urirhssub       URIBL_CT_SURBL  multi.surbl.org.        A   32
+body            URIBL_CT_SURBL  eval:check_uridnsbl('URIBL_CT_SURBL')
+describe        URIBL_CT_SURBL  Contains an URL listed in the CT SURBL blocklist
+tflags          URIBL_CT_SURBL  net notrim
+reuse           URIBL_CT_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')
@@ -220,6 +239,14 @@ describe        SURBL_BLOCKED   ADMINIST
 tflags          SURBL_BLOCKED   net noautolearn notrim
 reuse           SURBL_BLOCKED
 
+
+if can(Mail::SpamAssassin::Conf::feature_check_hashbl_emails)
+# Header BL Bug #8136
+header         URIBL_MULTI_SURBL_HEADERS	eval:check_hashbl_emails('multi.surbl.org', 'raw/max=10/shuffle/host', 'ALLFROM/Reply-To', '^127\.0\.0\.\d+$')
+priority       URIBL_MULTI_SURBL_HEADERS       	-100
+describe       URIBL_MULTI_SURBL_HEADERS       	Domain found in surbl multi for from or reply-to 
+endif
+
 if can(Mail::SpamAssassin::Conf::feature_dns_block_rule)
 dns_block_rule SURBL_BLOCKED multi.surbl.org
 endif
Index: spamassassin/rules/25_url_shortener.cf
===================================================================
--- spamassassin.orig/rules/25_url_shortener.cf
+++ spamassassin/rules/25_url_shortener.cf
@@ -75,6 +75,7 @@ url_shortener bizj.us
 url_shortener chilp.it
 url_shortener conta.cc
 url_shortener clck.ru
+url_shortener cli.re
 url_shortener crks.me
 url_shortener cutt.ly
 url_shortener cutwin.biz
@@ -136,8 +137,10 @@ url_shortener simurl.net
 url_shortener slidesha.re
 url_shortener smarturl.it
 url_shortener smfu.in
+url_shortener smollq.cc
 url_shortener snip.ly
 url_shortener snkr.me
+url_shortener sprl.in
 url_shortener stpmvt.com
 url_shortener t.co
 url_shortener t.ly
@@ -160,6 +163,7 @@ url_shortener urls.im
 url_shortener urlz.at
 url_shortener urlzs.com
 url_shortener utfg.sk
+url_shortener v.gd
 url_shortener wow.link
 url_shortener wp.me
 url_shortener x.co
@@ -305,8 +309,7 @@ if !can(Mail::SpamAssassin::Plugin::Deco
 ## perl -pe 'while (<>) {/^\s*url_shortener\s+(\S+)/ or next;$s=quotemeta($1);$s=~s/^\\./\\w+\\./;push @a,$s} print "uri __URL_SHORTENER m,^https?://(?:".join("|",@a).")/,i\n"' < 25_url_shortener.cf
 ##
 
-uri __URL_SHORTENER m,^https?://(?:\w+\.ftn\.app|\w+\.page\.link|\w+\.short\.gy|\w+\.shortz\.me|0rz\.tw|4sq\.com|4url\.cc|afly\.co|ai6\.net|amzn\.com|amzn\.to|b\.link|b23\.ru|binged\.it|bit\.do|bit\.ly|bitly\.com|bizj\.us|chilp\.it|conta\.cc|crks\.me|cutt\.ly|cutwin\.biz|dai\.ly|db\.tt|disq\.us|dlvr\.it|doi\.org|doiop\.com|eepurl\.com|fb\.me|fire\.to|firsturl\.de|firsturl\.net|flic\.kr|gdurl\.com|go\.ly|goo\.gl|goolnk\.com|gplinks\.in|guest\.link|hellotxt\.com|hop\.kz|hotshorturl\.com|hub\.am|huff\.to|hurl\.it|hyperurl\.co|inx\.lv|is\.gd|it2\.in|j\.mp|kore\.us|kurl\.no|l\.bestsellers\.to|lnk\.sk|lnkd\.in|lnkiy\.in|lru\.jp|mrte\.ch|n9\.cl|ndurl\.com|onion\.com|ouo\.io|ow\.ly|owl\.li|pduda\.mobi|rb\.gy|redir\.ec|rotf\.lol|s\.apache\.org|s\.free\.fr|s\.id|shar\.es|shorl\.com|shortn\.me|shorturl\.at|simurl\.net|slidesha\.re|smarturl\.it|smfu\.in|snip\.ly|snkr\.me|stpmvt\.com|t\.co|t\.ly|tcrn\.ch|tgr\.ph|tiny\.cc|tiny\.one|tiny\.pl|tinylink\.in|tinyurl\.com|to\.ly|trib\.al|twixar\.me|u\.nu|u\.to|url\.ie|urlcut\.com|urlday\.cc|urls\.im|urlz\.at|urlzs\.com|utfg\.sk|wow\.link|wp\.me|x\.co|x\.hypem\.com|xurl\.es|yhoo\.it|youtu\.be|z23\.ru|zurl\.ws|www\.shrunken\.com|0\.gp|2\.gp|2\.ly|3\.ly|4\.gp|4\.ly|5\.gp|6\.gp|6\.ly|7\.ly|8\.ly|9\.ly|g\.asia|p\.asia|ur3\.us|alturl\.com|\w+\.1sta\.com|\w+\.24ex\.com|\w+\.2fear\.com|\w+\.2fortune\.com|\w+\.2freedom\.com|\w+\.2hell\.com|\w+\.2savvy\.com|\w+\.2truth\.com|\w+\.2tunes\.com|\w+\.2ya\.com|\w+\.alturl\.com|\w+\.antiblog\.com|\w+\.bigbig\.com|\w+\.dealtap\.com|\w+\.ebored\.com|\w+\.echoz\.com|\w+\.filetap\.com|\w+\.funurl\.com|\w+\.headplug\.com|\w+\.hereweb\.com|\w+\.hitart\.com|\w+\.mirrorz\.com|\w+\.mp3update\.com|\w+\.shorturl\.com|\w+\.spyw\.com|\w+\.vze\.com|\w+\.arecool\.net|\w+\.iscool\.net|\w+\.isfun\.net|\w+\.tux\.nu|kisa\.link|www\.kisa\.link|bul\.tc|cy\.tc|fn\.tc|ftp\.tc|gr\.tc|hbr\.tc|heg\.tc|ins\.tc|ko\.tc|kod\.tc|lol\.tc|m2\.tc|ml\.tc|mmo\.tc|oy\.tc|pc\.tc|pubg\.tc|pvp\.tc|sro\.tc|tek\.link|tw\.tc|grabify\.link|catsnthing\.com|catsnthings\.fun|cheapcinema\.club|dateing\.club|fortnight\.space|fortnitechat\.site|freegiftcards\.co|gaming\-at\-my\.best|gamingfun\.me|headshot\.monster|imageshare\.best|joinmy\.site|leancoding\.co|locations\.quest|lovebird\.guru|myprivate\.pics|noodshare\.pics|partpicker\.shop|progaming\.monster|screenshare\.pics|screenshot\.best|shhh\.lol|shrekis\.life|sportshub\.bar|stopify\.co|trulove\.guru|yourmy\.monster|\w+\.app\.link|bitly\.ws|han\.gl|lukora\.cz|shorturl\.asia|m2\.do)/,i
-
+uri __URL_SHORTENER m,^https?://(?:\w+\.ftn\.app|\w+\.page\.link|\w+\.short\.gy|\w+\.shortz\.me|0rz\.tw|4sq\.com|4url\.cc|afly\.co|ai6\.net|amzn\.com|amzn\.to|b\.link|b23\.ru|binged\.it|bit\.do|bit\.ly|bitly\.com|bizj\.us|chilp\.it|conta\.cc|clck\.ru|cli\.re|crks\.me|cutt\.ly|cutwin\.biz|dai\.ly|db\.tt|disq\.us|dlvr\.it|doi\.org|doiop\.com|eepurl\.com|fb\.me|fire\.to|firsturl\.de|firsturl\.net|flic\.kr|gdurl\.com|go\.ly|goo\.gl|goolnk\.com|gplinks\.in|guest\.link|hellotxt\.com|hop\.kz|hotshorturl\.com|hub\.am|huff\.to|hurl\.it|hyperurl\.co|inx\.lv|is\.gd|it2\.in|j\.mp|kore\.us|kurl\.no|l\.bestsellers\.to|lnk\.sk|lnkd\.in|lnkiy\.in|lru\.jp|mrte\.ch|n9\.cl|ndurl\.com|onion\.com|ouo\.io|ow\.ly|owl\.li|pduda\.mobi|rb\.gy|redir\.ec|rotf\.lol|s\.apache\.org|s\.free\.fr|s\.id|shar\.es|shorl\.com|shortn\.me|shorturl\.at|simurl\.net|slidesha\.re|smarturl\.it|smfu\.in|smollq\.cc|snip\.ly|snkr\.me|sprl\.in|stpmvt\.com|t\.co|t\.ly|tcrn\.ch|tgr\.ph|tiny\.cc|tiny\.one|tiny\.pl|tinylink\.in|tinyurl\.com|to\.ly|trib\.al|twixar\.me|u\.nu|u\.to|url\.ie|urlcut\.com|urlday\.cc|urls\.im|urlz\.at|urlzs\.com|utfg\.sk|v\.gd|wow\.link|wp\.me|x\.co|x\.hypem\.com|xurl\.es|yhoo\.it|youtu\.be|z23\.ru|zurl\.ws|www\.shrunken\.com|0\.gp|2\.gp|2\.ly|3\.ly|4\.gp|4\.ly|5\.gp|6\.gp|6\.ly|7\.ly|8\.ly|9\.ly|g\.asia|p\.asia|ur3\.us|alturl\.com|\w+\.1sta\.com|\w+\.24ex\.com|\w+\.2fear\.com|\w+\.2fortune\.com|\w+\.2freedom\.com|\w+\.2hell\.com|\w+\.2savvy\.com|\w+\.2truth\.com|\w+\.2tunes\.com|\w+\.2ya\.com|\w+\.alturl\.com|\w+\.antiblog\.com|\w+\.bigbig\.com|\w+\.dealtap\.com|\w+\.ebored\.com|\w+\.echoz\.com|\w+\.filetap\.com|\w+\.funurl\.com|\w+\.headplug\.com|\w+\.hereweb\.com|\w+\.hitart\.com|\w+\.mirrorz\.com|\w+\.mp3update\.com|\w+\.shorturl\.com|\w+\.spyw\.com|\w+\.vze\.com|\w+\.arecool\.net|\w+\.iscool\.net|\w+\.isfun\.net|\w+\.tux\.nu|kisa\.link|www\.kisa\.link|bul\.tc|cy\.tc|fn\.tc|ftp\.tc|gr\.tc|hbr\.tc|heg\.tc|ins\.tc|ko\.tc|kod\.tc|lol\.tc|m2\.tc|ml\.tc|mmo\.tc|oy\.tc|pc\.tc|pubg\.tc|pvp\.tc|sro\.tc|tek\.link|tw\.tc|grabify\.link|catsnthing\.com|catsnthings\.fun|cheapcinema\.club|dateing\.club|fortnight\.space|fortnitechat\.site|freegiftcards\.co|gaming\-at\-my\.best|gamingfun\.me|headshot\.monster|imageshare\.best|joinmy\.site|leancoding\.co|locations\.quest|lovebird\.guru|myprivate\.pics|noodshare\.pics|partpicker\.shop|progaming\.monster|screenshare\.pics|screenshot\.best|shhh\.lol|shrekis\.life|sportshub\.bar|stopify\.co|trulove\.guru|yourmy\.monster|\w+\.app\.link|bitly\.ws|han\.gl|lukora\.cz|shorturl\.asia|m2\.do)/,i
 
 endif
 
Index: spamassassin/rules/50_scores.cf
===================================================================
--- spamassassin.orig/rules/50_scores.cf
+++ spamassassin/rules/50_scores.cf
@@ -284,7 +284,6 @@ score RCVD_FORGED_WROTE 0 # n=0 n=1 n=2
 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_PSBL 0 2.700 0 2.700 # n=0 n=2
-score RCVD_IN_VALIDITY_RPBL 0 1.284 0 1.310 # n=0 n=2
 score RCVD_MAIL_COM 0 # n=0 n=1 n=2 n=3
 score RDNS_DYNAMIC 2.639 0.363 1.663 0.982
 score RDNS_LOCALHOST 3.700 0.969 2.345 0.001
@@ -518,12 +517,16 @@ score RCVD_IN_ZEN_BLOCKED 0 0.001 0 0.00
 # https://www.validity.com/resource-center/fact-sheet-certification/
 # CERTIFIED is a subset of SAFE, thus the score is cumulative.
 # -2 + -3 = -5 points for CERTIFIED
-score RCVD_IN_VALIDITY_CERTIFIED 0.0 -3.0 0.0 -3.0
-score RCVD_IN_VALIDITY_SAFE 0.0 -2.0 0.0 -2.0
+# disabled by default 2025-05-11 WKC bz#8278
+score RCVD_IN_VALIDITY_CERTIFIED 0
+score RCVD_IN_VALIDITY_SAFE 0
+score RCVD_IN_VALIDITY_RPBL 0
+# Uncomment these if you enable the ones above
+#score RCVD_IN_VALIDITY_SAFE_BLOCKED 0.001
+#score RCVD_IN_VALIDITY_CERTIFIED_BLOCKED  0.001
+#score RCVD_IN_VALIDITY_RPBL_BLOCKED 0.001
 
-# DNSWL is a commercial service that requires payment for servers over 100K queries daily.
-# Unfortunately, they will return true answers for DNS servers they consider abusive so
-# SA Admins must enable these rules manually.
+# DNSWL is a "free for most" service that requires subscriptions for servers making over 100K queries daily.
 #
 score RCVD_IN_DNSWL_NONE 0 -0.0001 0 -0.0001
 score RCVD_IN_DNSWL_LOW 0 -0.7 0 -0.7
@@ -996,6 +999,7 @@ if (version >= 3.004000)
   # FIXED SCORES
   # TEMPORARILY LOWERED - adjust these higher after GA is done
   # (pending discussion: Welcomelists need scores, but they shouldn't effect the scoring of spam detection rules.)
+  score RCVD_IN_MSPIKE_H2      -0.01
   score RCVD_IN_MSPIKE_H3      -0.01
   score RCVD_IN_MSPIKE_H4      -0.01
   score RCVD_IN_MSPIKE_H5      -1.0
Index: spamassassin/rules/60_bayes_stopwords.cf
===================================================================
--- spamassassin.orig/rules/60_bayes_stopwords.cf
+++ spamassassin/rules/60_bayes_stopwords.cf
@@ -56,7 +56,7 @@ if (version >= 4.000000)
   bayes_stopword_pt (?^:(?:aqu(?:el(?:as?|es?)|ilo)|como|de(?:l(?:as?|es?)|pois)|e(?:l(?:as|es)|ntre|ram|s(?:s(?:as?|es?)|t(?:a(?:(?:mos|vam?|s))?|e(?:(?:ja(?:m(?:os)?)?|ve|s))?|iv(?:e(?:(?:mos|r(?:(?:am?|em|mos))?|ssem?))?|\xc3\xa9(?:ramos|ssemos))|ou|\xc3(?:\xa1(?:vamos)?|\xa3o))))|f(?:o(?:mos|r(?:am?|em|mos)|ssem?)|\xc3\xb4(?:ramos|ssemos))|h(?:a(?:ja(?:m(?:os)?)?|vemos)|ouv(?:e(?:(?:mos|r(?:(?:am?|e(?:m(?:os)?|i)|iam?|mos|\xc3(?:\xa3o|\xadamos|\xa1)))?|ssem?))?|\xc3\xa9(?:ramos|ssemos)))|is(?:so|to)|lhes|m(?:ais|e(?:smo|us)|inhas?|uito)|n(?:oss(?:as?|os?)|uma)|p(?:ara|el(?:as?|os?))|qu(?:a(?:ndo|l)|em)|s(?:e(?:ja(?:m(?:os)?)?|r(?:e(?:mos|i)|iam?|\xc3(?:\xa3o|\xadamos|\xa1))|us)|omos|uas)|t(?:amb\xc3\xa9m|e(?:mos|nh(?:a(?:m(?:os)?)?|o)|r(?:e(?:mos|i)|iam?|\xc3(?:\xa3o|\xadamos|\xa1))|us|ve)|i(?:nham?|v(?:e(?:(?:mos|r(?:(?:am?|em|mos))?|ssem?))?|\xc3\xa9(?:ramos|ssemos)))|uas|\xc3\xadnhamos)|voc\xc3\xaas?|\xc3\xa9ramos))
 
   # Russian
-  bayes_stopword_ru (?^:(?:\xd0(?:\xb1(?:\xd0\xbe\xd0\xbb(?:\xd0\xb5\xd0\xb5|\xd1\x8c\xd1\x88\xd0\xb5)|\xd1(?:\x83\xd0\xb4(?:\xd0\xb5\xd1\x82|\xd1\x82\xd0\xbe)|\x8b(?:\xd0\xbb\xd0[\xb0\xb8\xbe]|\xd1\x82\xd1\x8c)))|\xb2(?:\xd0(?:\xb4\xd1\x80\xd1\x83\xd0\xb3|\xb5\xd0\xb4\xd1\x8c|\xbf\xd1\x80\xd0\xbe\xd1\x87\xd0\xb5\xd0\xbc)|\xd1\x81\xd0\xb5(?:\xd0\xb3\xd0(?:\xb4\xd0\xb0|\xbe)|\xd1\x85))|\xb4(?:\xd0\xb0\xd0\xb6\xd0\xb5|\xd1\x80\xd1\x83\xd0\xb3\xd0\xbe\xd0\xb9)|\xb5\xd1\x81(?:\xd0\xbb\xd0\xb8|\xd1\x82\xd1\x8c)|\xb7\xd0(?:\xb0\xd1\x87\xd0\xb5\xd0\xbc|\xb4\xd0\xb5\xd1\x81\xd1\x8c)|\xb8\xd0\xbd\xd0\xbe\xd0\xb3\xd0\xb4\xd0\xb0|\xba(?:\xd0(?:\xb0\xd0\xba\xd0(?:\xb0\xd1\x8f|\xbe\xd0\xb9)|\xbe\xd0(?:\xb3\xd0\xb4\xd0\xb0|\xbd\xd0\xb5\xd1\x87\xd0\xbd\xd0\xbe))|\xd1\x83\xd0\xb4\xd0\xb0)|\xbb\xd1\x83\xd1\x87\xd1\x88\xd0\xb5|\xbc\xd0(?:\xb5\xd0(?:\xb6\xd0\xb4\xd1\x83|\xbd\xd1\x8f)|\xbd\xd0\xbe\xd0\xb3\xd0\xbe|\xbe\xd0\xb6\xd0(?:\xb5\xd1\x82|\xbd\xd0\xbe))|\xbd\xd0(?:\xb0\xd0(?:\xb4\xd0\xbe|\xba\xd0\xbe\xd0\xbd\xd0\xb5\xd1\x86)|\xb5\xd0(?:\xb3\xd0\xbe|\xbb\xd1\x8c\xd0\xb7\xd1\x8f)|\xb8(?:\xd0(?:\xb1\xd1\x83\xd0\xb4\xd1\x8c|\xba\xd0\xbe\xd0\xb3\xd0\xb4\xd0\xb0)|\xd1\x87\xd0\xb5\xd0\xb3\xd0\xbe))|\xbe\xd0(?:\xb4\xd0\xb8\xd0\xbd|\xbf\xd1\x8f\xd1\x82\xd1\x8c)|\xbf\xd0(?:\xb5\xd1\x80\xd0\xb5\xd0\xb4|\xbe\xd1(?:\x81\xd0\xbb\xd0\xb5|\x82\xd0\xbe\xd0\xbc(?:\xd1\x83)?|\x87\xd1\x82\xd0\xb8)))|\xd1(?:\x80\xd0\xb0\xd0\xb7\xd0\xb2\xd0\xb5|\x81\xd0(?:\xb2\xd0\xbe\xd1\x8e|\xb5\xd0(?:\xb1(?:\xd0\xb5|\xd1\x8f)|\xb9\xd1\x87\xd0\xb0\xd1\x81)|\xbe\xd0\xb2\xd1\x81\xd0\xb5\xd0\xbc)|\x82\xd0(?:\xb0\xd0\xba\xd0\xbe\xd0\xb9|\xb5\xd0(?:\xb1\xd1\x8f|\xbf\xd0\xb5\xd1\x80\xd1\x8c)|\xbe\xd0(?:\xb3\xd0(?:\xb4\xd0\xb0|\xbe)|\xb6\xd0\xb5|\xbb\xd1\x8c\xd0\xba\xd0\xbe))|\x85\xd0\xbe\xd1(?:\x80\xd0\xbe\xd1\x88\xd0\xbe|\x82\xd1\x8c)|\x87(?:\xd0\xb5(?:\xd0\xb3\xd0\xbe|\xd1\x80\xd0\xb5\xd0\xb7)|\xd1(?:\x82\xd0\xbe\xd0\xb1(?:\xd1\x8b)?|\x83\xd1\x82\xd1\x8c))|\x8d\xd1\x82\xd0\xbe(?:\xd0(?:\xb3\xd0\xbe|[\xb9\xbc])|\xd1\x82))))
+  bayes_stopword_ru (?^:(?:\xd0(?:\x92\xd0\xb0(?:\xd0\xbc|\xd1\x81)|\x95\xd1\x81\xd0\xbb\xd0\xb8|\x97\xd0\xb4\xd1\x80\xd0\xb0\xd0\xb2\xd1\x81\xd1\x82\xd0\xb2\xd1\x83\xd0\xb9\xd1\x82\xd0\xb5|\xb1(?:\xd0\xb5\xd0\xb7|\xd1\x83\xd0\xb4\xd0\xb5\xd1\x82)|\xb2\xd0\xb0\xd1\x81|\xb4\xd0\xbb\xd1\x8f|\xb5(?:\xd0\xb3\xd0\xbe|\xd1\x81(?:\xd0\xbb\xd0\xb8|\xd1\x82\xd1\x8c))|\xb7\xd0\xb0|\xb8\xd0(?:\xb7|\xbb\xd0\xb8)|\xbc(?:\xd0\xbe\xd0\xb6\xd0\xbd\xd0\xbe|\xd1\x8b)|\xbd(?:\xd0(?:\xb0|\xb5)|\xd1\x83\xd0\xb6\xd0\xbd\xd0\xbe)|\xbe\xd1\x82|\xbf\xd0\xbe)|\xd1(?:\x82\xd0\xbe\xd0\xbb\xd1\x8c\xd0\xba\xd0\xbe|\x87\xd1\x82\xd0\xbe|\x8d\xd1\x82\xd0\xbe)))
 
   # Swedish
   bayes_stopword_se (?^:(?:all[at]|bl(?:ev|i(?:vit|r))|d(?:e(?:nna|ras|ssa?|tta)|i(?:na|tt))|e(?:fter|ller)|fr\xc3\xa5n|h(?:a(?:de|ns)|ennes?|onom)|i(?:cke|n(?:gen|om|te))|kunde|m(?:ellan|i(?:na|tt)|ycket)|n\xc3\xa5g(?:o[nt]|ra)|s(?:amma|edan|i(?:na|tta)|j\xc3\xa4lv|kulle|\xc3\xa5dan[at]?)|till|u(?:nder|tan)|v(?:ar(?:f\xc3\xb6r|it|je|[ast])|ilk(?:as?|e[nt])|\xc3\xa5r[at])|\xc3\xb6ver))
Index: spamassassin/rules/60_welcomelist_auth.cf
===================================================================
--- spamassassin.orig/rules/60_welcomelist_auth.cf
+++ spamassassin/rules/60_welcomelist_auth.cf
@@ -91,7 +91,6 @@ def_welcomelist_auth *@capitalone.com
 def_welcomelist_auth *@*.capitalone.com
 def_welcomelist_auth *@*.capitaloneemail.com
 def_welcomelist_auth *@*.khanacademy.org
-def_welcomelist_auth *@*.wordpress.com
 def_welcomelist_auth *@statefarm.com
 def_welcomelist_auth *@*.statefarminfo.com
 def_welcomelist_auth *@*.visa.com
@@ -99,8 +98,6 @@ def_welcomelist_auth *@visapayablesautom
 def_welcomelist_auth *@visadpsmessage.com
 def_welcomelist_auth *@*.pinterest.com
 def_welcomelist_auth *@indeed.com
-def_welcomelist_auth *@docusign.net
-def_welcomelist_auth *@*.docusign.com
 
 # Senders consistently scoring low with advanced tuned SA to help default SA configurations.
 #
@@ -402,7 +399,6 @@ def_welcomelist_auth *@*.nea.org
 def_welcomelist_auth *@*.bhg.com
 def_welcomelist_auth *@*.nest.com
 def_welcomelist_auth *@*.colehaan.com
-def_welcomelist_auth *@*.microsoft.com
 def_welcomelist_auth *@*.vanheusen.com
 def_welcomelist_auth *@*.shoppbs.org
 def_welcomelist_auth *@*.roku.com
@@ -909,7 +905,6 @@ def_welcomelist_auth *@*.blackfriday.com
 def_welcomelist_auth *@*.olay.com
 def_welcomelist_auth confirmation@aircanada.ca
 def_welcomelist_auth no-reply@enterprise.com
-def_welcomelist_auth *@*.hubspotstarter.net
 def_welcomelist_auth *@*.serverchamber.com
 def_welcomelist_auth *@*.msbrooksclass.com
 def_welcomelist_auth *@*.hickoryfarms.com
@@ -1068,7 +1063,6 @@ 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
@@ -1076,8 +1070,6 @@ def_whitelist_auth *@visapayablesautomat
 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.
 #
@@ -1379,7 +1371,6 @@ 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
@@ -1886,7 +1877,6 @@ def_whitelist_auth *@*.blackfriday.com
 def_whitelist_auth *@*.olay.com
 def_whitelist_auth confirmation@aircanada.ca
 def_whitelist_auth no-reply@enterprise.com
-def_whitelist_auth *@*.hubspotstarter.net
 def_whitelist_auth *@*.serverchamber.com
 def_whitelist_auth *@*.msbrooksclass.com
 def_whitelist_auth *@*.hickoryfarms.com
Index: spamassassin/rules/60_welcomelist_dkim.cf
===================================================================
--- spamassassin.orig/rules/60_welcomelist_dkim.cf
+++ spamassassin/rules/60_welcomelist_dkim.cf
@@ -113,31 +113,6 @@ def_welcomelist_from_dkim  *@*.ebay.pt
 def_welcomelist_from_dkim  *@ebay.ca
 def_welcomelist_from_dkim  *@*.ebay.ca
 
-def_welcomelist_from_dkim  *@*			paypal.com
-def_welcomelist_from_dkim  *@paypal.com
-def_welcomelist_from_dkim  *@*.paypal.com
-def_welcomelist_from_dkim  *@paypal.co.uk
-def_welcomelist_from_dkim  *@*.paypal.co.uk
-def_welcomelist_from_dkim  *@paypal.at
-def_welcomelist_from_dkim  *@*.paypal.at
-def_welcomelist_from_dkim  *@paypal.be
-def_welcomelist_from_dkim  *@*.paypal.be
-def_welcomelist_from_dkim  *@paypal.de
-def_welcomelist_from_dkim  *@*.paypal.de
-def_welcomelist_from_dkim  *@paypal.es
-def_welcomelist_from_dkim  *@*.paypal.es
-def_welcomelist_from_dkim  *@paypal.fr
-def_welcomelist_from_dkim  *@*.paypal.fr
-def_welcomelist_from_dkim  *@paypal.ie
-def_welcomelist_from_dkim  *@*.paypal.ie
-def_welcomelist_from_dkim  *@paypal.it
-def_welcomelist_from_dkim  *@*.paypal.it
-def_welcomelist_from_dkim  *@paypal.nl
-def_welcomelist_from_dkim  *@*.paypal.nl
-def_welcomelist_from_dkim  *@paypal.pt
-def_welcomelist_from_dkim  *@*.paypal.pt
-def_welcomelist_from_dkim  *@paypal.ca
-def_welcomelist_from_dkim  *@*.paypal.ca
 
 def_welcomelist_from_dkim  *@cisco.com
 def_welcomelist_from_dkim  *@lh.lufthansa.com
@@ -230,32 +205,6 @@ def_whitelist_from_dkim  *@*.ebay.pt
 def_whitelist_from_dkim  *@ebay.ca
 def_whitelist_from_dkim  *@*.ebay.ca
 
-def_whitelist_from_dkim  *@*			paypal.com
-def_whitelist_from_dkim  *@paypal.com
-def_whitelist_from_dkim  *@*.paypal.com
-def_whitelist_from_dkim  *@paypal.co.uk
-def_whitelist_from_dkim  *@*.paypal.co.uk
-def_whitelist_from_dkim  *@paypal.at
-def_whitelist_from_dkim  *@*.paypal.at
-def_whitelist_from_dkim  *@paypal.be
-def_whitelist_from_dkim  *@*.paypal.be
-def_whitelist_from_dkim  *@paypal.de
-def_whitelist_from_dkim  *@*.paypal.de
-def_whitelist_from_dkim  *@paypal.es
-def_whitelist_from_dkim  *@*.paypal.es
-def_whitelist_from_dkim  *@paypal.fr
-def_whitelist_from_dkim  *@*.paypal.fr
-def_whitelist_from_dkim  *@paypal.ie
-def_whitelist_from_dkim  *@*.paypal.ie
-def_whitelist_from_dkim  *@paypal.it
-def_whitelist_from_dkim  *@*.paypal.it
-def_whitelist_from_dkim  *@paypal.nl
-def_whitelist_from_dkim  *@*.paypal.nl
-def_whitelist_from_dkim  *@paypal.pt
-def_whitelist_from_dkim  *@*.paypal.pt
-def_whitelist_from_dkim  *@paypal.ca
-def_whitelist_from_dkim  *@*.paypal.ca
-
 def_whitelist_from_dkim  *@cisco.com
 def_whitelist_from_dkim  *@lh.lufthansa.com
 def_whitelist_from_dkim  *@*.milesandmore.com
Index: spamassassin/rules/60_welcomelist_spf.cf
===================================================================
--- spamassassin.orig/rules/60_welcomelist_spf.cf
+++ spamassassin/rules/60_welcomelist_spf.cf
@@ -95,7 +95,6 @@ def_welcomelist_from_spf   *@ora.com
 def_welcomelist_from_spf   *@*.ora.com
 def_welcomelist_from_spf   *@mypoints.com
 def_welcomelist_from_spf   *@*.mypoints.com
-def_welcomelist_from_spf   *@paypal.com
 def_welcomelist_from_spf   *@ebay.com
 def_welcomelist_from_spf   *@foolsubs.com
 def_welcomelist_from_spf   *@match.com
@@ -136,7 +135,6 @@ def_whitelist_from_spf   *@ora.com
 def_whitelist_from_spf   *@*.ora.com
 def_whitelist_from_spf   *@mypoints.com
 def_whitelist_from_spf   *@*.mypoints.com
-def_whitelist_from_spf   *@paypal.com
 def_whitelist_from_spf   *@ebay.com
 def_whitelist_from_spf   *@foolsubs.com
 def_whitelist_from_spf   *@match.com
Index: spamassassin/rules/active.list
===================================================================
--- spamassassin.orig/rules/active.list
+++ spamassassin/rules/active.list
@@ -1,9 +1,6 @@
 # DO NOT EDIT: file generated by build/mkupdates/listpromotable
 # active ruleset list, automatically generated from https://ruleqa.spamassassin.org/
-# with results from: last-net: net-ena-week0 net-ena-week1 net-ena-week2 net-ena-week3 net-ena-week4 net-giovanni-ham net-giovanni-spam net-giovanni-spammy net-grenier net-hege net-jhardin net-llanga net-mmiroslaw-mails-ham net-mmiroslaw-mails-spam net-spamsponge net-tsz-corpus net-whyscream; day 1: ena-week0 ena-week1 ena-week2 ena-week3 giovanni-ham giovanni-spam giovanni-spammy grenier hege jhardin llanga mmiroslaw-mails-ham mmiroslaw-mails-spam spamsponge tsz-corpus whyscream; day 2: ena-week0 ena-week1 ena-week2 ena-week3 ena-week4 giovanni-ham giovanni-spam giovanni-spammy grenier hege jhardin llanga mmiroslaw-mails-ham mmiroslaw-mails-spam tsz-corpus whyscream; day 3: ena-week0 ena-week1 ena-week2 ena-week3 ena-week4 giovanni-ham giovanni-spam giovanni-spammy grenier hege jhardin llanga mmiroslaw-mails-ham mmiroslaw-mails-spam spamsponge tsz-corpus whyscream; day 4: ena-week0 ena-week1 ena-week2 ena-week3 ena-week4 giovanni-ham giovanni-spam giovanni-spammy grenier hege jhardin llanga mmiroslaw-mails-ham mmiroslaw-mails-spam spamsponge tsz-corpus whyscream; day 5: ena-week0 ena-week1 ena-week2 ena-week3 ena-week4 giovanni-ham giovanni-spam giovanni-spammy grenier hege jhardin llanga mmiroslaw-mails-ham mmiroslaw-mails-spam spamsponge tsz-corpus whyscream
-
-# good enough
-ACCT_PHISHING_MANY
+# with results from: last-net: net-ena-week0 net-ena-week1 net-ena-week4 net-giovanni-ham net-giovanni-spam net-grenier net-jhardin net-llanga net-mmiroslaw-mails-ham net-mmiroslaw-mails-spam net-spamsponge net-tsz-corpus net-whyscream; day 1: ena-week0 ena-week1 ena-week2 ena-week3 ena-week4 giovanni-ham giovanni-spam grenier jhardin llanga mmiroslaw-mails-ham mmiroslaw-mails-spam spamsponge tsz-corpus whyscream; day 2: ena-week0 ena-week1 ena-week2 ena-week3 ena-week4 giovanni-ham giovanni-spam grenier jhardin llanga mmiroslaw-mails-ham mmiroslaw-mails-spam spamsponge tsz-corpus whyscream; day 3: ena-week0 ena-week1 ena-week2 ena-week3 ena-week4 giovanni-ham giovanni-spam grenier jhardin llanga mmiroslaw-mails-ham mmiroslaw-mails-spam spamsponge tsz-corpus whyscream; day 4: ena-week0 ena-week1 ena-week2 ena-week3 ena-week4 giovanni-ham giovanni-spam grenier jhardin llanga mmiroslaw-mails-ham mmiroslaw-mails-spam spamsponge tsz-corpus whyscream; day 5: jhardin mmiroslaw-mails-ham mmiroslaw-mails-spam
 
 # tflags publish
 AC_BR_BONANZA
@@ -114,7 +111,7 @@ ALL_TRUSTED
 AMAZON_IMG_NOT_RCVD_AMZN
 
 # good enough
-APOSTROPHE_TOCC
+APOSTROPHE_FROM
 
 # tflags publish
 APP_DEVELOPMENT_FREEM
@@ -135,7 +132,7 @@ ARC_VALID
 AXB_XMAILER_MIMEOLE_OL_024C2
 
 # good enough
-AXB_X_FF_SEZ_S
+AXB_XMAILER_MIMEOLE_OL_1ECD5
 
 # tflags learn
 BAYES_00
@@ -177,6 +174,9 @@ BIGNUM_EMAILS_FREEM
 BIGNUM_EMAILS_MANY
 
 # tflags publish
+BILL_1618
+
+# tflags publish
 BITCOIN_BOMB
 
 # tflags publish
@@ -191,6 +191,9 @@ BITCOIN_EXTORT_02
 # tflags publish
 BITCOIN_IMGUR
 
+# good enough
+BITCOIN_MALF_HTML
+
 # tflags net
 BITCOIN_MALWARE
 
@@ -258,9 +261,9 @@ BITCOIN_XPRIO
 BITCOIN_YOUR_INFO
 
 # good enough
-BODY_SINGLE_URI
+BODY_EMAIL_419_FRAUD_GM_LOOSE
 
-# tflags net
+# tflags publish
 BODY_URI_ONLY
 
 # tflags publish
@@ -290,16 +293,13 @@ CHARSET_FARAWAY
 # tflags userconf
 CHARSET_FARAWAY_HEADER
 
-# good enough
-CK_HELO_GENERIC
-
 # tflags publish
 CN_B2B_SPAMMER
 
 # tflags publish
 COMMENT_GIBBERISH
 
-# tflags net
+# good enough
 COMPENSATION
 
 # tflags publish
@@ -314,9 +314,6 @@ CORRUPT_FROM_LINE_IN_HDRS
 # tflags publish
 CTE_8BIT_MISMATCH
 
-# good enough
-DATE_IN_FUTURE_Q_PLUS
-
 # tflags publish
 DAY_I_EARNED
 
@@ -395,6 +392,9 @@ DMARC_REJECT
 # tflags publish
 DOS_ANAL_SPAM_MAILER
 
+# good enough
+DOS_BODY_HIGH_NO_MID
+
 # tflags net
 DOS_DEREK_AUG08
 
@@ -404,6 +404,9 @@ DOS_OE_TO_MX
 # good enough
 DOS_OUTLOOK_TO_MX
 
+# good enough
+DOS_RCVD_IP_TWICE_C
+
 # tflags publish
 DOTGOV_IMAGE
 
@@ -453,9 +456,6 @@ FBI_SPOOF
 FILL_THIS_FORM
 
 # good enough
-FILL_THIS_FORM_LOAN
-
-# good enough
 FILL_THIS_FORM_LONG
 
 # tflags publish
@@ -482,10 +482,10 @@ FONT_INVIS_POSTEXTRAS
 # tflags net
 FORGED_SPF_HELO
 
-# tflags net
+# tflags publish
 FORM_FRAUD
 
-# tflags net
+# tflags publish
 FORM_FRAUD_3
 
 # tflags publish
@@ -545,39 +545,30 @@ FROM_IN_TO_AND_SUBJ
 # tflags userconf
 FROM_LOCAL_NOVOWEL
 
-# good enough
-FROM_MISSPACED
-
-# good enough
-FROM_MISSP_DYNIP
-
-# good enough
-FROM_MISSP_EH_MATCH
+# tflags publish
+FROM_LONG_DOM
 
-# good enough
-FROM_MISSP_FREEMAIL
+# tflags publish
+FROM_LONG_DOM_MINFP
 
 # good enough
 FROM_MISSP_MSFT
 
 # good enough
-FROM_MISSP_PHISH
-
-# good enough
 FROM_MISSP_REPLYTO
 
 # tflags net
 FROM_MISSP_SPF_FAIL
 
 # good enough
-FROM_MISSP_TO_UNDISC
-
-# good enough
 FROM_MISSP_USER
 
 # good enough
 FROM_MISSP_XPRIO
 
+# good enough
+FROM_MULTI_NORDNS
+
 # tflags net
 FROM_NEWDOM_BTC
 
@@ -600,7 +591,10 @@ FROM_SUSPICIOUS_NTLD
 FROM_SUSPICIOUS_NTLD_FP
 
 # good enough
-FROM_UNBAL2
+FROM_UNBAL1
+
+# good enough
+FROM_WSP_LEAD
 
 # good enough
 FROM_WSP_TRAIL
@@ -645,6 +639,9 @@ FUZZY_DR_OZ
 FUZZY_FACEBOOK
 
 # tflags publish
+FUZZY_HARRIS
+
+# tflags publish
 FUZZY_IMPORTANT
 
 # tflags publish
@@ -692,9 +689,6 @@ FUZZY_WELLSFARGO
 # tflags publish
 GAPPY_SALES_LEADS_FREEM
 
-# good enough
-GB_BITCOIN_CP
-
 # tflags publish
 GB_CUSTOM_HTM_URI
 
@@ -734,13 +728,25 @@ GOOG_MALWARE_DNLD
 # tflags publish
 GOOG_REDIR_DOCUSIGN
 
-# good enough
+# tflags publish
+GOOG_REDIR_FRAUD
+
+# tflags publish
+GOOG_REDIR_HTML_ONLY
+
+# tflags publish
 GOOG_REDIR_NORDNS
 
 # tflags publish
+GOOG_REDIR_NOTRDNS
+
+# tflags publish
 GOOG_REDIR_SHORT
 
 # tflags publish
+GOOG_REDIR_STATICRDNS
+
+# tflags publish
 GOOG_STO_EMAIL_PHISH
 
 # tflags publish
@@ -768,7 +774,7 @@ HAS_X_NO_RELAY
 HAS_X_OUTGOING_SPAM_STAT
 
 # good enough
-HDRS_LCASE_IMGONLY
+HDRS_LCASE
 
 # tflags publish
 HDRS_MISSP
@@ -785,9 +791,6 @@ HEADER_FROM_DIFFERENT_DOMAINS
 # tflags userconf
 HEAD_LONG
 
-# good enough
-HELO_LH_HOME
-
 # tflags publish
 HELO_NO_DOMAIN
 
@@ -875,15 +878,15 @@ HTML_SHRT_CMNT_OBFU_MANY
 # tflags publish
 HTML_SINGLET_MANY
 
-# good enough
-HTML_TAG_BALANCE_CENTER
-
 # tflags net
 HTML_TEXT_INVISIBLE_FONT
 
 # tflags publish
 HTML_TEXT_INVISIBLE_STYLE
 
+# good enough
+IMG_DIRECT_TO_MX
+
 # tflags publish
 IMG_ONLY_FM_DOM_INFO
 
@@ -899,13 +902,13 @@ JH_SPAMMY_PATTERN02
 # tflags net
 KHOP_HELO_FCRDNS
 
-# good enough
-KHOP_UNSUB_EMAIL
-
 # tflags publish
 LINKEDIN_IMG_NOT_RCVD_LNKN
 
 # good enough
+LIST_PARTIAL
+
+# good enough
 LIST_PARTIAL_SHORT_MSG
 
 # tflags publish
@@ -930,6 +933,9 @@ LONG_INVISIBLE_TEXT
 LOTS_OF_MONEY
 
 # good enough
+LOTTERY_1
+
+# good enough
 LOTTO_AGENT
 
 # good enough
@@ -938,9 +944,6 @@ LOTTO_DEPT
 # tflags publish
 LUCRATIVE
 
-# good enough
-MALFORMED_FREEMAIL
-
 # tflags publish
 MALF_HTML_B64
 
@@ -962,9 +965,6 @@ MANY_SUBDOM
 # tflags publish
 MILLION_HUNDRED
 
-# good enough
-MILLION_USD
-
 # tflags publish
 MIMEOLE_DIRECT_TO_MX
 
@@ -1043,9 +1043,6 @@ MSGID_DOLLARS_URI_IMG
 # tflags publish
 MSGID_HDR_MALF
 
-# good enough
-MSGID_NOFQDN1
-
 # tflags publish
 MSM_PRIO_REPTO
 
@@ -1073,9 +1070,6 @@ NML_ADSP_CUSTOM_LOW
 # tflags net
 NML_ADSP_CUSTOM_MED
 
-# good enough
-NORDNS_LOW_CONTRAST
-
 # tflags publish
 NOT_SPAM
 
@@ -1112,11 +1106,14 @@ OBFU_UNSUB_UL
 # tflags publish
 ODD_FREEM_REPTO
 
-# good enough
-PDS_BAD_THREAD_QP_64
+# tflags publish
+PAYPAL_PHISH_06
+
+# tflags publish
+PAYPAL_PHISH_07
 
 # good enough
-PDS_BRAND_SUBJ_NAKED_TO
+PDS_BAD_THREAD_QP_64
 
 # good enough
 PDS_BTC_ID
@@ -1125,14 +1122,14 @@ PDS_BTC_ID
 PDS_BTC_MSGID
 
 # good enough
-PDS_DBL_URL_TNB_RUNON
-
-# good enough
 PDS_FRNOM_TODOM_DBL_URL
 
 # good enough
 PDS_FRNOM_TODOM_NAKED_TO
 
+# tflags net
+PDS_FROM_2_EMAILS
+
 # good enough
 PDS_FROM_NAME_TO_DOMAIN
 
@@ -1140,13 +1137,16 @@ PDS_FROM_NAME_TO_DOMAIN
 PDS_HELO_SPF_FAIL
 
 # good enough
-PDS_HP_HELO_NORDNS
+PDS_NAKED_TO_NUMERO
 
 # good enough
 PDS_OTHER_BAD_TLD
 
 # good enough
-PDS_PHP_EVAL
+PDS_PRO_TLD
+
+# good enough
+PDS_TONAME_EQ_TOLOCAL_FREEM_FORGE
 
 # tflags publish
 PHISH_ATTACH
@@ -1163,9 +1163,6 @@ PHP_NOVER_MUA
 # tflags publish
 PHP_ORIG_SCRIPT
 
-# good enough
-PHP_ORIG_SCRIPT_EVAL
-
 # tflags publish
 PHP_SCRIPT
 
@@ -1185,6 +1182,12 @@ POSSIBLE_PAYPAL_PHISH_01
 POSSIBLE_PAYPAL_PHISH_02
 
 # tflags publish
+POSSIBLE_PAYPAL_PHISH_04
+
+# tflags publish
+POSSIBLE_PAYPAL_PHISH_10
+
+# tflags publish
 PP_MIME_FAKE_ASCII_TEXT
 
 # tflags publish
@@ -1251,10 +1254,10 @@ RCVD_IN_DNSWL_MED
 RCVD_IN_DNSWL_NONE
 
 # tflags net
-RCVD_IN_IADB_COURT
+RCVD_IN_IADB_DK
 
 # tflags net
-RCVD_IN_IADB_DK
+RCVD_IN_IADB_DMARC
 
 # tflags net
 RCVD_IN_IADB_DOPTIN
@@ -1272,10 +1275,10 @@ RCVD_IN_IADB_EDDB
 RCVD_IN_IADB_EPIA
 
 # tflags net
-RCVD_IN_IADB_GOODMAIL
+RCVD_IN_IADB_ESP
 
 # tflags net
-RCVD_IN_IADB_LEG_MAND
+RCVD_IN_IADB_GOODMAIL
 
 # tflags net
 RCVD_IN_IADB_LISTED
@@ -1401,37 +1404,22 @@ RCVD_IN_SBL
 RCVD_IN_SBL_CSS
 
 # tflags net
-RCVD_IN_SORBS_BLOCK
-
-# tflags net
-RCVD_IN_SORBS_DUL
-
-# tflags net
-RCVD_IN_SORBS_HTTP
-
-# tflags net
-RCVD_IN_SORBS_MISC
-
-# tflags net
-RCVD_IN_SORBS_SMTP
-
-# tflags net
-RCVD_IN_SORBS_SOCKS
+RCVD_IN_VALIDITY_CERTIFIED
 
 # tflags net
-RCVD_IN_SORBS_WEB
+RCVD_IN_VALIDITY_CERTIFIED_BLOCKED
 
 # tflags net
-RCVD_IN_SORBS_ZOMBIE
+RCVD_IN_VALIDITY_RPBL
 
 # tflags net
-RCVD_IN_VALIDITY_CERTIFIED
+RCVD_IN_VALIDITY_RPBL_BLOCKED
 
 # tflags net
-RCVD_IN_VALIDITY_RPBL
+RCVD_IN_VALIDITY_SAFE
 
 # tflags net
-RCVD_IN_VALIDITY_SAFE
+RCVD_IN_VALIDITY_SAFE_BLOCKED
 
 # tflags net
 RCVD_IN_XBL
@@ -1449,9 +1437,6 @@ RDNS_NUM_TLD_ATCHNX
 RDNS_NUM_TLD_XM
 
 # good enough
-READY_TO_SHIP
-
-# good enough
 REPLYTO_WITHOUT_TO_CC
 
 # tflags publish
@@ -1479,6 +1464,9 @@ REPTO_419_FRAUD_HM
 REPTO_419_FRAUD_OL
 
 # tflags publish
+REPTO_419_FRAUD_OL_LOOSE
+
+# tflags publish
 REPTO_419_FRAUD_PM
 
 # tflags publish
@@ -1496,9 +1484,6 @@ REPTO_419_FRAUD_YJ
 # tflags publish
 REPTO_419_FRAUD_YN
 
-# tflags publish
-REPTO_INFONUMSCOM
-
 # good enough
 RISK_FREE
 
@@ -1506,26 +1491,14 @@ RISK_FREE
 SCC_BOGUS_CTE_1
 
 # good enough
-SCC_CANSPAM_1
-
-# good enough
 SCC_CANSPAM_2
 
 # tflags publish
-SCC_CTMPP
-
-# tflags publish
 SCC_ISEMM_LID_1
 
 # tflags publish
-SCC_ISEMM_LID_1A
-
-# tflags publish
 SCC_ISEMM_LID_1B
 
-# good enough
-SCC_SPAMMER_ADDR_2
-
 # tflags publish
 SCC_SPECIAL_GUID
 
@@ -1547,18 +1520,12 @@ SHORTENER_SHORT_IMG
 # tflags publish
 SHORT_IMG_SUSP_NTLD
 
-# good enough
-SHORT_SHORTNER
-
 # tflags publish
 SHY_OBFU_EXPIRE
 
 # tflags publish
 SHY_OBFU_PASSWORD
 
-# tflags publish
-SPAM_CWINDOWSNET
-
 # tflags net
 SPF_FAIL
 
@@ -1613,21 +1580,12 @@ STATIC_XPRIO_OLE
 # tflags publish
 STOCK_TIP
 
-# good enough
-STY_INVIS_DIRECT
-
 # tflags userconf
 SUBJECT_IN_BLOCKLIST
 
 # tflags userconf
 SUBJECT_IN_WELCOMELIST
 
-# good enough
-SUBJECT_NEEDS_ENCODING
-
-# good enough
-SUBJ_ATTENTION
-
 # tflags net
 SUBJ_BRKN_WORDNUMS
 
@@ -1641,9 +1599,6 @@ SUSP_UTF8_WORD_COMBO
 SUSP_UTF8_WORD_FROM
 
 # good enough
-SUSP_UTF8_WORD_MANY
-
-# good enough
 SUSP_UTF8_WORD_SUBJ
 
 # tflags publish
@@ -1664,6 +1619,9 @@ TEQF_USR_MSGID_HEX
 # tflags publish
 TEQF_USR_MSGID_MALF
 
+# good enough
+TEQF_USR_POLITE
+
 # tflags publish
 THIS_AD
 
@@ -1673,17 +1631,14 @@ THIS_IS_ADV_SUSP_NTLD
 # tflags publish
 TONLINE_FAKE_DKIM
 
-# good enough
-TONOM_EQ_TOLOC_SHRT_SHRTNER
-
 # tflags publish
 TO_EQ_FM_DIRECT_MX
 
 # tflags net
-TO_EQ_FM_DOM_SPF_FAIL
+TO_EQ_FM_DOM_HTML_ONLY
 
 # tflags net
-TO_EQ_FM_HTML_ONLY
+TO_EQ_FM_DOM_SPF_FAIL
 
 # tflags net
 TO_EQ_FM_SPF_FAIL
@@ -1694,16 +1649,13 @@ 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
 
-# tflags net
+# good enough
 TO_NO_BRKTS_MSFT
 
 # tflags publish
@@ -1716,16 +1668,7 @@ TO_NO_BRKTS_PCNT
 TO_TOO_MANY_WFH_01
 
 # good enough
-TT_MSGID_TRUNC
-
-# good enough
-TVD_DOLLARS_US
-
-# good enough
-TVD_FROM_1
-
-# good enough
-TVD_PH_7
+TRANSFORM_LIFE
 
 # good enough
 TVD_PH_BODY_ACCOUNTS_PRE
@@ -1760,12 +1703,18 @@ UNICODE_OBFU_ZW
 # tflags publish
 UNICODE_OBFU_ZW_MANY
 
+# tflags publish
+UNICODE_RTL_OBFU
+
 # tflags userconf
 UNPARSEABLE_RELAY
 
 # tflags publish
 UNSUB_GOOG_FORM
 
+# good enough
+UPPERCASE_URI
+
 # tflags net
 URIBL_ABUSE_SURBL
 
@@ -1785,6 +1734,9 @@ URIBL_CSS
 URIBL_CSS_A
 
 # tflags net
+URIBL_CT_SURBL
+
+# tflags net
 URIBL_DBL_ABUSE_BOTCC
 
 # tflags net
@@ -1821,6 +1773,9 @@ URIBL_DBL_PHISH
 URIBL_DBL_SPAM
 
 # tflags net
+URIBL_DM_SURBL
+
+# tflags net
 URIBL_GREY
 
 # tflags net
@@ -1875,9 +1830,27 @@ URI_DOTTY_HEX
 URI_DQ_UNSUB
 
 # tflags publish
+URI_DWEBIPFS
+
+# tflags publish
+URI_EXCESS_SLASHES
+
+# tflags publish
 URI_FIREBASEAPP
 
 # tflags publish
+URI_FLKIPFSXYZIPFS
+
+# tflags publish
+URI_GLITCHME
+
+# tflags publish
+URI_GOOGDRAWPREVIEW
+
+# tflags publish
+URI_GOOGDRAWPREVIEW_MINFP
+
+# tflags publish
 URI_GOOGLE_PROXY
 
 # tflags publish
@@ -1899,6 +1872,12 @@ URI_IMG_CWINDOWSNET
 URI_IMG_WP_REDIR
 
 # tflags publish
+URI_IPFS
+
+# tflags publish
+URI_IPFSIO
+
+# tflags publish
 URI_LONG_REPEAT
 
 # tflags publish
@@ -1976,9 +1955,6 @@ USER_IN_WELCOMELIST
 # tflags userconf
 USER_IN_WELCOMELIST_TO
 
-# good enough
-US_DOLLARS_3
-
 # tflags publish
 VFY_ACCT_NORDNS
 
@@ -2009,9 +1985,6 @@ XFER_LOTSA_MONEY
 # tflags publish
 XM_DIGITS_ONLY
 
-# good enough
-XM_LIGHT_HEAVY
-
 # tflags publish
 XM_PHPMAILER_FORGED
 
@@ -2035,3 +2008,6 @@ YOUR_DELIVERY_ADDRESS
 
 # good enough
 YOU_INHERIT
+
+# tflags publish
+_SCC_HTML_ODDDIV8
Index: spamassassin/rules/init.pre
===================================================================
--- spamassassin.orig/rules/init.pre
+++ spamassassin/rules/init.pre
@@ -8,7 +8,7 @@
 # already have a file in place called "init.pre".
 #
 # There are now multiple files read to enable plugins in the 
-# /etc/spamassassin directory; previously only one, "init.pre" was 
+# /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.
Index: spamassassin/rules/v310.pre
===================================================================
--- spamassassin.orig/rules/v310.pre
+++ spamassassin/rules/v310.pre
@@ -10,7 +10,7 @@
 # if you so wish.
 #
 # There are now multiple files read to enable plugins in the
-# /etc/spamassassin directory; previously only one, "init.pre" was
+# /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.
Index: spamassassin/rules/v312.pre
===================================================================
--- spamassassin.orig/rules/v312.pre
+++ spamassassin/rules/v312.pre
@@ -10,7 +10,7 @@
 # if you so wish.
 #
 # There are now multiple files read to enable plugins in the
-# /etc/spamassassin directory; previously only one, "init.pre" was
+# /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.
Index: spamassassin/rules/v320.pre
===================================================================
--- spamassassin.orig/rules/v320.pre
+++ spamassassin/rules/v320.pre
@@ -10,7 +10,7 @@
 # if you so wish.
 #
 # There are now multiple files read to enable plugins in the
-# /etc/spamassassin directory; previously only one, "init.pre" was
+# /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.
Index: spamassassin/rules/v330.pre
===================================================================
--- spamassassin.orig/rules/v330.pre
+++ spamassassin/rules/v330.pre
@@ -10,7 +10,7 @@
 # if you so wish.
 #
 # There are now multiple files read to enable plugins in the
-# /etc/spamassassin directory; previously only one, "init.pre" was
+# /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.
Index: spamassassin/rules/v340.pre
===================================================================
--- spamassassin.orig/rules/v340.pre
+++ spamassassin/rules/v340.pre
@@ -10,7 +10,7 @@
 # if you so wish.
 #
 # There are now multiple files read to enable plugins in the
-# /etc/spamassassin directory; previously only one, "init.pre" was
+# /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.
Index: spamassassin/rules/v341.pre
===================================================================
--- spamassassin.orig/rules/v341.pre
+++ spamassassin/rules/v341.pre
@@ -10,7 +10,7 @@
 # if you so wish.
 #
 # There are now multiple files read to enable plugins in the
-# /etc/spamassassin directory; previously only one, "init.pre" was
+# /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.
Index: spamassassin/rules/v342.pre
===================================================================
--- spamassassin.orig/rules/v342.pre
+++ spamassassin/rules/v342.pre
@@ -10,7 +10,7 @@
 # if you so wish.
 #
 # There are now multiple files read to enable plugins in the
-# /etc/spamassassin directory; previously only one, "init.pre" was
+# /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.
Index: spamassassin/rules/v343.pre
===================================================================
--- spamassassin.orig/rules/v343.pre
+++ spamassassin/rules/v343.pre
@@ -10,7 +10,7 @@
 # if you so wish.
 #
 # There are now multiple files read to enable plugins in the
-# /etc/spamassassin directory; previously only one, "init.pre" was
+# /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.
Index: spamassassin/rules/v400.pre
===================================================================
--- spamassassin.orig/rules/v400.pre
+++ spamassassin/rules/v400.pre
@@ -10,7 +10,7 @@
 # if you so wish.
 #
 # There are now multiple files read to enable plugins in the
-# /etc/spamassassin directory; previously only one, "init.pre" was
+# /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.