public inbox for git-commits@fedoraproject.org
help / color / mirror / Atom feed
* [rpms/procps-ng] rawhide: Rebase to procps-ng-4.0.7
@ 2026-08-17 10:37 Jan Rybar
0 siblings, 0 replies; only message in thread
From: Jan Rybar @ 2026-08-17 10:37 UTC (permalink / raw)
To: git-commits
A new commit has been pushed.
Repo : rpms/procps-ng
Branch : rawhide
Commit : 4a5171b91e2631224c478455ff57567761af56bc
Author : Jan Rybar <jrybar@redhat.com>
Date : 2026-08-17T12:37:13+02:00
Stats : +140/-3 in 4 file(s)
URL : https://src.fedoraproject.org/rpms/procps-ng/c/4a5171b91e2631224c478455ff57567761af56bc?branch=rawhide
Log:
Rebase to procps-ng-4.0.7
- backport of upstream patch !300: visible tasks sorted by memory
---
diff --git a/.gitignore b/.gitignore
index ef8773e..33a9790 100644
--- a/.gitignore
+++ b/.gitignore
@@ -2,3 +2,4 @@
/procps-ng-4.0.3.tar.xz
/procps-ng-4.0.4.tar.xz
/procps-ng-4.0.6.tar.xz
+/procps-ng-4.0.7.tar.xz
diff --git a/300.patch b/300.patch
new file mode 100644
index 0000000..a56b903
--- /dev/null
+++ b/300.patch
@@ -0,0 +1,130 @@
+From 1db2da1c4332bca7233816a5c532973404da2c61 Mon Sep 17 00:00:00 2001
+From: Jan Rybar <jrybar@redhat.com>
+Date: Wed, 13 May 2026 09:00:01 +0200
+Subject: [PATCH 1/3] top: crawl all user tasks after sorting by memory enabled
+
+When top is run with -u <user> and sorting is switched to Memory, many
+user's tasks are hidden and need to be scrolled.
+When any sort-changing key (M, N, P, T, <, >, R) is pressed, the process array q->ppt gets completely reshuffled. But begtask is carried over from the old sort order.
+
+To fix this issue, it is needed to reset begtask to 0 in keys_xtra() so that after a sort change, window_hlp() starts its forward scan from the very beginning of the newly sorted array, guaranteeing it finds the first matching process.
+
+Red Hat issue https://redhat.atlassian.net/browse/RHEL-46760
+---
+ src/top/top.c | 3 +++
+ 1 file changed, 3 insertions(+)
+
+diff --git a/src/top/top.c b/src/top/top.c
+index e6c16fad..bb4ec8c1 100644
+--- a/src/top/top.c
++++ b/src/top/top.c
+@@ -6108,6 +6108,7 @@ static void keys_task (int ch) {
+ #endif
+ if (p >= w->procflgs) {
+ w->rc.sortindx = *p;
++ w->begtask = 0;
+ #ifndef TREE_NORESET
+ OFFw(w, Show_FOREST);
+ #endif
+@@ -6129,6 +6130,7 @@ static void keys_task (int ch) {
+ #endif
+ if (p < w->procflgs + w->maxpflgs) {
+ w->rc.sortindx = *p;
++ w->begtask = 0;
+ #ifndef TREE_NORESET
+ OFFw(w, Show_FOREST);
+ #endif
+@@ -6451,6 +6453,7 @@ static void keys_xtra (int ch) {
+ default: // keep gcc happy
+ break;
+ }
++ w->begtask = 0;
+ // some have objected to this message, so we'll just keep silent...
+ // show_msg(fmtmk("%s sort compatibility key honored", xmsg));
+ } // end: keys_xtra
+--
+GitLab
+
+
+From 006b4d78ff5562e6ee8a974679cf92cf73e86b88 Mon Sep 17 00:00:00 2001
+From: Jan Rybar <jrybar@redhat.com>
+Date: Thu, 14 May 2026 14:33:41 +0200
+Subject: [PATCH 2/3] top: Add begtask reset to 'V' and 'R' keys too
+
+The task-hiding-issue fix should also be applied to 'R' (reverse sort)
+and 'V' (show tree) keys.
+---
+ src/top/top.c | 2 ++
+ 1 file changed, 2 insertions(+)
+
+diff --git a/src/top/top.c b/src/top/top.c
+index bb4ec8c1..407be801 100644
+--- a/src/top/top.c
++++ b/src/top/top.c
+@@ -6178,6 +6178,7 @@ static void keys_task (int ch) {
+ OFFw(w, Show_FOREST);
+ }
+ #endif
++ w->begtask = 0;
+ break;
+ case 'S':
+ if (VIZCHKw(w)) {
+@@ -6208,6 +6209,7 @@ static void keys_task (int ch) {
+ ? N_txt(ON_word_only_txt) : N_txt(OFF_one_word_txt)));
+ if (!CHKw(w, Show_FOREST)) w->focus_pid = 0;
+ }
++ w->begtask = 0;
+ break;
+ case 'v':
+ if (VIZCHKw(w)) {
+--
+GitLab
+
+
+From 60fe5496610e68d1dadf38c57a2e165dceb0e953 Mon Sep 17 00:00:00 2001
+From: Jim Warner <james.warner@comcast.net>
+Date: Mon, 18 May 2026 10:40:38 +0200
+Subject: [PATCH 3/3] top: begtask reset conditional for 'R' and 'V'
+
+Co-authored-by: Jan Rybar <jrybar@redhat.com>
+---
+ src/top/top.c | 9 ++++++---
+ 1 file changed, 6 insertions(+), 3 deletions(-)
+
+diff --git a/src/top/top.c b/src/top/top.c
+index 407be801..7a359b16 100644
+--- a/src/top/top.c
++++ b/src/top/top.c
+@@ -6171,14 +6171,17 @@ static void keys_task (int ch) {
+ break;
+ case 'R':
+ #ifdef TREE_NORESET
+- if (!CHKw(w, Show_FOREST)) VIZTOGw(w, Qsrt_NORMAL);
++ if (!CHKw(w, Show_FOREST)) {
++ VIZTOGw(w, Qsrt_NORMAL);
++ w->begtask = 0;
++ }
+ #else
+ if (VIZCHKw(w)) {
+ TOGw(w, Qsrt_NORMAL);
+ OFFw(w, Show_FOREST);
++ w->begtask = 0;
+ }
+ #endif
+- w->begtask = 0;
+ break;
+ case 'S':
+ if (VIZCHKw(w)) {
+@@ -6208,8 +6211,8 @@ static void keys_task (int ch) {
+ show_msg(fmtmk(N_fmt(FOREST_modes_fmt) , CHKw(w, Show_FOREST)
+ ? N_txt(ON_word_only_txt) : N_txt(OFF_one_word_txt)));
+ if (!CHKw(w, Show_FOREST)) w->focus_pid = 0;
++ w->begtask = 0;
+ }
+- w->begtask = 0;
+ break;
+ case 'v':
+ if (VIZCHKw(w)) {
+--
+GitLab
+
diff --git a/procps-ng.spec b/procps-ng.spec
index e5f2480..7e1f78a 100644
--- a/procps-ng.spec
+++ b/procps-ng.spec
@@ -3,13 +3,15 @@
Summary: System and process monitoring utilities
Name: procps-ng
-Version: 4.0.6
-Release: 2%{?dist}
+Version: 4.0.7
+Release: 1%{?dist}
License: GPL-2.0-or-later AND LGPL-2.0-or-later AND LGPL-2.1-or-later
URL: https://sourceforge.net/projects/procps-ng/
Source0: https://downloads.sourceforge.net/%{name}/%{name}-%{version}.tar.xz
+Patch01: 300.patch
+
BuildRequires: make
BuildRequires: ncurses-devel
BuildRequires: libtool
@@ -159,6 +161,10 @@ ln -s %{_bindir}/pidof %{buildroot}%{_sbindir}/pidof
%files i18n -f %{name}.lang
%changelog
+* Mon Aug 17 2026 Jan Rybar <jrybar@redhat.com> - 4.0.7-1
+- Rebase to procps-ng-4.0.7
+- backport of upstream patch !300: visible tasks sorted by memory
+
* Thu Jul 16 2026 Fedora Release Engineering <releng@fedoraproject.org> - 4.0.6-2
- Rebuilt for https://fedoraproject.org/wiki/Fedora_45_Mass_Rebuild
diff --git a/sources b/sources
index a53c7cc..4267a65 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-SHA512 (procps-ng-4.0.6.tar.xz) = c499aa14b6c94eda3a455bfe0d2d3c74c79dd718bffbd20207bd0831cb87725b83a76e4ee537a49ddf112bd1248a156d35da00035cbcd4c22037a20dcb4bdc9c
+SHA512 (procps-ng-4.0.7.tar.xz) = 8c4cd796af9edcf027661b7f97a02f47d8c96c732b334f5943278780026e774ab490ae0a836ee67d2624f0762510f4098fec23e13f405c2263a1ee1a17edf35e
^ permalink raw reply related [flat|nested] only message in thread
only message in thread, other threads:[~2026-08-17 10:37 UTC | newest]
Thread overview: (only message) (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2026-08-17 10:37 [rpms/procps-ng] rawhide: Rebase to procps-ng-4.0.7 Jan Rybar
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox