From: "Sam James" <sam@gentoo.org>
To: gentoo-commits@lists.gentoo.org
Subject: [gentoo-commits] repo/gentoo:master commit in: sys-fs/xfsprogs/, sys-fs/xfsprogs/files/
Date: Tue, 27 Aug 2024 23:44:11 +0000 (UTC) [thread overview]
Message-ID: <1724802227.56527dba237030fc69ac2bb4c6725a5ac58a7e16.sam@gentoo> (raw)
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
next reply other threads:[~2024-08-27 23:44 UTC|newest]
Thread overview: 17+ messages / expand[flat|nested] mbox.gz Atom feed top
2024-08-27 23:44 Sam James [this message]
-- strict thread matches above, loose matches on Subject: below --
2025-02-20 1:15 [gentoo-commits] repo/gentoo:master commit in: sys-fs/xfsprogs/, sys-fs/xfsprogs/files/ Sam James
2024-09-02 2:50 Sam James
2024-04-17 23:04 Sam James
2024-02-05 23:28 Sam James
2023-06-26 9:12 David Seifert
2022-06-04 21:13 Sam James
2019-11-18 19:12 Thomas Deutschmann
2018-12-30 9:19 Andreas K. Hüttel
2018-05-14 8:23 Lars Wendler
2017-07-21 7:35 Lars Wendler
2017-01-12 20:33 Justin Lecher
2017-01-08 20:22 Lars Wendler
2017-01-08 20:22 Lars Wendler
2016-08-09 15:15 Mike Frysinger
2016-06-03 19:22 Mike Frysinger
2015-11-23 21:24 Lars Wendler
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=1724802227.56527dba237030fc69ac2bb4c6725a5ac58a7e16.sam@gentoo \
--to=sam@gentoo.org \
--cc=gentoo-commits@lists.gentoo.org \
--cc=gentoo-dev@lists.gentoo.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox