1 |
commit: 2dd0a008b006d89af11d13887d0d51e88213c0ad |
2 |
Author: Michael Mair-Keimberger <m.mairkeimberger <AT> gmail <DOT> com> |
3 |
AuthorDate: Tue Jun 30 18:21:45 2020 +0000 |
4 |
Commit: Aaron Bauman <bman <AT> gentoo <DOT> org> |
5 |
CommitDate: Wed Jul 1 19:58:28 2020 +0000 |
6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=2dd0a008 |
7 |
|
8 |
sys-auth/libnss-nis: remove unused patch(es) |
9 |
|
10 |
Package-Manager: Portage-2.3.103, Repoman-2.3.23 |
11 |
Signed-off-by: Michael Mair-Keimberger <m.mairkeimberger <AT> gmail.com> |
12 |
Closes: https://github.com/gentoo/gentoo/pull/16512 |
13 |
Signed-off-by: Aaron Bauman <bman <AT> gentoo.org> |
14 |
|
15 |
.../files/libnss-nis-1.4-glibc-2.30.patch | 157 --------------------- |
16 |
1 file changed, 157 deletions(-) |
17 |
|
18 |
diff --git a/sys-auth/libnss-nis/files/libnss-nis-1.4-glibc-2.30.patch b/sys-auth/libnss-nis/files/libnss-nis-1.4-glibc-2.30.patch |
19 |
deleted file mode 100644 |
20 |
index ac8d497ecb4..00000000000 |
21 |
--- a/sys-auth/libnss-nis/files/libnss-nis-1.4-glibc-2.30.patch |
22 |
+++ /dev/null |
23 |
@@ -1,157 +0,0 @@ |
24 |
-From e9f0f4286d5a923eca1a9c84ff125268d144822e Mon Sep 17 00:00:00 2001 |
25 |
-From: Khem Raj <raj.khem@×××××.com> |
26 |
-Date: Thu, 25 Jul 2019 12:10:56 -0700 |
27 |
-Subject: [PATCH] nis-hosts: Remove use of RES_USE_INET6 |
28 |
- |
29 |
-Upstream glibc dropped it starting glibc 2.30 |
30 |
-see |
31 |
-https://sourceware.org/git/?p=glibc.git;a=commit;h=3f8b44be0a658266adff5ece1e4bc3ce097a5dbe |
32 |
- |
33 |
-Fixes issue #6 |
34 |
- |
35 |
-Signed-off-by: Khem Raj <raj.khem@×××××.com> |
36 |
---- |
37 |
- src/nis-hosts.c | 55 ++++++++++++------------------------------------- |
38 |
- 1 file changed, 13 insertions(+), 42 deletions(-) |
39 |
- |
40 |
-diff --git a/src/nis-hosts.c b/src/nis-hosts.c |
41 |
-index 307b46e..bd3c4ad 100644 |
42 |
---- a/src/nis-hosts.c |
43 |
-+++ b/src/nis-hosts.c |
44 |
-@@ -35,15 +35,12 @@ |
45 |
- #include "libc-lock.h" |
46 |
- #include "nss-nis.h" |
47 |
- |
48 |
--/* Get implementation for some internal functions. */ |
49 |
--#include "mapv4v6addr.h" |
50 |
-- |
51 |
- #define ENTNAME hostent |
52 |
- #define DATABASE "hosts" |
53 |
- #define NEED_H_ERRNO |
54 |
- |
55 |
--#define EXTRA_ARGS , af, flags |
56 |
--#define EXTRA_ARGS_DECL , int af, int flags |
57 |
-+#define EXTRA_ARGS , af |
58 |
-+#define EXTRA_ARGS_DECL , int af |
59 |
- |
60 |
- #define ENTDATA hostent_data |
61 |
- struct hostent_data |
62 |
-@@ -67,19 +64,8 @@ LINE_PARSER |
63 |
- /* Parse address. */ |
64 |
- if (af != AF_INET6 && inet_pton (AF_INET, addr, entdata->host_addr) > 0) |
65 |
- { |
66 |
-- assert ((flags & AI_V4MAPPED) == 0 || af != AF_UNSPEC); |
67 |
-- if (flags & AI_V4MAPPED) |
68 |
-- { |
69 |
-- map_v4v6_address ((char *) entdata->host_addr, |
70 |
-- (char *) entdata->host_addr); |
71 |
-- result->h_addrtype = AF_INET6; |
72 |
-- result->h_length = IN6ADDRSZ; |
73 |
-- } |
74 |
-- else |
75 |
-- { |
76 |
-- result->h_addrtype = AF_INET; |
77 |
-- result->h_length = INADDRSZ; |
78 |
-- } |
79 |
-+ result->h_addrtype = AF_INET; |
80 |
-+ result->h_length = INADDRSZ; |
81 |
- } |
82 |
- else if (af != AF_INET |
83 |
- && inet_pton (AF_INET6, addr, entdata->host_addr) > 0) |
84 |
-@@ -134,7 +120,7 @@ strong_alias (_nss_nis_sethostent, _nss_nis_endhostent) |
85 |
- static enum nss_status |
86 |
- internal_nis_gethostent_r (struct hostent *host, char *buffer, |
87 |
- size_t buflen, int *errnop, int *h_errnop, |
88 |
-- int af, int flags) |
89 |
-+ int af) |
90 |
- { |
91 |
- char *domain; |
92 |
- if (yp_get_default_domain (&domain)) |
93 |
-@@ -203,7 +189,7 @@ internal_nis_gethostent_r (struct hostent *host, char *buffer, |
94 |
- ++p; |
95 |
- free (result); |
96 |
- |
97 |
-- parse_res = parse_line (p, host, data, buflen, errnop, af, flags); |
98 |
-+ parse_res = parse_line (p, host, data, buflen, errnop, af); |
99 |
- if (parse_res == -1) |
100 |
- { |
101 |
- free (outkey); |
102 |
-@@ -232,8 +218,7 @@ _nss_nis_gethostent_r (struct hostent *host, char *buffer, size_t buflen, |
103 |
- __libc_lock_lock (lock); |
104 |
- |
105 |
- status = internal_nis_gethostent_r (host, buffer, buflen, errnop, h_errnop, |
106 |
-- ((_res.options & RES_USE_INET6) ? AF_INET6 : AF_INET), |
107 |
-- ((_res.options & RES_USE_INET6) ? AI_V4MAPPED : 0 )); |
108 |
-+ AF_INET); |
109 |
- |
110 |
- __libc_lock_unlock (lock); |
111 |
- |
112 |
-@@ -244,7 +229,7 @@ _nss_nis_gethostent_r (struct hostent *host, char *buffer, size_t buflen, |
113 |
- static enum nss_status |
114 |
- internal_gethostbyname2_r (const char *name, int af, struct hostent *host, |
115 |
- char *buffer, size_t buflen, int *errnop, |
116 |
-- int *h_errnop, int flags) |
117 |
-+ int *h_errnop) |
118 |
- { |
119 |
- uintptr_t pad = -(uintptr_t) buffer % __alignof__ (struct parser_data); |
120 |
- buffer += pad; |
121 |
-@@ -318,7 +303,7 @@ internal_gethostbyname2_r (const char *name, int af, struct hostent *host, |
122 |
- ++p; |
123 |
- free (result); |
124 |
- |
125 |
-- int parse_res = parse_line (p, host, data, buflen, errnop, af, flags); |
126 |
-+ int parse_res = parse_line (p, host, data, buflen, errnop, af); |
127 |
- |
128 |
- if (parse_res < 1 || host->h_addrtype != af) |
129 |
- { |
130 |
-@@ -351,8 +336,7 @@ _nss_nis_gethostbyname2_r (const char *name, int af, struct hostent *host, |
131 |
- } |
132 |
- |
133 |
- return internal_gethostbyname2_r (name, af, host, buffer, buflen, errnop, |
134 |
-- h_errnop, |
135 |
-- ((_res.options & RES_USE_INET6) ? AI_V4MAPPED : 0)); |
136 |
-+ h_errnop); |
137 |
- } |
138 |
- |
139 |
- |
140 |
-@@ -360,18 +344,8 @@ enum nss_status |
141 |
- _nss_nis_gethostbyname_r (const char *name, struct hostent *host, char *buffer, |
142 |
- size_t buflen, int *errnop, int *h_errnop) |
143 |
- { |
144 |
-- if (_res.options & RES_USE_INET6) |
145 |
-- { |
146 |
-- enum nss_status status; |
147 |
-- |
148 |
-- status = internal_gethostbyname2_r (name, AF_INET6, host, buffer, buflen, |
149 |
-- errnop, h_errnop, AI_V4MAPPED); |
150 |
-- if (status == NSS_STATUS_SUCCESS) |
151 |
-- return status; |
152 |
-- } |
153 |
-- |
154 |
- return internal_gethostbyname2_r (name, AF_INET, host, buffer, buflen, |
155 |
-- errnop, h_errnop, 0); |
156 |
-+ errnop, h_errnop); |
157 |
- } |
158 |
- |
159 |
- |
160 |
-@@ -433,9 +407,7 @@ _nss_nis_gethostbyaddr_r (const void *addr, socklen_t addrlen, int af, |
161 |
- ++p; |
162 |
- free (result); |
163 |
- |
164 |
-- int parse_res = parse_line (p, host, data, buflen, errnop, af, |
165 |
-- ((_res.options & RES_USE_INET6) |
166 |
-- ? AI_V4MAPPED : 0)); |
167 |
-+ int parse_res = parse_line (p, host, data, buflen, errnop, af); |
168 |
- if (parse_res < 1) |
169 |
- { |
170 |
- if (parse_res == -1) |
171 |
-@@ -532,8 +504,7 @@ _nss_nis_gethostbyname4_r (const char *name, struct gaih_addrtuple **pat, |
172 |
- buflen -= pad; |
173 |
- |
174 |
- struct hostent host; |
175 |
-- int parse_res = parse_line (result, &host, data, buflen, errnop, AF_UNSPEC, |
176 |
-- 0); |
177 |
-+ int parse_res = parse_line (result, &host, data, buflen, errnop, AF_UNSPEC); |
178 |
- if (parse_res < 1) |
179 |
- { |
180 |
- if (parse_res == -1) |