clamav: Update to 0.101.2

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

diff --git a/lfs/clamav b/lfs/clamav
index 2c996b26a5353f9242676329d710b29a3b2d97f7..6406914081937a0b59afa358ec680d7447809d73 100644 (file)
--- a/lfs/clamav
+++ b/lfs/clamav
@@ -1,7 +1,7 @@
 ###############################################################################
 #                                                                             #
 # IPFire.org - A linux based firewall                                         #
-# Copyright (C) 2007-2014  IPFire Team  <info@ipfire.org>                     #
+# Copyright (C) 2007-2019  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.5
+VER        = 0.101.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    = 27
+PAK_VER    = 44
 
 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 = abb5c7efaff3394c0a49ff970841a2ac
+$(DL_FILE)_MD5 = faeb0e286e76c2a26e2e10845e4b68db
 
 install : $(TARGET)
 
@@ -58,7 +60,7 @@ download :$(patsubst %,$(DIR_DL)/%,$(objects))
 
 md5 : $(subst %,%_MD5,$(objects))
 
-dist: 
+dist:
        $(PAK)
 
 ###############################################################################
@@ -84,20 +86,17 @@ $(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects))
        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)