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: Tue, 05 Nov 2019 14:37:54
Message-Id: 1572964663.1d91414a2fd09db195b64d67e4cfdbdb6efe6488.polynomial-c@gentoo
1 commit: 1d91414a2fd09db195b64d67e4cfdbdb6efe6488
2 Author: Lars Wendler <polynomial-c <AT> gentoo <DOT> org>
3 AuthorDate: Tue Nov 5 14:37:17 2019 +0000
4 Commit: Lars Wendler <polynomial-c <AT> gentoo <DOT> org>
5 CommitDate: Tue Nov 5 14:37:43 2019 +0000
6 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=1d91414a
7
8 net-fs/samba: Removed old
9
10 Package-Manager: Portage-2.3.78, Repoman-2.3.17
11 Signed-off-by: Lars Wendler <polynomial-c <AT> gentoo.org>
12
13 net-fs/samba/Manifest | 1 -
14 net-fs/samba/samba-4.11.0.ebuild | 311 ---------------------------------------
15 2 files changed, 312 deletions(-)
16
17 diff --git a/net-fs/samba/Manifest b/net-fs/samba/Manifest
18 index eb3ee425653..d01ae4811d0 100644
19 --- a/net-fs/samba/Manifest
20 +++ b/net-fs/samba/Manifest
21 @@ -1,7 +1,6 @@
22 DIST samba-4.10.10.tar.gz 18335638 BLAKE2B f8c215b82fea4ef69b9baf8ffac417e8530b17e4974c249fbf566c231374c299f4de9a1fd9ba5027fdf41d59f3e275456a6e1e435edd4bebba35eacbaa9a9c1a SHA512 d82f96af5754d484673d3497b2837d9df06352d7be4810fe6d812d64db5b95d588ed42d5565bf0f6f7c305bb9c6d3274e740ea9acd75b32aad75d0b38e4d2bc9
23 DIST samba-4.10.2.tar.gz 18280710 BLAKE2B f15b117d1159dfa6cd279c5011629d688fcfba94a2ca8184a827d0787a31f76a38f46b355454b916f2e62c0a88109b86664f6bb16fc0e23d0f61d09908e587cd SHA512 3d146ea12567ebb02a7babcad779b82339ffbfb19f6f2be5cac33eb18af2c9b546dc1cd910072a5c9e152ba9c4a632ed6870c48a8f6ad9d04304b130f240a4bf
24 DIST samba-4.10.8.tar.gz 18316560 BLAKE2B a1b89169a13eb96202e846e9e501b364235d61459a5d2f2e443af569d8a754df8546b5fb52e9e1b9629535d838a7fdfd9cd1fb631870880dad9981587c14be5f SHA512 14d463dfba36473f4a1d2b306ff2a18c664e1a01bc8077ef62afc6796cf4dd65461d72b519b8df3a777eaf322cb98653b416468d770541cd21fab2383c8dce66
25 -DIST samba-4.11.0.tar.gz 18507455 BLAKE2B 20a39b1f8e5f54494cde6519021d24abf9c2832917033a638c9318f866c1c65a56536926906a0caa8a18b6f02b924c90e7cf05ea7401d9b1c9407d74d903c047 SHA512 3cdb7a0fd5b31a84e9e16587da94ad544adcbda4e0ab9f89e3038580329b1149eeab80e073db7bb121b2c355ecb00350f682887443de0dd30611722fe44817dd
26 DIST samba-4.11.1.tar.gz 18516111 BLAKE2B d2f557f0e53782783189c415cd086065a37b6808707dc0ec5096175a75eab9d6045b41ac1597ca1ea2d463a8261d7b299602f2da5dfecf5dddaf03d89ea1056a SHA512 3a711b11254cff4c0d74f883d8bc6e454094ba2c6a10fb0d08e85cbed11a1326bb39f0e47600380a5f293a14a6463dbd09be7404305923ac579b6f85072309c8
27 DIST samba-4.11.2.tar.gz 18516056 BLAKE2B 2b2a11e9b72deec54cf19830a402a5f2ae0dc2c3437116a636823d29e55c68842fce2434d196d567a8250b59e5bdffe9af367592c6949496f63caccbf4a5cb6f SHA512 f91053f019c9f979d7e29af00ea9b03a79c6f8efe91413ac2d6dca823f45ca9c30686264fdc0545dddabc687ad369a80c9ec78ebe75d1787dfc9b834233e12c1
28 DIST samba-4.5.11-disable-python-patches.tar.xz 6292 BLAKE2B c2a32a1059a02bc1c87ce5f604cbc5878c654b8f693c8486b5ba63b37513444915a7b6389fe82b7e31ab2f9577dd8462eddba60b4f4f756b4ed1145ce7bd90ae SHA512 f0e3076e3e1ecaae3f06b3ef30efc81719fb3f63a1041dcbdae4b62ca4cf693732f9eb16f047d046d4930136fed82194e82b455ea888e12cf845b3e6a122d57d
29
30 diff --git a/net-fs/samba/samba-4.11.0.ebuild b/net-fs/samba/samba-4.11.0.ebuild
31 deleted file mode 100644
32 index e971356a350..00000000000
33 --- a/net-fs/samba/samba-4.11.0.ebuild
34 +++ /dev/null
35 @@ -1,311 +0,0 @@
36 -# Copyright 1999-2019 Gentoo Authors
37 -# Distributed under the terms of the GNU General Public License v2
38 -
39 -EAPI=6
40 -PYTHON_COMPAT=( python3_{5,6,7} )
41 -PYTHON_REQ_USE='threads(+),xml(+)'
42 -
43 -inherit python-single-r1 waf-utils multilib-minimal linux-info systemd pam
44 -
45 -MY_PV="${PV/_rc/rc}"
46 -MY_P="${PN}-${MY_PV}"
47 -
48 -SRC_PATH="stable"
49 -[[ ${PV} = *_rc* ]] && SRC_PATH="rc"
50 -
51 -SRC_URI="mirror://samba/${SRC_PATH}/${MY_P}.tar.gz"
52 -[[ ${PV} = *_rc* ]] || \
53 -KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86"
54 -
55 -DESCRIPTION="Samba Suite Version 4"
56 -HOMEPAGE="https://www.samba.org/"
57 -LICENSE="GPL-3"
58 -
59 -SLOT="0"
60 -
61 -IUSE="acl addc addns ads ceph client cluster cups debug dmapi fam gpg iprint
62 -json ldap pam profiling-data python quota selinux syslog system-heimdal
63 -+system-mitkrb5 systemd test winbind zeroconf"
64 -
65 -MULTILIB_WRAPPED_HEADERS=(
66 - /usr/include/samba-4.0/policy.h
67 - /usr/include/samba-4.0/dcerpc_server.h
68 - /usr/include/samba-4.0/ctdb.h
69 - /usr/include/samba-4.0/ctdb_client.h
70 - /usr/include/samba-4.0/ctdb_protocol.h
71 - /usr/include/samba-4.0/ctdb_private.h
72 - /usr/include/samba-4.0/ctdb_typesafe_cb.h
73 - /usr/include/samba-4.0/ctdb_version.h
74 -)
75 -
76 -# sys-apps/attr is an automagic dependency (see bug #489748)
77 -CDEPEND="
78 - >=app-arch/libarchive-3.1.2[${MULTILIB_USEDEP}]
79 - dev-lang/perl:=
80 - dev-libs/libaio[${MULTILIB_USEDEP}]
81 - dev-libs/libbsd[${MULTILIB_USEDEP}]
82 - dev-libs/libgcrypt:0
83 - dev-libs/iniparser:0
84 - dev-libs/popt[${MULTILIB_USEDEP}]
85 - dev-python/subunit[${PYTHON_USEDEP},${MULTILIB_USEDEP}]
86 - >=dev-util/cmocka-1.1.1[${MULTILIB_USEDEP}]
87 - >=net-libs/gnutls-3.2.0
88 - net-libs/libnsl:=[${MULTILIB_USEDEP}]
89 - sys-apps/attr[${MULTILIB_USEDEP}]
90 - >=sys-libs/ldb-2.0.7[ldap(+)?,python?,${PYTHON_USEDEP},${MULTILIB_USEDEP}]
91 - <sys-libs/ldb-2.2.0[ldap(+)?,python?,${PYTHON_USEDEP},${MULTILIB_USEDEP}]
92 - sys-libs/libcap
93 - sys-libs/ncurses:0=[${MULTILIB_USEDEP}]
94 - sys-libs/readline:0=
95 - >=sys-libs/talloc-2.2.0[python?,${PYTHON_USEDEP},${MULTILIB_USEDEP}]
96 - >=sys-libs/tdb-1.4.2[python?,${PYTHON_USEDEP},${MULTILIB_USEDEP}]
97 - >=sys-libs/tevent-0.10.0[python?,${PYTHON_USEDEP},${MULTILIB_USEDEP}]
98 - sys-libs/zlib[${MULTILIB_USEDEP}]
99 - virtual/libiconv
100 - pam? ( sys-libs/pam )
101 - acl? ( virtual/acl )
102 - addns? (
103 - net-dns/bind-tools[gssapi]
104 - dev-python/dnspython:=[${PYTHON_USEDEP}]
105 - )
106 - ceph? ( sys-cluster/ceph )
107 - cluster? (
108 - net-libs/rpcsvc-proto
109 - !dev-db/ctdb
110 - )
111 - cups? ( net-print/cups )
112 - debug? ( dev-util/lttng-ust )
113 - dmapi? ( sys-apps/dmapi )
114 - fam? ( virtual/fam )
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 - zeroconf? ( net-dns/avahi )
122 -"
123 -DEPEND="${CDEPEND}
124 - ${PYTHON_DEPS}
125 - app-text/docbook-xsl-stylesheets
126 - dev-libs/libxslt
127 - net-libs/libtirpc[${MULTILIB_USEDEP}]
128 - virtual/pkgconfig
129 - || (
130 - net-libs/rpcsvc-proto
131 - <sys-libs/glibc-2.26[rpc(+)]
132 - )
133 - test? (
134 - !system-mitkrb5? (
135 - >=sys-libs/nss_wrapper-1.1.3
136 - >=net-dns/resolv_wrapper-1.1.4
137 - >=net-libs/socket_wrapper-1.1.9
138 - >=sys-libs/uid_wrapper-1.2.1
139 - )
140 - )"
141 -RDEPEND="${CDEPEND}
142 - python? ( ${PYTHON_DEPS} )
143 - client? ( net-fs/cifs-utils[ads?] )
144 - selinux? ( sec-policy/selinux-samba )
145 - !dev-perl/Parse-Yapp
146 -"
147 -
148 -REQUIRED_USE="
149 - addc? ( python json winbind )
150 - addns? ( python )
151 - ads? ( acl ldap winbind )
152 - cluster? ( ads )
153 - gpg? ( addc )
154 - test? ( python )
155 - ?? ( system-heimdal system-mitkrb5 )
156 - ${PYTHON_REQUIRED_USE}
157 -"
158 -
159 -# the test suite is messed, it uses system-installed samba
160 -# bits instead of what was built, tests things disabled via use
161 -# flags, and generally just fails to work in a way ebuilds could
162 -# rely on in its current state
163 -RESTRICT="test"
164 -
165 -S="${WORKDIR}/${MY_P}"
166 -
167 -PATCHES=(
168 - "${FILESDIR}/${PN}-4.4.0-pam.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)
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_with debug lttng)
253 - $(use_with ldap)
254 - $(use_with profiling-data)
255 - )
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_install_all() {
326 - # Attempt to fix bug #673168
327 - find "${ED}" -type d -name "Yapp" -print0 \
328 - | xargs -0 --no-run-if-empty rm -r || die
329 -}
330 -
331 -multilib_src_test() {
332 - if multilib_is_native_abi ; then
333 - "${WAF_BINARY}" test || die "test failed"
334 - fi
335 -}
336 -
337 -pkg_postinst() {
338 - ewarn "Be aware the this release contains the best of all of Samba's"
339 - ewarn "technology parts, both a file server (that you can reasonably expect"
340 - ewarn "to upgrade existing Samba 3.x releases to) and the AD domain"
341 - ewarn "controller work previously known as 'samba4'."
342 -
343 - elog "For further information and migration steps make sure to read "
344 - elog "https://samba.org/samba/history/${P}.html "
345 - elog "https://wiki.samba.org/index.php/Samba4/HOWTO "
346 -}