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: metadata.xml ChangeLog nfs-utils-1.2.9.ebuild
Date: Thu, 07 Nov 2013 07:50:27
Message-Id: 20131107075022.EE6302004B@flycatcher.gentoo.org
1 radhermit 13/11/07 07:50:22
2
3 Modified: metadata.xml ChangeLog
4 Added: nfs-utils-1.2.9.ebuild
5 Log:
6 Version bump, add default enabled libmount use flag (bug #487962).
7
8 (Portage version: 2.2.7/cvs/Linux x86_64, signed Manifest commit with key 4AB3E85B4F064CA3)
9
10 Revision Changes Path
11 1.7 net-fs/nfs-utils/metadata.xml
12
13 file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/net-fs/nfs-utils/metadata.xml?rev=1.7&view=markup
14 plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/net-fs/nfs-utils/metadata.xml?rev=1.7&content-type=text/plain
15 diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/net-fs/nfs-utils/metadata.xml?r1=1.6&r2=1.7
16
17 Index: metadata.xml
18 ===================================================================
19 RCS file: /var/cvsroot/gentoo-x86/net-fs/nfs-utils/metadata.xml,v
20 retrieving revision 1.6
21 retrieving revision 1.7
22 diff -u -r1.6 -r1.7
23 --- metadata.xml 24 Mar 2013 21:38:12 -0000 1.6
24 +++ metadata.xml 7 Nov 2013 07:50:22 -0000 1.7
25 @@ -4,6 +4,7 @@
26 <herd>net-fs</herd>
27 <longdescription>NFS client and server daemons</longdescription>
28 <use>
29 + <flag name='libmount'>Link mount.nfs with libmount</flag>
30 <flag name='nfsdcld'>Enable nfsdcld NFSv4 clientid tracking daemon</flag>
31 <flag name='nfsidmap'>Enable support for newer nfsidmap helper</flag>
32 <flag name='nfsv3'>Enable support for NFSv3</flag>
33
34
35
36 1.228 net-fs/nfs-utils/ChangeLog
37
38 file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/net-fs/nfs-utils/ChangeLog?rev=1.228&view=markup
39 plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/net-fs/nfs-utils/ChangeLog?rev=1.228&content-type=text/plain
40 diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/net-fs/nfs-utils/ChangeLog?r1=1.227&r2=1.228
41
42 Index: ChangeLog
43 ===================================================================
44 RCS file: /var/cvsroot/gentoo-x86/net-fs/nfs-utils/ChangeLog,v
45 retrieving revision 1.227
46 retrieving revision 1.228
47 diff -u -r1.227 -r1.228
48 --- ChangeLog 25 Sep 2013 17:26:19 -0000 1.227
49 +++ ChangeLog 7 Nov 2013 07:50:22 -0000 1.228
50 @@ -1,6 +1,12 @@
51 # ChangeLog for net-fs/nfs-utils
52 # Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
53 -# $Header: /var/cvsroot/gentoo-x86/net-fs/nfs-utils/ChangeLog,v 1.227 2013/09/25 17:26:19 ago Exp $
54 +# $Header: /var/cvsroot/gentoo-x86/net-fs/nfs-utils/ChangeLog,v 1.228 2013/11/07 07:50:22 radhermit Exp $
55 +
56 +*nfs-utils-1.2.9 (07 Nov 2013)
57 +
58 + 07 Nov 2013; Tim Harder <radhermit@g.o> +nfs-utils-1.2.9.ebuild,
59 + metadata.xml:
60 + Version bump, add default enabled libmount use flag (bug #487962).
61
62 25 Sep 2013; Agostino Sarubbo <ago@g.o> nfs-utils-1.2.7-r1.ebuild:
63 Stable for ppc, wrt bug #480074
64
65
66
67 1.1 net-fs/nfs-utils/nfs-utils-1.2.9.ebuild
68
69 file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/net-fs/nfs-utils/nfs-utils-1.2.9.ebuild?rev=1.1&view=markup
70 plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/net-fs/nfs-utils/nfs-utils-1.2.9.ebuild?rev=1.1&content-type=text/plain
71
72 Index: nfs-utils-1.2.9.ebuild
73 ===================================================================
74 # Copyright 1999-2013 Gentoo Foundation
75 # Distributed under the terms of the GNU General Public License v2
76 # $Header: /var/cvsroot/gentoo-x86/net-fs/nfs-utils/nfs-utils-1.2.9.ebuild,v 1.1 2013/11/07 07:50:22 radhermit Exp $
77
78 EAPI="4"
79
80 inherit eutils flag-o-matic multilib autotools systemd
81
82 DESCRIPTION="NFS client and server daemons"
83 HOMEPAGE="http://linux-nfs.org/"
84 SRC_URI="mirror://sourceforge/nfs/${P}.tar.bz2"
85
86 LICENSE="GPL-2"
87 SLOT="0"
88 KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86"
89 IUSE="caps ipv6 kerberos +libmount nfsdcld +nfsidmap +nfsv4 nfsv41 selinux tcpd +uuid"
90 RESTRICT="test" #315573
91
92 # kth-krb doesn't provide the right include
93 # files, and nfs-utils doesn't build against heimdal either,
94 # so don't depend on virtual/krb.
95 # (04 Feb 2005 agriffis)
96 DEPEND_COMMON="tcpd? ( sys-apps/tcp-wrappers )
97 caps? ( sys-libs/libcap )
98 sys-libs/e2fsprogs-libs
99 >=net-nds/rpcbind-0.2.0-r1
100 net-libs/libtirpc
101 libmount? ( sys-apps/util-linux )
102 nfsdcld? ( >=dev-db/sqlite-3.3 )
103 nfsv4? (
104 >=dev-libs/libevent-1.0b
105 >=net-libs/libnfsidmap-0.21-r1
106 kerberos? (
107 net-libs/librpcsecgss
108 >=net-libs/libgssglue-0.3
109 net-libs/libtirpc[kerberos]
110 app-crypt/mit-krb5
111 )
112 nfsidmap? (
113 >=net-libs/libnfsidmap-0.24
114 sys-apps/keyutils
115 )
116 )
117 nfsv41? (
118 sys-fs/lvm2
119 )
120 selinux? (
121 sec-policy/selinux-rpc
122 sec-policy/selinux-rpcbind
123 )
124 uuid? ( sys-apps/util-linux )"
125 RDEPEND="${DEPEND_COMMON} !net-nds/portmap"
126 DEPEND="${DEPEND_COMMON}
127 virtual/pkgconfig"
128
129 src_prepare() {
130 epatch "${FILESDIR}"/${PN}-1.1.4-mtab-sym.patch
131 epatch "${FILESDIR}"/${PN}-1.2.8-cross-build.patch
132 eautoreconf
133 }
134
135 src_configure() {
136 export libsqlite3_cv_is_recent=yes # Our DEPEND forces this.
137 export ac_cv_header_keyutils_h=$(usex nfsidmap)
138 econf \
139 --with-statedir=/var/lib/nfs \
140 --enable-tirpc \
141 $(use_enable libmount libmount-mount) \
142 $(use_with tcpd tcp-wrappers) \
143 $(use_enable nfsdcld nfsdcltrack) \
144 $(use_enable nfsv4) \
145 $(use_enable nfsv41) \
146 $(use_enable ipv6) \
147 $(use_enable caps) \
148 $(use_enable uuid) \
149 $(usex nfsv4 "$(use_enable kerberos gss)" "--disable-gss") \
150 $(usex nfsv4 "$(use_with kerberos gssglue)" "--without-gssglue")
151 }
152
153 src_compile(){
154 # remove compiled files bundled in the tarball
155 emake clean
156 default
157 }
158
159 src_install() {
160 default
161 rm linux-nfs/Makefile* || die
162 dodoc -r linux-nfs README
163
164 # Don't overwrite existing xtab/etab, install the original
165 # versions somewhere safe... more info in pkg_postinst
166 keepdir /var/lib/nfs/{,sm,sm.bak}
167 mv "${ED}"/var/lib "${ED}"/usr/$(get_libdir) || die
168
169 # Install some client-side binaries in /sbin
170 dodir /sbin
171 mv "${ED}"/usr/sbin/rpc.statd "${ED}"/sbin/ || die
172
173 if use nfsv4 && use nfsidmap ; then
174 # Install a config file for idmappers in newer kernels. #415625
175 insinto /etc/request-key.d
176 echo 'create id_resolver * * /usr/sbin/nfsidmap -t 600 %k %d' > id_resolver.conf
177 doins id_resolver.conf
178 fi
179
180 insinto /etc
181 doins "${FILESDIR}"/exports
182
183 local f list=() opt_need=""
184 if use nfsv4 ; then
185 opt_need="rpc.idmapd"
186 list+=( rpc.idmapd rpc.pipefs )
187 use kerberos && list+=( rpc.gssd rpc.svcgssd )
188 fi
189 for f in nfs nfsmount rpc.statd "${list[@]}" ; do
190 newinitd "${FILESDIR}"/${f}.initd ${f}
191 done
192 for f in nfs nfsmount ; do
193 newconfd "${FILESDIR}"/${f}.confd ${f}
194 done
195 sed -i \
196 -e "/^NFS_NEEDED_SERVICES=/s:=.*:=\"${opt_need}\":" \
197 "${ED}"/etc/conf.d/nfs || die #234132
198 systemd_dounit "${FILESDIR}"/nfsd.service
199 systemd_dounit "${FILESDIR}"/rpc-statd.service
200 systemd_dounit "${FILESDIR}"/rpc-mountd.service
201 }
202
203 pkg_postinst() {
204 # Install default xtab and friends if there's none existing. In
205 # src_install we put them in /usr/lib/nfs for safe-keeping, but
206 # the daemons actually use the files in /var/lib/nfs. #30486
207 local f
208 mkdir -p "${ROOT}"/var/lib/nfs #368505
209 for f in "${ROOT}"/usr/$(get_libdir)/nfs/*; do
210 [[ -e ${ROOT}/var/lib/nfs/${f##*/} ]] && continue
211 einfo "Copying default ${f##*/} from /usr/$(get_libdir)/nfs to /var/lib/nfs"
212 cp -pPR "${f}" "${ROOT}"/var/lib/nfs/
213 done
214 }