diff options
author | Linus Heckemann <git@sphalerite.org> | 2022-05-13 12:33:40 +0200 |
---|---|---|
committer | Linus Heckemann <git@sphalerite.org> | 2022-05-16 10:35:20 +0200 |
commit | 16fc84cd4be51376b7517f48d37811eb6ec27471 (patch) | |
tree | 40ea58645ff4e1dbc5883b4f304e3f461899bb44 /pkgs/tools/security/clamav | |
parent | 833884de60dc28084a3fc7177a4152094f06412a (diff) |
clamav: 0.103.6 -> 0.105.0
Diffstat (limited to 'pkgs/tools/security/clamav')
-rw-r--r-- | pkgs/tools/security/clamav/default.nix | 40 | ||||
-rw-r--r-- | pkgs/tools/security/clamav/remove-freshclam-test.patch | 20 |
2 files changed, 30 insertions, 30 deletions
diff --git a/pkgs/tools/security/clamav/default.nix b/pkgs/tools/security/clamav/default.nix index 4a72c900ca4a1..2535162525933 100644 --- a/pkgs/tools/security/clamav/default.nix +++ b/pkgs/tools/security/clamav/default.nix @@ -1,52 +1,32 @@ -{ lib, stdenv, fetchurl, pkg-config +{ lib, stdenv, fetchurl, pkg-config, cmake , zlib, bzip2, libiconv, libxml2, openssl, ncurses, curl, libmilter, pcre2 , libmspack, systemd, Foundation, json_c, check +, rustc, rust-bindgen, rustfmt, cargo, python3 }: stdenv.mkDerivation rec { pname = "clamav"; - version = "0.103.6"; + version = "0.105.0"; src = fetchurl { url = "https://www.clamav.net/downloads/production/${pname}-${version}.tar.gz"; - sha256 = "sha256-qqEuPcGfHTI7HFDXoQ+or1V+Q5AUnoZNWb3jm2rZujM="; + sha256 = "sha256-JwIDpUxFgEnbVPzZNoP/Wy2xkVHzY8SOgs7O/d4rNdQ="; }; - # don't install sample config files into the absolute sysconfdir folder - postPatch = '' - substituteInPlace Makefile.in --replace ' etc ' ' ' - ''; + # Flaky test, remove this when https://github.com/Cisco-Talos/clamav/issues/343 is fixed + patches = [ ./remove-freshclam-test.patch ]; enableParallelBuilding = true; - nativeBuildInputs = [ pkg-config ]; + nativeBuildInputs = [ cmake pkg-config rustc rust-bindgen rustfmt cargo python3 ]; buildInputs = [ zlib bzip2 libxml2 openssl ncurses curl libiconv libmilter pcre2 libmspack json_c check ] ++ lib.optional stdenv.isLinux systemd ++ lib.optional stdenv.isDarwin Foundation; - configureFlags = [ - "--libdir=$(out)/lib" - "--sysconfdir=/etc/clamav" - "--disable-llvm" # enabling breaks the build at the moment - "--with-zlib=${zlib.dev}" - "--with-xml=${libxml2.dev}" - "--with-openssl=${openssl.dev}" - "--with-libcurl=${curl.dev}" - "--with-libjson=${json_c.dev}" - "--with-system-libmspack" - "--enable-milter" - "--disable-unrar" # disable unrar because it's non-free and requires some extra patching to work properly - "--enable-check" - ] ++ lib.optional stdenv.isLinux - "--with-systemdsystemunitdir=$(out)/lib/systemd"; + cmakeFlags = [ + "-DSYSTEMD_UNIT_DIR=${placeholder "out"}/lib/systemd" + ]; - postInstall = '' - mkdir $out/etc - cp etc/*.sample $out/etc - ''; - - # Only required for the unit tests - hardeningDisable = [ "format" ]; doCheck = true; meta = with lib; { diff --git a/pkgs/tools/security/clamav/remove-freshclam-test.patch b/pkgs/tools/security/clamav/remove-freshclam-test.patch new file mode 100644 index 0000000000000..93078b52aaad3 --- /dev/null +++ b/pkgs/tools/security/clamav/remove-freshclam-test.patch @@ -0,0 +1,20 @@ +diff --git a/unit_tests/CMakeLists.txt b/unit_tests/CMakeLists.txt +index 1460357ba..1194abc9d 100644 +--- a/unit_tests/CMakeLists.txt ++++ b/unit_tests/CMakeLists.txt +@@ -371,15 +371,6 @@ if(ENABLE_APP) + set_property(TEST clamd_valgrind PROPERTY ENVIRONMENT ${ENVIRONMENT} VALGRIND=${Valgrind_EXECUTABLE}) + endif() + +- add_test(NAME freshclam COMMAND ${PythonTest_COMMAND};freshclam_test.py +- WORKING_DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR}) +- set_property(TEST freshclam PROPERTY ENVIRONMENT ${ENVIRONMENT}) +- if(Valgrind_FOUND) +- add_test(NAME freshclam_valgrind COMMAND ${PythonTest_COMMAND};freshclam_test.py +- WORKING_DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR}) +- set_property(TEST freshclam_valgrind PROPERTY ENVIRONMENT ${ENVIRONMENT} VALGRIND=${Valgrind_EXECUTABLE}) +- endif() +- + add_test(NAME sigtool COMMAND ${PythonTest_COMMAND};sigtool_test.py + WORKING_DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR}) + set_property(TEST sigtool PROPERTY ENVIRONMENT ${ENVIRONMENT}) |