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