util-linux-ng-2.16: Replace siginterrupt with sigaction.
authorKhem Raj <raj.khem@gmail.com>
Wed, 5 Aug 2009 20:26:58 +0000 (13:26 -0700)
committerKhem Raj <raj.khem@gmail.com>
Wed, 5 Aug 2009 20:26:58 +0000 (13:26 -0700)
siginterrupt is obsoleted and newer versions of uclibc
has moved these functions to a different category which is
not enabled by default. Best is to replace it with
sigaction.

Signed-off-by: Khem Raj <raj.khem@gmail.com>
recipes/util-linux-ng/util-linux-ng-2.16/util-linux-ng-replace-siginterrupt.patch [new file with mode: 0644]
recipes/util-linux-ng/util-linux-ng_2.16.bb

diff --git a/recipes/util-linux-ng/util-linux-ng-2.16/util-linux-ng-replace-siginterrupt.patch b/recipes/util-linux-ng/util-linux-ng-2.16/util-linux-ng-replace-siginterrupt.patch
new file mode 100644 (file)
index 0000000..4b5eb73
--- /dev/null
@@ -0,0 +1,23 @@
+Index: util-linux-ng-2.14/login-utils/login.c
+===================================================================
+--- util-linux-ng-2.14.orig/login-utils/login.c        2008-05-28 16:01:02.000000000 -0700
++++ util-linux-ng-2.14/login-utils/login.c     2009-03-04 18:31:42.000000000 -0800
+@@ -358,6 +358,7 @@
+     char *childArgv[10];
+     char *buff;
+     int childArgc = 0;
++    struct sigaction act;
+ #ifdef HAVE_SECURITY_PAM_MISC_H
+     int retcode;
+     pam_handle_t *pamh = NULL;
+@@ -373,7 +374,9 @@
+     pid = getpid();
+     signal(SIGALRM, timedout);
+-    siginterrupt(SIGALRM,1);           /* we have to interrupt syscalls like ioclt() */
++    (void) sigaction(SIGALRM, NULL, &act);
++    act.sa_flags &= ~SA_RESTART;
++    sigaction(SIGALRM, &act, NULL);
+     alarm((unsigned int)timeout);
+     signal(SIGQUIT, SIG_IGN);
+     signal(SIGINT, SIG_IGN);
index c22219a..e81ccca 100644 (file)
@@ -1,9 +1,10 @@
 require util-linux-ng.inc
 
-PR = "${INC_PR}.2"
+PR = "${INC_PR}.3"
 
 SRC_URI += "file://uclibc-compile.patch;patch=1 \
             file://tls.patch;patch=1 \
+           file://util-linux-ng-replace-siginterrupt.patch;patch=1 \
            "
 
 EXTRA_OECONF += " --enable-libuuid --enable-libblkid \