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