gentoo auto-resync : 22:02:2024 - 23:40:35

3 files changed, 133 insertions, 0 deletions

diff --git a/sys-fs/multipath-tools/Manifest b/sys-fs/multipath-tools/Manifest
index 988c077ce9bd..b9acb2077e79 100644
--- a/sys-fs/multipath-tools/Manifest
+++ b/sys-fs/multipath-tools/Manifest
@@ -1,5 +1,6 @@
 AUX multipath-tools-0.9.4-remove-Werror.patch 2173 BLAKE2B 38f7c335d1a8b9fab784892b7b9027a5e8d62747b301e757a4d49c8f3a4d753200cfb21877bccaf5b5918779a771aa9520695a33701d215bd1cf958b1d28969b SHA512 60e7393668afaa5c53ba30c8126df571c4ce658d6ac5de505ca38a4404729de377c65bed9e4f6e548ca15db05baced0b39229efeb84a587074484c3e8b5379f6
 AUX multipath-tools-0.9.4-test-fix.patch 1258 BLAKE2B 3b381e1e0690edf77503e2774651fb1c8a58348821e089315db71054fbf8c8a8cee68c037b52c43cd3703c5e42254a63d7b562b13f19b9809edff630404b2d2c SHA512 f24b75a6d0b198c2639d4933b89c48a9530563b399e8554e0349bb7848acb4197a55541ddab588d120e92cac00725ab7a029c438813b666a78f8d7a6c5ec8753
+AUX multipath-tools-0.9.7-null-pointer-dereference-in-uev_update_path.patch 983 BLAKE2B 14f51c1d3ae2151d1662981c9f00a7304a3604909fdf037a466108e3100f33dd99285d3fc546ce1a060afc2c0f29fea1c52ccc1d6617c0f17d7530771df6506d SHA512 b72a66f2b86d6ce31b2b228fd911d24d07801217ec4f2834c458657d26773d5a7a9994bf92c40c79109a9af01d11ad31e00442cb1f9525d805d217a2b93cec8f
 AUX multipath-tools-0.9.7-remove-Werror.patch 2469 BLAKE2B 2a234adf9fb79e70334428c7879b4558ac53a4d2b266e5373bd167cad4f65d085641f943e4327100ca0e4bf69a1d590225ba8aafa06ddc1c56696785b45dd905 SHA512 ab60eb8582c066b74918aeea2cf64bd684d012567f9d61763c9a896bb6afe003eddba648000d2e138c3532a580c64eb0a538a17a82961f61ec69bac14869044c
 AUX multipath.rc 565 BLAKE2B efb26199eddb75c5e87d1ab40aa8cb4fbaf9f7a2bfd7a20add6d55997d25de9a3dbf0d032c977593c2ee8d447539a34be0294ee3a80a80fb004dc2c51c8c64b5 SHA512 f08833fc3c928900f8c29438208b9715581bae426b1f45c246e8c418b210f7f9d35517ef9ad44db3d88944183b34e3411ece909b56892a9f3b7250fed49e43fe
 AUX multipathd-r1.rc 264 BLAKE2B f08733746c702da27e002b2cb07bbc1a1925002b1592c2f566aa8d66c71da5fd39fd6389636fc49b602f9051190ee5f7f85ad9ff35b924f51a2698e1a6654f0e SHA512 8cf764b59ed4bb13c3c2143cd83ee39bc87eca85c40acb3ed1dcd7cf4c39ecbdea7974b9705231d48377266c034a8623157648b9a99b6cef73617e4b37ad377e
@@ -10,5 +11,6 @@ DIST multipath-tools-0.9.7.tar.gz 570416 BLAKE2B ed3f47d648685f691a69d83ad36f39b
 EBUILD multipath-tools-0.9.3-r2.ebuild 2430 BLAKE2B 4e00be11956c5b7afc44dcad8e608b312a44aade65971951e48faa7fb1d492e84fa285548ad9740018e7ec4b49ecae29638989f03f3d6cbdb47d9d6ded201072 SHA512 9b99079b9090b73b2c8154cd389579919c1bdfd9275f01af679c244436a07bf969c12264655658a19e145cc496d7954a780ade5e6b2d53ca2bf80b0606a0da1a
 EBUILD multipath-tools-0.9.4-r1.ebuild 2003 BLAKE2B 392d31c886e8ed95d49de4cd7d5015ad65b74a582f81646601f83cfd67e5e6d69044752c6da892929fdf245cc90cdd5bc7254d192159872810f4c159749bb7e4 SHA512 3a513bc65b4d13cbe759b53a7d45cd51deecca962d8c2ce1f1a9470736efa2041fa749fc6739c0230eaa34a5d761ccb34bd63f579f453d8e165b58248cba11cc
 EBUILD multipath-tools-0.9.5.ebuild 1958 BLAKE2B ad92406184dd7ae8e4b01ab941d6fbb338178d5a2a213d844694e3fb8647dedfe4b91deb004a862d62233c7fa67012b314ae41cff9d917f6cc3e8943edd588d7 SHA512 c34061223a5f1e5e9cf39ef329a1a08f1ed25a8e7829274f2f0a32359787501eeaa63566167976f6a1d427887fd14b579185f59f9a3a05f788f004197d7af6e3
+EBUILD multipath-tools-0.9.7-r1.ebuild 2117 BLAKE2B 8b8a376392f98e029dafca1025acb0fd1f658280c72415bf09f974ed5a84ef2ce8b2cd2bcceb16611bc99f3602c3e221873bd4448c7979c97b6b9b62ea5880e2 SHA512 214cb337d547a3a29c603688abc87e87185ae7a0487a1ddf124e269f5b6ea3b20484e701e5c63711b711cab4c1088fd185bd812a60706c50c025f9683299f8df
 EBUILD multipath-tools-0.9.7.ebuild 2042 BLAKE2B b65a1aa569e51449e09ac8d76d8c303ed65f3e18632a724306d7aaed4e2e07d7680106466593c3376a2e927d4969a3242acc488dd6dfb48065cc7a1084ab4ed9 SHA512 9a1b4f74c7245be22abe55ae19ab0ed1c415fa97d1a445eeda79ed2077a5c45f9c179b58a4fd86419bee116d13dca3e57411fb1082d6637c077279fe0f06db5e
 MISC metadata.xml 346 BLAKE2B 8c5d2e150c70bdff56b05009f11d40663d9d969b07ecc88ff310fd4e756339d2f9a4a6b351b14c6cebc69ed36f17eb0500a0ba2b34f7c6b75c3864d1e090a46f SHA512 ffb0aab5f2d8bbdf83e0df3cc84cd239649e94e1189ba4702221091469309d3d49783c6943aae27eb34e3373f3e07a571930a361058d9a3b67f725781c47b87e
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
new file mode 100644
index 000000000000..0210563bd7c0
--- /dev/null
+++ b/sys-fs/multipath-tools/files/multipath-tools-0.9.7-null-pointer-dereference-in-uev_update_path.patch
@@ -0,0 +1,28 @@
+From fc8b102c666d7fbad9242dea43a64941399a1c0d Mon Sep 17 00:00:00 2001
+From: Benjamin Marzinski <bmarzins@redhat.com>
+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 <bmarzins@redhat.com>
+Reviewed-by: Martin Wilck <mwilck@suse.com>
+---
+ 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
new file mode 100644
index 000000000000..d0757b9e83ff
--- /dev/null
+++ b/sys-fs/multipath-tools/multipath-tools-0.9.7-r1.ebuild
@@ -0,0 +1,103 @@
+# 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 ~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
+	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
+	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
+}