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/
Date: Mon, 10 Sep 2018 13:11:59
Message-Id: 1536584878.8a79bdfc23a5cedd7489c92e538737d2d0bbceab.polynomial-c@gentoo
1 commit: 8a79bdfc23a5cedd7489c92e538737d2d0bbceab
2 Author: Lars Wendler <polynomial-c <AT> gentoo <DOT> org>
3 AuthorDate: Mon Sep 10 13:07:58 2018 +0000
4 Commit: Lars Wendler <polynomial-c <AT> gentoo <DOT> org>
5 CommitDate: Mon Sep 10 13:07:58 2018 +0000
6 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=8a79bdfc
7
8 net-fs/samba: Removed old.
9
10 Package-Manager: Portage-2.3.49, Repoman-2.3.10
11
12 net-fs/samba/Manifest | 5 -
13 net-fs/samba/metadata.xml | 1 -
14 net-fs/samba/samba-4.2.14.ebuild | 262 --------------------------------
15 net-fs/samba/samba-4.6.15.ebuild | 316 --------------------------------------
16 net-fs/samba/samba-4.7.7.ebuild | 320 ---------------------------------------
17 net-fs/samba/samba-4.8.3.ebuild | 286 ----------------------------------
18 6 files changed, 1190 deletions(-)
19
20 diff --git a/net-fs/samba/Manifest b/net-fs/samba/Manifest
21 index 6aa885b7dab..f411c287730 100644
22 --- a/net-fs/samba/Manifest
23 +++ b/net-fs/samba/Manifest
24 @@ -1,14 +1,9 @@
25 -DIST samba-4.2.14.tar.gz 20883281 BLAKE2B 90bff4ef0752b952e2e31b6e86223ae7e785248ef01b15d6a26f0912452cbfdb1e828b88c81c8b6d36e1e2ca7d79a00ffd196625eb6ee96b587483a25044fd47 SHA512 269dd74ba788657434f51ac70953a293c94bcf98280eaa6f44634c5da54169a5ea7865d543a7c23860c4750a40cdee7caeaf5c7fc3dbc137f444e90f31a09890
26 DIST samba-4.5.11-disable-python-patches.tar.xz 6292 BLAKE2B c2a32a1059a02bc1c87ce5f604cbc5878c654b8f693c8486b5ba63b37513444915a7b6389fe82b7e31ab2f9577dd8462eddba60b4f4f756b4ed1145ce7bd90ae SHA512 f0e3076e3e1ecaae3f06b3ef30efc81719fb3f63a1041dcbdae4b62ca4cf693732f9eb16f047d046d4930136fed82194e82b455ea888e12cf845b3e6a122d57d
27 DIST samba-4.5.16.tar.gz 21024396 BLAKE2B e737559fb748044076608fa233700eb54c7e1c56bc234763f062b6341a179cc78a4a8cdf9f3d6f4d7f3cf8a79f846852ddd5cc753a468c3adb3a0451e1809ed9 SHA512 de8a41013cfb5ef3adcb290efd97a78a5de876d90ad05764d631f14e663a1849bb53e4ac394b46c906f1109be5748fee9316407a659c57007d36851ae8adcd7f
28 -DIST samba-4.6.15.tar.gz 21175479 BLAKE2B 40751be51e5ae1368b66d5e0919092935749a749dbb469dd503864acb9d5caf1c26c0894ac3a5294ed8b2c79de31366d80f1b565bffb4f18a7ba659872748feb SHA512 7b55e305c41380ba6dd4df94bdd88aa2d4ebbe27ec258331c04a9610ee820e4c290a3dfdcd04fa89e100b115a674380881699d6cd565f08d753d1b23036c4986
29 DIST samba-4.6.16.tar.gz 21184221 BLAKE2B 93c2a666edadf1cf6277f6ec202f629be6badec6151dff0b4faed7e9541c6b0c20776ea1c2f536ca9ae1056e153929a312f7c8b06aa92adebf0758cca7cebf6b SHA512 e51d34a5a21d40e18b221ac2d150eb5d0a72cf14b3fdbaa11ab621dc173067c8c73764c748148907f6e5633b5afc68b691b673fb6cbffb3b77e1b7281dabebc4
30 DIST samba-4.6.7-disable-python-patches.tar.xz 8896 BLAKE2B 99496f91d015f10d111e2a8738c9e66b3c1f1958c0e0894d8e9d8f3ff141fbedaa25d93699b702ab69130fda770c80c3ed4280de0af1090dedbcfd5784b72222 SHA512 c45e548a49735e17b568bebf07dc7409de3de0f93256d1dcf345d2723a27d22a51d860ed921785354fda691f83be4eca3b9d618d5c332438ebf97518a01983eb
31 DIST samba-4.7.10.tar.gz 16911799 BLAKE2B e8ee8763c9843d048589cb17c1b78a3e3983ff8766b2981a7da0c2e6f8425a85c97f2619a9a8259a94ccd07d7aa55bb9bf928261959c04eb0b7fdfe318fc2433 SHA512 4165cf9ec1c6355d0832fb4e17939f8f1544802e6e144d51a4f6030ad54660bb468b586d3db488f5e13f3d451fe4e2af94b748d2432da62ce256eb2467d3a51c
32 -DIST samba-4.7.7.tar.gz 16875059 BLAKE2B 05ecf13562e847070498e923df0cc85836b2fb98d4618942f60e4f28d6c5110b382cfe494e6578bbc06e14052c5d87b0f542ada186e4f132375c4360eaa8bb9f SHA512 78f180f602f08ab9e3000ae016f667e44f059a865b606c21e18857efb89af469c2cb2f9c1316e658badf1a1f41826ba87ccb23f38dc31fe82bf9e5b8fb93daad
33 DIST samba-4.7.9.tar.gz 16907301 BLAKE2B c5e1e7422c271893ad6bc8fbaa1c17161e221d2eb9eb7cc370d52cf3d5dd4b54b023419f9dd72476ead8da306b6a530c4fc2529efad8eab26100157ffe23b5a4 SHA512 7e7e3c611e69fef904d13503752cafb7a259dd02b0be9a73d3b31ef82d701006da47e60a68dc19abb5343aa27ee4b210aa5d9bb2c1962932835dcbccba9b4f4a
34 -DIST samba-4.8.3.tar.gz 17680660 BLAKE2B ee2c37eb935b3545eec8975d2427e55cf0dcdc8f9725e7549ffd42f8069e2b1ee65178895c173cd694442aac0a888d661837edeb8990e948b021a69e3078106f SHA512 0dd035f5f2cfc5f47f2e9b9e295548ecce73014f01e9539d9cc639f27b00e1e71a57acb018da70e70d3761281246933b6935be151df1bd35e539d6d338686217
35 DIST samba-4.8.4.tar.gz 17700008 BLAKE2B 134d074b9e5d8d17c094791cd3274c31c2f458ba5a8b17a6bc2c5be60f5bf01f3220947ee14f477711cf239c9be5ce2067fefe27ad18b2b4c2f183698dd202d9 SHA512 a3ad651717df5a441064693412965a66bb3d7927baa4ca5625b0948d7253af74eaf05c7e75e6c07853186513df38a925019616cd6439a96e9828b04cd8c5350d
36 DIST samba-4.8.5.tar.gz 17715401 BLAKE2B fc1aef2f5362fff1870abe40eebfe932f5ca347e65d1a2502ee19c9fce8cbf71e3f4181a18056d8d6b3e92d2515f946e3dc746b00f2398d91f88b1172e91cd43 SHA512 23a88c48214c3bf4cbc135cb84873bb8d12f32187ccbda47b02495fa4a12458f103de5e968e8f9a5958c116f618332cfffbf54d084e4f1e363fbf079b897e3a0
37 DIST samba-4.9.0rc5.tar.gz 18016839 BLAKE2B 015b87d1356dcb3f7546cbfa268d61c7546ea16d31bde38ea53634122c34c89ca33d0902f6a5ca51452fc8661ebdddbd9ec0a22b8875e6b1e92801b1a4192d15 SHA512 c95378718f5080da9b472714dab51755e924fe871edf8cb262195e04cb9ecdbec20093e7e24f9e917c53b986ac96a041e86cf1572710454718756068b49fb18d
38 -DIST samba-disable-python-patches-4.2.12.tar.xz 6052 BLAKE2B 0ae755cbbd8921f4e2f5adf797cd3a77f81bb15ac2d1a65645bc9b53184c397a2bb35f83b88a0de680cc834a63b263e883e91206a7df99735f5ef8f091f54bb0 SHA512 c527d0a052d3211e5b12c17bc94db56cc5e5545189ed65a760c0656c94c22e27a4b159e6439eb0370873e1619873a741f3b3bd10d3876b38eb3914a87eace372
39
40 diff --git a/net-fs/samba/metadata.xml b/net-fs/samba/metadata.xml
41 index 743e5e2960d..97a8476c02f 100644
42 --- a/net-fs/samba/metadata.xml
43 +++ b/net-fs/samba/metadata.xml
44 @@ -12,7 +12,6 @@
45 <flag name="addc">Enable Active Directory Domain Controller support</flag>
46 <flag name="addns">Enable AD DNS integration</flag>
47 <flag name="ads">Enable Active Directory support</flag>
48 - <flag name="aio">Enable asynchronous IO support</flag>
49 <flag name="ceph">Enable support for Ceph distributed filesystem via <pkg>sys-cluster/ceph</pkg></flag>
50 <flag name="client">Enables the client part</flag>
51 <flag name="cluster">Enable support for clustering</flag>
52
53 diff --git a/net-fs/samba/samba-4.2.14.ebuild b/net-fs/samba/samba-4.2.14.ebuild
54 deleted file mode 100644
55 index 393fd23ce92..00000000000
56 --- a/net-fs/samba/samba-4.2.14.ebuild
57 +++ /dev/null
58 @@ -1,262 +0,0 @@
59 -# Copyright 1999-2018 Gentoo Foundation
60 -# Distributed under the terms of the GNU General Public License v2
61 -
62 -EAPI=5
63 -PYTHON_COMPAT=( python2_7 )
64 -PYTHON_REQ_USE='threads(+),xml(+)'
65 -
66 -inherit python-single-r1 waf-utils multilib-minimal linux-info systemd versionator eutils
67 -
68 -MY_PV="${PV/_rc/rc}"
69 -MY_P="${PN}-${MY_PV}"
70 -
71 -SRC_PATH="stable"
72 -[[ ${PV} = *_rc* ]] && SRC_PATH="rc"
73 -
74 -SRC_URI="mirror://samba/${SRC_PATH}/${MY_P}.tar.gz
75 - https://dev.gentoo.org/~polynomial-c/samba-disable-python-patches-4.2.12.tar.xz"
76 -[[ ${PV} = *_rc* ]] || \
77 -KEYWORDS="hppa"
78 -
79 -DESCRIPTION="Samba Suite Version 4"
80 -HOMEPAGE="https://www.samba.org/"
81 -LICENSE="GPL-3"
82 -
83 -SLOT="0"
84 -
85 -IUSE="acl addc addns ads aio avahi client cluster cups dmapi fam gnutls iprint
86 -ldap pam quota selinux syslog +system-mitkrb5 systemd test winbind"
87 -
88 -MULTILIB_WRAPPED_HEADERS=(
89 - /usr/include/samba-4.0/policy.h
90 - /usr/include/samba-4.0/dcerpc_server.h
91 - /usr/include/samba-4.0/ctdb.h
92 - /usr/include/samba-4.0/ctdb_client.h
93 - /usr/include/samba-4.0/ctdb_protocol.h
94 - /usr/include/samba-4.0/ctdb_private.h
95 - /usr/include/samba-4.0/ctdb_typesafe_cb.h
96 - /usr/include/samba-4.0/ctdb_version.h
97 -)
98 -
99 -# sys-apps/attr is an automagic dependency (see bug #489748)
100 -CDEPEND="${PYTHON_DEPS}
101 - >=app-arch/libarchive-3.1.2[${MULTILIB_USEDEP}]
102 - dev-lang/perl:=
103 - dev-libs/libbsd[${MULTILIB_USEDEP}]
104 - dev-libs/iniparser:0
105 - dev-libs/popt[${MULTILIB_USEDEP}]
106 - sys-libs/readline:=
107 - virtual/libiconv
108 - dev-python/subunit[${PYTHON_USEDEP},${MULTILIB_USEDEP}]
109 - net-libs/libnsl:=[${MULTILIB_USEDEP}]
110 - >=net-libs/socket_wrapper-1.1.2[${MULTILIB_USEDEP}]
111 - sys-apps/attr[${MULTILIB_USEDEP}]
112 - sys-libs/libcap
113 - >=sys-libs/ldb-1.1.24[ldap(+)?,${MULTILIB_USEDEP}]
114 - sys-libs/ncurses:0=[${MULTILIB_USEDEP}]
115 - >=sys-libs/nss_wrapper-1.0.2[${MULTILIB_USEDEP}]
116 - >=sys-libs/ntdb-1.0[python,${PYTHON_USEDEP},${MULTILIB_USEDEP}]
117 - >=sys-libs/talloc-2.1.2[python,${PYTHON_USEDEP},${MULTILIB_USEDEP}]
118 - >=sys-libs/tdb-1.3.6[python,${PYTHON_USEDEP},${MULTILIB_USEDEP}]
119 - >=sys-libs/tevent-0.9.28[${MULTILIB_USEDEP}]
120 - >=sys-libs/uid_wrapper-1.0.1[${MULTILIB_USEDEP}]
121 - sys-libs/zlib[${MULTILIB_USEDEP}]
122 - acl? ( virtual/acl )
123 - addns? ( net-dns/bind-tools[gssapi] )
124 - aio? ( dev-libs/libaio )
125 - cluster? (
126 - net-libs/rpcsvc-proto
127 - !dev-db/ctdb
128 - )
129 - cups? ( net-print/cups )
130 - dmapi? ( sys-apps/dmapi )
131 - fam? ( virtual/fam )
132 - gnutls? ( dev-libs/libgcrypt:0
133 - >=net-libs/gnutls-1.4.0 )
134 - ldap? ( net-nds/openldap[${MULTILIB_USEDEP}] )
135 - pam? ( virtual/pam )
136 - system-mitkrb5? ( app-crypt/mit-krb5[${MULTILIB_USEDEP}] )
137 - !system-mitkrb5? ( >=app-crypt/heimdal-1.5[-ssl,${MULTILIB_USEDEP}] )
138 - systemd? ( sys-apps/systemd:0= )"
139 -DEPEND="${CDEPEND}
140 - virtual/pkgconfig"
141 -RDEPEND="${CDEPEND}
142 - client? ( net-fs/cifs-utils[ads?] )
143 - selinux? ( sec-policy/selinux-samba )
144 - !dev-perl/Parse-Yapp
145 -"
146 -
147 -REQUIRED_USE="addc? ( gnutls !system-mitkrb5 )
148 - ads? ( acl gnutls ldap )
149 - ${PYTHON_REQUIRED_USE}"
150 -
151 -S="${WORKDIR}/${MY_P}"
152 -
153 -PATCHES=(
154 - "${FILESDIR}/${PN}-4.2.3-heimdal_compilefix.patch"
155 - "${FILESDIR}/${PN}-4.2.7-pam.patch"
156 - "${FILESDIR}/${PN}-glibc-2.26-no_rpc.patch" #637320
157 -)
158 -
159 -CONFDIR="${FILESDIR}/$(get_version_component_range 1-2)"
160 -
161 -WAF_BINARY="${S}/buildtools/bin/waf"
162 -
163 -SHAREDMODS=""
164 -
165 -pkg_setup() {
166 - python-single-r1_pkg_setup
167 - if use aio ; then
168 - if ! linux_config_exists || ! linux_chkconfig_present AIO; then
169 - ewarn "You must enable AIO support in your kernel config, "
170 - ewarn "to be able to support asynchronous I/O. "
171 - ewarn "You can find it at"
172 - ewarn
173 - ewarn "General Support"
174 - ewarn " Enable AIO support "
175 - ewarn
176 - ewarn "and recompile your kernel..."
177 - fi
178 - fi
179 - if use cluster ; then
180 - SHAREDMODS="${SHAREDMODS}idmap_rid,idmap_tdb2,idmap_ad"
181 - fi
182 -}
183 -
184 -src_prepare() {
185 - epatch "${PATCHES[@]}"
186 -
187 - # install the patches from tarball(s)
188 - EPATCH_SUFFIX="patch" \
189 - EPATCH_FORCE="yes" \
190 - epatch "${WORKDIR}/patches"
191 -
192 - # Allow user patches
193 - epatch_user
194 - multilib_copy_sources
195 -}
196 -
197 -multilib_src_configure() {
198 - local myconf=()
199 - myconf=(
200 - --enable-fhs
201 - --sysconfdir=/etc
202 - --localstatedir=/var
203 - --with-modulesdir=/usr/$(get_libdir)/samba
204 - --with-piddir=/run/${PN}
205 - --bundled-libraries=NONE
206 - --builtin-libraries=NONE
207 - --disable-rpath
208 - --disable-rpath-install
209 - --nopyc
210 - --nopyo
211 - )
212 - if multilib_is_native_abi ; then
213 - myconf+=(
214 - $(use_with acl acl-support)
215 - $(usex addc '' '--without-ad-dc')
216 - $(use_with addns dnsupdate)
217 - $(use_with ads)
218 - $(usex ads '--with-shared-modules=idmap_ad' '')
219 - $(use_with aio aio-support)
220 - $(use_enable avahi)
221 - $(use_with cluster cluster-support)
222 - $(use_enable cups)
223 - $(use_with dmapi)
224 - $(use_with fam)
225 - $(use_enable gnutls)
226 - $(use_enable iprint)
227 - $(use_with ldap)
228 - $(use_with pam)
229 - $(use_with pam pam_smbpass)
230 - $(usex pam "--with-pammodulesdir=/$(get_libdir)/security" '')
231 - $(use_with quota quotas)
232 - $(use_with syslog)
233 - $(use_with systemd)
234 - $(usex system-mitkrb5 '--with-system-mitkrb5' '')
235 - $(use_with winbind)
236 - $(usex test '--enable-selftest' '')
237 - --with-shared-modules=${SHAREDMODS}
238 - )
239 - else
240 - myconf+=(
241 - --without-acl-support
242 - --without-ad-dc
243 - --without-dnsupdate
244 - --without-ads
245 - --without-aio-support
246 - --disable-avahi
247 - --without-cluster-support
248 - --disable-cups
249 - --without-dmapi
250 - --without-fam
251 - --disable-gnutls
252 - --disable-iprint
253 - $(use_with ldap)
254 - --without-pam
255 - --without-pam_smbpass
256 - --without-quotas
257 - --without-syslog
258 - --without-systemd
259 - $(usex system-mitkrb5 '--with-system-mitkrb5' '')
260 - --without-winbind
261 - --disable-python
262 - )
263 - fi
264 -
265 - CPPFLAGS="-I${SYSROOT}/usr/include/et ${CPPFLAGS}" \
266 - waf-utils_src_configure ${myconf[@]}
267 -}
268 -
269 -multilib_src_install() {
270 - waf-utils_src_install
271 -
272 - # Make all .so files executable
273 - find "${D}" -type f -name "*.so" -exec chmod +x {} +
274 -
275 - if multilib_is_native_abi; then
276 - # install ldap schema for server (bug #491002)
277 - if use ldap ; then
278 - insinto /etc/openldap/schema
279 - doins examples/LDAP/samba.schema
280 - fi
281 -
282 - # create symlink for cups (bug #552310)
283 - if use cups ; then
284 - dosym /usr/bin/smbspool /usr/libexec/cups/backend/smb
285 - fi
286 -
287 - # install example config file
288 - insinto /etc/samba
289 - doins examples/smb.conf.default
290 -
291 - # Install init script and conf.d file
292 - newinitd "${CONFDIR}/samba4.initd-r1" samba
293 - newconfd "${CONFDIR}/samba4.confd" samba
294 -
295 - systemd_dotmpfilesd "${FILESDIR}"/samba.conf
296 - systemd_dounit "${FILESDIR}"/nmbd.service
297 - systemd_dounit "${FILESDIR}"/smbd.{service,socket}
298 - systemd_newunit "${FILESDIR}"/smbd_at.service 'smbd@.service'
299 - systemd_dounit "${FILESDIR}"/winbindd.service
300 - systemd_dounit "${FILESDIR}"/samba.service
301 - fi
302 -}
303 -
304 -multilib_src_test() {
305 - if multilib_is_native_abi ; then
306 - "${WAF_BINARY}" test || die "test failed"
307 - fi
308 -}
309 -
310 -pkg_postinst() {
311 - ewarn "Be aware the this release contains the best of all of Samba's"
312 - ewarn "technology parts, both a file server (that you can reasonably expect"
313 - ewarn "to upgrade existing Samba 3.x releases to) and the AD domain"
314 - ewarn "controller work previously known as 'samba4'."
315 -
316 - elog "For further information and migration steps make sure to read "
317 - elog "https://www.samba.org/samba/history/${P}.html "
318 - elog "https://www.samba.org/samba/history/${PN}-4.2.0.html and"
319 - elog "https://wiki.samba.org/index.php/Samba4/HOWTO "
320 -}
321
322 diff --git a/net-fs/samba/samba-4.6.15.ebuild b/net-fs/samba/samba-4.6.15.ebuild
323 deleted file mode 100644
324 index f45ae5e7a91..00000000000
325 --- a/net-fs/samba/samba-4.6.15.ebuild
326 +++ /dev/null
327 @@ -1,316 +0,0 @@
328 -# Copyright 1999-2018 Gentoo Foundation
329 -# Distributed under the terms of the GNU General Public License v2
330 -
331 -EAPI=6
332 -PYTHON_COMPAT=( python2_7 )
333 -PYTHON_REQ_USE='threads(+),xml(+)'
334 -
335 -inherit python-single-r1 waf-utils multilib-minimal linux-info systemd eutils
336 -
337 -MY_PV="${PV/_rc/rc}"
338 -MY_P="${PN}-${MY_PV}"
339 -
340 -SRC_PATH="stable"
341 -[[ ${PV} = *_rc* ]] && SRC_PATH="rc"
342 -
343 -SRC_URI="mirror://samba/${SRC_PATH}/${MY_P}.tar.gz
344 - https://dev.gentoo.org/~axs/samba-4.6.7-disable-python-patches.tar.xz"
345 -[[ ${PV} = *_rc* ]] || \
346 -KEYWORDS="~amd64 ~arm64 ~hppa ~x86"
347 -
348 -DESCRIPTION="Samba Suite Version 4"
349 -HOMEPAGE="https://www.samba.org/"
350 -LICENSE="GPL-3"
351 -
352 -SLOT="0"
353 -
354 -IUSE="acl addc addns ads ceph client cluster cups debug dmapi fam gnutls gpg iprint ldap pam python
355 -quota selinux syslog system-heimdal +system-mitkrb5 systemd test winbind zeroconf"
356 -
357 -MULTILIB_WRAPPED_HEADERS=(
358 - /usr/include/samba-4.0/policy.h
359 - /usr/include/samba-4.0/dcerpc_server.h
360 - /usr/include/samba-4.0/ctdb.h
361 - /usr/include/samba-4.0/ctdb_client.h
362 - /usr/include/samba-4.0/ctdb_protocol.h
363 - /usr/include/samba-4.0/ctdb_private.h
364 - /usr/include/samba-4.0/ctdb_typesafe_cb.h
365 - /usr/include/samba-4.0/ctdb_version.h
366 -)
367 -
368 -# sys-apps/attr is an automagic dependency (see bug #489748)
369 -CDEPEND="
370 - >=app-arch/libarchive-3.1.2[${MULTILIB_USEDEP}]
371 - dev-lang/perl:=
372 - dev-libs/libaio[${MULTILIB_USEDEP}]
373 - dev-libs/libbsd[${MULTILIB_USEDEP}]
374 - dev-libs/iniparser:0
375 - dev-libs/popt[${MULTILIB_USEDEP}]
376 - dev-python/subunit[${PYTHON_USEDEP},${MULTILIB_USEDEP}]
377 - >=dev-util/cmocka-1.0.0[${MULTILIB_USEDEP}]
378 - net-libs/libnsl:=[${MULTILIB_USEDEP}]
379 - sys-apps/attr[${MULTILIB_USEDEP}]
380 - ~sys-libs/ldb-1.1.29[ldap(+)?,python(+),${PYTHON_USEDEP},${MULTILIB_USEDEP}]
381 - sys-libs/libcap
382 - sys-libs/ncurses:0=[${MULTILIB_USEDEP}]
383 - sys-libs/readline:0=
384 - >=sys-libs/talloc-2.1.9[python?,${PYTHON_USEDEP},${MULTILIB_USEDEP}]
385 - >=sys-libs/tdb-1.3.12[python?,${PYTHON_USEDEP},${MULTILIB_USEDEP}]
386 - >=sys-libs/tevent-0.9.34[python?,${PYTHON_USEDEP},${MULTILIB_USEDEP}]
387 - sys-libs/zlib[${MULTILIB_USEDEP}]
388 - virtual/libiconv
389 - pam? ( virtual/pam )
390 - acl? ( virtual/acl )
391 - addns? (
392 - net-dns/bind-tools[gssapi]
393 - dev-python/dnspython:=[${PYTHON_USEDEP}]
394 - )
395 - ceph? ( sys-cluster/ceph )
396 - cluster? (
397 - net-libs/rpcsvc-proto
398 - !dev-db/ctdb
399 - )
400 - cups? ( net-print/cups )
401 - debug? ( dev-util/lttng-ust )
402 - dmapi? ( sys-apps/dmapi )
403 - fam? ( virtual/fam )
404 - gnutls? (
405 - dev-libs/libgcrypt:0
406 - >=net-libs/gnutls-1.4.0
407 - )
408 - gpg? ( app-crypt/gpgme )
409 - ldap? ( net-nds/openldap[${MULTILIB_USEDEP}] )
410 - system-heimdal? ( >=app-crypt/heimdal-1.5[-ssl,${MULTILIB_USEDEP}] )
411 - system-mitkrb5? ( app-crypt/mit-krb5[${MULTILIB_USEDEP}] )
412 - systemd? ( sys-apps/systemd:0= )"
413 -DEPEND="${CDEPEND}
414 - ${PYTHON_DEPS}
415 - app-text/docbook-xsl-stylesheets
416 - dev-libs/libxslt
417 - virtual/pkgconfig
418 - test? (
419 - !system-mitkrb5? (
420 - >=sys-libs/nss_wrapper-1.1.3
421 - >=net-dns/resolv_wrapper-1.1.4
422 - >=net-libs/socket_wrapper-1.1.7
423 - >=sys-libs/uid_wrapper-1.2.1
424 - )
425 - )"
426 -RDEPEND="${CDEPEND}
427 - python? ( ${PYTHON_DEPS} )
428 - client? ( net-fs/cifs-utils[ads?] )
429 - selinux? ( sec-policy/selinux-samba )
430 - !dev-perl/Parse-Yapp
431 -"
432 -
433 -REQUIRED_USE="
434 - addc? ( python gnutls !system-mitkrb5 )
435 - addns? ( python )
436 - ads? ( acl gnutls ldap )
437 - cluster? ( ads )
438 - gpg? ( addc )
439 - test? ( python )
440 - ?? ( system-heimdal system-mitkrb5 )
441 - ${PYTHON_REQUIRED_USE}
442 -"
443 -
444 -# the test suite is messed, it uses system-installed samba
445 -# bits instead of what was built, tests things disabled via use
446 -# flags, and generally just fails to work in a way ebuilds could
447 -# rely on in its current state
448 -RESTRICT="test"
449 -
450 -S="${WORKDIR}/${MY_P}"
451 -
452 -PATCHES=(
453 - "${FILESDIR}/${PN}-4.4.0-pam.patch"
454 - "${FILESDIR}/${PN}-4.5.1-compile_et_fix.patch"
455 - "${FILESDIR}/${PN}-glibc-2.26-no_rpc.patch" #637320
456 - "${FILESDIR}/${PN}-4.6-no_ads.patch"
457 -)
458 -
459 -#CONFDIR="${FILESDIR}/$(get_version_component_range 1-2)"
460 -CONFDIR="${FILESDIR}/4.4"
461 -
462 -WAF_BINARY="${S}/buildtools/bin/waf"
463 -
464 -SHAREDMODS=""
465 -
466 -pkg_setup() {
467 - python-single-r1_pkg_setup
468 - if use cluster ; then
469 - SHAREDMODS="idmap_rid,idmap_tdb2,idmap_ad"
470 - elif use ads ; then
471 - SHAREDMODS="idmap_ad"
472 - fi
473 -}
474 -
475 -src_prepare() {
476 - default
477 -
478 - # install the patches from tarball(s)
479 - eapply "${WORKDIR}/patches"
480 -
481 - # un-bundle dnspython
482 - sed -i -e '/"dns.resolver":/d' "${S}"/third_party/wscript || die
483 -
484 - # unbundle iso8601 unless tests are enabled
485 - use test || sed -i -e '/"iso8601":/d' "${S}"/third_party/wscript || die
486 -
487 - # ugly hackaround for bug #592502
488 - cp /usr/include/tevent_internal.h "${S}"/lib/tevent/ || die
489 -
490 - sed -e 's:<gpgme\.h>:<gpgme/gpgme.h>:' \
491 - -i source4/dsdb/samdb/ldb_modules/password_hash.c \
492 - || die
493 -
494 - # Friggin' WAF shit
495 - multilib_copy_sources
496 -}
497 -
498 -multilib_src_configure() {
499 - # when specifying libs for samba build you must append NONE to the end to
500 - # stop it automatically including things
501 - local bundled_libs="NONE"
502 - if ! use system-heimdal && ! use system-mitkrb5 ; then
503 - bundled_libs="heimbase,heimntlm,hdb,kdc,krb5,wind,gssapi,hcrypto,hx509,roken,asn1,com_err,NONE"
504 - fi
505 -
506 - local myconf=()
507 - myconf=(
508 - --enable-fhs
509 - --sysconfdir="${EPREFIX}/etc"
510 - --localstatedir="${EPREFIX}/var"
511 - --with-modulesdir="${EPREFIX}/usr/$(get_libdir)/samba"
512 - --with-piddir="${EPREFIX}/run/${PN}"
513 - --bundled-libraries="${bundled_libs}"
514 - --builtin-libraries=NONE
515 - --disable-rpath
516 - --disable-rpath-install
517 - --nopyc
518 - --nopyo
519 - )
520 - if multilib_is_native_abi ; then
521 - myconf+=(
522 - $(use_with acl acl-support)
523 - $(usex addc '' '--without-ad-dc')
524 - $(use_with addns dnsupdate)
525 - $(use_with ads)
526 - $(use_enable ceph cephfs)
527 - $(use_with cluster cluster-support)
528 - $(use_enable cups)
529 - $(use_with debug lttng)
530 - $(use_with dmapi)
531 - $(use_with fam)
532 - $(use_enable gnutls)
533 - $(use_with gpg gpgme)
534 - $(use_enable iprint)
535 - $(use_with ldap)
536 - $(use_with pam)
537 - $(usex pam "--with-pammodulesdir=${EPREFIX}/$(get_libdir)/security" '')
538 - $(use_with quota quotas)
539 - $(use_with syslog)
540 - $(use_with systemd)
541 - $(usex system-mitkrb5 '--with-system-mitkrb5' '')
542 - $(use_with winbind)
543 - $(usex python '' '--disable-python')
544 - $(usex test '--enable-selftest' '')
545 - $(use_enable zeroconf avahi)
546 - --with-shared-modules=${SHAREDMODS}
547 - )
548 - else
549 - myconf+=(
550 - --without-acl-support
551 - --without-ad-dc
552 - --without-dnsupdate
553 - --without-ads
554 - --disable-avahi
555 - --disable-cephfs
556 - --without-cluster-support
557 - --disable-cups
558 - --without-dmapi
559 - --without-fam
560 - --disable-gnutls
561 - --without-gpgme
562 - --disable-iprint
563 - $(use_with ldap)
564 - $(use_with debug lttng)
565 - --without-pam
566 - --without-quotas
567 - --without-syslog
568 - --without-systemd
569 - $(usex system-mitkrb5 '--with-system-mitkrb5' '')
570 - --without-winbind
571 - --disable-python
572 - )
573 - fi
574 -
575 - CPPFLAGS="-I${SYSROOT}${EPREFIX}/usr/include/et ${CPPFLAGS}" \
576 - waf-utils_src_configure ${myconf[@]}
577 -}
578 -
579 -multilib_src_compile() {
580 - waf-utils_src_compile
581 -}
582 -
583 -multilib_src_install() {
584 - waf-utils_src_install
585 -
586 - # Make all .so files executable
587 - find "${D}" -type f -name "*.so" -exec chmod +x {} +
588 -
589 - if multilib_is_native_abi; then
590 - # install ldap schema for server (bug #491002)
591 - if use ldap ; then
592 - insinto /etc/openldap/schema
593 - doins examples/LDAP/samba.schema
594 - fi
595 -
596 - # create symlink for cups (bug #552310)
597 - if use cups ; then
598 - dosym ../../../bin/smbspool /usr/libexec/cups/backend/smb
599 - fi
600 -
601 - # install example config file
602 - insinto /etc/samba
603 - doins examples/smb.conf.default
604 -
605 - # Fix paths in example file (#603964)
606 - sed \
607 - -e '/log file =/s@/usr/local/samba/var/@/var/log/samba/@' \
608 - -e '/include =/s@/usr/local/samba/lib/@/etc/samba/@' \
609 - -e '/path =/s@/usr/local/samba/lib/@/var/lib/samba/@' \
610 - -e '/path =/s@/usr/local/samba/@/var/lib/samba/@' \
611 - -e '/path =/s@/usr/spool/samba@/var/spool/samba@' \
612 - -i "${ED%/}"/etc/samba/smb.conf.default || die
613 -
614 - # Install init script and conf.d file
615 - newinitd "${CONFDIR}/samba4.initd-r1" samba
616 - newconfd "${CONFDIR}/samba4.confd" samba
617 -
618 - systemd_dotmpfilesd "${FILESDIR}"/samba.conf
619 - systemd_dounit "${FILESDIR}"/nmbd.service
620 - systemd_dounit "${FILESDIR}"/smbd.{service,socket}
621 - systemd_newunit "${FILESDIR}"/smbd_at.service 'smbd@.service'
622 - systemd_dounit "${FILESDIR}"/winbindd.service
623 - systemd_dounit "${FILESDIR}"/samba.service
624 - fi
625 -}
626 -
627 -multilib_src_test() {
628 - if multilib_is_native_abi ; then
629 - "${WAF_BINARY}" test || die "test failed"
630 - fi
631 -}
632 -
633 -pkg_postinst() {
634 - ewarn "Be aware the this release contains the best of all of Samba's"
635 - ewarn "technology parts, both a file server (that you can reasonably expect"
636 - ewarn "to upgrade existing Samba 3.x releases to) and the AD domain"
637 - ewarn "controller work previously known as 'samba4'."
638 -
639 - elog "For further information and migration steps make sure to read "
640 - elog "https://samba.org/samba/history/${P}.html "
641 - elog "https://samba.org/samba/history/${PN}-4.5.0.html and"
642 - elog "https://wiki.samba.org/index.php/Samba4/HOWTO "
643 -}
644
645 diff --git a/net-fs/samba/samba-4.7.7.ebuild b/net-fs/samba/samba-4.7.7.ebuild
646 deleted file mode 100644
647 index 9ed05cd5ef1..00000000000
648 --- a/net-fs/samba/samba-4.7.7.ebuild
649 +++ /dev/null
650 @@ -1,320 +0,0 @@
651 -# Copyright 1999-2018 Gentoo Foundation
652 -# Distributed under the terms of the GNU General Public License v2
653 -
654 -EAPI=6
655 -PYTHON_COMPAT=( python2_7 )
656 -PYTHON_REQ_USE='threads(+),xml(+)'
657 -
658 -inherit python-single-r1 waf-utils multilib-minimal linux-info systemd eutils
659 -
660 -MY_PV="${PV/_rc/rc}"
661 -MY_P="${PN}-${MY_PV}"
662 -
663 -SRC_PATH="stable"
664 -[[ ${PV} = *_rc* ]] && SRC_PATH="rc"
665 -
666 -SRC_URI="mirror://samba/${SRC_PATH}/${MY_P}.tar.gz"
667 -[[ ${PV} = *_rc* ]] || \
668 -KEYWORDS="~amd64 ~arm64 ~hppa ~x86"
669 -
670 -DESCRIPTION="Samba Suite Version 4"
671 -HOMEPAGE="https://www.samba.org/"
672 -LICENSE="GPL-3"
673 -
674 -SLOT="0"
675 -
676 -IUSE="acl addc addns ads ceph client cluster cups debug dmapi fam gnutls gpg iprint ldap pam python
677 -quota selinux syslog system-heimdal +system-mitkrb5 systemd test winbind zeroconf"
678 -
679 -MULTILIB_WRAPPED_HEADERS=(
680 - /usr/include/samba-4.0/policy.h
681 - /usr/include/samba-4.0/dcerpc_server.h
682 - /usr/include/samba-4.0/ctdb.h
683 - /usr/include/samba-4.0/ctdb_client.h
684 - /usr/include/samba-4.0/ctdb_protocol.h
685 - /usr/include/samba-4.0/ctdb_private.h
686 - /usr/include/samba-4.0/ctdb_typesafe_cb.h
687 - /usr/include/samba-4.0/ctdb_version.h
688 -)
689 -
690 -# sys-apps/attr is an automagic dependency (see bug #489748)
691 -CDEPEND="
692 - >=app-arch/libarchive-3.1.2[${MULTILIB_USEDEP}]
693 - dev-lang/perl:=
694 - dev-libs/libaio[${MULTILIB_USEDEP}]
695 - dev-libs/libbsd[${MULTILIB_USEDEP}]
696 - dev-libs/iniparser:0
697 - dev-libs/popt[${MULTILIB_USEDEP}]
698 - dev-python/subunit[${PYTHON_USEDEP},${MULTILIB_USEDEP}]
699 - >=dev-util/cmocka-1.1.1[${MULTILIB_USEDEP}]
700 - net-libs/libnsl:=[${MULTILIB_USEDEP}]
701 - sys-apps/attr[${MULTILIB_USEDEP}]
702 - >=sys-libs/ldb-1.2.3[ldap(+)?,python?,${PYTHON_USEDEP},${MULTILIB_USEDEP}]
703 - <sys-libs/ldb-1.3.0[ldap(+)?,python?,${PYTHON_USEDEP},${MULTILIB_USEDEP}]
704 - sys-libs/libcap
705 - sys-libs/ncurses:0=[${MULTILIB_USEDEP}]
706 - sys-libs/readline:0=
707 - >=sys-libs/talloc-2.1.9[python?,${PYTHON_USEDEP},${MULTILIB_USEDEP}]
708 - >=sys-libs/tdb-1.3.14[python?,${PYTHON_USEDEP},${MULTILIB_USEDEP}]
709 - >=sys-libs/tevent-0.9.34[python?,${PYTHON_USEDEP},${MULTILIB_USEDEP}]
710 - sys-libs/zlib[${MULTILIB_USEDEP}]
711 - virtual/libiconv
712 - pam? ( virtual/pam )
713 - acl? ( virtual/acl )
714 - addns? (
715 - net-dns/bind-tools[gssapi]
716 - dev-python/dnspython:=[${PYTHON_USEDEP}]
717 - )
718 - ceph? ( sys-cluster/ceph )
719 - cluster? (
720 - net-libs/rpcsvc-proto
721 - !dev-db/ctdb
722 - )
723 - cups? ( net-print/cups )
724 - debug? ( dev-util/lttng-ust )
725 - dmapi? ( sys-apps/dmapi )
726 - fam? ( virtual/fam )
727 - gnutls? (
728 - dev-libs/libgcrypt:0
729 - >=net-libs/gnutls-1.4.0
730 - )
731 - gpg? ( app-crypt/gpgme )
732 - ldap? ( net-nds/openldap[${MULTILIB_USEDEP}] )
733 - system-heimdal? ( >=app-crypt/heimdal-1.5[-ssl,${MULTILIB_USEDEP}] )
734 - system-mitkrb5? ( >=app-crypt/mit-krb5-1.15.1[${MULTILIB_USEDEP}] )
735 - systemd? ( sys-apps/systemd:0= )
736 -"
737 -DEPEND="${CDEPEND}
738 - ${PYTHON_DEPS}
739 - app-text/docbook-xsl-stylesheets
740 - dev-libs/libxslt
741 - virtual/pkgconfig
742 - net-libs/libtirpc[${MULTILIB_USEDEP}]
743 - || (
744 - net-libs/rpcsvc-proto
745 - <sys-libs/glibc-2.26[rpc(+)]
746 - )
747 - test? (
748 - !system-mitkrb5? (
749 - >=sys-libs/nss_wrapper-1.1.3
750 - >=net-dns/resolv_wrapper-1.1.4
751 - >=net-libs/socket_wrapper-1.1.7
752 - >=sys-libs/uid_wrapper-1.2.1
753 - )
754 - )"
755 -RDEPEND="${CDEPEND}
756 - python? ( ${PYTHON_DEPS} )
757 - client? ( net-fs/cifs-utils[ads?] )
758 - selinux? ( sec-policy/selinux-samba )
759 - !dev-perl/Parse-Yapp
760 -"
761 -
762 -REQUIRED_USE="
763 - addc? ( python gnutls )
764 - addns? ( python )
765 - ads? ( acl gnutls ldap )
766 - cluster? ( ads )
767 - gpg? ( addc )
768 - test? ( python )
769 - ?? ( system-heimdal system-mitkrb5 )
770 - ${PYTHON_REQUIRED_USE}
771 -"
772 -
773 -# the test suite is messed, it uses system-installed samba
774 -# bits instead of what was built, tests things disabled via use
775 -# flags, and generally just fails to work in a way ebuilds could
776 -# rely on in its current state
777 -RESTRICT="test"
778 -
779 -S="${WORKDIR}/${MY_P}"
780 -
781 -PATCHES=(
782 - "${FILESDIR}/${PN}-4.4.0-pam.patch"
783 - "${FILESDIR}/${PN}-4.5.1-compile_et_fix.patch"
784 - "${FILESDIR}"/talloc-disable-python.patch
785 - "${FILESDIR}/${PN}-4.7.3-krb-cross-compile.patch"
786 - "${FILESDIR}/${PN}-4.6-no_ads.patch"
787 -)
788 -
789 -#CONFDIR="${FILESDIR}/$(get_version_component_range 1-2)"
790 -CONFDIR="${FILESDIR}/4.4"
791 -
792 -WAF_BINARY="${S}/buildtools/bin/waf"
793 -
794 -SHAREDMODS=""
795 -
796 -pkg_setup() {
797 - python-single-r1_pkg_setup
798 - if use cluster ; then
799 - SHAREDMODS="idmap_rid,idmap_tdb2,idmap_ad"
800 - elif use ads ; then
801 - SHAREDMODS="idmap_ad"
802 - fi
803 -}
804 -
805 -src_prepare() {
806 - default
807 -
808 - # un-bundle dnspython
809 - sed -i -e '/"dns.resolver":/d' "${S}"/third_party/wscript || die
810 -
811 - # unbundle iso8601 unless tests are enabled
812 - use test || sed -i -e '/"iso8601":/d' "${S}"/third_party/wscript || die
813 -
814 - # ugly hackaround for bug #592502
815 - cp /usr/include/tevent_internal.h "${S}"/lib/tevent/ || die
816 -
817 - sed -e 's:<gpgme\.h>:<gpgme/gpgme.h>:' \
818 - -i source4/dsdb/samdb/ldb_modules/password_hash.c \
819 - || die
820 -
821 - # Friggin' WAF shit
822 - multilib_copy_sources
823 -}
824 -
825 -multilib_src_configure() {
826 - # when specifying libs for samba build you must append NONE to the end to
827 - # stop it automatically including things
828 - local bundled_libs="NONE"
829 - if ! use system-heimdal && ! use system-mitkrb5 ; then
830 - bundled_libs="heimbase,heimntlm,hdb,kdc,krb5,wind,gssapi,hcrypto,hx509,roken,asn1,com_err,NONE"
831 - fi
832 -
833 - local myconf=()
834 - myconf=(
835 - --enable-fhs
836 - --sysconfdir="${EPREFIX}/etc"
837 - --localstatedir="${EPREFIX}/var"
838 - --with-modulesdir="${EPREFIX}/usr/$(get_libdir)/samba"
839 - --with-piddir="${EPREFIX}/run/${PN}"
840 - --bundled-libraries="${bundled_libs}"
841 - --builtin-libraries=NONE
842 - --disable-rpath
843 - --disable-rpath-install
844 - --nopyc
845 - --nopyo
846 - )
847 - if multilib_is_native_abi ; then
848 - myconf+=(
849 - $(use_with acl acl-support)
850 - $(usex addc '' '--without-ad-dc')
851 - $(use_with addns dnsupdate)
852 - $(use_with ads)
853 - $(use_enable ceph cephfs)
854 - $(use_with cluster cluster-support)
855 - $(use_enable cups)
856 - $(use_with debug lttng)
857 - $(use_with dmapi)
858 - $(use_with fam)
859 - $(use_enable gnutls)
860 - $(use_with gpg gpgme)
861 - $(use_enable iprint)
862 - $(use_with ldap)
863 - $(use_with pam)
864 - $(usex pam "--with-pammodulesdir=${EPREFIX}/$(get_libdir)/security" '')
865 - $(use_with quota quotas)
866 - $(use_with syslog)
867 - $(use_with systemd)
868 - $(usex system-mitkrb5 '--with-system-mitkrb5' '')
869 - $(use_with winbind)
870 - $(usex python '' '--disable-python')
871 - $(usex test '--enable-selftest' '')
872 - $(use_enable zeroconf avahi)
873 - --with-shared-modules=${SHAREDMODS}
874 - )
875 - else
876 - myconf+=(
877 - --without-acl-support
878 - --without-ad-dc
879 - --without-dnsupdate
880 - --without-ads
881 - --disable-avahi
882 - --disable-cephfs
883 - --without-cluster-support
884 - --disable-cups
885 - --without-dmapi
886 - --without-fam
887 - --disable-gnutls
888 - --without-gpgme
889 - --disable-iprint
890 - $(use_with ldap)
891 - $(use_with debug lttng)
892 - --without-pam
893 - --without-quotas
894 - --without-syslog
895 - --without-systemd
896 - $(usex system-mitkrb5 '--with-system-mitkrb5' '')
897 - --without-winbind
898 - --disable-python
899 - )
900 - fi
901 -
902 - CPPFLAGS="-I${SYSROOT}${EPREFIX}/usr/include/et ${CPPFLAGS}" \
903 - waf-utils_src_configure ${myconf[@]}
904 -}
905 -
906 -multilib_src_compile() {
907 - waf-utils_src_compile
908 -}
909 -
910 -multilib_src_install() {
911 - waf-utils_src_install
912 -
913 - # Make all .so files executable
914 - find "${D}" -type f -name "*.so" -exec chmod +x {} +
915 -
916 - if multilib_is_native_abi; then
917 - # install ldap schema for server (bug #491002)
918 - if use ldap ; then
919 - insinto /etc/openldap/schema
920 - doins examples/LDAP/samba.schema
921 - fi
922 -
923 - # create symlink for cups (bug #552310)
924 - if use cups ; then
925 - dosym ../../../bin/smbspool /usr/libexec/cups/backend/smb
926 - fi
927 -
928 - # install example config file
929 - insinto /etc/samba
930 - doins examples/smb.conf.default
931 -
932 - # Fix paths in example file (#603964)
933 - sed \
934 - -e '/log file =/s@/usr/local/samba/var/@/var/log/samba/@' \
935 - -e '/include =/s@/usr/local/samba/lib/@/etc/samba/@' \
936 - -e '/path =/s@/usr/local/samba/lib/@/var/lib/samba/@' \
937 - -e '/path =/s@/usr/local/samba/@/var/lib/samba/@' \
938 - -e '/path =/s@/usr/spool/samba@/var/spool/samba@' \
939 - -i "${ED%/}"/etc/samba/smb.conf.default || die
940 -
941 - # Install init script and conf.d file
942 - newinitd "${CONFDIR}/samba4.initd-r1" samba
943 - newconfd "${CONFDIR}/samba4.confd" samba
944 -
945 - systemd_dotmpfilesd "${FILESDIR}"/samba.conf
946 - systemd_dounit "${FILESDIR}"/nmbd.service
947 - systemd_dounit "${FILESDIR}"/smbd.{service,socket}
948 - systemd_newunit "${FILESDIR}"/smbd_at.service 'smbd@.service'
949 - systemd_dounit "${FILESDIR}"/winbindd.service
950 - systemd_dounit "${FILESDIR}"/samba.service
951 - fi
952 -}
953 -
954 -multilib_src_test() {
955 - if multilib_is_native_abi ; then
956 - "${WAF_BINARY}" test || die "test failed"
957 - fi
958 -}
959 -
960 -pkg_postinst() {
961 - ewarn "Be aware the this release contains the best of all of Samba's"
962 - ewarn "technology parts, both a file server (that you can reasonably expect"
963 - ewarn "to upgrade existing Samba 3.x releases to) and the AD domain"
964 - ewarn "controller work previously known as 'samba4'."
965 -
966 - elog "For further information and migration steps make sure to read "
967 - elog "https://samba.org/samba/history/${P}.html "
968 - elog "https://samba.org/samba/history/${PN}-4.5.0.html and"
969 - elog "https://wiki.samba.org/index.php/Samba4/HOWTO "
970 -}
971
972 diff --git a/net-fs/samba/samba-4.8.3.ebuild b/net-fs/samba/samba-4.8.3.ebuild
973 deleted file mode 100644
974 index 49f819fe736..00000000000
975 --- a/net-fs/samba/samba-4.8.3.ebuild
976 +++ /dev/null
977 @@ -1,286 +0,0 @@
978 -# Copyright 1999-2018 Gentoo Foundation
979 -# Distributed under the terms of the GNU General Public License v2
980 -
981 -EAPI=6
982 -PYTHON_COMPAT=( python2_7 )
983 -PYTHON_REQ_USE='threads(+),xml(+)'
984 -
985 -inherit python-single-r1 waf-utils multilib-minimal linux-info systemd
986 -
987 -MY_PV="${PV/_rc/rc}"
988 -MY_P="${PN}-${MY_PV}"
989 -
990 -SRC_PATH="stable"
991 -[[ ${PV} = *_rc* ]] && SRC_PATH="rc"
992 -
993 -SRC_URI="mirror://samba/${SRC_PATH}/${MY_P}.tar.gz"
994 -[[ ${PV} = *_rc* ]] || \
995 -KEYWORDS="~amd64 ~arm64 ~hppa ~x86"
996 -
997 -DESCRIPTION="Samba Suite Version 4"
998 -HOMEPAGE="https://www.samba.org/"
999 -LICENSE="GPL-3"
1000 -
1001 -SLOT="0"
1002 -
1003 -IUSE="acl addc addns ads ceph client cluster cups debug dmapi fam gnutls gpg iprint ldap pam python
1004 -quota selinux syslog system-heimdal +system-mitkrb5 systemd test winbind zeroconf"
1005 -
1006 -MULTILIB_WRAPPED_HEADERS=(
1007 - /usr/include/samba-4.0/policy.h
1008 - /usr/include/samba-4.0/dcerpc_server.h
1009 - /usr/include/samba-4.0/ctdb.h
1010 - /usr/include/samba-4.0/ctdb_client.h
1011 - /usr/include/samba-4.0/ctdb_protocol.h
1012 - /usr/include/samba-4.0/ctdb_private.h
1013 - /usr/include/samba-4.0/ctdb_typesafe_cb.h
1014 - /usr/include/samba-4.0/ctdb_version.h
1015 -)
1016 -
1017 -# sys-apps/attr is an automagic dependency (see bug #489748)
1018 -CDEPEND="
1019 - >=app-arch/libarchive-3.1.2[${MULTILIB_USEDEP}]
1020 - dev-lang/perl:=
1021 - dev-libs/libaio[${MULTILIB_USEDEP}]
1022 - dev-libs/libbsd[${MULTILIB_USEDEP}]
1023 - dev-libs/iniparser:0
1024 - dev-libs/popt[${MULTILIB_USEDEP}]
1025 - dev-python/subunit[${PYTHON_USEDEP},${MULTILIB_USEDEP}]
1026 - >=dev-util/cmocka-1.1.1[${MULTILIB_USEDEP}]
1027 - net-libs/libnsl:=[${MULTILIB_USEDEP}]
1028 - sys-apps/attr[${MULTILIB_USEDEP}]
1029 - >=sys-libs/ldb-1.3.4[ldap(+)?,python?,${PYTHON_USEDEP},${MULTILIB_USEDEP}]
1030 - <sys-libs/ldb-1.4.0[ldap(+)?,python?,${PYTHON_USEDEP},${MULTILIB_USEDEP}]
1031 - sys-libs/libcap
1032 - sys-libs/ncurses:0=[${MULTILIB_USEDEP}]
1033 - sys-libs/readline:0=
1034 - >=sys-libs/talloc-2.1.11[python?,${PYTHON_USEDEP},${MULTILIB_USEDEP}]
1035 - >=sys-libs/tdb-1.3.15[python?,${PYTHON_USEDEP},${MULTILIB_USEDEP}]
1036 - >=sys-libs/tevent-0.9.36[python?,${PYTHON_USEDEP},${MULTILIB_USEDEP}]
1037 - sys-libs/zlib[${MULTILIB_USEDEP}]
1038 - virtual/libiconv
1039 - pam? ( virtual/pam )
1040 - acl? ( virtual/acl )
1041 - addns? (
1042 - net-dns/bind-tools[gssapi]
1043 - dev-python/dnspython:=[${PYTHON_USEDEP}]
1044 - )
1045 - ceph? ( sys-cluster/ceph )
1046 - cluster? (
1047 - net-libs/rpcsvc-proto
1048 - !dev-db/ctdb
1049 - )
1050 - cups? ( net-print/cups )
1051 - debug? ( dev-util/lttng-ust )
1052 - dmapi? ( sys-apps/dmapi )
1053 - fam? ( virtual/fam )
1054 - gnutls? (
1055 - dev-libs/libgcrypt:0
1056 - >=net-libs/gnutls-1.4.0
1057 - )
1058 - gpg? ( app-crypt/gpgme )
1059 - ldap? ( net-nds/openldap[${MULTILIB_USEDEP}] )
1060 - system-heimdal? ( >=app-crypt/heimdal-1.5[-ssl,${MULTILIB_USEDEP}] )
1061 - system-mitkrb5? ( >=app-crypt/mit-krb5-1.15.1[${MULTILIB_USEDEP}] )
1062 - systemd? ( sys-apps/systemd:0= )
1063 -"
1064 -DEPEND="${CDEPEND}
1065 - ${PYTHON_DEPS}
1066 - app-text/docbook-xsl-stylesheets
1067 - dev-libs/libxslt
1068 - net-libs/libtirpc[${MULTILIB_USEDEP}]
1069 - virtual/pkgconfig
1070 - || (
1071 - net-libs/rpcsvc-proto
1072 - <sys-libs/glibc-2.26[rpc(+)]
1073 - )
1074 - test? (
1075 - !system-mitkrb5? (
1076 - >=sys-libs/nss_wrapper-1.1.3
1077 - >=net-dns/resolv_wrapper-1.1.4
1078 - >=net-libs/socket_wrapper-1.1.7
1079 - >=sys-libs/uid_wrapper-1.2.1
1080 - )
1081 - )"
1082 -RDEPEND="${CDEPEND}
1083 - python? ( ${PYTHON_DEPS} )
1084 - client? ( net-fs/cifs-utils[ads?] )
1085 - selinux? ( sec-policy/selinux-samba )
1086 - !dev-perl/Parse-Yapp
1087 -"
1088 -
1089 -REQUIRED_USE="
1090 - addc? ( python gnutls winbind )
1091 - addns? ( python )
1092 - ads? ( acl gnutls ldap winbind )
1093 - cluster? ( ads )
1094 - gpg? ( addc )
1095 - test? ( python )
1096 - ?? ( system-heimdal system-mitkrb5 )
1097 - ${PYTHON_REQUIRED_USE}
1098 -"
1099 -
1100 -# the test suite is messed, it uses system-installed samba
1101 -# bits instead of what was built, tests things disabled via use
1102 -# flags, and generally just fails to work in a way ebuilds could
1103 -# rely on in its current state
1104 -RESTRICT="test"
1105 -
1106 -S="${WORKDIR}/${MY_P}"
1107 -
1108 -PATCHES=(
1109 - "${FILESDIR}/${PN}-4.4.0-pam.patch"
1110 - "${FILESDIR}/${PN}-4.5.1-compile_et_fix.patch"
1111 -)
1112 -
1113 -#CONFDIR="${FILESDIR}/$(get_version_component_range 1-2)"
1114 -CONFDIR="${FILESDIR}/4.4"
1115 -
1116 -WAF_BINARY="${S}/buildtools/bin/waf"
1117 -
1118 -SHAREDMODS=""
1119 -
1120 -pkg_setup() {
1121 - python-single-r1_pkg_setup
1122 - if use cluster ; then
1123 - SHAREDMODS="idmap_rid,idmap_tdb2,idmap_ad"
1124 - elif use ads ; then
1125 - SHAREDMODS="idmap_ad"
1126 - fi
1127 -}
1128 -
1129 -src_prepare() {
1130 - default
1131 -
1132 - # un-bundle dnspython
1133 - sed -i -e '/"dns.resolver":/d' "${S}"/third_party/wscript || die
1134 -
1135 - # unbundle iso8601 unless tests are enabled
1136 - use test || sed -i -e '/"iso8601":/d' "${S}"/third_party/wscript || die
1137 -
1138 - # ugly hackaround for bug #592502
1139 - cp /usr/include/tevent_internal.h "${S}"/lib/tevent/ || die
1140 -
1141 - sed -e 's:<gpgme\.h>:<gpgme/gpgme.h>:' \
1142 - -i source4/dsdb/samdb/ldb_modules/password_hash.c \
1143 - || die
1144 -
1145 - # Friggin' WAF shit
1146 - multilib_copy_sources
1147 -}
1148 -
1149 -multilib_src_configure() {
1150 - # when specifying libs for samba build you must append NONE to the end to
1151 - # stop it automatically including things
1152 - local bundled_libs="NONE"
1153 - if ! use system-heimdal && ! use system-mitkrb5 ; then
1154 - bundled_libs="heimbase,heimntlm,hdb,kdc,krb5,wind,gssapi,hcrypto,hx509,roken,asn1,com_err,NONE"
1155 - fi
1156 -
1157 - local myconf=(
1158 - --enable-fhs
1159 - --sysconfdir="${EPREFIX}/etc"
1160 - --localstatedir="${EPREFIX}/var"
1161 - --with-modulesdir="${EPREFIX}/usr/$(get_libdir)/samba"
1162 - --with-piddir="${EPREFIX}/run/${PN}"
1163 - --bundled-libraries="${bundled_libs}"
1164 - --builtin-libraries=NONE
1165 - --disable-rpath
1166 - --disable-rpath-install
1167 - --nopyc
1168 - --nopyo
1169 - $(multilib_native_use_with acl acl-support)
1170 - $(multilib_native_usex addc '' '--without-ad-dc')
1171 - $(multilib_native_use_with addns dnsupdate)
1172 - $(multilib_native_use_with ads)
1173 - $(multilib_native_use_enable ceph cephfs)
1174 - $(multilib_native_use_with cluster cluster-support)
1175 - $(multilib_native_use_enable cups)
1176 - $(multilib_native_use_with dmapi)
1177 - $(multilib_native_use_with fam)
1178 - $(multilib_native_use_with gpg gpgme)
1179 - $(multilib_native_use_enable iprint)
1180 - $(multilib_native_use_with pam)
1181 - $(multilib_native_usex pam "--with-pammodulesdir=${EPREFIX}/$(get_libdir)/security" '')
1182 - $(multilib_native_use_with quota quotas)
1183 - $(multilib_native_use_with syslog)
1184 - $(multilib_native_use_with systemd)
1185 - $(multilib_native_use_with winbind)
1186 - $(multilib_native_usex python '' '--disable-python')
1187 - $(multilib_native_use_enable zeroconf avahi)
1188 - $(multilib_native_usex test '--enable-selftest' '')
1189 - $(usex system-mitkrb5 '--with-system-mitkrb5' '')
1190 - $(use_enable gnutls)
1191 - $(use_with debug lttng)
1192 - $(use_with ldap)
1193 - )
1194 - multilib_is_native_abi && myconf+=( --with-shared-modules=${SHAREDMODS} )
1195 -
1196 - CPPFLAGS="-I${SYSROOT}${EPREFIX}/usr/include/et ${CPPFLAGS}" \
1197 - waf-utils_src_configure ${myconf[@]}
1198 -}
1199 -
1200 -multilib_src_compile() {
1201 - waf-utils_src_compile
1202 -}
1203 -
1204 -multilib_src_install() {
1205 - waf-utils_src_install
1206 -
1207 - # Make all .so files executable
1208 - find "${ED}" -type f -name "*.so" -exec chmod +x {} +
1209 -
1210 - if multilib_is_native_abi ; then
1211 - # install ldap schema for server (bug #491002)
1212 - if use ldap ; then
1213 - insinto /etc/openldap/schema
1214 - doins examples/LDAP/samba.schema
1215 - fi
1216 -
1217 - # create symlink for cups (bug #552310)
1218 - if use cups ; then
1219 - dosym ../../../bin/smbspool /usr/libexec/cups/backend/smb
1220 - fi
1221 -
1222 - # install example config file
1223 - insinto /etc/samba
1224 - doins examples/smb.conf.default
1225 -
1226 - # Fix paths in example file (#603964)
1227 - sed \
1228 - -e '/log file =/s@/usr/local/samba/var/@/var/log/samba/@' \
1229 - -e '/include =/s@/usr/local/samba/lib/@/etc/samba/@' \
1230 - -e '/path =/s@/usr/local/samba/lib/@/var/lib/samba/@' \
1231 - -e '/path =/s@/usr/local/samba/@/var/lib/samba/@' \
1232 - -e '/path =/s@/usr/spool/samba@/var/spool/samba@' \
1233 - -i "${ED%/}"/etc/samba/smb.conf.default || die
1234 -
1235 - # Install init script and conf.d file
1236 - newinitd "${CONFDIR}/samba4.initd-r1" samba
1237 - newconfd "${CONFDIR}/samba4.confd" samba
1238 -
1239 - systemd_dotmpfilesd "${FILESDIR}"/samba.conf
1240 - systemd_dounit "${FILESDIR}"/nmbd.service
1241 - systemd_dounit "${FILESDIR}"/smbd.{service,socket}
1242 - systemd_newunit "${FILESDIR}"/smbd_at.service 'smbd@.service'
1243 - systemd_dounit "${FILESDIR}"/winbindd.service
1244 - systemd_dounit "${FILESDIR}"/samba.service
1245 - fi
1246 -}
1247 -
1248 -multilib_src_test() {
1249 - if multilib_is_native_abi ; then
1250 - "${WAF_BINARY}" test || die "test failed"
1251 - fi
1252 -}
1253 -
1254 -pkg_postinst() {
1255 - ewarn "Be aware the this release contains the best of all of Samba's"
1256 - ewarn "technology parts, both a file server (that you can reasonably expect"
1257 - ewarn "to upgrade existing Samba 3.x releases to) and the AD domain"
1258 - ewarn "controller work previously known as 'samba4'."
1259 -
1260 - elog "For further information and migration steps make sure to read "
1261 - elog "https://samba.org/samba/history/${P}.html "
1262 - elog "https://wiki.samba.org/index.php/Samba4/HOWTO "
1263 -}