committing changes in /etc made by "-bash"

Package changes:

rspamd/composites.conf

@@ -124,7 +124,7 @@ composites {
   }
   BAD_REP_POLICIES {
     description = "Contains valid policies but are also marked by fuzzy/bayes/surbl/rbl";
-    expression = "(~g-:policies) & (-g+:fuzzy | -g+:bayes | -g+:surbl | -g+:rbl)";
+    expression = "(~g-:policies) & (-g+:fuzzy | -g+:statistics | -g+:surbl | -g+:rbl)";
     score = 0.1;
   }
 

rspamd/modules.d/rbl.conf

@@ -136,7 +136,6 @@ rbl {
       }
       symbol = "BLOCKLISTDE";
       rbl = "bl.blocklist.de";
-      ipv6 = true;
       checks = ['from', 'received'];
     }
 
@@ -160,6 +159,7 @@ rbl {
     RSPAMD_EMAILBL {
       ignore_whitelist = true;
       ignore_defaults = true;
+      exclude_users = false;
       emails_delimiter = ".";
       hash_format = "base32";
       hash_len = 32;
@@ -173,6 +173,7 @@ rbl {
     MSBL_EBL {
       ignore_whitelist = true;
       ignore_defaults = true;
+      exclude_users = false;
       rbl = "ebl.msbl.org";
       checks = ['emails', 'replyto'];
       emails_domainonly = false;
@@ -192,8 +193,9 @@ rbl {
     "SURBL_MULTI" {
       ignore_defaults = true;
       rbl = "multi.surbl.org";
-      checks = ['emails', 'dkim', 'urls'];
+      checks = ['emails', 'dkim', 'helo', 'rdns', 'replyto', 'urls'];
       emails_domainonly = true;
+      exclude_users = false;
 
       returnbits = {
         CRACKED_SURBL = 128; # From February 2016
@@ -207,8 +209,9 @@ rbl {
     "URIBL_MULTI" {
       ignore_defaults = true;
       rbl = "multi.uribl.com";
-      checks = ['emails', 'dkim', 'urls'];
+      checks = ['emails', 'dkim', 'helo', 'rdns', 'replyto', 'urls'];
       emails_domainonly = true;
+      exclude_users = false;
 
       returnbits {
         URIBL_BLOCKED = 1;
@@ -226,6 +229,7 @@ rbl {
       hash = 'blake2';
       hash_len = 32;
       hash_format = 'base32';
+      exclude_users = false;
 
       returncodes = {
         RSPAMD_URIBL = [
@@ -240,6 +244,7 @@ rbl {
       no_ip = true;
       checks = ['emails', 'dkim', 'helo', 'rdns', 'replyto', 'urls'];
       emails_domainonly = true;
+      exclude_users = false;
 
       returncodes = {
         # spam domain

rspamd/scores.d/rbl_group.conf

@@ -87,7 +87,7 @@ symbols = {
         groups = ["spamhaus"];
     }
     "RBL_SPAMHAUS_SBL" {
-        weight = 2.0;
+        weight = 4.0;
         description = "From address is listed in ZEN SBL";
         groups = ["spamhaus"];
     }
@@ -127,7 +127,7 @@ symbols = {
         groups = ["spamhaus"];
     }
     "RECEIVED_SPAMHAUS_SBL" {
-        weight = 1.0;
+        weight = 3.0;
         description = "Received address is listed in ZEN SBL";
         groups = ["spamhaus"];
         one_shot = true;

rspamd/scores.d/whitelist_group.conf

@@ -23,33 +23,41 @@ symbols = {
     "WHITELIST_SPF" {
         weight = -1.0;
         description = "Mail comes from the whitelisted domain and has a valid SPF policy";
+        groups = ["spf"];
     }
     "BLACKLIST_SPF" {
         weight = 1.0;
         description = "Mail comes from the whitelisted domain and has no valid SPF policy";
+        groups = ["spf"];
     }
     "WHITELIST_DKIM" {
         weight = -1.0;
         description = "Mail comes from the whitelisted domain and has a valid DKIM signature";
+        groups = ["dkim"];
     }
     "BLACKLIST_DKIM" {
         weight = 2.0;
         description = "Mail comes from the whitelisted domain and has non-valid DKIM signature";
+        groups = ["dkim"];
     }
     "WHITELIST_SPF_DKIM" {
         weight = -3.0;
         description = "Mail comes from the whitelisted domain and has valid SPF and DKIM policies";
+        groups = ["spf", "dkim"];
     }
     "BLACKLIST_SPF_DKIM" {
         weight = 3.0;
         description = "Mail comes from the whitelisted domain and has no valid SPF policy or a bad DKIM signature";
+        groups = ["spf", "dkim"];
     }
     "WHITELIST_DMARC" {
         weight = -7.0;
         description = "Mail comes from the whitelisted domain and has valid DMARC and DKIM policies";
+        groups = ["dmarc", "spf", "dkim"];
     }
     "BLACKLIST_DMARC" {
         weight = 6.0;
         description = "Mail comes from the whitelisted domain and has failed DMARC and DKIM policies";
+        groups = ["dmarc", "spf", "dkim"];
     }
 }

rspamd/statistic.conf

@@ -2,15 +2,15 @@
 # Please don't modify this file as your changes might be overwritten with
 # the next update.
 #
-# You can modify 'local.d/statistics.conf' to add and merge
+# You can modify 'local.d/statistic.conf' to add and merge
 # parameters defined inside this section
 #
-# You can modify 'override.d/statistics.conf' to strictly override all
+# You can modify 'override.d/statistic.conf' to strictly override all
 # parameters defined inside this section
 #
 # If you just need to change the default bayes classifier, you can also use
 # 'local.d/classifier-bayes.conf' or 'override.d/classifier-bayes.conf'. But
-# never ever use both `statistics.conf` and `classifier-bayes.conf` locals files
+# never ever use both `statistic.conf` and `classifier-bayes.conf` locals files
 # together!
 #
 # See https://rspamd.com/doc/faq.html#what-are-the-locald-and-overrided-directories

systemd/system/multi-user.target.wants/rspamd.service

@@ -0,0 +1 @@
+/usr/lib/systemd/system/rspamd.service