X-Git-Url: http://git.ipfire.org/?a=blobdiff_plain;f=lfs%2Fclamav;h=e91eb97c83881a5135bdc1091226e79438fb279b;hb=bee416e2829a5063819ee97f299482e4f894e9e5;hp=89116191919aab0b58deaabefe214bab3ce3e4b1;hpb=fb196971e9bac3b8055547f8273e4bad786f896d;p=ipfire-2.x.git

diff --git a/lfs/clamav b/lfs/clamav
index 8911619191..e91eb97c83 100644
--- a/lfs/clamav
+++ b/lfs/clamav
@@ -32,11 +32,11 @@ DL_FROM    = $(URL_IPFIRE)
 DIR_APP    = $(DIR_SRC)/$(THISAPP)
 TARGET     = $(DIR_INFO)/$(THISAPP)
 PROG       = clamav
-PAK_VER    = 33
+PAK_VER    = 34
 
 DEPS       = ""
 
-ifeq "$(MACHINE_TYPE)" "arm"
+ifeq "$(BUILD_PLATFORM)" "arm"
 CONFIGURE_FLAGS = --disable-fanotify
 endif
 
@@ -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,12 @@ $(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects))
 	rm -rfv /usr/share/clamav/*.cvd
 	mkdir -p /var/run/clamav
 	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
+	paxctl -Cm /usr/sbin/clamd
+	paxctl -Cm /usr/bin/clamscan
+	paxctl -Cm /usr/bin/freshclam
 
 	@rm -rf $(DIR_APP)
 	@$(POSTBUILD)