clamav: Update to version 0.101.4

Change deprecated options to a new one:
DetectBrokenExecutables to AlertBrokenExecutables
ArchiveBlockEncrypted to AlertEncrypted

Fixes: CVE-2019-12900 and CVE-2019-12625
Signed-off-by: Josef Schlehofer <pepe.schlehofer@gmail.com>

diff --git a/net/clamav/Makefile b/net/clamav/Makefile
index 6fc2c8a1ca7b61c4aa344e0456997045d2f1d857..4cef270c9e173cb236a360fbf7a4d23f904d1a1c 100644 (file)
--- a/net/clamav/Makefile
+++ b/net/clamav/Makefile
@@ -8,12 +8,12 @@
 include $(TOPDIR)/rules.mk
 
 PKG_NAME:=clamav
-PKG_VERSION:=0.101.3
+PKG_VERSION:=0.101.4
 PKG_RELEASE:=1
 
 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz
 PKG_SOURCE_URL:=https://www.clamav.net/downloads/production/
-PKG_HASH:=68d42aac4a9cbde293288533a9a3c3d55863de38f2b8707c1ef2d987b1260338
+PKG_HASH:=0bf094f0919d158a578421d66bc2569c8c8181233ba162bb51722f98c802bccd
 
 PKG_MAINTAINER:=Marko Ratkaj <marko.ratkaj@sartura.hr> \
                Lucian Cristian <lucian.cristian@gmail.com>

diff --git a/net/clamav/files/clamav.config b/net/clamav/files/clamav.config
index 26d941ea17e652bc1b0e499617bded5a141c7f09..9f945e3b90127bb47cc51b745094ef5d95617f6d 100644 (file)
--- a/net/clamav/files/clamav.config
+++ b/net/clamav/files/clamav.config
@@ -19,14 +19,14 @@ config clamav 'clamav'
        option ScanPE 'yes'
        option DisableCertCheck 'no'
        option ScanELF 'yes'
-       option DetectBrokenExecutables 'no'
+       option AlertBrokenExecutables 'no'
        option ScanOLE2 'yes'
        option ScanPDF 'yes'
        option ScanSWF 'yes'
        option ScanMail 'yes'
        option ScanPartialMessages 'no'
        option ScanArchive 'yes'
-       option ArchiveBlockEncrypted 'yes'
+       option AlertEncrypted 'yes'
        option MaxFileSize '10M'
        option TemporaryDirectory '/tmp'
        option LocalSocket '/var/run/clamav/clamd.sock'

diff --git a/net/clamav/files/clamav.init b/net/clamav/files/clamav.init
index 38b1c3238f09d43983a4002cc381be4f0a2d61e1..2802eb1f4db225aad8497ee5ed0a1adb958dbfa7 100644 (file)
--- a/net/clamav/files/clamav.init
+++ b/net/clamav/files/clamav.init
@@ -30,7 +30,7 @@ validate_clamav_section() {
                'ScanPE:string' \
                'DisableCertCheck:string' \
                'ScanELF:string' \
-               'DetectBrokenExecutables:string' \
+               'AlertBrokenExecutables:string' \
                'ScanOLE2:string' \
                'ScanPDF:string' \
                'ScanSWF:string' \
@@ -38,7 +38,7 @@ validate_clamav_section() {
                'ScanPartialMessages:string' \
                'ScanArchive:string' \
                'TemporaryDirectory:string' \
-               'ArchiveBlockEncrypted:string' \
+               'AlertEncrypted:string' \
                'MaxFileSize:string' \
                'LocalSocket:string' \
                'User:string' \
@@ -79,7 +79,7 @@ start_clamav_instance() {
        echo "ScanPE " $ScanPE >> $CLAMD_CONFIGFILE
        echo "DisableCertCheck " $DisableCertCheck >> $CLAMD_CONFIGFILE
        echo "ScanELF " $ScanELF >> $CLAMD_CONFIGFILE
-       echo "DetectBrokenExecutables " $DetectBrokenExecutables >> $CLAMD_CONFIGFILE
+       echo "AlertBrokenExecutables " $AlertBrokenExecutables >> $CLAMD_CONFIGFILE
        echo "ScanOLE2 " $ScanOLE2 >> $CLAMD_CONFIGFILE
        echo "ScanPDF " $ScanPDF >> $CLAMD_CONFIGFILE
        echo "ScanSWF " $ScanSWF >> $CLAMD_CONFIGFILE
@@ -87,7 +87,7 @@ start_clamav_instance() {
        echo "ScanPartialMessages " $ScanPartialMessages >> $CLAMD_CONFIGFILE
        echo "ScanArchive " $ScanArchive >> $CLAMD_CONFIGFILE
        echo "TemporaryDirectory " $TemporaryDirectory >> $CLAMD_CONFIGFILE
-       echo "ArchiveBlockEncrypted " $ArchiveBlockEncrypted >> $CLAMD_CONFIGFILE
+       echo "AlertEncrypted " $AlertEncrypted >> $CLAMD_CONFIGFILE
        echo "MaxFileSize " $MaxFileSize >> $CLAMD_CONFIGFILE
        echo "LocalSocket " $LocalSocket >> $CLAMD_CONFIGFILE
        echo "User " $User >> $CLAMD_CONFIGFILE