From 907abde3ec7056f654b1f99fb4ab4f16a7335e36 Mon Sep 17 00:00:00 2001 From: Umashankar Avagadda Date: Wed, 28 Jun 2023 05:12:07 +0000 Subject: [PATCH 1/3] ZCS-13605:Upgraded ClamAV to 1.0.1 --- thirdparty/clamav/zimbra-clamav/debian/changelog | 6 ++++++ thirdparty/clamav/zimbra-clamav/rpm/SPECS/clamav.spec | 2 ++ versions.def | 2 +- 3 files changed, 9 insertions(+), 1 deletion(-) diff --git a/thirdparty/clamav/zimbra-clamav/debian/changelog b/thirdparty/clamav/zimbra-clamav/debian/changelog index 97e39e44e..b1f791674 100644 --- a/thirdparty/clamav/zimbra-clamav/debian/changelog +++ b/thirdparty/clamav/zimbra-clamav/debian/changelog @@ -1,3 +1,9 @@ +zimbra-clamav (VERSION-1zimbra8.8b4ZAPPEND) unstable; urgency=medium + + * ZCS-13605, Upgraded ClamAV to 1.0.1 + + -- Zimbra Packaging Services Fri, 23 Jun 2023 16:05:22 +0000 + zimbra-clamav (VERSION-1zimbra8.8b4ZAPPEND) unstable; urgency=medium * ZBUG-3355, Upgraded OpenSSL to 3.0.9 diff --git a/thirdparty/clamav/zimbra-clamav/rpm/SPECS/clamav.spec b/thirdparty/clamav/zimbra-clamav/rpm/SPECS/clamav.spec index 9b4600f96..2ead9214f 100644 --- a/thirdparty/clamav/zimbra-clamav/rpm/SPECS/clamav.spec +++ b/thirdparty/clamav/zimbra-clamav/rpm/SPECS/clamav.spec @@ -22,6 +22,8 @@ The Zimbra ClamAV build %define debug_package %{nil} %changelog +* Fri Jun 23 2023 Zimbra Packaging Services - VERSION-1zimbra8.8b4ZAPPEND +- ZCS-13605, Upgraded ClamAV to 1.0.1 * Mon Jun 12 2023 Zimbra Packaging Services - VERSION-1zimbra8.8b4ZAPPEND - ZBUG-3355, Upgraded OpenSSL to 3.0.9 * Wed Feb 22 2023 Zimbra Packaging Services - VERSION-1zimbra8.8b3ZAPPEND diff --git a/versions.def b/versions.def index a7d744fd4..2c80743a9 100644 --- a/versions.def +++ b/versions.def @@ -44,7 +44,7 @@ BSD_VERSION := 0.7.0 CBPOLICYD_VERSION := 2.1.0-beta -CLAMAV_VERSION := 0.105.2 +CLAMAV_VERSION := 1.0.1 CLUEBRINGER_GIT := cf484f1b93cf9965886cc89d33bdeee9c26426cb CLUEBRINGER_VERSION := 2.1.0.0 From a9781c06391cffe29376676a2e4b80f308f8a5d3 Mon Sep 17 00:00:00 2001 From: Umashankar Avagadda Date: Wed, 28 Jun 2023 05:12:37 +0000 Subject: [PATCH 2/3] ZCS-13605:Updated clamav-db for ClamAV-1.0.1 --- thirdparty/clamav-db/Makefile | 7 ++++--- .../clamav-db/zimbra-clamav-db/debian/changelog | 6 ++++++ .../debian/zimbra-clamav-db.postinst | 13 +++++++++++-- .../zimbra-clamav-db/rpm/SPECS/clamav-db.spec | 15 ++++++++++++++- 4 files changed, 35 insertions(+), 6 deletions(-) diff --git a/thirdparty/clamav-db/Makefile b/thirdparty/clamav-db/Makefile index 7e9065dea..ff8433a9f 100644 --- a/thirdparty/clamav-db/Makefile +++ b/thirdparty/clamav-db/Makefile @@ -3,6 +3,7 @@ PKG_ROOT := $(shell pwd) include $(PKG_ROOT)/../../package.def pname_lc := clamav-db +pvers := $(CLAMAV_VERSION) zname := zimbra-$(pname_lc) zspec := $(pname_lc).spec bcvd := bytecode.cvd @@ -11,9 +12,9 @@ mcvd := main.cvd bcvd_file := $(SRC_DIR)/$(bcvd) dcvd_file := $(SRC_DIR)/$(dcvd) mcvd_file := $(SRC_DIR)/$(mcvd) -burl := http://database.clamav.net/$(bcvd) -durl := http://database.clamav.net/$(dcvd) -murl := http://database.clamav.net/$(mcvd) +burl := https://files.zimbra.com/downloads/clamav-database/$(pvers)/$(bcvd) +durl := https://files.zimbra.com/downloads/clamav-database/$(pvers)/$(dcvd) +murl := https://files.zimbra.com/downloads/clamav-database/$(pvers)/$(mcvd) .PHONY: all getsrc clean build setup diff --git a/thirdparty/clamav-db/zimbra-clamav-db/debian/changelog b/thirdparty/clamav-db/zimbra-clamav-db/debian/changelog index 951eb297c..3ace453a1 100644 --- a/thirdparty/clamav-db/zimbra-clamav-db/debian/changelog +++ b/thirdparty/clamav-db/zimbra-clamav-db/debian/changelog @@ -1,3 +1,9 @@ +zimbra-clamav-db (1.0.0-1zimbra8.7b2ZAPPEND) unstable; urgency=low + + * ZCS-13605, Updated clamav-db for ClamAV-1.0.1 + + -- Zimbra Packaging Services Fri, 23 Jun 2023 16:05:22 +0000 + zimbra-clamav-db (1.0.0-ITERATIONZAPPEND) unstable; urgency=low * Initial Release. diff --git a/thirdparty/clamav-db/zimbra-clamav-db/debian/zimbra-clamav-db.postinst b/thirdparty/clamav-db/zimbra-clamav-db/debian/zimbra-clamav-db.postinst index 039cfef48..6937ff352 100644 --- a/thirdparty/clamav-db/zimbra-clamav-db/debian/zimbra-clamav-db.postinst +++ b/thirdparty/clamav-db/zimbra-clamav-db/debian/zimbra-clamav-db.postinst @@ -1,6 +1,15 @@ #!/bin/bash if [ "$1" = configure ]; then - /bin/chown -R zimbra:zimbra /opt/zimbra/data/clamav - /bin/chmod 644 /opt/zimbra/data/clamav/init/*.init + /bin/chown -R zimbra:zimbra /opt/zimbra/data/clamav + /bin/chmod 644 /opt/zimbra/data/clamav/init/*.init + if [ -f /opt/zimbra/data/clamav/db/daily.cvd ]; then + rm -rf /opt/zimbra/data/clamav/db/daily.cvd + fi + if [ -f /opt/zimbra/data/clamav/db/main.cvd ]; then + rm -rf /opt/zimbra/data/clamav/db/main.cvd + fi + if [ -f /opt/zimbra/data/clamav/db/bytecode.cvd ]; then + rm -rf /opt/zimbra/data/clamav/db/bytecode.cvd + fi fi exit 0 diff --git a/thirdparty/clamav-db/zimbra-clamav-db/rpm/SPECS/clamav-db.spec b/thirdparty/clamav-db/zimbra-clamav-db/rpm/SPECS/clamav-db.spec index d773136c5..cee56ce7a 100644 --- a/thirdparty/clamav-db/zimbra-clamav-db/rpm/SPECS/clamav-db.spec +++ b/thirdparty/clamav-db/zimbra-clamav-db/rpm/SPECS/clamav-db.spec @@ -1,7 +1,7 @@ Summary: Initial ClamAV Databases for ClamAV Name: zimbra-clamav-db Version: 1.0.0 -Release: ITERATIONZAPPEND +Release: 1zimbra8.7b2ZAPPEND License: GPL-2 Requires: zimbra-base Packager: Zimbra Packaging Services @@ -14,6 +14,8 @@ AutoReqProv: no Initial ClamAV Databases for ClamAV %changelog +* Fri Jun 23 2023 Zimbra Packaging Services - VERSION-1zimbra8.7b2ZAPPEND +- ZCS-13605, Updated clamav-db for ClamAV-1.0.1 * Wed Mar 09 2016 Zimbra Packaging Services - 1.0.0-ITERATIONZAPPEND - Initial version @@ -27,3 +29,14 @@ cp ../../../src/main.cvd ${RPM_BUILD_ROOT}/opt/zimbra/data/clamav/init/main.cvd. %attr(644,zimbra,zimbra) /opt/zimbra/data/clamav/init/bytecode.cvd.init %attr(644,zimbra,zimbra) /opt/zimbra/data/clamav/init/daily.cvd.init %attr(644,zimbra,zimbra) /opt/zimbra/data/clamav/init/main.cvd.init + +%post -p /bin/bash +if [ -f /opt/zimbra/data/clamav/db/daily.cvd ]; then + rm -rf /opt/zimbra/data/clamav/db/daily.cvd +fi +if [ -f /opt/zimbra/data/clamav/db/main.cvd ]; then + rm -rf /opt/zimbra/data/clamav/db/main.cvd +fi +if [ -f /opt/zimbra/data/clamav/db/bytecode.cvd ]; then + rm -rf /opt/zimbra/data/clamav/db/bytecode.cvd +fi From 25bdabfe8dde3453291d5aaf5c02a882a2f52751 Mon Sep 17 00:00:00 2001 From: Umashankar Avagadda Date: Wed, 28 Jun 2023 05:13:14 +0000 Subject: [PATCH 3/3] ZCS-13605:Updated mta-components to 1.0.22 --- .../mta-components/zimbra-mta-components/debian/changelog | 6 ++++++ zimbra/mta-components/zimbra-mta-components/debian/control | 4 ++-- .../zimbra-mta-components/rpm/SPECS/mta-components.spec | 6 ++++-- 3 files changed, 12 insertions(+), 4 deletions(-) diff --git a/zimbra/mta-components/zimbra-mta-components/debian/changelog b/zimbra/mta-components/zimbra-mta-components/debian/changelog index e5c403915..c249ee1bf 100644 --- a/zimbra/mta-components/zimbra-mta-components/debian/changelog +++ b/zimbra/mta-components/zimbra-mta-components/debian/changelog @@ -1,3 +1,9 @@ +zimbra-mta-components (1.0.22-1zimbra8.8b1ZAPPEND) unstable; urgency=medium + + * ZCS-13605, Upgraded ClamAV to 1.0.1 and updated clamav-db for ClamAV-1.0.1 + + -- Zimbra Packaging Services Fri, 23 Jun 2023 16:05:22 +0000 + zimbra-mta-components (1.0.21-1zimbra8.8b1ZAPPEND) unstable; urgency=medium * Updated perl-mail-spamassassin,spamassassin-rules,opendkim,clamav,postfix diff --git a/zimbra/mta-components/zimbra-mta-components/debian/control b/zimbra/mta-components/zimbra-mta-components/debian/control index d55123548..9d536c328 100644 --- a/zimbra/mta-components/zimbra-mta-components/debian/control +++ b/zimbra/mta-components/zimbra-mta-components/debian/control @@ -9,8 +9,8 @@ Package: zimbra-mta-components Architecture: all Depends: ${misc:Depends}, ${perl:Depends}, ${shlibs:Depends}, sqlite3, zimbra-mta-base, zimbra-altermime, zimbra-amavisd (>= 2.13.0-1zimbra8.7b2ZAPPEND), - zimbra-clamav (>= 0.105.2-1zimbra8.8b4ZAPPEND), - zimbra-clamav-db, zimbra-cluebringer, zimbra-mariadb (>= 10.1.25-1zimbra8.7b3ZAPPEND), + zimbra-clamav (>= 1.0.1-1zimbra8.8b4ZAPPEND), + zimbra-clamav-db (>= 1.0.0-1zimbra8.7b2ZAPPEND), zimbra-cluebringer, zimbra-mariadb (>= 10.1.25-1zimbra8.7b3ZAPPEND), zimbra-opendkim (>= 2.10.3-1zimbra8.7b6ZAPPEND), zimbra-perl-mail-spamassassin (>= 3.4.6-1zimbra8.8b4ZAPPEND), zimbra-postfix (>= 3.6.1-1zimbra8.7b4ZAPPEND), zimbra-spamassassin-rules (>= 1.0.0-1zimbra8.8b6ZAPPEND) diff --git a/zimbra/mta-components/zimbra-mta-components/rpm/SPECS/mta-components.spec b/zimbra/mta-components/zimbra-mta-components/rpm/SPECS/mta-components.spec index 402813a8b..bedb77b3a 100644 --- a/zimbra/mta-components/zimbra-mta-components/rpm/SPECS/mta-components.spec +++ b/zimbra/mta-components/zimbra-mta-components/rpm/SPECS/mta-components.spec @@ -1,10 +1,10 @@ Summary: Zimbra components for MTA package Name: zimbra-mta-components -Version: 1.0.21 +Version: 1.0.22 Release: 1zimbra8.8b1ZAPPEND License: GPL-2 Requires: sqlite, zimbra-mta-base, zimbra-altermime, zimbra-amavisd >= 2.13.0-1zimbra8.7b2ZAPPEND -Requires: zimbra-clamav >= 0.105.2-1zimbra8.8b4ZAPPEND, zimbra-clamav-db +Requires: zimbra-clamav >= 1.0.1-1zimbra8.8b4ZAPPEND, zimbra-clamav-db >= 1.0.0-1zimbra8.7b2ZAPPEND Requires: zimbra-cluebringer, zimbra-mariadb >= 10.1.25-1zimbra8.7b3ZAPPEND Requires: zimbra-opendkim >= 2.10.3-1zimbra8.7b6ZAPPEND, zimbra-perl-mail-spamassassin >= 3.4.6-1zimbra8.8b4ZAPPEND Requires: zimbra-postfix >= 3.6.1-1zimbra8.7b4ZAPPEND @@ -20,6 +20,8 @@ Zimbra mta components pulls in all the packages used by zimbra-mta %changelog +* Fri Jun 23 2023 Zimbra Packaging Services - 1.0.22 +- ZCS-13605, Upgraded ClamAV to 1.0.1 and updated clamav-db for for ClamAV-1.0.1 * Tue Jun 13 2023 Zimbra Packaging Services - 1.0.21 - Updated perl-mail-spamassassin,spamassassin-rules,opendkim,clamav,postfix * Fri Mar 10 2023 Zimbra Packaging Services - 1.0.20