1 |
commit: 05565e9f2752082bc6d198d43775d275b5070219 |
2 |
Author: Lars Wendler <polynomial-c <AT> gentoo <DOT> org> |
3 |
AuthorDate: Fri Jan 18 15:14:59 2019 +0000 |
4 |
Commit: Lars Wendler <polynomial-c <AT> gentoo <DOT> org> |
5 |
CommitDate: Fri Jan 18 15:14:59 2019 +0000 |
6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=05565e9f |
7 |
|
8 |
net-fs/nfs-utils: Removed old. |
9 |
|
10 |
Package-Manager: Portage-2.3.56, Repoman-2.3.12 |
11 |
Signed-off-by: Lars Wendler <polynomial-c <AT> gentoo.org> |
12 |
|
13 |
net-fs/nfs-utils/Manifest | 1 - |
14 |
...s-utils-2.3.1-svcgssd_undefined_reference.patch | 40 ----- |
15 |
net-fs/nfs-utils/nfs-utils-2.3.1-r3.ebuild | 188 --------------------- |
16 |
3 files changed, 229 deletions(-) |
17 |
|
18 |
diff --git a/net-fs/nfs-utils/Manifest b/net-fs/nfs-utils/Manifest |
19 |
index 92c38322217..77edc0132d3 100644 |
20 |
--- a/net-fs/nfs-utils/Manifest |
21 |
+++ b/net-fs/nfs-utils/Manifest |
22 |
@@ -1,2 +1 @@ |
23 |
-DIST nfs-utils-2.3.1.tar.bz2 854899 BLAKE2B f9541b9dc103d978f21d57d8ba0c14a3b30f6ba874b112239d014076c1c72b6654e8e02b4bfea686e658dac84d1e896b872bc2054591275ef1713ae4e7b7d005 SHA512 de3e70f8656bc5b5aa98262685a9e80929c6314234d9bbb74d4c7efcb7a8b2640d48d2100850b403157ebefc8f0eb48598b48238fae795f64c7a0e9a8bff93e3 |
24 |
DIST nfs-utils-2.3.3.tar.bz2 888947 BLAKE2B 7c913f0c5061807d4af162fb392c8f466abb97c88960853b52298f61056bcad08f67a16e577036dec9afa737d88268d5a766b67c4b30a014b666dfbf3db81031 SHA512 266b86ef5041a7ecd144c6f2570e8a6eb00ebb4e547fa4b8c8c3e60a4af117c2690ff9effb0d4113a7b7ef57164583c8a6ada9cb1bb8f7b748524c826eaf1cba |
25 |
|
26 |
diff --git a/net-fs/nfs-utils/files/nfs-utils-2.3.1-svcgssd_undefined_reference.patch b/net-fs/nfs-utils/files/nfs-utils-2.3.1-svcgssd_undefined_reference.patch |
27 |
deleted file mode 100644 |
28 |
index 77c902f2727..00000000000 |
29 |
--- a/net-fs/nfs-utils/files/nfs-utils-2.3.1-svcgssd_undefined_reference.patch |
30 |
+++ /dev/null |
31 |
@@ -1,40 +0,0 @@ |
32 |
-From 1451d7585bf1c622658ccc04abac7e79ffe40263 Mon Sep 17 00:00:00 2001 |
33 |
-From: Justin Mitchell <jumitche@××××××.com> |
34 |
-Date: Mon, 8 Jan 2018 09:14:11 -0500 |
35 |
-Subject: [PATCH] svcgssd: Update svcgssd so that it builds |
36 |
- |
37 |
-Since a15bd948 the --enable-svcgss option no longer builds |
38 |
-as svcgssd references functions which were changed at that time. |
39 |
-Fix those, and other function changes since then. |
40 |
- |
41 |
-Signed-off-by: Justin Mitchell <jumitche@××××××.com> |
42 |
-Signed-off-by: Steve Dickson <steved@××××××.com> |
43 |
---- |
44 |
- utils/gssd/svcgssd.c | 4 +++- |
45 |
- 1 file changed, 3 insertions(+), 1 deletion(-) |
46 |
- |
47 |
-diff --git a/utils/gssd/svcgssd.c b/utils/gssd/svcgssd.c |
48 |
-index 3514ae1..23f0c0b 100644 |
49 |
---- a/utils/gssd/svcgssd.c |
50 |
-+++ b/utils/gssd/svcgssd.c |
51 |
-@@ -63,6 +63,8 @@ |
52 |
- #include "err_util.h" |
53 |
- #include "conffile.h" |
54 |
- |
55 |
-+struct state_paths etab; |
56 |
-+ |
57 |
- void |
58 |
- sig_die(int signal) |
59 |
- { |
60 |
-@@ -101,7 +103,7 @@ main(int argc, char *argv[]) |
61 |
- char *principal = NULL; |
62 |
- char *s; |
63 |
- |
64 |
-- conf_init(NFS_CONFFILE); |
65 |
-+ conf_init_file(NFS_CONFFILE); |
66 |
- |
67 |
- s = conf_get_str("svcgssd", "principal"); |
68 |
- if (!s) |
69 |
--- |
70 |
-1.8.3.1 |
71 |
- |
72 |
|
73 |
diff --git a/net-fs/nfs-utils/nfs-utils-2.3.1-r3.ebuild b/net-fs/nfs-utils/nfs-utils-2.3.1-r3.ebuild |
74 |
deleted file mode 100644 |
75 |
index 5cd180a79be..00000000000 |
76 |
--- a/net-fs/nfs-utils/nfs-utils-2.3.1-r3.ebuild |
77 |
+++ /dev/null |
78 |
@@ -1,188 +0,0 @@ |
79 |
-# Copyright 1999-2018 Gentoo Foundation |
80 |
-# Distributed under the terms of the GNU General Public License v2 |
81 |
- |
82 |
-EAPI=6 |
83 |
- |
84 |
-inherit autotools flag-o-matic multilib systemd |
85 |
- |
86 |
-DESCRIPTION="NFS client and server daemons" |
87 |
-HOMEPAGE="http://linux-nfs.org/" |
88 |
- |
89 |
-if [[ "${PV}" = *_rc* ]] ; then |
90 |
- inherit versionator |
91 |
- MY_PV="$(replace_all_version_separators -)" |
92 |
- SRC_URI="http://git.linux-nfs.org/?p=steved/nfs-utils.git;a=snapshot;h=refs/tags/${PN}-${MY_PV};sf=tgz -> ${P}.tar.gz" |
93 |
- S="${WORKDIR}/${PN}-${PN}-${MY_PV}" |
94 |
-else |
95 |
- SRC_URI="mirror://sourceforge/nfs/${P}.tar.bz2" |
96 |
- KEYWORDS="alpha amd64 arm arm64 hppa ia64 ~mips ppc ppc64 s390 sh sparc x86" |
97 |
-fi |
98 |
- |
99 |
-LICENSE="GPL-2" |
100 |
-SLOT="0" |
101 |
-IUSE="caps ipv6 kerberos ldap +libmount nfsdcld +nfsidmap +nfsv4 nfsv41 selinux tcpd +uuid" |
102 |
-REQUIRED_USE="kerberos? ( nfsv4 )" |
103 |
-RESTRICT="test" #315573 |
104 |
- |
105 |
-# kth-krb doesn't provide the right include |
106 |
-# files, and nfs-utils doesn't build against heimdal either, |
107 |
-# so don't depend on virtual/krb. |
108 |
-# (04 Feb 2005 agriffis) |
109 |
-DEPEND_COMMON=" |
110 |
- net-libs/libtirpc:= |
111 |
- >=net-nds/rpcbind-0.2.4 |
112 |
- sys-libs/e2fsprogs-libs |
113 |
- caps? ( sys-libs/libcap ) |
114 |
- ldap? ( net-nds/openldap ) |
115 |
- libmount? ( sys-apps/util-linux ) |
116 |
- nfsdcld? ( >=dev-db/sqlite-3.3 ) |
117 |
- nfsv4? ( |
118 |
- dev-libs/libevent:= |
119 |
- >=sys-apps/keyutils-1.5.9 |
120 |
- kerberos? ( |
121 |
- >=net-libs/libtirpc-0.2.4-r1[kerberos] |
122 |
- app-crypt/mit-krb5 |
123 |
- ) |
124 |
- ) |
125 |
- nfsv41? ( |
126 |
- sys-fs/lvm2 |
127 |
- ) |
128 |
- tcpd? ( sys-apps/tcp-wrappers ) |
129 |
- uuid? ( sys-apps/util-linux )" |
130 |
-RDEPEND="${DEPEND_COMMON} |
131 |
- !net-libs/libnfsidmap |
132 |
- !net-nds/portmap |
133 |
- !<sys-apps/openrc-0.13.9 |
134 |
- selinux? ( |
135 |
- sec-policy/selinux-rpc |
136 |
- sec-policy/selinux-rpcbind |
137 |
- ) |
138 |
-" |
139 |
-DEPEND="${DEPEND_COMMON} |
140 |
- net-libs/rpcsvc-proto |
141 |
- virtual/pkgconfig" |
142 |
- |
143 |
-PATCHES=( |
144 |
- "${FILESDIR}"/${PN}-1.1.4-mtab-sym.patch |
145 |
- "${FILESDIR}"/${PN}-1.2.8-cross-build.patch |
146 |
- "${FILESDIR}"/${P}-svcgssd_undefined_reference.patch #641912 |
147 |
-) |
148 |
- |
149 |
-src_prepare() { |
150 |
- default |
151 |
- |
152 |
- sed \ |
153 |
- -e "/^sbindir/s:= := \"${EPREFIX}\":g" \ |
154 |
- -i utils/*/Makefile.am || die |
155 |
- |
156 |
- eautoreconf |
157 |
-} |
158 |
- |
159 |
-src_configure() { |
160 |
- export libsqlite3_cv_is_recent=yes # Our DEPEND forces this. |
161 |
- export ac_cv_header_keyutils_h=$(usex nfsidmap) |
162 |
- local myeconfargs=( |
163 |
- --with-statedir="${EPREFIX%/}"/var/lib/nfs |
164 |
- --enable-tirpc |
165 |
- --with-tirpcinclude="${EPREFIX%/}"/usr/include/tirpc/ |
166 |
- --with-pluginpath="${EPREFIX%/}"/usr/$(get_libdir)/libnfsidmap |
167 |
- --with-rpcgen |
168 |
- --with-systemd="$(systemd_get_systemunitdir)" |
169 |
- --without-gssglue |
170 |
- $(use_enable caps) |
171 |
- $(use_enable ipv6) |
172 |
- $(use_enable kerberos gss) |
173 |
- $(use_enable kerberos svcgss) |
174 |
- $(use_enable ldap) |
175 |
- $(use_enable libmount libmount-mount) |
176 |
- $(use_enable nfsdcld nfsdcltrack) |
177 |
- $(use_enable nfsv4) |
178 |
- $(use_enable nfsv41) |
179 |
- $(use_enable uuid) |
180 |
- $(use_with tcpd tcp-wrappers) |
181 |
- ) |
182 |
- econf "${myeconfargs[@]}" |
183 |
-} |
184 |
- |
185 |
-src_compile(){ |
186 |
- # remove compiled files bundled in the tarball |
187 |
- emake clean |
188 |
- default |
189 |
-} |
190 |
- |
191 |
-src_install() { |
192 |
- default |
193 |
- rm linux-nfs/Makefile* || die |
194 |
- dodoc -r linux-nfs README |
195 |
- |
196 |
- # Don't overwrite existing xtab/etab, install the original |
197 |
- # versions somewhere safe... more info in pkg_postinst |
198 |
- keepdir /var/lib/nfs/{,sm,sm.bak} |
199 |
- mv "${ED%/}"/var/lib/nfs "${ED%/}"/usr/$(get_libdir)/ || die |
200 |
- |
201 |
- # Install some client-side binaries in /sbin |
202 |
- dodir /sbin |
203 |
- mv "${ED%/}"/usr/sbin/rpc.statd "${ED%/}"/sbin/ || die |
204 |
- |
205 |
- if use nfsv4 && use nfsidmap ; then |
206 |
- # Install a config file for idmappers in newer kernels. #415625 |
207 |
- insinto /etc/request-key.d |
208 |
- echo 'create id_resolver * * /usr/sbin/nfsidmap -t 600 %k %d' > id_resolver.conf |
209 |
- doins id_resolver.conf |
210 |
- fi |
211 |
- |
212 |
- insinto /etc |
213 |
- doins "${FILESDIR}"/exports |
214 |
- keepdir /etc/exports.d |
215 |
- |
216 |
- local f list=() opt_need="" |
217 |
- if use nfsv4 ; then |
218 |
- opt_need="rpc.idmapd" |
219 |
- list+=( rpc.idmapd rpc.pipefs ) |
220 |
- use kerberos && list+=( rpc.gssd rpc.svcgssd ) |
221 |
- fi |
222 |
- for f in nfs nfsclient rpc.statd "${list[@]}" ; do |
223 |
- newinitd "${FILESDIR}"/${f}.initd ${f} |
224 |
- done |
225 |
- newinitd "${FILESDIR}"/nfsmount.initd-1.3.1 nfsmount # Nuke after 2015/08/01 |
226 |
- for f in nfs nfsclient ; do |
227 |
- newconfd "${FILESDIR}"/${f}.confd ${f} |
228 |
- done |
229 |
- sed -i \ |
230 |
- -e "/^NFS_NEEDED_SERVICES=/s:=.*:=\"${opt_need}\":" \ |
231 |
- "${ED%/}"/etc/conf.d/nfs || die #234132 |
232 |
- |
233 |
- local systemd_systemunitdir="$(systemd_get_systemunitdir)" |
234 |
- sed -i \ |
235 |
- -e 's:/usr/sbin/rpc.statd:/sbin/rpc.statd:' \ |
236 |
- "${ED%/}${systemd_systemunitdir}"/* || die |
237 |
- |
238 |
- keepdir /var/lib/nfs #368505 |
239 |
- keepdir /var/lib/nfs/v4recovery #603628 |
240 |
- |
241 |
-} |
242 |
- |
243 |
-pkg_postinst() { |
244 |
- # Install default xtab and friends if there's none existing. In |
245 |
- # src_install we put them in /usr/lib/nfs for safe-keeping, but |
246 |
- # the daemons actually use the files in /var/lib/nfs. #30486 |
247 |
- local f |
248 |
- for f in "${EROOT%/}"/usr/$(get_libdir)/nfs/*; do |
249 |
- [[ -e ${EROOT%/}/var/lib/nfs/${f##*/} ]] && continue |
250 |
- einfo "Copying default ${f##*/} from ${EPREFIX}/usr/$(get_libdir)/nfs to ${EPREFIX}/var/lib/nfs" |
251 |
- cp -pPR "${f}" "${EROOT%/}"/var/lib/nfs/ |
252 |
- done |
253 |
- |
254 |
- if systemd_is_booted; then |
255 |
- if [[ ${REPLACING_VERSIONS} < 1.3.0 ]]; then |
256 |
- ewarn "We have switched to upstream systemd unit files. Since" |
257 |
- ewarn "they got renamed, you should probably enable the new ones." |
258 |
- ewarn "You can run 'equery files nfs-utils | grep systemd'" |
259 |
- ewarn "to know what services you need to enable now." |
260 |
- fi |
261 |
- else |
262 |
- ewarn "If you use OpenRC, the nfsmount service has been replaced with nfsclient." |
263 |
- ewarn "If you were using nfsmount, please add nfsclient and netmount to the" |
264 |
- ewarn "same runlevel as nfsmount." |
265 |
- fi |
266 |
-} |