This is an automated email from the git hooks/post-receive script. It was generated because a ref change was pushed to the repository containing the project "IPFire 2.x development tree".
The branch, next has been updated via f529ad213f52c5dc6d4eb0a8d0988e9f23fde5e5 (commit) via a83b738215156e95dab1551a7838c508de256a1f (commit) from 1c28319e1e1742f444c8447bcbbdcdf30fc5b2b6 (commit)
Those revisions listed above that are new to this repository have not appeared on any other notification email; so we list those revisions in full, below.
- Log ----------------------------------------------------------------- commit f529ad213f52c5dc6d4eb0a8d0988e9f23fde5e5 Author: Matthias Fischer matthias.fischer@ipfire.org Date: Sun Apr 22 13:38:11 2018 +0200
clamav 0.100.0: Add missing update for rootfile
This is missing in https://patchwork.ipfire.org/patch/1722/
Best, Matthias
Signed-off-by: Matthias Fischer matthias.fischer@ipfire.org Signed-off-by: Michael Tremer michael.tremer@ipfire.org
commit a83b738215156e95dab1551a7838c508de256a1f Author: Peter Müller peter.mueller@link38.eu Date: Sat Apr 21 18:44:45 2018 +0200
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
-----------------------------------------------------------------------
Summary of changes: config/rootfiles/packages/clamav | 8 ++++++-- lfs/clamav | 8 +++----- src/patches/clamav/llvm-glibc.patch | 12 ------------ 3 files changed, 9 insertions(+), 19 deletions(-) delete mode 100644 src/patches/clamav/llvm-glibc.patch
Difference in files: diff --git a/config/rootfiles/packages/clamav b/config/rootfiles/packages/clamav index d7636e983..ec5e09c84 100644 --- a/config/rootfiles/packages/clamav +++ b/config/rootfiles/packages/clamav @@ -4,7 +4,6 @@ usr/bin/clamconf usr/bin/clamdscan usr/bin/clamdtop usr/bin/clamscan -usr/bin/clamsubmit usr/bin/freshclam usr/bin/sigtool #usr/include/clamav.h @@ -12,6 +11,11 @@ usr/bin/sigtool usr/lib/libclamav.so usr/lib/libclamav.so.7 usr/lib/libclamav.so.7.1.1 +#usr/lib/libclammspack.a +#usr/lib/libclammspack.la +usr/lib/libclammspack.so +usr/lib/libclammspack.so.0 +usr/lib/libclammspack.so.0.1.0 #usr/lib/libclamunrar.la usr/lib/libclamunrar.so usr/lib/libclamunrar.so.7 @@ -21,6 +25,7 @@ usr/lib/libclamunrar_iface.so usr/lib/libclamunrar_iface.so.7 usr/lib/libclamunrar_iface.so.7.1.1 #usr/lib/pkgconfig/libclamav.pc +#usr/lib/pkgconfig/libclammspack.pc usr/sbin/clamd usr/share/clamav #usr/share/man/man1/clambc.1 @@ -28,7 +33,6 @@ usr/share/clamav #usr/share/man/man1/clamdscan.1 #usr/share/man/man1/clamdtop.1 #usr/share/man/man1/clamscan.1 -#usr/share/man/man1/clamsubmit.1 #usr/share/man/man1/freshclam.1 #usr/share/man/man1/sigtool.1 #usr/share/man/man5/clamav-milter.conf.5 diff --git a/lfs/clamav b/lfs/clamav index 748c2c371..7623801fb 100644 --- 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 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 -=================================================================== ---- 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.
hooks/post-receive -- IPFire 2.x development tree