1 |
commit: ebeab9d40a266a378887ca219f400c77120cce0f |
2 |
Author: Michael Mair-Keimberger (asterix) <m.mairkeimberger <AT> gmail <DOT> com> |
3 |
AuthorDate: Fri Aug 11 14:56:32 2017 +0000 |
4 |
Commit: David Seifert <soap <AT> gentoo <DOT> org> |
5 |
CommitDate: Sun Aug 13 11:28:48 2017 +0000 |
6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=ebeab9d4 |
7 |
|
8 |
sys-boot/systemd-boot: remove unused patch |
9 |
|
10 |
Closes: https://github.com/gentoo/gentoo/pull/5390 |
11 |
|
12 |
...dd-check-for-gperf-lookup-function-signat.patch | 302 --------------------- |
13 |
1 file changed, 302 deletions(-) |
14 |
|
15 |
diff --git a/sys-boot/systemd-boot/files/232-0002-build-sys-add-check-for-gperf-lookup-function-signat.patch b/sys-boot/systemd-boot/files/232-0002-build-sys-add-check-for-gperf-lookup-function-signat.patch |
16 |
deleted file mode 100644 |
17 |
index 440ec75bd3b..00000000000 |
18 |
--- a/sys-boot/systemd-boot/files/232-0002-build-sys-add-check-for-gperf-lookup-function-signat.patch |
19 |
+++ /dev/null |
20 |
@@ -1,302 +0,0 @@ |
21 |
-From 016fb3b83b861cfe58694996076a9764dcb46475 Mon Sep 17 00:00:00 2001 |
22 |
-From: Mike Gilbert <floppymaster@×××××.com> |
23 |
-Date: Tue, 10 Jan 2017 02:39:05 -0500 |
24 |
-Subject: [PATCH 2/2] build-sys: add check for gperf lookup function signature |
25 |
- (#5055) |
26 |
- |
27 |
-gperf-3.1 generates lookup functions that take a size_t length |
28 |
-parameter instead of unsigned int. Test for this at configure time. |
29 |
- |
30 |
-Fixes: https://github.com/systemd/systemd/issues/5039 |
31 |
---- |
32 |
- configure.ac | 22 ++++++++++++++++++++++ |
33 |
- src/basic/af-list.c | 2 +- |
34 |
- src/basic/arphrd-list.c | 2 +- |
35 |
- src/basic/cap-list.c | 2 +- |
36 |
- src/basic/errno-list.c | 2 +- |
37 |
- src/core/load-fragment.h | 2 +- |
38 |
- src/journal/journald-server.h | 2 +- |
39 |
- src/login/logind.h | 2 +- |
40 |
- src/network/networkd-conf.h | 2 +- |
41 |
- src/network/networkd-netdev.h | 2 +- |
42 |
- src/network/networkd-network.h | 2 +- |
43 |
- src/nspawn/nspawn-settings.h | 2 +- |
44 |
- src/resolve/dns-type.c | 2 +- |
45 |
- src/resolve/resolved-conf.h | 2 +- |
46 |
- src/test/test-af-list.c | 2 +- |
47 |
- src/test/test-arphrd-list.c | 2 +- |
48 |
- src/timesync/timesyncd-conf.h | 2 +- |
49 |
- src/udev/net/link-config.h | 2 +- |
50 |
- src/udev/udev-builtin-keyboard.c | 2 +- |
51 |
- 19 files changed, 40 insertions(+), 18 deletions(-) |
52 |
- |
53 |
-diff --git a/configure.ac b/configure.ac |
54 |
-index 1928e65bd..5c639e32d 100644 |
55 |
---- a/configure.ac |
56 |
-+++ b/configure.ac |
57 |
-@@ -258,6 +258,28 @@ AC_CHECK_SIZEOF(rlim_t,,[ |
58 |
- #include <sys/resource.h> |
59 |
- ]) |
60 |
- |
61 |
-+GPERF_TEST="$(echo foo,bar | ${GPERF} -L ANSI-C)" |
62 |
-+ |
63 |
-+AC_COMPILE_IFELSE( |
64 |
-+ [AC_LANG_PROGRAM([ |
65 |
-+ #include <string.h> |
66 |
-+ const char * in_word_set(const char *, size_t); |
67 |
-+ $GPERF_TEST] |
68 |
-+ )], |
69 |
-+ [GPERF_LEN_TYPE=size_t], |
70 |
-+ [AC_COMPILE_IFELSE( |
71 |
-+ [AC_LANG_PROGRAM([ |
72 |
-+ #include <string.h> |
73 |
-+ const char * in_word_set(const char *, unsigned); |
74 |
-+ $GPERF_TEST] |
75 |
-+ )], |
76 |
-+ [GPERF_LEN_TYPE=unsigned], |
77 |
-+ [AC_MSG_ERROR([** unable to determine gperf len type])] |
78 |
-+ )] |
79 |
-+) |
80 |
-+ |
81 |
-+AC_DEFINE_UNQUOTED([GPERF_LEN_TYPE], [$GPERF_LEN_TYPE], [gperf len type]) |
82 |
-+ |
83 |
- # ------------------------------------------------------------------------------ |
84 |
- # we use python to build the man page index |
85 |
- have_python=no |
86 |
-diff --git a/src/basic/af-list.c b/src/basic/af-list.c |
87 |
-index 3fac9c508..4b291d177 100644 |
88 |
---- a/src/basic/af-list.c |
89 |
-+++ b/src/basic/af-list.c |
90 |
-@@ -23,7 +23,7 @@ |
91 |
- #include "af-list.h" |
92 |
- #include "macro.h" |
93 |
- |
94 |
--static const struct af_name* lookup_af(register const char *str, register unsigned int len); |
95 |
-+static const struct af_name* lookup_af(register const char *str, register GPERF_LEN_TYPE len); |
96 |
- |
97 |
- #include "af-from-name.h" |
98 |
- #include "af-to-name.h" |
99 |
-diff --git a/src/basic/arphrd-list.c b/src/basic/arphrd-list.c |
100 |
-index 6792d1ee3..2d598dc66 100644 |
101 |
---- a/src/basic/arphrd-list.c |
102 |
-+++ b/src/basic/arphrd-list.c |
103 |
-@@ -23,7 +23,7 @@ |
104 |
- #include "arphrd-list.h" |
105 |
- #include "macro.h" |
106 |
- |
107 |
--static const struct arphrd_name* lookup_arphrd(register const char *str, register unsigned int len); |
108 |
-+static const struct arphrd_name* lookup_arphrd(register const char *str, register GPERF_LEN_TYPE len); |
109 |
- |
110 |
- #include "arphrd-from-name.h" |
111 |
- #include "arphrd-to-name.h" |
112 |
-diff --git a/src/basic/cap-list.c b/src/basic/cap-list.c |
113 |
-index 3e773a06f..d68cc78d0 100644 |
114 |
---- a/src/basic/cap-list.c |
115 |
-+++ b/src/basic/cap-list.c |
116 |
-@@ -26,7 +26,7 @@ |
117 |
- #include "parse-util.h" |
118 |
- #include "util.h" |
119 |
- |
120 |
--static const struct capability_name* lookup_capability(register const char *str, register unsigned int len); |
121 |
-+static const struct capability_name* lookup_capability(register const char *str, register GPERF_LEN_TYPE len); |
122 |
- |
123 |
- #include "cap-from-name.h" |
124 |
- #include "cap-to-name.h" |
125 |
-diff --git a/src/basic/errno-list.c b/src/basic/errno-list.c |
126 |
-index 31b66bad5..c6a01eec8 100644 |
127 |
---- a/src/basic/errno-list.c |
128 |
-+++ b/src/basic/errno-list.c |
129 |
-@@ -23,7 +23,7 @@ |
130 |
- #include "macro.h" |
131 |
- |
132 |
- static const struct errno_name* lookup_errno(register const char *str, |
133 |
-- register unsigned int len); |
134 |
-+ register GPERF_LEN_TYPE len); |
135 |
- |
136 |
- #include "errno-from-name.h" |
137 |
- #include "errno-to-name.h" |
138 |
-diff --git a/src/core/load-fragment.h b/src/core/load-fragment.h |
139 |
-index c05f205c3..ede6b1f73 100644 |
140 |
---- a/src/core/load-fragment.h |
141 |
-+++ b/src/core/load-fragment.h |
142 |
-@@ -118,7 +118,7 @@ int config_parse_user_group(const char *unit, const char *filename, unsigned lin |
143 |
- int config_parse_user_group_strv(const char *unit, const char *filename, unsigned line, const char *section, unsigned section_line, const char *lvalue, int ltype, const char *rvalue, void *data, void *userdata); |
144 |
- |
145 |
- /* gperf prototypes */ |
146 |
--const struct ConfigPerfItem* load_fragment_gperf_lookup(const char *key, unsigned length); |
147 |
-+const struct ConfigPerfItem* load_fragment_gperf_lookup(const char *key, GPERF_LEN_TYPE length); |
148 |
- extern const char load_fragment_gperf_nulstr[]; |
149 |
- |
150 |
- typedef enum Disabled { |
151 |
-diff --git a/src/journal/journald-server.h b/src/journal/journald-server.h |
152 |
-index 99d91496b..d1520c45d 100644 |
153 |
---- a/src/journal/journald-server.h |
154 |
-+++ b/src/journal/journald-server.h |
155 |
-@@ -179,7 +179,7 @@ void server_dispatch_message(Server *s, struct iovec *iovec, unsigned n, unsigne |
156 |
- void server_driver_message(Server *s, sd_id128_t message_id, const char *format, ...) _printf_(3,0) _sentinel_; |
157 |
- |
158 |
- /* gperf lookup function */ |
159 |
--const struct ConfigPerfItem* journald_gperf_lookup(const char *key, unsigned length); |
160 |
-+const struct ConfigPerfItem* journald_gperf_lookup(const char *key, GPERF_LEN_TYPE length); |
161 |
- |
162 |
- int config_parse_storage(const char *unit, const char *filename, unsigned line, const char *section, unsigned section_line, const char *lvalue, int ltype, const char *rvalue, void *data, void *userdata); |
163 |
- |
164 |
-diff --git a/src/login/logind.h b/src/login/logind.h |
165 |
-index 086fa1eeb..7556ee2e4 100644 |
166 |
---- a/src/login/logind.h |
167 |
-+++ b/src/login/logind.h |
168 |
-@@ -182,7 +182,7 @@ int manager_unit_is_active(Manager *manager, const char *unit); |
169 |
- int manager_job_is_active(Manager *manager, const char *path); |
170 |
- |
171 |
- /* gperf lookup function */ |
172 |
--const struct ConfigPerfItem* logind_gperf_lookup(const char *key, unsigned length); |
173 |
-+const struct ConfigPerfItem* logind_gperf_lookup(const char *key, GPERF_LEN_TYPE length); |
174 |
- |
175 |
- int manager_set_lid_switch_ignore(Manager *m, usec_t until); |
176 |
- |
177 |
-diff --git a/src/network/networkd-conf.h b/src/network/networkd-conf.h |
178 |
-index c7bfb42a7..00ddb7672 100644 |
179 |
---- a/src/network/networkd-conf.h |
180 |
-+++ b/src/network/networkd-conf.h |
181 |
-@@ -23,7 +23,7 @@ |
182 |
- |
183 |
- int manager_parse_config_file(Manager *m); |
184 |
- |
185 |
--const struct ConfigPerfItem* networkd_gperf_lookup(const char *key, unsigned length); |
186 |
-+const struct ConfigPerfItem* networkd_gperf_lookup(const char *key, GPERF_LEN_TYPE length); |
187 |
- |
188 |
- int config_parse_duid_type( |
189 |
- const char *unit, |
190 |
-diff --git a/src/network/networkd-netdev.h b/src/network/networkd-netdev.h |
191 |
-index 70ff947b9..37c743121 100644 |
192 |
---- a/src/network/networkd-netdev.h |
193 |
-+++ b/src/network/networkd-netdev.h |
194 |
-@@ -175,7 +175,7 @@ NetDevKind netdev_kind_from_string(const char *d) _pure_; |
195 |
- int config_parse_netdev_kind(const char *unit, const char *filename, unsigned line, const char *section, unsigned section_line, const char *lvalue, int ltype, const char *rvalue, void *data, void *userdata); |
196 |
- |
197 |
- /* gperf */ |
198 |
--const struct ConfigPerfItem* network_netdev_gperf_lookup(const char *key, unsigned length); |
199 |
-+const struct ConfigPerfItem* network_netdev_gperf_lookup(const char *key, GPERF_LEN_TYPE length); |
200 |
- |
201 |
- /* Macros which append INTERFACE= to the message */ |
202 |
- |
203 |
-diff --git a/src/network/networkd-network.h b/src/network/networkd-network.h |
204 |
-index 42fc82d39..09c3b3a3a 100644 |
205 |
---- a/src/network/networkd-network.h |
206 |
-+++ b/src/network/networkd-network.h |
207 |
-@@ -236,7 +236,7 @@ int config_parse_dhcp_route_table(const char *unit, const char *filename, unsign |
208 |
- /* Legacy IPv4LL support */ |
209 |
- int config_parse_ipv4ll(const char *unit, const char *filename, unsigned line, const char *section, unsigned section_line, const char *lvalue, int ltype, const char *rvalue, void *data, void *userdata); |
210 |
- |
211 |
--const struct ConfigPerfItem* network_network_gperf_lookup(const char *key, unsigned length); |
212 |
-+const struct ConfigPerfItem* network_network_gperf_lookup(const char *key, GPERF_LEN_TYPE length); |
213 |
- |
214 |
- extern const sd_bus_vtable network_vtable[]; |
215 |
- |
216 |
-diff --git a/src/nspawn/nspawn-settings.h b/src/nspawn/nspawn-settings.h |
217 |
-index 231e6d726..4ae34f8e2 100644 |
218 |
---- a/src/nspawn/nspawn-settings.h |
219 |
-+++ b/src/nspawn/nspawn-settings.h |
220 |
-@@ -103,7 +103,7 @@ bool settings_private_network(Settings *s); |
221 |
- |
222 |
- DEFINE_TRIVIAL_CLEANUP_FUNC(Settings*, settings_free); |
223 |
- |
224 |
--const struct ConfigPerfItem* nspawn_gperf_lookup(const char *key, unsigned length); |
225 |
-+const struct ConfigPerfItem* nspawn_gperf_lookup(const char *key, GPERF_LEN_TYPE length); |
226 |
- |
227 |
- int config_parse_capability(const char *unit, const char *filename, unsigned line, const char *section, unsigned section_line, const char *lvalue, int ltype, const char *rvalue, void *data, void *userdata); |
228 |
- int config_parse_id128(const char *unit, const char *filename, unsigned line, const char *section, unsigned section_line, const char *lvalue, int ltype, const char *rvalue, void *data, void *userdata); |
229 |
-diff --git a/src/resolve/dns-type.c b/src/resolve/dns-type.c |
230 |
-index aaf5ed62c..d89ae28dc 100644 |
231 |
---- a/src/resolve/dns-type.c |
232 |
-+++ b/src/resolve/dns-type.c |
233 |
-@@ -29,7 +29,7 @@ typedef const struct { |
234 |
- } dns_type; |
235 |
- |
236 |
- static const struct dns_type_name * |
237 |
--lookup_dns_type (register const char *str, register unsigned int len); |
238 |
-+lookup_dns_type (register const char *str, register GPERF_LEN_TYPE len); |
239 |
- |
240 |
- #include "dns_type-from-name.h" |
241 |
- #include "dns_type-to-name.h" |
242 |
-diff --git a/src/resolve/resolved-conf.h b/src/resolve/resolved-conf.h |
243 |
-index fc425a36b..8184d6cad 100644 |
244 |
---- a/src/resolve/resolved-conf.h |
245 |
-+++ b/src/resolve/resolved-conf.h |
246 |
-@@ -41,7 +41,7 @@ int manager_parse_search_domains_and_warn(Manager *m, const char *string); |
247 |
- int manager_add_dns_server_by_string(Manager *m, DnsServerType type, const char *word); |
248 |
- int manager_parse_dns_server_string_and_warn(Manager *m, DnsServerType type, const char *string); |
249 |
- |
250 |
--const struct ConfigPerfItem* resolved_gperf_lookup(const char *key, unsigned length); |
251 |
-+const struct ConfigPerfItem* resolved_gperf_lookup(const char *key, GPERF_LEN_TYPE length); |
252 |
- |
253 |
- int config_parse_dns_servers(const char *unit, const char *filename, unsigned line, const char *section, unsigned section_line, const char *lvalue, int ltype, const char *rvalue, void *data, void *userdata); |
254 |
- int config_parse_search_domains(const char *unit, const char *filename, unsigned line, const char *section, unsigned section_line, const char *lvalue, int ltype, const char *rvalue, void *data, void *userdata); |
255 |
-diff --git a/src/test/test-af-list.c b/src/test/test-af-list.c |
256 |
-index aeaa0929b..e2479133d 100644 |
257 |
---- a/src/test/test-af-list.c |
258 |
-+++ b/src/test/test-af-list.c |
259 |
-@@ -24,7 +24,7 @@ |
260 |
- #include "string-util.h" |
261 |
- #include "util.h" |
262 |
- |
263 |
--static const struct af_name* lookup_af(register const char *str, register unsigned int len); |
264 |
-+static const struct af_name* lookup_af(register const char *str, register GPERF_LEN_TYPE len); |
265 |
- |
266 |
- #include "af-from-name.h" |
267 |
- #include "af-list.h" |
268 |
-diff --git a/src/test/test-arphrd-list.c b/src/test/test-arphrd-list.c |
269 |
-index f3989ad20..8f4f342fa 100644 |
270 |
---- a/src/test/test-arphrd-list.c |
271 |
-+++ b/src/test/test-arphrd-list.c |
272 |
-@@ -24,7 +24,7 @@ |
273 |
- #include "string-util.h" |
274 |
- #include "util.h" |
275 |
- |
276 |
--static const struct arphrd_name* lookup_arphrd(register const char *str, register unsigned int len); |
277 |
-+static const struct arphrd_name* lookup_arphrd(register const char *str, register GPERF_LEN_TYPE len); |
278 |
- |
279 |
- #include "arphrd-from-name.h" |
280 |
- #include "arphrd-list.h" |
281 |
-diff --git a/src/timesync/timesyncd-conf.h b/src/timesync/timesyncd-conf.h |
282 |
-index cba0724b1..0280697e9 100644 |
283 |
---- a/src/timesync/timesyncd-conf.h |
284 |
-+++ b/src/timesync/timesyncd-conf.h |
285 |
-@@ -22,7 +22,7 @@ |
286 |
- #include "conf-parser.h" |
287 |
- #include "timesyncd-manager.h" |
288 |
- |
289 |
--const struct ConfigPerfItem* timesyncd_gperf_lookup(const char *key, unsigned length); |
290 |
-+const struct ConfigPerfItem* timesyncd_gperf_lookup(const char *key, GPERF_LEN_TYPE length); |
291 |
- |
292 |
- int manager_parse_server_string(Manager *m, ServerType type, const char *string); |
293 |
- |
294 |
-diff --git a/src/udev/net/link-config.h b/src/udev/net/link-config.h |
295 |
-index 91cc0357c..b0d8ceb76 100644 |
296 |
---- a/src/udev/net/link-config.h |
297 |
-+++ b/src/udev/net/link-config.h |
298 |
-@@ -93,7 +93,7 @@ const char *mac_policy_to_string(MACPolicy p) _const_; |
299 |
- MACPolicy mac_policy_from_string(const char *p) _pure_; |
300 |
- |
301 |
- /* gperf lookup function */ |
302 |
--const struct ConfigPerfItem* link_config_gperf_lookup(const char *key, unsigned length); |
303 |
-+const struct ConfigPerfItem* link_config_gperf_lookup(const char *key, GPERF_LEN_TYPE length); |
304 |
- |
305 |
- int config_parse_mac_policy(const char *unit, const char *filename, unsigned line, const char *section, unsigned section_line, const char *lvalue, int ltype, const char *rvalue, void *data, void *userdata); |
306 |
- int config_parse_name_policy(const char *unit, const char *filename, unsigned line, const char *section, unsigned section_line, const char *lvalue, int ltype, const char *rvalue, void *data, void *userdata); |
307 |
-diff --git a/src/udev/udev-builtin-keyboard.c b/src/udev/udev-builtin-keyboard.c |
308 |
-index aa10beafb..09024116f 100644 |
309 |
---- a/src/udev/udev-builtin-keyboard.c |
310 |
-+++ b/src/udev/udev-builtin-keyboard.c |
311 |
-@@ -29,7 +29,7 @@ |
312 |
- #include "string-util.h" |
313 |
- #include "udev.h" |
314 |
- |
315 |
--static const struct key *keyboard_lookup_key(const char *str, unsigned len); |
316 |
-+static const struct key *keyboard_lookup_key(const char *str, GPERF_LEN_TYPE len); |
317 |
- #include "keyboard-keys-from-name.h" |
318 |
- |
319 |
- static int install_force_release(struct udev_device *dev, const unsigned *release, unsigned release_count) { |
320 |
--- |
321 |
-2.11.0 |
322 |
- |