Merge branch 'master' into next

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

diff --git a/lfs/clamav b/lfs/clamav
index 650faecbebcf7c21983f17523feeb656e93f32f7..06ba0fcc4df2160f0c2430e4c5eeb3b5b6e12494 100644 (file)
--- a/lfs/clamav
+++ b/lfs/clamav
@@ -36,7 +36,7 @@ PAK_VER    = 34
 
 DEPS       = ""
 
-ifeq "$(MACHINE_TYPE)" "arm"
+ifeq "$(BUILD_PLATFORM)" "arm"
 CONFIGURE_FLAGS = --disable-fanotify
 endif
 
@@ -82,6 +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.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 \
@@ -97,10 +98,6 @@ $(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects))
        chown clamav:clamav /var/run/clamav
        #install initscripts
        $(call INSTALL_INITSCRIPT,clamav)
-       # Disable PaX mprotect for clamd, clamscan and freshclam
-       paxctl -cm /usr/sbin/clamd
-       paxctl -cm /usr/bin/clamscan
-       paxctl -cm /usr/bin/freshclam
 
        @rm -rf $(DIR_APP)
        @$(POSTBUILD)