X-Git-Url: http://git.ipfire.org/?a=blobdiff_plain;ds=sidebyside;f=lfs%2Fclamav;h=5fd8426e3b10e59ca93c63e19e01da0ecb838226;hb=afd6e1931defb60665b40438d8e54db6de46246f;hp=51febd92ca2d5d6417ed4a9485fc89fab688c87f;hpb=ac14b325e03276f9e17e334b03a3d3129903bac7;p=ipfire-2.x.git

diff --git a/lfs/clamav b/lfs/clamav
index 51febd92ca..5fd8426e3b 100644
--- a/lfs/clamav
+++ b/lfs/clamav
@@ -1,7 +1,7 @@
 ###############################################################################
 #                                                                             #
 # IPFire.org - A linux based firewall                                         #
-# Copyright (C) 2007-2013  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.98
+VER        = 0.98.7
 
 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    = 23
+PAK_VER    = 29
 
 DEPS       = ""
 
@@ -48,7 +48,7 @@ objects = $(DL_FILE)
 
 $(DL_FILE) = $(DL_FROM)/$(DL_FILE)
 
-$(DL_FILE)_MD5 = ca0b8c930efcb8be1d47592d268006c5
+$(DL_FILE)_MD5 = 157c601161da1c2d5a0e48ea1b49e067
 
 install : $(TARGET)
 
@@ -81,6 +81,7 @@ $(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 \
 		--sysconfdir=/var/ipfire/clamav \
@@ -94,8 +95,9 @@ $(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects))
 	mkdir -p /var/run/clamav
 	chown clamav:clamav /var/run/clamav
 
-	# Disable PaX mprotect for clamd and freshclam
+	# 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)