From 4df3bf9762850b34cd1ead5c80374d1a0fc3362e Mon Sep 17 00:00:00 2001 From: V3n3RiX Date: Mon, 12 Jul 2021 08:41:54 +0100 Subject: gentoo resync : 12.07.2021 --- sys-fs/multipath-tools/Manifest | 4 +- ...ltipath-tools-0.8.6-no-compress-man-pages.patch | 226 +++++++++++++++++++++ sys-fs/multipath-tools/metadata.xml | 3 + .../multipath-tools-0.8.6-r1.ebuild | 88 ++++++++ 4 files changed, 320 insertions(+), 1 deletion(-) create mode 100644 sys-fs/multipath-tools/files/multipath-tools-0.8.6-no-compress-man-pages.patch create mode 100644 sys-fs/multipath-tools/multipath-tools-0.8.6-r1.ebuild (limited to 'sys-fs/multipath-tools') diff --git a/sys-fs/multipath-tools/Manifest b/sys-fs/multipath-tools/Manifest index 025af351052b..2e37ad06efce 100644 --- a/sys-fs/multipath-tools/Manifest +++ b/sys-fs/multipath-tools/Manifest @@ -1,6 +1,8 @@ AUX multipath-tools-0.8.5-respect-flags.patch 542 BLAKE2B b60dda770d8441bfd4026bb4b0dbcea6590e71b8d3da0d5645983a6e8e4ef5c00c0283682f9de335b029d3817786e6512c852ae411efe0cdd40416eb970f33e0 SHA512 89d9b9ec971a7afd5f80e19d9b8b691763c3f8a093e99a229a09307e44e5661b4952eed86e732279c0820f15b8f4c48b803823cf27830d03ca7213f9a7364c47 +AUX multipath-tools-0.8.6-no-compress-man-pages.patch 8056 BLAKE2B 6e1ef1680538fc5c7babe920b47e94af8e8bca53f4c8e71f612517430a64d371d6fb2480c5d9b706198f32015ed323c45f9034d22c8bddaecc2bd11d0c671513 SHA512 446c756fd947daecae790733f9c15ca0e7bc902b9aa832a4f4f4625d3fc74f5f7772402f37fd48f0498ca281ae484690d3f1c913cc2dfea6cca9f7b5f8b43b4b AUX multipath.rc 565 BLAKE2B efb26199eddb75c5e87d1ab40aa8cb4fbaf9f7a2bfd7a20add6d55997d25de9a3dbf0d032c977593c2ee8d447539a34be0294ee3a80a80fb004dc2c51c8c64b5 SHA512 f08833fc3c928900f8c29438208b9715581bae426b1f45c246e8c418b210f7f9d35517ef9ad44db3d88944183b34e3411ece909b56892a9f3b7250fed49e43fe AUX multipathd-r1.rc 264 BLAKE2B f08733746c702da27e002b2cb07bbc1a1925002b1592c2f566aa8d66c71da5fd39fd6389636fc49b602f9051190ee5f7f85ad9ff35b924f51a2698e1a6654f0e SHA512 8cf764b59ed4bb13c3c2143cd83ee39bc87eca85c40acb3ed1dcd7cf4c39ecbdea7974b9705231d48377266c034a8623157648b9a99b6cef73617e4b37ad377e DIST multipath-tools-0.8.6.tar.gz 519405 BLAKE2B 5aed36550c76bbde0e874e37356b6c5a80a80b876b56dadb69ce09f0fb049a7097fd1c0aca5076f816848e2c2660f96680d7f16d56918a25299017b39f76f777 SHA512 82e5b7307e599ba6b059679c3987a442fb5be4885f0a27c260a99a07cb336b88d48e314b4ec951944e0200e4731522d8da043d98fa566857ecc6d100791c0e38 +EBUILD multipath-tools-0.8.6-r1.ebuild 2143 BLAKE2B e43f6abb36ea701d747513b6ac01344872b9e36c976f3f8213a51406d767047af9e69e0f1e4c6436852397fc597c57f89dc819985249362fed8e491015a47211 SHA512 c958b3bc9ade0daa842992efe67499ecd86d7948057bd1fcc88d158e5109539e5ac20ce5aaa17d6d73125158a38aa4dabbe4eb150dec8f282ebfa3b189b0d062 EBUILD multipath-tools-0.8.6.ebuild 2078 BLAKE2B 185d6508999de14cb02f9db69823b561cc62d9dbe596828421cd2381c656301874bb3f43052042b5a3179ca8de469914557acc7369109cdd5ef9c267b5493059 SHA512 c591a02efae279dce30f20f6ba5647eeec4d353e29f38f07a4677c0a683b07ad24a7471e7316e8e4063df43c4bca0833bbdef653ffa8e833566a9bb7fdb14c2a -MISC metadata.xml 364 BLAKE2B d1d285f68ff773055f374ad7f6790708b7fed62a0d9787aff638c6ced762ff34d62a94a90d79426dbf4a81d86cf2447f41947d7650d3f1bc366a9d3338af94ce SHA512 91654145796f3e879d14dc7aab2261099dc0e2cb44e7563bf3c006893b81aa0f84fdd52870aaf317197b87e6c4d9e1341e456daeb2f3b40c926bdaf31c797134 +MISC metadata.xml 452 BLAKE2B e950c42b1b03518526a348e0bb2a6ad8d2b912e14f71562d4249d1adeaf149443621d4518a6fdf7912e8efeb40634177a0da7d944d2142c7eb851231356a353c SHA512 2bd1aab9e07240502a4bd344c9ed73df3c677f41083f76865862e679c613dbf23957bce83469b5ddb9afa43fda13b7cf2fa4efb31da9b89a9ec91631260111b2 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 new file mode 100644 index 000000000000..d8521436d955 --- /dev/null +++ b/sys-fs/multipath-tools/files/multipath-tools-0.8.6-no-compress-man-pages.patch @@ -0,0 +1,226 @@ +From 80cca1a75f24ee239ace5577d49ccfec511480ca Mon Sep 17 00:00:00 2001 +From: Sam James +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/metadata.xml b/sys-fs/multipath-tools/metadata.xml index 9a20c9e5bc2b..9b1922756da5 100644 --- a/sys-fs/multipath-tools/metadata.xml +++ b/sys-fs/multipath-tools/metadata.xml @@ -8,4 +8,7 @@ Enable Rados block device support via sys-cluster/ceph + + opensvc/multipath-tools + 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 new file mode 100644 index 000000000000..8dff4dda6bf3 --- /dev/null +++ b/sys-fs/multipath-tools/multipath-tools-0.8.6-r1.ebuild @@ -0,0 +1,88 @@ +# 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 +} -- cgit v1.2.3