Gentoo Archives: gentoo-commits

From: Jeroen Roovers <jer@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] repo/gentoo:master commit in: net-fs/nfs-utils/
Date: Mon, 11 Sep 2017 09:03:04
Message-Id: 1505120547.b413668e977c44322947e7b16b1307febbc5e86c.jer@gentoo
1 commit: b413668e977c44322947e7b16b1307febbc5e86c
2 Author: Jeroen Roovers <jer <AT> gentoo <DOT> org>
3 AuthorDate: Mon Sep 11 09:02:27 2017 +0000
4 Commit: Jeroen Roovers <jer <AT> gentoo <DOT> org>
5 CommitDate: Mon Sep 11 09:02:27 2017 +0000
6 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=b413668e
7
8 net-fs/nfs-utils: Old.
9
10 Package-Manager: Portage-2.3.8, Repoman-2.3.3
11
12 net-fs/nfs-utils/Manifest | 1 -
13 net-fs/nfs-utils/nfs-utils-1.3.1-r5.ebuild | 171 -----------------------------
14 2 files changed, 172 deletions(-)
15
16 diff --git a/net-fs/nfs-utils/Manifest b/net-fs/nfs-utils/Manifest
17 index d5798c70b25..f55aa5701df 100644
18 --- a/net-fs/nfs-utils/Manifest
19 +++ b/net-fs/nfs-utils/Manifest
20 @@ -1,4 +1,3 @@
21 -DIST nfs-utils-1.3.1.tar.bz2 785800 SHA256 748c4afbdfd3e92017fe579f1dd3280a10db1306c43228f83cd6b55f0d95aed3 SHA512 304e718aaee1df4decb0711c58c814ac773d55277baca01fd74d275969b9a1cee4bf0c0c20ba3ed72a112bd92b4744d45179f29a2a69a7fc2ca2590762a671c9 WHIRLPOOL 6fe5e9957c4a2775871ede47d1020f1a642e9242501ff3d21b74c4772ae8dfcafba27334e5844a06f9cc3e0fd286d1f90573511c2b198e330cb46c06cdbfc592
22 DIST nfs-utils-1.3.4.tar.bz2 814545 SHA256 c529c82a82320daae811f3d3a143f83d2714d7e7a43beadd42fcd6022c17d590 SHA512 765c0bc55a9a0bdb2c25d8fb7189a9054fb9f2dd51726eda29f44e5d5c423e245b02307dfcfab9239276d8f44869a72732416f6e9ef5a1f80753d9243ba1b38c WHIRLPOOL 6dc556ef7d00a583c222eb62a600b0d83c6f91ad65d89ca14e1fb3c8aaacf4fbae492e6f0ca3fb0821e2b666f0806ad5fddec041a1124b86b9941540cdfb08b4
23 DIST nfs-utils-2.1.1.tar.bz2 820083 SHA256 0a28416948516c26f3bfe90425b0de09b79364dc1f508bf1dda8de66e1edbb09 SHA512 ed358280b7e124154632040bf747f6e4c3c6e4156bf90e82ff6915b1488f1c0dd65251a3a0f9b7ca96b9664d64e24b379828da9b524e64a3c769a44f4c930448 WHIRLPOOL bb28ae312b64c3493a1393a5b41eda457367594a71e230379ec04ffea3eb29d60ab8254e4981b0aa9cbe778dc1fbe9b08dc8615184a35cdb22bf4e5e04e56a6c
24 DIST nfs-utils-2.1.2_rc3.tar.gz 475356 SHA256 5b379316a2cc49b07f72042b72eadee0bfe7c88e65d7b5baa4798e6cefca5a82 SHA512 2f948994f275b405678240deecc879900cc0e72476adaf552db059364f08f0929722013d751e0bc7913c30eb3f8183d1fc7693709c063fc92e20b71edd24ccef WHIRLPOOL 6a16a9cc3d22d883b6a8aa2d2f01dce81f9a1df03154a80e4aa43ae9bb878a15f0ca37951702f780341283da94d885b7be3656a950285ef79619e09dc465727f
25
26 diff --git a/net-fs/nfs-utils/nfs-utils-1.3.1-r5.ebuild b/net-fs/nfs-utils/nfs-utils-1.3.1-r5.ebuild
27 deleted file mode 100644
28 index 12993ab5b9a..00000000000
29 --- a/net-fs/nfs-utils/nfs-utils-1.3.1-r5.ebuild
30 +++ /dev/null
31 @@ -1,171 +0,0 @@
32 -# Copyright 1999-2017 Gentoo Foundation
33 -# Distributed under the terms of the GNU General Public License v2
34 -
35 -EAPI="5"
36 -
37 -inherit eutils flag-o-matic multilib autotools systemd
38 -
39 -DESCRIPTION="NFS client and server daemons"
40 -HOMEPAGE="http://linux-nfs.org/"
41 -SRC_URI="mirror://sourceforge/nfs/${P}.tar.bz2"
42 -
43 -LICENSE="GPL-2"
44 -SLOT="0"
45 -KEYWORDS="alpha amd64 arm ~arm64 hppa ia64 ~mips ppc ppc64 ~s390 ~sh sparc x86"
46 -IUSE="caps ipv6 kerberos +libmount nfsdcld +nfsidmap +nfsv4 nfsv41 selinux tcpd +uuid"
47 -REQUIRED_USE="kerberos? ( nfsv4 )"
48 -RESTRICT="test" #315573
49 -
50 -# kth-krb doesn't provide the right include
51 -# files, and nfs-utils doesn't build against heimdal either,
52 -# so don't depend on virtual/krb.
53 -# (04 Feb 2005 agriffis)
54 -DEPEND_COMMON="tcpd? ( sys-apps/tcp-wrappers )
55 - caps? ( sys-libs/libcap )
56 - sys-libs/e2fsprogs-libs
57 - >=net-nds/rpcbind-0.2.0-r1
58 - net-libs/libtirpc
59 - libmount? ( sys-apps/util-linux )
60 - nfsdcld? ( >=dev-db/sqlite-3.3 )
61 - nfsv4? (
62 - <=dev-libs/libevent-2.1
63 - >=net-libs/libnfsidmap-0.21-r1
64 - kerberos? (
65 - >=net-libs/libtirpc-0.2.4-r1[kerberos]
66 - app-crypt/mit-krb5
67 - )
68 - nfsidmap? (
69 - >=net-libs/libnfsidmap-0.24
70 - >=sys-apps/keyutils-1.5.9
71 - )
72 - )
73 - nfsv41? (
74 - sys-fs/lvm2
75 - )
76 - uuid? ( sys-apps/util-linux )"
77 -RDEPEND="${DEPEND_COMMON}
78 - !net-nds/portmap
79 - !<sys-apps/openrc-0.13.9
80 - selinux? (
81 - sec-policy/selinux-rpc
82 - sec-policy/selinux-rpcbind
83 - )
84 -"
85 -DEPEND="${DEPEND_COMMON}
86 - virtual/pkgconfig"
87 -
88 -src_prepare() {
89 - epatch "${FILESDIR}"/${PN}-1.1.4-mtab-sym.patch
90 - epatch "${FILESDIR}"/${PN}-1.2.8-cross-build.patch
91 -
92 - sed \
93 - -e "/^sbindir/s:= := \"${EPREFIX}\":g" \
94 - -i utils/*/Makefile.am || die
95 -
96 - eautoreconf
97 -}
98 -
99 -src_configure() {
100 - export libsqlite3_cv_is_recent=yes # Our DEPEND forces this.
101 - export ac_cv_header_keyutils_h=$(usex nfsidmap)
102 - econf \
103 - --with-statedir="${EPREFIX}"/var/lib/nfs \
104 - --enable-tirpc \
105 - --with-tirpcinclude="${EPREFIX}"/usr/include/tirpc/ \
106 - $(use_enable libmount libmount-mount) \
107 - $(use_with tcpd tcp-wrappers) \
108 - $(use_enable nfsdcld nfsdcltrack) \
109 - $(use_enable nfsv4) \
110 - $(use_enable nfsv41) \
111 - $(use_enable ipv6) \
112 - $(use_enable caps) \
113 - $(use_enable uuid) \
114 - $(use_enable kerberos gss) \
115 - --without-gssglue
116 -}
117 -
118 -src_compile(){
119 - # remove compiled files bundled in the tarball
120 - emake clean
121 - default
122 -}
123 -
124 -src_install() {
125 - default
126 - rm linux-nfs/Makefile* || die
127 - dodoc -r linux-nfs README
128 -
129 - # Don't overwrite existing xtab/etab, install the original
130 - # versions somewhere safe... more info in pkg_postinst
131 - keepdir /var/lib/nfs/{,sm,sm.bak}
132 - mv "${ED}"/var/lib "${ED}"/usr/$(get_libdir) || die
133 -
134 - # Install some client-side binaries in /sbin
135 - dodir /sbin
136 - mv "${ED}"/usr/sbin/rpc.statd "${ED}"/sbin/ || die
137 -
138 - if use nfsv4 && use nfsidmap ; then
139 - # Install a config file for idmappers in newer kernels. #415625
140 - insinto /etc/request-key.d
141 - echo 'create id_resolver * * /usr/sbin/nfsidmap -t 600 %k %d' > id_resolver.conf
142 - doins id_resolver.conf
143 - fi
144 -
145 - insinto /etc
146 - doins "${FILESDIR}"/exports
147 - keepdir /etc/exports.d
148 -
149 - local f list=() opt_need=""
150 - if use nfsv4 ; then
151 - opt_need="rpc.idmapd"
152 - list+=( rpc.idmapd rpc.pipefs )
153 - use kerberos && list+=( rpc.gssd rpc.svcgssd )
154 - fi
155 - for f in nfs nfsclient rpc.statd "${list[@]}" ; do
156 - newinitd "${FILESDIR}"/${f}.initd ${f}
157 - done
158 - newinitd "${FILESDIR}"/nfsmount.initd-1.3.1 nfsmount # Nuke after 2015/08/01
159 - for f in nfs nfsclient ; do
160 - newconfd "${FILESDIR}"/${f}.confd ${f}
161 - done
162 - sed -i \
163 - -e "/^NFS_NEEDED_SERVICES=/s:=.*:=\"${opt_need}\":" \
164 - "${ED}"/etc/conf.d/nfs || die #234132
165 -
166 - systemd_dounit systemd/*.{mount,service,target}
167 - if ! use nfsv4 || ! use kerberos ; then
168 - rm "${D}$(systemd_get_unitdir)"/rpc-{gssd,svcgssd}.service || die
169 - fi
170 - rm "${D}$(systemd_get_unitdir)"/nfs-config.service || die
171 - sed -i -r \
172 - -e "/^EnvironmentFile=/s:=.*:=${EPREFIX}/etc/conf.d/nfs:" \
173 - -e '/^(After|Wants)=nfs-config.service$/d' \
174 - -e 's:/usr/sbin/rpc.statd:/sbin/rpc.statd:' \
175 - "${D}$(systemd_get_unitdir)"/* || die
176 -}
177 -
178 -pkg_postinst() {
179 - # Install default xtab and friends if there's none existing. In
180 - # src_install we put them in /usr/lib/nfs for safe-keeping, but
181 - # the daemons actually use the files in /var/lib/nfs. #30486
182 - local f
183 - mkdir -p "${EROOT}"/var/lib/nfs #368505
184 - for f in "${EROOT}"/usr/$(get_libdir)/nfs/*; do
185 - [[ -e ${EROOT}/var/lib/nfs/${f##*/} ]] && continue
186 - einfo "Copying default ${f##*/} from ${EPREFIX}/usr/$(get_libdir)/nfs to ${EPREFIX}/var/lib/nfs"
187 - cp -pPR "${f}" "${EROOT}"/var/lib/nfs/
188 - done
189 -
190 - if systemd_is_booted; then
191 - if [[ ${REPLACING_VERSIONS} < 1.3.0 ]]; then
192 - ewarn "We have switched to upstream systemd unit files. Since"
193 - ewarn "they got renamed, you should probably enable the new ones."
194 - ewarn "You can run 'equery files nfs-utils | grep systemd'"
195 - ewarn "to know what services you need to enable now."
196 - fi
197 - else
198 - ewarn "If you use OpenRC, the nfsmount service has been replaced with nfsclient."
199 - ewarn "If you were using nfsmount, please add nfsclient and netmount to the"
200 - ewarn "same runlevel as nfsmount."
201 - fi
202 -}