[rpms/clamav] epel9: Allow hex-literal 1.0

[rpms/clamav] epel9: Allow hex-literal 1.0

[Benjamin A. Beasley]

A new commit has been pushed.

Repo   : rpms/clamav
Branch : epel9
Commit : 997040fb1e1c61fbdc3e7d1e25936c17eb6354b3
Author : Benjamin A. Beasley <code@musicinmybrain.net>
Date   : 2025-12-04T10:03:08+00:00
Stats  : +28/-29 in 3 file(s)
URL    : https://src.fedoraproject.org/rpms/clamav/c/997040fb1e1c61fbdc3e7d1e25936c17eb6354b3?branch=epel9

Log:
Allow hex-literal 1.0

---
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" <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-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/