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