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

Gentoo Archives: gentoo-commits

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