commit: 60752de8427e908020accfe6964087b19641664e Author: Andreas K. Hüttel <dilfridge <AT> gentoo <DOT> org> AuthorDate: Fri Nov 1 14:35:45 2024 +0000 Commit: Andreas K. Hüttel <dilfridge <AT> gentoo <DOT> org> CommitDate: Fri Nov 1 14:35:45 2024 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=60752de8
sys-fs/multipath-tools: drop 0.9.7, 0.9.7-r1 Bug: https://bugs.gentoo.org/926145 Signed-off-by: Andreas K. Hüttel <dilfridge <AT> gentoo.org> sys-fs/multipath-tools/Manifest | 1 - ...ll-pointer-dereference-in-uev_update_path.patch | 28 ------ .../multipath-tools-0.9.7-r1.ebuild | 106 --------------------- .../multipath-tools/multipath-tools-0.9.7.ebuild | 105 -------------------- 4 files changed, 240 deletions(-) diff --git a/sys-fs/multipath-tools/Manifest b/sys-fs/multipath-tools/Manifest index 4be7fb5a794c..8a61ea0267a9 100644 --- a/sys-fs/multipath-tools/Manifest +++ b/sys-fs/multipath-tools/Manifest @@ -1,2 +1 @@ -DIST multipath-tools-0.9.7.tar.gz 570416 BLAKE2B ed3f47d648685f691a69d83ad36f39b279f3a5b1cf1cb15151841ea26d629df3a33ab9a186bbf6922264805cc3bc37d09f22e611215f1972e33b26e08ff71bc2 SHA512 0f4c97179a3de5a0c77893fec229eb183293fed8e5e01a9945b261845ccf5d13f8ef2c2ff0c17c9345217d236275caed4765422ec95aed80821f11658bf96e26 DIST multipath-tools-0.9.8.tar.gz 580531 BLAKE2B 66bc6b78795c08b4fe5f4bc718330be51b073dddb597998f384ccaf746c0b9e53e21d674623df03ed7f9ccd9800fe988add8068e0eaaeace076c00395453ba0a SHA512 4d73bcf6bce769a829c306c609b206ddba65a708620f458106e406dd18d12f9a9d97f400662daa8e6a75c9fdf7decb6dcbda92cb807b6c53522c7b4b2795b627 diff --git a/sys-fs/multipath-tools/files/multipath-tools-0.9.7-null-pointer-dereference-in-uev_update_path.patch b/sys-fs/multipath-tools/files/multipath-tools-0.9.7-null-pointer-dereference-in-uev_update_path.patch deleted file mode 100644 index 0210563bd7c0..000000000000 --- a/sys-fs/multipath-tools/files/multipath-tools-0.9.7-null-pointer-dereference-in-uev_update_path.patch +++ /dev/null @@ -1,28 +0,0 @@ -From fc8b102c666d7fbad9242dea43a64941399a1c0d Mon Sep 17 00:00:00 2001 -From: Benjamin Marzinski <[email protected]> -Date: Tue, 16 Jan 2024 20:19:11 -0500 -Subject: [PATCH] multipathd: fix null pointer dereference in uev_update_path - -The Auto-resize code added a check that deferences pp->mpp without -checking that it's non-NULL. Fix it. - -Fixes: 981b83ad1 ("multipathd: Add auto_resize config option") -Signed-off-by: Benjamin Marzinski <[email protected]> -Reviewed-by: Martin Wilck <[email protected]> ---- - multipathd/main.c | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/multipathd/main.c b/multipathd/main.c -index 74f6cd92..fbc3f8da 100644 ---- a/multipathd/main.c -+++ b/multipathd/main.c -@@ -1630,7 +1630,7 @@ uev_update_path (struct uevent *uev, struct vectors * vecs) - } - } - } -- if (auto_resize != AUTO_RESIZE_NEVER && -+ if (auto_resize != AUTO_RESIZE_NEVER && mpp && - !mpp->wait_for_udev) { - struct pathgroup *pgp; - struct path *pp2; diff --git a/sys-fs/multipath-tools/multipath-tools-0.9.7-r1.ebuild b/sys-fs/multipath-tools/multipath-tools-0.9.7-r1.ebuild deleted file mode 100644 index fce73a60728c..000000000000 --- a/sys-fs/multipath-tools/multipath-tools-0.9.7-r1.ebuild +++ /dev/null @@ -1,106 +0,0 @@ -# Copyright 1999-2024 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=8 - -inherit flag-o-matic linux-info systemd tmpfiles 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 ~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 - sys-libs/readline:= - >=virtual/libudev-232-r3 - systemd? ( sys-apps/systemd ) -" -DEPEND=" - ${RDEPEND} - test? ( dev-util/cmocka ) -" -BDEPEND="virtual/pkgconfig" - -CONFIG_CHECK="~DM_MULTIPATH" - -PATCHES=( - "${FILESDIR}"/${PN}-0.9.7-remove-Werror.patch - "${FILESDIR}"/${P}-null-pointer-dereference-in-uev_update_path.patch -) - -myemake() { - local myemakeargs=( - prefix="${EPREFIX}" - usr_prefix="${EPREFIX}/usr" - LIB="$(get_libdir)" - RUN=run - plugindir="${EPREFIX}/$(get_libdir)/multipath" - unitdir="$(systemd_get_systemunitdir)" - libudevdir="${EPREFIX}$(get_udevdir)" - GENTOO_CFLAGS="${CFLAGS}" - GENTOO_CPPFLAGS="${CPPFLAGS}" - FORTIFY_OPT= - OPTFLAGS= - FAKEVAR=1 - V=1 - ) - - emake "${myemakeargs[@]}" "$@" -} - -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 - # Breaks with always_inline - filter-flags -fno-semantic-interposition - # Breaks because of use of wrapping (-Wl,-wrap, wrap_*) - # https://github.com/opensvc/multipath-tools/issues/18 - filter-lto - myemake -} - -src_test() { - myemake test -} - -src_install() { - dodir /sbin - - myemake DESTDIR="${ED}" install - - 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 -} diff --git a/sys-fs/multipath-tools/multipath-tools-0.9.7.ebuild b/sys-fs/multipath-tools/multipath-tools-0.9.7.ebuild deleted file mode 100644 index e85965ca2f8d..000000000000 --- a/sys-fs/multipath-tools/multipath-tools-0.9.7.ebuild +++ /dev/null @@ -1,105 +0,0 @@ -# Copyright 1999-2024 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=8 - -inherit flag-o-matic linux-info systemd tmpfiles 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 ~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 - sys-libs/readline:= - >=virtual/libudev-232-r3 - systemd? ( sys-apps/systemd ) -" -DEPEND=" - ${RDEPEND} - test? ( dev-util/cmocka ) -" -BDEPEND="virtual/pkgconfig" - -CONFIG_CHECK="~DM_MULTIPATH" - -PATCHES=( - "${FILESDIR}"/${PN}-0.9.7-remove-Werror.patch -) - -myemake() { - local myemakeargs=( - prefix="${EPREFIX}" - usr_prefix="${EPREFIX}/usr" - LIB="$(get_libdir)" - RUN=run - plugindir="${EPREFIX}/$(get_libdir)/multipath" - unitdir="$(systemd_get_systemunitdir)" - libudevdir="${EPREFIX}$(get_udevdir)" - GENTOO_CFLAGS="${CFLAGS}" - GENTOO_CPPFLAGS="${CPPFLAGS}" - FORTIFY_OPT= - OPTFLAGS= - FAKEVAR=1 - V=1 - ) - - emake "${myemakeargs[@]}" "$@" -} - -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 - # Breaks with always_inline - filter-flags -fno-semantic-interposition - # Breaks because of use of wrapping (-Wl,-wrap, wrap_*) - # https://github.com/opensvc/multipath-tools/issues/18 - filter-lto - myemake -} - -src_test() { - myemake test -} - -src_install() { - dodir /sbin - - myemake DESTDIR="${ED}" install - - 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 -}
