summaryrefslogtreecommitdiffstats
path: root/source/a/procps-ng
diff options
context:
space:
mode:
author Patrick J Volkerding <volkerdi@slackware.com>2024-01-09 01:52:43 +0000
committer Eric Hameleers <alien@slackware.com>2024-01-09 03:31:52 +0100
commit09504fc48447542878036d98e868b525789c7bc6 (patch)
tree365d93793ee4dcd6b33f7e3c5b712c96ed5dc72b /source/a/procps-ng
parent360a12d5d90dc285bebff21b774cea64dffe1ca4 (diff)
downloadcurrent-09504fc48447542878036d98e868b525789c7bc6.tar.gz
current-09504fc48447542878036d98e868b525789c7bc6.tar.xz
Tue Jan 9 01:52:43 UTC 202420240109015243
a/procps-ng-3.3.17-x86_64-3.txz: Rebuilt. Add /etc/default/sysctl to support custom options for sysctl in rc.S. Thanks to lostintime. a/sysvinit-scripts-15.1-noarch-12.txz: Rebuilt. rc.S: support /etc/default/sysctl for custom options. Thanks to lostintime. l/imagemagick-7.1.1_26-x86_64-1.txz: Upgraded. l/qt5-5.15.12_20240103_b8fd1448-x86_64-1.txz: Upgraded. n/samba-4.19.4-x86_64-1.txz: Upgraded. x/imake-1.0.10-x86_64-1.txz: Upgraded.
Diffstat (limited to 'source/a/procps-ng')
-rw-r--r--source/a/procps-ng/doinst.sh16
-rwxr-xr-xsource/a/procps-ng/procps-ng.SlackBuild9
-rw-r--r--source/a/procps-ng/sysctl.default8
3 files changed, 31 insertions, 2 deletions
diff --git a/source/a/procps-ng/doinst.sh b/source/a/procps-ng/doinst.sh
new file mode 100644
index 000000000..b93b9726b
--- /dev/null
+++ b/source/a/procps-ng/doinst.sh
@@ -0,0 +1,16 @@
+config() {
+ for infile in $1; do
+ NEW="$infile"
+ OLD="$(dirname $NEW)/$(basename $NEW .new)"
+ # If there's no config file by that name, mv it over:
+ if [ ! -r $OLD ]; then
+ mv $NEW $OLD
+ elif [ "$(cat $OLD | md5sum)" = "$(cat $NEW | md5sum)" ]; then
+ # toss the redundant copy
+ rm $NEW
+ fi
+ # Otherwise, we leave the .new copy for the admin to consider...
+ done
+}
+
+config etc/default/sysctl.new
diff --git a/source/a/procps-ng/procps-ng.SlackBuild b/source/a/procps-ng/procps-ng.SlackBuild
index cf22501bc..5d2b4c405 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-2019 Patrick J. Volkerding, Sebeka, Minnesota, USA
+# Copyright 2005-2024 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.17}
PSMISCVER=${PSMISCVER:-23.3}
PROCINFONGVER=${PROCINFONGVER:-2.0.304}
PROCINFOVER=${PROCINFOVER:-18}
-BUILD=${BUILD:-2}
+BUILD=${BUILD:-3}
if [ -z "$ARCH" ]; then
case "$( uname -m )" in
@@ -213,6 +213,10 @@ install -m 0755 lsdev.pl $PKG/usr/bin/lsdev
install -m 0755 socklist.pl $PKG/usr/bin/socklist
install -m 0644 lsdev.8 socklist.8 $PKG/usr/man/man8
+# Add the default file for sysctl:
+mkdir -p $PKG/etc/default
+cat $CWD/sysctl.default > $PKG/etc/default/sysctl.new
+
# Strip binaries:
( cd $PKG
find . | xargs file | grep "executable" | grep ELF | cut -f 1 -d : | xargs strip --strip-unneeded 2> /dev/null
@@ -251,6 +255,7 @@ if [ -r ChangeLog ]; then
fi
mkdir -p $PKG/install
+zcat $CWD/doinst.sh.gz > $PKG/install/doinst.sh
cat $CWD/slack-desc > $PKG/install/slack-desc
cd $PKG
diff --git a/source/a/procps-ng/sysctl.default b/source/a/procps-ng/sysctl.default
new file mode 100644
index 000000000..195954452
--- /dev/null
+++ b/source/a/procps-ng/sysctl.default
@@ -0,0 +1,8 @@
+# /etc/default/sysctl
+
+# Default options for /sbin/sysctl in /etc/rc.d/rc.S:
+# -e: Use this option to ignore errors about unknown keys.
+# --system: Load settings from all system configuration files.
+# For more information, see: man sysctl
+
+SYSCTL_OPTIONS="-e --system"