X-Git-Url: https://git.donarmstrong.com/?p=spamassassin_config.git;a=blobdiff_plain;f=lists%2Fuser_prefs;h=8484b44c8d82572594e1e4540ba47a7147b0fc72;hp=07214174a65f56d35661506ca6dbac69f3385c7e;hb=c5509c855221dc1f5aa057cdb0aa7901158e8ebc;hpb=34d9d93ffe5629dd86e1fc168b1a6557a2c71a3d

diff --git a/lists/user_prefs b/lists/user_prefs
index 0721417..8484b44 100644
--- a/lists/user_prefs
+++ b/lists/user_prefs
@@ -72,12 +72,13 @@ subscriber_file /var/list/uniq-subscribers
 # newer rules which aren't in /usr/share/spamassassin
 ################################################################
 
-include /var/list/.spamassassin/newer-rules/20_dnsbl_tests.cf
-include /var/list/.spamassassin/newer-rules/20_head_tests.cf
-include /var/list/.spamassassin/newer-rules/20_ratware.cf
-include /var/list/.spamassassin/newer-rules/20_uri_tests.cf
-include /var/list/.spamassassin/newer-rules/25_uribl.cf
-include /var/list/.spamassassin/newer-rules/60_whitelist_dk.cf
+# these rules are already newer in newer SA
+# include /var/list/.spamassassin/newer-rules/20_dnsbl_tests.cf
+# include /var/list/.spamassassin/newer-rules/20_head_tests.cf
+# include /var/list/.spamassassin/newer-rules/20_ratware.cf
+# include /var/list/.spamassassin/newer-rules/20_uri_tests.cf
+# include /var/list/.spamassassin/newer-rules/25_uribl.cf
+# include /var/list/.spamassassin/newer-rules/60_whitelist_dk.cf
 include /var/list/.spamassassin/newer-rules/70_iadb.cf
 include /var/list/.spamassassin/newer-rules/80_additional.cf
 
@@ -106,6 +107,17 @@ include common/sare/99_sare_fraud_post25x.cf
 include common/common_spam
 include common/list_specific
 include common/scores
+include common/debian_specific
+include common/drug_spam
+include common/image_spam
+include common/misc_spam
+include common/money_spam
+include common/phrase_spam
+include common/pron_spam
+include common/scam_spam
+include common/url_spam
+include common/virus_spam
+
 
 header EXINNEN From =~ /schilling\@fokus\.fraunhofer\.de/i
 score EXINNEN 2.3