1 |
commit: 7401f52198730785b3548c3d82b61046cdb60375 |
2 |
Author: Dongsu Park <dongsu <AT> kinvolk <DOT> io> |
3 |
AuthorDate: Thu Feb 18 16:10:07 2021 +0000 |
4 |
Commit: Lars Wendler <polynomial-c <AT> gentoo <DOT> org> |
5 |
CommitDate: Fri Feb 26 11:38:42 2021 +0000 |
6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=7401f521 |
7 |
|
8 |
net-fs/samba: new USE flags spotlight, regedit, glusterfs, ntvfs |
9 |
|
10 |
Introduce a USE flag spotlight, to be able to disable the spotlight |
11 |
backend by default, as it is not needed by Linux. |
12 |
|
13 |
Introduce a USE flag rededit, to be able to disable the rededit |
14 |
tool if needed. |
15 |
|
16 |
Introduce a USE flag glusterfs, to be able to disable the glusterfs |
17 |
by default. |
18 |
|
19 |
Introduce a USE flag ntvfs, to be able to disable the ntvfs-fileserver |
20 |
by default. |
21 |
|
22 |
Since the docbook-xsl-stylesheets and libxslt are needed only |
23 |
at build time, we should move those deps to BDEPEND. |
24 |
|
25 |
Signed-off-by: Dongsu Park <dongsu <AT> kinvolk.io> |
26 |
Signed-off-by: Lars Wendler <polynomial-c <AT> gentoo.org> |
27 |
|
28 |
net-fs/samba/metadata.xml | 4 ++++ |
29 |
net-fs/samba/samba-4.12.11.ebuild | 21 ++++++++++++++++----- |
30 |
net-fs/samba/samba-4.12.9-r1.ebuild | 21 ++++++++++++++++----- |
31 |
net-fs/samba/samba-4.13.3-r1.ebuild | 14 +++++++++++--- |
32 |
net-fs/samba/samba-4.13.4.ebuild | 14 +++++++++++--- |
33 |
net-fs/samba/samba-4.14.0_rc3.ebuild | 14 +++++++++++--- |
34 |
6 files changed, 69 insertions(+), 19 deletions(-) |
35 |
|
36 |
diff --git a/net-fs/samba/metadata.xml b/net-fs/samba/metadata.xml |
37 |
index d1bb8bfdd51..e871aa5724b 100644 |
38 |
--- a/net-fs/samba/metadata.xml |
39 |
+++ b/net-fs/samba/metadata.xml |
40 |
@@ -16,12 +16,16 @@ |
41 |
<flag name="client">Enables the client part</flag> |
42 |
<flag name="cluster">Enable support for clustering</flag> |
43 |
<flag name="dmapi">Enable support for DMAPI. This currently works only in combination with XFS.</flag> |
44 |
+ <flag name="glusterfs">Enable support for Glusterfs filesystem via <pkg>sys-cluster/glusterfs</pkg></flag> |
45 |
<flag name="gpg">Use <pkg>app-crypt/gpgme</pkg> for AD DC</flag> |
46 |
<flag name="json">Enable json audit support through <pkg>dev-libs/jansson</pkg></flag> |
47 |
<flag name="iprint">Enabling iPrint technology by Novell</flag> |
48 |
+ <flag name="ntvfs">Enable support for NTVFS fileserver</flag> |
49 |
<flag name="profiling-data">Enables support for collecting profiling data</flag> |
50 |
<flag name="quota">Enables support for user quotas</flag> |
51 |
+ <flag name="regedit">Enable support for regedit command-line tool</flag> |
52 |
<flag name="snapper">Enable vfs_snapper module (requires <pkg>sys-apps/dbus</pkg>)</flag> |
53 |
+ <flag name="spotlight">Enable support for spotlight backend</flag> |
54 |
<flag name="system-heimdal">Use <pkg>app-crypt/heimdal</pkg> instead of |
55 |
bundled heimdal.</flag> |
56 |
<flag name="system-mitkrb5">Use <pkg>app-crypt/mit-krb5</pkg> instead of |
57 |
|
58 |
diff --git a/net-fs/samba/samba-4.12.11.ebuild b/net-fs/samba/samba-4.12.11.ebuild |
59 |
index 4945e097198..4c218a5d089 100644 |
60 |
--- a/net-fs/samba/samba-4.12.11.ebuild |
61 |
+++ b/net-fs/samba/samba-4.12.11.ebuild |
62 |
@@ -23,9 +23,10 @@ LICENSE="GPL-3" |
63 |
|
64 |
SLOT="0" |
65 |
|
66 |
-IUSE="acl addc addns ads ceph client cluster cups debug dmapi fam gpg iprint |
67 |
-json ldap pam profiling-data python quota selinux snapper syslog |
68 |
-system-heimdal +system-mitkrb5 systemd test winbind zeroconf" |
69 |
+IUSE="acl addc addns ads ceph client cluster cups debug dmapi fam glusterfs |
70 |
+gpg iprint json ldap ntvfs pam profiling-data python quota +regedit selinux |
71 |
+snapper spotlight syslog system-heimdal +system-mitkrb5 systemd test winbind |
72 |
+zeroconf" |
73 |
|
74 |
MULTILIB_WRAPPED_HEADERS=( |
75 |
/usr/include/samba-4.0/policy.h |
76 |
@@ -89,8 +90,6 @@ CDEPEND=" |
77 |
" |
78 |
DEPEND="${CDEPEND} |
79 |
${PYTHON_DEPS} |
80 |
- app-text/docbook-xsl-stylesheets |
81 |
- dev-libs/libxslt |
82 |
>=dev-util/cmocka-1.1.3[${MULTILIB_USEDEP}] |
83 |
net-libs/libtirpc[${MULTILIB_USEDEP}] |
84 |
virtual/pkgconfig |
85 |
@@ -98,6 +97,7 @@ DEPEND="${CDEPEND} |
86 |
net-libs/rpcsvc-proto |
87 |
<sys-libs/glibc-2.26[rpc(+)] |
88 |
) |
89 |
+ spotlight? ( dev-libs/glib ) |
90 |
test? ( |
91 |
!system-mitkrb5? ( |
92 |
>=sys-libs/nss_wrapper-1.1.3 |
93 |
@@ -112,12 +112,19 @@ RDEPEND="${CDEPEND} |
94 |
selinux? ( sec-policy/selinux-samba ) |
95 |
" |
96 |
|
97 |
+BDEPEND=" |
98 |
+ app-text/docbook-xsl-stylesheets |
99 |
+ dev-libs/libxslt |
100 |
+" |
101 |
+ |
102 |
REQUIRED_USE=" |
103 |
addc? ( python json winbind ) |
104 |
addns? ( python ) |
105 |
ads? ( acl ldap winbind ) |
106 |
cluster? ( ads ) |
107 |
gpg? ( addc ) |
108 |
+ ntvfs? ( addc ) |
109 |
+ spotlight? ( json ) |
110 |
test? ( python ) |
111 |
?? ( system-heimdal system-mitkrb5 ) |
112 |
${PYTHON_REQUIRED_USE} |
113 |
@@ -208,13 +215,17 @@ multilib_src_configure() { |
114 |
$(multilib_native_use_enable cups) |
115 |
$(multilib_native_use_with dmapi) |
116 |
$(multilib_native_use_with fam) |
117 |
+ $(multilib_native_use_enable glusterfs) |
118 |
$(multilib_native_use_with gpg gpgme) |
119 |
$(multilib_native_use_with json) |
120 |
$(multilib_native_use_enable iprint) |
121 |
+ $(multilib_native_use_with ntvfs ntvfs-fileserver) |
122 |
$(multilib_native_use_with pam) |
123 |
$(multilib_native_usex pam "--with-pammodulesdir=${EPREFIX}/$(get_libdir)/security" '') |
124 |
$(multilib_native_use_with quota quotas) |
125 |
+ $(multilib_native_use_with regedit) |
126 |
$(multilib_native_use_enable snapper) |
127 |
+ $(multilib_native_use_enable spotlight) |
128 |
$(multilib_native_use_with syslog) |
129 |
$(multilib_native_use_with systemd) |
130 |
--systemd-install-services |
131 |
|
132 |
diff --git a/net-fs/samba/samba-4.12.9-r1.ebuild b/net-fs/samba/samba-4.12.9-r1.ebuild |
133 |
index c6372965102..84df21f0f49 100644 |
134 |
--- a/net-fs/samba/samba-4.12.9-r1.ebuild |
135 |
+++ b/net-fs/samba/samba-4.12.9-r1.ebuild |
136 |
@@ -23,9 +23,10 @@ LICENSE="GPL-3" |
137 |
|
138 |
SLOT="0" |
139 |
|
140 |
-IUSE="acl addc addns ads ceph client cluster cups debug dmapi fam gpg iprint |
141 |
-json ldap pam profiling-data python quota selinux snapper syslog |
142 |
-system-heimdal +system-mitkrb5 systemd test winbind zeroconf" |
143 |
+IUSE="acl addc addns ads ceph client cluster cups debug dmapi fam glusterfs |
144 |
+gpg iprint json ldap ntvfs pam profiling-data python quota +regedit selinux |
145 |
+snapper spotlight syslog system-heimdal +system-mitkrb5 systemd test winbind |
146 |
+zeroconf" |
147 |
|
148 |
MULTILIB_WRAPPED_HEADERS=( |
149 |
/usr/include/samba-4.0/policy.h |
150 |
@@ -89,8 +90,6 @@ CDEPEND=" |
151 |
" |
152 |
DEPEND="${CDEPEND} |
153 |
${PYTHON_DEPS} |
154 |
- app-text/docbook-xsl-stylesheets |
155 |
- dev-libs/libxslt |
156 |
>=dev-util/cmocka-1.1.3[${MULTILIB_USEDEP}] |
157 |
net-libs/libtirpc[${MULTILIB_USEDEP}] |
158 |
virtual/pkgconfig |
159 |
@@ -98,6 +97,7 @@ DEPEND="${CDEPEND} |
160 |
net-libs/rpcsvc-proto |
161 |
<sys-libs/glibc-2.26[rpc(+)] |
162 |
) |
163 |
+ spotlight? ( dev-libs/glib ) |
164 |
test? ( |
165 |
!system-mitkrb5? ( |
166 |
>=sys-libs/nss_wrapper-1.1.3 |
167 |
@@ -112,12 +112,19 @@ RDEPEND="${CDEPEND} |
168 |
selinux? ( sec-policy/selinux-samba ) |
169 |
" |
170 |
|
171 |
+BDEPEND=" |
172 |
+ app-text/docbook-xsl-stylesheets |
173 |
+ dev-libs/libxslt |
174 |
+" |
175 |
+ |
176 |
REQUIRED_USE=" |
177 |
addc? ( python json winbind ) |
178 |
addns? ( python ) |
179 |
ads? ( acl ldap winbind ) |
180 |
cluster? ( ads ) |
181 |
gpg? ( addc ) |
182 |
+ ntvfs? ( addc ) |
183 |
+ spotlight? ( json ) |
184 |
test? ( python ) |
185 |
?? ( system-heimdal system-mitkrb5 ) |
186 |
${PYTHON_REQUIRED_USE} |
187 |
@@ -209,13 +216,17 @@ multilib_src_configure() { |
188 |
$(multilib_native_use_enable cups) |
189 |
$(multilib_native_use_with dmapi) |
190 |
$(multilib_native_use_with fam) |
191 |
+ $(multilib_native_use_enable glusterfs) |
192 |
$(multilib_native_use_with gpg gpgme) |
193 |
$(multilib_native_use_with json) |
194 |
$(multilib_native_use_enable iprint) |
195 |
+ $(multilib_native_use_with ntvfs ntvfs-fileserver) |
196 |
$(multilib_native_use_with pam) |
197 |
$(multilib_native_usex pam "--with-pammodulesdir=${EPREFIX}/$(get_libdir)/security" '') |
198 |
$(multilib_native_use_with quota quotas) |
199 |
+ $(multilib_native_use_with regedit) |
200 |
$(multilib_native_use_enable snapper) |
201 |
+ $(multilib_native_use_enable spotlight) |
202 |
$(multilib_native_use_with syslog) |
203 |
$(multilib_native_use_with systemd) |
204 |
--systemd-install-services |
205 |
|
206 |
diff --git a/net-fs/samba/samba-4.13.3-r1.ebuild b/net-fs/samba/samba-4.13.3-r1.ebuild |
207 |
index f5512a97a1a..315792bf568 100644 |
208 |
--- a/net-fs/samba/samba-4.13.3-r1.ebuild |
209 |
+++ b/net-fs/samba/samba-4.13.3-r1.ebuild |
210 |
@@ -22,9 +22,10 @@ S="${WORKDIR}/${MY_P}" |
211 |
|
212 |
LICENSE="GPL-3" |
213 |
SLOT="0" |
214 |
-IUSE="acl addc addns ads ceph client cluster cups debug dmapi fam gpg iprint |
215 |
-json ldap pam profiling-data python quota selinux snapper syslog |
216 |
-system-heimdal +system-mitkrb5 systemd test winbind zeroconf" |
217 |
+IUSE="acl addc addns ads ceph client cluster cups debug dmapi fam glusterfs |
218 |
+gpg iprint json ldap ntvfs pam profiling-data python quota +regedit selinux |
219 |
+snapper spotlight syslog system-heimdal +system-mitkrb5 systemd test winbind |
220 |
+zeroconf" |
221 |
|
222 |
REQUIRED_USE="${PYTHON_REQUIRED_USE} |
223 |
addc? ( python json winbind ) |
224 |
@@ -32,6 +33,8 @@ REQUIRED_USE="${PYTHON_REQUIRED_USE} |
225 |
ads? ( acl ldap winbind ) |
226 |
cluster? ( ads ) |
227 |
gpg? ( addc ) |
228 |
+ ntvfs? ( addc ) |
229 |
+ spotlight? ( json ) |
230 |
test? ( python ) |
231 |
!ads? ( !addc ) |
232 |
?? ( system-heimdal system-mitkrb5 ) |
233 |
@@ -113,6 +116,7 @@ DEPEND="${COMMON_DEPEND} |
234 |
net-libs/rpcsvc-proto |
235 |
<sys-libs/glibc-2.26[rpc(+)] |
236 |
) |
237 |
+ spotlight? ( dev-libs/glib ) |
238 |
test? ( |
239 |
!system-mitkrb5? ( |
240 |
>=net-dns/resolv_wrapper-1.1.4 |
241 |
@@ -209,12 +213,16 @@ multilib_src_configure() { |
242 |
$(multilib_native_use_enable cups) |
243 |
$(multilib_native_use_with dmapi) |
244 |
$(multilib_native_use_with fam) |
245 |
+ $(multilib_native_use_enable glusterfs) |
246 |
$(multilib_native_use_with gpg gpgme) |
247 |
$(multilib_native_use_with json) |
248 |
$(multilib_native_use_enable iprint) |
249 |
+ $(multilib_native_use_with ntvfs ntvfs-fileserver) |
250 |
$(multilib_native_use_with pam) |
251 |
$(multilib_native_usex pam "--with-pammodulesdir=${EPREFIX}/$(get_libdir)/security" '') |
252 |
$(multilib_native_use_with quota quotas) |
253 |
+ $(multilib_native_use_with regedit) |
254 |
+ $(multilib_native_use_enable spotlight) |
255 |
$(multilib_native_use_with syslog) |
256 |
$(multilib_native_use_with systemd) |
257 |
--systemd-install-services |
258 |
|
259 |
diff --git a/net-fs/samba/samba-4.13.4.ebuild b/net-fs/samba/samba-4.13.4.ebuild |
260 |
index f5512a97a1a..315792bf568 100644 |
261 |
--- a/net-fs/samba/samba-4.13.4.ebuild |
262 |
+++ b/net-fs/samba/samba-4.13.4.ebuild |
263 |
@@ -22,9 +22,10 @@ S="${WORKDIR}/${MY_P}" |
264 |
|
265 |
LICENSE="GPL-3" |
266 |
SLOT="0" |
267 |
-IUSE="acl addc addns ads ceph client cluster cups debug dmapi fam gpg iprint |
268 |
-json ldap pam profiling-data python quota selinux snapper syslog |
269 |
-system-heimdal +system-mitkrb5 systemd test winbind zeroconf" |
270 |
+IUSE="acl addc addns ads ceph client cluster cups debug dmapi fam glusterfs |
271 |
+gpg iprint json ldap ntvfs pam profiling-data python quota +regedit selinux |
272 |
+snapper spotlight syslog system-heimdal +system-mitkrb5 systemd test winbind |
273 |
+zeroconf" |
274 |
|
275 |
REQUIRED_USE="${PYTHON_REQUIRED_USE} |
276 |
addc? ( python json winbind ) |
277 |
@@ -32,6 +33,8 @@ REQUIRED_USE="${PYTHON_REQUIRED_USE} |
278 |
ads? ( acl ldap winbind ) |
279 |
cluster? ( ads ) |
280 |
gpg? ( addc ) |
281 |
+ ntvfs? ( addc ) |
282 |
+ spotlight? ( json ) |
283 |
test? ( python ) |
284 |
!ads? ( !addc ) |
285 |
?? ( system-heimdal system-mitkrb5 ) |
286 |
@@ -113,6 +116,7 @@ DEPEND="${COMMON_DEPEND} |
287 |
net-libs/rpcsvc-proto |
288 |
<sys-libs/glibc-2.26[rpc(+)] |
289 |
) |
290 |
+ spotlight? ( dev-libs/glib ) |
291 |
test? ( |
292 |
!system-mitkrb5? ( |
293 |
>=net-dns/resolv_wrapper-1.1.4 |
294 |
@@ -209,12 +213,16 @@ multilib_src_configure() { |
295 |
$(multilib_native_use_enable cups) |
296 |
$(multilib_native_use_with dmapi) |
297 |
$(multilib_native_use_with fam) |
298 |
+ $(multilib_native_use_enable glusterfs) |
299 |
$(multilib_native_use_with gpg gpgme) |
300 |
$(multilib_native_use_with json) |
301 |
$(multilib_native_use_enable iprint) |
302 |
+ $(multilib_native_use_with ntvfs ntvfs-fileserver) |
303 |
$(multilib_native_use_with pam) |
304 |
$(multilib_native_usex pam "--with-pammodulesdir=${EPREFIX}/$(get_libdir)/security" '') |
305 |
$(multilib_native_use_with quota quotas) |
306 |
+ $(multilib_native_use_with regedit) |
307 |
+ $(multilib_native_use_enable spotlight) |
308 |
$(multilib_native_use_with syslog) |
309 |
$(multilib_native_use_with systemd) |
310 |
--systemd-install-services |
311 |
|
312 |
diff --git a/net-fs/samba/samba-4.14.0_rc3.ebuild b/net-fs/samba/samba-4.14.0_rc3.ebuild |
313 |
index 08b7f93199d..197b80e6797 100644 |
314 |
--- a/net-fs/samba/samba-4.14.0_rc3.ebuild |
315 |
+++ b/net-fs/samba/samba-4.14.0_rc3.ebuild |
316 |
@@ -22,9 +22,10 @@ S="${WORKDIR}/${MY_P}" |
317 |
|
318 |
LICENSE="GPL-3" |
319 |
SLOT="0" |
320 |
-IUSE="acl addc addns ads ceph client cluster cups debug dmapi fam gpg iprint |
321 |
-json ldap pam profiling-data python quota selinux snapper syslog |
322 |
-system-heimdal +system-mitkrb5 systemd test winbind zeroconf" |
323 |
+IUSE="acl addc addns ads ceph client cluster cups debug dmapi fam glusterfs |
324 |
+gpg iprint json ldap ntvfs pam profiling-data python quota +regedit selinux |
325 |
+snapper spotlight syslog system-heimdal +system-mitkrb5 systemd test winbind |
326 |
+zeroconf" |
327 |
|
328 |
REQUIRED_USE="${PYTHON_REQUIRED_USE} |
329 |
addc? ( python json winbind ) |
330 |
@@ -32,6 +33,8 @@ REQUIRED_USE="${PYTHON_REQUIRED_USE} |
331 |
ads? ( acl ldap winbind ) |
332 |
cluster? ( ads ) |
333 |
gpg? ( addc ) |
334 |
+ ntvfs? ( addc ) |
335 |
+ spotlight? ( json ) |
336 |
test? ( python ) |
337 |
!ads? ( !addc ) |
338 |
?? ( system-heimdal system-mitkrb5 ) |
339 |
@@ -113,6 +116,7 @@ DEPEND="${COMMON_DEPEND} |
340 |
net-libs/rpcsvc-proto |
341 |
<sys-libs/glibc-2.26[rpc(+)] |
342 |
) |
343 |
+ spotlight? ( dev-libs/glib ) |
344 |
test? ( |
345 |
!system-mitkrb5? ( |
346 |
>=net-dns/resolv_wrapper-1.1.4 |
347 |
@@ -209,12 +213,16 @@ multilib_src_configure() { |
348 |
$(multilib_native_use_enable cups) |
349 |
$(multilib_native_use_with dmapi) |
350 |
$(multilib_native_use_with fam) |
351 |
+ $(multilib_native_use_enable glusterfs) |
352 |
$(multilib_native_use_with gpg gpgme) |
353 |
$(multilib_native_use_with json) |
354 |
$(multilib_native_use_enable iprint) |
355 |
+ $(multilib_native_use_with ntvfs ntvfs-fileserver) |
356 |
$(multilib_native_use_with pam) |
357 |
$(multilib_native_usex pam "--with-pammodulesdir=${EPREFIX}/$(get_libdir)/security" '') |
358 |
$(multilib_native_use_with quota quotas) |
359 |
+ $(multilib_native_use_with regedit) |
360 |
+ $(multilib_native_use_enable spotlight) |
361 |
$(multilib_native_use_with syslog) |
362 |
$(multilib_native_use_with systemd) |
363 |
--systemd-install-services |