Commit 351f8b47 authored by Milan P. Stanić's avatar Milan P. Stanić
Browse files

community/clamav: upgrade to 0.105.0

remove cmake-fix-race-condition-with-parallel-builds.patch, fixed
upstream
add cargo to makedepends
parent 8e89217f
......@@ -3,8 +3,8 @@
# Contributor: Carlo Landmeter <clandmeter@alpinelinux.org>
# Maintainer: Carlo Landmeter <clandmeter@alpinelinux.org>
pkgname=clamav
pkgver=0.104.2
pkgrel=1
pkgver=0.105.0
pkgrel=0
pkgusers="clamav"
pkggroups="clamav"
pkgdesc="An anti-virus toolkit for UNIX eis-ng backport"
......@@ -17,6 +17,7 @@ install="freshclam.pre-install
clamav-daemon.pre-install clamav-daemon.pre-upgrade"
makedepends="$depends_dev
bzip2-dev
cargo
check-dev
cmake
curl-dev
......@@ -38,7 +39,6 @@ subpackages="$pkgname-doc $pkgname-dev $pkgname-libunrar $pkgname-libs
$pkgname-milter"
source="https://www.clamav.net/downloads/production/clamav-$pkgver.tar.gz
link-fts.patch
cmake-fix-race-condition-with-parallel-builds.patch
clamd.initd
clamd.confd
......@@ -261,9 +261,8 @@ milter() {
}
sha512sums="
8c89a05dec6650677125177434cc49ec2298701525508cdda52358e8f98086d80892287f6267f8b7fda0aef2ca361616cb584c3059f3b066bfde65f7f1ba2df5 clamav-0.104.2.tar.gz
84e871942e67d0a96c4a95eee7e36e1094865a69fdfd590ad8acf4e4a772e1b60bd1f21f73f9c5ad9043a6624c4fece5bb66a976b2592e9b7babfa1e5a1ba453 clamav-0.105.0.tar.gz
20a52291d00e0b8e6e0cd7b31484a577045dfa8e2481fe1e4e1640e6f6d9317114c7fd53211a2bf9edcea4e084789b4820d7ceeaaf17346d581524683289e698 link-fts.patch
8a7e20d83ba004a701f91df94561d5df1ca6819df5bc7d0830279f51ad2e0f14fb003fd22db4a7de784c68ca4af504896b88f189124549a092a0689514456947 cmake-fix-race-condition-with-parallel-builds.patch
d886d810de66e8da800384c1e8192f7da4352402ffc3b33cfbca93d81a2235d8c902ca9d436b9be70f00740b4555e1efbf09bf9f84059095a1a297b27581cd20 clamd.initd
59c561b3dcb0b616b647cd8e4ebc46a2cc5e7144c8c7ea0054cc1c3021d1da8f67e4dad5c083c3fe712ed887aaabfca91b538f4759537e7c4c9ab71ba4fd5794 clamd.confd
6f0c615b89f0f0d2f0e9f965f025b9ac8c81b2168fa6727dc8a47222abd780f9b656732f289d6061a20126b16126a975d50e8b3b8ff131f55dd8803da8be5dec freshclam.initd
......
From c5c3b7558e16dabc6d2c7c7876ac8cd2e23f4caf Mon Sep 17 00:00:00 2001
From: Alexander Sulfrian <asulfrian@zedat.fu-berlin.de>
Date: Fri, 24 Sep 2021 12:37:43 +0200
Subject: [PATCH] CMake: Fix race condition with parallel builds
If running multiple parallel processes of "xor_testfile.py" there was a
race condition between checking for the existence of the directory and
creating it. Now this is handled as a dependency in CMake.
---
unit_tests/input/CMakeLists.txt | 4 ++++
unit_tests/input/xor_testfile.py | 3 ---
2 files changed, 4 insertions(+), 3 deletions(-)
diff --git a/unit_tests/input/CMakeLists.txt b/unit_tests/input/CMakeLists.txt
index 3297290d18..7a3ba4bb96 100644
--- a/unit_tests/input/CMakeLists.txt
+++ b/unit_tests/input/CMakeLists.txt
@@ -62,6 +62,9 @@ if(ENABLE_UNRAR)
)
endif()
+add_custom_target(tgt_clamav_hdb_scanfiles ALL
+ COMMAND ${CMAKE_COMMAND} -E make_directory ${CMAKE_CURRENT_BINARY_DIR}/clamav_hdb_scanfiles)
+
# Decrypt test file
function(decrypt_testfile test_file)
add_custom_command(OUTPUT clamav_hdb_scanfiles/${test_file}
@@ -71,6 +74,7 @@ function(decrypt_testfile test_file)
--out_file ${CMAKE_CURRENT_BINARY_DIR}/clamav_hdb_scanfiles/${test_file}
COMMENT "Decrypting test file ${test_file}...")
add_custom_target(tgt_${test_file} ALL DEPENDS ${CMAKE_CURRENT_BINARY_DIR}/clamav_hdb_scanfiles/${test_file})
+ ADD_DEPENDENCIES(tgt_${test_file} tgt_clamav_hdb_scanfiles)
endfunction()
foreach(TESTFILE ${TESTFILES})
diff --git a/unit_tests/input/xor_testfile.py b/unit_tests/input/xor_testfile.py
index bacc971faa..41379621b5 100755
--- a/unit_tests/input/xor_testfile.py
+++ b/unit_tests/input/xor_testfile.py
@@ -53,9 +53,6 @@ def main():
# Write out the result to the destination file.
try:
- if not out_file.parent.exists():
- out_file.parent.mkdir()
-
with out_file.open('w+b') as out_file_fd:
out_file_fd.write(out_file_bytes)
Supports Markdown
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment