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, 10 Mar 2017 11:30:17
Message-Id: 1489145409.85b5a04e4bde084f302da3e968dd7bc6b2f2eba2.polynomial-c@gentoo
1 commit: 85b5a04e4bde084f302da3e968dd7bc6b2f2eba2
2 Author: Lars Wendler <polynomial-c <AT> gentoo <DOT> org>
3 AuthorDate: Fri Mar 10 11:29:47 2017 +0000
4 Commit: Lars Wendler <polynomial-c <AT> gentoo <DOT> org>
5 CommitDate: Fri Mar 10 11:30:09 2017 +0000
6 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=85b5a04e
7
8 net-fs/samba: Removed old.
9
10 Package-Manager: Portage-2.3.4, Repoman-2.3.2
11
12 net-fs/samba/Manifest | 1 -
13 net-fs/samba/samba-4.5.4.ebuild | 266 ----------------------------------------
14 2 files changed, 267 deletions(-)
15
16 diff --git a/net-fs/samba/Manifest b/net-fs/samba/Manifest
17 index cad3dc7c663..80e30298a9c 100644
18 --- a/net-fs/samba/Manifest
19 +++ b/net-fs/samba/Manifest
20 @@ -1,6 +1,5 @@
21 DIST samba-4.2.11.tar.gz 20875348 SHA256 75bce53c922e51352933c9846f2c4b1e251fabb80927adb426a773a321ee01f8 SHA512 293365f2718e756b66ccaec4b0dbce7044ade615b332f58968cf42dd1ec6b6445576590eaf5bd35fa00ba9aa4ba3be7720afc33763652e97731eebc3149f4820 WHIRLPOOL 1e04fd527e55c8d438c96a43d9a25a9b3e09a3edc504a2a5fe44bc8f9101c833c90e3ba3188b8872b046370916f3798e4fce0ffa7848b65f452b5c51ec7107f1
22 DIST samba-4.2.14.tar.gz 20883281 SHA256 db820a9947e44f04b0eb25e4aa0c3db32c4042fca541775ee8e2905093e888e6 SHA512 269dd74ba788657434f51ac70953a293c94bcf98280eaa6f44634c5da54169a5ea7865d543a7c23860c4750a40cdee7caeaf5c7fc3dbc137f444e90f31a09890 WHIRLPOOL 925369c2f9c222d718bf4aacc7b1a83b8275acd96bbc1eca52ad96c86847327807560674ee9b180173d17a1e6109307ec4f70f1acbebe2efc8a9e67f2141e17d
23 -DIST samba-4.5.4.tar.gz 20958348 SHA256 1800d10ea14cabef67c83cc56a0f37f4f30ba5df218b3a1e7c874069a08c0f40 SHA512 7b24227e17ab091e6165c605f28af19fa846de63f3f24508411db2b509d942e599702dd278c8430481d7a404c5a97005148286ea4e94a35b57a1ec303b1a4409 WHIRLPOOL a1b84726b0a0addb1ca2de8d84429280a82001bf2fb0fbd7524dd2499fb18370d19e099b0852b93cb105b3db45583688b107533d404703ac635c2e6e8e2cb81b
24 DIST samba-4.5.5.tar.gz 20953640 SHA256 bff02762b3e4ee030f02266c6e24a0b888248b387246219b7fbe3e1758ef2184 SHA512 dd9bd2cdd16ef9289c46583b9809fb2757f821bcfedacbac384718b977f981a20d011065087b2fa985c57082512b9cc5d5e19daede3fc6c7e063e04a66349b4a WHIRLPOOL 0dcffe3071ef2e621a2bc5b317e05036b5a75c6a0231538026bdee76bb43743d72acff128025e7957791a65856794cbfa2bfbca203b5f0a685455e1798b29f40
25 DIST samba-4.5.6.tar.gz 20978580 SHA256 0d8ff81ef034344d09c9614fae7a2ad19cf7b175eb080e8548aa7783040ade70 SHA512 089ffbeae5d967ad1c805db55f2778dd4cc23083ed732df04a6f1f9d9bd734004002e93c9f1dd3128cf363a26060d0baf30256a0ba78f797cd340ae478e2c0b0 WHIRLPOOL 03c6cd57e76bbfc8b2f6bcd2893376687063c0e3455e00646e71e32cb0c908d5e2bc8a33344cc9252cf466345bd8121e715e029f12d5ba10203dd5e302811ab5
26 DIST samba-4.6.0rc2.tar.gz 20956751 SHA256 e05a941d6d089a4781a51eb758661d66ce9c23b7e6286da756f5910424de22d5 SHA512 e66d9f50f0bda315c1a57cf94c5c06811bf5d0c709ebc513488635c1e044865abc27af9f60023e5ae4ae0c08f819bfc46886bd408be0c63aa8a09a945efa67e0 WHIRLPOOL 6fc370fbb4dc5501a3c134725bebe89869bb57d6d54c713d1920056ebe558ee378046e9fa1a6b70af6e23885b92ca4c3dde85e574e482e7a101b334cf0dc9705
27
28 diff --git a/net-fs/samba/samba-4.5.4.ebuild b/net-fs/samba/samba-4.5.4.ebuild
29 deleted file mode 100644
30 index d76476baed2..00000000000
31 --- a/net-fs/samba/samba-4.5.4.ebuild
32 +++ /dev/null
33 @@ -1,266 +0,0 @@
34 -# Copyright 1999-2017 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-disable-python-patches-4.5.0_rc1.tar.xz"
51 -[[ ${PV} = *_rc* ]] || \
52 -KEYWORDS="~amd64 ~hppa ~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 -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="${PYTHON_DEPS}
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 - sys-apps/attr[${MULTILIB_USEDEP}]
84 - >=sys-libs/ldb-1.1.27[ldap(+)?,${MULTILIB_USEDEP}]
85 - sys-libs/libcap
86 - sys-libs/ncurses:0=[${MULTILIB_USEDEP}]
87 - sys-libs/readline:0=
88 - >=sys-libs/talloc-2.1.8[python,${PYTHON_USEDEP},${MULTILIB_USEDEP}]
89 - >=sys-libs/tdb-1.3.10[python,${PYTHON_USEDEP},${MULTILIB_USEDEP}]
90 - >=sys-libs/tevent-0.9.31-r1[${MULTILIB_USEDEP}]
91 - sys-libs/zlib[${MULTILIB_USEDEP}]
92 - virtual/libiconv
93 - pam? ( virtual/pam )
94 - acl? ( virtual/acl )
95 - addns? ( net-dns/bind-tools[gssapi] )
96 - cluster? ( !dev-db/ctdb )
97 - cups? ( net-print/cups )
98 - dmapi? ( sys-apps/dmapi )
99 - fam? ( virtual/fam )
100 - gnutls? (
101 - dev-libs/libgcrypt:0
102 - >=net-libs/gnutls-1.4.0
103 - )
104 - gpg? ( app-crypt/gpgme )
105 - ldap? ( net-nds/openldap[${MULTILIB_USEDEP}] )
106 - system-heimdal? ( >=app-crypt/heimdal-1.5[-ssl,${MULTILIB_USEDEP}] )
107 - system-mitkrb5? ( app-crypt/mit-krb5[${MULTILIB_USEDEP}] )
108 - systemd? ( sys-apps/systemd:0= )"
109 -DEPEND="${CDEPEND}
110 - virtual/pkgconfig"
111 -RDEPEND="${CDEPEND}
112 - client? ( net-fs/cifs-utils[ads?] )
113 - selinux? ( sec-policy/selinux-samba )
114 - !dev-perl/Parse-Yapp
115 -"
116 -
117 -REQUIRED_USE="addc? ( gnutls !system-mitkrb5 )
118 - ads? ( acl gnutls ldap )
119 - gpg? ( addc )
120 - ?? ( system-heimdal system-mitkrb5 )
121 - ${PYTHON_REQUIRED_USE}"
122 -
123 -S="${WORKDIR}/${MY_P}"
124 -
125 -PATCHES=(
126 - "${FILESDIR}/${PN}-4.4.0-pam.patch"
127 - "${FILESDIR}/${PN}-4.5.1-compile_et_fix.patch"
128 -)
129 -
130 -#CONFDIR="${FILESDIR}/$(get_version_component_range 1-2)"
131 -CONFDIR="${FILESDIR}/4.4"
132 -
133 -WAF_BINARY="${S}/buildtools/bin/waf"
134 -
135 -SHAREDMODS=""
136 -
137 -pkg_setup() {
138 - python-single-r1_pkg_setup
139 - if use cluster ; then
140 - SHAREDMODS="idmap_rid,idmap_tdb2,idmap_ad"
141 - elif use ads ; then
142 - SHAREDMODS="idmap_ad"
143 - fi
144 -}
145 -
146 -src_prepare() {
147 - default
148 -
149 - # install the patches from tarball(s)
150 - eapply "${WORKDIR}/patches"
151 -
152 - # ugly hackaround for bug #592502
153 - cp /usr/include/tevent_internal.h "${S}"/lib/tevent/ || die
154 -
155 - sed -e 's:<gpgme\.h>:<gpgme/gpgme.h>:' \
156 - -i source4/dsdb/samdb/ldb_modules/password_hash.c \
157 - || die
158 -
159 - # Friggin' WAF shit
160 - multilib_copy_sources
161 -}
162 -
163 -multilib_src_configure() {
164 - # when specifying libs for samba build you must append NONE to the end to
165 - # stop it automatically including things
166 - local bundled_libs="NONE"
167 - if ! use system-heimdal && ! use system-mitkrb5 ; then
168 - bundled_libs="heimbase,heimntlm,hdb,kdc,krb5,wind,gssapi,hcrypto,hx509,roken,asn1,com_err,NONE"
169 - fi
170 -
171 - local myconf=()
172 - myconf=(
173 - --enable-fhs
174 - --sysconfdir="${EPREFIX}/etc"
175 - --localstatedir="${EPREFIX}/var"
176 - --with-modulesdir="${EPREFIX}/usr/$(get_libdir)/samba"
177 - --with-piddir="${EPREFIX}/run/${PN}"
178 - --bundled-libraries="${bundled_libs}"
179 - --builtin-libraries=NONE
180 - --disable-rpath
181 - --disable-rpath-install
182 - --nopyc
183 - --nopyo
184 - )
185 - if multilib_is_native_abi ; then
186 - myconf+=(
187 - $(use_with acl acl-support)
188 - $(usex addc '' '--without-ad-dc')
189 - $(use_with addns dnsupdate)
190 - $(use_with ads)
191 - $(use_with cluster cluster-support)
192 - $(use_enable cups)
193 - $(use_with dmapi)
194 - $(use_with fam)
195 - $(use_enable gnutls)
196 - $(use_with gpg gpgme)
197 - $(use_enable iprint)
198 - $(use_with ldap)
199 - $(use_with pam)
200 - $(usex pam "--with-pammodulesdir=${EPREFIX}/$(get_libdir)/security" '')
201 - $(use_with quota quotas)
202 - $(use_with syslog)
203 - $(use_with systemd)
204 - $(usex system-mitkrb5 '--with-system-mitkrb5' '')
205 - $(use_with winbind)
206 - $(usex test '--enable-selftest' '')
207 - $(use_enable zeroconf avahi)
208 - --with-shared-modules=${SHAREDMODS}
209 - )
210 - else
211 - myconf+=(
212 - --without-acl-support
213 - --without-ad-dc
214 - --without-dnsupdate
215 - --without-ads
216 - --disable-avahi
217 - --without-cluster-support
218 - --disable-cups
219 - --without-dmapi
220 - --without-fam
221 - --disable-gnutls
222 - --without-gpgme
223 - --disable-iprint
224 - $(use_with ldap)
225 - --without-pam
226 - --without-quotas
227 - --without-syslog
228 - --without-systemd
229 - $(usex system-mitkrb5 '--with-system-mitkrb5' '')
230 - --without-winbind
231 - --disable-python
232 - )
233 - fi
234 -
235 - CPPFLAGS="-I${SYSROOT}${EPREFIX}/usr/include/et ${CPPFLAGS}" \
236 - waf-utils_src_configure ${myconf[@]}
237 -}
238 -
239 -multilib_src_install() {
240 - waf-utils_src_install
241 -
242 - # Make all .so files executable
243 - find "${D}" -type f -name "*.so" -exec chmod +x {} +
244 -
245 - if multilib_is_native_abi; then
246 - # install ldap schema for server (bug #491002)
247 - if use ldap ; then
248 - insinto /etc/openldap/schema
249 - doins examples/LDAP/samba.schema
250 - fi
251 -
252 - # create symlink for cups (bug #552310)
253 - if use cups ; then
254 - dosym /usr/bin/smbspool /usr/libexec/cups/backend/smb
255 - fi
256 -
257 - # install example config file
258 - insinto /etc/samba
259 - doins examples/smb.conf.default
260 -
261 - # Fix paths in example file (#603964)
262 - sed \
263 - -e '/log file =/s@/usr/local/samba/var/@/var/log/samba/@' \
264 - -e '/include =/s@/usr/local/samba/lib/@/etc/samba/@' \
265 - -e '/path =/s@/usr/local/samba/lib/@/var/lib/samba/@' \
266 - -e '/path =/s@/usr/local/samba/@/var/lib/samba/@' \
267 - -e '/path =/s@/usr/spool/samba@/var/spool/samba@' \
268 - -i "${ED%/}"/etc/samba/smb.conf.default || die
269 -
270 - # Install init script and conf.d file
271 - newinitd "${CONFDIR}/samba4.initd-r1" samba
272 - newconfd "${CONFDIR}/samba4.confd" samba
273 -
274 - systemd_dotmpfilesd "${FILESDIR}"/samba.conf
275 - systemd_dounit "${FILESDIR}"/nmbd.service
276 - systemd_dounit "${FILESDIR}"/smbd.{service,socket}
277 - systemd_newunit "${FILESDIR}"/smbd_at.service 'smbd@.service'
278 - systemd_dounit "${FILESDIR}"/winbindd.service
279 - systemd_dounit "${FILESDIR}"/samba.service
280 - fi
281 -}
282 -
283 -multilib_src_test() {
284 - if multilib_is_native_abi ; then
285 - "${WAF_BINARY}" test || die "test failed"
286 - fi
287 -}
288 -
289 -pkg_postinst() {
290 - ewarn "Be aware the this release contains the best of all of Samba's"
291 - ewarn "technology parts, both a file server (that you can reasonably expect"
292 - ewarn "to upgrade existing Samba 3.x releases to) and the AD domain"
293 - ewarn "controller work previously known as 'samba4'."
294 -
295 - elog "For further information and migration steps make sure to read "
296 - elog "http://samba.org/samba/history/${P}.html "
297 - elog "http://samba.org/samba/history/${PN}-4.5.0.html and"
298 - elog "http://wiki.samba.org/index.php/Samba4/HOWTO "
299 -}