commit aba047e6234256f8673c4ab49719be4a2ac70e49
Author: Jakub Bogusz <[email protected]>
Date: Tue Aug 28 19:07:00 2018 +0200
- updated to 2.32.1
- removed obsolete bug-614 patch
util-linux-bug-614.patch | 34 ----------------------------------
util-linux.spec | 10 ++++------
2 files changed, 4 insertions(+), 40 deletions(-)
---
diff --git a/util-linux.spec b/util-linux.spec
index fad4de8..36f971d 100644
--- a/util-linux.spec
+++ b/util-linux.spec
@@ -36,13 +36,13 @@ Summary(ru.UTF-8): Набор базовых системных утилит д
Summary(tr.UTF-8): Temel sistem araçları
Summary(uk.UTF-8): Набір базових системних утиліт для Linux
Name: util-linux
-Version: 2.32
-Release: 3
+Version: 2.32.1
+Release: 1
License: GPL v2+
Group: Applications/System
# https://github.com/karelzak/util-linux (GitHub backup)
-Source0:
https://www.kernel.org/pub/linux/utils/util-linux/v%{version}/%{name}-%{version}.tar.xz
-# Source0-md5: e0d8a25853f88cd15ff557e5d8cb4ea7
+Source0:
https://www.kernel.org/pub/linux/utils/util-linux/v2.32/%{name}-%{version}.tar.xz
+# Source0-md5: 9e5b1b8c1dc99455bdb6b462cf9436d9
Source1:
http://www.mif.pg.gda.pl/homepages/ankry/man-PLD/%{name}-non-english-man-pages.tar.bz2
# Source1-md5: 3c940c7e7fe699eaa2ddb1bffb3de2fe
Source2: login.pamd
@@ -64,7 +64,6 @@ 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
@@ -747,7 +746,6 @@ 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
deleted file mode 100644
index b5e70b4..0000000
--- a/util-linux-bug-614.patch
+++ /dev/null
@@ -1,34 +0,0 @@
-commit 6963338ca586bef3370e189f13785b4b6b63bbdb
-Author: Karel Zak <[email protected]>
-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 <[email protected]>
-
-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/aba047e6234256f8673c4ab49719be4a2ac70e49
_______________________________________________
pld-cvs-commit mailing list
[email protected]
http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit
