Gentoo Archives: gentoo-commits

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