From 238f2af030367ddd0d0a014e19be72c45483e153 Mon Sep 17 00:00:00 2001
From: Patrick J Volkerding <volkerdi@slackware.com>
Date: Tue, 22 Jan 2019 01:38:43 +0000
Subject: Tue Jan 22 01:38:43 UTC 2019

a/btrfs-progs-4.20-x86_64-1.txz:  Upgraded.
a/kernel-firmware-20190118_a8b75ca-noarch-1.txz:  Upgraded.
a/sysvinit-scripts-2.1-noarch-26.txz:  Rebuilt.
  rc.S: Don't sleep for 3 seconds before mounting non-root filesystems. This
  should not be needed once udev reports having settled all devices.
  Let me know if I'm wrong. :-)
d/parallel-20190122-noarch-1.txz:  Upgraded.
l/glib2-2.58.3-x86_64-1.txz:  Upgraded.
l/gtk+3-3.24.4-x86_64-1.txz:  Upgraded.
l/librsvg-2.44.12-x86_64-1.txz:  Upgraded.
l/python-packaging-19.0-x86_64-1.txz:  Upgraded.
n/p11-kit-0.23.15-x86_64-1.txz:  Upgraded.
x/libinput-1.12.6-x86_64-1.txz:  Upgraded.
xfce/exo-0.12.4-x86_64-1.txz:  Upgraded.
---
 source/a/btrfs-progs/btrfs-progs.SlackBuild           | 8 ++++----
 source/a/sysvinit-scripts/scripts/rc.S                | 4 ----
 source/a/sysvinit-scripts/sysvinit-scripts.SlackBuild | 2 +-
 source/xfce/exo/exo.url                               | 2 +-
 4 files changed, 6 insertions(+), 10 deletions(-)

(limited to 'source')

diff --git a/source/a/btrfs-progs/btrfs-progs.SlackBuild b/source/a/btrfs-progs/btrfs-progs.SlackBuild
index 2de9fe6ae..60f7eb376 100755
--- a/source/a/btrfs-progs/btrfs-progs.SlackBuild
+++ b/source/a/btrfs-progs/btrfs-progs.SlackBuild
@@ -51,7 +51,7 @@ fi
 # the name of the created package would be, and then exit. This information
 # could be useful to other scripts.
 if [ ! -z "${PRINT_PACKAGE_NAME}" ]; then
-  echo "$PKGNAM-$VERSION-$ARCH-$BUILD.txz"
+  echo "$PKGNAM-$(echo $VERSION | tr -d v)-$ARCH-$BUILD.txz"
   exit 0
 fi
 
@@ -150,14 +150,14 @@ if [ -d $PKG/usr/man ]; then
 fi
 
 # Add a documentation directory:
-mkdir -p $PKG/usr/doc/${PKGNAM}-$VERSION
+mkdir -p $PKG/usr/doc/${PKGNAM}-$(echo $VERSION | tr -d v)
 cp -a \
   COPYING* INSTALL README* \
-  $PKG/usr/doc/${PKGNAM}-$VERSION
+  $PKG/usr/doc/${PKGNAM}-$(echo $VERSION | tr -d v)
 
 mkdir -p $PKG/install
 cat $CWD/slack-desc > $PKG/install/slack-desc
 
 cd $TMP/package-${PKGNAM}
-/sbin/makepkg -l y -c n $TMP/${PKGNAM}-$VERSION-$ARCH-$BUILD.txz
+/sbin/makepkg -l y -c n $TMP/${PKGNAM}-$(echo $VERSION | tr -d v)-$ARCH-$BUILD.txz
 
diff --git a/source/a/sysvinit-scripts/scripts/rc.S b/source/a/sysvinit-scripts/scripts/rc.S
index e53cd96da..4162938f3 100644
--- a/source/a/sysvinit-scripts/scripts/rc.S
+++ b/source/a/sysvinit-scripts/scripts/rc.S
@@ -274,7 +274,6 @@ elif [ ! $READWRITE = yes ]; then
     /sbin/umount -a -r
     /sbin/mount -n -o remount,ro /
     echo "Rebooting system."
-    sleep 2
     reboot -f
   fi
   # Remount the root filesystem in read-write mode
@@ -358,10 +357,7 @@ fi
 # because those have already been mounted.  Also check that
 # devpts is not already mounted before attempting to mount
 # it.  With a 2.6.x or newer kernel udev mounts devpts.
-# We also need to wait a little bit to let USB and other
-# hotplugged devices settle (sorry to slow down the boot):
 echo "Mounting non-root local filesystems:"
-sleep 3
 if /bin/grep -wq devpts /proc/mounts ; then
   # This pipe after the mount command is just to convert the new
   # mount verbose output back to the old format that contained
diff --git a/source/a/sysvinit-scripts/sysvinit-scripts.SlackBuild b/source/a/sysvinit-scripts/sysvinit-scripts.SlackBuild
index 4bc29169c..4f2588ea1 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:-2.1}
 ARCH=noarch
-BUILD=${BUILD:-25}
+BUILD=${BUILD:-26}
 
 # 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/xfce/exo/exo.url b/source/xfce/exo/exo.url
index 4445fc67a..14d3c88e8 100644
--- a/source/xfce/exo/exo.url
+++ b/source/xfce/exo/exo.url
@@ -1 +1 @@
-http://archive.xfce.org:/src/xfce/exo/0.12/exo-0.12.3.tar.bz2
+http://archive.xfce.org:/src/xfce/exo/0.12/exo-0.12.4.tar.bz2
-- 
cgit v1.2.3