procps: upgrade from 4.0.5 to 4.0.6

Remove patch top_large_pid_fix.patch, already in 4.0.6

Signed-off-by: Changqing Li <changqing.li@windriver.com>
Signed-off-by: Mathieu Dubois-Briand <mathieu.dubois-briand@bootlin.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>

diff --git a/meta/recipes-extended/procps/procps/top_large_pid_fix.patch b/meta/recipes-extended/procps/procps/top_large_pid_fix.patch
deleted file mode 100644 (file)
index d7e3141..0000000
--- a/meta/recipes-extended/procps/procps/top_large_pid_fix.patch
+++ /dev/null
@@ -1,52 +0,0 @@
-From f21fc624d960d12afa399af7333d4f9193fb2ffb Mon Sep 17 00:00:00 2001
-From: Jim Warner <james.warner@comcast.net>
-Date: Tue, 16 Sep 2025 12:00:00 -0500
-Subject: [PATCH] library: avoid possible segmentation fault, <pids> api
-Upstream-Status: Backport
-[https://gitlab.com/procps-ng/procps/-/commit/5461b50b1a85c5e556c4cd2739ca8ffdbc69399a]
-
-In the issue referenced below, that SEGV was caused by
-passing a '-1' pid to the procps_pids_select function.
-That value, in turn, is caused by providing a LONG_MAX
-or greater number for what was assigned to an integer.
-
-So, this commit will help ensure we avoid a match when
-we should fail plus skip some unproductive libc calls.
-
-[ the same problem occurs in that old 3.3.17 library ]
-
-Reference(s):
-https://gitlab.com/procps-ng/procps/-/issues/394
-
-Signed-off-by: Jim Warner <james.warner@comcast.net>
-Signed-off-by: Amaury Couderc <amaury.couderc@est.tech>
-
----
- library/readproc.c | 4 ++--
- 1 file changed, 2 insertions(+), 2 deletions(-)
-
-diff --git a/library/readproc.c b/library/readproc.c
-index 2dfe4c9e..d0e039bf 100644
---- a/library/readproc.c
-+++ b/library/readproc.c
-@@ -1434,7 +1434,7 @@ static int listed_nextpid (PROCTAB *PT, proc_t *p) {
-   pid_t pid = *(PT->pids)++;
-   char *path = PT->path;
- 
--  if (pid) {
-+  if (pid > 0) {
-     snprintf(path, PROCPATHLEN, "/proc/%d", pid);
-     p->tid = p->tgid = pid;        // this tgid may be a huge fib |
- 
-@@ -1546,7 +1546,7 @@ PROCTAB *openproc(unsigned flags, ...) {
-         did_stat = 1;
-     }
-     PT->taskdir = NULL;
--    PT->taskdir_user = -1;
-+    PT->taskdir_user = -2;
-     PT->taskfinder = simple_nexttid;
-     PT->taskreader = simple_readtask;
- 
--- 
-2.43.0
-

diff --git a/meta/recipes-extended/procps/procps_4.0.5.bb b/meta/recipes-extended/procps/procps_4.0.6.bb
similarity index 97%
rename from meta/recipes-extended/procps/procps_4.0.5.bb
rename to meta/recipes-extended/procps/procps_4.0.6.bb
index 0e0e06f0d2853d981169ed7d855943f57dd11b6b..168027077b7603c728c74fbfee883bec0ec8ac00 100644 (file)
--- a/meta/recipes-extended/procps/procps_4.0.5.bb
+++ b/meta/recipes-extended/procps/procps_4.0.6.bb
@@ -14,9 +14,8 @@ inherit autotools gettext pkgconfig update-alternatives
 
 SRC_URI = "git://gitlab.com/procps-ng/procps.git;protocol=https;branch=master;tag=v${PV} \
            file://sysctl.conf \
-           file://top_large_pid_fix.patch \
            "
-SRCREV = "f46b2f7929cdfe2913ed0a7f585b09d6adbf994e"
+SRCREV = "4dafddf4c3f4646caa517f039a2307e92657ec93"
 
 # Upstream has a custom autogen.sh which invokes po/update-potfiles as they
 # don't ship a po/POTFILES.in (which is silly).  Without that file gettext