update ClamAV to 0.100.0

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-01000-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üller <peter.mueller@link38.eu>
Signed-off-by: Michael Tremer <michael.tremer@ipfire.org>

diff --git a/lfs/clamav b/lfs/clamav
index 748c2c371c9dd882efb23b5e13686f88261cc6a4..7623801fb8a7c5537c1672038b5c9d3ff22518f5 100644 (file)
--- a/lfs/clamav
+++ b/lfs/clamav
@@ -24,7 +24,7 @@
 
 include Config
 
-VER        = 0.99.4
+VER        = 0.100.0
 
 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    = 37
+PAK_VER    = 38
 
 DEPS       = ""
 
@@ -48,7 +48,7 @@ objects = $(DL_FILE)
 
 $(DL_FILE) = $(DL_FROM)/$(DL_FILE)
 
-$(DL_FILE)_MD5 = b9359b90086948b3c4eb97c84cf4b400
+$(DL_FILE)_MD5 = 93e8efb489c2afdfca73703b76c24e01
 
 install : $(TARGET)
 
@@ -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.patch
        cd $(DIR_APP) && ./configure \
                --prefix=/usr \
-               --disable-zlib-vcheck \
                --sysconfdir=/var/ipfire/clamav \
                $(CONFIGURE_FLAGS)
        cd $(DIR_APP) && make $(MAKETUNING)

diff --git a/src/patches/clamav/llvm-glibc.patch b/src/patches/clamav/llvm-glibc.patch
deleted file mode 100644 (file)
index 78845fc..0000000
--- 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
-===================================================================
---- 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 
-  * linking with libc_nonshared.a and -Wl,--export-dynamic doesn't make 'stat' 
-  * available as an exported symbol, so we have to add it explicitly.