diff options
author | Khem Raj <raj.khem@gmail.com> | 2013-03-27 12:08:31 +0000 |
---|---|---|
committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2013-03-27 12:57:49 +0000 |
commit | f17316600204426a2c0d1dce104fed076fe5e5ca (patch) | |
tree | bd228e8e9ab315a1153de375fc4eecc6b5a46fd7 /meta/recipes-core/systemd/systemd/systemd-pam-fix-msformat.patch | |
parent | eddba86f51d210c70568b77ba516d61d2b81177e (diff) | |
download | poky-f17316600204426a2c0d1dce104fed076fe5e5ca.tar.gz |
systemd: Upgrade to 198
Tested on ppc and x86_64
compile tested for uclibc
(From OE-Core rev: effb345e6c84158066620a90e224ad25ba79db34)
Signed-off-by: Khem Raj <raj.khem@gmail.com>
Signed-off-by: Ross Burton <ross.burton@intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta/recipes-core/systemd/systemd/systemd-pam-fix-msformat.patch')
-rw-r--r-- | meta/recipes-core/systemd/systemd/systemd-pam-fix-msformat.patch | 140 |
1 files changed, 70 insertions, 70 deletions
diff --git a/meta/recipes-core/systemd/systemd/systemd-pam-fix-msformat.patch b/meta/recipes-core/systemd/systemd/systemd-pam-fix-msformat.patch index aa186bda72..8d1aa7d11a 100644 --- a/meta/recipes-core/systemd/systemd/systemd-pam-fix-msformat.patch +++ b/meta/recipes-core/systemd/systemd/systemd-pam-fix-msformat.patch | |||
@@ -1,20 +1,20 @@ | |||
1 | Upstream-Status: Denied [no desire for uclibc support] | 1 | Upstream-Status: Denied [no desire for uclibc support] |
2 | Signed-off-by: Khem Raj <raj.khem@gmail.com> | 2 | Signed-off-by: Khem Raj <raj.khem@gmail.com> |
3 | 3 | ||
4 | Index: systemd-196/src/fsck/fsck.c | 4 | Index: systemd-198/src/fsck/fsck.c |
5 | =================================================================== | 5 | =================================================================== |
6 | --- systemd-196.orig/src/fsck/fsck.c 2012-07-26 03:45:14.000000000 -0700 | 6 | --- systemd-198.orig/src/fsck/fsck.c 2013-03-07 13:18:34.000000000 -0800 |
7 | +++ systemd-196/src/fsck/fsck.c 2013-01-21 16:10:46.807537608 -0800 | 7 | +++ systemd-198/src/fsck/fsck.c 2013-03-09 14:49:03.756572873 -0800 |
8 | @@ -36,6 +36,8 @@ | 8 | @@ -37,6 +37,8 @@ |
9 | #include "bus-errors.h" | ||
10 | #include "virt.h" | 9 | #include "virt.h" |
10 | #include "fileio.h" | ||
11 | 11 | ||
12 | +#include "config.h" | 12 | +#include "config.h" |
13 | + | 13 | + |
14 | static bool arg_skip = false; | 14 | static bool arg_skip = false; |
15 | static bool arg_force = false; | 15 | static bool arg_force = false; |
16 | static bool arg_show_progress = false; | 16 | static bool arg_show_progress = false; |
17 | @@ -193,9 +195,16 @@ | 17 | @@ -203,9 +205,16 @@ |
18 | char *device; | 18 | char *device; |
19 | double p; | 19 | double p; |
20 | usec_t t; | 20 | usec_t t; |
@@ -33,10 +33,10 @@ Index: systemd-196/src/fsck/fsck.c | |||
33 | 33 | ||
34 | /* Only show one progress counter at max */ | 34 | /* Only show one progress counter at max */ |
35 | if (!locked) { | 35 | if (!locked) { |
36 | Index: systemd-196/src/core/swap.c | 36 | Index: systemd-198/src/core/swap.c |
37 | =================================================================== | 37 | =================================================================== |
38 | --- systemd-196.orig/src/core/swap.c 2012-10-29 19:40:42.000000000 -0700 | 38 | --- systemd-198.orig/src/core/swap.c 2013-03-07 13:18:34.000000000 -0800 |
39 | +++ systemd-196/src/core/swap.c 2013-01-21 16:15:11.751544181 -0800 | 39 | +++ systemd-198/src/core/swap.c 2013-03-09 14:49:03.756572873 -0800 |
40 | @@ -41,6 +41,8 @@ | 40 | @@ -41,6 +41,8 @@ |
41 | #include "path-util.h" | 41 | #include "path-util.h" |
42 | #include "virt.h" | 42 | #include "virt.h" |
@@ -46,7 +46,7 @@ Index: systemd-196/src/core/swap.c | |||
46 | static const UnitActiveState state_translation_table[_SWAP_STATE_MAX] = { | 46 | static const UnitActiveState state_translation_table[_SWAP_STATE_MAX] = { |
47 | [SWAP_DEAD] = UNIT_INACTIVE, | 47 | [SWAP_DEAD] = UNIT_INACTIVE, |
48 | [SWAP_ACTIVATING] = UNIT_ACTIVATING, | 48 | [SWAP_ACTIVATING] = UNIT_ACTIVATING, |
49 | @@ -1059,6 +1061,7 @@ | 49 | @@ -1037,6 +1039,7 @@ |
50 | char *dev = NULL, *d; | 50 | char *dev = NULL, *d; |
51 | int prio = 0, k; | 51 | int prio = 0, k; |
52 | 52 | ||
@@ -54,7 +54,7 @@ Index: systemd-196/src/core/swap.c | |||
54 | k = fscanf(m->proc_swaps, | 54 | k = fscanf(m->proc_swaps, |
55 | "%ms " /* device/file */ | 55 | "%ms " /* device/file */ |
56 | "%*s " /* type of swap */ | 56 | "%*s " /* type of swap */ |
57 | @@ -1066,6 +1069,16 @@ | 57 | @@ -1044,6 +1047,16 @@ |
58 | "%*s " /* used */ | 58 | "%*s " /* used */ |
59 | "%i\n", /* priority */ | 59 | "%i\n", /* priority */ |
60 | &dev, &prio); | 60 | &dev, &prio); |
@@ -71,10 +71,10 @@ Index: systemd-196/src/core/swap.c | |||
71 | if (k != 2) { | 71 | if (k != 2) { |
72 | if (k == EOF) | 72 | if (k == EOF) |
73 | break; | 73 | break; |
74 | Index: systemd-196/src/core/mount-setup.c | 74 | Index: systemd-198/src/core/mount-setup.c |
75 | =================================================================== | 75 | =================================================================== |
76 | --- systemd-196.orig/src/core/mount-setup.c 2012-11-09 06:55:35.000000000 -0800 | 76 | --- systemd-198.orig/src/core/mount-setup.c 2013-03-07 13:18:34.000000000 -0800 |
77 | +++ systemd-196/src/core/mount-setup.c 2013-01-21 16:10:46.807537608 -0800 | 77 | +++ systemd-198/src/core/mount-setup.c 2013-03-09 14:49:03.760572872 -0800 |
78 | @@ -28,6 +28,7 @@ | 78 | @@ -28,6 +28,7 @@ |
79 | #include <assert.h> | 79 | #include <assert.h> |
80 | #include <unistd.h> | 80 | #include <unistd.h> |
@@ -83,16 +83,16 @@ Index: systemd-196/src/core/mount-setup.c | |||
83 | 83 | ||
84 | #include "mount-setup.h" | 84 | #include "mount-setup.h" |
85 | #include "dev-setup.h" | 85 | #include "dev-setup.h" |
86 | @@ -42,6 +43,8 @@ | 86 | @@ -43,6 +44,8 @@ |
87 | #include "missing.h" | ||
88 | #include "virt.h" | 87 | #include "virt.h" |
88 | #include "efivars.h" | ||
89 | 89 | ||
90 | +#include "config.h" | 90 | +#include "config.h" |
91 | + | 91 | + |
92 | #ifndef TTY_GID | 92 | #ifndef TTY_GID |
93 | #define TTY_GID 5 | 93 | #define TTY_GID 5 |
94 | #endif | 94 | #endif |
95 | @@ -224,9 +227,12 @@ | 95 | @@ -231,9 +234,12 @@ |
96 | for (;;) { | 96 | for (;;) { |
97 | char *controller; | 97 | char *controller; |
98 | int enabled = 0; | 98 | int enabled = 0; |
@@ -107,11 +107,11 @@ Index: systemd-196/src/core/mount-setup.c | |||
107 | if (feof(f)) | 107 | if (feof(f)) |
108 | break; | 108 | break; |
109 | 109 | ||
110 | Index: systemd-196/src/core/mount.c | 110 | Index: systemd-198/src/core/mount.c |
111 | =================================================================== | 111 | =================================================================== |
112 | --- systemd-196.orig/src/core/mount.c 2012-10-22 16:53:02.000000000 -0700 | 112 | --- systemd-198.orig/src/core/mount.c 2013-03-07 13:18:34.000000000 -0800 |
113 | +++ systemd-196/src/core/mount.c 2013-01-21 16:10:46.811537609 -0800 | 113 | +++ systemd-198/src/core/mount.c 2013-03-09 14:49:03.760572872 -0800 |
114 | @@ -41,6 +41,8 @@ | 114 | @@ -42,6 +42,8 @@ |
115 | #include "exit-status.h" | 115 | #include "exit-status.h" |
116 | #include "def.h" | 116 | #include "def.h" |
117 | 117 | ||
@@ -120,7 +120,7 @@ Index: systemd-196/src/core/mount.c | |||
120 | static const UnitActiveState state_translation_table[_MOUNT_STATE_MAX] = { | 120 | static const UnitActiveState state_translation_table[_MOUNT_STATE_MAX] = { |
121 | [MOUNT_DEAD] = UNIT_INACTIVE, | 121 | [MOUNT_DEAD] = UNIT_INACTIVE, |
122 | [MOUNT_MOUNTING] = UNIT_ACTIVATING, | 122 | [MOUNT_MOUNTING] = UNIT_ACTIVATING, |
123 | @@ -1538,7 +1540,7 @@ | 123 | @@ -1584,7 +1586,7 @@ |
124 | int k; | 124 | int k; |
125 | 125 | ||
126 | device = path = options = options2 = fstype = d = p = o = NULL; | 126 | device = path = options = options2 = fstype = d = p = o = NULL; |
@@ -129,7 +129,7 @@ Index: systemd-196/src/core/mount.c | |||
129 | if ((k = fscanf(m->proc_self_mountinfo, | 129 | if ((k = fscanf(m->proc_self_mountinfo, |
130 | "%*s " /* (1) mount id */ | 130 | "%*s " /* (1) mount id */ |
131 | "%*s " /* (2) parent id */ | 131 | "%*s " /* (2) parent id */ |
132 | @@ -1557,7 +1559,31 @@ | 132 | @@ -1603,7 +1605,31 @@ |
133 | &fstype, | 133 | &fstype, |
134 | &device, | 134 | &device, |
135 | &options2)) != 5) { | 135 | &options2)) != 5) { |
@@ -162,10 +162,10 @@ Index: systemd-196/src/core/mount.c | |||
162 | if (k == EOF) | 162 | if (k == EOF) |
163 | break; | 163 | break; |
164 | 164 | ||
165 | Index: systemd-196/src/core/umount.c | 165 | Index: systemd-198/src/core/umount.c |
166 | =================================================================== | 166 | =================================================================== |
167 | --- systemd-196.orig/src/core/umount.c 2012-11-16 09:32:41.000000000 -0800 | 167 | --- systemd-198.orig/src/core/umount.c 2013-03-07 13:18:34.000000000 -0800 |
168 | +++ systemd-196/src/core/umount.c 2013-01-21 16:10:46.811537609 -0800 | 168 | +++ systemd-198/src/core/umount.c 2013-03-09 14:49:03.760572872 -0800 |
169 | @@ -36,6 +36,8 @@ | 169 | @@ -36,6 +36,8 @@ |
170 | #include "util.h" | 170 | #include "util.h" |
171 | #include "virt.h" | 171 | #include "virt.h" |
@@ -235,20 +235,20 @@ Index: systemd-196/src/core/umount.c | |||
235 | if (k == EOF) | 235 | if (k == EOF) |
236 | break; | 236 | break; |
237 | 237 | ||
238 | Index: systemd-196/src/shared/socket-util.c | 238 | Index: systemd-198/src/shared/socket-util.c |
239 | =================================================================== | 239 | =================================================================== |
240 | --- systemd-196.orig/src/shared/socket-util.c 2012-11-14 13:21:15.000000000 -0800 | 240 | --- systemd-198.orig/src/shared/socket-util.c 2013-03-07 13:18:34.000000000 -0800 |
241 | +++ systemd-196/src/shared/socket-util.c 2013-01-21 16:10:46.811537609 -0800 | 241 | +++ systemd-198/src/shared/socket-util.c 2013-03-09 14:49:03.760572872 -0800 |
242 | @@ -39,6 +39,8 @@ | 242 | @@ -40,6 +40,8 @@ |
243 | #include "socket-util.h" | ||
244 | #include "missing.h" | 243 | #include "missing.h" |
244 | #include "fileio.h" | ||
245 | 245 | ||
246 | +#include "config.h" | 246 | +#include "config.h" |
247 | + | 247 | + |
248 | int socket_address_parse(SocketAddress *a, const char *s) { | 248 | int socket_address_parse(SocketAddress *a, const char *s) { |
249 | int r; | 249 | int r; |
250 | char *e, *n; | 250 | char *e, *n; |
251 | @@ -202,8 +204,16 @@ | 251 | @@ -203,8 +205,16 @@ |
252 | a->type = SOCK_RAW; | 252 | a->type = SOCK_RAW; |
253 | 253 | ||
254 | errno = 0; | 254 | errno = 0; |
@@ -266,10 +266,10 @@ Index: systemd-196/src/shared/socket-util.c | |||
266 | 266 | ||
267 | family = netlink_family_from_string(sfamily); | 267 | family = netlink_family_from_string(sfamily); |
268 | if (family < 0) | 268 | if (family < 0) |
269 | Index: systemd-196/src/tmpfiles/tmpfiles.c | 269 | Index: systemd-198/src/tmpfiles/tmpfiles.c |
270 | =================================================================== | 270 | =================================================================== |
271 | --- systemd-196.orig/src/tmpfiles/tmpfiles.c 2012-10-23 16:06:30.000000000 -0700 | 271 | --- systemd-198.orig/src/tmpfiles/tmpfiles.c 2013-03-07 13:18:34.000000000 -0800 |
272 | +++ systemd-196/src/tmpfiles/tmpfiles.c 2013-01-21 16:10:46.811537609 -0800 | 272 | +++ systemd-198/src/tmpfiles/tmpfiles.c 2013-03-09 14:55:40.772566599 -0800 |
273 | @@ -51,6 +51,8 @@ | 273 | @@ -51,6 +51,8 @@ |
274 | #include "conf-files.h" | 274 | #include "conf-files.h" |
275 | #include "capability.h" | 275 | #include "capability.h" |
@@ -279,26 +279,25 @@ Index: systemd-196/src/tmpfiles/tmpfiles.c | |||
279 | /* This reads all files listed in /etc/tmpfiles.d/?*.conf and creates | 279 | /* This reads all files listed in /etc/tmpfiles.d/?*.conf and creates |
280 | * them in the file system. This is intended to be used to create | 280 | * them in the file system. This is intended to be used to create |
281 | * properly owned directories beneath /tmp, /var/tmp, /run, which are | 281 | * properly owned directories beneath /tmp, /var/tmp, /run, which are |
282 | @@ -990,7 +992,7 @@ | 282 | @@ -993,6 +995,7 @@ |
283 | i = new0(Item, 1); | ||
284 | if (!i) | 283 | if (!i) |
285 | return log_oom(); | 284 | return log_oom(); |
286 | - | 285 | |
287 | +#ifdef HAVE_MSFORMAT | 286 | +#ifdef HAVE_MSFORMAT |
288 | if (sscanf(buffer, | 287 | r = sscanf(buffer, |
289 | "%c " | 288 | "%c %ms %ms %ms %ms %ms %n", |
290 | "%ms " | 289 | &type, |
291 | @@ -1006,6 +1008,28 @@ | 290 | @@ -1002,6 +1005,29 @@ |
292 | &group, | 291 | &group, |
293 | &age, | 292 | &age, |
294 | &n) < 2) { | 293 | &n); |
295 | +#else | 294 | +#else |
296 | + i->path = malloc(257); | 295 | + i->path = malloc(257); |
297 | + mode = malloc(257); | 296 | + mode = malloc(257); |
298 | + user = malloc(257); | 297 | + user = malloc(257); |
299 | + group = malloc(257); | 298 | + group = malloc(257); |
300 | + age = malloc(257); | 299 | + age = malloc(257); |
301 | + if (sscanf(buffer, | 300 | + r = sscanf(buffer, |
302 | + "%c " | 301 | + "%c " |
303 | + "%256s " | 302 | + "%256s " |
304 | + "%256s " | 303 | + "%256s " |
@@ -312,38 +311,39 @@ Index: systemd-196/src/tmpfiles/tmpfiles.c | |||
312 | + user, | 311 | + user, |
313 | + group, | 312 | + group, |
314 | + age, | 313 | + age, |
315 | + &n) < 2) { | 314 | + &n); |
316 | +#endif /* HAVE_MSFORMAT */ | 315 | +#endif /* HAVE_MSFORMAT */ |
316 | + | ||
317 | if (r < 2) { | ||
317 | log_error("[%s:%u] Syntax error.", fname, line); | 318 | log_error("[%s:%u] Syntax error.", fname, line); |
318 | r = -EIO; | 319 | r = -EIO; |
319 | goto finish; | 320 | Index: systemd-198/src/cryptsetup/cryptsetup-generator.c |
320 | Index: systemd-196/src/cryptsetup/cryptsetup-generator.c | ||
321 | =================================================================== | 321 | =================================================================== |
322 | --- systemd-196.orig/src/cryptsetup/cryptsetup-generator.c 2012-08-08 14:53:24.000000000 -0700 | 322 | --- systemd-198.orig/src/cryptsetup/cryptsetup-generator.c 2013-03-07 13:18:34.000000000 -0800 |
323 | +++ systemd-196/src/cryptsetup/cryptsetup-generator.c 2013-01-21 16:10:46.811537609 -0800 | 323 | +++ systemd-198/src/cryptsetup/cryptsetup-generator.c 2013-03-09 14:51:33.080571639 -0800 |
324 | @@ -30,6 +30,8 @@ | 324 | @@ -31,6 +31,8 @@ |
325 | #include "virt.h" | ||
326 | #include "strv.h" | 325 | #include "strv.h" |
326 | #include "fileio.h" | ||
327 | 327 | ||
328 | +#include "config.h" | 328 | +#include "config.h" |
329 | + | 329 | + |
330 | static const char *arg_dest = "/tmp"; | 330 | static const char *arg_dest = "/tmp"; |
331 | static bool arg_enabled = true; | 331 | static bool arg_enabled = true; |
332 | static bool arg_read_crypttab = true; | 332 | static bool arg_read_crypttab = true; |
333 | @@ -421,8 +423,15 @@ | 333 | @@ -395,7 +397,16 @@ |
334 | l = strstrip(line); | 334 | if (*l == '#' || *l == 0) |
335 | if (*l == '#' || *l == 0) | 335 | continue; |
336 | continue; | 336 | |
337 | - | ||
338 | +#ifdef HAVE_MSFORMAT | 337 | +#ifdef HAVE_MSFORMAT |
339 | k = sscanf(l, "%ms %ms %ms %ms", &name, &device, &password, &options); | 338 | k = sscanf(l, "%ms %ms %ms %ms", &name, &device, &password, &options); |
340 | +#else | 339 | +#else |
341 | + name = malloc(257); | 340 | + name = malloc(257); |
342 | + device = malloc(257); | 341 | + device = malloc(257); |
343 | + password = malloc(257); | 342 | + password = malloc(257); |
344 | + options = malloc(257); | 343 | + options = malloc(257); |
345 | + k = sscanf(l, "%256s %256s %256s %256s", name, device, password, options); | 344 | + k = sscanf(l, "%256s %256s %256s %256s", name, device, password, options); |
346 | +#endif /* HAVE_MSFORMAT */ | 345 | +#endif /* HAVE_MSFORMAT */ |
347 | if (k < 2 || k > 4) { | 346 | + |
348 | log_error("Failed to parse /etc/crypttab:%u, ignoring.", n); | 347 | if (k < 2 || k > 4) { |
349 | r = EXIT_FAILURE; | 348 | log_error("Failed to parse /etc/crypttab:%u, ignoring.", n); |
349 | r = EXIT_FAILURE; | ||