1 |
commit: 3954cc683747c38ef3ba6e9f94df777889214740 |
2 |
Author: Jakov Smolić <jsmolic <AT> gentoo <DOT> org> |
3 |
AuthorDate: Mon Mar 28 09:31:17 2022 +0000 |
4 |
Commit: Jakov Smolić <jsmolic <AT> gentoo <DOT> org> |
5 |
CommitDate: Mon Mar 28 09:31:17 2022 +0000 |
6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=3954cc68 |
7 |
|
8 |
net-libs/libnfsidmap: treeclean |
9 |
|
10 |
Closes: https://bugs.gentoo.org/806755 |
11 |
Signed-off-by: Jakov Smolić <jsmolic <AT> gentoo.org> |
12 |
|
13 |
net-libs/libnfsidmap/Manifest | 1 - |
14 |
.../files/libnfsidmap-0.21-headers.patch | 22 ---- |
15 |
.../files/libnfsidmap-0.27-getgrouplist.patch | 115 --------------------- |
16 |
net-libs/libnfsidmap/libnfsidmap-0.27-r1.ebuild | 56 ---------- |
17 |
net-libs/libnfsidmap/metadata.xml | 8 -- |
18 |
profiles/package.mask | 6 -- |
19 |
6 files changed, 208 deletions(-) |
20 |
|
21 |
diff --git a/net-libs/libnfsidmap/Manifest b/net-libs/libnfsidmap/Manifest |
22 |
deleted file mode 100644 |
23 |
index 5c73486bf1a9..000000000000 |
24 |
--- a/net-libs/libnfsidmap/Manifest |
25 |
+++ /dev/null |
26 |
@@ -1 +0,0 @@ |
27 |
-DIST libnfsidmap-0.27.tar.bz2 303900 BLAKE2B c6cb8d81042426552fd3cde9dfd26f805d3c92281a65c3ca2d12671477eb697f3cd51a6d8313a658eb70232136e5615e0cb9ad090a92e747e245f49e60cfcf8a SHA512 0698079abb4bb9ebeaccbcabca725b022c1daaa3d287944d9c4c2a2134489b649b44fcbcd9916e91dd6d91cdc67d267adf5741c5404150c66cc8243b9f15970d |
28 |
|
29 |
diff --git a/net-libs/libnfsidmap/files/libnfsidmap-0.21-headers.patch b/net-libs/libnfsidmap/files/libnfsidmap-0.21-headers.patch |
30 |
deleted file mode 100644 |
31 |
index 6ef12d44e44f..000000000000 |
32 |
--- a/net-libs/libnfsidmap/files/libnfsidmap-0.21-headers.patch |
33 |
+++ /dev/null |
34 |
@@ -1,22 +0,0 @@ |
35 |
-for toupper and such |
36 |
- |
37 |
---- a/nss.c |
38 |
-+++ b/nss.c |
39 |
-@@ -34,6 +34,7 @@ |
40 |
- * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. |
41 |
- */ |
42 |
- |
43 |
-+#include <ctype.h> |
44 |
- #include <sys/types.h> |
45 |
- #include <errno.h> |
46 |
- #include <unistd.h> |
47 |
---- a/libnfsidmap.c |
48 |
-+++ b/libnfsidmap.c |
49 |
-@@ -37,6 +37,7 @@ |
50 |
- * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. |
51 |
- */ |
52 |
- |
53 |
-+#include <ctype.h> |
54 |
- #include <sys/types.h> |
55 |
- #include <errno.h> |
56 |
- #include <unistd.h> |
57 |
|
58 |
diff --git a/net-libs/libnfsidmap/files/libnfsidmap-0.27-getgrouplist.patch b/net-libs/libnfsidmap/files/libnfsidmap-0.27-getgrouplist.patch |
59 |
deleted file mode 100644 |
60 |
index 9a8f0a487ae3..000000000000 |
61 |
--- a/net-libs/libnfsidmap/files/libnfsidmap-0.27-getgrouplist.patch |
62 |
+++ /dev/null |
63 |
@@ -1,115 +0,0 @@ |
64 |
-http://bugs.gentoo.org/169909 |
65 |
- |
66 |
---- libnfsidmap-0.27/configure.ac |
67 |
-+++ libnfsidmap-0.27/configure.ac |
68 |
-@@ -63,7 +63,7 @@ |
69 |
- |
70 |
- # Checks for library functions. |
71 |
- AC_FUNC_MALLOC |
72 |
--AC_CHECK_FUNCS([strchr strdup]) |
73 |
-+AC_CHECK_FUNCS([strchr strdup getgrouplist]) |
74 |
- |
75 |
- AC_CONFIG_FILES([Makefile]) |
76 |
- AC_CONFIG_FILES([libnfsidmap.pc]) |
77 |
---- libnfsidmap-0.27/getgrouplist.c |
78 |
-+++ libnfsidmap-0.27/getgrouplist.c |
79 |
-@@ -0,0 +1,88 @@ |
80 |
-+/* |
81 |
-+ * getgrouplist.c |
82 |
-+ * |
83 |
-+ * if system does not provide the non-standard getgrouplist, we will emulate |
84 |
-+ * it via POSIX standard functions |
85 |
-+ * |
86 |
-+ * Copyright (c) 1991, 1993 |
87 |
-+ * The Regents of the University of California. All rights reserved. |
88 |
-+ * |
89 |
-+ * Redistribution and use in source and binary forms, with or without |
90 |
-+ * modification, are permitted provided that the following conditions |
91 |
-+ * are met: |
92 |
-+ * 1. Redistributions of source code must retain the above copyright |
93 |
-+ * notice, this list of conditions and the following disclaimer. |
94 |
-+ * 2. Redistributions in binary form must reproduce the above copyright |
95 |
-+ * notice, this list of conditions and the following disclaimer in the |
96 |
-+ * documentation and/or other materials provided with the distribution. |
97 |
-+ * 4. Neither the name of the University nor the names of its contributors |
98 |
-+ * may be used to endorse or promote products derived from this software |
99 |
-+ * without specific prior written permission. |
100 |
-+ * |
101 |
-+ * THIS SOFTWARE IS PROVIDED BY THE REGENTS AND CONTRIBUTORS ``AS IS'' AND |
102 |
-+ * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE |
103 |
-+ * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE |
104 |
-+ * ARE DISCLAIMED. IN NO EVENT SHALL THE REGENTS OR CONTRIBUTORS BE LIABLE |
105 |
-+ * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL |
106 |
-+ * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS |
107 |
-+ * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) |
108 |
-+ * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT |
109 |
-+ * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY |
110 |
-+ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF |
111 |
-+ * SUCH DAMAGE. |
112 |
-+ */ |
113 |
-+ |
114 |
-+#ifdef HAVE_CONFIG_H |
115 |
-+#include "config.h" |
116 |
-+#endif |
117 |
-+#include <sys/types.h> |
118 |
-+#include <grp.h> |
119 |
-+#include <string.h> |
120 |
-+#include <unistd.h> |
121 |
-+ |
122 |
-+#ifndef HAVE_GETGROUPLIST |
123 |
-+static |
124 |
-+int |
125 |
-+getgrouplist(const char *uname, gid_t agroup, gid_t *groups, int *grpcnt) |
126 |
-+{ |
127 |
-+ const struct group *grp; |
128 |
-+ int i, maxgroups, ngroups, ret; |
129 |
-+ |
130 |
-+ ret = 0; |
131 |
-+ ngroups = 0; |
132 |
-+ maxgroups = *grpcnt; |
133 |
-+ /* |
134 |
-+ * When installing primary group, duplicate it; |
135 |
-+ * the first element of groups is the effective gid |
136 |
-+ * and will be overwritten when a setgid file is executed. |
137 |
-+ */ |
138 |
-+ groups[ngroups++] = agroup; |
139 |
-+ if (maxgroups > 1) |
140 |
-+ groups[ngroups++] = agroup; |
141 |
-+ /* |
142 |
-+ * Scan the group file to find additional groups. |
143 |
-+ */ |
144 |
-+ setgrent(); |
145 |
-+ while ((grp = getgrent()) != NULL) { |
146 |
-+ for (i = 0; i < ngroups; i++) { |
147 |
-+ if (grp->gr_gid == groups[i]) |
148 |
-+ goto skip; |
149 |
-+ } |
150 |
-+ for (i = 0; grp->gr_mem[i]; i++) { |
151 |
-+ if (!strcmp(grp->gr_mem[i], uname)) { |
152 |
-+ if (ngroups >= maxgroups) { |
153 |
-+ ret = -1; |
154 |
-+ break; |
155 |
-+ } |
156 |
-+ groups[ngroups++] = grp->gr_gid; |
157 |
-+ break; |
158 |
-+ } |
159 |
-+ } |
160 |
-+skip: |
161 |
-+ ; |
162 |
-+ } |
163 |
-+ endgrent(); |
164 |
-+ *grpcnt = ngroups; |
165 |
-+ return (ret); |
166 |
-+} |
167 |
-+#endif |
168 |
---- libnfsidmap-0.27/nss.c |
169 |
-+++ libnfsidmap-0.27/nss.c |
170 |
-@@ -51,6 +51,8 @@ |
171 |
- #include "cfg.h" |
172 |
- #include <syslog.h> |
173 |
- |
174 |
-+#include "getgrouplist.c" |
175 |
-+ |
176 |
- /* |
177 |
- * NSS Translation Methods |
178 |
- * |
179 |
|
180 |
diff --git a/net-libs/libnfsidmap/libnfsidmap-0.27-r1.ebuild b/net-libs/libnfsidmap/libnfsidmap-0.27-r1.ebuild |
181 |
deleted file mode 100644 |
182 |
index 2d736e7faf37..000000000000 |
183 |
--- a/net-libs/libnfsidmap/libnfsidmap-0.27-r1.ebuild |
184 |
+++ /dev/null |
185 |
@@ -1,56 +0,0 @@ |
186 |
-# Copyright 1999-2022 Gentoo Authors |
187 |
-# Distributed under the terms of the GNU General Public License v2 |
188 |
- |
189 |
-EAPI=6 |
190 |
- |
191 |
-inherit autotools |
192 |
- |
193 |
-DESCRIPTION="NFSv4 ID <-> name mapping library" |
194 |
-HOMEPAGE="http://www.citi.umich.edu/projects/nfsv4/linux/" |
195 |
-#SRC_URI="http://www.citi.umich.edu/projects/nfsv4/linux/libnfsidmap/${P}.tar.gz" |
196 |
-SRC_URI="https://fedorapeople.org/~steved/${PN}/${PV}/${P}.tar.bz2" |
197 |
- |
198 |
-LICENSE="BSD" |
199 |
-SLOT="0" |
200 |
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~m68k ~mips ppc ppc64 ~s390 sparc x86" |
201 |
-IUSE="ldap static-libs" |
202 |
- |
203 |
-DEPEND="ldap? ( net-nds/openldap:= )" |
204 |
-RDEPEND=" |
205 |
- ${DEPEND} |
206 |
- !<net-fs/nfs-utils-1.2.2 |
207 |
- !net-fs/idmapd |
208 |
-" |
209 |
- |
210 |
-PATCHES=( |
211 |
- "${FILESDIR}"/${PN}-0.27-getgrouplist.patch #169909 |
212 |
- "${FILESDIR}"/${PN}-0.21-headers.patch |
213 |
-) |
214 |
- |
215 |
-src_prepare() { |
216 |
- default |
217 |
- # Ideally the build would use -DLIBDIR=$(libdir) at build time. |
218 |
- sed -i \ |
219 |
- -e "/PATH_PLUGINS/s:/usr/lib/libnfsidmap:${EPREFIX}/usr/$(get_libdir)/libnfsidmap:" \ |
220 |
- libnfsidmap.c || die #504666 |
221 |
- eautoreconf |
222 |
-} |
223 |
- |
224 |
-src_configure() { |
225 |
- local myeconfargs=( |
226 |
- $(use_enable static-libs static) |
227 |
- $(use_enable ldap) |
228 |
- ) |
229 |
- econf "${myeconfargs[@]}" |
230 |
-} |
231 |
- |
232 |
-src_install() { |
233 |
- default |
234 |
- |
235 |
- insinto /etc |
236 |
- doins idmapd.conf |
237 |
- |
238 |
- # remove useless files |
239 |
- rm -f "${ED%/}"/usr/$(get_libdir)/libnfsidmap/*.{a,la} |
240 |
- use static-libs || find "${ED%/}"/usr -name '*.la' -delete || die |
241 |
-} |
242 |
|
243 |
diff --git a/net-libs/libnfsidmap/metadata.xml b/net-libs/libnfsidmap/metadata.xml |
244 |
deleted file mode 100644 |
245 |
index 73dda144f9ac..000000000000 |
246 |
--- a/net-libs/libnfsidmap/metadata.xml |
247 |
+++ /dev/null |
248 |
@@ -1,8 +0,0 @@ |
249 |
-<?xml version="1.0" encoding="UTF-8"?> |
250 |
-<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd"> |
251 |
-<pkgmetadata> |
252 |
-<maintainer type="project"> |
253 |
- <email>base-system@g.o</email> |
254 |
- <name>Gentoo Base System</name> |
255 |
-</maintainer> |
256 |
-</pkgmetadata> |
257 |
|
258 |
diff --git a/profiles/package.mask b/profiles/package.mask |
259 |
index 8deef505af87..e25397f36f11 100644 |
260 |
--- a/profiles/package.mask |
261 |
+++ b/profiles/package.mask |
262 |
@@ -368,12 +368,6 @@ net-fs/smbtad |
263 |
# bug #774495. Dead HOMEPAGE. Removal on 2022-03-27. |
264 |
dev-libs/smack |
265 |
|
266 |
-# Andreas K. Hüttel <dilfridge@g.o> (2022-02-27) |
267 |
-# Outdated, fails to build with glibc-2.34, bug 806755 |
268 |
-# Has been integrated into net-fs/nfs-utils, please use that instead. |
269 |
-# Removal in 30 days. |
270 |
-net-libs/libnfsidmap |
271 |
- |
272 |
# Andreas Sturmlechner <asturm@g.o> (2022-02-27) |
273 |
# No revdeps since begin of gentoo.git history, outdated and unmaintained. |
274 |
# Bug #834307. Removal on 2022-03-29. |