diff options
| -rw-r--r-- | .SRCINFO | 12 | ||||
| -rw-r--r-- | PKGBUILD | 18 | ||||
| -rw-r--r-- | fs66093.patch | 60 |
3 files changed, 11 insertions, 79 deletions
@@ -1,7 +1,7 @@ pkgbase = procps-ng-nosystemd pkgdesc = Utilities for monitoring your system and its processes - pkgver = 3.3.16 - pkgrel = 3 + pkgver = 3.3.17 + pkgrel = 1 url = https://gitlab.com/procps-ng/procps install = procps-ng.install arch = i686 @@ -13,7 +13,7 @@ pkgbase = procps-ng-nosystemd depends = ncurses depends = libncursesw.so provides = procps - provides = procps-ng=3.3.16 + provides = procps-ng=3.3.17 provides = sysvinit-tools provides = libprocps.so conflicts = procps @@ -25,11 +25,9 @@ pkgbase = procps-ng-nosystemd replaces = sysvinit-tools replaces = sysctl-default-conf backup = etc/sysctl.conf - source = https://downloads.sourceforge.net/project/procps-ng/Production/procps-ng-3.3.16.tar.xz - source = fs66093.patch + source = https://downloads.sourceforge.net/project/procps-ng/Production/procps-ng-3.3.17.tar.xz source = sysctl.conf - sha256sums = 925eacd65dedcf9c98eb94e8978bbfb63f5de37294cc1047d81462ed477a20af - sha256sums = 48eb1f6e1b84d9dfec27556771c05f6a02880aefbe774a3db71bee0c35228992 + sha256sums = 4518b3e7aafd34ec07d0063d250fd474999b20b200218c3ae56f5d2113f141b4 sha256sums = bbb659d6e670921312ca205f16e92f47a80d7530160b3277bfc00e5ea0ac3836 pkgname = procps-ng-nosystemd @@ -5,8 +5,8 @@ # Contributor: Eric Bélanger <eric@archlinux.org> pkgname=procps-ng-nosystemd -pkgver=3.3.16 -pkgrel=3 +pkgver=3.3.17 +pkgrel=1 pkgdesc='Utilities for monitoring your system and its processes' url='https://gitlab.com/procps-ng/procps' license=('GPL' 'LGPL') @@ -14,10 +14,8 @@ arch=('i686' 'x86_64') depends=('glibc' 'ncurses' 'libncursesw.so') backup=('etc/sysctl.conf') source=("https://downloads.sourceforge.net/project/procps-ng/Production/procps-ng-${pkgver}.tar.xz" - 'fs66093.patch' 'sysctl.conf') -sha256sums=('925eacd65dedcf9c98eb94e8978bbfb63f5de37294cc1047d81462ed477a20af' - '48eb1f6e1b84d9dfec27556771c05f6a02880aefbe774a3db71bee0c35228992' +sha256sums=('4518b3e7aafd34ec07d0063d250fd474999b20b200218c3ae56f5d2113f141b4' 'bbb659d6e670921312ca205f16e92f47a80d7530160b3277bfc00e5ea0ac3836') groups=('base') conflicts=('procps' 'procps-ng' 'sysvinit-tools' 'sysctl-default-conf') @@ -26,17 +24,13 @@ provides=('procps' "procps-ng=$pkgver" 'sysvinit-tools' 'libprocps.so') install=procps-ng.install prepare() { - cd "${srcdir}/procps-ng-${pkgver}" + cd "${srcdir}/procps-${pkgver}" sed 's:<ncursesw/:<:g' -i watch.c - - # pgrep: check sanity of SC_ARG_MAX - # https://bugs.archlinux.org/task/66093 - patch -p1 -i ../fs66093.patch } build() { - cd "${srcdir}/procps-ng-${pkgver}" + cd "${srcdir}/procps-${pkgver}" ./configure \ --prefix=/usr \ @@ -54,7 +48,7 @@ build() { } package() { - cd "${srcdir}/procps-ng-${pkgver}" + cd "${srcdir}/procps-${pkgver}" make DESTDIR="${pkgdir}" install install -Dm644 "sysctl.conf" "$pkgdir/etc/sysctl.conf" diff --git a/fs66093.patch b/fs66093.patch deleted file mode 100644 index 57a9346e84ad..000000000000 --- a/fs66093.patch +++ /dev/null @@ -1,60 +0,0 @@ -From bb96fc42956c9ed926a1b958ab715f8b4a663dec Mon Sep 17 00:00:00 2001 -From: Craig Small <csmall@dropbear.xyz> -Date: Sun, 5 Jan 2020 15:05:55 +1100 -Subject: [PATCH] pgrep: check sanity of SC_ARG_MAX - -A kernel change means we cannot trust what sysconf(SC_ARG_MAX) -returns. We clamp it so its more than 4096 and less than 128*1024 -which is what findutils does. - -References: - procps-ng/procps#152 - https://git.savannah.gnu.org/cgit/findutils.git/tree/lib/buildcmd.c#n535 - https://lwn.net/Articles/727862/ ---- - pgrep.c | 22 +++++++++++++++++++++- - 1 file changed, 21 insertions(+), 1 deletion(-) - -diff --git a/pgrep.c b/pgrep.c -index 01563db..bde7448 100644 ---- a/pgrep.c -+++ b/pgrep.c -@@ -485,6 +485,26 @@ static regex_t * do_regcomp (void) - return preg; - } - -+/* -+ * SC_ARG_MAX used to return the maximum size a command line can be -+ * however changes to the kernel mean this can be bigger than we can -+ * alloc. Clamp it to 128kB like xargs and friends do -+ * Should also not be smaller than POSIX_ARG_MAX which is 4096 -+ */ -+static size_t get_arg_max(void) -+{ -+#define MIN_ARG_SIZE 4096u -+#define MAX_ARG_SIZE (128u * 1024u) -+ -+ size_t val = sysconf(_SC_ARG_MAX); -+ -+ if (val < MIN_ARG_SIZE) -+ val = MIN_ARG_SIZE; -+ if (val > MAX_ARG_SIZE) -+ val = MAX_ARG_SIZE; -+ -+ return val; -+} - static struct el * select_procs (int *num) - { - PROCTAB *ptp; -@@ -497,7 +517,7 @@ static struct el * select_procs (int *num) - regex_t *preg; - pid_t myself = getpid(); - struct el *list = NULL; -- long cmdlen = sysconf(_SC_ARG_MAX) * sizeof(char); -+ long cmdlen = get_arg_max() * sizeof(char); - char *cmdline = xmalloc(cmdlen); - char *cmdsearch = xmalloc(cmdlen); - char *cmdoutput = xmalloc(cmdlen); --- -2.26.2 - |