[packages/util-linux] - rel 2; fix dmesg --raw

[arekm]

commit d03e2778aea010b257efe97bae5412c34fce63c9
Author: Arkadiusz Miśkiewicz <arekm at maven.pl>
Date:   Thu Apr 5 18:21:19 2018 +0200

    - rel 2; fix dmesg --raw

 util-linux-bug-614.patch | 34 ++++++++++++++++++++++++++++++++++
 util-linux.spec          |  4 +++-
 2 files changed, 37 insertions(+), 1 deletion(-)
---
diff --git a/util-linux.spec b/util-linux.spec
index b53a00d..3a3b30c 100644
--- a/util-linux.spec
+++ b/util-linux.spec
@@ -37,7 +37,7 @@ Summary(tr.UTF-8):	Temel sistem araçları
 Summary(uk.UTF-8):	Набір базових системних утиліт для Linux
 Name:		util-linux
 Version:	2.32
-Release:	1
+Release:	2
 License:	GPL v2+
 Group:		Applications/System
 # https://github.com/karelzak/util-linux (GitHub backup)
@@ -64,6 +64,7 @@ Patch4:		su-paths.patch
 Patch5:		%{name}-ac.patch
 Patch6:		%{name}-diet.patch
 Patch7:		%{name}-pl.po.patch
+Patch8:		%{name}-bug-614.patch
 URL:		https://github.com/karelzak/util-linux
 BuildRequires:	audit-libs-devel >= 1.0.6
 BuildRequires:	autoconf >= 2.60
@@ -746,6 +747,7 @@ Bashowe dopełnianie parametrów dla poleceń z pakietu util-linux.
 %patch5 -p1
 %{?with_initrd:%patch6 -p1}
 %patch7 -p1
+%patch8 -p1
 
 cp -p %{SOURCE10} nologin.c
 
diff --git a/util-linux-bug-614.patch b/util-linux-bug-614.patch
new file mode 100644
index 0000000..b5e70b4
--- /dev/null
+++ b/util-linux-bug-614.patch
@@ -0,0 +1,34 @@
+commit 6963338ca586bef3370e189f13785b4b6b63bbdb
+Author: Karel Zak <kzak at redhat.com>
+Date:   Thu Apr 5 15:59:59 2018 +0200
+
+    dmesg: fix raw output
+    
+    The commit 5f538ac40c0d215b6c9a881effe4c3b214366715 has introduced
+    regression ("goto" to the wrong place, so timestamps in raw mode is
+    not printed at all).
+    
+    Addresses: https://github.com/karelzak/util-linux/issues/614
+    Signed-off-by: Karel Zak <kzak at redhat.com>
+
+diff --git a/sys-utils/dmesg.c b/sys-utils/dmesg.c
+index 22c381c1d..ba4e22528 100644
+--- a/sys-utils/dmesg.c
++++ b/sys-utils/dmesg.c
+@@ -906,7 +906,7 @@ static void print_record(struct dmesg_control *ctl,
+ 				       LOG_MAKEPRI(rec->facility, rec->level),
+ 				       (long) rec->tv.tv_sec,
+ 				       (long) rec->tv.tv_usec);
+-		goto mesg_output;
++		goto full_output;
+ 	}
+ 
+ 	/* Store decode information (facility & priority level) in a buffer */
+@@ -1008,7 +1008,6 @@ full_output:
+ 			color_disable();
+ 	}
+ 
+-mesg_output:
+ 	/*
+ 	 * A kernel message may contain several lines of output, separated
+ 	 * by '\n'.  If the timestamp and decode outputs are forced then each
================================================================

---- gitweb:

http://git.pld-linux.org/gitweb.cgi/packages/util-linux.git/commitdiff/d03e2778aea010b257efe97bae5412c34fce63c9