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-libs: samba-libs-3.3.9.ebuild ChangeLog samba-libs-3.4.3.ebuild samba-libs-3.3.8.ebuild samba-libs-3.4.2-r2.ebuild
Date: Thu, 29 Oct 2009 20:38:42
Message-Id: E1N3blY-0002ot-Qb@stork.gentoo.org
1 patrick 09/10/29 20:38:40
2
3 Modified: samba-libs-3.3.9.ebuild ChangeLog
4 Added: samba-libs-3.4.3.ebuild
5 Removed: samba-libs-3.3.8.ebuild samba-libs-3.4.2-r2.ebuild
6 Log:
7 Bump, remove old
8 (Portage version: 2.2_rc46/cvs/Linux x86_64)
9
10 Revision Changes Path
11 1.2 net-fs/samba-libs/samba-libs-3.3.9.ebuild
12
13 file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/net-fs/samba-libs/samba-libs-3.3.9.ebuild?rev=1.2&view=markup
14 plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/net-fs/samba-libs/samba-libs-3.3.9.ebuild?rev=1.2&content-type=text/plain
15 diff : http://sources.gentoo.org/viewcvs.py/gentoo-x86/net-fs/samba-libs/samba-libs-3.3.9.ebuild?r1=1.1&r2=1.2
16
17 Index: samba-libs-3.3.9.ebuild
18 ===================================================================
19 RCS file: /var/cvsroot/gentoo-x86/net-fs/samba-libs/samba-libs-3.3.9.ebuild,v
20 retrieving revision 1.1
21 retrieving revision 1.2
22 diff -u -r1.1 -r1.2
23 --- samba-libs-3.3.9.ebuild 22 Oct 2009 18:52:20 -0000 1.1
24 +++ samba-libs-3.3.9.ebuild 29 Oct 2009 20:38:39 -0000 1.2
25 @@ -1,6 +1,6 @@
26 # Copyright 1999-2009 Gentoo Foundation
27 # Distributed under the terms of the GNU General Public License v2
28 -# $Header: /var/cvsroot/gentoo-x86/net-fs/samba-libs/samba-libs-3.3.9.ebuild,v 1.1 2009/10/22 18:52:20 patrick Exp $
29 +# $Header: /var/cvsroot/gentoo-x86/net-fs/samba-libs/samba-libs-3.3.9.ebuild,v 1.2 2009/10/29 20:38:39 patrick Exp $
30
31 EAPI="2"
32
33 @@ -13,7 +13,7 @@
34 SRC_URI="mirror://samba/${MY_P}.tar.gz"
35 LICENSE="GPL-3"
36 SLOT="0"
37 -KEYWORDS="~amd64 ~arm ~hppa ~ppc64 ~x86"
38 +KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ppc64 ~x86"
39 IUSE="ads aio caps cluster cups debug examples ldap pam syslog winbind"
40
41 DEPEND="dev-libs/popt
42
43
44
45 1.20 net-fs/samba-libs/ChangeLog
46
47 file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/net-fs/samba-libs/ChangeLog?rev=1.20&view=markup
48 plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/net-fs/samba-libs/ChangeLog?rev=1.20&content-type=text/plain
49 diff : http://sources.gentoo.org/viewcvs.py/gentoo-x86/net-fs/samba-libs/ChangeLog?r1=1.19&r2=1.20
50
51 Index: ChangeLog
52 ===================================================================
53 RCS file: /var/cvsroot/gentoo-x86/net-fs/samba-libs/ChangeLog,v
54 retrieving revision 1.19
55 retrieving revision 1.20
56 diff -u -r1.19 -r1.20
57 --- ChangeLog 24 Oct 2009 11:20:45 -0000 1.19
58 +++ ChangeLog 29 Oct 2009 20:38:39 -0000 1.20
59 @@ -1,6 +1,12 @@
60 # ChangeLog for net-fs/samba-libs
61 # Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2
62 -# $Header: /var/cvsroot/gentoo-x86/net-fs/samba-libs/ChangeLog,v 1.19 2009/10/24 11:20:45 klausman Exp $
63 +# $Header: /var/cvsroot/gentoo-x86/net-fs/samba-libs/ChangeLog,v 1.20 2009/10/29 20:38:39 patrick Exp $
64 +
65 +*samba-libs-3.4.3 (29 Oct 2009)
66 +
67 + 29 Oct 2009; Patrick Lauer <patrick@g.o> -samba-libs-3.3.8.ebuild,
68 + -samba-libs-3.4.2-r2.ebuild, +samba-libs-3.4.3.ebuild:
69 + Bump, remove old
70
71 24 Oct 2009; Tobias Klausmann <klausman@g.o>
72 samba-libs-3.3.8.ebuild:
73
74
75
76 1.1 net-fs/samba-libs/samba-libs-3.4.3.ebuild
77
78 file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/net-fs/samba-libs/samba-libs-3.4.3.ebuild?rev=1.1&view=markup
79 plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/net-fs/samba-libs/samba-libs-3.4.3.ebuild?rev=1.1&content-type=text/plain
80
81 Index: samba-libs-3.4.3.ebuild
82 ===================================================================
83 # Copyright 1999-2009 Gentoo Foundation
84 # Distributed under the terms of the GNU General Public License v2
85 # $Header: /var/cvsroot/gentoo-x86/net-fs/samba-libs/samba-libs-3.4.3.ebuild,v 1.1 2009/10/29 20:38:39 patrick Exp $
86
87 EAPI="2"
88
89 inherit pam confutils versionator multilib autotools
90
91 MY_P="samba-${PV}"
92
93 DESCRIPTION="Library bits of the samba network filesystem"
94 HOMEPAGE="http://www.samba.org/"
95 SRC_URI="mirror://samba/${MY_P}.tar.gz"
96 LICENSE="GPL-3"
97 SLOT="0"
98 KEYWORDS="~amd64 ~hppa ~ppc64 ~x86"
99 IUSE="samba4 ads aio caps cluster cups debug examples ldap pam syslog winbind
100 +netapi +smbclient smbsharemodes addns tools"
101
102 DEPEND="dev-libs/popt
103 sys-libs/talloc
104 sys-libs/tdb
105 virtual/libiconv
106 ads? ( virtual/krb5 sys-fs/e2fsprogs )
107 caps? ( sys-libs/libcap )
108 cluster? ( dev-db/ctdb )
109 cups? ( net-print/cups )
110 debug? ( dev-libs/dmalloc )
111 ldap? ( net-nds/openldap )
112 pam? ( virtual/pam
113 winbind? ( dev-libs/iniparser ) )
114 syslog? ( virtual/logger )
115 !<net-fs/samba-3.3"
116 RDEPEND="${DEPEND}"
117
118 # Disable tests since we don't want to build that much here
119 RESTRICT="test"
120
121 BINPROGS=""
122
123 if use tools ; then
124 if use samba4 ; then BINPROGS="${BINPROGS} bin/ldbedit bin/ldbsearch bin/ldbadd bin/ldbdel bin/ldbmodify bin/ldbrename"; fi
125 fi
126
127 S="${WORKDIR}/${MY_P}/source3"
128
129 # TODO:
130 # - enable iPrint on Prefix/OSX and Darwin?
131 # - selftest-prefix? selftest?
132
133 CONFDIR="${FILESDIR}/$(get_version_component_range 1-2)"
134
135 pkg_setup() {
136 confutils_use_depend_all samba4 ads
137 confutils_use_depend_all ads ldap
138 }
139
140 src_prepare() {
141
142 cd ".."
143
144 epatch \
145 "${FILESDIR}/samba-3.4.2-missing_includes.patch" \
146 "${FILESDIR}/samba-3.4.2-fix-samba4-automake.patch" \
147 "${FILESDIR}/samba-3.4.2-insert-AC_LD_VERSIONSCRIPT.patch"
148 # "${FILESDIR}/samba-3.4.2-upgrade-tevent-version.patch" \
149
150 cp "${FILESDIR}/samba-3.4.2-lib.tevent.python.mk" "lib/tevent/python.mk"
151
152 cd "source3"
153 eautoconf -Ilibreplace -Im4 -I../m4 -I../lib/replace -I../source4
154
155 # ensure that winbind has correct ldflags (QA notice)
156 sed -i \
157 -e 's|LDSHFLAGS="|LDSHFLAGS="\\${LDFLAGS} |g' \
158 configure || die "sed failed"
159 }
160
161 src_configure() {
162 local myconf
163
164 # compile franky samba4 hybrid
165 # http://wiki.samba.org/index.php/Franky
166 if use samba4 ; then
167 myconf="${myconf} --enable-merged-build --enable-developer"
168 if has_version app-crypt/heimdal ; then
169 myconf="${myconf} --with-krb5=/usr/"
170 elif has_version app-crypt/mit-krb5 ; then
171 die "MIT Kerberos not supported by samba 4, use heimdal"
172 else
173 die "No supported kerberos provider detected"
174 fi
175 fi
176
177 # Filter out -fPIE
178 [[ ${CHOST} == *-*bsd* ]] && myconf="${myconf} --disable-pie"
179 use hppa && myconf="${myconf} --disable-pie"
180
181 # Upstream refuses to make this configurable
182 use caps && export ac_cv_header_sys_capability_h=yes || export ac_cv_header_sys_capability_h=no
183
184 # Notes:
185 # - FAM is a plugin for the server
186 # - DNS-SD is only used in client/server code
187 # - AFS is a pw-auth-method and only used in client/server code
188 # - AFSACL is a server module
189 # - automount is only needed in conjunction with NIS and we don't have that
190 # anymore
191 # - quota-support is only needed in server-code
192 # - acl-support is only used in server-code
193 # - --without-dce-dfs and --without-nisplus-home can't be passed to configure but are disabled by default
194 econf ${myconf} \
195 --sysconfdir=/etc/samba \
196 --localstatedir=/var \
197 $(use_enable debug developer) \
198 --enable-largefile \
199 --enable-socket-wrapper \
200 --enable-nss-wrapper \
201 --disable-swat \
202 $(use_enable debug dmalloc) \
203 $(use_enable cups) \
204 --disable-iprint \
205 --disable-fam \
206 --enable-shared-libs \
207 --disable-dnssd \
208 --disable-avahi \
209 --with-fhs \
210 --with-privatedir=/var/lib/samba/private \
211 --with-rootsbindir=/var/cache/samba \
212 --with-lockdir=/var/cache/samba \
213 --with-swatdir=/usr/share/doc/${PF}/swat \
214 --with-configdir=/etc/samba \
215 --with-logfilebase=/var/log/samba \
216 --with-pammodulesdir=$(getpam_mod_dir) \
217 --without-afs \
218 --without-fake-kaserver \
219 --without-vfs-afsacl \
220 $(use_with ldap) \
221 $(use_with ads) \
222 $(use_with ads krb5 /usr) \
223 $(use_with ads dnsupdate) \
224 --without-automount \
225 --without-cifsmount \
226 --without-cifsupcall \
227 $(use_with pam) \
228 $(use_with pam pam_smbpass) \
229 $(use_with syslog) \
230 --without-quotas \
231 --without-sys-quotas \
232 --without-utmp \
233 --without-libtdb \
234 $(use_with netapi libnetapi) \
235 --without-libtalloc \
236 $(use_with smbclient libsmbclient) \
237 $(use_with smbsharemodes libsmbsharemodes) \
238 $(use_with addns libaddns) \
239 $(use_with cluster ctdb /usr) \
240 $(use_with cluster cluster-support) \
241 --without-acl-support \
242 $(use_with aio aio-support) \
243 --with-sendfile-support \
244 $(use_with winbind) \
245 --without-included-popt \
246 --without-included-iniparser
247 }
248
249 src_compile() {
250
251 # compile libs
252 if use addns ; then
253 einfo "make addns library"
254 emake libaddns || die "emake libaddns failed"
255 fi
256 if use netapi ; then
257 einfo "make netapi library"
258 emake libnetapi || die "emake libnetapi failed"
259 fi
260 if use smbclient ; then
261 einfo "make smbclient library"
262 emake libsmbclient || die "emake libsmbclient failed"
263 fi
264 if use smbsharemodes ; then
265 einfo "make smbsharemodes library"
266 emake libsmbsharemodes || die "emake libsmbsharemodes failed"
267 fi
268
269 # compile modules
270 if use pam ; then
271 einfo "make pam modules"
272 emake pam_modules || die "emake pam_modules failed";
273 fi
274 if use winbind ; then
275 einfo "make nss modules"
276 emake nss_modules || die "emake nss_modules failed";
277 fi
278
279 # compile utilities
280 if use tools ; then
281 einfo "make utilities"
282 emake ${BINPROGS} || die "emake binprogs failed";
283 fi
284
285 }
286
287 src_install() {
288
289 # install libs
290 if use netapi ; then
291 einfo "install netapi library"
292 emake installlibnetapi DESTDIR="${D}" || die "emake install libnetapi failed"
293 fi
294 if use smbclient ; then
295 einfo "install smbclient library"
296 emake installlibsmbclient DESTDIR="${D}" || die "emake install libsmbclient failed"
297 fi
298 if use smbsharemodes ; then
299 einfo "install smbsharemodes library"
300 emake installlibsmbsharemodes DESTDIR="${D}" || die "emake install libsmbsharemodes failed"
301 fi
302 if use addns ; then
303 einfo "install addns library"
304 emake installlibaddns DESTDIR="${D}" || die "emake install libaddns failed"
305 fi
306
307 # install modules
308 if use pam ; then
309 einfo "install pam modules"
310 emake installpammodules DESTDIR="${D}" || die "emake installpammodules failed"
311 fi
312
313 # Remove empty installation directories
314 rmdir \
315 "${D}/usr/$(get_libdir)/samba" \
316 "${D}/usr"/{sbin,bin} \
317 "${D}/usr/share"/{man,locale,} \
318 "${D}/var"/{run,lib/samba/private,lib/samba,lib,cache/samba,cache,} \
319 # || die "tried to remove non-empty dirs, this seems like a bug in the ebuild"
320
321 # Nsswitch extensions. Make link for wins and winbind resolvers
322 if use winbind ; then
323 einfo "install lbwbclient"
324 emake installlibwbclient DESTDIR="${D}" || die "emake installlibwbclient failed"
325 dolib.so ../nsswitch/libnss_wins.so
326 dosym libnss_wins.so /usr/$(get_libdir)/libnss_wins.so.2
327 dolib.so ../nsswitch/libnss_winbind.so
328 dosym libnss_winbind.so /usr/$(get_libdir)/libnss_winbind.so.2
329 fi
330
331 if use pam ; then
332 if use winbind ; then
333 newpamd "${CONFDIR}/system-auth-winbind.pam" system-auth-winbind
334 doman ../docs/manpages/pam_winbind.8
335 dohtml ../docs/htmldocs/manpages/pam_winbind.8.html
336
337 if use examples ; then
338 insinto /usr/share/doc/${PF}/examples
339 doins -r ../examples/pam_winbind
340 fi
341 fi
342
343 newpamd "${CONFDIR}/samba.pam" samba
344 dodoc pam_smbpass/README
345 fi
346
347 # install utilities
348 if use tools && [[ -n "${BINPROGS}" ]] ; then
349 einfo "install utilities"
350 dobin ${BINPROGS} || die "not all bins around"
351 for prog in ${BINPROGS} ; do
352 doman ../docs/manpages/${prog/bin\/}* || die "doman failed"
353 dohtml ../docs/htmldocs/manpages/${prog/bin\/}*.html || die "dohtml failed"
354 done
355 fi
356
357 # install examples
358 if use examples ; then
359 einfo "install examples"
360 insinto /usr/share/doc/${PF}/examples
361 doins -r ../examples/libsmbclient
362 use winbind && doins -r ../examples/nss
363 fi
364
365 }