From mboxrd@z Thu Jan 1 00:00:00 1970
Return-Path: <gentoo-commits+bounces-1664882-garchives=archives.gentoo.org@lists.gentoo.org>
Received: from lists.gentoo.org (pigeon.gentoo.org [208.92.234.80])
(using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)
key-exchange X25519 server-signature RSA-PSS (2048 bits))
(No client certificate requested)
by finch.gentoo.org (Postfix) with ESMTPS id 5082C1581FB
for <garchives@archives.gentoo.org>; Tue, 27 Aug 2024 23:44:15 +0000 (UTC)
Received: from pigeon.gentoo.org (localhost [127.0.0.1])
by pigeon.gentoo.org (Postfix) with SMTP id 97A722BC014;
Tue, 27 Aug 2024 23:44:14 +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 pigeon.gentoo.org (Postfix) with ESMTPS id 76F722BC014
for <gentoo-commits@lists.gentoo.org>; Tue, 27 Aug 2024 23:44:14 +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 6FF5E342F9D
for <gentoo-commits@lists.gentoo.org>; Tue, 27 Aug 2024 23:44:13 +0000 (UTC)
Received: from localhost.localdomain (localhost [IPv6:::1])
by oystercatcher.gentoo.org (Postfix) with ESMTP id AF8F51EC4
for <gentoo-commits@lists.gentoo.org>; Tue, 27 Aug 2024 23:44:11 +0000 (UTC)
From: "Sam James" <sam@gentoo.org>
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" <sam@gentoo.org>
Message-ID: <1724802227.56527dba237030fc69ac2bb4c6725a5ac58a7e16.sam@gentoo>
Subject: [gentoo-commits] repo/gentoo:master commit in: sys-fs/xfsprogs/, sys-fs/xfsprogs/files/
X-VCS-Repository: repo/gentoo
X-VCS-Files: sys-fs/xfsprogs/files/xfsprogs-6.10.0-c++-void.patch sys-fs/xfsprogs/xfsprogs-6.10.0-r1.ebuild sys-fs/xfsprogs/xfsprogs-6.10.0-r2.ebuild
X-VCS-Directories: sys-fs/xfsprogs/files/ sys-fs/xfsprogs/
X-VCS-Committer: sam
X-VCS-Committer-Name: Sam James
X-VCS-Revision: 56527dba237030fc69ac2bb4c6725a5ac58a7e16
X-VCS-Branch: master
Date: Tue, 27 Aug 2024 23:44:11 +0000 (UTC)
Precedence: bulk
List-Post: <mailto:gentoo-commits@lists.gentoo.org>
List-Help: <mailto:gentoo-commits+help@lists.gentoo.org>
List-Unsubscribe: <mailto:gentoo-commits+unsubscribe@lists.gentoo.org>
List-Subscribe: <mailto:gentoo-commits+subscribe@lists.gentoo.org>
List-Id: Gentoo Linux mail <gentoo-commits.gentoo.org>
X-BeenThere: gentoo-commits@lists.gentoo.org
X-Auto-Response-Suppress: DR, RN, NRN, OOF, AutoReply
X-Archives-Salt: c6d3c020-49f9-4151-b59d-ec71eb75a6dc
X-Archives-Hash: 4b403426d6c3657439bb095e3536c331
commit: 56527dba237030fc69ac2bb4c6725a5ac58a7e16
Author: Sam James <sam <AT> gentoo <DOT> org>
AuthorDate: Tue Aug 27 23:42:38 2024 +0000
Commit: Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Tue Aug 27 23:43:47 2024 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=56527dba
sys-fs/xfsprogs: fix C++ compat in headers
Closes: https://bugs.gentoo.org/938569
Thanks-to: Matt Whitlock <gentoo <AT> mattwhitlock.name>
Signed-off-by: Sam James <sam <AT> gentoo.org>
.../xfsprogs/files/xfsprogs-6.10.0-c++-void.patch | 46 ++++++++++++++++++++++
...-6.10.0-r1.ebuild => xfsprogs-6.10.0-r2.ebuild} | 4 ++
2 files changed, 50 insertions(+)
diff --git a/sys-fs/xfsprogs/files/xfsprogs-6.10.0-c++-void.patch b/sys-fs/xfsprogs/files/xfsprogs-6.10.0-c++-void.patch
new file mode 100644
index 000000000000..04b71ff89fc0
--- /dev/null
+++ b/sys-fs/xfsprogs/files/xfsprogs-6.10.0-c++-void.patch
@@ -0,0 +1,46 @@
+https://bugs.gentoo.org/938569
+https://lore.kernel.org/linux-xfs/172480131521.2291268.17945339760767205637.stgit@frogsfrogsfrogs/
+
+From fd885ea4d54be6e98df7342bd99b77bc8cbd64d5 Mon Sep 17 00:00:00 2001
+Message-ID: <fd885ea4d54be6e98df7342bd99b77bc8cbd64d5.1724802060.git.sam@gentoo.org>
+From: "Darrick J. Wong" <djwong@kernel.org>
+Date: Tue, 27 Aug 2024 16:33:58 -0700
+Subject: [PATCH] xfs: fix C++ compilation errors in xfs_fs.h
+
+Several people reported C++ compilation errors due to things that C
+compilers allow but C++ compilers do not. Fix both of these problems,
+and hope there aren't more of these brown paper bags in 2 months when we
+finally get these fixes through the process into a released xfsprogs.
+
+Reported-by: kernel@mattwhitlock.name
+Reported-by: sam@gentoo.org
+Closes: https://bugzilla.kernel.org/show_bug.cgi?id=219203
+Fixes: 233f4e12bbb2c ("xfs: add parent pointer ioctls")
+Signed-off-by: Darrick J. Wong <djwong@kernel.org>
+---
+ libxfs/xfs_fs.h | 4 ++--
+ 1 file changed, 2 insertions(+), 2 deletions(-)
+
+diff --git a/libxfs/xfs_fs.h b/libxfs/xfs_fs.h
+index 454b63ef..2b8e1f4f 100644
+--- a/libxfs/xfs_fs.h
++++ b/libxfs/xfs_fs.h
+@@ -906,13 +906,13 @@ static inline struct xfs_getparents_rec *
+ xfs_getparents_next_rec(struct xfs_getparents *gp,
+ struct xfs_getparents_rec *gpr)
+ {
+- void *next = ((void *)gpr + gpr->gpr_reclen);
++ void *next = ((char *)gpr + gpr->gpr_reclen);
+ void *end = (void *)(uintptr_t)(gp->gp_buffer + gp->gp_bufsize);
+
+ if (next >= end)
+ return NULL;
+
+- return next;
++ return (struct xfs_getparents_rec *)next;
+ }
+
+ /* Iterate through this file handle's directory parent pointers. */
+--
+2.46.0
+
diff --git a/sys-fs/xfsprogs/xfsprogs-6.10.0-r1.ebuild b/sys-fs/xfsprogs/xfsprogs-6.10.0-r2.ebuild
similarity index 98%
rename from sys-fs/xfsprogs/xfsprogs-6.10.0-r1.ebuild
rename to sys-fs/xfsprogs/xfsprogs-6.10.0-r2.ebuild
index db059509605d..16fed283d07e 100644
--- a/sys-fs/xfsprogs/xfsprogs-6.10.0-r1.ebuild
+++ b/sys-fs/xfsprogs/xfsprogs-6.10.0-r2.ebuild
@@ -25,6 +25,10 @@ DEPEND="${RDEPEND}"
BDEPEND="nls? ( sys-devel/gettext )"
RDEPEND+=" selinux? ( sec-policy/selinux-xfs )"
+PATCHES=(
+ "${FILESDIR}"/${PN}-6.10.0-c++-void.patch
+)
+
src_prepare() {
default