Fri Apr 23 19:13:09 UTC 202120210423191309

a/pkgtools-15.0-noarch-39.txz:  Rebuilt.
  upgradepkg: revert change where $ROOT/sbin/installpkg is called instead of
  /sbin/installpkg. Conceptually, this seemed like a nice change (but would
  have also required removepkg to be called the same way), but it seems to
  break an established expectation that the pkgtools can be used without them
  actually being installed in $ROOT. Thanks to alienBOB.
a/sysvinit-scripts-15.0-noarch-2.txz:  Rebuilt.
  Use #!/bin/bash for these scripts so that bashisms don't cause script issues
  if /bin/sh is some other shell. Thanks to mumahendras3.
  rc.S: Use GazL's proposals for detecting/mounting /proc and /sys.
d/parallel-20210422-noarch-1.txz:  Upgraded.
l/glib-networking-2.68.1-x86_64-1.txz:  Upgraded.
l/gtk+3-3.24.29-x86_64-1.txz:  Upgraded.
x/igt-gpu-tools-1.26-x86_64-1.txz:  Upgraded.
isolinux/initrd.img:  Rebuilt.
  Rebuild with pkgtools-15.0-noarch-39.
usb-and-pxe-installers/usbboot.img:  Rebuilt.
  Rebuild with pkgtools-15.0-noarch-39.

15 files changed, 29 insertions, 33 deletions

diff --git a/source/a/pkgtools/pkgtools.SlackBuild b/source/a/pkgtools/pkgtools.SlackBuild
index aac185ee..0c7d43f0 100755
--- a/source/a/pkgtools/pkgtools.SlackBuild
+++ b/source/a/pkgtools/pkgtools.SlackBuild
@@ -30,7 +30,7 @@ PKGNAM=pkgtools
 # *** UPDATE THESE WITH EACH BUILD:
 VERSION=15.0
 ARCH=${ARCH:-noarch}
-BUILD=${BUILD:-38}
+BUILD=${BUILD:-39}
 
 # 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/a/pkgtools/scripts/installpkg b/source/a/pkgtools/scripts/installpkg
index 3bebe7ce..3bebe7ce 100755..100644
--- a/source/a/pkgtools/scripts/installpkg
+++ b/source/a/pkgtools/scripts/installpkg
diff --git a/source/a/pkgtools/scripts/upgradepkg b/source/a/pkgtools/scripts/upgradepkg
index 62d05440..d71ca4b0 100644
--- a/source/a/pkgtools/scripts/upgradepkg
+++ b/source/a/pkgtools/scripts/upgradepkg
@@ -262,11 +262,11 @@ for ARG; do
         echo "$NEW would be installed (new package)."
       else
         if [ $PLAINTERSE ]; then
-          $ROOT/sbin/installpkg --terse --terselength $TERSELENGTH $INCOMINGDIR/$NNAME
+          /sbin/installpkg --terse --terselength $TERSELENGTH $INCOMINGDIR/$NNAME
         elif [ $INFOBOX ]; then
-          $ROOT/sbin/installpkg --infobox $INCOMINGDIR/$NNAME
+          /sbin/installpkg --infobox $INCOMINGDIR/$NNAME
         elif [ $TERSE ]; then
-          OUTPUTLINE="$($ROOT/sbin/installpkg --terse --terselength $(expr $TERSELENGTH - 12) $INCOMINGDIR/$NNAME)"
+          OUTPUTLINE="$(/sbin/installpkg --terse --terselength $(expr $TERSELENGTH - 12) $INCOMINGDIR/$NNAME)"
           ( flock 9 || exit 11
             echo "Installing: ${OUTPUTLINE}"
           ) 9> $INSTLOCKDIR/outputline.lock
@@ -278,7 +278,7 @@ for ARG; do
 +==============================================================================
 
 EOF
-          $ROOT/sbin/installpkg $INCOMINGDIR/$NNAME
+          /sbin/installpkg $INCOMINGDIR/$NNAME
         fi
       fi
     fi
@@ -356,26 +356,26 @@ EOF
   # Next, the new package is pre-installed:
   if [ "$VERBOSE" = "verbose" ]; then
     if ! [ $TERSE ]; then
-      $ROOT/sbin/installpkg $INCOMINGDIR/$NNAME
+      /sbin/installpkg $INCOMINGDIR/$NNAME
       RETCODE=$?
     else
-      $ROOT/sbin/installpkg $INCOMINGDIR/$NNAME 1> /dev/null
+      /sbin/installpkg $INCOMINGDIR/$NNAME 1> /dev/null
       RETCODE=$?
     fi
   else
     if [ $PLAINTERSE ]; then
-      $ROOT/sbin/installpkg --terse --terselength $TERSELENGTH $INCOMINGDIR/$NNAME
+      /sbin/installpkg --terse --terselength $TERSELENGTH $INCOMINGDIR/$NNAME
     elif [ $INFOBOX ]; then
-      $ROOT/sbin/installpkg --infobox $INCOMINGDIR/$NNAME
+      /sbin/installpkg --infobox $INCOMINGDIR/$NNAME
     elif [ $TERSE ]; then
-      OUTPUTLINE="$($ROOT/sbin/installpkg --terse --terselength $(expr $TERSELENGTH - 12) $INCOMINGDIR/$NNAME)"
+      OUTPUTLINE="$(/sbin/installpkg --terse --terselength $(expr $TERSELENGTH - 12) $INCOMINGDIR/$NNAME)"
       RETCODE=$?
       ( flock 9 || exit 11
         echo "Upgrading:  ${OUTPUTLINE}"
       ) 9> $INSTLOCKDIR/outputline.lock
     else
       echo "Pre-installing package $NEW..."
-      $ROOT/sbin/installpkg $INCOMINGDIR/$NNAME 1> /dev/null
+      /sbin/installpkg $INCOMINGDIR/$NNAME 1> /dev/null
       RETCODE=$?
     fi
   fi
@@ -406,9 +406,9 @@ EOF
   # shift location, so we should always reinstall as the final step:
   if [ ! "$NOT_PARANOID" = "true" ]; then
     if ! [ $TERSE ]; then
-      $ROOT/sbin/installpkg --no-overwrite $INCOMINGDIR/$NNAME
+      /sbin/installpkg --no-overwrite $INCOMINGDIR/$NNAME
     else
-      $ROOT/sbin/installpkg --no-overwrite $INCOMINGDIR/$NNAME 1> /dev/null
+      /sbin/installpkg --no-overwrite $INCOMINGDIR/$NNAME 1> /dev/null
     fi
   fi
   ! [ $TERSE ] && echo "Package $OLD upgraded with new package $INCOMINGDIR/$NNAME."
diff --git a/source/a/sysvinit-scripts/scripts/rc.4 b/source/a/sysvinit-scripts/scripts/rc.4
index 76278410..ee32e48f 100644
--- a/source/a/sysvinit-scripts/scripts/rc.4
+++ b/source/a/sysvinit-scripts/scripts/rc.4
@@ -1,4 +1,4 @@
-#! /bin/sh
+#!/bin/bash
 #
 # rc.4		This file is executed by init(8) when the system is being
 #		initialized for run level 4 (XDM)
diff --git a/source/a/sysvinit-scripts/scripts/rc.6 b/source/a/sysvinit-scripts/scripts/rc.6
index b95c35c4..92338d4d 100644
--- a/source/a/sysvinit-scripts/scripts/rc.6
+++ b/source/a/sysvinit-scripts/scripts/rc.6
@@ -1,4 +1,4 @@
-#! /bin/sh
+#!/bin/bash
 #
 # rc.6		This file is executed by init when it goes into runlevel
 #		0 (halt) or runlevel 6 (reboot). It kills all processes,
diff --git a/source/a/sysvinit-scripts/scripts/rc.K b/source/a/sysvinit-scripts/scripts/rc.K
index a8d0808c..4330eafc 100644
--- a/source/a/sysvinit-scripts/scripts/rc.K
+++ b/source/a/sysvinit-scripts/scripts/rc.K
@@ -1,4 +1,4 @@
-#! /bin/sh
+#!/bin/bash
 #
 # rc.K 		This file is executed by init when it goes into runlevel
 #		1, which is the administrative state. It kills all
diff --git a/source/a/sysvinit-scripts/scripts/rc.M b/source/a/sysvinit-scripts/scripts/rc.M
index f2c7952c..8a1a9b04 100644
--- a/source/a/sysvinit-scripts/scripts/rc.M
+++ b/source/a/sysvinit-scripts/scripts/rc.M
@@ -1,4 +1,4 @@
-#!/bin/sh
+#!/bin/bash
 #
 # rc.M		This file is executed by init(8) when the system is being
 #		initialized for one of the "multi user" run levels (i.e.
diff --git a/source/a/sysvinit-scripts/scripts/rc.S b/source/a/sysvinit-scripts/scripts/rc.S
index 03bd9ece..4dce8b6a 100644
--- a/source/a/sysvinit-scripts/scripts/rc.S
+++ b/source/a/sysvinit-scripts/scripts/rc.S
@@ -1,4 +1,4 @@
-#!/bin/sh
+#!/bin/bash
 #
 # /etc/rc.d/rc.S:  System initialization script.
 #
@@ -8,17 +8,13 @@
 PATH=/usr/local/sbin:/usr/sbin:/sbin:/usr/local/bin:/usr/bin:/bin
 
 # Mount /proc if it is not already mounted:
-if [ ! -r /proc/self/mounts ]; then
+if [ ! -d /proc/sys ]; then
   /sbin/mount -v proc /proc -n -t proc 2> /dev/null
 fi
 
-# Mount sysfs next, if the kernel supports it:
-if [ -d /sys ]; then
-  if grep -wq sysfs /proc/filesystems ; then
-    if ! grep -wq sysfs /proc/mounts ; then
-      /sbin/mount -v sysfs /sys -n -t sysfs
-    fi
-  fi
+# Mount /sys if it is not already mounted:
+if [ ! -d /sys/kernel ]; then
+  /sbin/mount -v sysfs /sys -n -t sysfs 2> /dev/null
 fi
 
 # If /run exists, mount a tmpfs on it (unless the
diff --git a/source/a/sysvinit-scripts/scripts/rc.cpufreq b/source/a/sysvinit-scripts/scripts/rc.cpufreq
index 4caaa5a4..10d713f0 100644
--- a/source/a/sysvinit-scripts/scripts/rc.cpufreq
+++ b/source/a/sysvinit-scripts/scripts/rc.cpufreq
@@ -1,4 +1,4 @@
-#!/bin/sh
+#!/bin/bash
 #
 # rc.cpufreq:  Settings for CPU frequency and voltage scaling in the kernel.
 #              For more information, see the kernel documentation in
diff --git a/source/a/sysvinit-scripts/scripts/rc.local b/source/a/sysvinit-scripts/scripts/rc.local
index 65b358bb..18f481d3 100644
--- a/source/a/sysvinit-scripts/scripts/rc.local
+++ b/source/a/sysvinit-scripts/scripts/rc.local
@@ -1,4 +1,4 @@
-#!/bin/sh
+#!/bin/bash
 #
 # /etc/rc.d/rc.local:  Local system initialization script.
 #
diff --git a/source/a/sysvinit-scripts/scripts/rc.loop b/source/a/sysvinit-scripts/scripts/rc.loop
index 942fc544..6d15a60f 100644
--- a/source/a/sysvinit-scripts/scripts/rc.loop
+++ b/source/a/sysvinit-scripts/scripts/rc.loop
@@ -1,4 +1,4 @@
-#!/bin/sh
+#!/bin/bash
 #
 # Load the loop device kernel module.
 #
diff --git a/source/a/sysvinit-scripts/scripts/rc.modules b/source/a/sysvinit-scripts/scripts/rc.modules
index 650c0ef8..cc5c7d25 100644
--- a/source/a/sysvinit-scripts/scripts/rc.modules
+++ b/source/a/sysvinit-scripts/scripts/rc.modules
@@ -1,4 +1,4 @@
-#!/bin/sh
+#!/bin/bash
 
 # /etc/rc.d/rc.modules
 
diff --git a/source/a/sysvinit-scripts/scripts/rc.modules.local b/source/a/sysvinit-scripts/scripts/rc.modules.local
index 6bd1f339..ef1bfc52 100644
--- a/source/a/sysvinit-scripts/scripts/rc.modules.local
+++ b/source/a/sysvinit-scripts/scripts/rc.modules.local
@@ -1,4 +1,4 @@
-#!/bin/sh
+#!/bin/bash
 
 # /etc/rc.d/rc.modules.local
 
diff --git a/source/a/sysvinit-scripts/scripts/rc.sysvinit b/source/a/sysvinit-scripts/scripts/rc.sysvinit
index 057c3f1e..4cbd873e 100644
--- a/source/a/sysvinit-scripts/scripts/rc.sysvinit
+++ b/source/a/sysvinit-scripts/scripts/rc.sysvinit
@@ -1,4 +1,4 @@
-#!/bin/sh
+#!/bin/bash
 #
 # rc.sysvinit   This file provides basic compatibility with SystemV style
 #               startup scripts.  The SystemV style init system places 
diff --git a/source/a/sysvinit-scripts/sysvinit-scripts.SlackBuild b/source/a/sysvinit-scripts/sysvinit-scripts.SlackBuild
index 7c126419..d09bc302 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.0}
 ARCH=noarch
-BUILD=${BUILD:-1}
+BUILD=${BUILD:-2}
 
 # 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