[rpms/clamav] epel9: Update the image crate dependency to 0.25, the current release

[rpms/clamav] epel9: Update the image crate dependency to 0.25, the current release

[Benjamin A. Beasley]

A new commit has been pushed.

Repo   : rpms/clamav
Branch : epel9
Commit : e884e3dd1b95de115de540405f9670a76cff7f27
Author : Benjamin A. Beasley <code@musicinmybrain.net>
Date   : 2024-09-17T21:02:49-04:00
Stats  : +33/-1 in 2 file(s)
URL    : https://src.fedoraproject.org/rpms/clamav/c/e884e3dd1b95de115de540405f9670a76cff7f27?branch=epel9

Log:
Update the image crate dependency to 0.25, the current release

---
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" <code@musicinmybrain.net>
+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 <code@musicinmybrain.net> - 1.0.7-2
+- Update the image crate dependency to 0.25, the current release
+
 * Thu Sep 05 2024 Yaakov Selkowitz <yselkowi@redhat.com> - 1.0.7-1
 - Update to 1.0.7