Gentoo Archives: gentoo-commits

From: David Seifert <soap@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] repo/gentoo:master commit in: sys-fs/multipath-tools/, sys-fs/multipath-tools/files/
Date: Wed, 26 May 2021 08:33:41
Message-Id: 1622017988.3381fddc644bbd30231d73c7e5818555f33d2da8.soap@gentoo
1 commit: 3381fddc644bbd30231d73c7e5818555f33d2da8
2 Author: David Seifert <soap <AT> gentoo <DOT> org>
3 AuthorDate: Wed May 26 08:33:08 2021 +0000
4 Commit: David Seifert <soap <AT> gentoo <DOT> org>
5 CommitDate: Wed May 26 08:33:08 2021 +0000
6 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=3381fddc
7
8 sys-fs/multipath-tools: drop 0.8.3-r2
9
10 Signed-off-by: David Seifert <soap <AT> gentoo.org>
11
12 sys-fs/multipath-tools/Manifest | 1 -
13 .../multipath-tools-0.7.5-respect-flags.patch | 19 ---
14 ...path-tools-0.8.3-fix-gcc-10-compatibility.patch | 11 --
15 .../files/multipath-tools-0.8.3-json-c-0.14.patch | 28 ----
16 .../multipath-tools-0.8.3-no-gziped-docs.patch | 175 ---------------------
17 .../multipath-tools-0.8.3-r2.ebuild | 93 -----------
18 6 files changed, 327 deletions(-)
19
20 diff --git a/sys-fs/multipath-tools/Manifest b/sys-fs/multipath-tools/Manifest
21 index 752b9ac0800..8ccd861e78f 100644
22 --- a/sys-fs/multipath-tools/Manifest
23 +++ b/sys-fs/multipath-tools/Manifest
24 @@ -1,2 +1 @@
25 -DIST multipath-tools-0.8.3.tar.gz 465248 BLAKE2B 21a7a18c70150b4422bdd0ae02f26f491845eb06928ab74e631df8c6b3c110d10f43f75b9f8289a7134826c923b7ba58ce54c40497c3b7e6211e53902c8a1b5f SHA512 d9fdc2763f5a1efa15ee07c5d863008c9694623935f62a0e0b56f941df4e0d0ca3f86056fefc9b5ca828b47782127e3d55f2f925b1ed957e02b675bef36f4cae
26 DIST multipath-tools-0.8.6.tar.gz 519405 BLAKE2B 5aed36550c76bbde0e874e37356b6c5a80a80b876b56dadb69ce09f0fb049a7097fd1c0aca5076f816848e2c2660f96680d7f16d56918a25299017b39f76f777 SHA512 82e5b7307e599ba6b059679c3987a442fb5be4885f0a27c260a99a07cb336b88d48e314b4ec951944e0200e4731522d8da043d98fa566857ecc6d100791c0e38
27
28 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
29 deleted file mode 100644
30 index fef55ce31e9..00000000000
31 --- a/sys-fs/multipath-tools/files/multipath-tools-0.7.5-respect-flags.patch
32 +++ /dev/null
33 @@ -1,19 +0,0 @@
34 ---- multipath-tools-0.7.5/Makefile.inc
35 -+++ multipath-tools-0.7.5/Makefile.inc
36 -@@ -91,12 +91,13 @@
37 - -Wp,-D_FORTIFY_SOURCE=2 $(STACKPROT) \
38 - --param=ssp-buffer-size=4
39 -
40 --CFLAGS := $(OPTFLAGS) -DBIN_DIR=\"$(bindir)\" -DLIB_STRING=\"${LIB}\" -DRUN_DIR=\"${RUN}\" \
41 -- -MMD -MP $(CFLAGS)
42 -+CFLAGS ?= $(OPTFLAGS)
43 -+CFLAGS += -DBIN_DIR=\"$(bindir)\" -DLIB_STRING=\"${LIB}\" -DRUN_DIR=\"${RUN}\" \
44 -+ -MMD -MP
45 - BIN_CFLAGS = -fPIE -DPIE
46 - LIB_CFLAGS = -fPIC
47 - SHARED_FLAGS = -shared
48 --LDFLAGS = -Wl,-z,relro -Wl,-z,now
49 -+LDFLAGS += -Wl,-z,relro -Wl,-z,now
50 - BIN_LDFLAGS = -pie
51 -
52 - # Check whether a function with name $1 has been declared in header file $2.
53
54 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
55 deleted file mode 100644
56 index 18ed8d65e0f..00000000000
57 --- a/sys-fs/multipath-tools/files/multipath-tools-0.8.3-fix-gcc-10-compatibility.patch
58 +++ /dev/null
59 @@ -1,11 +0,0 @@
60 ---- a/libmultipath/structs.h
61 -+++ b/libmultipath/structs.h
62 -@@ -106,7 +106,7 @@ enum yes_no_undef_states {
63 - * _FIND_MULTIPATHS_F must have the same value as YNU_YES.
64 - * Generate a compile time error if that isn't the case.
65 - */
66 --char ___error1___[-(_FIND_MULTIPATHS_F != YNU_YES)];
67 -+extern char ___error1___[-(_FIND_MULTIPATHS_F != YNU_YES)];
68 -
69 - #define find_multipaths_on(conf) \
70 - (!!((conf)->find_multipaths & _FIND_MULTIPATHS_F))
71
72 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
73 deleted file mode 100644
74 index 34d02f7b5d7..00000000000
75 --- a/sys-fs/multipath-tools/files/multipath-tools-0.8.3-json-c-0.14.patch
76 +++ /dev/null
77 @@ -1,28 +0,0 @@
78 -From 8438a9cd8d7ed88645fa8e6a8f19c0fd9ae872a7 Mon Sep 17 00:00:00 2001
79 -From: =?UTF-8?q?Bj=C3=B6rn=20Esser?= <besser82@×××××××××××××.org>
80 -Date: Mon, 13 Apr 2020 19:22:02 +0200
81 -Subject: [PATCH] Add support for upcoming json-c 0.14.0.
82 -
83 -TRUE/FALSE are not defined anymore. 1 and 0 are used instead.
84 -This is backwards compatible, as earlier versions of json-c are
85 -using the same integer values in their present definitions.
86 ----
87 - libdmmp/libdmmp_private.h | 2 +-
88 - 1 file changed, 1 insertion(+), 1 deletion(-)
89 -
90 -diff --git a/libdmmp/libdmmp_private.h b/libdmmp/libdmmp_private.h
91 -index ac85b63f..4378962b 100644
92 ---- a/libdmmp/libdmmp_private.h
93 -+++ b/libdmmp/libdmmp_private.h
94 -@@ -82,7 +82,7 @@ static out_type func_name(struct dmmp_context *ctx, const char *var_name) { \
95 - do { \
96 - json_type j_type = json_type_null; \
97 - json_object *j_obj_tmp = NULL; \
98 -- if (json_object_object_get_ex(j_obj, key, &j_obj_tmp) != TRUE) { \
99 -+ if (json_object_object_get_ex(j_obj, key, &j_obj_tmp) != 1) { \
100 - _error(ctx, "Invalid JSON output from multipathd IPC: " \
101 - "key '%s' not found", key); \
102 - rc = DMMP_ERR_IPC_ERROR; \
103 ---
104 -2.26.0
105 -
106
107 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
108 deleted file mode 100644
109 index 534a8d33df8..00000000000
110 --- a/sys-fs/multipath-tools/files/multipath-tools-0.8.3-no-gziped-docs.patch
111 +++ /dev/null
112 @@ -1,175 +0,0 @@
113 -Do not gzip docs
114 -
115 ---- a/kpartx/Makefile
116 -+++ b/kpartx/Makefile
117 -@@ -21,7 +21,6 @@ all: $(EXEC)
118 -
119 - $(EXEC): $(OBJS)
120 - $(CC) $(CFLAGS) $(OBJS) -o $(EXEC) $(LDFLAGS) $(LIBDEPS)
121 -- $(GZIP) $(EXEC).8 > $(EXEC).8.gz
122 -
123 - install: $(EXEC) $(EXEC).8
124 - $(INSTALL_PROGRAM) -d $(DESTDIR)$(bindir)
125 -@@ -33,11 +32,11 @@ install: $(EXEC) $(EXEC).8
126 - $(INSTALL_PROGRAM) -m 644 kpartx.rules $(DESTDIR)$(libudevdir)/rules.d/66-kpartx.rules
127 - $(INSTALL_PROGRAM) -m 644 del-part-nodes.rules $(DESTDIR)$(libudevdir)/rules.d/68-del-part-nodes.rules
128 - $(INSTALL_PROGRAM) -d $(DESTDIR)$(man8dir)
129 -- $(INSTALL_PROGRAM) -m 644 $(EXEC).8.gz $(DESTDIR)$(man8dir)
130 -+ $(INSTALL_PROGRAM) -m 644 $(EXEC).8 $(DESTDIR)$(man8dir)
131 -
132 - uninstall:
133 - $(RM) $(DESTDIR)$(bindir)/$(EXEC)
134 -- $(RM) $(DESTDIR)$(man8dir)/$(EXEC).8.gz
135 -+ $(RM) $(DESTDIR)$(man8dir)/$(EXEC).8
136 - $(RM) $(DESTDIR)$(libudevdir)/kpartx_id
137 - $(RM) $(DESTDIR)$(libudevdir)/rules.d/11-dm-parts.rules
138 - $(RM) $(DESTDIR)$(libudevdir)/rules.d/66-kpartx.rules
139 ---- a/libdmmp/Makefile
140 -+++ b/libdmmp/Makefile
141 -@@ -40,7 +40,7 @@ install:
142 - $(DESTDIR)$(pkgconfdir)/$(PKGFILE)
143 - perl -i -pe 's|__INCLUDEDIR__|$(includedir)|g' \
144 - $(DESTDIR)$(pkgconfdir)/$(PKGFILE)
145 -- @for file in docs/man/*.3.gz; do \
146 -+ @for file in docs/man/*.3; do \
147 - $(INSTALL_PROGRAM) -m 644 -D \
148 - $$file \
149 - $(DESTDIR)$(man3dir)/ || exit $?; \
150 -@@ -69,11 +69,11 @@ check: all
151 - speed_test: all
152 - $(MAKE) -C test speed_test
153 -
154 --doc: docs/man/$(EXTRA_MAN_FILES).gz
155 -+doc: docs/man/$(EXTRA_MAN_FILES)
156 -
157 - TEMPFILE := $(shell mktemp)
158 -
159 --docs/man/$(EXTRA_MAN_FILES).gz: $(HEADERS)
160 -+docs/man/$(EXTRA_MAN_FILES): $(HEADERS)
161 - @for file in $(EXTRA_MAN_FILES); do \
162 - $(INSTALL_PROGRAM) -v -m 644 -D docs/$$file docs/man/$$file; \
163 - done
164 -@@ -82,10 +82,7 @@ docs/man/$(EXTRA_MAN_FILES).gz: $(HEADERS)
165 - perl docs/kernel-doc -man "$(TEMPFILE)" | \
166 - perl docs/split-man.pl docs/man
167 - -rm -f "$(TEMPFILE)"
168 -- @for file in docs/man/*.3; do \
169 -- gzip -f $$file; \
170 -- done
171 -- find docs/man -type f -name \*[0-9].gz
172 -+ find docs/man -type f -name \*.[0-9]
173 -
174 - dep_clean:
175 - $(RM) $(OBJS:.o=.d)
176 ---- a/libmpathpersist/Makefile
177 -+++ b/libmpathpersist/Makefile
178 -@@ -16,8 +16,6 @@ all: $(LIBS)
179 - $(LIBS): $(OBJS)
180 - $(CC) $(LDFLAGS) $(SHARED_FLAGS) $(LIBDEPS) -Wl,-soname=$@ -o $@ $(OBJS)
181 - $(LN) $(LIBS) $(DEVLIB)
182 -- $(GZIP) mpath_persistent_reserve_in.3 > mpath_persistent_reserve_in.3.gz
183 -- $(GZIP) mpath_persistent_reserve_out.3 > mpath_persistent_reserve_out.3.gz
184 -
185 - install: $(LIBS)
186 - $(INSTALL_PROGRAM) -d $(DESTDIR)$(syslibdir)
187 -@@ -26,14 +24,14 @@ install: $(LIBS)
188 - $(INSTALL_PROGRAM) -m 755 -d $(DESTDIR)$(man3dir)
189 - $(INSTALL_PROGRAM) -m 755 -d $(DESTDIR)$(includedir)
190 - $(LN) $(LIBS) $(DESTDIR)$(syslibdir)/$(DEVLIB)
191 -- $(INSTALL_PROGRAM) -m 644 mpath_persistent_reserve_in.3.gz $(DESTDIR)$(man3dir)
192 -- $(INSTALL_PROGRAM) -m 644 mpath_persistent_reserve_out.3.gz $(DESTDIR)$(man3dir)
193 -+ $(INSTALL_PROGRAM) -m 644 mpath_persistent_reserve_in.3 $(DESTDIR)$(man3dir)
194 -+ $(INSTALL_PROGRAM) -m 644 mpath_persistent_reserve_out.3 $(DESTDIR)$(man3dir)
195 - $(INSTALL_PROGRAM) -m 644 mpath_persist.h $(DESTDIR)$(includedir)
196 -
197 - uninstall:
198 - $(RM) $(DESTDIR)$(syslibdir)/$(LIBS)
199 -- $(RM) $(DESTDIR)$(man3dir)/mpath_persistent_reserve_in.3.gz
200 -- $(RM) $(DESTDIR)$(man3dir)/mpath_persistent_reserve_out.3.gz
201 -+ $(RM) $(DESTDIR)$(man3dir)/mpath_persistent_reserve_in.3
202 -+ $(RM) $(DESTDIR)$(man3dir)/mpath_persistent_reserve_out.3
203 - $(RM) $(DESTDIR)$(includedir)/mpath_persist.h
204 - $(RM) $(DESTDIR)$(syslibdir)/$(DEVLIB)
205 -
206 ---- a/mpathpersist/Makefile
207 -+++ b/mpathpersist/Makefile
208 -@@ -14,13 +14,12 @@ all: $(EXEC)
209 -
210 - $(EXEC): $(OBJS)
211 - $(CC) $(OBJS) -o $(EXEC) $(LDFLAGS) $(CFLAGS) $(LIBDEPS)
212 -- $(GZIP) $(EXEC).8 > $(EXEC).8.gz
213 -
214 - install:
215 - $(INSTALL_PROGRAM) -d $(DESTDIR)$(bindir)
216 - $(INSTALL_PROGRAM) -m 755 $(EXEC) $(DESTDIR)$(bindir)/
217 - $(INSTALL_PROGRAM) -d $(DESTDIR)$(man8dir)
218 -- $(INSTALL_PROGRAM) -m 644 $(EXEC).8.gz $(DESTDIR)$(man8dir)
219 -+ $(INSTALL_PROGRAM) -m 644 $(EXEC).8 $(DESTDIR)$(man8dir)
220 -
221 - clean: dep_clean
222 - $(RM) core *.o $(EXEC) *.gz
223 -@@ -29,7 +28,7 @@ include $(wildcard $(OBJS:.o=.d))
224 -
225 - uninstall:
226 - $(RM) $(DESTDIR)$(bindir)/$(EXEC)
227 -- $(RM) $(DESTDIR)$(man8dir)/$(EXEC).8.gz
228 -+ $(RM) $(DESTDIR)$(man8dir)/$(EXEC).8
229 -
230 - dep_clean:
231 - $(RM) $(OBJS:.o=.d)
232 ---- a/multipath/Makefile
233 -+++ b/multipath/Makefile
234 -@@ -16,8 +16,6 @@ all: $(EXEC)
235 -
236 - $(EXEC): $(OBJS) $(multipathdir)/libmultipath.so $(mpathcmddir)/libmpathcmd.so
237 - $(CC) $(CFLAGS) $(OBJS) -o $(EXEC) $(LDFLAGS) $(LIBDEPS)
238 -- $(GZIP) $(EXEC).8 > $(EXEC).8.gz
239 -- $(GZIP) $(EXEC).conf.5 > $(EXEC).conf.5.gz
240 -
241 - install:
242 - $(INSTALL_PROGRAM) -d $(DESTDIR)$(bindir)
243 -@@ -26,16 +24,16 @@ install:
244 - $(INSTALL_PROGRAM) -m 644 11-dm-mpath.rules $(DESTDIR)$(udevrulesdir)
245 - $(INSTALL_PROGRAM) -m 644 $(EXEC).rules $(DESTDIR)$(libudevdir)/rules.d/56-multipath.rules
246 - $(INSTALL_PROGRAM) -d $(DESTDIR)$(man8dir)
247 -- $(INSTALL_PROGRAM) -m 644 $(EXEC).8.gz $(DESTDIR)$(man8dir)
248 -+ $(INSTALL_PROGRAM) -m 644 $(EXEC).8 $(DESTDIR)$(man8dir)
249 - $(INSTALL_PROGRAM) -d $(DESTDIR)$(man5dir)
250 -- $(INSTALL_PROGRAM) -m 644 $(EXEC).conf.5.gz $(DESTDIR)$(man5dir)
251 -+ $(INSTALL_PROGRAM) -m 644 $(EXEC).conf.5 $(DESTDIR)$(man5dir)
252 -
253 - uninstall:
254 - $(RM) $(DESTDIR)$(bindir)/$(EXEC)
255 - $(RM) $(DESTDIR)$(udevrulesdir)/11-dm-mpath.rules
256 - $(RM) $(DESTDIR)$(libudevdir)/rules.d/56-multipath.rules
257 -- $(RM) $(DESTDIR)$(man8dir)/$(EXEC).8.gz
258 -- $(RM) $(DESTDIR)$(man5dir)/$(EXEC).conf.5.gz
259 -+ $(RM) $(DESTDIR)$(man8dir)/$(EXEC).8
260 -+ $(RM) $(DESTDIR)$(man5dir)/$(EXEC).conf.5
261 -
262 - clean: dep_clean
263 - $(RM) core *.o $(EXEC) *.gz
264 ---- a/multipathd/Makefile
265 -+++ b/multipathd/Makefile
266 -@@ -34,7 +34,6 @@ all : $(EXEC)
267 -
268 - $(EXEC): $(OBJS) $(multipathdir)/libmultipath.so $(mpathcmddir)/libmpathcmd.so
269 - $(CC) $(CFLAGS) $(OBJS) $(LDFLAGS) -o $(EXEC) $(LIBDEPS)
270 -- $(GZIP) $(EXEC).8 > $(EXEC).8.gz
271 -
272 - install:
273 - $(INSTALL_PROGRAM) -d $(DESTDIR)$(bindir)
274 -@@ -45,11 +44,11 @@ ifdef SYSTEMD
275 - $(INSTALL_PROGRAM) -m 644 $(EXEC).socket $(DESTDIR)$(unitdir)
276 - endif
277 - $(INSTALL_PROGRAM) -d $(DESTDIR)$(man8dir)
278 -- $(INSTALL_PROGRAM) -m 644 $(EXEC).8.gz $(DESTDIR)$(man8dir)
279 -+ $(INSTALL_PROGRAM) -m 644 $(EXEC).8 $(DESTDIR)$(man8dir)
280 -
281 - uninstall:
282 - $(RM) $(DESTDIR)$(bindir)/$(EXEC)
283 -- $(RM) $(DESTDIR)$(man8dir)/$(EXEC).8.gz
284 -+ $(RM) $(DESTDIR)$(man8dir)/$(EXEC).8
285 - $(RM) $(DESTDIR)$(unitdir)/$(EXEC).service
286 - $(RM) $(DESTDIR)$(unitdir)/$(EXEC).socket
287 -
288
289 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
290 deleted file mode 100644
291 index 2949cba6cbb..00000000000
292 --- a/sys-fs/multipath-tools/multipath-tools-0.8.3-r2.ebuild
293 +++ /dev/null
294 @@ -1,93 +0,0 @@
295 -# Copyright 1999-2021 Gentoo Authors
296 -# Distributed under the terms of the GNU General Public License v2
297 -
298 -EAPI="7"
299 -
300 -inherit linux-info systemd toolchain-funcs udev vcs-snapshot
301 -
302 -DESCRIPTION="Device mapper target autoconfig"
303 -HOMEPAGE="http://christophe.varoqui.free.fr/"
304 -SRC_URI="https://git.opensvc.com/?p=multipath-tools/.git;a=snapshot;h=${PV};sf=tgz -> ${P}.tar.gz"
305 -
306 -LICENSE="GPL-2"
307 -SLOT="0"
308 -KEYWORDS="~alpha amd64 ~arm arm64 ~ia64 ppc ppc64 x86"
309 -IUSE="systemd rbd"
310 -
311 -BDEPEND="virtual/pkgconfig"
312 -
313 -RDEPEND="
314 - dev-libs/json-c:=
315 - dev-libs/libaio
316 - dev-libs/userspace-rcu:=
317 - >=sys-fs/lvm2-2.02.45
318 - >=virtual/libudev-232-r3
319 - sys-libs/readline:0=
320 - rbd? ( sys-cluster/ceph )
321 - systemd? ( sys-apps/systemd )
322 -"
323 -
324 -DEPEND="${RDEPEND}"
325 -
326 -CONFIG_CHECK="~DM_MULTIPATH"
327 -
328 -RESTRICT="test"
329 -
330 -PATCHES=(
331 - "${FILESDIR}"/${PN}-0.7.5-respect-flags.patch
332 - "${FILESDIR}"/${PN}-0.8.3-no-gziped-docs.patch
333 - "${FILESDIR}"/${PN}-0.8.3-json-c-0.14.patch
334 - "${FILESDIR}"/${PN}-0.8.3-fix-gcc-10-compatibility.patch
335 -)
336 -
337 -get_systemd_pv() {
338 - use systemd && \
339 - $(tc-getPKG_CONFIG) --modversion systemd
340 -}
341 -
342 -src_prepare() {
343 - default
344 -
345 - # The upstream lacks any way to configure the build at present
346 - # and ceph is a huge dependency, so we're using sed to make it
347 - # optional until the upstream has a proper configure system
348 - if ! use rbd ; then
349 - sed \
350 - -e "s/libcheckrbd.so/# libcheckrbd.so/" \
351 - -e "s/-lrados//" \
352 - -i libmultipath/checkers/Makefile \
353 - || die
354 - fi
355 -}
356 -
357 -src_compile() {
358 - # LIBDM_API_FLUSH involves grepping files in /usr/include,
359 - # so force the test to go the way we want #411337.
360 - emake \
361 - CC="$(tc-getCC)" \
362 - LIBDM_API_FLUSH=1 SYSTEMD="$(get_systemd_pv)"
363 -}
364 -
365 -src_install() {
366 - dodir /sbin /usr/share/man/man{5,8}
367 - emake \
368 - DESTDIR="${D}" \
369 - RUN=run \
370 - SYSTEMD=$(get_systemd_pv) \
371 - unitdir="$(systemd_get_systemunitdir)" \
372 - libudevdir='${prefix}'/"$(get_udevdir)" \
373 - pkgconfdir='${prefix}'/usr/'${LIB}'/pkgconfig \
374 - install
375 -
376 - newinitd "${FILESDIR}"/multipathd-r1.rc multipathd
377 - newinitd "${FILESDIR}"/multipath.rc multipath
378 -
379 - einstalldocs
380 -}
381 -
382 -pkg_postinst() {
383 - if [[ -z ${REPLACING_VERSIONS} ]]; then
384 - elog "If you need multipath on your system, you must"
385 - elog "add 'multipath' into your boot runlevel!"
386 - fi
387 -}