From 34c69a90eabb6e22de0b9bba1c7031c976ae3d4d Mon Sep 17 00:00:00 2001
From: Patrick J Volkerding <volkerdi@slackware.com>
Date: Sat, 21 Dec 2019 21:02:24 +0000
Subject: Sat Dec 21 21:02:24 UTC 2019

a/kernel-generic-5.4.6-x86_64-1.txz:  Upgraded.
a/kernel-huge-5.4.6-x86_64-1.txz:  Upgraded.
a/kernel-modules-5.4.6-x86_64-1.txz:  Upgraded.
a/procps-ng-3.3.16-x86_64-2.txz:  Rebuilt.
  Patched to hardcode the pgrep command string buffer size to 4096 as was done
  in the previous release. This avoids an allocation error when the stack size
  is unlimited. Thanks to Jeroslaw Siebert.
a/xfsprogs-5.4.0-x86_64-1.txz:  Upgraded.
d/kernel-headers-5.4.6-x86-1.txz:  Upgraded.
k/kernel-source-5.4.6-noarch-1.txz:  Upgraded.
l/QScintilla-2.11.4-x86_64-1.txz:  Upgraded.
n/dhcpcd-8.1.4-x86_64-1.txz:  Upgraded.
n/lftp-4.9.0-x86_64-1.txz:  Upgraded.
xap/hexchat-2.14.3-x86_64-1.txz:  Upgraded.
isolinux/initrd.img:  Rebuilt.
kernels/*:  Upgraded.
usb-and-pxe-installers/usbboot.img:  Rebuilt.
---
 source/a/procps-ng/procps-ng.SlackBuild            |  8 ++++++--
 source/a/procps-ng/procps-ng.pgrep.CMDSTRSIZE.diff | 20 ++++++++++++++++++++
 2 files changed, 26 insertions(+), 2 deletions(-)
 create mode 100644 source/a/procps-ng/procps-ng.pgrep.CMDSTRSIZE.diff

(limited to 'source/a/procps-ng')

diff --git a/source/a/procps-ng/procps-ng.SlackBuild b/source/a/procps-ng/procps-ng.SlackBuild
index 2399950b6..32010ad16 100755
--- a/source/a/procps-ng/procps-ng.SlackBuild
+++ b/source/a/procps-ng/procps-ng.SlackBuild
@@ -1,6 +1,6 @@
 #!/bin/bash
 
-# Copyright 2005-2018  Patrick J. Volkerding, Sebeka, Minnesota, USA
+# Copyright 2005-2019  Patrick J. Volkerding, Sebeka, Minnesota, USA
 # All rights reserved.
 #
 # Redistribution and use of this script, with or without modification, is
@@ -27,7 +27,7 @@ VERSION=${VERSION:-3.3.16}
 PSMISCVER=${PSMISCVER:-23.3}
 PROCINFONGVER=${PROCINFONGVER:-2.0.304}
 PROCINFOVER=${PROCINFOVER:-18}
-BUILD=${BUILD:-1}
+BUILD=${BUILD:-2}
 
 if [ -z "$ARCH" ]; then
   case "$( uname -m )" in
@@ -81,6 +81,10 @@ find -L . \
  \( -perm 666 -o -perm 664 -o -perm 640 -o -perm 600 -o -perm 444 \
   -o -perm 440 -o -perm 400 \) -exec chmod 644 {} \+
 
+# Revert to hardcoded command string size from procps-ng-3.3.15, as the
+# newer stack-based allocation fails in some cases where ulimit is unlimited:
+zcat $CWD/procps-ng.pgrep.CMDSTRSIZE.diff.gz | patch -p1 --verbose || exit 1
+
 CFLAGS="$SLKCFLAGS" \
 CXXFLAGS="$SLKCFLAGS" \
 ./configure \
diff --git a/source/a/procps-ng/procps-ng.pgrep.CMDSTRSIZE.diff b/source/a/procps-ng/procps-ng.pgrep.CMDSTRSIZE.diff
new file mode 100644
index 000000000..4ff321d0d
--- /dev/null
+++ b/source/a/procps-ng/procps-ng.pgrep.CMDSTRSIZE.diff
@@ -0,0 +1,20 @@
+--- ./pgrep.c.orig	2019-10-27 06:32:58.339230954 -0500
++++ ./pgrep.c	2019-12-21 13:38:57.229656940 -0600
+@@ -42,6 +42,8 @@
+ #define EXIT_FATAL 3
+ #define XALLOC_EXIT_CODE EXIT_FATAL
+ 
++#define CMDSTRSIZE 4096
++
+ #include "c.h"
+ #include "fileutils.h"
+ #include "nsutils.h"
+@@ -497,7 +499,7 @@
+ 	regex_t *preg;
+ 	pid_t myself = getpid();
+ 	struct el *list = NULL;
+-        long cmdlen = sysconf(_SC_ARG_MAX) * sizeof(char);
++        long cmdlen = CMDSTRSIZE;
+ 	char *cmdline = xmalloc(cmdlen);
+ 	char *cmdsearch = xmalloc(cmdlen);
+ 	char *cmdoutput = xmalloc(cmdlen);
-- 
cgit v1.2.3