From b7819d03d7312d3d8d12b49738aa417f35f6e18a Mon Sep 17 00:00:00 2001 From: V3n3RiX Date: Tue, 22 Nov 2022 01:05:27 +0000 Subject: gentoo auto-resync : 22:11:2022 - 01:05:27 --- sys-fs/Manifest.gz | Bin 22190 -> 22188 bytes sys-fs/lvm2/Manifest | 7 +- sys-fs/lvm2/lvm2-2.03.14-r4.ebuild | 1 + sys-fs/lvm2/lvm2-2.03.16-r1.ebuild | 315 ------------------------------------- sys-fs/lvm2/lvm2-2.03.16-r2.ebuild | 1 + sys-fs/lvm2/lvm2-2.03.17.ebuild | 1 + 6 files changed, 6 insertions(+), 319 deletions(-) delete mode 100644 sys-fs/lvm2/lvm2-2.03.16-r1.ebuild (limited to 'sys-fs') diff --git a/sys-fs/Manifest.gz b/sys-fs/Manifest.gz index a02e84037128..1cbe5d2f4243 100644 Binary files a/sys-fs/Manifest.gz and b/sys-fs/Manifest.gz differ diff --git a/sys-fs/lvm2/Manifest b/sys-fs/lvm2/Manifest index 5c67f04cd397..d015f9dbd30b 100644 --- a/sys-fs/lvm2/Manifest +++ b/sys-fs/lvm2/Manifest @@ -35,8 +35,7 @@ AUX lvmpolld.initd-2.02.183 348 BLAKE2B cba0419add6591320dc60ef7616b66706e042b56 DIST LVM2.2.03.14.tgz 2639538 BLAKE2B 806f5e9cb76a05febef6f8ce8cfc42c92927b9538f62a21029c5ffc426a4fd7c3f32709be08dbd8028b53891b1075d1d13cb3b0d7b1815071ee8eb927d8f3ed3 SHA512 6a93bed1d5cf36f0f48d4d413d028b0e480cd4fc20e25d173770a892f265d2a0cc68d01a720b1513469953649e989532cd0c45f9538f92a4190eb3dc4555857d DIST LVM2.2.03.16.tgz 2658805 BLAKE2B 05c6089adff0c61ff1281a05a917f75480ad4acc28cb0214a42589d206a61168f68de07891b9af9814ed7998f16aff6f29ba29b85b23de36f38bf3b5f27802c1 SHA512 084ba4080537359458db936637fc7f83bb9bfcf2de9f3660882551b5c31c7e9900c7d381b238ce1bb7629942c740c121f0dea5e404c302d31ed028b5c65efaa5 DIST LVM2.2.03.17.tgz 2726793 BLAKE2B 425e52fe2d7832f8440203d2b6ffc3a097903abea8be07bbbf4864001d5f55083954e561a92b0fe4fc467533e465af3958b25cf33d2693f50f077dc3d9b74bd2 SHA512 ce9f4c10a7e89b397fa021098976117c062227da4f25996296dd3678c0aeb826edf9b7e4f5d3992f42156865ae47cb98671ec37a26868710174a473b42cc70a9 -EBUILD lvm2-2.03.14-r4.ebuild 9754 BLAKE2B fb0bc82154959383aebdb494229f521c39fdb1fcd9efd44ed43257456610cfe3cc1822878ff929eaacb4b5aea6f2fbb8acdb5c7a388066ec547933cc9d2e4fb0 SHA512 8a266fbee2cf9ee8e48be42a415483f37a4ea3959c7d6e8e7118d13ebc3f7dbb0d6858f3714f292947affa3a1914df08d22d58d637d87bd6b9943d27ff8fe593 -EBUILD lvm2-2.03.16-r1.ebuild 9680 BLAKE2B 5205dad55e1b3c698c5c5df2e3180ccc6efd1f96d06999da9900cbed699287a65fc32140ff21c976acac39a49d347e8f1d10421a3dfbb977119ca3a898e6c7aa SHA512 38189585f7fb88bebfcfae78c098308c39c204db97c96894a1a62170de53229d865c8664b95cfe1dbf89b84aee083072d845fcfff259f6cbfb65d2e8e507809b -EBUILD lvm2-2.03.16-r2.ebuild 9860 BLAKE2B 7dd9c19c1e9e353a0f47b5726c4204171dd8db5bb4d36d860abe52f9ff5eb42302a995365365827d716d9fee05d04a8636727149cadd8fde4914f4c3e0cb653a SHA512 fa88f913cee5c2c31ddfe409bdb7eb27775b5e7744e0804bb5dcf8ca5487083041a9d8163e2b788751a8654fb1caab454c9a33a34cb24bc7a5a89dccad8ce370 -EBUILD lvm2-2.03.17.ebuild 9363 BLAKE2B e92decb208c5acaf53b890e8582b55b61333e8f18a499c30f44fdd5ca3aae3fabd6ad0ae484f2ccecf87a36aa5049f7673e0835ddb4ee3b67b53ba65be7fb5b0 SHA512 4f003ebb3425c79d0875e4681ab9e58599aaa4da7b22b0432728c73fbc03e10d378bb21d2ef5872eb356224af870b670b8b7eb6b973022a6469740320f817d37 +EBUILD lvm2-2.03.14-r4.ebuild 9835 BLAKE2B aa0a130201d82ec80917e56403c7bba1c390c66ec9a9a516ec82f64acf9a3e2f358cfbf3d1309c6a14cebdbd3122f22c5368e4729381e1be8a53fe239938d0cc SHA512 f1c50379f42be3967b21a900e2f0411ee6d2ce105aceede21d39a86c5ce8e288475f6ff0add5fb21e0c1ec0a8833acf82d1a76fd79e9e5dd0da1e45a6deb6136 +EBUILD lvm2-2.03.16-r2.ebuild 9941 BLAKE2B e065d4a4265c7d7772a0a021ebe0dad0a34ad11413d14d1272668a6cf684e138bd0de43d54ded0d420dec13218117c5f5e11e16a2566525639c559bfa1733abd SHA512 a84934086b8b293540011cea17c8ebf5abdaba3370c4a529e30e28e8d0623fef3510fd868cedcc9bbe67b2b162df305a1ac37fccd2effcd6eb678e93ef15b841 +EBUILD lvm2-2.03.17.ebuild 9444 BLAKE2B 009fe89c6eb4668e08d9b34a3a2b99bf01d717a85a233353add45231d54c2bc055f5c18228bcf08ab44b4e922ef9b9b6d9c026c0916c6cdbdfbbe0b47c604309 SHA512 1c60f42051fc23db30ffb942dd5a54b80f599e181e72ccadbfee95a2fd857fd822a17b13ff514f7a186812bd1c72f4a50e85536ce868335f6f7d87f29ed1e0ee MISC metadata.xml 939 BLAKE2B a3f004d1454fd139e640d70d7e53b472faa4f70f1b7b7b015a85ddd15766746ed89d0691ab8988b826d50d384d9be689dc5c2162358255c86fe24056c06acd55 SHA512 4bbc76d6ab664633ad7306965a430ae7071f3822e5dcc55d102ab19f2a853ead2c33144372892e38c51c264ca3e2ff7bcf4765105a7e7960fb5c835879e81621 diff --git a/sys-fs/lvm2/lvm2-2.03.14-r4.ebuild b/sys-fs/lvm2/lvm2-2.03.14-r4.ebuild index b8512c8bc5ce..b991a1ef1218 100644 --- a/sys-fs/lvm2/lvm2-2.03.14-r4.ebuild +++ b/sys-fs/lvm2/lvm2-2.03.14-r4.ebuild @@ -103,6 +103,7 @@ src_prepare() { # Users without systemd get no auto-activation of any logical volume if ! use systemd ; then eapply "${FILESDIR}"/${PN}-2.03.14-dm_lvm_rules_no_systemd.patch + sed -i -e '/^USE_SD_NOTIFY=yes$/s/yes/no/' daemons/lvmlockd/Makefile.in || die fi sed -i \ diff --git a/sys-fs/lvm2/lvm2-2.03.16-r1.ebuild b/sys-fs/lvm2/lvm2-2.03.16-r1.ebuild deleted file mode 100644 index 70e6c17be7d5..000000000000 --- a/sys-fs/lvm2/lvm2-2.03.16-r1.ebuild +++ /dev/null @@ -1,315 +0,0 @@ -# Copyright 1999-2022 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" -SLOT="0" -KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux" -IUSE="+lvm lvm2create-initrd readline sanlock selinux static static-libs systemd +thin +udev" -REQUIRED_USE=" - static? ( !systemd !udev ) - static-libs? ( static !udev ) - systemd? ( udev )" - -DEPEND_COMMON=" - udev? ( virtual/libudev:= ) - lvm? ( - dev-libs/libaio - sys-apps/util-linux - readline? ( sys-libs/readline:= ) - sanlock? ( sys-cluster/sanlock ) - systemd? ( sys-apps/systemd:= ) - )" -# /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 - lvm2create-initrd? ( sys-apps/makedev ) - thin? ( sys-block/thin-provisioning-tools ) - )" -# note: thin- 0.3.0 is required to avoid --disable-thin_check_needs_check -DEPEND="${DEPEND_COMMON} - static? ( - lvm? ( - dev-libs/libaio[static-libs] - sys-apps/util-linux[static-libs] - readline? ( sys-libs/readline[static-libs] ) - ) - selinux? ( sys-libs/libselinux[static-libs] ) - )" -BDEPEND=" - sys-devel/autoconf-archive - virtual/pkgconfig" - -PATCHES=( - # Gentoo specific modification(s): - "${FILESDIR}"/${PN}-2.03.06-example.conf.in.patch - - # For upstream -- review and forward: - "${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.03.12-dynamic-static-ldflags.patch #332905 - "${FILESDIR}"/${PN}-2.03.14-static-pkgconfig-libs.patch #370217, #439414 + blkid - "${FILESDIR}"/${PN}-2.03.12-static-pkgconfig-libs-2.patch - "${FILESDIR}"/${PN}-2.03.05-pthread-pkgconfig.patch #492450 - "${FILESDIR}"/${PN}-2.03.12-static-libm.patch #617756 - "${FILESDIR}"/${PN}-2.02.166-HPPA-no-O_DIRECT.patch #657446 - "${FILESDIR}"/${PN}-2.03.05-dmeventd-no-idle-exit.patch - "${FILESDIR}"/${PN}-2.03.14-r1-add-fcntl.patch - "${FILESDIR}"/${PN}-2.03.14-r1-fopen-to-freopen.patch - "${FILESDIR}"/${PN}-2.03.14-r1-mallinfo.patch - "${FILESDIR}"/${PN}-2.03.14-freopen_n2.patch - "${FILESDIR}"/${PN}-2.03.16-readelf.patch -) - -QA_CONFIGURE_OPTIONS="--disable-static" - -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.16-dm_lvm_rules_no_systemd.patch - fi - - 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 - - sed -i -e "s:/usr/bin/true:$(type -P true):" scripts/blk_availability_systemd_red_hat.service.in || die #517514 - - # Don't install thin man page when not requested - if ! use lvm || ! use thin ; then - sed -i -e 's/^\(MAN7+=.*\) $(LVMTHINMAN) \(.*\)$/\1 \2/' man/Makefile.in || die - fi - - eautoreconf -} - -src_configure() { - filter-flags -flto - - # Workaround for bug #822210 - tc-ld-disable-gold - - 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 lvm dmfilemapd) - $(use_enable lvm dmeventd) - $(use_enable lvm cmdlib) - $(use_enable lvm fsadm) - $(use_enable lvm lvmpolld) - $(usev !lvm --disable-udev-systemd-background-jobs) - - # 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)" - - # disable O_DIRECT support on hppa, breaks pv detection (#99532) - $(usev hppa --disable-o_direct) - ) - - if use lvm && 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 - - export READELF="$(tc-getREADELF)" - 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 "${EPREFIX}$(get_udevdir)"/rules.d) - # USE=sanlock requires USE=lvm - $(use_enable $(usex lvm sanlock lvm) lvmlockd-sanlock) - $(use_enable systemd udev-systemd-background-jobs) - $(use_enable systemd notify-dbus) - --with-systemdsystemunitdir="$(systemd_get_systemunitdir)" - CLDFLAGS="${LDFLAGS}" - READELF="${READELF}" - ) - # Hard-wire this to bash as some shells (dash) don't know - # "-o pipefail" #682404 - CONFIG_SHELL="${BROOT}/bin/bash" 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 are disabled because of device-node mucking, if you want to" - einfo "run tests, compile the package and see ${S}/tests" -} - -src_install() { - local INSTALL_TARGETS=( - # full LVM2 - $(usev lvm "install install_tmpfiles_configuration") - # install systemd related files only when requested, bug #522430 - $(usev $(usex lvm systemd lvm) "SYSTEMD_GENERATOR_DIR=$(systemd_get_systemgeneratordir) install_systemd_units install_systemd_generators") - - # install dm unconditionally - install_device-mapper - ) - emake V=1 DESTDIR="${D}" "${INSTALL_TARGETS[@]}" - - newinitd "${FILESDIR}"/device-mapper.rc-2.02.105-r2 device-mapper - newconfd "${FILESDIR}"/device-mapper.conf-1.02.22-r3 device-mapper - - if use lvm ; then - newinitd "${FILESDIR}"/dmeventd.initd-2.02.184-r2 dmeventd - newinitd "${FILESDIR}"/lvm.rc-2.02.187 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/\//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}"/lvmpolld.initd-2.02.183 lvmpolld - - 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 - - if use sanlock; then - newinitd "${FILESDIR}"/lvmlockd.initd-2.02.166-r1 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_postinst() { - use lvm && tmpfiles_process lvm2.conf - - if use udev; then - udev_reload - fi - - if [[ -z "${REPLACING_VERSIONS}" ]]; then - # This is a new installation - 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." - 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 be causing problems for UDEV-enabled LVM services." - fi - fi -} - -pkg_postrm() { - if use udev && [[ -z ${REPLACED_BY_VERSION} ]]; then - udev_reload - fi -} diff --git a/sys-fs/lvm2/lvm2-2.03.16-r2.ebuild b/sys-fs/lvm2/lvm2-2.03.16-r2.ebuild index dca72ccfd4a0..4b49e8d27e66 100644 --- a/sys-fs/lvm2/lvm2-2.03.16-r2.ebuild +++ b/sys-fs/lvm2/lvm2-2.03.16-r2.ebuild @@ -108,6 +108,7 @@ src_prepare() { # Users without systemd get no auto-activation of any logical volume if ! use systemd ; then eapply "${FILESDIR}"/${PN}-2.03.16-dm_lvm_rules_no_systemd.patch + sed -i -e '/^USE_SD_NOTIFY=yes$/s/yes/no/' daemons/lvmlockd/Makefile.in || die fi sed -i \ diff --git a/sys-fs/lvm2/lvm2-2.03.17.ebuild b/sys-fs/lvm2/lvm2-2.03.17.ebuild index 01f3f1dd4f90..91f4b5074807 100644 --- a/sys-fs/lvm2/lvm2-2.03.17.ebuild +++ b/sys-fs/lvm2/lvm2-2.03.17.ebuild @@ -107,6 +107,7 @@ src_prepare() { # Users without systemd get no auto-activation of any logical volume if ! use systemd ; then eapply "${FILESDIR}"/${PN}-2.03.16-dm_lvm_rules_no_systemd.patch + sed -i -e '/^USE_SD_NOTIFY=yes$/s/yes/no/' daemons/lvmlockd/Makefile.in || die fi sed -i -e "s:/usr/bin/true:$(type -P true):" scripts/blk_availability_systemd_red_hat.service.in || die #517514 -- cgit v1.2.3