Merge #3358

3358: Update 3rd party deps r=mergify[bot] a=nextgens

## What type of PR?

bug-fix

## What does this PR do?

Update 3rd party deps (clamav & snappymail), clarify the wording in the docs related to rspamd overrides.

### Related issue(s)
- closes #3347 
- closes #3360 (thank you [ctrl-i](https://github.com/ctrl-i) for the heads up)
- #3359 

## Prerequisites
Before we can consider review and merge, please make sure the following list is done and checked.
If an entry in not applicable, you can check it or remove it from the list.

- [ ] In case of feature or enhancement: documentation updated accordingly
- [x] Unless it's docs or a minor change: add [changelog](https://mailu.io/master/contributors/workflow.html#changelog) entry file.


Co-authored-by: Florent Daigniere <nextgens@freenetproject.org>

core/admin/mailu/models.py

@@ -276,7 +276,7 @@ class Domain(Base):
             f'_{proto}._tcp.{self.name}. 600 IN SRV {prio} 1 {port} {hostname}.' if port in ports else f'_{proto}._tcp.{self.name}. 600 IN SRV 0 0 0 .'
             for proto, port, prio
             in protocols
-        ]+[f'autoconfig.{self.name}. 600 IN CNAME {hostname}.']
+        ]+[f'autoconfig.{self.name}. 600 IN CNAME {hostname}.', f'autodiscover.{self.name}. 600 IN CNAME {hostname}.']
 
     @cached_property
     def dns_tlsa(self):

docs/antispam.rst

@@ -113,7 +113,7 @@ The following steps have to be taken to configure an additional symbol (rule) th
    * soft reject: temporarily delay message (this is used, for instance, to greylist or rate-limit messages)
 
    To move an email message to the Junk (Spam) folder, a score of 15 can be used in combination with the action "add header".
-   The above example configuration will reject all emails send from domains that are listed in '/etc/rspamd/override.d/blacklist.inc'.
+   The above example configuration will reject all emails send from domains that are listed in '/overrides/blacklist.inc'.
 
 
 2. In the Rspamd overrides folder create a map that contains the domains to be blocked. You can use # to add comments.
@@ -137,12 +137,12 @@ The following steps have to be taken to configure an additional symbol (rule) th
 
    The symbol is only displayed if the symbol has no pre-filter (action= line) configured. Changes made in this screen are not saved to the configuration file.
 
-5. Check if the map is available. In rspamd webgui to to configuration. A map is available with the path:
-   /etc/rspamd/override.d/blacklist.inc	Senders domain part is on the local blacklist
+5. Check if the map is available. In rspamd webgui go to configuration, a map is available with the path:
+   /overrides/blacklist.inc	Senders domain part is on the local blacklist
 
    .. image:: assets/screenshots/RspamdMapBlacklist.png
 
-   When clicking on this map, you can live-edit the map via the GUI. Changes are effective immediately. Only changes made to maps in the overrides folder are persistent. Changes made to other maps will be reverted when the Rspamd container is recreated. It is also possible to make direct changes to the map on filesystem. These changes are also effective immediately.
+   When clicking on this map, you can live-edit the map via the GUI. Please note that only changes made to maps in the ``/overrides`` folder are persistent as changes made interractively though the GUI will be reverted when the Rspamd container is recreated. All changes (whether through the GUI or on the filesystem) are effective immediately.
 
 For more information on using the multimap filter see the official `multimap documentation`_ of Rspamd.
 

setup/flavors/compose/docker-compose.yml

@@ -217,7 +217,7 @@ services:
   # Optional services
   {% if antivirus_enabled %}
   antivirus:
-    image: clamav/clamav-debian:1.2.0-6
+    image: clamav/clamav-debian:1.2.3-45
     restart: always
     logging:
       driver: journald

towncrier/newsfragments/3347.bugfix

@@ -0,0 +1,5 @@
+Update to a newer clamav 1.2.3-45
+Update to snappymail 2.36.4
+Update to roundcube 1.6.8 (CVE-2024-42009, CVE-2024-42008, CVE-2024-42010)
+Add a new DNS entry for autodiscover (old MUA autoconfiguration)
+Clarify the language in the documentation related to rspamd overrides

webmails/Dockerfile

@@ -28,7 +28,7 @@ RUN set -euxo pipefail \
   ; mkdir -p /run/nginx /conf
 
 # roundcube
-ENV ROUNDCUBE_URL https://github.com/roundcube/roundcubemail/releases/download/1.6.7/roundcubemail-1.6.7-complete.tar.gz
+ENV ROUNDCUBE_URL https://github.com/roundcube/roundcubemail/releases/download/1.6.8/roundcubemail-1.6.8-complete.tar.gz
 ENV CARDDAV_URL https://github.com/mstilkerich/rcmcarddav/releases/download/v5.1.0/carddav-v5.1.0.tar.gz
 
 RUN set -euxo pipefail \
@@ -54,7 +54,7 @@ COPY roundcube/config/config.inc.carddav.php /var/www/roundcube/plugins/carddav/
 
 # snappymail
 
-ENV SNAPPYMAIL_URL https://github.com/the-djmaze/snappymail/releases/download/v2.36.1/snappymail-2.36.1.tar.gz
+ENV SNAPPYMAIL_URL https://github.com/the-djmaze/snappymail/releases/download/v2.36.4/snappymail-2.36.4.tar.gz
 
 RUN set -euxo pipefail \
   ; mkdir  /var/www/snappymail \