gentoo resync : 08.06.2019

3 files changed, 344 insertions, 0 deletions

diff --git a/sys-fs/lvm2/Manifest b/sys-fs/lvm2/Manifest
index 3b11a5d3232f..a0e72a452680 100644
--- a/sys-fs/lvm2/Manifest
+++ b/sys-fs/lvm2/Manifest
@@ -26,6 +26,7 @@ AUX lvm2-2.02.178-asneeded.patch 452 BLAKE2B 6d7013e7a0e1aae933e22b2c30b85cf744f
 AUX lvm2-2.02.178-dynamic-static-ldflags.patch 2279 BLAKE2B 526104c96dbef36568a11898193c5d0a7d69a63df2011e1f1a778a4317248a683470e331ddbf8b07fe8654abca5a96e9a53d0b13715c860f8c1e8b33b8e95384 SHA512 83f253ca629e90380164edc74f3900f6e40fcd0002d357dbcaecf4a75c2a2213c55cce1291a27afd2e07c72838e46fe7438217f8a103c20233ffa2621cf02cb1
 AUX lvm2-2.02.178-example.conf.in.patch 1650 BLAKE2B f5e04bb7524cffb5ee3f6f819541eba0681e8a32f884be4c78537a38848fdbe03d3028b90568e03810df86012cfb497c9050fb949c6c8b1d4460174a6794205b SHA512 fe30018b3f0ebd6f99e63a5d8b423365b8f2c5d5b17b19810ca1bea52f49a5c07e059cfcb1851be752024ba5acad6fbb736f20264b83bdf385f845c3b68d5b5b
 AUX lvm2-2.02.178-static-pkgconfig-libs.patch 3495 BLAKE2B 85869e4f46b001c4a8d43692ae7e3d73731deb9bc6094b4cdb3059058dfb819ecf507f5c5a5b47d4be4db18e6d0765c652f5b0e18ea17ecb55112fc70f7033bd SHA512 9a8b3d2296e4966d7209bdef3cd4c40f65a81ab5c2220d6b8ea06fd35ebad272a09a39b7f4e352eff32ad82babfbbec6c4f108d200193b3f84b225f739e0afc6
+AUX lvm2-2.02.184-allow-reading-metadata-with-invalid-creation_time.patch 2748 BLAKE2B 40b64eb5937ba162b6084f1cf8cdd977146593573127eea6635d389777d5620db1daa7133299445b56b7dba0444b5958d1107f097ec94e5d17014fbb17419d8e SHA512 632080b067a68f65b20d3e96f36616a494d1aabbbc1465a83058574bb0ec49b72f9413e60175d599137a85674f6bb3a9c0e89296101314fe0e127a843b5578c0
 AUX lvm2-2.02.184-dmeventd-no-idle-exit.patch 2468 BLAKE2B e59873c7da99a8e62f71c78b1e93d54c342258949719fabdf2b08b0fcbf00ddcd3c8eb2a937416c646a948dda91474d2ad2187fcb880152986c7f6936bbee1ee SHA512 02a82cde3affd8e84b9800ad06c0c2ec9562f9412157e4f9ba96ef502a22d7870ece3d867684cf90c32ebc77bad8ae3beef5a3fe606ef7c30ad1b2b73e81de1a
 AUX lvm2-2.02.56-lvm2create_initrd.patch 2032 BLAKE2B 5533ceb7a601d58995e7a90b1355508907edb30d14704b397a8c8ba0d66dbcd3d6b02ace1cadef1dfbb1d927449403f76f0f38e5d034344b3232deb512507cb6 SHA512 b2a1705fa6b962027ebc5047583547489afe8ef8d8977c6284a28d0a8b0e05e20e6c48bd6c02a8bb02de9cfb40ac2d6e2a4b8ed8ef8c4ae7b6ea9a29bc4194de
 AUX lvm2-2.02.63-always-make-static-libdm.patch 1420 BLAKE2B baf7010b5965f5c2b9a32ec812cb259cb3ceccea0d56e48d75e9f8e872634913f160fcfff0c2c77854ddfeaafb3b48bbca16d569041ab6f45aecb950f8e5bf4a SHA512 67735af9e51369d5b3b400cab4f9ffa25f8dea1c1ec3d01855cb3c5aeade5c39a35eeed43f3a665204fe6bbba4ca43baecd845330bf26d023064b94ca3d1317c
@@ -47,5 +48,6 @@ EBUILD lvm2-2.02.183.ebuild 8761 BLAKE2B cdc1958b9af3fae4f19813a18316ce6166a17f1
 EBUILD lvm2-2.02.184-r1.ebuild 8955 BLAKE2B caa7021e7703bf50529b42425a36c1662943504dff7fe8d857996f226a02119db2f6bad377a80f1fb7fb808f82962fadbd52a5b561f571c5592ceb4524efa825 SHA512 4b337fac136367fe009993e65b84f66e26c3fc6c5517ef6415734843b793ece2dd8411c639771e11a680a092965dc30b589fb26350b490fff28b190559b7e836
 EBUILD lvm2-2.02.184-r2.ebuild 9014 BLAKE2B e016e38f56610bff72529ea22e7ad9de1c71cef034c028efe0d8641255d802c504c756899a1c319050cf780656f87e509fb50614adca39c3e14468d3ce503e55 SHA512 15567897f0448bb34980833b107b2e93d416b67df33c57d77269fa52b8fc0d2d6ffbeb19f7c9dccaa2845857dc8a9778d733f22792112fca74720df3f42e5f03
 EBUILD lvm2-2.02.184-r3.ebuild 9217 BLAKE2B 214b1fd2f96fb14910dcc9ef709f20127433a18d6b0e109ba35b5ae6f3474787d6d0b95dd59fe25ab63459c576678aadbaddcabe1fb022b86ed27d4cecba2451 SHA512 76fb52a849217d733a98eed8ab3e71071b5bb237c2886e3929fda2492973bc9f20999bbf830269a67a0db12d9eb9b996d723cb1af2104ec22b43032bf4b2de3f
+EBUILD lvm2-2.02.184-r4.ebuild 9304 BLAKE2B 08f16e3da527fca5a3269bd2be03b54709a1b84554e4f3044d214677051adbb7490411d150b84aa312c68633caae31147ed283e1bba61ee155db8c5d51c84e40 SHA512 4178d38a7e852107ee43206c9a39a9cde4465a0e1cd91a96f541cac32d3053e85446f95750cb2e3f812635e5f9cc95e7ab2cc9c820234950f4bf2d13b9f58b7f
 EBUILD lvm2-2.02.184.ebuild 8769 BLAKE2B 8ff55443aee773e87a78842021820822e8ba2283b61b510dee16423b1e3eb6f48a7ca0badd7776a266c14a8e3a458da889bd548685cc9adcc72a31bbbc25ddd1 SHA512 8fb5b8587580b59869b784434662d771e78378158233633c650e0a445f7c808fa06ab37f744182a25c1fd293f6e9fcf24653a160f59f56b6696249c22d8f2ea0
 MISC metadata.xml 1146 BLAKE2B 7a4bbf38d2e752523c2909c240a2c90ada04aee8efe96c62c5989887f4997e00a4ed7312dd9803d8ddcae02e8bbc3ba8f0fa9e5da0f484bc9768e0ed99ab8be3 SHA512 24240ba35d93d9f9171f2b164d949846a5ea2126eceed4b4454dd0b4efb9b1132f9f6717d2c7364f20820b792bbaf26dc274f7c10767993b35a565a76e042f4f
diff --git a/sys-fs/lvm2/files/lvm2-2.02.184-allow-reading-metadata-with-invalid-creation_time.patch b/sys-fs/lvm2/files/lvm2-2.02.184-allow-reading-metadata-with-invalid-creation_time.patch
new file mode 100644
index 000000000000..34968c7c2eb7
--- /dev/null
+++ b/sys-fs/lvm2/files/lvm2-2.02.184-allow-reading-metadata-with-invalid-creation_time.patch
@@ -0,0 +1,72 @@
+From a397b69ce33d811aba7d64d54b5c8e0efb86fd15 Mon Sep 17 00:00:00 2001
+From: Zdenek Kabelac <zkabelac@redhat.com>
+Date: Fri, 10 May 2019 14:40:11 +0200
+Subject: [PATCH] metadata: allow reading metadata with invalid creation_time
+
+lvm2 till version 2.02.169 (commit 78d004efa8a1809cea68283e6204edfa9d7c1091)
+was printing invalid creation_time argument into metadata on 32bit arch.
+
+However with commit ba9820b14223b731125c83dbc9709aa44fdcdbf1 we started
+to properly validate all input numbers and thus we refused to accept
+invalid metadata with 'garbage' string - but this results in the
+situation where metadata produced on older lvm2 on 32 bit architecture
+will become unreadable after upgrade.
+
+To fix this case - extend libdm parser in a way, that whenever we
+find error integer value, we also check if the parsed value is not for
+creation_time node and in this case we let the metadata pass through
+with made-up date 2018-05-24 (release date of 2.02.169).
+---
+ libdm/libdm-config.c | 18 +++++++++++++++---
+ 1 file changed, 15 insertions(+), 3 deletions(-)
+
+diff --git a/libdm/libdm-config.c b/libdm/libdm-config.c
+index 3f0d2510e..382f86bbf 100644
+--- a/libdm/libdm-config.c
++++ b/libdm/libdm-config.c
+@@ -51,6 +51,8 @@ struct parser {
+ 
+ 	struct dm_pool *mem;
+ 	int no_dup_node_check;	/* whether to disable dup node checking */
++	const char *key;        /* last obtained key */
++	unsigned ignored_creation_time;
+ };
+ 
+ struct config_output {
+@@ -176,7 +178,7 @@ static int _do_dm_config_parse(struct dm_config_tree *cft, const char *start, co
+ 	/* TODO? if (start == end) return 1; */
+ 
+ 	struct parser *p;
+-	if (!(p = dm_pool_alloc(cft->mem, sizeof(*p))))
++	if (!(p = dm_pool_zalloc(cft->mem, sizeof(*p))))
+ 		return_0;
+ 
+ 	p->mem = cft->mem;
+@@ -615,6 +617,7 @@ static struct dm_config_node *_section(struct parser *p, struct dm_config_node *
+ 		match(TOK_SECTION_E);
+ 	} else {
+ 		match(TOK_EQ);
++		p->key = root->key;
+ 		if (!(value = _value(p)))
+ 			return_NULL;
+ 		if (root->v)
+@@ -682,8 +685,17 @@ static struct dm_config_value *_type(struct parser *p)
+ 		errno = 0;
+ 		v->v.i = strtoll(p->tb, NULL, 0);	/* FIXME: check error */
+ 		if (errno) {
+-			log_error("Failed to read int token.");
+-			return NULL;
++			if (errno == ERANGE && p->key &&
++			    strcmp("creation_time", p->key) == 0) {
++				/* Due to a bug in some older 32bit builds (<2.02.169),
++				 * lvm was able to produce invalid creation_time string */
++				v->v.i = 1527120000; /* Pick 2018-05-24 day instead */
++				if (!p->ignored_creation_time++)
++					log_warn("WARNING: Invalid creation_time found in metadata (repaired with next metadata update).");
++			} else {
++				log_error("Failed to read int token.");
++				return NULL;
++			}
+ 		}
+ 		match(TOK_INT);
+ 		break;
diff --git a/sys-fs/lvm2/lvm2-2.02.184-r4.ebuild b/sys-fs/lvm2/lvm2-2.02.184-r4.ebuild
new file mode 100644
index 000000000000..c08bc9768448
--- /dev/null
+++ b/sys-fs/lvm2/lvm2-2.02.184-r4.ebuild
@@ -0,0 +1,270 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+inherit autotools linux-info multilib systemd toolchain-funcs udev flag-o-matic
+
+DESCRIPTION="User-land utilities for LVM2 (device-mapper) software"
+HOMEPAGE="https://sourceware.org/lvm2/"
+SRC_URI="ftp://sourceware.org/pub/lvm2/${PN/lvm/LVM}.${PV}.tgz
+	ftp://sourceware.org/pub/lvm2/old/${PN/lvm/LVM}.${PV}.tgz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ia64 ~mips ppc ppc64 s390 ~sh sparc x86 ~amd64-linux ~x86-linux"
+IUSE="readline static static-libs systemd lvm2create_initrd sanlock selinux +udev +thin device-mapper-only"
+REQUIRED_USE="device-mapper-only? ( !lvm2create_initrd !sanlock !thin )
+	systemd? ( udev )"
+
+DEPEND_COMMON="
+	dev-libs/libaio[static-libs?]
+	static? ( dev-libs/libaio[static-libs] )
+	!static? ( dev-libs/libaio[static-libs?] )
+	readline? ( sys-libs/readline:0= )
+	sanlock? ( sys-cluster/sanlock )
+	systemd? ( >=sys-apps/systemd-205:0= )
+	udev? ( >=virtual/libudev-208:=[static-libs?] )"
+# /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
+	!<sys-apps/openrc-0.11
+	!<sys-fs/cryptsetup-1.1.2
+	!!sys-fs/lvm-user
+	>=sys-apps/util-linux-2.16
+	lvm2create_initrd? ( sys-apps/makedev )
+	thin? ( >=sys-block/thin-provisioning-tools-0.3.0 )"
+# note: thin- 0.3.0 is required to avoid --disable-thin_check_needs_check
+# USE 'static' currently only works with eudev, bug 520450
+DEPEND="${DEPEND_COMMON}
+	virtual/pkgconfig
+	>=sys-devel/binutils-2.20.1-r1
+	sys-devel/autoconf-archive
+	static? (
+		selinux? ( sys-libs/libselinux[static-libs] )
+		udev? ( >=sys-fs/eudev-3.1.2[static-libs] )
+		>=sys-apps/util-linux-2.16[static-libs]
+	)"
+
+S=${WORKDIR}/${PN/lvm/LVM}.${PV}
+
+PATCHES=(
+	# Gentoo specific modification(s):
+	"${FILESDIR}"/${PN}-2.02.178-example.conf.in.patch
+
+	# For upstream -- review and forward:
+	"${FILESDIR}"/${PN}-2.02.63-always-make-static-libdm.patch
+	"${FILESDIR}"/${PN}-2.02.56-lvm2create_initrd.patch
+	"${FILESDIR}"/${PN}-2.02.67-createinitrd.patch #301331
+	"${FILESDIR}"/${PN}-2.02.99-locale-muck.patch #330373
+	"${FILESDIR}"/${PN}-2.02.178-asneeded.patch # -Wl,--as-needed
+	"${FILESDIR}"/${PN}-2.02.178-dynamic-static-ldflags.patch #332905
+	"${FILESDIR}"/${PN}-2.02.178-static-pkgconfig-libs.patch #370217, #439414 + blkid
+	"${FILESDIR}"/${PN}-2.02.176-pthread-pkgconfig.patch #492450
+	"${FILESDIR}"/${PN}-2.02.171-static-libm.patch #617756
+	"${FILESDIR}"/${PN}-2.02.166-HPPA-no-O_DIRECT.patch #657446
+	#"${FILESDIR}"/${PN}-2.02.145-mkdev.patch #580062 # Merged upstream
+	"${FILESDIR}"/${PN}-2.02.184-dmeventd-no-idle-exit.patch
+	"${FILESDIR}"/${PN}-2.02.184-allow-reading-metadata-with-invalid-creation_time.patch #682380
+)
+
+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
+
+	sed -i \
+		-e "1iAR = $(tc-getAR)" \
+		-e "s:CC ?= @CC@:CC = $(tc-getCC):" \
+		make.tmpl.in || die #444082
+
+	sed -i -e '/FLAG/s:-O2::' configure{.ac,} || die #480212
+
+	if use udev && ! use device-mapper-only; then
+		sed -i -e '/use_lvmetad =/s:0:1:' conf/example.conf.in || die #514196
+		elog "Notice that \"use_lvmetad\" setting is enabled with USE=\"udev\" in"
+		elog "/etc/lvm/lvm.conf, which will require restart of udev, lvm, and lvmetad"
+		elog "if it was previously disabled."
+	fi
+
+	sed -i -e "s:/usr/bin/true:$(type -P true):" scripts/blk_availability_systemd_red_hat.service.in || die #517514
+
+	# Without thin-privision-tools, there is nothing to install for target install_man7:
+	if ! use thin ; then
+		sed -i -e '/^install_lvm2/s:install_man7::' man/Makefile.in || die
+	fi
+
+	eautoreconf
+}
+
+src_configure() {
+	filter-flags -flto
+	local myeconfargs=()
+
+	# Most of this package does weird stuff.
+	# The build options are tristate, and --without is NOT supported
+	# options: 'none', 'internal', 'shared'
+	myeconfargs+=(
+		$(use_enable !device-mapper-only dmfilemapd)
+		$(use_enable !device-mapper-only dmeventd)
+		$(use_enable !device-mapper-only cmdlib)
+		$(use_enable !device-mapper-only applib)
+		$(use_enable !device-mapper-only fsadm)
+		$(use_enable !device-mapper-only lvmetad)
+		$(use_enable !device-mapper-only lvmpolld)
+		$(usex device-mapper-only --disable-udev-systemd-background-jobs '')
+
+		# This only causes the .static versions to become available
+		$(usex static --enable-static_link '')
+
+		# dmeventd requires mirrors to be internal, and snapshot available
+		# so we cannot disable them
+		--with-mirrors="$(usex device-mapper-only none internal)"
+		--with-snapshots="$(usex device-mapper-only none internal)"
+
+		# disable O_DIRECT support on hppa, breaks pv detection (#99532)
+		$(usex hppa --disable-o_direct '')
+	)
+
+	if use thin; then
+		myeconfargs+=( --with-thin=internal --with-cache=internal )
+		local texec
+		for texec in check dump repair restore; do
+			myeconfargs+=( --with-thin-${texec}="${EPREFIX}"/sbin/thin_${texec} )
+			myeconfargs+=( --with-cache-${texec}="${EPREFIX}"/sbin/cache_${texec} )
+		done
+	else
+		myeconfargs+=( --with-thin=none --with-cache=none )
+	fi
+
+	myeconfargs+=( --with-clvmd=none --with-cluster=none )
+
+	myeconfargs+=(
+		$(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 "$(get_udevdir)"/rules.d)
+		$(use_enable sanlock lvmlockd-sanlock)
+		$(use_enable systemd udev-systemd-background-jobs)
+		$(use_enable systemd notify-dbus)
+		--with-systemdsystemunitdir="$(systemd_get_systemunitdir)"
+		CLDFLAGS="${LDFLAGS}"
+	)
+	econf "${myeconfargs[@]}"
+}
+
+src_compile() {
+	pushd include >/dev/null
+	emake
+	popd >/dev/null
+
+	if use device-mapper-only ; then
+		emake device-mapper
+	else
+		emake
+		emake CC="$(tc-getCC)" -C scripts lvm2_activation_generator_systemd_red_hat
+	fi
+}
+
+src_install() {
+	local inst INSTALL_TARGETS
+	INSTALL_TARGETS=( install install_tmpfiles_configuration )
+	# install systemd related files only when requested, bug #522430
+	use systemd && INSTALL_TARGETS+=( install_systemd_units install_systemd_generators )
+	use device-mapper-only && INSTALL_TARGETS=( install_device-mapper )
+	for inst in ${INSTALL_TARGETS[@]}; do
+		emake DESTDIR="${D}" ${inst}
+	done
+
+	newinitd "${FILESDIR}"/device-mapper.rc-2.02.105-r2 device-mapper
+	newconfd "${FILESDIR}"/device-mapper.conf-1.02.22-r3 device-mapper
+
+	if use !device-mapper-only ; then
+		newinitd "${FILESDIR}"/dmeventd.initd-2.02.184-r2 dmeventd
+		newinitd "${FILESDIR}"/lvm.rc-2.02.184-r3 lvm
+		newconfd "${FILESDIR}"/lvm.confd-2.02.184-r3 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-2.02.105-r2 lvm-monitoring
+		newinitd "${FILESDIR}"/lvmetad.initd-2.02.116-r3 lvmetad
+		newinitd "${FILESDIR}"/lvmpolld.initd-2.02.183 lvmpolld
+	fi
+
+	if use sanlock; then
+		newinitd "${FILESDIR}"/lvmlockd.initd-2.02.166-r1 lvmlockd
+	fi
+
+	if use static-libs; then
+		dolib.a libdm/ioctl/libdevmapper.a
+		dolib.a libdaemon/client/libdaemonclient.a #462908
+		#gen_usr_ldscript libdevmapper.so
+		dolib.a daemons/dmeventd/libdevmapper-event.a
+		#gen_usr_ldscript libdevmapper-event.so
+	else
+		rm -f "${ED%/}"/usr/$(get_libdir)/{libdevmapper-event,liblvm2cmd,liblvm2app,libdevmapper}.a
+	fi
+
+	if use lvm2create_initrd; then
+		dosbin scripts/lvm2create_initrd/lvm2create_initrd
+		doman scripts/lvm2create_initrd/lvm2create_initrd.8
+		newdoc scripts/lvm2create_initrd/README README.lvm2create_initrd
+	fi
+
+	insinto /etc
+	doins "${FILESDIR}"/dmtab
+
+	dodoc README VERSION* WHATS_NEW WHATS_NEW_DM doc/*.{c,txt} conf/*.conf
+}
+
+pkg_postinst() {
+	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 /etc/lvm/lvm.conf if you want"
+	ewarn "to enable lvm autoactivation and metadata caching."
+}
+
+src_test() {
+	einfo "Tests are disabled because of device-node mucking, if you want to"
+	einfo "run tests, compile the package and see ${S}/tests"
+}