From b782f49f670260f025715baedf58fc280ec2cd80 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Miroslav=20Such=C3=BD?= Date: Sat, 7 Sep 2024 19:37:42 +0000 Subject: [PATCH 01/13] Migrate to SPDX license This is part of https://fedoraproject.org/wiki/Changes/SPDX_Licenses_Phase_4 If there will be no comments in two weeks, I will merge this. --- clamav.spec | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/clamav.spec b/clamav.spec index 85e9049..5d285d6 100644 --- a/clamav.spec +++ b/clamav.spec @@ -27,7 +27,7 @@ Summary: End-user tools for the Clam Antivirus scanner Name: clamav Version: 1.0.7 Release: 1%{?dist} -License: %{?with_unrar:proprietary}%{!?with_unrar:GPLv2} +License: %{?with_unrar:proprietary}%{!?with_unrar:GPL-2.0-only} URL: https://www.clamav.net/ %if %{with unrar} Source0: https://www.clamav.net/downloads/production/%{name}-%{version}%{?prerelease}.tar.gz From e884e3dd1b95de115de540405f9670a76cff7f27 Mon Sep 17 00:00:00 2001 From: "Benjamin A. Beasley" Date: Sun, 15 Sep 2024 12:57:50 -0400 Subject: [PATCH 02/13] Update the image crate dependency to 0.25, the current release --- ...341e8e34aa325ac03718121e33a3b4e5b75e.patch | 22 +++++++++++++++++++ clamav.spec | 12 +++++++++- 2 files changed, 33 insertions(+), 1 deletion(-) create mode 100644 24d1341e8e34aa325ac03718121e33a3b4e5b75e.patch diff --git a/24d1341e8e34aa325ac03718121e33a3b4e5b75e.patch b/24d1341e8e34aa325ac03718121e33a3b4e5b75e.patch new file mode 100644 index 0000000..7bd5cfb --- /dev/null +++ b/24d1341e8e34aa325ac03718121e33a3b4e5b75e.patch @@ -0,0 +1,22 @@ +From 24d1341e8e34aa325ac03718121e33a3b4e5b75e Mon Sep 17 00:00:00 2001 +From: "Benjamin A. Beasley" +Date: Sun, 15 Sep 2024 12:50:07 -0400 +Subject: [PATCH] In libclamav_rust, use the current version of the image crate + +--- + libclamav_rust/Cargo.toml | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/libclamav_rust/Cargo.toml b/libclamav_rust/Cargo.toml +index 526951c519..eb95ca8011 100644 +--- a/libclamav_rust/Cargo.toml ++++ b/libclamav_rust/Cargo.toml +@@ -12,7 +12,7 @@ log = { version = "0.4", features = ["std"] } + sha2 = "0.10" + tempfile = "3" + thiserror = "1" +-image = "0.24" ++image = "0.25" + rustdct = "0.7" + transpose = "0.2" + num-traits = "0.2" diff --git a/clamav.spec b/clamav.spec index 5d285d6..4dd2a6c 100644 --- a/clamav.spec +++ b/clamav.spec @@ -26,7 +26,7 @@ Summary: End-user tools for the Clam Antivirus scanner Name: clamav Version: 1.0.7 -Release: 1%{?dist} +Release: 2%{?dist} License: %{?with_unrar:proprietary}%{!?with_unrar:GPL-2.0-only} URL: https://www.clamav.net/ %if %{with unrar} @@ -80,6 +80,8 @@ Patch5: clamav-clamonacc-service.patch Patch6: clamav-freshclam.service.patch # Debian patch to fix big-endian Patch7: https://salsa.debian.org/clamav-team/clamav/-/raw/unstable/debian/patches/libclamav-pe-Use-endian-wrapper-in-more-places.patch +# Update the image crate dependency to 0.25, the current release +Patch8: https://github.com/Cisco-Talos/clamav/pull/1366/commits/24d1341e8e34aa325ac03718121e33a3b4e5b75e.patch BuildRequires: cmake3 BuildRequires: gettext-devel @@ -290,6 +292,11 @@ cd .. %patch -P5 -p1 -b .clamonacc-service %patch -P6 -p1 -b .freshclam-service %patch -P7 -p1 -b .big-endian +# This patch is not made to be backwards-compatible (even though it could have +# been), and the vendored dependencies in EPEL8 include image 0.24, not 0.25. +%if 0%{?fedora} || 0%{?rhel} >= 9 +%patch -P8 -p1 -b .image-0.25 +%endif install -p -m0644 %{SOURCE300} clamav-milter/ @@ -603,6 +610,9 @@ exit 0 %changelog +* Sun Sep 15 2024 Benjamin A. Beasley - 1.0.7-2 +- Update the image crate dependency to 0.25, the current release + * Thu Sep 05 2024 Yaakov Selkowitz - 1.0.7-1 - Update to 1.0.7 From b3e1a94723212cd4d25d5910a3104cf6ddb31680 Mon Sep 17 00:00:00 2001 From: "Benjamin A. Beasley" Date: Tue, 17 Sep 2024 21:02:22 -0400 Subject: [PATCH 03/13] Document licenses of statically linked Rust dependencies --- clamav.spec | 61 +++++++++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 61 insertions(+) diff --git a/clamav.spec b/clamav.spec index 4dd2a6c..d902c6a 100644 --- a/clamav.spec +++ b/clamav.spec @@ -175,6 +175,61 @@ user-creation scripts required by clamav. Summary: Dynamic libraries for the Clam Antivirus scanner Provides: bundled(libmspack) = 0.5-0.1.alpha.modified_by_clamav +# LICENSE.dependencies contains a full license breakdown +# From the output of %%{cargo_license_summary}: +# +%if 0%{?fedora} || 0%{?rhel} >= 9 +# 0BSD OR MIT OR Apache-2.0 +# Apache-2.0 +# Apache-2.0 OR MIT +# Apache-2.0 WITH LLVM-exception OR Apache-2.0 OR MIT +# BSD-2-Clause +# BSD-2-Clause AND ISC +# BSD-3-Clause +# MIT +# MIT OR Apache-2.0 (duplicate) +# MIT OR Apache-2.0 OR Zlib +# MIT OR Zlib OR Apache-2.0 (duplicate) +# Unlicense OR MIT +# Zlib OR Apache-2.0 OR MIT (duplicate) +License: %{shrink: + %{?with_unrar:proprietary}%{!?with_unrar:GPL-2.0-only} AND + (0BSD OR MIT OR Apache-2.0) AND + Apache-2.0 AND + (Apache-2.0 OR MIT) AND + (Apache-2.0 WITH LLVM-exception OR Apache-2.0 OR MIT) AND + BSD-2-Clause AND + BSD-3-Clause AND + ISC AND + MIT AND + (MIT OR Zlib OR Apache-2.0) AND + (Unlicense OR MIT) AND + Zlib + } +%else +# 0BSD OR MIT OR Apache-2.0 +# Apache-2.0 OR MIT +# Apache-2.0 WITH LLVM-exception OR Apache-2.0 OR MIT +# BSD-3-Clause +# MIT +# MIT OR Apache-2.0 (duplicate) +# MIT OR Zlib OR Apache-2.0 +# Unlicense OR MIT +# Zlib +# Zlib OR Apache-2.0 OR MIT (duplicate) +License: %{shrink: + %{?with_unrar:proprietary}%{!?with_unrar:GPL-2.0-only} AND + (0BSD OR MIT OR Apache-2.0) AND + (Apache-2.0 OR MIT) AND + (Apache-2.0 WITH LLVM-exception OR Apache-2.0 OR MIT) AND + BSD-3-Clause AND + MIT AND + (MIT OR Zlib OR Apache-2.0) AND + (Unlicense OR MIT) AND + Zlib + } +%endif + %description lib This package contains dynamic libraries shared between applications using the Clam Antivirus scanner. @@ -337,6 +392,10 @@ export have_cv_ipv6=yes %cmake3_build +cd libclamav_rust +%cargo_license_summary +%{cargo_license} > ../LICENSES.dependencies + %install rm -rf _doc* @@ -541,6 +600,8 @@ exit 0 %files lib +# Licenses for statically linked Rust dependencies in libclamav +%license LICENSES.dependencies %{_libdir}/libclamav.so.11* %{_libdir}/libclammspack.so.0* %if %{with unrar} From b08aa79384debd6ad70ffa5935bcaaa531ad3a62 Mon Sep 17 00:00:00 2001 From: Orion Poplawski Date: Wed, 3 May 2023 08:40:41 -0600 Subject: [PATCH 04/13] Update to 1.4.1 --- clamav-clamonacc-service.patch | 7 +-- clamav-rpath.patch | 18 -------- clamav.spec | 43 ++++++++++++------- ...pe-Use-endian-wrapper-in-more-places.patch | 38 +++++----------- sources | 4 +- update_clamav.sh | 4 +- 6 files changed, 45 insertions(+), 69 deletions(-) delete mode 100644 clamav-rpath.patch diff --git a/clamav-clamonacc-service.patch b/clamav-clamonacc-service.patch index c72e806..b376dba 100644 --- a/clamav-clamonacc-service.patch +++ b/clamav-clamonacc-service.patch @@ -1,5 +1,6 @@ ---- ./clamonacc/clamav-clamonacc.service.in.clamonacc-service 2022-05-05 22:36:27.572671129 +0100 -+++ ./clamonacc/clamav-clamonacc.service.in 2022-05-05 22:43:05.204324524 +0100 +diff -up clamav-1.4.0/clamonacc/clamav-clamonacc.service.in.clamonacc-service clamav-1.4.0/clamonacc/clamav-clamonacc.service.in +--- clamav-1.4.0/clamonacc/clamav-clamonacc.service.in.clamonacc-service 2024-08-15 20:12:56.950984705 -0600 ++++ clamav-1.4.0/clamonacc/clamav-clamonacc.service.in 2024-08-15 20:14:19.088770747 -0600 @@ -4,14 +4,12 @@ [Unit] Description=ClamAV On-Access Scanner @@ -14,6 +15,6 @@ -ExecStartPre=/bin/bash -c "while [ ! -S /run/clamav/clamd.ctl ]; do sleep 1; done" -ExecStart=@prefix@/sbin/clamonacc -F --log=/var/log/clamav/clamonacc.log --move=/root/quarantine +ExecStart=@prefix@/sbin/clamonacc -F --config-file=/etc/clamd.d/scan.conf + ExecStop=/bin/kill -SIGKILL $MAINPID [Install] - WantedBy=multi-user.target diff --git a/clamav-rpath.patch b/clamav-rpath.patch deleted file mode 100644 index b55cab9..0000000 --- a/clamav-rpath.patch +++ /dev/null @@ -1,18 +0,0 @@ -diff -up clamav-1.0.0/CMakeLists.txt.rpath clamav-1.0.0/CMakeLists.txt ---- clamav-1.0.0/CMakeLists.txt.rpath 2023-01-15 22:04:58.217120124 -0700 -+++ clamav-1.0.0/CMakeLists.txt 2023-01-15 22:05:57.121818812 -0700 -@@ -180,14 +180,6 @@ endif() - - include(GNUInstallDirs) - --if (NOT DEFINED CMAKE_INSTALL_RPATH) -- if(CMAKE_INSTALL_FULL_LIBDIR) -- set(CMAKE_INSTALL_RPATH "${CMAKE_INSTALL_FULL_LIBDIR}") -- else() -- set(CMAKE_INSTALL_RPATH "${CMAKE_INSTALL_PREFIX}/lib") -- endif() --endif() -- - if("${CMAKE_CXX_COMPILER_ID}" MATCHES "Clang") - set(USING_CLANG ON) - else() diff --git a/clamav.spec b/clamav.spec index d902c6a..5c2bfa1 100644 --- a/clamav.spec +++ b/clamav.spec @@ -1,4 +1,4 @@ -#global prerelease -rc2 +#global prerelease -rc %global _hardened_build 1 @@ -25,8 +25,8 @@ Summary: End-user tools for the Clam Antivirus scanner Name: clamav -Version: 1.0.7 -Release: 2%{?dist} +Version: 1.4.1 +Release: 1%{?dist} License: %{?with_unrar:proprietary}%{!?with_unrar:GPL-2.0-only} URL: https://www.clamav.net/ %if %{with unrar} @@ -50,7 +50,7 @@ Source5: clamd-README #http://database.clamav.net/main.cvd Source10: main-62.cvd #http://database.clamav.net/daily.cvd -Source11: daily-27388.cvd +Source11: daily-27399.cvd #http://database.clamav.net/bytecode.cvd Source12: bytecode-335.cvd #for update @@ -65,15 +65,10 @@ Source330: clamav-milter.systemd #for scanner-systemd/server-systemd Source530: clamd@.service -# Accept RUSTFLAGS -# https://github.com/Cisco-Talos/clamav/pull/835 -Patch0: clamav-rustflags.patch # Change default config locations for Fedora Patch1: clamav-default_confs.patch # Fix pkg-config flags for static linking, multilib Patch2: clamav-private.patch -# Remove rpath -Patch3: clamav-rpath.patch # Modify clamav-clamonacc.service for Fedora compatibility Patch5: clamav-clamonacc-service.patch # Allow freshclam service to run if cron.d file is present @@ -124,6 +119,9 @@ BuildRequires: pcre2-devel # Explicitly needed on EL8 BuildRequires: python3 BuildRequires: python3-pytest +%if 0%{?fedora} >= 41 +BuildRequires: python3-cgi +%endif BuildRequires: zlib-devel #BuildRequires: %%{_includedir}/tcpd.h BuildRequires: bc @@ -332,18 +330,18 @@ This package contains files which are needed to run the clamav-milter. # EL8 and earlier do not have the Rust cargo dependencies that are # defined by the generate_buildrequires stage in EL9 and later, so the # vendored packages included in the ClamAV sources suffice. -sed -i -e '/cbindgen/s/version = *"0.20"/version = "0.24"/' -e '/^bindgen *=/s/= .*/= "0.63"/' libclamav_rust/Cargo.toml %cargo_prep cd libclamav_rust -rm -r .cargo +sed -i -e '/^base64 *=/s/= .*/= "0.21"/' Cargo.toml +sed -i -e '/^bindgen *=/s/= .*/= "0.69"/' Cargo.toml +sed -i -e '/^cbindgen *=/s/= *".*"/= "0.26"/' Cargo.toml +sed -i -e '/^onenote_parser *=/s/= *.*/= "0.3.1"/' Cargo.toml %cargo_prep cd .. %endif -%patch -P0 -p1 -b .rustflags %patch -P1 -p1 -b .default_confs %patch -P2 -p1 -b .private -%patch -P3 -p1 -b .rpath %patch -P5 -p1 -b .clamonacc-service %patch -P6 -p1 -b .freshclam-service %patch -P7 -p1 -b .big-endian @@ -384,6 +382,7 @@ export have_cv_ipv6=yes -DCMAKE_INSTALL_DOCDIR=%{_pkgdocdir} \ -DCLAMAV_USER=%{updateuser} -DCLAMAV_GROUP=%{updateuser} \ -DDATABASE_DIRECTORY=%{homedir} \ + -DDO_NOT_SET_RPATH=ON \ %{!?with_clamonacc:-DENABLE_CLAMONACC=OFF} \ %{?with_llvm:-DBYTECODE_RUNTIME=llvm -D LLVM_FIND_VERSION="3.6.0"} \ %{!?with_unrar:-DENABLE_UNRAR=OFF} @@ -486,7 +485,13 @@ rm %{buildroot}%{_unitdir}/clamav-daemon.* %check +%ifarch s390x +# Tests fail on s390x +# https://github.com/Cisco-Talos/clamav/issues/759 +%ctest3 -- -E valgrind || : +%else %ctest3 -- -E valgrind +%endif # valgrind tests fail https://github.com/Cisco-Talos/clamav/issues/584 %ctest3 -- -R valgrind || : @@ -602,16 +607,17 @@ exit 0 %files lib # Licenses for statically linked Rust dependencies in libclamav %license LICENSES.dependencies -%{_libdir}/libclamav.so.11* +%{_libdir}/libclamav.so.12* %{_libdir}/libclammspack.so.0* %if %{with unrar} -%{_libdir}/libclamunrar*.so.11* +%{_libdir}/libclamunrar*.so.12* %endif %files devel %{_includedir}/* %{_libdir}/*.so +%{_libdir}/libclamav_rust.a %{_libdir}/pkgconfig/* %{_bindir}/clamav-config @@ -638,9 +644,11 @@ exit 0 %files freshclam %{_bindir}/freshclam -%{_libdir}/libfreshclam.so.2* +%{_libdir}/libfreshclam.so.3* %{_mandir}/*/freshclam* %{_unitdir}/clamav-freshclam.service +%{_unitdir}/clamav-freshclam-once.service +%{_unitdir}/clamav-freshclam-once.timer %config(noreplace) %verify(not mtime) %{_sysconfdir}/freshclam.conf %ghost %attr(0644,%{updateuser},%{updateuser}) %{homedir}/bytecode.cld %ghost %attr(0644,%{updateuser},%{updateuser}) %{homedir}/bytecode.cvd @@ -671,6 +679,9 @@ exit 0 %changelog +* Wed Sep 25 2024 Orion Poplawski - 1.4.1-1 +- Update to 1.4.1 + * Sun Sep 15 2024 Benjamin A. Beasley - 1.0.7-2 - Update the image crate dependency to 0.25, the current release diff --git a/libclamav-pe-Use-endian-wrapper-in-more-places.patch b/libclamav-pe-Use-endian-wrapper-in-more-places.patch index 3053713..729f71d 100644 --- a/libclamav-pe-Use-endian-wrapper-in-more-places.patch +++ b/libclamav-pe-Use-endian-wrapper-in-more-places.patch @@ -1,25 +1,7 @@ -From 5a7b1cdfadc980fb1c4fa32e6275e7c96a963110 Mon Sep 17 00:00:00 2001 -From: Sebastian Andrzej Siewior -Date: Fri, 6 Jan 2023 21:42:30 +0100 -Subject: libclamav/pe: Use endian wrapper in more places. - -A few user of VirtualAddress and Size in cli_exe_info::pe_image_data_dir -don't use the endian wrapper while other places do. This leads to -testsuite failures on big endian machines. - -Use the endian wrapper in all places across pe.c for the two members. - -Patch-Name: libclamav-pe-Use-endian-wrapper-in-more-places.patch -Signed-off-by: Sebastian Andrzej Siewior ---- - libclamav/pe.c | 18 +++++++++--------- - 1 file changed, 9 insertions(+), 9 deletions(-) - -diff --git a/libclamav/pe.c b/libclamav/pe.c -index f5dcea9..19cd2d4 100644 ---- a/libclamav/pe.c -+++ b/libclamav/pe.c -@@ -2422,22 +2422,22 @@ static cl_error_t hash_imptbl(cli_ctx *ctx, unsigned char **digest, uint32_t *im +diff -up clamav-1.4.0/libclamav/pe.c.big-endian clamav-1.4.0/libclamav/pe.c +--- clamav-1.4.0/libclamav/pe.c.big-endian 2024-08-13 14:24:46.000000000 -0600 ++++ clamav-1.4.0/libclamav/pe.c 2024-08-15 20:16:02.017730419 -0600 +@@ -2424,22 +2424,22 @@ static cl_error_t hash_imptbl(cli_ctx *c /* If the PE doesn't have an import table then skip it. This is an * uncommon case but can happen. */ @@ -46,7 +28,7 @@ index f5dcea9..19cd2d4 100644 if (impdes == NULL) { cli_dbgmsg("scan_pe: failed to acquire fmap buffer\n"); status = CL_EREAD; -@@ -2447,7 +2447,7 @@ static cl_error_t hash_imptbl(cli_ctx *ctx, unsigned char **digest, uint32_t *im +@@ -2449,7 +2449,7 @@ static cl_error_t hash_imptbl(cli_ctx *c /* Safety: We can trust peinfo->dirs[1].Size only because `fmap_need_off()` (above) * would have failed if the size exceeds the end of the fmap. */ @@ -55,7 +37,7 @@ index f5dcea9..19cd2d4 100644 if (genhash[CLI_HASH_MD5]) { hashctx[CLI_HASH_MD5] = cl_hash_init("md5"); -@@ -2546,7 +2546,7 @@ static cl_error_t hash_imptbl(cli_ctx *ctx, unsigned char **digest, uint32_t *im +@@ -2556,7 +2556,7 @@ static cl_error_t hash_imptbl(cli_ctx *c done: if (needed_impoff) { @@ -64,16 +46,16 @@ index f5dcea9..19cd2d4 100644 } for (type = CLI_HASH_MD5; type < CLI_HASH_AVAIL_TYPES; type++) { -@@ -3250,7 +3250,7 @@ int cli_scanpe(cli_ctx *ctx) +@@ -3241,7 +3241,7 @@ int cli_scanpe(cli_ctx *ctx) /* Trojan.Swizzor.Gen */ if (SCAN_HEURISTICS && (DCONF & PE_CONF_SWIZZOR) && peinfo->nsections > 1 && fsize > 64 * 1024 && fsize < 4 * 1024 * 1024) { - if (peinfo->dirs[2].Size) { + if (EC32(peinfo->dirs[2].Size)) { - struct swizz_stats *stats = cli_calloc(1, sizeof(*stats)); + struct swizz_stats *stats = calloc(1, sizeof(*stats)); unsigned int m = 1000; ret = CL_CLEAN; -@@ -5292,13 +5292,13 @@ cl_error_t cli_peheader(fmap_t *map, struct cli_exe_info *peinfo, uint32_t opts, +@@ -5250,13 +5250,13 @@ cl_error_t cli_peheader(fmap_t *map, str cli_dbgmsg("EntryPoint offset: 0x%x (%d)\n", peinfo->ep, peinfo->ep); } @@ -81,7 +63,7 @@ index f5dcea9..19cd2d4 100644 + if (is_dll || peinfo->ndatadirs < 3 || !EC32(peinfo->dirs[2].Size)) peinfo->res_addr = 0; else - peinfo->res_addr = EC32(peinfo->dirs[2].VirtualAddress); + peinfo->res_addr = peinfo->dirs[2].VirtualAddress; while (opts & CLI_PEHEADER_OPT_EXTRACT_VINFO && - peinfo->ndatadirs >= 3 && peinfo->dirs[2].Size) { diff --git a/sources b/sources index 249eb7f..ba649a5 100644 --- a/sources +++ b/sources @@ -1,4 +1,4 @@ -SHA512 (clamav-1.0.7-norar.tar.xz) = c8563a927005cc3782e7c43e95d40324e5254501b94ce5f4a8526abd2e5455a84d060f9e7199879706b551f3bb64209e5935e6899846cfec6c271de4917bed97 +SHA512 (clamav-1.4.1-norar.tar.xz) = 33a99a3593a05a359af058a0883b90cca385f10fdbacd0d78cdb7532b498d0dbfd9f4b43867d2e0de03c307480c63f871e716307d4703bac78561070f404d121 SHA512 (main-62.cvd) = b52e5d9ecacbd9b11c3b0cc460388746fccb353a7520522ed15ee25f645a432bed5be7e6b38512f134f085eb9be76a1e26c19de8b09491d4ec46da8c5afc318e -SHA512 (daily-27388.cvd) = ff8f3fd3386e41c288de5aec00de937807ad4e7b2d93533b7e254d2068b943b8b7310471af0dbe7e7e639668d73ff447c59038e56882bc7e1911c6dd28c1970d SHA512 (bytecode-335.cvd) = 9177c0533658b21584de0623ff9b7c70b2ec92ce9f6fecf98a881902c98025930430415715e9914ce7c0c6fb91aad532b4c907677c3010a0da47583b7ad24d4f +SHA512 (daily-27399.cvd) = 81cf5edafb33c32ab45e7d2f3d75459287b295ffefc3ef3abeb6538ca72ccf44ee15e2ec0a2594c72914063808e07f552288b83d62707b8dca84067eedb38845 diff --git a/update_clamav.sh b/update_clamav.sh index c3dd9c8..142324f 100755 --- a/update_clamav.sh +++ b/update_clamav.sh @@ -1,5 +1,5 @@ -VERSION=1.0.7 -REPOS="f41 f40 f39 epel9" +VERSION=1.4.1 +REPOS="n" if [ -z "$1" ] then From 697a05510d0c3582d5f2a701ed23999f9bf61e20 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Thu, 16 Jan 2025 13:49:03 +0000 Subject: [PATCH 05/13] Rebuilt for https://fedoraproject.org/wiki/Fedora_42_Mass_Rebuild --- clamav.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/clamav.spec b/clamav.spec index 5c2bfa1..5dcbd9d 100644 --- a/clamav.spec +++ b/clamav.spec @@ -26,7 +26,7 @@ Summary: End-user tools for the Clam Antivirus scanner Name: clamav Version: 1.4.1 -Release: 1%{?dist} +Release: 2%{?dist} License: %{?with_unrar:proprietary}%{!?with_unrar:GPL-2.0-only} URL: https://www.clamav.net/ %if %{with unrar} @@ -679,6 +679,9 @@ exit 0 %changelog +* Thu Jan 16 2025 Fedora Release Engineering - 1.4.1-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_42_Mass_Rebuild + * Wed Sep 25 2024 Orion Poplawski - 1.4.1-1 - Update to 1.4.1 From 6b6bb39959708ec91149a42a8e00795b2cd7ec2c Mon Sep 17 00:00:00 2001 From: Orion Poplawski Date: Sat, 25 Jan 2025 12:19:29 -0700 Subject: [PATCH 06/13] Update to 1.4.2 --- clamav.spec | 17 ++++++++++------- sources | 4 ++-- update_clamav.sh | 2 +- 3 files changed, 13 insertions(+), 10 deletions(-) diff --git a/clamav.spec b/clamav.spec index 5dcbd9d..b12245c 100644 --- a/clamav.spec +++ b/clamav.spec @@ -25,8 +25,8 @@ Summary: End-user tools for the Clam Antivirus scanner Name: clamav -Version: 1.4.1 -Release: 2%{?dist} +Version: 1.4.2 +Release: 1%{?dist} License: %{?with_unrar:proprietary}%{!?with_unrar:GPL-2.0-only} URL: https://www.clamav.net/ %if %{with unrar} @@ -50,7 +50,7 @@ Source5: clamd-README #http://database.clamav.net/main.cvd Source10: main-62.cvd #http://database.clamav.net/daily.cvd -Source11: daily-27399.cvd +Source11: daily-27526.cvd #http://database.clamav.net/bytecode.cvd Source12: bytecode-335.cvd #for update @@ -332,7 +332,7 @@ This package contains files which are needed to run the clamav-milter. # vendored packages included in the ClamAV sources suffice. %cargo_prep cd libclamav_rust -sed -i -e '/^base64 *=/s/= .*/= "0.21"/' Cargo.toml +sed -i -e '/^base64 *=/s/= .*/= "0.22"/' Cargo.toml sed -i -e '/^bindgen *=/s/= .*/= "0.69"/' Cargo.toml sed -i -e '/^cbindgen *=/s/= *".*"/= "0.26"/' Cargo.toml sed -i -e '/^onenote_parser *=/s/= *.*/= "0.3.1"/' Cargo.toml @@ -488,12 +488,12 @@ rm %{buildroot}%{_unitdir}/clamav-daemon.* %ifarch s390x # Tests fail on s390x # https://github.com/Cisco-Talos/clamav/issues/759 -%ctest3 -- -E valgrind || : +%ctest3 -E valgrind || : %else -%ctest3 -- -E valgrind +%ctest3 -E valgrind %endif # valgrind tests fail https://github.com/Cisco-Talos/clamav/issues/584 -%ctest3 -- -R valgrind || : +%ctest3 -R valgrind || : %post @@ -679,6 +679,9 @@ exit 0 %changelog +* Thu Jan 23 2025 Orion Poplawski - 1.4.2-1 +- Update to 1.4.2 + * Thu Jan 16 2025 Fedora Release Engineering - 1.4.1-2 - Rebuilt for https://fedoraproject.org/wiki/Fedora_42_Mass_Rebuild diff --git a/sources b/sources index ba649a5..4a68a6e 100644 --- a/sources +++ b/sources @@ -1,4 +1,4 @@ -SHA512 (clamav-1.4.1-norar.tar.xz) = 33a99a3593a05a359af058a0883b90cca385f10fdbacd0d78cdb7532b498d0dbfd9f4b43867d2e0de03c307480c63f871e716307d4703bac78561070f404d121 +SHA512 (clamav-1.4.2-norar.tar.xz) = b36ed02823f2d2495b21292580a2d09c45ac6af9c64a09ec9549bc4fd4740b69bcedaa5b9eccbc40763d34bd0cf6dd445f569da9431a046c53f43792bbb92393 SHA512 (main-62.cvd) = b52e5d9ecacbd9b11c3b0cc460388746fccb353a7520522ed15ee25f645a432bed5be7e6b38512f134f085eb9be76a1e26c19de8b09491d4ec46da8c5afc318e SHA512 (bytecode-335.cvd) = 9177c0533658b21584de0623ff9b7c70b2ec92ce9f6fecf98a881902c98025930430415715e9914ce7c0c6fb91aad532b4c907677c3010a0da47583b7ad24d4f -SHA512 (daily-27399.cvd) = 81cf5edafb33c32ab45e7d2f3d75459287b295ffefc3ef3abeb6538ca72ccf44ee15e2ec0a2594c72914063808e07f552288b83d62707b8dca84067eedb38845 +SHA512 (daily-27526.cvd) = 34145504fe34d7183cac25e93cec43177a92420154b52ce37fde77e8c9a365a7a3fb9a9f92aa43825e88294cc4b00ac31f2ea8cf8c12fbc4d90d7b965083edf2 diff --git a/update_clamav.sh b/update_clamav.sh index 142324f..6cce762 100755 --- a/update_clamav.sh +++ b/update_clamav.sh @@ -1,4 +1,4 @@ -VERSION=1.4.1 +VERSION=1.4.2 REPOS="n" if [ -z "$1" ] From e8572d85e13945836e0fe845ff28d56de9c5db72 Mon Sep 17 00:00:00 2001 From: Orion Poplawski Date: Sun, 26 Jan 2025 13:16:10 -0700 Subject: [PATCH 07/13] Update to 1.0.8 Update to 1.0.8 Update to 1.0.8 Update to 1.0.8 Update to 1.0.8 Update to 1.0.8 Update to 1.0.8 Update to 1.0.8 Update to 1.0.8 --- clamav.spec | 7 +++++-- sources | 4 ++-- update_clamav.sh | 2 +- 3 files changed, 8 insertions(+), 5 deletions(-) diff --git a/clamav.spec b/clamav.spec index 85e9049..21cd175 100644 --- a/clamav.spec +++ b/clamav.spec @@ -25,7 +25,7 @@ Summary: End-user tools for the Clam Antivirus scanner Name: clamav -Version: 1.0.7 +Version: 1.0.8 Release: 1%{?dist} License: %{?with_unrar:proprietary}%{!?with_unrar:GPLv2} URL: https://www.clamav.net/ @@ -50,7 +50,7 @@ Source5: clamd-README #http://database.clamav.net/main.cvd Source10: main-62.cvd #http://database.clamav.net/daily.cvd -Source11: daily-27388.cvd +Source11: daily-27530.cvd #http://database.clamav.net/bytecode.cvd Source12: bytecode-335.cvd #for update @@ -603,6 +603,9 @@ exit 0 %changelog +* Sun Jan 26 2025 Orion Poplawski - 1.0.8-1 +- Update to 1.0.8 + * Thu Sep 05 2024 Yaakov Selkowitz - 1.0.7-1 - Update to 1.0.7 diff --git a/sources b/sources index 249eb7f..70703e9 100644 --- a/sources +++ b/sources @@ -1,4 +1,4 @@ -SHA512 (clamav-1.0.7-norar.tar.xz) = c8563a927005cc3782e7c43e95d40324e5254501b94ce5f4a8526abd2e5455a84d060f9e7199879706b551f3bb64209e5935e6899846cfec6c271de4917bed97 +SHA512 (clamav-1.0.8-norar.tar.xz) = 48510b8296eb2acc7189a6c883bc0478ff753547538dd39f0c75e9028a97571a00f9703f2f90d2def500eb77a1c52fed1a4980d8cb1a01d7563c05699419fa1b SHA512 (main-62.cvd) = b52e5d9ecacbd9b11c3b0cc460388746fccb353a7520522ed15ee25f645a432bed5be7e6b38512f134f085eb9be76a1e26c19de8b09491d4ec46da8c5afc318e -SHA512 (daily-27388.cvd) = ff8f3fd3386e41c288de5aec00de937807ad4e7b2d93533b7e254d2068b943b8b7310471af0dbe7e7e639668d73ff447c59038e56882bc7e1911c6dd28c1970d +SHA512 (daily-27530.cvd) = bf9548144b5806b055d81b30e8453e5d9fcc085c42f784aae3bf64058193d4459a78856234688c84a0ab648a2bfbb400e7a6e903b2d60b38c245b17dcfa973dc SHA512 (bytecode-335.cvd) = 9177c0533658b21584de0623ff9b7c70b2ec92ce9f6fecf98a881902c98025930430415715e9914ce7c0c6fb91aad532b4c907677c3010a0da47583b7ad24d4f diff --git a/update_clamav.sh b/update_clamav.sh index c3dd9c8..0b28091 100755 --- a/update_clamav.sh +++ b/update_clamav.sh @@ -1,4 +1,4 @@ -VERSION=1.0.7 +VERSION=1.0.8 REPOS="f41 f40 f39 epel9" if [ -z "$1" ] From a5a23da3f55a76acdeb2ff2a0799bc00b0fa7f71 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Zbigniew=20J=C4=99drzejewski-Szmek?= Date: Thu, 23 Jan 2025 17:51:30 +0100 Subject: [PATCH 08/13] Add sysusers.d config file to allow rpm to create users/groups automatically --- clamav.spec | 65 ++++++++++++++++++++++------------------------------- 1 file changed, 27 insertions(+), 38 deletions(-) diff --git a/clamav.spec b/clamav.spec index b12245c..38e7739 100644 --- a/clamav.spec +++ b/clamav.spec @@ -26,7 +26,7 @@ Summary: End-user tools for the Clam Antivirus scanner Name: clamav Version: 1.4.2 -Release: 1%{?dist} +Release: 2%{?dist} License: %{?with_unrar:proprietary}%{!?with_unrar:GPL-2.0-only} URL: https://www.clamav.net/ %if %{with unrar} @@ -161,7 +161,6 @@ Summary: Filesystem structure for clamav # Prevent version mix Conflicts: %{name} < %{version}-%{release} Conflicts: %{name} > %{version}-%{release} -Requires(pre): shadow-utils BuildArch: noarch %description filesystem @@ -295,7 +294,6 @@ Requires: data(clamav) Requires: clamav-filesystem = %{version}-%{release} Requires: clamav-lib = %{version}-%{release} Requires: coreutils -Requires(pre): shadow-utils # This is still used by clamsmtp and exim-clamav Provides: clamav-server = %{version}-%{release} Provides: clamav-scanner-systemd = %{version}-%{release} @@ -316,9 +314,9 @@ Summary: Milter module for the Clam Antivirus scanner #Requires: clamd = %%{version}-%%{release} #Requires: /usr/sbin/sendmail Requires: clamav-filesystem = %{version}-%{release} -Requires(pre): shadow-utils Provides: clamav-milter-systemd = %{version}-%{release} Obsoletes: clamav-milter-systemd < %{version}-%{release} +Requires: group(clamscan) %description milter This package contains files which are needed to run the clamav-milter. @@ -356,6 +354,21 @@ install -p -m0644 %{SOURCE300} clamav-milter/ mkdir -p libclamunrar{,_iface} %{!?with_unrar:touch libclamunrar/{Makefile.in,all,install}} +# Create sysusers.d config files +cat >clamav.sysusers.conf <clamd.sysusers.conf <clamav-milter.sysusers.conf <= 9 %generate_buildrequires @@ -365,7 +378,6 @@ cd libclamav_rust %cargo_generate_buildrequires %endif - %build # add -Wl,--as-needed if not exist export LDFLAGS=$(echo %{?__global_ldflags} | sed '/-Wl,--as-needed/!s/$/ -Wl,--as-needed/') @@ -483,6 +495,10 @@ install -m 0644 %SOURCE1 %{buildroot}%{_includedir}/clamav-types.h # TODO: Evaluate using upstream's unit with clamav-daemon.socket rm %{buildroot}%{_unitdir}/clamav-daemon.* +install -m0644 -D clamav.sysusers.conf %{buildroot}%{_sysusersdir}/clamav.conf +install -m0644 -D clamd.sysusers.conf %{buildroot}%{_sysusersdir}/clamd.conf +install -m0644 -D clamav-milter.sysusers.conf %{buildroot}%{_sysusersdir}/clamav-milter.conf + %check %ifarch s390x @@ -516,25 +532,6 @@ do [ -f $f -a $f -nt $cvd ] && rm -f $cvd || : done - -%pre filesystem -getent group %{updateuser} >/dev/null || groupadd -r %{updateuser} -getent passwd %{updateuser} >/dev/null || \ - useradd -r -g %{updateuser} -d %{homedir} -s /sbin/nologin \ - -c "Clamav database update user" %{updateuser} -getent group virusgroup >/dev/null || groupadd -r virusgroup -usermod %{updateuser} -a -G virusgroup -exit 0 - - -%pre -n clamd -getent group %{scanuser} >/dev/null || groupadd -r %{scanuser} -getent passwd %{scanuser} >/dev/null || \ - useradd -r -g %{scanuser} -d / -s /sbin/nologin \ - -c "Clamav scanner user" %{scanuser} -usermod %{scanuser} -a -G virusgroup -exit 0 - %post -n clamd # Point to the new service unit [ -L /etc/systemd/system/multi-user.target.wants/clamd@scan.service ] && @@ -547,20 +544,6 @@ exit 0 %postun -n clamd %systemd_postun_with_restart clamd@scan.service - -%triggerin milter -- clamav-scanner -# Add the milteruser to the scanuser group; this is required when -# milter and clamd communicate through local sockets -/usr/sbin/groupmems -g %{scanuser} -a %{milteruser} &>/dev/null || : - -%pre milter -getent group %{milteruser} >/dev/null || groupadd -r %{milteruser} -getent passwd %{milteruser} >/dev/null || \ - useradd -r -g %{milteruser} -d %{_rundir}/clamav-milter -s /sbin/nologin \ - -c "Clamav Milter user" %{milteruser} -usermod %{milteruser} -a -G virusgroup -exit 0 - %post milter %systemd_post clamav-milter.service @@ -627,6 +610,7 @@ exit 0 %dir %{_sysconfdir}/clamd.d # Used by both clamd, clamdscan, and clamonacc %config(noreplace) %{_sysconfdir}/clamd.d/scan.conf +%{_sysusersdir}/clamav.conf %files data @@ -666,6 +650,7 @@ exit 0 %{_sbindir}/clamd %{_unitdir}/clamd@.service %{_tmpfilesdir}/clamd.scan.conf +%{_sysusersdir}/clamd.conf %files milter @@ -676,9 +661,13 @@ exit 0 %dir %{_sysconfdir}/mail %config(noreplace) %{_sysconfdir}/mail/clamav-milter.conf %{_tmpfilesdir}/clamav-milter.conf +%{_sysusersdir}/clamav-milter.conf %changelog +* Sat Feb 8 2025 Zbigniew Jedrzejewski-Szmek - 1.4.2-2 +- Add sysusers.d config files to allow rpm to create users/groups automatically + * Thu Jan 23 2025 Orion Poplawski - 1.4.2-1 - Update to 1.4.2 From 602cb9058682367d79804419c4c15cb47eacffd0 Mon Sep 17 00:00:00 2001 From: Gwyn Ciesla Date: Wed, 18 Jun 2025 15:01:33 -0500 Subject: [PATCH 09/13] 1.4.3 --- clamav.spec | 11 +++++++---- sources | 6 +++--- update_clamav.sh | 2 +- 3 files changed, 11 insertions(+), 8 deletions(-) diff --git a/clamav.spec b/clamav.spec index 38e7739..2ad2853 100644 --- a/clamav.spec +++ b/clamav.spec @@ -25,8 +25,8 @@ Summary: End-user tools for the Clam Antivirus scanner Name: clamav -Version: 1.4.2 -Release: 2%{?dist} +Version: 1.4.3 +Release: 1%{?dist} License: %{?with_unrar:proprietary}%{!?with_unrar:GPL-2.0-only} URL: https://www.clamav.net/ %if %{with unrar} @@ -50,9 +50,9 @@ Source5: clamd-README #http://database.clamav.net/main.cvd Source10: main-62.cvd #http://database.clamav.net/daily.cvd -Source11: daily-27526.cvd +Source11: daily-27673.cvd #http://database.clamav.net/bytecode.cvd -Source12: bytecode-335.cvd +Source12: bytecode-336.cvd #for update Source200: freshclam-sleep Source201: freshclam.sysconfig @@ -665,6 +665,9 @@ done %changelog +* Wed Jun 18 2025 Gwyn Ciesla - 1.4.3-1 +- 1.4.3 + * Sat Feb 8 2025 Zbigniew Jedrzejewski-Szmek - 1.4.2-2 - Add sysusers.d config files to allow rpm to create users/groups automatically diff --git a/sources b/sources index 4a68a6e..71ea01c 100644 --- a/sources +++ b/sources @@ -1,4 +1,4 @@ -SHA512 (clamav-1.4.2-norar.tar.xz) = b36ed02823f2d2495b21292580a2d09c45ac6af9c64a09ec9549bc4fd4740b69bcedaa5b9eccbc40763d34bd0cf6dd445f569da9431a046c53f43792bbb92393 +SHA512 (clamav-1.4.3-norar.tar.xz) = d9e6835b88e4934a36b037d28cf01e627b7843e52ef9fc6858f59000acf26120f3534e7a6b262d3ad66a2668557f3a1d0a93fb676711c91f64c8b97fa36fe191 SHA512 (main-62.cvd) = b52e5d9ecacbd9b11c3b0cc460388746fccb353a7520522ed15ee25f645a432bed5be7e6b38512f134f085eb9be76a1e26c19de8b09491d4ec46da8c5afc318e -SHA512 (bytecode-335.cvd) = 9177c0533658b21584de0623ff9b7c70b2ec92ce9f6fecf98a881902c98025930430415715e9914ce7c0c6fb91aad532b4c907677c3010a0da47583b7ad24d4f -SHA512 (daily-27526.cvd) = 34145504fe34d7183cac25e93cec43177a92420154b52ce37fde77e8c9a365a7a3fb9a9f92aa43825e88294cc4b00ac31f2ea8cf8c12fbc4d90d7b965083edf2 +SHA512 (daily-27673.cvd) = e0447f80ef2cc8981b0e1ea430a7006a1027de0b989f5a3256766804f74a50aac52f577ef929c8e1789b9353d1a4cf18d289a27b1f7e609098e11ad81bb62226 +SHA512 (bytecode-336.cvd) = 62a7f8b62da2a2476d3f66851d71e84f055f84543112b18f14e86484b02370d4daff0cb3e2b9ec77acf4a179327619a8b9950122e7882003074a9a0bf4a7ebab diff --git a/update_clamav.sh b/update_clamav.sh index 6cce762..7718896 100755 --- a/update_clamav.sh +++ b/update_clamav.sh @@ -1,4 +1,4 @@ -VERSION=1.4.2 +VERSION=1.4.3 REPOS="n" if [ -z "$1" ] From 19d8fb5551cd4249468d716ca7a767fbe4b45093 Mon Sep 17 00:00:00 2001 From: Gwyn Ciesla Date: Wed, 18 Jun 2025 15:29:25 -0500 Subject: [PATCH 10/13] 1.0.9 --- clamav.spec | 9 ++++++--- sources | 6 +++--- update_clamav.sh | 4 ++-- 3 files changed, 11 insertions(+), 8 deletions(-) diff --git a/clamav.spec b/clamav.spec index 21cd175..fb7d718 100644 --- a/clamav.spec +++ b/clamav.spec @@ -25,7 +25,7 @@ Summary: End-user tools for the Clam Antivirus scanner Name: clamav -Version: 1.0.8 +Version: 1.0.9 Release: 1%{?dist} License: %{?with_unrar:proprietary}%{!?with_unrar:GPLv2} URL: https://www.clamav.net/ @@ -50,9 +50,9 @@ Source5: clamd-README #http://database.clamav.net/main.cvd Source10: main-62.cvd #http://database.clamav.net/daily.cvd -Source11: daily-27530.cvd +Source11: daily-27673.cvd #http://database.clamav.net/bytecode.cvd -Source12: bytecode-335.cvd +Source12: bytecode-336.cvd #for update Source200: freshclam-sleep Source201: freshclam.sysconfig @@ -603,6 +603,9 @@ exit 0 %changelog +* Wed Jun 18 2025 Gwyn Ciesla - 1.0.9-1 +- Update to 1.0.9 + * Sun Jan 26 2025 Orion Poplawski - 1.0.8-1 - Update to 1.0.8 diff --git a/sources b/sources index 70703e9..a6de93f 100644 --- a/sources +++ b/sources @@ -1,4 +1,4 @@ -SHA512 (clamav-1.0.8-norar.tar.xz) = 48510b8296eb2acc7189a6c883bc0478ff753547538dd39f0c75e9028a97571a00f9703f2f90d2def500eb77a1c52fed1a4980d8cb1a01d7563c05699419fa1b +SHA512 (clamav-1.0.9-norar.tar.xz) = 3d637526a6da1b02410857c818d92e10193ba4baeb195e489cf2d41ac470eb05274f8d6d33c3bdc7d6256de8d937c823e0dae40879a21b2ba3df78711e1ade77 SHA512 (main-62.cvd) = b52e5d9ecacbd9b11c3b0cc460388746fccb353a7520522ed15ee25f645a432bed5be7e6b38512f134f085eb9be76a1e26c19de8b09491d4ec46da8c5afc318e -SHA512 (daily-27530.cvd) = bf9548144b5806b055d81b30e8453e5d9fcc085c42f784aae3bf64058193d4459a78856234688c84a0ab648a2bfbb400e7a6e903b2d60b38c245b17dcfa973dc -SHA512 (bytecode-335.cvd) = 9177c0533658b21584de0623ff9b7c70b2ec92ce9f6fecf98a881902c98025930430415715e9914ce7c0c6fb91aad532b4c907677c3010a0da47583b7ad24d4f +SHA512 (daily-27673.cvd) = e0447f80ef2cc8981b0e1ea430a7006a1027de0b989f5a3256766804f74a50aac52f577ef929c8e1789b9353d1a4cf18d289a27b1f7e609098e11ad81bb62226 +SHA512 (bytecode-336.cvd) = 62a7f8b62da2a2476d3f66851d71e84f055f84543112b18f14e86484b02370d4daff0cb3e2b9ec77acf4a179327619a8b9950122e7882003074a9a0bf4a7ebab diff --git a/update_clamav.sh b/update_clamav.sh index 0b28091..c30ab0e 100755 --- a/update_clamav.sh +++ b/update_clamav.sh @@ -1,5 +1,5 @@ -VERSION=1.0.8 -REPOS="f41 f40 f39 epel9" +VERSION=1.0.9 +REPOS="f41 epel9 epel8" if [ -z "$1" ] then From 174d267d5a849178c742c574edcf60a831e63695 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Wed, 23 Jul 2025 18:20:35 +0000 Subject: [PATCH 11/13] Rebuilt for https://fedoraproject.org/wiki/Fedora_43_Mass_Rebuild --- clamav.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/clamav.spec b/clamav.spec index 2ad2853..7bbdc37 100644 --- a/clamav.spec +++ b/clamav.spec @@ -26,7 +26,7 @@ Summary: End-user tools for the Clam Antivirus scanner Name: clamav Version: 1.4.3 -Release: 1%{?dist} +Release: 2%{?dist} License: %{?with_unrar:proprietary}%{!?with_unrar:GPL-2.0-only} URL: https://www.clamav.net/ %if %{with unrar} @@ -665,6 +665,9 @@ done %changelog +* Wed Jul 23 2025 Fedora Release Engineering - 1.4.3-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_43_Mass_Rebuild + * Wed Jun 18 2025 Gwyn Ciesla - 1.4.3-1 - 1.4.3 From 997040fb1e1c61fbdc3e7d1e25936c17eb6354b3 Mon Sep 17 00:00:00 2001 From: "Benjamin A. Beasley" Date: Thu, 4 Dec 2025 10:03:08 +0000 Subject: [PATCH 12/13] Allow hex-literal 1.0 --- ...341e8e34aa325ac03718121e33a3b4e5b75e.patch | 22 ------------------- clamav-rust-dependency-versions.patch | 21 ++++++++++++++++++ clamav.spec | 14 ++++++------ 3 files changed, 28 insertions(+), 29 deletions(-) delete mode 100644 24d1341e8e34aa325ac03718121e33a3b4e5b75e.patch create mode 100644 clamav-rust-dependency-versions.patch diff --git a/24d1341e8e34aa325ac03718121e33a3b4e5b75e.patch b/24d1341e8e34aa325ac03718121e33a3b4e5b75e.patch deleted file mode 100644 index 7bd5cfb..0000000 --- a/24d1341e8e34aa325ac03718121e33a3b4e5b75e.patch +++ /dev/null @@ -1,22 +0,0 @@ -From 24d1341e8e34aa325ac03718121e33a3b4e5b75e Mon Sep 17 00:00:00 2001 -From: "Benjamin A. Beasley" -Date: Sun, 15 Sep 2024 12:50:07 -0400 -Subject: [PATCH] In libclamav_rust, use the current version of the image crate - ---- - libclamav_rust/Cargo.toml | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/libclamav_rust/Cargo.toml b/libclamav_rust/Cargo.toml -index 526951c519..eb95ca8011 100644 ---- a/libclamav_rust/Cargo.toml -+++ b/libclamav_rust/Cargo.toml -@@ -12,7 +12,7 @@ log = { version = "0.4", features = ["std"] } - sha2 = "0.10" - tempfile = "3" - thiserror = "1" --image = "0.24" -+image = "0.25" - rustdct = "0.7" - transpose = "0.2" - num-traits = "0.2" diff --git a/clamav-rust-dependency-versions.patch b/clamav-rust-dependency-versions.patch new file mode 100644 index 0000000..56bd08d --- /dev/null +++ b/clamav-rust-dependency-versions.patch @@ -0,0 +1,21 @@ +diff -Naur clamav-1.4.3-original/libclamav_rust/Cargo.toml clamav-1.4.3/libclamav_rust/Cargo.toml +--- clamav-1.4.3-original/libclamav_rust/Cargo.toml 2025-12-04 10:01:33.233889863 +0000 ++++ clamav-1.4.3/libclamav_rust/Cargo.toml 2025-12-04 10:02:29.088468217 +0000 +@@ -12,7 +12,7 @@ + sha2 = "0.10" + tempfile = "3" + thiserror = "1" +-image = "0.24" ++image = ">=0.24, <0.26" + rustdct = "0.7" + transpose = "0.2" + num-traits = "0.2" +@@ -21,7 +21,7 @@ + unicode-segmentation = "1.10" + bindgen = "0.69" + onenote_parser = "0.3.1" +-hex-literal = "0.4" ++hex-literal = ">=0.4, <2.0" + inflate = "0.4" + bzip2-rs = "0.1" + byteorder = "1.5" diff --git a/clamav.spec b/clamav.spec index 7bbdc37..e09b9c4 100644 --- a/clamav.spec +++ b/clamav.spec @@ -75,8 +75,12 @@ Patch5: clamav-clamonacc-service.patch Patch6: clamav-freshclam.service.patch # Debian patch to fix big-endian Patch7: https://salsa.debian.org/clamav-team/clamav/-/raw/unstable/debian/patches/libclamav-pe-Use-endian-wrapper-in-more-places.patch -# Update the image crate dependency to 0.25, the current release -Patch8: https://github.com/Cisco-Talos/clamav/pull/1366/commits/24d1341e8e34aa325ac03718121e33a3b4e5b75e.patch +# - Update the image crate dependency to 0.25, the current release, +# https://github.com/Cisco-Talos/clamav/pull/1366/commits/24d1341e8e34aa325ac03718121e33a3b4e5b75e, +# allowing 0.24 for backwards-compatibility with vendored dependencies in EPEL8 +# - Allow version 1.0 of the hex-literal crate dependency; not suitable for +# upstream yet due to MSRV +Patch8: clamav-rust-dependency-versions.patch BuildRequires: cmake3 BuildRequires: gettext-devel @@ -343,11 +347,7 @@ cd .. %patch -P5 -p1 -b .clamonacc-service %patch -P6 -p1 -b .freshclam-service %patch -P7 -p1 -b .big-endian -# This patch is not made to be backwards-compatible (even though it could have -# been), and the vendored dependencies in EPEL8 include image 0.24, not 0.25. -%if 0%{?fedora} || 0%{?rhel} >= 9 -%patch -P8 -p1 -b .image-0.25 -%endif +%patch -P8 -p1 -b .rust-dependencies install -p -m0644 %{SOURCE300} clamav-milter/ From 1fb46f57547554441dd90612360f0198aee5971b Mon Sep 17 00:00:00 2001 From: Gwyn Ciesla Date: Thu, 4 Dec 2025 16:45:08 -0600 Subject: [PATCH 13/13] Bump EVR --- clamav.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/clamav.spec b/clamav.spec index e09b9c4..60ea311 100644 --- a/clamav.spec +++ b/clamav.spec @@ -26,7 +26,7 @@ Summary: End-user tools for the Clam Antivirus scanner Name: clamav Version: 1.4.3 -Release: 2%{?dist} +Release: 3%{?dist} License: %{?with_unrar:proprietary}%{!?with_unrar:GPL-2.0-only} URL: https://www.clamav.net/ %if %{with unrar} @@ -665,6 +665,9 @@ done %changelog +* Thu Dec 04 2025 Gwyn Ciesla - 1.4.3-3 +- Bump EVR, hex-literal patches. + * Wed Jul 23 2025 Fedora Release Engineering - 1.4.3-2 - Rebuilt for https://fedoraproject.org/wiki/Fedora_43_Mass_Rebuild