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