sys-fs/lvm2: Sync with Gentoo

It's from Gentoo commit 7d11c421c6aa1e8020afa4596d915c6c600dc704.

Signed-off-by: Flatcar Buildbot <buildbot@flatcar-linux.org>

sdk_container/src/third_party/portage-stable/sys-fs/lvm2/Manifest

@@ -1,3 +1,4 @@
 DIST LVM2.2.03.22.tgz 2755031 BLAKE2B 79bbea84bd82f111c1bb5de336e6a9f1368b2c9e43f075dccaa90c7746a364259ad278adf650379eca75f2803ed74e74dd372be2cca8518462182657f96a0033 SHA512 17cd24ceee8026481566824b688dafd03ec816201d5cb3549cb7fc8a36f4cdaa982faaef4dcd26debfe775dea5ffa2744798164314ea6dc99a84f8ccccfc33ff
 DIST LVM2.2.03.37.tgz 2983951 BLAKE2B 4762ebe827b886c0e72a91c545c8c4fa9c9d1629e987f13d0c52ee41b80444c3c5c8a81a90566ed9bd7b68d67684749a7ad2cc066b20a3fa44eb8466ae0cc82e SHA512 c67e9e47c9f117d82b458e43c98e7b2bbf0f176fc86b7fa1a90d04209df14df442f576fd9b1e41be86b161aa744f0db5b6cac9d7b118bc4156354307314c441a
 DIST LVM2.2.03.38.tgz 2985871 BLAKE2B 2cdec7e7256855ec1d40f690e3b3b2d0538cef275c68bfaa15235b10890f05c4d9e861607fc611e420619e9e07a0dd431b1a0d9258c8ccf4af7a5b772281f33e SHA512 97fd1849cd632943c8233f06f181b1899b0e6937444d672abef10307c66d207c16325701ac669d5ff438490a11596c19d1dbbcff50e4e7c00c9b6e4eb1ecf87c
+DIST LVM2.2.03.39.tgz 2877966 BLAKE2B 24dc0f3a07dbd07a808343bb35078b6fe9e0372052c5d58c1d18b525ed23621434accce891d0a9390f9b5bd790c2d67dd22280746aada409e02c7cef9d9fae1f SHA512 7d00f676af77f4921b10182b0c87420e196c1ec7ec6faad46fc475566b921c62b838ca29b06cddc907e6a4a1033f6ae5020abe64566fa11872eb836af6869988

sdk_container/src/third_party/portage-stable/sys-fs/lvm2/lvm2-2.03.37.ebuild

@@ -13,14 +13,16 @@ S="${WORKDIR}/${PN^^}.${PV}"
 
 LICENSE="GPL-2 LGPL-2.1"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86"
-IUSE="lvm nvme readline sanlock selinux static static-libs systemd thin +udev valgrind"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 ~sparc x86"
+IUSE="lvm nvme readline sanlock selinux static static-libs systemd test thin +udev valgrind"
 REQUIRED_USE="
 	static? ( !systemd !udev !nvme )
 	static-libs? ( static !udev )
 	systemd? ( udev )
+	test? ( lvm )
 	thin? ( lvm )
 "
+RESTRICT="!test? ( test )"
 
 # Doesn't strictly need >=sanlock-4.0.0 but autodetects features, so pick
 # the best we have for predictability. Ditto systemd.
@@ -33,6 +35,7 @@ DEPEND_COMMON="
 		sanlock? ( >=sys-cluster/sanlock-4.0.0 )
 		systemd? ( >=sys-apps/systemd-234:= )
 	)
+	nvme? ( >=sys-libs/libnvme-1.1 )
 "
 # /run is now required for locking during early boot. /var cannot be assumed to
 # be available -- thus, pull in recent enough baselayout for /run.
@@ -41,7 +44,6 @@ RDEPEND="
 	${DEPEND_COMMON}
 	>=sys-apps/baselayout-2.2
 	lvm? ( virtual/tmpfiles )
-	nvme? ( >=sys-libs/libnvme-1.1 )
 "
 
 PDEPEND="

sdk_container/src/third_party/portage-stable/sys-fs/lvm2/lvm2-2.03.38.ebuild

@@ -35,6 +35,7 @@ DEPEND_COMMON="
 		sanlock? ( >=sys-cluster/sanlock-4.0.0 )
 		systemd? ( >=sys-apps/systemd-234:= )
 	)
+	nvme? ( >=sys-libs/libnvme-1.1 )
 "
 # /run is now required for locking during early boot. /var cannot be assumed to
 # be available -- thus, pull in recent enough baselayout for /run.
@@ -43,7 +44,6 @@ RDEPEND="
 	${DEPEND_COMMON}
 	>=sys-apps/baselayout-2.2
 	lvm? ( virtual/tmpfiles )
-	nvme? ( >=sys-libs/libnvme-1.1 )
 "
 
 PDEPEND="

sdk_container/src/third_party/portage-stable/sys-fs/lvm2/lvm2-2.03.39.ebuild

@@ -0,0 +1,333 @@
+# Copyright 1999-2026 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+TMPFILES_OPTIONAL=1
+inherit autotools linux-info systemd toolchain-funcs tmpfiles udev flag-o-matic
+
+DESCRIPTION="User-land utilities for LVM2 (device-mapper) software"
+HOMEPAGE="https://sourceware.org/lvm2/"
+SRC_URI="https://sourceware.org/ftp/lvm2/${PN^^}.${PV}.tgz"
+S="${WORKDIR}/${PN^^}.${PV}"
+
+LICENSE="GPL-2 LGPL-2.1"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86"
+IUSE="lvm nvme readline sanlock selinux static static-libs systemd test thin +udev valgrind vdo xfs"
+REQUIRED_USE="
+	static? ( !systemd !udev !nvme )
+	static-libs? ( static !udev )
+	systemd? ( udev )
+	test? ( lvm )
+	thin? ( lvm )
+	sanlock? ( lvm )
+	vdo? ( lvm )
+"
+RESTRICT="!test? ( test )"
+
+# Doesn't strictly need >=sanlock-4.0.0 but autodetects features, so pick
+# the best we have for predictability. Ditto systemd.
+DEPEND_COMMON="
+	udev? ( virtual/libudev:= )
+	lvm? (
+		dev-libs/libaio
+		>=sys-apps/util-linux-2.24
+		readline? ( sys-libs/readline:= )
+		sanlock? ( >=sys-cluster/sanlock-4.0.0 )
+		systemd? ( >=sys-apps/systemd-234:= )
+		vdo? ( >=sys-block/vdo-8.3.2.1 )
+	)
+	nvme? ( >=sys-libs/libnvme-1.1 )
+"
+# /run is now required for locking during early boot. /var cannot be assumed to
+# be available -- thus, pull in recent enough baselayout for /run.
+# This version of LVM is incompatible with cryptsetup <1.1.2.
+RDEPEND="
+	${DEPEND_COMMON}
+	>=sys-apps/baselayout-2.2
+	lvm? ( virtual/tmpfiles )
+"
+
+PDEPEND="
+	lvm? (
+		thin? ( >=sys-block/thin-provisioning-tools-1.0.6 )
+	)
+"
+# note: thin-0.3.0 is required to avoid --disable-thin_check_needs_check
+DEPEND="
+	${DEPEND_COMMON}
+	static? (
+		sys-apps/util-linux[static-libs]
+		lvm? (
+			dev-libs/libaio[static-libs]
+			readline? ( sys-libs/readline[static-libs] )
+		)
+		selinux? ( sys-libs/libselinux[static-libs] )
+	)
+	valgrind? ( >=dev-debug/valgrind-3.6 )
+	xfs? ( sys-fs/xfsprogs )
+"
+BDEPEND="
+	dev-build/autoconf-archive
+	virtual/pkgconfig
+"
+
+PATCHES=(
+	# Gentoo specific modification(s):
+	"${FILESDIR}"/${PN}-2.03.20-example.conf.in.patch
+
+	# For upstream -- review and forward:
+	"${FILESDIR}"/${PN}-2.03.37-dmeventd-no-idle-exit.patch
+	"${FILESDIR}"/${PN}-2.03.20-freopen-musl.patch
+	"${FILESDIR}"/${PN}-2.03.22-autoconf-2.72-egrep.patch
+	"${FILESDIR}"/${PN}-2.03.22-thin-autodetect.patch
+)
+
+pkg_setup() {
+	local CONFIG_CHECK="~SYSVIPC"
+
+	if use udev; then
+		local WARNING_SYSVIPC="CONFIG_SYSVIPC:\tis not set (required for udev sync)\n"
+		if linux_config_exists; then
+			local uevent_helper_path=$(linux_chkconfig_string UEVENT_HELPER_PATH)
+			if [[ -n "${uevent_helper_path}" ]] && [[ "${uevent_helper_path}" != '""' ]]; then
+				ewarn "It's recommended to set an empty value to the following kernel config option:"
+				ewarn "CONFIG_UEVENT_HELPER_PATH=${uevent_helper_path}"
+			fi
+		fi
+	fi
+
+	check_extra_config
+
+	# 1. Genkernel no longer copies /sbin/lvm blindly.
+	if use static; then
+		elog "Warning, we no longer overwrite /sbin/lvm and /sbin/dmsetup with"
+		elog "their static versions. If you need the static binaries,"
+		elog "you must append .static to the filename!"
+	fi
+}
+
+src_prepare() {
+	default
+
+	# Users without systemd get no auto-activation of any logical volume
+	if ! use systemd ; then
+		eapply "${FILESDIR}"/${PN}-2.03.20-dm_lvm_rules_no_systemd.patch
+	fi
+
+	eautoreconf
+}
+
+src_configure() {
+	filter-lto
+
+	export ac_cv_header_xfs_xfs_h=$(usex xfs)
+
+	# Most of this package does weird stuff.
+	# The build options are tristate, and --without is NOT supported
+	# options: 'none', 'internal', 'shared'
+	local myeconfargs=(
+		$(use_enable lvm dmfilemapd)
+		$(use_enable lvm dmeventd)
+		$(use_enable lvm cmdlib)
+		$(use_enable lvm fsadm)
+		$(use_enable lvm lvmpolld)
+		# This only causes the .static versions to become available
+		$(usev static --enable-static_link)
+
+		# dmeventd requires mirrors to be internal, and snapshot available
+		# so we cannot disable them
+		--with-mirrors="$(usex lvm internal none)"
+		--with-snapshots="$(usex lvm internal none)"
+		# vdo is internal or none only
+		--with-vdo="$(usex vdo internal none)"
+
+	)
+
+	if use lvm && use thin; then
+		myeconfargs+=(
+			--with-thin=internal
+			--enable-thin_check_needs_check
+			--with-cache=internal
+			--enable-cache_check_needs_check
+		)
+		local texec
+		for texec in check dump repair restore; do
+			myeconfargs+=( --with-thin-${texec}="${EPREFIX}"/usr/sbin/thin_${texec} )
+			myeconfargs+=( --with-cache-${texec}="${EPREFIX}"/usr/sbin/cache_${texec} )
+		done
+	else
+		myeconfargs+=( --with-thin=none --with-cache=none )
+	fi
+
+	myeconfargs+=(
+		# musl doesn't do symbol versioning so can end up with
+		# runtime breakage.
+		--with-symvers=$(usex elibc_glibc 'gnu' 'no')
+		$(use_enable readline)
+		$(use_enable selinux)
+		--enable-pkgconfig
+		--with-confdir="${EPREFIX}"/etc
+		--exec-prefix="${EPREFIX}"
+		--sbindir="${EPREFIX}/sbin"
+		--with-staticdir="${EPREFIX}"/sbin
+		--libdir="${EPREFIX}/$(get_libdir)"
+		--with-usrlibdir="${EPREFIX}/usr/$(get_libdir)"
+		--with-default-dm-run-dir=/run
+		--with-default-run-dir=/run/lvm
+		--with-default-locking-dir=/run/lock/lvm
+		--with-default-pid-dir=/run
+		$(use_enable udev udev_rules)
+		$(use_enable udev udev_sync)
+		$(use_with udev udevdir "${EPREFIX}$(get_udevdir)"/rules.d)
+		# USE=sanlock requires USE=lvm
+		$(use_enable $(usex lvm sanlock lvm) lvmlockd-sanlock)
+		$(use_with systemd)
+		$(use_enable systemd sd-notify)
+		$(use_enable systemd systemd-journal)
+		$(use_enable systemd notify-dbus)
+		$(use_enable systemd app-machineid)
+		$(use_enable systemd systemd-journal)
+		$(use_with systemd systemd-run "/usr/bin/systemd-run")
+		$(use_enable valgrind valgrind-pool)
+		$(use_with nvme libnvme)
+		$(use_enable nvme nvme-wwid)
+		--with-systemdsystemunitdir="$(systemd_get_systemunitdir)"
+		CLDFLAGS="${LDFLAGS}"
+	)
+
+	econf "${myeconfargs[@]}"
+}
+
+src_compile() {
+	emake V=1 -C include
+
+	if use lvm ; then
+		emake V=1
+		emake V=1 CC="$(tc-getCC)" -C scripts
+	else
+		emake V=1 device-mapper
+		# https://bugs.gentoo.org/878131
+		emake V=1 -C libdm/dm-tools device-mapper
+	fi
+}
+
+src_test() {
+	einfo "Tests other than unit tests are disabled because of device-node"
+	einfo "mucking, run tests, compile the package and see ${S}/tests"
+
+	# run only unit tests
+	emake V=1 -C "${S}"/test -j1 run-unit-test
+}
+
+src_install() {
+	local targets=()
+	if use lvm; then
+		targets+=( install install_tmpfiles_configuration )
+		if use systemd; then
+			# install systemd related files only when requested, bug #522430
+			targets+=( install_systemd_units )
+		fi
+	else
+		targets+=( install_device-mapper )
+	fi
+
+	# -j1 for bug #918125
+	emake -j1 V=1 DESTDIR="${D}" "${targets[@]}"
+
+	newinitd "${FILESDIR}"/device-mapper.rc-r3 device-mapper
+	newconfd "${FILESDIR}"/device-mapper.conf-r4 device-mapper
+
+	if use lvm ; then
+		newinitd "${FILESDIR}"/dmeventd.initd-r3 dmeventd
+		newinitd "${FILESDIR}"/lvm.rc-r1 lvm
+		newconfd "${FILESDIR}"/lvm.confd-r4 lvm
+		if ! use udev ; then
+			# We keep the variable but remove udev from it.
+			sed -r -i \
+				-e '/^rc_need=/s/\<udev\>//g' \
+				"${ED}"/etc/conf.d/lvm || die "Could not drop udev from rc_need"
+		fi
+
+		newinitd "${FILESDIR}"/lvm-monitoring.initd-r3 lvm-monitoring
+		newinitd "${FILESDIR}"/lvmpolld.initd-r1 lvmpolld
+
+		if use sanlock; then
+			newinitd "${FILESDIR}"/lvmlockd.initd-r2 lvmlockd
+		fi
+	fi
+
+	if use static-libs; then
+		dolib.a libdm/ioctl/libdevmapper.a
+		if use lvm; then
+			# depends on lvmetad
+			dolib.a libdaemon/client/libdaemonclient.a #462908
+			# depends on dmeventd
+			dolib.a daemons/dmeventd/libdevmapper-event.a
+		fi
+	else
+		rm -f "${ED}"/usr/$(get_libdir)/{libdevmapper-event,liblvm2cmd,liblvm2app,libdevmapper}.a || die
+	fi
+
+	insinto /etc
+	doins "${FILESDIR}"/dmtab
+
+	dodoc README VERSION* WHATS_NEW WHATS_NEW_DM doc/*.{c,txt} conf/*.conf
+}
+
+pkg_preinst() {
+	HAD_LVM=0
+
+	if has_version 'sys-fs/lvm2[lvm(+)]' ; then
+		HAD_LVM=1
+	fi
+}
+
+pkg_postinst() {
+	use lvm && tmpfiles_process lvm2.conf
+	use udev && udev_reload
+
+	# This is a new installation
+	if [[ -z "${REPLACING_VERSIONS}" ]]; then
+		if use lvm ; then
+			ewarn "Make sure the \"lvm\" init script is in the runlevels:"
+			ewarn "# rc-update add lvm boot"
+			ewarn
+			ewarn "Make sure to enable lvmetad in ${EROOT}/etc/lvm/lvm.conf if you want"
+			ewarn "to enable lvm autoactivation and metadata caching."
+		else
+			ewarn "Please enable USE=lvm if you need the LVM daemon and"
+			ewarn "tools like 'lvchange', 'vgchange', etc!"
+		fi
+	else
+		if ! use lvm && [[ ${HAD_LVM} -eq 1 ]] ; then
+			ewarn "LVM was previously enabled but is now disabled."
+			ewarn "Please enable USE=lvm if you need the LVM daemon and"
+			ewarn "tools like 'lvchange', 'vgchange', etc!"
+			ewarn "See the 2022-11-19-lvm2-default-USE-flags news item for more details."
+		fi
+	fi
+
+	if use udev && [[ -d /run ]] ; then
+		local permission_run_expected="drwxr-xr-x"
+		local permission_run=$(stat -c "%A" /run)
+		if [[ "${permission_run}" != "${permission_run_expected}" ]] ; then
+			ewarn "Found the following problematic permissions:"
+			ewarn ""
+			ewarn "    ${permission_run} /run"
+			ewarn ""
+			ewarn "Expected:"
+			ewarn ""
+			ewarn "    ${permission_run_expected} /run"
+			ewarn ""
+			ewarn "This is known to cause problems for udev-enabled LVM services."
+		fi
+	fi
+}
+
+pkg_postrm() {
+	if use udev && [[ -z ${REPLACED_BY_VERSION} ]]; then
+		udev_reload
+	fi
+}

sdk_container/src/third_party/portage-stable/sys-fs/lvm2/metadata.xml

@@ -17,6 +17,7 @@
 			Build and install NVMe plugin for determining the World-Wide Identification
 			(WWID) of an NVME device via <pkg>sys-libs/libnvme</pkg>.
 		</flag>
+		<flag name="vdo">Support for Virtual Disk Optimizer (VDO)</flag>
 		<flag name="xfs">
 			Support XFS for 'lvextend --resizefs'.
 		</flag>