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