1 |
commit: f9a639cb2ba90fa3519e3e0f299606c4b0b00e3d |
2 |
Author: Michael Mair-Keimberger <m.mairkeimberger <AT> gmail <DOT> com> |
3 |
AuthorDate: Tue Dec 5 18:02:08 2017 +0000 |
4 |
Commit: Michael Palimaka <kensington <AT> gentoo <DOT> org> |
5 |
CommitDate: Wed Dec 6 11:59:47 2017 +0000 |
6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=f9a639cb |
7 |
|
8 |
sys-fs/udev: remove unused patches |
9 |
|
10 |
Closes: https://github.com/gentoo/gentoo/pull/6459 |
11 |
|
12 |
...dd-check-for-gperf-lookup-function-signat.patch | 302 --------------------- |
13 |
sys-fs/udev/files/systemd-232-pkgconfig.patch | 50 ---- |
14 |
sys-fs/udev/files/udev-229-sysmacros.patch | 82 ------ |
15 |
3 files changed, 434 deletions(-) |
16 |
|
17 |
diff --git a/sys-fs/udev/files/232-0002-build-sys-add-check-for-gperf-lookup-function-signat.patch b/sys-fs/udev/files/232-0002-build-sys-add-check-for-gperf-lookup-function-signat.patch |
18 |
deleted file mode 100644 |
19 |
index 440ec75bd3b..00000000000 |
20 |
--- a/sys-fs/udev/files/232-0002-build-sys-add-check-for-gperf-lookup-function-signat.patch |
21 |
+++ /dev/null |
22 |
@@ -1,302 +0,0 @@ |
23 |
-From 016fb3b83b861cfe58694996076a9764dcb46475 Mon Sep 17 00:00:00 2001 |
24 |
-From: Mike Gilbert <floppymaster@×××××.com> |
25 |
-Date: Tue, 10 Jan 2017 02:39:05 -0500 |
26 |
-Subject: [PATCH 2/2] build-sys: add check for gperf lookup function signature |
27 |
- (#5055) |
28 |
- |
29 |
-gperf-3.1 generates lookup functions that take a size_t length |
30 |
-parameter instead of unsigned int. Test for this at configure time. |
31 |
- |
32 |
-Fixes: https://github.com/systemd/systemd/issues/5039 |
33 |
---- |
34 |
- configure.ac | 22 ++++++++++++++++++++++ |
35 |
- src/basic/af-list.c | 2 +- |
36 |
- src/basic/arphrd-list.c | 2 +- |
37 |
- src/basic/cap-list.c | 2 +- |
38 |
- src/basic/errno-list.c | 2 +- |
39 |
- src/core/load-fragment.h | 2 +- |
40 |
- src/journal/journald-server.h | 2 +- |
41 |
- src/login/logind.h | 2 +- |
42 |
- src/network/networkd-conf.h | 2 +- |
43 |
- src/network/networkd-netdev.h | 2 +- |
44 |
- src/network/networkd-network.h | 2 +- |
45 |
- src/nspawn/nspawn-settings.h | 2 +- |
46 |
- src/resolve/dns-type.c | 2 +- |
47 |
- src/resolve/resolved-conf.h | 2 +- |
48 |
- src/test/test-af-list.c | 2 +- |
49 |
- src/test/test-arphrd-list.c | 2 +- |
50 |
- src/timesync/timesyncd-conf.h | 2 +- |
51 |
- src/udev/net/link-config.h | 2 +- |
52 |
- src/udev/udev-builtin-keyboard.c | 2 +- |
53 |
- 19 files changed, 40 insertions(+), 18 deletions(-) |
54 |
- |
55 |
-diff --git a/configure.ac b/configure.ac |
56 |
-index 1928e65bd..5c639e32d 100644 |
57 |
---- a/configure.ac |
58 |
-+++ b/configure.ac |
59 |
-@@ -258,6 +258,28 @@ AC_CHECK_SIZEOF(rlim_t,,[ |
60 |
- #include <sys/resource.h> |
61 |
- ]) |
62 |
- |
63 |
-+GPERF_TEST="$(echo foo,bar | ${GPERF} -L ANSI-C)" |
64 |
-+ |
65 |
-+AC_COMPILE_IFELSE( |
66 |
-+ [AC_LANG_PROGRAM([ |
67 |
-+ #include <string.h> |
68 |
-+ const char * in_word_set(const char *, size_t); |
69 |
-+ $GPERF_TEST] |
70 |
-+ )], |
71 |
-+ [GPERF_LEN_TYPE=size_t], |
72 |
-+ [AC_COMPILE_IFELSE( |
73 |
-+ [AC_LANG_PROGRAM([ |
74 |
-+ #include <string.h> |
75 |
-+ const char * in_word_set(const char *, unsigned); |
76 |
-+ $GPERF_TEST] |
77 |
-+ )], |
78 |
-+ [GPERF_LEN_TYPE=unsigned], |
79 |
-+ [AC_MSG_ERROR([** unable to determine gperf len type])] |
80 |
-+ )] |
81 |
-+) |
82 |
-+ |
83 |
-+AC_DEFINE_UNQUOTED([GPERF_LEN_TYPE], [$GPERF_LEN_TYPE], [gperf len type]) |
84 |
-+ |
85 |
- # ------------------------------------------------------------------------------ |
86 |
- # we use python to build the man page index |
87 |
- have_python=no |
88 |
-diff --git a/src/basic/af-list.c b/src/basic/af-list.c |
89 |
-index 3fac9c508..4b291d177 100644 |
90 |
---- a/src/basic/af-list.c |
91 |
-+++ b/src/basic/af-list.c |
92 |
-@@ -23,7 +23,7 @@ |
93 |
- #include "af-list.h" |
94 |
- #include "macro.h" |
95 |
- |
96 |
--static const struct af_name* lookup_af(register const char *str, register unsigned int len); |
97 |
-+static const struct af_name* lookup_af(register const char *str, register GPERF_LEN_TYPE len); |
98 |
- |
99 |
- #include "af-from-name.h" |
100 |
- #include "af-to-name.h" |
101 |
-diff --git a/src/basic/arphrd-list.c b/src/basic/arphrd-list.c |
102 |
-index 6792d1ee3..2d598dc66 100644 |
103 |
---- a/src/basic/arphrd-list.c |
104 |
-+++ b/src/basic/arphrd-list.c |
105 |
-@@ -23,7 +23,7 @@ |
106 |
- #include "arphrd-list.h" |
107 |
- #include "macro.h" |
108 |
- |
109 |
--static const struct arphrd_name* lookup_arphrd(register const char *str, register unsigned int len); |
110 |
-+static const struct arphrd_name* lookup_arphrd(register const char *str, register GPERF_LEN_TYPE len); |
111 |
- |
112 |
- #include "arphrd-from-name.h" |
113 |
- #include "arphrd-to-name.h" |
114 |
-diff --git a/src/basic/cap-list.c b/src/basic/cap-list.c |
115 |
-index 3e773a06f..d68cc78d0 100644 |
116 |
---- a/src/basic/cap-list.c |
117 |
-+++ b/src/basic/cap-list.c |
118 |
-@@ -26,7 +26,7 @@ |
119 |
- #include "parse-util.h" |
120 |
- #include "util.h" |
121 |
- |
122 |
--static const struct capability_name* lookup_capability(register const char *str, register unsigned int len); |
123 |
-+static const struct capability_name* lookup_capability(register const char *str, register GPERF_LEN_TYPE len); |
124 |
- |
125 |
- #include "cap-from-name.h" |
126 |
- #include "cap-to-name.h" |
127 |
-diff --git a/src/basic/errno-list.c b/src/basic/errno-list.c |
128 |
-index 31b66bad5..c6a01eec8 100644 |
129 |
---- a/src/basic/errno-list.c |
130 |
-+++ b/src/basic/errno-list.c |
131 |
-@@ -23,7 +23,7 @@ |
132 |
- #include "macro.h" |
133 |
- |
134 |
- static const struct errno_name* lookup_errno(register const char *str, |
135 |
-- register unsigned int len); |
136 |
-+ register GPERF_LEN_TYPE len); |
137 |
- |
138 |
- #include "errno-from-name.h" |
139 |
- #include "errno-to-name.h" |
140 |
-diff --git a/src/core/load-fragment.h b/src/core/load-fragment.h |
141 |
-index c05f205c3..ede6b1f73 100644 |
142 |
---- a/src/core/load-fragment.h |
143 |
-+++ b/src/core/load-fragment.h |
144 |
-@@ -118,7 +118,7 @@ int config_parse_user_group(const char *unit, const char *filename, unsigned lin |
145 |
- 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); |
146 |
- |
147 |
- /* gperf prototypes */ |
148 |
--const struct ConfigPerfItem* load_fragment_gperf_lookup(const char *key, unsigned length); |
149 |
-+const struct ConfigPerfItem* load_fragment_gperf_lookup(const char *key, GPERF_LEN_TYPE length); |
150 |
- extern const char load_fragment_gperf_nulstr[]; |
151 |
- |
152 |
- typedef enum Disabled { |
153 |
-diff --git a/src/journal/journald-server.h b/src/journal/journald-server.h |
154 |
-index 99d91496b..d1520c45d 100644 |
155 |
---- a/src/journal/journald-server.h |
156 |
-+++ b/src/journal/journald-server.h |
157 |
-@@ -179,7 +179,7 @@ void server_dispatch_message(Server *s, struct iovec *iovec, unsigned n, unsigne |
158 |
- void server_driver_message(Server *s, sd_id128_t message_id, const char *format, ...) _printf_(3,0) _sentinel_; |
159 |
- |
160 |
- /* gperf lookup function */ |
161 |
--const struct ConfigPerfItem* journald_gperf_lookup(const char *key, unsigned length); |
162 |
-+const struct ConfigPerfItem* journald_gperf_lookup(const char *key, GPERF_LEN_TYPE length); |
163 |
- |
164 |
- 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); |
165 |
- |
166 |
-diff --git a/src/login/logind.h b/src/login/logind.h |
167 |
-index 086fa1eeb..7556ee2e4 100644 |
168 |
---- a/src/login/logind.h |
169 |
-+++ b/src/login/logind.h |
170 |
-@@ -182,7 +182,7 @@ int manager_unit_is_active(Manager *manager, const char *unit); |
171 |
- int manager_job_is_active(Manager *manager, const char *path); |
172 |
- |
173 |
- /* gperf lookup function */ |
174 |
--const struct ConfigPerfItem* logind_gperf_lookup(const char *key, unsigned length); |
175 |
-+const struct ConfigPerfItem* logind_gperf_lookup(const char *key, GPERF_LEN_TYPE length); |
176 |
- |
177 |
- int manager_set_lid_switch_ignore(Manager *m, usec_t until); |
178 |
- |
179 |
-diff --git a/src/network/networkd-conf.h b/src/network/networkd-conf.h |
180 |
-index c7bfb42a7..00ddb7672 100644 |
181 |
---- a/src/network/networkd-conf.h |
182 |
-+++ b/src/network/networkd-conf.h |
183 |
-@@ -23,7 +23,7 @@ |
184 |
- |
185 |
- int manager_parse_config_file(Manager *m); |
186 |
- |
187 |
--const struct ConfigPerfItem* networkd_gperf_lookup(const char *key, unsigned length); |
188 |
-+const struct ConfigPerfItem* networkd_gperf_lookup(const char *key, GPERF_LEN_TYPE length); |
189 |
- |
190 |
- int config_parse_duid_type( |
191 |
- const char *unit, |
192 |
-diff --git a/src/network/networkd-netdev.h b/src/network/networkd-netdev.h |
193 |
-index 70ff947b9..37c743121 100644 |
194 |
---- a/src/network/networkd-netdev.h |
195 |
-+++ b/src/network/networkd-netdev.h |
196 |
-@@ -175,7 +175,7 @@ NetDevKind netdev_kind_from_string(const char *d) _pure_; |
197 |
- 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); |
198 |
- |
199 |
- /* gperf */ |
200 |
--const struct ConfigPerfItem* network_netdev_gperf_lookup(const char *key, unsigned length); |
201 |
-+const struct ConfigPerfItem* network_netdev_gperf_lookup(const char *key, GPERF_LEN_TYPE length); |
202 |
- |
203 |
- /* Macros which append INTERFACE= to the message */ |
204 |
- |
205 |
-diff --git a/src/network/networkd-network.h b/src/network/networkd-network.h |
206 |
-index 42fc82d39..09c3b3a3a 100644 |
207 |
---- a/src/network/networkd-network.h |
208 |
-+++ b/src/network/networkd-network.h |
209 |
-@@ -236,7 +236,7 @@ int config_parse_dhcp_route_table(const char *unit, const char *filename, unsign |
210 |
- /* Legacy IPv4LL support */ |
211 |
- 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); |
212 |
- |
213 |
--const struct ConfigPerfItem* network_network_gperf_lookup(const char *key, unsigned length); |
214 |
-+const struct ConfigPerfItem* network_network_gperf_lookup(const char *key, GPERF_LEN_TYPE length); |
215 |
- |
216 |
- extern const sd_bus_vtable network_vtable[]; |
217 |
- |
218 |
-diff --git a/src/nspawn/nspawn-settings.h b/src/nspawn/nspawn-settings.h |
219 |
-index 231e6d726..4ae34f8e2 100644 |
220 |
---- a/src/nspawn/nspawn-settings.h |
221 |
-+++ b/src/nspawn/nspawn-settings.h |
222 |
-@@ -103,7 +103,7 @@ bool settings_private_network(Settings *s); |
223 |
- |
224 |
- DEFINE_TRIVIAL_CLEANUP_FUNC(Settings*, settings_free); |
225 |
- |
226 |
--const struct ConfigPerfItem* nspawn_gperf_lookup(const char *key, unsigned length); |
227 |
-+const struct ConfigPerfItem* nspawn_gperf_lookup(const char *key, GPERF_LEN_TYPE length); |
228 |
- |
229 |
- 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); |
230 |
- 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); |
231 |
-diff --git a/src/resolve/dns-type.c b/src/resolve/dns-type.c |
232 |
-index aaf5ed62c..d89ae28dc 100644 |
233 |
---- a/src/resolve/dns-type.c |
234 |
-+++ b/src/resolve/dns-type.c |
235 |
-@@ -29,7 +29,7 @@ typedef const struct { |
236 |
- } dns_type; |
237 |
- |
238 |
- static const struct dns_type_name * |
239 |
--lookup_dns_type (register const char *str, register unsigned int len); |
240 |
-+lookup_dns_type (register const char *str, register GPERF_LEN_TYPE len); |
241 |
- |
242 |
- #include "dns_type-from-name.h" |
243 |
- #include "dns_type-to-name.h" |
244 |
-diff --git a/src/resolve/resolved-conf.h b/src/resolve/resolved-conf.h |
245 |
-index fc425a36b..8184d6cad 100644 |
246 |
---- a/src/resolve/resolved-conf.h |
247 |
-+++ b/src/resolve/resolved-conf.h |
248 |
-@@ -41,7 +41,7 @@ int manager_parse_search_domains_and_warn(Manager *m, const char *string); |
249 |
- int manager_add_dns_server_by_string(Manager *m, DnsServerType type, const char *word); |
250 |
- int manager_parse_dns_server_string_and_warn(Manager *m, DnsServerType type, const char *string); |
251 |
- |
252 |
--const struct ConfigPerfItem* resolved_gperf_lookup(const char *key, unsigned length); |
253 |
-+const struct ConfigPerfItem* resolved_gperf_lookup(const char *key, GPERF_LEN_TYPE length); |
254 |
- |
255 |
- 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); |
256 |
- 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); |
257 |
-diff --git a/src/test/test-af-list.c b/src/test/test-af-list.c |
258 |
-index aeaa0929b..e2479133d 100644 |
259 |
---- a/src/test/test-af-list.c |
260 |
-+++ b/src/test/test-af-list.c |
261 |
-@@ -24,7 +24,7 @@ |
262 |
- #include "string-util.h" |
263 |
- #include "util.h" |
264 |
- |
265 |
--static const struct af_name* lookup_af(register const char *str, register unsigned int len); |
266 |
-+static const struct af_name* lookup_af(register const char *str, register GPERF_LEN_TYPE len); |
267 |
- |
268 |
- #include "af-from-name.h" |
269 |
- #include "af-list.h" |
270 |
-diff --git a/src/test/test-arphrd-list.c b/src/test/test-arphrd-list.c |
271 |
-index f3989ad20..8f4f342fa 100644 |
272 |
---- a/src/test/test-arphrd-list.c |
273 |
-+++ b/src/test/test-arphrd-list.c |
274 |
-@@ -24,7 +24,7 @@ |
275 |
- #include "string-util.h" |
276 |
- #include "util.h" |
277 |
- |
278 |
--static const struct arphrd_name* lookup_arphrd(register const char *str, register unsigned int len); |
279 |
-+static const struct arphrd_name* lookup_arphrd(register const char *str, register GPERF_LEN_TYPE len); |
280 |
- |
281 |
- #include "arphrd-from-name.h" |
282 |
- #include "arphrd-list.h" |
283 |
-diff --git a/src/timesync/timesyncd-conf.h b/src/timesync/timesyncd-conf.h |
284 |
-index cba0724b1..0280697e9 100644 |
285 |
---- a/src/timesync/timesyncd-conf.h |
286 |
-+++ b/src/timesync/timesyncd-conf.h |
287 |
-@@ -22,7 +22,7 @@ |
288 |
- #include "conf-parser.h" |
289 |
- #include "timesyncd-manager.h" |
290 |
- |
291 |
--const struct ConfigPerfItem* timesyncd_gperf_lookup(const char *key, unsigned length); |
292 |
-+const struct ConfigPerfItem* timesyncd_gperf_lookup(const char *key, GPERF_LEN_TYPE length); |
293 |
- |
294 |
- int manager_parse_server_string(Manager *m, ServerType type, const char *string); |
295 |
- |
296 |
-diff --git a/src/udev/net/link-config.h b/src/udev/net/link-config.h |
297 |
-index 91cc0357c..b0d8ceb76 100644 |
298 |
---- a/src/udev/net/link-config.h |
299 |
-+++ b/src/udev/net/link-config.h |
300 |
-@@ -93,7 +93,7 @@ const char *mac_policy_to_string(MACPolicy p) _const_; |
301 |
- MACPolicy mac_policy_from_string(const char *p) _pure_; |
302 |
- |
303 |
- /* gperf lookup function */ |
304 |
--const struct ConfigPerfItem* link_config_gperf_lookup(const char *key, unsigned length); |
305 |
-+const struct ConfigPerfItem* link_config_gperf_lookup(const char *key, GPERF_LEN_TYPE length); |
306 |
- |
307 |
- 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); |
308 |
- 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); |
309 |
-diff --git a/src/udev/udev-builtin-keyboard.c b/src/udev/udev-builtin-keyboard.c |
310 |
-index aa10beafb..09024116f 100644 |
311 |
---- a/src/udev/udev-builtin-keyboard.c |
312 |
-+++ b/src/udev/udev-builtin-keyboard.c |
313 |
-@@ -29,7 +29,7 @@ |
314 |
- #include "string-util.h" |
315 |
- #include "udev.h" |
316 |
- |
317 |
--static const struct key *keyboard_lookup_key(const char *str, unsigned len); |
318 |
-+static const struct key *keyboard_lookup_key(const char *str, GPERF_LEN_TYPE len); |
319 |
- #include "keyboard-keys-from-name.h" |
320 |
- |
321 |
- static int install_force_release(struct udev_device *dev, const unsigned *release, unsigned release_count) { |
322 |
--- |
323 |
-2.11.0 |
324 |
- |
325 |
|
326 |
diff --git a/sys-fs/udev/files/systemd-232-pkgconfig.patch b/sys-fs/udev/files/systemd-232-pkgconfig.patch |
327 |
deleted file mode 100644 |
328 |
index 50f7921b565..00000000000 |
329 |
--- a/sys-fs/udev/files/systemd-232-pkgconfig.patch |
330 |
+++ /dev/null |
331 |
@@ -1,50 +0,0 @@ |
332 |
-From a36dad95c447a5cf65f9e3b66c86e906e7f05890 Mon Sep 17 00:00:00 2001 |
333 |
-From: Mike Gilbert <floppym@g.o> |
334 |
-Date: Sat, 5 Nov 2016 09:17:34 -0400 |
335 |
-Subject: [PATCH] Adjust pkgconfig files to point at rootlibdir |
336 |
- |
337 |
-The .so symlinks got moved to rootlibdir in 082210c7. |
338 |
---- |
339 |
- Makefile.am | 1 + |
340 |
- src/libsystemd/libsystemd.pc.in | 2 +- |
341 |
- src/libudev/libudev.pc.in | 2 +- |
342 |
- 3 files changed, 3 insertions(+), 2 deletions(-) |
343 |
- |
344 |
-diff --git a/Makefile.am b/Makefile.am |
345 |
-index f2d8bf5..73144b1 100644 |
346 |
---- a/Makefile.am |
347 |
-+++ b/Makefile.am |
348 |
-@@ -6054,6 +6054,7 @@ EXTRA_DIST += \ |
349 |
- |
350 |
- # ------------------------------------------------------------------------------ |
351 |
- substitutions = \ |
352 |
-+ '|rootlibdir=$(rootlibdir)|' \ |
353 |
- '|rootlibexecdir=$(rootlibexecdir)|' \ |
354 |
- '|rootbindir=$(rootbindir)|' \ |
355 |
- '|bindir=$(bindir)|' \ |
356 |
-diff --git a/src/libsystemd/libsystemd.pc.in b/src/libsystemd/libsystemd.pc.in |
357 |
-index e8f7950..7e6d499 100644 |
358 |
---- a/src/libsystemd/libsystemd.pc.in |
359 |
-+++ b/src/libsystemd/libsystemd.pc.in |
360 |
-@@ -7,7 +7,7 @@ |
361 |
- |
362 |
- prefix=@prefix@ |
363 |
- exec_prefix=@exec_prefix@ |
364 |
--libdir=@libdir@ |
365 |
-+libdir=@rootlibdir@ |
366 |
- includedir=@includedir@ |
367 |
- |
368 |
- Name: systemd |
369 |
-diff --git a/src/libudev/libudev.pc.in b/src/libudev/libudev.pc.in |
370 |
-index a0f3f52..770c922 100644 |
371 |
---- a/src/libudev/libudev.pc.in |
372 |
-+++ b/src/libudev/libudev.pc.in |
373 |
-@@ -7,7 +7,7 @@ |
374 |
- |
375 |
- prefix=@prefix@ |
376 |
- exec_prefix=@exec_prefix@ |
377 |
--libdir=@libdir@ |
378 |
-+libdir=@rootlibdir@ |
379 |
- includedir=@includedir@ |
380 |
- |
381 |
- Name: libudev |
382 |
|
383 |
diff --git a/sys-fs/udev/files/udev-229-sysmacros.patch b/sys-fs/udev/files/udev-229-sysmacros.patch |
384 |
deleted file mode 100644 |
385 |
index d72eb5907da..00000000000 |
386 |
--- a/sys-fs/udev/files/udev-229-sysmacros.patch |
387 |
+++ /dev/null |
388 |
@@ -1,82 +0,0 @@ |
389 |
-https://bugs.gentoo.org/580200 |
390 |
-https://github.com/systemd/systemd/commit/27d13af71c3af6b2f9b60556d2c046dbb6e36e23 |
391 |
- |
392 |
-From 27d13af71c3af6b2f9b60556d2c046dbb6e36e23 Mon Sep 17 00:00:00 2001 |
393 |
-From: Mike Frysinger <vapier@g.o> |
394 |
-Date: Mon, 14 Mar 2016 17:44:49 -0400 |
395 |
-Subject: [PATCH] include sys/sysmacros.h in more places |
396 |
- |
397 |
-Since glibc is moving away from implicitly including sys/sysmacros.h |
398 |
-all the time via sys/types.h, include the header directly in more |
399 |
-places. This seems to cover most makedev/major/minor usage. |
400 |
---- |
401 |
- src/basic/macro.h | 1 + |
402 |
- src/basic/util.h | 1 + |
403 |
- src/libudev/libudev.h | 1 + |
404 |
- src/systemd/sd-device.h | 1 + |
405 |
- src/udev/udev.h | 1 + |
406 |
- 5 files changed, 5 insertions(+) |
407 |
- |
408 |
-diff --git a/src/basic/macro.h b/src/basic/macro.h |
409 |
-index c34441d..b36a956 100644 |
410 |
---- a/src/basic/macro.h |
411 |
-+++ b/src/basic/macro.h |
412 |
-@@ -23,6 +23,7 @@ |
413 |
- #include <inttypes.h> |
414 |
- #include <stdbool.h> |
415 |
- #include <sys/param.h> |
416 |
-+#include <sys/sysmacros.h> |
417 |
- #include <sys/types.h> |
418 |
- |
419 |
- #define _printf_(a,b) __attribute__ ((format (printf, a, b))) |
420 |
-diff --git a/src/basic/util.h b/src/basic/util.h |
421 |
-index e095254..286db05 100644 |
422 |
---- a/src/basic/util.h |
423 |
-+++ b/src/basic/util.h |
424 |
-@@ -36,6 +36,7 @@ |
425 |
- #include <sys/socket.h> |
426 |
- #include <sys/stat.h> |
427 |
- #include <sys/statfs.h> |
428 |
-+#include <sys/sysmacros.h> |
429 |
- #include <sys/types.h> |
430 |
- #include <time.h> |
431 |
- #include <unistd.h> |
432 |
-diff --git a/src/libudev/libudev.h b/src/libudev/libudev.h |
433 |
-index eb58740..3f6d0ed 100644 |
434 |
---- a/src/libudev/libudev.h |
435 |
-+++ b/src/libudev/libudev.h |
436 |
-@@ -21,6 +21,7 @@ |
437 |
- #define _LIBUDEV_H_ |
438 |
- |
439 |
- #include <stdarg.h> |
440 |
-+#include <sys/sysmacros.h> |
441 |
- #include <sys/types.h> |
442 |
- |
443 |
- #ifdef __cplusplus |
444 |
-diff --git a/src/systemd/sd-device.h b/src/systemd/sd-device.h |
445 |
-index 5bfca6e..c1d0756 100644 |
446 |
---- a/src/systemd/sd-device.h |
447 |
-+++ b/src/systemd/sd-device.h |
448 |
-@@ -22,6 +22,7 @@ |
449 |
- ***/ |
450 |
- |
451 |
- #include <inttypes.h> |
452 |
-+#include <sys/sysmacros.h> |
453 |
- #include <sys/types.h> |
454 |
- |
455 |
- #include "_sd-common.h" |
456 |
-diff --git a/src/udev/udev.h b/src/udev/udev.h |
457 |
-index 5659051..8433e8d 100644 |
458 |
---- a/src/udev/udev.h |
459 |
-+++ b/src/udev/udev.h |
460 |
-@@ -19,6 +19,7 @@ |
461 |
- */ |
462 |
- |
463 |
- #include <sys/param.h> |
464 |
-+#include <sys/sysmacros.h> |
465 |
- #include <sys/types.h> |
466 |
- |
467 |
- #include "libudev.h" |
468 |
--- |
469 |
-2.7.4 |
470 |
- |