1 |
commit: e8a687c8017a0b19b5763e93aadf51f2f4beadc8 |
2 |
Author: xdch47 <xdch47 <AT> posteo <DOT> de> |
3 |
AuthorDate: Fri Jan 18 18:01:12 2019 +0000 |
4 |
Commit: Anthony G. Basile <blueness <AT> gentoo <DOT> org> |
5 |
CommitDate: Sat Jan 19 00:54:48 2019 +0000 |
6 |
URL: https://gitweb.gentoo.org/proj/musl.git/commit/?id=e8a687c8 |
7 |
|
8 |
net-fs/samba: version bump to 4.9.4 |
9 |
|
10 |
Package-Manager: Portage-2.3.51, Repoman-2.3.11 |
11 |
Manifest-Sign-Key: 0DEDF1A904568BAD1FC45C283DCC44782ED07E1C |
12 |
Signed-off-by: Anthony G. Basile <blueness <AT> gentoo.org> |
13 |
|
14 |
net-fs/samba/Manifest | 17 +-- |
15 |
net-fs/samba/samba-4.9.4.ebuild | 293 ++++++++++++++++++++++++++++++++++++++++ |
16 |
2 files changed, 302 insertions(+), 8 deletions(-) |
17 |
|
18 |
diff --git a/net-fs/samba/Manifest b/net-fs/samba/Manifest |
19 |
index ba6cc79..1fa7571 100644 |
20 |
--- a/net-fs/samba/Manifest |
21 |
+++ b/net-fs/samba/Manifest |
22 |
@@ -5,14 +5,15 @@ DIST samba-4.5.11-disable-python-patches.tar.xz 6292 BLAKE2B c2a32a1059a02bc1c87 |
23 |
DIST samba-4.5.16.tar.gz 21024396 BLAKE2B e737559fb748044076608fa233700eb54c7e1c56bc234763f062b6341a179cc78a4a8cdf9f3d6f4d7f3cf8a79f846852ddd5cc753a468c3adb3a0451e1809ed9 SHA512 de8a41013cfb5ef3adcb290efd97a78a5de876d90ad05764d631f14e663a1849bb53e4ac394b46c906f1109be5748fee9316407a659c57007d36851ae8adcd7f |
24 |
DIST samba-4.9.1.tar.gz 18018259 BLAKE2B 783423098864c391f08b30e05b70308e922bdb4dad08b8b0b4d1112808357b9bb96aad7a094d0fe2e308f84a143d5f90be523b9c3551a3068ecdcad7347613f6 SHA512 267673b6d6ab0db59063480c20f02e5864ef96e9ad1097c23a99b2ab4b5fd2252193d7a152729b40cae0751fb9b0b108b087a190f5db11eabbd075224bd6e663 |
25 |
DIST samba-4.9.2.tar.gz 18042752 BLAKE2B e6d361a38f1103c104015987fa2b67c49a91fb2fac77538b3d9fa0c1629348df00c8fb4ea0dbb1a1f3f62cd377699c1ebc00b1b1b7b1e0d073d3633d41a62e7b SHA512 67de5faeda45e5c245bf02cc195cdf9ca4b63f17625837badf7c50d97250e94de5309c9ef824bd7890bc771b1dc0a3bfbafea09880850b5167f0bf8a8ef488ed |
26 |
+DIST samba-4.9.4.tar.gz 18053738 BLAKE2B 337444e55fc8a8864e3960609719087e64e7d14faaf150c510b9011f67ffdc8a9bd6533c60be938e742db8a2e5401a065e7d14fae0480ee7a996a1f71ef0448d SHA512 ecd9937caa12d409b9b4cf34982b1670346fa64c7ecd111b390e296771476e13eb7b868997bfe489f36b7bdc5c9fc3af42cd5ad276e9d85aaedfa8ac4cfc0617 |
27 |
-----BEGIN PGP SIGNATURE----- |
28 |
|
29 |
-iQEzBAEBCAAdFiEEDe3xqQRWi60fxFwoPcxEeC7QfhwFAlvukdUACgkQPcxEeC7Q |
30 |
-fhwYTQf9FX5N807jrmzQv9wnqOrRtMOSTLJ73v4DpnYJpYYID8SHLGGErGdGw7QI |
31 |
-xqg2FCtULHha+j4T8ruaMJ5KwxCyHsPnXYn/niRfNa9oYNHHz72+Ox2wGxd1vmMc |
32 |
-D0BhMtvvdVaeE0Rq88K1LXBDAk5GzSt4lTjgPnialK/di9WuiUgY3u6S6rubPiNe |
33 |
-ZUKLOws546vIj3oGiRVOKBidPpxbxpO24XDPRjZqbftdgfCulDdR8iQ22h7mVZf+ |
34 |
-AO9ime/GBVxol7Dh7efElwz0vgSyK3pR5L0xV302dYIEZkr3jHHI24AstwKKtKP5 |
35 |
-lUI9kY54Keut22SqCduvn7C5Rp3aug== |
36 |
-=BVxv |
37 |
+iQEzBAEBCAAdFiEEDe3xqQRWi60fxFwoPcxEeC7QfhwFAlxCFGYACgkQPcxEeC7Q |
38 |
+fhzVmgf/Rb7+LH6puZDEU31GxPYzxq0tePU7mu53wUaKBVVj/7QwPk9Q9iHqdy+G |
39 |
+bYmZ2cYGF7YiRSUa8hNAU7RAHHrNF2c9PONqg0/T298qADCb64VlLtGMcD9tUfTv |
40 |
+QMeVo6RUVjDbJTxtznj+HTKb5cbb+iaRppChJkrxucYjG1SX4uAMUe0q44ut2iGk |
41 |
+QivT0dtPxdTU3ntN1yTliGJ+jfoiiajpVsAfqRSwT3Ee5v3E6LskajK4Sp/ZVntc |
42 |
+1AGeg2y/meQM2MVURgNmUlbMqHlH83RlGeGHGLgAZhDpO2f716gNVF1fhMGwtzUk |
43 |
+RKHbr9PJLZ6zK5zpzQ+31OIlAiUGUg== |
44 |
+=JAYJ |
45 |
-----END PGP SIGNATURE----- |
46 |
|
47 |
diff --git a/net-fs/samba/samba-4.9.4.ebuild b/net-fs/samba/samba-4.9.4.ebuild |
48 |
new file mode 100644 |
49 |
index 0000000..a7b9e14 |
50 |
--- /dev/null |
51 |
+++ b/net-fs/samba/samba-4.9.4.ebuild |
52 |
@@ -0,0 +1,293 @@ |
53 |
+# Copyright 1999-2019 Gentoo Authors |
54 |
+# Distributed under the terms of the GNU General Public License v2 |
55 |
+ |
56 |
+EAPI=6 |
57 |
+PYTHON_COMPAT=( python2_7 ) |
58 |
+PYTHON_REQ_USE='threads(+),xml(+)' |
59 |
+ |
60 |
+inherit python-single-r1 waf-utils multilib-minimal linux-info systemd |
61 |
+ |
62 |
+MY_PV="${PV/_rc/rc}" |
63 |
+MY_P="${PN}-${MY_PV}" |
64 |
+ |
65 |
+SRC_PATH="stable" |
66 |
+[[ ${PV} = *_rc* ]] && SRC_PATH="rc" |
67 |
+ |
68 |
+SRC_URI="mirror://samba/${SRC_PATH}/${MY_P}.tar.gz" |
69 |
+[[ ${PV} = *_rc* ]] || \ |
70 |
+KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~x86" |
71 |
+ |
72 |
+DESCRIPTION="Samba Suite Version 4" |
73 |
+HOMEPAGE="https://www.samba.org/" |
74 |
+LICENSE="GPL-3" |
75 |
+ |
76 |
+SLOT="0" |
77 |
+ |
78 |
+IUSE="acl addc addns ads ceph client cluster cups debug dmapi fam gnutls gpg iprint json ldap |
79 |
+pam python quota selinux syslog system-heimdal +system-mitkrb5 systemd test winbind zeroconf" |
80 |
+ |
81 |
+MULTILIB_WRAPPED_HEADERS=( |
82 |
+ /usr/include/samba-4.0/policy.h |
83 |
+ /usr/include/samba-4.0/dcerpc_server.h |
84 |
+ /usr/include/samba-4.0/ctdb.h |
85 |
+ /usr/include/samba-4.0/ctdb_client.h |
86 |
+ /usr/include/samba-4.0/ctdb_protocol.h |
87 |
+ /usr/include/samba-4.0/ctdb_private.h |
88 |
+ /usr/include/samba-4.0/ctdb_typesafe_cb.h |
89 |
+ /usr/include/samba-4.0/ctdb_version.h |
90 |
+) |
91 |
+ |
92 |
+# sys-apps/attr is an automagic dependency (see bug #489748) |
93 |
+CDEPEND=" |
94 |
+ >=app-arch/libarchive-3.1.2[${MULTILIB_USEDEP}] |
95 |
+ dev-lang/perl:= |
96 |
+ dev-libs/libaio[${MULTILIB_USEDEP}] |
97 |
+ dev-libs/libbsd[${MULTILIB_USEDEP}] |
98 |
+ dev-libs/iniparser:0 |
99 |
+ dev-libs/popt[${MULTILIB_USEDEP}] |
100 |
+ dev-python/subunit[${PYTHON_USEDEP},${MULTILIB_USEDEP}] |
101 |
+ >=dev-util/cmocka-1.1.1[${MULTILIB_USEDEP}] |
102 |
+ net-libs/libnsl:=[${MULTILIB_USEDEP}] |
103 |
+ sys-apps/attr[${MULTILIB_USEDEP}] |
104 |
+ >=sys-libs/ldb-1.4.3[ldap(+)?,python?,${PYTHON_USEDEP},${MULTILIB_USEDEP}] |
105 |
+ <sys-libs/ldb-1.5.0[ldap(+)?,python?,${PYTHON_USEDEP},${MULTILIB_USEDEP}] |
106 |
+ sys-libs/libcap |
107 |
+ sys-libs/ncurses:0=[${MULTILIB_USEDEP}] |
108 |
+ sys-libs/readline:0= |
109 |
+ >=sys-libs/talloc-2.1.14[python?,${PYTHON_USEDEP},${MULTILIB_USEDEP}] |
110 |
+ >=sys-libs/tdb-1.3.16[python?,${PYTHON_USEDEP},${MULTILIB_USEDEP}] |
111 |
+ >=sys-libs/tevent-0.9.37[python?,${PYTHON_USEDEP},${MULTILIB_USEDEP}] |
112 |
+ sys-libs/zlib[${MULTILIB_USEDEP}] |
113 |
+ virtual/libiconv |
114 |
+ pam? ( virtual/pam ) |
115 |
+ acl? ( virtual/acl ) |
116 |
+ addns? ( |
117 |
+ net-dns/bind-tools[gssapi] |
118 |
+ dev-python/dnspython:=[${PYTHON_USEDEP}] |
119 |
+ ) |
120 |
+ ceph? ( sys-cluster/ceph ) |
121 |
+ cluster? ( |
122 |
+ net-libs/rpcsvc-proto |
123 |
+ !dev-db/ctdb |
124 |
+ ) |
125 |
+ cups? ( net-print/cups ) |
126 |
+ debug? ( dev-util/lttng-ust ) |
127 |
+ dmapi? ( sys-apps/dmapi ) |
128 |
+ fam? ( virtual/fam ) |
129 |
+ gnutls? ( |
130 |
+ dev-libs/libgcrypt:0 |
131 |
+ >=net-libs/gnutls-1.4.0 |
132 |
+ ) |
133 |
+ gpg? ( app-crypt/gpgme ) |
134 |
+ json? ( dev-libs/jansson ) |
135 |
+ ldap? ( net-nds/openldap[${MULTILIB_USEDEP}] ) |
136 |
+ system-heimdal? ( >=app-crypt/heimdal-1.5[-ssl,${MULTILIB_USEDEP}] ) |
137 |
+ system-mitkrb5? ( >=app-crypt/mit-krb5-1.15.1[${MULTILIB_USEDEP}] ) |
138 |
+ systemd? ( sys-apps/systemd:0= ) |
139 |
+" |
140 |
+DEPEND="${CDEPEND} |
141 |
+ ${PYTHON_DEPS} |
142 |
+ app-text/docbook-xsl-stylesheets |
143 |
+ dev-libs/libxslt |
144 |
+ net-libs/libtirpc[${MULTILIB_USEDEP}] |
145 |
+ virtual/pkgconfig |
146 |
+ || ( |
147 |
+ net-libs/rpcsvc-proto |
148 |
+ <sys-libs/glibc-2.26[rpc(+)] |
149 |
+ ) |
150 |
+ test? ( |
151 |
+ !system-mitkrb5? ( |
152 |
+ >=sys-libs/nss_wrapper-1.1.3 |
153 |
+ >=net-dns/resolv_wrapper-1.1.4 |
154 |
+ >=net-libs/socket_wrapper-1.1.7 |
155 |
+ >=sys-libs/uid_wrapper-1.2.1 |
156 |
+ ) |
157 |
+ )" |
158 |
+RDEPEND="${CDEPEND} |
159 |
+ python? ( ${PYTHON_DEPS} ) |
160 |
+ client? ( net-fs/cifs-utils[ads?] ) |
161 |
+ selinux? ( sec-policy/selinux-samba ) |
162 |
+ !dev-perl/Parse-Yapp |
163 |
+" |
164 |
+ |
165 |
+REQUIRED_USE=" |
166 |
+ addc? ( python gnutls json winbind ) |
167 |
+ addns? ( python ) |
168 |
+ ads? ( acl gnutls ldap winbind ) |
169 |
+ cluster? ( ads ) |
170 |
+ gpg? ( addc ) |
171 |
+ test? ( python ) |
172 |
+ ?? ( system-heimdal system-mitkrb5 ) |
173 |
+ ${PYTHON_REQUIRED_USE} |
174 |
+" |
175 |
+ |
176 |
+# the test suite is messed, it uses system-installed samba |
177 |
+# bits instead of what was built, tests things disabled via use |
178 |
+# flags, and generally just fails to work in a way ebuilds could |
179 |
+# rely on in its current state |
180 |
+RESTRICT="test" |
181 |
+ |
182 |
+S="${WORKDIR}/${MY_P}" |
183 |
+ |
184 |
+PATCHES=( |
185 |
+ "${FILESDIR}/${PN}-4.4.0-pam.patch" |
186 |
+ "${FILESDIR}/${PN}-4.5.1-compile_et_fix.patch" |
187 |
+ "${FILESDIR}/${PN}-4.9.2-timespec.patch" |
188 |
+ "${FILESDIR}/netdb-defines.patch" |
189 |
+) |
190 |
+ |
191 |
+#CONFDIR="${FILESDIR}/$(get_version_component_range 1-2)" |
192 |
+CONFDIR="${FILESDIR}/4.4" |
193 |
+ |
194 |
+WAF_BINARY="${S}/buildtools/bin/waf" |
195 |
+ |
196 |
+SHAREDMODS="" |
197 |
+ |
198 |
+pkg_setup() { |
199 |
+ python-single-r1_pkg_setup |
200 |
+ if use cluster ; then |
201 |
+ SHAREDMODS="idmap_rid,idmap_tdb2,idmap_ad" |
202 |
+ elif use ads ; then |
203 |
+ SHAREDMODS="idmap_ad" |
204 |
+ fi |
205 |
+} |
206 |
+ |
207 |
+src_prepare() { |
208 |
+ default |
209 |
+ use elibc_musl && eapply "${FILESDIR}/musl-disable-netgroup.patch" |
210 |
+ |
211 |
+ # un-bundle dnspython |
212 |
+ sed -i -e '/"dns.resolver":/d' "${S}"/third_party/wscript || die |
213 |
+ |
214 |
+ # unbundle iso8601 unless tests are enabled |
215 |
+ if ! use test ; then |
216 |
+ sed -i -e '/"iso8601":/d' "${S}"/third_party/wscript || die |
217 |
+ fi |
218 |
+ |
219 |
+ # ugly hackaround for bug #592502 |
220 |
+ cp /usr/include/tevent_internal.h "${S}"/lib/tevent/ || die |
221 |
+ |
222 |
+ sed -e 's:<gpgme\.h>:<gpgme/gpgme.h>:' \ |
223 |
+ -i source4/dsdb/samdb/ldb_modules/password_hash.c \ |
224 |
+ || die |
225 |
+ |
226 |
+ # Friggin' WAF shit |
227 |
+ multilib_copy_sources |
228 |
+} |
229 |
+ |
230 |
+multilib_src_configure() { |
231 |
+ # when specifying libs for samba build you must append NONE to the end to |
232 |
+ # stop it automatically including things |
233 |
+ local bundled_libs="NONE" |
234 |
+ if ! use system-heimdal && ! use system-mitkrb5 ; then |
235 |
+ bundled_libs="heimbase,heimntlm,hdb,kdc,krb5,wind,gssapi,hcrypto,hx509,roken,asn1,com_err,NONE" |
236 |
+ fi |
237 |
+ |
238 |
+ local myconf=( |
239 |
+ --enable-fhs |
240 |
+ --sysconfdir="${EPREFIX}/etc" |
241 |
+ --localstatedir="${EPREFIX}/var" |
242 |
+ --with-modulesdir="${EPREFIX}/usr/$(get_libdir)/samba" |
243 |
+ --with-piddir="${EPREFIX}/run/${PN}" |
244 |
+ --bundled-libraries="${bundled_libs}" |
245 |
+ --builtin-libraries=NONE |
246 |
+ --disable-rpath |
247 |
+ --disable-rpath-install |
248 |
+ --nopyc |
249 |
+ --nopyo |
250 |
+ $(multilib_native_use_with acl acl-support) |
251 |
+ $(multilib_native_usex addc '' '--without-ad-dc') |
252 |
+ $(multilib_native_use_with addns dnsupdate) |
253 |
+ $(multilib_native_use_with ads) |
254 |
+ $(multilib_native_use_enable ceph cephfs) |
255 |
+ $(multilib_native_use_with cluster cluster-support) |
256 |
+ $(multilib_native_use_enable cups) |
257 |
+ $(multilib_native_use_with dmapi) |
258 |
+ $(multilib_native_use_with fam) |
259 |
+ $(multilib_native_use_with gpg gpgme) |
260 |
+ $(multilib_native_use_with json json-audit) |
261 |
+ $(multilib_native_use_enable iprint) |
262 |
+ $(multilib_native_use_with pam) |
263 |
+ $(multilib_native_usex pam "--with-pammodulesdir=${EPREFIX}/$(get_libdir)/security" '') |
264 |
+ $(multilib_native_use_with quota quotas) |
265 |
+ $(multilib_native_use_with syslog) |
266 |
+ $(multilib_native_use_with systemd) |
267 |
+ $(multilib_native_use_with winbind) |
268 |
+ $(multilib_native_usex python '' '--disable-python') |
269 |
+ $(multilib_native_use_enable zeroconf avahi) |
270 |
+ $(multilib_native_usex test '--enable-selftest' '') |
271 |
+ $(usex system-mitkrb5 '--with-system-mitkrb5' '') |
272 |
+ $(use_enable gnutls) |
273 |
+ $(use_with debug lttng) |
274 |
+ $(use_with ldap) |
275 |
+ ) |
276 |
+ multilib_is_native_abi && myconf+=( --with-shared-modules=${SHAREDMODS} ) |
277 |
+ |
278 |
+ CPPFLAGS="-I${SYSROOT}${EPREFIX}/usr/include/et ${CPPFLAGS}" \ |
279 |
+ waf-utils_src_configure ${myconf[@]} |
280 |
+} |
281 |
+ |
282 |
+multilib_src_compile() { |
283 |
+ waf-utils_src_compile |
284 |
+} |
285 |
+ |
286 |
+multilib_src_install() { |
287 |
+ waf-utils_src_install |
288 |
+ |
289 |
+ # Make all .so files executable |
290 |
+ find "${ED}" -type f -name "*.so" -exec chmod +x {} + || die |
291 |
+ |
292 |
+ if multilib_is_native_abi ; then |
293 |
+ # install ldap schema for server (bug #491002) |
294 |
+ if use ldap ; then |
295 |
+ insinto /etc/openldap/schema |
296 |
+ doins examples/LDAP/samba.schema |
297 |
+ fi |
298 |
+ |
299 |
+ # create symlink for cups (bug #552310) |
300 |
+ if use cups ; then |
301 |
+ dosym ../../../bin/smbspool /usr/libexec/cups/backend/smb |
302 |
+ fi |
303 |
+ |
304 |
+ # install example config file |
305 |
+ insinto /etc/samba |
306 |
+ doins examples/smb.conf.default |
307 |
+ |
308 |
+ # Fix paths in example file (#603964) |
309 |
+ sed \ |
310 |
+ -e '/log file =/s@/usr/local/samba/var/@/var/log/samba/@' \ |
311 |
+ -e '/include =/s@/usr/local/samba/lib/@/etc/samba/@' \ |
312 |
+ -e '/path =/s@/usr/local/samba/lib/@/var/lib/samba/@' \ |
313 |
+ -e '/path =/s@/usr/local/samba/@/var/lib/samba/@' \ |
314 |
+ -e '/path =/s@/usr/spool/samba@/var/spool/samba@' \ |
315 |
+ -i "${ED%/}"/etc/samba/smb.conf.default || die |
316 |
+ |
317 |
+ # Install init script and conf.d file |
318 |
+ newinitd "${CONFDIR}/samba4.initd-r1" samba |
319 |
+ newconfd "${CONFDIR}/samba4.confd" samba |
320 |
+ |
321 |
+ systemd_dotmpfilesd "${FILESDIR}"/samba.conf |
322 |
+ systemd_dounit "${FILESDIR}"/nmbd.service |
323 |
+ systemd_dounit "${FILESDIR}"/smbd.{service,socket} |
324 |
+ systemd_newunit "${FILESDIR}"/smbd_at.service 'smbd@.service' |
325 |
+ systemd_dounit "${FILESDIR}"/winbindd.service |
326 |
+ systemd_dounit "${FILESDIR}"/samba.service |
327 |
+ fi |
328 |
+} |
329 |
+ |
330 |
+multilib_src_test() { |
331 |
+ if multilib_is_native_abi ; then |
332 |
+ "${WAF_BINARY}" test || die "test failed" |
333 |
+ fi |
334 |
+} |
335 |
+ |
336 |
+pkg_postinst() { |
337 |
+ ewarn "Be aware the this release contains the best of all of Samba's" |
338 |
+ ewarn "technology parts, both a file server (that you can reasonably expect" |
339 |
+ ewarn "to upgrade existing Samba 3.x releases to) and the AD domain" |
340 |
+ ewarn "controller work previously known as 'samba4'." |
341 |
+ |
342 |
+ elog "For further information and migration steps make sure to read " |
343 |
+ elog "https://samba.org/samba/history/${P}.html " |
344 |
+ elog "https://wiki.samba.org/index.php/Samba4/HOWTO " |
345 |
+} |