gentoo auto-resync : 14:05:2024 - 00:01:24

3 files changed, 45 insertions, 2 deletions

diff --git a/sys-fs/duperemove/Manifest b/sys-fs/duperemove/Manifest
index e3c27bf15dd9..7ed48d7d46aa 100644
--- a/sys-fs/duperemove/Manifest
+++ b/sys-fs/duperemove/Manifest
@@ -1,3 +1,4 @@
+AUX duperemove-0.14.1-32bit.patch 1296 BLAKE2B 6064f8bd3e192acc6391f04a452572f0adb37ca1a7dd93253c3b394fa4214defe1e2ebdfd53bc4e854540e6fe3099a193f3ba351e117fcf8fa3c00847deb016f SHA512 533f817c0e605a3aa33d75e308f318100c5945f4958d78ef73f4bda0d219a45d81f8f65e2af19445b1aad31306a2228179f98064538345e8c5bcc6a8ff166625
 DIST duperemove-0.14.1.gh.new.tar.gz 167968 BLAKE2B 74d5ed6c452a24103d9ca0050ee1d1fdbb4eb4df5c2e86f84e6a1c70abf54d2caf27597d2088a5130d696bebaf07f93dd5f47e9c414af9ce3d19f096b872a02a SHA512 16af9fb002d6e51ce469869507d5d4b8f9576620746337252ad733e6f74ae275c1e83da6af1c203543b9d19890180952d87f9fad4a02d4c4e0a25577ce569191
-EBUILD duperemove-0.14.1.ebuild 718 BLAKE2B c3ae906d0e7994c70937859be11520896515326377530dd578cbda7d14ee59e0e1779baf93e2b8472f72d5eb40ffdc904aa45c7d2338c97d716439877e307a91 SHA512 07f024262aad449689937b4b08690923a535570fca51b58b8951c02b5a6e1442fc286a2fa6c9ef6c01c131051a9f8ab2e7d3fa77537c3322ba619346f084e4d8
+EBUILD duperemove-0.14.1-r1.ebuild 818 BLAKE2B 0d517c674b8d949f2df9cd79fc01613835cbfd618abe5de1444a2656da4ff3c653123e3a7d67631e5276bf6138b952fc70c4c01f9d7ed35efd5c5303da2219ef SHA512 949ac6f98e59da10b5399c28755b0781ae8796b6c1ccb2825ddbf4a824961fec4dbd237251bfc36cf2b44218242bf38286cf9d83f1c55b9bf46251963bdffcaf
 MISC metadata.xml 334 BLAKE2B 375ee51b86214e9cc0d3b68727d83314d2694fa25f36758f7af1e691bcbc620896576c4f957809429d527ab0d9e6c6464af4850d13991b7174f8118901fd9985 SHA512 6ff5e136e085723546f070d388e9da22a902461629c799985fb2563c3eb3ca7b05794b4bcc96bedee97dd5a65551b2c74aeadbb3e2880a3ffa6426a9fea05bac
diff --git a/sys-fs/duperemove/duperemove-0.14.1.ebuild b/sys-fs/duperemove/duperemove-0.14.1-r1.ebuild
index 8ce73d66e3e1..30aacbdaf841 100644
--- a/sys-fs/duperemove/duperemove-0.14.1.ebuild
+++ b/sys-fs/duperemove/duperemove-0.14.1-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2023 Gentoo Authors
+# Copyright 1999-2024 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=8
@@ -26,6 +26,11 @@ RDEPEND="
 	${DEPEND}
 "
 
+PATCHES=(
+	# https://github.com/markfasheh/duperemove/issues/344
+	"${FILESDIR}/${P}-32bit.patch"
+)
+
 src_compile() {
 	emake VERSION="${PV}" IS_RELEASE=1 CC="$(tc-getCC)" CFLAGS="${CFLAGS} -Wall"
 }
diff --git a/sys-fs/duperemove/files/duperemove-0.14.1-32bit.patch b/sys-fs/duperemove/files/duperemove-0.14.1-32bit.patch
new file mode 100644
index 000000000000..6e2ebf79f063
--- /dev/null
+++ b/sys-fs/duperemove/files/duperemove-0.14.1-32bit.patch
@@ -0,0 +1,37 @@
+From 9e97c827707e9d709180a12ddfa16527e36fc676 Mon Sep 17 00:00:00 2001
+From: Alexandre Bruyelles <git@jack.fr.eu.org>
+Date: Sun, 12 May 2024 19:45:52 +0200
+Subject: [PATCH] fiemap: fiemap_count_shared: use coherent parameter size
+
+Fixes https://github.com/markfasheh/duperemove/issues/344
+
+Signed-off-by: Alexandre Bruyelles <git@jack.fr.eu.org>
+---
+ fiemap.c | 2 +-
+ fiemap.h | 2 +-
+ 2 files changed, 2 insertions(+), 2 deletions(-)
+
+diff --git a/fiemap.c b/fiemap.c
+index aa61114431bd..655797dc4d91 100644
+--- a/fiemap.c
++++ b/fiemap.c
+@@ -98,7 +98,7 @@ struct fiemap *do_fiemap(int fd)
+ 	return fiemap;
+ }
+ 
+-int fiemap_count_shared(int fd, size_t start_off, size_t end_off, size_t *shared)
++int fiemap_count_shared(int fd, size_t start_off, size_t end_off, uint64_t *shared)
+ {
+ 	_cleanup_(freep) struct fiemap *fiemap = NULL;
+ 	struct fiemap_extent *extent;
+diff --git a/fiemap.h b/fiemap.h
+index f9eb17b9aa4a..1918c6e96322 100644
+--- a/fiemap.h
++++ b/fiemap.h
+@@ -26,5 +26,5 @@ struct fiemap *do_fiemap(int fd);
+ /*
+  * Count how much of the area between start_off and end_off is shared.
+  */
+-int fiemap_count_shared(int fd, size_t start_off, size_t end_off, size_t *shared);
++int fiemap_count_shared(int fd, size_t start_off, size_t end_off, uint64_t *shared);
+ #endif	/* __FIEMAP_H__ */