From adb727afeb568404873e8cbc91ba93d3d49eff13 Mon Sep 17 00:00:00 2001 From: V3n3RiX Date: Mon, 26 Dec 2022 14:07:48 +0000 Subject: gentoo auto-resync : 26:12:2022 - 14:07:48 --- sys-fs/multipath-tools/Manifest | 9 +- .../multipath-tools-0.8.7-respect-flags.patch | 14 ---- .../multipath-tools-0.9.0-respect-flags.patch | 15 ---- sys-fs/multipath-tools/metadata.xml | 3 - .../multipath-tools/multipath-tools-0.8.9.ebuild | 88 -------------------- .../multipath-tools/multipath-tools-0.9.0.ebuild | 76 ----------------- .../multipath-tools-0.9.3-r2.ebuild | 97 ---------------------- 7 files changed, 1 insertion(+), 301 deletions(-) delete mode 100644 sys-fs/multipath-tools/files/multipath-tools-0.8.7-respect-flags.patch delete mode 100644 sys-fs/multipath-tools/files/multipath-tools-0.9.0-respect-flags.patch delete mode 100644 sys-fs/multipath-tools/multipath-tools-0.8.9.ebuild delete mode 100644 sys-fs/multipath-tools/multipath-tools-0.9.0.ebuild delete mode 100644 sys-fs/multipath-tools/multipath-tools-0.9.3-r2.ebuild (limited to 'sys-fs/multipath-tools') diff --git a/sys-fs/multipath-tools/Manifest b/sys-fs/multipath-tools/Manifest index 6bb7eee76c4b..ebb9c5e08cd7 100644 --- a/sys-fs/multipath-tools/Manifest +++ b/sys-fs/multipath-tools/Manifest @@ -1,12 +1,5 @@ -AUX multipath-tools-0.8.7-respect-flags.patch 693 BLAKE2B 298948ad60635be15ae8b83eb0e43e46a8055b22ac351b317c435ff20728e37dd6d371eb0898c5d764490affa7b8dc878faacb2d3084ff3aa49cc102341774d5 SHA512 03573d907ef34e610e9b4e993640ab2b44be52f0b335390435cdc3d33351c5e378c421eeae0706e62000e9f1d95b118afd5a17292e0a1051c680c717b1b9b0bd -AUX multipath-tools-0.9.0-respect-flags.patch 746 BLAKE2B 8cb64404a5ebfe195d6b9cde8e047df9acb3a08a25645fb20c8c1c1b7cfa59c34b854f33ec064124c33c1fc9c11eba47306d873ed05f4cc37ff80fe0c9b409b4 SHA512 9b17f934317f9251a3a779cb6dfc228697348e3a128dc8cebbd767681bb71006733c196d8b8db14000b008500af81620fc53df52e18545ed3d4893c9a2409d83 AUX multipath.rc 565 BLAKE2B efb26199eddb75c5e87d1ab40aa8cb4fbaf9f7a2bfd7a20add6d55997d25de9a3dbf0d032c977593c2ee8d447539a34be0294ee3a80a80fb004dc2c51c8c64b5 SHA512 f08833fc3c928900f8c29438208b9715581bae426b1f45c246e8c418b210f7f9d35517ef9ad44db3d88944183b34e3411ece909b56892a9f3b7250fed49e43fe AUX multipathd-r1.rc 264 BLAKE2B f08733746c702da27e002b2cb07bbc1a1925002b1592c2f566aa8d66c71da5fd39fd6389636fc49b602f9051190ee5f7f85ad9ff35b924f51a2698e1a6654f0e SHA512 8cf764b59ed4bb13c3c2143cd83ee39bc87eca85c40acb3ed1dcd7cf4c39ecbdea7974b9705231d48377266c034a8623157648b9a99b6cef73617e4b37ad377e -DIST multipath-tools-0.8.9.tar.gz 534866 BLAKE2B b5ebf3c393f6b60e85678ac07378ae07056b6777409fc1bc4f4133cdd3f8c75a3d76f6e9342208df7fed8fe7812b089eba8f6b769e47e1dd6c8b7fd321bdbd30 SHA512 25f2a5d436af6a343804988cef45ca1574d4a981655a2b91563ddb89138619158befdf5af92d836a17c95d6dcf901072b614473c2129274e5dcdb1a1d64edb4d -DIST multipath-tools-0.9.0.tar.gz 537311 BLAKE2B e7d4958d24d1e19da2b80be23585ad37f6b0c1b66dc1377014d825ddd2be10ea3b8c30162cb7a23b120427bf0c957c6cad8560018e1cb058c284f37afd5d50d4 SHA512 6c417f6d1d116fa43bedb9f77769ece9cbb7b35b78a9b3558c41df2360e52a65a07314b12ab7e4a7bbc867b9755250de9db96a2f7eb4a6a37f0b0b3f0bbc840e DIST multipath-tools-0.9.3.tar.gz 552442 BLAKE2B e2065119cdd68bd8c2b4420bd0de9ce370601597972dba32c076bfc4df6d0a1a65356454a2f96f95f27cf681387685edcbac2eb41258d4a7049a1ef62cdf0949 SHA512 4faa2ee5a96a9d5d752219931ebc885cb70ed6b022d45ede985ad7919c043a3aee166e6f126d32dffd187c5c32d5cbce91747d87d0b55557e2f7f68b279583da -EBUILD multipath-tools-0.8.9.ebuild 2091 BLAKE2B e6fa02e23e152cb1eb730ecf3f8714d75aa391daf48f8a55350780d711ef7239a6dd2aeda1dd4ede09024cdbe4f12d61b22be3d00094482a24318ecc2f1147de SHA512 9aa9722d0fd8927c09b4f1a631f5bdbc2a14d8bdf72fdbfe53da3a74cd7f6a7623d098534fb093e236d694c1a5594d611ffbc94879a4ecd6e046d823bb7830eb -EBUILD multipath-tools-0.9.0.ebuild 1759 BLAKE2B b988f5cc90eb8e8b9d61154e1cdc901fca42a94bd2aef6fd7b999d25d666b43e09611b01a39dc757bb167b04428821225004d3d3dfb85d2e233aba6d246b6b77 SHA512 2849e1ee2e649dea2fa18a9cdd73da06ae6ff28babdd127a122f9a81c416be83f48eeb9556b90e11ba53489b5023e80e2d37e65618fdadb45f07024431e9f5a9 -EBUILD multipath-tools-0.9.3-r2.ebuild 2430 BLAKE2B 0fe03de138073d8c9c053ddc448c05f0dea199d3e03227b35e5ebdf981e88339d48598a2fef32ef191919a423550110a0f7f9c1426a5281e36339e71cdef290e SHA512 5c487f27bc81de3a1b8d43b03e3b765ff39406751649b7917bed3d92370667025d93d7f32171bb953cb18fe712345c2faed120b846fd8053fa21df893a980189 EBUILD multipath-tools-0.9.3.ebuild 2328 BLAKE2B ff73af2f67386d163fd94f3f88ae4b299b447b95ee7449a860ea9e791305f92c7d41fa64d42d1633464c4322bc0491f5cff9024ca13a1bb7f62e990471c70d5c SHA512 a8d5572055b6d4883bd142b0288f034c4e6b3beb4c8c47b8c55d00c8e1d7d11dcf4802e5c8a63eef46d4d158ae49fb73ee35353d1207d029481a6da539615e68 -MISC metadata.xml 453 BLAKE2B 2f2a56731716bfb47dee061219c80834aa382daf9e6ce937cef2237fc1bbb05e988672cc178ad471d68e9ab4f9292677be71ef9198a163f85a7f3b8658f5d698 SHA512 e8df3db70f5d919789ff0512409365fc80dfbb31ede6079c49910e8acffc6b5289290a48acef8230bc59899262801255048d1a730f81c3642945f8c872ac5428 +MISC metadata.xml 346 BLAKE2B 8c5d2e150c70bdff56b05009f11d40663d9d969b07ecc88ff310fd4e756339d2f9a4a6b351b14c6cebc69ed36f17eb0500a0ba2b34f7c6b75c3864d1e090a46f SHA512 ffb0aab5f2d8bbdf83e0df3cc84cd239649e94e1189ba4702221091469309d3d49783c6943aae27eb34e3373f3e07a571930a361058d9a3b67f725781c47b87e diff --git a/sys-fs/multipath-tools/files/multipath-tools-0.8.7-respect-flags.patch b/sys-fs/multipath-tools/files/multipath-tools-0.8.7-respect-flags.patch deleted file mode 100644 index 43c03883ee07..000000000000 --- a/sys-fs/multipath-tools/files/multipath-tools-0.8.7-respect-flags.patch +++ /dev/null @@ -1,14 +0,0 @@ ---- a/Makefile.inc -+++ b/Makefile.inc -@@ -101,8 +101,9 @@ OPTFLAGS := -O2 -g $(STACKPROT) --param=ssp-buffer-size=4 - WARNFLAGS := -Werror -Wall -Wextra -Wformat=2 $(WFORMATOVERFLOW) -Werror=implicit-int \ - -Werror=implicit-function-declaration -Werror=format-security \ - $(WNOCLOBBERED) -Werror=cast-qual $(ERROR_DISCARDED_QUALIFIERS) --CPPFLAGS := -Wp,-D_FORTIFY_SOURCE=2 --CFLAGS := --std=gnu99 $(CFLAGS) $(OPTFLAGS) $(WARNFLAGS) -pipe \ -+CPPFLAGS ?= -Wp,-D_FORTIFY_SOURCE=2 -+CFLAGS ?= --std=gnu99 $(CFLAGS) $(OPTFLAGS) $(WARNFLAGS) -pipe -+CFLAGS += --std=gnu99 \ - -DBIN_DIR=\"$(bindir)\" -DLIB_STRING=\"${LIB}\" -DRUN_DIR=\"${RUN}\" \ - -MMD -MP - BIN_CFLAGS = -fPIE -DPIE diff --git a/sys-fs/multipath-tools/files/multipath-tools-0.9.0-respect-flags.patch b/sys-fs/multipath-tools/files/multipath-tools-0.9.0-respect-flags.patch deleted file mode 100644 index f2b6dca05776..000000000000 --- a/sys-fs/multipath-tools/files/multipath-tools-0.9.0-respect-flags.patch +++ /dev/null @@ -1,15 +0,0 @@ ---- a/Makefile.inc -+++ b/Makefile.inc -@@ -140,10 +140,9 @@ - WARNFLAGS := -Werror -Wall -Wextra -Wformat=2 $(WFORMATOVERFLOW) -Werror=implicit-int \ - -Werror=implicit-function-declaration -Werror=format-security \ - $(WNOCLOBBERED) -Werror=cast-qual $(ERROR_DISCARDED_QUALIFIERS) --CPPFLAGS := $(FORTIFY_OPT) \ -- -DBIN_DIR=\"$(bindir)\" -DMULTIPATH_DIR=\"$(plugindir)\" -DRUN_DIR=\"${RUN}\" \ -+CPPFLAGS += -DBIN_DIR=\"$(bindir)\" -DMULTIPATH_DIR=\"$(plugindir)\" -DRUN_DIR=\"${RUN}\" \ - -DCONFIG_DIR=\"$(configdir)\" -DEXTRAVERSION=\"$(EXTRAVERSION)\" -MMD -MP --CFLAGS := --std=gnu99 $(CFLAGS) $(OPTFLAGS) $(WARNFLAGS) -pipe -+CFLAGS += -std=gnu99 $(WARNFLAGS) - BIN_CFLAGS = -fPIE -DPIE - LIB_CFLAGS = -fPIC - SHARED_FLAGS = -shared diff --git a/sys-fs/multipath-tools/metadata.xml b/sys-fs/multipath-tools/metadata.xml index 1cbf200d6c5b..019e77364d43 100644 --- a/sys-fs/multipath-tools/metadata.xml +++ b/sys-fs/multipath-tools/metadata.xml @@ -5,9 +5,6 @@ base-system@gentoo.org Gentoo Base System - - Enable Rados block device support via sys-cluster/ceph - opensvc/multipath-tools diff --git a/sys-fs/multipath-tools/multipath-tools-0.8.9.ebuild b/sys-fs/multipath-tools/multipath-tools-0.8.9.ebuild deleted file mode 100644 index 4d67993c2e86..000000000000 --- a/sys-fs/multipath-tools/multipath-tools-0.8.9.ebuild +++ /dev/null @@ -1,88 +0,0 @@ -# Copyright 1999-2022 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI="7" - -inherit linux-info systemd toolchain-funcs udev - -DESCRIPTION="Device mapper target autoconfig" -HOMEPAGE="http://christophe.varoqui.free.fr/" -SRC_URI="https://github.com/opensvc/${PN}/archive/refs/tags/${PV}.tar.gz -> ${P}.tar.gz" - -LICENSE="GPL-2" -SLOT="0" -KEYWORDS="~alpha amd64 ~arm arm64 ~ia64 ~loong ppc ppc64 ~riscv x86" -IUSE="systemd rbd test" -RESTRICT="!test? ( test )" - -RDEPEND=" - dev-libs/json-c:= - dev-libs/libaio - dev-libs/userspace-rcu:= - >=sys-fs/lvm2-2.02.45 - >=virtual/libudev-232-r3 - sys-libs/readline:0= - rbd? ( sys-cluster/ceph ) - systemd? ( sys-apps/systemd ) -" -DEPEND="${RDEPEND} - test? ( dev-util/cmocka )" -BDEPEND="virtual/pkgconfig" - -CONFIG_CHECK="~DM_MULTIPATH" - -PATCHES=( - "${FILESDIR}"/${PN}-0.8.7-respect-flags.patch -) - -src_prepare() { - default - - # The upstream lacks any way to configure the build at present - # and ceph is a huge dependency, so we're using sed to make it - # optional until the upstream has a proper configure system - if ! use rbd ; then - sed \ - -e "s/libcheckrbd.so/# libcheckrbd.so/" \ - -e "s/-lrados//" \ - -i libmultipath/checkers/Makefile \ - || die - fi -} - -src_compile() { - tc-export CC - - # LIBDM_API_FLUSH involves grepping files in /usr/include, - # so force the test to go the way we want #411337. - emake \ - LIB="${EPREFIX}/$(get_libdir)" \ - LIBDM_API_FLUSH=1 \ - PKGCONFIG="$(tc-getPKG_CONFIG)" -} - -src_install() { - dodir /sbin /usr/share/man/man{3,5,8} - emake \ - DESTDIR="${D}" \ - LIB="${EPREFIX}/$(get_libdir)" \ - RUN=run \ - unitdir="$(systemd_get_systemunitdir)" \ - libudevdir='${prefix}'/"$(get_udevdir)" \ - pkgconfdir='${prefix}'/usr/'${LIB}'/pkgconfig \ - install - - newinitd "${FILESDIR}"/multipathd-r1.rc multipathd - newinitd "${FILESDIR}"/multipath.rc multipath - - einstalldocs - - find "${ED}" -type f -name "*.la" -delete || die -} - -pkg_postinst() { - if [[ -z ${REPLACING_VERSIONS} ]] ; then - elog "If you need multipath on your system, you must" - elog "add 'multipath' into your boot runlevel!" - fi -} diff --git a/sys-fs/multipath-tools/multipath-tools-0.9.0.ebuild b/sys-fs/multipath-tools/multipath-tools-0.9.0.ebuild deleted file mode 100644 index c3ba08e79c7e..000000000000 --- a/sys-fs/multipath-tools/multipath-tools-0.9.0.ebuild +++ /dev/null @@ -1,76 +0,0 @@ -# Copyright 1999-2022 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=8 - -inherit linux-info systemd toolchain-funcs udev - -DESCRIPTION="Device mapper target autoconfig" -HOMEPAGE="http://christophe.varoqui.free.fr/" -SRC_URI="https://github.com/opensvc/${PN}/archive/refs/tags/${PV}.tar.gz -> ${P}.tar.gz" - -LICENSE="GPL-2" -SLOT="0" -KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~ia64 ~loong ~ppc ~ppc64 ~riscv ~x86" -IUSE="systemd test" -RESTRICT="!test? ( test )" - -RDEPEND=" - dev-libs/json-c:= - dev-libs/libaio - dev-libs/userspace-rcu:= - >=sys-fs/lvm2-2.02.45 - >=virtual/libudev-232-r3 - sys-libs/readline:= - systemd? ( sys-apps/systemd )" -DEPEND="${RDEPEND} - test? ( dev-util/cmocka )" -BDEPEND="virtual/pkgconfig" - -CONFIG_CHECK="~DM_MULTIPATH" - -PATCHES=( "${FILESDIR}"/${PN}-0.9.0-respect-flags.patch ) - -src_compile() { - tc-export CC - - # LIBDM_API_FLUSH involves grepping files in /usr/include, - # so force the test to go the way we want #411337. - emake \ - prefix="${EPREFIX}" \ - LIB="$(get_libdir)" \ - LIBDM_API_FLUSH=1 \ - PKGCONFIG="$(tc-getPKG_CONFIG)" -} - -src_install() { - dodir /sbin /usr/share/man/man{3,5,8} - emake \ - DESTDIR="${D}" \ - prefix="${EPREFIX}" \ - LIB="$(get_libdir)" \ - RUN=run \ - unitdir="$(systemd_get_systemunitdir)" \ - libudevdir='$(prefix)'/$(get_udevdir) \ - pkgconfdir='$(prefix)/usr/$(LIB)/pkgconfig' \ - install - einstalldocs - - newinitd "${FILESDIR}"/multipathd-r1.rc multipathd - newinitd "${FILESDIR}"/multipath.rc multipath - - find "${ED}" -type f -name '*.la' -delete || die -} - -pkg_postinst() { - udev_reload - - if [[ -z ${REPLACING_VERSIONS} ]] ; then - elog "If you need multipath on your system, you must" - elog "add 'multipath' into your boot runlevel!" - fi -} - -pkg_postrm() { - udev_reload -} diff --git a/sys-fs/multipath-tools/multipath-tools-0.9.3-r2.ebuild b/sys-fs/multipath-tools/multipath-tools-0.9.3-r2.ebuild deleted file mode 100644 index ff744e92c05d..000000000000 --- a/sys-fs/multipath-tools/multipath-tools-0.9.3-r2.ebuild +++ /dev/null @@ -1,97 +0,0 @@ -# Copyright 1999-2022 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=8 - -inherit linux-info systemd toolchain-funcs udev tmpfiles - -DESCRIPTION="Device mapper target autoconfig" -HOMEPAGE="http://christophe.varoqui.free.fr/" -SRC_URI="https://github.com/opensvc/${PN}/archive/refs/tags/${PV}.tar.gz -> ${P}.tar.gz" - -LICENSE="GPL-2" -SLOT="0" -KEYWORDS="~alpha amd64 ~arm arm64 ~ia64 ~loong ppc ppc64 ~riscv x86" -IUSE="systemd test" -RESTRICT="!test? ( test )" - -RDEPEND=" - dev-libs/json-c:= - dev-libs/libaio - dev-libs/userspace-rcu:= - >=sys-fs/lvm2-2.02.45 - >=virtual/libudev-232-r3 - sys-libs/readline:= - systemd? ( sys-apps/systemd )" -DEPEND="${RDEPEND} - test? ( dev-util/cmocka )" -BDEPEND="virtual/pkgconfig" - -CONFIG_CHECK="~DM_MULTIPATH" - -src_prepare() { - default - - sed -r -i -e '/^(CPPFLAGS|CFLAGS)\>/s,^(CPPFLAGS|CFLAGS)\>[[:space:]]+:=,\1 := $(GENTOO_\1),' \ - "${S}"/Makefile.inc || die -} - -src_compile() { - tc-export CC - - # LIBDM_API_FLUSH involves grepping files in /usr/include, - # so force the test to go the way we want #411337. - emake \ - prefix="${EPREFIX}/usr" \ - plugindir="${EPREFIX}/$(get_libdir)/multipath" \ - LIB="$(get_libdir)" \ - LIBDM_API_FLUSH=1 \ - PKGCONFIG="$(tc-getPKG_CONFIG)" \ - GENTOO_CFLAGS="${CFLAGS}" \ - GENTOO_CPPFLAGS="${CPPFLAGS}" \ - FAKEVAR=1 -} - -src_install() { - dodir /sbin - - # Please clean this up > 0.9.3: https://github.com/opensvc/multipath-tools/pull/53 - # $(prefix) doesn't work correctly in makefile in 0.9.3. - emake \ - DESTDIR="${ED}" \ - prefix="${EPREFIX}" \ - LIB="$(get_libdir)" \ - RUN=run \ - plugindir="${EPREFIX}/$(get_libdir)/multipath" \ - unitdir="$(systemd_get_systemunitdir)" \ - libudevdir="${EPREFIX}/$(get_udevdir)" \ - pkgconfdir="${EPREFIX}/usr/$(get_libdir)/pkgconfig" \ - GENTOO_CFLAGS="${CFLAGS}" \ - GENTOO_CPPFLAGS="${CPPFLAGS}" \ - install - - rmdir "${ED}"/usr/include - rmdir "${ED}"/usr/share - mv "${ED}"/include "${ED}"/usr/include || die - mv "${ED}"/share "${ED}"/usr/share || die - einstalldocs - - newinitd "${FILESDIR}"/multipathd-r1.rc multipathd - newinitd "${FILESDIR}"/multipath.rc multipath - - find "${ED}" -type f -name '*.la' -delete || die -} - -pkg_postinst() { - tmpfiles_process /usr/lib/tmpfiles.d/multipath.conf - udev_reload - - if [[ -z ${REPLACING_VERSIONS} ]] ; then - elog "If you need multipath on your system, you must" - elog "add 'multipath' into your boot runlevel!" - fi -} - -pkg_postrm() { - udev_reload -} -- cgit v1.2.3