gentoo auto-resync : 18:04:2024 - 12:04:39

3 files changed, 260 insertions, 0 deletions

diff --git a/sys-fs/xfsprogs/Manifest b/sys-fs/xfsprogs/Manifest
index 8f06c1591cbb..9b2dde6a1393 100644
--- a/sys-fs/xfsprogs/Manifest
+++ b/sys-fs/xfsprogs/Manifest
@@ -3,8 +3,11 @@ AUX 0002-io-Adapt-to-64-bit-time_t.patch 1641 BLAKE2B 51a74717f974b24543e8a9151a
 AUX 0003-build-Request-64-bit-time_t-where-possible.patch 1297 BLAKE2B 2e2a379aef0fc803cfb319919f19c51917e2084fe13ad72f9c62f97cd7561a0262fd192cc7625a0ac52c9bbc4611eb31e61984edfb1b52788fa2346f236eb56b SHA512 022267f15c044d595b6a52e91e0802b98ae2f3b4b8b921b64fc79dadec498473f3053ba19c6fb44766fe4ff8bdd85df577c77030523524c8079ed47e4d06bd51
 AUX xfsprogs-5.18.0-docdir.patch 278 BLAKE2B 5277fff17f26b4da946535a430878bfe1e91f92f41c44f2eaaac80703d58176f8d15e14f0586fcf23f29ce207f193303dc662ae5cca6877d6eca9f5ae698620f SHA512 0a94f24b292bece9786bceb99100c25b6d697b9ecf1566bb52b8266683e3adaee415bf7d79c81eed7f2adf846f982f3d91122c9a6dcbb7e16231983037fe9cae
 AUX xfsprogs-5.3.0-libdir.patch 1137 BLAKE2B 7e455b8b82c553a819155fb4c1fee3d5c31bef0fa4c7ab0bf4ad4558a9a5b0b2f408138558c3601deb3ba85d465ab2dae5248bc20a4ba83f08cf733b27a796a1 SHA512 eaec31b6dab500c2e9c4fe7d5d82e60a40f3073cff99af0ae2aa817f6e4541f6a3de0a48f9151a274c6dd97e99ca26192b95b920aea1c5227d75232b808c98fa
+AUX xfsprogs-6.7.0-fix-porting-to-6.7.patch 6103 BLAKE2B 4dae3812b6c40892ed7a8605cd46f117997c4dcf0d02c2402670c5294a2e5d6a0cac11743d90b0578d7544906d1d25da7ca6da6baf2cae76a995b8acad734cd1 SHA512 36b576afe505173f71b4848c064e6b9a4031ec831df32cf3b9726544941408a03a8f64cdd3aedfb9a264213705850e72258cef6ab542c4278c087f338d8d5905
 DIST xfsprogs-6.4.0.tar.xz 1344720 BLAKE2B 566a80a1fa90520c6cc2b20c8e8cde41eb83a48f0b6d4a978f9e5d43960e99b54cab3e0c2cd4147a3d8f4944e50876063fc571441c8239d6deaaa01604843a6b SHA512 831e7747640bc2964b182226d8bb6f637610b123aeec9b3cb97a5de5d5b65bde30c6b40ad2e78de6a5214e823dd75de3a2bdfddd8ab1638f5c7340a760c91b3f
 DIST xfsprogs-6.6.0.tar.xz 1351792 BLAKE2B a479126ed19389c057af28ac3564893826a6d27859984cfadb28b17663759d8f19b1796031d43f294bf8001f5ddda8854b6b0d90d0229092bd31fbdf6e5d1554 SHA512 89b4436a958075ac77cc2b5b5f0618164d47f7d6fbc2271a7927c886fba7bf67284e1825c1ecc259969235222b4d084a40c354edb6d83c21029d737108aa38da
+DIST xfsprogs-6.7.0.tar.xz 1349748 BLAKE2B e16db682cafbd35266e9130a64943c19304174ebd501e30aa32fb8f0d1904286ccdef62c0820480541c7272575d770eea7e73e7dc83c0b452eb5fb2a3a7085ca SHA512 4f543e4c5c4e88e4f9ce16b82ca1151330f687469368fe7470b68e8bb21d1d3c7280eb2e691d3bdf24ae3d4fa2ee5764dc34637198bca0d4ffa65eea2f10ac74
 EBUILD xfsprogs-6.4.0.ebuild 2442 BLAKE2B e3c81310b54fffc95322f9e0ff1c6cc74a29ee08d31f98bd183405cfef572830829049bcdf393cd59c337415196e6f69cbc065c1b0d09ccfe2dde487fd281b7c SHA512 b69bd26d92c5c0d6988778867485c40b21dcfe7d1a7f6e357620933a31a68e2b3035ceca27ceff5fba8f8317d73b7c09f201f6cf61ad0801289878c5383f0add
 EBUILD xfsprogs-6.6.0.ebuild 2632 BLAKE2B b71bec7b14c345cda6fe0fce490a524d3e5ebb4f2906aa61a777d3c14852369df0ac4edd752753b75001c912e8d5b51a2d136effe318b7d1c6309810d2cb8888 SHA512 90ed981a0161cd1398b287e4572a82120b46204b3070b30f03a5130b646fe128876a059ddd12b52bac60dcf71d5e1e8517716c6e86da260e46cf978c418367b8
+EBUILD xfsprogs-6.7.0.ebuild 2489 BLAKE2B b4402c8334294d17c55ba32c7bcce269a0d88d804acf55d31ad6e1553ae872efbc6d86581a8a90bceff38ef9ab80066ed444d8115d71d84d1811145eea1e6c0b SHA512 90128b5a9599346043be72ee87e8f5caac4094e7ab2c4bf2f37154dfa84ec3127bfe2ef84f955b77ef070bda0c201ceb9c91bea99e7feecf874aec5a37219f95
 MISC metadata.xml 339 BLAKE2B b7d67fc8bcf854e7a2453c23e5d5d8c193525ccd16a643e80415a103d2d22c892458ea6ada32653d04b3d471c780f07b2b0537a317d9e64468130e065c6f5ab1 SHA512 445b4f6d853a272cc6bf8fde42745adf226512fa310f9af4bbabad4cfa5a6888b2c2215dfc0896c07b800820b69417c6d408bb21ed17a5224b5c9e3412c5f62d
diff --git a/sys-fs/xfsprogs/files/xfsprogs-6.7.0-fix-porting-to-6.7.patch b/sys-fs/xfsprogs/files/xfsprogs-6.7.0-fix-porting-to-6.7.patch
new file mode 100644
index 000000000000..fcc30d170a8c
--- /dev/null
+++ b/sys-fs/xfsprogs/files/xfsprogs-6.7.0-fix-porting-to-6.7.patch
@@ -0,0 +1,157 @@
+https://lore.kernel.org/linux-xfs/171142126323.2211955.1239989461209318080.stgit@frogsfrogsfrogs/
+
+From mboxrd@z Thu Jan  1 00:00:00 1970
+Received: from smtp.kernel.org (aws-us-west-2-korg-mail-1.web.codeaurora.org [10.30.226.201])
+	(using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits))
+	(No client certificate requested)
+	by smtp.subspace.kernel.org (Postfix) with ESMTPS id 80EBA128387
+	for <linux-xfs@vger.kernel.org>; Tue, 26 Mar 2024 02:59:42 +0000 (UTC)
+Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=10.30.226.201
+ARC-Seal:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116;
+	t=1711421982; cv=none; b=BWaXePO42YIrz9dUA7DXc3SL5MWIoC+liDfJkd/1AM/cv7gR6JRGHa5e5W3sXZFsI6S6pH/fKSEijUigTR0kiRGPFWbeCiDWEGQdq6y4AChFbZMTfQSg4Jei7pONholMK08CyBQ/K4UutICyqbos2cdxAGKKjNPTIOtdQdkiHdc=
+ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org;
+	s=arc-20240116; t=1711421982; c=relaxed/simple;
+	bh=qfMP8tvVLZAoDkRmqI3ZwhMEx6csbe2+Xclngz+n+GI=;
+	h=Date:Subject:From:To:Cc:Message-ID:In-Reply-To:References:
+	 MIME-Version:Content-Type; b=O5h4CVWF9TsE/Yho55MGUjmR7zhvoPO0EhXK59BWm/HSUFB3D7vD+ozThDlpENzz0iLrKzdR6aPYBS78cRpOzAszO4ZnMf0HPbFlLmlsIHK/ha5XFPO2qrmLgOGUkKKZepgXIROIA9knDYpxuvlWHnOptPf9birJvyR0gztAEyw=
+ARC-Authentication-Results:i=1; smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=kernel.org header.i=@kernel.org header.b=dkgsPgmY; arc=none smtp.client-ip=10.30.226.201
+Authentication-Results: smtp.subspace.kernel.org;
+	dkim=pass (2048-bit key) header.d=kernel.org header.i=@kernel.org header.b="dkgsPgmY"
+Received: by smtp.kernel.org (Postfix) with ESMTPSA id 0A482C433C7;
+	Tue, 26 Mar 2024 02:59:42 +0000 (UTC)
+DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org;
+	s=k20201202; t=1711421982;
+	bh=qfMP8tvVLZAoDkRmqI3ZwhMEx6csbe2+Xclngz+n+GI=;
+	h=Date:Subject:From:To:Cc:In-Reply-To:References:From;
+	b=dkgsPgmYjqxxC1yEflpaDSaicJ6J1MpL6wH2GNkbwb7jHMXma/nM8+TuJ7ITuHQGY
+	 WXTMKAQFvTq29s+IWJaQZtuCfgH6cDQ3JTkRcjvg/OgSTo0X+aqxadBBnAjO4AP5/P
+	 hX4gszw3hlZ8oDjMvW9Wl6nLyDmR82rshZOTF4hZfQ8mkbU3Vzcsg2QiPQQzzKgfon
+	 3c/GxXIQ7V2jg37MBrPpNRYPvqBXWn1X/EkR0wuFiUtw9fTJ6Wyt0Vr6/vemAf2U+S
+	 gwHkISopsTOE3k8cCYYf7LXqmtU3PLOOqWBDol6TkWe6OgIOMSljoytIkFq1up/zhz
+	 LHrtnfD5yRlLg==
+Date: Mon, 25 Mar 2024 19:59:41 -0700
+Subject: [PATCH 01/13] libxfs: fix incorrect porting to 6.7
+From: "Darrick J. Wong" <djwong@kernel.org>
+To: cem@kernel.org, djwong@kernel.org
+Cc: Christoph Hellwig <hch@lst.de>, Bill O'Donnell <bodonnel@redhat.com>,
+ linux-xfs@vger.kernel.org
+Message-ID: <171142126323.2211955.1239989461209318080.stgit@frogsfrogsfrogs>
+In-Reply-To: <171142126291.2211955.14829143192552278353.stgit@frogsfrogsfrogs>
+References: <171142126291.2211955.14829143192552278353.stgit@frogsfrogsfrogs>
+User-Agent: StGit/0.19
+Precedence: bulk
+X-Mailing-List: linux-xfs@vger.kernel.org
+List-Id: <linux-xfs.vger.kernel.org>
+List-Subscribe: <mailto:linux-xfs+subscribe@vger.kernel.org>
+List-Unsubscribe: <mailto:linux-xfs+unsubscribe@vger.kernel.org>
+MIME-Version: 1.0
+Content-Type: text/plain; charset="utf-8"
+Content-Transfer-Encoding: 7bit
+
+From: Darrick J. Wong <djwong@kernel.org>
+
+Userspace libxfs is supposed to match the kernel libxfs except for the
+preprocessor include directives.  Fix a few discrepancies that came up
+for whatever reason.
+
+To fix the build errors resulting from CONFIG_XFS_RT not being defined,
+add it to libxfs.h and alter the Makefile to track xfs_rtbitmap.h.
+
+Signed-off-by: Darrick J. Wong <djwong@kernel.org>
+Reviewed-by: Christoph Hellwig <hch@lst.de>
+Reviewed-by: Bill O'Donnell <bodonnel@redhat.com>
+---
+ db/check.c            |    1 -
+ include/libxfs.h      |    4 ++++
+ libxfs/Makefile       |    1 +
+ libxfs/xfs_rtbitmap.c |    2 +-
+ libxfs/xfs_rtbitmap.h |    3 ---
+ repair/rt.c           |    1 -
+ 6 files changed, 6 insertions(+), 6 deletions(-)
+
+
+diff --git a/db/check.c b/db/check.c
+index 9d5576c333b2..a47a5d9cb5b4 100644
+--- a/db/check.c
++++ b/db/check.c
+@@ -20,7 +20,6 @@
+ #include "init.h"
+ #include "malloc.h"
+ #include "dir2.h"
+-#include "xfs_rtbitmap.h"
+ 
+ typedef enum {
+ 	IS_USER_QUOTA, IS_PROJECT_QUOTA, IS_GROUP_QUOTA,
+diff --git a/include/libxfs.h b/include/libxfs.h
+index 9cec394ca407..aeec2bc76126 100644
+--- a/include/libxfs.h
++++ b/include/libxfs.h
+@@ -7,6 +7,9 @@
+ #ifndef __LIBXFS_H__
+ #define __LIBXFS_H__
+ 
++/* For userspace XFS_RT is always defined */
++#define CONFIG_XFS_RT
++
+ #include "libxfs_api_defs.h"
+ #include "platform_defs.h"
+ #include "xfs.h"
+@@ -80,6 +83,7 @@ struct iomap;
+ #include "xfs_refcount_btree.h"
+ #include "xfs_refcount.h"
+ #include "xfs_btree_staging.h"
++#include "xfs_rtbitmap.h"
+ 
+ #ifndef ARRAY_SIZE
+ #define ARRAY_SIZE(x) (sizeof(x) / sizeof((x)[0]))
+diff --git a/libxfs/Makefile b/libxfs/Makefile
+index 010ee68e2292..6f688c0ad25a 100644
+--- a/libxfs/Makefile
++++ b/libxfs/Makefile
+@@ -50,6 +50,7 @@ HFILES = \
+ 	xfs_refcount_btree.h \
+ 	xfs_rmap.h \
+ 	xfs_rmap_btree.h \
++	xfs_rtbitmap.h \
+ 	xfs_sb.h \
+ 	xfs_shared.h \
+ 	xfs_trans_resv.h \
+diff --git a/libxfs/xfs_rtbitmap.c b/libxfs/xfs_rtbitmap.c
+index 8f313339e97f..fb083499070c 100644
+--- a/libxfs/xfs_rtbitmap.c
++++ b/libxfs/xfs_rtbitmap.c
+@@ -931,7 +931,7 @@ xfs_rtcheck_alloc_range(
+  */
+ int
+ xfs_rtfree_extent(
+-	xfs_trans_t		*tp,	/* transaction pointer */
++	struct xfs_trans	*tp,	/* transaction pointer */
+ 	xfs_rtxnum_t		start,	/* starting rtext number to free */
+ 	xfs_rtxlen_t		len)	/* length of extent freed */
+ {
+diff --git a/libxfs/xfs_rtbitmap.h b/libxfs/xfs_rtbitmap.h
+index db2f8c924b05..c0637057d69c 100644
+--- a/libxfs/xfs_rtbitmap.h
++++ b/libxfs/xfs_rtbitmap.h
+@@ -6,9 +6,6 @@
+ #ifndef __XFS_RTBITMAP_H__
+ #define	__XFS_RTBITMAP_H__
+ 
+-/* For userspace XFS_RT is always defined */
+-#define CONFIG_XFS_RT
+-
+ struct xfs_rtalloc_args {
+ 	struct xfs_mount	*mp;
+ 	struct xfs_trans	*tp;
+diff --git a/repair/rt.c b/repair/rt.c
+index abe58b569c0c..9f3bc8d53ec6 100644
+--- a/repair/rt.c
++++ b/repair/rt.c
+@@ -13,7 +13,6 @@
+ #include "protos.h"
+ #include "err_protos.h"
+ #include "rt.h"
+-#include "xfs_rtbitmap.h"
+ 
+ #define xfs_highbit64 libxfs_highbit64	/* for XFS_RTBLOCKLOG macro */
+ 
diff --git a/sys-fs/xfsprogs/xfsprogs-6.7.0.ebuild b/sys-fs/xfsprogs/xfsprogs-6.7.0.ebuild
new file mode 100644
index 000000000000..c412012a15f3
--- /dev/null
+++ b/sys-fs/xfsprogs/xfsprogs-6.7.0.ebuild
@@ -0,0 +1,100 @@
+# Copyright 1999-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit flag-o-matic systemd udev usr-ldscript toolchain-funcs
+
+DESCRIPTION="XFS filesystem utilities"
+HOMEPAGE="https://xfs.wiki.kernel.org/ https://git.kernel.org/pub/scm/fs/xfs/xfsprogs-dev.git/"
+SRC_URI="https://www.kernel.org/pub/linux/utils/fs/xfs/${PN}/${P}.tar.xz"
+
+LICENSE="LGPL-2.1"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86"
+IUSE="icu libedit nls selinux"
+
+RDEPEND="
+	dev-libs/inih
+	dev-libs/userspace-rcu:=
+	>=sys-apps/util-linux-2.17.2
+	icu? ( dev-libs/icu:= )
+	libedit? ( dev-libs/libedit )
+"
+DEPEND="${RDEPEND}"
+BDEPEND="nls? ( sys-devel/gettext )"
+RDEPEND+=" selinux? ( sec-policy/selinux-xfs )"
+
+PATCHES=(
+	"${FILESDIR}"/${PN}-5.3.0-libdir.patch
+	"${FILESDIR}"/${PN}-6.7.0-fix-porting-to-6.7.patch
+)
+
+src_prepare() {
+	default
+
+	# Fix doc dir
+	sed -i \
+		-e "/^PKG_DOC_DIR/s:@pkg_name@:${PF}:" \
+		include/builddefs.in || die
+
+	# Don't install compressed docs
+	sed 's@\(CHANGES\)\.gz[[:space:]]@\1 @' -i doc/Makefile || die
+}
+
+src_configure() {
+	# include/builddefs.in will add FCFLAGS to CFLAGS which will
+	# unnecessarily clutter CFLAGS (and fortran isn't used)
+	unset FCFLAGS
+
+	# If set in user env, this breaks configure
+	unset PLATFORM
+
+	export DEBUG=-DNDEBUG
+
+	# Package is honoring CFLAGS; No need to use OPTIMIZER anymore.
+	# However, we have to provide an empty value to avoid default
+	# flags.
+	export OPTIMIZER=" "
+
+	# Avoid automagic on libdevmapper (bug #709694)
+	export ac_cv_search_dm_task_create=no
+
+	# bug 903611
+	use elibc_musl && append-flags -D_LARGEFILE64_SOURCE
+
+	# Build fails with -O3 (bug #712698)
+	replace-flags -O3 -O2
+
+	# Upstream does NOT support --disable-static anymore,
+	# https://www.spinics.net/lists/linux-xfs/msg30185.html
+	# https://www.spinics.net/lists/linux-xfs/msg30272.html
+	local myconf=(
+		--enable-static
+		--with-crond-dir="${EPREFIX}/etc/cron.d"
+		--with-systemd-unit-dir="$(systemd_get_systemunitdir)"
+		--with-udev-rule-dir="$(get_udevdir)"
+		$(use_enable icu libicu)
+		$(use_enable nls gettext)
+		$(use_enable libedit editline)
+	)
+
+	if tc-is-lto ; then
+		myconf+=( --enable-lto )
+	else
+		myconf+=( --disable-lto )
+	fi
+
+	econf "${myconf[@]}"
+}
+
+src_compile() {
+	emake V=1
+}
+
+src_install() {
+	emake DIST_ROOT="${ED}" HAVE_ZIPPED_MANPAGES=false install
+	emake DIST_ROOT="${ED}" HAVE_ZIPPED_MANPAGES=false install-dev
+
+	gen_usr_ldscript -a handle
+}