From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from smtp.gentoo.org (woodpecker.gentoo.org [140.211.166.183]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (No client certificate requested) by finch.gentoo.org (Postfix) with ESMTPS id E9EAA1582EF for ; Sun, 23 Feb 2025 05:21:30 +0000 (UTC) Received: from lists.gentoo.org (bobolink.gentoo.org [140.211.166.189]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (No client certificate requested) (Authenticated sender: relay-lists.gentoo.org@gentoo.org) by smtp.gentoo.org (Postfix) with ESMTPSA id D55E13430AC for ; Sun, 23 Feb 2025 05:21:30 +0000 (UTC) Received: from bobolink.gentoo.org (localhost [127.0.0.1]) by bobolink.gentoo.org (Postfix) with ESMTP id D4615110296; Sun, 23 Feb 2025 05:21:29 +0000 (UTC) Received: from smtp.gentoo.org (woodpecker.gentoo.org [140.211.166.183]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (No client certificate requested) by bobolink.gentoo.org (Postfix) with ESMTPS id C7AA0110296 for ; Sun, 23 Feb 2025 05:21:29 +0000 (UTC) Received: from oystercatcher.gentoo.org (oystercatcher.gentoo.org [148.251.78.52]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id 840093430AC for ; Sun, 23 Feb 2025 05:21:29 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id E1F1D23C1 for ; Sun, 23 Feb 2025 05:21:27 +0000 (UTC) From: "Sam James" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Sam James" Message-ID: <1740287965.e592ca40fd7c5e7031b83319f3860209a9e3ff5f.sam@gentoo> Subject: [gentoo-commits] repo/gentoo:master commit in: sys-fs/xfsprogs/files/, sys-fs/xfsprogs/ X-VCS-Repository: repo/gentoo X-VCS-Files: sys-fs/xfsprogs/files/xfsprogs-6.13.0-32-bit.patch sys-fs/xfsprogs/xfsprogs-6.13.0-r1.ebuild sys-fs/xfsprogs/xfsprogs-6.13.0.ebuild X-VCS-Directories: sys-fs/xfsprogs/ sys-fs/xfsprogs/files/ X-VCS-Committer: sam X-VCS-Committer-Name: Sam James X-VCS-Revision: e592ca40fd7c5e7031b83319f3860209a9e3ff5f X-VCS-Branch: master Date: Sun, 23 Feb 2025 05:21:27 +0000 (UTC) Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-commits@lists.gentoo.org X-Auto-Response-Suppress: DR, RN, NRN, OOF, AutoReply X-Archives-Salt: cfec6339-65d5-4e87-880f-83cedfb1dc84 X-Archives-Hash: 767295ee98d41e7ad70442ef3e40d770 commit: e592ca40fd7c5e7031b83319f3860209a9e3ff5f Author: Sam James gentoo org> AuthorDate: Sun Feb 23 05:19:25 2025 +0000 Commit: Sam James gentoo org> CommitDate: Sun Feb 23 05:19:25 2025 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=e592ca40 sys-fs/xfsprogs: fix 32-bit compat in 6.13.0 Signed-off-by: Sam James gentoo.org> sys-fs/xfsprogs/files/xfsprogs-6.13.0-32-bit.patch | 44 ++++++++++++++++++++++ ...ogs-6.13.0.ebuild => xfsprogs-6.13.0-r1.ebuild} | 4 ++ 2 files changed, 48 insertions(+) diff --git a/sys-fs/xfsprogs/files/xfsprogs-6.13.0-32-bit.patch b/sys-fs/xfsprogs/files/xfsprogs-6.13.0-32-bit.patch new file mode 100644 index 000000000000..e5bb09425f7e --- /dev/null +++ b/sys-fs/xfsprogs/files/xfsprogs-6.13.0-32-bit.patch @@ -0,0 +1,44 @@ +https://lore.kernel.org/linux-xfs/20250221185757.79333-1-preichl@redhat.com/ + +From: Pavel Reichl +To: aalbersh@redhat.com +Cc: linux-xfs@vger.kernel.org +Subject: [PATCH v2] xfsprogs: Fix mismatched return type of filesize() +Date: Fri, 21 Feb 2025 19:57:57 +0100 +Message-ID: <20250221185757.79333-1-preichl@redhat.com> +X-Mailer: git-send-email 2.48.1 +In-Reply-To: <20250217155043.78452-1-preichl@redhat.com> +References: <20250217155043.78452-1-preichl@redhat.com> +Precedence: bulk +X-Mailing-List: linux-xfs@vger.kernel.org +List-Id: +List-Subscribe: +List-Unsubscribe: +MIME-Version: 1.0 +Content-Transfer-Encoding: 8bit + +The function filesize() was declared with a return type of 'long' but +defined with 'off_t'. This mismatch caused build issues due to type +incompatibility. + +This commit updates the declaration to match the definition, ensuring +consistency and preventing potential compilation errors. + +Fixes: 73fb78e5ee8 ("mkfs: support copying in large or sparse files") + +Signed-off-by: Pavel Reichl +Reviewed-by: Darrick J. Wong +Reviewed-by: Carlos Maiolino +--- a/mkfs/proto.c ++++ b/mkfs/proto.c +@@ -20,7 +20,7 @@ static struct xfs_trans * getres(struct xfs_mount *mp, uint blocks); + static void rsvfile(xfs_mount_t *mp, xfs_inode_t *ip, long long len); + static int newregfile(char **pp, char **fname); + static void rtinit(xfs_mount_t *mp); +-static long filesize(int fd); ++static off_t filesize(int fd); + static int slashes_are_spaces; + + /* +-- +2.48.1 diff --git a/sys-fs/xfsprogs/xfsprogs-6.13.0.ebuild b/sys-fs/xfsprogs/xfsprogs-6.13.0-r1.ebuild similarity index 98% rename from sys-fs/xfsprogs/xfsprogs-6.13.0.ebuild rename to sys-fs/xfsprogs/xfsprogs-6.13.0-r1.ebuild index d7ac475a1d1f..f2dfa068fb68 100644 --- a/sys-fs/xfsprogs/xfsprogs-6.13.0.ebuild +++ b/sys-fs/xfsprogs/xfsprogs-6.13.0-r1.ebuild @@ -28,6 +28,10 @@ DEPEND=" BDEPEND="nls? ( sys-devel/gettext )" RDEPEND+=" selinux? ( sec-policy/selinux-xfs )" +PATCHES=( + "${FILESDIR}"/${PN}-6.13.0-32-bit.patch +) + src_prepare() { default