summaryrefslogtreecommitdiffstats
path: root/meta
diff options
context:
space:
mode:
Diffstat (limited to 'meta')
-rw-r--r--meta/recipes-core/systemd/systemd/0005-src-basic-missing.h-check-for-missing-strndupa.patch71
1 files changed, 10 insertions, 61 deletions
diff --git a/meta/recipes-core/systemd/systemd/0005-src-basic-missing.h-check-for-missing-strndupa.patch b/meta/recipes-core/systemd/systemd/0005-src-basic-missing.h-check-for-missing-strndupa.patch
index a2e25a97df..df1043b27d 100644
--- a/meta/recipes-core/systemd/systemd/0005-src-basic-missing.h-check-for-missing-strndupa.patch
+++ b/meta/recipes-core/systemd/systemd/0005-src-basic-missing.h-check-for-missing-strndupa.patch
@@ -43,8 +43,6 @@ Signed-off-by: Andrej Valek <andrej.valek@siemens.com>
43 src/udev/udev-rules.c | 1 + 43 src/udev/udev-rules.c | 1 +
44 29 files changed, 40 insertions(+) 44 29 files changed, 40 insertions(+)
45 45
46diff --git a/meson.build b/meson.build
47index 79195c9..80d9564 100644
48--- a/meson.build 46--- a/meson.build
49+++ b/meson.build 47+++ b/meson.build
50@@ -572,6 +572,7 @@ foreach ident : [ 48@@ -572,6 +572,7 @@ foreach ident : [
@@ -55,8 +53,6 @@ index 79195c9..80d9564 100644
55 ] 53 ]
56 54
57 have = cc.has_function(ident[0], prefix : ident[1], args : '-D_GNU_SOURCE') 55 have = cc.has_function(ident[0], prefix : ident[1], args : '-D_GNU_SOURCE')
58diff --git a/src/backlight/backlight.c b/src/backlight/backlight.c
59index dfd6805..c2b2ace 100644
60--- a/src/backlight/backlight.c 56--- a/src/backlight/backlight.c
61+++ b/src/backlight/backlight.c 57+++ b/src/backlight/backlight.c
62@@ -17,6 +17,7 @@ 58@@ -17,6 +17,7 @@
@@ -67,8 +63,6 @@ index dfd6805..c2b2ace 100644
67 63
68 static int find_pci_or_platform_parent(sd_device *device, sd_device **ret) { 64 static int find_pci_or_platform_parent(sd_device *device, sd_device **ret) {
69 const char *subsystem, *sysname, *value; 65 const char *subsystem, *sysname, *value;
70diff --git a/src/basic/env-util.c b/src/basic/env-util.c
71index fd449dc..e2b0722 100644
72--- a/src/basic/env-util.c 66--- a/src/basic/env-util.c
73+++ b/src/basic/env-util.c 67+++ b/src/basic/env-util.c
74@@ -16,6 +16,7 @@ 68@@ -16,6 +16,7 @@
@@ -79,8 +73,6 @@ index fd449dc..e2b0722 100644
79 73
80 #define VALID_CHARS_ENV_NAME \ 74 #define VALID_CHARS_ENV_NAME \
81 DIGITS LETTERS \ 75 DIGITS LETTERS \
82diff --git a/src/basic/missing_stdlib.h b/src/basic/missing_stdlib.h
83index 188a8d4..1e16ec2 100644
84--- a/src/basic/missing_stdlib.h 76--- a/src/basic/missing_stdlib.h
85+++ b/src/basic/missing_stdlib.h 77+++ b/src/basic/missing_stdlib.h
86@@ -11,3 +11,15 @@ 78@@ -11,3 +11,15 @@
@@ -99,8 +91,6 @@ index 188a8d4..1e16ec2 100644
99+ (char *)memcpy(__new, __old, __len); \ 91+ (char *)memcpy(__new, __old, __len); \
100+ }) 92+ })
101+#endif 93+#endif
102diff --git a/src/basic/mkdir.c b/src/basic/mkdir.c
103index 6b82eab..51c6b78 100644
104--- a/src/basic/mkdir.c 94--- a/src/basic/mkdir.c
105+++ b/src/basic/mkdir.c 95+++ b/src/basic/mkdir.c
106@@ -14,6 +14,7 @@ 96@@ -14,6 +14,7 @@
@@ -111,8 +101,6 @@ index 6b82eab..51c6b78 100644
111 101
112 int mkdir_safe_internal(const char *path, mode_t mode, uid_t uid, gid_t gid, MkdirFlags flags, mkdir_func_t _mkdir) { 102 int mkdir_safe_internal(const char *path, mode_t mode, uid_t uid, gid_t gid, MkdirFlags flags, mkdir_func_t _mkdir) {
113 struct stat st; 103 struct stat st;
114diff --git a/src/basic/parse-util.c b/src/basic/parse-util.c
115index 87724af..d9c53bc 100644
116--- a/src/basic/parse-util.c 104--- a/src/basic/parse-util.c
117+++ b/src/basic/parse-util.c 105+++ b/src/basic/parse-util.c
118@@ -19,6 +19,7 @@ 106@@ -19,6 +19,7 @@
@@ -123,8 +111,6 @@ index 87724af..d9c53bc 100644
123 111
124 int parse_boolean(const char *v) { 112 int parse_boolean(const char *v) {
125 if (!v) 113 if (!v)
126diff --git a/src/basic/proc-cmdline.c b/src/basic/proc-cmdline.c
127index 1670001..b51feaa 100644
128--- a/src/basic/proc-cmdline.c 114--- a/src/basic/proc-cmdline.c
129+++ b/src/basic/proc-cmdline.c 115+++ b/src/basic/proc-cmdline.c
130@@ -15,6 +15,7 @@ 116@@ -15,6 +15,7 @@
@@ -135,8 +121,6 @@ index 1670001..b51feaa 100644
135 121
136 int proc_cmdline(char **ret) { 122 int proc_cmdline(char **ret) {
137 const char *e; 123 const char *e;
138diff --git a/src/basic/procfs-util.c b/src/basic/procfs-util.c
139index 7aaf95b..42ce53d 100644
140--- a/src/basic/procfs-util.c 124--- a/src/basic/procfs-util.c
141+++ b/src/basic/procfs-util.c 125+++ b/src/basic/procfs-util.c
142@@ -11,6 +11,7 @@ 126@@ -11,6 +11,7 @@
@@ -147,8 +131,6 @@ index 7aaf95b..42ce53d 100644
147 131
148 int procfs_tasks_get_limit(uint64_t *ret) { 132 int procfs_tasks_get_limit(uint64_t *ret) {
149 _cleanup_free_ char *value = NULL; 133 _cleanup_free_ char *value = NULL;
150diff --git a/src/basic/time-util.c b/src/basic/time-util.c
151index daf952b..374b97f 100644
152--- a/src/basic/time-util.c 134--- a/src/basic/time-util.c
153+++ b/src/basic/time-util.c 135+++ b/src/basic/time-util.c
154@@ -28,6 +28,7 @@ 136@@ -28,6 +28,7 @@
@@ -159,8 +141,6 @@ index daf952b..374b97f 100644
159 141
160 static clockid_t map_clock_id(clockid_t c) { 142 static clockid_t map_clock_id(clockid_t c) {
161 143
162diff --git a/src/core/dbus-cgroup.c b/src/core/dbus-cgroup.c
163index 4615aea..bc1364f 100644
164--- a/src/core/dbus-cgroup.c 144--- a/src/core/dbus-cgroup.c
165+++ b/src/core/dbus-cgroup.c 145+++ b/src/core/dbus-cgroup.c
166@@ -15,6 +15,7 @@ 146@@ -15,6 +15,7 @@
@@ -171,8 +151,6 @@ index 4615aea..bc1364f 100644
171 151
172 static BUS_DEFINE_PROPERTY_GET_ENUM(property_get_cgroup_device_policy, cgroup_device_policy, CGroupDevicePolicy); 152 static BUS_DEFINE_PROPERTY_GET_ENUM(property_get_cgroup_device_policy, cgroup_device_policy, CGroupDevicePolicy);
173 153
174diff --git a/src/core/dbus-util.c b/src/core/dbus-util.c
175index f4fbb72..0a1e3b5 100644
176--- a/src/core/dbus-util.c 154--- a/src/core/dbus-util.c
177+++ b/src/core/dbus-util.c 155+++ b/src/core/dbus-util.c
178@@ -7,6 +7,7 @@ 156@@ -7,6 +7,7 @@
@@ -183,8 +161,6 @@ index f4fbb72..0a1e3b5 100644
183 161
184 int bus_property_get_triggered_unit( 162 int bus_property_get_triggered_unit(
185 sd_bus *bus, 163 sd_bus *bus,
186diff --git a/src/core/kmod-setup.c b/src/core/kmod-setup.c
187index a91cfeb..a459610 100644
188--- a/src/core/kmod-setup.c 164--- a/src/core/kmod-setup.c
189+++ b/src/core/kmod-setup.c 165+++ b/src/core/kmod-setup.c
190@@ -11,6 +11,7 @@ 166@@ -11,6 +11,7 @@
@@ -195,8 +171,6 @@ index a91cfeb..a459610 100644
195 171
196 #if HAVE_KMOD 172 #if HAVE_KMOD
197 #include <libkmod.h> 173 #include <libkmod.h>
198diff --git a/src/core/service.c b/src/core/service.c
199index 0289990..0e725b5 100644
200--- a/src/core/service.c 174--- a/src/core/service.c
201+++ b/src/core/service.c 175+++ b/src/core/service.c
202@@ -42,6 +42,7 @@ 176@@ -42,6 +42,7 @@
@@ -207,8 +181,6 @@ index 0289990..0e725b5 100644
207 181
208 static const UnitActiveState state_translation_table[_SERVICE_STATE_MAX] = { 182 static const UnitActiveState state_translation_table[_SERVICE_STATE_MAX] = {
209 [SERVICE_DEAD] = UNIT_INACTIVE, 183 [SERVICE_DEAD] = UNIT_INACTIVE,
210diff --git a/src/journal/journalctl.c b/src/journal/journalctl.c
211index 0048909..0e85eb7 100644
212--- a/src/journal/journalctl.c 184--- a/src/journal/journalctl.c
213+++ b/src/journal/journalctl.c 185+++ b/src/journal/journalctl.c
214@@ -67,6 +67,7 @@ 186@@ -67,6 +67,7 @@
@@ -219,8 +191,6 @@ index 0048909..0e85eb7 100644
219 191
220 #define DEFAULT_FSS_INTERVAL_USEC (15*USEC_PER_MINUTE) 192 #define DEFAULT_FSS_INTERVAL_USEC (15*USEC_PER_MINUTE)
221 193
222diff --git a/src/libsystemd/sd-bus/bus-message.c b/src/libsystemd/sd-bus/bus-message.c
223index 427d42f..b050568 100644
224--- a/src/libsystemd/sd-bus/bus-message.c 194--- a/src/libsystemd/sd-bus/bus-message.c
225+++ b/src/libsystemd/sd-bus/bus-message.c 195+++ b/src/libsystemd/sd-bus/bus-message.c
226@@ -21,6 +21,7 @@ 196@@ -21,6 +21,7 @@
@@ -231,8 +201,6 @@ index 427d42f..b050568 100644
231 201
232 static int message_append_basic(sd_bus_message *m, char type, const void *p, const void **stored); 202 static int message_append_basic(sd_bus_message *m, char type, const void *p, const void **stored);
233 203
234diff --git a/src/libsystemd/sd-bus/bus-objects.c b/src/libsystemd/sd-bus/bus-objects.c
235index d9fc256..e9c6932 100644
236--- a/src/libsystemd/sd-bus/bus-objects.c 204--- a/src/libsystemd/sd-bus/bus-objects.c
237+++ b/src/libsystemd/sd-bus/bus-objects.c 205+++ b/src/libsystemd/sd-bus/bus-objects.c
238@@ -13,6 +13,7 @@ 206@@ -13,6 +13,7 @@
@@ -243,8 +211,6 @@ index d9fc256..e9c6932 100644
243 211
244 static int node_vtable_get_userdata( 212 static int node_vtable_get_userdata(
245 sd_bus *bus, 213 sd_bus *bus,
246diff --git a/src/libsystemd/sd-bus/test-bus-benchmark.c b/src/libsystemd/sd-bus/test-bus-benchmark.c
247index 8de0a85..4fd0a2e 100644
248--- a/src/libsystemd/sd-bus/test-bus-benchmark.c 214--- a/src/libsystemd/sd-bus/test-bus-benchmark.c
249+++ b/src/libsystemd/sd-bus/test-bus-benchmark.c 215+++ b/src/libsystemd/sd-bus/test-bus-benchmark.c
250@@ -14,6 +14,7 @@ 216@@ -14,6 +14,7 @@
@@ -255,8 +221,6 @@ index 8de0a85..4fd0a2e 100644
255 221
256 #define MAX_SIZE (2*1024*1024) 222 #define MAX_SIZE (2*1024*1024)
257 223
258diff --git a/src/locale/keymap-util.c b/src/locale/keymap-util.c
259index b8bd181..fe0cae0 100644
260--- a/src/locale/keymap-util.c 224--- a/src/locale/keymap-util.c
261+++ b/src/locale/keymap-util.c 225+++ b/src/locale/keymap-util.c
262@@ -23,6 +23,7 @@ 226@@ -23,6 +23,7 @@
@@ -267,8 +231,6 @@ index b8bd181..fe0cae0 100644
267 231
268 static bool startswith_comma(const char *s, const char *prefix) { 232 static bool startswith_comma(const char *s, const char *prefix) {
269 s = startswith(s, prefix); 233 s = startswith(s, prefix);
270diff --git a/src/nspawn/nspawn-settings.c b/src/nspawn/nspawn-settings.c
271index 476cb07..91e28de 100644
272--- a/src/nspawn/nspawn-settings.c 234--- a/src/nspawn/nspawn-settings.c
273+++ b/src/nspawn/nspawn-settings.c 235+++ b/src/nspawn/nspawn-settings.c
274@@ -16,6 +16,7 @@ 236@@ -16,6 +16,7 @@
@@ -279,8 +241,6 @@ index 476cb07..91e28de 100644
279 241
280 Settings *settings_new(void) { 242 Settings *settings_new(void) {
281 Settings *s; 243 Settings *s;
282diff --git a/src/shared/dns-domain.c b/src/shared/dns-domain.c
283index 4b31cb3..989ebf3 100644
284--- a/src/shared/dns-domain.c 244--- a/src/shared/dns-domain.c
285+++ b/src/shared/dns-domain.c 245+++ b/src/shared/dns-domain.c
286@@ -24,6 +24,7 @@ 246@@ -24,6 +24,7 @@
@@ -291,8 +251,6 @@ index 4b31cb3..989ebf3 100644
291 251
292 int dns_label_unescape(const char **name, char *dest, size_t sz, DNSLabelFlags flags) { 252 int dns_label_unescape(const char **name, char *dest, size_t sz, DNSLabelFlags flags) {
293 const char *n; 253 const char *n;
294diff --git a/src/shared/journal-importer.c b/src/shared/journal-importer.c
295index 8638cd3..d03774a 100644
296--- a/src/shared/journal-importer.c 254--- a/src/shared/journal-importer.c
297+++ b/src/shared/journal-importer.c 255+++ b/src/shared/journal-importer.c
298@@ -13,6 +13,7 @@ 256@@ -13,6 +13,7 @@
@@ -303,8 +261,6 @@ index 8638cd3..d03774a 100644
303 261
304 enum { 262 enum {
305 IMPORTER_STATE_LINE = 0, /* waiting to read, or reading line */ 263 IMPORTER_STATE_LINE = 0, /* waiting to read, or reading line */
306diff --git a/src/shared/logs-show.c b/src/shared/logs-show.c
307index 5fb736f..19cb165 100644
308--- a/src/shared/logs-show.c 264--- a/src/shared/logs-show.c
309+++ b/src/shared/logs-show.c 265+++ b/src/shared/logs-show.c
310@@ -38,6 +38,7 @@ 266@@ -38,6 +38,7 @@
@@ -315,8 +271,6 @@ index 5fb736f..19cb165 100644
315 271
316 /* up to three lines (each up to 100 characters) or 300 characters, whichever is less */ 272 /* up to three lines (each up to 100 characters) or 300 characters, whichever is less */
317 #define PRINT_LINE_THRESHOLD 3 273 #define PRINT_LINE_THRESHOLD 3
318diff --git a/src/shared/pager.c b/src/shared/pager.c
319index 2abb0f6..a00c95f 100644
320--- a/src/shared/pager.c 274--- a/src/shared/pager.c
321+++ b/src/shared/pager.c 275+++ b/src/shared/pager.c
322@@ -25,6 +25,7 @@ 276@@ -25,6 +25,7 @@
@@ -327,8 +281,6 @@ index 2abb0f6..a00c95f 100644
327 281
328 static pid_t pager_pid = 0; 282 static pid_t pager_pid = 0;
329 283
330diff --git a/src/shared/path-lookup.c b/src/shared/path-lookup.c
331index 442fde7..0eb1188 100644
332--- a/src/shared/path-lookup.c 284--- a/src/shared/path-lookup.c
333+++ b/src/shared/path-lookup.c 285+++ b/src/shared/path-lookup.c
334@@ -20,6 +20,7 @@ 286@@ -20,6 +20,7 @@
@@ -339,8 +291,6 @@ index 442fde7..0eb1188 100644
339 291
340 int xdg_user_runtime_dir(char **ret, const char *suffix) { 292 int xdg_user_runtime_dir(char **ret, const char *suffix) {
341 const char *e; 293 const char *e;
342diff --git a/src/shared/uid-range.c b/src/shared/uid-range.c
343index 7cb7d8a..8b12b91 100644
344--- a/src/shared/uid-range.c 294--- a/src/shared/uid-range.c
345+++ b/src/shared/uid-range.c 295+++ b/src/shared/uid-range.c
346@@ -9,6 +9,7 @@ 296@@ -9,6 +9,7 @@
@@ -351,8 +301,6 @@ index 7cb7d8a..8b12b91 100644
351 301
352 static bool uid_range_intersect(UidRange *range, uid_t start, uid_t nr) { 302 static bool uid_range_intersect(UidRange *range, uid_t start, uid_t nr) {
353 assert(range); 303 assert(range);
354diff --git a/src/socket-proxy/socket-proxyd.c b/src/socket-proxy/socket-proxyd.c
355index abbbc9f..6179b58 100644
356--- a/src/socket-proxy/socket-proxyd.c 304--- a/src/socket-proxy/socket-proxyd.c
357+++ b/src/socket-proxy/socket-proxyd.c 305+++ b/src/socket-proxy/socket-proxyd.c
358@@ -28,6 +28,7 @@ 306@@ -28,6 +28,7 @@
@@ -363,8 +311,6 @@ index abbbc9f..6179b58 100644
363 311
364 #define BUFFER_SIZE (256 * 1024) 312 #define BUFFER_SIZE (256 * 1024)
365 313
366diff --git a/src/test/test-hexdecoct.c b/src/test/test-hexdecoct.c
367index 5221742..a05e778 100644
368--- a/src/test/test-hexdecoct.c 314--- a/src/test/test-hexdecoct.c
369+++ b/src/test/test-hexdecoct.c 315+++ b/src/test/test-hexdecoct.c
370@@ -6,6 +6,7 @@ 316@@ -6,6 +6,7 @@
@@ -375,8 +321,6 @@ index 5221742..a05e778 100644
375 321
376 static void test_hexchar(void) { 322 static void test_hexchar(void) {
377 assert_se(hexchar(0xa) == 'a'); 323 assert_se(hexchar(0xa) == 'a');
378diff --git a/src/udev/udev-builtin-path_id.c b/src/udev/udev-builtin-path_id.c
379index 7ce1c56..cc19b8e 100644
380--- a/src/udev/udev-builtin-path_id.c 324--- a/src/udev/udev-builtin-path_id.c
381+++ b/src/udev/udev-builtin-path_id.c 325+++ b/src/udev/udev-builtin-path_id.c
382@@ -23,6 +23,7 @@ 326@@ -23,6 +23,7 @@
@@ -387,8 +331,6 @@ index 7ce1c56..cc19b8e 100644
387 331
388 _printf_(2,3) 332 _printf_(2,3)
389 static void path_prepend(char **path, const char *fmt, ...) { 333 static void path_prepend(char **path, const char *fmt, ...) {
390diff --git a/src/udev/udev-rules.c b/src/udev/udev-rules.c
391index ee87d7c..9aced10 100644
392--- a/src/udev/udev-rules.c 334--- a/src/udev/udev-rules.c
393+++ b/src/udev/udev-rules.c 335+++ b/src/udev/udev-rules.c
394@@ -40,6 +40,7 @@ 336@@ -40,6 +40,7 @@
@@ -399,6 +341,13 @@ index ee87d7c..9aced10 100644
399 341
400 #define PREALLOC_TOKEN 2048 342 #define PREALLOC_TOKEN 2048
401 #define RULES_DIRS (const char* const*) CONF_PATHS_STRV("udev/rules.d") 343 #define RULES_DIRS (const char* const*) CONF_PATHS_STRV("udev/rules.d")
402-- 344--- a/src/login/pam_systemd.c
4032.11.0 345+++ b/src/login/pam_systemd.c
404 346@@ -27,6 +27,7 @@
347 #include "hostname-util.h"
348 #include "login-util.h"
349 #include "macro.h"
350+#include "missing.h"
351 #include "parse-util.h"
352 #include "path-util.h"
353 #include "process-util.h"