13 files changed, 37 insertions, 34 deletions

diff --git a/meta/recipes-core/util-linux/util-linux-2.20.1/util-linux-ng-replace-siginterrupt.patch b/meta/recipes-core/util-linux/util-linux-2.20.1/util-linux-ng-replace-siginterrupt.patch
deleted file mode 100644
index c5c0affcb8..0000000000
--- a/meta/recipes-core/util-linux/util-linux-2.20.1/util-linux-ng-replace-siginterrupt.patch
+++ /dev/null
@@ -1,25 +0,0 @@
-Upstream-Status: Pending
-
-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);
diff --git a/meta/recipes-core/util-linux/util-linux-2.20.1/MCONFIG b/meta/recipes-core/util-linux/util-linux-2.21/MCONFIG
index 3fea2c02d7..3fea2c02d7 100644
--- a/meta/recipes-core/util-linux/util-linux-2.20.1/MCONFIG
+++ b/meta/recipes-core/util-linux/util-linux-2.21/MCONFIG
diff --git a/meta/recipes-core/util-linux/util-linux-2.20.1/defines.h b/meta/recipes-core/util-linux/util-linux-2.21/defines.h
index 6ce6b86df5..6ce6b86df5 100644
--- a/meta/recipes-core/util-linux/util-linux-2.20.1/defines.h
+++ b/meta/recipes-core/util-linux/util-linux-2.21/defines.h
diff --git a/meta/recipes-core/util-linux/util-linux-2.20.1/make_include b/meta/recipes-core/util-linux/util-linux-2.21/make_include
index e6abcd91f7..e6abcd91f7 100644
--- a/meta/recipes-core/util-linux/util-linux-2.20.1/make_include
+++ b/meta/recipes-core/util-linux/util-linux-2.21/make_include
diff --git a/meta/recipes-core/util-linux/util-linux-2.20.1/remove-lscpu.patch b/meta/recipes-core/util-linux/util-linux-2.21/remove-lscpu.patch
index 434e28d637..434e28d637 100644
--- a/meta/recipes-core/util-linux/util-linux-2.20.1/remove-lscpu.patch
+++ b/meta/recipes-core/util-linux/util-linux-2.21/remove-lscpu.patch
diff --git a/meta/recipes-core/util-linux/util-linux-2.20.1/remove_sigsetmark.patch b/meta/recipes-core/util-linux/util-linux-2.21/remove_sigsetmark.patch
index 02e4d16ff7..02e4d16ff7 100644
--- a/meta/recipes-core/util-linux/util-linux-2.20.1/remove_sigsetmark.patch
+++ b/meta/recipes-core/util-linux/util-linux-2.21/remove_sigsetmark.patch
diff --git a/meta/recipes-core/util-linux/util-linux-2.20.1/swapargs.h b/meta/recipes-core/util-linux/util-linux-2.21/swapargs.h
index e960eef05f..e960eef05f 100644
--- a/meta/recipes-core/util-linux/util-linux-2.20.1/swapargs.h
+++ b/meta/recipes-core/util-linux/util-linux-2.21/swapargs.h
diff --git a/meta/recipes-core/util-linux/util-linux-2.20.1/uclibc-__progname-conflict.patch b/meta/recipes-core/util-linux/util-linux-2.21/uclibc-__progname-conflict.patch
index 45826b180a..45826b180a 100644
--- a/meta/recipes-core/util-linux/util-linux-2.20.1/uclibc-__progname-conflict.patch
+++ b/meta/recipes-core/util-linux/util-linux-2.21/uclibc-__progname-conflict.patch
diff --git a/meta/recipes-core/util-linux/util-linux-2.20.1/uclibc-compile.patch b/meta/recipes-core/util-linux/util-linux-2.21/uclibc-compile.patch
index 75774d8200..75774d8200 100644
--- a/meta/recipes-core/util-linux/util-linux-2.20.1/uclibc-compile.patch
+++ b/meta/recipes-core/util-linux/util-linux-2.21/uclibc-compile.patch
diff --git a/meta/recipes-core/util-linux/util-linux-2.20.1/util-linux-ng-2.16-mount_lock_path.patch b/meta/recipes-core/util-linux/util-linux-2.21/util-linux-ng-2.16-mount_lock_path.patch
index 5773d7ea1b..5773d7ea1b 100644
--- a/meta/recipes-core/util-linux/util-linux-2.20.1/util-linux-ng-2.16-mount_lock_path.patch
+++ b/meta/recipes-core/util-linux/util-linux-2.21/util-linux-ng-2.16-mount_lock_path.patch
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 @@
+Upstream-Status: Pending
+
+Index: util-linux-2.21/login-utils/login.c
+===================================================================
+--- util-linux-2.21.orig/login-utils/login.c
++++ util-linux-2.21/login-utils/login.c
+@@ -1216,6 +1216,8 @@ int main(int argc, char **argv)
+        char *buff;
+        int childArgc = 0;
+        int retcode;
++       struct sigaction act;
++
+ 
+        char *pwdbuf = NULL;
+        struct passwd *pwd = NULL, _pwd;
+@@ -1229,7 +1231,9 @@ int main(int argc, char **argv)
+        timeout = getlogindefs_num("LOGIN_TIMEOUT", LOGIN_TIMEOUT);
+ 
+        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);
diff --git a/meta/recipes-core/util-linux/util-linux.inc b/meta/recipes-core/util-linux/util-linux.inc
index f60f33b922..1a3d293fd6 100644
--- a/meta/recipes-core/util-linux/util-linux.inc
+++ b/meta/recipes-core/util-linux/util-linux.inc
@@ -9,9 +9,11 @@ LICENSE = "GPLv2+ & LGPLv2.1+ & BSD"
 
 LIC_FILES_CHKSUM = "file://README.licensing;md5=9c920d811858a74b67a36ba23cbaa95f \
                     file://COPYING;md5=59530bdf33659b29e73d4adb9f9f6552 \
-                    file://licenses/COPYING.GPL;md5=8ca43cbc842c2336e835926c2166c28b \
-                    file://licenses/COPYING.UCB;md5=263860f8968d8bafa5392cab74285262 \
-                    file://getopt/COPYING;md5=8ca43cbc842c2336e835926c2166c28b"
+                    file://Documentation/licenses/COPYING.GPLv2;md5=8ca43cbc842c2336e835926c2166c28b \
+                    file://Documentation/licenses/COPYING.LGPLv2.1;md5=bbb461211a33b134d42ed5ee802b37ff \
+                    file://Documentation/licenses/COPYING.BSD-3;md5=58dcd8452651fc8b07d1f65ce07ca8af \
+                    file://Documentation/licenses/COPYING.UCB;md5=263860f8968d8bafa5392cab74285262 \
+                    file://getopt/COPYING;md5=c3a41733416fb80af7ba1b7e1f712551"
 
 inherit autotools gettext pkgconfig
 DEPENDS = "zlib ncurses"
diff --git a/meta/recipes-core/util-linux/util-linux_2.20.1.bb b/meta/recipes-core/util-linux/util-linux_2.21.bb
index ed445d7e69..aa6ac649a3 100644
--- a/meta/recipes-core/util-linux/util-linux_2.20.1.bb
+++ b/meta/recipes-core/util-linux/util-linux_2.21.bb
@@ -1,5 +1,5 @@
-MAJOR_VERSION = "2.20"
-PR = "r2"
+MAJOR_VERSION = "2.21"
+PR = "r0"
 require util-linux.inc
 
 # note that `lscpu' is under GPLv3+
@@ -10,15 +10,15 @@ SRC_URI += "file://util-linux-ng-replace-siginterrupt.patch \
             file://uclibc-__progname-conflict.patch \      
 "
 
-SRC_URI[md5sum] = "079b37517fd4e002a2e6e992e8b4e361"
-SRC_URI[sha256sum] = "d16ebcda3e64ab88ed363d9c1242cdb7ccfd5e1f56c83d0c3b0638c23793bbe0"
+SRC_URI[md5sum] = "3c7a26963f3921c1e775a80330321870"
+SRC_URI[sha256sum] = "2813ae6fe0449b60402e122c2baf97f26aa53e6e2dd05591c6cbcdf67ffdb6c6"
 
 # Only lscpu part is gplv3; rest of the code is not, 
 # so take out the lscpu parts while running non-gplv3 build.
 python () {
     d.setVar("REMOVELSCPU", "no")
     if (d.getVar("INCOMPATIBLE_LICENSE", True) or "").find("GPLv3") != -1:
-        # avoid GPLv3 
+        # avoid GPLv3
         d.setVar("REMOVELSCPU", "yes")
         packages = (d.getVar("PACKAGES", False) or "").split()
         if "util-linux-lscpu" in packages:
@@ -39,7 +39,7 @@ do_remove_lscpu() {
 
 addtask remove_lscpu before do_configure after do_patch
 
-CACHED_CONFIGUREVARS += "scanf_cv_type_modifier=as"
+CACHED_CONFIGUREVARS += "scanf_cv_alloc_modifier=as"
 EXTRA_OECONF_virtclass-native += "--disable-fallocate --disable-use-tty-group"
 
 do_install_append () {