From: Matthias Fischer <matthias.fischer@ipfire.org>
Date: Fri, 26 Jan 2018 16:43:24 +0000 (+0100)
Subject: clamav: Update to 0.99.3
X-Git-Tag: v2.19-core118~3^2~1
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=9a57c6cdd383d2795f8be391cd2c1e93195168ca;p=ipfire-2.x.git

clamav: Update to 0.99.3

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 <matthias.fischer@ipfire.org>
Signed-off-by: Michael Tremer <michael.tremer@ipfire.org>
---

diff --git a/lfs/clamav b/lfs/clamav
index e91eb97c83..89254a1884 100644
--- a/lfs/clamav
+++ b/lfs/clamav
@@ -1,7 +1,7 @@
 ###############################################################################
 #                                                                             #
 # IPFire.org - A linux based firewall                                         #
-# Copyright (C) 2007-2016  IPFire Team  <info@ipfire.org>                     #
+# Copyright (C) 2007-2018  IPFire Team  <info@ipfire.org>                     #
 #                                                                             #
 # 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/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 67dbdd7d8b..78845fcfc8 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 <sys/stat.h>
  #endif
  #include <fcntl.h>