From d3224d47ec659949e47c090e75b1190773144f44 Mon Sep 17 00:00:00 2001 From: Karel Zak Date: Tue, 13 Feb 2018 13:42:48 +0100 Subject: [PATCH] 2.32-0.1: upstream upgrade --- .gitignore | 1 + ...-Revert-dmesg-fragment-concatenation.patch | 194 ------------------ sources | 2 +- util-linux.spec | 16 +- 4 files changed, 9 insertions(+), 204 deletions(-) delete mode 100644 0001-Revert-dmesg-fragment-concatenation.patch diff --git a/.gitignore b/.gitignore index cd9cdca..8ab6480 100644 --- a/.gitignore +++ b/.gitignore @@ -62,3 +62,4 @@ /util-linux-2.31-rc1.tar.xz /util-linux-2.31-rc2.tar.xz /util-linux-2.31.tar.xz +/util-linux-2.32-rc1.tar.xz diff --git a/0001-Revert-dmesg-fragment-concatenation.patch b/0001-Revert-dmesg-fragment-concatenation.patch deleted file mode 100644 index 7680766..0000000 --- a/0001-Revert-dmesg-fragment-concatenation.patch +++ /dev/null @@ -1,194 +0,0 @@ -From 8a6f0cfd96a3a7f0e72079407af4b8ed705c1ed2 Mon Sep 17 00:00:00 2001 -From: Karel Zak -Date: Mon, 30 Oct 2017 15:04:20 +0100 -Subject: [PATCH] Revert "dmesg: fragment concatenation" - -* introduces regressions -* stupid code; parse_kmsg_record() called more than once for each record - -This reverts commit 22eb2f0190d8a9850da750641439ccd284ac0bfe. ---- - sys-utils/dmesg.c | 117 ++++-------------------------------------------------- - 1 file changed, 7 insertions(+), 110 deletions(-) - -diff --git a/sys-utils/dmesg.c b/sys-utils/dmesg.c -index b626380f7..6e5911a76 100644 ---- a/sys-utils/dmesg.c -+++ b/sys-utils/dmesg.c -@@ -20,7 +20,6 @@ - #include - #include - #include --#include - - #include "c.h" - #include "colors.h" -@@ -179,8 +178,6 @@ struct dmesg_control { - int kmsg; /* /dev/kmsg file descriptor */ - ssize_t kmsg_first_read;/* initial read() return code */ - char kmsg_buf[BUFSIZ];/* buffer to read kmsg data */ -- char kmsg_saved[BUFSIZ];/* buffer to save line after fragment */ -- ssize_t kmsg_saved_size; /* if nonzero, read from kmsg_saved */ - - /* - * For the --file option we mmap whole file. The unnecessary (already -@@ -209,7 +206,6 @@ struct dmesg_record { - int level; - int facility; - struct timeval tv; -- char flags; - - const char *next; /* buffer with next unparsed record */ - size_t next_size; /* size of the next buffer */ -@@ -226,13 +222,6 @@ struct dmesg_record { - - static int read_kmsg(struct dmesg_control *ctl); - -- --static int parse_kmsg_record(struct dmesg_control *ctl, -- struct dmesg_record *rec, -- char *buf, -- size_t sz); -- -- - static int set_level_color(int log_level, const char *mesg, size_t mesgsz) - { - int id = -1; -@@ -1024,101 +1013,15 @@ static void print_buffer(struct dmesg_control *ctl, - print_record(ctl, &rec); - } - --/* -- * Read one record from kmsg, automatically concatenating message fragments -- */ - static ssize_t read_kmsg_one(struct dmesg_control *ctl) - { - ssize_t size; -- struct dmesg_record rec = { .flags = 0 }; -- char fragment_buf[BUFSIZ] = { 0 }; -- ssize_t fragment_offset = 0; -- -- if (ctl->kmsg_saved_size != 0) { -- size = ctl->kmsg_saved_size; -- memcpy(ctl->kmsg_buf, ctl->kmsg_saved, size); -- ctl->kmsg_saved_size = 0; -- return size; -- } - -- /* -- * kmsg returns EPIPE if record was modified while reading. -- * Read records until there is one with a flag different from 'c'/'+', -- * which indicates that a fragment (if it exists) is complete. -- */ -+ /* kmsg returns EPIPE if record was modified while reading */ - do { -- /* -- * If there is a fragment in progress, and we're in follow mode, -- * read with a timeout so that if no line is read in 100ms, we can -- * assume that the fragment is the last line in /dev/kmsg and it -- * is completed. -- */ -- if (ctl->follow && fragment_offset) { -- struct pollfd pfd = {.fd = ctl->kmsg, .events = POLLIN}; -- poll(&pfd, 1, 100); -- /* If 100ms has passed and kmsg has no data to read() */ -- if (!(pfd.revents & POLLIN)) { -- memcpy(ctl->kmsg_buf, fragment_buf, fragment_offset); -- return fragment_offset + 1; -- } -- } -- size = read(ctl->kmsg, ctl->kmsg_buf, sizeof(ctl->kmsg_buf) - 1); -- -- /* -- * If read() would have blocked and we have a fragment in -- * progress, assume that it's completed (ie. it was the last line -- * in the ring buffer) otherwise it won't be displayed until -- * another non-fragment message is logged. -- */ -- if (errno == EAGAIN && fragment_offset) { -- memcpy(ctl->kmsg_buf, fragment_buf, fragment_offset); -- return fragment_offset + 1; -- } -- -- if (parse_kmsg_record(ctl, &rec, ctl->kmsg_buf, -- (size_t) size) == 0) { -- /* -- * 'c' can indicate a start of a fragment or a -- * continuation, '+' is used in older kernels to -- * indicate a continuation. -- */ -- if (rec.flags == 'c' || rec.flags == '+') { -- if (!fragment_offset) { -- memcpy(fragment_buf, ctl->kmsg_buf, size); -- fragment_offset = size - 1; -- } else { -- /* -- * In case of a buffer overflow, just -- * truncate the fragment - no one should -- * be logging this much anyway -- */ -- ssize_t truncate_size = min( -- fragment_offset + rec.mesg_size, -- sizeof(fragment_buf)); -- -- memcpy(fragment_buf + fragment_offset, -- rec.mesg, truncate_size); -- fragment_offset += rec.mesg_size; -- } -- -- } else if (rec.flags == '-') { -- /* -- * If there was a fragment being built, move it -- * into kmsg_buf, but first save a copy of the -- * current message so that it doesn't get lost. -- */ -- if (fragment_offset) { -- memcpy(ctl->kmsg_saved, -- ctl->kmsg_buf, size); -- ctl->kmsg_saved_size = size; -- memcpy(ctl->kmsg_buf, -- fragment_buf, fragment_offset); -- return fragment_offset + 1; -- } -- } -- } -- } while ((size < 0 && errno == EPIPE) || -- (rec.flags == 'c' || rec.flags == '+')); -+ size = read(ctl->kmsg, ctl->kmsg_buf, -+ sizeof(ctl->kmsg_buf) - 1); -+ } while (size < 0 && errno == EPIPE); - - return size; - } -@@ -1212,17 +1115,11 @@ static int parse_kmsg_record(struct dmesg_control *ctl, - if (LAST_KMSG_FIELD(p)) - goto mesg; - -- /* D) flags */ -- rec->flags = *p; // flag is one char -- p = p + 1; -- if (LAST_KMSG_FIELD(p)) -- goto mesg; -- -- /* E) optional fields (ignore) */ -+ /* D) optional fields (ignore) */ - p = skip_item(p, end, ";"); - - mesg: -- /* F) message text */ -+ /* E) message text */ - rec->mesg = p; - p = skip_item(p, end, "\n"); - -@@ -1238,7 +1135,7 @@ mesg: - */ - unhexmangle_to_buffer(rec->mesg, (char *) rec->mesg, rec->mesg_size + 1); - -- /* G) message tags (ignore) */ -+ /* F) message tags (ignore) */ - - return 0; - } --- -2.13.6 - diff --git a/sources b/sources index 8d319dc..d59c8b7 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (util-linux-2.31.tar.xz) = 48b668526e96a132736b882090d0e33c20b4b3a0e1760502d83118ed98ccc9423d310848a2bb73f82f85e9c19f6191075ae2c5269b007e76be1fbd7b6b88fbf5 +SHA512 (util-linux-2.32-rc1.tar.xz) = 46ccffb1b10b9b386ac04d1d627ae291a2e710f723546d527c6ffdf30e276694f8c19d4cbb563a0a5f1e5a30f1b4be7a5009f7de5a26b11d761138861c711fc1 diff --git a/util-linux.spec b/util-linux.spec index 728a80b..e44bfd1 100644 --- a/util-linux.spec +++ b/util-linux.spec @@ -1,14 +1,14 @@ ### Header Summary: A collection of basic system utilities Name: util-linux -Version: 2.31 -Release: 5%{?dist} +Version: 2.32 +Release: 0.1%{?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 ### Macros -%define upstream_version %{version} +%define upstream_version %{version}-rc1 %define upstream_major %(eval echo %{version} | %{__sed} -e 's/\([[:digit:]]*\)\.\([[:digit:]]*\)\.[[:digit:]]*$/\1.\2/') %define compldir %{_datadir}/bash-completion/completions/ @@ -92,9 +92,6 @@ Requires: libfdisk = %{version}-%{release} # 151635 - makeing /var/log/lastlog Patch0: 2.28-login-lastlog-create.patch -# upstream -Patch1: 0001-Revert-dmesg-fragment-concatenation.patch - %description The util-linux package contains a large variety of low-level system utilities that are necessary for a Linux system to function. Among @@ -339,9 +336,6 @@ echo '.so man8/raw.8' > $RPM_BUILD_ROOT%{_mandir}/man8/rawdevices.8 # sbin -> bin mv ${RPM_BUILD_ROOT}%{_sbindir}/raw ${RPM_BUILD_ROOT}%{_bindir}/raw -# bin -> sbin (v2.31 bug, will be fixed in v2.31.1) -mv ${RPM_BUILD_ROOT}%{_bindir}/rfkill ${RPM_BUILD_ROOT}%{_sbindir}/rfkill - # And a dirs uuidd needs that the makefiles don't create install -d ${RPM_BUILD_ROOT}/run/uuidd install -d ${RPM_BUILD_ROOT}/var/lib/libuuid @@ -943,6 +937,10 @@ exit 0 %{_libdir}/python*/site-packages/libmount/ %changelog +* Tue Feb 13 2018 Karel Zak - 2.32-0.1 +- upgrade to v2.32-rc1 + http://www.kernel.org/pub/linux/utils/util-linux/v2.32/v2.32-ReleaseNotes + * Fri Feb 09 2018 Fedora Release Engineering - 2.31-5 - Rebuilt for https://fedoraproject.org/wiki/Fedora_28_Mass_Rebuild