[gentoo-commits] repo/gentoo:master commit in: sys-fs/multipath-tools/, sys-fs/multipath-tools/files/

public inbox for gentoo-commits@lists.gentoo.org
 help / color / mirror / Atom feed

* [gentoo-commits] repo/gentoo:master commit in: sys-fs/multipath-tools/, sys-fs/multipath-tools/files/
@ 2017-01-07 21:49 Robin H. Johnson
  0 siblings, 0 replies; 13+ messages in thread
From: Robin H. Johnson @ 2017-01-07 21:49 UTC (permalink / raw
  To: gentoo-commits

commit:     464cae287dd74763239b33d48b871224a888cb50
Author:     Anthony Ryan <anthonyryan1 <AT> gmail <DOT> com>
AuthorDate: Wed Jan  4 21:51:16 2017 +0000
Commit:     Robin H. Johnson <robbat2 <AT> gentoo <DOT> org>
CommitDate: Sat Jan  7 21:49:28 2017 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=464cae28

sys-fs/multipath-tools: Version bump 0.6.4

Gentoo-bug: 604228

* Include patch for sysmacros
* Remove patch for makefile (building still performs a few unnecessary
  operations, but the cost is negligible compared to the cost of
  carrying yet another patch.
* Remove COMMIT_ID
* Remove some unnecessary definitions
* Include a way to disable ceph when building
* Add linux-info to check for CONFIG_DM_MULTIPATH

Package-Manager: Portage-2.3.3, Repoman-2.3.1
(cherry picked from commit ef97e67d7cb4b009af471dd2fafdf463960a909d)
Signed-off-by: Robin H. Johnson <robbat2 <AT> gentoo.org>

 sys-fs/multipath-tools/Manifest                    |  1 +
 .../files/multipath-tools-0.6.4-sysmacros.patch    | 60 ++++++++++++++
 sys-fs/multipath-tools/metadata.xml                | 11 ++-
 .../multipath-tools/multipath-tools-0.6.4.ebuild   | 92 ++++++++++++++++++++++
 4 files changed, 160 insertions(+), 4 deletions(-)

diff --git a/sys-fs/multipath-tools/Manifest b/sys-fs/multipath-tools/Manifest
index a820e93..551033c 100644
--- a/sys-fs/multipath-tools/Manifest
+++ b/sys-fs/multipath-tools/Manifest
@@ -1,2 +1,3 @@
 DIST multipath-tools-0.5.0.tar.bz2 184024 SHA256 f13cf1eb84e94e83b2019e68f7965526903c13e94246db43965d181668a0a6f9 SHA512 dfad21c45d0f69e39041d30d203a582c8ee8329bf390c51cde10155b3de379e7ad8fead2ac4beb268a924fd7e7dc8e1cf538ea3c70d41479fd8786fa30ba22a9 WHIRLPOOL bc8a365d66d1c5f584de04304125949926d4a1576cba4a00acca0f1333eb13d83318da36d9d88c5dc92691a331d427ad6b99eb1f2983fbc387303dbfdbae11ff
 DIST multipath-tools-0.6.2.tar.gz 242413 SHA256 f5cec5d92d56ec99220fccc1e70b9d10bc8ff5039c809ebcc201ce34d7ee3095 SHA512 8a04302002bf778299495e4be2d4302c19350d8ec218da23c5f781233efa6d0b39208a676b0d770771d7f09d62fa2b1ce32c03f60662691f74afb111e918b639 WHIRLPOOL f040273bd188c30f2f3b87e21a403b5f5d3ce2f0918382890cc0750b803bf05f70ed6bf46a83c5b68137835bc9bcf6cbca14f6462cfbef660667118b59eafc7d
+DIST multipath-tools-0.6.4.tar.gz 285448 SHA256 1e2747883320f7db854201e5bfb97216e7518468f03503985382ce2c69e5558b SHA512 ec35c6c26c3b233ebece7136ea99dd4c0dff2927e7b543e7091219dc7065fe87e609a1eda9ab6d08399d44fe882d70c8dbe6be9ab175d154c5dd2d12ee1d86ea WHIRLPOOL 6138ba1cbb814bbf53e7a5113f50325d7a7d7088ff2b0f83f1e574f0644241e368cc6b5223eca039b414a0a459a52413d396ea214ff3eaa57f0681e8322b2d9d

diff --git a/sys-fs/multipath-tools/files/multipath-tools-0.6.4-sysmacros.patch b/sys-fs/multipath-tools/files/multipath-tools-0.6.4-sysmacros.patch
new file mode 100644
index 00000000..99a12fc
--- /dev/null
+++ b/sys-fs/multipath-tools/files/multipath-tools-0.6.4-sysmacros.patch
@@ -0,0 +1,60 @@
+diff --git a/kpartx/dasd.c b/kpartx/dasd.c
+index 1206e45..f50c1bd 100644
+--- a/kpartx/dasd.c
++++ b/kpartx/dasd.c
+@@ -28,6 +28,7 @@
+ #include <inttypes.h>
+ #include <sys/types.h>
+ #include <sys/stat.h>
++#include <sys/sysmacros.h>
+ #include <sys/ioctl.h>
+ #include <linux/hdreg.h>
+ #include <errno.h>
+diff --git a/kpartx/kpartx.c b/kpartx/kpartx.c
+index d31fea8..3452787 100644
+--- a/kpartx/kpartx.c
++++ b/kpartx/kpartx.c
+@@ -28,6 +28,7 @@
+ #include <stdint.h>
+ #include <sys/ioctl.h>
+ #include <sys/stat.h>
++#include <sys/sysmacros.h>
+ #include <sys/types.h>
+ #include <ctype.h>
+ #include <libdevmapper.h>
+diff --git a/libmultipath/checkers/tur.c b/libmultipath/checkers/tur.c
+index 4d6c3c2..d9a9e67 100644
+--- a/libmultipath/checkers/tur.c
++++ b/libmultipath/checkers/tur.c
+@@ -11,6 +11,7 @@
+ #include <unistd.h>
+ #include <fcntl.h>
+ #include <sys/ioctl.h>
++#include <sys/sysmacros.h>
+ #include <errno.h>
+ #include <sys/time.h>
+ #include <pthread.h>
+diff --git a/libmultipath/devmapper.c b/libmultipath/devmapper.c
+index 4f8ef13..9c0b240 100644
+--- a/libmultipath/devmapper.c
++++ b/libmultipath/devmapper.c
+@@ -12,6 +12,7 @@
+ #include <ctype.h>
+ #include <unistd.h>
+ #include <errno.h>
++#include <sys/sysmacros.h>
+ 
+ #include "checkers.h"
+ #include "vector.h"
+diff --git a/libmultipath/util.c b/libmultipath/util.c
+index 03a5738..1841f35 100644
+--- a/libmultipath/util.c
++++ b/libmultipath/util.c
+@@ -4,6 +4,7 @@
+ #include <pthread.h>
+ #include <string.h>
+ #include <sys/stat.h>
++#include <sys/sysmacros.h>
+ #include <sys/types.h>
+ #include <unistd.h>
+ 

diff --git a/sys-fs/multipath-tools/metadata.xml b/sys-fs/multipath-tools/metadata.xml
index 56c1244..9a20c9e 100644
--- a/sys-fs/multipath-tools/metadata.xml
+++ b/sys-fs/multipath-tools/metadata.xml
@@ -1,8 +1,11 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<maintainer type="project">
-	<email>base-system@gentoo.org</email>
-	<name>Gentoo Base System</name>
-</maintainer>
+	<maintainer type="project">
+		<email>base-system@gentoo.org</email>
+		<name>Gentoo Base System</name>
+	</maintainer>
+	<use>
+		<flag name="rbd">Enable Rados block device support via <pkg>sys-cluster/ceph</pkg></flag>
+	</use>
 </pkgmetadata>

diff --git a/sys-fs/multipath-tools/multipath-tools-0.6.4.ebuild b/sys-fs/multipath-tools/multipath-tools-0.6.4.ebuild
new file mode 100644
index 00000000..6d4e372
--- /dev/null
+++ b/sys-fs/multipath-tools/multipath-tools-0.6.4.ebuild
@@ -0,0 +1,92 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=6
+
+inherit linux-info systemd toolchain-funcs udev vcs-snapshot
+
+DESCRIPTION="Device mapper target autoconfig"
+HOMEPAGE="http://christophe.varoqui.free.fr/"
+SRC_URI="http://git.opensvc.com/?p=multipath-tools/.git;a=snapshot;h=${PV};sf=tgz -> ${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~x86"
+IUSE="systemd rbd"
+
+RDEPEND=">=sys-fs/lvm2-2.02.45
+	>=virtual/udev-171
+	dev-libs/libaio
+	dev-libs/userspace-rcu
+	sys-libs/readline:0=
+	rbd? ( sys-cluster/ceph )
+	systemd? ( sys-apps/systemd )"
+DEPEND="${RDEPEND}
+	virtual/pkgconfig"
+
+CONFIG_CHECK="~DM_MULTIPATH"
+
+PATCHES=(
+	# modprobe fails when modules are compiled statically into the kernel
+	# https://www.redhat.com/archives/dm-devel/2017-January/msg00043.html
+	"${FILESDIR}"/${PN}-0.6.2-ignore-modprobe-failures.patch
+
+	# https://bugs.gentoo.org/show_bug.cgi?id=604228
+	# https://www.redhat.com/archives/dm-devel/2017-January/msg00022.html
+	"${FILESDIR}"/${P}-sysmacros.patch
+)
+
+get_systemd_pv() {
+	use systemd && \
+		$(tc-getPKG_CONFIG) --modversion systemd
+}
+
+pkg_pretend() {
+	linux-info_pkg_setup
+}
+
+pkg_setup() {
+	linux-info_pkg_setup
+}
+
+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 proer configure system
+	if ! use rbd ; then
+		sed -i -e "s/libcheckrbd.so/# libcheckrbd.so/" libmultipath/checkers/Makefile
+		sed -i -e "s/-lrados//" libmultipath/checkers/Makefile
+	fi
+}
+
+src_compile() {
+	# LIBDM_API_FLUSH involves grepping files in /usr/include,
+	# so force the test to go the way we want #411337.
+	emake \
+		LIBDM_API_FLUSH=1 SYSTEMD="$(get_systemd_pv)"
+}
+
+src_install() {
+	dodir /sbin /usr/share/man/man{5,8}
+	emake \
+		DESTDIR="${D}" \
+		SYSTEMD=$(get_systemd_pv) \
+		unitdir="$(systemd_get_systemunitdir)" \
+		libudevdir='${prefix}'/"$(get_udevdir)" \
+		install
+
+	newinitd "${FILESDIR}"/rc-multipathd multipathd
+	newinitd "${FILESDIR}"/multipath.rc multipath
+
+	einstalldocs
+}
+
+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
+}


^ permalink raw reply related	[flat|nested] 13+ messages in thread

* [gentoo-commits] repo/gentoo:master commit in: sys-fs/multipath-tools/, sys-fs/multipath-tools/files/
@ 2017-10-10 19:47 Thomas Deutschmann
  0 siblings, 0 replies; 13+ messages in thread
From: Thomas Deutschmann @ 2017-10-10 19:47 UTC (permalink / raw
  To: gentoo-commits

commit:     6a1123b2ad8fa7c112797aa49212059e6cb12a2f
Author:     Thomas Deutschmann <whissi <AT> gentoo <DOT> org>
AuthorDate: Tue Oct 10 19:40:22 2017 +0000
Commit:     Thomas Deutschmann <whissi <AT> gentoo <DOT> org>
CommitDate: Tue Oct 10 19:47:44 2017 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=6a1123b2

sys-fs/multipath-tools: Bump to v0.7.3

Package-Manager: Portage-2.3.10, Repoman-2.3.3

 sys-fs/multipath-tools/Manifest                    |  1 +
 ...ath-tools-0.7.3-fix-build-without-systemd.patch | 39 +++++++++
 .../multipath-tools/multipath-tools-0.7.3.ebuild   | 96 ++++++++++++++++++++++
 3 files changed, 136 insertions(+)

diff --git a/sys-fs/multipath-tools/Manifest b/sys-fs/multipath-tools/Manifest
index f62c491023d..e732cfda8c4 100644
--- a/sys-fs/multipath-tools/Manifest
+++ b/sys-fs/multipath-tools/Manifest
@@ -2,3 +2,4 @@ DIST multipath-tools-0.5.0.tar.bz2 184024 SHA256 f13cf1eb84e94e83b2019e68f796552
 DIST multipath-tools-0.6.4.tar.gz 285448 SHA256 1e2747883320f7db854201e5bfb97216e7518468f03503985382ce2c69e5558b SHA512 ec35c6c26c3b233ebece7136ea99dd4c0dff2927e7b543e7091219dc7065fe87e609a1eda9ab6d08399d44fe882d70c8dbe6be9ab175d154c5dd2d12ee1d86ea WHIRLPOOL 6138ba1cbb814bbf53e7a5113f50325d7a7d7088ff2b0f83f1e574f0644241e368cc6b5223eca039b414a0a459a52413d396ea214ff3eaa57f0681e8322b2d9d
 DIST multipath-tools-0.7.1.tar.gz 329008 SHA256 d788aaf3ea862b44b5aa07eaa0e5696061f972a1a46d0f469c4a4f4c477c1970 SHA512 81ceb3887250a691b94cb49b7141ace4fc1f69d7f8381e517560dfc7c51ee4c5a1f4f4e40a0b368cf5f7381697fa746b856cbade8990c1608cbcd77248946a82 WHIRLPOOL 2bcc7cc2f425ca3f3f634807cafb7817b54b83d82987a09c9dd530dca1375175a7d52f1854bdd6d5f37c3b1fcf7bc34d67fc2dcae5809dfae968b313c8c86cba
 DIST multipath-tools-0.7.2.tar.gz 335187 SHA256 e4273527b8a8e31d596221dd74fdeb9f2b7558d59e514bc7eb040d077bddf24b SHA512 9637e6c69ecfe8dbfb55794569017051961dbe39fa1019000e4be9c2c888a5b6d13ae360af8738bb1fb89a8d27ec833ff0075b1d066b8b3ca21cd9832f477046 WHIRLPOOL 051956ab5c899ce98833925f84245f7450c7c01012edafdb6fff39762cf87908f53413c42f2ccb6059fd2717d29bf55ded260ade027b37ef0227a46b8266d8c7
+DIST multipath-tools-0.7.3.tar.gz 344030 SHA256 b59712c3068b9b33c2fc769eb499c637a0ddff7b46ae9d2cc411c4d61e233ffb SHA512 fbcd5609bcb4f80a91410cec86882e9f39ee056edb314382f25db8e1e1ed5c084e14849a67502be2b11a2e980dc2cb5d34235885476ae5ce62809a175bee9ace WHIRLPOOL 03b99202d2831513ba1fcc3e504ba3554b970c5bc366288a50e62e2225028dff972c102b7ae93d026026bea6614b5305a605122c91e0b8deeb91f9c98a68119f

diff --git a/sys-fs/multipath-tools/files/multipath-tools-0.7.3-fix-build-without-systemd.patch b/sys-fs/multipath-tools/files/multipath-tools-0.7.3-fix-build-without-systemd.patch
new file mode 100644
index 00000000000..d92e5c05c7d
--- /dev/null
+++ b/sys-fs/multipath-tools/files/multipath-tools-0.7.3-fix-build-without-systemd.patch
@@ -0,0 +1,39 @@
+From f0a874f9bd86504840a7bdbf0a0c07bcd0ea8c29 Mon Sep 17 00:00:00 2001
+From: Michael Lass <bevan@bi-co.net>
+Date: Wed, 20 Sep 2017 21:54:32 +0200
+Subject: [PATCH] multipathd: fix build without systemd
+
+do_sd_notify contains a call to sd_notify which is unknown if USE_SYSTEMD is
+undefined. In this case, do_sd_notify is never called anyway, so embed the
+entire function into an #ifdef USE_SYSTEMD.
+
+This fixes a regression introduced in 88ddca5.
+
+Signed-off-by: Michael Lass <bevan@bi-co.net>
+---
+ multipathd/main.c | 2 ++
+ 1 file changed, 2 insertions(+)
+
+diff --git a/multipathd/main.c b/multipathd/main.c
+index 8049da22..bbe14771 100644
+--- a/multipathd/main.c
++++ b/multipathd/main.c
+@@ -169,6 +169,7 @@ sd_notify_status(void)
+ 	return NULL;
+ }
+ 
++#ifdef USE_SYSTEMD
+ static void do_sd_notify(enum daemon_status old_state)
+ {
+ 	/*
+@@ -181,6 +182,7 @@ static void do_sd_notify(enum daemon_status old_state)
+ 		return;
+ 	sd_notify(0, sd_notify_status());
+ }
++#endif
+ 
+ static void config_cleanup(void *arg)
+ {
+-- 
+2.14.1
+

diff --git a/sys-fs/multipath-tools/multipath-tools-0.7.3.ebuild b/sys-fs/multipath-tools/multipath-tools-0.7.3.ebuild
new file mode 100644
index 00000000000..577cbe8db1b
--- /dev/null
+++ b/sys-fs/multipath-tools/multipath-tools-0.7.3.ebuild
@@ -0,0 +1,96 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+inherit linux-info systemd toolchain-funcs udev vcs-snapshot toolchain-funcs
+
+DESCRIPTION="Device mapper target autoconfig"
+HOMEPAGE="http://christophe.varoqui.free.fr/"
+SRC_URI="http://git.opensvc.com/?p=multipath-tools/.git;a=snapshot;h=${PV};sf=tgz -> ${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~x86"
+IUSE="systemd rbd"
+
+RDEPEND="
+	dev-libs/json-c
+	dev-libs/libaio
+	dev-libs/userspace-rcu
+	>=sys-fs/lvm2-2.02.45
+	>=virtual/udev-171
+	sys-libs/readline:0=
+	rbd? ( sys-cluster/ceph )
+	systemd? ( sys-apps/systemd )
+"
+DEPEND="
+	${RDEPEND}
+	virtual/pkgconfig
+"
+
+CONFIG_CHECK="~DM_MULTIPATH"
+
+PATCHES=( "${FILESDIR}"/${PN}-0.7.3-fix-build-without-systemd.patch )
+
+get_systemd_pv() {
+	use systemd && \
+		$(tc-getPKG_CONFIG) --modversion systemd
+}
+
+pkg_pretend() {
+	linux-info_pkg_setup
+}
+
+pkg_setup() {
+	linux-info_pkg_setup
+}
+
+src_prepare() {
+	default
+
+	# Fix for bug #624884
+	if grep -qF DM_TABLE_STATE kpartx/kpartx.rules ; then
+		sed '/DM_TABLE_STATE/d' -i kpartx/kpartx.rules || die
+	else
+		elog "DM_TABLE_STATE sed hack is no longer necessary."
+	fi
+
+	# 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 proer configure system
+	if ! use rbd ; then
+		sed -i -e "s/libcheckrbd.so/# libcheckrbd.so/" libmultipath/checkers/Makefile
+		sed -i -e "s/-lrados//" libmultipath/checkers/Makefile
+	fi
+}
+
+src_compile() {
+	# LIBDM_API_FLUSH involves grepping files in /usr/include,
+	# so force the test to go the way we want #411337.
+	emake \
+		CC="$(tc-getCC)" \
+		LIBDM_API_FLUSH=1 SYSTEMD="$(get_systemd_pv)"
+}
+
+src_install() {
+	dodir /sbin /usr/share/man/man{5,8}
+	emake \
+		DESTDIR="${D}" \
+		SYSTEMD=$(get_systemd_pv) \
+		unitdir="$(systemd_get_systemunitdir)" \
+		libudevdir='${prefix}'/"$(get_udevdir)" \
+		install
+
+	newinitd "${FILESDIR}"/rc-multipathd multipathd
+	newinitd "${FILESDIR}"/multipath.rc multipath
+
+	einstalldocs
+}
+
+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
+}


^ permalink raw reply related	[flat|nested] 13+ messages in thread

* [gentoo-commits] repo/gentoo:master commit in: sys-fs/multipath-tools/, sys-fs/multipath-tools/files/
@ 2018-11-23 10:35 Lars Wendler
  0 siblings, 0 replies; 13+ messages in thread
From: Lars Wendler @ 2018-11-23 10:35 UTC (permalink / raw
  To: gentoo-commits

commit:     75bc6a33728394d3341a0b0abd8875d1adb6775a
Author:     Lars Wendler <polynomial-c <AT> gentoo <DOT> org>
AuthorDate: Fri Nov 23 10:35:49 2018 +0000
Commit:     Lars Wendler <polynomial-c <AT> gentoo <DOT> org>
CommitDate: Fri Nov 23 10:35:49 2018 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=75bc6a33

sys-fs/multipath-tools: Removed old.

Package-Manager: Portage-2.3.52, Repoman-2.3.12
Signed-off-by: Lars Wendler <polynomial-c <AT> gentoo.org>

 sys-fs/multipath-tools/Manifest                    |   1 -
 .../files/multipath-tools-0.5.0-makefile.patch     | 200 ---------------------
 .../multipath-tools-0.5.0-systemd-pkgconfig.patch  |  24 ---
 .../multipath-tools-0.5.0-r1.ebuild                |  65 -------
 4 files changed, 290 deletions(-)

diff --git a/sys-fs/multipath-tools/Manifest b/sys-fs/multipath-tools/Manifest
index 9fd04cc7c00..fd21d742f18 100644
--- a/sys-fs/multipath-tools/Manifest
+++ b/sys-fs/multipath-tools/Manifest
@@ -1,4 +1,3 @@
-DIST multipath-tools-0.5.0.tar.bz2 184024 BLAKE2B 1e1b0fdd52bf0aaea3ed281e0cd89d04aed58c03b9b42ac094173bebdf3b81e368d0c7efb23a8748d4598c99d1502fdf5f8b2c9b64a2be4ce7d6b30fa607984a SHA512 dfad21c45d0f69e39041d30d203a582c8ee8329bf390c51cde10155b3de379e7ad8fead2ac4beb268a924fd7e7dc8e1cf538ea3c70d41479fd8786fa30ba22a9
 DIST multipath-tools-0.6.4.tar.gz 285448 BLAKE2B 1b63c4e712e682965c595ed988a6590e181abd4d37779b72b52f4e415d4caba33df518a1ea1e3b460d15b5a78f4db5a75c1066439eb40c503023007c1f70752a SHA512 ec35c6c26c3b233ebece7136ea99dd4c0dff2927e7b543e7091219dc7065fe87e609a1eda9ab6d08399d44fe882d70c8dbe6be9ab175d154c5dd2d12ee1d86ea
 DIST multipath-tools-0.7.8.tar.gz 415900 BLAKE2B 04c237e91f8e56484603d5b5ec7504da6be1caf9564d21a9fa4be7268fbb88089b8446c959b57f859eb9696f39cbb82bffdcd3d0a6716da6487bedd5c18c0d8b SHA512 500a51f9e8c5cc0ad04cc69c39f657e8058a08750d506b447c4a1131ad7308d43de19d79e98fa8254c56cd7eb1e832c8ccbc439ce94054db7eeebcdf2bf225cb
 DIST multipath-tools-0.7.9.tar.gz 419377 BLAKE2B 29003b7ce2d673eb59d869e2165028654361ca31f49b8e810d90611db249a5183492959d3aef778b870df7c1d283004bda88f3cc6f760569247f1ccc61617379 SHA512 6b237f148c239938b9f46a1a8118fc070372d5f2cfe2021c26ad9ca15d37e8866390168b6a4f13adcc5538001354247e072559a0add33ce1fe8245ae64ed0a3c

diff --git a/sys-fs/multipath-tools/files/multipath-tools-0.5.0-makefile.patch b/sys-fs/multipath-tools/files/multipath-tools-0.5.0-makefile.patch
deleted file mode 100644
index 691b138731f..00000000000
--- a/sys-fs/multipath-tools/files/multipath-tools-0.5.0-makefile.patch
+++ /dev/null
@@ -1,200 +0,0 @@
---- multipath-tools-0.5.0/kpartx/Makefile
-+++ multipath-tools-0.5.0/kpartx/Makefile
-@@ -12,7 +12,7 @@
- 	CFLAGS += -DLIBDM_API_COOKIE
- endif
- 
--LDFLAGS = -ldevmapper
-+LIBS = -ldevmapper
- OBJS = bsd.o dos.o kpartx.o solaris.o unixware.o dasd.o sun.o \
-        gpt.o mac.o ps3.o crc32.o lopart.o xstrncpy.o devmapper.o
- EXEC = kpartx
-@@ -20,8 +20,7 @@
- all: $(EXEC)
- 
- $(EXEC): $(OBJS)
--	$(CC) $(OBJS) -o $(EXEC) $(LDFLAGS)
--	$(GZIP) $(EXEC).8 > $(EXEC).8.gz
-+	$(CC) $(CFLAGS) $(LDFLAGS) $(OBJS) $(LIBS) -o $(EXEC)
- 
- install: $(EXEC) $(EXEC).8
- 	$(INSTALL_PROGRAM) -d $(DESTDIR)$(bindir)
-@@ -29,14 +28,15 @@
- 	$(INSTALL_PROGRAM) -d $(DESTDIR)$(libudevdir)
- 	$(INSTALL_PROGRAM) -m 755 kpartx_id $(DESTDIR)$(libudevdir)
- 	$(INSTALL_PROGRAM) -d $(DESTDIR)/etc/udev/rules.d
--	$(INSTALL_PROGRAM) -m 644 kpartx.rules $(DESTDIR)/etc/udev/rules.d/
-+	$(INSTALL_PROGRAM) -m 644 kpartx.rules $(DESTDIR)/etc/udev/rules.d/66-kpartx.rules
- 	$(INSTALL_PROGRAM) -d $(DESTDIR)$(mandir)
--	$(INSTALL_PROGRAM) -m 644 $(EXEC).8.gz $(DESTDIR)$(mandir)
-+	$(INSTALL_PROGRAM) -m 644 $(EXEC).8 $(DESTDIR)$(mandir)
- 
- uninstall:
- 	rm -f $(DESTDIR)$(bindir)/$(EXEC)
--	rm -f $(DESTDIR)$(mandir)/$(EXEC).8.gz
-+	rm -f $(DESTDIR)$(mandir)/$(EXEC).8
- 	rm -f $(DESTDIR)$(libudevdir)/kpartx_id
-+	rm -f $(DESTDIR)/etc/udev/rules.d/66-kpartx.rules
- 
- clean:
--	rm -f core *.o $(EXEC) *.gz
-+	rm -f core *.o $(EXEC)
---- multipath-tools-0.5.0/libmpathpersist/Makefile
-+++ multipath-tools-0.5.0/libmpathpersist/Makefile
-@@ -22,8 +22,6 @@
- 	$(CC) -Wall -fPIC -c $(CFLAGS) *.c 
- 	$(CC)  -shared $(LIBDEPS) -Wl,-soname=$@ $(CFLAGS) -o $@ $(OBJS)
- 	ln -s $(LIBS) $(DEVLIB)
--	$(GZIP) mpath_persistent_reserve_in.3 > mpath_persistent_reserve_in.3.gz	
--	$(GZIP) mpath_persistent_reserve_out.3 > mpath_persistent_reserve_out.3.gz	
- 
- install: $(LIBS)
- 	$(INSTALL_PROGRAM) -d $(DESTDIR)$(syslibdir)
-@@ -31,19 +29,17 @@
- 	$(INSTALL_PROGRAM) -m 755 -d $(DESTDIR)$(syslibdir)
- 	$(INSTALL_PROGRAM) -m 755 -d $(DESTDIR)$(man3dir)
- 	$(INSTALL_PROGRAM) -m 755 -d $(DESTDIR)/usr/include/
--	$(INSTALL_PROGRAM) -m 755 -d $(DESTDIR)/usr/share/doc/mpathpersist/
--	ln -sf $(DESTDIR)$(syslibdir)/$(LIBS) $(DESTDIR)$(syslibdir)/$(DEVLIB)
--	install -m 644 mpath_persistent_reserve_in.3.gz $(DESTDIR)$(man3dir)	
--	install -m 644 mpath_persistent_reserve_out.3.gz $(DESTDIR)$(man3dir)	
--	install -m 644 mpath_persist.h $(DESTDIR)/usr/include/
-+	$(INSTALL_PROGRAM) -m 644 mpath_persistent_reserve_in.3 $(DESTDIR)$(man3dir)
-+	$(INSTALL_PROGRAM) -m 644 mpath_persistent_reserve_out.3 $(DESTDIR)$(man3dir)
-+	$(INSTALL_PROGRAM) -m 644 mpath_persist.h $(DESTDIR)/usr/include/
- 
- uninstall:
- 	rm -f $(DESTDIR)$(syslibdir)/$(LIBS)
--	rm $(DESTDIR)$(mandir)/mpath_persistent_reserve_in.3.gz	
--	rm $(DESTDIR)$(mandir)/mpath_persistent_reserve_out.3.gz	
-+	rm $(DESTDIR)$(mandir)/mpath_persistent_reserve_in.3	
-+	rm $(DESTDIR)$(mandir)/mpath_persistent_reserve_out.3	
- 
- clean:
- 	rm -f core *.a *.o 
- 	rm -f libmpathpersist.so.0
- 	rm -f libmpathpersist.so
--	rm -f mpath_persistent_reserve_in.3.gz mpath_persistent_reserve_out.3.gz
-+	rm -f mpath_persistent_reserve_in.3 mpath_persistent_reserve_out.3
---- multipath-tools-0.5.0/Makefile.inc
-+++ multipath-tools-0.5.0/Makefile.inc
-@@ -48,8 +48,8 @@
- 	RPM_OPT_FLAGS = -O2 -g -pipe -Wall -Wp,-D_FORTIFY_SOURCE=2 -fexceptions -fstack-protector --param=ssp-buffer-size=4
- endif
- 
--OPTFLAGS     = $(RPM_OPT_FLAGS) -Wunused -Wstrict-prototypes
--CFLAGS	     = $(OPTFLAGS) -fPIC -DLIB_STRING=\"${LIB}\"
-+OPTFLAGS     = -Wall -Wunused -Wstrict-prototypes
-+CFLAGS	    += $(OPTFLAGS) -fPIC -DLIB_STRING=\"${LIB}\"
- SHARED_FLAGS = -shared
- 
- %.o:	%.c
---- multipath-tools-0.5.0/mpathpersist/Makefile
-+++ multipath-tools-0.5.0/mpathpersist/Makefile
-@@ -13,18 +13,17 @@
- 
- $(EXEC): $(OBJS)
- 	$(CC) -g $(OBJS) -o $(EXEC) $(LDFLAGS) $(CFLAGS)
--	$(GZIP) $(EXEC).8 > $(EXEC).8.gz
- 	
- install:
- 	install -d $(DESTDIR)$(bindir)
- 	install -m 755 $(EXEC) $(DESTDIR)$(bindir)/
- 	install -d $(DESTDIR)$(mandir)
--	install -m 644 $(EXEC).8.gz $(DESTDIR)$(mandir)
-+	install -m 644 $(EXEC).8 $(DESTDIR)$(mandir)
- 	
- clean:
- 	rm -f *.o $(EXEC)
--	rm -f mpathpersist.8.gz
-+	rm -f mpathpersist.8
- 
- uninstall:
- 	rm $(DESTDIR)$(bindir)/$(EXEC)
--	rm $(DESTDIR)$(mandir)/$(EXEC).8.gz
-+	rm $(DESTDIR)$(mandir)/$(EXEC).8
---- multipath-tools-0.5.0/multipath/Makefile
-+++ multipath-tools-0.5.0/multipath/Makefile
-@@ -7,29 +7,27 @@
- OBJS = main.o
- 
- CFLAGS += -I$(multipathdir)
--LDFLAGS += -lpthread -ldevmapper -ldl -L$(multipathdir) -lmultipath -ludev
-+LIBS += -lpthread -ldevmapper -ldl -L$(multipathdir) -lmultipath -ludev
- 
- EXEC = multipath
- 
- all: $(EXEC)
- 
- $(EXEC): $(OBJS)
--	$(CC) $(CFLAGS) $(OBJS) -o $(EXEC) $(LDFLAGS)
--	$(GZIP) $(EXEC).8 > $(EXEC).8.gz
--	$(GZIP) $(EXEC).conf.5 > $(EXEC).conf.5.gz
-+	$(CC) $(CFLAGS) $(LDFLAGS) $(OBJS) $(LIBS) -o $(EXEC)
- 
- install:
- 	$(INSTALL_PROGRAM) -d $(DESTDIR)$(bindir)
- 	$(INSTALL_PROGRAM) -m 755 $(EXEC) $(DESTDIR)$(bindir)/
- 	$(INSTALL_PROGRAM) -d $(DESTDIR)$(mandir)
--	$(INSTALL_PROGRAM) -m 644 $(EXEC).8.gz $(DESTDIR)$(mandir)
-+	$(INSTALL_PROGRAM) -m 644 $(EXEC).8 $(DESTDIR)$(mandir)
- 	$(INSTALL_PROGRAM) -d $(DESTDIR)$(man5dir)
--	$(INSTALL_PROGRAM) -m 644 $(EXEC).conf.5.gz $(DESTDIR)$(man5dir)
-+	$(INSTALL_PROGRAM) -m 644 $(EXEC).conf.5 $(DESTDIR)$(man5dir)
- 
- uninstall:
- 	rm $(DESTDIR)$(bindir)/$(EXEC)
--	rm $(DESTDIR)$(mandir)/$(EXEC).8.gz
--	rm $(DESTDIR)$(man5dir)/$(EXEC).conf.5.gz
-+	rm $(DESTDIR)$(mandir)/$(EXEC).8
-+	rm $(DESTDIR)$(man5dir)/$(EXEC).conf.5
- 
- clean:
--	rm -f core *.o $(EXEC) *.gz
-+	rm -f core *.o $(EXEC)
---- multipath-tools-0.5.0/multipathd/Makefile
-+++ multipath-tools-0.5.0/multipathd/Makefile
-@@ -9,11 +9,11 @@
- ifdef SYSTEMD
- 	CFLAGS += -DUSE_SYSTEMD=$(SYSTEMD)
- endif
--LDFLAGS += -lpthread -ldevmapper -lreadline
-+LIBS += -lpthread -ldevmapper -lreadline
- ifdef SYSTEMD
--	LDFLAGS += -lsystemd-daemon
-+	LIBS += -lsystemd-daemon
- endif
--LDFLAGS += -ludev -ldl \
-+LIBS += -ludev -ldl \
- 	-L$(multipathdir) -lmultipath -L$(mpathpersistdir) -lmpathpersist
- 
- #
-@@ -35,8 +35,7 @@
- all : $(EXEC)
- 
- $(EXEC): $(OBJS)
--	$(CC) $(CFLAGS) $(OBJS) $(LDFLAGS) -o $(EXEC)
--	$(GZIP) $(EXEC).8 > $(EXEC).8.gz
-+	$(CC) $(CFLAGS) $(LDFLAGS) $(OBJS) $(LIBS) -o $(EXEC)
- 
- install:
- 	$(INSTALL_PROGRAM) -d $(DESTDIR)$(bindir)
-@@ -48,15 +47,15 @@
- 	$(INSTALL_PROGRAM) -m 644 $(EXEC).socket $(DESTDIR)$(unitdir)
- endif
- 	$(INSTALL_PROGRAM) -d $(DESTDIR)$(mandir)
--	$(INSTALL_PROGRAM) -m 644 $(EXEC).8.gz $(DESTDIR)$(mandir)
-+	$(INSTALL_PROGRAM) -m 644 $(EXEC).8 $(DESTDIR)$(mandir)
- 
- uninstall:
- 	rm -f $(DESTDIR)$(bindir)/$(EXEC)
- 	rm -f $(DESTDIR)$(rcdir)/$(EXEC)
--	rm -f $(DESTDIR)$(mandir)/$(EXEC).8.gz
-+	rm -f $(DESTDIR)$(mandir)/$(EXEC).8
- 	rm -f $(DESTDIR)$(unitdir)/$(EXEC).service
- 	rm -f $(DESTDIR)$(unitdir)/$(EXEC).socket
- 
- clean:
--	rm -f core *.o $(EXEC) *.gz
-+	rm -f core *.o $(EXEC)
- 

diff --git a/sys-fs/multipath-tools/files/multipath-tools-0.5.0-systemd-pkgconfig.patch b/sys-fs/multipath-tools/files/multipath-tools-0.5.0-systemd-pkgconfig.patch
deleted file mode 100644
index d75f841361a..00000000000
--- a/sys-fs/multipath-tools/files/multipath-tools-0.5.0-systemd-pkgconfig.patch
+++ /dev/null
@@ -1,24 +0,0 @@
-diff -ru multipath-tools-0.5.0/libmultipath/Makefile multipath-tools-0.5.0-modified/libmultipath/Makefile
---- multipath-tools-0.5.0/libmultipath/Makefile	2013-12-17 22:40:41.000000000 +0100
-+++ multipath-tools-0.5.0-modified/libmultipath/Makefile	2014-03-07 04:03:45.963309627 +0100
-@@ -9,7 +9,7 @@
- LIBS = $(DEVLIB).$(SONAME)
- LIBDEPS = -lpthread -ldl -ldevmapper -ludev
- ifdef SYSTEMD
--	LIBDEPS += -lsystemd-daemon
-+	LIBDEPS += $(shell pkg-config --libs libsystemd 2>/dev/null || pkg-config --libs libsystemd-daemon 2>/dev/null)
- endif
- 
- OBJS = memory.o parser.o vector.o devmapper.o callout.o \
-diff -ru multipath-tools-0.5.0/multipathd/Makefile multipath-tools-0.5.0-modified/multipathd/Makefile
---- multipath-tools-0.5.0/multipathd/Makefile	2014-03-07 04:05:09.340307633 +0100
-+++ multipath-tools-0.5.0-modified/multipathd/Makefile	2014-03-07 04:04:03.555309206 +0100
-@@ -11,7 +11,7 @@
- endif
- LIBS += -lpthread -ldevmapper -lreadline
- ifdef SYSTEMD
--	LIBS += -lsystemd-daemon
-+	LIBS += $(shell pkg-config --libs libsystemd 2>/dev/null || pkg-config --libs libsystemd-daemon 2>/dev/null)
- endif
- LIBS += -ludev -ldl \
- 	-L$(multipathdir) -lmultipath -L$(mpathpersistdir) -lmpathpersist

diff --git a/sys-fs/multipath-tools/multipath-tools-0.5.0-r1.ebuild b/sys-fs/multipath-tools/multipath-tools-0.5.0-r1.ebuild
deleted file mode 100644
index 0edaad0c284..00000000000
--- a/sys-fs/multipath-tools/multipath-tools-0.5.0-r1.ebuild
+++ /dev/null
@@ -1,65 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=4
-inherit eutils systemd toolchain-funcs udev
-
-DESCRIPTION="Device mapper target autoconfig"
-HOMEPAGE="http://christophe.varoqui.free.fr/"
-SRC_URI="http://christophe.varoqui.free.fr/${PN}/${P}.tar.bz2"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~alpha amd64 ~arm ~arm64 ~ia64 ppc ppc64 ~sparc x86"
-IUSE="systemd"
-
-RDEPEND=">=sys-fs/lvm2-2.02.45
-	>=virtual/udev-171
-	dev-libs/libaio
-	sys-libs/readline
-	systemd? ( sys-apps/systemd )"
-DEPEND="${RDEPEND}
-	virtual/pkgconfig"
-
-src_prepare() {
-	epatch "${FILESDIR}"/${P}-makefile.patch
-	epatch "${FILESDIR}"/${P}-systemd-pkgconfig.patch
-	epatch_user
-}
-
-src_compile() {
-	# LIBDM_API_FLUSH involves grepping files in /usr/include,
-	# so force the test to go the way we want #411337.
-	emake LIBDM_API_FLUSH=1 CC="$(tc-getCC)" SYSTEMD=$(usex systemd 1 "")
-}
-
-src_install() {
-	local udevdir="$(get_udevdir)"
-
-	dodir /sbin /usr/share/man/man8
-	emake \
-		DESTDIR="${D}" \
-		SYSTEMD=$(usex systemd 1 "") \
-		unitdir="$(systemd_get_unitdir)" \
-		libudevdir='${prefix}'/"${udevdir}" \
-		install
-
-	insinto /etc
-	newins "${S}"/multipath.conf.annotated multipath.conf
-	# /etc/udev is reserved for user modified rules!
-	mv "${D}"/etc/udev/rules.d "${D}/${udevdir}"/ || die
-	fperms 644 "${udevdir}"/rules.d/66-kpartx.rules
-	newinitd "${FILESDIR}"/rc-multipathd multipathd
-	newinitd "${FILESDIR}"/multipath.rc multipath
-
-	dodoc multipath.conf.* AUTHOR ChangeLog FAQ
-	docinto kpartx
-	dodoc kpartx/ChangeLog kpartx/README
-}
-
-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
-}


^ permalink raw reply related	[flat|nested] 13+ messages in thread

* [gentoo-commits] repo/gentoo:master commit in: sys-fs/multipath-tools/, sys-fs/multipath-tools/files/
@ 2019-10-02 21:44 Thomas Deutschmann
  0 siblings, 0 replies; 13+ messages in thread
From: Thomas Deutschmann @ 2019-10-02 21:44 UTC (permalink / raw
  To: gentoo-commits

commit:     cf57bf37514572a8c126e2c840c45cd66fb81ba8
Author:     Thomas Deutschmann <whissi <AT> gentoo <DOT> org>
AuthorDate: Wed Oct  2 21:42:36 2019 +0000
Commit:     Thomas Deutschmann <whissi <AT> gentoo <DOT> org>
CommitDate: Wed Oct  2 21:43:53 2019 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=cf57bf37

sys-fs/multipath-tools: bump to v0.8.3

Package-Manager: Portage-2.3.76, Repoman-2.3.17
Signed-off-by: Thomas Deutschmann <whissi <AT> gentoo.org>

 sys-fs/multipath-tools/Manifest                    |   1 +
 .../multipath-tools-0.8.3-no-gziped-docs.patch     | 175 +++++++++++++++++++++
 .../multipath-tools/multipath-tools-0.8.3.ebuild   |  89 +++++++++++
 3 files changed, 265 insertions(+)

diff --git a/sys-fs/multipath-tools/Manifest b/sys-fs/multipath-tools/Manifest
index 827222b72f6..fa9c2ed1f14 100644
--- a/sys-fs/multipath-tools/Manifest
+++ b/sys-fs/multipath-tools/Manifest
@@ -2,3 +2,4 @@ DIST multipath-tools-0.6.4.tar.gz 285448 BLAKE2B 1b63c4e712e682965c595ed988a6590
 DIST multipath-tools-0.7.9.tar.gz 419377 BLAKE2B 29003b7ce2d673eb59d869e2165028654361ca31f49b8e810d90611db249a5183492959d3aef778b870df7c1d283004bda88f3cc6f760569247f1ccc61617379 SHA512 6b237f148c239938b9f46a1a8118fc070372d5f2cfe2021c26ad9ca15d37e8866390168b6a4f13adcc5538001354247e072559a0add33ce1fe8245ae64ed0a3c
 DIST multipath-tools-0.8.1.tar.gz 447883 BLAKE2B c840ede03fd15763cd947a71596bf3a2e5935433d956208225f4fd6ed55074e2d9709f8b0e6c059a58d44b6649f52b3564d6651ea1af6186138357ba37f86b14 SHA512 1f87f974aace746ecac8af6ae330de16affe49cc89a5660b28be3b1c4a69f822da01042432176e64b5de6ad3a6568044954fdce8e3aa31e85611a595a4939947
 DIST multipath-tools-0.8.2.tar.gz 458879 BLAKE2B a5aae1c9b211c788b658cf53e1c966bb9dd39dbe3e81058d6c758ba11cfd77ebfbc9d70bfde5b41d00fb1d4fbf31f3d2e6d58c69179e8842b9f5b8e9edd0b755 SHA512 c809e652479a8b6b141fd69810dbba316d93368ec6cf1c57f479ccde50e3ccf0bebe1b62e9db4791135aec45a90761f9100635f0ffa4b175ce9c2d82ebcea5c9
+DIST multipath-tools-0.8.3.tar.gz 465248 BLAKE2B 21a7a18c70150b4422bdd0ae02f26f491845eb06928ab74e631df8c6b3c110d10f43f75b9f8289a7134826c923b7ba58ce54c40497c3b7e6211e53902c8a1b5f SHA512 d9fdc2763f5a1efa15ee07c5d863008c9694623935f62a0e0b56f941df4e0d0ca3f86056fefc9b5ca828b47782127e3d55f2f925b1ed957e02b675bef36f4cae

diff --git a/sys-fs/multipath-tools/files/multipath-tools-0.8.3-no-gziped-docs.patch b/sys-fs/multipath-tools/files/multipath-tools-0.8.3-no-gziped-docs.patch
new file mode 100644
index 00000000000..534a8d33df8
--- /dev/null
+++ b/sys-fs/multipath-tools/files/multipath-tools-0.8.3-no-gziped-docs.patch
@@ -0,0 +1,175 @@
+Do not gzip docs
+
+--- a/kpartx/Makefile
++++ b/kpartx/Makefile
+@@ -21,7 +21,6 @@ all: $(EXEC)
+ 
+ $(EXEC): $(OBJS)
+ 	$(CC) $(CFLAGS) $(OBJS) -o $(EXEC) $(LDFLAGS) $(LIBDEPS)
+-	$(GZIP) $(EXEC).8 > $(EXEC).8.gz
+ 
+ install: $(EXEC) $(EXEC).8
+ 	$(INSTALL_PROGRAM) -d $(DESTDIR)$(bindir)
+@@ -33,11 +32,11 @@ install: $(EXEC) $(EXEC).8
+ 	$(INSTALL_PROGRAM) -m 644 kpartx.rules $(DESTDIR)$(libudevdir)/rules.d/66-kpartx.rules
+ 	$(INSTALL_PROGRAM) -m 644 del-part-nodes.rules $(DESTDIR)$(libudevdir)/rules.d/68-del-part-nodes.rules
+ 	$(INSTALL_PROGRAM) -d $(DESTDIR)$(man8dir)
+-	$(INSTALL_PROGRAM) -m 644 $(EXEC).8.gz $(DESTDIR)$(man8dir)
++	$(INSTALL_PROGRAM) -m 644 $(EXEC).8 $(DESTDIR)$(man8dir)
+ 
+ uninstall:
+ 	$(RM) $(DESTDIR)$(bindir)/$(EXEC)
+-	$(RM) $(DESTDIR)$(man8dir)/$(EXEC).8.gz
++	$(RM) $(DESTDIR)$(man8dir)/$(EXEC).8
+ 	$(RM) $(DESTDIR)$(libudevdir)/kpartx_id
+ 	$(RM) $(DESTDIR)$(libudevdir)/rules.d/11-dm-parts.rules
+ 	$(RM) $(DESTDIR)$(libudevdir)/rules.d/66-kpartx.rules
+--- a/libdmmp/Makefile
++++ b/libdmmp/Makefile
+@@ -40,7 +40,7 @@ install:
+ 		$(DESTDIR)$(pkgconfdir)/$(PKGFILE)
+ 	perl -i -pe 's|__INCLUDEDIR__|$(includedir)|g' \
+ 		$(DESTDIR)$(pkgconfdir)/$(PKGFILE)
+-	@for file in docs/man/*.3.gz; do \
++	@for file in docs/man/*.3; do \
+ 		$(INSTALL_PROGRAM) -m 644 -D \
+ 			$$file \
+ 			$(DESTDIR)$(man3dir)/ || exit $?; \
+@@ -69,11 +69,11 @@ check: all
+ speed_test: all
+ 	$(MAKE) -C test speed_test
+ 
+-doc: docs/man/$(EXTRA_MAN_FILES).gz
++doc: docs/man/$(EXTRA_MAN_FILES)
+ 
+ TEMPFILE := $(shell mktemp)
+ 
+-docs/man/$(EXTRA_MAN_FILES).gz: $(HEADERS)
++docs/man/$(EXTRA_MAN_FILES): $(HEADERS)
+ 	@for file in $(EXTRA_MAN_FILES); do \
+ 		$(INSTALL_PROGRAM) -v -m 644 -D docs/$$file docs/man/$$file; \
+ 	done
+@@ -82,10 +82,7 @@ docs/man/$(EXTRA_MAN_FILES).gz: $(HEADERS)
+ 	perl docs/kernel-doc -man "$(TEMPFILE)" | \
+ 	    perl docs/split-man.pl docs/man
+ 	-rm -f "$(TEMPFILE)"
+-	@for file in docs/man/*.3; do \
+-		gzip -f $$file; \
+-	done
+-	find docs/man -type f -name \*[0-9].gz
++	find docs/man -type f -name \*.[0-9]
+ 
+ dep_clean:
+ 	$(RM) $(OBJS:.o=.d)
+--- a/libmpathpersist/Makefile
++++ b/libmpathpersist/Makefile
+@@ -16,8 +16,6 @@ all: $(LIBS)
+ $(LIBS): $(OBJS)
+ 	$(CC) $(LDFLAGS) $(SHARED_FLAGS) $(LIBDEPS) -Wl,-soname=$@ -o $@ $(OBJS)
+ 	$(LN) $(LIBS) $(DEVLIB)
+-	$(GZIP) mpath_persistent_reserve_in.3 > mpath_persistent_reserve_in.3.gz
+-	$(GZIP) mpath_persistent_reserve_out.3 > mpath_persistent_reserve_out.3.gz
+ 
+ install: $(LIBS)
+ 	$(INSTALL_PROGRAM) -d $(DESTDIR)$(syslibdir)
+@@ -26,14 +24,14 @@ install: $(LIBS)
+ 	$(INSTALL_PROGRAM) -m 755 -d $(DESTDIR)$(man3dir)
+ 	$(INSTALL_PROGRAM) -m 755 -d $(DESTDIR)$(includedir)
+ 	$(LN) $(LIBS) $(DESTDIR)$(syslibdir)/$(DEVLIB)
+-	$(INSTALL_PROGRAM) -m 644 mpath_persistent_reserve_in.3.gz $(DESTDIR)$(man3dir)
+-	$(INSTALL_PROGRAM) -m 644 mpath_persistent_reserve_out.3.gz $(DESTDIR)$(man3dir)
++	$(INSTALL_PROGRAM) -m 644 mpath_persistent_reserve_in.3 $(DESTDIR)$(man3dir)
++	$(INSTALL_PROGRAM) -m 644 mpath_persistent_reserve_out.3 $(DESTDIR)$(man3dir)
+ 	$(INSTALL_PROGRAM) -m 644 mpath_persist.h $(DESTDIR)$(includedir)
+ 
+ uninstall:
+ 	$(RM) $(DESTDIR)$(syslibdir)/$(LIBS)
+-	$(RM) $(DESTDIR)$(man3dir)/mpath_persistent_reserve_in.3.gz
+-	$(RM) $(DESTDIR)$(man3dir)/mpath_persistent_reserve_out.3.gz
++	$(RM) $(DESTDIR)$(man3dir)/mpath_persistent_reserve_in.3
++	$(RM) $(DESTDIR)$(man3dir)/mpath_persistent_reserve_out.3
+ 	$(RM) $(DESTDIR)$(includedir)/mpath_persist.h
+ 	$(RM) $(DESTDIR)$(syslibdir)/$(DEVLIB)
+ 
+--- a/mpathpersist/Makefile
++++ b/mpathpersist/Makefile
+@@ -14,13 +14,12 @@ all: $(EXEC)
+ 
+ $(EXEC): $(OBJS)
+ 	$(CC) $(OBJS) -o $(EXEC) $(LDFLAGS) $(CFLAGS) $(LIBDEPS)
+-	$(GZIP) $(EXEC).8 > $(EXEC).8.gz
+ 
+ install:
+ 	$(INSTALL_PROGRAM) -d $(DESTDIR)$(bindir)
+ 	$(INSTALL_PROGRAM) -m 755 $(EXEC) $(DESTDIR)$(bindir)/
+ 	$(INSTALL_PROGRAM) -d $(DESTDIR)$(man8dir)
+-	$(INSTALL_PROGRAM) -m 644 $(EXEC).8.gz $(DESTDIR)$(man8dir)
++	$(INSTALL_PROGRAM) -m 644 $(EXEC).8 $(DESTDIR)$(man8dir)
+ 
+ clean: dep_clean
+ 	$(RM) core *.o $(EXEC) *.gz
+@@ -29,7 +28,7 @@ include $(wildcard $(OBJS:.o=.d))
+ 
+ uninstall:
+ 	$(RM) $(DESTDIR)$(bindir)/$(EXEC)
+-	$(RM) $(DESTDIR)$(man8dir)/$(EXEC).8.gz
++	$(RM) $(DESTDIR)$(man8dir)/$(EXEC).8
+ 
+ dep_clean:
+ 	$(RM) $(OBJS:.o=.d)
+--- a/multipath/Makefile
++++ b/multipath/Makefile
+@@ -16,8 +16,6 @@ all: $(EXEC)
+ 
+ $(EXEC): $(OBJS) $(multipathdir)/libmultipath.so $(mpathcmddir)/libmpathcmd.so
+ 	$(CC) $(CFLAGS) $(OBJS) -o $(EXEC) $(LDFLAGS) $(LIBDEPS)
+-	$(GZIP) $(EXEC).8 > $(EXEC).8.gz
+-	$(GZIP) $(EXEC).conf.5 > $(EXEC).conf.5.gz
+ 
+ install:
+ 	$(INSTALL_PROGRAM) -d $(DESTDIR)$(bindir)
+@@ -26,16 +24,16 @@ install:
+ 	$(INSTALL_PROGRAM) -m 644 11-dm-mpath.rules $(DESTDIR)$(udevrulesdir)
+ 	$(INSTALL_PROGRAM) -m 644 $(EXEC).rules $(DESTDIR)$(libudevdir)/rules.d/56-multipath.rules
+ 	$(INSTALL_PROGRAM) -d $(DESTDIR)$(man8dir)
+-	$(INSTALL_PROGRAM) -m 644 $(EXEC).8.gz $(DESTDIR)$(man8dir)
++	$(INSTALL_PROGRAM) -m 644 $(EXEC).8 $(DESTDIR)$(man8dir)
+ 	$(INSTALL_PROGRAM) -d $(DESTDIR)$(man5dir)
+-	$(INSTALL_PROGRAM) -m 644 $(EXEC).conf.5.gz $(DESTDIR)$(man5dir)
++	$(INSTALL_PROGRAM) -m 644 $(EXEC).conf.5 $(DESTDIR)$(man5dir)
+ 
+ uninstall:
+ 	$(RM) $(DESTDIR)$(bindir)/$(EXEC)
+ 	$(RM) $(DESTDIR)$(udevrulesdir)/11-dm-mpath.rules
+ 	$(RM) $(DESTDIR)$(libudevdir)/rules.d/56-multipath.rules
+-	$(RM) $(DESTDIR)$(man8dir)/$(EXEC).8.gz
+-	$(RM) $(DESTDIR)$(man5dir)/$(EXEC).conf.5.gz
++	$(RM) $(DESTDIR)$(man8dir)/$(EXEC).8
++	$(RM) $(DESTDIR)$(man5dir)/$(EXEC).conf.5
+ 
+ clean: dep_clean
+ 	$(RM) core *.o $(EXEC) *.gz
+--- a/multipathd/Makefile
++++ b/multipathd/Makefile
+@@ -34,7 +34,6 @@ all : $(EXEC)
+ 
+ $(EXEC): $(OBJS) $(multipathdir)/libmultipath.so $(mpathcmddir)/libmpathcmd.so
+ 	$(CC) $(CFLAGS) $(OBJS) $(LDFLAGS) -o $(EXEC) $(LIBDEPS)
+-	$(GZIP) $(EXEC).8 > $(EXEC).8.gz
+ 
+ install:
+ 	$(INSTALL_PROGRAM) -d $(DESTDIR)$(bindir)
+@@ -45,11 +44,11 @@ ifdef SYSTEMD
+ 	$(INSTALL_PROGRAM) -m 644 $(EXEC).socket $(DESTDIR)$(unitdir)
+ endif
+ 	$(INSTALL_PROGRAM) -d $(DESTDIR)$(man8dir)
+-	$(INSTALL_PROGRAM) -m 644 $(EXEC).8.gz $(DESTDIR)$(man8dir)
++	$(INSTALL_PROGRAM) -m 644 $(EXEC).8 $(DESTDIR)$(man8dir)
+ 
+ uninstall:
+ 	$(RM) $(DESTDIR)$(bindir)/$(EXEC)
+-	$(RM) $(DESTDIR)$(man8dir)/$(EXEC).8.gz
++	$(RM) $(DESTDIR)$(man8dir)/$(EXEC).8
+ 	$(RM) $(DESTDIR)$(unitdir)/$(EXEC).service
+ 	$(RM) $(DESTDIR)$(unitdir)/$(EXEC).socket
+ 

diff --git a/sys-fs/multipath-tools/multipath-tools-0.8.3.ebuild b/sys-fs/multipath-tools/multipath-tools-0.8.3.ebuild
new file mode 100644
index 00000000000..8be358bc905
--- /dev/null
+++ b/sys-fs/multipath-tools/multipath-tools-0.8.3.ebuild
@@ -0,0 +1,89 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="7"
+
+inherit linux-info systemd toolchain-funcs udev vcs-snapshot toolchain-funcs
+
+DESCRIPTION="Device mapper target autoconfig"
+HOMEPAGE="http://christophe.varoqui.free.fr/"
+SRC_URI="https://git.opensvc.com/?p=multipath-tools/.git;a=snapshot;h=${PV};sf=tgz -> ${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~ia64 ~ppc ~ppc64 ~x86"
+IUSE="systemd rbd"
+
+RDEPEND="
+	dev-libs/json-c:=
+	dev-libs/libaio
+	dev-libs/userspace-rcu:=
+	>=sys-fs/lvm2-2.02.45
+	>=virtual/udev-171
+	sys-libs/readline:0=
+	rbd? ( sys-cluster/ceph )
+	systemd? ( sys-apps/systemd )
+"
+DEPEND="${RDEPEND}"
+BDEPEND="
+	virtual/pkgconfig
+"
+
+CONFIG_CHECK="~DM_MULTIPATH"
+
+RESTRICT="test"
+
+PATCHES=(
+	"${FILESDIR}"/${PN}-0.7.5-respect-flags.patch
+	"${FILESDIR}"/${PN}-0.8.3-no-gziped-docs.patch
+)
+
+get_systemd_pv() {
+	use systemd && \
+		$(tc-getPKG_CONFIG) --modversion systemd
+}
+
+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() {
+	# LIBDM_API_FLUSH involves grepping files in /usr/include,
+	# so force the test to go the way we want #411337.
+	emake \
+		CC="$(tc-getCC)" \
+		LIBDM_API_FLUSH=1 SYSTEMD="$(get_systemd_pv)"
+}
+
+src_install() {
+	dodir /sbin /usr/share/man/man{5,8}
+	emake \
+		DESTDIR="${D}" \
+		SYSTEMD=$(get_systemd_pv) \
+		unitdir="$(systemd_get_systemunitdir)" \
+		libudevdir='${prefix}'/"$(get_udevdir)" \
+		install
+
+	newinitd "${FILESDIR}"/rc-multipathd multipathd
+	newinitd "${FILESDIR}"/multipath.rc multipath
+
+	einstalldocs
+}
+
+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
+}


^ permalink raw reply related	[flat|nested] 13+ messages in thread

* [gentoo-commits] repo/gentoo:master commit in: sys-fs/multipath-tools/, sys-fs/multipath-tools/files/
@ 2019-11-27 20:58 Thomas Deutschmann
  0 siblings, 0 replies; 13+ messages in thread
From: Thomas Deutschmann @ 2019-11-27 20:58 UTC (permalink / raw
  To: gentoo-commits

commit:     9fff7e7bd17fb3b933a3845e69099c70e037d142
Author:     Thomas Deutschmann <whissi <AT> gentoo <DOT> org>
AuthorDate: Wed Nov 27 20:55:53 2019 +0000
Commit:     Thomas Deutschmann <whissi <AT> gentoo <DOT> org>
CommitDate: Wed Nov 27 20:57:40 2019 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=9fff7e7b

sys-fs/multipath-tools: rev bump

- Fix pkgconfig file install location

- Set run dir to /run

- Update multipathd runscript

- Require >=libudev-232 for sys/sysmacros.h.

Closes: https://bugs.gentoo.org/685314
Closes: https://bugs.gentoo.org/698422
Package-Manager: Portage-2.3.80, Repoman-2.3.19
Signed-off-by: Thomas Deutschmann <whissi <AT> gentoo.org>

 sys-fs/multipath-tools/files/multipathd-r1.rc      | 12 +++
 .../multipath-tools-0.8.3-r1.ebuild                | 91 ++++++++++++++++++++++
 2 files changed, 103 insertions(+)

diff --git a/sys-fs/multipath-tools/files/multipathd-r1.rc b/sys-fs/multipath-tools/files/multipathd-r1.rc
new file mode 100644
index 00000000000..59de1e6f71a
--- /dev/null
+++ b/sys-fs/multipath-tools/files/multipathd-r1.rc
@@ -0,0 +1,12 @@
+#!/sbin/openrc-run
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+command="/sbin/multipathd"
+pidfile="/run/multipathd.pid"
+start_stop_daemon_args="--wait 1000"
+
+depend() {
+	need localmount
+	after modules
+}

diff --git a/sys-fs/multipath-tools/multipath-tools-0.8.3-r1.ebuild b/sys-fs/multipath-tools/multipath-tools-0.8.3-r1.ebuild
new file mode 100644
index 00000000000..ac5a16737ab
--- /dev/null
+++ b/sys-fs/multipath-tools/multipath-tools-0.8.3-r1.ebuild
@@ -0,0 +1,91 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="7"
+
+inherit linux-info systemd toolchain-funcs udev vcs-snapshot toolchain-funcs
+
+DESCRIPTION="Device mapper target autoconfig"
+HOMEPAGE="http://christophe.varoqui.free.fr/"
+SRC_URI="https://git.opensvc.com/?p=multipath-tools/.git;a=snapshot;h=${PV};sf=tgz -> ${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~ia64 ~ppc ~ppc64 ~x86"
+IUSE="systemd rbd"
+
+BDEPEND="virtual/pkgconfig"
+
+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}"
+
+CONFIG_CHECK="~DM_MULTIPATH"
+
+RESTRICT="test"
+
+PATCHES=(
+	"${FILESDIR}"/${PN}-0.7.5-respect-flags.patch
+	"${FILESDIR}"/${PN}-0.8.3-no-gziped-docs.patch
+)
+
+get_systemd_pv() {
+	use systemd && \
+		$(tc-getPKG_CONFIG) --modversion systemd
+}
+
+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() {
+	# LIBDM_API_FLUSH involves grepping files in /usr/include,
+	# so force the test to go the way we want #411337.
+	emake \
+		CC="$(tc-getCC)" \
+		LIBDM_API_FLUSH=1 SYSTEMD="$(get_systemd_pv)"
+}
+
+src_install() {
+	dodir /sbin /usr/share/man/man{5,8}
+	emake \
+		DESTDIR="${D}" \
+		RUN=run \
+		SYSTEMD=$(get_systemd_pv) \
+		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
+}
+
+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
+}


^ permalink raw reply related	[flat|nested] 13+ messages in thread

* [gentoo-commits] repo/gentoo:master commit in: sys-fs/multipath-tools/, sys-fs/multipath-tools/files/
@ 2020-09-15  9:49 Lars Wendler
  0 siblings, 0 replies; 13+ messages in thread
From: Lars Wendler @ 2020-09-15  9:49 UTC (permalink / raw
  To: gentoo-commits

commit:     2953ae544c1f20301c7017c2323b167a8287d8c2
Author:     Lars Wendler <polynomial-c <AT> gentoo <DOT> org>
AuthorDate: Tue Sep 15 09:49:30 2020 +0000
Commit:     Lars Wendler <polynomial-c <AT> gentoo <DOT> org>
CommitDate: Tue Sep 15 09:49:30 2020 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=2953ae54

sys-fs/multipath-tools: Removed old

Package-Manager: Portage-3.0.7, Repoman-3.0.1
Signed-off-by: Lars Wendler <polynomial-c <AT> gentoo.org>

 sys-fs/multipath-tools/Manifest                    |  2 -
 ...path-tools-0.6.2-ignore-modprobe-failures.patch | 25 ------
 .../files/multipath-tools-0.6.4-sysmacros.patch    | 60 -------------
 .../multipath-tools-0.6.4-r1.ebuild                | 99 ----------------------
 .../multipath-tools/multipath-tools-0.7.9.ebuild   | 94 --------------------
 5 files changed, 280 deletions(-)

diff --git a/sys-fs/multipath-tools/Manifest b/sys-fs/multipath-tools/Manifest
index b6fc606d5e1..dd78e5e9f42 100644
--- a/sys-fs/multipath-tools/Manifest
+++ b/sys-fs/multipath-tools/Manifest
@@ -1,4 +1,2 @@
-DIST multipath-tools-0.6.4.tar.gz 285448 BLAKE2B 1b63c4e712e682965c595ed988a6590e181abd4d37779b72b52f4e415d4caba33df518a1ea1e3b460d15b5a78f4db5a75c1066439eb40c503023007c1f70752a SHA512 ec35c6c26c3b233ebece7136ea99dd4c0dff2927e7b543e7091219dc7065fe87e609a1eda9ab6d08399d44fe882d70c8dbe6be9ab175d154c5dd2d12ee1d86ea
-DIST multipath-tools-0.7.9.tar.gz 419377 BLAKE2B 29003b7ce2d673eb59d869e2165028654361ca31f49b8e810d90611db249a5183492959d3aef778b870df7c1d283004bda88f3cc6f760569247f1ccc61617379 SHA512 6b237f148c239938b9f46a1a8118fc070372d5f2cfe2021c26ad9ca15d37e8866390168b6a4f13adcc5538001354247e072559a0add33ce1fe8245ae64ed0a3c
 DIST multipath-tools-0.8.3.tar.gz 465248 BLAKE2B 21a7a18c70150b4422bdd0ae02f26f491845eb06928ab74e631df8c6b3c110d10f43f75b9f8289a7134826c923b7ba58ce54c40497c3b7e6211e53902c8a1b5f SHA512 d9fdc2763f5a1efa15ee07c5d863008c9694623935f62a0e0b56f941df4e0d0ca3f86056fefc9b5ca828b47782127e3d55f2f925b1ed957e02b675bef36f4cae
 DIST multipath-tools-0.8.4.tar.gz 480994 BLAKE2B be8368df049218e2eaa1749e7b1c7a930da15f0311ab549b1bbba9c019dcfe39f90a05fd621e0703301ef1d55c98ac8cc74231d82950d9066f19d8764421704b SHA512 720823188c053c1c50269a30e34a9d69099098495bfd607076bcfa2c079565e3f0580c91783f19d42ed82290c0db98e4e19ef620eca4ee5ec7885c49c72d2307

diff --git a/sys-fs/multipath-tools/files/multipath-tools-0.6.2-ignore-modprobe-failures.patch b/sys-fs/multipath-tools/files/multipath-tools-0.6.2-ignore-modprobe-failures.patch
deleted file mode 100644
index cb785899c2e..00000000000
--- a/sys-fs/multipath-tools/files/multipath-tools-0.6.2-ignore-modprobe-failures.patch
+++ /dev/null
@@ -1,25 +0,0 @@
-From 100588046ad59176b9779c73212aea63be5aace4 Mon Sep 17 00:00:00 2001
-From: Mike Gilbert <floppym@gentoo.org>
-Date: Mon, 12 Sep 2016 17:26:38 -0400
-Subject: [PATCH] multipathd.service: ignore modprobe failures
-
----
- multipathd/multipathd.service | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/multipathd/multipathd.service b/multipathd/multipathd.service
-index e3d6f91..d26577f 100644
---- a/multipathd/multipathd.service
-+++ b/multipathd/multipathd.service
-@@ -11,7 +11,7 @@ Conflicts=shutdown.target
- Type=notify
- NotifyAccess=main
- LimitCORE=infinity
--ExecStartPre=/sbin/modprobe -a scsi_dh_alua scsi_dh_emc scsi_dh_rdac dm-multipath
-+ExecStartPre=-/sbin/modprobe -a scsi_dh_alua scsi_dh_emc scsi_dh_rdac dm-multipath
- ExecStart=/sbin/multipathd -d -s
- ExecReload=/sbin/multipathd reconfigure
- 
--- 
-2.10.0
-

diff --git a/sys-fs/multipath-tools/files/multipath-tools-0.6.4-sysmacros.patch b/sys-fs/multipath-tools/files/multipath-tools-0.6.4-sysmacros.patch
deleted file mode 100644
index 99a12fc7b78..00000000000
--- a/sys-fs/multipath-tools/files/multipath-tools-0.6.4-sysmacros.patch
+++ /dev/null
@@ -1,60 +0,0 @@
-diff --git a/kpartx/dasd.c b/kpartx/dasd.c
-index 1206e45..f50c1bd 100644
---- a/kpartx/dasd.c
-+++ b/kpartx/dasd.c
-@@ -28,6 +28,7 @@
- #include <inttypes.h>
- #include <sys/types.h>
- #include <sys/stat.h>
-+#include <sys/sysmacros.h>
- #include <sys/ioctl.h>
- #include <linux/hdreg.h>
- #include <errno.h>
-diff --git a/kpartx/kpartx.c b/kpartx/kpartx.c
-index d31fea8..3452787 100644
---- a/kpartx/kpartx.c
-+++ b/kpartx/kpartx.c
-@@ -28,6 +28,7 @@
- #include <stdint.h>
- #include <sys/ioctl.h>
- #include <sys/stat.h>
-+#include <sys/sysmacros.h>
- #include <sys/types.h>
- #include <ctype.h>
- #include <libdevmapper.h>
-diff --git a/libmultipath/checkers/tur.c b/libmultipath/checkers/tur.c
-index 4d6c3c2..d9a9e67 100644
---- a/libmultipath/checkers/tur.c
-+++ b/libmultipath/checkers/tur.c
-@@ -11,6 +11,7 @@
- #include <unistd.h>
- #include <fcntl.h>
- #include <sys/ioctl.h>
-+#include <sys/sysmacros.h>
- #include <errno.h>
- #include <sys/time.h>
- #include <pthread.h>
-diff --git a/libmultipath/devmapper.c b/libmultipath/devmapper.c
-index 4f8ef13..9c0b240 100644
---- a/libmultipath/devmapper.c
-+++ b/libmultipath/devmapper.c
-@@ -12,6 +12,7 @@
- #include <ctype.h>
- #include <unistd.h>
- #include <errno.h>
-+#include <sys/sysmacros.h>
- 
- #include "checkers.h"
- #include "vector.h"
-diff --git a/libmultipath/util.c b/libmultipath/util.c
-index 03a5738..1841f35 100644
---- a/libmultipath/util.c
-+++ b/libmultipath/util.c
-@@ -4,6 +4,7 @@
- #include <pthread.h>
- #include <string.h>
- #include <sys/stat.h>
-+#include <sys/sysmacros.h>
- #include <sys/types.h>
- #include <unistd.h>
- 

diff --git a/sys-fs/multipath-tools/multipath-tools-0.6.4-r1.ebuild b/sys-fs/multipath-tools/multipath-tools-0.6.4-r1.ebuild
deleted file mode 100644
index 59c081dc6d9..00000000000
--- a/sys-fs/multipath-tools/multipath-tools-0.6.4-r1.ebuild
+++ /dev/null
@@ -1,99 +0,0 @@
-# Copyright 1999-2018 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit linux-info systemd toolchain-funcs udev vcs-snapshot toolchain-funcs
-
-DESCRIPTION="Device mapper target autoconfig"
-HOMEPAGE="http://christophe.varoqui.free.fr/"
-SRC_URI="http://git.opensvc.com/?p=multipath-tools/.git;a=snapshot;h=${PV};sf=tgz -> ${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~alpha amd64 ~arm ~arm64 ~ia64 ppc ppc64 x86"
-IUSE="systemd rbd"
-
-RDEPEND=">=sys-fs/lvm2-2.02.45
-	>=virtual/udev-171
-	dev-libs/libaio
-	dev-libs/userspace-rcu:=
-	sys-libs/readline:0=
-	rbd? ( sys-cluster/ceph )
-	systemd? ( sys-apps/systemd )"
-DEPEND="${RDEPEND}
-	virtual/pkgconfig"
-
-CONFIG_CHECK="~DM_MULTIPATH"
-
-PATCHES=(
-	# modprobe fails when modules are compiled statically into the kernel
-	# https://www.redhat.com/archives/dm-devel/2017-January/msg00043.html
-	"${FILESDIR}"/${PN}-0.6.2-ignore-modprobe-failures.patch
-
-	# https://bugs.gentoo.org/show_bug.cgi?id=604228
-	# https://www.redhat.com/archives/dm-devel/2017-January/msg00022.html
-	"${FILESDIR}"/${P}-sysmacros.patch
-)
-
-get_systemd_pv() {
-	use systemd && \
-		$(tc-getPKG_CONFIG) --modversion systemd
-}
-
-pkg_pretend() {
-	linux-info_pkg_setup
-}
-
-pkg_setup() {
-	linux-info_pkg_setup
-}
-
-src_prepare() {
-	default
-
-	# Fix for bug #624884
-	if grep -qF DM_TABLE_STATE kpartx/kpartx.rules ; then
-		sed '/DM_TABLE_STATE/d' -i kpartx/kpartx.rules || die
-	else
-		elog "DM_TABLE_STATE sed hack is no longer necessary."
-	fi
-
-	# 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 proer configure system
-	if ! use rbd ; then
-		sed -i -e "s/libcheckrbd.so/# libcheckrbd.so/" libmultipath/checkers/Makefile
-		sed -i -e "s/-lrados//" libmultipath/checkers/Makefile
-	fi
-}
-
-src_compile() {
-	# LIBDM_API_FLUSH involves grepping files in /usr/include,
-	# so force the test to go the way we want #411337.
-	emake \
-		CC="$(tc-getCC)" \
-		LIBDM_API_FLUSH=1 SYSTEMD="$(get_systemd_pv)"
-}
-
-src_install() {
-	dodir /sbin /usr/share/man/man{5,8}
-	emake \
-		DESTDIR="${D}" \
-		SYSTEMD=$(get_systemd_pv) \
-		unitdir="$(systemd_get_systemunitdir)" \
-		libudevdir='${prefix}'/"$(get_udevdir)" \
-		install
-
-	newinitd "${FILESDIR}"/rc-multipathd multipathd
-	newinitd "${FILESDIR}"/multipath.rc multipath
-
-	einstalldocs
-}
-
-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.7.9.ebuild b/sys-fs/multipath-tools/multipath-tools-0.7.9.ebuild
deleted file mode 100644
index c4898d34da4..00000000000
--- a/sys-fs/multipath-tools/multipath-tools-0.7.9.ebuild
+++ /dev/null
@@ -1,94 +0,0 @@
-# Copyright 1999-2018 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="6"
-
-inherit linux-info systemd toolchain-funcs udev vcs-snapshot toolchain-funcs
-
-DESCRIPTION="Device mapper target autoconfig"
-HOMEPAGE="http://christophe.varoqui.free.fr/"
-SRC_URI="https://git.opensvc.com/?p=multipath-tools/.git;a=snapshot;h=${PV};sf=tgz -> ${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~ia64 ~ppc ~ppc64 ~x86"
-IUSE="systemd rbd"
-
-RDEPEND="
-	dev-libs/json-c:=
-	dev-libs/libaio
-	dev-libs/userspace-rcu:=
-	>=sys-fs/lvm2-2.02.45
-	>=virtual/udev-171
-	sys-libs/readline:0=
-	rbd? ( sys-cluster/ceph )
-	systemd? ( sys-apps/systemd )
-"
-DEPEND="
-	${RDEPEND}
-	virtual/pkgconfig
-"
-
-CONFIG_CHECK="~DM_MULTIPATH"
-
-RESTRICT="test"
-
-PATCHES=( "${FILESDIR}"/${PN}-0.7.5-respect-flags.patch )
-
-get_systemd_pv() {
-	use systemd && \
-		$(tc-getPKG_CONFIG) --modversion systemd
-}
-
-pkg_pretend() {
-	linux-info_pkg_setup
-}
-
-pkg_setup() {
-	linux-info_pkg_setup
-}
-
-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() {
-	# LIBDM_API_FLUSH involves grepping files in /usr/include,
-	# so force the test to go the way we want #411337.
-	emake \
-		CC="$(tc-getCC)" \
-		LIBDM_API_FLUSH=1 SYSTEMD="$(get_systemd_pv)"
-}
-
-src_install() {
-	dodir /sbin /usr/share/man/man{5,8}
-	emake \
-		DESTDIR="${D}" \
-		SYSTEMD=$(get_systemd_pv) \
-		unitdir="$(systemd_get_systemunitdir)" \
-		libudevdir='${prefix}'/"$(get_udevdir)" \
-		install
-
-	newinitd "${FILESDIR}"/rc-multipathd multipathd
-	newinitd "${FILESDIR}"/multipath.rc multipath
-
-	einstalldocs
-}
-
-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
-}


^ permalink raw reply related	[flat|nested] 13+ messages in thread

* [gentoo-commits] repo/gentoo:master commit in: sys-fs/multipath-tools/, sys-fs/multipath-tools/files/
@ 2020-11-14 10:56 Lars Wendler
  0 siblings, 0 replies; 13+ messages in thread
From: Lars Wendler @ 2020-11-14 10:56 UTC (permalink / raw
  To: gentoo-commits

commit:     43452e990badd711455dab87c52b3fc48bcca2dc
Author:     Lars Wendler <polynomial-c <AT> gentoo <DOT> org>
AuthorDate: Sat Nov 14 10:56:08 2020 +0000
Commit:     Lars Wendler <polynomial-c <AT> gentoo <DOT> org>
CommitDate: Sat Nov 14 10:56:08 2020 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=43452e99

sys-fs/multipath-tools: Bump to version 0.8.5

Package-Manager: Portage-3.0.9, Repoman-3.0.2
Signed-off-by: Lars Wendler <polynomial-c <AT> gentoo.org>

 sys-fs/multipath-tools/Manifest                    |  1 +
 .../multipath-tools-0.8.5-respect-flags.patch      | 12 +++
 .../multipath-tools/multipath-tools-0.8.5.ebuild   | 91 ++++++++++++++++++++++
 3 files changed, 104 insertions(+)

diff --git a/sys-fs/multipath-tools/Manifest b/sys-fs/multipath-tools/Manifest
index dd78e5e9f42..3791f6de0fa 100644
--- a/sys-fs/multipath-tools/Manifest
+++ b/sys-fs/multipath-tools/Manifest
@@ -1,2 +1,3 @@
 DIST multipath-tools-0.8.3.tar.gz 465248 BLAKE2B 21a7a18c70150b4422bdd0ae02f26f491845eb06928ab74e631df8c6b3c110d10f43f75b9f8289a7134826c923b7ba58ce54c40497c3b7e6211e53902c8a1b5f SHA512 d9fdc2763f5a1efa15ee07c5d863008c9694623935f62a0e0b56f941df4e0d0ca3f86056fefc9b5ca828b47782127e3d55f2f925b1ed957e02b675bef36f4cae
 DIST multipath-tools-0.8.4.tar.gz 480994 BLAKE2B be8368df049218e2eaa1749e7b1c7a930da15f0311ab549b1bbba9c019dcfe39f90a05fd621e0703301ef1d55c98ac8cc74231d82950d9066f19d8764421704b SHA512 720823188c053c1c50269a30e34a9d69099098495bfd607076bcfa2c079565e3f0580c91783f19d42ed82290c0db98e4e19ef620eca4ee5ec7885c49c72d2307
+DIST multipath-tools-0.8.5.tar.gz 494750 BLAKE2B a42d17a47631107433a1d0a9da69a0bb10d2125cb242d2125d67da18f6bc6231c9233b163dc1d07d88dcba9f912830c047fdee5b42435f59ea2976598a72fd75 SHA512 f62a09107ccb18ffab97139fe2dba3dc22450836d8669c4381a8bce4072672a027a3a1e687f33e374429bffa49b3ba4a54d1e52294044d7bc1f82ed5d5aaf760

diff --git a/sys-fs/multipath-tools/files/multipath-tools-0.8.5-respect-flags.patch b/sys-fs/multipath-tools/files/multipath-tools-0.8.5-respect-flags.patch
new file mode 100644
index 00000000000..20d9fef6f3f
--- /dev/null
+++ b/sys-fs/multipath-tools/files/multipath-tools-0.8.5-respect-flags.patch
@@ -0,0 +1,12 @@
+--- multipath-tools-0.8.5-eecfcba/Makefile.inc
++++ multipath-tools-0.8.5-eecfcba/Makefile.inc
+@@ -98,7 +98,8 @@
+ 		  -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 \
++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/multipath-tools-0.8.5.ebuild b/sys-fs/multipath-tools/multipath-tools-0.8.5.ebuild
new file mode 100644
index 00000000000..cd850ca74ae
--- /dev/null
+++ b/sys-fs/multipath-tools/multipath-tools-0.8.5.ebuild
@@ -0,0 +1,91 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="7"
+
+inherit linux-info systemd toolchain-funcs udev vcs-snapshot toolchain-funcs
+
+DESCRIPTION="Device mapper target autoconfig"
+HOMEPAGE="http://christophe.varoqui.free.fr/"
+SRC_URI="https://git.opensvc.com/?p=multipath-tools/.git;a=snapshot;h=${PV};sf=tgz -> ${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~ia64 ~ppc ~ppc64 ~x86"
+IUSE="systemd rbd"
+
+BDEPEND="virtual/pkgconfig"
+
+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}"
+
+CONFIG_CHECK="~DM_MULTIPATH"
+
+RESTRICT="test"
+
+PATCHES=(
+	"${FILESDIR}"/${PN}-0.8.5-respect-flags.patch
+	"${FILESDIR}"/${PN}-0.8.3-no-gziped-docs.patch
+)
+
+get_systemd_pv() {
+	use systemd && \
+		$(tc-getPKG_CONFIG) --modversion systemd
+}
+
+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() {
+	# LIBDM_API_FLUSH involves grepping files in /usr/include,
+	# so force the test to go the way we want #411337.
+	emake \
+		CC="$(tc-getCC)" \
+		LIBDM_API_FLUSH=1 SYSTEMD="$(get_systemd_pv)"
+}
+
+src_install() {
+	dodir /sbin /usr/share/man/man{3,5,8}
+	emake \
+		DESTDIR="${D}" \
+		RUN=run \
+		SYSTEMD=$(get_systemd_pv) \
+		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
+}
+
+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
+}


^ permalink raw reply related	[flat|nested] 13+ messages in thread

* [gentoo-commits] repo/gentoo:master commit in: sys-fs/multipath-tools/, sys-fs/multipath-tools/files/
@ 2021-04-06 10:17 Lars Wendler
  0 siblings, 0 replies; 13+ messages in thread
From: Lars Wendler @ 2021-04-06 10:17 UTC (permalink / raw
  To: gentoo-commits

commit:     cc3d8bbdd85180c7356fbfc1075b90cd201c7e4b
Author:     Lars Wendler <polynomial-c <AT> gentoo <DOT> org>
AuthorDate: Tue Apr  6 10:16:55 2021 +0000
Commit:     Lars Wendler <polynomial-c <AT> gentoo <DOT> org>
CommitDate: Tue Apr  6 10:17:10 2021 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=cc3d8bbd

sys-fs/multipath-tools: Removed old

Signed-off-by: Lars Wendler <polynomial-c <AT> gentoo.org>

 sys-fs/multipath-tools/Manifest                    |  1 -
 .../multipath-tools-0.8.4-parallel_make_fix.patch  | 85 --------------------
 .../multipath-tools-0.8.4-respect-flags.patch      | 19 -----
 .../multipath-tools/multipath-tools-0.8.4.ebuild   | 93 ----------------------
 4 files changed, 198 deletions(-)

diff --git a/sys-fs/multipath-tools/Manifest b/sys-fs/multipath-tools/Manifest
index bc6aed9719d..5890da6bae6 100644
--- a/sys-fs/multipath-tools/Manifest
+++ b/sys-fs/multipath-tools/Manifest
@@ -1,4 +1,3 @@
 DIST multipath-tools-0.8.3.tar.gz 465248 BLAKE2B 21a7a18c70150b4422bdd0ae02f26f491845eb06928ab74e631df8c6b3c110d10f43f75b9f8289a7134826c923b7ba58ce54c40497c3b7e6211e53902c8a1b5f SHA512 d9fdc2763f5a1efa15ee07c5d863008c9694623935f62a0e0b56f941df4e0d0ca3f86056fefc9b5ca828b47782127e3d55f2f925b1ed957e02b675bef36f4cae
-DIST multipath-tools-0.8.4.tar.gz 480994 BLAKE2B be8368df049218e2eaa1749e7b1c7a930da15f0311ab549b1bbba9c019dcfe39f90a05fd621e0703301ef1d55c98ac8cc74231d82950d9066f19d8764421704b SHA512 720823188c053c1c50269a30e34a9d69099098495bfd607076bcfa2c079565e3f0580c91783f19d42ed82290c0db98e4e19ef620eca4ee5ec7885c49c72d2307
 DIST multipath-tools-0.8.5.tar.gz 494750 BLAKE2B a42d17a47631107433a1d0a9da69a0bb10d2125cb242d2125d67da18f6bc6231c9233b163dc1d07d88dcba9f912830c047fdee5b42435f59ea2976598a72fd75 SHA512 f62a09107ccb18ffab97139fe2dba3dc22450836d8669c4381a8bce4072672a027a3a1e687f33e374429bffa49b3ba4a54d1e52294044d7bc1f82ed5d5aaf760
 DIST multipath-tools-0.8.6.tar.gz 519405 BLAKE2B 5aed36550c76bbde0e874e37356b6c5a80a80b876b56dadb69ce09f0fb049a7097fd1c0aca5076f816848e2c2660f96680d7f16d56918a25299017b39f76f777 SHA512 82e5b7307e599ba6b059679c3987a442fb5be4885f0a27c260a99a07cb336b88d48e314b4ec951944e0200e4731522d8da043d98fa566857ecc6d100791c0e38

diff --git a/sys-fs/multipath-tools/files/multipath-tools-0.8.4-parallel_make_fix.patch b/sys-fs/multipath-tools/files/multipath-tools-0.8.4-parallel_make_fix.patch
deleted file mode 100644
index 651cd04f59f..00000000000
--- a/sys-fs/multipath-tools/files/multipath-tools-0.8.4-parallel_make_fix.patch
+++ /dev/null
@@ -1,85 +0,0 @@
-From 041472afebd1e621be1143f2bfb4c5650df171cc Mon Sep 17 00:00:00 2001
-From: Lars Wendler <polynomial-c@gentoo.org>
-Date: Mon, 11 May 2020 11:49:58 +0200
-Subject: [PATCH] multipath-tools: Fix parallel make issues
-
-build is broken like this (tested with -j16):
-
-  x86_64-pc-linux-gnu-gcc -Wl,-O1 -Wl,--hash-style=gnu -Wl,--sort-common -Wl,--as-needed -Wl,-z,relro -Wl,-z,now -shared -lpthread -ldevmapper -ldl -L../libmultipath -lmultipath -L../libmpathcmd -lmpathcmd -Wl,-soname=libmpathpersist.so.0 -o libmpathpersist.so.0 mpath_persist.o mpath_updatepr.o mpath_pr_ioctl.o
-  building defaults.o because of defaults.c
-  ...
-  /usr/lib/gcc/x86_64-pc-linux-gnu/9.3.0/../../../../x86_64-pc-linux-gnu/bin/ld: cannot find -lmultipath
-  collect2: error: ld returned 1 exit status
-  make[1]: *** [Makefile:17: libmpathpersist.so.0] Error 1
-  make: *** [Makefile:29: libmpathpersist] Error 2
-  make: *** Waiting for unfinished jobs....
-
-install is broken like this:
-
-  install -m 755 libprio*.so /var/tmp/portage/sys-fs/multipath-tools-0.8.4/image/lib64/multipath
-  install -m 755 libcheckcciss_tur.so libcheckreadsector0.so libchecktur.so libcheckdirectio.so libcheckemc_clariion.so libcheckhp_sw.so libcheckrdac.so /var/tmp/portage/sys-fs/multipath-tools-0.8.4/image/lib64/multipath
-  ...
-  /usr/bin/install: target '/var/tmp/portage/sys-fs/multipath-tools-0.8.4/image/lib64/multipath' is not a directory
-  /usr/bin/install: target '/var/tmp/portage/sys-fs/multipath-tools-0.8.4/image/lib64/multipath' is not a directory
-  make[1]: *** [Makefile:28: install] Error 1
-  make[1]: *** [Makefile:38: install] Error 1
----
- Makefile                           | 3 ++-
- libmultipath/checkers/Makefile     | 1 +
- libmultipath/foreign/Makefile      | 1 +
- libmultipath/prioritizers/Makefile | 1 +
- 4 files changed, 5 insertions(+), 1 deletion(-)
-
-diff --git a/Makefile b/Makefile
-index 1dee3680..a9ade94f 100644
---- a/Makefile
-+++ b/Makefile
-@@ -29,7 +29,8 @@ $(BUILDDIRS):
- 	$(MAKE) -C $@
- 
- multipath multipathd mpathpersist: libmultipath
--mpathpersist:  libmpathpersist
-+libmpathpersist: libmultipath
-+mpathpersist:  libmultipath libmpathpersist
- 
- $(BUILDDIRS.clean):
- 	$(MAKE) -C ${@:.clean=} clean
-diff --git a/libmultipath/checkers/Makefile b/libmultipath/checkers/Makefile
-index 02caea64..f201ca4c 100644
---- a/libmultipath/checkers/Makefile
-+++ b/libmultipath/checkers/Makefile
-@@ -24,6 +24,7 @@ libcheck%.so: libsg.o %.o
- 	$(CC) $(LDFLAGS) $(SHARED_FLAGS) -o $@ $^
- 
- install:
-+	$(INSTALL_PROGRAM) -m 755 -d $(DESTDIR)$(libdir)
- 	$(INSTALL_PROGRAM) -m 755 $(LIBS) $(DESTDIR)$(libdir)
- 
- uninstall:
-diff --git a/libmultipath/foreign/Makefile b/libmultipath/foreign/Makefile
-index fae58a0d..567deebd 100644
---- a/libmultipath/foreign/Makefile
-+++ b/libmultipath/foreign/Makefile
-@@ -14,6 +14,7 @@ libforeign-%.so: %.o
- 	$(CC) $(LDFLAGS) $(SHARED_FLAGS) -o $@ $^
- 
- install:
-+	$(INSTALL_PROGRAM) -m 755 -d $(DESTDIR)$(libdir)
- 	$(INSTALL_PROGRAM) -m 755 $(LIBS) $(DESTDIR)$(libdir)
- 
- uninstall:
-diff --git a/libmultipath/prioritizers/Makefile b/libmultipath/prioritizers/Makefile
-index 9d0fe03c..b0b0b522 100644
---- a/libmultipath/prioritizers/Makefile
-+++ b/libmultipath/prioritizers/Makefile
-@@ -35,6 +35,7 @@ libprio%.so: %.o
- 	$(CC) $(LDFLAGS) $(SHARED_FLAGS) -o $@ $^
- 
- install: $(LIBS)
-+	$(INSTALL_PROGRAM) -m 755 -d $(DESTDIR)$(libdir)
- 	$(INSTALL_PROGRAM) -m 755 libprio*.so $(DESTDIR)$(libdir)
- 
- uninstall:
--- 
-2.26.2
-

diff --git a/sys-fs/multipath-tools/files/multipath-tools-0.8.4-respect-flags.patch b/sys-fs/multipath-tools/files/multipath-tools-0.8.4-respect-flags.patch
deleted file mode 100644
index 5e5258405b4..00000000000
--- a/sys-fs/multipath-tools/files/multipath-tools-0.8.4-respect-flags.patch
+++ /dev/null
@@ -1,19 +0,0 @@
---- multipath-tools-0.8.4-d491591/Makefile.inc
-+++ multipath-tools-0.8.4-d491591/Makefile.inc
-@@ -99,12 +99,13 @@
- 		  -Werror=cast-qual $(ERROR_DISCARDED_QUALIFIERS) \
- 		  $(STACKPROT) --param=ssp-buffer-size=4
- CPPFLAGS	:= -Wp,-D_FORTIFY_SOURCE=2 
--CFLAGS		:= $(OPTFLAGS) -DBIN_DIR=\"$(bindir)\" -DLIB_STRING=\"${LIB}\" -DRUN_DIR=\"${RUN}\" \
--		   -MMD -MP $(CFLAGS)
-+CFLAGS		?= $(OPTFLAGS)
-+CFLAGS		+= -DBIN_DIR=\"$(bindir)\" -DLIB_STRING=\"${LIB}\" -DRUN_DIR=\"${RUN}\" \
-+		   -MMD -MP
- BIN_CFLAGS	= -fPIE -DPIE
- LIB_CFLAGS	= -fPIC
- SHARED_FLAGS	= -shared
--LDFLAGS		= -Wl,-z,relro -Wl,-z,now
-+LDFLAGS		+= -Wl,-z,relro -Wl,-z,now
- BIN_LDFLAGS	= -pie
- 
- # Check whether a function with name $1 has been declared in header file $2.

diff --git a/sys-fs/multipath-tools/multipath-tools-0.8.4.ebuild b/sys-fs/multipath-tools/multipath-tools-0.8.4.ebuild
deleted file mode 100644
index ab4f6f9cd3c..00000000000
--- a/sys-fs/multipath-tools/multipath-tools-0.8.4.ebuild
+++ /dev/null
@@ -1,93 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="7"
-
-inherit linux-info systemd toolchain-funcs udev vcs-snapshot toolchain-funcs
-
-DESCRIPTION="Device mapper target autoconfig"
-HOMEPAGE="http://christophe.varoqui.free.fr/"
-SRC_URI="https://git.opensvc.com/?p=multipath-tools/.git;a=snapshot;h=${PV};sf=tgz -> ${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~ia64 ~ppc ~ppc64 ~x86"
-IUSE="systemd rbd"
-
-BDEPEND="virtual/pkgconfig"
-
-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}"
-
-CONFIG_CHECK="~DM_MULTIPATH"
-
-RESTRICT="test"
-
-PATCHES=(
-	"${FILESDIR}"/${PN}-0.8.4-respect-flags.patch
-	"${FILESDIR}"/${PN}-0.8.3-no-gziped-docs.patch
-	"${FILESDIR}"/${PN}-0.8.3-json-c-0.14.patch
-	"${FILESDIR}"/${PN}-0.8.4-parallel_make_fix.patch
-)
-
-get_systemd_pv() {
-	use systemd && \
-		$(tc-getPKG_CONFIG) --modversion systemd
-}
-
-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() {
-	# LIBDM_API_FLUSH involves grepping files in /usr/include,
-	# so force the test to go the way we want #411337.
-	emake \
-		CC="$(tc-getCC)" \
-		LIBDM_API_FLUSH=1 SYSTEMD="$(get_systemd_pv)"
-}
-
-src_install() {
-	dodir /sbin /usr/share/man/man{3,5,8}
-	emake \
-		DESTDIR="${D}" \
-		RUN=run \
-		SYSTEMD=$(get_systemd_pv) \
-		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
-}
-
-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
-}


^ permalink raw reply related	[flat|nested] 13+ messages in thread

* [gentoo-commits] repo/gentoo:master commit in: sys-fs/multipath-tools/, sys-fs/multipath-tools/files/
@ 2021-05-26  8:33 David Seifert
  0 siblings, 0 replies; 13+ messages in thread
From: David Seifert @ 2021-05-26  8:33 UTC (permalink / raw
  To: gentoo-commits

commit:     3381fddc644bbd30231d73c7e5818555f33d2da8
Author:     David Seifert <soap <AT> gentoo <DOT> org>
AuthorDate: Wed May 26 08:33:08 2021 +0000
Commit:     David Seifert <soap <AT> gentoo <DOT> org>
CommitDate: Wed May 26 08:33:08 2021 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=3381fddc

sys-fs/multipath-tools: drop 0.8.3-r2

Signed-off-by: David Seifert <soap <AT> gentoo.org>

 sys-fs/multipath-tools/Manifest                    |   1 -
 .../multipath-tools-0.7.5-respect-flags.patch      |  19 ---
 ...path-tools-0.8.3-fix-gcc-10-compatibility.patch |  11 --
 .../files/multipath-tools-0.8.3-json-c-0.14.patch  |  28 ----
 .../multipath-tools-0.8.3-no-gziped-docs.patch     | 175 ---------------------
 .../multipath-tools-0.8.3-r2.ebuild                |  93 -----------
 6 files changed, 327 deletions(-)

diff --git a/sys-fs/multipath-tools/Manifest b/sys-fs/multipath-tools/Manifest
index 752b9ac0800..8ccd861e78f 100644
--- a/sys-fs/multipath-tools/Manifest
+++ b/sys-fs/multipath-tools/Manifest
@@ -1,2 +1 @@
-DIST multipath-tools-0.8.3.tar.gz 465248 BLAKE2B 21a7a18c70150b4422bdd0ae02f26f491845eb06928ab74e631df8c6b3c110d10f43f75b9f8289a7134826c923b7ba58ce54c40497c3b7e6211e53902c8a1b5f SHA512 d9fdc2763f5a1efa15ee07c5d863008c9694623935f62a0e0b56f941df4e0d0ca3f86056fefc9b5ca828b47782127e3d55f2f925b1ed957e02b675bef36f4cae
 DIST multipath-tools-0.8.6.tar.gz 519405 BLAKE2B 5aed36550c76bbde0e874e37356b6c5a80a80b876b56dadb69ce09f0fb049a7097fd1c0aca5076f816848e2c2660f96680d7f16d56918a25299017b39f76f777 SHA512 82e5b7307e599ba6b059679c3987a442fb5be4885f0a27c260a99a07cb336b88d48e314b4ec951944e0200e4731522d8da043d98fa566857ecc6d100791c0e38

diff --git a/sys-fs/multipath-tools/files/multipath-tools-0.7.5-respect-flags.patch b/sys-fs/multipath-tools/files/multipath-tools-0.7.5-respect-flags.patch
deleted file mode 100644
index fef55ce31e9..00000000000
--- a/sys-fs/multipath-tools/files/multipath-tools-0.7.5-respect-flags.patch
+++ /dev/null
@@ -1,19 +0,0 @@
---- multipath-tools-0.7.5/Makefile.inc
-+++ multipath-tools-0.7.5/Makefile.inc
-@@ -91,12 +91,13 @@
- 		  -Wp,-D_FORTIFY_SOURCE=2 $(STACKPROT) \
- 		  --param=ssp-buffer-size=4
- 
--CFLAGS		:= $(OPTFLAGS) -DBIN_DIR=\"$(bindir)\" -DLIB_STRING=\"${LIB}\" -DRUN_DIR=\"${RUN}\" \
--		   -MMD -MP $(CFLAGS)
-+CFLAGS		?= $(OPTFLAGS)
-+CFLAGS		+= -DBIN_DIR=\"$(bindir)\" -DLIB_STRING=\"${LIB}\" -DRUN_DIR=\"${RUN}\" \
-+		   -MMD -MP
- BIN_CFLAGS	= -fPIE -DPIE
- LIB_CFLAGS	= -fPIC
- SHARED_FLAGS	= -shared
--LDFLAGS		= -Wl,-z,relro -Wl,-z,now
-+LDFLAGS		+= -Wl,-z,relro -Wl,-z,now
- BIN_LDFLAGS	= -pie
- 
- # Check whether a function with name $1 has been declared in header file $2.

diff --git a/sys-fs/multipath-tools/files/multipath-tools-0.8.3-fix-gcc-10-compatibility.patch b/sys-fs/multipath-tools/files/multipath-tools-0.8.3-fix-gcc-10-compatibility.patch
deleted file mode 100644
index 18ed8d65e0f..00000000000
--- a/sys-fs/multipath-tools/files/multipath-tools-0.8.3-fix-gcc-10-compatibility.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- a/libmultipath/structs.h
-+++ b/libmultipath/structs.h
-@@ -106,7 +106,7 @@ enum yes_no_undef_states {
-  * _FIND_MULTIPATHS_F must have the same value as YNU_YES.
-  * Generate a compile time error if that isn't the case.
-  */
--char ___error1___[-(_FIND_MULTIPATHS_F != YNU_YES)];
-+extern char ___error1___[-(_FIND_MULTIPATHS_F != YNU_YES)];
- 
- #define find_multipaths_on(conf) \
- 	(!!((conf)->find_multipaths & _FIND_MULTIPATHS_F))

diff --git a/sys-fs/multipath-tools/files/multipath-tools-0.8.3-json-c-0.14.patch b/sys-fs/multipath-tools/files/multipath-tools-0.8.3-json-c-0.14.patch
deleted file mode 100644
index 34d02f7b5d7..00000000000
--- a/sys-fs/multipath-tools/files/multipath-tools-0.8.3-json-c-0.14.patch
+++ /dev/null
@@ -1,28 +0,0 @@
-From 8438a9cd8d7ed88645fa8e6a8f19c0fd9ae872a7 Mon Sep 17 00:00:00 2001
-From: =?UTF-8?q?Bj=C3=B6rn=20Esser?= <besser82@fedoraproject.org>
-Date: Mon, 13 Apr 2020 19:22:02 +0200
-Subject: [PATCH] Add support for upcoming json-c 0.14.0.
-
-TRUE/FALSE are not defined anymore.  1 and 0 are used instead.
-This is backwards compatible, as earlier versions of json-c are
-using the same integer values in their present definitions.
----
- libdmmp/libdmmp_private.h | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/libdmmp/libdmmp_private.h b/libdmmp/libdmmp_private.h
-index ac85b63f..4378962b 100644
---- a/libdmmp/libdmmp_private.h
-+++ b/libdmmp/libdmmp_private.h
-@@ -82,7 +82,7 @@ static out_type func_name(struct dmmp_context *ctx, const char *var_name) { \
- do { \
- 	json_type j_type = json_type_null; \
- 	json_object *j_obj_tmp = NULL; \
--	if (json_object_object_get_ex(j_obj, key, &j_obj_tmp) != TRUE) { \
-+	if (json_object_object_get_ex(j_obj, key, &j_obj_tmp) != 1) { \
- 		_error(ctx, "Invalid JSON output from multipathd IPC: " \
- 		       "key '%s' not found", key); \
- 		rc = DMMP_ERR_IPC_ERROR; \
--- 
-2.26.0
-

diff --git a/sys-fs/multipath-tools/files/multipath-tools-0.8.3-no-gziped-docs.patch b/sys-fs/multipath-tools/files/multipath-tools-0.8.3-no-gziped-docs.patch
deleted file mode 100644
index 534a8d33df8..00000000000
--- a/sys-fs/multipath-tools/files/multipath-tools-0.8.3-no-gziped-docs.patch
+++ /dev/null
@@ -1,175 +0,0 @@
-Do not gzip docs
-
---- a/kpartx/Makefile
-+++ b/kpartx/Makefile
-@@ -21,7 +21,6 @@ all: $(EXEC)
- 
- $(EXEC): $(OBJS)
- 	$(CC) $(CFLAGS) $(OBJS) -o $(EXEC) $(LDFLAGS) $(LIBDEPS)
--	$(GZIP) $(EXEC).8 > $(EXEC).8.gz
- 
- install: $(EXEC) $(EXEC).8
- 	$(INSTALL_PROGRAM) -d $(DESTDIR)$(bindir)
-@@ -33,11 +32,11 @@ install: $(EXEC) $(EXEC).8
- 	$(INSTALL_PROGRAM) -m 644 kpartx.rules $(DESTDIR)$(libudevdir)/rules.d/66-kpartx.rules
- 	$(INSTALL_PROGRAM) -m 644 del-part-nodes.rules $(DESTDIR)$(libudevdir)/rules.d/68-del-part-nodes.rules
- 	$(INSTALL_PROGRAM) -d $(DESTDIR)$(man8dir)
--	$(INSTALL_PROGRAM) -m 644 $(EXEC).8.gz $(DESTDIR)$(man8dir)
-+	$(INSTALL_PROGRAM) -m 644 $(EXEC).8 $(DESTDIR)$(man8dir)
- 
- uninstall:
- 	$(RM) $(DESTDIR)$(bindir)/$(EXEC)
--	$(RM) $(DESTDIR)$(man8dir)/$(EXEC).8.gz
-+	$(RM) $(DESTDIR)$(man8dir)/$(EXEC).8
- 	$(RM) $(DESTDIR)$(libudevdir)/kpartx_id
- 	$(RM) $(DESTDIR)$(libudevdir)/rules.d/11-dm-parts.rules
- 	$(RM) $(DESTDIR)$(libudevdir)/rules.d/66-kpartx.rules
---- a/libdmmp/Makefile
-+++ b/libdmmp/Makefile
-@@ -40,7 +40,7 @@ install:
- 		$(DESTDIR)$(pkgconfdir)/$(PKGFILE)
- 	perl -i -pe 's|__INCLUDEDIR__|$(includedir)|g' \
- 		$(DESTDIR)$(pkgconfdir)/$(PKGFILE)
--	@for file in docs/man/*.3.gz; do \
-+	@for file in docs/man/*.3; do \
- 		$(INSTALL_PROGRAM) -m 644 -D \
- 			$$file \
- 			$(DESTDIR)$(man3dir)/ || exit $?; \
-@@ -69,11 +69,11 @@ check: all
- speed_test: all
- 	$(MAKE) -C test speed_test
- 
--doc: docs/man/$(EXTRA_MAN_FILES).gz
-+doc: docs/man/$(EXTRA_MAN_FILES)
- 
- TEMPFILE := $(shell mktemp)
- 
--docs/man/$(EXTRA_MAN_FILES).gz: $(HEADERS)
-+docs/man/$(EXTRA_MAN_FILES): $(HEADERS)
- 	@for file in $(EXTRA_MAN_FILES); do \
- 		$(INSTALL_PROGRAM) -v -m 644 -D docs/$$file docs/man/$$file; \
- 	done
-@@ -82,10 +82,7 @@ docs/man/$(EXTRA_MAN_FILES).gz: $(HEADERS)
- 	perl docs/kernel-doc -man "$(TEMPFILE)" | \
- 	    perl docs/split-man.pl docs/man
- 	-rm -f "$(TEMPFILE)"
--	@for file in docs/man/*.3; do \
--		gzip -f $$file; \
--	done
--	find docs/man -type f -name \*[0-9].gz
-+	find docs/man -type f -name \*.[0-9]
- 
- dep_clean:
- 	$(RM) $(OBJS:.o=.d)
---- a/libmpathpersist/Makefile
-+++ b/libmpathpersist/Makefile
-@@ -16,8 +16,6 @@ all: $(LIBS)
- $(LIBS): $(OBJS)
- 	$(CC) $(LDFLAGS) $(SHARED_FLAGS) $(LIBDEPS) -Wl,-soname=$@ -o $@ $(OBJS)
- 	$(LN) $(LIBS) $(DEVLIB)
--	$(GZIP) mpath_persistent_reserve_in.3 > mpath_persistent_reserve_in.3.gz
--	$(GZIP) mpath_persistent_reserve_out.3 > mpath_persistent_reserve_out.3.gz
- 
- install: $(LIBS)
- 	$(INSTALL_PROGRAM) -d $(DESTDIR)$(syslibdir)
-@@ -26,14 +24,14 @@ install: $(LIBS)
- 	$(INSTALL_PROGRAM) -m 755 -d $(DESTDIR)$(man3dir)
- 	$(INSTALL_PROGRAM) -m 755 -d $(DESTDIR)$(includedir)
- 	$(LN) $(LIBS) $(DESTDIR)$(syslibdir)/$(DEVLIB)
--	$(INSTALL_PROGRAM) -m 644 mpath_persistent_reserve_in.3.gz $(DESTDIR)$(man3dir)
--	$(INSTALL_PROGRAM) -m 644 mpath_persistent_reserve_out.3.gz $(DESTDIR)$(man3dir)
-+	$(INSTALL_PROGRAM) -m 644 mpath_persistent_reserve_in.3 $(DESTDIR)$(man3dir)
-+	$(INSTALL_PROGRAM) -m 644 mpath_persistent_reserve_out.3 $(DESTDIR)$(man3dir)
- 	$(INSTALL_PROGRAM) -m 644 mpath_persist.h $(DESTDIR)$(includedir)
- 
- uninstall:
- 	$(RM) $(DESTDIR)$(syslibdir)/$(LIBS)
--	$(RM) $(DESTDIR)$(man3dir)/mpath_persistent_reserve_in.3.gz
--	$(RM) $(DESTDIR)$(man3dir)/mpath_persistent_reserve_out.3.gz
-+	$(RM) $(DESTDIR)$(man3dir)/mpath_persistent_reserve_in.3
-+	$(RM) $(DESTDIR)$(man3dir)/mpath_persistent_reserve_out.3
- 	$(RM) $(DESTDIR)$(includedir)/mpath_persist.h
- 	$(RM) $(DESTDIR)$(syslibdir)/$(DEVLIB)
- 
---- a/mpathpersist/Makefile
-+++ b/mpathpersist/Makefile
-@@ -14,13 +14,12 @@ all: $(EXEC)
- 
- $(EXEC): $(OBJS)
- 	$(CC) $(OBJS) -o $(EXEC) $(LDFLAGS) $(CFLAGS) $(LIBDEPS)
--	$(GZIP) $(EXEC).8 > $(EXEC).8.gz
- 
- install:
- 	$(INSTALL_PROGRAM) -d $(DESTDIR)$(bindir)
- 	$(INSTALL_PROGRAM) -m 755 $(EXEC) $(DESTDIR)$(bindir)/
- 	$(INSTALL_PROGRAM) -d $(DESTDIR)$(man8dir)
--	$(INSTALL_PROGRAM) -m 644 $(EXEC).8.gz $(DESTDIR)$(man8dir)
-+	$(INSTALL_PROGRAM) -m 644 $(EXEC).8 $(DESTDIR)$(man8dir)
- 
- clean: dep_clean
- 	$(RM) core *.o $(EXEC) *.gz
-@@ -29,7 +28,7 @@ include $(wildcard $(OBJS:.o=.d))
- 
- uninstall:
- 	$(RM) $(DESTDIR)$(bindir)/$(EXEC)
--	$(RM) $(DESTDIR)$(man8dir)/$(EXEC).8.gz
-+	$(RM) $(DESTDIR)$(man8dir)/$(EXEC).8
- 
- dep_clean:
- 	$(RM) $(OBJS:.o=.d)
---- a/multipath/Makefile
-+++ b/multipath/Makefile
-@@ -16,8 +16,6 @@ all: $(EXEC)
- 
- $(EXEC): $(OBJS) $(multipathdir)/libmultipath.so $(mpathcmddir)/libmpathcmd.so
- 	$(CC) $(CFLAGS) $(OBJS) -o $(EXEC) $(LDFLAGS) $(LIBDEPS)
--	$(GZIP) $(EXEC).8 > $(EXEC).8.gz
--	$(GZIP) $(EXEC).conf.5 > $(EXEC).conf.5.gz
- 
- install:
- 	$(INSTALL_PROGRAM) -d $(DESTDIR)$(bindir)
-@@ -26,16 +24,16 @@ install:
- 	$(INSTALL_PROGRAM) -m 644 11-dm-mpath.rules $(DESTDIR)$(udevrulesdir)
- 	$(INSTALL_PROGRAM) -m 644 $(EXEC).rules $(DESTDIR)$(libudevdir)/rules.d/56-multipath.rules
- 	$(INSTALL_PROGRAM) -d $(DESTDIR)$(man8dir)
--	$(INSTALL_PROGRAM) -m 644 $(EXEC).8.gz $(DESTDIR)$(man8dir)
-+	$(INSTALL_PROGRAM) -m 644 $(EXEC).8 $(DESTDIR)$(man8dir)
- 	$(INSTALL_PROGRAM) -d $(DESTDIR)$(man5dir)
--	$(INSTALL_PROGRAM) -m 644 $(EXEC).conf.5.gz $(DESTDIR)$(man5dir)
-+	$(INSTALL_PROGRAM) -m 644 $(EXEC).conf.5 $(DESTDIR)$(man5dir)
- 
- uninstall:
- 	$(RM) $(DESTDIR)$(bindir)/$(EXEC)
- 	$(RM) $(DESTDIR)$(udevrulesdir)/11-dm-mpath.rules
- 	$(RM) $(DESTDIR)$(libudevdir)/rules.d/56-multipath.rules
--	$(RM) $(DESTDIR)$(man8dir)/$(EXEC).8.gz
--	$(RM) $(DESTDIR)$(man5dir)/$(EXEC).conf.5.gz
-+	$(RM) $(DESTDIR)$(man8dir)/$(EXEC).8
-+	$(RM) $(DESTDIR)$(man5dir)/$(EXEC).conf.5
- 
- clean: dep_clean
- 	$(RM) core *.o $(EXEC) *.gz
---- a/multipathd/Makefile
-+++ b/multipathd/Makefile
-@@ -34,7 +34,6 @@ all : $(EXEC)
- 
- $(EXEC): $(OBJS) $(multipathdir)/libmultipath.so $(mpathcmddir)/libmpathcmd.so
- 	$(CC) $(CFLAGS) $(OBJS) $(LDFLAGS) -o $(EXEC) $(LIBDEPS)
--	$(GZIP) $(EXEC).8 > $(EXEC).8.gz
- 
- install:
- 	$(INSTALL_PROGRAM) -d $(DESTDIR)$(bindir)
-@@ -45,11 +44,11 @@ ifdef SYSTEMD
- 	$(INSTALL_PROGRAM) -m 644 $(EXEC).socket $(DESTDIR)$(unitdir)
- endif
- 	$(INSTALL_PROGRAM) -d $(DESTDIR)$(man8dir)
--	$(INSTALL_PROGRAM) -m 644 $(EXEC).8.gz $(DESTDIR)$(man8dir)
-+	$(INSTALL_PROGRAM) -m 644 $(EXEC).8 $(DESTDIR)$(man8dir)
- 
- uninstall:
- 	$(RM) $(DESTDIR)$(bindir)/$(EXEC)
--	$(RM) $(DESTDIR)$(man8dir)/$(EXEC).8.gz
-+	$(RM) $(DESTDIR)$(man8dir)/$(EXEC).8
- 	$(RM) $(DESTDIR)$(unitdir)/$(EXEC).service
- 	$(RM) $(DESTDIR)$(unitdir)/$(EXEC).socket
- 

diff --git a/sys-fs/multipath-tools/multipath-tools-0.8.3-r2.ebuild b/sys-fs/multipath-tools/multipath-tools-0.8.3-r2.ebuild
deleted file mode 100644
index 2949cba6cbb..00000000000
--- a/sys-fs/multipath-tools/multipath-tools-0.8.3-r2.ebuild
+++ /dev/null
@@ -1,93 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="7"
-
-inherit linux-info systemd toolchain-funcs udev vcs-snapshot
-
-DESCRIPTION="Device mapper target autoconfig"
-HOMEPAGE="http://christophe.varoqui.free.fr/"
-SRC_URI="https://git.opensvc.com/?p=multipath-tools/.git;a=snapshot;h=${PV};sf=tgz -> ${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~alpha amd64 ~arm arm64 ~ia64 ppc ppc64 x86"
-IUSE="systemd rbd"
-
-BDEPEND="virtual/pkgconfig"
-
-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}"
-
-CONFIG_CHECK="~DM_MULTIPATH"
-
-RESTRICT="test"
-
-PATCHES=(
-	"${FILESDIR}"/${PN}-0.7.5-respect-flags.patch
-	"${FILESDIR}"/${PN}-0.8.3-no-gziped-docs.patch
-	"${FILESDIR}"/${PN}-0.8.3-json-c-0.14.patch
-	"${FILESDIR}"/${PN}-0.8.3-fix-gcc-10-compatibility.patch
-)
-
-get_systemd_pv() {
-	use systemd && \
-		$(tc-getPKG_CONFIG) --modversion systemd
-}
-
-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() {
-	# LIBDM_API_FLUSH involves grepping files in /usr/include,
-	# so force the test to go the way we want #411337.
-	emake \
-		CC="$(tc-getCC)" \
-		LIBDM_API_FLUSH=1 SYSTEMD="$(get_systemd_pv)"
-}
-
-src_install() {
-	dodir /sbin /usr/share/man/man{5,8}
-	emake \
-		DESTDIR="${D}" \
-		RUN=run \
-		SYSTEMD=$(get_systemd_pv) \
-		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
-}
-
-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
-}


^ permalink raw reply related	[flat|nested] 13+ messages in thread

* [gentoo-commits] repo/gentoo:master commit in: sys-fs/multipath-tools/, sys-fs/multipath-tools/files/
@ 2021-09-20  4:12 Sam James
  0 siblings, 0 replies; 13+ messages in thread
From: Sam James @ 2021-09-20  4:12 UTC (permalink / raw
  To: gentoo-commits

commit:     a71d4395773257f18b8b61624bf006097b072c92
Author:     Sam James <sam <AT> gentoo <DOT> org>
AuthorDate: Mon Sep 20 04:12:31 2021 +0000
Commit:     Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Mon Sep 20 04:12:31 2021 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=a71d4395

sys-fs/multipath-tools: add 0.8.7

Signed-off-by: Sam James <sam <AT> gentoo.org>

 sys-fs/multipath-tools/Manifest                    |  1 +
 .../multipath-tools-0.8.7-respect-flags.patch      | 14 ++++
 .../multipath-tools/multipath-tools-0.8.7.ebuild   | 89 ++++++++++++++++++++++
 3 files changed, 104 insertions(+)

diff --git a/sys-fs/multipath-tools/Manifest b/sys-fs/multipath-tools/Manifest
index 8ccd861e78f..0a206de7b65 100644
--- a/sys-fs/multipath-tools/Manifest
+++ b/sys-fs/multipath-tools/Manifest
@@ -1 +1,2 @@
 DIST multipath-tools-0.8.6.tar.gz 519405 BLAKE2B 5aed36550c76bbde0e874e37356b6c5a80a80b876b56dadb69ce09f0fb049a7097fd1c0aca5076f816848e2c2660f96680d7f16d56918a25299017b39f76f777 SHA512 82e5b7307e599ba6b059679c3987a442fb5be4885f0a27c260a99a07cb336b88d48e314b4ec951944e0200e4731522d8da043d98fa566857ecc6d100791c0e38
+DIST multipath-tools-0.8.7.tar.gz 523535 BLAKE2B 3f59af86f5b9f9ea524bf0c36e4a4bc3e01f557f2e18486b5278fe10e3bcf10dbc7568768c0e95529885bcdca6bcf04021ad5261bd1e6a3aeae5eb95b9d54801 SHA512 c01aea837b13429d17688455b813947342ca1cabba19b22e13ce640c77e68335a6d410280a8298595e239131e6fcbb655fa6de5ff9857eac99aa175046a450cd

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
new file mode 100644
index 00000000000..43c03883ee0
--- /dev/null
+++ b/sys-fs/multipath-tools/files/multipath-tools-0.8.7-respect-flags.patch
@@ -0,0 +1,14 @@
+--- 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/multipath-tools-0.8.7.ebuild b/sys-fs/multipath-tools/multipath-tools-0.8.7.ebuild
new file mode 100644
index 00000000000..b078cc97d9d
--- /dev/null
+++ b/sys-fs/multipath-tools/multipath-tools-0.8.7.ebuild
@@ -0,0 +1,89 @@
+# Copyright 1999-2021 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 ~ppc ~ppc64 ~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
+	"${FILESDIR}"/${PN}-0.8.6-no-compress-man-pages.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
+}


^ permalink raw reply related	[flat|nested] 13+ messages in thread

* [gentoo-commits] repo/gentoo:master commit in: sys-fs/multipath-tools/, sys-fs/multipath-tools/files/
@ 2022-06-21  9:41 David Seifert
  0 siblings, 0 replies; 13+ messages in thread
From: David Seifert @ 2022-06-21  9:41 UTC (permalink / raw
  To: gentoo-commits

commit:     13a6aa70c9ce95cee331058dbce0ddd5977eebfc
Author:     David Seifert <soap <AT> gentoo <DOT> org>
AuthorDate: Tue Jun 21 09:40:55 2022 +0000
Commit:     David Seifert <soap <AT> gentoo <DOT> org>
CommitDate: Tue Jun 21 09:40:55 2022 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=13a6aa70

sys-fs/multipath-tools: drop 0.8.6-r1, 0.8.7, 0.8.8

Signed-off-by: David Seifert <soap <AT> gentoo.org>

 sys-fs/multipath-tools/Manifest                    |   4 -
 .../multipath-tools-0.8.5-respect-flags.patch      |  12 --
 ...ltipath-tools-0.8.6-no-compress-man-pages.patch | 226 ---------------------
 .../multipath-tools-0.8.6-r1.ebuild                |  88 --------
 .../multipath-tools/multipath-tools-0.8.7.ebuild   |  89 --------
 .../multipath-tools/multipath-tools-0.8.8.ebuild   |  90 --------
 6 files changed, 509 deletions(-)

diff --git a/sys-fs/multipath-tools/Manifest b/sys-fs/multipath-tools/Manifest
index b3e04b797c89..55dc9b865d23 100644
--- a/sys-fs/multipath-tools/Manifest
+++ b/sys-fs/multipath-tools/Manifest
@@ -1,5 +1 @@
-DIST multipath-tools-0.8.6.tar.gz 519405 BLAKE2B 5aed36550c76bbde0e874e37356b6c5a80a80b876b56dadb69ce09f0fb049a7097fd1c0aca5076f816848e2c2660f96680d7f16d56918a25299017b39f76f777 SHA512 82e5b7307e599ba6b059679c3987a442fb5be4885f0a27c260a99a07cb336b88d48e314b4ec951944e0200e4731522d8da043d98fa566857ecc6d100791c0e38
-DIST multipath-tools-0.8.7.tar.gz 523535 BLAKE2B 3f59af86f5b9f9ea524bf0c36e4a4bc3e01f557f2e18486b5278fe10e3bcf10dbc7568768c0e95529885bcdca6bcf04021ad5261bd1e6a3aeae5eb95b9d54801 SHA512 c01aea837b13429d17688455b813947342ca1cabba19b22e13ce640c77e68335a6d410280a8298595e239131e6fcbb655fa6de5ff9857eac99aa175046a450cd
-DIST multipath-tools-0.8.8-no-compress-man-pages.patch.bz2 2493 BLAKE2B 08d77d6524861a590e07e3e9eedb1039c9b15b589becd912f17f37f728a751c7566699540c025aa1f8a0b2e04db551b0093d066f6e340a15309794fdde197483 SHA512 662f32ba5437be2a3cfffc5a466dccb7923668eeef5f23112b31d6c1b43eca2917579729e975cfbe4cd60ecfaf547f534d304626ac19d165bb2f1a3ae4bb1cc6
-DIST multipath-tools-0.8.8.tar.gz 527412 BLAKE2B 15e24a04ff1c41c8562033ca22214c015ab4c4a9e9833323830b665793c1964b6fcb7b710761bf501f0e99d461d6e6c7dfe80851a0ded4d99693a1561490598f SHA512 f09932da93b6ab06f0f911b09c605ea931fb8cb8b5530ef9999d21a41056fb48e944fc245dfe20096b2746ce1c9ebb5b548e1182079a3b52659d33263a441969
 DIST multipath-tools-0.8.9.tar.gz 534866 BLAKE2B b5ebf3c393f6b60e85678ac07378ae07056b6777409fc1bc4f4133cdd3f8c75a3d76f6e9342208df7fed8fe7812b089eba8f6b769e47e1dd6c8b7fd321bdbd30 SHA512 25f2a5d436af6a343804988cef45ca1574d4a981655a2b91563ddb89138619158befdf5af92d836a17c95d6dcf901072b614473c2129274e5dcdb1a1d64edb4d

diff --git a/sys-fs/multipath-tools/files/multipath-tools-0.8.5-respect-flags.patch b/sys-fs/multipath-tools/files/multipath-tools-0.8.5-respect-flags.patch
deleted file mode 100644
index 20d9fef6f3f1..000000000000
--- a/sys-fs/multipath-tools/files/multipath-tools-0.8.5-respect-flags.patch
+++ /dev/null
@@ -1,12 +0,0 @@
---- multipath-tools-0.8.5-eecfcba/Makefile.inc
-+++ multipath-tools-0.8.5-eecfcba/Makefile.inc
-@@ -98,7 +98,8 @@
- 		  -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 \
-+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.8.6-no-compress-man-pages.patch b/sys-fs/multipath-tools/files/multipath-tools-0.8.6-no-compress-man-pages.patch
deleted file mode 100644
index d8521436d955..000000000000
--- a/sys-fs/multipath-tools/files/multipath-tools-0.8.6-no-compress-man-pages.patch
+++ /dev/null
@@ -1,226 +0,0 @@
-From 80cca1a75f24ee239ace5577d49ccfec511480ca Mon Sep 17 00:00:00 2001
-From: Sam James <sam@gentoo.org>
-Date: Mon, 12 Jul 2021 06:04:04 +0100
-Subject: [PATCH] Don't compress man pages
-
----
- kpartx/Makefile          |  5 ++---
- libdmmp/Makefile         | 13 ++++---------
- libmpathpersist/Makefile | 14 +++++---------
- mpathpersist/Makefile    |  5 ++---
- multipath/Makefile       | 10 ++++------
- multipathd/Makefile      |  5 ++---
- 6 files changed, 19 insertions(+), 33 deletions(-)
-
-diff --git a/kpartx/Makefile b/kpartx/Makefile
-index 2906a98..cd351a4 100644
---- a/kpartx/Makefile
-+++ b/kpartx/Makefile
-@@ -21,7 +21,6 @@ all: $(EXEC)
- 
- $(EXEC): $(OBJS)
- 	$(CC) $(CFLAGS) $(OBJS) -o $(EXEC) $(LDFLAGS) $(LIBDEPS)
--	$(GZIP) $(EXEC).8 > $(EXEC).8.gz
- 
- install: $(EXEC) $(EXEC).8
- 	$(INSTALL_PROGRAM) -d $(DESTDIR)$(bindir)
-@@ -33,11 +32,11 @@ install: $(EXEC) $(EXEC).8
- 	$(INSTALL_PROGRAM) -m 644 kpartx.rules $(DESTDIR)$(libudevdir)/rules.d/66-kpartx.rules
- 	$(INSTALL_PROGRAM) -m 644 del-part-nodes.rules $(DESTDIR)$(libudevdir)/rules.d/68-del-part-nodes.rules
- 	$(INSTALL_PROGRAM) -d $(DESTDIR)$(man8dir)
--	$(INSTALL_PROGRAM) -m 644 $(EXEC).8.gz $(DESTDIR)$(man8dir)
-+	$(INSTALL_PROGRAM) -m 644 $(EXEC).8 $(DESTDIR)$(man8dir)
- 
- uninstall:
- 	$(RM) $(DESTDIR)$(bindir)/$(EXEC)
--	$(RM) $(DESTDIR)$(man8dir)/$(EXEC).8.gz
-+	$(RM) $(DESTDIR)$(man8dir)/$(EXEC).8
- 	$(RM) $(DESTDIR)$(libudevdir)/kpartx_id
- 	$(RM) $(DESTDIR)$(libudevdir)/rules.d/11-dm-parts.rules
- 	$(RM) $(DESTDIR)$(libudevdir)/rules.d/66-kpartx.rules
-diff --git a/libdmmp/Makefile b/libdmmp/Makefile
-index 764a0bc..a859786 100644
---- a/libdmmp/Makefile
-+++ b/libdmmp/Makefile
-@@ -21,13 +21,13 @@ CFLAGS += $(LIB_CFLAGS) -fvisibility=hidden -I$(libdmmpdir) -I$(mpathcmddir) \
- LIBDEPS += $(shell $(PKGCONFIG) --libs json-c) -L$(mpathcmddir) -lmpathcmd -lpthread
- 
- all: $(LIBS) doc
--.PHONY:	doc doc.gz clean install uninstall check speed_test dep_clean
-+.PHONY:	doc clean install uninstall check speed_test dep_clean
- 
- $(LIBS): $(OBJS)
- 	$(CC) $(LDFLAGS) $(SHARED_FLAGS) -Wl,-soname=$@ -o $@ $(OBJS) $(LIBDEPS)
- 	$(LN) $@ $(DEVLIB)
- 
--install:	doc.gz
-+install:	doc
- 	mkdir -p $(DESTDIR)$(usrlibdir)
- 	$(INSTALL_PROGRAM) -m 755 $(LIBS) $(DESTDIR)$(usrlibdir)/$(LIBS)
- 	$(INSTALL_PROGRAM) -m 644 -D \
-@@ -41,7 +41,7 @@ install:	doc.gz
- 		$(DESTDIR)$(pkgconfdir)/$(PKGFILE)
- 	perl -i -pe 's|__INCLUDEDIR__|$(includedir)|g' \
- 		$(DESTDIR)$(pkgconfdir)/$(PKGFILE)
--	$(INSTALL_PROGRAM) -m 644 -t $(DESTDIR)$(man3dir) docs/man/*.3.gz
-+	$(INSTALL_PROGRAM) -m 644 -t $(DESTDIR)$(man3dir) docs/man/*.3
- 
- uninstall:
- 	$(RM) $(DESTDIR)$(usrlibdir)/$(LIBS)
-@@ -55,7 +55,7 @@ uninstall:
- 
- clean: dep_clean
- 	$(RM) core *.a *.o *.gz *.so *.so.*
--	$(RM) docs/man/*.gz
-+	$(RM) docs/man/*
- 	$(MAKE) -C test clean
- 
- include $(wildcard $(OBJS:.o=.d))
-@@ -66,13 +66,8 @@ check: all
- speed_test: all
- 	$(MAKE) -C test speed_test
- 
--doc.gz:	doc $(patsubst %,%.gz,$(wildcard docs/man/*.3))
--
- doc: docs/man/dmmp_strerror.3
- 
--docs/man/%.3.gz:	docs/man/%.3
--	gzip -c $< >$@
--
- docs/man/dmmp_strerror.3:	$(HEADERS)
- 	TEMPFILE=$(shell mktemp); \
- 	cat $^ | perl docs/doc-preclean.pl >$$TEMPFILE; \
-diff --git a/libmpathpersist/Makefile b/libmpathpersist/Makefile
-index 57103e5..37c765a 100644
---- a/libmpathpersist/Makefile
-+++ b/libmpathpersist/Makefile
-@@ -12,7 +12,7 @@ LIBDEPS += -lmultipath -lmpathcmd -ldevmapper -lpthread -ldl
- 
- OBJS = mpath_persist.o mpath_updatepr.o mpath_pr_ioctl.o
- 
--all: $(DEVLIB) man
-+all: $(DEVLIB)
- 
- $(LIBS): $(OBJS) $(VERSION_SCRIPT)
- 	$(CC) $(LDFLAGS) $(SHARED_FLAGS) -Wl,-soname=$@ \
-@@ -21,10 +21,6 @@ $(LIBS): $(OBJS) $(VERSION_SCRIPT)
- $(DEVLIB): $(LIBS)
- 	$(LN) $(LIBS) $@
- 
--man:
--	$(GZIP) mpath_persistent_reserve_in.3 > mpath_persistent_reserve_in.3.gz
--	$(GZIP) mpath_persistent_reserve_out.3 > mpath_persistent_reserve_out.3.gz
--
- install: all
- 	$(INSTALL_PROGRAM) -d $(DESTDIR)$(syslibdir)
- 	$(INSTALL_PROGRAM) -m 755 $(LIBS) $(DESTDIR)$(syslibdir)/$(LIBS)
-@@ -32,14 +28,14 @@ install: all
- 	$(INSTALL_PROGRAM) -m 755 -d $(DESTDIR)$(man3dir)
- 	$(INSTALL_PROGRAM) -m 755 -d $(DESTDIR)$(includedir)
- 	$(LN) $(LIBS) $(DESTDIR)$(syslibdir)/$(DEVLIB)
--	$(INSTALL_PROGRAM) -m 644 mpath_persistent_reserve_in.3.gz $(DESTDIR)$(man3dir)
--	$(INSTALL_PROGRAM) -m 644 mpath_persistent_reserve_out.3.gz $(DESTDIR)$(man3dir)
-+	$(INSTALL_PROGRAM) -m 644 mpath_persistent_reserve_in.3 $(DESTDIR)$(man3dir)
-+	$(INSTALL_PROGRAM) -m 644 mpath_persistent_reserve_out.3 $(DESTDIR)$(man3dir)
- 	$(INSTALL_PROGRAM) -m 644 mpath_persist.h $(DESTDIR)$(includedir)
- 
- uninstall:
- 	$(RM) $(DESTDIR)$(syslibdir)/$(LIBS)
--	$(RM) $(DESTDIR)$(man3dir)/mpath_persistent_reserve_in.3.gz
--	$(RM) $(DESTDIR)$(man3dir)/mpath_persistent_reserve_out.3.gz
-+	$(RM) $(DESTDIR)$(man3dir)/mpath_persistent_reserve_in.3
-+	$(RM) $(DESTDIR)$(man3dir)/mpath_persistent_reserve_out.3
- 	$(RM) $(DESTDIR)$(includedir)/mpath_persist.h
- 	$(RM) $(DESTDIR)$(syslibdir)/$(DEVLIB)
- 
-diff --git a/mpathpersist/Makefile b/mpathpersist/Makefile
-index 5126801..0aba3cb 100644
---- a/mpathpersist/Makefile
-+++ b/mpathpersist/Makefile
-@@ -14,13 +14,12 @@ all: $(EXEC)
- 
- $(EXEC): $(OBJS)
- 	$(CC) $(OBJS) -o $(EXEC) $(LDFLAGS) $(CFLAGS) $(LIBDEPS)
--	$(GZIP) $(EXEC).8 > $(EXEC).8.gz
- 
- install:
- 	$(INSTALL_PROGRAM) -d $(DESTDIR)$(bindir)
- 	$(INSTALL_PROGRAM) -m 755 $(EXEC) $(DESTDIR)$(bindir)/
- 	$(INSTALL_PROGRAM) -d $(DESTDIR)$(man8dir)
--	$(INSTALL_PROGRAM) -m 644 $(EXEC).8.gz $(DESTDIR)$(man8dir)
-+	$(INSTALL_PROGRAM) -m 644 $(EXEC).8 $(DESTDIR)$(man8dir)
- 
- clean: dep_clean
- 	$(RM) core *.o $(EXEC) *.gz
-@@ -29,7 +28,7 @@ include $(wildcard $(OBJS:.o=.d))
- 
- uninstall:
- 	$(RM) $(DESTDIR)$(bindir)/$(EXEC)
--	$(RM) $(DESTDIR)$(man8dir)/$(EXEC).8.gz
-+	$(RM) $(DESTDIR)$(man8dir)/$(EXEC).8
- 
- dep_clean:
- 	$(RM) $(OBJS:.o=.d)
-diff --git a/multipath/Makefile b/multipath/Makefile
-index 0828a8f..55b6f7b 100644
---- a/multipath/Makefile
-+++ b/multipath/Makefile
-@@ -16,8 +16,6 @@ all: $(EXEC)
- 
- $(EXEC): $(OBJS) $(multipathdir)/libmultipath.so $(mpathcmddir)/libmpathcmd.so
- 	$(CC) $(CFLAGS) $(OBJS) -o $(EXEC) $(LDFLAGS) $(LIBDEPS)
--	$(GZIP) $(EXEC).8 > $(EXEC).8.gz
--	$(GZIP) $(EXEC).conf.5 > $(EXEC).conf.5.gz
- 
- install:
- 	$(INSTALL_PROGRAM) -d $(DESTDIR)$(bindir)
-@@ -26,16 +24,16 @@ install:
- 	$(INSTALL_PROGRAM) -m 644 11-dm-mpath.rules $(DESTDIR)$(udevrulesdir)
- 	$(INSTALL_PROGRAM) -m 644 $(EXEC).rules $(DESTDIR)$(libudevdir)/rules.d/56-multipath.rules
- 	$(INSTALL_PROGRAM) -d $(DESTDIR)$(man8dir)
--	$(INSTALL_PROGRAM) -m 644 $(EXEC).8.gz $(DESTDIR)$(man8dir)
-+	$(INSTALL_PROGRAM) -m 644 $(EXEC).8 $(DESTDIR)$(man8dir)
- 	$(INSTALL_PROGRAM) -d $(DESTDIR)$(man5dir)
--	$(INSTALL_PROGRAM) -m 644 $(EXEC).conf.5.gz $(DESTDIR)$(man5dir)
-+	$(INSTALL_PROGRAM) -m 644 $(EXEC).conf.5 $(DESTDIR)$(man5dir)
- 
- uninstall:
- 	$(RM) $(DESTDIR)$(bindir)/$(EXEC)
- 	$(RM) $(DESTDIR)$(udevrulesdir)/11-dm-mpath.rules
- 	$(RM) $(DESTDIR)$(libudevdir)/rules.d/56-multipath.rules
--	$(RM) $(DESTDIR)$(man8dir)/$(EXEC).8.gz
--	$(RM) $(DESTDIR)$(man5dir)/$(EXEC).conf.5.gz
-+	$(RM) $(DESTDIR)$(man8dir)/$(EXEC).8
-+	$(RM) $(DESTDIR)$(man5dir)/$(EXEC).conf.5
- 
- clean: dep_clean
- 	$(RM) core *.o $(EXEC) *.gz
-diff --git a/multipathd/Makefile b/multipathd/Makefile
-index d053c1e..cf3339f 100644
---- a/multipathd/Makefile
-+++ b/multipathd/Makefile
-@@ -38,7 +38,6 @@ all : $(EXEC)
- 
- $(EXEC): $(OBJS) $(multipathdir)/libmultipath.so $(mpathcmddir)/libmpathcmd.so
- 	$(CC) $(CFLAGS) $(OBJS) $(LDFLAGS) -o $(EXEC) $(LIBDEPS)
--	$(GZIP) $(EXEC).8 > $(EXEC).8.gz
- 
- cli_handlers.o:	cli_handlers.c
- 	$(CC) $(CFLAGS) -Wno-unused-parameter -c -o $@ $<
-@@ -52,11 +51,11 @@ ifdef SYSTEMD
- 	$(INSTALL_PROGRAM) -m 644 $(EXEC).socket $(DESTDIR)$(unitdir)
- endif
- 	$(INSTALL_PROGRAM) -d $(DESTDIR)$(man8dir)
--	$(INSTALL_PROGRAM) -m 644 $(EXEC).8.gz $(DESTDIR)$(man8dir)
-+	$(INSTALL_PROGRAM) -m 644 $(EXEC).8 $(DESTDIR)$(man8dir)
- 
- uninstall:
- 	$(RM) $(DESTDIR)$(bindir)/$(EXEC)
--	$(RM) $(DESTDIR)$(man8dir)/$(EXEC).8.gz
-+	$(RM) $(DESTDIR)$(man8dir)/$(EXEC).8
- 	$(RM) $(DESTDIR)$(unitdir)/$(EXEC).service
- 	$(RM) $(DESTDIR)$(unitdir)/$(EXEC).socket
- 
--- 
-2.32.0
-

diff --git a/sys-fs/multipath-tools/multipath-tools-0.8.6-r1.ebuild b/sys-fs/multipath-tools/multipath-tools-0.8.6-r1.ebuild
deleted file mode 100644
index e8862ae67790..000000000000
--- a/sys-fs/multipath-tools/multipath-tools-0.8.6-r1.ebuild
+++ /dev/null
@@ -1,88 +0,0 @@
-# Copyright 1999-2021 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 ppc ppc64 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.5-respect-flags.patch
-	"${FILESDIR}"/${PN}-0.8.6-no-compress-man-pages.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() {
-	# LIBDM_API_FLUSH involves grepping files in /usr/include,
-	# so force the test to go the way we want #411337.
-	emake \
-		CC="$(tc-getCC)" \
-		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.8.7.ebuild b/sys-fs/multipath-tools/multipath-tools-0.8.7.ebuild
deleted file mode 100644
index 35caf3b69f5b..000000000000
--- a/sys-fs/multipath-tools/multipath-tools-0.8.7.ebuild
+++ /dev/null
@@ -1,89 +0,0 @@
-# Copyright 1999-2021 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 ppc ppc64 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
-	"${FILESDIR}"/${PN}-0.8.6-no-compress-man-pages.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.8.8.ebuild b/sys-fs/multipath-tools/multipath-tools-0.8.8.ebuild
deleted file mode 100644
index f0a18e273bed..000000000000
--- a/sys-fs/multipath-tools/multipath-tools-0.8.8.ebuild
+++ /dev/null
@@ -1,90 +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"
-SRC_URI+=" https://dev.gentoo.org/~sam/distfiles/${CATEGORY}/${PN}/${PN}-0.8.8-no-compress-man-pages.patch.bz2"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~ia64 ~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
-	"${WORKDIR}"/${PN}-0.8.8-no-compress-man-pages.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
-}


^ permalink raw reply related	[flat|nested] 13+ messages in thread

* [gentoo-commits] repo/gentoo:master commit in: sys-fs/multipath-tools/, sys-fs/multipath-tools/files/
@ 2023-03-23  8:59 Sam James
  0 siblings, 0 replies; 13+ messages in thread
From: Sam James @ 2023-03-23  8:59 UTC (permalink / raw
  To: gentoo-commits

commit:     c0774867a0d5379c2bd726c659a62eae46eeac20
Author:     Sam James <sam <AT> gentoo <DOT> org>
AuthorDate: Thu Mar 23 08:50:45 2023 +0000
Commit:     Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Thu Mar 23 08:55:31 2023 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=c0774867

sys-fs/multipath-tools: add 0.9.4

Closes: https://bugs.gentoo.org/889644
Signed-off-by: Sam James <sam <AT> gentoo.org>

 sys-fs/multipath-tools/Manifest                    |   1 +
 .../files/multipath-tools-0.9.4-test-fix.patch     |  31 ++++++
 .../multipath-tools/multipath-tools-0.9.4.ebuild   | 105 +++++++++++++++++++++
 3 files changed, 137 insertions(+)

diff --git a/sys-fs/multipath-tools/Manifest b/sys-fs/multipath-tools/Manifest
index a3d16d489def..f0b00aab1bea 100644
--- a/sys-fs/multipath-tools/Manifest
+++ b/sys-fs/multipath-tools/Manifest
@@ -1 +1,2 @@
 DIST multipath-tools-0.9.3.tar.gz 552442 BLAKE2B e2065119cdd68bd8c2b4420bd0de9ce370601597972dba32c076bfc4df6d0a1a65356454a2f96f95f27cf681387685edcbac2eb41258d4a7049a1ef62cdf0949 SHA512 4faa2ee5a96a9d5d752219931ebc885cb70ed6b022d45ede985ad7919c043a3aee166e6f126d32dffd187c5c32d5cbce91747d87d0b55557e2f7f68b279583da
+DIST multipath-tools-0.9.4.tar.gz 554381 BLAKE2B 297f002e23312415467d8c4935da3b7f449318cd68120c719f40f0f45a9ebebc27f1297b918068b63471b65f72c08ce3cc6cad9b7bafcb646bb163c6486194ea SHA512 5e0dcea610fc215e345444c04453a38f39c73e493c2bc53f6b3a90cd701266aabdf7c4693dfc321099af836d0019bf27355e265ad5db5deff48f8bb94ed4719d

diff --git a/sys-fs/multipath-tools/files/multipath-tools-0.9.4-test-fix.patch b/sys-fs/multipath-tools/files/multipath-tools-0.9.4-test-fix.patch
new file mode 100644
index 000000000000..c0469a20d122
--- /dev/null
+++ b/sys-fs/multipath-tools/files/multipath-tools-0.9.4-test-fix.patch
@@ -0,0 +1,31 @@
+https://listman.redhat.com/archives/dm-devel/2023-March/053587.html
+
+From 2ebbff587e80f3f153b934d3cfcccb8a4bb21568 Mon Sep 17 00:00:00 2001
+From: Sam James <sam@gentoo.org>
+Date: Thu, 23 Mar 2023 08:04:49 +0000
+Subject: [PATCH] tests: fix quoting of CFLAGS in Makefile
+
+Otherwise, when CFLAGS/CPPFLAGS have multiple entries (like "-O2 -pipe"), we
+get an error:
+```
+make[1]: Entering directory '/var/tmp/portage/sys-fs/multipath-tools-0.9.4/work/multipath-tools-0.9.4/tests'
+/bin/sh: line 1: -pipe: command not found
+make[1]: *** [Makefile:115: libmultipath.so.0] Error 127
+make[1]: *** Waiting for unfinished jobs....
+```
+
+Signed-off-by: Sam James <sam@gentoo.org>
+--- a/tests/Makefile
++++ b/tests/Makefile
+@@ -112,7 +112,7 @@ dep_clean:
+ # Pass the original values of CFLAGS etc. to the sub-make, which will include
+ # Makefile.in again. Otherwise, the flags would be added twice.
+ libmultipath.so.0: $(multipathdir)/libmultipath.so.0
+-	@CFLAGS=$(ORIG_CFLAGS) CPPFLAGS=$(ORIG_CPPFLAGS) LDFLAGS=$(ORIG_LDFLAGS) \
++	@CFLAGS="$(ORIG_CFLAGS)" CPPFLAGS="$(ORIG_CPPFLAGS)" LDFLAGS="$(ORIG_LDFLAGS)" \
+ 	$(MAKE) -C $(multipathdir) configdir=$(TESTDIR)/conf.d plugindir=$(TESTDIR)/lib test-lib
+ 
+ # COLON will get expanded during second expansion below
+-- 
+2.40.0
+

diff --git a/sys-fs/multipath-tools/multipath-tools-0.9.4.ebuild b/sys-fs/multipath-tools/multipath-tools-0.9.4.ebuild
new file mode 100644
index 000000000000..a0a952eec775
--- /dev/null
+++ b/sys-fs/multipath-tools/multipath-tools-0.9.4.ebuild
@@ -0,0 +1,105 @@
+# Copyright 1999-2023 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.4-test-fix.patch
+)
+
+myemake() {
+	local myemakeargs=(
+		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}"
+		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
+
+	append-flags -Wno-error
+
+	myemake
+}
+
+src_test() {
+	myemake test
+}
+
+src_install() {
+	dodir /sbin
+
+	myemake DESTDIR="${ED}" 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
+}


^ permalink raw reply related	[flat|nested] 13+ messages in thread

* [gentoo-commits] repo/gentoo:master commit in: sys-fs/multipath-tools/, sys-fs/multipath-tools/files/
@ 2024-11-01 14:47 Andreas K. Hüttel
  0 siblings, 0 replies; 13+ messages in thread
From: Andreas K. Hüttel @ 2024-11-01 14:47 UTC (permalink / raw
  To: gentoo-commits

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 <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
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
-}


^ permalink raw reply related	[flat|nested] 13+ messages in thread

end of thread, other threads:[~2024-11-01 14:47 UTC | newest]

Thread overview: 13+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2024-11-01 14:47 [gentoo-commits] repo/gentoo:master commit in: sys-fs/multipath-tools/, sys-fs/multipath-tools/files/ Andreas K. Hüttel
  -- strict thread matches above, loose matches on Subject: below --
2023-03-23  8:59 Sam James
2022-06-21  9:41 David Seifert
2021-09-20  4:12 Sam James
2021-05-26  8:33 David Seifert
2021-04-06 10:17 Lars Wendler
2020-11-14 10:56 Lars Wendler
2020-09-15  9:49 Lars Wendler
2019-11-27 20:58 Thomas Deutschmann
2019-10-02 21:44 Thomas Deutschmann
2018-11-23 10:35 Lars Wendler
2017-10-10 19:47 Thomas Deutschmann
2017-01-07 21:49 Robin H. Johnson

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox