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

[Sam James]

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