From 90d1c4b9d46180bc821e702163c8c14013e0dd38 Mon Sep 17 00:00:00 2001 From: Leah Neukirchen Date: Tue, 13 May 2025 23:44:05 +0200 Subject: [PATCH] procps-ng: update to 4.0.5. --- common/shlibs | 2 +- .../patches/0001-fix-breakage-in-unhex.patch | 29 +++++++++++++++++++ srcpkgs/procps-ng/template | 6 ++-- 3 files changed, 33 insertions(+), 4 deletions(-) create mode 100644 srcpkgs/procps-ng/patches/0001-fix-breakage-in-unhex.patch diff --git a/common/shlibs b/common/shlibs index d8f498c7c73..c86acc14eb8 100644 --- a/common/shlibs +++ b/common/shlibs @@ -2396,7 +2396,7 @@ libopenraw.so.7 libopenraw-0.1.0_1 libopenrawgnome.so.7 libopenraw-0.1.0_1 libclutter-gst-3.0.so.0 clutter-gst3-3.0.4_1 libgsound.so.0 gsound-1.0.1_1 -libproc2.so.0 procps-ng-4.0.3_1 +libproc2.so.1 procps-ng-4.0.5_1 libgegl-0.4.so.0 gegl-0.4.56_1 libgegl-npd-0.4.so gegl-0.4.56_1 libgegl-sc-0.4.so gegl-0.4.56_1 diff --git a/srcpkgs/procps-ng/patches/0001-fix-breakage-in-unhex.patch b/srcpkgs/procps-ng/patches/0001-fix-breakage-in-unhex.patch new file mode 100644 index 00000000000..e05cdd4e6a5 --- /dev/null +++ b/srcpkgs/procps-ng/patches/0001-fix-breakage-in-unhex.patch @@ -0,0 +1,29 @@ +From b6f858f08d355739c49099f87a8590379f2b250d Mon Sep 17 00:00:00 2001 +From: Christian Hesse +Date: Mon, 20 Jan 2025 12:03:11 +0100 +Subject: [PATCH 1/1] fix breakage in unhex + +This broke in commit 23491ebf40cd85de4ec62b135da513cbe88632e0, where +ITEMS_COUNT was introduced for procps_pids_new(). But we still want to +calculate with base of 16 here... + +Fixes: https://gitlab.com/procps-ng/procps/-/issues/369 + +Signed-off-by: Christian Hesse +--- + src/pgrep.c | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/src/pgrep.c b/src/pgrep.c +index 6fc25dd4..4fdc46ce 100644 +--- a/src/pgrep.c ++++ b/src/pgrep.c +@@ -498,7 +498,7 @@ static unsigned long long unhex (const char *restrict in) + unsigned long long ret; + char *rem; + errno = 0; +- ret = strtoull(in, &rem, ITEMS_COUNT); ++ ret = strtoull(in, &rem, 16); + if (errno || *rem != '\0') { + xwarnx(_("not a hex string: %s"), in); + return 0; diff --git a/srcpkgs/procps-ng/template b/srcpkgs/procps-ng/template index ae01f117532..a839ab84971 100644 --- a/srcpkgs/procps-ng/template +++ b/srcpkgs/procps-ng/template @@ -1,7 +1,7 @@ # Template file for 'procps-ng' pkgname=procps-ng -version=4.0.4 -revision=2 +version=4.0.5 +revision=1 build_style=gnu-configure configure_args="--exec-prefix=/ --bindir=/usr/bin --sbindir=/usr/bin --libdir=/usr/lib --disable-kill --enable-watch8bit @@ -15,7 +15,7 @@ license="GPL-2.0-or-later, LGPL-2.1-or-later" homepage="https://gitlab.com/procps-ng/procps" changelog="https://gitlab.com/procps-ng/procps/raw/master/NEWS" distfiles="${SOURCEFORGE_SITE}/procps-ng/Production/procps-ng-${version}.tar.xz" -checksum=22870d6feb2478adb617ce4f09a787addaf2d260c5a8aa7b17d889a962c5e42e +checksum=c2e6d193cc78f84cd6ddb72aaf6d5c6a9162f0470e5992092057f5ff518562fa # "pmap X with unreachable process" and "pmap XX with unreachable process" fail # in the CI. make_check=ci-skip