From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from firstgate.proxmox.com (firstgate.proxmox.com [212.224.123.68]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits) server-digest SHA256) (No client certificate requested) by lists.proxmox.com (Postfix) with ESMTPS id 2888D92244 for ; Mon, 13 Mar 2023 22:24:13 +0100 (CET) Received: from firstgate.proxmox.com (localhost [127.0.0.1]) by firstgate.proxmox.com (Proxmox) with ESMTP id 107CA18C3A for ; Mon, 13 Mar 2023 22:24:13 +0100 (CET) Received: from proxmox-new.maurer-it.com (proxmox-new.maurer-it.com [94.136.29.106]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits)) (No client certificate requested) by firstgate.proxmox.com (Proxmox) with ESMTPS for ; Mon, 13 Mar 2023 22:24:09 +0100 (CET) Received: from proxmox-new.maurer-it.com (localhost.localdomain [127.0.0.1]) by proxmox-new.maurer-it.com (Proxmox) with ESMTP id B69DC44730 for ; Mon, 13 Mar 2023 22:24:08 +0100 (CET) From: Stoiko Ivanov To: pmg-devel@lists.proxmox.com Date: Mon, 13 Mar 2023 22:23:45 +0100 Message-Id: <20230313212351.111977-3-s.ivanov@proxmox.com> X-Mailer: git-send-email 2.30.2 In-Reply-To: <20230313212351.111977-1-s.ivanov@proxmox.com> References: <20230313212351.111977-1-s.ivanov@proxmox.com> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-SPAM-LEVEL: Spam detection results: 0 AWL 0.142 Adjusted score from AWL reputation of From: address BAYES_00 -1.9 Bayes spam probability is 0 to 1% KAM_DMARC_STATUS 0.01 Test Rule for DKIM or SPF Failure with Strict Alignment SPF_HELO_NONE 0.001 SPF: HELO does not publish an SPF Record SPF_PASS -0.001 SPF: sender matches SPF record Subject: [pmg-devel] [PATCH pmg-api 2/7] templates: sync spamassassin templates with 4.0.0 upstream X-BeenThere: pmg-devel@lists.proxmox.com X-Mailman-Version: 2.1.29 Precedence: list List-Id: Proxmox Mail Gateway development discussion List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 13 Mar 2023 21:24:13 -0000 to minimize the diff and disable vanished modules no functional change intended Signed-off-by: Stoiko Ivanov --- src/templates/init.pre.in | 26 ++++++++++++++++++++++---- src/templates/v310.pre.in | 18 +++++++++--------- src/templates/v320.pre.in | 5 +++++ 3 files changed, 36 insertions(+), 13 deletions(-) diff --git a/src/templates/init.pre.in b/src/templates/init.pre.in index 04ca4d6..98d17b4 100644 --- a/src/templates/init.pre.in +++ b/src/templates/init.pre.in @@ -7,24 +7,42 @@ # in SpamAssassin 3.0.x releases. It will not be installed if you # already have a file in place called "init.pre". # +# There are now multiple files read to enable plugins in the +# /etc/mail/spamassassin directory; previously only one, "init.pre" was +# read. Now both "init.pre", "v310.pre", and any other files ending in +# ".pre" will be read. As future releases are made, new plugins will be +# added to new files, named according to the release they're added in. ########################################################################### +# Version compatibility - Welcomelist/Blocklist +# In SpamAssassin 4.0, rules containing "whitelist" or "blacklist" have been +# renamed to contain more racially neutral "welcomelist" and "blocklist" +# terms. When this compatibility flag is enabled, old rule names from stock +# rules will not hit anymore alongside the new ones. For more information, +# see: https://wiki.apache.org/spamassassin/WelcomelistBlocklist +# +enable_compat welcomelist_blocklist + # RelayCountry - add metadata for Bayes learning, marking the countries # a message was relayed through # +# Note: This requires the Geo::IP Perl module +# # loadplugin Mail::SpamAssassin::Plugin::RelayCountry [% IF pmg.spam.rbl_checks %] +# URIDNSBL - look up URLs found in the message against several DNS +# blocklists. +# loadplugin Mail::SpamAssassin::Plugin::URIDNSBL [% END %] -# Hashcash - perform hashcash verification. -# -loadplugin Mail::SpamAssassin::Plugin::Hashcash [% IF pmg.spam.rbl_checks %] +# SPF - perform SPF verification. +# loadplugin Mail::SpamAssassin::Plugin::SPF [% END %] # always load dkim to improve accuracy -loadplugin Mail::SpamAssassin::Plugin::DKIM \ No newline at end of file +loadplugin Mail::SpamAssassin::Plugin::DKIM diff --git a/src/templates/v310.pre.in b/src/templates/v310.pre.in index d72c347..696142d 100644 --- a/src/templates/v310.pre.in +++ b/src/templates/v310.pre.in @@ -9,6 +9,11 @@ # so you can modify it to enable some disabled-by-default plugins below, # if you so wish. # +# There are now multiple files read to enable plugins in the +# /etc/mail/spamassassin directory; previously only one, "init.pre" was +# read. Now both "init.pre", "v310.pre", and any other files ending in +# ".pre" will be read. As future releases are made, new plugins will be +# added to new files, named according to the release they're added in. ########################################################################### [% IF pmg.spam.rbl_checks %] @@ -40,18 +45,13 @@ loadplugin Mail::SpamAssassin::Plugin::AutoLearnThreshold # loadplugin Mail::SpamAssassin::Plugin::TextCat -# WhitelistSubject - Whitelist/Blacklist certain subject regular expressions +# AccessDB - lookup from-addresses in access database # -loadplugin Mail::SpamAssassin::Plugin::WhiteListSubject +#loadplugin Mail::SpamAssassin::Plugin::AccessDB -########################################################################### -# experimental plugins - -# DomainKeys - perform DomainKeys verification -# -# External modules required for use, see INSTALL for more information. +# WelcomelistSubject - Welcomelist/Blocklist certain subject regular expressions # -#loadplugin Mail::SpamAssassin::Plugin::DomainKeys +loadplugin Mail::SpamAssassin::Plugin::WelcomeListSubject # MIMEHeader - apply regexp rules against MIME headers in the message # diff --git a/src/templates/v320.pre.in b/src/templates/v320.pre.in index db49b07..846c73a 100644 --- a/src/templates/v320.pre.in +++ b/src/templates/v320.pre.in @@ -9,6 +9,11 @@ # so you can modify it to enable some disabled-by-default plugins below, # if you so wish. # +# There are now multiple files read to enable plugins in the +# /etc/mail/spamassassin directory; previously only one, "init.pre" was +# read. Now both "init.pre", "v310.pre", and any other files ending in +# ".pre" will be read. As future releases are made, new plugins will be +# added to new files, named according to the release they're added in. ########################################################################### # Check - Provides main check functionality -- 2.30.2