2.23.2-4: #1005566 #1005194

2.24-libfdisk-fix-SIGFPE.patch

@@ -0,0 +1,39 @@
+From 44baaedaffee029dca76796b933412d97a19dff6 Mon Sep 17 00:00:00 2001
+From: Karel Zak <kzak@redhat.com>
+Date: Mon, 9 Sep 2013 10:57:50 +0200
+Subject: [PATCH] libfdisk: fix SIGFPE
+
+ #0 recount_geometry at libfdisk/src/alignment.c:143
+ #1 fdisk_discover_geometry at libfdisk/src/alignment.c:205
+ #2 fdisk_context_assign_device at libfdisk/src/context.c:173
+ #3 print_partition_table_from_option at fdisks/fdisk.c:924
+
+References: https://bugzilla.redhat.com/show_bug.cgi?id=1005566
+Signed-off-by: Karel Zak <kzak@redhat.com>
+---
+ libfdisk/src/alignment.c | 9 +++++----
+ 1 file changed, 5 insertions(+), 4 deletions(-)
+
+diff --git a/libfdisk/src/alignment.c b/libfdisk/src/alignment.c
+index ac44e73..4d4ab48 100644
+--- a/libfdisk/src/alignment.c
++++ b/libfdisk/src/alignment.c
+@@ -193,11 +193,12 @@ int fdisk_discover_geometry(struct fdisk_context *cxt)
+
+	/* what the kernel/bios thinks the geometry is */
+	blkdev_get_geometry(cxt->dev_fd, &h, &s);
+-	if (!h && !s) {
+-		/* unable to discover geometry, use default values */
+-		s = 63;
++
++	/* defaults */
++	if (!h)
+		h = 255;
+-	}
++	if (!s)
++		s = 63;
+
+	/* obtained heads and sectors */
+	cxt->geom.heads = h;
+--
+1.8.1.4

2.24-su-fix-lastlog-and-btmp-logging.patch

@@ -0,0 +1,47 @@
+From 9b5dc4cb8d5d82c31c0cda898832998c21afc303 Mon Sep 17 00:00:00 2001
+From: Karel Zak <kzak@redhat.com>
+Date: Mon, 9 Sep 2013 12:24:01 +0200
+Subject: [PATCH] su: fix lastlog and btmp logging
+
+The su(1) logging code mix ups "old" and "new" passwd structs. The
+result is things like
+
+	Sep  9 11:50:45 x2 su: (to kzak) kzak on none
+
+in /var/log/messages. The right log entry is
+
+	Sep  9 11:50:45 x2 su: (to root) kzak on pts/3
+
+The bug has been introduced by commit c74a7af17c7a176c358dfaa8e1814786c89ebc14.
+
+References: https://bugzilla.redhat.com/show_bug.cgi?id=1005194
+Signed-off-by: Karel Zak <kzak@redhat.com>
+---
+ login-utils/su-common.c | 5 +----
+ 1 file changed, 1 insertion(+), 4 deletions(-)
+
+diff --git a/login-utils/su-common.c b/login-utils/su-common.c
+index ade5c92..858af01 100644
+--- a/login-utils/su-common.c
++++ b/login-utils/su-common.c
+@@ -161,7 +161,7 @@ log_syslog(struct passwd const *pw, bool successful)
+       old_user = pwd ? pwd->pw_name : "";
+     }
+
+-  if (get_terminal_name(STDERR_FILENO, NULL, &tty, NULL) == 0 && tty)
++  if (get_terminal_name(STDERR_FILENO, NULL, &tty, NULL) != 0 || !tty)
+     tty = "none";
+
+   openlog (program_invocation_short_name, 0 , LOG_AUTH);
+@@ -483,9 +483,6 @@ authenticate (const struct passwd *pw)
+
+ done:
+
+-  if (lpw && lpw->pw_name)
+-     pw = lpw;
+-
+   log_syslog(pw, !is_pam_failure(retval));
+
+   if (is_pam_failure(retval))
+--
+1.8.1.4

util-linux.spec

@@ -2,7 +2,7 @@
 Summary: A collection of basic system utilities
 Name: util-linux
 Version: 2.23.2
-Release: 3%{?dist}
+Release: 4%{?dist}
 License: GPLv2 and GPLv2+ and LGPLv2+ and BSD with advertising and Public Domain
 Group: System Environment/Base
 URL: http://en.wikipedia.org/wiki/Util-linux
@@ -85,6 +85,11 @@ Patch2: 2.24-su-suppress-PAM-info-messages.patch
 Patch3: 2.24-libmount-canonicalize-for-conversion-from-loopdev.patch
 # v2.24 backport: #921498 - multiple internal testsuite failures
 Patch4: 2.24-tests-portability.patch
+# v2.24 backport: #1005566 - recount_geometry: Process /usr/sbin/fdisk was killed by signal 8 (SIGFPE)
+Patch5: 2.24-libfdisk-fix-SIGFPE.patch
+# v2.24 backport: #1005194 - su generates incorrect log entries
+Patch6: 2.24-su-fix-lastlog-and-btmp-logging.patch
+
 
 %description
 The util-linux package contains a large variety of low-level system
@@ -801,6 +806,10 @@ fi
 %{_libdir}/pkgconfig/uuid.pc
 
 %changelog
+* Mon Sep  9 2013 Karel Zak <kzak@redhat.com> 2.23.2-4
+- fix #1005566 - recount_geometry: Process /usr/sbin/fdisk was killed by signal 8 (SIGFPE)
+- fix #1005194 - su generates incorrect log entries
+
 * Mon Sep  9 2013 Karel Zak <kzak@redhat.com> 2.23.2-3
 - refresh and rename patches
 - fix #987787 - Remove lastlogin from su