1 |
commit: 342d66f9a56b13bc363b96e48b795fd9fc618dc9 |
2 |
Author: Ian Stakenvicius <axs <AT> gentoo <DOT> org> |
3 |
AuthorDate: Wed Jan 27 22:22:43 2016 +0000 |
4 |
Commit: Ian Stakenvicius <axs <AT> gentoo <DOT> org> |
5 |
CommitDate: Wed Jan 27 23:04:59 2016 +0000 |
6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=342d66f9 |
7 |
|
8 |
net-fs/samba: bundle ctdb |
9 |
|
10 |
Samba is the only consumer of dev-db/ctdb, and samba-4.2 and above has dropped support |
11 |
for building against an external ctdb. This commit builds and installs ctdb bundled |
12 |
within samba instead, and soft-blocks the external package to avoid collisions. |
13 |
|
14 |
Bug: https://bugs.gentoo.org/show_bug.cgi?id=561402 |
15 |
|
16 |
Package-Manager: portage-2.2.26 |
17 |
|
18 |
.../{samba-4.2.7-r1.ebuild => samba-4.2.7-r2.ebuild} | 15 +++++++++++++-- |
19 |
net-fs/samba/samba-4.3.3-r1.ebuild | 16 ++++++++++++++-- |
20 |
.../samba/{samba-4.3.4.ebuild => samba-4.3.4-r1.ebuild} | 17 ++++++++++++++--- |
21 |
3 files changed, 41 insertions(+), 7 deletions(-) |
22 |
|
23 |
diff --git a/net-fs/samba/samba-4.2.7-r1.ebuild b/net-fs/samba/samba-4.2.7-r2.ebuild |
24 |
similarity index 94% |
25 |
rename from net-fs/samba/samba-4.2.7-r1.ebuild |
26 |
rename to net-fs/samba/samba-4.2.7-r2.ebuild |
27 |
index 4530acc..8ea6722 100644 |
28 |
--- a/net-fs/samba/samba-4.2.7-r1.ebuild |
29 |
+++ b/net-fs/samba/samba-4.2.7-r2.ebuild |
30 |
@@ -31,6 +31,12 @@ ldap pam quota selinux syslog +system-mitkrb5 systemd test winbind" |
31 |
MULTILIB_WRAPPED_HEADERS=( |
32 |
/usr/include/samba-4.0/policy.h |
33 |
/usr/include/samba-4.0/dcerpc_server.h |
34 |
+ /usr/include/samba-4.0/ctdb.h |
35 |
+ /usr/include/samba-4.0/ctdb_client.h |
36 |
+ /usr/include/samba-4.0/ctdb_protocol.h |
37 |
+ /usr/include/samba-4.0/ctdb_private.h |
38 |
+ /usr/include/samba-4.0/ctdb_typesafe_cb.h |
39 |
+ /usr/include/samba-4.0/ctdb_version.h |
40 |
) |
41 |
|
42 |
# sys-apps/attr is an automagic dependency (see bug #489748) |
43 |
@@ -58,7 +64,7 @@ CDEPEND="${PYTHON_DEPS} |
44 |
acl? ( virtual/acl ) |
45 |
addns? ( net-dns/bind-tools[gssapi] ) |
46 |
aio? ( dev-libs/libaio ) |
47 |
- cluster? ( >=dev-db/ctdb-1.0.114_p1 ) |
48 |
+ cluster? ( !dev-db/ctdb ) |
49 |
cups? ( net-print/cups ) |
50 |
dmapi? ( sys-apps/dmapi ) |
51 |
fam? ( virtual/fam ) |
52 |
@@ -90,6 +96,8 @@ CONFDIR="${FILESDIR}/$(get_version_component_range 1-2)" |
53 |
|
54 |
WAF_BINARY="${S}/buildtools/bin/waf" |
55 |
|
56 |
+SHAREDMODS="" |
57 |
+ |
58 |
pkg_setup() { |
59 |
python-single-r1_pkg_setup |
60 |
if use aio ; then |
61 |
@@ -104,6 +112,9 @@ pkg_setup() { |
62 |
ewarn "and recompile your kernel..." |
63 |
fi |
64 |
fi |
65 |
+ if use cluster ; then |
66 |
+ SHAREDMODS="${SHAREDMODS}idmap_rid,idmap_tdb2,idmap_ad" |
67 |
+ fi |
68 |
} |
69 |
|
70 |
src_prepare() { |
71 |
@@ -142,7 +153,6 @@ multilib_src_configure() { |
72 |
$(use_with ads) |
73 |
$(usex ads '--with-shared-modules=idmap_ad' '') |
74 |
$(use_with aio aio-support) |
75 |
- $(usex cluster '--with-ctdb-dir=/usr' '') |
76 |
$(use_enable avahi) |
77 |
$(use_with cluster cluster-support) |
78 |
$(use_enable cups) |
79 |
@@ -160,6 +170,7 @@ multilib_src_configure() { |
80 |
$(usex system-mitkrb5 '--with-system-mitkrb5' '') |
81 |
$(use_with winbind) |
82 |
$(usex test '--enable-selftest' '') |
83 |
+ --with-shared-modules=${SHAREDMODS} |
84 |
) |
85 |
else |
86 |
myconf+=( |
87 |
|
88 |
diff --git a/net-fs/samba/samba-4.3.3-r1.ebuild b/net-fs/samba/samba-4.3.3-r1.ebuild |
89 |
index bb4da0b..17a8911 100644 |
90 |
--- a/net-fs/samba/samba-4.3.3-r1.ebuild |
91 |
+++ b/net-fs/samba/samba-4.3.3-r1.ebuild |
92 |
@@ -30,6 +30,13 @@ ldap pam quota selinux syslog +system-mitkrb5 systemd test winbind" |
93 |
|
94 |
MULTILIB_WRAPPED_HEADERS=( |
95 |
/usr/include/samba-4.0/policy.h |
96 |
+ /usr/include/samba-4.0/dcerpc_server.h |
97 |
+ /usr/include/samba-4.0/ctdb.h |
98 |
+ /usr/include/samba-4.0/ctdb_client.h |
99 |
+ /usr/include/samba-4.0/ctdb_protocol.h |
100 |
+ /usr/include/samba-4.0/ctdb_private.h |
101 |
+ /usr/include/samba-4.0/ctdb_typesafe_cb.h |
102 |
+ /usr/include/samba-4.0/ctdb_version.h |
103 |
) |
104 |
|
105 |
# sys-apps/attr is an automagic dependency (see bug #489748) |
106 |
@@ -56,7 +63,7 @@ CDEPEND="${PYTHON_DEPS} |
107 |
acl? ( virtual/acl ) |
108 |
addns? ( net-dns/bind-tools[gssapi] ) |
109 |
aio? ( dev-libs/libaio ) |
110 |
- cluster? ( >=dev-db/ctdb-1.0.114_p1 ) |
111 |
+ cluster? ( !dev-db/ctdb ) |
112 |
cups? ( net-print/cups ) |
113 |
dmapi? ( sys-apps/dmapi ) |
114 |
fam? ( virtual/fam ) |
115 |
@@ -88,6 +95,8 @@ CONFDIR="${FILESDIR}/$(get_version_component_range 1-2)" |
116 |
|
117 |
WAF_BINARY="${S}/buildtools/bin/waf" |
118 |
|
119 |
+SHAREDMODS="" |
120 |
+ |
121 |
pkg_setup() { |
122 |
python-single-r1_pkg_setup |
123 |
if use aio ; then |
124 |
@@ -102,6 +111,9 @@ pkg_setup() { |
125 |
ewarn "and recompile your kernel..." |
126 |
fi |
127 |
fi |
128 |
+ if use cluster ; then |
129 |
+ SHAREDMODS="${SHAREDMODS}idmap_rid,idmap_tdb2,idmap_ad" |
130 |
+ fi |
131 |
} |
132 |
|
133 |
src_prepare() { |
134 |
@@ -140,7 +152,6 @@ multilib_src_configure() { |
135 |
$(use_with ads) |
136 |
$(usex ads '--with-shared-modules=idmap_ad' '') |
137 |
$(use_with aio aio-support) |
138 |
- $(usex cluster '--with-ctdb-dir=/usr' '') |
139 |
$(use_enable avahi) |
140 |
$(use_with cluster cluster-support) |
141 |
$(use_enable cups) |
142 |
@@ -158,6 +169,7 @@ multilib_src_configure() { |
143 |
$(usex system-mitkrb5 '--with-system-mitkrb5' '') |
144 |
$(use_with winbind) |
145 |
$(usex test '--enable-selftest' '') |
146 |
+ --with-shared-modules=${SHAREDMODS} |
147 |
) |
148 |
else |
149 |
myconf+=( |
150 |
|
151 |
diff --git a/net-fs/samba/samba-4.3.4.ebuild b/net-fs/samba/samba-4.3.4-r1.ebuild |
152 |
similarity index 93% |
153 |
rename from net-fs/samba/samba-4.3.4.ebuild |
154 |
rename to net-fs/samba/samba-4.3.4-r1.ebuild |
155 |
index 45798e9..cf4f9af 100644 |
156 |
--- a/net-fs/samba/samba-4.3.4.ebuild |
157 |
+++ b/net-fs/samba/samba-4.3.4-r1.ebuild |
158 |
@@ -31,6 +31,12 @@ ldap pam quota selinux syslog +system-mitkrb5 systemd test winbind" |
159 |
MULTILIB_WRAPPED_HEADERS=( |
160 |
/usr/include/samba-4.0/policy.h |
161 |
/usr/include/samba-4.0/dcerpc_server.h |
162 |
+ /usr/include/samba-4.0/ctdb.h |
163 |
+ /usr/include/samba-4.0/ctdb_client.h |
164 |
+ /usr/include/samba-4.0/ctdb_protocol.h |
165 |
+ /usr/include/samba-4.0/ctdb_private.h |
166 |
+ /usr/include/samba-4.0/ctdb_typesafe_cb.h |
167 |
+ /usr/include/samba-4.0/ctdb_version.h |
168 |
) |
169 |
|
170 |
# sys-apps/attr is an automagic dependency (see bug #489748) |
171 |
@@ -41,7 +47,7 @@ CDEPEND="${PYTHON_DEPS} |
172 |
dev-libs/popt[${MULTILIB_USEDEP}] |
173 |
sys-libs/readline:= |
174 |
virtual/libiconv |
175 |
- dev-python/subunit[${PYTHON_USEDEP}] |
176 |
+ dev-python/subunit[${PYTHON_USEDEP},${MULTILIB_USEDEP}] |
177 |
>=net-libs/socket_wrapper-1.1.3[${MULTILIB_USEDEP}] |
178 |
sys-apps/attr[${MULTILIB_USEDEP}] |
179 |
sys-libs/libcap |
180 |
@@ -57,7 +63,7 @@ CDEPEND="${PYTHON_DEPS} |
181 |
acl? ( virtual/acl ) |
182 |
addns? ( net-dns/bind-tools[gssapi] ) |
183 |
aio? ( dev-libs/libaio ) |
184 |
- cluster? ( >=dev-db/ctdb-1.0.114_p1 ) |
185 |
+ cluster? ( !dev-db/ctdb ) |
186 |
cups? ( net-print/cups ) |
187 |
dmapi? ( sys-apps/dmapi ) |
188 |
fam? ( virtual/fam ) |
189 |
@@ -89,6 +95,8 @@ CONFDIR="${FILESDIR}/$(get_version_component_range 1-2)" |
190 |
|
191 |
WAF_BINARY="${S}/buildtools/bin/waf" |
192 |
|
193 |
+SHAREDMODS="" |
194 |
+ |
195 |
pkg_setup() { |
196 |
python-single-r1_pkg_setup |
197 |
if use aio ; then |
198 |
@@ -103,6 +111,9 @@ pkg_setup() { |
199 |
ewarn "and recompile your kernel..." |
200 |
fi |
201 |
fi |
202 |
+ if use cluster ; then |
203 |
+ SHAREDMODS="${SHAREDMODS}idmap_rid,idmap_tdb2,idmap_ad" |
204 |
+ fi |
205 |
} |
206 |
|
207 |
src_prepare() { |
208 |
@@ -141,7 +152,6 @@ multilib_src_configure() { |
209 |
$(use_with ads) |
210 |
$(usex ads '--with-shared-modules=idmap_ad' '') |
211 |
$(use_with aio aio-support) |
212 |
- $(usex cluster '--with-ctdb-dir=/usr' '') |
213 |
$(use_enable avahi) |
214 |
$(use_with cluster cluster-support) |
215 |
$(use_enable cups) |
216 |
@@ -159,6 +169,7 @@ multilib_src_configure() { |
217 |
$(usex system-mitkrb5 '--with-system-mitkrb5' '') |
218 |
$(use_with winbind) |
219 |
$(usex test '--enable-selftest' '') |
220 |
+ --with-shared-modules=${SHAREDMODS} |
221 |
) |
222 |
else |
223 |
myconf+=( |