Christian Hesse pushed to branch main at Arch Linux / Packaging / Packages / procps-ng
Commits: 4a382ea8 by Christian Hesse at 2025-01-23T13:51:22+01:00 upgpkg: 4.0.5-2: fix breakage in unhex https://gitlab.com/procps-ng/procps/-/issues/369 https://gitlab.com/procps-ng/procps/-/merge_requests/247 - - - - - 3 changed files: - .SRCINFO - + 0001-fix-breakage-in-unhex.patch - PKGBUILD Changes: ===================================== .SRCINFO ===================================== @@ -1,7 +1,7 @@ pkgbase = procps-ng pkgdesc = Utilities for monitoring your system and its processes pkgver = 4.0.5 - pkgrel = 1 + pkgrel = 2 url = https://gitlab.com/procps-ng/procps arch = x86_64 license = GPL @@ -23,8 +23,11 @@ pkgbase = procps-ng replaces = sysvinit-tools options = !emptydirs source = git+https://gitlab.com/procps-ng/procps.git#tag=v4.0.5?signed + source = 0001-fix-breakage-in-unhex.patch validpgpkeys = 5D2FB320B825D93904D205193938F96BDF50FEA5 sha256sums = 640ad0085ee013efb94877072cfa7c0c025884dc8cc398e331b7efb6ebaefc01 + sha256sums = 5386ca099f38dc1c0e0521f193896ff38c6c7a3855090ff4e245f1d6d165708d b2sums = 4f5d23ecd02434e83896e93840dddbe0896e321c7cb2294a54d280abf03b87302489ef7d99c56476952d1364eb4acfe7715b06b2b56a956373e037b0a273111b + b2sums = 80c67d37768c56e9c9eff24ed51ffef115cdba8ed670294ac02241b752167fc595ecb7cfebfb203dc9ba2891350c4921660f694cd1acea49fb2f55d521ee99b2 pkgname = procps-ng ===================================== 0001-fix-breakage-in-unhex.patch ===================================== @@ -0,0 +1,29 @@ +From b6f858f08d355739c49099f87a8590379f2b250d Mon Sep 17 00:00:00 2001 +From: Christian Hesse <[email protected]> +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 <[email protected]> +--- + 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; ===================================== PKGBUILD ===================================== @@ -6,7 +6,7 @@ pkgname=procps-ng pkgver=4.0.5 -pkgrel=1 +pkgrel=2 pkgdesc='Utilities for monitoring your system and its processes' url='https://gitlab.com/procps-ng/procps' license=(GPL LGPL) @@ -18,13 +18,21 @@ provides=(procps sysvinit-tools libproc2.so) replaces=(procps sysvinit-tools) options=('!emptydirs') validpgpkeys=('5D2FB320B825D93904D205193938F96BDF50FEA5') # Craig Small <[email protected]> -source=("git+https://gitlab.com/procps-ng/procps.git#tag=v${pkgver}?signed";) -sha256sums=('640ad0085ee013efb94877072cfa7c0c025884dc8cc398e331b7efb6ebaefc01') -b2sums=('4f5d23ecd02434e83896e93840dddbe0896e321c7cb2294a54d280abf03b87302489ef7d99c56476952d1364eb4acfe7715b06b2b56a956373e037b0a273111b') +source=("git+https://gitlab.com/procps-ng/procps.git#tag=v${pkgver}?signed"; + '0001-fix-breakage-in-unhex.patch') +sha256sums=('640ad0085ee013efb94877072cfa7c0c025884dc8cc398e331b7efb6ebaefc01' + '5386ca099f38dc1c0e0521f193896ff38c6c7a3855090ff4e245f1d6d165708d') +b2sums=('4f5d23ecd02434e83896e93840dddbe0896e321c7cb2294a54d280abf03b87302489ef7d99c56476952d1364eb4acfe7715b06b2b56a956373e037b0a273111b' + '80c67d37768c56e9c9eff24ed51ffef115cdba8ed670294ac02241b752167fc595ecb7cfebfb203dc9ba2891350c4921660f694cd1acea49fb2f55d521ee99b2') prepare() { cd procps + # fix breakage in unhex + # https://gitlab.com/procps-ng/procps/-/issues/369 + # https://gitlab.com/procps-ng/procps/-/merge_requests/247 + patch -Np1 < ../0001-fix-breakage-in-unhex.patch + ./autogen.sh } View it on GitLab: https://gitlab.archlinux.org/archlinux/packaging/packages/procps-ng/-/commit/4a382ea83637f2902fd1d0278979e414e2df44cf -- View it on GitLab: https://gitlab.archlinux.org/archlinux/packaging/packages/procps-ng/-/commit/4a382ea83637f2902fd1d0278979e414e2df44cf You're receiving this email because of your account on gitlab.archlinux.org.
