[rpms/clamav] epel9: Update to 1.4.1

[rpms/clamav] epel9: Update to 1.4.1

[Orion Poplawski]

A new commit has been pushed.

Repo   : rpms/clamav
Branch : epel9
Commit : b08aa79384debd6ad70ffa5935bcaaa531ad3a62
Author : Orion Poplawski <orion@nwra.com>
Date   : 2024-10-17T19:14:19-06:00
Stats  : +45/-69 in 6 file(s)
URL    : https://src.fedoraproject.org/rpms/clamav/c/b08aa79384debd6ad70ffa5935bcaaa531ad3a62?branch=epel9

Log:
Update to 1.4.1

---
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 <orion@nwra.com> - 1.4.1-1
+- Update to 1.4.1
+
 * Sun Sep 15 2024 Benjamin A. Beasley <code@musicinmybrain.net> - 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 <sebastian@breakpoint.cc>
-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 <sebastian@breakpoint.cc>
----
- 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