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