app-antivirus/clamav: add 1.4.1-r1

Swap out 1.4.0 for 1.4.0-r1 - noticed an incompatible-pointer-type
warning just after pushing.

As a side benefit we can drop the old onenote-rs patch in favour
of a later revision of upstream's git crate!

Signed-off-by: Matt Jolly <kangie@gentoo.org>

4 files changed, 35 insertions, 34 deletions

diff --git a/app-antivirus/clamav/Manifest b/app-antivirus/clamav/Manifest
index 7212a5c955f5..d5636a04acd1 100644
--- a/app-antivirus/clamav/Manifest
+++ b/app-antivirus/clamav/Manifest
@@ -170,7 +170,7 @@ DIST num_cpus-1.16.0.crate 15713 BLAKE2B 11b432fc7c7496d48918f09ed0954e0f1d08455
 DIST once_cell-1.17.0.crate 32736 BLAKE2B 767fc8f362ce5ed7a9eafceb2f0764a2a1c7f4070e22d1e6e2498b3c841c5f761e77fb66a34b899a75d48f1563f6b9b73b90aa9431055d4e0269c47a1b043c1f SHA512 291d87380c0ea17fb3ffc9fdff8620d2ff55601c06ef65b2f0c54254fecd5b488645c6e94c6026b82071893f4d420491ff712399a782e14efa1e323e5c299c46
 DIST once_cell-1.18.0.crate 32969 BLAKE2B a08d5beee50a7add28bd9e50b18709e7b34574f0f55f80909d5efb7ac5917e5f30bdcf3fb43ddd0a4f420a427390c7ffe1cc1c7191a3a1d939bc6e3139e6eef7 SHA512 9328968afdf3535b2d9e0113d75afa725259d76994ef2e1948ad7efa4ec8a65bac7cfdc31b749d5cd55ad4e28d2e28ac57b871e3067b89182453c7e2413a13b8
 DIST once_cell-1.19.0.crate 33046 BLAKE2B c14b374eaf4ac0f60acc2e02f7bba270a0e8e0a6978d749cd3cb0ab3eb26907e4fbea70dd5132982f90290381ed18ff8a87fd530f1415fabffac864f157ea380 SHA512 4154876afd34a699ee650d1a8a1c5ee5a25f0ebd9388b8bef2564e33629fae68f113d7507488c68abbe7ea1acf9bbc41813cbbf3ef3e464e3f3b9cc7a51d870c
-DIST onenote.rs-8b450447e58143004b68dd21c11b710fdb79be92.gh.tar.gz 725441 BLAKE2B e4ad2b41d47db5318f792624d9cc793c9fa1b77cab6811d13d9cfeb7f4239639f4191d5d3207d27549426b9414e04f4aa0e18ed00e221cea49a9e4a5b3423470 SHA512 4a29e1f9a77e7174481b0d9e3cd860dcbe593a2fc28f60823197e52a1067cc1674758c97b13605fb7d58cb35d518941bc117b49458a58a1e887f15981df4e8a0
+DIST onenote.rs-29c08532252b917543ff268284f926f30876bb79.gh.tar.gz 725455 BLAKE2B d89839fe5254895376b7a0d793feb246f2244a277fb97d9753ae661e6cd393765a009e3c957a139c9f3f26cfb989e2ec3b14df4099b81e0969334a885e54e61c SHA512 cbae71d1b28ef7465729d19c70e59ccc8690a21131827d3d627128fbe3a178abcf7c3ddf1fd7e7ede0e024c329c26c77474388e343f8758537faa0d570d4fd15
 DIST paste-1.0.14.crate 18157 BLAKE2B 35e8548611c51ee75f4d04926149e5e54870d7073d9b635d550a6fa0f85891f57f326bdbcff3dd8618cf40f8e08cf903ef87d9c034d5921d8b91e1db842cdd7c SHA512 3a793f0e5e773a7f7defc798a4c17ae9a40d715144632ea6cb0a8c785e14c4212046491df016bb9838281f8eaf327a79f01c1e2ac5f26785c028bc880faff9ee
 DIST peeking_take_while-0.1.2.crate 6697 BLAKE2B 31571604d00872900abcb677a483da93654de523bbdb0331c326dc9a3e531f246e571bebcb983e79dc46e33ed6dd32b978be509841ec0d9f1e7209c06289c22a SHA512 7bf8721987c3e2e1986683dd897746592a909382f02b840b777effec7d8b0a864c1a83b03c73d555e359f22c423168a54b75448a7e7b996b739527ce8c88b721
 DIST pin-project-1.0.12.crate 56972 BLAKE2B 1f6b106cd55b9692bb1d671bfd51011d9f89cfe8bbbe030c64e7ea57b6efb0765838b03812708a7aa38c197d3b43328a9d88fdf93abb51f4d1a3061301b74414 SHA512 434ce0a0e16441c7aa6f12dc98584a0e7986e9491eb08d5143e3f64e1f73dfa4db9d0fb2098f16e5a36f3653201aff735437d2d1d366c11160c09534c75fbfe7
diff --git a/app-antivirus/clamav/clamav-1.4.1.ebuild b/app-antivirus/clamav/clamav-1.4.1-r1.ebuild
index 4dc3275f4755..b5509223351b 100644
--- a/app-antivirus/clamav/clamav-1.4.1.ebuild
+++ b/app-antivirus/clamav/clamav-1.4.1-r1.ebuild
@@ -154,7 +154,7 @@ CRATES="
 
 # Get the commit from the CLAM-2329-new-from-slice branch
 declare -A GIT_CRATES=(
-	[onenote_parser]="https://github.com/Cisco-Talos/onenote.rs;8b450447e58143004b68dd21c11b710fdb79be92;onenote.rs-%commit%"
+	[onenote_parser]="https://github.com/Cisco-Talos/onenote.rs;29c08532252b917543ff268284f926f30876bb79;onenote.rs-%commit%"
 )
 
 inherit cargo cmake flag-o-matic llvm python-any-r1 systemd tmpfiles
@@ -224,6 +224,10 @@ DEPEND="${COMMON_DEPEND}
 RDEPEND="${COMMON_DEPEND}
 	selinux? ( sec-policy/selinux-clamav )"
 
+PATCHES=(
+	"${FILESDIR}/${P}-pointer-types.patch"
+)
+
 python_check_deps() {
 	python_has_version -b "dev-python/pytest[${PYTHON_USEDEP}]"
 }
@@ -234,8 +238,6 @@ pkg_setup() {
 }
 
 src_prepare() {
-	eapply --dir="${WORKDIR}/onenote.rs-8b450447e58143004b68dd21c11b710fdb79be92" \
-		"${FILESDIR}/${PN}-1.3.1-onenote-rs.patch"
 	cmake_src_prepare
 }
 
diff --git a/app-antivirus/clamav/files/clamav-1.3.1-onenote-rs.patch b/app-antivirus/clamav/files/clamav-1.3.1-onenote-rs.patch
deleted file mode 100644
index d8421a269606..000000000000
--- a/app-antivirus/clamav/files/clamav-1.3.1-onenote-rs.patch
+++ /dev/null
@@ -1,30 +0,0 @@
-From bc17e5a2e1f324461024f5e3e5776085a6b6df37 Mon Sep 17 00:00:00 2001
-From: Matt Jolly <Matt.Jolly@footclan.ninja>
-Date: Mon, 24 Jun 2024 17:34:05 +1000
-Subject: [PATCH] PropertType: Specify type for custom discriminant values
-
-We use custom discriminant values for enum variants for "PropertType" without specifying the type.
-This causes it to default to "isize" which on 64bit platforms is big enough to hold the 32bit constants,
-but causes overflow when isize is 32bit.
-
-This issue was uncovered due to build failures on arm for Gentoo Linux as a dependency of ClamAV.
-
-Bug: https://bugs.gentoo.org/927214
-Signed-off-by: Matt Jolly <kangie@gentoo.org>
-Co-authored-by: Steven Newbury <steve@snewbury.org.uk>
----
- src/one/property/mod.rs | 1 +
- 1 file changed, 1 insertion(+)
-
-diff --git a/src/one/property/mod.rs b/src/one/property/mod.rs
-index 42841c6..fcc0481 100644
---- a/src/one/property/mod.rs
-+++ b/src/one/property/mod.rs
-@@ -23,6 +23,7 @@ mod references;
- pub(crate) mod simple;
- pub(crate) mod time;
- 
-+#[repr(u32)]
- #[derive(Debug, Copy, Clone, PartialEq)]
- #[allow(dead_code)]
- #[allow(clippy::enum_clike_unportable_variant)]
diff --git a/app-antivirus/clamav/files/clamav-1.4.1-pointer-types.patch b/app-antivirus/clamav/files/clamav-1.4.1-pointer-types.patch
new file mode 100644
index 000000000000..b6ad930008b6
--- /dev/null
+++ b/app-antivirus/clamav/files/clamav-1.4.1-pointer-types.patch
@@ -0,0 +1,29 @@
+From 26c465b562f08d4b4c3da688a6a3b051ddc51b01 Mon Sep 17 00:00:00 2001
+From: Matt Jolly <kangie@gentoo.org>
+Date: Mon, 23 Sep 2024 21:25:07 +1000
+Subject: [PATCH] Resolve incompatible-pointer-types
+
+Explicitly cast regex match to `const char **`; we don't modify the
+value once it's set like this; we should be safe.
+
+Signed-off-by: Matt Jolly <kangie@gentoo.org>
+---
+ libclamav/regex/engine.c | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/libclamav/regex/engine.c b/libclamav/regex/engine.c
+index 68a1767fb..38add7d15 100644
+--- a/libclamav/regex/engine.c
++++ b/libclamav/regex/engine.c
+@@ -223,7 +223,7 @@ matcher(struct re_guts *g, const char *string, size_t nmatch,
+ 			dp = dissect(m, m->coldp, endp, gf, gl);
+ 		} else {
+ 			if (g->nplus > 0 && m->lastpos == NULL)
+-				m->lastpos = (char **)cli_max_malloc((g->nplus+1) *
++				m->lastpos = (const char **)cli_max_malloc((g->nplus+1) *
+ 							sizeof(char *));
+ 			if (g->nplus > 0 && m->lastpos == NULL) {
+ 				free(m->pmatch);
+-- 
+2.45.2
+