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: net-fs/samba/files/, net-fs/samba/
Date: Thu, 26 Mar 2020 19:06:47
Message-Id: 1585249593.83b750b0219c89cfb129250989508218559ac863.polynomial-c@gentoo
1 commit: 83b750b0219c89cfb129250989508218559ac863
2 Author: Lars Wendler <polynomial-c <AT> gentoo <DOT> org>
3 AuthorDate: Thu Mar 26 18:58:47 2020 +0000
4 Commit: Lars Wendler <polynomial-c <AT> gentoo <DOT> org>
5 CommitDate: Thu Mar 26 19:06:33 2020 +0000
6 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=83b750b0
7
8 net-fs/samba: Security cleanup
9
10 Bug: https://bugs.gentoo.org/693558
11 Package-Manager: Portage-2.3.96, Repoman-2.3.22
12 Signed-off-by: Lars Wendler <polynomial-c <AT> gentoo.org>
13
14 net-fs/samba/Manifest | 10 -
15 net-fs/samba/files/nmbd.service | 12 -
16 .../samba-4.10.0-disable_gnutls_build_fix.patch | 32 ---
17 .../samba/files/samba-4.5.1-compile_et_fix.patch | 16 --
18 .../files/samba-4.8.6-no-pydsdb-when-no-addc.patch | 36 ---
19 net-fs/samba/files/samba-glibc-2.26-no_rpc.patch | 14 -
20 net-fs/samba/files/samba.service | 10 -
21 net-fs/samba/files/smbd.service | 12 -
22 net-fs/samba/files/smbd.socket | 9 -
23 net-fs/samba/files/smbd_at.service | 7 -
24 net-fs/samba/files/talloc-disable-python.patch | 34 ---
25 net-fs/samba/files/winbindd.service | 12 -
26 net-fs/samba/samba-4.10.11.ebuild | 317 ---------------------
27 net-fs/samba/samba-4.10.13.ebuild | 317 ---------------------
28 net-fs/samba/samba-4.10.2-r1.ebuild | 310 --------------------
29 net-fs/samba/samba-4.11.4.ebuild | 313 --------------------
30 net-fs/samba/samba-4.11.6.ebuild | 313 --------------------
31 net-fs/samba/samba-4.5.16-r1.ebuild | 297 -------------------
32 net-fs/samba/samba-4.8.12.ebuild | 306 --------------------
33 net-fs/samba/samba-4.8.6-r4.ebuild | 290 -------------------
34 net-fs/samba/samba-4.8.6-r5.ebuild | 304 --------------------
35 net-fs/samba/samba-4.9.17.ebuild | 310 --------------------
36 net-fs/samba/samba-4.9.18.ebuild | 310 --------------------
37 23 files changed, 3591 deletions(-)
38
39 diff --git a/net-fs/samba/Manifest b/net-fs/samba/Manifest
40 index 9d3ffd7c679..fb43e058142 100644
41 --- a/net-fs/samba/Manifest
42 +++ b/net-fs/samba/Manifest
43 @@ -1,13 +1,3 @@
44 -DIST samba-4.10.11.tar.gz 18342499 BLAKE2B 9555f0e7ee46a7d372defd1c0978024cf36e23a33229cba2e374bed7bad67cb1e24ad5f37e989e01397fec2bcf7aa403bbb67669a764ec0a669571b182915c34 SHA512 776978698cc2d0e86d22d61caadc24f886f0e7fd35788806ebc641502a9a1f4a46afcde7c82e3d644eaaef8c302da5f795b9518681014b7f46a39422766fb758
45 -DIST samba-4.10.13.tar.gz 18350580 BLAKE2B ab97d46284bee60762543ed1c27846e22dd984ff61b1601cc32af46b87cca30751ffc6b1ca4da7045c22224cd4f23c46cfa42f478098676bc243412f319f6658 SHA512 959986ce8cb846d9e3e6b83eff896fefa140b1b5d03ace878100c806a4e969352b37b0dca9e7795775bab7d8230770dae66cd48b4856a2c416f0234fd63e0bf2
46 -DIST samba-4.10.2.tar.gz 18280710 BLAKE2B f15b117d1159dfa6cd279c5011629d688fcfba94a2ca8184a827d0787a31f76a38f46b355454b916f2e62c0a88109b86664f6bb16fc0e23d0f61d09908e587cd SHA512 3d146ea12567ebb02a7babcad779b82339ffbfb19f6f2be5cac33eb18af2c9b546dc1cd910072a5c9e152ba9c4a632ed6870c48a8f6ad9d04304b130f240a4bf
47 -DIST samba-4.11.4.tar.gz 18530105 BLAKE2B 39e0cc6965681f3d64e861edebe2b77e558b68d9a3f4d7fa52e6ccfe704f2294fb3fb1a619d07d2130f36b1bf572300c733a273ccf78d554807e0f5897dcbcff SHA512 18ae1cb8b092c441a3fd4c6ecc9f35841dc51e3061f435107f7d2579b5e8ca6f8c96a947627dbd401b81c7de2293ff2587c30be694e160bf8a10c6d15aa73880
48 DIST samba-4.11.6.tar.gz 18541566 BLAKE2B 2b4a40be7cec8a9706cbc344796885f59403aa11ca3d8a7dc40b3d287ec222c11d7395fd193c4b66c4116f1bffd869caf444a950d508f5a9a596db32553e1461 SHA512 3815080a1693c596a126371a5ea4e8534317a7266803c7de13a7e5b3ee9757dfbf13c0de20d498a6683d3aaf56941ed42f289e3c24f88713529a5f047a691af2
49 DIST samba-4.11.7.tar.gz 18541292 BLAKE2B 083ee2ebade2dd6267f8c53234bd98cc3325d28cf0a03fce2f45accfd36acfaaa9cdc82f326e913cfdbd585b0d705c71a95685ec37901e7d8a4d17cd2a04d3f2 SHA512 c728adbc9fd86f9b745f62d2f435d0fd5e8d1381725a657f8d14ec246d5c758c9eb92bd82c25b0c3f40ce4d10eaf5ce7792363b8a8c4df2e6c78c1458fef4f95
50 DIST samba-4.12.0.tar.gz 18156651 BLAKE2B a02a5cdce9551743bfa88fe9e42ab2f2b6fc3ec96e933bcb92f994681b8dbbeef675f718e723f131c95252a51d964d141f5dda98529dc7779ba372fc6d0080c5 SHA512 d50be899675b8e3504311e73bb75fbb8264e918e0d1765239ecb5b14e15c0917565f8a9ce1877fb604151bf4f23dfc4c2f7f30a53c872681e3d2571d3ed5ef82
51 -DIST samba-4.5.11-disable-python-patches.tar.xz 6292 BLAKE2B c2a32a1059a02bc1c87ce5f604cbc5878c654b8f693c8486b5ba63b37513444915a7b6389fe82b7e31ab2f9577dd8462eddba60b4f4f756b4ed1145ce7bd90ae SHA512 f0e3076e3e1ecaae3f06b3ef30efc81719fb3f63a1041dcbdae4b62ca4cf693732f9eb16f047d046d4930136fed82194e82b455ea888e12cf845b3e6a122d57d
52 -DIST samba-4.5.16.tar.gz 21024396 BLAKE2B e737559fb748044076608fa233700eb54c7e1c56bc234763f062b6341a179cc78a4a8cdf9f3d6f4d7f3cf8a79f846852ddd5cc753a468c3adb3a0451e1809ed9 SHA512 de8a41013cfb5ef3adcb290efd97a78a5de876d90ad05764d631f14e663a1849bb53e4ac394b46c906f1109be5748fee9316407a659c57007d36851ae8adcd7f
53 -DIST samba-4.8.12.tar.gz 17764832 BLAKE2B d2c0c8b9090da7c94b9343fd3f416e9aafad64273abc9be0639b011f71072926a0b303cf53e63c4e470aeb168e8ec23003b5f4ed4258aac8d6b3d029f71fba6f SHA512 f29595f6390d01860cb6acd750d2e36b4d207dd1da16465c21c8d6d732ce27bd0582a0f34296081e2659638d839c8b12f28deccc31982afa94650da8bce8df8b
54 -DIST samba-4.8.6.tar.gz 17723841 BLAKE2B 38da52e14b4417f26462eef2226c4498e54d2c276b4056e8c6d6c66079f33bcda24c1eab30b29bc7413280ec89a74a55e043e8274ac50f9a25bae7563717ff34 SHA512 f6afab5ca466bd8653a56c205b71ce94ecf0ad0c6e4c9d64cbba7b1e56f1987bc2022e6b629d87eb6078e3f6ba53833c19cfb41e40b6d589e4317ea9d85de273
55 -DIST samba-4.9.17.tar.gz 18100548 BLAKE2B c0b9a869b67fafaaa09776c472d8a7fd56eed10577ea554d07a8ed1d591dcb783381ea3d2c026315bdeebb0b4a8d456d4193da65be1a88b246d235ecda70cac0 SHA512 658fd4a073e7f93ccb270d63d4a12fc29ec30d3928464f81c583c85706d3a559794dbde23c6dee17ac7c3333ce2c5afb965c152fdeb6b7bd643fe1bafcd35823
56 -DIST samba-4.9.18.tar.gz 18103049 BLAKE2B f1071f76924722294be545534c3462d12963073dade444d9aebbbcb56bb84f5ae608bf9a97583e1050713ea668ced6aaf13f0a180e7b682da8405d40600cace9 SHA512 c7161fdf90d5e2ee5fd28aca93b596f4dc4417d2f8519a586a2319e42a62107a026adc128b90f7c3ad71d4d21c0b782bc8eb79005714bf0ee93fba19ffeef624
57
58 diff --git a/net-fs/samba/files/nmbd.service b/net-fs/samba/files/nmbd.service
59 deleted file mode 100644
60 index 44b4ffba1f7..00000000000
61 --- a/net-fs/samba/files/nmbd.service
62 +++ /dev/null
63 @@ -1,12 +0,0 @@
64 -[Unit]
65 -Description=Samba NetBIOS name server
66 -After=network.target
67 -
68 -[Service]
69 -Type=forking
70 -PIDFile=/var/run/samba/nmbd.pid
71 -ExecStart=/usr/sbin/nmbd -D
72 -ExecReload=/bin/kill -HUP $MAINPID
73 -
74 -[Install]
75 -WantedBy=multi-user.target
76
77 diff --git a/net-fs/samba/files/samba-4.10.0-disable_gnutls_build_fix.patch b/net-fs/samba/files/samba-4.10.0-disable_gnutls_build_fix.patch
78 deleted file mode 100644
79 index 12b2df3a597..00000000000
80 --- a/net-fs/samba/files/samba-4.10.0-disable_gnutls_build_fix.patch
81 +++ /dev/null
82 @@ -1,32 +0,0 @@
83 -From 41eeabcb0175659aebf6d480c43fb64310f37d9c Mon Sep 17 00:00:00 2001
84 -From: Andrew Bartlett <abartlet@×××××.org>
85 -Date: Wed, 20 Mar 2019 13:57:50 +1300
86 -Subject: [PATCH] build: Allow build when --disable-gnutls is set
87 -
88 -BUG: https://bugzilla.samba.org/show_bug.cgi?id=13844
89 -
90 -Signed-off-by: Andrew Bartlett <abartlet@×××××.org>
91 ----
92 - lib/mscat/wscript | 6 +++++-
93 - 1 file changed, 5 insertions(+), 1 deletion(-)
94 -
95 -diff --git a/lib/mscat/wscript b/lib/mscat/wscript
96 -index 7ca9ef567ee..4d1f752a3c1 100644
97 ---- a/lib/mscat/wscript
98 -+++ b/lib/mscat/wscript
99 -@@ -12,7 +12,11 @@ def configure(conf):
100 - if not conf.find_program('asn1Parser', var='ASN1PARSER'):
101 - Logs.warn('WARNING: ans1Parser hasn\'t been found! Please install it (e.g. libtasn1-bin)')
102 -
103 -- conf.CHECK_FUNCS_IN('gnutls_pkcs7_get_embedded_data_oid', 'gnutls')
104 -+ # GnuTLS is currently able to be disabled
105 -+ if conf.env.enable_gnutls:
106 -+ conf.CHECK_FUNCS_IN('gnutls_pkcs7_get_embedded_data_oid', 'gnutls')
107 -+ else:
108 -+ Logs.warn('WARNING: gnutls disabled so dumpmscat will not be built')
109 -
110 - def build(bld):
111 - if (bld.CONFIG_SET('HAVE_LIBTASN1') and
112 ---
113 -2.11.0
114 -
115
116 diff --git a/net-fs/samba/files/samba-4.5.1-compile_et_fix.patch b/net-fs/samba/files/samba-4.5.1-compile_et_fix.patch
117 deleted file mode 100644
118 index 463512f9a9c..00000000000
119 --- a/net-fs/samba/files/samba-4.5.1-compile_et_fix.patch
120 +++ /dev/null
121 @@ -1,16 +0,0 @@
122 ---- samba-4.5.1/source4/heimdal_build/wscript_configure
123 -+++ samba-4.5.1/source4/heimdal_build/wscript_configure
124 -@@ -258,7 +258,11 @@
125 -
126 - # With the proper checks in place we should be able to build against the system libtommath.
127 - #if conf.CHECK_BUNDLED_SYSTEM('tommath', checkfunctions='mp_init', headers='tommath.h'):
128 - # conf.define('USING_SYSTEM_TOMMATH', 1)
129 -
130 --check_system_heimdal_binary("compile_et")
131 --check_system_heimdal_binary("asn1_compile")
132 -+# comment out next line to stop Gentoo Samba build from using the compile_et in e2fsprogs-libs
133 -+# to compile the error tables. This produces a compile error later on.
134 -+#check_system_heimdal_binary("compile_et")
135 -+#
136 -+# As a precaution do the same for asn1_compile
137 -+#check_system_heimdal_binary("asn1_compile")
138
139 diff --git a/net-fs/samba/files/samba-4.8.6-no-pydsdb-when-no-addc.patch b/net-fs/samba/files/samba-4.8.6-no-pydsdb-when-no-addc.patch
140 deleted file mode 100644
141 index 1093b1de71d..00000000000
142 --- a/net-fs/samba/files/samba-4.8.6-no-pydsdb-when-no-addc.patch
143 +++ /dev/null
144 @@ -1,36 +0,0 @@
145 -Do not install the python DSDB modules when ADDC is disabled.
146 -This is a change integrated upstream in 4.9.1 (or earlier).
147 -
148 -Without this, the python dsdb_dns.so module is installed, which
149 -is linked to libdnsserver-common.so that is NOT installed, and so
150 -potential breakage ensues.
151 -
152 ---- a/source4/dsdb/wscript_build 2018-01-17 03:08:39.000000000 -0500
153 -+++ b/source4/dsdb/wscript_build 2018-11-08 10:43:58.064486832 -0500
154 -@@ -63,10 +63,11 @@
155 - )
156 -
157 - bld.SAMBA_PYTHON('python_dsdb',
158 - source='pydsdb.c',
159 - # the dependency on dcerpc here is because gensec
160 - # depends on dcerpc but the waf circular dependency finder
161 - # removes it so we end up with unresolved symbols.
162 - deps='samdb pyldb-util dcerpc com_err pyrpc_util pyparam_util dsdb_garbage_collect_tombstones',
163 -- realname='samba/dsdb.so'
164 -+ realname='samba/dsdb.so',
165 -+ enabled=bld.AD_DC_BUILD_IS_ENABLED()
166 - )
167 ---- a/source4/dns_server/wscript_build 2018-11-08 11:49:03.450296286 -0500
168 -+++ b/source4/dns_server/wscript_build 2018-11-08 11:49:23.327864408 -0500
169 -@@ -64,9 +64,10 @@
170 - private_library=True,
171 - deps='samba-hostconfig samdb-common gensec popt dnsserver_common',
172 - enabled=bld.AD_DC_BUILD_IS_ENABLED())
173 -
174 -
175 - bld.SAMBA_PYTHON('python_dsdb_dns',
176 - source='pydns.c',
177 - deps='samdb pyldb-util pyrpc_util dnsserver_common pytalloc-util',
178 -- realname='samba/dsdb_dns.so')
179 -+ realname='samba/dsdb_dns.so',
180 -+ enabled=bld.AD_DC_BUILD_IS_ENABLED())
181
182 diff --git a/net-fs/samba/files/samba-glibc-2.26-no_rpc.patch b/net-fs/samba/files/samba-glibc-2.26-no_rpc.patch
183 deleted file mode 100644
184 index e66446845f2..00000000000
185 --- a/net-fs/samba/files/samba-glibc-2.26-no_rpc.patch
186 +++ /dev/null
187 @@ -1,14 +0,0 @@
188 -https://attachments.samba.org/attachment.cgi?id=13172
189 -https://bugs.gentoo.org/637320
190 -
191 ---- a/lib/replace/wscript
192 -+++ b/lib/replace/wscript
193 -@@ -71,7 +71,7 @@
194 - conf.CHECK_HEADERS('sys/fileio.h sys/filesys.h sys/dustat.h sys/sysmacros.h')
195 - conf.CHECK_HEADERS('xfs/libxfs.h netgroup.h')
196 -
197 -- conf.CHECK_CODE('', headers='rpc/rpc.h rpcsvc/yp_prot.h', define='HAVE_RPCSVC_YP_PROT_H')
198 -+ conf.CHECK_CODE('ypstat s;', headers='rpc/rpc.h rpcsvc/yp_prot.h', define='HAVE_RPCSVC_YP_PROT_H')
199 -
200 - conf.CHECK_HEADERS('valgrind.h valgrind/valgrind.h valgrind/memcheck.h')
201 - conf.CHECK_HEADERS('nss_common.h nsswitch.h ns_api.h')
202
203 diff --git a/net-fs/samba/files/samba.service b/net-fs/samba/files/samba.service
204 deleted file mode 100644
205 index 8214ff86318..00000000000
206 --- a/net-fs/samba/files/samba.service
207 +++ /dev/null
208 @@ -1,10 +0,0 @@
209 -[Unit]
210 -Description=Samba AD server
211 -After=network.target winbindd.service
212 -Conflicts=nmbd.service smbd.service
213 -
214 -[Service]
215 -ExecStart=/usr/sbin/samba --interactive
216 -
217 -[Install]
218 -WantedBy=multi-user.target
219
220 diff --git a/net-fs/samba/files/smbd.service b/net-fs/samba/files/smbd.service
221 deleted file mode 100644
222 index 5c006a44edb..00000000000
223 --- a/net-fs/samba/files/smbd.service
224 +++ /dev/null
225 @@ -1,12 +0,0 @@
226 -[Unit]
227 -Description=Samba SMB/CIFS server
228 -After=network.target nmbd.service winbindd.service
229 -
230 -[Service]
231 -Type=forking
232 -PIDFile=/var/run/samba/smbd.pid
233 -ExecStart=/usr/sbin/smbd -D
234 -ExecReload=/bin/kill -HUP $MAINPID
235 -
236 -[Install]
237 -WantedBy=multi-user.target
238
239 diff --git a/net-fs/samba/files/smbd.socket b/net-fs/samba/files/smbd.socket
240 deleted file mode 100644
241 index 833bf438832..00000000000
242 --- a/net-fs/samba/files/smbd.socket
243 +++ /dev/null
244 @@ -1,9 +0,0 @@
245 -[Unit]
246 -Description=Samba SMB/CIFS server socket
247 -
248 -[Socket]
249 -ListenStream=445
250 -Accept=yes
251 -
252 -[Install]
253 -WantedBy=sockets.target
254
255 diff --git a/net-fs/samba/files/smbd_at.service b/net-fs/samba/files/smbd_at.service
256 deleted file mode 100644
257 index e1f71be3f7f..00000000000
258 --- a/net-fs/samba/files/smbd_at.service
259 +++ /dev/null
260 @@ -1,7 +0,0 @@
261 -[Unit]
262 -Description=Samba SMB/CIFS server instance
263 -
264 -[Service]
265 -ExecStart=/usr/sbin/smbd -F
266 -ExecReload=/bin/kill -HUP $MAINPID
267 -StandardInput=socket
268
269 diff --git a/net-fs/samba/files/talloc-disable-python.patch b/net-fs/samba/files/talloc-disable-python.patch
270 deleted file mode 100644
271 index 6ef45eb37fb..00000000000
272 --- a/net-fs/samba/files/talloc-disable-python.patch
273 +++ /dev/null
274 @@ -1,34 +0,0 @@
275 ---- a/lib/talloc/wscript 2017-04-28 04:57:26.000000000 -0400
276 -+++ b/lib/talloc/wscript 2017-07-05 14:30:42.700580464 -0400
277 -@@ -74,19 +74,22 @@
278 - implied_deps='replace'):
279 - conf.define('USING_SYSTEM_TALLOC', 1)
280 -
281 -- using_system_pytalloc_util = True
282 -- if not conf.CHECK_BUNDLED_SYSTEM_PKG('pytalloc-util', minversion=VERSION,
283 -- implied_deps='talloc replace'):
284 -+ if conf.env.disable_python:
285 - using_system_pytalloc_util = False
286 --
287 -- # We need to get a pytalloc-util for all the python versions
288 -- # we are building for
289 -- if conf.env['EXTRA_PYTHON']:
290 -- name = 'pytalloc-util' + conf.all_envs['extrapython']['PYTHON_SO_ABI_FLAG']
291 -- if not conf.CHECK_BUNDLED_SYSTEM_PKG(name, minversion=VERSION,
292 -+ else:
293 -+ using_system_pytalloc_util = True
294 -+ if not conf.CHECK_BUNDLED_SYSTEM_PKG('pytalloc-util', minversion=VERSION,
295 - implied_deps='talloc replace'):
296 - using_system_pytalloc_util = False
297 -
298 -+ # We need to get a pytalloc-util for all the python versions
299 -+ # we are building for
300 -+ if conf.env['EXTRA_PYTHON']:
301 -+ name = 'pytalloc-util' + conf.all_envs['extrapython']['PYTHON_SO_ABI_FLAG']
302 -+ if not conf.CHECK_BUNDLED_SYSTEM_PKG(name, minversion=VERSION,
303 -+ implied_deps='talloc replace'):
304 -+ using_system_pytalloc_util = False
305 -+
306 - if using_system_pytalloc_util:
307 - conf.define('USING_SYSTEM_PYTALLOC_UTIL', 1)
308 -
309
310 diff --git a/net-fs/samba/files/winbindd.service b/net-fs/samba/files/winbindd.service
311 deleted file mode 100644
312 index 67a778fc76c..00000000000
313 --- a/net-fs/samba/files/winbindd.service
314 +++ /dev/null
315 @@ -1,12 +0,0 @@
316 -[Unit]
317 -Description=Samba Winbind daemon
318 -After=network.target nmbd.service
319 -
320 -[Service]
321 -Type=forking
322 -PIDFile=/var/run/samba/winbindd.pid
323 -ExecStart=/usr/sbin/winbindd -D
324 -ExecReload=/bin/kill -HUP $MAINPID
325 -
326 -[Install]
327 -WantedBy=multi-user.target
328
329 diff --git a/net-fs/samba/samba-4.10.11.ebuild b/net-fs/samba/samba-4.10.11.ebuild
330 deleted file mode 100644
331 index ed134f4d5d3..00000000000
332 --- a/net-fs/samba/samba-4.10.11.ebuild
333 +++ /dev/null
334 @@ -1,317 +0,0 @@
335 -# Copyright 1999-2020 Gentoo Authors
336 -# Distributed under the terms of the GNU General Public License v2
337 -
338 -EAPI=6
339 -PYTHON_COMPAT=( python3_{6,7} )
340 -PYTHON_REQ_USE='threads(+),xml(+)'
341 -
342 -inherit python-single-r1 waf-utils multilib-minimal linux-info systemd pam
343 -
344 -MY_PV="${PV/_rc/rc}"
345 -MY_P="${PN}-${MY_PV}"
346 -
347 -SRC_PATH="stable"
348 -[[ ${PV} = *_rc* ]] && SRC_PATH="rc"
349 -
350 -SRC_URI="mirror://samba/${SRC_PATH}/${MY_P}.tar.gz"
351 -[[ ${PV} = *_rc* ]] || \
352 -KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86"
353 -
354 -DESCRIPTION="Samba Suite Version 4"
355 -HOMEPAGE="https://www.samba.org/"
356 -LICENSE="GPL-3"
357 -
358 -SLOT="0"
359 -
360 -IUSE="acl addc addns ads ceph client cluster cups debug dmapi fam gnutls gpg
361 -iprint json ldap pam profiling-data python quota selinux syslog system-heimdal
362 -+system-mitkrb5 systemd test winbind zeroconf"
363 -
364 -MULTILIB_WRAPPED_HEADERS=(
365 - /usr/include/samba-4.0/policy.h
366 - /usr/include/samba-4.0/dcerpc_server.h
367 - /usr/include/samba-4.0/ctdb.h
368 - /usr/include/samba-4.0/ctdb_client.h
369 - /usr/include/samba-4.0/ctdb_protocol.h
370 - /usr/include/samba-4.0/ctdb_private.h
371 - /usr/include/samba-4.0/ctdb_typesafe_cb.h
372 - /usr/include/samba-4.0/ctdb_version.h
373 -)
374 -
375 -# sys-apps/attr is an automagic dependency (see bug #489748)
376 -CDEPEND="
377 - >=app-arch/libarchive-3.1.2[${MULTILIB_USEDEP}]
378 - dev-lang/perl:=
379 - dev-libs/libaio[${MULTILIB_USEDEP}]
380 - dev-libs/libbsd[${MULTILIB_USEDEP}]
381 - dev-libs/iniparser:0
382 - dev-libs/popt[${MULTILIB_USEDEP}]
383 - >=dev-util/cmocka-1.1.1[${MULTILIB_USEDEP}]
384 - net-libs/libnsl:=[${MULTILIB_USEDEP}]
385 - sys-apps/attr[${MULTILIB_USEDEP}]
386 - >=sys-libs/ldb-1.5.6[ldap(+)?,python?,${PYTHON_SINGLE_USEDEP},${MULTILIB_USEDEP}]
387 - <sys-libs/ldb-1.6.0[ldap(+)?,python?,${PYTHON_SINGLE_USEDEP},${MULTILIB_USEDEP}]
388 - sys-libs/libcap
389 - sys-libs/ncurses:0=[${MULTILIB_USEDEP}]
390 - sys-libs/readline:0=
391 - >=sys-libs/talloc-2.1.16[python?,${PYTHON_SINGLE_USEDEP},${MULTILIB_USEDEP}]
392 - >=sys-libs/tdb-1.3.18[python?,${PYTHON_SINGLE_USEDEP},${MULTILIB_USEDEP}]
393 - >=sys-libs/tevent-0.9.39[python?,${PYTHON_SINGLE_USEDEP},${MULTILIB_USEDEP}]
394 - sys-libs/zlib[${MULTILIB_USEDEP}]
395 - virtual/libiconv
396 - pam? ( sys-libs/pam )
397 - acl? ( virtual/acl )
398 - $(python_gen_cond_dep "
399 - dev-python/subunit[\${PYTHON_MULTI_USEDEP},${MULTILIB_USEDEP}]
400 - addns? (
401 - net-dns/bind-tools[gssapi]
402 - dev-python/dnspython:=[\${PYTHON_MULTI_USEDEP}]
403 - )
404 - ")
405 - ceph? ( sys-cluster/ceph )
406 - cluster? (
407 - net-libs/rpcsvc-proto
408 - !dev-db/ctdb
409 - )
410 - cups? ( net-print/cups )
411 - debug? ( dev-util/lttng-ust )
412 - dmapi? ( sys-apps/dmapi )
413 - fam? ( virtual/fam )
414 - gnutls? (
415 - dev-libs/libgcrypt:0
416 - >=net-libs/gnutls-1.4.0
417 - )
418 - gpg? ( app-crypt/gpgme )
419 - json? ( dev-libs/jansson )
420 - ldap? ( net-nds/openldap[${MULTILIB_USEDEP}] )
421 - system-heimdal? ( >=app-crypt/heimdal-1.5[-ssl,${MULTILIB_USEDEP}] )
422 - system-mitkrb5? ( >=app-crypt/mit-krb5-1.15.1[${MULTILIB_USEDEP}] )
423 - systemd? ( sys-apps/systemd:0= )
424 - zeroconf? ( net-dns/avahi )
425 -"
426 -DEPEND="${CDEPEND}
427 - ${PYTHON_DEPS}
428 - app-text/docbook-xsl-stylesheets
429 - dev-libs/libxslt
430 - net-libs/libtirpc[${MULTILIB_USEDEP}]
431 - virtual/pkgconfig
432 - || (
433 - net-libs/rpcsvc-proto
434 - <sys-libs/glibc-2.26[rpc(+)]
435 - )
436 - test? (
437 - !system-mitkrb5? (
438 - >=sys-libs/nss_wrapper-1.1.3
439 - >=net-dns/resolv_wrapper-1.1.4
440 - >=net-libs/socket_wrapper-1.1.9
441 - >=sys-libs/uid_wrapper-1.2.1
442 - )
443 - )"
444 -RDEPEND="${CDEPEND}
445 - python? ( ${PYTHON_DEPS} )
446 - client? ( net-fs/cifs-utils[ads?] )
447 - selinux? ( sec-policy/selinux-samba )
448 - !dev-perl/Parse-Yapp
449 -"
450 -
451 -REQUIRED_USE="
452 - addc? ( python gnutls json winbind )
453 - addns? ( python )
454 - ads? ( acl gnutls ldap winbind )
455 - cluster? ( ads )
456 - gpg? ( addc )
457 - test? ( python )
458 - ?? ( system-heimdal system-mitkrb5 )
459 - ${PYTHON_REQUIRED_USE}
460 -"
461 -
462 -# the test suite is messed, it uses system-installed samba
463 -# bits instead of what was built, tests things disabled via use
464 -# flags, and generally just fails to work in a way ebuilds could
465 -# rely on in its current state
466 -RESTRICT="test"
467 -
468 -S="${WORKDIR}/${MY_P}"
469 -
470 -PATCHES=(
471 - "${FILESDIR}/${PN}-4.4.0-pam.patch"
472 - "${FILESDIR}/${PN}-4.5.1-compile_et_fix.patch"
473 - "${FILESDIR}/${PN}-4.9.2-timespec.patch"
474 -)
475 -
476 -#CONFDIR="${FILESDIR}/$(get_version_component_range 1-2)"
477 -CONFDIR="${FILESDIR}/4.4"
478 -
479 -WAF_BINARY="${S}/buildtools/bin/waf"
480 -
481 -SHAREDMODS=""
482 -
483 -pkg_setup() {
484 - python-single-r1_pkg_setup
485 - if use cluster ; then
486 - SHAREDMODS="idmap_rid,idmap_tdb2,idmap_ad"
487 - elif use ads ; then
488 - SHAREDMODS="idmap_ad"
489 - fi
490 -}
491 -
492 -src_prepare() {
493 - default
494 -
495 - # un-bundle dnspython
496 - sed -i -e '/"dns.resolver":/d' "${S}"/third_party/wscript || die
497 -
498 - # unbundle iso8601 unless tests are enabled
499 - if ! use test ; then
500 - sed -i -e '/"iso8601":/d' "${S}"/third_party/wscript || die
501 - fi
502 -
503 - # ugly hackaround for bug #592502
504 - cp /usr/include/tevent_internal.h "${S}"/lib/tevent/ || die
505 -
506 - sed -e 's:<gpgme\.h>:<gpgme/gpgme.h>:' \
507 - -i source4/dsdb/samdb/ldb_modules/password_hash.c \
508 - || die
509 -
510 - # Friggin' WAF shit
511 - multilib_copy_sources
512 -}
513 -
514 -multilib_src_configure() {
515 - # when specifying libs for samba build you must append NONE to the end to
516 - # stop it automatically including things
517 - local bundled_libs="NONE"
518 - if ! use system-heimdal && ! use system-mitkrb5 ; then
519 - bundled_libs="heimbase,heimntlm,hdb,kdc,krb5,wind,gssapi,hcrypto,hx509,roken,asn1,com_err,NONE"
520 - fi
521 -
522 - local myconf=(
523 - --enable-fhs
524 - --sysconfdir="${EPREFIX}/etc"
525 - --localstatedir="${EPREFIX}/var"
526 - --with-modulesdir="${EPREFIX}/usr/$(get_libdir)/samba"
527 - --with-piddir="${EPREFIX}/run/${PN}"
528 - --bundled-libraries="${bundled_libs}"
529 - --builtin-libraries=NONE
530 - --disable-rpath
531 - --disable-rpath-install
532 - --nopyc
533 - --nopyo
534 - $(multilib_native_use_with acl acl-support)
535 - $(multilib_native_usex addc '' '--without-ad-dc')
536 - $(multilib_native_use_with addns dnsupdate)
537 - $(multilib_native_use_with ads)
538 - $(multilib_native_use_enable ceph cephfs)
539 - $(multilib_native_use_with cluster cluster-support)
540 - $(multilib_native_use_enable cups)
541 - $(multilib_native_use_with dmapi)
542 - $(multilib_native_use_with fam)
543 - $(multilib_native_use_with gpg gpgme)
544 - $(multilib_native_use_with json)
545 - $(multilib_native_use_enable iprint)
546 - $(multilib_native_use_with pam)
547 - $(multilib_native_usex pam "--with-pammodulesdir=${EPREFIX}/$(get_libdir)/security" '')
548 - $(multilib_native_use_with quota quotas)
549 - $(multilib_native_use_with syslog)
550 - $(multilib_native_use_with systemd)
551 - $(multilib_native_use_with winbind)
552 - $(multilib_native_usex python '' '--disable-python')
553 - $(multilib_native_use_enable zeroconf avahi)
554 - $(multilib_native_usex test '--enable-selftest' '')
555 - $(usex system-mitkrb5 "--with-system-mitkrb5 $(multilib_native_usex addc --with-experimental-mit-ad-dc '')" '')
556 - $(use_enable gnutls)
557 - $(use_with debug lttng)
558 - $(use_with ldap)
559 - $(use_with profiling-data)
560 - )
561 -
562 - multilib_is_native_abi && myconf+=( --with-shared-modules=${SHAREDMODS} )
563 -
564 - CPPFLAGS="-I${SYSROOT}${EPREFIX}/usr/include/et ${CPPFLAGS}" \
565 - waf-utils_src_configure ${myconf[@]}
566 -}
567 -
568 -multilib_src_compile() {
569 - waf-utils_src_compile
570 -}
571 -
572 -multilib_src_install() {
573 - waf-utils_src_install
574 -
575 - # Make all .so files executable
576 - find "${ED}" -type f -name "*.so" -exec chmod +x {} + || die
577 -
578 - if multilib_is_native_abi ; then
579 - # install ldap schema for server (bug #491002)
580 - if use ldap ; then
581 - insinto /etc/openldap/schema
582 - doins examples/LDAP/samba.schema
583 - fi
584 -
585 - # create symlink for cups (bug #552310)
586 - if use cups ; then
587 - dosym ../../../bin/smbspool /usr/libexec/cups/backend/smb
588 - fi
589 -
590 - # install example config file
591 - insinto /etc/samba
592 - doins examples/smb.conf.default
593 -
594 - # Fix paths in example file (#603964)
595 - sed \
596 - -e '/log file =/s@/usr/local/samba/var/@/var/log/samba/@' \
597 - -e '/include =/s@/usr/local/samba/lib/@/etc/samba/@' \
598 - -e '/path =/s@/usr/local/samba/lib/@/var/lib/samba/@' \
599 - -e '/path =/s@/usr/local/samba/@/var/lib/samba/@' \
600 - -e '/path =/s@/usr/spool/samba@/var/spool/samba@' \
601 - -i "${ED%/}"/etc/samba/smb.conf.default || die
602 -
603 - # Install init script and conf.d file
604 - newinitd "${CONFDIR}/samba4.initd-r1" samba
605 - newconfd "${CONFDIR}/samba4.confd" samba
606 -
607 - systemd_dotmpfilesd "${FILESDIR}"/samba.conf
608 - systemd_dounit "${FILESDIR}"/nmbd.service
609 - systemd_dounit "${FILESDIR}"/smbd.{service,socket}
610 - systemd_newunit "${FILESDIR}"/smbd_at.service 'smbd@.service'
611 - systemd_dounit "${FILESDIR}"/winbindd.service
612 - systemd_dounit "${FILESDIR}"/samba.service
613 - fi
614 -
615 - if use pam && use winbind ; then
616 - newpamd "${CONFDIR}/system-auth-winbind.pam" system-auth-winbind
617 - # bugs #376853 and #590374
618 - insinto /etc/security
619 - doins examples/pam_winbind/pam_winbind.conf
620 - fi
621 -
622 - keepdir /var/cache/samba
623 - keepdir /var/lib/ctdb
624 - keepdir /var/lib/samba/{bind-dns,private}
625 - keepdir /var/lock/samba
626 - keepdir /var/log/samba
627 - keepdir /var/run/{ctdb,samba}
628 -}
629 -
630 -multilib_src_install_all() {
631 - # Attempt to fix bug #673168
632 - find "${ED}" -type d -name "Yapp" -print0 \
633 - | xargs -0 --no-run-if-empty rm -r || die
634 -}
635 -
636 -multilib_src_test() {
637 - if multilib_is_native_abi ; then
638 - "${WAF_BINARY}" test || die "test failed"
639 - fi
640 -}
641 -
642 -pkg_postinst() {
643 - ewarn "Be aware that this release contains the best of all of Samba's"
644 - ewarn "technology parts, both a file server (that you can reasonably expect"
645 - ewarn "to upgrade existing Samba 3.x releases to) and the AD domain"
646 - ewarn "controller work previously known as 'samba4'."
647 -
648 - elog "For further information and migration steps make sure to read "
649 - elog "https://samba.org/samba/history/${P}.html "
650 - elog "https://wiki.samba.org/index.php/Samba4/HOWTO "
651 -}
652
653 diff --git a/net-fs/samba/samba-4.10.13.ebuild b/net-fs/samba/samba-4.10.13.ebuild
654 deleted file mode 100644
655 index ed134f4d5d3..00000000000
656 --- a/net-fs/samba/samba-4.10.13.ebuild
657 +++ /dev/null
658 @@ -1,317 +0,0 @@
659 -# Copyright 1999-2020 Gentoo Authors
660 -# Distributed under the terms of the GNU General Public License v2
661 -
662 -EAPI=6
663 -PYTHON_COMPAT=( python3_{6,7} )
664 -PYTHON_REQ_USE='threads(+),xml(+)'
665 -
666 -inherit python-single-r1 waf-utils multilib-minimal linux-info systemd pam
667 -
668 -MY_PV="${PV/_rc/rc}"
669 -MY_P="${PN}-${MY_PV}"
670 -
671 -SRC_PATH="stable"
672 -[[ ${PV} = *_rc* ]] && SRC_PATH="rc"
673 -
674 -SRC_URI="mirror://samba/${SRC_PATH}/${MY_P}.tar.gz"
675 -[[ ${PV} = *_rc* ]] || \
676 -KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86"
677 -
678 -DESCRIPTION="Samba Suite Version 4"
679 -HOMEPAGE="https://www.samba.org/"
680 -LICENSE="GPL-3"
681 -
682 -SLOT="0"
683 -
684 -IUSE="acl addc addns ads ceph client cluster cups debug dmapi fam gnutls gpg
685 -iprint json ldap pam profiling-data python quota selinux syslog system-heimdal
686 -+system-mitkrb5 systemd test winbind zeroconf"
687 -
688 -MULTILIB_WRAPPED_HEADERS=(
689 - /usr/include/samba-4.0/policy.h
690 - /usr/include/samba-4.0/dcerpc_server.h
691 - /usr/include/samba-4.0/ctdb.h
692 - /usr/include/samba-4.0/ctdb_client.h
693 - /usr/include/samba-4.0/ctdb_protocol.h
694 - /usr/include/samba-4.0/ctdb_private.h
695 - /usr/include/samba-4.0/ctdb_typesafe_cb.h
696 - /usr/include/samba-4.0/ctdb_version.h
697 -)
698 -
699 -# sys-apps/attr is an automagic dependency (see bug #489748)
700 -CDEPEND="
701 - >=app-arch/libarchive-3.1.2[${MULTILIB_USEDEP}]
702 - dev-lang/perl:=
703 - dev-libs/libaio[${MULTILIB_USEDEP}]
704 - dev-libs/libbsd[${MULTILIB_USEDEP}]
705 - dev-libs/iniparser:0
706 - dev-libs/popt[${MULTILIB_USEDEP}]
707 - >=dev-util/cmocka-1.1.1[${MULTILIB_USEDEP}]
708 - net-libs/libnsl:=[${MULTILIB_USEDEP}]
709 - sys-apps/attr[${MULTILIB_USEDEP}]
710 - >=sys-libs/ldb-1.5.6[ldap(+)?,python?,${PYTHON_SINGLE_USEDEP},${MULTILIB_USEDEP}]
711 - <sys-libs/ldb-1.6.0[ldap(+)?,python?,${PYTHON_SINGLE_USEDEP},${MULTILIB_USEDEP}]
712 - sys-libs/libcap
713 - sys-libs/ncurses:0=[${MULTILIB_USEDEP}]
714 - sys-libs/readline:0=
715 - >=sys-libs/talloc-2.1.16[python?,${PYTHON_SINGLE_USEDEP},${MULTILIB_USEDEP}]
716 - >=sys-libs/tdb-1.3.18[python?,${PYTHON_SINGLE_USEDEP},${MULTILIB_USEDEP}]
717 - >=sys-libs/tevent-0.9.39[python?,${PYTHON_SINGLE_USEDEP},${MULTILIB_USEDEP}]
718 - sys-libs/zlib[${MULTILIB_USEDEP}]
719 - virtual/libiconv
720 - pam? ( sys-libs/pam )
721 - acl? ( virtual/acl )
722 - $(python_gen_cond_dep "
723 - dev-python/subunit[\${PYTHON_MULTI_USEDEP},${MULTILIB_USEDEP}]
724 - addns? (
725 - net-dns/bind-tools[gssapi]
726 - dev-python/dnspython:=[\${PYTHON_MULTI_USEDEP}]
727 - )
728 - ")
729 - ceph? ( sys-cluster/ceph )
730 - cluster? (
731 - net-libs/rpcsvc-proto
732 - !dev-db/ctdb
733 - )
734 - cups? ( net-print/cups )
735 - debug? ( dev-util/lttng-ust )
736 - dmapi? ( sys-apps/dmapi )
737 - fam? ( virtual/fam )
738 - gnutls? (
739 - dev-libs/libgcrypt:0
740 - >=net-libs/gnutls-1.4.0
741 - )
742 - gpg? ( app-crypt/gpgme )
743 - json? ( dev-libs/jansson )
744 - ldap? ( net-nds/openldap[${MULTILIB_USEDEP}] )
745 - system-heimdal? ( >=app-crypt/heimdal-1.5[-ssl,${MULTILIB_USEDEP}] )
746 - system-mitkrb5? ( >=app-crypt/mit-krb5-1.15.1[${MULTILIB_USEDEP}] )
747 - systemd? ( sys-apps/systemd:0= )
748 - zeroconf? ( net-dns/avahi )
749 -"
750 -DEPEND="${CDEPEND}
751 - ${PYTHON_DEPS}
752 - app-text/docbook-xsl-stylesheets
753 - dev-libs/libxslt
754 - net-libs/libtirpc[${MULTILIB_USEDEP}]
755 - virtual/pkgconfig
756 - || (
757 - net-libs/rpcsvc-proto
758 - <sys-libs/glibc-2.26[rpc(+)]
759 - )
760 - test? (
761 - !system-mitkrb5? (
762 - >=sys-libs/nss_wrapper-1.1.3
763 - >=net-dns/resolv_wrapper-1.1.4
764 - >=net-libs/socket_wrapper-1.1.9
765 - >=sys-libs/uid_wrapper-1.2.1
766 - )
767 - )"
768 -RDEPEND="${CDEPEND}
769 - python? ( ${PYTHON_DEPS} )
770 - client? ( net-fs/cifs-utils[ads?] )
771 - selinux? ( sec-policy/selinux-samba )
772 - !dev-perl/Parse-Yapp
773 -"
774 -
775 -REQUIRED_USE="
776 - addc? ( python gnutls json winbind )
777 - addns? ( python )
778 - ads? ( acl gnutls ldap winbind )
779 - cluster? ( ads )
780 - gpg? ( addc )
781 - test? ( python )
782 - ?? ( system-heimdal system-mitkrb5 )
783 - ${PYTHON_REQUIRED_USE}
784 -"
785 -
786 -# the test suite is messed, it uses system-installed samba
787 -# bits instead of what was built, tests things disabled via use
788 -# flags, and generally just fails to work in a way ebuilds could
789 -# rely on in its current state
790 -RESTRICT="test"
791 -
792 -S="${WORKDIR}/${MY_P}"
793 -
794 -PATCHES=(
795 - "${FILESDIR}/${PN}-4.4.0-pam.patch"
796 - "${FILESDIR}/${PN}-4.5.1-compile_et_fix.patch"
797 - "${FILESDIR}/${PN}-4.9.2-timespec.patch"
798 -)
799 -
800 -#CONFDIR="${FILESDIR}/$(get_version_component_range 1-2)"
801 -CONFDIR="${FILESDIR}/4.4"
802 -
803 -WAF_BINARY="${S}/buildtools/bin/waf"
804 -
805 -SHAREDMODS=""
806 -
807 -pkg_setup() {
808 - python-single-r1_pkg_setup
809 - if use cluster ; then
810 - SHAREDMODS="idmap_rid,idmap_tdb2,idmap_ad"
811 - elif use ads ; then
812 - SHAREDMODS="idmap_ad"
813 - fi
814 -}
815 -
816 -src_prepare() {
817 - default
818 -
819 - # un-bundle dnspython
820 - sed -i -e '/"dns.resolver":/d' "${S}"/third_party/wscript || die
821 -
822 - # unbundle iso8601 unless tests are enabled
823 - if ! use test ; then
824 - sed -i -e '/"iso8601":/d' "${S}"/third_party/wscript || die
825 - fi
826 -
827 - # ugly hackaround for bug #592502
828 - cp /usr/include/tevent_internal.h "${S}"/lib/tevent/ || die
829 -
830 - sed -e 's:<gpgme\.h>:<gpgme/gpgme.h>:' \
831 - -i source4/dsdb/samdb/ldb_modules/password_hash.c \
832 - || die
833 -
834 - # Friggin' WAF shit
835 - multilib_copy_sources
836 -}
837 -
838 -multilib_src_configure() {
839 - # when specifying libs for samba build you must append NONE to the end to
840 - # stop it automatically including things
841 - local bundled_libs="NONE"
842 - if ! use system-heimdal && ! use system-mitkrb5 ; then
843 - bundled_libs="heimbase,heimntlm,hdb,kdc,krb5,wind,gssapi,hcrypto,hx509,roken,asn1,com_err,NONE"
844 - fi
845 -
846 - local myconf=(
847 - --enable-fhs
848 - --sysconfdir="${EPREFIX}/etc"
849 - --localstatedir="${EPREFIX}/var"
850 - --with-modulesdir="${EPREFIX}/usr/$(get_libdir)/samba"
851 - --with-piddir="${EPREFIX}/run/${PN}"
852 - --bundled-libraries="${bundled_libs}"
853 - --builtin-libraries=NONE
854 - --disable-rpath
855 - --disable-rpath-install
856 - --nopyc
857 - --nopyo
858 - $(multilib_native_use_with acl acl-support)
859 - $(multilib_native_usex addc '' '--without-ad-dc')
860 - $(multilib_native_use_with addns dnsupdate)
861 - $(multilib_native_use_with ads)
862 - $(multilib_native_use_enable ceph cephfs)
863 - $(multilib_native_use_with cluster cluster-support)
864 - $(multilib_native_use_enable cups)
865 - $(multilib_native_use_with dmapi)
866 - $(multilib_native_use_with fam)
867 - $(multilib_native_use_with gpg gpgme)
868 - $(multilib_native_use_with json)
869 - $(multilib_native_use_enable iprint)
870 - $(multilib_native_use_with pam)
871 - $(multilib_native_usex pam "--with-pammodulesdir=${EPREFIX}/$(get_libdir)/security" '')
872 - $(multilib_native_use_with quota quotas)
873 - $(multilib_native_use_with syslog)
874 - $(multilib_native_use_with systemd)
875 - $(multilib_native_use_with winbind)
876 - $(multilib_native_usex python '' '--disable-python')
877 - $(multilib_native_use_enable zeroconf avahi)
878 - $(multilib_native_usex test '--enable-selftest' '')
879 - $(usex system-mitkrb5 "--with-system-mitkrb5 $(multilib_native_usex addc --with-experimental-mit-ad-dc '')" '')
880 - $(use_enable gnutls)
881 - $(use_with debug lttng)
882 - $(use_with ldap)
883 - $(use_with profiling-data)
884 - )
885 -
886 - multilib_is_native_abi && myconf+=( --with-shared-modules=${SHAREDMODS} )
887 -
888 - CPPFLAGS="-I${SYSROOT}${EPREFIX}/usr/include/et ${CPPFLAGS}" \
889 - waf-utils_src_configure ${myconf[@]}
890 -}
891 -
892 -multilib_src_compile() {
893 - waf-utils_src_compile
894 -}
895 -
896 -multilib_src_install() {
897 - waf-utils_src_install
898 -
899 - # Make all .so files executable
900 - find "${ED}" -type f -name "*.so" -exec chmod +x {} + || die
901 -
902 - if multilib_is_native_abi ; then
903 - # install ldap schema for server (bug #491002)
904 - if use ldap ; then
905 - insinto /etc/openldap/schema
906 - doins examples/LDAP/samba.schema
907 - fi
908 -
909 - # create symlink for cups (bug #552310)
910 - if use cups ; then
911 - dosym ../../../bin/smbspool /usr/libexec/cups/backend/smb
912 - fi
913 -
914 - # install example config file
915 - insinto /etc/samba
916 - doins examples/smb.conf.default
917 -
918 - # Fix paths in example file (#603964)
919 - sed \
920 - -e '/log file =/s@/usr/local/samba/var/@/var/log/samba/@' \
921 - -e '/include =/s@/usr/local/samba/lib/@/etc/samba/@' \
922 - -e '/path =/s@/usr/local/samba/lib/@/var/lib/samba/@' \
923 - -e '/path =/s@/usr/local/samba/@/var/lib/samba/@' \
924 - -e '/path =/s@/usr/spool/samba@/var/spool/samba@' \
925 - -i "${ED%/}"/etc/samba/smb.conf.default || die
926 -
927 - # Install init script and conf.d file
928 - newinitd "${CONFDIR}/samba4.initd-r1" samba
929 - newconfd "${CONFDIR}/samba4.confd" samba
930 -
931 - systemd_dotmpfilesd "${FILESDIR}"/samba.conf
932 - systemd_dounit "${FILESDIR}"/nmbd.service
933 - systemd_dounit "${FILESDIR}"/smbd.{service,socket}
934 - systemd_newunit "${FILESDIR}"/smbd_at.service 'smbd@.service'
935 - systemd_dounit "${FILESDIR}"/winbindd.service
936 - systemd_dounit "${FILESDIR}"/samba.service
937 - fi
938 -
939 - if use pam && use winbind ; then
940 - newpamd "${CONFDIR}/system-auth-winbind.pam" system-auth-winbind
941 - # bugs #376853 and #590374
942 - insinto /etc/security
943 - doins examples/pam_winbind/pam_winbind.conf
944 - fi
945 -
946 - keepdir /var/cache/samba
947 - keepdir /var/lib/ctdb
948 - keepdir /var/lib/samba/{bind-dns,private}
949 - keepdir /var/lock/samba
950 - keepdir /var/log/samba
951 - keepdir /var/run/{ctdb,samba}
952 -}
953 -
954 -multilib_src_install_all() {
955 - # Attempt to fix bug #673168
956 - find "${ED}" -type d -name "Yapp" -print0 \
957 - | xargs -0 --no-run-if-empty rm -r || die
958 -}
959 -
960 -multilib_src_test() {
961 - if multilib_is_native_abi ; then
962 - "${WAF_BINARY}" test || die "test failed"
963 - fi
964 -}
965 -
966 -pkg_postinst() {
967 - ewarn "Be aware that this release contains the best of all of Samba's"
968 - ewarn "technology parts, both a file server (that you can reasonably expect"
969 - ewarn "to upgrade existing Samba 3.x releases to) and the AD domain"
970 - ewarn "controller work previously known as 'samba4'."
971 -
972 - elog "For further information and migration steps make sure to read "
973 - elog "https://samba.org/samba/history/${P}.html "
974 - elog "https://wiki.samba.org/index.php/Samba4/HOWTO "
975 -}
976
977 diff --git a/net-fs/samba/samba-4.10.2-r1.ebuild b/net-fs/samba/samba-4.10.2-r1.ebuild
978 deleted file mode 100644
979 index e83a909917e..00000000000
980 --- a/net-fs/samba/samba-4.10.2-r1.ebuild
981 +++ /dev/null
982 @@ -1,310 +0,0 @@
983 -# Copyright 1999-2020 Gentoo Authors
984 -# Distributed under the terms of the GNU General Public License v2
985 -
986 -EAPI=6
987 -PYTHON_COMPAT=( python3_{6,7} )
988 -PYTHON_REQ_USE='threads(+),xml(+)'
989 -
990 -inherit python-single-r1 waf-utils multilib-minimal linux-info systemd pam
991 -
992 -MY_PV="${PV/_rc/rc}"
993 -MY_P="${PN}-${MY_PV}"
994 -
995 -SRC_PATH="stable"
996 -[[ ${PV} = *_rc* ]] && SRC_PATH="rc"
997 -
998 -SRC_URI="mirror://samba/${SRC_PATH}/${MY_P}.tar.gz"
999 -[[ ${PV} = *_rc* ]] || \
1000 -KEYWORDS="~alpha ~amd64 ~arm arm64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86"
1001 -
1002 -DESCRIPTION="Samba Suite Version 4"
1003 -HOMEPAGE="https://www.samba.org/"
1004 -LICENSE="GPL-3"
1005 -
1006 -SLOT="0"
1007 -
1008 -IUSE="acl addc addns ads ceph client cluster cups debug dmapi fam gnutls gpg iprint json ldap
1009 -pam python quota selinux syslog system-heimdal +system-mitkrb5 systemd test winbind zeroconf"
1010 -
1011 -MULTILIB_WRAPPED_HEADERS=(
1012 - /usr/include/samba-4.0/policy.h
1013 - /usr/include/samba-4.0/dcerpc_server.h
1014 - /usr/include/samba-4.0/ctdb.h
1015 - /usr/include/samba-4.0/ctdb_client.h
1016 - /usr/include/samba-4.0/ctdb_protocol.h
1017 - /usr/include/samba-4.0/ctdb_private.h
1018 - /usr/include/samba-4.0/ctdb_typesafe_cb.h
1019 - /usr/include/samba-4.0/ctdb_version.h
1020 -)
1021 -
1022 -# sys-apps/attr is an automagic dependency (see bug #489748)
1023 -CDEPEND="
1024 - >=app-arch/libarchive-3.1.2[${MULTILIB_USEDEP}]
1025 - dev-lang/perl:=
1026 - dev-libs/libaio[${MULTILIB_USEDEP}]
1027 - dev-libs/libbsd[${MULTILIB_USEDEP}]
1028 - dev-libs/iniparser:0
1029 - dev-libs/popt[${MULTILIB_USEDEP}]
1030 - >=dev-util/cmocka-1.1.1[${MULTILIB_USEDEP}]
1031 - net-libs/libnsl:=[${MULTILIB_USEDEP}]
1032 - sys-apps/attr[${MULTILIB_USEDEP}]
1033 - >=sys-libs/ldb-1.5.4[ldap(+)?,python?,${PYTHON_SINGLE_USEDEP},${MULTILIB_USEDEP}]
1034 - <sys-libs/ldb-1.6.0[ldap(+)?,python?,${PYTHON_SINGLE_USEDEP},${MULTILIB_USEDEP}]
1035 - sys-libs/libcap
1036 - sys-libs/ncurses:0=[${MULTILIB_USEDEP}]
1037 - sys-libs/readline:0=
1038 - >=sys-libs/talloc-2.1.16[python?,${PYTHON_SINGLE_USEDEP},${MULTILIB_USEDEP}]
1039 - >=sys-libs/tdb-1.3.18[python?,${PYTHON_SINGLE_USEDEP},${MULTILIB_USEDEP}]
1040 - >=sys-libs/tevent-0.9.39[python?,${PYTHON_SINGLE_USEDEP},${MULTILIB_USEDEP}]
1041 - sys-libs/zlib[${MULTILIB_USEDEP}]
1042 - virtual/libiconv
1043 - pam? ( sys-libs/pam )
1044 - acl? ( virtual/acl )
1045 - $(python_gen_cond_dep "
1046 - dev-python/subunit[\${PYTHON_MULTI_USEDEP},${MULTILIB_USEDEP}]
1047 - addns? (
1048 - net-dns/bind-tools[gssapi]
1049 - dev-python/dnspython:=[\${PYTHON_MULTI_USEDEP}]
1050 - )
1051 - ")
1052 - ceph? ( sys-cluster/ceph )
1053 - cluster? (
1054 - net-libs/rpcsvc-proto
1055 - !dev-db/ctdb
1056 - )
1057 - cups? ( net-print/cups )
1058 - debug? ( dev-util/lttng-ust )
1059 - dmapi? ( sys-apps/dmapi )
1060 - fam? ( virtual/fam )
1061 - gnutls? (
1062 - dev-libs/libgcrypt:0
1063 - >=net-libs/gnutls-1.4.0
1064 - )
1065 - gpg? ( app-crypt/gpgme )
1066 - json? ( dev-libs/jansson )
1067 - ldap? ( net-nds/openldap[${MULTILIB_USEDEP}] )
1068 - system-heimdal? ( >=app-crypt/heimdal-1.5[-ssl,${MULTILIB_USEDEP}] )
1069 - system-mitkrb5? ( >=app-crypt/mit-krb5-1.15.1[${MULTILIB_USEDEP}] )
1070 - systemd? ( sys-apps/systemd:0= )
1071 - zeroconf? ( net-dns/avahi )
1072 -"
1073 -DEPEND="${CDEPEND}
1074 - ${PYTHON_DEPS}
1075 - app-text/docbook-xsl-stylesheets
1076 - dev-libs/libxslt
1077 - net-libs/libtirpc[${MULTILIB_USEDEP}]
1078 - virtual/pkgconfig
1079 - || (
1080 - net-libs/rpcsvc-proto
1081 - <sys-libs/glibc-2.26[rpc(+)]
1082 - )
1083 - test? (
1084 - !system-mitkrb5? (
1085 - >=sys-libs/nss_wrapper-1.1.3
1086 - >=net-dns/resolv_wrapper-1.1.4
1087 - >=net-libs/socket_wrapper-1.1.9
1088 - >=sys-libs/uid_wrapper-1.2.1
1089 - )
1090 - )"
1091 -RDEPEND="${CDEPEND}
1092 - python? ( ${PYTHON_DEPS} )
1093 - client? ( net-fs/cifs-utils[ads?] )
1094 - selinux? ( sec-policy/selinux-samba )
1095 - !dev-perl/Parse-Yapp
1096 -"
1097 -
1098 -REQUIRED_USE="
1099 - addc? ( python gnutls json winbind )
1100 - addns? ( python )
1101 - ads? ( acl gnutls ldap winbind )
1102 - cluster? ( ads )
1103 - gpg? ( addc )
1104 - test? ( python )
1105 - ?? ( system-heimdal system-mitkrb5 )
1106 - ${PYTHON_REQUIRED_USE}
1107 -"
1108 -
1109 -# the test suite is messed, it uses system-installed samba
1110 -# bits instead of what was built, tests things disabled via use
1111 -# flags, and generally just fails to work in a way ebuilds could
1112 -# rely on in its current state
1113 -RESTRICT="test"
1114 -
1115 -S="${WORKDIR}/${MY_P}"
1116 -
1117 -PATCHES=(
1118 - "${FILESDIR}/${PN}-4.4.0-pam.patch"
1119 - "${FILESDIR}/${PN}-4.5.1-compile_et_fix.patch"
1120 - "${FILESDIR}/${PN}-4.9.2-timespec.patch"
1121 - "${FILESDIR}/${PN}-4.10.0-disable_gnutls_build_fix.patch"
1122 -)
1123 -
1124 -#CONFDIR="${FILESDIR}/$(get_version_component_range 1-2)"
1125 -CONFDIR="${FILESDIR}/4.4"
1126 -
1127 -WAF_BINARY="${S}/buildtools/bin/waf"
1128 -
1129 -SHAREDMODS=""
1130 -
1131 -pkg_setup() {
1132 - python-single-r1_pkg_setup
1133 - if use cluster ; then
1134 - SHAREDMODS="idmap_rid,idmap_tdb2,idmap_ad"
1135 - elif use ads ; then
1136 - SHAREDMODS="idmap_ad"
1137 - fi
1138 -}
1139 -
1140 -src_prepare() {
1141 - default
1142 -
1143 - # un-bundle dnspython
1144 - sed -i -e '/"dns.resolver":/d' "${S}"/third_party/wscript || die
1145 -
1146 - # unbundle iso8601 unless tests are enabled
1147 - if ! use test ; then
1148 - sed -i -e '/"iso8601":/d' "${S}"/third_party/wscript || die
1149 - fi
1150 -
1151 - # ugly hackaround for bug #592502
1152 - cp /usr/include/tevent_internal.h "${S}"/lib/tevent/ || die
1153 -
1154 - sed -e 's:<gpgme\.h>:<gpgme/gpgme.h>:' \
1155 - -i source4/dsdb/samdb/ldb_modules/password_hash.c \
1156 - || die
1157 -
1158 - # Friggin' WAF shit
1159 - multilib_copy_sources
1160 -}
1161 -
1162 -multilib_src_configure() {
1163 - # when specifying libs for samba build you must append NONE to the end to
1164 - # stop it automatically including things
1165 - local bundled_libs="NONE"
1166 - if ! use system-heimdal && ! use system-mitkrb5 ; then
1167 - bundled_libs="heimbase,heimntlm,hdb,kdc,krb5,wind,gssapi,hcrypto,hx509,roken,asn1,com_err,NONE"
1168 - fi
1169 -
1170 - local myconf=(
1171 - --enable-fhs
1172 - --sysconfdir="${EPREFIX}/etc"
1173 - --localstatedir="${EPREFIX}/var"
1174 - --with-modulesdir="${EPREFIX}/usr/$(get_libdir)/samba"
1175 - --with-piddir="${EPREFIX}/run/${PN}"
1176 - --bundled-libraries="${bundled_libs}"
1177 - --builtin-libraries=NONE
1178 - --disable-rpath
1179 - --disable-rpath-install
1180 - --nopyc
1181 - --nopyo
1182 - $(multilib_native_use_with acl acl-support)
1183 - $(multilib_native_usex addc '' '--without-ad-dc')
1184 - $(multilib_native_use_with addns dnsupdate)
1185 - $(multilib_native_use_with ads)
1186 - $(multilib_native_use_enable ceph cephfs)
1187 - $(multilib_native_use_with cluster cluster-support)
1188 - $(multilib_native_use_enable cups)
1189 - $(multilib_native_use_with dmapi)
1190 - $(multilib_native_use_with fam)
1191 - $(multilib_native_use_with gpg gpgme)
1192 - $(multilib_native_use_with json)
1193 - $(multilib_native_use_enable iprint)
1194 - $(multilib_native_use_with pam)
1195 - $(multilib_native_usex pam "--with-pammodulesdir=${EPREFIX}/$(get_libdir)/security" '')
1196 - $(multilib_native_use_with quota quotas)
1197 - $(multilib_native_use_with syslog)
1198 - $(multilib_native_use_with systemd)
1199 - $(multilib_native_use_with winbind)
1200 - $(multilib_native_usex python '' '--disable-python')
1201 - $(multilib_native_use_enable zeroconf avahi)
1202 - $(multilib_native_usex test '--enable-selftest' '')
1203 - $(usex system-mitkrb5 "--with-system-mitkrb5 $(multilib_native_usex addc --with-experimental-mit-ad-dc '')" '')
1204 - $(use_enable gnutls)
1205 - $(use_with debug lttng)
1206 - $(use_with ldap)
1207 - )
1208 -
1209 - multilib_is_native_abi && myconf+=( --with-shared-modules=${SHAREDMODS} )
1210 -
1211 - CPPFLAGS="-I${SYSROOT}${EPREFIX}/usr/include/et ${CPPFLAGS}" \
1212 - waf-utils_src_configure ${myconf[@]}
1213 -}
1214 -
1215 -multilib_src_compile() {
1216 - waf-utils_src_compile
1217 -}
1218 -
1219 -multilib_src_install() {
1220 - waf-utils_src_install
1221 -
1222 - # Make all .so files executable
1223 - find "${ED}" -type f -name "*.so" -exec chmod +x {} + || die
1224 -
1225 - if multilib_is_native_abi ; then
1226 - # install ldap schema for server (bug #491002)
1227 - if use ldap ; then
1228 - insinto /etc/openldap/schema
1229 - doins examples/LDAP/samba.schema
1230 - fi
1231 -
1232 - # create symlink for cups (bug #552310)
1233 - if use cups ; then
1234 - dosym ../../../bin/smbspool /usr/libexec/cups/backend/smb
1235 - fi
1236 -
1237 - # install example config file
1238 - insinto /etc/samba
1239 - doins examples/smb.conf.default
1240 -
1241 - # Fix paths in example file (#603964)
1242 - sed \
1243 - -e '/log file =/s@/usr/local/samba/var/@/var/log/samba/@' \
1244 - -e '/include =/s@/usr/local/samba/lib/@/etc/samba/@' \
1245 - -e '/path =/s@/usr/local/samba/lib/@/var/lib/samba/@' \
1246 - -e '/path =/s@/usr/local/samba/@/var/lib/samba/@' \
1247 - -e '/path =/s@/usr/spool/samba@/var/spool/samba@' \
1248 - -i "${ED%/}"/etc/samba/smb.conf.default || die
1249 -
1250 - # Install init script and conf.d file
1251 - newinitd "${CONFDIR}/samba4.initd-r1" samba
1252 - newconfd "${CONFDIR}/samba4.confd" samba
1253 -
1254 - systemd_dotmpfilesd "${FILESDIR}"/samba.conf
1255 - systemd_dounit "${FILESDIR}"/nmbd.service
1256 - systemd_dounit "${FILESDIR}"/smbd.{service,socket}
1257 - systemd_newunit "${FILESDIR}"/smbd_at.service 'smbd@.service'
1258 - systemd_dounit "${FILESDIR}"/winbindd.service
1259 - systemd_dounit "${FILESDIR}"/samba.service
1260 - fi
1261 -
1262 - if use pam && use winbind ; then
1263 - newpamd "${CONFDIR}/system-auth-winbind.pam" system-auth-winbind
1264 - # bugs #376853 and #590374
1265 - insinto /etc/security
1266 - doins examples/pam_winbind/pam_winbind.conf
1267 - fi
1268 -
1269 - keepdir /var/cache/samba
1270 - keepdir /var/lib/ctdb
1271 - keepdir /var/lib/samba/{bind-dns,private}
1272 - keepdir /var/lock/samba
1273 - keepdir /var/log/samba
1274 - keepdir /var/run/{ctdb,samba}
1275 -}
1276 -
1277 -multilib_src_test() {
1278 - if multilib_is_native_abi ; then
1279 - "${WAF_BINARY}" test || die "test failed"
1280 - fi
1281 -}
1282 -
1283 -pkg_postinst() {
1284 - ewarn "Be aware that this release contains the best of all of Samba's"
1285 - ewarn "technology parts, both a file server (that you can reasonably expect"
1286 - ewarn "to upgrade existing Samba 3.x releases to) and the AD domain"
1287 - ewarn "controller work previously known as 'samba4'."
1288 -
1289 - elog "For further information and migration steps make sure to read "
1290 - elog "https://samba.org/samba/history/${P}.html "
1291 - elog "https://wiki.samba.org/index.php/Samba4/HOWTO "
1292 -}
1293
1294 diff --git a/net-fs/samba/samba-4.11.4.ebuild b/net-fs/samba/samba-4.11.4.ebuild
1295 deleted file mode 100644
1296 index 7914bd6929b..00000000000
1297 --- a/net-fs/samba/samba-4.11.4.ebuild
1298 +++ /dev/null
1299 @@ -1,313 +0,0 @@
1300 -# Copyright 1999-2020 Gentoo Authors
1301 -# Distributed under the terms of the GNU General Public License v2
1302 -
1303 -EAPI=6
1304 -PYTHON_COMPAT=( python3_{6,7} )
1305 -PYTHON_REQ_USE='threads(+),xml(+)'
1306 -
1307 -inherit python-single-r1 waf-utils multilib-minimal linux-info systemd pam
1308 -
1309 -MY_PV="${PV/_rc/rc}"
1310 -MY_P="${PN}-${MY_PV}"
1311 -
1312 -SRC_PATH="stable"
1313 -[[ ${PV} = *_rc* ]] && SRC_PATH="rc"
1314 -
1315 -SRC_URI="mirror://samba/${SRC_PATH}/${MY_P}.tar.gz"
1316 -[[ ${PV} = *_rc* ]] || \
1317 -KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86"
1318 -
1319 -DESCRIPTION="Samba Suite Version 4"
1320 -HOMEPAGE="https://www.samba.org/"
1321 -LICENSE="GPL-3"
1322 -
1323 -SLOT="0"
1324 -
1325 -IUSE="acl addc addns ads ceph client cluster cups debug dmapi fam gpg iprint
1326 -json ldap pam profiling-data python quota selinux syslog system-heimdal
1327 -+system-mitkrb5 systemd test winbind zeroconf"
1328 -
1329 -MULTILIB_WRAPPED_HEADERS=(
1330 - /usr/include/samba-4.0/policy.h
1331 - /usr/include/samba-4.0/dcerpc_server.h
1332 - /usr/include/samba-4.0/ctdb.h
1333 - /usr/include/samba-4.0/ctdb_client.h
1334 - /usr/include/samba-4.0/ctdb_protocol.h
1335 - /usr/include/samba-4.0/ctdb_private.h
1336 - /usr/include/samba-4.0/ctdb_typesafe_cb.h
1337 - /usr/include/samba-4.0/ctdb_version.h
1338 -)
1339 -
1340 -# sys-apps/attr is an automagic dependency (see bug #489748)
1341 -CDEPEND="
1342 - >=app-arch/libarchive-3.1.2[${MULTILIB_USEDEP}]
1343 - dev-lang/perl:=
1344 - dev-libs/libaio[${MULTILIB_USEDEP}]
1345 - dev-libs/libbsd[${MULTILIB_USEDEP}]
1346 - dev-libs/libgcrypt:0
1347 - dev-libs/iniparser:0
1348 - dev-libs/popt[${MULTILIB_USEDEP}]
1349 - >=dev-util/cmocka-1.1.1[${MULTILIB_USEDEP}]
1350 - >=net-libs/gnutls-3.2.0
1351 - net-libs/libnsl:=[${MULTILIB_USEDEP}]
1352 - sys-apps/attr[${MULTILIB_USEDEP}]
1353 - >=sys-libs/ldb-2.0.8[ldap(+)?,python?,${PYTHON_SINGLE_USEDEP},${MULTILIB_USEDEP}]
1354 - <sys-libs/ldb-2.2.0[ldap(+)?,python?,${PYTHON_SINGLE_USEDEP},${MULTILIB_USEDEP}]
1355 - sys-libs/libcap
1356 - sys-libs/ncurses:0=[${MULTILIB_USEDEP}]
1357 - sys-libs/readline:0=
1358 - >=sys-libs/talloc-2.2.0[python?,${PYTHON_SINGLE_USEDEP},${MULTILIB_USEDEP}]
1359 - >=sys-libs/tdb-1.4.2[python?,${PYTHON_SINGLE_USEDEP},${MULTILIB_USEDEP}]
1360 - >=sys-libs/tevent-0.10.0[python?,${PYTHON_SINGLE_USEDEP},${MULTILIB_USEDEP}]
1361 - sys-libs/zlib[${MULTILIB_USEDEP}]
1362 - virtual/libiconv
1363 - pam? ( sys-libs/pam )
1364 - acl? ( virtual/acl )
1365 - $(python_gen_cond_dep "
1366 - dev-python/subunit[\${PYTHON_MULTI_USEDEP},${MULTILIB_USEDEP}]
1367 - addns? (
1368 - net-dns/bind-tools[gssapi]
1369 - dev-python/dnspython:=[\${PYTHON_MULTI_USEDEP}]
1370 - )
1371 - ")
1372 - ceph? ( sys-cluster/ceph )
1373 - cluster? (
1374 - net-libs/rpcsvc-proto
1375 - !dev-db/ctdb
1376 - )
1377 - cups? ( net-print/cups )
1378 - debug? ( dev-util/lttng-ust )
1379 - dmapi? ( sys-apps/dmapi )
1380 - fam? ( virtual/fam )
1381 - gpg? ( app-crypt/gpgme )
1382 - json? ( dev-libs/jansson )
1383 - ldap? ( net-nds/openldap[${MULTILIB_USEDEP}] )
1384 - system-heimdal? ( >=app-crypt/heimdal-1.5[-ssl,${MULTILIB_USEDEP}] )
1385 - system-mitkrb5? ( >=app-crypt/mit-krb5-1.15.1[${MULTILIB_USEDEP}] )
1386 - systemd? ( sys-apps/systemd:0= )
1387 - zeroconf? ( net-dns/avahi )
1388 -"
1389 -DEPEND="${CDEPEND}
1390 - ${PYTHON_DEPS}
1391 - app-text/docbook-xsl-stylesheets
1392 - dev-libs/libxslt
1393 - net-libs/libtirpc[${MULTILIB_USEDEP}]
1394 - virtual/pkgconfig
1395 - || (
1396 - net-libs/rpcsvc-proto
1397 - <sys-libs/glibc-2.26[rpc(+)]
1398 - )
1399 - test? (
1400 - !system-mitkrb5? (
1401 - >=sys-libs/nss_wrapper-1.1.3
1402 - >=net-dns/resolv_wrapper-1.1.4
1403 - >=net-libs/socket_wrapper-1.1.9
1404 - >=sys-libs/uid_wrapper-1.2.1
1405 - )
1406 - )"
1407 -RDEPEND="${CDEPEND}
1408 - python? ( ${PYTHON_DEPS} )
1409 - client? ( net-fs/cifs-utils[ads?] )
1410 - selinux? ( sec-policy/selinux-samba )
1411 - !dev-perl/Parse-Yapp
1412 -"
1413 -
1414 -REQUIRED_USE="
1415 - addc? ( python json winbind )
1416 - addns? ( python )
1417 - ads? ( acl ldap winbind )
1418 - cluster? ( ads )
1419 - gpg? ( addc )
1420 - test? ( python )
1421 - ?? ( system-heimdal system-mitkrb5 )
1422 - ${PYTHON_REQUIRED_USE}
1423 -"
1424 -
1425 -# the test suite is messed, it uses system-installed samba
1426 -# bits instead of what was built, tests things disabled via use
1427 -# flags, and generally just fails to work in a way ebuilds could
1428 -# rely on in its current state
1429 -RESTRICT="test"
1430 -
1431 -S="${WORKDIR}/${MY_P}"
1432 -
1433 -PATCHES=(
1434 - "${FILESDIR}/${PN}-4.4.0-pam.patch"
1435 - "${FILESDIR}/${PN}-4.9.2-timespec.patch"
1436 -)
1437 -
1438 -#CONFDIR="${FILESDIR}/$(get_version_component_range 1-2)"
1439 -CONFDIR="${FILESDIR}/4.4"
1440 -
1441 -WAF_BINARY="${S}/buildtools/bin/waf"
1442 -
1443 -SHAREDMODS=""
1444 -
1445 -pkg_setup() {
1446 - python-single-r1_pkg_setup
1447 - if use cluster ; then
1448 - SHAREDMODS="idmap_rid,idmap_tdb2,idmap_ad"
1449 - elif use ads ; then
1450 - SHAREDMODS="idmap_ad"
1451 - fi
1452 -}
1453 -
1454 -src_prepare() {
1455 - default
1456 -
1457 - # un-bundle dnspython
1458 - sed -i -e '/"dns.resolver":/d' "${S}"/third_party/wscript || die
1459 -
1460 - # unbundle iso8601 unless tests are enabled
1461 - if ! use test ; then
1462 - sed -i -e '/"iso8601":/d' "${S}"/third_party/wscript || die
1463 - fi
1464 -
1465 - # ugly hackaround for bug #592502
1466 - cp /usr/include/tevent_internal.h "${S}"/lib/tevent/ || die
1467 -
1468 - sed -e 's:<gpgme\.h>:<gpgme/gpgme.h>:' \
1469 - -i source4/dsdb/samdb/ldb_modules/password_hash.c \
1470 - || die
1471 -
1472 - # Friggin' WAF shit
1473 - multilib_copy_sources
1474 -}
1475 -
1476 -multilib_src_configure() {
1477 - # when specifying libs for samba build you must append NONE to the end to
1478 - # stop it automatically including things
1479 - local bundled_libs="NONE"
1480 - if ! use system-heimdal && ! use system-mitkrb5 ; then
1481 - bundled_libs="heimbase,heimntlm,hdb,kdc,krb5,wind,gssapi,hcrypto,hx509,roken,asn1,com_err,NONE"
1482 - fi
1483 -
1484 - local myconf=(
1485 - --enable-fhs
1486 - --sysconfdir="${EPREFIX}/etc"
1487 - --localstatedir="${EPREFIX}/var"
1488 - --with-modulesdir="${EPREFIX}/usr/$(get_libdir)/samba"
1489 - --with-piddir="${EPREFIX}/run/${PN}"
1490 - --bundled-libraries="${bundled_libs}"
1491 - --builtin-libraries=NONE
1492 - --disable-rpath
1493 - --disable-rpath-install
1494 - --nopyc
1495 - --nopyo
1496 - $(multilib_native_use_with acl acl-support)
1497 - $(multilib_native_usex addc '' '--without-ad-dc')
1498 - $(multilib_native_use_with addns dnsupdate)
1499 - $(multilib_native_use_with ads)
1500 - $(multilib_native_use_enable ceph cephfs)
1501 - $(multilib_native_use_with cluster cluster-support)
1502 - $(multilib_native_use_enable cups)
1503 - $(multilib_native_use_with dmapi)
1504 - $(multilib_native_use_with fam)
1505 - $(multilib_native_use_with gpg gpgme)
1506 - $(multilib_native_use_with json)
1507 - $(multilib_native_use_enable iprint)
1508 - $(multilib_native_use_with pam)
1509 - $(multilib_native_usex pam "--with-pammodulesdir=${EPREFIX}/$(get_libdir)/security" '')
1510 - $(multilib_native_use_with quota quotas)
1511 - $(multilib_native_use_with syslog)
1512 - $(multilib_native_use_with systemd)
1513 - $(multilib_native_use_with winbind)
1514 - $(multilib_native_usex python '' '--disable-python')
1515 - $(multilib_native_use_enable zeroconf avahi)
1516 - $(multilib_native_usex test '--enable-selftest' '')
1517 - $(usex system-mitkrb5 "--with-system-mitkrb5 $(multilib_native_usex addc --with-experimental-mit-ad-dc '')" '')
1518 - $(use_with debug lttng)
1519 - $(use_with ldap)
1520 - $(use_with profiling-data)
1521 - )
1522 -
1523 - multilib_is_native_abi && myconf+=( --with-shared-modules=${SHAREDMODS} )
1524 -
1525 - CPPFLAGS="-I${SYSROOT}${EPREFIX}/usr/include/et ${CPPFLAGS}" \
1526 - waf-utils_src_configure ${myconf[@]}
1527 -}
1528 -
1529 -multilib_src_compile() {
1530 - waf-utils_src_compile
1531 -}
1532 -
1533 -multilib_src_install() {
1534 - waf-utils_src_install
1535 -
1536 - # Make all .so files executable
1537 - find "${ED}" -type f -name "*.so" -exec chmod +x {} + || die
1538 -
1539 - if multilib_is_native_abi ; then
1540 - # install ldap schema for server (bug #491002)
1541 - if use ldap ; then
1542 - insinto /etc/openldap/schema
1543 - doins examples/LDAP/samba.schema
1544 - fi
1545 -
1546 - # create symlink for cups (bug #552310)
1547 - if use cups ; then
1548 - dosym ../../../bin/smbspool /usr/libexec/cups/backend/smb
1549 - fi
1550 -
1551 - # install example config file
1552 - insinto /etc/samba
1553 - doins examples/smb.conf.default
1554 -
1555 - # Fix paths in example file (#603964)
1556 - sed \
1557 - -e '/log file =/s@/usr/local/samba/var/@/var/log/samba/@' \
1558 - -e '/include =/s@/usr/local/samba/lib/@/etc/samba/@' \
1559 - -e '/path =/s@/usr/local/samba/lib/@/var/lib/samba/@' \
1560 - -e '/path =/s@/usr/local/samba/@/var/lib/samba/@' \
1561 - -e '/path =/s@/usr/spool/samba@/var/spool/samba@' \
1562 - -i "${ED%/}"/etc/samba/smb.conf.default || die
1563 -
1564 - # Install init script and conf.d file
1565 - newinitd "${CONFDIR}/samba4.initd-r1" samba
1566 - newconfd "${CONFDIR}/samba4.confd" samba
1567 -
1568 - systemd_dotmpfilesd "${FILESDIR}"/samba.conf
1569 - systemd_dounit "${FILESDIR}"/nmbd.service
1570 - systemd_dounit "${FILESDIR}"/smbd.{service,socket}
1571 - systemd_newunit "${FILESDIR}"/smbd_at.service 'smbd@.service'
1572 - systemd_dounit "${FILESDIR}"/winbindd.service
1573 - systemd_dounit "${FILESDIR}"/samba.service
1574 - fi
1575 -
1576 - if use pam && use winbind ; then
1577 - newpamd "${CONFDIR}/system-auth-winbind.pam" system-auth-winbind
1578 - # bugs #376853 and #590374
1579 - insinto /etc/security
1580 - doins examples/pam_winbind/pam_winbind.conf
1581 - fi
1582 -
1583 - keepdir /var/cache/samba
1584 - keepdir /var/lib/ctdb
1585 - keepdir /var/lib/samba/{bind-dns,private}
1586 - keepdir /var/lock/samba
1587 - keepdir /var/log/samba
1588 - keepdir /var/run/{ctdb,samba}
1589 -}
1590 -
1591 -multilib_src_install_all() {
1592 - # Attempt to fix bug #673168
1593 - find "${ED}" -type d -name "Yapp" -print0 \
1594 - | xargs -0 --no-run-if-empty rm -r || die
1595 -}
1596 -
1597 -multilib_src_test() {
1598 - if multilib_is_native_abi ; then
1599 - "${WAF_BINARY}" test || die "test failed"
1600 - fi
1601 -}
1602 -
1603 -pkg_postinst() {
1604 - ewarn "Be aware that this release contains the best of all of Samba's"
1605 - ewarn "technology parts, both a file server (that you can reasonably expect"
1606 - ewarn "to upgrade existing Samba 3.x releases to) and the AD domain"
1607 - ewarn "controller work previously known as 'samba4'."
1608 -
1609 - elog "For further information and migration steps make sure to read "
1610 - elog "https://samba.org/samba/history/${P}.html "
1611 - elog "https://wiki.samba.org/index.php/Samba4/HOWTO "
1612 -}
1613
1614 diff --git a/net-fs/samba/samba-4.11.6.ebuild b/net-fs/samba/samba-4.11.6.ebuild
1615 deleted file mode 100644
1616 index 7914bd6929b..00000000000
1617 --- a/net-fs/samba/samba-4.11.6.ebuild
1618 +++ /dev/null
1619 @@ -1,313 +0,0 @@
1620 -# Copyright 1999-2020 Gentoo Authors
1621 -# Distributed under the terms of the GNU General Public License v2
1622 -
1623 -EAPI=6
1624 -PYTHON_COMPAT=( python3_{6,7} )
1625 -PYTHON_REQ_USE='threads(+),xml(+)'
1626 -
1627 -inherit python-single-r1 waf-utils multilib-minimal linux-info systemd pam
1628 -
1629 -MY_PV="${PV/_rc/rc}"
1630 -MY_P="${PN}-${MY_PV}"
1631 -
1632 -SRC_PATH="stable"
1633 -[[ ${PV} = *_rc* ]] && SRC_PATH="rc"
1634 -
1635 -SRC_URI="mirror://samba/${SRC_PATH}/${MY_P}.tar.gz"
1636 -[[ ${PV} = *_rc* ]] || \
1637 -KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86"
1638 -
1639 -DESCRIPTION="Samba Suite Version 4"
1640 -HOMEPAGE="https://www.samba.org/"
1641 -LICENSE="GPL-3"
1642 -
1643 -SLOT="0"
1644 -
1645 -IUSE="acl addc addns ads ceph client cluster cups debug dmapi fam gpg iprint
1646 -json ldap pam profiling-data python quota selinux syslog system-heimdal
1647 -+system-mitkrb5 systemd test winbind zeroconf"
1648 -
1649 -MULTILIB_WRAPPED_HEADERS=(
1650 - /usr/include/samba-4.0/policy.h
1651 - /usr/include/samba-4.0/dcerpc_server.h
1652 - /usr/include/samba-4.0/ctdb.h
1653 - /usr/include/samba-4.0/ctdb_client.h
1654 - /usr/include/samba-4.0/ctdb_protocol.h
1655 - /usr/include/samba-4.0/ctdb_private.h
1656 - /usr/include/samba-4.0/ctdb_typesafe_cb.h
1657 - /usr/include/samba-4.0/ctdb_version.h
1658 -)
1659 -
1660 -# sys-apps/attr is an automagic dependency (see bug #489748)
1661 -CDEPEND="
1662 - >=app-arch/libarchive-3.1.2[${MULTILIB_USEDEP}]
1663 - dev-lang/perl:=
1664 - dev-libs/libaio[${MULTILIB_USEDEP}]
1665 - dev-libs/libbsd[${MULTILIB_USEDEP}]
1666 - dev-libs/libgcrypt:0
1667 - dev-libs/iniparser:0
1668 - dev-libs/popt[${MULTILIB_USEDEP}]
1669 - >=dev-util/cmocka-1.1.1[${MULTILIB_USEDEP}]
1670 - >=net-libs/gnutls-3.2.0
1671 - net-libs/libnsl:=[${MULTILIB_USEDEP}]
1672 - sys-apps/attr[${MULTILIB_USEDEP}]
1673 - >=sys-libs/ldb-2.0.8[ldap(+)?,python?,${PYTHON_SINGLE_USEDEP},${MULTILIB_USEDEP}]
1674 - <sys-libs/ldb-2.2.0[ldap(+)?,python?,${PYTHON_SINGLE_USEDEP},${MULTILIB_USEDEP}]
1675 - sys-libs/libcap
1676 - sys-libs/ncurses:0=[${MULTILIB_USEDEP}]
1677 - sys-libs/readline:0=
1678 - >=sys-libs/talloc-2.2.0[python?,${PYTHON_SINGLE_USEDEP},${MULTILIB_USEDEP}]
1679 - >=sys-libs/tdb-1.4.2[python?,${PYTHON_SINGLE_USEDEP},${MULTILIB_USEDEP}]
1680 - >=sys-libs/tevent-0.10.0[python?,${PYTHON_SINGLE_USEDEP},${MULTILIB_USEDEP}]
1681 - sys-libs/zlib[${MULTILIB_USEDEP}]
1682 - virtual/libiconv
1683 - pam? ( sys-libs/pam )
1684 - acl? ( virtual/acl )
1685 - $(python_gen_cond_dep "
1686 - dev-python/subunit[\${PYTHON_MULTI_USEDEP},${MULTILIB_USEDEP}]
1687 - addns? (
1688 - net-dns/bind-tools[gssapi]
1689 - dev-python/dnspython:=[\${PYTHON_MULTI_USEDEP}]
1690 - )
1691 - ")
1692 - ceph? ( sys-cluster/ceph )
1693 - cluster? (
1694 - net-libs/rpcsvc-proto
1695 - !dev-db/ctdb
1696 - )
1697 - cups? ( net-print/cups )
1698 - debug? ( dev-util/lttng-ust )
1699 - dmapi? ( sys-apps/dmapi )
1700 - fam? ( virtual/fam )
1701 - gpg? ( app-crypt/gpgme )
1702 - json? ( dev-libs/jansson )
1703 - ldap? ( net-nds/openldap[${MULTILIB_USEDEP}] )
1704 - system-heimdal? ( >=app-crypt/heimdal-1.5[-ssl,${MULTILIB_USEDEP}] )
1705 - system-mitkrb5? ( >=app-crypt/mit-krb5-1.15.1[${MULTILIB_USEDEP}] )
1706 - systemd? ( sys-apps/systemd:0= )
1707 - zeroconf? ( net-dns/avahi )
1708 -"
1709 -DEPEND="${CDEPEND}
1710 - ${PYTHON_DEPS}
1711 - app-text/docbook-xsl-stylesheets
1712 - dev-libs/libxslt
1713 - net-libs/libtirpc[${MULTILIB_USEDEP}]
1714 - virtual/pkgconfig
1715 - || (
1716 - net-libs/rpcsvc-proto
1717 - <sys-libs/glibc-2.26[rpc(+)]
1718 - )
1719 - test? (
1720 - !system-mitkrb5? (
1721 - >=sys-libs/nss_wrapper-1.1.3
1722 - >=net-dns/resolv_wrapper-1.1.4
1723 - >=net-libs/socket_wrapper-1.1.9
1724 - >=sys-libs/uid_wrapper-1.2.1
1725 - )
1726 - )"
1727 -RDEPEND="${CDEPEND}
1728 - python? ( ${PYTHON_DEPS} )
1729 - client? ( net-fs/cifs-utils[ads?] )
1730 - selinux? ( sec-policy/selinux-samba )
1731 - !dev-perl/Parse-Yapp
1732 -"
1733 -
1734 -REQUIRED_USE="
1735 - addc? ( python json winbind )
1736 - addns? ( python )
1737 - ads? ( acl ldap winbind )
1738 - cluster? ( ads )
1739 - gpg? ( addc )
1740 - test? ( python )
1741 - ?? ( system-heimdal system-mitkrb5 )
1742 - ${PYTHON_REQUIRED_USE}
1743 -"
1744 -
1745 -# the test suite is messed, it uses system-installed samba
1746 -# bits instead of what was built, tests things disabled via use
1747 -# flags, and generally just fails to work in a way ebuilds could
1748 -# rely on in its current state
1749 -RESTRICT="test"
1750 -
1751 -S="${WORKDIR}/${MY_P}"
1752 -
1753 -PATCHES=(
1754 - "${FILESDIR}/${PN}-4.4.0-pam.patch"
1755 - "${FILESDIR}/${PN}-4.9.2-timespec.patch"
1756 -)
1757 -
1758 -#CONFDIR="${FILESDIR}/$(get_version_component_range 1-2)"
1759 -CONFDIR="${FILESDIR}/4.4"
1760 -
1761 -WAF_BINARY="${S}/buildtools/bin/waf"
1762 -
1763 -SHAREDMODS=""
1764 -
1765 -pkg_setup() {
1766 - python-single-r1_pkg_setup
1767 - if use cluster ; then
1768 - SHAREDMODS="idmap_rid,idmap_tdb2,idmap_ad"
1769 - elif use ads ; then
1770 - SHAREDMODS="idmap_ad"
1771 - fi
1772 -}
1773 -
1774 -src_prepare() {
1775 - default
1776 -
1777 - # un-bundle dnspython
1778 - sed -i -e '/"dns.resolver":/d' "${S}"/third_party/wscript || die
1779 -
1780 - # unbundle iso8601 unless tests are enabled
1781 - if ! use test ; then
1782 - sed -i -e '/"iso8601":/d' "${S}"/third_party/wscript || die
1783 - fi
1784 -
1785 - # ugly hackaround for bug #592502
1786 - cp /usr/include/tevent_internal.h "${S}"/lib/tevent/ || die
1787 -
1788 - sed -e 's:<gpgme\.h>:<gpgme/gpgme.h>:' \
1789 - -i source4/dsdb/samdb/ldb_modules/password_hash.c \
1790 - || die
1791 -
1792 - # Friggin' WAF shit
1793 - multilib_copy_sources
1794 -}
1795 -
1796 -multilib_src_configure() {
1797 - # when specifying libs for samba build you must append NONE to the end to
1798 - # stop it automatically including things
1799 - local bundled_libs="NONE"
1800 - if ! use system-heimdal && ! use system-mitkrb5 ; then
1801 - bundled_libs="heimbase,heimntlm,hdb,kdc,krb5,wind,gssapi,hcrypto,hx509,roken,asn1,com_err,NONE"
1802 - fi
1803 -
1804 - local myconf=(
1805 - --enable-fhs
1806 - --sysconfdir="${EPREFIX}/etc"
1807 - --localstatedir="${EPREFIX}/var"
1808 - --with-modulesdir="${EPREFIX}/usr/$(get_libdir)/samba"
1809 - --with-piddir="${EPREFIX}/run/${PN}"
1810 - --bundled-libraries="${bundled_libs}"
1811 - --builtin-libraries=NONE
1812 - --disable-rpath
1813 - --disable-rpath-install
1814 - --nopyc
1815 - --nopyo
1816 - $(multilib_native_use_with acl acl-support)
1817 - $(multilib_native_usex addc '' '--without-ad-dc')
1818 - $(multilib_native_use_with addns dnsupdate)
1819 - $(multilib_native_use_with ads)
1820 - $(multilib_native_use_enable ceph cephfs)
1821 - $(multilib_native_use_with cluster cluster-support)
1822 - $(multilib_native_use_enable cups)
1823 - $(multilib_native_use_with dmapi)
1824 - $(multilib_native_use_with fam)
1825 - $(multilib_native_use_with gpg gpgme)
1826 - $(multilib_native_use_with json)
1827 - $(multilib_native_use_enable iprint)
1828 - $(multilib_native_use_with pam)
1829 - $(multilib_native_usex pam "--with-pammodulesdir=${EPREFIX}/$(get_libdir)/security" '')
1830 - $(multilib_native_use_with quota quotas)
1831 - $(multilib_native_use_with syslog)
1832 - $(multilib_native_use_with systemd)
1833 - $(multilib_native_use_with winbind)
1834 - $(multilib_native_usex python '' '--disable-python')
1835 - $(multilib_native_use_enable zeroconf avahi)
1836 - $(multilib_native_usex test '--enable-selftest' '')
1837 - $(usex system-mitkrb5 "--with-system-mitkrb5 $(multilib_native_usex addc --with-experimental-mit-ad-dc '')" '')
1838 - $(use_with debug lttng)
1839 - $(use_with ldap)
1840 - $(use_with profiling-data)
1841 - )
1842 -
1843 - multilib_is_native_abi && myconf+=( --with-shared-modules=${SHAREDMODS} )
1844 -
1845 - CPPFLAGS="-I${SYSROOT}${EPREFIX}/usr/include/et ${CPPFLAGS}" \
1846 - waf-utils_src_configure ${myconf[@]}
1847 -}
1848 -
1849 -multilib_src_compile() {
1850 - waf-utils_src_compile
1851 -}
1852 -
1853 -multilib_src_install() {
1854 - waf-utils_src_install
1855 -
1856 - # Make all .so files executable
1857 - find "${ED}" -type f -name "*.so" -exec chmod +x {} + || die
1858 -
1859 - if multilib_is_native_abi ; then
1860 - # install ldap schema for server (bug #491002)
1861 - if use ldap ; then
1862 - insinto /etc/openldap/schema
1863 - doins examples/LDAP/samba.schema
1864 - fi
1865 -
1866 - # create symlink for cups (bug #552310)
1867 - if use cups ; then
1868 - dosym ../../../bin/smbspool /usr/libexec/cups/backend/smb
1869 - fi
1870 -
1871 - # install example config file
1872 - insinto /etc/samba
1873 - doins examples/smb.conf.default
1874 -
1875 - # Fix paths in example file (#603964)
1876 - sed \
1877 - -e '/log file =/s@/usr/local/samba/var/@/var/log/samba/@' \
1878 - -e '/include =/s@/usr/local/samba/lib/@/etc/samba/@' \
1879 - -e '/path =/s@/usr/local/samba/lib/@/var/lib/samba/@' \
1880 - -e '/path =/s@/usr/local/samba/@/var/lib/samba/@' \
1881 - -e '/path =/s@/usr/spool/samba@/var/spool/samba@' \
1882 - -i "${ED%/}"/etc/samba/smb.conf.default || die
1883 -
1884 - # Install init script and conf.d file
1885 - newinitd "${CONFDIR}/samba4.initd-r1" samba
1886 - newconfd "${CONFDIR}/samba4.confd" samba
1887 -
1888 - systemd_dotmpfilesd "${FILESDIR}"/samba.conf
1889 - systemd_dounit "${FILESDIR}"/nmbd.service
1890 - systemd_dounit "${FILESDIR}"/smbd.{service,socket}
1891 - systemd_newunit "${FILESDIR}"/smbd_at.service 'smbd@.service'
1892 - systemd_dounit "${FILESDIR}"/winbindd.service
1893 - systemd_dounit "${FILESDIR}"/samba.service
1894 - fi
1895 -
1896 - if use pam && use winbind ; then
1897 - newpamd "${CONFDIR}/system-auth-winbind.pam" system-auth-winbind
1898 - # bugs #376853 and #590374
1899 - insinto /etc/security
1900 - doins examples/pam_winbind/pam_winbind.conf
1901 - fi
1902 -
1903 - keepdir /var/cache/samba
1904 - keepdir /var/lib/ctdb
1905 - keepdir /var/lib/samba/{bind-dns,private}
1906 - keepdir /var/lock/samba
1907 - keepdir /var/log/samba
1908 - keepdir /var/run/{ctdb,samba}
1909 -}
1910 -
1911 -multilib_src_install_all() {
1912 - # Attempt to fix bug #673168
1913 - find "${ED}" -type d -name "Yapp" -print0 \
1914 - | xargs -0 --no-run-if-empty rm -r || die
1915 -}
1916 -
1917 -multilib_src_test() {
1918 - if multilib_is_native_abi ; then
1919 - "${WAF_BINARY}" test || die "test failed"
1920 - fi
1921 -}
1922 -
1923 -pkg_postinst() {
1924 - ewarn "Be aware that this release contains the best of all of Samba's"
1925 - ewarn "technology parts, both a file server (that you can reasonably expect"
1926 - ewarn "to upgrade existing Samba 3.x releases to) and the AD domain"
1927 - ewarn "controller work previously known as 'samba4'."
1928 -
1929 - elog "For further information and migration steps make sure to read "
1930 - elog "https://samba.org/samba/history/${P}.html "
1931 - elog "https://wiki.samba.org/index.php/Samba4/HOWTO "
1932 -}
1933
1934 diff --git a/net-fs/samba/samba-4.5.16-r1.ebuild b/net-fs/samba/samba-4.5.16-r1.ebuild
1935 deleted file mode 100644
1936 index 8ec36b988f8..00000000000
1937 --- a/net-fs/samba/samba-4.5.16-r1.ebuild
1938 +++ /dev/null
1939 @@ -1,297 +0,0 @@
1940 -# Copyright 1999-2020 Gentoo Authors
1941 -# Distributed under the terms of the GNU General Public License v2
1942 -
1943 -EAPI=6
1944 -PYTHON_COMPAT=( python2_7 )
1945 -PYTHON_REQ_USE='threads(+),xml(+)'
1946 -
1947 -inherit python-single-r1 waf-utils multilib-minimal linux-info systemd eutils
1948 -
1949 -MY_PV="${PV/_rc/rc}"
1950 -MY_P="${PN}-${MY_PV}"
1951 -
1952 -SRC_PATH="stable"
1953 -[[ ${PV} = *_rc* ]] && SRC_PATH="rc"
1954 -
1955 -SRC_URI="mirror://samba/${SRC_PATH}/${MY_P}.tar.gz
1956 - https://dev.gentoo.org/~polynomial-c/samba-4.5.11-disable-python-patches.tar.xz"
1957 -[[ ${PV} = *_rc* ]] || \
1958 -KEYWORDS="~alpha amd64 arm ~arm64 ~hppa ia64 ppc ppc64 sparc x86"
1959 -
1960 -DESCRIPTION="Samba Suite Version 4"
1961 -HOMEPAGE="https://www.samba.org/"
1962 -LICENSE="GPL-3"
1963 -
1964 -SLOT="0"
1965 -
1966 -IUSE="acl addc addns ads client cluster cups dmapi fam gnutls gpg iprint ldap pam
1967 -quota selinux syslog system-heimdal +system-mitkrb5 systemd test winbind zeroconf"
1968 -
1969 -# the test suite is messed, it uses system-installed samba
1970 -# bits instead of what was built, tests things disabled via use
1971 -# flags, and generally just fails to work in a way ebuilds could
1972 -# rely on in its current state
1973 -RESTRICT="test"
1974 -
1975 -MULTILIB_WRAPPED_HEADERS=(
1976 - /usr/include/samba-4.0/policy.h
1977 - /usr/include/samba-4.0/dcerpc_server.h
1978 - /usr/include/samba-4.0/ctdb.h
1979 - /usr/include/samba-4.0/ctdb_client.h
1980 - /usr/include/samba-4.0/ctdb_protocol.h
1981 - /usr/include/samba-4.0/ctdb_private.h
1982 - /usr/include/samba-4.0/ctdb_typesafe_cb.h
1983 - /usr/include/samba-4.0/ctdb_version.h
1984 -)
1985 -
1986 -# sys-apps/attr is an automagic dependency (see bug #489748)
1987 -CDEPEND="${PYTHON_DEPS}
1988 - >=app-arch/libarchive-3.1.2[${MULTILIB_USEDEP}]
1989 - dev-lang/perl:=
1990 - dev-libs/libaio[${MULTILIB_USEDEP}]
1991 - dev-libs/libbsd[${MULTILIB_USEDEP}]
1992 - dev-libs/iniparser:0
1993 - dev-libs/popt[${MULTILIB_USEDEP}]
1994 - $(python_gen_cond_dep "
1995 - dev-python/subunit[\${PYTHON_MULTI_USEDEP},${MULTILIB_USEDEP}]
1996 - ")
1997 - net-libs/libnsl:=[${MULTILIB_USEDEP}]
1998 - sys-apps/attr[${MULTILIB_USEDEP}]
1999 - >=sys-libs/ldb-1.1.27[ldap(+)?,python(+),${MULTILIB_USEDEP}]
2000 - <sys-libs/ldb-1.1.30[ldap(+)?,python(+),${MULTILIB_USEDEP}]
2001 - sys-libs/libcap
2002 - sys-libs/ncurses:0=[${MULTILIB_USEDEP}]
2003 - sys-libs/readline:0=
2004 - >=sys-libs/talloc-2.1.8[python,${PYTHON_SINGLE_USEDEP},${MULTILIB_USEDEP}]
2005 - >=sys-libs/tdb-1.3.10[python,${PYTHON_SINGLE_USEDEP},${MULTILIB_USEDEP}]
2006 - >=sys-libs/tevent-0.9.31-r1[${MULTILIB_USEDEP}]
2007 - sys-libs/zlib[${MULTILIB_USEDEP}]
2008 - virtual/libiconv
2009 - pam? ( sys-libs/pam )
2010 - acl? ( virtual/acl )
2011 - addns? ( net-dns/bind-tools[gssapi] )
2012 - cluster? (
2013 - net-libs/rpcsvc-proto
2014 - !dev-db/ctdb
2015 - )
2016 - cups? ( net-print/cups )
2017 - dmapi? ( sys-apps/dmapi )
2018 - fam? ( virtual/fam )
2019 - gnutls? (
2020 - dev-libs/libgcrypt:0
2021 - >=net-libs/gnutls-1.4.0
2022 - )
2023 - gpg? ( app-crypt/gpgme )
2024 - ldap? ( net-nds/openldap[${MULTILIB_USEDEP}] )
2025 - system-heimdal? ( >=app-crypt/heimdal-1.5[-ssl,${MULTILIB_USEDEP}] )
2026 - system-mitkrb5? ( app-crypt/mit-krb5[${MULTILIB_USEDEP}] )
2027 - systemd? ( sys-apps/systemd:0= )
2028 - zeroconf? ( net-dns/avahi )"
2029 -DEPEND="${CDEPEND}
2030 - app-text/docbook-xsl-stylesheets
2031 - dev-libs/libxslt
2032 - virtual/pkgconfig
2033 - test? (
2034 - >=sys-libs/nss_wrapper-1.1.3
2035 - >=net-dns/resolv_wrapper-1.1.4
2036 - >=net-libs/socket_wrapper-1.1.7
2037 - >=sys-libs/uid_wrapper-1.2.1
2038 - )"
2039 -RDEPEND="${CDEPEND}
2040 - client? ( net-fs/cifs-utils[ads?] )
2041 - selinux? ( sec-policy/selinux-samba )
2042 - !dev-perl/Parse-Yapp
2043 -"
2044 -
2045 -REQUIRED_USE="
2046 - addc? ( gnutls !system-mitkrb5 )
2047 - ads? ( acl gnutls ldap )
2048 - cluster? ( ads )
2049 - gpg? ( addc )
2050 - ?? ( system-heimdal system-mitkrb5 )
2051 - ${PYTHON_REQUIRED_USE}"
2052 -
2053 -S="${WORKDIR}/${MY_P}"
2054 -
2055 -PATCHES=(
2056 - "${FILESDIR}/${PN}-4.4.0-pam.patch"
2057 - "${FILESDIR}/${PN}-4.5.1-compile_et_fix.patch"
2058 - "${FILESDIR}/${PN}-glibc-2.26-no_rpc.patch" #637320
2059 -)
2060 -
2061 -#CONFDIR="${FILESDIR}/$(get_version_component_range 1-2)"
2062 -CONFDIR="${FILESDIR}/4.4"
2063 -
2064 -WAF_BINARY="${S}/buildtools/bin/waf"
2065 -
2066 -SHAREDMODS=""
2067 -
2068 -pkg_setup() {
2069 - python-single-r1_pkg_setup
2070 - if use cluster ; then
2071 - SHAREDMODS="idmap_rid,idmap_tdb2,idmap_ad"
2072 - elif use ads ; then
2073 - SHAREDMODS="idmap_ad"
2074 - fi
2075 -}
2076 -
2077 -src_prepare() {
2078 - default
2079 -
2080 - # install the patches from tarball(s)
2081 - eapply "${WORKDIR}/patches"
2082 -
2083 - # ugly hackaround for bug #592502
2084 - cp /usr/include/tevent_internal.h "${S}"/lib/tevent/ || die
2085 -
2086 - sed -e 's:<gpgme\.h>:<gpgme/gpgme.h>:' \
2087 - -i source4/dsdb/samdb/ldb_modules/password_hash.c \
2088 - || die
2089 -
2090 - # Friggin' WAF shit
2091 - multilib_copy_sources
2092 -}
2093 -
2094 -multilib_src_configure() {
2095 - # when specifying libs for samba build you must append NONE to the end to
2096 - # stop it automatically including things
2097 - local bundled_libs="NONE"
2098 - if ! use system-heimdal && ! use system-mitkrb5 ; then
2099 - bundled_libs="heimbase,heimntlm,hdb,kdc,krb5,wind,gssapi,hcrypto,hx509,roken,asn1,com_err,NONE"
2100 - fi
2101 -
2102 - local myconf=()
2103 - myconf=(
2104 - --enable-fhs
2105 - --sysconfdir="${EPREFIX}/etc"
2106 - --localstatedir="${EPREFIX}/var"
2107 - --with-modulesdir="${EPREFIX}/usr/$(get_libdir)/samba"
2108 - --with-piddir="${EPREFIX}/run/${PN}"
2109 - --without-lttng
2110 - --bundled-libraries="${bundled_libs}"
2111 - --builtin-libraries=NONE
2112 - --disable-rpath
2113 - --disable-rpath-install
2114 - --nopyc
2115 - --nopyo
2116 - --disable-cephfs
2117 - )
2118 - if multilib_is_native_abi ; then
2119 - myconf+=(
2120 - $(use_with acl acl-support)
2121 - $(usex addc '' '--without-ad-dc')
2122 - $(use_with addns dnsupdate)
2123 - $(use_with ads)
2124 - $(use_with cluster cluster-support)
2125 - $(use_enable cups)
2126 - $(use_with dmapi)
2127 - $(use_with fam)
2128 - $(use_enable gnutls)
2129 - $(use_with gpg gpgme)
2130 - $(use_enable iprint)
2131 - $(use_with ldap)
2132 - $(use_with pam)
2133 - $(usex pam "--with-pammodulesdir=${EPREFIX}/$(get_libdir)/security" '')
2134 - $(use_with quota quotas)
2135 - $(use_with syslog)
2136 - $(use_with systemd)
2137 - $(usex system-mitkrb5 '--with-system-mitkrb5' '')
2138 - $(use_with winbind)
2139 - $(usex test '--enable-selftest' '')
2140 - $(use_enable zeroconf avahi)
2141 - --with-shared-modules=${SHAREDMODS}
2142 - )
2143 - else
2144 - myconf+=(
2145 - --without-acl-support
2146 - --without-ad-dc
2147 - --without-dnsupdate
2148 - --without-ads
2149 - --disable-avahi
2150 - --without-cluster-support
2151 - --disable-cups
2152 - --without-dmapi
2153 - --without-fam
2154 - --disable-gnutls
2155 - --without-gpgme
2156 - --disable-iprint
2157 - $(use_with ldap)
2158 - --without-pam
2159 - --without-quotas
2160 - --without-syslog
2161 - --without-systemd
2162 - $(usex system-mitkrb5 '--with-system-mitkrb5' '')
2163 - --without-winbind
2164 - --disable-python
2165 - )
2166 - fi
2167 -
2168 - CPPFLAGS="-I${SYSROOT}${EPREFIX}/usr/include/et ${CPPFLAGS}" \
2169 - waf-utils_src_configure ${myconf[@]}
2170 -}
2171 -
2172 -multilib_src_compile() {
2173 - waf-utils_src_compile
2174 -}
2175 -
2176 -multilib_src_install() {
2177 - waf-utils_src_install
2178 -
2179 - # Make all .so files executable
2180 - find "${D}" -type f -name "*.so" -exec chmod +x {} +
2181 -
2182 - if multilib_is_native_abi; then
2183 - # install ldap schema for server (bug #491002)
2184 - if use ldap ; then
2185 - insinto /etc/openldap/schema
2186 - doins examples/LDAP/samba.schema
2187 - fi
2188 -
2189 - # create symlink for cups (bug #552310)
2190 - if use cups ; then
2191 - dosym ../../../bin/smbspool /usr/libexec/cups/backend/smb
2192 - fi
2193 -
2194 - # install example config file
2195 - insinto /etc/samba
2196 - doins examples/smb.conf.default
2197 -
2198 - # Fix paths in example file (#603964)
2199 - sed \
2200 - -e '/log file =/s@/usr/local/samba/var/@/var/log/samba/@' \
2201 - -e '/include =/s@/usr/local/samba/lib/@/etc/samba/@' \
2202 - -e '/path =/s@/usr/local/samba/lib/@/var/lib/samba/@' \
2203 - -e '/path =/s@/usr/local/samba/@/var/lib/samba/@' \
2204 - -e '/path =/s@/usr/spool/samba@/var/spool/samba@' \
2205 - -i "${ED%/}"/etc/samba/smb.conf.default || die
2206 -
2207 - # Install init script and conf.d file
2208 - newinitd "${CONFDIR}/samba4.initd-r1" samba
2209 - newconfd "${CONFDIR}/samba4.confd" samba
2210 -
2211 - systemd_dotmpfilesd "${FILESDIR}"/samba.conf
2212 - systemd_dounit "${FILESDIR}"/nmbd.service
2213 - systemd_dounit "${FILESDIR}"/smbd.{service,socket}
2214 - systemd_newunit "${FILESDIR}"/smbd_at.service 'smbd@.service'
2215 - systemd_dounit "${FILESDIR}"/winbindd.service
2216 - systemd_dounit "${FILESDIR}"/samba.service
2217 - fi
2218 -}
2219 -
2220 -multilib_src_test() {
2221 - if multilib_is_native_abi ; then
2222 - "${WAF_BINARY}" test || die "test failed"
2223 - fi
2224 -}
2225 -
2226 -pkg_postinst() {
2227 - ewarn "Be aware that this release contains the best of all of Samba's"
2228 - ewarn "technology parts, both a file server (that you can reasonably expect"
2229 - ewarn "to upgrade existing Samba 3.x releases to) and the AD domain"
2230 - ewarn "controller work previously known as 'samba4'."
2231 -
2232 - elog "For further information and migration steps make sure to read "
2233 - elog "https://samba.org/samba/history/${P}.html "
2234 - elog "https://samba.org/samba/history/${PN}-4.5.0.html and"
2235 - elog "https://wiki.samba.org/index.php/Samba4/HOWTO "
2236 -}
2237
2238 diff --git a/net-fs/samba/samba-4.8.12.ebuild b/net-fs/samba/samba-4.8.12.ebuild
2239 deleted file mode 100644
2240 index ea9d19f2b3f..00000000000
2241 --- a/net-fs/samba/samba-4.8.12.ebuild
2242 +++ /dev/null
2243 @@ -1,306 +0,0 @@
2244 -# Copyright 1999-2020 Gentoo Authors
2245 -# Distributed under the terms of the GNU General Public License v2
2246 -
2247 -EAPI=6
2248 -PYTHON_COMPAT=( python2_7 )
2249 -PYTHON_REQ_USE='threads(+),xml(+)'
2250 -
2251 -inherit python-single-r1 waf-utils multilib-minimal linux-info systemd pam
2252 -
2253 -MY_PV="${PV/_rc/rc}"
2254 -MY_P="${PN}-${MY_PV}"
2255 -
2256 -SRC_PATH="stable"
2257 -[[ ${PV} = *_rc* ]] && SRC_PATH="rc"
2258 -
2259 -SRC_URI="mirror://samba/${SRC_PATH}/${MY_P}.tar.gz"
2260 -[[ ${PV} = *_rc* ]] || \
2261 -KEYWORDS="~alpha ~amd64 ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86"
2262 -
2263 -DESCRIPTION="Samba Suite Version 4"
2264 -HOMEPAGE="https://www.samba.org/"
2265 -LICENSE="GPL-3"
2266 -
2267 -SLOT="0"
2268 -
2269 -IUSE="acl addc addns ads ceph client cluster cups debug dmapi fam gnutls gpg
2270 -iprint ldap pam profiling-data python quota selinux syslog system-heimdal
2271 -+system-mitkrb5 systemd test winbind zeroconf"
2272 -
2273 -MULTILIB_WRAPPED_HEADERS=(
2274 - /usr/include/samba-4.0/policy.h
2275 - /usr/include/samba-4.0/dcerpc_server.h
2276 - /usr/include/samba-4.0/ctdb.h
2277 - /usr/include/samba-4.0/ctdb_client.h
2278 - /usr/include/samba-4.0/ctdb_protocol.h
2279 - /usr/include/samba-4.0/ctdb_private.h
2280 - /usr/include/samba-4.0/ctdb_typesafe_cb.h
2281 - /usr/include/samba-4.0/ctdb_version.h
2282 -)
2283 -
2284 -# sys-apps/attr is an automagic dependency (see bug #489748)
2285 -CDEPEND="
2286 - >=app-arch/libarchive-3.1.2[${MULTILIB_USEDEP}]
2287 - dev-lang/perl:=
2288 - dev-libs/libaio[${MULTILIB_USEDEP}]
2289 - dev-libs/libbsd[${MULTILIB_USEDEP}]
2290 - dev-libs/iniparser:0
2291 - dev-libs/popt[${MULTILIB_USEDEP}]
2292 - >=dev-util/cmocka-1.1.1[${MULTILIB_USEDEP}]
2293 - net-libs/libnsl:=[${MULTILIB_USEDEP}]
2294 - sys-apps/attr[${MULTILIB_USEDEP}]
2295 - >=sys-libs/ldb-1.3.8[ldap(+)?,python?,${PYTHON_SINGLE_USEDEP},${MULTILIB_USEDEP}]
2296 - <sys-libs/ldb-1.4.0[ldap(+)?,python?,${PYTHON_SINGLE_USEDEP},${MULTILIB_USEDEP}]
2297 - sys-libs/libcap
2298 - sys-libs/ncurses:0=[${MULTILIB_USEDEP}]
2299 - sys-libs/readline:0=
2300 - >=sys-libs/talloc-2.1.11[python?,${PYTHON_SINGLE_USEDEP},${MULTILIB_USEDEP}]
2301 - >=sys-libs/tdb-1.3.15[python?,${PYTHON_SINGLE_USEDEP},${MULTILIB_USEDEP}]
2302 - >=sys-libs/tevent-0.9.36[python?,${PYTHON_SINGLE_USEDEP},${MULTILIB_USEDEP}]
2303 - sys-libs/zlib[${MULTILIB_USEDEP}]
2304 - virtual/libiconv
2305 - pam? ( sys-libs/pam )
2306 - acl? ( virtual/acl )
2307 - $(python_gen_cond_dep "
2308 - dev-python/subunit[\${PYTHON_MULTI_USEDEP},${MULTILIB_USEDEP}]
2309 - addns? (
2310 - net-dns/bind-tools[gssapi]
2311 - dev-python/dnspython:=[\${PYTHON_MULTI_USEDEP}]
2312 - )
2313 - ")
2314 - ceph? ( sys-cluster/ceph )
2315 - cluster? (
2316 - net-libs/rpcsvc-proto
2317 - !dev-db/ctdb
2318 - )
2319 - cups? ( net-print/cups )
2320 - debug? ( dev-util/lttng-ust )
2321 - dmapi? ( sys-apps/dmapi )
2322 - fam? ( virtual/fam )
2323 - gnutls? (
2324 - dev-libs/libgcrypt:0
2325 - >=net-libs/gnutls-1.4.0
2326 - )
2327 - gpg? ( app-crypt/gpgme )
2328 - ldap? ( net-nds/openldap[${MULTILIB_USEDEP}] )
2329 - system-heimdal? ( >=app-crypt/heimdal-1.5[-ssl,${MULTILIB_USEDEP}] )
2330 - system-mitkrb5? ( >=app-crypt/mit-krb5-1.15.1[${MULTILIB_USEDEP}] )
2331 - systemd? ( sys-apps/systemd:0= )
2332 - zeroconf? ( net-dns/avahi )
2333 -"
2334 -DEPEND="${CDEPEND}
2335 - ${PYTHON_DEPS}
2336 - app-text/docbook-xsl-stylesheets
2337 - dev-libs/libxslt
2338 - net-libs/libtirpc[${MULTILIB_USEDEP}]
2339 - virtual/pkgconfig
2340 - || (
2341 - net-libs/rpcsvc-proto
2342 - <sys-libs/glibc-2.26[rpc(+)]
2343 - )
2344 - test? (
2345 - !system-mitkrb5? (
2346 - >=sys-libs/nss_wrapper-1.1.3
2347 - >=net-dns/resolv_wrapper-1.1.4
2348 - >=net-libs/socket_wrapper-1.1.9
2349 - >=sys-libs/uid_wrapper-1.2.1
2350 - )
2351 - )"
2352 -RDEPEND="${CDEPEND}
2353 - python? ( ${PYTHON_DEPS} )
2354 - client? ( net-fs/cifs-utils[ads?] )
2355 - selinux? ( sec-policy/selinux-samba )
2356 - !dev-perl/Parse-Yapp
2357 -"
2358 -
2359 -REQUIRED_USE="
2360 - addc? ( python gnutls winbind )
2361 - addns? ( python )
2362 - ads? ( acl gnutls ldap winbind )
2363 - cluster? ( ads )
2364 - gpg? ( addc )
2365 - test? ( python )
2366 - ?? ( system-heimdal system-mitkrb5 )
2367 - ${PYTHON_REQUIRED_USE}
2368 -"
2369 -
2370 -# the test suite is messed, it uses system-installed samba
2371 -# bits instead of what was built, tests things disabled via use
2372 -# flags, and generally just fails to work in a way ebuilds could
2373 -# rely on in its current state
2374 -RESTRICT="test"
2375 -
2376 -S="${WORKDIR}/${MY_P}"
2377 -
2378 -PATCHES=(
2379 - "${FILESDIR}/${PN}-4.4.0-pam.patch"
2380 - "${FILESDIR}/${PN}-4.5.1-compile_et_fix.patch"
2381 - "${FILESDIR}/${PN}-4.8.6-no-pydsdb-when-no-addc.patch"
2382 -)
2383 -
2384 -#CONFDIR="${FILESDIR}/$(get_version_component_range 1-2)"
2385 -CONFDIR="${FILESDIR}/4.4"
2386 -
2387 -WAF_BINARY="${S}/buildtools/bin/waf"
2388 -
2389 -SHAREDMODS=""
2390 -
2391 -pkg_setup() {
2392 - python-single-r1_pkg_setup
2393 - if use cluster ; then
2394 - SHAREDMODS="idmap_rid,idmap_tdb2,idmap_ad"
2395 - elif use ads ; then
2396 - SHAREDMODS="idmap_ad"
2397 - fi
2398 -}
2399 -
2400 -src_prepare() {
2401 - default
2402 -
2403 - # un-bundle dnspython
2404 - sed -i -e '/"dns.resolver":/d' "${S}"/third_party/wscript || die
2405 -
2406 - # unbundle iso8601 unless tests are enabled
2407 - use test || sed -i -e '/"iso8601":/d' "${S}"/third_party/wscript || die
2408 -
2409 - # ugly hackaround for bug #592502
2410 - cp /usr/include/tevent_internal.h "${S}"/lib/tevent/ || die
2411 -
2412 - sed -e 's:<gpgme\.h>:<gpgme/gpgme.h>:' \
2413 - -i source4/dsdb/samdb/ldb_modules/password_hash.c \
2414 - || die
2415 -
2416 - # Friggin' WAF shit
2417 - multilib_copy_sources
2418 -}
2419 -
2420 -multilib_src_configure() {
2421 - # when specifying libs for samba build you must append NONE to the end to
2422 - # stop it automatically including things
2423 - local bundled_libs="NONE"
2424 - if ! use system-heimdal && ! use system-mitkrb5 ; then
2425 - bundled_libs="heimbase,heimntlm,hdb,kdc,krb5,wind,gssapi,hcrypto,hx509,roken,asn1,com_err,NONE"
2426 - fi
2427 -
2428 - local myconf=(
2429 - --enable-fhs
2430 - --sysconfdir="${EPREFIX}/etc"
2431 - --localstatedir="${EPREFIX}/var"
2432 - --with-modulesdir="${EPREFIX}/usr/$(get_libdir)/samba"
2433 - --with-piddir="${EPREFIX}/run/${PN}"
2434 - --bundled-libraries="${bundled_libs}"
2435 - --builtin-libraries=NONE
2436 - --disable-rpath
2437 - --disable-rpath-install
2438 - --nopyc
2439 - --nopyo
2440 - $(multilib_native_use_with acl acl-support)
2441 - $(multilib_native_usex addc '' '--without-ad-dc')
2442 - $(multilib_native_use_with addns dnsupdate)
2443 - $(multilib_native_use_with ads)
2444 - $(multilib_native_use_enable ceph cephfs)
2445 - $(multilib_native_use_with cluster cluster-support)
2446 - $(multilib_native_use_enable cups)
2447 - $(multilib_native_use_with dmapi)
2448 - $(multilib_native_use_with fam)
2449 - $(multilib_native_use_with gpg gpgme)
2450 - $(multilib_native_use_enable iprint)
2451 - $(multilib_native_use_with pam)
2452 - $(multilib_native_usex pam "--with-pammodulesdir=${EPREFIX}/$(get_libdir)/security" '')
2453 - $(multilib_native_use_with quota quotas)
2454 - $(multilib_native_use_with syslog)
2455 - $(multilib_native_use_with systemd)
2456 - $(multilib_native_use_with winbind)
2457 - $(multilib_native_usex python '' '--disable-python')
2458 - $(multilib_native_use_enable zeroconf avahi)
2459 - $(multilib_native_usex test '--enable-selftest' '')
2460 - $(usex system-mitkrb5 '--with-system-mitkrb5' '')
2461 - $(use_enable gnutls)
2462 - $(use_with debug lttng)
2463 - $(use_with ldap)
2464 - $(use_with profiling-data)
2465 - )
2466 - multilib_is_native_abi && myconf+=( --with-shared-modules=${SHAREDMODS} )
2467 -
2468 - CPPFLAGS="-I${SYSROOT}${EPREFIX}/usr/include/et ${CPPFLAGS}" \
2469 - waf-utils_src_configure ${myconf[@]}
2470 -}
2471 -
2472 -multilib_src_compile() {
2473 - waf-utils_src_compile
2474 -}
2475 -
2476 -multilib_src_install() {
2477 - waf-utils_src_install
2478 -
2479 - # Make all .so files executable
2480 - find "${ED}" -type f -name "*.so" -exec chmod +x {} +
2481 -
2482 - if multilib_is_native_abi ; then
2483 - # install ldap schema for server (bug #491002)
2484 - if use ldap ; then
2485 - insinto /etc/openldap/schema
2486 - doins examples/LDAP/samba.schema
2487 - fi
2488 -
2489 - # create symlink for cups (bug #552310)
2490 - if use cups ; then
2491 - dosym ../../../bin/smbspool /usr/libexec/cups/backend/smb
2492 - fi
2493 -
2494 - # install example config file
2495 - insinto /etc/samba
2496 - doins examples/smb.conf.default
2497 -
2498 - # Fix paths in example file (#603964)
2499 - sed \
2500 - -e '/log file =/s@/usr/local/samba/var/@/var/log/samba/@' \
2501 - -e '/include =/s@/usr/local/samba/lib/@/etc/samba/@' \
2502 - -e '/path =/s@/usr/local/samba/lib/@/var/lib/samba/@' \
2503 - -e '/path =/s@/usr/local/samba/@/var/lib/samba/@' \
2504 - -e '/path =/s@/usr/spool/samba@/var/spool/samba@' \
2505 - -i "${ED%/}"/etc/samba/smb.conf.default || die
2506 -
2507 - # Install init script and conf.d file
2508 - newinitd "${CONFDIR}/samba4.initd-r1" samba
2509 - newconfd "${CONFDIR}/samba4.confd" samba
2510 -
2511 - systemd_dotmpfilesd "${FILESDIR}"/samba.conf
2512 - systemd_dounit "${FILESDIR}"/nmbd.service
2513 - systemd_dounit "${FILESDIR}"/smbd.{service,socket}
2514 - systemd_newunit "${FILESDIR}"/smbd_at.service 'smbd@.service'
2515 - systemd_dounit "${FILESDIR}"/winbindd.service
2516 - systemd_dounit "${FILESDIR}"/samba.service
2517 - fi
2518 -
2519 - if use pam && use winbind ; then
2520 - newpamd "${CONFDIR}/system-auth-winbind.pam" system-auth-winbind
2521 - # bugs #376853 and #590374
2522 - insinto /etc/security
2523 - doins examples/pam_winbind/pam_winbind.conf
2524 - fi
2525 -
2526 - keepdir /var/cache/samba
2527 - keepdir /var/lib/ctdb
2528 - keepdir /var/lib/samba/{bind-dns,private}
2529 - keepdir /var/lock/samba
2530 - keepdir /var/log/samba
2531 - keepdir /var/run/{ctdb,samba}
2532 -}
2533 -
2534 -multilib_src_test() {
2535 - if multilib_is_native_abi ; then
2536 - "${WAF_BINARY}" test || die "test failed"
2537 - fi
2538 -}
2539 -
2540 -pkg_postinst() {
2541 - ewarn "Be aware that this release contains the best of all of Samba's"
2542 - ewarn "technology parts, both a file server (that you can reasonably expect"
2543 - ewarn "to upgrade existing Samba 3.x releases to) and the AD domain"
2544 - ewarn "controller work previously known as 'samba4'."
2545 -
2546 - elog "For further information and migration steps make sure to read "
2547 - elog "https://samba.org/samba/history/${P}.html "
2548 - elog "https://wiki.samba.org/index.php/Samba4/HOWTO "
2549 -}
2550
2551 diff --git a/net-fs/samba/samba-4.8.6-r4.ebuild b/net-fs/samba/samba-4.8.6-r4.ebuild
2552 deleted file mode 100644
2553 index 5b52da4ab01..00000000000
2554 --- a/net-fs/samba/samba-4.8.6-r4.ebuild
2555 +++ /dev/null
2556 @@ -1,290 +0,0 @@
2557 -# Copyright 1999-2020 Gentoo Authors
2558 -# Distributed under the terms of the GNU General Public License v2
2559 -
2560 -EAPI=6
2561 -PYTHON_COMPAT=( python2_7 )
2562 -PYTHON_REQ_USE='threads(+),xml(+)'
2563 -
2564 -inherit python-single-r1 waf-utils multilib-minimal linux-info systemd
2565 -
2566 -MY_PV="${PV/_rc/rc}"
2567 -MY_P="${PN}-${MY_PV}"
2568 -
2569 -SRC_PATH="stable"
2570 -[[ ${PV} = *_rc* ]] && SRC_PATH="rc"
2571 -
2572 -SRC_URI="mirror://samba/${SRC_PATH}/${MY_P}.tar.gz"
2573 -[[ ${PV} = *_rc* ]] || \
2574 -KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ia64 ppc ppc64 ~sparc x86"
2575 -
2576 -DESCRIPTION="Samba Suite Version 4"
2577 -HOMEPAGE="https://www.samba.org/"
2578 -LICENSE="GPL-3"
2579 -
2580 -SLOT="0"
2581 -
2582 -IUSE="acl addc addns ads ceph client cluster cups debug dmapi fam gnutls gpg iprint ldap pam python
2583 -quota selinux syslog system-heimdal +system-mitkrb5 systemd test winbind zeroconf"
2584 -
2585 -MULTILIB_WRAPPED_HEADERS=(
2586 - /usr/include/samba-4.0/policy.h
2587 - /usr/include/samba-4.0/dcerpc_server.h
2588 - /usr/include/samba-4.0/ctdb.h
2589 - /usr/include/samba-4.0/ctdb_client.h
2590 - /usr/include/samba-4.0/ctdb_protocol.h
2591 - /usr/include/samba-4.0/ctdb_private.h
2592 - /usr/include/samba-4.0/ctdb_typesafe_cb.h
2593 - /usr/include/samba-4.0/ctdb_version.h
2594 -)
2595 -
2596 -# sys-apps/attr is an automagic dependency (see bug #489748)
2597 -CDEPEND="
2598 - >=app-arch/libarchive-3.1.2[${MULTILIB_USEDEP}]
2599 - dev-lang/perl:=
2600 - dev-libs/libaio[${MULTILIB_USEDEP}]
2601 - dev-libs/libbsd[${MULTILIB_USEDEP}]
2602 - dev-libs/iniparser:0
2603 - dev-libs/popt[${MULTILIB_USEDEP}]
2604 - >=dev-util/cmocka-1.1.1[${MULTILIB_USEDEP}]
2605 - net-libs/libnsl:=[${MULTILIB_USEDEP}]
2606 - sys-apps/attr[${MULTILIB_USEDEP}]
2607 - >=sys-libs/ldb-1.3.6[ldap(+)?,python?,${PYTHON_SINGLE_USEDEP},${MULTILIB_USEDEP}]
2608 - <sys-libs/ldb-1.4.0[ldap(+)?,python?,${PYTHON_SINGLE_USEDEP},${MULTILIB_USEDEP}]
2609 - sys-libs/libcap
2610 - sys-libs/ncurses:0=[${MULTILIB_USEDEP}]
2611 - sys-libs/readline:0=
2612 - >=sys-libs/talloc-2.1.11[python?,${PYTHON_SINGLE_USEDEP},${MULTILIB_USEDEP}]
2613 - >=sys-libs/tdb-1.3.15[python?,${PYTHON_SINGLE_USEDEP},${MULTILIB_USEDEP}]
2614 - >=sys-libs/tevent-0.9.36[python?,${PYTHON_SINGLE_USEDEP},${MULTILIB_USEDEP}]
2615 - sys-libs/zlib[${MULTILIB_USEDEP}]
2616 - virtual/libiconv
2617 - pam? ( sys-libs/pam )
2618 - acl? ( virtual/acl )
2619 - $(python_gen_cond_dep "
2620 - dev-python/subunit[\${PYTHON_MULTI_USEDEP},${MULTILIB_USEDEP}]
2621 - addns? (
2622 - net-dns/bind-tools[gssapi]
2623 - dev-python/dnspython:=[\${PYTHON_MULTI_USEDEP}]
2624 - )
2625 - ")
2626 - ceph? ( sys-cluster/ceph )
2627 - cluster? (
2628 - net-libs/rpcsvc-proto
2629 - !dev-db/ctdb
2630 - )
2631 - cups? ( net-print/cups )
2632 - debug? ( dev-util/lttng-ust )
2633 - dmapi? ( sys-apps/dmapi )
2634 - fam? ( virtual/fam )
2635 - gnutls? (
2636 - dev-libs/libgcrypt:0
2637 - >=net-libs/gnutls-1.4.0
2638 - )
2639 - gpg? ( app-crypt/gpgme )
2640 - ldap? ( net-nds/openldap[${MULTILIB_USEDEP}] )
2641 - system-heimdal? ( >=app-crypt/heimdal-1.5[-ssl,${MULTILIB_USEDEP}] )
2642 - system-mitkrb5? ( >=app-crypt/mit-krb5-1.15.1[${MULTILIB_USEDEP}] )
2643 - systemd? ( sys-apps/systemd:0= )
2644 - zeroconf? ( net-dns/avahi )
2645 -"
2646 -DEPEND="${CDEPEND}
2647 - ${PYTHON_DEPS}
2648 - app-text/docbook-xsl-stylesheets
2649 - dev-libs/libxslt
2650 - net-libs/libtirpc[${MULTILIB_USEDEP}]
2651 - virtual/pkgconfig
2652 - || (
2653 - net-libs/rpcsvc-proto
2654 - <sys-libs/glibc-2.26[rpc(+)]
2655 - )
2656 - test? (
2657 - !system-mitkrb5? (
2658 - >=sys-libs/nss_wrapper-1.1.3
2659 - >=net-dns/resolv_wrapper-1.1.4
2660 - >=net-libs/socket_wrapper-1.1.7
2661 - >=sys-libs/uid_wrapper-1.2.1
2662 - )
2663 - )"
2664 -RDEPEND="${CDEPEND}
2665 - python? ( ${PYTHON_DEPS} )
2666 - client? ( net-fs/cifs-utils[ads?] )
2667 - selinux? ( sec-policy/selinux-samba )
2668 - !dev-perl/Parse-Yapp
2669 -"
2670 -
2671 -REQUIRED_USE="
2672 - addc? ( python gnutls winbind )
2673 - addns? ( python )
2674 - ads? ( acl gnutls ldap winbind )
2675 - cluster? ( ads )
2676 - gpg? ( addc )
2677 - test? ( python )
2678 - ?? ( system-heimdal system-mitkrb5 )
2679 - ${PYTHON_REQUIRED_USE}
2680 -"
2681 -
2682 -# the test suite is messed, it uses system-installed samba
2683 -# bits instead of what was built, tests things disabled via use
2684 -# flags, and generally just fails to work in a way ebuilds could
2685 -# rely on in its current state
2686 -RESTRICT="test"
2687 -
2688 -S="${WORKDIR}/${MY_P}"
2689 -
2690 -PATCHES=(
2691 - "${FILESDIR}/${PN}-4.4.0-pam.patch"
2692 - "${FILESDIR}/${PN}-4.5.1-compile_et_fix.patch"
2693 - "${FILESDIR}/${PN}-4.8.6-no-pydsdb-when-no-addc.patch"
2694 -)
2695 -
2696 -#CONFDIR="${FILESDIR}/$(get_version_component_range 1-2)"
2697 -CONFDIR="${FILESDIR}/4.4"
2698 -
2699 -WAF_BINARY="${S}/buildtools/bin/waf"
2700 -
2701 -SHAREDMODS=""
2702 -
2703 -pkg_setup() {
2704 - python-single-r1_pkg_setup
2705 - if use cluster ; then
2706 - SHAREDMODS="idmap_rid,idmap_tdb2,idmap_ad"
2707 - elif use ads ; then
2708 - SHAREDMODS="idmap_ad"
2709 - fi
2710 -}
2711 -
2712 -src_prepare() {
2713 - default
2714 -
2715 - # un-bundle dnspython
2716 - sed -i -e '/"dns.resolver":/d' "${S}"/third_party/wscript || die
2717 -
2718 - # unbundle iso8601 unless tests are enabled
2719 - use test || sed -i -e '/"iso8601":/d' "${S}"/third_party/wscript || die
2720 -
2721 - # ugly hackaround for bug #592502
2722 - cp /usr/include/tevent_internal.h "${S}"/lib/tevent/ || die
2723 -
2724 - sed -e 's:<gpgme\.h>:<gpgme/gpgme.h>:' \
2725 - -i source4/dsdb/samdb/ldb_modules/password_hash.c \
2726 - || die
2727 -
2728 - # Friggin' WAF shit
2729 - multilib_copy_sources
2730 -}
2731 -
2732 -multilib_src_configure() {
2733 - # when specifying libs for samba build you must append NONE to the end to
2734 - # stop it automatically including things
2735 - local bundled_libs="NONE"
2736 - if ! use system-heimdal && ! use system-mitkrb5 ; then
2737 - bundled_libs="heimbase,heimntlm,hdb,kdc,krb5,wind,gssapi,hcrypto,hx509,roken,asn1,com_err,NONE"
2738 - fi
2739 -
2740 - local myconf=(
2741 - --enable-fhs
2742 - --sysconfdir="${EPREFIX}/etc"
2743 - --localstatedir="${EPREFIX}/var"
2744 - --with-modulesdir="${EPREFIX}/usr/$(get_libdir)/samba"
2745 - --with-piddir="${EPREFIX}/run/${PN}"
2746 - --bundled-libraries="${bundled_libs}"
2747 - --builtin-libraries=NONE
2748 - --disable-rpath
2749 - --disable-rpath-install
2750 - --nopyc
2751 - --nopyo
2752 - $(multilib_native_use_with acl acl-support)
2753 - $(multilib_native_usex addc '' '--without-ad-dc')
2754 - $(multilib_native_use_with addns dnsupdate)
2755 - $(multilib_native_use_with ads)
2756 - $(multilib_native_use_enable ceph cephfs)
2757 - $(multilib_native_use_with cluster cluster-support)
2758 - $(multilib_native_use_enable cups)
2759 - $(multilib_native_use_with dmapi)
2760 - $(multilib_native_use_with fam)
2761 - $(multilib_native_use_with gpg gpgme)
2762 - $(multilib_native_use_enable iprint)
2763 - $(multilib_native_use_with pam)
2764 - $(multilib_native_usex pam "--with-pammodulesdir=${EPREFIX}/$(get_libdir)/security" '')
2765 - $(multilib_native_use_with quota quotas)
2766 - $(multilib_native_use_with syslog)
2767 - $(multilib_native_use_with systemd)
2768 - $(multilib_native_use_with winbind)
2769 - $(multilib_native_usex python '' '--disable-python')
2770 - $(multilib_native_use_enable zeroconf avahi)
2771 - $(multilib_native_usex test '--enable-selftest' '')
2772 - $(usex system-mitkrb5 '--with-system-mitkrb5' '')
2773 - $(use_enable gnutls)
2774 - $(use_with debug lttng)
2775 - $(use_with ldap)
2776 - )
2777 - multilib_is_native_abi && myconf+=( --with-shared-modules=${SHAREDMODS} )
2778 -
2779 - CPPFLAGS="-I${SYSROOT}${EPREFIX}/usr/include/et ${CPPFLAGS}" \
2780 - waf-utils_src_configure ${myconf[@]}
2781 -}
2782 -
2783 -multilib_src_compile() {
2784 - waf-utils_src_compile
2785 -}
2786 -
2787 -multilib_src_install() {
2788 - waf-utils_src_install
2789 -
2790 - # Make all .so files executable
2791 - find "${ED}" -type f -name "*.so" -exec chmod +x {} +
2792 -
2793 - if multilib_is_native_abi ; then
2794 - # install ldap schema for server (bug #491002)
2795 - if use ldap ; then
2796 - insinto /etc/openldap/schema
2797 - doins examples/LDAP/samba.schema
2798 - fi
2799 -
2800 - # create symlink for cups (bug #552310)
2801 - if use cups ; then
2802 - dosym ../../../bin/smbspool /usr/libexec/cups/backend/smb
2803 - fi
2804 -
2805 - # install example config file
2806 - insinto /etc/samba
2807 - doins examples/smb.conf.default
2808 -
2809 - # Fix paths in example file (#603964)
2810 - sed \
2811 - -e '/log file =/s@/usr/local/samba/var/@/var/log/samba/@' \
2812 - -e '/include =/s@/usr/local/samba/lib/@/etc/samba/@' \
2813 - -e '/path =/s@/usr/local/samba/lib/@/var/lib/samba/@' \
2814 - -e '/path =/s@/usr/local/samba/@/var/lib/samba/@' \
2815 - -e '/path =/s@/usr/spool/samba@/var/spool/samba@' \
2816 - -i "${ED%/}"/etc/samba/smb.conf.default || die
2817 -
2818 - # Install init script and conf.d file
2819 - newinitd "${CONFDIR}/samba4.initd-r1" samba
2820 - newconfd "${CONFDIR}/samba4.confd" samba
2821 -
2822 - systemd_dotmpfilesd "${FILESDIR}"/samba.conf
2823 - systemd_dounit "${FILESDIR}"/nmbd.service
2824 - systemd_dounit "${FILESDIR}"/smbd.{service,socket}
2825 - systemd_newunit "${FILESDIR}"/smbd_at.service 'smbd@.service'
2826 - systemd_dounit "${FILESDIR}"/winbindd.service
2827 - systemd_dounit "${FILESDIR}"/samba.service
2828 - fi
2829 -}
2830 -
2831 -multilib_src_test() {
2832 - if multilib_is_native_abi ; then
2833 - "${WAF_BINARY}" test || die "test failed"
2834 - fi
2835 -}
2836 -
2837 -pkg_postinst() {
2838 - ewarn "Be aware that this release contains the best of all of Samba's"
2839 - ewarn "technology parts, both a file server (that you can reasonably expect"
2840 - ewarn "to upgrade existing Samba 3.x releases to) and the AD domain"
2841 - ewarn "controller work previously known as 'samba4'."
2842 -
2843 - elog "For further information and migration steps make sure to read "
2844 - elog "https://samba.org/samba/history/${P}.html "
2845 - elog "https://wiki.samba.org/index.php/Samba4/HOWTO "
2846 -}
2847
2848 diff --git a/net-fs/samba/samba-4.8.6-r5.ebuild b/net-fs/samba/samba-4.8.6-r5.ebuild
2849 deleted file mode 100644
2850 index 2b2d8e52a42..00000000000
2851 --- a/net-fs/samba/samba-4.8.6-r5.ebuild
2852 +++ /dev/null
2853 @@ -1,304 +0,0 @@
2854 -# Copyright 1999-2020 Gentoo Authors
2855 -# Distributed under the terms of the GNU General Public License v2
2856 -
2857 -EAPI=6
2858 -PYTHON_COMPAT=( python2_7 )
2859 -PYTHON_REQ_USE='threads(+),xml(+)'
2860 -
2861 -inherit python-single-r1 waf-utils multilib-minimal linux-info systemd pam
2862 -
2863 -MY_PV="${PV/_rc/rc}"
2864 -MY_P="${PN}-${MY_PV}"
2865 -
2866 -SRC_PATH="stable"
2867 -[[ ${PV} = *_rc* ]] && SRC_PATH="rc"
2868 -
2869 -SRC_URI="mirror://samba/${SRC_PATH}/${MY_P}.tar.gz"
2870 -[[ ${PV} = *_rc* ]] || \
2871 -KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86"
2872 -
2873 -DESCRIPTION="Samba Suite Version 4"
2874 -HOMEPAGE="https://www.samba.org/"
2875 -LICENSE="GPL-3"
2876 -
2877 -SLOT="0"
2878 -
2879 -IUSE="acl addc addns ads ceph client cluster cups debug dmapi fam gnutls gpg iprint ldap pam python
2880 -quota selinux syslog system-heimdal +system-mitkrb5 systemd test winbind zeroconf"
2881 -
2882 -MULTILIB_WRAPPED_HEADERS=(
2883 - /usr/include/samba-4.0/policy.h
2884 - /usr/include/samba-4.0/dcerpc_server.h
2885 - /usr/include/samba-4.0/ctdb.h
2886 - /usr/include/samba-4.0/ctdb_client.h
2887 - /usr/include/samba-4.0/ctdb_protocol.h
2888 - /usr/include/samba-4.0/ctdb_private.h
2889 - /usr/include/samba-4.0/ctdb_typesafe_cb.h
2890 - /usr/include/samba-4.0/ctdb_version.h
2891 -)
2892 -
2893 -# sys-apps/attr is an automagic dependency (see bug #489748)
2894 -CDEPEND="
2895 - >=app-arch/libarchive-3.1.2[${MULTILIB_USEDEP}]
2896 - dev-lang/perl:=
2897 - dev-libs/libaio[${MULTILIB_USEDEP}]
2898 - dev-libs/libbsd[${MULTILIB_USEDEP}]
2899 - dev-libs/iniparser:0
2900 - dev-libs/popt[${MULTILIB_USEDEP}]
2901 - >=dev-util/cmocka-1.1.1[${MULTILIB_USEDEP}]
2902 - net-libs/libnsl:=[${MULTILIB_USEDEP}]
2903 - sys-apps/attr[${MULTILIB_USEDEP}]
2904 - >=sys-libs/ldb-1.3.6[ldap(+)?,python?,${PYTHON_SINGLE_USEDEP},${MULTILIB_USEDEP}]
2905 - <sys-libs/ldb-1.4.0[ldap(+)?,python?,${PYTHON_SINGLE_USEDEP},${MULTILIB_USEDEP}]
2906 - sys-libs/libcap
2907 - sys-libs/ncurses:0=[${MULTILIB_USEDEP}]
2908 - sys-libs/readline:0=
2909 - >=sys-libs/talloc-2.1.11[python?,${PYTHON_SINGLE_USEDEP},${MULTILIB_USEDEP}]
2910 - >=sys-libs/tdb-1.3.15[python?,${PYTHON_SINGLE_USEDEP},${MULTILIB_USEDEP}]
2911 - >=sys-libs/tevent-0.9.36[python?,${PYTHON_SINGLE_USEDEP},${MULTILIB_USEDEP}]
2912 - sys-libs/zlib[${MULTILIB_USEDEP}]
2913 - virtual/libiconv
2914 - pam? ( sys-libs/pam )
2915 - acl? ( virtual/acl )
2916 - $(python_gen_cond_dep "
2917 - dev-python/subunit[\${PYTHON_MULTI_USEDEP},${MULTILIB_USEDEP}]
2918 - addns? (
2919 - net-dns/bind-tools[gssapi]
2920 - dev-python/dnspython:=[\${PYTHON_MULTI_USEDEP}]
2921 - )
2922 - ")
2923 - ceph? ( sys-cluster/ceph )
2924 - cluster? (
2925 - net-libs/rpcsvc-proto
2926 - !dev-db/ctdb
2927 - )
2928 - cups? ( net-print/cups )
2929 - debug? ( dev-util/lttng-ust )
2930 - dmapi? ( sys-apps/dmapi )
2931 - fam? ( virtual/fam )
2932 - gnutls? (
2933 - dev-libs/libgcrypt:0
2934 - >=net-libs/gnutls-1.4.0
2935 - )
2936 - gpg? ( app-crypt/gpgme )
2937 - ldap? ( net-nds/openldap[${MULTILIB_USEDEP}] )
2938 - system-heimdal? ( >=app-crypt/heimdal-1.5[-ssl,${MULTILIB_USEDEP}] )
2939 - system-mitkrb5? ( >=app-crypt/mit-krb5-1.15.1[${MULTILIB_USEDEP}] )
2940 - systemd? ( sys-apps/systemd:0= )
2941 - zeroconf? ( net-dns/avahi )
2942 -"
2943 -DEPEND="${CDEPEND}
2944 - ${PYTHON_DEPS}
2945 - app-text/docbook-xsl-stylesheets
2946 - dev-libs/libxslt
2947 - net-libs/libtirpc[${MULTILIB_USEDEP}]
2948 - virtual/pkgconfig
2949 - || (
2950 - net-libs/rpcsvc-proto
2951 - <sys-libs/glibc-2.26[rpc(+)]
2952 - )
2953 - test? (
2954 - !system-mitkrb5? (
2955 - >=sys-libs/nss_wrapper-1.1.3
2956 - >=net-dns/resolv_wrapper-1.1.4
2957 - >=net-libs/socket_wrapper-1.1.9
2958 - >=sys-libs/uid_wrapper-1.2.1
2959 - )
2960 - )"
2961 -RDEPEND="${CDEPEND}
2962 - python? ( ${PYTHON_DEPS} )
2963 - client? ( net-fs/cifs-utils[ads?] )
2964 - selinux? ( sec-policy/selinux-samba )
2965 - !dev-perl/Parse-Yapp
2966 -"
2967 -
2968 -REQUIRED_USE="
2969 - addc? ( python gnutls winbind )
2970 - addns? ( python )
2971 - ads? ( acl gnutls ldap winbind )
2972 - cluster? ( ads )
2973 - gpg? ( addc )
2974 - test? ( python )
2975 - ?? ( system-heimdal system-mitkrb5 )
2976 - ${PYTHON_REQUIRED_USE}
2977 -"
2978 -
2979 -# the test suite is messed, it uses system-installed samba
2980 -# bits instead of what was built, tests things disabled via use
2981 -# flags, and generally just fails to work in a way ebuilds could
2982 -# rely on in its current state
2983 -RESTRICT="test"
2984 -
2985 -S="${WORKDIR}/${MY_P}"
2986 -
2987 -PATCHES=(
2988 - "${FILESDIR}/${PN}-4.4.0-pam.patch"
2989 - "${FILESDIR}/${PN}-4.5.1-compile_et_fix.patch"
2990 - "${FILESDIR}/${PN}-4.8.6-no-pydsdb-when-no-addc.patch"
2991 -)
2992 -
2993 -#CONFDIR="${FILESDIR}/$(get_version_component_range 1-2)"
2994 -CONFDIR="${FILESDIR}/4.4"
2995 -
2996 -WAF_BINARY="${S}/buildtools/bin/waf"
2997 -
2998 -SHAREDMODS=""
2999 -
3000 -pkg_setup() {
3001 - python-single-r1_pkg_setup
3002 - if use cluster ; then
3003 - SHAREDMODS="idmap_rid,idmap_tdb2,idmap_ad"
3004 - elif use ads ; then
3005 - SHAREDMODS="idmap_ad"
3006 - fi
3007 -}
3008 -
3009 -src_prepare() {
3010 - default
3011 -
3012 - # un-bundle dnspython
3013 - sed -i -e '/"dns.resolver":/d' "${S}"/third_party/wscript || die
3014 -
3015 - # unbundle iso8601 unless tests are enabled
3016 - use test || sed -i -e '/"iso8601":/d' "${S}"/third_party/wscript || die
3017 -
3018 - # ugly hackaround for bug #592502
3019 - cp /usr/include/tevent_internal.h "${S}"/lib/tevent/ || die
3020 -
3021 - sed -e 's:<gpgme\.h>:<gpgme/gpgme.h>:' \
3022 - -i source4/dsdb/samdb/ldb_modules/password_hash.c \
3023 - || die
3024 -
3025 - # Friggin' WAF shit
3026 - multilib_copy_sources
3027 -}
3028 -
3029 -multilib_src_configure() {
3030 - # when specifying libs for samba build you must append NONE to the end to
3031 - # stop it automatically including things
3032 - local bundled_libs="NONE"
3033 - if ! use system-heimdal && ! use system-mitkrb5 ; then
3034 - bundled_libs="heimbase,heimntlm,hdb,kdc,krb5,wind,gssapi,hcrypto,hx509,roken,asn1,com_err,NONE"
3035 - fi
3036 -
3037 - local myconf=(
3038 - --enable-fhs
3039 - --sysconfdir="${EPREFIX}/etc"
3040 - --localstatedir="${EPREFIX}/var"
3041 - --with-modulesdir="${EPREFIX}/usr/$(get_libdir)/samba"
3042 - --with-piddir="${EPREFIX}/run/${PN}"
3043 - --bundled-libraries="${bundled_libs}"
3044 - --builtin-libraries=NONE
3045 - --disable-rpath
3046 - --disable-rpath-install
3047 - --nopyc
3048 - --nopyo
3049 - $(multilib_native_use_with acl acl-support)
3050 - $(multilib_native_usex addc '' '--without-ad-dc')
3051 - $(multilib_native_use_with addns dnsupdate)
3052 - $(multilib_native_use_with ads)
3053 - $(multilib_native_use_enable ceph cephfs)
3054 - $(multilib_native_use_with cluster cluster-support)
3055 - $(multilib_native_use_enable cups)
3056 - $(multilib_native_use_with dmapi)
3057 - $(multilib_native_use_with fam)
3058 - $(multilib_native_use_with gpg gpgme)
3059 - $(multilib_native_use_enable iprint)
3060 - $(multilib_native_use_with pam)
3061 - $(multilib_native_usex pam "--with-pammodulesdir=${EPREFIX}/$(get_libdir)/security" '')
3062 - $(multilib_native_use_with quota quotas)
3063 - $(multilib_native_use_with syslog)
3064 - $(multilib_native_use_with systemd)
3065 - $(multilib_native_use_with winbind)
3066 - $(multilib_native_usex python '' '--disable-python')
3067 - $(multilib_native_use_enable zeroconf avahi)
3068 - $(multilib_native_usex test '--enable-selftest' '')
3069 - $(usex system-mitkrb5 '--with-system-mitkrb5' '')
3070 - $(use_enable gnutls)
3071 - $(use_with debug lttng)
3072 - $(use_with ldap)
3073 - )
3074 - multilib_is_native_abi && myconf+=( --with-shared-modules=${SHAREDMODS} )
3075 -
3076 - CPPFLAGS="-I${SYSROOT}${EPREFIX}/usr/include/et ${CPPFLAGS}" \
3077 - waf-utils_src_configure ${myconf[@]}
3078 -}
3079 -
3080 -multilib_src_compile() {
3081 - waf-utils_src_compile
3082 -}
3083 -
3084 -multilib_src_install() {
3085 - waf-utils_src_install
3086 -
3087 - # Make all .so files executable
3088 - find "${ED}" -type f -name "*.so" -exec chmod +x {} +
3089 -
3090 - if multilib_is_native_abi ; then
3091 - # install ldap schema for server (bug #491002)
3092 - if use ldap ; then
3093 - insinto /etc/openldap/schema
3094 - doins examples/LDAP/samba.schema
3095 - fi
3096 -
3097 - # create symlink for cups (bug #552310)
3098 - if use cups ; then
3099 - dosym ../../../bin/smbspool /usr/libexec/cups/backend/smb
3100 - fi
3101 -
3102 - # install example config file
3103 - insinto /etc/samba
3104 - doins examples/smb.conf.default
3105 -
3106 - # Fix paths in example file (#603964)
3107 - sed \
3108 - -e '/log file =/s@/usr/local/samba/var/@/var/log/samba/@' \
3109 - -e '/include =/s@/usr/local/samba/lib/@/etc/samba/@' \
3110 - -e '/path =/s@/usr/local/samba/lib/@/var/lib/samba/@' \
3111 - -e '/path =/s@/usr/local/samba/@/var/lib/samba/@' \
3112 - -e '/path =/s@/usr/spool/samba@/var/spool/samba@' \
3113 - -i "${ED%/}"/etc/samba/smb.conf.default || die
3114 -
3115 - # Install init script and conf.d file
3116 - newinitd "${CONFDIR}/samba4.initd-r1" samba
3117 - newconfd "${CONFDIR}/samba4.confd" samba
3118 -
3119 - systemd_dotmpfilesd "${FILESDIR}"/samba.conf
3120 - systemd_dounit "${FILESDIR}"/nmbd.service
3121 - systemd_dounit "${FILESDIR}"/smbd.{service,socket}
3122 - systemd_newunit "${FILESDIR}"/smbd_at.service 'smbd@.service'
3123 - systemd_dounit "${FILESDIR}"/winbindd.service
3124 - systemd_dounit "${FILESDIR}"/samba.service
3125 - fi
3126 -
3127 - if use pam && use winbind ; then
3128 - newpamd "${CONFDIR}/system-auth-winbind.pam" system-auth-winbind
3129 - # bugs #376853 and #590374
3130 - insinto /etc/security
3131 - doins examples/pam_winbind/pam_winbind.conf
3132 - fi
3133 -
3134 - keepdir /var/cache/samba
3135 - keepdir /var/lib/ctdb
3136 - keepdir /var/lib/samba/{bind-dns,private}
3137 - keepdir /var/lock/samba
3138 - keepdir /var/log/samba
3139 - keepdir /var/run/{ctdb,samba}
3140 -}
3141 -
3142 -multilib_src_test() {
3143 - if multilib_is_native_abi ; then
3144 - "${WAF_BINARY}" test || die "test failed"
3145 - fi
3146 -}
3147 -
3148 -pkg_postinst() {
3149 - ewarn "Be aware that this release contains the best of all of Samba's"
3150 - ewarn "technology parts, both a file server (that you can reasonably expect"
3151 - ewarn "to upgrade existing Samba 3.x releases to) and the AD domain"
3152 - ewarn "controller work previously known as 'samba4'."
3153 -
3154 - elog "For further information and migration steps make sure to read "
3155 - elog "https://samba.org/samba/history/${P}.html "
3156 - elog "https://wiki.samba.org/index.php/Samba4/HOWTO "
3157 -}
3158
3159 diff --git a/net-fs/samba/samba-4.9.17.ebuild b/net-fs/samba/samba-4.9.17.ebuild
3160 deleted file mode 100644
3161 index b01d8c405a0..00000000000
3162 --- a/net-fs/samba/samba-4.9.17.ebuild
3163 +++ /dev/null
3164 @@ -1,310 +0,0 @@
3165 -# Copyright 1999-2020 Gentoo Authors
3166 -# Distributed under the terms of the GNU General Public License v2
3167 -
3168 -EAPI=6
3169 -PYTHON_COMPAT=( python2_7 )
3170 -PYTHON_REQ_USE='threads(+),xml(+)'
3171 -
3172 -inherit python-single-r1 waf-utils multilib-minimal linux-info systemd pam
3173 -
3174 -MY_PV="${PV/_rc/rc}"
3175 -MY_P="${PN}-${MY_PV}"
3176 -
3177 -SRC_PATH="stable"
3178 -[[ ${PV} = *_rc* ]] && SRC_PATH="rc"
3179 -
3180 -SRC_URI="mirror://samba/${SRC_PATH}/${MY_P}.tar.gz"
3181 -[[ ${PV} = *_rc* ]] || \
3182 -KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86"
3183 -
3184 -DESCRIPTION="Samba Suite Version 4"
3185 -HOMEPAGE="https://www.samba.org/"
3186 -LICENSE="GPL-3"
3187 -
3188 -SLOT="0"
3189 -
3190 -IUSE="acl addc addns ads ceph client cluster cups debug dmapi fam gnutls gpg
3191 -iprint json ldap pam profiling-data python quota selinux syslog system-heimdal
3192 -+system-mitkrb5 systemd test winbind zeroconf"
3193 -
3194 -MULTILIB_WRAPPED_HEADERS=(
3195 - /usr/include/samba-4.0/policy.h
3196 - /usr/include/samba-4.0/dcerpc_server.h
3197 - /usr/include/samba-4.0/ctdb.h
3198 - /usr/include/samba-4.0/ctdb_client.h
3199 - /usr/include/samba-4.0/ctdb_protocol.h
3200 - /usr/include/samba-4.0/ctdb_private.h
3201 - /usr/include/samba-4.0/ctdb_typesafe_cb.h
3202 - /usr/include/samba-4.0/ctdb_version.h
3203 -)
3204 -
3205 -# sys-apps/attr is an automagic dependency (see bug #489748)
3206 -CDEPEND="
3207 - >=app-arch/libarchive-3.1.2[${MULTILIB_USEDEP}]
3208 - dev-lang/perl:=
3209 - dev-libs/libaio[${MULTILIB_USEDEP}]
3210 - dev-libs/libbsd[${MULTILIB_USEDEP}]
3211 - dev-libs/iniparser:0
3212 - dev-libs/popt[${MULTILIB_USEDEP}]
3213 - >=dev-util/cmocka-1.1.1[${MULTILIB_USEDEP}]
3214 - net-libs/libnsl:=[${MULTILIB_USEDEP}]
3215 - sys-apps/attr[${MULTILIB_USEDEP}]
3216 - >=sys-libs/ldb-1.4.8[ldap(+)?,python?,${PYTHON_SINGLE_USEDEP},${MULTILIB_USEDEP}]
3217 - <sys-libs/ldb-1.5.0[ldap(+)?,python?,${PYTHON_SINGLE_USEDEP},${MULTILIB_USEDEP}]
3218 - sys-libs/libcap
3219 - sys-libs/ncurses:0=[${MULTILIB_USEDEP}]
3220 - sys-libs/readline:0=
3221 - >=sys-libs/talloc-2.1.14[python?,${PYTHON_SINGLE_USEDEP},${MULTILIB_USEDEP}]
3222 - >=sys-libs/tdb-1.3.16[python?,${PYTHON_SINGLE_USEDEP},${MULTILIB_USEDEP}]
3223 - >=sys-libs/tevent-0.9.37[python?,${PYTHON_SINGLE_USEDEP},${MULTILIB_USEDEP}]
3224 - sys-libs/zlib[${MULTILIB_USEDEP}]
3225 - virtual/libiconv
3226 - pam? ( sys-libs/pam )
3227 - acl? ( virtual/acl )
3228 - $(python_gen_cond_dep "
3229 - dev-python/subunit[\${PYTHON_MULTI_USEDEP},${MULTILIB_USEDEP}]
3230 - addns? (
3231 - net-dns/bind-tools[gssapi]
3232 - dev-python/dnspython:=[\${PYTHON_MULTI_USEDEP}]
3233 - )
3234 - ")
3235 - ceph? ( sys-cluster/ceph )
3236 - cluster? (
3237 - net-libs/rpcsvc-proto
3238 - !dev-db/ctdb
3239 - )
3240 - cups? ( net-print/cups )
3241 - debug? ( dev-util/lttng-ust )
3242 - dmapi? ( sys-apps/dmapi )
3243 - fam? ( virtual/fam )
3244 - gnutls? (
3245 - dev-libs/libgcrypt:0
3246 - >=net-libs/gnutls-1.4.0
3247 - )
3248 - gpg? ( app-crypt/gpgme )
3249 - json? ( dev-libs/jansson )
3250 - ldap? ( net-nds/openldap[${MULTILIB_USEDEP}] )
3251 - system-heimdal? ( >=app-crypt/heimdal-1.5[-ssl,${MULTILIB_USEDEP}] )
3252 - system-mitkrb5? ( >=app-crypt/mit-krb5-1.15.1[${MULTILIB_USEDEP}] )
3253 - systemd? ( sys-apps/systemd:0= )
3254 - zeroconf? ( net-dns/avahi )
3255 -"
3256 -DEPEND="${CDEPEND}
3257 - ${PYTHON_DEPS}
3258 - app-text/docbook-xsl-stylesheets
3259 - dev-libs/libxslt
3260 - net-libs/libtirpc[${MULTILIB_USEDEP}]
3261 - virtual/pkgconfig
3262 - || (
3263 - net-libs/rpcsvc-proto
3264 - <sys-libs/glibc-2.26[rpc(+)]
3265 - )
3266 - test? (
3267 - !system-mitkrb5? (
3268 - >=sys-libs/nss_wrapper-1.1.3
3269 - >=net-dns/resolv_wrapper-1.1.4
3270 - >=net-libs/socket_wrapper-1.1.9
3271 - >=sys-libs/uid_wrapper-1.2.1
3272 - )
3273 - )"
3274 -RDEPEND="${CDEPEND}
3275 - python? ( ${PYTHON_DEPS} )
3276 - client? ( net-fs/cifs-utils[ads?] )
3277 - selinux? ( sec-policy/selinux-samba )
3278 - !dev-perl/Parse-Yapp
3279 -"
3280 -
3281 -REQUIRED_USE="
3282 - addc? ( python gnutls json winbind )
3283 - addns? ( python )
3284 - ads? ( acl gnutls ldap winbind )
3285 - cluster? ( ads )
3286 - gpg? ( addc )
3287 - test? ( python )
3288 - ?? ( system-heimdal system-mitkrb5 )
3289 - ${PYTHON_REQUIRED_USE}
3290 -"
3291 -
3292 -# the test suite is messed, it uses system-installed samba
3293 -# bits instead of what was built, tests things disabled via use
3294 -# flags, and generally just fails to work in a way ebuilds could
3295 -# rely on in its current state
3296 -RESTRICT="test"
3297 -
3298 -S="${WORKDIR}/${MY_P}"
3299 -
3300 -PATCHES=(
3301 - "${FILESDIR}/${PN}-4.4.0-pam.patch"
3302 - "${FILESDIR}/${PN}-4.5.1-compile_et_fix.patch"
3303 - "${FILESDIR}/${PN}-4.9.2-timespec.patch"
3304 -)
3305 -
3306 -#CONFDIR="${FILESDIR}/$(get_version_component_range 1-2)"
3307 -CONFDIR="${FILESDIR}/4.4"
3308 -
3309 -WAF_BINARY="${S}/buildtools/bin/waf"
3310 -
3311 -SHAREDMODS=""
3312 -
3313 -pkg_setup() {
3314 - python-single-r1_pkg_setup
3315 - if use cluster ; then
3316 - SHAREDMODS="idmap_rid,idmap_tdb2,idmap_ad"
3317 - elif use ads ; then
3318 - SHAREDMODS="idmap_ad"
3319 - fi
3320 -}
3321 -
3322 -src_prepare() {
3323 - default
3324 -
3325 - # un-bundle dnspython
3326 - sed -i -e '/"dns.resolver":/d' "${S}"/third_party/wscript || die
3327 -
3328 - # unbundle iso8601 unless tests are enabled
3329 - if ! use test ; then
3330 - sed -i -e '/"iso8601":/d' "${S}"/third_party/wscript || die
3331 - fi
3332 -
3333 - # ugly hackaround for bug #592502
3334 - cp /usr/include/tevent_internal.h "${S}"/lib/tevent/ || die
3335 -
3336 - sed -e 's:<gpgme\.h>:<gpgme/gpgme.h>:' \
3337 - -i source4/dsdb/samdb/ldb_modules/password_hash.c \
3338 - || die
3339 -
3340 - # Friggin' WAF shit
3341 - multilib_copy_sources
3342 -}
3343 -
3344 -multilib_src_configure() {
3345 - # when specifying libs for samba build you must append NONE to the end to
3346 - # stop it automatically including things
3347 - local bundled_libs="NONE"
3348 - if ! use system-heimdal && ! use system-mitkrb5 ; then
3349 - bundled_libs="heimbase,heimntlm,hdb,kdc,krb5,wind,gssapi,hcrypto,hx509,roken,asn1,com_err,NONE"
3350 - fi
3351 -
3352 - local myconf=(
3353 - --enable-fhs
3354 - --sysconfdir="${EPREFIX}/etc"
3355 - --localstatedir="${EPREFIX}/var"
3356 - --with-modulesdir="${EPREFIX}/usr/$(get_libdir)/samba"
3357 - --with-piddir="${EPREFIX}/run/${PN}"
3358 - --bundled-libraries="${bundled_libs}"
3359 - --builtin-libraries=NONE
3360 - --disable-rpath
3361 - --disable-rpath-install
3362 - --nopyc
3363 - --nopyo
3364 - $(multilib_native_use_with acl acl-support)
3365 - $(multilib_native_usex addc '' '--without-ad-dc')
3366 - $(multilib_native_use_with addns dnsupdate)
3367 - $(multilib_native_use_with ads)
3368 - $(multilib_native_use_enable ceph cephfs)
3369 - $(multilib_native_use_with cluster cluster-support)
3370 - $(multilib_native_use_enable cups)
3371 - $(multilib_native_use_with dmapi)
3372 - $(multilib_native_use_with fam)
3373 - $(multilib_native_use_with gpg gpgme)
3374 - $(multilib_native_use_with json json-audit)
3375 - $(multilib_native_use_enable iprint)
3376 - $(multilib_native_use_with pam)
3377 - $(multilib_native_usex pam "--with-pammodulesdir=${EPREFIX}/$(get_libdir)/security" '')
3378 - $(multilib_native_use_with quota quotas)
3379 - $(multilib_native_use_with syslog)
3380 - $(multilib_native_use_with systemd)
3381 - $(multilib_native_use_with winbind)
3382 - $(multilib_native_usex python '' '--disable-python')
3383 - $(multilib_native_use_enable zeroconf avahi)
3384 - $(multilib_native_usex test '--enable-selftest' '')
3385 - $(usex system-mitkrb5 "--with-system-mitkrb5 $(multilib_native_usex addc --with-experimental-mit-ad-dc '')" '')
3386 - $(use_enable gnutls)
3387 - $(use_with debug lttng)
3388 - $(use_with ldap)
3389 - $(use_with profiling-data)
3390 - )
3391 - multilib_is_native_abi && myconf+=( --with-shared-modules=${SHAREDMODS} )
3392 -
3393 - CPPFLAGS="-I${SYSROOT}${EPREFIX}/usr/include/et ${CPPFLAGS}" \
3394 - waf-utils_src_configure ${myconf[@]}
3395 -}
3396 -
3397 -multilib_src_compile() {
3398 - waf-utils_src_compile
3399 -}
3400 -
3401 -multilib_src_install() {
3402 - waf-utils_src_install
3403 -
3404 - # Make all .so files executable
3405 - find "${ED}" -type f -name "*.so" -exec chmod +x {} + || die
3406 -
3407 - if multilib_is_native_abi ; then
3408 - # install ldap schema for server (bug #491002)
3409 - if use ldap ; then
3410 - insinto /etc/openldap/schema
3411 - doins examples/LDAP/samba.schema
3412 - fi
3413 -
3414 - # create symlink for cups (bug #552310)
3415 - if use cups ; then
3416 - dosym ../../../bin/smbspool /usr/libexec/cups/backend/smb
3417 - fi
3418 -
3419 - # install example config file
3420 - insinto /etc/samba
3421 - doins examples/smb.conf.default
3422 -
3423 - # Fix paths in example file (#603964)
3424 - sed \
3425 - -e '/log file =/s@/usr/local/samba/var/@/var/log/samba/@' \
3426 - -e '/include =/s@/usr/local/samba/lib/@/etc/samba/@' \
3427 - -e '/path =/s@/usr/local/samba/lib/@/var/lib/samba/@' \
3428 - -e '/path =/s@/usr/local/samba/@/var/lib/samba/@' \
3429 - -e '/path =/s@/usr/spool/samba@/var/spool/samba@' \
3430 - -i "${ED%/}"/etc/samba/smb.conf.default || die
3431 -
3432 - # Install init script and conf.d file
3433 - newinitd "${CONFDIR}/samba4.initd-r1" samba
3434 - newconfd "${CONFDIR}/samba4.confd" samba
3435 -
3436 - systemd_dotmpfilesd "${FILESDIR}"/samba.conf
3437 - systemd_dounit "${FILESDIR}"/nmbd.service
3438 - systemd_dounit "${FILESDIR}"/smbd.{service,socket}
3439 - systemd_newunit "${FILESDIR}"/smbd_at.service 'smbd@.service'
3440 - systemd_dounit "${FILESDIR}"/winbindd.service
3441 - systemd_dounit "${FILESDIR}"/samba.service
3442 - fi
3443 -
3444 - if use pam && use winbind ; then
3445 - newpamd "${CONFDIR}/system-auth-winbind.pam" system-auth-winbind
3446 - # bugs #376853 and #590374
3447 - insinto /etc/security
3448 - doins examples/pam_winbind/pam_winbind.conf
3449 - fi
3450 -
3451 - keepdir /var/cache/samba
3452 - keepdir /var/lib/ctdb
3453 - keepdir /var/lib/samba/{bind-dns,private}
3454 - keepdir /var/lock/samba
3455 - keepdir /var/log/samba
3456 - keepdir /var/run/{ctdb,samba}
3457 -}
3458 -
3459 -multilib_src_test() {
3460 - if multilib_is_native_abi ; then
3461 - "${WAF_BINARY}" test || die "test failed"
3462 - fi
3463 -}
3464 -
3465 -pkg_postinst() {
3466 - ewarn "Be aware that this release contains the best of all of Samba's"
3467 - ewarn "technology parts, both a file server (that you can reasonably expect"
3468 - ewarn "to upgrade existing Samba 3.x releases to) and the AD domain"
3469 - ewarn "controller work previously known as 'samba4'."
3470 -
3471 - elog "For further information and migration steps make sure to read "
3472 - elog "https://samba.org/samba/history/${P}.html "
3473 - elog "https://wiki.samba.org/index.php/Samba4/HOWTO "
3474 -}
3475
3476 diff --git a/net-fs/samba/samba-4.9.18.ebuild b/net-fs/samba/samba-4.9.18.ebuild
3477 deleted file mode 100644
3478 index b01d8c405a0..00000000000
3479 --- a/net-fs/samba/samba-4.9.18.ebuild
3480 +++ /dev/null
3481 @@ -1,310 +0,0 @@
3482 -# Copyright 1999-2020 Gentoo Authors
3483 -# Distributed under the terms of the GNU General Public License v2
3484 -
3485 -EAPI=6
3486 -PYTHON_COMPAT=( python2_7 )
3487 -PYTHON_REQ_USE='threads(+),xml(+)'
3488 -
3489 -inherit python-single-r1 waf-utils multilib-minimal linux-info systemd pam
3490 -
3491 -MY_PV="${PV/_rc/rc}"
3492 -MY_P="${PN}-${MY_PV}"
3493 -
3494 -SRC_PATH="stable"
3495 -[[ ${PV} = *_rc* ]] && SRC_PATH="rc"
3496 -
3497 -SRC_URI="mirror://samba/${SRC_PATH}/${MY_P}.tar.gz"
3498 -[[ ${PV} = *_rc* ]] || \
3499 -KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86"
3500 -
3501 -DESCRIPTION="Samba Suite Version 4"
3502 -HOMEPAGE="https://www.samba.org/"
3503 -LICENSE="GPL-3"
3504 -
3505 -SLOT="0"
3506 -
3507 -IUSE="acl addc addns ads ceph client cluster cups debug dmapi fam gnutls gpg
3508 -iprint json ldap pam profiling-data python quota selinux syslog system-heimdal
3509 -+system-mitkrb5 systemd test winbind zeroconf"
3510 -
3511 -MULTILIB_WRAPPED_HEADERS=(
3512 - /usr/include/samba-4.0/policy.h
3513 - /usr/include/samba-4.0/dcerpc_server.h
3514 - /usr/include/samba-4.0/ctdb.h
3515 - /usr/include/samba-4.0/ctdb_client.h
3516 - /usr/include/samba-4.0/ctdb_protocol.h
3517 - /usr/include/samba-4.0/ctdb_private.h
3518 - /usr/include/samba-4.0/ctdb_typesafe_cb.h
3519 - /usr/include/samba-4.0/ctdb_version.h
3520 -)
3521 -
3522 -# sys-apps/attr is an automagic dependency (see bug #489748)
3523 -CDEPEND="
3524 - >=app-arch/libarchive-3.1.2[${MULTILIB_USEDEP}]
3525 - dev-lang/perl:=
3526 - dev-libs/libaio[${MULTILIB_USEDEP}]
3527 - dev-libs/libbsd[${MULTILIB_USEDEP}]
3528 - dev-libs/iniparser:0
3529 - dev-libs/popt[${MULTILIB_USEDEP}]
3530 - >=dev-util/cmocka-1.1.1[${MULTILIB_USEDEP}]
3531 - net-libs/libnsl:=[${MULTILIB_USEDEP}]
3532 - sys-apps/attr[${MULTILIB_USEDEP}]
3533 - >=sys-libs/ldb-1.4.8[ldap(+)?,python?,${PYTHON_SINGLE_USEDEP},${MULTILIB_USEDEP}]
3534 - <sys-libs/ldb-1.5.0[ldap(+)?,python?,${PYTHON_SINGLE_USEDEP},${MULTILIB_USEDEP}]
3535 - sys-libs/libcap
3536 - sys-libs/ncurses:0=[${MULTILIB_USEDEP}]
3537 - sys-libs/readline:0=
3538 - >=sys-libs/talloc-2.1.14[python?,${PYTHON_SINGLE_USEDEP},${MULTILIB_USEDEP}]
3539 - >=sys-libs/tdb-1.3.16[python?,${PYTHON_SINGLE_USEDEP},${MULTILIB_USEDEP}]
3540 - >=sys-libs/tevent-0.9.37[python?,${PYTHON_SINGLE_USEDEP},${MULTILIB_USEDEP}]
3541 - sys-libs/zlib[${MULTILIB_USEDEP}]
3542 - virtual/libiconv
3543 - pam? ( sys-libs/pam )
3544 - acl? ( virtual/acl )
3545 - $(python_gen_cond_dep "
3546 - dev-python/subunit[\${PYTHON_MULTI_USEDEP},${MULTILIB_USEDEP}]
3547 - addns? (
3548 - net-dns/bind-tools[gssapi]
3549 - dev-python/dnspython:=[\${PYTHON_MULTI_USEDEP}]
3550 - )
3551 - ")
3552 - ceph? ( sys-cluster/ceph )
3553 - cluster? (
3554 - net-libs/rpcsvc-proto
3555 - !dev-db/ctdb
3556 - )
3557 - cups? ( net-print/cups )
3558 - debug? ( dev-util/lttng-ust )
3559 - dmapi? ( sys-apps/dmapi )
3560 - fam? ( virtual/fam )
3561 - gnutls? (
3562 - dev-libs/libgcrypt:0
3563 - >=net-libs/gnutls-1.4.0
3564 - )
3565 - gpg? ( app-crypt/gpgme )
3566 - json? ( dev-libs/jansson )
3567 - ldap? ( net-nds/openldap[${MULTILIB_USEDEP}] )
3568 - system-heimdal? ( >=app-crypt/heimdal-1.5[-ssl,${MULTILIB_USEDEP}] )
3569 - system-mitkrb5? ( >=app-crypt/mit-krb5-1.15.1[${MULTILIB_USEDEP}] )
3570 - systemd? ( sys-apps/systemd:0= )
3571 - zeroconf? ( net-dns/avahi )
3572 -"
3573 -DEPEND="${CDEPEND}
3574 - ${PYTHON_DEPS}
3575 - app-text/docbook-xsl-stylesheets
3576 - dev-libs/libxslt
3577 - net-libs/libtirpc[${MULTILIB_USEDEP}]
3578 - virtual/pkgconfig
3579 - || (
3580 - net-libs/rpcsvc-proto
3581 - <sys-libs/glibc-2.26[rpc(+)]
3582 - )
3583 - test? (
3584 - !system-mitkrb5? (
3585 - >=sys-libs/nss_wrapper-1.1.3
3586 - >=net-dns/resolv_wrapper-1.1.4
3587 - >=net-libs/socket_wrapper-1.1.9
3588 - >=sys-libs/uid_wrapper-1.2.1
3589 - )
3590 - )"
3591 -RDEPEND="${CDEPEND}
3592 - python? ( ${PYTHON_DEPS} )
3593 - client? ( net-fs/cifs-utils[ads?] )
3594 - selinux? ( sec-policy/selinux-samba )
3595 - !dev-perl/Parse-Yapp
3596 -"
3597 -
3598 -REQUIRED_USE="
3599 - addc? ( python gnutls json winbind )
3600 - addns? ( python )
3601 - ads? ( acl gnutls ldap winbind )
3602 - cluster? ( ads )
3603 - gpg? ( addc )
3604 - test? ( python )
3605 - ?? ( system-heimdal system-mitkrb5 )
3606 - ${PYTHON_REQUIRED_USE}
3607 -"
3608 -
3609 -# the test suite is messed, it uses system-installed samba
3610 -# bits instead of what was built, tests things disabled via use
3611 -# flags, and generally just fails to work in a way ebuilds could
3612 -# rely on in its current state
3613 -RESTRICT="test"
3614 -
3615 -S="${WORKDIR}/${MY_P}"
3616 -
3617 -PATCHES=(
3618 - "${FILESDIR}/${PN}-4.4.0-pam.patch"
3619 - "${FILESDIR}/${PN}-4.5.1-compile_et_fix.patch"
3620 - "${FILESDIR}/${PN}-4.9.2-timespec.patch"
3621 -)
3622 -
3623 -#CONFDIR="${FILESDIR}/$(get_version_component_range 1-2)"
3624 -CONFDIR="${FILESDIR}/4.4"
3625 -
3626 -WAF_BINARY="${S}/buildtools/bin/waf"
3627 -
3628 -SHAREDMODS=""
3629 -
3630 -pkg_setup() {
3631 - python-single-r1_pkg_setup
3632 - if use cluster ; then
3633 - SHAREDMODS="idmap_rid,idmap_tdb2,idmap_ad"
3634 - elif use ads ; then
3635 - SHAREDMODS="idmap_ad"
3636 - fi
3637 -}
3638 -
3639 -src_prepare() {
3640 - default
3641 -
3642 - # un-bundle dnspython
3643 - sed -i -e '/"dns.resolver":/d' "${S}"/third_party/wscript || die
3644 -
3645 - # unbundle iso8601 unless tests are enabled
3646 - if ! use test ; then
3647 - sed -i -e '/"iso8601":/d' "${S}"/third_party/wscript || die
3648 - fi
3649 -
3650 - # ugly hackaround for bug #592502
3651 - cp /usr/include/tevent_internal.h "${S}"/lib/tevent/ || die
3652 -
3653 - sed -e 's:<gpgme\.h>:<gpgme/gpgme.h>:' \
3654 - -i source4/dsdb/samdb/ldb_modules/password_hash.c \
3655 - || die
3656 -
3657 - # Friggin' WAF shit
3658 - multilib_copy_sources
3659 -}
3660 -
3661 -multilib_src_configure() {
3662 - # when specifying libs for samba build you must append NONE to the end to
3663 - # stop it automatically including things
3664 - local bundled_libs="NONE"
3665 - if ! use system-heimdal && ! use system-mitkrb5 ; then
3666 - bundled_libs="heimbase,heimntlm,hdb,kdc,krb5,wind,gssapi,hcrypto,hx509,roken,asn1,com_err,NONE"
3667 - fi
3668 -
3669 - local myconf=(
3670 - --enable-fhs
3671 - --sysconfdir="${EPREFIX}/etc"
3672 - --localstatedir="${EPREFIX}/var"
3673 - --with-modulesdir="${EPREFIX}/usr/$(get_libdir)/samba"
3674 - --with-piddir="${EPREFIX}/run/${PN}"
3675 - --bundled-libraries="${bundled_libs}"
3676 - --builtin-libraries=NONE
3677 - --disable-rpath
3678 - --disable-rpath-install
3679 - --nopyc
3680 - --nopyo
3681 - $(multilib_native_use_with acl acl-support)
3682 - $(multilib_native_usex addc '' '--without-ad-dc')
3683 - $(multilib_native_use_with addns dnsupdate)
3684 - $(multilib_native_use_with ads)
3685 - $(multilib_native_use_enable ceph cephfs)
3686 - $(multilib_native_use_with cluster cluster-support)
3687 - $(multilib_native_use_enable cups)
3688 - $(multilib_native_use_with dmapi)
3689 - $(multilib_native_use_with fam)
3690 - $(multilib_native_use_with gpg gpgme)
3691 - $(multilib_native_use_with json json-audit)
3692 - $(multilib_native_use_enable iprint)
3693 - $(multilib_native_use_with pam)
3694 - $(multilib_native_usex pam "--with-pammodulesdir=${EPREFIX}/$(get_libdir)/security" '')
3695 - $(multilib_native_use_with quota quotas)
3696 - $(multilib_native_use_with syslog)
3697 - $(multilib_native_use_with systemd)
3698 - $(multilib_native_use_with winbind)
3699 - $(multilib_native_usex python '' '--disable-python')
3700 - $(multilib_native_use_enable zeroconf avahi)
3701 - $(multilib_native_usex test '--enable-selftest' '')
3702 - $(usex system-mitkrb5 "--with-system-mitkrb5 $(multilib_native_usex addc --with-experimental-mit-ad-dc '')" '')
3703 - $(use_enable gnutls)
3704 - $(use_with debug lttng)
3705 - $(use_with ldap)
3706 - $(use_with profiling-data)
3707 - )
3708 - multilib_is_native_abi && myconf+=( --with-shared-modules=${SHAREDMODS} )
3709 -
3710 - CPPFLAGS="-I${SYSROOT}${EPREFIX}/usr/include/et ${CPPFLAGS}" \
3711 - waf-utils_src_configure ${myconf[@]}
3712 -}
3713 -
3714 -multilib_src_compile() {
3715 - waf-utils_src_compile
3716 -}
3717 -
3718 -multilib_src_install() {
3719 - waf-utils_src_install
3720 -
3721 - # Make all .so files executable
3722 - find "${ED}" -type f -name "*.so" -exec chmod +x {} + || die
3723 -
3724 - if multilib_is_native_abi ; then
3725 - # install ldap schema for server (bug #491002)
3726 - if use ldap ; then
3727 - insinto /etc/openldap/schema
3728 - doins examples/LDAP/samba.schema
3729 - fi
3730 -
3731 - # create symlink for cups (bug #552310)
3732 - if use cups ; then
3733 - dosym ../../../bin/smbspool /usr/libexec/cups/backend/smb
3734 - fi
3735 -
3736 - # install example config file
3737 - insinto /etc/samba
3738 - doins examples/smb.conf.default
3739 -
3740 - # Fix paths in example file (#603964)
3741 - sed \
3742 - -e '/log file =/s@/usr/local/samba/var/@/var/log/samba/@' \
3743 - -e '/include =/s@/usr/local/samba/lib/@/etc/samba/@' \
3744 - -e '/path =/s@/usr/local/samba/lib/@/var/lib/samba/@' \
3745 - -e '/path =/s@/usr/local/samba/@/var/lib/samba/@' \
3746 - -e '/path =/s@/usr/spool/samba@/var/spool/samba@' \
3747 - -i "${ED%/}"/etc/samba/smb.conf.default || die
3748 -
3749 - # Install init script and conf.d file
3750 - newinitd "${CONFDIR}/samba4.initd-r1" samba
3751 - newconfd "${CONFDIR}/samba4.confd" samba
3752 -
3753 - systemd_dotmpfilesd "${FILESDIR}"/samba.conf
3754 - systemd_dounit "${FILESDIR}"/nmbd.service
3755 - systemd_dounit "${FILESDIR}"/smbd.{service,socket}
3756 - systemd_newunit "${FILESDIR}"/smbd_at.service 'smbd@.service'
3757 - systemd_dounit "${FILESDIR}"/winbindd.service
3758 - systemd_dounit "${FILESDIR}"/samba.service
3759 - fi
3760 -
3761 - if use pam && use winbind ; then
3762 - newpamd "${CONFDIR}/system-auth-winbind.pam" system-auth-winbind
3763 - # bugs #376853 and #590374
3764 - insinto /etc/security
3765 - doins examples/pam_winbind/pam_winbind.conf
3766 - fi
3767 -
3768 - keepdir /var/cache/samba
3769 - keepdir /var/lib/ctdb
3770 - keepdir /var/lib/samba/{bind-dns,private}
3771 - keepdir /var/lock/samba
3772 - keepdir /var/log/samba
3773 - keepdir /var/run/{ctdb,samba}
3774 -}
3775 -
3776 -multilib_src_test() {
3777 - if multilib_is_native_abi ; then
3778 - "${WAF_BINARY}" test || die "test failed"
3779 - fi
3780 -}
3781 -
3782 -pkg_postinst() {
3783 - ewarn "Be aware that this release contains the best of all of Samba's"
3784 - ewarn "technology parts, both a file server (that you can reasonably expect"
3785 - ewarn "to upgrade existing Samba 3.x releases to) and the AD domain"
3786 - ewarn "controller work previously known as 'samba4'."
3787 -
3788 - elog "For further information and migration steps make sure to read "
3789 - elog "https://samba.org/samba/history/${P}.html "
3790 - elog "https://wiki.samba.org/index.php/Samba4/HOWTO "
3791 -}