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: Fri, 13 Jul 2018 14:14:12
Message-Id: 1531491236.a68b6d394e0779b8818887175c8c212a91d28179.polynomial-c@gentoo
1 commit: a68b6d394e0779b8818887175c8c212a91d28179
2 Author: Lars Wendler <polynomial-c <AT> gentoo <DOT> org>
3 AuthorDate: Fri Jul 13 14:13:20 2018 +0000
4 Commit: Lars Wendler <polynomial-c <AT> gentoo <DOT> org>
5 CommitDate: Fri Jul 13 14:13:56 2018 +0000
6 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=a68b6d39
7
8 net-fs/samba: Removed old.
9
10 Package-Manager: Portage-2.3.42, Repoman-2.3.9
11
12 net-fs/samba/Manifest | 1 -
13 net-fs/samba/samba-4.8.2.ebuild | 286 ----------------------------------------
14 2 files changed, 287 deletions(-)
15
16 diff --git a/net-fs/samba/Manifest b/net-fs/samba/Manifest
17 index a2b265f4f95..52ff5ec3021 100644
18 --- a/net-fs/samba/Manifest
19 +++ b/net-fs/samba/Manifest
20 @@ -4,7 +4,6 @@ DIST samba-4.5.16.tar.gz 21024396 BLAKE2B e737559fb748044076608fa233700eb54c7e1c
21 DIST samba-4.6.15.tar.gz 21175479 BLAKE2B 40751be51e5ae1368b66d5e0919092935749a749dbb469dd503864acb9d5caf1c26c0894ac3a5294ed8b2c79de31366d80f1b565bffb4f18a7ba659872748feb SHA512 7b55e305c41380ba6dd4df94bdd88aa2d4ebbe27ec258331c04a9610ee820e4c290a3dfdcd04fa89e100b115a674380881699d6cd565f08d753d1b23036c4986
22 DIST samba-4.6.7-disable-python-patches.tar.xz 8896 BLAKE2B 99496f91d015f10d111e2a8738c9e66b3c1f1958c0e0894d8e9d8f3ff141fbedaa25d93699b702ab69130fda770c80c3ed4280de0af1090dedbcfd5784b72222 SHA512 c45e548a49735e17b568bebf07dc7409de3de0f93256d1dcf345d2723a27d22a51d860ed921785354fda691f83be4eca3b9d618d5c332438ebf97518a01983eb
23 DIST samba-4.7.7.tar.gz 16875059 BLAKE2B 05ecf13562e847070498e923df0cc85836b2fb98d4618942f60e4f28d6c5110b382cfe494e6578bbc06e14052c5d87b0f542ada186e4f132375c4360eaa8bb9f SHA512 78f180f602f08ab9e3000ae016f667e44f059a865b606c21e18857efb89af469c2cb2f9c1316e658badf1a1f41826ba87ccb23f38dc31fe82bf9e5b8fb93daad
24 -DIST samba-4.8.2.tar.gz 17675145 BLAKE2B 3ae5c33c85d7f0e4cf7fe45fbef55cd0d5aec2e77355297be31c4a32de41ff40338f58843a3e31942ca2c2a086829ed4f339485a7dd39693f1e433526eb23af1 SHA512 061b968c81c2272b5e353444ef53372ae5caa66f5af0b28b422e7d33a32ed0d321900c13636729c0e21a4d8dedcaff7ca7a5f6fe682b71c292f9a66a497a2766
25 DIST samba-4.8.3.tar.gz 17680660 BLAKE2B ee2c37eb935b3545eec8975d2427e55cf0dcdc8f9725e7549ffd42f8069e2b1ee65178895c173cd694442aac0a888d661837edeb8990e948b021a69e3078106f SHA512 0dd035f5f2cfc5f47f2e9b9e295548ecce73014f01e9539d9cc639f27b00e1e71a57acb018da70e70d3761281246933b6935be151df1bd35e539d6d338686217
26 DIST samba-4.9.0rc1.tar.gz 17960031 BLAKE2B d430b56fcb314a3c6a5da0cbd9b55434c02580b19991827ccd6bf65a056bd7a920b7f37eb0bdfb85e0251e6fc4ec1f28f4a1fd81ab66ee98eb58149efd1e2f5a SHA512 9984a5589e49a575b95eb584560acbd14265f5ed6f1f057254f357e63e6293bc9642a458d7623b7245e29a68f6a1f869f50a72ba67fab59715e17ba7739660c8
27 DIST samba-disable-python-patches-4.2.12.tar.xz 6052 BLAKE2B 0ae755cbbd8921f4e2f5adf797cd3a77f81bb15ac2d1a65645bc9b53184c397a2bb35f83b88a0de680cc834a63b263e883e91206a7df99735f5ef8f091f54bb0 SHA512 c527d0a052d3211e5b12c17bc94db56cc5e5545189ed65a760c0656c94c22e27a4b159e6439eb0370873e1619873a741f3b3bd10d3876b38eb3914a87eace372
28
29 diff --git a/net-fs/samba/samba-4.8.2.ebuild b/net-fs/samba/samba-4.8.2.ebuild
30 deleted file mode 100644
31 index eb9a466868e..00000000000
32 --- a/net-fs/samba/samba-4.8.2.ebuild
33 +++ /dev/null
34 @@ -1,286 +0,0 @@
35 -# Copyright 1999-2018 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
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 -[[ ${PV} = *_rc* ]] || \
52 -KEYWORDS="~amd64 ~arm64 ~hppa ~x86"
53 -
54 -DESCRIPTION="Samba Suite Version 4"
55 -HOMEPAGE="https://www.samba.org/"
56 -LICENSE="GPL-3"
57 -
58 -SLOT="0"
59 -
60 -IUSE="acl addc addns ads ceph client cluster cups debug dmapi fam gnutls gpg iprint ldap pam python
61 -quota selinux syslog system-heimdal +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.3.3[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.11[python?,${PYTHON_USEDEP},${MULTILIB_USEDEP}]
91 - >=sys-libs/tdb-1.3.15[python?,${PYTHON_USEDEP},${MULTILIB_USEDEP}]
92 - >=sys-libs/tevent-0.9.36[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 - ceph? ( sys-cluster/ceph )
102 - cluster? (
103 - net-libs/rpcsvc-proto
104 - !dev-db/ctdb
105 - )
106 - cups? ( net-print/cups )
107 - debug? ( dev-util/lttng-ust )
108 - dmapi? ( sys-apps/dmapi )
109 - fam? ( virtual/fam )
110 - gnutls? (
111 - dev-libs/libgcrypt:0
112 - >=net-libs/gnutls-1.4.0
113 - )
114 - gpg? ( app-crypt/gpgme )
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 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.8-without_ads_build_fix.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 - use test || sed -i -e '/"iso8601":/d' "${S}"/third_party/wscript || die
194 -
195 - # ugly hackaround for bug #592502
196 - cp /usr/include/tevent_internal.h "${S}"/lib/tevent/ || die
197 -
198 - sed -e 's:<gpgme\.h>:<gpgme/gpgme.h>:' \
199 - -i source4/dsdb/samdb/ldb_modules/password_hash.c \
200 - || die
201 -
202 - # Friggin' WAF shit
203 - multilib_copy_sources
204 -}
205 -
206 -multilib_src_configure() {
207 - # when specifying libs for samba build you must append NONE to the end to
208 - # stop it automatically including things
209 - local bundled_libs="NONE"
210 - if ! use system-heimdal && ! use system-mitkrb5 ; then
211 - bundled_libs="heimbase,heimntlm,hdb,kdc,krb5,wind,gssapi,hcrypto,hx509,roken,asn1,com_err,NONE"
212 - fi
213 -
214 - local myconf=(
215 - --enable-fhs
216 - --sysconfdir="${EPREFIX}/etc"
217 - --localstatedir="${EPREFIX}/var"
218 - --with-modulesdir="${EPREFIX}/usr/$(get_libdir)/samba"
219 - --with-piddir="${EPREFIX}/run/${PN}"
220 - --bundled-libraries="${bundled_libs}"
221 - --builtin-libraries=NONE
222 - --disable-rpath
223 - --disable-rpath-install
224 - --nopyc
225 - --nopyo
226 - $(multilib_native_use_with acl acl-support)
227 - $(multilib_native_usex addc '' '--without-ad-dc')
228 - $(multilib_native_use_with addns dnsupdate)
229 - $(multilib_native_use_with ads)
230 - $(multilib_native_use_enable ceph cephfs)
231 - $(multilib_native_use_with cluster cluster-support)
232 - $(multilib_native_use_enable cups)
233 - $(multilib_native_use_with dmapi)
234 - $(multilib_native_use_with fam)
235 - $(multilib_native_use_with gpg gpgme)
236 - $(multilib_native_use_enable iprint)
237 - $(multilib_native_use_with pam)
238 - $(multilib_native_usex pam "--with-pammodulesdir=${EPREFIX}/$(get_libdir)/security" '')
239 - $(multilib_native_use_with quota quotas)
240 - $(multilib_native_use_with syslog)
241 - $(multilib_native_use_with systemd)
242 - $(multilib_native_use_with winbind)
243 - $(multilib_native_usex python '' '--disable-python')
244 - $(multilib_native_use_enable zeroconf avahi)
245 - $(multilib_native_usex test '--enable-selftest' '')
246 - $(usex system-mitkrb5 '--with-system-mitkrb5' '')
247 - $(use_enable gnutls)
248 - $(use_with debug lttng)
249 - $(use_with ldap)
250 - )
251 - multilib_is_native_abi && myconf+=( --with-shared-modules=${SHAREDMODS} )
252 -
253 - CPPFLAGS="-I${SYSROOT}${EPREFIX}/usr/include/et ${CPPFLAGS}" \
254 - waf-utils_src_configure ${myconf[@]}
255 -}
256 -
257 -multilib_src_compile() {
258 - waf-utils_src_compile
259 -}
260 -
261 -multilib_src_install() {
262 - waf-utils_src_install
263 -
264 - # Make all .so files executable
265 - find "${ED}" -type f -name "*.so" -exec chmod +x {} +
266 -
267 - if multilib_is_native_abi ; then
268 - # install ldap schema for server (bug #491002)
269 - if use ldap ; then
270 - insinto /etc/openldap/schema
271 - doins examples/LDAP/samba.schema
272 - fi
273 -
274 - # create symlink for cups (bug #552310)
275 - if use cups ; then
276 - dosym ../../../bin/smbspool /usr/libexec/cups/backend/smb
277 - fi
278 -
279 - # install example config file
280 - insinto /etc/samba
281 - doins examples/smb.conf.default
282 -
283 - # Fix paths in example file (#603964)
284 - sed \
285 - -e '/log file =/s@/usr/local/samba/var/@/var/log/samba/@' \
286 - -e '/include =/s@/usr/local/samba/lib/@/etc/samba/@' \
287 - -e '/path =/s@/usr/local/samba/lib/@/var/lib/samba/@' \
288 - -e '/path =/s@/usr/local/samba/@/var/lib/samba/@' \
289 - -e '/path =/s@/usr/spool/samba@/var/spool/samba@' \
290 - -i "${ED%/}"/etc/samba/smb.conf.default || die
291 -
292 - # Install init script and conf.d file
293 - newinitd "${CONFDIR}/samba4.initd-r1" samba
294 - newconfd "${CONFDIR}/samba4.confd" samba
295 -
296 - systemd_dotmpfilesd "${FILESDIR}"/samba.conf
297 - systemd_dounit "${FILESDIR}"/nmbd.service
298 - systemd_dounit "${FILESDIR}"/smbd.{service,socket}
299 - systemd_newunit "${FILESDIR}"/smbd_at.service 'smbd@.service'
300 - systemd_dounit "${FILESDIR}"/winbindd.service
301 - systemd_dounit "${FILESDIR}"/samba.service
302 - fi
303 -}
304 -
305 -multilib_src_test() {
306 - if multilib_is_native_abi ; then
307 - "${WAF_BINARY}" test || die "test failed"
308 - fi
309 -}
310 -
311 -pkg_postinst() {
312 - ewarn "Be aware the this release contains the best of all of Samba's"
313 - ewarn "technology parts, both a file server (that you can reasonably expect"
314 - ewarn "to upgrade existing Samba 3.x releases to) and the AD domain"
315 - ewarn "controller work previously known as 'samba4'."
316 -
317 - elog "For further information and migration steps make sure to read "
318 - elog "https://samba.org/samba/history/${P}.html "
319 - elog "https://wiki.samba.org/index.php/Samba4/HOWTO "
320 -}