1 |
polynomial-c 13/10/29 13:54:28 |
2 |
|
3 |
Modified: ChangeLog |
4 |
Added: samba-4.1.0-r1.ebuild samba-4.0.10-r1.ebuild |
5 |
Removed: samba-4.1.0.ebuild samba-4.1.0_rc4.ebuild |
6 |
samba-4.0.9.ebuild samba-4.0.10.ebuild |
7 |
Log: |
8 |
Lots of dependency "fixes" (bug #489166, #489748, #489764, #489770). Minor improvements of the init scripts. Removed old (broken) ebuilds |
9 |
|
10 |
(Portage version: 2.2.7/cvs/Linux x86_64, signed Manifest commit with key 0x981CA6FC) |
11 |
|
12 |
Revision Changes Path |
13 |
1.619 net-fs/samba/ChangeLog |
14 |
|
15 |
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/net-fs/samba/ChangeLog?rev=1.619&view=markup |
16 |
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/net-fs/samba/ChangeLog?rev=1.619&content-type=text/plain |
17 |
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/net-fs/samba/ChangeLog?r1=1.618&r2=1.619 |
18 |
|
19 |
Index: ChangeLog |
20 |
=================================================================== |
21 |
RCS file: /var/cvsroot/gentoo-x86/net-fs/samba/ChangeLog,v |
22 |
retrieving revision 1.618 |
23 |
retrieving revision 1.619 |
24 |
diff -u -r1.618 -r1.619 |
25 |
--- ChangeLog 14 Oct 2013 08:00:42 -0000 1.618 |
26 |
+++ ChangeLog 29 Oct 2013 13:54:28 -0000 1.619 |
27 |
@@ -1,6 +1,16 @@ |
28 |
# ChangeLog for net-fs/samba |
29 |
# Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2 |
30 |
-# $Header: /var/cvsroot/gentoo-x86/net-fs/samba/ChangeLog,v 1.618 2013/10/14 08:00:42 polynomial-c Exp $ |
31 |
+# $Header: /var/cvsroot/gentoo-x86/net-fs/samba/ChangeLog,v 1.619 2013/10/29 13:54:28 polynomial-c Exp $ |
32 |
+ |
33 |
+*samba-4.1.0-r1 (29 Oct 2013) |
34 |
+*samba-4.0.10-r1 (29 Oct 2013) |
35 |
+ |
36 |
+ 29 Oct 2013; Lars Wendler <polynomial-c@g.o> -samba-4.0.9.ebuild, |
37 |
+ -samba-4.0.10.ebuild, +samba-4.0.10-r1.ebuild, -samba-4.1.0_rc4.ebuild, |
38 |
+ -samba-4.1.0.ebuild, +samba-4.1.0-r1.ebuild, files/4.0/samba4.initd-r1, |
39 |
+ files/4.1/samba4.initd-r1: |
40 |
+ Lots of dependency "fixes" (bug #489166, #489748, #489764, #489770). Minor |
41 |
+ improvements of the init scripts. Removed old (broken) ebuilds. |
42 |
|
43 |
*samba-4.1.0 (14 Oct 2013) |
44 |
|
45 |
|
46 |
|
47 |
|
48 |
1.1 net-fs/samba/samba-4.1.0-r1.ebuild |
49 |
|
50 |
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/net-fs/samba/samba-4.1.0-r1.ebuild?rev=1.1&view=markup |
51 |
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/net-fs/samba/samba-4.1.0-r1.ebuild?rev=1.1&content-type=text/plain |
52 |
|
53 |
Index: samba-4.1.0-r1.ebuild |
54 |
=================================================================== |
55 |
# Copyright 1999-2013 Gentoo Foundation |
56 |
# Distributed under the terms of the GNU General Public License v2 |
57 |
# $Header: /var/cvsroot/gentoo-x86/net-fs/samba/samba-4.1.0-r1.ebuild,v 1.1 2013/10/29 13:54:28 polynomial-c Exp $ |
58 |
|
59 |
EAPI=5 |
60 |
PYTHON_COMPAT=( python2_{6,7} ) |
61 |
|
62 |
inherit python-r1 waf-utils multilib linux-info systemd |
63 |
|
64 |
MY_PV="${PV/_rc/rc}" |
65 |
MY_P="${PN}-${MY_PV}" |
66 |
|
67 |
SRC_URI="mirror://samba/stable/${MY_P}.tar.gz" |
68 |
KEYWORDS="~amd64 ~hppa ~x86" |
69 |
|
70 |
DESCRIPTION="Samba Suite Version 4" |
71 |
HOMEPAGE="http://www.samba.org/" |
72 |
LICENSE="GPL-3" |
73 |
|
74 |
SLOT="0" |
75 |
|
76 |
IUSE="acl addns ads aio avahi client cluster cups fam gnutls iprint |
77 |
ldap quota selinux syslog test winbind" |
78 |
|
79 |
# sys-apps/attr is an automagic dependency (see bug #489748) |
80 |
# dev-libs/libaio is an automagic dependency (see bug #489764) |
81 |
# sys-libs/pam is an automagic dependency (see bug #489770) |
82 |
RDEPEND="${PYTHON_DEPS} |
83 |
>=app-crypt/heimdal-1.5[-ssl] |
84 |
dev-libs/iniparser |
85 |
dev-libs/libaio |
86 |
dev-libs/popt |
87 |
sys-libs/readline |
88 |
virtual/libiconv |
89 |
dev-python/subunit |
90 |
sys-apps/attr |
91 |
sys-libs/libcap |
92 |
>=sys-libs/ldb-1.1.16 |
93 |
>=sys-libs/tdb-1.2.11[python] |
94 |
>=sys-libs/talloc-2.0.8[python] |
95 |
>=sys-libs/tevent-0.9.18 |
96 |
sys-libs/zlib |
97 |
virtual/pam |
98 |
acl? ( virtual/acl ) |
99 |
addns? ( net-dns/bind-tools[gssapi] ) |
100 |
client? ( net-fs/cifs-utils[ads?] ) |
101 |
cluster? ( >=dev-db/ctdb-1.0.114_p1 ) |
102 |
fam? ( virtual/fam ) |
103 |
gnutls? ( dev-libs/libgcrypt |
104 |
>=net-libs/gnutls-1.4.0 ) |
105 |
ldap? ( net-nds/openldap ) |
106 |
selinux? ( sec-policy/selinux-samba )" |
107 |
DEPEND="${RDEPEND} |
108 |
virtual/pkgconfig" |
109 |
|
110 |
REQUIRED_USE="ads? ( acl ldap )" |
111 |
|
112 |
RESTRICT="mirror" |
113 |
|
114 |
S="${WORKDIR}/${MY_P}" |
115 |
|
116 |
CONFDIR="${FILESDIR}/$(get_version_component_range 1-2)" |
117 |
|
118 |
WAF_BINARY="${S}/buildtools/bin/waf" |
119 |
|
120 |
pkg_setup() { |
121 |
python_export_best |
122 |
if use aio; then |
123 |
if ! linux_config_exists || ! linux_chkconfig_present AIO; then |
124 |
ewarn "You must enable AIO support in your kernel config, " |
125 |
ewarn "to be able to support asynchronous I/O. " |
126 |
ewarn "You can find it at" |
127 |
ewarn |
128 |
ewarn "General Support" |
129 |
ewarn " Enable AIO support " |
130 |
ewarn |
131 |
ewarn "and recompile your kernel..." |
132 |
fi |
133 |
fi |
134 |
} |
135 |
|
136 |
src_configure() { |
137 |
local myconf='' |
138 |
use "cluster" && myconf+=" --with-ctdb-dir=/usr" |
139 |
use "test" && myconf+=" --enable-selftest" |
140 |
myconf="${myconf} \ |
141 |
--enable-fhs \ |
142 |
--sysconfdir=/etc \ |
143 |
--localstatedir=/var \ |
144 |
--with-modulesdir=/usr/$(get_libdir)/samba \ |
145 |
--with-pammodulesdir=/$(get_libdir)/security \ |
146 |
--with-piddir=/run/${PN} \ |
147 |
--disable-rpath \ |
148 |
--disable-rpath-install \ |
149 |
--nopyc \ |
150 |
--nopyo \ |
151 |
--bundled-libraries=ntdb \ |
152 |
--builtin-libraries=ntdb \ |
153 |
$(use_with addns dnsupdate) \ |
154 |
$(use_with acl acl-support) \ |
155 |
$(use_with ads) \ |
156 |
$(use_with aio aio-support) \ |
157 |
$(use_enable avahi) \ |
158 |
$(use_with cluster cluster-support) \ |
159 |
$(use_enable cups) \ |
160 |
$(use_with fam) \ |
161 |
$(use_enable gnutls) \ |
162 |
$(use_enable iprint) \ |
163 |
$(use_with ldap) \ |
164 |
--with-pam \ |
165 |
--with-pam_smbpass \ |
166 |
$(use_with quota quotas) \ |
167 |
$(use_with syslog) \ |
168 |
$(use_with winbind) |
169 |
" |
170 |
use "ads" && myconf+=" --with-shared-modules=idmap_ad" |
171 |
|
172 |
CPPFLAGS="-I/usr/include/et ${CPPFLAGS}" \ |
173 |
waf-utils_src_configure ${myconf} |
174 |
} |
175 |
|
176 |
src_install() { |
177 |
waf-utils_src_install |
178 |
|
179 |
# Seems like the build script gets the shebangs correct by itself |
180 |
# (4.0.6) |
181 |
#python_replicate_script \ |
182 |
# "${D}/usr/sbin/samba_dnsupdate" \ |
183 |
# "${D}/usr/sbin/samba_spnupdate" \ |
184 |
# "${D}/usr/sbin/samba_upgradedns" \ |
185 |
# "${D}/usr/sbin/samba_kcc" \ |
186 |
# "${D}/usr/bin/samba-tool" |
187 |
|
188 |
# Make all .so files executable |
189 |
find "${D}" -type f -name "*.so" -exec chmod +x {} + |
190 |
|
191 |
# Install init script and conf.d file |
192 |
newinitd "${CONFDIR}/samba4.initd-r1" samba |
193 |
newconfd "${CONFDIR}/samba4.confd" samba |
194 |
|
195 |
systemd_dotmpfilesd "${FILESDIR}"/samba.conf |
196 |
systemd_dounit "${FILESDIR}"/nmbd.service |
197 |
systemd_dounit "${FILESDIR}"/smbd.{service,socket} |
198 |
systemd_newunit "${FILESDIR}"/smbd_at.service 'smbd@.service' |
199 |
systemd_dounit "${FILESDIR}"/winbindd.service |
200 |
} |
201 |
|
202 |
src_test() { |
203 |
"${WAF_BINARY}" test || die "test failed" |
204 |
} |
205 |
|
206 |
pkg_postinst() { |
207 |
elog "This is is the first stable release of Samba 4.0" |
208 |
|
209 |
ewarn "Be aware the this release contains the best of all of Samba's" |
210 |
ewarn "technology parts, both a file server (that you can reasonably expect" |
211 |
ewarn "to upgrade existing Samba 3.x releases to) and the AD domain" |
212 |
ewarn "controller work previously known as 'samba4'." |
213 |
|
214 |
elog "For further information and migration steps make sure to read " |
215 |
elog "http://samba.org/samba/history/${P}.html " |
216 |
elog "http://samba.org/samba/history/${PN}-4.0.0.html and" |
217 |
elog "http://wiki.samba.org/index.php/Samba4/HOWTO " |
218 |
} |
219 |
|
220 |
|
221 |
|
222 |
1.1 net-fs/samba/samba-4.0.10-r1.ebuild |
223 |
|
224 |
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/net-fs/samba/samba-4.0.10-r1.ebuild?rev=1.1&view=markup |
225 |
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/net-fs/samba/samba-4.0.10-r1.ebuild?rev=1.1&content-type=text/plain |
226 |
|
227 |
Index: samba-4.0.10-r1.ebuild |
228 |
=================================================================== |
229 |
# Copyright 1999-2013 Gentoo Foundation |
230 |
# Distributed under the terms of the GNU General Public License v2 |
231 |
# $Header: /var/cvsroot/gentoo-x86/net-fs/samba/samba-4.0.10-r1.ebuild,v 1.1 2013/10/29 13:54:28 polynomial-c Exp $ |
232 |
|
233 |
EAPI=5 |
234 |
PYTHON_COMPAT=( python2_{6,7} ) |
235 |
|
236 |
inherit python-r1 waf-utils multilib linux-info systemd |
237 |
|
238 |
MY_PV="${PV/_rc/rc}" |
239 |
MY_P="${PN}-${MY_PV}" |
240 |
|
241 |
if [ "${PV}" = "4.9999" ]; then |
242 |
EGIT_REPO_URI="git://git.samba.org/samba.git" |
243 |
KEYWORDS="" |
244 |
inherit git-2 |
245 |
else |
246 |
SRC_URI="mirror://samba/stable/${MY_P}.tar.gz" |
247 |
KEYWORDS="~amd64 ~hppa ~x86" |
248 |
fi |
249 |
|
250 |
DESCRIPTION="Samba Suite Version 4" |
251 |
HOMEPAGE="http://www.samba.org/" |
252 |
LICENSE="GPL-3" |
253 |
|
254 |
SLOT="0" |
255 |
|
256 |
IUSE="acl addns ads aio avahi client cluster cups fam gnutls iprint |
257 |
ldap quota selinux swat syslog test winbind" |
258 |
|
259 |
# sys-apps/attr is an automagic dependency (see bug #489748) |
260 |
# dev-libs/libaio is an automagic dependency (see bug #489764) |
261 |
# sys-libs/pam is an automagic dependency (see bug #489770) |
262 |
RDEPEND="${PYTHON_DEPS} |
263 |
>=app-crypt/heimdal-1.5[-ssl] |
264 |
dev-libs/iniparser |
265 |
dev-libs/libaio |
266 |
dev-libs/popt |
267 |
sys-libs/readline |
268 |
virtual/libiconv |
269 |
dev-python/subunit |
270 |
sys-apps/attr |
271 |
sys-libs/libcap |
272 |
>=sys-libs/ldb-1.1.16 |
273 |
>=sys-libs/tdb-1.2.11[python] |
274 |
>=sys-libs/talloc-2.0.8[python] |
275 |
>=sys-libs/tevent-0.9.18 |
276 |
sys-libs/zlib |
277 |
virtual/pam |
278 |
acl? ( virtual/acl ) |
279 |
addns? ( net-dns/bind-tools[gssapi] ) |
280 |
client? ( net-fs/cifs-utils[ads?] ) |
281 |
cluster? ( >=dev-db/ctdb-1.0.114_p1 ) |
282 |
fam? ( virtual/fam ) |
283 |
gnutls? ( dev-libs/libgcrypt |
284 |
>=net-libs/gnutls-1.4.0 ) |
285 |
ldap? ( net-nds/openldap ) |
286 |
selinux? ( sec-policy/selinux-samba )" |
287 |
DEPEND="${RDEPEND} |
288 |
virtual/pkgconfig" |
289 |
|
290 |
REQUIRED_USE="ads? ( acl ldap )" |
291 |
|
292 |
RESTRICT="mirror" |
293 |
|
294 |
S="${WORKDIR}/${MY_P}" |
295 |
|
296 |
CONFDIR="${FILESDIR}/$(get_version_component_range 1-2)" |
297 |
|
298 |
WAF_BINARY="${S}/buildtools/bin/waf" |
299 |
|
300 |
pkg_setup() { |
301 |
python_export_best |
302 |
if use aio; then |
303 |
if ! linux_config_exists || ! linux_chkconfig_present AIO; then |
304 |
ewarn "You must enable AIO support in your kernel config, " |
305 |
ewarn "to be able to support asynchronous I/O. " |
306 |
ewarn "You can find it at" |
307 |
ewarn |
308 |
ewarn "General Support" |
309 |
ewarn " Enable AIO support " |
310 |
ewarn |
311 |
ewarn "and recompile your kernel..." |
312 |
fi |
313 |
fi |
314 |
} |
315 |
|
316 |
src_configure() { |
317 |
local myconf='' |
318 |
use "cluster" && myconf+=" --with-ctdb-dir=/usr" |
319 |
use "test" && myconf+=" --enable-selftest" |
320 |
myconf="${myconf} \ |
321 |
--enable-fhs \ |
322 |
--sysconfdir=/etc \ |
323 |
--localstatedir=/var \ |
324 |
--with-modulesdir=/usr/$(get_libdir)/samba \ |
325 |
--with-pammodulesdir=/$(get_libdir)/security \ |
326 |
--with-piddir=/run/${PN} \ |
327 |
--disable-rpath \ |
328 |
--disable-rpath-install \ |
329 |
--nopyc \ |
330 |
--nopyo \ |
331 |
--disable-ntdb \ |
332 |
--bundled-libraries=NONE \ |
333 |
--builtin-libraries=NONE \ |
334 |
$(use_with addns dnsupdate) \ |
335 |
$(use_with acl acl-support) \ |
336 |
$(use_with ads) \ |
337 |
$(use_with aio aio-support) \ |
338 |
$(use_enable avahi) \ |
339 |
$(use_with cluster cluster-support) \ |
340 |
$(use_enable cups) \ |
341 |
$(use_with fam) \ |
342 |
$(use_enable gnutls) \ |
343 |
$(use_enable iprint) \ |
344 |
$(use_with ldap) \ |
345 |
--with-pam \ |
346 |
--with-pam_smbpass \ |
347 |
$(use_with quota quotas) \ |
348 |
$(use_with syslog) \ |
349 |
$(use_with swat) \ |
350 |
$(use_with winbind) |
351 |
" |
352 |
use "ads" && myconf+=" --with-shared-modules=idmap_ad" |
353 |
|
354 |
CPPFLAGS="-I/usr/include/et ${CPPFLAGS}" \ |
355 |
waf-utils_src_configure ${myconf} |
356 |
} |
357 |
|
358 |
src_install() { |
359 |
waf-utils_src_install |
360 |
|
361 |
# Seems like the build script gets the shebangs correct by itself |
362 |
# (4.0.6) |
363 |
#python_replicate_script \ |
364 |
# "${D}/usr/sbin/samba_dnsupdate" \ |
365 |
# "${D}/usr/sbin/samba_spnupdate" \ |
366 |
# "${D}/usr/sbin/samba_upgradedns" \ |
367 |
# "${D}/usr/sbin/samba_kcc" \ |
368 |
# "${D}/usr/bin/samba-tool" |
369 |
|
370 |
# Make all .so files executable |
371 |
find "${D}" -type f -name "*.so" -exec chmod +x {} + |
372 |
|
373 |
# Install init script and conf.d file |
374 |
newinitd "${CONFDIR}/samba4.initd-r1" samba |
375 |
newconfd "${CONFDIR}/samba4.confd" samba |
376 |
|
377 |
systemd_dotmpfilesd "${FILESDIR}"/samba.conf |
378 |
systemd_dounit "${FILESDIR}"/nmbd.service |
379 |
systemd_dounit "${FILESDIR}"/smbd.{service,socket} |
380 |
systemd_newunit "${FILESDIR}"/smbd_at.service 'smbd@.service' |
381 |
systemd_dounit "${FILESDIR}"/winbindd.service |
382 |
} |
383 |
|
384 |
src_test() { |
385 |
"${WAF_BINARY}" test || die "test failed" |
386 |
} |
387 |
|
388 |
pkg_postinst() { |
389 |
elog "This is is the first stable release of Samba 4.0" |
390 |
|
391 |
ewarn "Be aware the this release contains the best of all of Samba's" |
392 |
ewarn "technology parts, both a file server (that you can reasonably expect" |
393 |
ewarn "to upgrade existing Samba 3.x releases to) and the AD domain" |
394 |
ewarn "controller work previously known as 'samba4'." |
395 |
|
396 |
elog "For further information and migration steps make sure to read " |
397 |
elog "http://samba.org/samba/history/${P}.html " |
398 |
elog "http://samba.org/samba/history/${PN}-4.0.0.html and" |
399 |
elog "http://wiki.samba.org/index.php/Samba4/HOWTO " |
400 |
} |