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