From 9dcdc0c3330cfa9d170ac90893be11bd972537b4 Mon Sep 17 00:00:00 2001 From: Clinton Ebadi Date: Mon, 18 Apr 2022 21:34:57 -0400 Subject: [PATCH] Integrate upstream changes from 3.4.3 -> 3.4.6 --- 65_debian.cf | 7 +++++++ local.cf | 25 +++++++++++++++++++++++++ 2 files changed, 32 insertions(+) diff --git a/65_debian.cf b/65_debian.cf index f0848e7..c92da6f 100644 --- a/65_debian.cf +++ b/65_debian.cf @@ -25,3 +25,10 @@ header __CRON_HEADER X-Cron-Env =~ /./ meta D_SENT_BY_CRON __CRON_FROM && __CRON_HEADER score D_SENT_BY_CRON -5.0 describe D_SENT_BY_CRON Sent by Cron Daemon + +# As documented in https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=861671, +# the bb.barracudacentral.org blacklist requires users to register, making it +# unsuitable for use in the default configuration. If you've registered your +# use of this blacklist, remove the following line in order to re-activate +# this service: +score RCVD_IN_BRBL_LASTEXT 0 diff --git a/local.cf b/local.cf index 2ed874c..3f9f28b 100644 --- a/local.cf +++ b/local.cf @@ -7,6 +7,11 @@ # ########################################################################### +# A 'contact address' users should contact for more info. (replaces +# _CONTACTADDRESS_ in the report template) +# report_contact youremailaddress@domain.tld + + # Add *****SPAM***** to the Subject header of spam e-mails # # rewrite_header Subject *****SPAM***** @@ -66,6 +71,22 @@ txrep_autolearn 1 # # normalize_charset 1 +# Textual body scan limit (default: 50000) +# +# Amount of data per email text/* mimepart, that will be run through body +# rules. This enables safer and faster scanning of large messages, +# perhaps having very large textual attachments. There should be no need +# to change this well tested default. +# +# body_part_scan_size 50000 + +# Textual rawbody data scan limit (default: 500000) +# +# Amount of data per email text/* mimepart, that will be run through +# rawbody rules. +# +# rawbody_part_scan_size 500000 + # Some shortcircuiting, if the plugin is enabled # ifplugin Mail::SpamAssassin::Plugin::Shortcircuit @@ -74,6 +95,10 @@ ifplugin Mail::SpamAssassin::Plugin::Shortcircuit # shortcircuiting plugin is active, causing early exit to save CPU load. # Uncomment to turn this on # +# SpamAssassin tries hard not to launch DNS queries before priority -100. +# If you want to shortcircuit without launching unneeded queries, make +# sure such rule priority is below -100. These examples are already: +# # shortcircuit USER_IN_WHITELIST on # shortcircuit USER_IN_DEF_WHITELIST on # shortcircuit USER_IN_ALL_SPAM_TO on -- 2.20.1