Get Gentoo!
gentoo.org sites
gentoo.org Wiki Bugs Forums Packages
Planet Archives Sources
Infra Status

Gentoo Archives: gentoo-commits

From: "William Hubbs (williamh)" <williamh@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] gentoo-x86 commit in net-fs/nfs-utils: nfs-utils-1.3.1-r4.ebuild nfs-utils-1.3.2-r5.ebuild ChangeLog
Date: Tue, 03 Feb 2015 19:28:40
Message-Id: 20150203192836.1EB8210FC4@oystercatcher.gentoo.org
1 williamh 15/02/03 19:28:36
2
3 Modified: ChangeLog
4 Added: nfs-utils-1.3.1-r4.ebuild nfs-utils-1.3.2-r5.ebuild
5 Log:
6 drop the provide nfsmount from nfsclient since there is now a migration script.
7
8 (Portage version: 2.2.15/cvs/Linux x86_64, RepoMan options: --force, signed Manifest commit with key 0x30C46538)
9
10 Revision Changes Path
11 1.273 net-fs/nfs-utils/ChangeLog
12
13 file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/net-fs/nfs-utils/ChangeLog?rev=1.273&view=markup
14 plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/net-fs/nfs-utils/ChangeLog?rev=1.273&content-type=text/plain
15 diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/net-fs/nfs-utils/ChangeLog?r1=1.272&r2=1.273
16
17 Index: ChangeLog
18 ===================================================================
19 RCS file: /var/cvsroot/gentoo-x86/net-fs/nfs-utils/ChangeLog,v
20 retrieving revision 1.272
21 retrieving revision 1.273
22 diff -u -r1.272 -r1.273
23 --- ChangeLog 3 Feb 2015 09:28:55 -0000 1.272
24 +++ ChangeLog 3 Feb 2015 19:28:36 -0000 1.273
25 @@ -1,6 +1,14 @@
26 # ChangeLog for net-fs/nfs-utils
27 # Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2
28 -# $Header: /var/cvsroot/gentoo-x86/net-fs/nfs-utils/ChangeLog,v 1.272 2015/02/03 09:28:55 pinkbyte Exp $
29 +# $Header: /var/cvsroot/gentoo-x86/net-fs/nfs-utils/ChangeLog,v 1.273 2015/02/03 19:28:36 williamh Exp $
30 +
31 +*nfs-utils-1.3.2-r5 (03 Feb 2015)
32 +*nfs-utils-1.3.1-r4 (03 Feb 2015)
33 +
34 + 03 Feb 2015; William Hubbs <williamh@g.o> +nfs-utils-1.3.1-r4.ebuild,
35 + +nfs-utils-1.3.2-r5.ebuild, files/nfsclient.initd:
36 + drop the provide nfsmount from nfsclient since there is now a migration
37 + script.
38
39 *nfs-utils-1.3.2-r4 (03 Feb 2015)
40 *nfs-utils-1.3.1-r3 (03 Feb 2015)
41
42
43
44 1.1 net-fs/nfs-utils/nfs-utils-1.3.1-r4.ebuild
45
46 file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/net-fs/nfs-utils/nfs-utils-1.3.1-r4.ebuild?rev=1.1&view=markup
47 plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/net-fs/nfs-utils/nfs-utils-1.3.1-r4.ebuild?rev=1.1&content-type=text/plain
48
49 Index: nfs-utils-1.3.1-r4.ebuild
50 ===================================================================
51 # Copyright 1999-2015 Gentoo Foundation
52 # Distributed under the terms of the GNU General Public License v2
53 # $Header: /var/cvsroot/gentoo-x86/net-fs/nfs-utils/nfs-utils-1.3.1-r4.ebuild,v 1.1 2015/02/03 19:28:36 williamh Exp $
54
55 EAPI="5"
56
57 inherit eutils flag-o-matic multilib autotools systemd
58
59 DESCRIPTION="NFS client and server daemons"
60 HOMEPAGE="http://linux-nfs.org/"
61 SRC_URI="mirror://sourceforge/nfs/${P}.tar.bz2"
62
63 LICENSE="GPL-2"
64 SLOT="0"
65 KEYWORDS="~alpha amd64 arm ~arm64 hppa ~ia64 ~mips ppc ppc64 ~s390 ~sh ~sparc x86"
66 IUSE="caps ipv6 kerberos +libmount nfsdcld +nfsidmap +nfsv4 nfsv41 selinux tcpd +uuid"
67 REQUIRED_USE="kerberos? ( nfsv4 )"
68 RESTRICT="test" #315573
69
70 # kth-krb doesn't provide the right include
71 # files, and nfs-utils doesn't build against heimdal either,
72 # so don't depend on virtual/krb.
73 # (04 Feb 2005 agriffis)
74 DEPEND_COMMON="tcpd? ( sys-apps/tcp-wrappers )
75 caps? ( sys-libs/libcap )
76 sys-libs/e2fsprogs-libs
77 >=net-nds/rpcbind-0.2.0-r1
78 net-libs/libtirpc
79 libmount? ( sys-apps/util-linux )
80 nfsdcld? ( >=dev-db/sqlite-3.3 )
81 nfsv4? (
82 <=dev-libs/libevent-2.1
83 >=net-libs/libnfsidmap-0.21-r1
84 kerberos? (
85 >=net-libs/libtirpc-0.2.4-r1[kerberos]
86 app-crypt/mit-krb5
87 )
88 nfsidmap? (
89 >=net-libs/libnfsidmap-0.24
90 >=sys-apps/keyutils-1.5.9
91 )
92 )
93 nfsv41? (
94 sys-fs/lvm2
95 )
96 uuid? ( sys-apps/util-linux )"
97 RDEPEND="${DEPEND_COMMON}
98 !net-nds/portmap
99 !<sys-apps/openrc-0.13.4
100 selinux? (
101 sec-policy/selinux-rpc
102 sec-policy/selinux-rpcbind
103 )
104 "
105 DEPEND="${DEPEND_COMMON}
106 virtual/pkgconfig"
107
108 src_prepare() {
109 epatch "${FILESDIR}"/${PN}-1.1.4-mtab-sym.patch
110 epatch "${FILESDIR}"/${PN}-1.2.8-cross-build.patch
111
112 sed \
113 -e "/^sbindir/s:= := \"${EPREFIX}\":g" \
114 -i utils/*/Makefile.am || die
115
116 eautoreconf
117 }
118
119 src_configure() {
120 export libsqlite3_cv_is_recent=yes # Our DEPEND forces this.
121 export ac_cv_header_keyutils_h=$(usex nfsidmap)
122 econf \
123 --with-statedir="${EPREFIX}"/var/lib/nfs \
124 --enable-tirpc \
125 --with-tirpcinclude="${EPREFIX}"/usr/include/tirpc/ \
126 $(use_enable libmount libmount-mount) \
127 $(use_with tcpd tcp-wrappers) \
128 $(use_enable nfsdcld nfsdcltrack) \
129 $(use_enable nfsv4) \
130 $(use_enable nfsv41) \
131 $(use_enable ipv6) \
132 $(use_enable caps) \
133 $(use_enable uuid) \
134 $(use_enable kerberos gss) \
135 --without-gssglue
136 }
137
138 src_compile(){
139 # remove compiled files bundled in the tarball
140 emake clean
141 default
142 }
143
144 src_install() {
145 default
146 rm linux-nfs/Makefile* || die
147 dodoc -r linux-nfs README
148
149 # Don't overwrite existing xtab/etab, install the original
150 # versions somewhere safe... more info in pkg_postinst
151 keepdir /var/lib/nfs/{,sm,sm.bak}
152 mv "${ED}"/var/lib "${ED}"/usr/$(get_libdir) || die
153
154 # Install some client-side binaries in /sbin
155 dodir /sbin
156 mv "${ED}"/usr/sbin/rpc.statd "${ED}"/sbin/ || die
157
158 if use nfsv4 && use nfsidmap ; then
159 # Install a config file for idmappers in newer kernels. #415625
160 insinto /etc/request-key.d
161 echo 'create id_resolver * * /usr/sbin/nfsidmap -t 600 %k %d' > id_resolver.conf
162 doins id_resolver.conf
163 fi
164
165 insinto /etc
166 doins "${FILESDIR}"/exports
167 keepdir /etc/exports.d
168
169 local f list=() opt_need=""
170 if use nfsv4 ; then
171 opt_need="rpc.idmapd"
172 list+=( rpc.idmapd rpc.pipefs )
173 use kerberos && list+=( rpc.gssd rpc.svcgssd )
174 fi
175 for f in nfs nfsclient rpc.statd "${list[@]}" ; do
176 newinitd "${FILESDIR}"/${f}.initd ${f}
177 done
178 newinitd "${FILESDIR}"/nfsmount.initd-1.3.1 nfsmount # Nuke after 2015/08/01
179 for f in nfs nfsclient ; do
180 newconfd "${FILESDIR}"/${f}.confd ${f}
181 done
182 sed -i \
183 -e "/^NFS_NEEDED_SERVICES=/s:=.*:=\"${opt_need}\":" \
184 "${ED}"/etc/conf.d/nfs || die #234132
185
186 systemd_dounit systemd/*.{mount,service,target}
187 if ! use nfsv4 || ! use kerberos ; then
188 rm "${D}$(systemd_get_unitdir)"/rpc-{gssd,svcgssd}.service || die
189 fi
190 rm "${D}$(systemd_get_unitdir)"/nfs-config.service || die
191 sed -i -r \
192 -e "/^EnvironmentFile=/s:=.*:=${EPREFIX}/etc/conf.d/nfs:" \
193 -e '/^(After|Wants)=nfs-config.service$/d' \
194 -e 's:/usr/sbin/rpc.statd:/sbin/rpc.statd:' \
195 "${D}$(systemd_get_unitdir)"/* || die
196 }
197
198 pkg_postinst() {
199 # Install default xtab and friends if there's none existing. In
200 # src_install we put them in /usr/lib/nfs for safe-keeping, but
201 # the daemons actually use the files in /var/lib/nfs. #30486
202 local f
203 mkdir -p "${EROOT}"/var/lib/nfs #368505
204 for f in "${EROOT}"/usr/$(get_libdir)/nfs/*; do
205 [[ -e ${EROOT}/var/lib/nfs/${f##*/} ]] && continue
206 einfo "Copying default ${f##*/} from ${EPREFIX}/usr/$(get_libdir)/nfs to ${EPREFIX}/var/lib/nfs"
207 cp -pPR "${f}" "${EROOT}"/var/lib/nfs/
208 done
209
210 if systemd_is_booted; then
211 if [[ ${REPLACING_VERSIONS} < 1.3.0 ]]; then
212 ewarn "We have switched to upstream systemd unit files. Since"
213 ewarn "they got renamed, you should probably enable the new ones."
214 ewarn "You can run 'equery files nfs-utils | grep systemd'"
215 ewarn "to know what services you need to enable now."
216 fi
217 else
218 ewarn "If you use OpenRC, the nfsmount service has been replaced with nfsclient."
219 ewarn "If you were using nfsmount, please add nfsclient and netmount to the"
220 ewarn "same runlevel as nfsmount."
221 fi
222 }
223
224
225
226 1.1 net-fs/nfs-utils/nfs-utils-1.3.2-r5.ebuild
227
228 file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/net-fs/nfs-utils/nfs-utils-1.3.2-r5.ebuild?rev=1.1&view=markup
229 plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/net-fs/nfs-utils/nfs-utils-1.3.2-r5.ebuild?rev=1.1&content-type=text/plain
230
231 Index: nfs-utils-1.3.2-r5.ebuild
232 ===================================================================
233 # Copyright 1999-2015 Gentoo Foundation
234 # Distributed under the terms of the GNU General Public License v2
235 # $Header: /var/cvsroot/gentoo-x86/net-fs/nfs-utils/nfs-utils-1.3.2-r5.ebuild,v 1.1 2015/02/03 19:28:36 williamh Exp $
236
237 EAPI="5"
238
239 inherit eutils flag-o-matic multilib autotools systemd
240
241 DESCRIPTION="NFS client and server daemons"
242 HOMEPAGE="http://linux-nfs.org/"
243 SRC_URI="mirror://sourceforge/nfs/${P}.tar.bz2"
244
245 LICENSE="GPL-2"
246 SLOT="0"
247 KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86"
248 IUSE="caps ipv6 kerberos +libmount nfsdcld +nfsidmap +nfsv4 nfsv41 selinux tcpd +uuid"
249 REQUIRED_USE="kerberos? ( nfsv4 )"
250 RESTRICT="test" #315573
251
252 # kth-krb doesn't provide the right include
253 # files, and nfs-utils doesn't build against heimdal either,
254 # so don't depend on virtual/krb.
255 # (04 Feb 2005 agriffis)
256 DEPEND_COMMON="tcpd? ( sys-apps/tcp-wrappers )
257 caps? ( sys-libs/libcap )
258 sys-libs/e2fsprogs-libs
259 >=net-nds/rpcbind-0.2.0-r1
260 net-libs/libtirpc
261 libmount? ( sys-apps/util-linux )
262 nfsdcld? ( >=dev-db/sqlite-3.3 )
263 nfsv4? (
264 dev-libs/libevent
265 >=net-libs/libnfsidmap-0.21-r1
266 kerberos? (
267 >=net-libs/libtirpc-0.2.4-r1[kerberos]
268 app-crypt/mit-krb5
269 )
270 nfsidmap? (
271 >=net-libs/libnfsidmap-0.24
272 >=sys-apps/keyutils-1.5.9
273 )
274 )
275 nfsv41? (
276 sys-fs/lvm2
277 )
278 uuid? ( sys-apps/util-linux )"
279 RDEPEND="${DEPEND_COMMON}
280 !net-nds/portmap
281 !<sys-apps/openrc-0.13.4
282 selinux? (
283 sec-policy/selinux-rpc
284 sec-policy/selinux-rpcbind
285 )
286 "
287 DEPEND="${DEPEND_COMMON}
288 virtual/pkgconfig"
289
290 src_prepare() {
291 epatch "${FILESDIR}"/${PN}-1.1.4-mtab-sym.patch
292 epatch "${FILESDIR}"/${PN}-1.2.8-cross-build.patch
293 epatch "${FILESDIR}"/${PN}-1.3.2-background-statd.patch
294
295 sed \
296 -e "/^sbindir/s:= := \"${EPREFIX}\":g" \
297 -i utils/*/Makefile.am || die
298
299 epatch_user
300 eautoreconf
301 }
302
303 src_configure() {
304 export libsqlite3_cv_is_recent=yes # Our DEPEND forces this.
305 export ac_cv_header_keyutils_h=$(usex nfsidmap)
306 econf \
307 --with-statedir="${EPREFIX}"/var/lib/nfs \
308 --enable-tirpc \
309 --with-tirpcinclude="${EPREFIX}"/usr/include/tirpc/ \
310 $(use_enable libmount libmount-mount) \
311 $(use_with tcpd tcp-wrappers) \
312 $(use_enable nfsdcld nfsdcltrack) \
313 $(use_enable nfsv4) \
314 $(use_enable nfsv41) \
315 $(use_enable ipv6) \
316 $(use_enable caps) \
317 $(use_enable uuid) \
318 $(use_enable kerberos gss) \
319 --without-gssglue
320 }
321
322 src_compile(){
323 # remove compiled files bundled in the tarball
324 emake clean
325 default
326 }
327
328 src_install() {
329 default
330 rm linux-nfs/Makefile* || die
331 dodoc -r linux-nfs README
332
333 # Don't overwrite existing xtab/etab, install the original
334 # versions somewhere safe... more info in pkg_postinst
335 keepdir /var/lib/nfs/{,sm,sm.bak}
336 mv "${ED}"/var/lib "${ED}"/usr/$(get_libdir) || die
337
338 # Install some client-side binaries in /sbin
339 dodir /sbin
340 mv "${ED}"/usr/sbin/rpc.statd "${ED}"/sbin/ || die
341
342 if use nfsv4 && use nfsidmap ; then
343 # Install a config file for idmappers in newer kernels. #415625
344 insinto /etc/request-key.d
345 echo 'create id_resolver * * /usr/sbin/nfsidmap -t 600 %k %d' > id_resolver.conf
346 doins id_resolver.conf
347 fi
348
349 insinto /etc
350 doins "${FILESDIR}"/exports
351 keepdir /etc/exports.d
352
353 local f list=() opt_need=""
354 if use nfsv4 ; then
355 opt_need="rpc.idmapd"
356 list+=( rpc.idmapd rpc.pipefs )
357 use kerberos && list+=( rpc.gssd rpc.svcgssd )
358 fi
359 for f in nfs nfsclient rpc.statd "${list[@]}" ; do
360 newinitd "${FILESDIR}"/${f}.initd ${f}
361 done
362 newinitd "${FILESDIR}"/nfsmount.initd-1.3.1 nfsmount # Nuke after 2015/08/01
363 for f in nfs nfsclient ; do
364 newconfd "${FILESDIR}"/${f}.confd ${f}
365 done
366 sed -i \
367 -e "/^NFS_NEEDED_SERVICES=/s:=.*:=\"${opt_need}\":" \
368 "${ED}"/etc/conf.d/nfs || die #234132
369
370 systemd_dounit systemd/*.{mount,service,target}
371 if ! use nfsv4 || ! use kerberos ; then
372 rm "${D}$(systemd_get_unitdir)"/rpc-{gssd,svcgssd}.service || die
373 fi
374 if ! use nfsv41 ; then
375 rm "${D}$(systemd_get_unitdir)"/nfs-blkmap.* || die
376 fi
377 rm "${D}$(systemd_get_unitdir)"/nfs-config.service || die
378 sed -i -r \
379 -e "/^EnvironmentFile=/s:=.*:=${EPREFIX}/etc/conf.d/nfs:" \
380 -e '/^(After|Wants)=nfs-config.service$/d' \
381 -e 's:/usr/sbin/rpc.statd:/sbin/rpc.statd:' \
382 "${D}$(systemd_get_unitdir)"/* || die
383 }
384
385 pkg_postinst() {
386 # Install default xtab and friends if there's none existing. In
387 # src_install we put them in /usr/lib/nfs for safe-keeping, but
388 # the daemons actually use the files in /var/lib/nfs. #30486
389 local f
390 mkdir -p "${EROOT}"/var/lib/nfs #368505
391 for f in "${EROOT}"/usr/$(get_libdir)/nfs/*; do
392 [[ -e ${EROOT}/var/lib/nfs/${f##*/} ]] && continue
393 einfo "Copying default ${f##*/} from ${EPREFIX}/usr/$(get_libdir)/nfs to ${EPREFIX}/var/lib/nfs"
394 cp -pPR "${f}" "${EROOT}"/var/lib/nfs/
395 done
396
397 if systemd_is_booted; then
398 if [[ ${REPLACING_VERSIONS} < 1.3.0 ]]; then
399 ewarn "We have switched to upstream systemd unit files. Since"
400 ewarn "they got renamed, you should probably enable the new ones."
401 ewarn "You can run 'equery files nfs-utils | grep systemd'"
402 ewarn "to know what services you need to enable now."
403 fi
404 else
405 ewarn "If you use OpenRC, the nfsmount service has been replaced with nfsclient."
406 ewarn "If you were using nfsmount, please add nfsclient and netmount to the"
407 ewarn "same runlevel as nfsmount."
408 fi
409 }
Report Message
Find on MARC Find on Google Groups