X-Git-Url: http://git.ipfire.org/?a=blobdiff_plain;f=lfs%2Fclamav;h=987c0453a74f14a5d5d851ba6eb2dd77f6e02bdd;hb=c183124f5808ffc57e09667f7f13590dc6d03db0;hp=d6f8164b7225fb2bbc13c06b10c8ec6374bf2bc9;hpb=606efa9c2a1515fdb76e2f710b2237335d1584ce;p=ipfire-2.x.git

diff --git a/lfs/clamav b/lfs/clamav
index d6f8164b72..987c0453a7 100644
--- a/lfs/clamav
+++ b/lfs/clamav
@@ -1,7 +1,7 @@
 ###############################################################################
 #                                                                             #
 # IPFire.org - A linux based firewall                                         #
-# Copyright (C) 2007-2019  IPFire Team  <info@ipfire.org>                     #
+# Copyright (C) 2007-2022  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,9 @@
 
 include Config
 
-VER        = 0.101.3
+SUMMARY    = Antivirus Toolkit
+
+VER        = 0.105.1
 
 THISAPP    = clamav-$(VER)
 DL_FILE    = $(THISAPP).tar.gz
@@ -32,13 +34,11 @@ DL_FROM    = $(URL_IPFIRE)
 DIR_APP    = $(DIR_SRC)/$(THISAPP)
 TARGET     = $(DIR_INFO)/$(THISAPP)
 PROG       = clamav
-PAK_VER    = 45
+PAK_VER    = 62
 
-DEPS       = ""
+DEPS       =
 
-ifeq "$(BUILD_PLATFORM)" "arm"
-CONFIGURE_FLAGS = --disable-fanotify
-endif
+SERVICES   = clamav
 
 DATABASE_DIR = /var/lib/clamav
 
@@ -50,7 +50,7 @@ objects = $(DL_FILE)
 
 $(DL_FILE) = $(DL_FROM)/$(DL_FILE)
 
-$(DL_FILE)_MD5 = 1981c5bd299c1f3cbf3f74095a00524c
+$(DL_FILE)_BLAKE2 = be46d9afd76fb536d7de7363a45d38fef6a5983011e3cd0dcc25c2a209c8d37a2bbe1f7f4a5694152cabf622ef83e072b892ae12ba404da1955bb5b654e5216d
 
 install : $(TARGET)
 
@@ -58,13 +58,13 @@ check : $(patsubst %,$(DIR_CHK)/%,$(objects))
 
 download :$(patsubst %,$(DIR_DL)/%,$(objects))
 
-md5 : $(subst %,%_MD5,$(objects))
+b2 : $(subst %,%_BLAKE2,$(objects))
 
 dist:
 	$(PAK)
 
 ###############################################################################
-# Downloading, checking, md5sum
+# Downloading, checking, b2sum
 ###############################################################################
 
 $(patsubst %,$(DIR_CHK)/%,$(objects)) :
@@ -73,8 +73,8 @@ $(patsubst %,$(DIR_CHK)/%,$(objects)) :
 $(patsubst %,$(DIR_DL)/%,$(objects)) :
 	@$(LOAD)
 
-$(subst %,%_MD5,$(objects)) :
-	@$(MD5)
+$(subst %,%_BLAKE2,$(objects)) :
+	@$(B2SUM)
 
 ###############################################################################
 # Installation Details
@@ -83,20 +83,34 @@ $(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 \
-		--with-dbdir=$(DATABASE_DIR) \
-		$(CONFIGURE_FLAGS)
-	cd $(DIR_APP) && make $(MAKETUNING)
-	cd $(DIR_APP) && make install
+
+	cd $(DIR_APP) && mkdir -pv build
+	cd $(DIR_APP)/build && cmake .. -G Ninja \
+		-DCMAKE_BUILD_TYPE=Release \
+		-DCMAKE_INSTALL_PREFIX=/usr \
+		-DCMAKE_INSTALL_LIBDIR=/usr/lib \
+		-DOPTIMIZE=ON \
+		-DBYTECODE_RUNTIME="interpreter" \
+		-DENABLE_TESTS=OFF \
+		-DENABLE_CLAMONACC=OFF \
+		-DENABLE_MILTER=OFF \
+		-DENABLE_MAN_PAGES=OFF \
+		-DENABLE_EXTERNAL_MSPACK=OFF \
+		-DENABLE_FRESHCLAM_DNS_FIX=ON \
+		-DAPP_CONFIG_DIRECTORY=/var/ipfire/clamav \
+		-DCURSES_LIBRARY=/usr/lib/libncurses.so \
+		-DDATABASE_DIRECTORY=$(DATABASE_DIR)
+
+	cd $(DIR_APP)/build && ninja $(MAKETUNING) && ninja install
+
 	mkdir -pv $(DATABASE_DIR)
 	chown clamav.clamav -R $(DATABASE_DIR)
 	rm -rfv $(DATABASE_DIR)/*.cvd
+	mkdir -pv /var/ipfire/clamav
 	cp -rf $(DIR_SRC)/config/clamav/* /var/ipfire/clamav/
-	mkdir -p /var/run/clamav
+	mkdir -pv /var/run/clamav
 	chown clamav:clamav /var/run/clamav
 	#install initscripts
-	$(call INSTALL_INITSCRIPT,clamav)
+	$(call INSTALL_INITSCRIPTS,$(SERVICES))
 	@rm -rf $(DIR_APP)
 	@$(POSTBUILD)