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

6 files changed, 47 insertions, 4 deletions

diff --git a/sys-fs/Manifest.gz b/sys-fs/Manifest.gz
index c8dcdddca7e5..1c6f9f3005f2 100644
--- a/sys-fs/Manifest.gz
+++ b/sys-fs/Manifest.gz
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__ */
diff --git a/sys-fs/fuse-overlayfs/Manifest b/sys-fs/fuse-overlayfs/Manifest
index 2b67558ebb4e..ef7aa9d03962 100644
--- a/sys-fs/fuse-overlayfs/Manifest
+++ b/sys-fs/fuse-overlayfs/Manifest
@@ -1,5 +1,5 @@
 DIST fuse-overlayfs-1.12.tar.gz 99684 BLAKE2B e7ef075c043738d506efcf973ecef7eb321e9f2b2812b318a4087d2a913f022240ed4b0d46e47463daff6976dd99fb587a5819a22c7e58dd52029930e92abffc SHA512 f113ac20b389d2f1c5e5ff160a60c308017e74c9c85d74a7200bab81a4cfa30335a64740c173f17c91ab4feddffb138ca4378e92894645a67eea5ac73d42890f
 DIST fuse-overlayfs-1.13.tar.gz 99775 BLAKE2B 7a0643a5ef029db7f3d1009e9dd4e7a647bf936205723fc3656dfd6d14d622e98f9df15590783492f056ab3f151fd658b6fe65f7177f9499532d02411138ac7c SHA512 2f005b7eb4f0cc31dd75a6c453d81fbbf1c77cb6c1e8f991a53465c1e8c0109c999063a3b2088978abeea2272677985cd79ecbbbcd7aaaac0088dcdd34981f4b
 EBUILD fuse-overlayfs-1.12.ebuild 504 BLAKE2B 584f9cdd21a7f956f6e34c2afc935feeae031dff27b816fef1c79bbd6a229bd22cfe72b305f564bfa79d2a182278140e3da6afd9ea45db38aeada2b065ab64ad SHA512 6e64dc415bfa62b85e763fbaf6c5d8eb216e9fefc167a687c34f9723540125b99a19d60c5c24250d0d99213c9fdf3abc341d457c58bccc8b738c8ac0926609b6
-EBUILD fuse-overlayfs-1.13.ebuild 609 BLAKE2B 6ed5709ecbdf192294953c59232bd4aa74001910202eb9b9acc1960f516f5adf984267260a2d66f43ae3cdd8c118bf8f70575212f7049f2655576725b9c63ba6 SHA512 ec4a7411517a6a338edde85bde138203d6eb584c59eda17e1ab55b4aeca4e4772f1e9f2d8869fece3948408777f816cf56e3e2404e486bb81a91b793acbd1150
+EBUILD fuse-overlayfs-1.13.ebuild 608 BLAKE2B 38b3ec559ab03b3bc4f3e68d59be97a8114d10c50234f0029cb93e95287f1fcc1f389039d4f3e123d6dedc34854c07f342fd0fde485650733d09d21b50051b96 SHA512 3a8ad8df9b456d6d133a018467082380d2eeab8e5c60a78cb11bba1d0e2eb48c8a5d51a1339560ddf1564acf32040350dac1bf17efedcd83bde21a5afdd8e2ba
 MISC metadata.xml 588 BLAKE2B 5871bf7c5b838fc87673fbe00610b2aee63be3140af6cc46050f98dc299e922096bdc9928d6700d9779f4ff3bb9212258e7a86d27d764a623b9b53047078b2dc SHA512 aea63b5ea32b83fb24ee7422bd5df24e4f1250f8a33b7281d381531df3d230d2a9c257c3a5d0e379a252c82a82f490b448f6bd2f416d766cd6e000e354408438
diff --git a/sys-fs/fuse-overlayfs/fuse-overlayfs-1.13.ebuild b/sys-fs/fuse-overlayfs/fuse-overlayfs-1.13.ebuild
index 54c468c0fd7a..4bbe7b857e53 100644
--- a/sys-fs/fuse-overlayfs/fuse-overlayfs-1.13.ebuild
+++ b/sys-fs/fuse-overlayfs/fuse-overlayfs-1.13.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://github.com/containers/fuse-overlayfs/archive/v${PV}.tar.gz -> $
 
 LICENSE="GPL-3"
 SLOT="0"
-KEYWORDS="amd64 ~arm64 ~ppc64 ~riscv"
+KEYWORDS="amd64 arm64 ~ppc64 ~riscv"
 
 DEPEND="sys-fs/fuse:3"
 RDEPEND="${DEPEND}"