Gentoo Archives: gentoo-commits

From: Lars Wendler <polynomial-c@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: Fri, 23 Nov 2018 10:36:01
Message-Id: 1542969349.75bc6a33728394d3341a0b0abd8875d1adb6775a.polynomial-c@gentoo
1 commit: 75bc6a33728394d3341a0b0abd8875d1adb6775a
2 Author: Lars Wendler <polynomial-c <AT> gentoo <DOT> org>
3 AuthorDate: Fri Nov 23 10:35:49 2018 +0000
4 Commit: Lars Wendler <polynomial-c <AT> gentoo <DOT> org>
5 CommitDate: Fri Nov 23 10:35:49 2018 +0000
6 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=75bc6a33
7
8 sys-fs/multipath-tools: Removed old.
9
10 Package-Manager: Portage-2.3.52, Repoman-2.3.12
11 Signed-off-by: Lars Wendler <polynomial-c <AT> gentoo.org>
12
13 sys-fs/multipath-tools/Manifest | 1 -
14 .../files/multipath-tools-0.5.0-makefile.patch | 200 ---------------------
15 .../multipath-tools-0.5.0-systemd-pkgconfig.patch | 24 ---
16 .../multipath-tools-0.5.0-r1.ebuild | 65 -------
17 4 files changed, 290 deletions(-)
18
19 diff --git a/sys-fs/multipath-tools/Manifest b/sys-fs/multipath-tools/Manifest
20 index 9fd04cc7c00..fd21d742f18 100644
21 --- a/sys-fs/multipath-tools/Manifest
22 +++ b/sys-fs/multipath-tools/Manifest
23 @@ -1,4 +1,3 @@
24 -DIST multipath-tools-0.5.0.tar.bz2 184024 BLAKE2B 1e1b0fdd52bf0aaea3ed281e0cd89d04aed58c03b9b42ac094173bebdf3b81e368d0c7efb23a8748d4598c99d1502fdf5f8b2c9b64a2be4ce7d6b30fa607984a SHA512 dfad21c45d0f69e39041d30d203a582c8ee8329bf390c51cde10155b3de379e7ad8fead2ac4beb268a924fd7e7dc8e1cf538ea3c70d41479fd8786fa30ba22a9
25 DIST multipath-tools-0.6.4.tar.gz 285448 BLAKE2B 1b63c4e712e682965c595ed988a6590e181abd4d37779b72b52f4e415d4caba33df518a1ea1e3b460d15b5a78f4db5a75c1066439eb40c503023007c1f70752a SHA512 ec35c6c26c3b233ebece7136ea99dd4c0dff2927e7b543e7091219dc7065fe87e609a1eda9ab6d08399d44fe882d70c8dbe6be9ab175d154c5dd2d12ee1d86ea
26 DIST multipath-tools-0.7.8.tar.gz 415900 BLAKE2B 04c237e91f8e56484603d5b5ec7504da6be1caf9564d21a9fa4be7268fbb88089b8446c959b57f859eb9696f39cbb82bffdcd3d0a6716da6487bedd5c18c0d8b SHA512 500a51f9e8c5cc0ad04cc69c39f657e8058a08750d506b447c4a1131ad7308d43de19d79e98fa8254c56cd7eb1e832c8ccbc439ce94054db7eeebcdf2bf225cb
27 DIST multipath-tools-0.7.9.tar.gz 419377 BLAKE2B 29003b7ce2d673eb59d869e2165028654361ca31f49b8e810d90611db249a5183492959d3aef778b870df7c1d283004bda88f3cc6f760569247f1ccc61617379 SHA512 6b237f148c239938b9f46a1a8118fc070372d5f2cfe2021c26ad9ca15d37e8866390168b6a4f13adcc5538001354247e072559a0add33ce1fe8245ae64ed0a3c
28
29 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
30 deleted file mode 100644
31 index 691b138731f..00000000000
32 --- a/sys-fs/multipath-tools/files/multipath-tools-0.5.0-makefile.patch
33 +++ /dev/null
34 @@ -1,200 +0,0 @@
35 ---- multipath-tools-0.5.0/kpartx/Makefile
36 -+++ multipath-tools-0.5.0/kpartx/Makefile
37 -@@ -12,7 +12,7 @@
38 - CFLAGS += -DLIBDM_API_COOKIE
39 - endif
40 -
41 --LDFLAGS = -ldevmapper
42 -+LIBS = -ldevmapper
43 - OBJS = bsd.o dos.o kpartx.o solaris.o unixware.o dasd.o sun.o \
44 - gpt.o mac.o ps3.o crc32.o lopart.o xstrncpy.o devmapper.o
45 - EXEC = kpartx
46 -@@ -20,8 +20,7 @@
47 - all: $(EXEC)
48 -
49 - $(EXEC): $(OBJS)
50 -- $(CC) $(OBJS) -o $(EXEC) $(LDFLAGS)
51 -- $(GZIP) $(EXEC).8 > $(EXEC).8.gz
52 -+ $(CC) $(CFLAGS) $(LDFLAGS) $(OBJS) $(LIBS) -o $(EXEC)
53 -
54 - install: $(EXEC) $(EXEC).8
55 - $(INSTALL_PROGRAM) -d $(DESTDIR)$(bindir)
56 -@@ -29,14 +28,15 @@
57 - $(INSTALL_PROGRAM) -d $(DESTDIR)$(libudevdir)
58 - $(INSTALL_PROGRAM) -m 755 kpartx_id $(DESTDIR)$(libudevdir)
59 - $(INSTALL_PROGRAM) -d $(DESTDIR)/etc/udev/rules.d
60 -- $(INSTALL_PROGRAM) -m 644 kpartx.rules $(DESTDIR)/etc/udev/rules.d/
61 -+ $(INSTALL_PROGRAM) -m 644 kpartx.rules $(DESTDIR)/etc/udev/rules.d/66-kpartx.rules
62 - $(INSTALL_PROGRAM) -d $(DESTDIR)$(mandir)
63 -- $(INSTALL_PROGRAM) -m 644 $(EXEC).8.gz $(DESTDIR)$(mandir)
64 -+ $(INSTALL_PROGRAM) -m 644 $(EXEC).8 $(DESTDIR)$(mandir)
65 -
66 - uninstall:
67 - rm -f $(DESTDIR)$(bindir)/$(EXEC)
68 -- rm -f $(DESTDIR)$(mandir)/$(EXEC).8.gz
69 -+ rm -f $(DESTDIR)$(mandir)/$(EXEC).8
70 - rm -f $(DESTDIR)$(libudevdir)/kpartx_id
71 -+ rm -f $(DESTDIR)/etc/udev/rules.d/66-kpartx.rules
72 -
73 - clean:
74 -- rm -f core *.o $(EXEC) *.gz
75 -+ rm -f core *.o $(EXEC)
76 ---- multipath-tools-0.5.0/libmpathpersist/Makefile
77 -+++ multipath-tools-0.5.0/libmpathpersist/Makefile
78 -@@ -22,8 +22,6 @@
79 - $(CC) -Wall -fPIC -c $(CFLAGS) *.c
80 - $(CC) -shared $(LIBDEPS) -Wl,-soname=$@ $(CFLAGS) -o $@ $(OBJS)
81 - ln -s $(LIBS) $(DEVLIB)
82 -- $(GZIP) mpath_persistent_reserve_in.3 > mpath_persistent_reserve_in.3.gz
83 -- $(GZIP) mpath_persistent_reserve_out.3 > mpath_persistent_reserve_out.3.gz
84 -
85 - install: $(LIBS)
86 - $(INSTALL_PROGRAM) -d $(DESTDIR)$(syslibdir)
87 -@@ -31,19 +29,17 @@
88 - $(INSTALL_PROGRAM) -m 755 -d $(DESTDIR)$(syslibdir)
89 - $(INSTALL_PROGRAM) -m 755 -d $(DESTDIR)$(man3dir)
90 - $(INSTALL_PROGRAM) -m 755 -d $(DESTDIR)/usr/include/
91 -- $(INSTALL_PROGRAM) -m 755 -d $(DESTDIR)/usr/share/doc/mpathpersist/
92 -- ln -sf $(DESTDIR)$(syslibdir)/$(LIBS) $(DESTDIR)$(syslibdir)/$(DEVLIB)
93 -- install -m 644 mpath_persistent_reserve_in.3.gz $(DESTDIR)$(man3dir)
94 -- install -m 644 mpath_persistent_reserve_out.3.gz $(DESTDIR)$(man3dir)
95 -- install -m 644 mpath_persist.h $(DESTDIR)/usr/include/
96 -+ $(INSTALL_PROGRAM) -m 644 mpath_persistent_reserve_in.3 $(DESTDIR)$(man3dir)
97 -+ $(INSTALL_PROGRAM) -m 644 mpath_persistent_reserve_out.3 $(DESTDIR)$(man3dir)
98 -+ $(INSTALL_PROGRAM) -m 644 mpath_persist.h $(DESTDIR)/usr/include/
99 -
100 - uninstall:
101 - rm -f $(DESTDIR)$(syslibdir)/$(LIBS)
102 -- rm $(DESTDIR)$(mandir)/mpath_persistent_reserve_in.3.gz
103 -- rm $(DESTDIR)$(mandir)/mpath_persistent_reserve_out.3.gz
104 -+ rm $(DESTDIR)$(mandir)/mpath_persistent_reserve_in.3
105 -+ rm $(DESTDIR)$(mandir)/mpath_persistent_reserve_out.3
106 -
107 - clean:
108 - rm -f core *.a *.o
109 - rm -f libmpathpersist.so.0
110 - rm -f libmpathpersist.so
111 -- rm -f mpath_persistent_reserve_in.3.gz mpath_persistent_reserve_out.3.gz
112 -+ rm -f mpath_persistent_reserve_in.3 mpath_persistent_reserve_out.3
113 ---- multipath-tools-0.5.0/Makefile.inc
114 -+++ multipath-tools-0.5.0/Makefile.inc
115 -@@ -48,8 +48,8 @@
116 - RPM_OPT_FLAGS = -O2 -g -pipe -Wall -Wp,-D_FORTIFY_SOURCE=2 -fexceptions -fstack-protector --param=ssp-buffer-size=4
117 - endif
118 -
119 --OPTFLAGS = $(RPM_OPT_FLAGS) -Wunused -Wstrict-prototypes
120 --CFLAGS = $(OPTFLAGS) -fPIC -DLIB_STRING=\"${LIB}\"
121 -+OPTFLAGS = -Wall -Wunused -Wstrict-prototypes
122 -+CFLAGS += $(OPTFLAGS) -fPIC -DLIB_STRING=\"${LIB}\"
123 - SHARED_FLAGS = -shared
124 -
125 - %.o: %.c
126 ---- multipath-tools-0.5.0/mpathpersist/Makefile
127 -+++ multipath-tools-0.5.0/mpathpersist/Makefile
128 -@@ -13,18 +13,17 @@
129 -
130 - $(EXEC): $(OBJS)
131 - $(CC) -g $(OBJS) -o $(EXEC) $(LDFLAGS) $(CFLAGS)
132 -- $(GZIP) $(EXEC).8 > $(EXEC).8.gz
133 -
134 - install:
135 - install -d $(DESTDIR)$(bindir)
136 - install -m 755 $(EXEC) $(DESTDIR)$(bindir)/
137 - install -d $(DESTDIR)$(mandir)
138 -- install -m 644 $(EXEC).8.gz $(DESTDIR)$(mandir)
139 -+ install -m 644 $(EXEC).8 $(DESTDIR)$(mandir)
140 -
141 - clean:
142 - rm -f *.o $(EXEC)
143 -- rm -f mpathpersist.8.gz
144 -+ rm -f mpathpersist.8
145 -
146 - uninstall:
147 - rm $(DESTDIR)$(bindir)/$(EXEC)
148 -- rm $(DESTDIR)$(mandir)/$(EXEC).8.gz
149 -+ rm $(DESTDIR)$(mandir)/$(EXEC).8
150 ---- multipath-tools-0.5.0/multipath/Makefile
151 -+++ multipath-tools-0.5.0/multipath/Makefile
152 -@@ -7,29 +7,27 @@
153 - OBJS = main.o
154 -
155 - CFLAGS += -I$(multipathdir)
156 --LDFLAGS += -lpthread -ldevmapper -ldl -L$(multipathdir) -lmultipath -ludev
157 -+LIBS += -lpthread -ldevmapper -ldl -L$(multipathdir) -lmultipath -ludev
158 -
159 - EXEC = multipath
160 -
161 - all: $(EXEC)
162 -
163 - $(EXEC): $(OBJS)
164 -- $(CC) $(CFLAGS) $(OBJS) -o $(EXEC) $(LDFLAGS)
165 -- $(GZIP) $(EXEC).8 > $(EXEC).8.gz
166 -- $(GZIP) $(EXEC).conf.5 > $(EXEC).conf.5.gz
167 -+ $(CC) $(CFLAGS) $(LDFLAGS) $(OBJS) $(LIBS) -o $(EXEC)
168 -
169 - install:
170 - $(INSTALL_PROGRAM) -d $(DESTDIR)$(bindir)
171 - $(INSTALL_PROGRAM) -m 755 $(EXEC) $(DESTDIR)$(bindir)/
172 - $(INSTALL_PROGRAM) -d $(DESTDIR)$(mandir)
173 -- $(INSTALL_PROGRAM) -m 644 $(EXEC).8.gz $(DESTDIR)$(mandir)
174 -+ $(INSTALL_PROGRAM) -m 644 $(EXEC).8 $(DESTDIR)$(mandir)
175 - $(INSTALL_PROGRAM) -d $(DESTDIR)$(man5dir)
176 -- $(INSTALL_PROGRAM) -m 644 $(EXEC).conf.5.gz $(DESTDIR)$(man5dir)
177 -+ $(INSTALL_PROGRAM) -m 644 $(EXEC).conf.5 $(DESTDIR)$(man5dir)
178 -
179 - uninstall:
180 - rm $(DESTDIR)$(bindir)/$(EXEC)
181 -- rm $(DESTDIR)$(mandir)/$(EXEC).8.gz
182 -- rm $(DESTDIR)$(man5dir)/$(EXEC).conf.5.gz
183 -+ rm $(DESTDIR)$(mandir)/$(EXEC).8
184 -+ rm $(DESTDIR)$(man5dir)/$(EXEC).conf.5
185 -
186 - clean:
187 -- rm -f core *.o $(EXEC) *.gz
188 -+ rm -f core *.o $(EXEC)
189 ---- multipath-tools-0.5.0/multipathd/Makefile
190 -+++ multipath-tools-0.5.0/multipathd/Makefile
191 -@@ -9,11 +9,11 @@
192 - ifdef SYSTEMD
193 - CFLAGS += -DUSE_SYSTEMD=$(SYSTEMD)
194 - endif
195 --LDFLAGS += -lpthread -ldevmapper -lreadline
196 -+LIBS += -lpthread -ldevmapper -lreadline
197 - ifdef SYSTEMD
198 -- LDFLAGS += -lsystemd-daemon
199 -+ LIBS += -lsystemd-daemon
200 - endif
201 --LDFLAGS += -ludev -ldl \
202 -+LIBS += -ludev -ldl \
203 - -L$(multipathdir) -lmultipath -L$(mpathpersistdir) -lmpathpersist
204 -
205 - #
206 -@@ -35,8 +35,7 @@
207 - all : $(EXEC)
208 -
209 - $(EXEC): $(OBJS)
210 -- $(CC) $(CFLAGS) $(OBJS) $(LDFLAGS) -o $(EXEC)
211 -- $(GZIP) $(EXEC).8 > $(EXEC).8.gz
212 -+ $(CC) $(CFLAGS) $(LDFLAGS) $(OBJS) $(LIBS) -o $(EXEC)
213 -
214 - install:
215 - $(INSTALL_PROGRAM) -d $(DESTDIR)$(bindir)
216 -@@ -48,15 +47,15 @@
217 - $(INSTALL_PROGRAM) -m 644 $(EXEC).socket $(DESTDIR)$(unitdir)
218 - endif
219 - $(INSTALL_PROGRAM) -d $(DESTDIR)$(mandir)
220 -- $(INSTALL_PROGRAM) -m 644 $(EXEC).8.gz $(DESTDIR)$(mandir)
221 -+ $(INSTALL_PROGRAM) -m 644 $(EXEC).8 $(DESTDIR)$(mandir)
222 -
223 - uninstall:
224 - rm -f $(DESTDIR)$(bindir)/$(EXEC)
225 - rm -f $(DESTDIR)$(rcdir)/$(EXEC)
226 -- rm -f $(DESTDIR)$(mandir)/$(EXEC).8.gz
227 -+ rm -f $(DESTDIR)$(mandir)/$(EXEC).8
228 - rm -f $(DESTDIR)$(unitdir)/$(EXEC).service
229 - rm -f $(DESTDIR)$(unitdir)/$(EXEC).socket
230 -
231 - clean:
232 -- rm -f core *.o $(EXEC) *.gz
233 -+ rm -f core *.o $(EXEC)
234 -
235
236 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
237 deleted file mode 100644
238 index d75f841361a..00000000000
239 --- a/sys-fs/multipath-tools/files/multipath-tools-0.5.0-systemd-pkgconfig.patch
240 +++ /dev/null
241 @@ -1,24 +0,0 @@
242 -diff -ru multipath-tools-0.5.0/libmultipath/Makefile multipath-tools-0.5.0-modified/libmultipath/Makefile
243 ---- multipath-tools-0.5.0/libmultipath/Makefile 2013-12-17 22:40:41.000000000 +0100
244 -+++ multipath-tools-0.5.0-modified/libmultipath/Makefile 2014-03-07 04:03:45.963309627 +0100
245 -@@ -9,7 +9,7 @@
246 - LIBS = $(DEVLIB).$(SONAME)
247 - LIBDEPS = -lpthread -ldl -ldevmapper -ludev
248 - ifdef SYSTEMD
249 -- LIBDEPS += -lsystemd-daemon
250 -+ LIBDEPS += $(shell pkg-config --libs libsystemd 2>/dev/null || pkg-config --libs libsystemd-daemon 2>/dev/null)
251 - endif
252 -
253 - OBJS = memory.o parser.o vector.o devmapper.o callout.o \
254 -diff -ru multipath-tools-0.5.0/multipathd/Makefile multipath-tools-0.5.0-modified/multipathd/Makefile
255 ---- multipath-tools-0.5.0/multipathd/Makefile 2014-03-07 04:05:09.340307633 +0100
256 -+++ multipath-tools-0.5.0-modified/multipathd/Makefile 2014-03-07 04:04:03.555309206 +0100
257 -@@ -11,7 +11,7 @@
258 - endif
259 - LIBS += -lpthread -ldevmapper -lreadline
260 - ifdef SYSTEMD
261 -- LIBS += -lsystemd-daemon
262 -+ LIBS += $(shell pkg-config --libs libsystemd 2>/dev/null || pkg-config --libs libsystemd-daemon 2>/dev/null)
263 - endif
264 - LIBS += -ludev -ldl \
265 - -L$(multipathdir) -lmultipath -L$(mpathpersistdir) -lmpathpersist
266
267 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
268 deleted file mode 100644
269 index 0edaad0c284..00000000000
270 --- a/sys-fs/multipath-tools/multipath-tools-0.5.0-r1.ebuild
271 +++ /dev/null
272 @@ -1,65 +0,0 @@
273 -# Copyright 1999-2014 Gentoo Foundation
274 -# Distributed under the terms of the GNU General Public License v2
275 -
276 -EAPI=4
277 -inherit eutils systemd toolchain-funcs udev
278 -
279 -DESCRIPTION="Device mapper target autoconfig"
280 -HOMEPAGE="http://christophe.varoqui.free.fr/"
281 -SRC_URI="http://christophe.varoqui.free.fr/${PN}/${P}.tar.bz2"
282 -
283 -LICENSE="GPL-2"
284 -SLOT="0"
285 -KEYWORDS="~alpha amd64 ~arm ~arm64 ~ia64 ppc ppc64 ~sparc x86"
286 -IUSE="systemd"
287 -
288 -RDEPEND=">=sys-fs/lvm2-2.02.45
289 - >=virtual/udev-171
290 - dev-libs/libaio
291 - sys-libs/readline
292 - systemd? ( sys-apps/systemd )"
293 -DEPEND="${RDEPEND}
294 - virtual/pkgconfig"
295 -
296 -src_prepare() {
297 - epatch "${FILESDIR}"/${P}-makefile.patch
298 - epatch "${FILESDIR}"/${P}-systemd-pkgconfig.patch
299 - epatch_user
300 -}
301 -
302 -src_compile() {
303 - # LIBDM_API_FLUSH involves grepping files in /usr/include,
304 - # so force the test to go the way we want #411337.
305 - emake LIBDM_API_FLUSH=1 CC="$(tc-getCC)" SYSTEMD=$(usex systemd 1 "")
306 -}
307 -
308 -src_install() {
309 - local udevdir="$(get_udevdir)"
310 -
311 - dodir /sbin /usr/share/man/man8
312 - emake \
313 - DESTDIR="${D}" \
314 - SYSTEMD=$(usex systemd 1 "") \
315 - unitdir="$(systemd_get_unitdir)" \
316 - libudevdir='${prefix}'/"${udevdir}" \
317 - install
318 -
319 - insinto /etc
320 - newins "${S}"/multipath.conf.annotated multipath.conf
321 - # /etc/udev is reserved for user modified rules!
322 - mv "${D}"/etc/udev/rules.d "${D}/${udevdir}"/ || die
323 - fperms 644 "${udevdir}"/rules.d/66-kpartx.rules
324 - newinitd "${FILESDIR}"/rc-multipathd multipathd
325 - newinitd "${FILESDIR}"/multipath.rc multipath
326 -
327 - dodoc multipath.conf.* AUTHOR ChangeLog FAQ
328 - docinto kpartx
329 - dodoc kpartx/ChangeLog kpartx/README
330 -}
331 -
332 -pkg_postinst() {
333 - if [[ -z ${REPLACING_VERSIONS} ]]; then
334 - elog "If you need multipath on your system, you must"
335 - elog "add 'multipath' into your boot runlevel!"
336 - fi
337 -}