rpi-firmware: ignore user from tarball

[people/pmueller/ipfire-2.x.git] / lfs / clamav

diff --git a/lfs/clamav b/lfs/clamav
index d6f8164b7225fb2bbc13c06b10c8ec6374bf2bc9..69e5d8c0f8c0db1e090cca4f1aeebd45c9b571f1 100644 (file)
--- 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-2021  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.101.3
+VER        = 0.104.1
 
 THISAPP    = clamav-$(VER)
 DL_FILE    = $(THISAPP).tar.gz
@@ -32,13 +32,9 @@ DL_FROM    = $(URL_IPFIRE)
 DIR_APP    = $(DIR_SRC)/$(THISAPP)
 TARGET     = $(DIR_INFO)/$(THISAPP)
 PROG       = clamav
-PAK_VER    = 45
+PAK_VER    = 58
 
-DEPS       = ""
-
-ifeq "$(BUILD_PLATFORM)" "arm"
-CONFIGURE_FLAGS = --disable-fanotify
-endif
+DEPS       =
 
 DATABASE_DIR = /var/lib/clamav
 
@@ -50,7 +46,7 @@ objects = $(DL_FILE)
 
 $(DL_FILE) = $(DL_FROM)/$(DL_FILE)
 
-$(DL_FILE)_MD5 = 1981c5bd299c1f3cbf3f74095a00524c
+$(DL_FILE)_MD5 = 49b9bb94d5b2cafc761f8fbe660d3bfa
 
 install : $(TARGET)
 
@@ -60,7 +56,7 @@ download :$(patsubst %,$(DIR_DL)/%,$(objects))
 
 md5 : $(subst %,%_MD5,$(objects))
 
-dist:
+dist: 
        $(PAK)
 
 ###############################################################################
@@ -83,18 +79,32 @@ $(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)