Merge branch 'master' into next

[ipfire-2.x.git] / lfs / clamav

diff --git a/lfs/clamav b/lfs/clamav
index 3c778c3c326e8667c76d4309e11464891478c72a..06ba0fcc4df2160f0c2430e4c5eeb3b5b6e12494 100644 (file)
--- a/lfs/clamav
+++ b/lfs/clamav
@@ -24,7 +24,7 @@
 
 include Config
 
-VER        = 0.99.1
+VER        = 0.99.2
 
 THISAPP    = clamav-$(VER)
 DL_FILE    = $(THISAPP).tar.gz
@@ -32,11 +32,11 @@ DL_FROM    = $(URL_IPFIRE)
 DIR_APP    = $(DIR_SRC)/$(THISAPP)
 TARGET     = $(DIR_INFO)/$(THISAPP)
 PROG       = clamav
-PAK_VER    = 31
+PAK_VER    = 34
 
 DEPS       = ""
 
-ifeq "$(MACHINE_TYPE)" "arm"
+ifeq "$(BUILD_PLATFORM)" "arm"
 CONFIGURE_FLAGS = --disable-fanotify
 endif
 
@@ -48,7 +48,7 @@ objects = $(DL_FILE)
 
 $(DL_FILE) = $(DL_FROM)/$(DL_FILE)
 
-$(DL_FILE)_MD5 = cf1f3cbe62a08c9165801f79239166ff
+$(DL_FILE)_MD5 = 61b51a04619aeafd965892a53f86d192
 
 install : $(TARGET)
 
@@ -82,8 +82,10 @@ $(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) && ./configure \
                --prefix=/usr \
+               --disable-zlib-vcheck \
                --sysconfdir=/var/ipfire/clamav \
                $(CONFIGURE_FLAGS)
        cd $(DIR_APP) && make $(MAKETUNING)
@@ -94,11 +96,8 @@ $(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects))
        rm -rfv /usr/share/clamav/*.cvd
        mkdir -p /var/run/clamav
        chown clamav:clamav /var/run/clamav
-
-       # Disable PaX mprotect for clamd, clamscan and freshclam
-       paxctl -cm /usr/sbin/clamd
-       paxctl -cm /usr/bin/clamscan
-       paxctl -cm /usr/bin/freshclam
+       #install initscripts
+       $(call INSTALL_INITSCRIPT,clamav)
 
        @rm -rf $(DIR_APP)
        @$(POSTBUILD)