1 |
commit: 1e07a2ffdc317d2bc6180b99649927887a81db45 |
2 |
Author: Lars Wendler <polynomial-c <AT> gentoo <DOT> org> |
3 |
AuthorDate: Wed Apr 26 14:45:34 2017 +0000 |
4 |
Commit: Lars Wendler <polynomial-c <AT> gentoo <DOT> org> |
5 |
CommitDate: Wed Apr 26 14:46:33 2017 +0000 |
6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=1e07a2ff |
7 |
|
8 |
net-fs/samba: Bump to version 4.6.3 |
9 |
|
10 |
Package-Manager: Portage-2.3.5, Repoman-2.3.2 |
11 |
|
12 |
net-fs/samba/Manifest | 1 + |
13 |
net-fs/samba/samba-4.6.3.ebuild | 299 ++++++++++++++++++++++++++++++++++++++++ |
14 |
2 files changed, 300 insertions(+) |
15 |
|
16 |
diff --git a/net-fs/samba/Manifest b/net-fs/samba/Manifest |
17 |
index 324d5c4f7fb..eae041eb021 100644 |
18 |
--- a/net-fs/samba/Manifest |
19 |
+++ b/net-fs/samba/Manifest |
20 |
@@ -5,6 +5,7 @@ DIST samba-4.5.8.tar.gz 20979104 SHA256 f63b656d8823a280c50c9dbd6b692816cd7a88ad |
21 |
DIST samba-4.6.0-disable-python-patches.tar.xz 7544 SHA256 508adeea65604ef8f4da006504de7c27bed56d7003db1166dc5d3b01f5a6be6e SHA512 07de2c0877aff31069ed0ab4fbe1c2272c854ae898ee5300a3b176ba31a218b05acff0b5120a5da0995592e7877c607865d2194c992df17b27c993836f58a654 WHIRLPOOL 12888f2ebf8d4ed5619860b2e6929599022b8ab1245970a5e1258f26e89aca1f87ab58fa54c7300dbd79a0c8fd6955e12c8aca6eeca246cdf06661d53ca3f6dd |
22 |
DIST samba-4.6.1.tar.gz 21097666 SHA256 5d2751faa3cd33affd4f49681f700eff9f6c22d6b08e8858ae0d3cd8e51c535e SHA512 8c759bb6483f67d632f35d779bf1afb44907fd478e3e5919fc95f36dd198e393819ed419686235ba01b5ec0e15ea80cb11e7fa8f22f37a1742bf0e818a3c6c14 WHIRLPOOL a4ec6692a72979756acd2381f428c6f3f0f6dd909a4270d529ad5348cbdd4bbe9f19d37ff24977a8683c5b48323edb251d946b138f3ce44793c1fe03884435be |
23 |
DIST samba-4.6.2.tar.gz 21097045 SHA256 927afcc16e444718985e3952de92d34e7b776b9ca0238179d866da18a6441c35 SHA512 d64129b7fc65bf30cc06e34a07ac5cf04b52bf6639950eff48ae0ec27b0de44614df6a7c44b62b1859553fc7051f493b2d8216739da2232ac1caeaea81d328df WHIRLPOOL fed65abc7eb2b996062db57d40ccc57b10e8519412e97c9dd9147cd462f80f0b401939c2f00522595eed3f66f879c88039239d1dcf6fdc73c38c3fb7d43cef3a |
24 |
+DIST samba-4.6.3.tar.gz 21107898 SHA256 2a38ef3da77809cba0583fc188e2a4b5420437aecaad0dffe9a06f732e4b1561 SHA512 5218e3bf4c837374fd7ca2b6ec19e665e61de64ca8acdbf9b15bb9669895db31986b753399c686b5fa43c3862b1da434afad7436cd148b66f1d02dbb9c176432 WHIRLPOOL d8f8a95385255c1067956c5a8d459d8dd2cdfc4f82e1b5b0cfa6240ad55eff694688a385b58e5906ab5b915a4a026baa778e8d2d4f809939755f270860c775af |
25 |
DIST samba-disable-python-patches-4.2.12.tar.xz 6052 SHA256 8903eacbabdfaf7b64cbde03d7c367d1efdc92e54090f0f4b9ed5d2a462b1c18 SHA512 c527d0a052d3211e5b12c17bc94db56cc5e5545189ed65a760c0656c94c22e27a4b159e6439eb0370873e1619873a741f3b3bd10d3876b38eb3914a87eace372 WHIRLPOOL ad63db55d5dc96f56e6c9b30c2092e2f6e206b0ed5d13c249879d10753c8db2f475c5d4e651e2fc042ad992b648d3b4465f1b28c6b4bbf821cf503d27f741f7e |
26 |
DIST samba-disable-python-patches-4.2.9.tar.xz 6016 SHA256 222d0153f03dddde28a0b906ee2b27076223ac88b84a998aaa285f658861edfa SHA512 02fc666a36f8e733e522663d80775d130fabee9d5fb4e1c261d28815e07be425ae8977213f9216c7af62dd8b2619e7e13d71f9a25780b058c8119901c2115a18 WHIRLPOOL ebba3a6d41a41844621759672aa8c984d26f44d12007c8e929405470c381bc262523ec68d3972e86cf675c45f092fa287496167e42940e70d704790753e47b03 |
27 |
DIST samba-disable-python-patches-4.5.0_rc1.tar.xz 6204 SHA256 fa0d776e04e3222c0dc4761e376717f4154937cdcb85f4117b8978dfb770a78e SHA512 920089ba3c6e8e7d913b1d7ef1017262a19d1af41215adb30cfc98a57556efc4b0116931d4ef774c01124149d8eca2be3a23814ce7e11daf0180d2c111799927 WHIRLPOOL 6d55710895435ad012e23f8c252e5276966241014710349ca7fa9cf037e8742030b8e053f7cb71309a0a45f48d2235d55393243bf4d19476a22dd39bb1b7748d |
28 |
|
29 |
diff --git a/net-fs/samba/samba-4.6.3.ebuild b/net-fs/samba/samba-4.6.3.ebuild |
30 |
new file mode 100644 |
31 |
index 00000000000..30f4ff49fb5 |
32 |
--- /dev/null |
33 |
+++ b/net-fs/samba/samba-4.6.3.ebuild |
34 |
@@ -0,0 +1,299 @@ |
35 |
+# Copyright 1999-2017 Gentoo Foundation |
36 |
+# Distributed under the terms of the GNU General Public License v2 |
37 |
+ |
38 |
+EAPI=6 |
39 |
+PYTHON_COMPAT=( python2_7 ) |
40 |
+PYTHON_REQ_USE='threads(+),xml(+)' |
41 |
+ |
42 |
+inherit python-single-r1 waf-utils multilib-minimal linux-info systemd eutils |
43 |
+ |
44 |
+MY_PV="${PV/_rc/rc}" |
45 |
+MY_P="${PN}-${MY_PV}" |
46 |
+ |
47 |
+SRC_PATH="stable" |
48 |
+[[ ${PV} = *_rc* ]] && SRC_PATH="rc" |
49 |
+ |
50 |
+SRC_URI="mirror://samba/${SRC_PATH}/${MY_P}.tar.gz |
51 |
+ https://dev.gentoo.org/~polynomial-c/samba-4.6.0-disable-python-patches.tar.xz" |
52 |
+[[ ${PV} = *_rc* ]] || \ |
53 |
+KEYWORDS="~amd64 ~hppa ~x86" |
54 |
+ |
55 |
+DESCRIPTION="Samba Suite Version 4" |
56 |
+HOMEPAGE="http://www.samba.org/" |
57 |
+LICENSE="GPL-3" |
58 |
+ |
59 |
+SLOT="0" |
60 |
+ |
61 |
+IUSE="acl addc addns ads client cluster cups dmapi fam gnutls gpg iprint ldap pam python |
62 |
+quota selinux syslog system-heimdal +system-mitkrb5 systemd test winbind zeroconf" |
63 |
+ |
64 |
+MULTILIB_WRAPPED_HEADERS=( |
65 |
+ /usr/include/samba-4.0/policy.h |
66 |
+ /usr/include/samba-4.0/dcerpc_server.h |
67 |
+ /usr/include/samba-4.0/ctdb.h |
68 |
+ /usr/include/samba-4.0/ctdb_client.h |
69 |
+ /usr/include/samba-4.0/ctdb_protocol.h |
70 |
+ /usr/include/samba-4.0/ctdb_private.h |
71 |
+ /usr/include/samba-4.0/ctdb_typesafe_cb.h |
72 |
+ /usr/include/samba-4.0/ctdb_version.h |
73 |
+) |
74 |
+ |
75 |
+# sys-apps/attr is an automagic dependency (see bug #489748) |
76 |
+CDEPEND=" |
77 |
+ >=app-arch/libarchive-3.1.2[${MULTILIB_USEDEP}] |
78 |
+ dev-lang/perl:= |
79 |
+ dev-libs/libaio[${MULTILIB_USEDEP}] |
80 |
+ dev-libs/libbsd[${MULTILIB_USEDEP}] |
81 |
+ dev-libs/iniparser:0 |
82 |
+ dev-libs/popt[${MULTILIB_USEDEP}] |
83 |
+ dev-python/subunit[${PYTHON_USEDEP},${MULTILIB_USEDEP}] |
84 |
+ >=dev-util/cmocka-1.0.0[${MULTILIB_USEDEP}] |
85 |
+ sys-apps/attr[${MULTILIB_USEDEP}] |
86 |
+ >=sys-libs/ldb-1.1.29[ldap(+)?,python(+)?,${PYTHON_USEDEP},${MULTILIB_USEDEP}] |
87 |
+ sys-libs/libcap |
88 |
+ sys-libs/ncurses:0=[${MULTILIB_USEDEP}] |
89 |
+ sys-libs/readline:0= |
90 |
+ >=sys-libs/talloc-2.1.9[python?,${PYTHON_USEDEP},${MULTILIB_USEDEP}] |
91 |
+ >=sys-libs/tdb-1.3.12[python?,${PYTHON_USEDEP},${MULTILIB_USEDEP}] |
92 |
+ >=sys-libs/tevent-0.9.31-r1[python?,${PYTHON_USEDEP},${MULTILIB_USEDEP}] |
93 |
+ sys-libs/zlib[${MULTILIB_USEDEP}] |
94 |
+ virtual/libiconv |
95 |
+ pam? ( virtual/pam ) |
96 |
+ acl? ( virtual/acl ) |
97 |
+ addns? ( |
98 |
+ net-dns/bind-tools[gssapi] |
99 |
+ dev-python/dnspython:=[${PYTHON_USEDEP}] |
100 |
+ ) |
101 |
+ cluster? ( !dev-db/ctdb ) |
102 |
+ cups? ( net-print/cups ) |
103 |
+ dmapi? ( sys-apps/dmapi ) |
104 |
+ fam? ( virtual/fam ) |
105 |
+ gnutls? ( |
106 |
+ dev-libs/libgcrypt:0 |
107 |
+ >=net-libs/gnutls-1.4.0 |
108 |
+ ) |
109 |
+ gpg? ( app-crypt/gpgme ) |
110 |
+ ldap? ( net-nds/openldap[${MULTILIB_USEDEP}] ) |
111 |
+ system-heimdal? ( >=app-crypt/heimdal-1.5[-ssl,${MULTILIB_USEDEP}] ) |
112 |
+ system-mitkrb5? ( app-crypt/mit-krb5[${MULTILIB_USEDEP}] ) |
113 |
+ systemd? ( sys-apps/systemd:0= ) |
114 |
+ test? ( |
115 |
+ !system-mitkrb5? ( |
116 |
+ >=sys-libs/nss_wrapper-1.1.3 |
117 |
+ >=net-dns/resolv_wrapper-1.1.4 |
118 |
+ >=net-libs/socket_wrapper-1.1.7 |
119 |
+ >=sys-libs/uid_wrapper-1.2.1 |
120 |
+ ) |
121 |
+ )" |
122 |
+DEPEND="${CDEPEND} |
123 |
+ ${PYTHON_DEPS} |
124 |
+ virtual/pkgconfig" |
125 |
+RDEPEND="${CDEPEND} |
126 |
+ python? ( ${PYTHON_DEPS} ) |
127 |
+ client? ( net-fs/cifs-utils[ads?] ) |
128 |
+ selinux? ( sec-policy/selinux-samba ) |
129 |
+ !dev-perl/Parse-Yapp |
130 |
+" |
131 |
+ |
132 |
+REQUIRED_USE="addc? ( python gnutls !system-mitkrb5 ) |
133 |
+ test? ( python ) |
134 |
+ addns? ( python ) |
135 |
+ ads? ( acl gnutls ldap ) |
136 |
+ gpg? ( addc ) |
137 |
+ ?? ( system-heimdal system-mitkrb5 ) |
138 |
+ ${PYTHON_REQUIRED_USE}" |
139 |
+ |
140 |
+# the test suite is messed, it uses system-installed samba |
141 |
+# bits instead of what was built, tests things disabled via use |
142 |
+# flags, and generally just fails to work in a way ebuilds could |
143 |
+# rely on in its current state |
144 |
+RESTRICT="test" |
145 |
+ |
146 |
+S="${WORKDIR}/${MY_P}" |
147 |
+ |
148 |
+PATCHES=( |
149 |
+ "${FILESDIR}/${PN}-4.4.0-pam.patch" |
150 |
+ "${FILESDIR}/${PN}-4.5.1-compile_et_fix.patch" |
151 |
+) |
152 |
+ |
153 |
+#CONFDIR="${FILESDIR}/$(get_version_component_range 1-2)" |
154 |
+CONFDIR="${FILESDIR}/4.4" |
155 |
+ |
156 |
+WAF_BINARY="${S}/buildtools/bin/waf" |
157 |
+ |
158 |
+SHAREDMODS="" |
159 |
+ |
160 |
+pkg_setup() { |
161 |
+ python-single-r1_pkg_setup |
162 |
+ if use cluster ; then |
163 |
+ SHAREDMODS="idmap_rid,idmap_tdb2,idmap_ad" |
164 |
+ elif use ads ; then |
165 |
+ SHAREDMODS="idmap_ad" |
166 |
+ fi |
167 |
+} |
168 |
+ |
169 |
+src_prepare() { |
170 |
+ default |
171 |
+ |
172 |
+ # install the patches from tarball(s) |
173 |
+ eapply "${WORKDIR}/patches" |
174 |
+ |
175 |
+ # un-bundle dnspython |
176 |
+ sed -i -e '/"dns.resolver":/d' "${S}"/third_party/wscript || die |
177 |
+ |
178 |
+ # unbundle iso8601 unless tests are enabled |
179 |
+ use test || sed -i -e '/"iso8601":/d' "${S}"/third_party/wscript || die |
180 |
+ |
181 |
+ # ugly hackaround for bug #592502 |
182 |
+ cp /usr/include/tevent_internal.h "${S}"/lib/tevent/ || die |
183 |
+ |
184 |
+ sed -e 's:<gpgme\.h>:<gpgme/gpgme.h>:' \ |
185 |
+ -i source4/dsdb/samdb/ldb_modules/password_hash.c \ |
186 |
+ || die |
187 |
+ |
188 |
+ # Friggin' WAF shit |
189 |
+ multilib_copy_sources |
190 |
+} |
191 |
+ |
192 |
+multilib_src_configure() { |
193 |
+ # when specifying libs for samba build you must append NONE to the end to |
194 |
+ # stop it automatically including things |
195 |
+ local bundled_libs="NONE" |
196 |
+ if ! use system-heimdal && ! use system-mitkrb5 ; then |
197 |
+ bundled_libs="heimbase,heimntlm,hdb,kdc,krb5,wind,gssapi,hcrypto,hx509,roken,asn1,com_err,NONE" |
198 |
+ fi |
199 |
+ |
200 |
+ local myconf=() |
201 |
+ myconf=( |
202 |
+ --enable-fhs |
203 |
+ --sysconfdir="${EPREFIX}/etc" |
204 |
+ --localstatedir="${EPREFIX}/var" |
205 |
+ --with-modulesdir="${EPREFIX}/usr/$(get_libdir)/samba" |
206 |
+ --with-piddir="${EPREFIX}/run/${PN}" |
207 |
+ --bundled-libraries="${bundled_libs}" |
208 |
+ --builtin-libraries=NONE |
209 |
+ --disable-rpath |
210 |
+ --disable-rpath-install |
211 |
+ --nopyc |
212 |
+ --nopyo |
213 |
+ ) |
214 |
+ if multilib_is_native_abi ; then |
215 |
+ myconf+=( |
216 |
+ $(use_with acl acl-support) |
217 |
+ $(usex addc '' '--without-ad-dc') |
218 |
+ $(use_with addns dnsupdate) |
219 |
+ $(use_with ads) |
220 |
+ $(use_with cluster cluster-support) |
221 |
+ $(use_enable cups) |
222 |
+ $(use_with dmapi) |
223 |
+ $(use_with fam) |
224 |
+ $(use_enable gnutls) |
225 |
+ $(use_with gpg gpgme) |
226 |
+ $(use_enable iprint) |
227 |
+ $(use_with ldap) |
228 |
+ $(use_with pam) |
229 |
+ $(usex pam "--with-pammodulesdir=${EPREFIX}/$(get_libdir)/security" '') |
230 |
+ $(use_with quota quotas) |
231 |
+ $(use_with syslog) |
232 |
+ $(use_with systemd) |
233 |
+ $(usex system-mitkrb5 '--with-system-mitkrb5' '') |
234 |
+ $(use_with winbind) |
235 |
+ $(usex python '' '--disable-python') |
236 |
+ $(usex test '--enable-selftest' '') |
237 |
+ $(use_enable zeroconf avahi) |
238 |
+ --with-shared-modules=${SHAREDMODS} |
239 |
+ ) |
240 |
+ else |
241 |
+ myconf+=( |
242 |
+ --without-acl-support |
243 |
+ --without-ad-dc |
244 |
+ --without-dnsupdate |
245 |
+ --without-ads |
246 |
+ --disable-avahi |
247 |
+ --without-cluster-support |
248 |
+ --disable-cups |
249 |
+ --without-dmapi |
250 |
+ --without-fam |
251 |
+ --disable-gnutls |
252 |
+ --without-gpgme |
253 |
+ --disable-iprint |
254 |
+ $(use_with ldap) |
255 |
+ --without-pam |
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}${EPREFIX}/usr/include/et ${CPPFLAGS}" \ |
266 |
+ waf-utils_src_configure ${myconf[@]} |
267 |
+} |
268 |
+ |
269 |
+multilib_src_compile() { |
270 |
+ waf-utils_src_compile |
271 |
+} |
272 |
+ |
273 |
+multilib_src_install() { |
274 |
+ waf-utils_src_install |
275 |
+ |
276 |
+ # Make all .so files executable |
277 |
+ find "${D}" -type f -name "*.so" -exec chmod +x {} + |
278 |
+ |
279 |
+ if multilib_is_native_abi; then |
280 |
+ # install ldap schema for server (bug #491002) |
281 |
+ if use ldap ; then |
282 |
+ insinto /etc/openldap/schema |
283 |
+ doins examples/LDAP/samba.schema |
284 |
+ fi |
285 |
+ |
286 |
+ # create symlink for cups (bug #552310) |
287 |
+ if use cups ; then |
288 |
+ dosym /usr/bin/smbspool /usr/libexec/cups/backend/smb |
289 |
+ fi |
290 |
+ |
291 |
+ # install example config file |
292 |
+ insinto /etc/samba |
293 |
+ doins examples/smb.conf.default |
294 |
+ |
295 |
+ # Fix paths in example file (#603964) |
296 |
+ sed \ |
297 |
+ -e '/log file =/s@/usr/local/samba/var/@/var/log/samba/@' \ |
298 |
+ -e '/include =/s@/usr/local/samba/lib/@/etc/samba/@' \ |
299 |
+ -e '/path =/s@/usr/local/samba/lib/@/var/lib/samba/@' \ |
300 |
+ -e '/path =/s@/usr/local/samba/@/var/lib/samba/@' \ |
301 |
+ -e '/path =/s@/usr/spool/samba@/var/spool/samba@' \ |
302 |
+ -i "${ED%/}"/etc/samba/smb.conf.default || die |
303 |
+ |
304 |
+ # Install init script and conf.d file |
305 |
+ newinitd "${CONFDIR}/samba4.initd-r1" samba |
306 |
+ newconfd "${CONFDIR}/samba4.confd" samba |
307 |
+ |
308 |
+ systemd_dotmpfilesd "${FILESDIR}"/samba.conf |
309 |
+ systemd_dounit "${FILESDIR}"/nmbd.service |
310 |
+ systemd_dounit "${FILESDIR}"/smbd.{service,socket} |
311 |
+ systemd_newunit "${FILESDIR}"/smbd_at.service 'smbd@.service' |
312 |
+ systemd_dounit "${FILESDIR}"/winbindd.service |
313 |
+ systemd_dounit "${FILESDIR}"/samba.service |
314 |
+ fi |
315 |
+} |
316 |
+ |
317 |
+multilib_src_test() { |
318 |
+ if multilib_is_native_abi ; then |
319 |
+ "${WAF_BINARY}" test || die "test failed" |
320 |
+ fi |
321 |
+} |
322 |
+ |
323 |
+pkg_postinst() { |
324 |
+ ewarn "Be aware the this release contains the best of all of Samba's" |
325 |
+ ewarn "technology parts, both a file server (that you can reasonably expect" |
326 |
+ ewarn "to upgrade existing Samba 3.x releases to) and the AD domain" |
327 |
+ ewarn "controller work previously known as 'samba4'." |
328 |
+ |
329 |
+ elog "For further information and migration steps make sure to read " |
330 |
+ elog "http://samba.org/samba/history/${P}.html " |
331 |
+ elog "http://samba.org/samba/history/${PN}-4.5.0.html and" |
332 |
+ elog "http://wiki.samba.org/index.php/Samba4/HOWTO " |
333 |
+} |