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-client: ChangeLog samba-client-3.3.9.ebuild samba-client-3.4.3.ebuild samba-client-3.3.8.ebuild samba-client-3.4.2.ebuild
Date: Thu, 29 Oct 2009 20:38:19
Message-Id: E1N3blA-0002lT-Tw@stork.gentoo.org
1 patrick 09/10/29 20:38:16
2
3 Modified: ChangeLog samba-client-3.3.9.ebuild
4 Added: samba-client-3.4.3.ebuild
5 Removed: samba-client-3.3.8.ebuild samba-client-3.4.2.ebuild
6 Log:
7 Bump, remove old
8 (Portage version: 2.2_rc46/cvs/Linux x86_64)
9
10 Revision Changes Path
11 1.17 net-fs/samba-client/ChangeLog
12
13 file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/net-fs/samba-client/ChangeLog?rev=1.17&view=markup
14 plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/net-fs/samba-client/ChangeLog?rev=1.17&content-type=text/plain
15 diff : http://sources.gentoo.org/viewcvs.py/gentoo-x86/net-fs/samba-client/ChangeLog?r1=1.16&r2=1.17
16
17 Index: ChangeLog
18 ===================================================================
19 RCS file: /var/cvsroot/gentoo-x86/net-fs/samba-client/ChangeLog,v
20 retrieving revision 1.16
21 retrieving revision 1.17
22 diff -u -r1.16 -r1.17
23 --- ChangeLog 24 Oct 2009 11:20:25 -0000 1.16
24 +++ ChangeLog 29 Oct 2009 20:38:16 -0000 1.17
25 @@ -1,6 +1,13 @@
26 # ChangeLog for net-fs/samba-client
27 # Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2
28 -# $Header: /var/cvsroot/gentoo-x86/net-fs/samba-client/ChangeLog,v 1.16 2009/10/24 11:20:25 klausman Exp $
29 +# $Header: /var/cvsroot/gentoo-x86/net-fs/samba-client/ChangeLog,v 1.17 2009/10/29 20:38:16 patrick Exp $
30 +
31 +*samba-client-3.4.3 (29 Oct 2009)
32 +
33 + 29 Oct 2009; Patrick Lauer <patrick@g.o>
34 + -samba-client-3.3.8.ebuild, -samba-client-3.4.2.ebuild,
35 + +samba-client-3.4.3.ebuild:
36 + Bump, remove old
37
38 24 Oct 2009; Tobias Klausmann <klausman@g.o>
39 samba-client-3.3.8.ebuild:
40
41
42
43 1.2 net-fs/samba-client/samba-client-3.3.9.ebuild
44
45 file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/net-fs/samba-client/samba-client-3.3.9.ebuild?rev=1.2&view=markup
46 plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/net-fs/samba-client/samba-client-3.3.9.ebuild?rev=1.2&content-type=text/plain
47 diff : http://sources.gentoo.org/viewcvs.py/gentoo-x86/net-fs/samba-client/samba-client-3.3.9.ebuild?r1=1.1&r2=1.2
48
49 Index: samba-client-3.3.9.ebuild
50 ===================================================================
51 RCS file: /var/cvsroot/gentoo-x86/net-fs/samba-client/samba-client-3.3.9.ebuild,v
52 retrieving revision 1.1
53 retrieving revision 1.2
54 diff -u -r1.1 -r1.2
55 --- samba-client-3.3.9.ebuild 22 Oct 2009 18:51:58 -0000 1.1
56 +++ samba-client-3.3.9.ebuild 29 Oct 2009 20:38:16 -0000 1.2
57 @@ -1,6 +1,6 @@
58 # Copyright 1999-2009 Gentoo Foundation
59 # Distributed under the terms of the GNU General Public License v2
60 -# $Header: /var/cvsroot/gentoo-x86/net-fs/samba-client/samba-client-3.3.9.ebuild,v 1.1 2009/10/22 18:51:58 patrick Exp $
61 +# $Header: /var/cvsroot/gentoo-x86/net-fs/samba-client/samba-client-3.3.9.ebuild,v 1.2 2009/10/29 20:38:16 patrick Exp $
62
63 EAPI="2"
64
65 @@ -13,7 +13,7 @@
66 SRC_URI="mirror://samba/${MY_P}.tar.gz"
67 LICENSE="GPL-3"
68 SLOT="0"
69 -KEYWORDS="~amd64 ~arm ~hppa ~ppc64 ~x86"
70 +KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ppc64 ~x86"
71 IUSE="ads aio avahi caps cluster cups debug ldap minimal syslog winbind zeroconf"
72
73 DEPEND="!<net-fs/samba-3.3
74
75
76
77 1.1 net-fs/samba-client/samba-client-3.4.3.ebuild
78
79 file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/net-fs/samba-client/samba-client-3.4.3.ebuild?rev=1.1&view=markup
80 plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/net-fs/samba-client/samba-client-3.4.3.ebuild?rev=1.1&content-type=text/plain
81
82 Index: samba-client-3.4.3.ebuild
83 ===================================================================
84 # Copyright 1999-2009 Gentoo Foundation
85 # Distributed under the terms of the GNU General Public License v2
86 # $Header: /var/cvsroot/gentoo-x86/net-fs/samba-client/samba-client-3.4.3.ebuild,v 1.1 2009/10/29 20:38:16 patrick Exp $
87
88 EAPI="2"
89
90 inherit pam confutils versionator multilib eutils toolchain-funcs autotools
91
92 MY_P="samba-${PV}"
93
94 DESCRIPTION="Client bits of the samba network filesystem"
95 HOMEPAGE="http://www.samba.org/"
96 SRC_URI="mirror://samba/${MY_P}.tar.gz"
97 LICENSE="GPL-3"
98 SLOT="0"
99 KEYWORDS="~amd64 ~hppa ~ppc64 ~x86"
100 IUSE="samba4 ads aio avahi caps cluster cups debug ldap minimal syslog winbind zeroconf"
101
102 DEPEND="!<net-fs/samba-3.3
103 !net-fs/mount-cifs
104 ads? ( virtual/krb5 sys-fs/e2fsprogs
105 net-fs/samba-libs[ads] sys-apps/keyutils )
106 !minimal? (
107 dev-libs/popt
108 dev-libs/iniparser
109 virtual/libiconv
110 zeroconf? ( || ( net-dns/avahi[mdnsresponder-compat] net-misc/mDNSResponder ) )
111 caps? ( sys-libs/libcap )
112 cups? ( net-print/cups )
113 debug? ( dev-libs/dmalloc )
114 ldap? ( net-nds/openldap )
115 syslog? ( virtual/logger )
116 sys-libs/tdb
117 sys-libs/talloc
118 ~net-fs/samba-libs-${PV}[caps?,cups?,ldap?,syslog?,winbind?,ads?,samba4?,netapi] )"
119 RDEPEND="${DEPEND}"
120
121 S="${WORKDIR}/${MY_P}/source3"
122
123 # TODO:
124 # - enable iPrint on Prefix/OSX and Darwin?
125 # - selftest-prefix? selftest?
126
127 RESTRICT="test"
128
129 CONFDIR="${FILESDIR}/$(get_version_component_range 1-2)"
130 BINPROGS="bin/smbclient bin/net bin/smbget bin/smbtree bin/nmblookup bin/smbpasswd bin/rpcclient bin/smbcacls bin/smbcquotas bin/ntlm_auth"
131
132 pkg_setup() {
133 confutils_use_depend_all samba4 ads
134 confutils_use_depend_all ads ldap
135 }
136
137 src_prepare() {
138
139 cd ".."
140
141 epatch \
142 "${FILESDIR}/samba-3.4.2-missing_includes.patch" \
143 "${FILESDIR}/samba-3.4.2-fix-samba4-automake.patch" \
144 "${FILESDIR}/samba-3.4.2-insert-AC_LD_VERSIONSCRIPT.patch"
145 # "${FILESDIR}/samba-3.4.2-upgrade-tevent-version.patch" \
146
147 cp "${FILESDIR}/samba-3.4.2-lib.tevent.python.mk" "lib/tevent/python.mk"
148
149 cd "source3"
150 eautoconf -Ilibreplace -Im4 -I../m4 -I../lib/replace -I../source4
151 }
152
153 src_configure() {
154 local myconf
155
156 # compile franky samba4 hybrid
157 # http://wiki.samba.org/index.php/Franky
158 if use samba4 ; then
159 myconf="${myconf} --enable-merged-build --enable-developer"
160 if has_version app-crypt/heimdal ; then
161 myconf="${myconf} --with-krb5=/usr/"
162 elif has_version app-crypt/mit-krb5 ; then
163 die "MIT Kerberos not supported by samba 4, use heimdal"
164 else
165 die "No supported kerberos provider detected"
166 fi
167 fi
168
169 # Filter out -fPIE
170 [[ ${CHOST} == *-*bsd* ]] && myconf="${myconf} --disable-pie"
171 use hppa && myconf="${myconf} --disable-pie"
172
173 # Upstream refuses to make this configurable
174 export ac_cv_header_sys_capability_h=no
175 if ! use minimal ; then
176 use caps && export ac_cv_header_sys_capability_h=yes
177 fi
178
179 if ! use minimal || use ads; then
180 # Notes:
181 # - FAM is a plugin for the server
182 # - DNS-SD is only used in client/server code
183 # - AFS is a pw-auth-method and only used in client/server code
184 # - AFSACL is a server module
185 # - automount is only needed in conjunction with NIS and we don't have that
186 # anymore
187 # - quota-support is only needed in server-code
188 # - acl-support is only used in server-code
189 # - --without-dce-dfs and --without-nisplus-home can't be passed to configure but are disabled by default
190 # - current DNS/SD support in the client is via the mdnsresponder-compat api in avahi
191 econf ${myconf} \
192 --sysconfdir=/etc/samba \
193 --localstatedir=/var \
194 $(use_enable debug developer) \
195 --enable-largefile \
196 --enable-socket-wrapper \
197 --enable-nss-wrapper \
198 --disable-swat \
199 $(use_enable debug dmalloc) \
200 $(use minimal && echo "--disable-cups" || echo "$(use_enable cups)") \
201 --disable-iprint \
202 --disable-fam \
203 --enable-shared-libs \
204 $(use minimal && echo "--disable-dnssd" || echo "$(use_enable avahi dnssd)") \
205 --disable-avahi \
206 --with-fhs \
207 --with-privatedir=/var/lib/samba/private \
208 --with-rootsbindir=/var/cache/samba \
209 --with-lockdir=/var/cache/samba \
210 --with-swatdir=/usr/share/doc/${PF}/swat \
211 --with-configdir=/etc/samba \
212 --with-logfilebase=/var/log/samba \
213 --with-pammodulesdir=$(getpam_mod_dir) \
214 --without-afs \
215 --without-fake-kaserver \
216 --without-vfs-afsacl \
217 $(use minimal && echo "--without-ldap" || echo "$(use_with ldap)") \
218 $(use minimal && echo "--without-ads" || echo "$(use_with ads)") \
219 $(use minimal && echo "--without-krb5" || echo "$(use_with ads krb5 /usr)") \
220 $(use minimal && echo "--without-dnsupdate" || echo "$(use_with ads dnsupdate)") \
221 --without-automount \
222 --without-cifsmount \
223 --without-cifsupcall \
224 --without-pam \
225 --without-pam_smbpass \
226 $(use minimal && echo "--without-syslog" || echo "$(use_with syslog)") \
227 --without-quotas \
228 --without-sys-quotas \
229 --without-utmp \
230 --without-lib{talloc,tdb,netapi,smbclient,smbsharemodes} \
231 --without-libaddns \
232 $(use minimal && echo "--without-ctdb" || echo "$(use_with cluster ctdb /usr)") \
233 $(use minimal && echo "--without-cluster" || echo "$(use_with cluster cluster-support)") \
234 --without-acl-support \
235 $(use minimal && echo "--without-aio-support" || echo "$(use_with aio aio-support)") \
236 --with-sendfile-support \
237 $(use minimal && echo "--without-winbind" || echo "$(use_with winbind)") \
238 --without-included-popt \
239 --without-included-iniparser
240 fi
241 }
242
243 src_compile() {
244 mkdir bin
245 $(tc-getCC) ${CFLAGS} ${LDFLAGS} -o bin/mount.cifs client/{mount.cifs,mtab}.c || die "building mount.cifs failed"
246 $(tc-getCC) ${CFLAGS} ${LDFLAGS} -o bin/umount.cifs client/{umount.cifs,mtab}.c || die "building umount.cifs failed"
247
248 if use ads ; then
249 emake bin/cifs.upcall || die "emake cifs.upcall failed"
250 fi
251
252 if ! use minimal ; then
253 emake ${BINPROGS} || die "emake binprogs failed"
254 if use cups ; then
255 emake bin/smbspool || die "emake smbspool failed"
256 fi
257 fi
258 }
259
260 src_install() {
261 into /
262 dosbin bin/mount.cifs bin/umount.cifs || die "u/mount.cifs not around"
263 doman ../docs/manpages/{u,}mount.cifs.8 || die "can't create man pages"
264 dohtml ../docs/htmldocs/manpages/{u,}mount.cifs.8.html || die "dohtml failed"
265
266 into /usr
267 if use ads ; then
268 dosbin bin/cifs.upcall || die "cifs.upcall not around"
269 doman ../docs/manpages/cifs.upcall.8 || die "doman failed"
270 dohtml ../docs/htmldocs/manpages/cifs.upcall.8.html || die "doman failed"
271 fi
272
273 if ! use minimal ; then
274 dobin ${BINPROGS} || die "not all bins around"
275 for prog in ${BINPROGS} ; do
276 doman ../docs/manpages/${prog/bin\/}* || die "doman failed"
277 dohtml ../docs/htmldocs/manpages/${prog/bin\/}*.html || die "dohtml failed"
278 done
279
280 if use cups ; then
281 dobin bin/smbspool || die "smbspool not around"
282 doman ../docs/manpages/smbspool.8 || die "doman failed"
283 dohtml ../docs/htmldocs/manpages/smbspool.8.html || die "dohtml failed"
284 dosym /usr/bin/smbspool $(cups-config --serverbin)/backend/smb
285 fi
286 fi
287 }