clamav: update to 1.3.0
authorkrant <aleksey.vasilenko@gmail.com>
Thu, 22 Feb 2024 10:53:47 +0000 (12:53 +0200)
committerJosef Schlehofer <pepe.schlehofer@gmail.com>
Wed, 6 Mar 2024 19:50:37 +0000 (20:50 +0100)
- Add build-time Rust dependency
- Don't set default and rename changed CMake options

Signed-off-by: krant <aleksey.vasilenko@gmail.com>
(cherry picked from commit a9a1e7c3a68fab5317153835de90db8cd5c9ec3c)

net/clamav/Makefile

index 035d91fc3dd1e191b3bcb7f08186e90df36efaf6..5f08fca75ddcf26becf0bfae987c5f7c54ff597c 100644 (file)
@@ -8,12 +8,12 @@
 include $(TOPDIR)/rules.mk
 
 PKG_NAME:=clamav
-PKG_VERSION:=0.104.4
+PKG_VERSION:=1.3.0
 PKG_RELEASE:=1
 
 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz
 PKG_SOURCE_URL:=https://www.clamav.net/downloads/production/
-PKG_HASH:=8ac32e910aa744cc7f921c5122ba523ef1ffbbbf94545f94fc4a976b502be74b
+PKG_HASH:=0a86a6496320d91576037b33101119af6fd8d5b91060cd316a3a9c229e9604aa
 
 PKG_MAINTAINER:=Marko Ratkaj <markoratkaj@gmail.com> \
                Lucian Cristian <lucian.cristian@gmail.com>
@@ -21,10 +21,11 @@ PKG_LICENSE:=GPL-2.0-only
 PKG_LICENSE_FILES:=COPYING*
 PKG_CPE_ID:=cpe:/a:clamav:clamav
 
-PKG_BUILD_DEPENDS:=ncurses
+PKG_BUILD_DEPENDS:=ncurses rust/host
 PKG_BUILD_FLAGS:=gc-sections lto
 
 include $(INCLUDE_DIR)/package.mk
+include ../../lang/rust/rust-values.mk
 include $(INCLUDE_DIR)/nls.mk
 include $(INCLUDE_DIR)/cmake.mk
 
@@ -57,7 +58,6 @@ define Package/freshclam/description
 endef
 
 CMAKE_OPTIONS += \
-       -DENABLE_MILTER=ON \
        -DHAVE_ATTRIB_PACKED=ON \
        -DHAVE_ATTRIB_ALIGNED=ON \
        -Dtest_run_result=ON \
@@ -66,11 +66,12 @@ CMAKE_OPTIONS += \
        -DCLAMAV_GROUP=nogroup \
        -DMMAP_FOR_CROSSCOMPILING=ON \
        -DENABLE_CLAMONACC=ON \
-       -DENABLE_DOCS=OFF \
-       -DENABLE_DOXYGEN=OFF \
+       -DENABLE_MAN_PAGES=OFF \
+       -DENABLE_TESTS=OFF \
        -DENABLE_EXAMPLES=OFF \
        -DENABLE_UNRAR=OFF \
        -DENABLE_SYSTEMD=OFF \
+       -DRUST_COMPILER_TARGET=$(RUSTC_TARGET_ARCH) \
        -DHAVE_SYSTEM_LFS_FTS=O$(if $(CONFIG_USE_GLIBC),N,FF)
 
 TARGET_CXXFLAGS += -fno-rtti