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