diff options
author | Saul Wold <sgw@linux.intel.com> | 2012-02-27 00:45:48 -0800 |
---|---|---|
committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2012-02-28 12:27:46 +0000 |
commit | 79e8d533eec5dc0b1831bd4c6e4959401c7f1fcb (patch) | |
tree | 6253b2390a781ad4e84a50108ca158b553890c4c /meta/recipes-core/util-linux/util-linux-2.21/util-linux-ng-replace-siginterrupt.patch | |
parent | ef461c4a2a3e056adc875662f3c26f2cb4b9f161 (diff) | |
download | poky-79e8d533eec5dc0b1831bd4c6e4959401c7f1fcb.tar.gz |
util-linux: Update to 2.21
This updates various checksums for the COPYING files, which moved in the process
no changes to Licenses
Tweak the scanf_cv_alloc_modifier and rebase the patch
(From OE-Core rev: 9cb35b41c803bd0d1904b2dc0e14624fa7ea6e95)
Signed-off-by: Saul Wold <sgw@linux.intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta/recipes-core/util-linux/util-linux-2.21/util-linux-ng-replace-siginterrupt.patch')
-rw-r--r-- | meta/recipes-core/util-linux/util-linux-2.21/util-linux-ng-replace-siginterrupt.patch | 26 |
1 files changed, 26 insertions, 0 deletions
diff --git a/meta/recipes-core/util-linux/util-linux-2.21/util-linux-ng-replace-siginterrupt.patch b/meta/recipes-core/util-linux/util-linux-2.21/util-linux-ng-replace-siginterrupt.patch new file mode 100644 index 0000000000..ef56048c60 --- /dev/null +++ b/meta/recipes-core/util-linux/util-linux-2.21/util-linux-ng-replace-siginterrupt.patch | |||
@@ -0,0 +1,26 @@ | |||
1 | Upstream-Status: Pending | ||
2 | |||
3 | Index: util-linux-2.21/login-utils/login.c | ||
4 | =================================================================== | ||
5 | --- util-linux-2.21.orig/login-utils/login.c | ||
6 | +++ util-linux-2.21/login-utils/login.c | ||
7 | @@ -1216,6 +1216,8 @@ int main(int argc, char **argv) | ||
8 | char *buff; | ||
9 | int childArgc = 0; | ||
10 | int retcode; | ||
11 | + struct sigaction act; | ||
12 | + | ||
13 | |||
14 | char *pwdbuf = NULL; | ||
15 | struct passwd *pwd = NULL, _pwd; | ||
16 | @@ -1229,7 +1231,9 @@ int main(int argc, char **argv) | ||
17 | timeout = getlogindefs_num("LOGIN_TIMEOUT", LOGIN_TIMEOUT); | ||
18 | |||
19 | signal(SIGALRM, timedout); | ||
20 | - siginterrupt(SIGALRM, 1); /* we have to interrupt syscalls like ioclt() */ | ||
21 | + (void) sigaction(SIGALRM, NULL, &act); | ||
22 | + act.sa_flags &= ~SA_RESTART; | ||
23 | + sigaction(SIGALRM, &act, NULL); | ||
24 | alarm((unsigned int)timeout); | ||
25 | signal(SIGQUIT, SIG_IGN); | ||
26 | signal(SIGINT, SIG_IGN); | ||