diff options
Diffstat (limited to 'source/a/procps-ng')
| -rwxr-xr-x | source/a/procps-ng/procps-ng.SlackBuild | 12 | ||||
| -rw-r--r-- | source/a/procps-ng/procps-ng.pgrep.CMDSTRSIZE.diff | 20 |
2 files changed, 4 insertions, 28 deletions
diff --git a/source/a/procps-ng/procps-ng.SlackBuild b/source/a/procps-ng/procps-ng.SlackBuild index 76ac8b5df..59ee18046 100755 --- a/source/a/procps-ng/procps-ng.SlackBuild +++ b/source/a/procps-ng/procps-ng.SlackBuild @@ -23,11 +23,11 @@ cd $(dirname $0) ; CWD=$(pwd) PKGNAM=procps-ng -VERSION=${VERSION:-3.3.16} +VERSION=${VERSION:-3.3.17} PSMISCVER=${PSMISCVER:-23.3} PROCINFONGVER=${PROCINFONGVER:-2.0.304} PROCINFOVER=${PROCINFOVER:-18} -BUILD=${BUILD:-4} +BUILD=${BUILD:-1} if [ -z "$ARCH" ]; then case "$( uname -m )" in @@ -67,9 +67,9 @@ fi rm -rf $PKG mkdir -p $TMP $PKG cd $TMP -rm -rf $PKGNAM-$VERSION +rm -rf $PKGNAM-$VERSION procps-$VERSION tar xvf $CWD/$PKGNAM-$VERSION.tar.xz || exit 1 -cd $PKGNAM-$VERSION || exit 1 +cd procps-$VERSION || $PKGNAM-$VERSION || exit 1 tar xvf $CWD/psmisc-$PSMISCVER.tar.xz || exit 1 tar xvf $CWD/procinfo-ng-$PROCINFONGVER.tar.xz || exit 1 tar xvf $CWD/procinfo-$PROCINFOVER.tar.xz || exit 1 @@ -81,10 +81,6 @@ 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 deleted file mode 100644 index 4ff321d0d..000000000 --- a/source/a/procps-ng/procps-ng.pgrep.CMDSTRSIZE.diff +++ /dev/null @@ -1,20 +0,0 @@ ---- ./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); |