From f222df060c0f8e54ba15c751cc31676663f55f54 Mon Sep 17 00:00:00 2001
From: Nazar Mokrynskyi <nazar@mokrynskyi.com>
Date: Sun, 26 Jan 2025 19:18:18 +0200
Subject: [PATCH 1/3] Fix `clamav` path to allow for updates

---
 setup/flavors/compose/docker-compose.yml | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/setup/flavors/compose/docker-compose.yml b/setup/flavors/compose/docker-compose.yml
index 428d6995..ecbea8dc 100644
--- a/setup/flavors/compose/docker-compose.yml
+++ b/setup/flavors/compose/docker-compose.yml
@@ -217,7 +217,7 @@ services:
   # Optional services
   {% if antivirus_enabled %}
   antivirus:
-    image: clamav/clamav-debian:1.2.3-45
+    image: clamav/clamav-debian:1.4.1-16
     restart: always
     logging:
       driver: journald
@@ -226,7 +226,7 @@ services:
     networks:
       - clamav
     volumes:
-      - "{{ root }}/filter/clamav:/var/lib/clamav"
+      - "{{ root }}/clamav:/var/lib/clamav"
     healthcheck:
       test: ["CMD-SHELL", "kill -0 `cat /tmp/clamd.pid` && kill -0 `cat /tmp/freshclam.pid`"]
       interval: 10s

From d51915871cb3c7a8134a0abedbe15e68f5347bc1 Mon Sep 17 00:00:00 2001
From: Nazar Mokrynskyi <nazar@mokrynskyi.com>
Date: Mon, 27 Jan 2025 17:47:20 +0200
Subject: [PATCH 2/3] Update ClamAV image tag to more generic and add
 newsfragment

---
 setup/flavors/compose/docker-compose.yml | 2 +-
 towncrier/newsfragments/3735.bugfix      | 7 +++++++
 2 files changed, 8 insertions(+), 1 deletion(-)
 create mode 100644 towncrier/newsfragments/3735.bugfix

diff --git a/setup/flavors/compose/docker-compose.yml b/setup/flavors/compose/docker-compose.yml
index ecbea8dc..709b708d 100644
--- a/setup/flavors/compose/docker-compose.yml
+++ b/setup/flavors/compose/docker-compose.yml
@@ -217,7 +217,7 @@ services:
   # Optional services
   {% if antivirus_enabled %}
   antivirus:
-    image: clamav/clamav-debian:1.4.1-16
+    image: clamav/clamav-debian:1.4
     restart: always
     logging:
       driver: journald
diff --git a/towncrier/newsfragments/3735.bugfix b/towncrier/newsfragments/3735.bugfix
new file mode 100644
index 00000000..25e0d444
--- /dev/null
+++ b/towncrier/newsfragments/3735.bugfix
@@ -0,0 +1,7 @@
+Place ClamAV files under `mailu/clamav` instead of `mailu/filter/clamav` such that they can be modified by ClamAV
+itself.
+
+Users will want to change their `docker-compose.yml` accordingly and remove `mailu/filter/clamav` after upgrade.
+
+Also ClamAV image tag increased to `1.4` instead of specific (older) release, users will need to update it manually as
+well and keep it updated over time.

From 7531f2387134138aa196540f89bb600846879963 Mon Sep 17 00:00:00 2001
From: Nazar Mokrynskyi <nazar@mokrynskyi.com>
Date: Mon, 27 Jan 2025 17:52:25 +0200
Subject: [PATCH 3/3] Change clamav path in tests too

---
 tests/compose/filters/docker-compose.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/tests/compose/filters/docker-compose.yml b/tests/compose/filters/docker-compose.yml
index 2d2562a4..b452ed79 100644
--- a/tests/compose/filters/docker-compose.yml
+++ b/tests/compose/filters/docker-compose.yml
@@ -99,7 +99,7 @@ services:
     networks:
       - clamav
     volumes:
-      - "/mailu/filter/clamav:/var/lib/clamav"
+      - "/mailu/clamav:/var/lib/clamav"
     healthcheck:
       test: ["CMD-SHELL", "kill -0 `cat /tmp/clamd.pid` && kill -0 `cat /tmp/freshclam.pid`"]
       interval: 10s