sys-fs/duperemove: Backport a type fix for 32-bit systems

Closes: https://bugs.gentoo.org/928358
Signed-off-by: Michał Górny <mgorny@gentoo.org>
This commit is contained in:
Michał Górny
2024-05-13 14:31:16 +02:00
parent 9f3b53b076
commit 06f0223d5b
2 changed files with 43 additions and 1 deletions

View File

@@ -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"
}

View File

@@ -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__ */