From mboxrd@z Thu Jan  1 00:00:00 1970
From: Peter =?utf-8?q?M=C3=BCller?= <peter.mueller@link38.eu>
To: development@lists.ipfire.org
Subject: [PATCH] update ClamAV to 0.100.0
Date: Sat, 21 Apr 2018 18:44:45 +0200
Message-ID: <8a2a2da2-bb60-2944-fdd8-c00b517a3559@link38.eu>
MIME-Version: 1.0
Content-Type: multipart/mixed; boundary="===============2785258077085590022=="
List-Id: <development.lists.ipfire.org>

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

Update ClamAV to 0.100.0, which brings some new features and bugfixes
(release notes are available here: https://blog.clamav.net/2018/04/clamav-010=
00-has-been-released.html).

Since the internal LLVM code is now deprecated and disabled by default,
patching clamav/libclamav/c++/llvm/lib/ExecutionEngine/JIT/Intercept.cpp
does not seem to be necessary anymore.

Further, the --disable-zlib-vcheck option has been removed since it
produces warnings during compilation.

Signed-off-by: Peter M=C3=BCller <peter.mueller(a)link38.eu>
---
 lfs/clamav                          |  8 +++-----
 src/patches/clamav/llvm-glibc.patch | 12 ------------
 2 files changed, 3 insertions(+), 17 deletions(-)
 delete mode 100644 src/patches/clamav/llvm-glibc.patch

diff --git a/lfs/clamav b/lfs/clamav
index 748c2c371..7623801fb 100644
--- a/lfs/clamav
+++ b/lfs/clamav
@@ -24,7 +24,7 @@
=20
 include Config
=20
-VER        =3D 0.99.4
+VER        =3D 0.100.0
=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 37
+PAK_VER    =3D 38
=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 b9359b90086948b3c4eb97c84cf4b400
+$(DL_FILE)_MD5 =3D 93e8efb489c2afdfca73703b76c24e01
=20
 install : $(TARGET)
=20
@@ -81,10 +81,8 @@ $(subst %,%_MD5,$(objects)) :
 $(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) && ./configure \
 		--prefix=3D/usr \
-		--disable-zlib-vcheck \
 		--sysconfdir=3D/var/ipfire/clamav \
 		$(CONFIGURE_FLAGS)
 	cd $(DIR_APP) && make $(MAKETUNING)
diff --git a/src/patches/clamav/llvm-glibc.patch b/src/patches/clamav/llvm-gl=
ibc.patch
deleted file mode 100644
index 78845fcfc..000000000
--- a/src/patches/clamav/llvm-glibc.patch
+++ /dev/null
@@ -1,12 +0,0 @@
-Index: clamav-0.97.3/libclamav/c++/llvm/lib/ExecutionEngine/JIT/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
-@@ -55,6 +55,7 @@ static void runAtExitHandlers() {
- #include <sys/stat.h>
- #endif
- #include <fcntl.h>
-+#include <unistd.h>
- /* stat functions are redirecting to __xstat with a version number.  On x86=
-64=20
-  * linking with libc_nonshared.a and -Wl,--export-dynamic doesn't make 'sta=
t'=20
-  * available as an exported symbol, so we have to add it explicitly.
--=20
2.13.6

--===============2785258077085590022==--