From 29159dd1a70dc0202406ad0af01585bb565fa679 Mon Sep 17 00:00:00 2001
From: Schrijvers Luc <begasus@gmail.com>
Date: Sat, 19 Oct 2024 12:09:42 +0200
Subject: [PATCH] clamav, bump version (#11228)

---
 ...lamav-1.2.0.recipe => clamav-1.4.1.recipe} | 19 ++++---
 .../clamav/patches/clamav-1.2.0.patchset      | 52 -------------------
 2 files changed, 13 insertions(+), 58 deletions(-)
 rename app-antivirus/clamav/{clamav-1.2.0.recipe => clamav-1.4.1.recipe} (91%)
 delete mode 100644 app-antivirus/clamav/patches/clamav-1.2.0.patchset

diff --git a/app-antivirus/clamav/clamav-1.2.0.recipe b/app-antivirus/clamav/clamav-1.4.1.recipe
similarity index 91%
rename from app-antivirus/clamav/clamav-1.2.0.recipe
rename to app-antivirus/clamav/clamav-1.4.1.recipe
index d2611e645..763058e54 100644
--- a/app-antivirus/clamav/clamav-1.2.0.recipe
+++ b/app-antivirus/clamav/clamav-1.4.1.recipe
@@ -6,11 +6,10 @@ COPYRIGHT="2001-2007 Tomasz Kojm
 	2007-2023 Cisco Systems"
 PACKAGER="Luca D'Amico <damico.luca91@live.it>"
 LICENSE="GNU GPL v2"
-REVISION="2"
+REVISION="1"
 SOURCE_URI="https://github.com/Cisco-Talos/clamav/archive/refs/tags/clamav-$portVersion.tar.gz"
-CHECKSUM_SHA256="efe7e234fe29a96bf4da23336e38ea2989ed0be162342993e99a11901524f43f"
+CHECKSUM_SHA256="f2016f214d6fd94ff77a0e3103755d18bfac1d62c1ca9f8cb823481b3c0a63d1"
 SOURCE_DIR="clamav-clamav-$portVersion"
-PATCHES="clamav-$portVersion.patchset"
 
 ARCHITECTURES="all !x86_gcc2"
 SECONDARY_ARCHITECTURES="x86"
@@ -55,6 +54,7 @@ PROVIDES_devel="
 	clamav${secondaryArchSuffix}_devel = $portVersion
 	cmd:clamav_config$secondaryArchSuffix = $portVersion
 	devel:libclamav$secondaryArchSuffix = $portVersion
+	devel:libclamav_rust$secondaryArchSuffix
 	devel:libclamunrar$secondaryArchSuffix = $portVersion
 	devel:libclamunrar_iface$secondaryArchSuffix = $portVersion
 	devel:libfreshclam$secondaryArchSuffix = $portVersion
@@ -80,8 +80,11 @@ BUILD_REQUIRES="
 	devel:libz$secondaryArchSuffix
 	"
 BUILD_PREREQUIRES="
-	cmd:cargo$secondaryArchSuffix >= 0.70.0
+	pytest_python310
+	cmd:cargo$secondaryArchSuffix
 	cmd:cmake
+	cmd:dot
+	cmd:doxygen
 	cmd:gcc$secondaryArchSuffix
 	cmd:make
 	cmd:python3
@@ -91,13 +94,16 @@ BUILD()
 {
 	cmake -Bbuild -S. -DCMAKE_BUILD_TYPE=Release \
 		$cmakeDirArgs \
+		-DCMAKE_EXE_LINKER_FLAGS="-lbe" \
 		-DENABLE_MILTER=OFF \
 		-DENABLE_EXTERNAL_MSPACK=ON \
 		-DAPP_CONFIG_DIRECTORY=$settingsDir/clamav \
-		-DDATABASE_DIRECTORY=$settingsDir/clamav/db
+		-DDATABASE_DIRECTORY=$settingsDir/clamav/db \
+		-DENABLE_DOXYGEN=ON
 	make -C build
 }
 
+
 INSTALL()
 {
 	make -C build install
@@ -105,7 +111,8 @@ INSTALL()
 	prepareInstalledDevelLibs libclamav \
 		libclamunrar \
 		libclamunrar_iface \
-		libfreshclam
+		libfreshclam \
+		libclamav_rust
 	fixPkgconfig
 
 	packageEntries devel "$developDir" \
diff --git a/app-antivirus/clamav/patches/clamav-1.2.0.patchset b/app-antivirus/clamav/patches/clamav-1.2.0.patchset
deleted file mode 100644
index 12bef08c9..000000000
--- a/app-antivirus/clamav/patches/clamav-1.2.0.patchset
+++ /dev/null
@@ -1,52 +0,0 @@
-From dc5efaa4fe8443afc08f5cf5d8a06f56d3640372 Mon Sep 17 00:00:00 2001
-From: Luca D'Amico <damico.luca91@live.it>
-Date: Tue, 17 Oct 2023 19:15:17 +0000
-Subject: applying patch haiku-1.2.0.patch
-
-
-diff --git a/CMakeLists.txt b/CMakeLists.txt
-index 5426f38..be74d2b 100644
---- a/CMakeLists.txt
-+++ b/CMakeLists.txt
-@@ -610,8 +610,10 @@ foreach(_cxx1x_flag -std=c++14 -std=c++11)
-     endif()
- endforeach()
- 
--# Always use '-fPIC'/'-fPIE' option.
--set(CMAKE_POSITION_INDEPENDENT_CODE ON)
-+# Always use '-fPIC'/'-fPIE' option if OS is not Haiku.
-+if(NOT HAIKU)
-+       set(CMAKE_POSITION_INDEPENDENT_CODE ON)
-+endif()
- 
- # Checks for header files.
- include(CheckIncludeFile)
-diff --git a/libfreshclam/CMakeLists.txt b/libfreshclam/CMakeLists.txt
-index 01b456c..218d74c 100644
---- a/libfreshclam/CMakeLists.txt
-+++ b/libfreshclam/CMakeLists.txt
-@@ -48,6 +48,10 @@ if(ENABLE_SHARED_LIB)
-                 resolv
-                 ${APPLE_CORE_FOUNDATION}
-                 ${APPLE_SECURITY} )
-+    elseif(HAIKU)
-+        target_link_libraries( freshclam
-+            PUBLIC
-+                network )
-     elseif(UNIX)
-         if(HAVE_RESOLV_H AND NOT C_BSD) # BSD appears to have libresolv inside libc
-             target_link_libraries( freshclam
-@@ -128,6 +132,10 @@ if(ENABLE_STATIC_LIB)
-                 resolv
-                 ${APPLE_CORE_FOUNDATION}
-                 ${APPLE_SECURITY} )
-+    elseif(HAIKU)
-+        target_link_libraries( freshclam_static
-+            PUBLIC
-+                network )
-     elseif(UNIX)
-         if(HAVE_RESOLV_H AND NOT C_BSD) # BSD appears to have libresolv inside libc
-             target_link_libraries( freshclam_static
--- 
-2.42.0
-