X-Git-Url: http://git.ipfire.org/?a=blobdiff_plain;f=lfs%2Fclamav;h=c0612f1aa3906c8c03631a48b8c94d230ff936d7;hb=701c891b40dc7e115f7359b26babab86ba36602c;hp=a20922e9dd624a5838b40ed8b4fd6dfba6e8478c;hpb=ae666b0c234f9204b864292e044a0c8d182e58d2;p=people%2Fpmueller%2Fipfire-2.x.git

diff --git a/lfs/clamav b/lfs/clamav
index a20922e9dd..c0612f1aa3 100644
--- a/lfs/clamav
+++ b/lfs/clamav
@@ -1,7 +1,7 @@
 ###############################################################################
 #                                                                             #
 # IPFire.org - A linux based firewall                                         #
-# Copyright (C) 2007-2016  IPFire Team  <info@ipfire.org>                     #
+# Copyright (C) 2007-2018  IPFire Team  <info@ipfire.org>                     #
 #                                                                             #
 # This program is free software: you can redistribute it and/or modify        #
 # it under the terms of the GNU General Public License as published by        #
@@ -24,7 +24,7 @@
 
 include Config
 
-VER        = 0.99.2
+VER        = 0.100.1
 
 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    = 34
+PAK_VER    = 39
 
 DEPS       = ""
 
@@ -48,7 +48,7 @@ objects = $(DL_FILE)
 
 $(DL_FILE) = $(DL_FROM)/$(DL_FILE)
 
-$(DL_FILE)_MD5 = 61b51a04619aeafd965892a53f86d192
+$(DL_FILE)_MD5 = 0f653df0480eebcd828939e8db9f0443
 
 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)
@@ -97,6 +95,10 @@ $(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)