From mboxrd@z Thu Jan  1 00:00:00 1970
From: Matthias Fischer <matthias.fischer@ipfire.org>
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>
MIME-Version: 1.0
Content-Type: multipart/mixed; boundary="===============1536145220801262093=="
List-Id: <development.lists.ipfire.org>

--===============1536145220801262093==
Content-Type: text/plain; charset="utf-8"
Content-Transfer-Encoding: quoted-printable

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(a)ipfire.org>
---
 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 =3D> 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  <info(a)ipfire.org>                 =
    #
+# Copyright (C) 2007-2018  IPFire Team  <info(a)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 @@
=20
 include Config
=20
-VER        =3D 0.99.2
+VER        =3D 0.99.3
=20
 THISAPP    =3D clamav-$(VER)
 DL_FILE    =3D $(THISAPP).tar.gz
@@ -32,7 +32,7 @@ DL_FROM    =3D $(URL_IPFIRE)
 DIR_APP    =3D $(DIR_SRC)/$(THISAPP)
 TARGET     =3D $(DIR_INFO)/$(THISAPP)
 PROG       =3D clamav
-PAK_VER    =3D 34
+PAK_VER    =3D 35
=20
 DEPS       =3D ""
=20
@@ -48,7 +48,7 @@ objects =3D $(DL_FILE)
=20
 $(DL_FILE) =3D $(DL_FROM)/$(DL_FILE)
=20
-$(DL_FILE)_MD5 =3D 61b51a04619aeafd965892a53f86d192
+$(DL_FILE)_MD5 =3D 5272f127312e987b3e10c155cf1d84df
=20
 install : $(TARGET)
=20
@@ -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.pat=
ch
-	cd $(DIR_APP) && patch -Np1 < $(DIR_SRC)/src/patches/clamav-0.99.2-gcc-6.pa=
tch
+	cd $(DIR_APP) && patch -Np1 < $(DIR_SRC)/src/patches/clamav-0.99.3-gcc-6.pa=
tch
 	cd $(DIR_APP) && ./configure \
 		--prefix=3D/usr \
 		--disable-zlib-vcheck \
diff --git a/src/patches/clamav-0.99.2-gcc-6.patch b/src/patches/clamav/clama=
v-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-gl=
ibc.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/J=
IT/Intercept.cpp
 =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
 --- 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>
--=20
2.16.1


--===============1536145220801262093==--