1 |
commit: 704f2dedeb4f78f0cdeae74ddcaf0821db73ca84 |
2 |
Author: Thomas Deutschmann <whissi <AT> gentoo <DOT> org> |
3 |
AuthorDate: Thu Nov 23 20:27:21 2017 +0000 |
4 |
Commit: Thomas Deutschmann <whissi <AT> gentoo <DOT> org> |
5 |
CommitDate: Thu Nov 23 20:48:22 2017 +0000 |
6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=704f2ded |
7 |
|
8 |
sys-fs/multipath-tools: Bump to v0.7.4 |
9 |
|
10 |
Package-Manager: Portage-2.3.16, Repoman-2.3.6 |
11 |
|
12 |
sys-fs/multipath-tools/Manifest | 1 + |
13 |
.../multipath-tools-0.7.4-respect-flags.patch | 17 ++++ |
14 |
.../multipath-tools/multipath-tools-0.7.4.ebuild | 96 ++++++++++++++++++++++ |
15 |
3 files changed, 114 insertions(+) |
16 |
|
17 |
diff --git a/sys-fs/multipath-tools/Manifest b/sys-fs/multipath-tools/Manifest |
18 |
index e732cfda8c4..ebd40ad948d 100644 |
19 |
--- a/sys-fs/multipath-tools/Manifest |
20 |
+++ b/sys-fs/multipath-tools/Manifest |
21 |
@@ -3,3 +3,4 @@ DIST multipath-tools-0.6.4.tar.gz 285448 SHA256 1e2747883320f7db854201e5bfb97216 |
22 |
DIST multipath-tools-0.7.1.tar.gz 329008 SHA256 d788aaf3ea862b44b5aa07eaa0e5696061f972a1a46d0f469c4a4f4c477c1970 SHA512 81ceb3887250a691b94cb49b7141ace4fc1f69d7f8381e517560dfc7c51ee4c5a1f4f4e40a0b368cf5f7381697fa746b856cbade8990c1608cbcd77248946a82 WHIRLPOOL 2bcc7cc2f425ca3f3f634807cafb7817b54b83d82987a09c9dd530dca1375175a7d52f1854bdd6d5f37c3b1fcf7bc34d67fc2dcae5809dfae968b313c8c86cba |
23 |
DIST multipath-tools-0.7.2.tar.gz 335187 SHA256 e4273527b8a8e31d596221dd74fdeb9f2b7558d59e514bc7eb040d077bddf24b SHA512 9637e6c69ecfe8dbfb55794569017051961dbe39fa1019000e4be9c2c888a5b6d13ae360af8738bb1fb89a8d27ec833ff0075b1d066b8b3ca21cd9832f477046 WHIRLPOOL 051956ab5c899ce98833925f84245f7450c7c01012edafdb6fff39762cf87908f53413c42f2ccb6059fd2717d29bf55ded260ade027b37ef0227a46b8266d8c7 |
24 |
DIST multipath-tools-0.7.3.tar.gz 344030 SHA256 b59712c3068b9b33c2fc769eb499c637a0ddff7b46ae9d2cc411c4d61e233ffb SHA512 fbcd5609bcb4f80a91410cec86882e9f39ee056edb314382f25db8e1e1ed5c084e14849a67502be2b11a2e980dc2cb5d34235885476ae5ce62809a175bee9ace WHIRLPOOL 03b99202d2831513ba1fcc3e504ba3554b970c5bc366288a50e62e2225028dff972c102b7ae93d026026bea6614b5305a605122c91e0b8deeb91f9c98a68119f |
25 |
+DIST multipath-tools-0.7.4.tar.gz 350361 BLAKE2B a55a5912f040913b2db8a6fe28727dd52fd4be9ceb8544f1b45384e12112775caa6159da3ce774dd529377796a2b9033490ee655f3caac864919708bdc5070ec SHA512 0a00b79920251b685265ab731e5418538f32d6392b101082c71a6c7345ef7d008bcdcf466ee1317e8bf658d0fb01fc9a2e4ec6658fc565129c1bb5949ac91254 |
26 |
|
27 |
diff --git a/sys-fs/multipath-tools/files/multipath-tools-0.7.4-respect-flags.patch b/sys-fs/multipath-tools/files/multipath-tools-0.7.4-respect-flags.patch |
28 |
new file mode 100644 |
29 |
index 00000000000..19573fe6eee |
30 |
--- /dev/null |
31 |
+++ b/sys-fs/multipath-tools/files/multipath-tools-0.7.4-respect-flags.patch |
32 |
@@ -0,0 +1,17 @@ |
33 |
+--- a/Makefile.inc |
34 |
++++ b/Makefile.inc |
35 |
+@@ -90,11 +90,12 @@ OPTFLAGS = -O2 -g -pipe -Wall -Wextra -Wformat=2 -Werror=implicit-int \ |
36 |
+ -Wp,-D_FORTIFY_SOURCE=2 $(STACKPROT) \ |
37 |
+ --param=ssp-buffer-size=4 |
38 |
+ |
39 |
+-CFLAGS = $(OPTFLAGS) -DLIB_STRING=\"${LIB}\" -DRUN_DIR=\"${RUN}\" |
40 |
++CFLAGS ?= $(OPTFLAGS) |
41 |
++CFLAGS += -DLIB_STRING=\"${LIB}\" -DRUN_DIR=\"${RUN}\" |
42 |
+ BIN_CFLAGS = -fPIE -DPIE |
43 |
+ LIB_CFLAGS = -fPIC |
44 |
+ SHARED_FLAGS = -shared |
45 |
+-LDFLAGS = -Wl,-z,relro -Wl,-z,now |
46 |
++LDFLAGS += -Wl,-z,relro -Wl,-z,now |
47 |
+ BIN_LDFLAGS = -pie |
48 |
+ |
49 |
+ # Check whether a function with name $1 has been declared in header file $2. |
50 |
|
51 |
diff --git a/sys-fs/multipath-tools/multipath-tools-0.7.4.ebuild b/sys-fs/multipath-tools/multipath-tools-0.7.4.ebuild |
52 |
new file mode 100644 |
53 |
index 00000000000..b114189a868 |
54 |
--- /dev/null |
55 |
+++ b/sys-fs/multipath-tools/multipath-tools-0.7.4.ebuild |
56 |
@@ -0,0 +1,96 @@ |
57 |
+# Copyright 1999-2017 Gentoo Foundation |
58 |
+# Distributed under the terms of the GNU General Public License v2 |
59 |
+ |
60 |
+EAPI="6" |
61 |
+ |
62 |
+inherit linux-info systemd toolchain-funcs udev vcs-snapshot toolchain-funcs |
63 |
+ |
64 |
+DESCRIPTION="Device mapper target autoconfig" |
65 |
+HOMEPAGE="http://christophe.varoqui.free.fr/" |
66 |
+SRC_URI="https://git.opensvc.com/?p=multipath-tools/.git;a=snapshot;h=${PV};sf=tgz -> ${P}.tar.gz" |
67 |
+ |
68 |
+LICENSE="GPL-2" |
69 |
+SLOT="0" |
70 |
+KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~x86" |
71 |
+IUSE="systemd rbd" |
72 |
+ |
73 |
+RDEPEND=" |
74 |
+ dev-libs/json-c |
75 |
+ dev-libs/libaio |
76 |
+ dev-libs/userspace-rcu |
77 |
+ >=sys-fs/lvm2-2.02.45 |
78 |
+ >=virtual/udev-171 |
79 |
+ sys-libs/readline:0= |
80 |
+ rbd? ( sys-cluster/ceph ) |
81 |
+ systemd? ( sys-apps/systemd ) |
82 |
+" |
83 |
+DEPEND=" |
84 |
+ ${RDEPEND} |
85 |
+ virtual/pkgconfig |
86 |
+" |
87 |
+ |
88 |
+CONFIG_CHECK="~DM_MULTIPATH" |
89 |
+ |
90 |
+PATCHES=( "${FILESDIR}"/${PN}-0.7.4-respect-flags.patch ) |
91 |
+ |
92 |
+get_systemd_pv() { |
93 |
+ use systemd && \ |
94 |
+ $(tc-getPKG_CONFIG) --modversion systemd |
95 |
+} |
96 |
+ |
97 |
+pkg_pretend() { |
98 |
+ linux-info_pkg_setup |
99 |
+} |
100 |
+ |
101 |
+pkg_setup() { |
102 |
+ linux-info_pkg_setup |
103 |
+} |
104 |
+ |
105 |
+src_prepare() { |
106 |
+ default |
107 |
+ |
108 |
+ # Fix for bug #624884 |
109 |
+ if grep -qF DM_TABLE_STATE kpartx/kpartx.rules ; then |
110 |
+ sed '/DM_TABLE_STATE/d' -i kpartx/kpartx.rules || die |
111 |
+ else |
112 |
+ elog "DM_TABLE_STATE sed hack is no longer necessary." |
113 |
+ fi |
114 |
+ |
115 |
+ # The upstream lacks any way to configure the build at present |
116 |
+ # and ceph is a huge dependency, so we're using sed to make it |
117 |
+ # optional until the upstream has a proer configure system |
118 |
+ if ! use rbd ; then |
119 |
+ sed -i -e "s/libcheckrbd.so/# libcheckrbd.so/" libmultipath/checkers/Makefile |
120 |
+ sed -i -e "s/-lrados//" libmultipath/checkers/Makefile |
121 |
+ fi |
122 |
+} |
123 |
+ |
124 |
+src_compile() { |
125 |
+ # LIBDM_API_FLUSH involves grepping files in /usr/include, |
126 |
+ # so force the test to go the way we want #411337. |
127 |
+ emake \ |
128 |
+ CC="$(tc-getCC)" \ |
129 |
+ LIBDM_API_FLUSH=1 SYSTEMD="$(get_systemd_pv)" |
130 |
+} |
131 |
+ |
132 |
+src_install() { |
133 |
+ dodir /sbin /usr/share/man/man{5,8} |
134 |
+ emake \ |
135 |
+ DESTDIR="${D}" \ |
136 |
+ SYSTEMD=$(get_systemd_pv) \ |
137 |
+ unitdir="$(systemd_get_systemunitdir)" \ |
138 |
+ libudevdir='${prefix}'/"$(get_udevdir)" \ |
139 |
+ install |
140 |
+ |
141 |
+ newinitd "${FILESDIR}"/rc-multipathd multipathd |
142 |
+ newinitd "${FILESDIR}"/multipath.rc multipath |
143 |
+ |
144 |
+ einstalldocs |
145 |
+} |
146 |
+ |
147 |
+pkg_postinst() { |
148 |
+ if [[ -z ${REPLACING_VERSIONS} ]]; then |
149 |
+ elog "If you need multipath on your system, you must" |
150 |
+ elog "add 'multipath' into your boot runlevel!" |
151 |
+ fi |
152 |
+} |