From f991f6faa904115c1487450a36cf3f1171fbb694 Mon Sep 17 00:00:00 2001 From: Karel Zak Date: Thu, 23 Jul 2020 14:51:41 +0200 Subject: [PATCH] 2.36-1: upgrade --- .gitignore | 1 + 2.28-login-lastlog-create.patch | 12 ------------ 2.36-login-lastlog-create.patch | 12 ++++++++++++ sources | 2 +- util-linux.spec | 27 +++++++++++++++++++-------- 5 files changed, 33 insertions(+), 21 deletions(-) delete mode 100644 2.28-login-lastlog-create.patch create mode 100644 2.36-login-lastlog-create.patch diff --git a/.gitignore b/.gitignore index 1a63250..3126fff 100644 --- a/.gitignore +++ b/.gitignore @@ -77,3 +77,4 @@ /util-linux-2.35.tar.xz /util-linux-2.35.1.tar.xz /util-linux-2.35.2.tar.xz +/util-linux-2.36.tar.xz diff --git a/2.28-login-lastlog-create.patch b/2.28-login-lastlog-create.patch deleted file mode 100644 index 869543e..0000000 --- a/2.28-login-lastlog-create.patch +++ /dev/null @@ -1,12 +0,0 @@ -diff -up util-linux-2.28/login-utils/login.c.kzak util-linux-2.28/login-utils/login.c ---- util-linux-2.28/login-utils/login.c.kzak 2016-03-08 14:28:16.724156218 +0100 -+++ util-linux-2.28/login-utils/login.c 2016-04-26 12:45:29.235326017 +0200 -@@ -510,7 +510,7 @@ static void log_lastlog(struct login_con - sa.sa_handler = SIG_IGN; - sigaction(SIGXFSZ, &sa, &oldsa_xfsz); - -- fd = open(_PATH_LASTLOG, O_RDWR, 0); -+ fd = open(_PATH_LASTLOG, O_RDWR | O_CREAT, 0); - if (fd < 0) - goto done; - diff --git a/2.36-login-lastlog-create.patch b/2.36-login-lastlog-create.patch new file mode 100644 index 0000000..e2523d3 --- /dev/null +++ b/2.36-login-lastlog-create.patch @@ -0,0 +1,12 @@ +diff -up util-linux-2.36/login-utils/login.c.kzak util-linux-2.36/login-utils/login.c +--- util-linux-2.36/login-utils/login.c.kzak 2020-07-23 14:13:26.777030764 +0200 ++++ util-linux-2.36/login-utils/login.c 2020-07-23 14:11:22.793686983 +0200 +@@ -585,7 +585,7 @@ static void log_lastlog(struct login_con + sa.sa_handler = SIG_IGN; + sigaction(SIGXFSZ, &sa, &oldsa_xfsz); + +- fd = open(_PATH_LASTLOG, O_RDWR, 0); ++ fd = open(_PATH_LASTLOG, O_RDWR | O_CREAT, 0); + if (fd < 0) + goto done; + offset = cxt->pwd->pw_uid * sizeof(ll); diff --git a/sources b/sources index 1716aeb..e271813 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (util-linux-2.35.2.tar.xz) = 59e038ba71aa74c9af6f927b357483a965f675ab3ffcd25cf0c1b043656312d2d2d07c55659fd3da69ede165bec313e0ae7e1cd73758e49681ae610604b399a2 +SHA512 (util-linux-2.36.tar.xz) = cbb4975da8d99a1edd45514171d59ea7b019ce0f77a81e88b447a733f725e91c53540d9dc78bc626dc011dca129b8b150aaf9e64ccf62a4202ae816581acf4fd diff --git a/util-linux.spec b/util-linux.spec index e8cbc1a..55f4255 100644 --- a/util-linux.spec +++ b/util-linux.spec @@ -1,8 +1,8 @@ ### Header Summary: A collection of basic system utilities Name: util-linux -Version: 2.35.2 -Release: 2%{?dist} +Version: 2.36 +Release: 1%{?dist} License: GPLv2 and GPLv2+ and LGPLv2+ and BSD with advertising and Public Domain URL: http://en.wikipedia.org/wiki/Util-linux @@ -100,7 +100,7 @@ Requires: libfdisk = %{version}-%{release} ### Ready for upstream? ### # 151635 - makeing /var/log/lastlog -Patch0: 2.28-login-lastlog-create.patch +Patch0: 2.36-login-lastlog-create.patch %description The util-linux package contains a large variety of low-level system @@ -508,13 +508,13 @@ fi %{_unitdir}/fstrim.* %{_bindir}/cal +%{_bindir}/chmem +%{_bindir}/choom %{_bindir}/chrt %{_bindir}/col %{_bindir}/colcrt %{_bindir}/colrm %{_bindir}/column -%{_bindir}/choom -%{_bindir}/chmem %{_bindir}/dmesg %{_bindir}/eject %{_bindir}/fallocate @@ -528,6 +528,7 @@ fi %{_bindir}/ipcmk %{_bindir}/ipcrm %{_bindir}/ipcs +%{_bindir}/irqtop %{_bindir}/isosize %{_bindir}/kill %{_bindir}/last @@ -537,6 +538,7 @@ fi %{_bindir}/lsblk %{_bindir}/lscpu %{_bindir}/lsipc +%{_bindir}/lsirq %{_bindir}/lslocks %{_bindir}/lslogins %{_bindir}/lsmem @@ -553,8 +555,8 @@ fi %{_bindir}/renice %{_bindir}/rev %{_bindir}/script -%{_bindir}/scriptreplay %{_bindir}/scriptlive +%{_bindir}/scriptreplay %{_bindir}/setarch %{_bindir}/setpriv %{_bindir}/setsid @@ -587,6 +589,7 @@ fi %{_mandir}/man1/ipcmk.1* %{_mandir}/man1/ipcrm.1* %{_mandir}/man1/ipcs.1* +%{_mandir}/man1/irqtop.1* %{_mandir}/man1/kill.1* %{_mandir}/man1/last.1* %{_mandir}/man1/lastb.1* @@ -595,6 +598,7 @@ fi %{_mandir}/man1/look.1* %{_mandir}/man1/lscpu.1* %{_mandir}/man1/lsipc.1* +%{_mandir}/man1/lsirq.1* %{_mandir}/man1/lslogins.1* %{_mandir}/man1/lsmem.1* %{_mandir}/man1/mcookie.1* @@ -609,8 +613,8 @@ fi %{_mandir}/man1/rev.1* %{_mandir}/man1/runuser.1* %{_mandir}/man1/script.1* -%{_mandir}/man1/scriptreplay.1* %{_mandir}/man1/scriptlive.1* +%{_mandir}/man1/scriptreplay.1* %{_mandir}/man1/setpriv.1* %{_mandir}/man1/setsid.1* %{_mandir}/man1/setterm.1* @@ -746,6 +750,7 @@ fi %{compldir}/ipcmk %{compldir}/ipcrm %{compldir}/ipcs +%{compldir}/irqtop %{compldir}/isosize %{compldir}/last %{compldir}/ldattach @@ -755,6 +760,7 @@ fi %{compldir}/lsblk %{compldir}/lscpu %{compldir}/lsipc +%{compldir}/lsirq %{compldir}/lslocks %{compldir}/lslogins %{compldir}/lsmem @@ -782,8 +788,8 @@ fi %{compldir}/rtcwake %{compldir}/runuser %{compldir}/script -%{compldir}/scriptreplay %{compldir}/scriptlive +%{compldir}/scriptreplay %{compldir}/setarch %{compldir}/setpriv %{compldir}/setsid @@ -927,6 +933,11 @@ fi %{_libdir}/python*/site-packages/libmount/ %changelog +* Thu Jul 23 2020 Karel Zak - 2.36-1 +- upgrade to upstream release v2.36 + https://www.kernel.org/pub/linux/utils/util-linux/v2.36/v2.36-ReleaseNotes +- add irqtop and lsirq commands + * Tue May 26 2020 Miro Hrončok - 2.35.2-2 - Rebuilt for Python 3.9