From patchwork Sat Jan 27 03:43:24 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Matthias Fischer X-Patchwork-Id: 1634 Return-Path: Received: from mail01.ipfire.org (unknown [172.28.1.200]) by web02.ipfire.org (Postfix) with ESMTP id 17E8560250 for ; Fri, 26 Jan 2018 17:43:33 +0100 (CET) Received: from mail01.ipfire.org (localhost [IPv6:::1]) by mail01.ipfire.org (Postfix) with ESMTP id 1557D46DB; Fri, 26 Jan 2018 17:43:31 +0100 (CET) Received: from Devel.localdomain (unknown [79.223.12.52]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-SHA256 (128/128 bits)) (Client did not present a certificate) by mail01.ipfire.org (Postfix) with ESMTPSA id 8889A46DA for ; Fri, 26 Jan 2018 17:43:29 +0100 (CET) From: Matthias Fischer To: development@lists.ipfire.org Subject: [PATCH] clamav: Update to 0.99.3 Date: Fri, 26 Jan 2018 17:43:24 +0100 Message-Id: <20180126164324.31213-1-matthias.fischer@ipfire.org> X-Mailer: git-send-email 2.16.1 X-BeenThere: development@lists.ipfire.org X-Mailman-Version: 2.1.21 Precedence: list List-Id: IPFire development talk List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: development-bounces@lists.ipfire.org Sender: "Development" Excerpt from 'README': "ClamAV 0.99.3 is a hotfix release to patch a set of vulnerabilities. - fixes for the following CVE's: CVE-2017-6418, CVE-2017-6420, CVE-2017-12374, CVE-2017-12375, CVE-2017-12376, CVE-2017-12377, CVE-2017-12378, CVE-2017-12379, CVE-2017-12380. - also included are 2 minor fixes to properly detect openssl install locations on FreeBSD 11, and prevent false warnings about zlib 1.2.1# version numbers." For details see: http://blog.clamav.net/2018/01/clamav-0993-has-been-released.html Best, Matthias Signed-off-by: Matthias Fischer --- lfs/clamav | 10 +++++----- .../clamav-0.99.3-gcc-6.patch} | 0 src/patches/clamav/llvm-glibc.patch | 2 +- 3 files changed, 6 insertions(+), 6 deletions(-) rename src/patches/{clamav-0.99.2-gcc-6.patch => clamav/clamav-0.99.3-gcc-6.patch} (100%) diff --git a/lfs/clamav b/lfs/clamav index e91eb97c8..a2c58a186 100644 --- a/lfs/clamav +++ b/lfs/clamav @@ -1,7 +1,7 @@ ############################################################################### # # # IPFire.org - A linux based firewall # -# Copyright (C) 2007-2016 IPFire Team # +# Copyright (C) 2007-2018 IPFire Team # # # # This program is free software: you can redistribute it and/or modify # # it under the terms of the GNU General Public License as published by # @@ -24,7 +24,7 @@ include Config -VER = 0.99.2 +VER = 0.99.3 THISAPP = clamav-$(VER) DL_FILE = $(THISAPP).tar.gz @@ -32,7 +32,7 @@ DL_FROM = $(URL_IPFIRE) DIR_APP = $(DIR_SRC)/$(THISAPP) TARGET = $(DIR_INFO)/$(THISAPP) PROG = clamav -PAK_VER = 34 +PAK_VER = 35 DEPS = "" @@ -48,7 +48,7 @@ objects = $(DL_FILE) $(DL_FILE) = $(DL_FROM)/$(DL_FILE) -$(DL_FILE)_MD5 = 61b51a04619aeafd965892a53f86d192 +$(DL_FILE)_MD5 = 5272f127312e987b3e10c155cf1d84df install : $(TARGET) @@ -82,7 +82,7 @@ $(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects)) @$(PREBUILD) @rm -rf $(DIR_APP) && cd $(DIR_SRC) && tar zxf $(DIR_DL)/$(DL_FILE) cd $(DIR_APP) && patch -Np1 -i $(DIR_SRC)/src/patches/clamav/llvm-glibc.patch - cd $(DIR_APP) && patch -Np1 < $(DIR_SRC)/src/patches/clamav-0.99.2-gcc-6.patch + cd $(DIR_APP) && patch -Np1 < $(DIR_SRC)/src/patches/clamav-0.99.3-gcc-6.patch cd $(DIR_APP) && ./configure \ --prefix=/usr \ --disable-zlib-vcheck \ diff --git a/src/patches/clamav-0.99.2-gcc-6.patch b/src/patches/clamav/clamav-0.99.3-gcc-6.patch similarity index 100% rename from src/patches/clamav-0.99.2-gcc-6.patch rename to src/patches/clamav/clamav-0.99.3-gcc-6.patch diff --git a/src/patches/clamav/llvm-glibc.patch b/src/patches/clamav/llvm-glibc.patch index 67dbdd7d8..78845fcfc 100644 --- a/src/patches/clamav/llvm-glibc.patch +++ b/src/patches/clamav/llvm-glibc.patch @@ -2,7 +2,7 @@ Index: clamav-0.97.3/libclamav/c++/llvm/lib/ExecutionEngine/JIT/Intercept.cpp =================================================================== --- clamav-0.97.3.orig/libclamav/c++/llvm/lib/ExecutionEngine/JIT/Intercept.cpp +++ clamav-0.97.3/libclamav/c++/llvm/lib/ExecutionEngine/JIT/Intercept.cpp -@@ -52,6 +52,7 @@ static void runAtExitHandlers() { +@@ -55,6 +55,7 @@ static void runAtExitHandlers() { #include #endif #include