1 |
dev-zero 07/09/07 21:07:39 |
2 |
|
3 |
Modified: ChangeLog |
4 |
Added: samba-3.0.25c.ebuild |
5 |
Log: |
6 |
Version bump (bug #178639, thanks to Johan Andersson for the py_smb-patch). Added ipv6 support (bug #187905). Replaced 'kerberos' with 'ads' USE flag (bug #181558). Added possibility to start daemons seperately (bug #112188). Fixed python-handling (bug #177545). |
7 |
(Portage version: 2.1.3.7) |
8 |
|
9 |
Revision Changes Path |
10 |
1.298 net-fs/samba/ChangeLog |
11 |
|
12 |
file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/net-fs/samba/ChangeLog?rev=1.298&view=markup |
13 |
plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/net-fs/samba/ChangeLog?rev=1.298&content-type=text/plain |
14 |
diff : http://sources.gentoo.org/viewcvs.py/gentoo-x86/net-fs/samba/ChangeLog?r1=1.297&r2=1.298 |
15 |
|
16 |
Index: ChangeLog |
17 |
=================================================================== |
18 |
RCS file: /var/cvsroot/gentoo-x86/net-fs/samba/ChangeLog,v |
19 |
retrieving revision 1.297 |
20 |
retrieving revision 1.298 |
21 |
diff -u -r1.297 -r1.298 |
22 |
--- ChangeLog 4 Jul 2007 08:09:15 -0000 1.297 |
23 |
+++ ChangeLog 7 Sep 2007 21:07:39 -0000 1.298 |
24 |
@@ -1,6 +1,21 @@ |
25 |
# ChangeLog for net-fs/samba |
26 |
# Copyright 1999-2007 Gentoo Foundation; Distributed under the GPL v2 |
27 |
-# $Header: /var/cvsroot/gentoo-x86/net-fs/samba/ChangeLog,v 1.297 2007/07/04 08:09:15 dev-zero Exp $ |
28 |
+# $Header: /var/cvsroot/gentoo-x86/net-fs/samba/ChangeLog,v 1.298 2007/09/07 21:07:39 dev-zero Exp $ |
29 |
+ |
30 |
+*samba-3.0.25c (07 Sep 2007) |
31 |
+ |
32 |
+ 07 Sep 2007; Tiziano Müller <dev-zero@g.o> |
33 |
+ +files/3.0.25c-lazyldflags.patch, +files/3.0.25c-py_smp.patch, |
34 |
+ +files/3.0.x-libdirsymlink.patch, +files/config/lmhosts, |
35 |
+ +files/config/nsswitch.conf-winbind, +files/config/nsswitch.conf-wins, |
36 |
+ +files/config/samba.pam, +files/config/samba.schema, |
37 |
+ +files/config/smb.conf.example-samba3, +files/config/smbusers, |
38 |
+ +files/config/swat.xinetd, +files/config/system-auth-winbind, |
39 |
+ files/samba-init, +files/samba-xinetd, +samba-3.0.25c.ebuild: |
40 |
+ Version bump (bug #178639, thanks to Johan Andersson for the py_smb-patch). |
41 |
+ Added ipv6 support (bug #187905). Replaced 'kerberos' with 'ads' USE flag |
42 |
+ (bug #181558). Added possibility to start daemons seperately (bug #112188). |
43 |
+ Fixed python-handling (bug #177545). |
44 |
|
45 |
24 Jun 2007; Tiziano Müller <dev-zero@g.o> -samba-3.0.24.ebuild: |
46 |
Dropped old version |
47 |
|
48 |
|
49 |
|
50 |
1.1 net-fs/samba/samba-3.0.25c.ebuild |
51 |
|
52 |
file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/net-fs/samba/samba-3.0.25c.ebuild?rev=1.1&view=markup |
53 |
plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/net-fs/samba/samba-3.0.25c.ebuild?rev=1.1&content-type=text/plain |
54 |
|
55 |
Index: samba-3.0.25c.ebuild |
56 |
=================================================================== |
57 |
# Copyright 1999-2007 Gentoo Foundation |
58 |
# Distributed under the terms of the GNU General Public License v2 |
59 |
# $Header: /var/cvsroot/gentoo-x86/net-fs/samba/samba-3.0.25c.ebuild,v 1.1 2007/09/07 21:07:39 dev-zero Exp $ |
60 |
|
61 |
inherit eutils pam python multilib versionator confutils |
62 |
|
63 |
MY_P=${PN}-${PV/_/} |
64 |
|
65 |
DESCRIPTION="A suite of SMB and CIFS client/server programs for UNIX" |
66 |
HOMEPAGE="http://www.samba.org/" |
67 |
SRC_URI="mirror://samba/${MY_P}.tar.gz |
68 |
mirror://samba/old-versions/${MY_P}.tar.gz" |
69 |
LICENSE="GPL-2" |
70 |
SLOT="0" |
71 |
KEYWORDS="alpha amd64 arm hppa ia64 mips ppc ppc64 s390 sh sparc ~sparc-fbsd x86 ~x86-fbsd" |
72 |
IUSE_LINGUAS="linguas_ja linguas_pl" |
73 |
IUSE="${IUSE_LINGUAS} acl ads async automount caps cups doc examples ipv6 kernel_linux ldap fam |
74 |
pam python quotas readline selinux swat syslog winbind" |
75 |
|
76 |
RDEPEND="dev-libs/popt |
77 |
virtual/libiconv |
78 |
acl? ( kernel_linux? ( sys-apps/acl ) ) |
79 |
cups? ( net-print/cups ) |
80 |
ipv6? ( sys-apps/xinetd ) |
81 |
ads? ( virtual/krb5 ) |
82 |
ldap? ( net-nds/openldap ) |
83 |
pam? ( virtual/pam ) |
84 |
python? ( dev-lang/python ) |
85 |
readline? ( sys-libs/readline ) |
86 |
selinux? ( sec-policy/selinux-samba ) |
87 |
swat? ( sys-apps/xinetd ) |
88 |
syslog? ( virtual/logger ) |
89 |
fam? ( virtual/fam ) |
90 |
caps? ( sys-libs/libcap )" |
91 |
DEPEND="${RDEPEND}" |
92 |
|
93 |
S=${WORKDIR}/${MY_P} |
94 |
CONFDIR=${FILESDIR}/config |
95 |
PRIVATE_DST=/var/lib/samba/private |
96 |
|
97 |
pkg_setup() { |
98 |
confutils_use_depend_all ads ldap |
99 |
} |
100 |
|
101 |
src_unpack() { |
102 |
unpack ${A} |
103 |
cd "${S}/source" |
104 |
|
105 |
# This patch adds "-Wl,-z,now" to smb{mnt,umount} |
106 |
# Please read ... for further informations |
107 |
epatch "${FILESDIR}/${PV}-lazyldflags.patch" |
108 |
epatch "${FILESDIR}/${PV}-py_smp.patch" |
109 |
|
110 |
# Ok, agreed, this is ugly. But it avoids a patch we |
111 |
# need for every samba version and we don't need autotools |
112 |
sed -i \ |
113 |
-e 's|"lib32" ||' \ |
114 |
-e 's|if test -d "$i/$l" ;|if test -d "$i/$l" -o -L "$i/$l";|' \ |
115 |
configure || die "sed failed" |
116 |
} |
117 |
|
118 |
src_compile() { |
119 |
cd "${S}/source" |
120 |
|
121 |
local myconf |
122 |
local mylangs |
123 |
local mymod_shared |
124 |
|
125 |
python_version |
126 |
myconf="--with-python=no" |
127 |
use python && myconf="--with-python=${python}" |
128 |
|
129 |
mylangs="--with-manpages-langs=en" |
130 |
use linguas_ja && mylangs="${mylangs},ja" |
131 |
use linguas_pl && mylangs="${mylangs},pl" |
132 |
|
133 |
use winbind && mymod_shared="--with-shared-modules=idmap_rid" |
134 |
if use ldap ; then |
135 |
myconf="${myconf} $(use_with ads)" |
136 |
use winbind && mymod_shared="${mymod_shared},idmap_ad" |
137 |
fi |
138 |
|
139 |
[[ ${CHOST} == *-*bsd* ]] && myconf="${myconf} --disable-pie" |
140 |
use hppa && myconf="${myconf} --disable-pie" |
141 |
|
142 |
use caps && export ac_cv_header_sys_capability_h=yes || export ac_cv_header_sys_capability_h=no |
143 |
|
144 |
# Otherwise we get the whole swat stuff installed |
145 |
if ! use swat ; then |
146 |
sed -i \ |
147 |
-e 's/^\(install:.*\)installswat \(.*\)/\1\2/' \ |
148 |
Makefile.in || die "sed failed" |
149 |
fi |
150 |
|
151 |
econf \ |
152 |
--with-fhs \ |
153 |
--sysconfdir=/etc/samba \ |
154 |
--localstatedir=/var \ |
155 |
--with-configdir=/etc/samba \ |
156 |
--with-libdir=/usr/$(get_libdir)/samba \ |
157 |
--with-swatdir=/usr/share/doc/${PF}/swat \ |
158 |
--with-piddir=/var/run/samba \ |
159 |
--with-lockdir=/var/cache/samba \ |
160 |
--with-logfilebase=/var/log/samba \ |
161 |
--with-privatedir=${PRIVATE_DST} \ |
162 |
--with-libsmbclient \ |
163 |
--without-spinlocks \ |
164 |
--enable-socket-wrapper \ |
165 |
--with-cifsmount=no \ |
166 |
$(use_with acl acl-support) \ |
167 |
$(use_with async aio-support) \ |
168 |
$(use_with automount) \ |
169 |
$(use_enable cups) \ |
170 |
$(use_enable fam) \ |
171 |
$(use_with ads krb5) \ |
172 |
$(use_with ldap) \ |
173 |
$(use_with pam) $(use_with pam pam_smbpass) \ |
174 |
$(use_with quotas) $(use_with quotas sys-quotas) \ |
175 |
$(use_with readline) \ |
176 |
$(use_with kernel_linux smbmount) \ |
177 |
$(use_with syslog) \ |
178 |
$(use_with winbind) \ |
179 |
${myconf} ${mylangs} ${mymod_shared} || die "econf failed" |
180 |
|
181 |
emake proto || die "emake proto failed" |
182 |
emake everything || die "emake everything failed" |
183 |
|
184 |
if use python ; then |
185 |
emake python_ext || die "emake python_ext failed" |
186 |
fi |
187 |
} |
188 |
|
189 |
src_test() { |
190 |
cd "${S}/source" |
191 |
emake test || die "tests failed" |
192 |
} |
193 |
|
194 |
src_install() { |
195 |
cd "${S}/source" |
196 |
|
197 |
emake DESTDIR="${D}" install-everything || die "emake install-everything failed" |
198 |
|
199 |
# Extra rpctorture progs |
200 |
local extra_bins="rpctorture" |
201 |
for i in ${extra_bins} ; do |
202 |
[[ -x "${S}/bin/${i}" ]] && dobin "${S}/bin/${i}" |
203 |
done |
204 |
|
205 |
# remove .old stuff from /usr/bin: |
206 |
rm -f "${D}"/usr/bin/*.old |
207 |
|
208 |
# Nsswitch extensions. Make link for wins and winbind resolvers |
209 |
if use winbind ; then |
210 |
dolib.so nsswitch/libnss_wins.so |
211 |
dosym libnss_wins.so /usr/$(get_libdir)/libnss_wins.so.2 |
212 |
dolib.so nsswitch/libnss_winbind.so |
213 |
dosym libnss_winbind.so /usr/$(get_libdir)/libnss_winbind.so.2 |
214 |
fi |
215 |
|
216 |
if use pam ; then |
217 |
exeinto /$(get_libdir)/security |
218 |
doexe bin/pam_smbpass.so |
219 |
if use winbind ; then |
220 |
exeinto /$(get_libdir)/security |
221 |
doexe bin/pam_winbind.so |
222 |
fi |
223 |
fi |
224 |
|
225 |
if use kernel_linux ; then |
226 |
# Warning: this can byte you if /usr is |
227 |
# on a separate volume and you have to mount |
228 |
# a smb volume before the local mount |
229 |
dosym ../usr/bin/smbmount /sbin/mount.smbfs |
230 |
fperms 4755 /usr/bin/smbmnt |
231 |
fperms 4755 /usr/bin/smbumount |
232 |
fi |
233 |
|
234 |
# bug #46389: samba doesn't create symlink anymore |
235 |
# beaviour seems to be changed in 3.0.6, see bug #61046 |
236 |
dosym samba/libsmbclient.so /usr/$(get_libdir)/libsmbclient.so.0 |
237 |
dosym samba/libsmbclient.so /usr/$(get_libdir)/libsmbclient.so |
238 |
|
239 |
# make the smb backend symlink for cups printing support (bug #133133) |
240 |
if use cups ; then |
241 |
dodir $(cups-config --serverbin)/backend |
242 |
dosym /usr/bin/smbspool $(cups-config --serverbin)/backend/smb |
243 |
fi |
244 |
|
245 |
if use python ; then |
246 |
emake DESTDIR="${D}" python_install || die "emake installpython failed" |
247 |
# We're doing that manually |
248 |
find "${D}/usr/$(get_libdir)/python${PYVER}/site-packages" -iname "*.pyc" -delete |
249 |
fi |
250 |
|
251 |
cd "${S}/source" |
252 |
|
253 |
# General config files |
254 |
insinto /etc/samba |
255 |
doins "${CONFDIR}"/{smbusers,lmhosts} |
256 |
newins "${CONFDIR}/smb.conf.example-samba3" smb.conf.example |
257 |
|
258 |
newpamd "${CONFDIR}/samba.pam" samba |
259 |
use winbind && doins ${CONFDIR}/system-auth-winbind |
260 |
if use swat ; then |
261 |
insinto /etc/xinetd.d |
262 |
newins "${CONFDIR}/swat.xinetd swat" |
263 |
else |
264 |
rm -f "${D}/usr/sbin/swat" |
265 |
rm -f "${D}/usr/share/man/man8/swat.8" |
266 |
fi |
267 |
|
268 |
newinitd "${FILESDIR}/samba-init" samba |
269 |
newconfd "${FILESDIR}/samba-conf" samba |
270 |
|
271 |
if use ldap ; then |
272 |
insinto /etc/openldap/schema |
273 |
doins "${S}/examples/LDAP/samba.schema" |
274 |
fi |
275 |
|
276 |
if use ipv6 ; then |
277 |
insinto /etc/xinetd.d |
278 |
newins "${FILESDIR}/samba-xinetd" smb |
279 |
fi |
280 |
|
281 |
# dirs |
282 |
diropts -m0700 ; keepdir ${PRIVATE_DST} |
283 |
diropts -m1777 ; keepdir /var/spool/samba |
284 |
|
285 |
diropts -m0755 |
286 |
keepdir /var/{log,run,cache}/samba |
287 |
keepdir /var/lib/samba/{netlogon,profiles} |
288 |
keepdir /var/lib/samba/printers/{W32X86,WIN40,W32ALPHA,W32MIPS,W32PPC} |
289 |
keepdir /usr/$(get_libdir)/samba/{rpc,idmap,auth} |
290 |
|
291 |
# docs |
292 |
dodoc "${FILESDIR}/README.gentoo" |
293 |
dodoc "${S}"/{COPYING,Manifest,README,Roadmap,WHATSNEW.txt} |
294 |
dodoc "${CONFDIR}/nsswitch.conf-wins" |
295 |
use winbind && dodoc "${CONFDIR}/nsswitch.conf-winbind" |
296 |
|
297 |
if use examples ; then |
298 |
insinto /usr/share/doc/${PF} |
299 |
doins -r "${S}/examples/" |
300 |
find "${D}/usr/share/doc/${PF}" -type d -print0 | xargs -0 chmod 755 |
301 |
find "${D}/usr/share/doc/${PF}/examples" ! -type d -print0 | xargs -0 chmod 644 |
302 |
if use python ; then |
303 |
insinto /usr/share/doc/${PF}/python |
304 |
doins -r "${S}/source/python/examples" |
305 |
fi |
306 |
fi |
307 |
|
308 |
if ! use doc ; then |
309 |
if ! use swat ; then |
310 |
rm -rf "${D}/usr/share/doc/${PF}/swat" |
311 |
else |
312 |
rm -rf "${D}/usr/share/doc/${PF}/swat/help"/{guide,howto,devel} |
313 |
rm -rf "${D}/usr/share/doc/${PF}/swat/using_samba" |
314 |
fi |
315 |
fi |
316 |
|
317 |
} |
318 |
|
319 |
pkg_preinst() { |
320 |
local PRIVATE_SRC=/etc/samba/private |
321 |
if [[ ! -r ${ROOT}/${PRIVATE_DST}/secrets.tdb \ |
322 |
&& -r ${ROOT}/${PRIVATE_SRC}/secrets.tdb ]] ; then |
323 |
ebegin "Copying ${ROOT}/${PRIVATE_SRC}/* to ${ROOT}/${PRIVATE_DST}/" |
324 |
mkdir -p "${D}"/${PRIVATE_DST} |
325 |
cp -pPRf "${ROOT}"/${PRIVATE_SRC}/* "${D}"/${PRIVATE_DST}/ |
326 |
eend $? |
327 |
fi |
328 |
|
329 |
if [[ ! -f "${ROOT}/etc/samba/smb.conf" ]] ; then |
330 |
touch "${D}/etc/samba/smb.conf" |
331 |
fi |
332 |
} |
333 |
|
334 |
pkg_postinst() { |
335 |
if use python ; then |
336 |
python_version |
337 |
python_mod_optimize /usr/$(get_libdir)/python${PYVER}/site-packages/samba |
338 |
fi |
339 |
|
340 |
if use swat ; then |
341 |
einfo "swat must be enabled by xinetd:" |
342 |
einfo " change the /etc/xinetd.d/swat configuration" |
343 |
fi |
344 |
|
345 |
if use ipv6 ; then |
346 |
einfo "ipv6 support must be enabled by xinetd:" |
347 |
einfo " change the /etc/xinetd.d/smb configuration" |
348 |
fi |
349 |
|
350 |
elog "It is possible to start/stop daemons seperately:" |
351 |
elog " Create a symlink from /etc/init.d/samba.{smbd,nmbd,winbind} to" |
352 |
elog " /etc/init.d/samba. Calling /etc/init.d/samba directly will start" |
353 |
elog " the daemons configured in /etc/conf.d/samba" |
354 |
|
355 |
elog "The mount/umount.cifs helper applications are not included anymore." |
356 |
elog "Please install net-fs/mount-cifs instead." |
357 |
} |
358 |
|
359 |
pkg_postrm() { |
360 |
if use python ; then |
361 |
python_version |
362 |
python_mod_cleanup /usr/$(get_libdir)/python${PYVER}/site-packages/samba |
363 |
fi |
364 |
|
365 |
# If stale docs, and one isn't re-emerging the latest version, removes |
366 |
# (this is actually a portage bug, though) |
367 |
[[ -n ${PF} && ! -f ${ROOT}/usr/$(get_libdir)/${PN}/en.msg ]] && \ |
368 |
rm -rf "${ROOT}"/usr/share/doc/${PF} |
369 |
} |
370 |
|
371 |
|
372 |
|
373 |
-- |
374 |
gentoo-commits@g.o mailing list |