diff options
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 | 86 |
1 files changed, 43 insertions, 43 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 8d1aa7d11a..77bb305874 100644 --- a/meta/recipes-core/systemd/systemd/systemd-pam-fix-msformat.patch +++ b/meta/recipes-core/systemd/systemd/systemd-pam-fix-msformat.patch | |||
@@ -1,10 +1,10 @@ | |||
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-198/src/fsck/fsck.c | 4 | Index: systemd-204/src/fsck/fsck.c |
5 | =================================================================== | 5 | =================================================================== |
6 | --- systemd-198.orig/src/fsck/fsck.c 2013-03-07 13:18:34.000000000 -0800 | 6 | --- systemd-204.orig/src/fsck/fsck.c 2013-04-02 05:48:49.000000000 -0700 |
7 | +++ systemd-198/src/fsck/fsck.c 2013-03-09 14:49:03.756572873 -0800 | 7 | +++ systemd-204/src/fsck/fsck.c 2013-05-23 11:26:51.776345015 -0700 |
8 | @@ -37,6 +37,8 @@ | 8 | @@ -37,6 +37,8 @@ |
9 | #include "virt.h" | 9 | #include "virt.h" |
10 | #include "fileio.h" | 10 | #include "fileio.h" |
@@ -14,7 +14,7 @@ Index: systemd-198/src/fsck/fsck.c | |||
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 | @@ -203,9 +205,16 @@ | 17 | @@ -198,9 +200,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-198/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-198/src/core/swap.c | 36 | Index: systemd-204/src/core/swap.c |
37 | =================================================================== | 37 | =================================================================== |
38 | --- systemd-198.orig/src/core/swap.c 2013-03-07 13:18:34.000000000 -0800 | 38 | --- systemd-204.orig/src/core/swap.c 2013-05-06 12:06:04.000000000 -0700 |
39 | +++ systemd-198/src/core/swap.c 2013-03-09 14:49:03.756572873 -0800 | 39 | +++ systemd-204/src/core/swap.c 2013-05-23 11:26:51.780345015 -0700 |
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-198/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 | @@ -1037,6 +1039,7 @@ | 49 | @@ -1055,6 +1057,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-198/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 | @@ -1044,6 +1047,16 @@ | 57 | @@ -1062,6 +1065,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-198/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-198/src/core/mount-setup.c | 74 | Index: systemd-204/src/core/mount-setup.c |
75 | =================================================================== | 75 | =================================================================== |
76 | --- systemd-198.orig/src/core/mount-setup.c 2013-03-07 13:18:34.000000000 -0800 | 76 | --- systemd-204.orig/src/core/mount-setup.c 2013-04-24 06:34:38.000000000 -0700 |
77 | +++ systemd-198/src/core/mount-setup.c 2013-03-09 14:49:03.760572872 -0800 | 77 | +++ systemd-204/src/core/mount-setup.c 2013-05-23 11:26:51.780345015 -0700 |
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> |
@@ -92,7 +92,7 @@ Index: systemd-198/src/core/mount-setup.c | |||
92 | #ifndef TTY_GID | 92 | #ifndef TTY_GID |
93 | #define TTY_GID 5 | 93 | #define TTY_GID 5 |
94 | #endif | 94 | #endif |
95 | @@ -231,9 +234,12 @@ | 95 | @@ -233,9 +236,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-198/src/core/mount-setup.c | |||
107 | if (feof(f)) | 107 | if (feof(f)) |
108 | break; | 108 | break; |
109 | 109 | ||
110 | Index: systemd-198/src/core/mount.c | 110 | Index: systemd-204/src/core/mount.c |
111 | =================================================================== | 111 | =================================================================== |
112 | --- systemd-198.orig/src/core/mount.c 2013-03-07 13:18:34.000000000 -0800 | 112 | --- systemd-204.orig/src/core/mount.c 2013-05-06 12:06:04.000000000 -0700 |
113 | +++ systemd-198/src/core/mount.c 2013-03-09 14:49:03.760572872 -0800 | 113 | +++ systemd-204/src/core/mount.c 2013-05-23 11:26:51.780345015 -0700 |
114 | @@ -42,6 +42,8 @@ | 114 | @@ -43,6 +43,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-198/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 | @@ -1584,7 +1586,7 @@ | 123 | @@ -1626,7 +1628,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-198/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 | @@ -1603,7 +1605,31 @@ | 132 | @@ -1645,7 +1647,31 @@ |
133 | &fstype, | 133 | &fstype, |
134 | &device, | 134 | &device, |
135 | &options2)) != 5) { | 135 | &options2)) != 5) { |
@@ -162,10 +162,10 @@ Index: systemd-198/src/core/mount.c | |||
162 | if (k == EOF) | 162 | if (k == EOF) |
163 | break; | 163 | break; |
164 | 164 | ||
165 | Index: systemd-198/src/core/umount.c | 165 | Index: systemd-204/src/core/umount.c |
166 | =================================================================== | 166 | =================================================================== |
167 | --- systemd-198.orig/src/core/umount.c 2013-03-07 13:18:34.000000000 -0800 | 167 | --- systemd-204.orig/src/core/umount.c 2013-04-18 08:14:11.000000000 -0700 |
168 | +++ systemd-198/src/core/umount.c 2013-03-09 14:49:03.760572872 -0800 | 168 | +++ systemd-204/src/core/umount.c 2013-05-23 11:26:51.780345015 -0700 |
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,10 +235,10 @@ Index: systemd-198/src/core/umount.c | |||
235 | if (k == EOF) | 235 | if (k == EOF) |
236 | break; | 236 | break; |
237 | 237 | ||
238 | Index: systemd-198/src/shared/socket-util.c | 238 | Index: systemd-204/src/shared/socket-util.c |
239 | =================================================================== | 239 | =================================================================== |
240 | --- systemd-198.orig/src/shared/socket-util.c 2013-03-07 13:18:34.000000000 -0800 | 240 | --- systemd-204.orig/src/shared/socket-util.c 2013-04-18 08:14:11.000000000 -0700 |
241 | +++ systemd-198/src/shared/socket-util.c 2013-03-09 14:49:03.760572872 -0800 | 241 | +++ systemd-204/src/shared/socket-util.c 2013-05-23 11:30:53.528348084 -0700 |
242 | @@ -40,6 +40,8 @@ | 242 | @@ -40,6 +40,8 @@ |
243 | #include "missing.h" | 243 | #include "missing.h" |
244 | #include "fileio.h" | 244 | #include "fileio.h" |
@@ -252,25 +252,25 @@ Index: systemd-198/src/shared/socket-util.c | |||
252 | a->type = SOCK_RAW; | 252 | a->type = SOCK_RAW; |
253 | 253 | ||
254 | errno = 0; | 254 | errno = 0; |
255 | - if (sscanf(s, "%ms %u", &sfamily, &group) < 1) | ||
256 | +#ifdef HAVE_MSFORMAT | 255 | +#ifdef HAVE_MSFORMAT |
257 | + if (sscanf(s, "%ms %u", &sfamily, &group) < 1) | 256 | if (sscanf(s, "%ms %u", &sfamily, &group) < 1) |
257 | - return errno > 0 ? -errno : -EINVAL; | ||
258 | + return errno ? -errno : -EINVAL; | 258 | + return errno ? -errno : -EINVAL; |
259 | +#else | 259 | +#else |
260 | + sfamily = malloc(257); | 260 | + sfamily = malloc(257); |
261 | + if (sscanf(s, "%256s %u", sfamily, &group) < 1) { | 261 | + if (sscanf(s, "%256s %u", sfamily, &group) < 1) { |
262 | + free(sfamily); | 262 | + free(sfamily); |
263 | return errno ? -errno : -EINVAL; | 263 | + return errno ? -errno : -EINVAL; |
264 | + } | 264 | + } |
265 | +#endif /* HAVE_MSFORMAT */ | 265 | +#endif /* HAVE_MSFORMAT */ |
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-198/src/tmpfiles/tmpfiles.c | 269 | Index: systemd-204/src/tmpfiles/tmpfiles.c |
270 | =================================================================== | 270 | =================================================================== |
271 | --- systemd-198.orig/src/tmpfiles/tmpfiles.c 2013-03-07 13:18:34.000000000 -0800 | 271 | --- systemd-204.orig/src/tmpfiles/tmpfiles.c 2013-04-24 06:34:38.000000000 -0700 |
272 | +++ systemd-198/src/tmpfiles/tmpfiles.c 2013-03-09 14:55:40.772566599 -0800 | 272 | +++ systemd-204/src/tmpfiles/tmpfiles.c 2013-05-23 11:26:51.784345016 -0700 |
273 | @@ -51,6 +51,8 @@ | 273 | @@ -52,6 +52,8 @@ |
274 | #include "conf-files.h" | 274 | #include "conf-files.h" |
275 | #include "capability.h" | 275 | #include "capability.h" |
276 | 276 | ||
@@ -279,7 +279,7 @@ Index: systemd-198/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 | @@ -993,6 +995,7 @@ | 282 | @@ -1029,6 +1031,7 @@ |
283 | if (!i) | 283 | if (!i) |
284 | return log_oom(); | 284 | return log_oom(); |
285 | 285 | ||
@@ -287,7 +287,7 @@ Index: systemd-198/src/tmpfiles/tmpfiles.c | |||
287 | r = sscanf(buffer, | 287 | r = sscanf(buffer, |
288 | "%c %ms %ms %ms %ms %ms %n", | 288 | "%c %ms %ms %ms %ms %ms %n", |
289 | &type, | 289 | &type, |
290 | @@ -1002,6 +1005,29 @@ | 290 | @@ -1038,6 +1041,29 @@ |
291 | &group, | 291 | &group, |
292 | &age, | 292 | &age, |
293 | &n); | 293 | &n); |
@@ -316,11 +316,11 @@ Index: systemd-198/src/tmpfiles/tmpfiles.c | |||
316 | + | 316 | + |
317 | if (r < 2) { | 317 | if (r < 2) { |
318 | log_error("[%s:%u] Syntax error.", fname, line); | 318 | log_error("[%s:%u] Syntax error.", fname, line); |
319 | r = -EIO; | 319 | return -EIO; |
320 | Index: systemd-198/src/cryptsetup/cryptsetup-generator.c | 320 | Index: systemd-204/src/cryptsetup/cryptsetup-generator.c |
321 | =================================================================== | 321 | =================================================================== |
322 | --- systemd-198.orig/src/cryptsetup/cryptsetup-generator.c 2013-03-07 13:18:34.000000000 -0800 | 322 | --- systemd-204.orig/src/cryptsetup/cryptsetup-generator.c 2013-05-06 12:06:04.000000000 -0700 |
323 | +++ systemd-198/src/cryptsetup/cryptsetup-generator.c 2013-03-09 14:51:33.080571639 -0800 | 323 | +++ systemd-204/src/cryptsetup/cryptsetup-generator.c 2013-05-23 11:26:51.784345016 -0700 |
324 | @@ -31,6 +31,8 @@ | 324 | @@ -31,6 +31,8 @@ |
325 | #include "strv.h" | 325 | #include "strv.h" |
326 | #include "fileio.h" | 326 | #include "fileio.h" |
@@ -330,7 +330,7 @@ Index: systemd-198/src/cryptsetup/cryptsetup-generator.c | |||
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 | @@ -395,7 +397,16 @@ | 333 | @@ -398,7 +400,16 @@ |
334 | if (*l == '#' || *l == 0) | 334 | if (*l == '#' || *l == 0) |
335 | continue; | 335 | continue; |
336 | 336 | ||