Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

ZCS-13605 : Upgrade ClamAV to 1.0.1 #190

Merged
merged 3 commits into from
Jul 27, 2023
+56 −11
Merged

ZCS-13605 : Upgrade ClamAV to 1.0.1 #190

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
907abde
ZCS-13605:Upgraded ClamAV to 1.0.1
umagmrit Jun 28, 2023
a9781c0
ZCS-13605:Updated clamav-db for ClamAV-1.0.1
umagmrit Jun 28, 2023
25bdabf
ZCS-13605:Updated mta-components to 1.0.22
umagmrit Jun 28, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
7 changes: 4 additions & 3 deletions thirdparty/clamav-db/Makefile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand All @@ -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)
umagmrit marked this conversation as resolved.
Show resolved Hide resolved
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

Expand Down
6 changes: 6 additions & 0 deletions thirdparty/clamav-db/zimbra-clamav-db/debian/changelog
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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 <[email protected]> Fri, 23 Jun 2023 16:05:22 +0000

zimbra-clamav-db (1.0.0-ITERATIONZAPPEND) unstable; urgency=low

* Initial Release.
Expand Down
13 changes: 11 additions & 2 deletions thirdparty/clamav-db/zimbra-clamav-db/debian/zimbra-clamav-db.postinst
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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
umagmrit marked this conversation as resolved.
Show resolved Hide resolved
rm -rf /opt/zimbra/data/clamav/db/daily.cvd
fi
if [ -f /opt/zimbra/data/clamav/db/main.cvd ]; then
umagmrit marked this conversation as resolved.
Show resolved Hide resolved
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
15 changes: 14 additions & 1 deletion thirdparty/clamav-db/zimbra-clamav-db/rpm/SPECS/clamav-db.spec
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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 <[email protected]>
Expand All @@ -14,6 +14,8 @@ AutoReqProv: no
Initial ClamAV Databases for ClamAV

%changelog
* Fri Jun 23 2023 Zimbra Packaging Services <[email protected]> - VERSION-1zimbra8.7b2ZAPPEND
- ZCS-13605, Updated clamav-db for ClamAV-1.0.1
* Wed Mar 09 2016 Zimbra Packaging Services <[email protected]> - 1.0.0-ITERATIONZAPPEND
- Initial version

Expand All @@ -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
6 changes: 6 additions & 0 deletions thirdparty/clamav/zimbra-clamav/debian/changelog
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,3 +1,9 @@
zimbra-clamav (VERSION-1zimbra8.8b4ZAPPEND) unstable; urgency=medium

* ZCS-13605, Upgraded ClamAV to 1.0.1

-- Zimbra Packaging Services <[email protected]> Fri, 23 Jun 2023 16:05:22 +0000

zimbra-clamav (VERSION-1zimbra8.8b4ZAPPEND) unstable; urgency=medium

* ZBUG-3355, Upgraded OpenSSL to 3.0.9
Expand Down
2 changes: 2 additions & 0 deletions thirdparty/clamav/zimbra-clamav/rpm/SPECS/clamav.spec
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,6 +22,8 @@ The Zimbra ClamAV build
%define debug_package %{nil}

%changelog
* Fri Jun 23 2023 Zimbra Packaging Services <[email protected]> - VERSION-1zimbra8.8b4ZAPPEND
- ZCS-13605, Upgraded ClamAV to 1.0.1
* Mon Jun 12 2023 Zimbra Packaging Services <[email protected]> - VERSION-1zimbra8.8b4ZAPPEND
- ZBUG-3355, Upgraded OpenSSL to 3.0.9
* Wed Feb 22 2023 Zimbra Packaging Services <[email protected]> - VERSION-1zimbra8.8b3ZAPPEND
Expand Down
2 changes: 1 addition & 1 deletion versions.def
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
6 changes: 6 additions & 0 deletions zimbra/mta-components/zimbra-mta-components/debian/changelog
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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 <[email protected]> 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
Expand Down
4 changes: 2 additions & 2 deletions zimbra/mta-components/zimbra-mta-components/debian/control
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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)
Expand Down
6 changes: 4 additions & 2 deletions zimbra/mta-components/zimbra-mta-components/rpm/SPECS/mta-components.spec
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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
Expand All @@ -20,6 +20,8 @@ Zimbra mta components pulls in all the packages used by
zimbra-mta

%changelog
* Fri Jun 23 2023 Zimbra Packaging Services <[email protected]> - 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 <[email protected]> - 1.0.21
- Updated perl-mail-spamassassin,spamassassin-rules,opendkim,clamav,postfix
* Fri Mar 10 2023 Zimbra Packaging Services <[email protected]> - 1.0.20
Expand Down