diff options
Diffstat (limited to 'source')
| -rw-r--r-- | source/a/procps-ng/doinst.sh | 16 | ||||
| -rwxr-xr-x | source/a/procps-ng/procps-ng.SlackBuild | 9 | ||||
| -rw-r--r-- | source/a/procps-ng/sysctl.default | 8 | ||||
| -rw-r--r-- | source/a/sysvinit-scripts/scripts/rc.S | 15 | ||||
| -rwxr-xr-x | source/a/sysvinit-scripts/sysvinit-scripts.SlackBuild | 2 | ||||
| -rwxr-xr-x | source/l/qt5/fetch_sources.sh | 2 | ||||
| -rwxr-xr-x | source/l/system-config-printer/system-config-printer.SlackBuild | 9 | ||||
| -rw-r--r-- | source/n/samba/samba.url | 4 |
8 files changed, 49 insertions, 16 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" diff --git a/source/a/sysvinit-scripts/scripts/rc.S b/source/a/sysvinit-scripts/scripts/rc.S index 2466cd77a..608b4da69 100644 --- a/source/a/sysvinit-scripts/scripts/rc.S +++ b/source/a/sysvinit-scripts/scripts/rc.S @@ -301,14 +301,21 @@ if [ -x /etc/rc.d/rc.modules -a -z "$container" ]; then fi # Configure kernel parameters: +if [ -r /etc/default/sysctl ]; then + # Source user defined options: + . /etc/default/sysctl +else + SYSCTL_OPTIONS="-e --system" +fi if [ -x /sbin/sysctl -a -r /etc/sysctl.conf -a -z "$container" ]; then - echo "Configuring kernel parameters: /sbin/sysctl -e --system" - /sbin/sysctl -e --system + echo "Configuring kernel parameters: /sbin/sysctl $SYSCTL_OPTIONS" + /sbin/sysctl $SYSCTL_OPTIONS elif [ -x /sbin/sysctl -a -z "$container" ]; then - echo "Configuring kernel parameters: /sbin/sysctl -e --system" + echo "Configuring kernel parameters: /sbin/sysctl $SYSCTL_OPTIONS" # Don't say "Applying /etc/sysctl.conf" or complain if the file doesn't exist - /sbin/sysctl -e --system 2> /dev/null | grep -v "Applying /etc/sysctl.conf" + /sbin/sysctl $SYSCTL_OPTIONS 2> /dev/null | grep -v "Applying /etc/sysctl.conf" fi +unset SYSCTL_OPTIONS # Check all the non-root filesystems: if [ ! -r /etc/fastboot -a -z "$container" ]; then diff --git a/source/a/sysvinit-scripts/sysvinit-scripts.SlackBuild b/source/a/sysvinit-scripts/sysvinit-scripts.SlackBuild index 12955d585..0f085c17f 100755 --- a/source/a/sysvinit-scripts/sysvinit-scripts.SlackBuild +++ b/source/a/sysvinit-scripts/sysvinit-scripts.SlackBuild @@ -25,7 +25,7 @@ cd $(dirname $0) ; CWD=$(pwd) PKGNAM=sysvinit-scripts VERSION=${VERSION:-15.1} ARCH=noarch -BUILD=${BUILD:-11} +BUILD=${BUILD:-12} # If the variable PRINT_PACKAGE_NAME is set, then this script will report what # the name of the created package would be, and then exit. This information diff --git a/source/l/qt5/fetch_sources.sh b/source/l/qt5/fetch_sources.sh index 1aad12309..19b86c1ab 100755 --- a/source/l/qt5/fetch_sources.sh +++ b/source/l/qt5/fetch_sources.sh @@ -21,7 +21,7 @@ # OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF # ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. -BRANCH="5.15.11" +BRANCH="5.15.12" rm -f qt-everywhere-src-*.tar* diff --git a/source/l/system-config-printer/system-config-printer.SlackBuild b/source/l/system-config-printer/system-config-printer.SlackBuild index 15b5a60b8..c8782bafa 100755 --- a/source/l/system-config-printer/system-config-printer.SlackBuild +++ b/source/l/system-config-printer/system-config-printer.SlackBuild @@ -1,7 +1,7 @@ #!/bin/bash # Copyright 2010, 2011, 2012 Eric Hameleers, Eindhoven, NL -# Copyright 2010, 2011, 2012, 2013, 2018, 2020, 2021, 2022 Patrick J. Volkerding, Sebeka, MN, USA +# Copyright 2010, 2011, 2012, 2013, 2018, 2020, 2021, 2022, 2024 Patrick J. Volkerding, Sebeka, MN, USA # All rights reserved. # # Redistribution and use of this script, with or without modification, is @@ -113,6 +113,7 @@ PYTHON=/usr/bin/python3 \ --docdir=/usr/doc/$PKGNAM-$VERSION \ --localstatedir=/var/lib \ --sysconfdir=/etc \ + --with-udevdir=/lib/udev \ --with-udev-rules \ --with-systemdsystemunitdir=no \ --program-prefix= \ @@ -134,14 +135,10 @@ python3 setup.py install --root=$PKG || exit 1 python3 -m compileall "${PKG}/usr/share/system-config-printer" python3 -O -m compileall "${PKG}/usr/share/system-config-printer" -# Move the udev files to the usual Slackware location: -mkdir -p $PKG/lib -mv $PKG/etc/udev $PKG/lib/ - # Move the dbus configs to the system location: mkdir -p $PKG/usr/share/dbus-1/system.d/ mv $PKG/etc/dbus-1/system.d/* $PKG/usr/share/dbus-1/system.d/ -rmdir --parents $PKG/etc/dbus-1/system.d/ +rm -rf $PKG/etc/dbus-1 if [ ! -L /lib${LIBDIRSUFFIX}/libpam.so.? ]; then # Looks like PAM is not installed. Instead, your user must be in group 'lp'. diff --git a/source/n/samba/samba.url b/source/n/samba/samba.url index 62c4fff8d..bc66238b9 100644 --- a/source/n/samba/samba.url +++ b/source/n/samba/samba.url @@ -1,2 +1,2 @@ -https://download.samba.org/pub/samba/stable/samba-4.19.3.tar.gz -https://download.samba.org/pub/samba/stable/samba-4.19.3.tar.asc +https://download.samba.org/pub/samba/stable/samba-4.19.4.tar.gz +https://download.samba.org/pub/samba/stable/samba-4.19.4.tar.asc |