diff options
author | Saul Wold <sgw@linux.intel.com> | 2012-04-30 11:26:24 -0700 |
---|---|---|
committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2012-05-03 15:48:06 +0100 |
commit | 034cebebb294a025c5ed1d60d6332f982d2b93ce (patch) | |
tree | 67ea779326e9d6b3d3c8066261ce4d7c1d32c044 /meta/recipes-core/util-linux/util-linux/remove_sigsetmark.patch | |
parent | 6362e9c01e999fb24269cc117a049f4c42e6b27a (diff) | |
download | poky-034cebebb294a025c5ed1d60d6332f982d2b93ce.tar.gz |
util-linux: Update to 2.21.1
(From OE-Core rev: 2114d734b9c4ace980ef9fa30dd5b5f76f49b934)
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/remove_sigsetmark.patch')
-rw-r--r-- | meta/recipes-core/util-linux/util-linux/remove_sigsetmark.patch | 35 |
1 files changed, 35 insertions, 0 deletions
diff --git a/meta/recipes-core/util-linux/util-linux/remove_sigsetmark.patch b/meta/recipes-core/util-linux/util-linux/remove_sigsetmark.patch new file mode 100644 index 0000000000..02e4d16ff7 --- /dev/null +++ b/meta/recipes-core/util-linux/util-linux/remove_sigsetmark.patch | |||
@@ -0,0 +1,35 @@ | |||
1 | simpleinit: remove deprecated sigsetmask() | ||
2 | |||
3 | The sigsetmask() is deprecated in favor of sigprocmask(). | ||
4 | |||
5 | This is not needed upstream since simpleinit is removed from | ||
6 | util-linux-ng master | ||
7 | |||
8 | Signed-off-by: Khem Raj <raj.khem@gmail.com> | ||
9 | |||
10 | Upstream-Status: Inappropriate | ||
11 | |||
12 | Index: util-linux-2.19.1/simpleinit/shutdown.c | ||
13 | =================================================================== | ||
14 | --- util-linux-2.19.1.orig/simpleinit/shutdown.c 2011-03-04 03:47:47.000000000 -0800 | ||
15 | +++ util-linux-2.19.1/simpleinit/shutdown.c 2011-07-06 08:43:39.183849752 -0700 | ||
16 | @@ -145,7 +145,7 @@ | ||
17 | { | ||
18 | int c, i, fd; | ||
19 | char *ptr; | ||
20 | - | ||
21 | + sigset_t sigmask; | ||
22 | i = getdtablesize (); | ||
23 | for (fd = 3; fd < i; fd++) close (fd); | ||
24 | if (getpid () == 1) | ||
25 | @@ -153,7 +153,9 @@ | ||
26 | for (fd = 0; fd < 3; fd++) close (fd); | ||
27 | while (1) wait (NULL); /* Grim reaper never stops */ | ||
28 | } | ||
29 | - sigsetmask (0); /* simpleinit(8) blocks all signals: undo for ALRM */ | ||
30 | + /* simpleinit(8) blocks all signals: undo for ALRM */ | ||
31 | + sigemptyset(&sigmask); | ||
32 | + sigprocmask (SIG_SETMASK, &sigmask, NULL); | ||
33 | for (i = 1; i < NSIG; i++) signal (i, SIG_DFL); | ||
34 | |||
35 | setlocale(LC_ALL, ""); | ||