1 |
patrick 12/01/30 13:21:54 |
2 |
|
3 |
Modified: ChangeLog |
4 |
Added: samba-3.5.12.ebuild |
5 |
Removed: samba-3.6.0.ebuild samba-3.6.1.ebuild |
6 |
Log: |
7 |
Bump for #390527 |
8 |
|
9 |
(Portage version: 2.2.0_alpha84/cvs/Linux x86_64) |
10 |
|
11 |
Revision Changes Path |
12 |
1.496 net-fs/samba/ChangeLog |
13 |
|
14 |
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/net-fs/samba/ChangeLog?rev=1.496&view=markup |
15 |
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/net-fs/samba/ChangeLog?rev=1.496&content-type=text/plain |
16 |
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/net-fs/samba/ChangeLog?r1=1.495&r2=1.496 |
17 |
|
18 |
Index: ChangeLog |
19 |
=================================================================== |
20 |
RCS file: /var/cvsroot/gentoo-x86/net-fs/samba/ChangeLog,v |
21 |
retrieving revision 1.495 |
22 |
retrieving revision 1.496 |
23 |
diff -u -r1.495 -r1.496 |
24 |
--- ChangeLog 30 Jan 2012 12:14:55 -0000 1.495 |
25 |
+++ ChangeLog 30 Jan 2012 13:21:54 -0000 1.496 |
26 |
@@ -1,6 +1,12 @@ |
27 |
# ChangeLog for net-fs/samba |
28 |
# Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2 |
29 |
-# $Header: /var/cvsroot/gentoo-x86/net-fs/samba/ChangeLog,v 1.495 2012/01/30 12:14:55 patrick Exp $ |
30 |
+# $Header: /var/cvsroot/gentoo-x86/net-fs/samba/ChangeLog,v 1.496 2012/01/30 13:21:54 patrick Exp $ |
31 |
+ |
32 |
+*samba-3.5.12 (30 Jan 2012) |
33 |
+ |
34 |
+ 30 Jan 2012; Patrick Lauer <patrick@g.o> +samba-3.5.12.ebuild, |
35 |
+ -samba-3.6.0.ebuild, -samba-3.6.1.ebuild: |
36 |
+ Bump for #390527 |
37 |
|
38 |
*samba-3.6.3 (30 Jan 2012) |
39 |
|
40 |
|
41 |
|
42 |
|
43 |
1.1 net-fs/samba/samba-3.5.12.ebuild |
44 |
|
45 |
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/net-fs/samba/samba-3.5.12.ebuild?rev=1.1&view=markup |
46 |
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/net-fs/samba/samba-3.5.12.ebuild?rev=1.1&content-type=text/plain |
47 |
|
48 |
Index: samba-3.5.12.ebuild |
49 |
=================================================================== |
50 |
# Copyright 1999-2012 Gentoo Foundation |
51 |
# Distributed under the terms of the GNU General Public License v2 |
52 |
# $Header: /var/cvsroot/gentoo-x86/net-fs/samba/samba-3.5.12.ebuild,v 1.1 2012/01/30 13:21:54 patrick Exp $ |
53 |
|
54 |
EAPI=4 |
55 |
|
56 |
inherit pam versionator multilib eutils |
57 |
|
58 |
MY_PV=${PV/_/} |
59 |
MY_P="${PN}-${MY_PV}" |
60 |
|
61 |
DESCRIPTION="Library bits of the samba network filesystem" |
62 |
HOMEPAGE="http://www.samba.org/" |
63 |
SRC_URI="mirror://samba/${P}.tar.gz |
64 |
http://dev.gentoo.org/~dagger/files/smb_traffic_analyzer_v2.diff.bz2" |
65 |
LICENSE="GPL-3" |
66 |
SLOT="0" |
67 |
KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~x86-fbsd" |
68 |
IUSE="acl addns ads +aio avahi caps +client cluster cups debug doc examples fam |
69 |
ldap ldb +netapi pam quota +readline +server +smbclient smbsharemodes smbtav2 |
70 |
swat syslog winbind" |
71 |
|
72 |
DEPEND="dev-libs/popt |
73 |
!net-fs/samba-client |
74 |
!net-fs/samba-libs |
75 |
!net-fs/samba-server |
76 |
!net-fs/cifs-utils |
77 |
sys-libs/talloc |
78 |
sys-libs/tdb |
79 |
virtual/libiconv |
80 |
ads? ( virtual/krb5 sys-fs/e2fsprogs |
81 |
client? ( sys-apps/keyutils ) ) |
82 |
avahi? ( net-dns/avahi[dbus] ) |
83 |
caps? ( sys-libs/libcap ) |
84 |
client? ( !net-fs/mount-cifs |
85 |
dev-libs/iniparser ) |
86 |
cluster? ( >=dev-db/ctdb-1.0.114_p1 ) |
87 |
cups? ( net-print/cups ) |
88 |
fam? ( virtual/fam ) |
89 |
ldap? ( net-nds/openldap ) |
90 |
pam? ( virtual/pam |
91 |
winbind? ( dev-libs/iniparser ) |
92 |
) |
93 |
readline? ( >=sys-libs/readline-5.2 ) |
94 |
syslog? ( virtual/logger )" |
95 |
|
96 |
RDEPEND="${DEPEND}" |
97 |
|
98 |
# Disable tests since we don't want to build that much here |
99 |
RESTRICT="test" |
100 |
|
101 |
SBINPROGS="" |
102 |
BINPROGS="" |
103 |
KRBPLUGIN="" |
104 |
PLUGINEXT=".so" |
105 |
SHAREDMODS="" |
106 |
|
107 |
S="${WORKDIR}/${MY_P}/source3" |
108 |
|
109 |
# TODO: |
110 |
# - enable iPrint on Prefix/OSX and Darwin? |
111 |
# - selftest-prefix? selftest? |
112 |
# - AFS? |
113 |
|
114 |
CONFDIR="${FILESDIR}/$(get_version_component_range 1-2)" |
115 |
|
116 |
REQUIRED_USE=" |
117 |
ads? ( ldap ) |
118 |
swat? ( server ) |
119 |
" |
120 |
|
121 |
pkg_setup() { |
122 |
if use server ; then |
123 |
SBINPROGS="${SBINPROGS} bin/smbd bin/nmbd" |
124 |
BINPROGS="${BINPROGS} bin/testparm bin/smbstatus bin/smbcontrol bin/pdbedit |
125 |
bin/profiles bin/sharesec bin/eventlogadm" |
126 |
|
127 |
use smbtav2 && BINPROGS="${BINPROGS} bin/smbta-util" |
128 |
use swat && SBINPROGS="${SBINPROGS} bin/swat" |
129 |
use winbind && SBINPROGS="${SBINPROGS} bin/winbindd" |
130 |
use ads && use winbind && KRBPLUGIN="${KRBPLUGIN} bin/winbind_krb5_locator" |
131 |
fi |
132 |
|
133 |
if use client ; then |
134 |
BINPROGS="${BINPROGS} bin/smbclient bin/net bin/smbget bin/smbtree |
135 |
bin/nmblookup bin/smbpasswd bin/rpcclient bin/smbcacls bin/smbcquotas |
136 |
bin/ntlm_auth" |
137 |
|
138 |
use ads && SBINPROGS="${SBINPROGS} bin/cifs.upcall" |
139 |
fi |
140 |
|
141 |
use cups && BINPROGS="${BINPROGS} bin/smbspool" |
142 |
use ldb && BINPROGS="${BINPROGS} bin/ldbedit bin/ldbsearch bin/ldbadd bin/ldbdel bin/ldbmodify bin/ldbrename"; |
143 |
|
144 |
if use winbind ; then |
145 |
BINPROGS="${BINPROGS} bin/wbinfo" |
146 |
SHAREDMODS="${SHAREDMODS}idmap_rid,idmap_hash" |
147 |
use ads && SHAREDMODS="${SHAREDMODS},idmap_ad" |
148 |
use ldap && SHAREDMODS="${SHAREDMODS},idmap_ldap,idmap_adex" |
149 |
fi |
150 |
|
151 |
if use winbind && |
152 |
[[ $(tc-getCC)$ == *gcc* ]] && |
153 |
[[ $(gcc-major-version)$(gcc-minor-version) -lt 43 ]] |
154 |
then |
155 |
eerror "It is a known issue that ${P} will not build with " |
156 |
eerror "winbind use flag enabled when using gcc < 4.3 ." |
157 |
eerror "Please use at least the latest stable gcc version." |
158 |
die "Using sys-devel/gcc < 4.3 with winbind use flag." |
159 |
fi |
160 |
} |
161 |
|
162 |
src_prepare() { |
163 |
cp "${FILESDIR}/samba-3.4.2-lib.tevent.python.mk" "../lib/tevent/python.mk" |
164 |
|
165 |
# ensure that winbind has correct ldflags (QA notice) |
166 |
sed -i \ |
167 |
-e 's|LDSHFLAGS="|LDSHFLAGS="\\${LDFLAGS} |g' \ |
168 |
configure || die "sed failed" |
169 |
|
170 |
epatch "${CONFDIR}"/${PN}-3.5.6-kerberos-dummy.patch |
171 |
use smbtav2 && cd "${WORKDIR}/${P}" && epatch "${WORKDIR}"/smb_traffic_analyzer_v2.diff |
172 |
cd "${WORKDIR}/${MY_P}" && epatch "${CONFDIR}"/${PN}-3.5.8-uclib-build.patch |
173 |
epatch "${CONFDIR}"/smb.conf.default.patch |
174 |
} |
175 |
|
176 |
src_configure() { |
177 |
local myconf |
178 |
|
179 |
# Filter out -fPIE |
180 |
[[ ${CHOST} == *-*bsd* ]] && myconf+=" --disable-pie" |
181 |
|
182 |
# Upstream refuses to make this configurable |
183 |
use caps && export ac_cv_header_sys_capability_h=yes || export ac_cv_header_sys_capability_h=no |
184 |
|
185 |
# use_with doesn't accept 2 USE-flags |
186 |
if use client && use ads ; then |
187 |
myconf+=" --with-cifsupcall" |
188 |
else |
189 |
myconf+=" --without-cifsupcall" |
190 |
fi |
191 |
|
192 |
if use client && use kernel_linux ; then |
193 |
myconf+=" --with-cifsmount --with-cifsumount" |
194 |
else |
195 |
myconf+=" --without-cifsmount --without-cifsumount" |
196 |
fi |
197 |
|
198 |
# Notes: |
199 |
# - automount is only needed in conjunction with NIS and we don't have that |
200 |
# anymore => LDAP? |
201 |
# - --without-dce-dfs and --without-nisplus-home can't be passed to configure but are disabled by default |
202 |
econf ${myconf} \ |
203 |
--with-piddir=/var/run/samba \ |
204 |
--sysconfdir=/etc/samba \ |
205 |
--localstatedir=/var \ |
206 |
$(use_enable debug developer) \ |
207 |
--enable-largefile \ |
208 |
--enable-socket-wrapper \ |
209 |
--enable-nss-wrapper \ |
210 |
$(use_enable swat) \ |
211 |
$(use_enable cups) \ |
212 |
--disable-iprint \ |
213 |
$(use_enable fam) \ |
214 |
--enable-shared-libs \ |
215 |
--disable-dnssd \ |
216 |
$(use_enable avahi) \ |
217 |
--with-fhs \ |
218 |
--with-privatedir=/var/lib/samba/private \ |
219 |
--with-rootsbindir=/var/cache/samba \ |
220 |
--with-lockdir=/var/cache/samba \ |
221 |
--with-swatdir=/usr/share/doc/${PF}/swat \ |
222 |
--with-configdir=/etc/samba \ |
223 |
--with-logfilebase=/var/log/samba \ |
224 |
--with-pammodulesdir=$(getpam_mod_dir) \ |
225 |
--without-afs \ |
226 |
--without-fake-kaserver \ |
227 |
--without-vfs-afsacl \ |
228 |
$(use_with ldap) \ |
229 |
$(use_with ads) \ |
230 |
$(use_with ads krb5 /usr) \ |
231 |
$(use_with ads dnsupdate) \ |
232 |
--without-automount \ |
233 |
$(use_with pam) \ |
234 |
$(use_with pam pam_smbpass) \ |
235 |
$(use_with syslog) \ |
236 |
$(use_with quota quotas) \ |
237 |
$(use_with quota sys-quotas) \ |
238 |
--without-utmp \ |
239 |
--without-lib{talloc,tdb} \ |
240 |
$(use_with netapi libnetapi) \ |
241 |
$(use_with smbclient libsmbclient) \ |
242 |
$(use_with smbsharemodes libsmbsharemodes) \ |
243 |
$(use_with addns libaddns) \ |
244 |
$(use_with cluster ctdb /usr) \ |
245 |
$(use_with cluster cluster-support) \ |
246 |
$(use_with acl acl-support) \ |
247 |
$(use_with aio aio-support) \ |
248 |
--with-sendfile-support \ |
249 |
$(use_with winbind) \ |
250 |
--with-shared-modules=${SHAREDMODS} \ |
251 |
--without-included-popt \ |
252 |
--without-included-iniparser |
253 |
} |
254 |
|
255 |
src_compile() { |
256 |
# compile libs |
257 |
if use addns ; then |
258 |
einfo "make addns library" |
259 |
emake libaddns |
260 |
fi |
261 |
if use netapi ; then |
262 |
einfo "make netapi library" |
263 |
emake libnetapi |
264 |
fi |
265 |
if use smbclient ; then |
266 |
einfo "make smbclient library" |
267 |
emake libsmbclient |
268 |
fi |
269 |
if use smbsharemodes ; then |
270 |
einfo "make smbsharemodes library" |
271 |
emake libsmbsharemodes |
272 |
fi |
273 |
|
274 |
# compile modules |
275 |
emake modules |
276 |
|
277 |
# compile pam moudles |
278 |
if use pam ; then |
279 |
einfo "make pam modules" |
280 |
emake pam_modules |
281 |
fi |
282 |
|
283 |
# compile winbind nss modules |
284 |
if use winbind ; then |
285 |
einfo "make nss modules" |
286 |
emake nss_modules |
287 |
fi |
288 |
|
289 |
# compile utilities |
290 |
if [ -n "${BINPROGS}" ] ; then |
291 |
einfo "make binprogs" |
292 |
emake ${BINPROGS} |
293 |
fi |
294 |
if [ -n "${SBINPROGS}" ] ; then |
295 |
einfo "make sbinprogs" |
296 |
emake ${SBINPROGS} |
297 |
fi |
298 |
|
299 |
if [ -n "${KRBPLUGIN}" ] ; then |
300 |
einfo "make krbplugin" |
301 |
emake ${KRBPLUGIN}${PLUGINEXT} |
302 |
fi |
303 |
|
304 |
if use client && use kernel_linux; then |
305 |
einfo "make {,u}mount.cifs" |
306 |
emake bin/{,u}mount.cifs |
307 |
fi |
308 |
} |
309 |
|
310 |
src_install() { |
311 |
# install libs |
312 |
if use addns ; then |
313 |
einfo "install addns library" |
314 |
emake installlibaddns DESTDIR="${D}" |
315 |
fi |
316 |
if use netapi ; then |
317 |
einfo "install netapi library" |
318 |
emake installlibnetapi DESTDIR="${D}" |
319 |
fi |
320 |
if use smbclient ; then |
321 |
einfo "install smbclient library" |
322 |
emake installlibsmbclient DESTDIR="${D}" |
323 |
fi |
324 |
if use smbsharemodes ; then |
325 |
einfo "install smbsharemodes library" |
326 |
emake installlibsmbsharemodes DESTDIR="${D}" |
327 |
fi |
328 |
|
329 |
# install modules |
330 |
emake installmodules DESTDIR="${D}" |
331 |
|
332 |
if use pam ; then |
333 |
einfo "install pam modules" |
334 |
emake installpammodules DESTDIR="${D}" |
335 |
|
336 |
if use winbind ; then |
337 |
newpamd "${CONFDIR}/system-auth-winbind.pam" system-auth-winbind |
338 |
doman ../docs/manpages/pam_winbind.8 |
339 |
# bug #376853 |
340 |
insinto /etc/security |
341 |
doins ../examples/pam_winbind/pam_winbind.conf || die |
342 |
fi |
343 |
|
344 |
newpamd "${CONFDIR}/samba.pam" samba |
345 |
dodoc pam_smbpass/README |
346 |
fi |
347 |
|
348 |
# Nsswitch extensions. Make link for wins and winbind resolvers |
349 |
if use winbind ; then |
350 |
einfo "install libwbclient" |
351 |
emake installlibwbclient DESTDIR="${D}" |
352 |
dolib.so ../nsswitch/libnss_wins.so |
353 |
dosym libnss_wins.so /usr/$(get_libdir)/libnss_wins.so.2 |
354 |
dolib.so ../nsswitch/libnss_winbind.so |
355 |
dosym libnss_winbind.so /usr/$(get_libdir)/libnss_winbind.so.2 |
356 |
einfo "install libwbclient related manpages" |
357 |
doman ../docs/manpages/idmap_rid.8 |
358 |
doman ../docs/manpages/idmap_hash.8 |
359 |
if use ldap ; then |
360 |
doman ../docs/manpages/idmap_adex.8 |
361 |
doman ../docs/manpages/idmap_ldap.8 |
362 |
fi |
363 |
if use ads ; then |
364 |
doman ../docs/manpages/idmap_ad.8 |
365 |
fi |
366 |
fi |
367 |
|
368 |
# install binaries |
369 |
insinto /usr |
370 |
for prog in ${SBINPROGS} ; do |
371 |
dosbin ${prog} |
372 |
doman ../docs/manpages/${prog/bin\/}* |
373 |
done |
374 |
|
375 |
for prog in ${BINPROGS} ; do |
376 |
dobin ${prog} |
377 |
doman ../docs/manpages/${prog/bin\/}* |
378 |
done |
379 |
|
380 |
# install krbplugin |
381 |
if [ -n "${KRBPLUGIN}" ] ; then |
382 |
if has_version app-crypt/mit-krb5 ; then |
383 |
insinto /usr/$(get_libdir)/krb5/plugins/libkrb5 |
384 |
doins ${KRBPLUGIN}${PLUGINEXT} |
385 |
elif has_version app-crypt/heimdal ; then |
386 |
insinto /usr/$(get_libdir)/plugin/krb5 |
387 |
doins ${KRBPLUGIN}${PLUGINEXT} |
388 |
fi |
389 |
insinto /usr |
390 |
for prog in ${KRBPLUGIN} ; do |
391 |
doman ../docs/manpages/${prog/bin\/}* |
392 |
done |
393 |
fi |
394 |
|
395 |
# install server components |
396 |
if use server ; then |
397 |
doman ../docs/manpages/vfs* ../docs/manpages/samba.7 |
398 |
|
399 |
diropts -m0700 |
400 |
keepdir /var/lib/samba/private |
401 |
|
402 |
diropts -m1777 |
403 |
keepdir /var/spool/samba |
404 |
|
405 |
diropts -m0755 |
406 |
keepdir /var/{cache,log}/samba |
407 |
keepdir /var/lib/samba/{netlogon,profiles} |
408 |
keepdir /var/lib/samba/printers/{W32X86,WIN40,W32ALPHA,W32MIPS,W32PPC,X64,IA64,COLOR} |
409 |
keepdir /usr/$(get_libdir)/samba/{auth,pdb,rpc,idmap,nss_info,gpext} |
410 |
|
411 |
newconfd "${CONFDIR}/samba.confd" samba |
412 |
newinitd "${CONFDIR}/samba.initd" samba |
413 |
|
414 |
insinto /etc/samba |
415 |
doins "${CONFDIR}"/{smbusers,lmhosts} |
416 |
|
417 |
if use ldap ; then |
418 |
insinto /etc/openldap/schema |
419 |
doins ../examples/LDAP/samba.schema |
420 |
fi |
421 |
|
422 |
if use swat ; then |
423 |
insinto /etc/xinetd.d |
424 |
newins "${CONFDIR}/swat.xinetd" swat |
425 |
script/installswat.sh "${D}" "${ROOT}/usr/share/doc/${PF}/swat" "${S}" |
426 |
fi |
427 |
|
428 |
dodoc ../MAINTAINERS ../README* ../Roadmap ../WHATSNEW.txt ../docs/THANKS |
429 |
fi |
430 |
|
431 |
# install client files ({u,}mount.cifs into /) |
432 |
if use client && use kernel_linux ; then |
433 |
into / |
434 |
dosbin bin/{u,}mount.cifs |
435 |
doman ../docs/manpages/{u,}mount.cifs.8 |
436 |
fi |
437 |
|
438 |
# install the spooler to cups |
439 |
if use cups ; then |
440 |
dosym /usr/bin/smbspool $(cups-config --serverbin)/backend/smb |
441 |
fi |
442 |
|
443 |
# install misc files |
444 |
insinto /etc/samba |
445 |
doins ../examples/smb.conf.default |
446 |
doman ../docs/manpages/smb.conf.5 |
447 |
|
448 |
insinto /usr/"$(get_libdir)"/samba |
449 |
doins ../codepages/{valid.dat,upcase.dat,lowcase.dat} |
450 |
|
451 |
# install docs |
452 |
if use doc ; then |
453 |
dohtml -r ../docs/htmldocs/* |
454 |
dodoc ../docs/*.pdf |
455 |
fi |
456 |
|
457 |
# install examples |
458 |
if use examples ; then |
459 |
insinto /usr/share/doc/${PF}/examples |
460 |
|
461 |
if use smbclient ; then |
462 |
doins -r ../examples/libsmbclient |
463 |
fi |
464 |
|
465 |
if use winbind ; then |
466 |
doins -r ../examples/pam_winbind ../examples/nss |
467 |
fi |
468 |
|
469 |
if use server ; then |
470 |
cd ../examples |
471 |
doins -r auth autofs dce-dfs LDAP logon misc pdb \ |
472 |
perfcounter printer-accounting printing scripts tridge \ |
473 |
validchars VFS |
474 |
fi |
475 |
fi |
476 |
|
477 |
# Remove empty installation directories |
478 |
rmdir --ignore-fail-on-non-empty \ |
479 |
"${D}/usr/$(get_libdir)/samba" \ |
480 |
"${D}/usr"/{sbin,bin} \ |
481 |
"${D}/usr/share"/{man,locale,} \ |
482 |
"${D}/var"/{run,lib/samba/private,lib/samba,lib,cache/samba,cache,} \ |
483 |
# || die "tried to remove non-empty dirs, this seems like a bug in the ebuild" |
484 |
} |
485 |
|
486 |
pkg_postinst() { |
487 |
elog "The default value of 'wide links' has been changed to 'no' in samba 3.5" |
488 |
elog "to avoid an insecure default configuration" |
489 |
elog "('wide links = yes' and 'unix extensions = yes'). For more details," |
490 |
elog "please see http://www.samba.org/samba/news/symlink_attack.html ." |
491 |
elog "" |
492 |
elog "An EXPERIMENTAL implementation of the SMB2 protocol has been added." |
493 |
elog "SMB2 can be enabled by setting 'max protocol = smb2'. SMB2 is a new " |
494 |
elog "implementation of the SMB protocol used by Windows Vista and higher" |
495 |
elog "" |
496 |
elog "For further information make sure to read the release notes at" |
497 |
elog "http://samba.org/samba/history/${P}.html and " |
498 |
elog "http://samba.org/samba/history/${PN}-3.5.0.html" |
499 |
} |