X-Git-Url: http://git.ipfire.org/?p=ipfire-2.x.git;a=blobdiff_plain;f=lfs%2Fclamav;h=a6e44ebf20b5ece0bf263d6960a63aef295d5d69;hp=5fd8426e3b10e59ca93c63e19e01da0ecb838226;hb=15b1a3e360a277dc7481103f8ddcbf189033e3a6;hpb=b33e050763f5c752aadedc62c4da75f3392aca25;ds=sidebyside

diff --git a/lfs/clamav b/lfs/clamav
index 5fd8426e3b..a6e44ebf20 100644
--- a/lfs/clamav
+++ b/lfs/clamav
@@ -1,7 +1,7 @@
 ###############################################################################
 #                                                                             #
 # IPFire.org - A linux based firewall                                         #
-# Copyright (C) 2007-2015  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.98.7
+VER        = 0.101.1
 
 THISAPP    = clamav-$(VER)
 DL_FILE    = $(THISAPP).tar.gz
@@ -32,14 +32,16 @@ DL_FROM    = $(URL_IPFIRE)
 DIR_APP    = $(DIR_SRC)/$(THISAPP)
 TARGET     = $(DIR_INFO)/$(THISAPP)
 PROG       = clamav
-PAK_VER    = 29
+PAK_VER    = 43
 
 DEPS       = ""
 
-ifeq "$(MACHINE_TYPE)" "arm"
+ifeq "$(BUILD_PLATFORM)" "arm"
 CONFIGURE_FLAGS = --disable-fanotify
 endif
 
+DATABASE_DIR = /var/lib/clamav
+
 ###############################################################################
 # Top-level Rules
 ###############################################################################
@@ -48,7 +50,7 @@ objects = $(DL_FILE)
 
 $(DL_FILE) = $(DL_FROM)/$(DL_FILE)
 
-$(DL_FILE)_MD5 = 157c601161da1c2d5a0e48ea1b49e067
+$(DL_FILE)_MD5 = 9c137d6172f6e132e08e61fe25b636f8
 
 install : $(TARGET)
 
@@ -58,7 +60,7 @@ download :$(patsubst %,$(DIR_DL)/%,$(objects))
 
 md5 : $(subst %,%_MD5,$(objects))
 
-dist: 
+dist:
 	$(PAK)
 
 ###############################################################################
@@ -81,24 +83,20 @@ $(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 \
+		--with-dbdir=$(DATABASE_DIR) \
 		$(CONFIGURE_FLAGS)
 	cd $(DIR_APP) && make $(MAKETUNING)
 	cd $(DIR_APP) && make install
-	mkdir -p /usr/share/clamav/
-	chown clamav.clamav -R /usr/share/clamav/
+	mkdir -pv $(DATABASE_DIR)
+	chown clamav.clamav -R $(DATABASE_DIR)
+	rm -rfv $(DATABASE_DIR)/*.cvd
 	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
-
+	#install initscripts
+	$(call INSTALL_INITSCRIPT,clamav)
 	@rm -rf $(DIR_APP)
 	@$(POSTBUILD)