X-Git-Url: http://git.ipfire.org/?a=blobdiff_plain;f=lfs%2Fclamav;h=2e07ed03449dbe4a5d6df207f1cc6ffd6ec9c85e;hb=600b99fb315f02cd778b7725cdf54ca95caf095d;hp=d30ae6344c75d9c680c85116d044475ba6fcfcbf;hpb=b13a80565075897e8ecb3805829294555a152caf;p=ipfire-2.x.git

diff --git a/lfs/clamav b/lfs/clamav
index d30ae6344c..2e07ed0344 100644
--- a/lfs/clamav
+++ b/lfs/clamav
@@ -1,7 +1,7 @@
 ###############################################################################
 #                                                                             #
 # IPFire.org - A linux based firewall                                         #
-# Copyright (C) 2007-2011  IPFire Team  <info@ipfire.org>                     #
+# Copyright (C) 2007-2015  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.97.2
+VER        = 0.98.6
 
 THISAPP    = clamav-$(VER)
 DL_FILE    = $(THISAPP).tar.gz
@@ -32,10 +32,14 @@ DL_FROM    = $(URL_IPFIRE)
 DIR_APP    = $(DIR_SRC)/$(THISAPP)
 TARGET     = $(DIR_INFO)/$(THISAPP)
 PROG       = clamav
-PAK_VER    = 17
+PAK_VER    = 28
 
 DEPS       = ""
 
+ifeq "$(MACHINE_TYPE)" "arm"
+CONFIGURE_FLAGS = --disable-fanotify
+endif
+
 ###############################################################################
 # Top-level Rules
 ###############################################################################
@@ -44,7 +48,7 @@ objects = $(DL_FILE)
 
 $(DL_FILE) = $(DL_FROM)/$(DL_FILE)
 
-$(DL_FILE)_MD5 = cb2d78b4790fdfca3b2390d7ce82f0b7
+$(DL_FILE)_MD5 = 7f4f7e82a09e42c4ebf153d6d452d9d8
 
 install : $(TARGET)
 
@@ -77,13 +81,24 @@ $(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) && ./configure --prefix=/usr --sysconfdir=/var/ipfire/clamav
+	cd $(DIR_APP) && patch -Np1 -i $(DIR_SRC)/src/patches/clamav/llvm-glibc.patch
+	cd $(DIR_APP) && ./configure \
+		--prefix=/usr \
+		--sysconfdir=/var/ipfire/clamav \
+		$(CONFIGURE_FLAGS)
 	cd $(DIR_APP) && make $(MAKETUNING)
 	cd $(DIR_APP) && make install
+	mkdir -p /usr/share/clamav/
 	chown clamav.clamav -R /usr/share/clamav/
 	cp -rf $(DIR_SRC)/config/clamav/* /var/ipfire/clamav/
 	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
+
 	@rm -rf $(DIR_APP)
 	@$(POSTBUILD)