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

Gentoo Archives: gentoo-commits

From: "Tim Harder (radhermit)" <radhermit@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-r1.ebuild nfs-utils-1.3.2.ebuild
Date: Sat, 31 Jan 2015 22:59:40
Message-Id: 20150131225937.13CB310C82@oystercatcher.gentoo.org
1 radhermit 15/01/31 22:59:37
2
3 Modified: ChangeLog
4 Added: nfs-utils-1.3.2-r1.ebuild
5 Removed: nfs-utils-1.3.2.ebuild
6 Log:
7 Force rpc.statd into the background.
8
9 (Portage version: 2.2.15/cvs/Linux x86_64, signed Manifest commit with key 4AB3E85B4F064CA3)
10
11 Revision Changes Path
12 1.269 net-fs/nfs-utils/ChangeLog
13
14 file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/net-fs/nfs-utils/ChangeLog?rev=1.269&view=markup
15 plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/net-fs/nfs-utils/ChangeLog?rev=1.269&content-type=text/plain
16 diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/net-fs/nfs-utils/ChangeLog?r1=1.268&r2=1.269
17
18 Index: ChangeLog
19 ===================================================================
20 RCS file: /var/cvsroot/gentoo-x86/net-fs/nfs-utils/ChangeLog,v
21 retrieving revision 1.268
22 retrieving revision 1.269
23 diff -u -r1.268 -r1.269
24 --- ChangeLog 31 Jan 2015 17:43:01 -0000 1.268
25 +++ ChangeLog 31 Jan 2015 22:59:37 -0000 1.269
26 @@ -1,6 +1,12 @@
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.268 2015/01/31 17:43:01 jer Exp $
30 +# $Header: /var/cvsroot/gentoo-x86/net-fs/nfs-utils/ChangeLog,v 1.269 2015/01/31 22:59:37 radhermit Exp $
31 +
32 +*nfs-utils-1.3.2-r1 (31 Jan 2015)
33 +
34 + 31 Jan 2015; Tim Harder <radhermit@g.o> -nfs-utils-1.3.2.ebuild,
35 + +nfs-utils-1.3.2-r1.ebuild, files/rpc.statd.initd:
36 + Force rpc.statd into the background.
37
38 31 Jan 2015; Jeroen Roovers <jer@g.o> nfs-utils-1.3.2.ebuild:
39 Fix dev-libs/libevent dependency (bug #446374).
40
41
42
43 1.1 net-fs/nfs-utils/nfs-utils-1.3.2-r1.ebuild
44
45 file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/net-fs/nfs-utils/nfs-utils-1.3.2-r1.ebuild?rev=1.1&view=markup
46 plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/net-fs/nfs-utils/nfs-utils-1.3.2-r1.ebuild?rev=1.1&content-type=text/plain
47
48 Index: nfs-utils-1.3.2-r1.ebuild
49 ===================================================================
50 # Copyright 1999-2015 Gentoo Foundation
51 # Distributed under the terms of the GNU General Public License v2
52 # $Header: /var/cvsroot/gentoo-x86/net-fs/nfs-utils/nfs-utils-1.3.2-r1.ebuild,v 1.1 2015/01/31 22:59:37 radhermit Exp $
53
54 EAPI="5"
55
56 inherit eutils flag-o-matic multilib autotools systemd
57
58 DESCRIPTION="NFS client and server daemons"
59 HOMEPAGE="http://linux-nfs.org/"
60 SRC_URI="mirror://sourceforge/nfs/${P}.tar.bz2"
61
62 LICENSE="GPL-2"
63 SLOT="0"
64 KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86"
65 IUSE="caps ipv6 kerberos +libmount nfsdcld +nfsidmap +nfsv4 nfsv41 selinux tcpd +uuid"
66 REQUIRED_USE="kerberos? ( nfsv4 )"
67 RESTRICT="test" #315573
68
69 # kth-krb doesn't provide the right include
70 # files, and nfs-utils doesn't build against heimdal either,
71 # so don't depend on virtual/krb.
72 # (04 Feb 2005 agriffis)
73 DEPEND_COMMON="tcpd? ( sys-apps/tcp-wrappers )
74 caps? ( sys-libs/libcap )
75 sys-libs/e2fsprogs-libs
76 >=net-nds/rpcbind-0.2.0-r1
77 net-libs/libtirpc
78 libmount? ( sys-apps/util-linux )
79 nfsdcld? ( >=dev-db/sqlite-3.3 )
80 nfsv4? (
81 dev-libs/libevent
82 >=net-libs/libnfsidmap-0.21-r1
83 kerberos? (
84 >=net-libs/libtirpc-0.2.4-r1[kerberos]
85 app-crypt/mit-krb5
86 )
87 nfsidmap? (
88 >=net-libs/libnfsidmap-0.24
89 >=sys-apps/keyutils-1.5.9
90 )
91 )
92 nfsv41? (
93 sys-fs/lvm2
94 )
95 uuid? ( sys-apps/util-linux )"
96 RDEPEND="${DEPEND_COMMON}
97 !net-nds/portmap
98 !<sys-apps/openrc-0.13.4
99 selinux? (
100 sec-policy/selinux-rpc
101 sec-policy/selinux-rpcbind
102 )
103 "
104 DEPEND="${DEPEND_COMMON}
105 virtual/pkgconfig"
106
107 src_prepare() {
108 epatch "${FILESDIR}"/${PN}-1.1.4-mtab-sym.patch
109 epatch "${FILESDIR}"/${PN}-1.2.8-cross-build.patch
110
111 sed \
112 -e "/^sbindir/s:= := \"${EPREFIX}\":g" \
113 -i utils/*/Makefile.am || die
114
115 eautoreconf
116 }
117
118 src_configure() {
119 export libsqlite3_cv_is_recent=yes # Our DEPEND forces this.
120 export ac_cv_header_keyutils_h=$(usex nfsidmap)
121 econf \
122 --with-statedir="${EPREFIX}"/var/lib/nfs \
123 --enable-tirpc \
124 --with-tirpcinclude="${EPREFIX}"/usr/include/tirpc/ \
125 $(use_enable libmount libmount-mount) \
126 $(use_with tcpd tcp-wrappers) \
127 $(use_enable nfsdcld nfsdcltrack) \
128 $(use_enable nfsv4) \
129 $(use_enable nfsv41) \
130 $(use_enable ipv6) \
131 $(use_enable caps) \
132 $(use_enable uuid) \
133 $(use_enable kerberos gss) \
134 --without-gssglue
135 }
136
137 src_compile(){
138 # remove compiled files bundled in the tarball
139 emake clean
140 default
141 }
142
143 src_install() {
144 default
145 rm linux-nfs/Makefile* || die
146 dodoc -r linux-nfs README
147
148 # Don't overwrite existing xtab/etab, install the original
149 # versions somewhere safe... more info in pkg_postinst
150 keepdir /var/lib/nfs/{,sm,sm.bak}
151 mv "${ED}"/var/lib "${ED}"/usr/$(get_libdir) || die
152
153 # Install some client-side binaries in /sbin
154 dodir /sbin
155 mv "${ED}"/usr/sbin/rpc.statd "${ED}"/sbin/ || die
156
157 if use nfsv4 && use nfsidmap ; then
158 # Install a config file for idmappers in newer kernels. #415625
159 insinto /etc/request-key.d
160 echo 'create id_resolver * * /usr/sbin/nfsidmap -t 600 %k %d' > id_resolver.conf
161 doins id_resolver.conf
162 fi
163
164 insinto /etc
165 doins "${FILESDIR}"/exports
166 keepdir /etc/exports.d
167
168 local f list=() opt_need=""
169 if use nfsv4 ; then
170 opt_need="rpc.idmapd"
171 list+=( rpc.idmapd rpc.pipefs )
172 use kerberos && list+=( rpc.gssd rpc.svcgssd )
173 fi
174 for f in nfs nfsclient rpc.statd "${list[@]}" ; do
175 newinitd "${FILESDIR}"/${f}.initd ${f}
176 done
177 for f in nfs nfsclient ; do
178 newconfd "${FILESDIR}"/${f}.confd ${f}
179 done
180 sed -i \
181 -e "/^NFS_NEEDED_SERVICES=/s:=.*:=\"${opt_need}\":" \
182 "${ED}"/etc/conf.d/nfs || die #234132
183
184 systemd_dounit systemd/*.{mount,service,target}
185 if ! use nfsv4 || ! use kerberos ; then
186 rm "${D}$(systemd_get_unitdir)"/rpc-{gssd,svcgssd}.service || die
187 fi
188 if ! use nfsv41 ; then
189 rm "${D}$(systemd_get_unitdir)"/nfs-blkmap.* || die
190 fi
191 rm "${D}$(systemd_get_unitdir)"/nfs-config.service || die
192 sed -i -r \
193 -e "/^EnvironmentFile=/s:=.*:=${EPREFIX}/etc/conf.d/nfs:" \
194 -e '/^(After|Wants)=nfs-config.service$/d' \
195 -e 's:/usr/sbin/rpc.statd:/sbin/rpc.statd:' \
196 "${D}$(systemd_get_unitdir)"/* || die
197 }
198
199 pkg_postinst() {
200 # Install default xtab and friends if there's none existing. In
201 # src_install we put them in /usr/lib/nfs for safe-keeping, but
202 # the daemons actually use the files in /var/lib/nfs. #30486
203 local f
204 mkdir -p "${EROOT}"/var/lib/nfs #368505
205 for f in "${EROOT}"/usr/$(get_libdir)/nfs/*; do
206 [[ -e ${EROOT}/var/lib/nfs/${f##*/} ]] && continue
207 einfo "Copying default ${f##*/} from ${EPREFIX}/usr/$(get_libdir)/nfs to ${EPREFIX}/var/lib/nfs"
208 cp -pPR "${f}" "${EROOT}"/var/lib/nfs/
209 done
210
211 if systemd_is_booted; then
212 if [[ ${REPLACING_VERSIONS} < 1.3.0 ]]; then
213 ewarn "We have switched to upstream systemd unit files. Since"
214 ewarn "they got renamed, you should probably enable the new ones."
215 ewarn "You can run 'equery files nfs-utils | grep systemd'"
216 ewarn "to know what services you need to enable now."
217 fi
218 else
219 ewarn "If you use OpenRC, the nfsmount service has been replaced with nfsclient."
220 ewarn "If you were using nfsmount, please add nfsclient and netmount to the"
221 ewarn "same runlevel as nfsmount."
222 fi
223 }
Report Message
Find on MARC Find on Google Groups