Gentoo Archives: gentoo-commits

From: "Mike Frysinger (vapier)" <vapier@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] gentoo-x86 commit in net-fs/nfs-utils: ChangeLog nfs-utils-1.1.1.ebuild
Date: Sat, 29 Dec 2007 09:33:38
Message-Id: E1J8Y4O-00089P-9Q@stork.gentoo.org
1 vapier 07/12/29 09:33:28
2
3 Modified: ChangeLog
4 Added: nfs-utils-1.1.1.ebuild
5 Log:
6 Version bump #197336 by Francisco Javier. Tweak nfs init.d needs based on exportfs #172431. Only mount nfsd fs in nfs init.d script. Mount rpc_pipefs in rpc.idmapd and rpc.gssd after making sure the dir exists #180425 by Maurice Volaski.
7 (Portage version: 2.1.4_rc11)
8
9 Revision Changes Path
10 1.111 net-fs/nfs-utils/ChangeLog
11
12 file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/net-fs/nfs-utils/ChangeLog?rev=1.111&view=markup
13 plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/net-fs/nfs-utils/ChangeLog?rev=1.111&content-type=text/plain
14 diff : http://sources.gentoo.org/viewcvs.py/gentoo-x86/net-fs/nfs-utils/ChangeLog?r1=1.110&r2=1.111
15
16 Index: ChangeLog
17 ===================================================================
18 RCS file: /var/cvsroot/gentoo-x86/net-fs/nfs-utils/ChangeLog,v
19 retrieving revision 1.110
20 retrieving revision 1.111
21 diff -u -r1.110 -r1.111
22 --- ChangeLog 29 Dec 2007 06:57:33 -0000 1.110
23 +++ ChangeLog 29 Dec 2007 09:33:27 -0000 1.111
24 @@ -1,6 +1,16 @@
25 # ChangeLog for net-fs/nfs-utils
26 # Copyright 1999-2007 Gentoo Foundation; Distributed under the GPL v2
27 -# $Header: /var/cvsroot/gentoo-x86/net-fs/nfs-utils/ChangeLog,v 1.110 2007/12/29 06:57:33 vapier Exp $
28 +# $Header: /var/cvsroot/gentoo-x86/net-fs/nfs-utils/ChangeLog,v 1.111 2007/12/29 09:33:27 vapier Exp $
29 +
30 +*nfs-utils-1.1.1 (29 Dec 2007)
31 +
32 + 29 Dec 2007; Mike Frysinger <vapier@g.o> files/nfs.initd,
33 + files/rpc.gssd.initd, files/rpc.idmapd.initd, files/rpc.statd.initd,
34 + +nfs-utils-1.1.1.ebuild:
35 + Version bump #197336 by Francisco Javier. Tweak nfs init.d needs based on
36 + exportfs #172431. Only mount nfsd fs in nfs init.d script. Mount rpc_pipefs
37 + in rpc.idmapd and rpc.gssd after making sure the dir exists #180425 by
38 + Maurice Volaski.
39
40 29 Dec 2007; Mike Frysinger <vapier@g.o> files/rpc.statd.initd:
41 Look up the full path of rpc.statd to avoid matching the init.d script
42
43
44
45 1.1 net-fs/nfs-utils/nfs-utils-1.1.1.ebuild
46
47 file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/net-fs/nfs-utils/nfs-utils-1.1.1.ebuild?rev=1.1&view=markup
48 plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/net-fs/nfs-utils/nfs-utils-1.1.1.ebuild?rev=1.1&content-type=text/plain
49
50 Index: nfs-utils-1.1.1.ebuild
51 ===================================================================
52 # Copyright 1999-2007 Gentoo Foundation
53 # Distributed under the terms of the GNU General Public License v2
54 # $Header: /var/cvsroot/gentoo-x86/net-fs/nfs-utils/nfs-utils-1.1.1.ebuild,v 1.1 2007/12/29 09:33:27 vapier Exp $
55
56 inherit eutils flag-o-matic multilib
57
58 DESCRIPTION="NFS client and server daemons"
59 HOMEPAGE="http://nfs.sourceforge.net/"
60 SRC_URI="mirror://sourceforge/nfs/${P}.tar.gz
61 http://www.citi.umich.edu/projects/nfsv4/linux/nfs-utils-patches/1.1.1-1/nfs-utils-1.1.1-001-xlog_segfault_fix.dif
62 http://www.citi.umich.edu/projects/nfsv4/linux/nfs-utils-patches/1.1.1-1/nfs-utils-1.1.1-002-svcgssd_pass_down_principal_name.dif"
63
64 LICENSE="GPL-2"
65 SLOT="0"
66 KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86"
67 IUSE="nonfsv4 tcpd kerberos"
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 RDEPEND="tcpd? ( sys-apps/tcp-wrappers )
74 >=net-nds/portmap-5b-r6
75 !nonfsv4? (
76 >=dev-libs/libevent-1.0b
77 >=net-libs/libnfsidmap-0.16
78 )
79 kerberos? (
80 net-libs/librpcsecgss
81 net-libs/libgssglue
82 app-crypt/mit-krb5
83 )"
84 # util-linux dep is to prevent man-page collision
85 DEPEND="${RDEPEND}
86 >=sys-apps/util-linux-2.12r-r7"
87
88 src_unpack() {
89 unpack ${P}.tar.gz
90 cd "${S}"
91 epatch "${DISTDIR}"/nfs-utils-1.1.1-001-xlog_segfault_fix.dif "${DISTDIR}"/nfs-utils-1.1.1-002-svcgssd_pass_down_principal_name.dif
92 sed -i \
93 -e 's:libgssapi >= 0\.11:libgssglue >= 0.1:' \
94 -e 's:-lgssapi:-lgssglue:' \
95 configure #191746
96 }
97
98 src_compile() {
99 econf \
100 --mandir=/usr/share/man \
101 --with-statedir=/var/lib/nfs \
102 --disable-rquotad \
103 --enable-nfsv3 \
104 --enable-secure-statd \
105 $(use_with tcpd tcp-wrappers) \
106 $(use_enable !nonfsv4 nfsv4) \
107 $(use_enable kerberos gss) \
108 || die "Configure failed"
109
110 emake || die "Failed to compile"
111 }
112
113 src_install() {
114 emake DESTDIR="${D}" install || die
115
116 # Don't overwrite existing xtab/etab, install the original
117 # versions somewhere safe... more info in pkg_postinst
118 dodir /usr/lib/nfs
119 keepdir /var/lib/nfs/{sm,sm.bak}
120 mv "${D}"/var/lib/nfs/* "${D}"/usr/lib/nfs
121 keepdir /var/lib/nfs
122
123 # Install some client-side binaries in /sbin
124 dodir /sbin
125 mv "${D}"/usr/sbin/rpc.statd "${D}"/sbin/ || die
126
127 dodoc ChangeLog README
128 docinto linux-nfs ; dodoc linux-nfs/*
129
130 insinto /etc
131 doins "${FILESDIR}"/exports
132
133 local f list=""
134 use !nonfsv4 && list="${list} rpc.idmapd"
135 use kerberos && list="${list} rpc.gssd"
136 for f in nfs nfsmount rpc.statd ${list} ; do
137 newinitd "${FILESDIR}"/${f}.initd ${f} || die "doinitd ${f}"
138 done
139 newconfd "${FILESDIR}"/nfs.confd nfs
140 use !nonfsv4 && doins utils/idmapd/idmapd.conf
141
142 # uClibc doesn't provide rpcgen like glibc, so lets steal it from nfs-utils
143 if ! use elibc_glibc ; then
144 dobin tools/rpcgen/rpcgen || die "rpcgen"
145 newdoc tools/rpcgen/README README.rpcgen
146 fi
147 }
148
149 pkg_preinst() {
150 [[ -s ${ROOT}/etc/exports ]] && rm -f "${D}"/etc/exports
151 }
152
153 pkg_postinst() {
154 # Install default xtab and friends if there's none existing.
155 # In src_install we put them in /usr/lib/nfs for safe-keeping, but
156 # the daemons actually use the files in /var/lib/nfs. This fixes
157 # bug 30486
158 local f
159 for f in "${ROOT}"/usr/$(get_libdir)/nfs/*; do
160 [[ -e ${ROOT}/var/lib/nfs/${f##*/} ]] && continue
161 einfo "Copying default ${f##*/} from /usr/$(get_libdir)/nfs to /var/lib/nfs"
162 cp -pPR "${f}" "${ROOT}"/var/lib/nfs/
163 done
164 }
165
166
167
168 --
169 gentoo-commits@g.o mailing list