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?= <besse...@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 -}