X-Git-Url: http://git.ipfire.org/?a=blobdiff_plain;f=lfs%2Fclamav;h=420ee82b38c89d1ce6aba306af1e22b4d5471205;hb=612424542710ab75cbfb4187d98295a7cbaec719;hp=0625ecf9366ebdaabc7d0b31a88b5e65a1e75e23;hpb=e2f8251726f7b4b567021a8631f153e014442f0c;p=people%2Fpmueller%2Fipfire-2.x.git

diff --git a/lfs/clamav b/lfs/clamav
index 0625ecf936..420ee82b38 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.2
 
 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    = 34
+PAK_VER    = 41
 
 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 = 61b51a04619aeafd965892a53f86d192
+$(DL_FILE)_MD5 = 253dd79dd57da759567e42543a569c5c
 
 install : $(TARGET)
 
@@ -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)