summaryrefslogtreecommitdiffstats
path: root/source
diff options
context:
space:
mode:
author Patrick J Volkerding <volkerdi@slackware.com>2019-12-21 21:02:24 +0000
committer Eric Hameleers <alien@slackware.com>2019-12-22 08:59:50 +0100
commit34c69a90eabb6e22de0b9bba1c7031c976ae3d4d (patch)
tree8726deae26229f33906077fef5a05de029dc18e2 /source
parent07f87f994f59b3e53d1385c2a078db7a9952492d (diff)
downloadcurrent-34c69a90eabb6e22de0b9bba1c7031c976ae3d4d.tar.gz
current-34c69a90eabb6e22de0b9bba1c7031c976ae3d4d.tar.xz
Sat Dec 21 21:02:24 UTC 201920191221210224
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.
Diffstat (limited to 'source')
-rwxr-xr-xsource/a/procps-ng/procps-ng.SlackBuild8
-rw-r--r--source/a/procps-ng/procps-ng.pgrep.CMDSTRSIZE.diff20
-rw-r--r--source/k/kernel-configs/config-generic-5.4.6 (renamed from source/k/kernel-configs/config-generic-5.4.5)2
-rw-r--r--source/k/kernel-configs/config-generic-5.4.6.x64 (renamed from source/k/kernel-configs/config-generic-5.4.5.x64)2
-rw-r--r--source/k/kernel-configs/config-generic-smp-5.4.6-smp (renamed from source/k/kernel-configs/config-generic-smp-5.4.5-smp)2
-rw-r--r--source/k/kernel-configs/config-huge-5.4.6 (renamed from source/k/kernel-configs/config-huge-5.4.5)2
-rw-r--r--source/k/kernel-configs/config-huge-5.4.6.x64 (renamed from source/k/kernel-configs/config-huge-5.4.5.x64)2
-rw-r--r--source/k/kernel-configs/config-huge-smp-5.4.6-smp (renamed from source/k/kernel-configs/config-huge-smp-5.4.5-smp)2
-rw-r--r--source/n/dhcpcd/dhcpcd-8.1.3.tar.xz.distinfo1
-rw-r--r--source/n/dhcpcd/dhcpcd-8.1.4.tar.xz.distinfo1
-rwxr-xr-xsource/n/lftp/lftp.SlackBuild2
-rwxr-xr-xsource/xap/hexchat/hexchat.SlackBuild2
-rw-r--r--source/xap/hexchat/hexchat.url4
13 files changed, 37 insertions, 13 deletions
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);
diff --git a/source/k/kernel-configs/config-generic-5.4.5 b/source/k/kernel-configs/config-generic-5.4.6
index c16a3729f..7688ad136 100644
--- a/source/k/kernel-configs/config-generic-5.4.5
+++ b/source/k/kernel-configs/config-generic-5.4.6
@@ -1,6 +1,6 @@
#
# Automatically generated file; DO NOT EDIT.
-# Linux/x86 5.4.5 Kernel Configuration
+# Linux/x86 5.4.6 Kernel Configuration
#
#
diff --git a/source/k/kernel-configs/config-generic-5.4.5.x64 b/source/k/kernel-configs/config-generic-5.4.6.x64
index 6c1a2b0b4..6c4af203d 100644
--- a/source/k/kernel-configs/config-generic-5.4.5.x64
+++ b/source/k/kernel-configs/config-generic-5.4.6.x64
@@ -1,6 +1,6 @@
#
# Automatically generated file; DO NOT EDIT.
-# Linux/x86 5.4.5 Kernel Configuration
+# Linux/x86 5.4.6 Kernel Configuration
#
#
diff --git a/source/k/kernel-configs/config-generic-smp-5.4.5-smp b/source/k/kernel-configs/config-generic-smp-5.4.6-smp
index 0c4ad4037..e19e7e5db 100644
--- a/source/k/kernel-configs/config-generic-smp-5.4.5-smp
+++ b/source/k/kernel-configs/config-generic-smp-5.4.6-smp
@@ -1,6 +1,6 @@
#
# Automatically generated file; DO NOT EDIT.
-# Linux/x86 5.4.5 Kernel Configuration
+# Linux/x86 5.4.6 Kernel Configuration
#
#
diff --git a/source/k/kernel-configs/config-huge-5.4.5 b/source/k/kernel-configs/config-huge-5.4.6
index d0f193040..d9b0b2141 100644
--- a/source/k/kernel-configs/config-huge-5.4.5
+++ b/source/k/kernel-configs/config-huge-5.4.6
@@ -1,6 +1,6 @@
#
# Automatically generated file; DO NOT EDIT.
-# Linux/x86 5.4.5 Kernel Configuration
+# Linux/x86 5.4.6 Kernel Configuration
#
#
diff --git a/source/k/kernel-configs/config-huge-5.4.5.x64 b/source/k/kernel-configs/config-huge-5.4.6.x64
index b742d5c38..b45fee5bc 100644
--- a/source/k/kernel-configs/config-huge-5.4.5.x64
+++ b/source/k/kernel-configs/config-huge-5.4.6.x64
@@ -1,6 +1,6 @@
#
# Automatically generated file; DO NOT EDIT.
-# Linux/x86 5.4.5 Kernel Configuration
+# Linux/x86 5.4.6 Kernel Configuration
#
#
diff --git a/source/k/kernel-configs/config-huge-smp-5.4.5-smp b/source/k/kernel-configs/config-huge-smp-5.4.6-smp
index 49ccd7613..26b43f409 100644
--- a/source/k/kernel-configs/config-huge-smp-5.4.5-smp
+++ b/source/k/kernel-configs/config-huge-smp-5.4.6-smp
@@ -1,6 +1,6 @@
#
# Automatically generated file; DO NOT EDIT.
-# Linux/x86 5.4.5 Kernel Configuration
+# Linux/x86 5.4.6 Kernel Configuration
#
#
diff --git a/source/n/dhcpcd/dhcpcd-8.1.3.tar.xz.distinfo b/source/n/dhcpcd/dhcpcd-8.1.3.tar.xz.distinfo
deleted file mode 100644
index 93a243317..000000000
--- a/source/n/dhcpcd/dhcpcd-8.1.3.tar.xz.distinfo
+++ /dev/null
@@ -1 +0,0 @@
-SHA256 (dhcpcd-8.1.3.tar.xz) = 144f08b8320f7289099cd3bc8d2715eb48fce9c38a596cb297b62c69497ad34e
diff --git a/source/n/dhcpcd/dhcpcd-8.1.4.tar.xz.distinfo b/source/n/dhcpcd/dhcpcd-8.1.4.tar.xz.distinfo
new file mode 100644
index 000000000..25ccdb2cf
--- /dev/null
+++ b/source/n/dhcpcd/dhcpcd-8.1.4.tar.xz.distinfo
@@ -0,0 +1 @@
+SHA256 (dhcpcd-8.1.4.tar.xz) = 27a0d1a37aa1aa23e9d3a906455cf8fd56a83589370dfe9da3c5f3225cc4c13d
diff --git a/source/n/lftp/lftp.SlackBuild b/source/n/lftp/lftp.SlackBuild
index 152f7eb51..2f90ed17a 100755
--- a/source/n/lftp/lftp.SlackBuild
+++ b/source/n/lftp/lftp.SlackBuild
@@ -24,7 +24,7 @@ cd $(dirname $0) ; CWD=$(pwd)
PKGNAM=lftp
VERSION=${VERSION:-$(echo lftp-*.tar.xz | rev | cut -f 3- -d . | cut -f 1 -d - | rev)}
-BUILD=${BUILD:-4}
+BUILD=${BUILD:-1}
NUMJOBS=${NUMJOBS:-" -j$(expr $(nproc) + 1) "}
diff --git a/source/xap/hexchat/hexchat.SlackBuild b/source/xap/hexchat/hexchat.SlackBuild
index 73bab50b7..dbd1cdc15 100755
--- a/source/xap/hexchat/hexchat.SlackBuild
+++ b/source/xap/hexchat/hexchat.SlackBuild
@@ -24,7 +24,7 @@ cd $(dirname $0) ; CWD=$(pwd)
PKGNAM=hexchat
VERSION=${VERSION:-$(echo $PKGNAM-*.tar.?z | rev | cut -f 3- -d . | cut -f 1 -d - | rev)}
-BUILD=${BUILD:-4}
+BUILD=${BUILD:-1}
# Automatically determine the architecture we're building on:
if [ -z "$ARCH" ]; then
diff --git a/source/xap/hexchat/hexchat.url b/source/xap/hexchat/hexchat.url
index 9c61d9516..a6cab81b1 100644
--- a/source/xap/hexchat/hexchat.url
+++ b/source/xap/hexchat/hexchat.url
@@ -1,2 +1,2 @@
-https://dl.hexchat.net/hexchat/hexchat-2.14.2.tar.xz.asc
-https://dl.hexchat.net/hexchat/hexchat-2.14.2.tar.xz
+https://dl.hexchat.net/hexchat/hexchat-2.14.3.tar.xz.asc
+https://dl.hexchat.net/hexchat/hexchat-2.14.3.tar.xz