Gentoo Archives: gentoo-commits

From: David Seifert <soap@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] repo/gentoo:master commit in: net-libs/libnfsidmap/files/, net-libs/libnfsidmap/
Date: Sun, 09 Feb 2020 18:50:28
Message-Id: 1581274191.97dfca109b5c0adc2d824c05e891b9aca1bcb2e0.soap@gentoo
1 commit: 97dfca109b5c0adc2d824c05e891b9aca1bcb2e0
2 Author: David Seifert <soap <AT> gentoo <DOT> org>
3 AuthorDate: Sun Feb 9 18:49:51 2020 +0000
4 Commit: David Seifert <soap <AT> gentoo <DOT> org>
5 CommitDate: Sun Feb 9 18:49:51 2020 +0000
6 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=97dfca10
7
8 net-libs/libnfsidmap: Remove old
9
10 Package-Manager: Portage-2.3.88, Repoman-2.3.20
11 Signed-off-by: David Seifert <soap <AT> gentoo.org>
12
13 net-libs/libnfsidmap/Manifest | 1 -
14 .../files/libnfsidmap-0.19-getgrouplist.patch | 115 ---------------------
15 net-libs/libnfsidmap/libnfsidmap-0.25-r1.ebuild | 48 ---------
16 3 files changed, 164 deletions(-)
17
18 diff --git a/net-libs/libnfsidmap/Manifest b/net-libs/libnfsidmap/Manifest
19 index a1269755bcc..5c73486bf1a 100644
20 --- a/net-libs/libnfsidmap/Manifest
21 +++ b/net-libs/libnfsidmap/Manifest
22 @@ -1,2 +1 @@
23 -DIST libnfsidmap-0.25.tar.gz 346587 BLAKE2B dbf31779371ba29737ed7a5901cf46f17e4a1b2ac444c2959d3ae76f41815e9a15a2ee892e417c5b7f97cf5f8396024071430fed028a8cd583aeed1a95e350df SHA512 8acf30790cdd19341c75cb8a4f7ee4dbc9f688c8514258046e55c8f4245df213709ccb7d5327a11b146b0e3b7266d3d4da018699c6be47fbedcc4cd384b54557
24 DIST libnfsidmap-0.27.tar.bz2 303900 BLAKE2B c6cb8d81042426552fd3cde9dfd26f805d3c92281a65c3ca2d12671477eb697f3cd51a6d8313a658eb70232136e5615e0cb9ad090a92e747e245f49e60cfcf8a SHA512 0698079abb4bb9ebeaccbcabca725b022c1daaa3d287944d9c4c2a2134489b649b44fcbcd9916e91dd6d91cdc67d267adf5741c5404150c66cc8243b9f15970d
25
26 diff --git a/net-libs/libnfsidmap/files/libnfsidmap-0.19-getgrouplist.patch b/net-libs/libnfsidmap/files/libnfsidmap-0.19-getgrouplist.patch
27 deleted file mode 100644
28 index 0d5d367b95b..00000000000
29 --- a/net-libs/libnfsidmap/files/libnfsidmap-0.19-getgrouplist.patch
30 +++ /dev/null
31 @@ -1,115 +0,0 @@
32 -http://bugs.gentoo.org/169909
33 -
34 ---- libnfsidmap-0.19/configure.in
35 -+++ libnfsidmap-0.19/configure.in
36 -@@ -38,7 +38,7 @@
37 -
38 - # Checks for library functions.
39 - AC_FUNC_MALLOC
40 --AC_CHECK_FUNCS([strchr strdup])
41 -+AC_CHECK_FUNCS([strchr strdup getgrouplist])
42 -
43 - AC_CONFIG_FILES([Makefile])
44 - AC_OUTPUT(libnfsidmap.pc)
45 ---- libnfsidmap-0.19/nss.c
46 -+++ libnfsidmap-0.19/nss.c
47 -@@ -49,6 +49,8 @@
48 - #include "cfg.h"
49 - #include <syslog.h>
50 -
51 -+#include "getgrouplist.c"
52 -+
53 - /*
54 - * NSS Translation Methods
55 - *
56 ---- libnfsidmap-0.19/getgrouplist.c
57 -+++ libnfsidmap-0.19/getgrouplist.c
58 -@@ -0,0 +1,88 @@
59 -+/*
60 -+ * getgrouplist.c
61 -+ *
62 -+ * if system does not provide the non-standard getgrouplist, we will emulate
63 -+ * it via POSIX standard functions
64 -+ *
65 -+ * Copyright (c) 1991, 1993
66 -+ * The Regents of the University of California. All rights reserved.
67 -+ *
68 -+ * Redistribution and use in source and binary forms, with or without
69 -+ * modification, are permitted provided that the following conditions
70 -+ * are met:
71 -+ * 1. Redistributions of source code must retain the above copyright
72 -+ * notice, this list of conditions and the following disclaimer.
73 -+ * 2. Redistributions in binary form must reproduce the above copyright
74 -+ * notice, this list of conditions and the following disclaimer in the
75 -+ * documentation and/or other materials provided with the distribution.
76 -+ * 4. Neither the name of the University nor the names of its contributors
77 -+ * may be used to endorse or promote products derived from this software
78 -+ * without specific prior written permission.
79 -+ *
80 -+ * THIS SOFTWARE IS PROVIDED BY THE REGENTS AND CONTRIBUTORS ``AS IS'' AND
81 -+ * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
82 -+ * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
83 -+ * ARE DISCLAIMED. IN NO EVENT SHALL THE REGENTS OR CONTRIBUTORS BE LIABLE
84 -+ * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
85 -+ * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
86 -+ * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
87 -+ * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
88 -+ * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
89 -+ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
90 -+ * SUCH DAMAGE.
91 -+ */
92 -+
93 -+#ifdef HAVE_CONFIG_H
94 -+#include "config.h"
95 -+#endif
96 -+#include <sys/types.h>
97 -+#include <grp.h>
98 -+#include <string.h>
99 -+#include <unistd.h>
100 -+
101 -+#ifndef HAVE_GETGROUPLIST
102 -+static
103 -+int
104 -+getgrouplist(const char *uname, gid_t agroup, gid_t *groups, int *grpcnt)
105 -+{
106 -+ const struct group *grp;
107 -+ int i, maxgroups, ngroups, ret;
108 -+
109 -+ ret = 0;
110 -+ ngroups = 0;
111 -+ maxgroups = *grpcnt;
112 -+ /*
113 -+ * When installing primary group, duplicate it;
114 -+ * the first element of groups is the effective gid
115 -+ * and will be overwritten when a setgid file is executed.
116 -+ */
117 -+ groups[ngroups++] = agroup;
118 -+ if (maxgroups > 1)
119 -+ groups[ngroups++] = agroup;
120 -+ /*
121 -+ * Scan the group file to find additional groups.
122 -+ */
123 -+ setgrent();
124 -+ while ((grp = getgrent()) != NULL) {
125 -+ for (i = 0; i < ngroups; i++) {
126 -+ if (grp->gr_gid == groups[i])
127 -+ goto skip;
128 -+ }
129 -+ for (i = 0; grp->gr_mem[i]; i++) {
130 -+ if (!strcmp(grp->gr_mem[i], uname)) {
131 -+ if (ngroups >= maxgroups) {
132 -+ ret = -1;
133 -+ break;
134 -+ }
135 -+ groups[ngroups++] = grp->gr_gid;
136 -+ break;
137 -+ }
138 -+ }
139 -+skip:
140 -+ ;
141 -+ }
142 -+ endgrent();
143 -+ *grpcnt = ngroups;
144 -+ return (ret);
145 -+}
146 -+#endif
147
148 diff --git a/net-libs/libnfsidmap/libnfsidmap-0.25-r1.ebuild b/net-libs/libnfsidmap/libnfsidmap-0.25-r1.ebuild
149 deleted file mode 100644
150 index e069cf37e05..00000000000
151 --- a/net-libs/libnfsidmap/libnfsidmap-0.25-r1.ebuild
152 +++ /dev/null
153 @@ -1,48 +0,0 @@
154 -# Copyright 1999-2018 Gentoo Foundation
155 -# Distributed under the terms of the GNU General Public License v2
156 -
157 -EAPI="4"
158 -
159 -inherit autotools eutils multilib
160 -
161 -DESCRIPTION="NFSv4 ID <-> name mapping library"
162 -HOMEPAGE="http://www.citi.umich.edu/projects/nfsv4/linux/"
163 -SRC_URI="http://www.citi.umich.edu/projects/nfsv4/linux/libnfsidmap/${P}.tar.gz"
164 -
165 -LICENSE="BSD"
166 -SLOT="0"
167 -KEYWORDS="~alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86"
168 -IUSE="ldap static-libs"
169 -
170 -DEPEND="ldap? ( net-nds/openldap )"
171 -RDEPEND="${DEPEND}
172 - !<net-fs/nfs-utils-1.2.2
173 - !net-fs/idmapd"
174 -
175 -src_prepare() {
176 - epatch "${FILESDIR}"/${PN}-0.19-getgrouplist.patch #169909
177 - epatch "${FILESDIR}"/${PN}-0.21-headers.patch
178 - # Ideally the build would use -DLIBDIR=$(libdir) at build time.
179 - sed -i \
180 - -e "/PATH_PLUGINS/s:/usr/lib/libnfsidmap:${EPREFIX}/usr/$(get_libdir)/libnfsidmap:" \
181 - libnfsidmap.c || die #504666
182 - eautoreconf
183 -}
184 -
185 -src_configure() {
186 - econf \
187 - --disable-dependency-tracking \
188 - $(use_enable static-libs static) \
189 - $(use_enable ldap)
190 -}
191 -
192 -src_install() {
193 - default
194 -
195 - insinto /etc
196 - doins idmapd.conf
197 -
198 - # remove useless files
199 - rm -f "${D}"/usr/$(get_libdir)/libnfsidmap/*.{a,la}
200 - use static-libs || find "${D}"/usr -name '*.la' -delete
201 -}