Fri Jul 19 18:26:45 UTC 201920190719182645

a/aaa_elflibs-15.0-x86_64-9.txz:  Rebuilt.
  Upgraded: libbz2.so.1.0.8, libexpat.so.1.6.9, libglib-2.0.so.0.6000.5,
  libgmodule-2.0.so.0.6000.5, libgobject-2.0.so.0.6000.5,
  libgthread-2.0.so.0.6000.5, libidn2.so.0.3.6.
  Removed: libicudata.so.63.1, libicui18n.so.63.1, libicuio.so.63.1,
  libicutest.so.63.1, libicutu.so.63.1, libicuuc.so.63.1.
  Added: libpcre2-8.so.0.8.0, libpsl.so.5.3.2. These are needed by wget which
  is used by slackpkg, so they should be in here. Thanks to OutSiderBR.
ap/lxc-2.0.11_fad08f383-x86_64-1.txz:  Upgraded.
  Updated from 2.0 git branch.
  Ported init script updates from sysvinit-scripts.
d/ccache-3.7.2-x86_64-1.txz:  Upgraded.
l/libsigc++-2.10.2-x86_64-1.txz:  Upgraded.
n/curl-7.65.3-x86_64-1.txz:  Upgraded.
  This is a bugfix release:
  Fix a regression that caused the progress meter not to appear.
  For more information, see:
    https://curl.haxx.se/changes.html
n/iputils-20190709-x86_64-1.txz:  Upgraded.

14 files changed, 357 insertions, 283 deletions

diff --git a/source/a/aaa_elflibs/aaa_elflibs.SlackBuild b/source/a/aaa_elflibs/aaa_elflibs.SlackBuild
index bf2a5823a..a93e4aeeb 100755
--- a/source/a/aaa_elflibs/aaa_elflibs.SlackBuild
+++ b/source/a/aaa_elflibs/aaa_elflibs.SlackBuild
@@ -23,7 +23,7 @@ cd $(dirname $0) ; CWD=$(pwd)
 
 PKGNAM=aaa_elflibs
 VERSION=${VERSION:-15.0}
-BUILD=${BUILD:-8}
+BUILD=${BUILD:-9}
 
 # Automatically determine the architecture we're building on:
 if [ -z "$ARCH" ]; then
diff --git a/source/a/aaa_elflibs/symlinks-to-tracked-libs b/source/a/aaa_elflibs/symlinks-to-tracked-libs
index 5071f1a09..764d77bd2 100644
--- a/source/a/aaa_elflibs/symlinks-to-tracked-libs
+++ b/source/a/aaa_elflibs/symlinks-to-tracked-libs
@@ -61,9 +61,11 @@
 /usr/lib/libpanel.so.6
 /usr/lib/libpanelw.so.5
 /usr/lib/libpanelw.so.6
+/usr/lib/libpcre2-8.so.0
 /usr/lib/libpng.so.14
 /usr/lib/libpng14.so.14
 /usr/lib/libpng16.so.16
+/usr/lib/libpsl.so.5
 /usr/lib/libreadline.so.6
 /usr/lib/libreadline.so.7
 /usr/lib/libreadline.so.8
diff --git a/source/a/aaa_elflibs/symlinks-to-tracked-libs-tmp b/source/a/aaa_elflibs/symlinks-to-tracked-libs-tmp
index 18b81364c..2e0d30830 100644
--- a/source/a/aaa_elflibs/symlinks-to-tracked-libs-tmp
+++ b/source/a/aaa_elflibs/symlinks-to-tracked-libs-tmp
@@ -2,9 +2,3 @@
 # like to keep copies of temporarily until we can recompile
 # everything that's still using them.  Once that happens, they'll
 # be dropped from this package.
-/usr/lib/libicudata.so.63
-/usr/lib/libicui18n.so.63
-/usr/lib/libicuio.so.63
-/usr/lib/libicutest.so.63
-/usr/lib/libicutu.so.63
-/usr/lib/libicuuc.so.63
diff --git a/source/ap/lxc/scripts/rc.6.lxc b/source/ap/lxc/scripts/rc.6.lxc
index 7fd57ef26..73923da97 100644
--- a/source/ap/lxc/scripts/rc.6.lxc
+++ b/source/ap/lxc/scripts/rc.6.lxc
@@ -44,6 +44,10 @@ case "$0" in
 		;;
 esac
 
+# Restart init. This prevents init from hanging on to file handles for removed
+# glibc shared libraries in the case that those were upgraded or reinstalled.
+/sbin/telinit u
+
 # Save the system time to the hardware clock using hwclock --systohc.
 # This will also create or update the timestamps in /etc/adjtime.
 if [ -x /sbin/hwclock -a -z "$container" ]; then
@@ -114,6 +118,11 @@ if [ -x /etc/rc.d/rc.openldap ]; then
   /etc/rc.d/rc.openldap stop
 fi
 
+# Stop the haveged entropy daemon:
+if [ -x /etc/rc.d/rc.haveged -a -z "$container" ]; then
+  /etc/rc.d/rc.haveged stop
+fi
+
 # Stop D-Bus:
 if [ -x /etc/rc.d/rc.messagebus ]; then
   /etc/rc.d/rc.messagebus stop
@@ -122,10 +131,10 @@ fi
 # Kill any processes (typically gam) that would otherwise prevent
 # unmounting NFS volumes:
 unset FUSER_DELAY
-for dir in $(/bin/mount | grep 'type nfs ' | cut -d ' ' -f 3 ) ; do
+for dir in $(/bin/mount | grep 'type nfs ' | sed -e 's|.* on ||g' | cut -d ' ' -f 1) ; do
   echo "Killing processes holding NFS mount $dir open..."
   # Background this to prevent fuser from also blocking shutdown:
-  /usr/bin/fuser -k -m $dir &
+  /usr/bin/fuser -k -M -m "$dir" &
   FUSER_DELAY=5
 done
 # If fuser was run, let it have some delay:
@@ -236,7 +245,11 @@ fi
 
 if [ -z "$container" ]; then
   echo "Unmounting local file systems:"
-  /bin/umount -v -a -t no,proc,sysfs | tr -d ' ' | grep successfully | sed "s/:successfullyunmounted/ has been successfully unmounted./g" 2> /dev/null
+  /bin/umount -v -a -t no,proc,sysfs,devtmpfs,fuse.gvfsd-fuse,tmpfs
+  # JFS needs a sync here or the / partition cannot be remounted read-only.
+  # In spite of this, it seems that a JFS root partition will always be checked
+  # (and found to be clean) at boot:
+  /bin/sync
   echo "Remounting root filesystem read-only:"
   /bin/mount -v -n -o remount,ro /
 fi
@@ -269,7 +282,7 @@ fi
 if [ -z "$container" ]; then
   if [ -r /etc/lvmtab -o -d /etc/lvm/backup ]; then
     echo "Deactivating LVM volume groups:"
-    /sbin/vgchange -an --ignorelockingfailure
+    /sbin/vgchange -an
   fi
 fi
 
diff --git a/source/ap/lxc/scripts/rc.6.orig b/source/ap/lxc/scripts/rc.6.orig
index 23c280d91..e3986db86 100644
--- a/source/ap/lxc/scripts/rc.6.orig
+++ b/source/ap/lxc/scripts/rc.6.orig
@@ -37,6 +37,10 @@ case "$0" in
 		;;
 esac
 
+# Restart init. This prevents init from hanging on to file handles for removed
+# glibc shared libraries in the case that those were upgraded or reinstalled.
+/sbin/telinit u
+
 # Save the system time to the hardware clock using hwclock --systohc.
 # This will also create or update the timestamps in /etc/adjtime.
 if [ -x /sbin/hwclock ]; then
@@ -107,6 +111,11 @@ if [ -x /etc/rc.d/rc.openldap ]; then
   /etc/rc.d/rc.openldap stop
 fi
 
+# Stop the haveged entropy daemon:
+if [ -x /etc/rc.d/rc.haveged ]; then
+  /etc/rc.d/rc.haveged stop
+fi
+
 # Stop D-Bus:
 if [ -x /etc/rc.d/rc.messagebus ]; then
   /etc/rc.d/rc.messagebus stop
@@ -115,10 +124,10 @@ fi
 # Kill any processes (typically gam) that would otherwise prevent
 # unmounting NFS volumes:
 unset FUSER_DELAY
-for dir in $(/bin/mount | grep 'type nfs ' | cut -d ' ' -f 3 ) ; do
+for dir in $(/bin/mount | grep 'type nfs ' | sed -e 's|.* on ||g' | cut -d ' ' -f 1) ; do
   echo "Killing processes holding NFS mount $dir open..."
   # Background this to prevent fuser from also blocking shutdown:
-  /usr/bin/fuser -k -m $dir &
+  /usr/bin/fuser -k -M -m "$dir" &
   FUSER_DELAY=5
 done
 # If fuser was run, let it have some delay:
@@ -225,8 +234,19 @@ if [ -x /etc/rc.d/rc.cgmanager ]; then
   /etc/rc.d/rc.cgmanager stop
 fi
 
+# Umount all tmpfs mounts except /dev/shm and under /run:
+cat /proc/mounts | grep " tmpfs " | grep -v -e " /run " -e " /run/" -e " /dev/shm " | while read mount ; do
+  umount --recursive -v $(echo $mount | cut -f 2 -d ' ') 2> /dev/null
+done
+
+# Unmount local file systems:
 echo "Unmounting local file systems:"
-/bin/umount -v -a -t no,proc,sysfs | tr -d ' ' | grep successfully | sed "s/:successfullyunmounted/ has been successfully unmounted./g" 2> /dev/null
+/bin/umount -v -a -t no,proc,sysfs,devtmpfs,fuse.gvfsd-fuse,tmpfs
+
+# JFS needs a sync here or the / partition cannot be remounted read-only.
+# In spite of this, it seems that a JFS root partition will always be checked
+# (and found to be clean) at boot:
+/bin/sync
 
 echo "Remounting root filesystem read-only:"
 /bin/mount -v -n -o remount,ro /
@@ -258,7 +278,7 @@ fi
 # Deactivate LVM volume groups:
 if [ -r /etc/lvmtab -o -d /etc/lvm/backup ]; then
   echo "Deactivating LVM volume groups:"
-  /sbin/vgchange -an --ignorelockingfailure
+  /sbin/vgchange -an
 fi
 
 # This never hurts again (especially since root-on-LVM always fails
diff --git a/source/ap/lxc/scripts/rc.M.lxc b/source/ap/lxc/scripts/rc.M.lxc
index 2b16190eb..8cab0150b 100644
--- a/source/ap/lxc/scripts/rc.M.lxc
+++ b/source/ap/lxc/scripts/rc.M.lxc
@@ -27,10 +27,10 @@ if [ -x /sbin/ldconfig ]; then
   /sbin/ldconfig &
 fi
 
-# Screen blanks after 15 minutes idle time, and powers down in one hour
-# if the kernel supports APM or ACPI power management:
-if [ -z "$container" ]; then
-  /bin/setterm -blank 15 -powersave powerdown -powerdown 60
+# Call the setterm init script to set screen blanking and power management
+# defaults:
+if [ -x /etc/rc.d/rc.setterm -a -z "$container" ]; then
+  /etc/rc.d/rc.setterm
 fi
 
 # Set the hostname.
@@ -105,6 +105,16 @@ if grep -wq sysfs /proc/mounts && grep -q devtmpfs /proc/filesystems ; then
   fi
 fi
 
+# Start the haveged entropy daemon:
+if [ -x /etc/rc.d/rc.haveged -a -z "$container" ]; then
+  /etc/rc.d/rc.haveged start
+fi
+
+# Start the rngd entropy daemon:
+if [ -x /etc/rc.d/rc.rngd -a -z "$container" ]; then
+  /etc/rc.d/rc.rngd start
+fi
+
 # Initialize the networking hardware.
 if [ -x /etc/rc.d/rc.inet1 ]; then
   /etc/rc.d/rc.inet1
@@ -115,6 +125,11 @@ if [ -x /etc/rc.d/rc.messagebus ]; then
   /etc/rc.d/rc.messagebus start
 fi
 
+# Start console-kit-daemon:
+if [ -x /etc/rc.d/rc.consolekit ]; then
+  /etc/rc.d/rc.consolekit start
+fi
+
 # Start Bluetooth:
 if [ -x /etc/rc.d/rc.bluetooth ]; then
   /etc/rc.d/rc.bluetooth start
@@ -146,8 +161,7 @@ if [ -x /etc/rc.d/rc.ntpd ]; then
 fi
 
 # Remove stale locks and junk files (must be done after mount -a!)
-/bin/rm -f /var/lock/* /var/spool/uucp/LCK..* /tmp/.X*lock /tmp/core /core 2> /dev/null
-/bin/rm -rf /var/spool/cron/cron.?????? 2> /dev/null
+/bin/rm -f /var/lock/* /var/spool/uucp/LCK..* /tmp/.X*lock /tmp/.X11-unix/* 2> /dev/null
 
 # Remove stale hunt sockets so the game can start.
 if [ -r /tmp/hunt -o -r /tmp/hunt.stats ]; then
@@ -191,11 +205,6 @@ if [ -x /usr/bin/update-mime-database -a -d /usr/share/mime ]; then
   /usr/bin/update-mime-database /usr/share/mime 1> /dev/null 2> /dev/null &
 fi
 
-# Start console-kit-daemon:
-if [ -x /etc/rc.d/rc.consolekit ]; then
-  /etc/rc.d/rc.consolekit start
-fi
-
 # Start HAL:
 if [ -x /etc/rc.d/rc.hald ]; then
   /etc/rc.d/rc.hald start
@@ -217,7 +226,7 @@ fi
 if [ -x /usr/bin/update-gdk-pixbuf-loaders ]; then
   echo "Updating gdk-pixbuf.loaders:"
   echo "  /usr/bin/update-gdk-pixbuf-loaders &"
-  /usr/bin/update-gdk-pixbuf-loaders > /dev/null 2>&1 &
+  HOME=/root /usr/bin/update-gdk-pixbuf-loaders > /dev/null 2>&1 &
 fi
 if [ -x /usr/bin/update-pango-querymodules ]; then
   echo "Updating pango.modules:"
@@ -255,12 +264,10 @@ if [ -x /etc/rc.d/rc.atalk ]; then
 fi
 
 # Start smartd, which monitors the status of S.M.A.R.T. compatible
-# hard drives and reports any problems.  Note some devices (which aren't
-# smart, I guess ;) will hang if probed by smartd, so it's commented out
-# by default.
-#if [ -x /usr/sbin/smartd ]; then
-#  /usr/sbin/smartd
-#fi
+# hard drives and reports any problems:
+if [ -x /etc/rc.d/rc.smartd -a -z "$container" ]; then
+  /etc/rc.d/rc.smartd start
+fi
 
 # Monitor the UPS with genpowerd.
 # To use this, uncomment this section and edit your settings in
@@ -285,15 +292,13 @@ if [ -x /sbin/accton -a -r /var/log/pacct ]; then
 fi
 
 # Start crond (Dillon's crond):
-# If you want cron to actually log activity to /var/log/cron, then change
-# -l notice to -l info to increase the logging level.
-if [ -x /usr/sbin/crond ]; then
-  /usr/sbin/crond -l notice
+if [ -x /etc/rc.d/rc.crond ]; then
+  /etc/rc.d/rc.crond start
 fi
 
 # Start atd (manages jobs scheduled with 'at'):
-if [ -x /usr/sbin/atd ]; then
-  /usr/sbin/atd -b 15 -l 1
+if [ -x /etc/rc.d/rc.atd ]; then
+  /etc/rc.d/rc.atd start
 fi
 
 # Slackware-Mini-Quota-HOWTO:
@@ -386,6 +391,18 @@ if [ -x /etc/rc.d/rc.gpm ]; then
   /etc/rc.d/rc.gpm start
 fi
 
+# Start the Icecream scheduler. This needs to run on only one machine that is
+# part of the compile cluster:
+if [ -x /etc/rc.d/rc.icecc-scheduler ]; then
+  /etc/rc.d/rc.icecc-scheduler start
+fi
+
+# Start the Icecream daemon. This needs to run on every machine that will be
+# part of the compile cluster (including the machine running the scheduler):
+if [ -x /etc/rc.d/rc.iceccd ]; then
+  /etc/rc.d/rc.iceccd start
+fi
+
 # If there are SystemV init scripts for this runlevel, run them.
 if [ -x /etc/rc.d/rc.sysvinit ]; then
   /etc/rc.d/rc.sysvinit
diff --git a/source/ap/lxc/scripts/rc.M.orig b/source/ap/lxc/scripts/rc.M.orig
index 0cd9f0b52..cfffb8ec4 100644
--- a/source/ap/lxc/scripts/rc.M.orig
+++ b/source/ap/lxc/scripts/rc.M.orig
@@ -20,9 +20,11 @@ if [ -x /sbin/ldconfig ]; then
   /sbin/ldconfig &
 fi
 
-# Screen blanks after 15 minutes idle time, and powers down in one hour
-# if the kernel supports APM or ACPI power management:
-/bin/setterm -blank 15 -powersave powerdown -powerdown 60
+# Call the setterm init script to set screen blanking and power management
+# defaults:
+if [ -x /etc/rc.d/rc.setterm ]; then
+  /etc/rc.d/rc.setterm
+fi
 
 # Set the hostname.
 if [ -r /etc/HOSTNAME ]; then
@@ -30,7 +32,7 @@ if [ -r /etc/HOSTNAME ]; then
 else
   # fall back on this old default:
   echo "darkstar.example.net" > /etc/HOSTNAME
-  /bin/hostname darkstar
+  /bin/hostname $(cat /etc/HOSTNAME)
 fi
 
 # Set the permissions on /var/log/dmesg according to whether the kernel
@@ -94,6 +96,16 @@ if grep -wq sysfs /proc/mounts && grep -q devtmpfs /proc/filesystems ; then
   fi
 fi
 
+# Start the haveged entropy daemon:
+if [ -x /etc/rc.d/rc.haveged ]; then
+  /etc/rc.d/rc.haveged start
+fi
+
+# Start the rngd entropy daemon:
+if [ -x /etc/rc.d/rc.rngd ]; then
+  /etc/rc.d/rc.rngd start
+fi
+
 # Initialize the networking hardware.
 if [ -x /etc/rc.d/rc.inet1 ]; then
   /etc/rc.d/rc.inet1
@@ -104,6 +116,11 @@ if [ -x /etc/rc.d/rc.messagebus ]; then
   /etc/rc.d/rc.messagebus start
 fi
 
+# Start console-kit-daemon:
+if [ -x /etc/rc.d/rc.consolekit ]; then
+  /etc/rc.d/rc.consolekit start
+fi
+
 # Start Bluetooth:
 if [ -x /etc/rc.d/rc.bluetooth ]; then
   /etc/rc.d/rc.bluetooth start
@@ -135,8 +152,7 @@ if [ -x /etc/rc.d/rc.ntpd ]; then
 fi
 
 # Remove stale locks and junk files (must be done after mount -a!)
-/bin/rm -f /var/lock/* /var/spool/uucp/LCK..* /tmp/.X*lock /tmp/core /core 2> /dev/null
-/bin/rm -rf /var/spool/cron/cron.?????? 2> /dev/null
+/bin/rm -f /var/lock/* /var/spool/uucp/LCK..* /tmp/.X*lock /tmp/.X11-unix/* 2> /dev/null
 
 # Remove stale hunt sockets so the game can start.
 if [ -r /tmp/hunt -o -r /tmp/hunt.stats ]; then
@@ -180,11 +196,6 @@ if [ -x /usr/bin/update-mime-database -a -d /usr/share/mime ]; then
   /usr/bin/update-mime-database /usr/share/mime 1> /dev/null 2> /dev/null &
 fi
 
-# Start console-kit-daemon:
-if [ -x /etc/rc.d/rc.consolekit ]; then
-  /etc/rc.d/rc.consolekit start
-fi
-
 # Start HAL:
 if [ -x /etc/rc.d/rc.hald ]; then
   /etc/rc.d/rc.hald start
@@ -206,7 +217,7 @@ fi
 if [ -x /usr/bin/update-gdk-pixbuf-loaders ]; then
   echo "Updating gdk-pixbuf.loaders:"
   echo "  /usr/bin/update-gdk-pixbuf-loaders &"
-  /usr/bin/update-gdk-pixbuf-loaders > /dev/null 2>&1 &
+  HOME=/root /usr/bin/update-gdk-pixbuf-loaders > /dev/null 2>&1 &
 fi
 if [ -x /usr/bin/update-pango-querymodules ]; then
   echo "Updating pango.modules:"
@@ -244,12 +255,10 @@ if [ -x /etc/rc.d/rc.atalk ]; then
 fi
 
 # Start smartd, which monitors the status of S.M.A.R.T. compatible
-# hard drives and reports any problems.  Note some devices (which aren't
-# smart, I guess ;) will hang if probed by smartd, so it's commented out
-# by default.
-#if [ -x /usr/sbin/smartd ]; then
-#  /usr/sbin/smartd
-#fi
+# hard drives and reports any problems:
+if [ -x /etc/rc.d/rc.smartd ]; then
+  /etc/rc.d/rc.smartd start
+fi
 
 # Monitor the UPS with genpowerd.
 # To use this, uncomment this section and edit your settings in
@@ -274,15 +283,13 @@ if [ -x /sbin/accton -a -r /var/log/pacct ]; then
 fi
 
 # Start crond (Dillon's crond):
-# If you want cron to actually log activity to /var/log/cron, then change
-# -l notice to -l info to increase the logging level.
-if [ -x /usr/sbin/crond ]; then
-  /usr/sbin/crond -l notice
+if [ -x /etc/rc.d/rc.crond ]; then
+  /etc/rc.d/rc.crond start
 fi
 
 # Start atd (manages jobs scheduled with 'at'):
-if [ -x /usr/sbin/atd ]; then
-  /usr/sbin/atd -b 15 -l 1
+if [ -x /etc/rc.d/rc.atd ]; then
+  /etc/rc.d/rc.atd start
 fi
 
 # Slackware-Mini-Quota-HOWTO:
@@ -375,6 +382,18 @@ if [ -x /etc/rc.d/rc.gpm ]; then
   /etc/rc.d/rc.gpm start
 fi
 
+# Start the Icecream scheduler. This needs to run on only one machine that is
+# part of the compile cluster:
+if [ -x /etc/rc.d/rc.icecc-scheduler ]; then
+  /etc/rc.d/rc.icecc-scheduler start
+fi
+
+# Start the Icecream daemon. This needs to run on every machine that will be
+# part of the compile cluster (including the machine running the scheduler):
+if [ -x /etc/rc.d/rc.iceccd ]; then
+  /etc/rc.d/rc.iceccd start
+fi
+
 # If there are SystemV init scripts for this runlevel, run them.
 if [ -x /etc/rc.d/rc.sysvinit ]; then
   /etc/rc.d/rc.sysvinit
diff --git a/source/ap/lxc/scripts/rc.S.lxc b/source/ap/lxc/scripts/rc.S.lxc
index d6bc21f0a..6732184a1 100644
--- a/source/ap/lxc/scripts/rc.S.lxc
+++ b/source/ap/lxc/scripts/rc.S.lxc
@@ -191,11 +191,6 @@ if [ -z "$container" ]; then
   /sbin/swapon -a 2> /dev/null
 fi
 
-# Start FUSE, if requested:
-if [ -x /etc/rc.d/rc.fuse -a -z "$container" ]; then
-  /etc/rc.d/rc.fuse start
-fi
-
 # Set the tick and frequency for the system clock.
 # Default values are: TICK=10000 and FREQ=0
 if [ -z "$container" ]; then
@@ -255,7 +250,12 @@ fi
 
 # Check the root filesystem:
 if [ -z "$container" ]; then
-  if [ ! $READWRITE = yes ]; then
+  # If we're using F2FS for the root filesystem, don't check it as it doesn't
+  # allow checking a read-only filesystem:
+  if grep -q ' / f2fs ' /proc/mounts ; then
+    echo "Remounting root device with read-write enabled."
+    /sbin/mount -w -v -n -o remount /
+  elif [ ! $READWRITE = yes ]; then
     RETVAL=0
     if [ ! -r /etc/fastboot ]; then
       echo "Checking root filesystem:"
@@ -294,7 +294,6 @@ if [ -z "$container" ]; 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
@@ -318,24 +317,23 @@ if [ -z "$container" ]; then
   fi # Done checking root filesystem
 fi
 
-# Any /etc/mtab that exists here is old, so we start with a new one:
-/bin/rm -f /etc/mtab{,~,.tmp} && /bin/touch /etc/mtab
-
-# Add entry for / to /etc/mtab:
-if [ -z "$container" ]; then
-  /sbin/mount -f -w /
-fi
-
-# Add /proc, /sys, and /dev/shm mounts to /etc/mtab:
-if [ -z "$container" ]; then
-  if [ -d /proc/sys ]; then
-    /sbin/mount -f -t proc proc /proc
-  fi
-  if [ -d /sys/bus ]; then
-    /sbin/mount -f -t sysfs sysfs /sys
-  fi
-  if grep -q '^[^ ]\+ /dev/shm ' /proc/mounts 2> /dev/null ; then
-    /sbin/mount -f -t tmpfs tmpfs /dev/shm
+# If /etc/mtab is a symlink (probably to /proc/mounts) then we don't want to mess with it.
+if [ ! -L /etc/mtab -o ! -r /etc/mtab ]; then
+  # /etc/mtab is a file (or doesn't exist), so we'll handle it the old way:
+  # Any /etc/mtab that exists here is old, so we start with a new one:
+  /bin/rm -f /etc/mtab{,~,.tmp} && /bin/touch /etc/mtab
+  if [ -z "$container" ]; then
+    # Add /, /proc, /sys, and /dev/shm mounts to /etc/mtab:
+    /sbin/mount -f -w /
+    if [ -d /proc/sys ]; then
+      /sbin/mount -f -t proc proc /proc
+    fi
+    if [ -d /sys/bus ]; then
+      /sbin/mount -f -t sysfs sysfs /sys
+    fi
+    if grep -q '^[^ ]\+ /dev/shm ' /proc/mounts 2> /dev/null ; then
+      /sbin/mount -f -t tmpfs tmpfs /dev/shm
+    fi
   fi
 fi
 
@@ -384,18 +382,15 @@ 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):
 if [ -z "$container" ]; then
   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
     # more useful information:
-    /sbin/mount -a -v -t nonfs,nosmbfs,nocifs,noproc,nosysfs,nodevpts | grep successfully | cut -f 1 -d : | tr -d ' ' | while read dev ; do mount | grep "${dev} " ; done
+    /sbin/mount -a -v -t nonfs,nosmbfs,nocifs,noproc,nosysfs,nodevpts | grep successfully | cut -f 1 -d : | tr -d ' ' | while read dev ; do mount | grep " ${dev} " ; done
   else
-    /sbin/mount -a -v -t nonfs,nosmbfs,nocifs,noproc,nosysfs | grep successfully | cut -f 1 -d : | tr -d ' ' | while read dev ; do mount | grep "${dev} " ; done
+    /sbin/mount -a -v -t nonfs,nosmbfs,nocifs,noproc,nosysfs | grep successfully | cut -f 1 -d : | tr -d ' ' | while read dev ; do mount | grep " ${dev} " ; done
   fi
 fi
 
@@ -411,13 +406,23 @@ if [ -x /etc/rc.d/rc.cgmanager -a -d /sys/fs/cgroup ]; then
   /etc/rc.d/rc.cgmanager start
 fi
 
+# Start libcgroup services:
+if [ -x /etc/rc.d/rc.cgconfig -a -x /etc/rc.d/rc.cgred -a -d /sys/fs/cgroup ]; then
+  /etc/rc.d/rc.cgconfig start ; echo " /usr/sbin/cgconfigparser -l /etc/cgconfig.conf"
+  /etc/rc.d/rc.cgred start
+fi
+
 # Clean up some temporary files:
 rm -f /var/run/* /var/run/*/* /var/run/*/*/* /etc/nologin \
   /etc/dhcpc/*.pid /etc/forcefsck /etc/fastboot \
   /var/state/saslauthd/saslauthd.pid \
   /tmp/.Xauth* 1> /dev/null 2> /dev/null
+if [ -d /var/lib/pkgtools/setup/tmp ]; then
+  ( cd /var/lib/pkgtools/setup/tmp && rm -rf * )
+elif [ -d /var/log/setup/tmp ]; then
   ( cd /var/log/setup/tmp && rm -rf * )
-  ( cd /tmp && rm -rf kde-[a-zA-Z]* ksocket-[a-zA-Z]* hsperfdata_[a-zA-Z]* plugtmp* )
+fi
+( cd /tmp && rm -rf kde-[a-zA-Z]* ksocket-[a-zA-Z]* hsperfdata_[a-zA-Z]* plugtmp* )
 
 # Clear /var/lock/subsys:
 if [ -d /var/lock/subsys ]; then
@@ -471,4 +476,3 @@ else
   dd if=/dev/urandom of=/etc/random-seed count=1 bs=512 2> /dev/null
 fi
 chmod 600 /etc/random-seed
-
diff --git a/source/ap/lxc/scripts/rc.S.orig b/source/ap/lxc/scripts/rc.S.orig
index 78e68e40a..4162938f3 100644
--- a/source/ap/lxc/scripts/rc.S.orig
+++ b/source/ap/lxc/scripts/rc.S.orig
@@ -73,7 +73,6 @@ if grep -wq cgroup /proc/filesystems ; then
   fi
 fi
 
-
 # Initialize the Logical Volume Manager.
 # This won't start unless we find /etc/lvmtab (LVM1) or
 # /etc/lvm/backup/ (LVM2).  This is created by /sbin/vgscan, so to
@@ -177,11 +176,6 @@ fi
 # Enable swapping:
 /sbin/swapon -a 2> /dev/null
 
-# Start FUSE, if requested:
-if [ -x /etc/rc.d/rc.fuse ]; then
-  /etc/rc.d/rc.fuse start
-fi
-
 # Set the tick and frequency for the system clock.
 # Default values are: TICK=10000 and FREQ=0
 TICK=10000
@@ -235,8 +229,13 @@ if [ -r /etc/forcefsck ]; then
   FORCEFSCK="-f"
 fi
 
-# Check the root filesystem:
-if [ ! $READWRITE = yes ]; then
+# If we're using F2FS for the root filesystem, don't check it as it doesn't
+# allow checking a read-only filesystem:
+if grep -q ' / f2fs ' /proc/mounts ; then
+  echo "Remounting root device with read-write enabled."
+  /sbin/mount -w -v -n -o remount /
+elif [ ! $READWRITE = yes ]; then
+  # Check the root filesystem:
   RETVAL=0
   if [ ! -r /etc/fastboot ]; then
     echo "Checking root filesystem:"
@@ -275,7 +274,6 @@ if [ ! $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
@@ -298,22 +296,22 @@ else
   echo "to the Linux section in your /etc/lilo.conf and type 'lilo' to reinstall it."
 fi # Done checking root filesystem
 
-
-# Any /etc/mtab that exists here is old, so we start with a new one:
-/bin/rm -f /etc/mtab{,~,.tmp} && /bin/touch /etc/mtab
-
-# Add entry for / to /etc/mtab:
-/sbin/mount -f -w /
-
-# Add /proc, /sys, and /dev/shm mounts to /etc/mtab:
-if [ -d /proc/sys ]; then
-  /sbin/mount -f -t proc proc /proc
-fi
-if [ -d /sys/bus ]; then
-  /sbin/mount -f -t sysfs sysfs /sys
-fi
-if grep -q '^[^ ]\+ /dev/shm ' /proc/mounts 2> /dev/null ; then
-  /sbin/mount -f -t tmpfs tmpfs /dev/shm
+# If /etc/mtab is a symlink (probably to /proc/mounts) then we don't want to mess with it.
+if [ ! -L /etc/mtab -o ! -r /etc/mtab ]; then
+  # /etc/mtab is a file (or doesn't exist), so we'll handle it the old way:
+  # Any /etc/mtab that exists here is old, so we start with a new one:
+  /bin/rm -f /etc/mtab{,~,.tmp} && /bin/touch /etc/mtab
+  # Add /, /proc, /sys, and /dev/shm mounts to /etc/mtab:
+  /sbin/mount -f -w /
+  if [ -d /proc/sys ]; then
+    /sbin/mount -f -t proc proc /proc
+  fi
+  if [ -d /sys/bus ]; then
+    /sbin/mount -f -t sysfs sysfs /sys
+  fi
+  if grep -q '^[^ ]\+ /dev/shm ' /proc/mounts 2> /dev/null ; then
+    /sbin/mount -f -t tmpfs tmpfs /dev/shm
+  fi
 fi
 
 # Configure ISA Plug-and-Play devices:
@@ -359,17 +357,14 @@ 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
   # more useful information:
-  /sbin/mount -a -v -t nonfs,nosmbfs,nocifs,noproc,nosysfs,nodevpts | grep successfully | cut -f 1 -d : | tr -d ' ' | while read dev ; do mount | grep "${dev} " ; done
+  /sbin/mount -a -v -t nonfs,nosmbfs,nocifs,noproc,nosysfs,nodevpts | grep successfully | cut -f 1 -d : | tr -d ' ' | while read dev ; do mount | grep " ${dev} " ; done
 else
-  /sbin/mount -a -v -t nonfs,nosmbfs,nocifs,noproc,nosysfs | grep successfully | cut -f 1 -d : | tr -d ' ' | while read dev ; do mount | grep "${dev} " ; done
+  /sbin/mount -a -v -t nonfs,nosmbfs,nocifs,noproc,nosysfs | grep successfully | cut -f 1 -d : | tr -d ' ' | while read dev ; do mount | grep " ${dev} " ; done
 fi
 
 # Enable swapping again.  This is needed in case a swapfile is used,
@@ -382,13 +377,23 @@ if [ -x /etc/rc.d/rc.cgmanager -a -d /sys/fs/cgroup ]; then
   /etc/rc.d/rc.cgmanager start
 fi
 
+# Start libcgroup services:
+if [ -x /etc/rc.d/rc.cgconfig -a -x /etc/rc.d/rc.cgred -a -d /sys/fs/cgroup ]; then
+  /etc/rc.d/rc.cgconfig start ; echo " /usr/sbin/cgconfigparser -l /etc/cgconfig.conf"
+  /etc/rc.d/rc.cgred start
+fi
+
 # Clean up some temporary files:
 rm -f /var/run/* /var/run/*/* /var/run/*/*/* /etc/nologin \
   /etc/dhcpc/*.pid /etc/forcefsck /etc/fastboot \
   /var/state/saslauthd/saslauthd.pid \
   /tmp/.Xauth* 1> /dev/null 2> /dev/null
+if [ -d /var/lib/pkgtools/setup/tmp ]; then
+  ( cd /var/lib/pkgtools/setup/tmp && rm -rf * )
+elif [ -d /var/log/setup/tmp ]; then
   ( cd /var/log/setup/tmp && rm -rf * )
-  ( cd /tmp && rm -rf kde-[a-zA-Z]* ksocket-[a-zA-Z]* hsperfdata_[a-zA-Z]* plugtmp* )
+fi
+( cd /tmp && rm -rf kde-[a-zA-Z]* ksocket-[a-zA-Z]* hsperfdata_[a-zA-Z]* plugtmp* )
 
 # Clear /var/lock/subsys:
 if [ -d /var/lock/subsys ]; then
@@ -442,4 +447,3 @@ else
   dd if=/dev/urandom of=/etc/random-seed count=1 bs=512 2> /dev/null
 fi
 chmod 600 /etc/random-seed
-
diff --git a/source/ap/lxc/scripts/rc.inet1.lxc b/source/ap/lxc/scripts/rc.inet1.lxc
index 58213a7c0..2ae9bbb58 100644
--- a/source/ap/lxc/scripts/rc.inet1.lxc
+++ b/source/ap/lxc/scripts/rc.inet1.lxc
@@ -1,4 +1,4 @@
-#! /bin/sh
+#!/bin/bash
 # /etc/rc.d/rc.inet1
 # This script is used to bring up the various network interfaces.
 #
@@ -215,19 +215,28 @@ if_up() {
         # 15 seconds should be a reasonable default DHCP timeout.  30 was too much.
         echo "/etc/rc.d/rc.inet1:  /sbin/dhcpcd -L -t ${DHCP_TIMEOUT[$i]:-15} ${DHCP_OPTIONS} ${1}" | $LOGGER
         /sbin/dhcpcd -L -t ${DHCP_TIMEOUT[$i]:-15} ${DHCP_OPTIONS} ${1}
-        # If the dhcpcd call succeeds, add extra IP addresses, if defined, to interface
-        if [ "$?" == "0" ] && [ -n "${IPALIASES[$i]}" ]; then
-          num=0
-          for ipalias in ${IPALIASES[$i]}; do
-            /sbin/ip address add ${ipalias}/32 dev ${1} label ${1}:${num} ;
-            num=$(($num + 1))
-          done
+        if [ "$?" == "0" ]; then # the dhcp call has succeeded
+          if [ -n "${IPALIASES[$i]}" ]; then
+            # Add extra IP addresses, if defined, to interface
+            num=0
+            for ipalias in ${IPALIASES[$i]}; do
+              ip="${ipalias%/*}"
+              nm="${ipalias#*/}"
+              [ -z "$nm" ] || [ "$ip" == "$nm" ] && nm="32"
+              /sbin/ip address add ${ip}/${nm} dev ${1} label ${1}:${num}
+              num=$(($num + 1))
+            done
+          fi
+          if [ "${PROMISCUOUS[$i]}" = "yes" ]; then
+            # Set promiscuous mode on the interface
+            /sbin/ip link set dev ${1} promisc on
+          fi
         fi
       else # bring up interface using a static IP address
         if [ -n "${IPADDR[$i]}" ]; then # skip unconfigured interfaces
           # Set up the network card:
-          echo "/etc/rc.d/rc.inet1:  /sbin/ip address add ${IPADDR[$i]}/${NETMASK[$i]} dev ${1}" | $LOGGER
-          /sbin/ip address add ${IPADDR[$i]}/${NETMASK[$i]} dev ${1}
+          echo "/etc/rc.d/rc.inet1:  /sbin/ip address add ${IPADDR[$i]}/${NETMASK[$i]} broadcast + dev ${1}" | $LOGGER
+          /sbin/ip address add ${IPADDR[$i]}/${NETMASK[$i]} broadcast + dev ${1}
           if /sbin/ip link show dev ${1} | grep -wq "state DOWN" ; then
             /sbin/ip link set dev ${1} up  # Bring up interface
           fi
@@ -235,10 +244,17 @@ if_up() {
           if [ -n "${IPALIASES[$i]}" ]; then
             num=0
             for ipalias in ${IPALIASES[$i]}; do
-              /sbin/ip address add ${ipalias}/32 dev ${1} label ${1}:${num} ;
+              ip="${ipalias%/*}"
+              nm="${ipalias#*/}"
+              [ -z "$nm" ] || [ "$ip" == "$nm" ] && nm="32"
+              /sbin/ip address add ${ip}/${nm} dev ${1} label ${1}:${num}
               num=$(($num + 1))
             done
           fi
+          if [ "${PROMISCUOUS[$i]}" = "yes" ]; then
+            # Set promiscuous mode on the interface
+            /sbin/ip link set dev ${1} promisc on
+          fi
         else
           debug_log "${1} interface is not configured in /etc/rc.d/rc.inet1.conf"
         fi
@@ -279,6 +295,8 @@ if_down() {
     if [ -n "${BRNICS[$i]}" ]; then
       br_close $i
     fi
+    # Flush the address from the interface:
+    ip address flush dev ${1}
   fi
 }
 
diff --git a/source/ap/lxc/scripts/rc.inet1.orig b/source/ap/lxc/scripts/rc.inet1.orig
index 2f566ef89..cf9da0f46 100644
--- a/source/ap/lxc/scripts/rc.inet1.orig
+++ b/source/ap/lxc/scripts/rc.inet1.orig
@@ -1,4 +1,4 @@
-#! /bin/sh
+#!/bin/bash
 # /etc/rc.d/rc.inet1
 # This script is used to bring up the various network interfaces.
 #
@@ -204,19 +204,28 @@ if_up() {
         # 15 seconds should be a reasonable default DHCP timeout.  30 was too much.
         echo "/etc/rc.d/rc.inet1:  /sbin/dhcpcd -L -t ${DHCP_TIMEOUT[$i]:-15} ${DHCP_OPTIONS} ${1}" | $LOGGER
         /sbin/dhcpcd -L -t ${DHCP_TIMEOUT[$i]:-15} ${DHCP_OPTIONS} ${1}
-        # If the dhcpcd call succeeds, add extra IP addresses, if defined, to interface
-        if [ "$?" == "0" ] && [ -n "${IPALIASES[$i]}" ]; then
-          num=0
-          for ipalias in ${IPALIASES[$i]}; do
-            /sbin/ip address add ${ipalias}/32 dev ${1} label ${1}:${num} ;
-            num=$(($num + 1))
-          done
+        if [ "$?" == "0" ]; then # the dhcp call has succeeded
+          if [ -n "${IPALIASES[$i]}" ]; then
+            # Add extra IP addresses, if defined, to interface
+            num=0
+            for ipalias in ${IPALIASES[$i]}; do
+              ip="${ipalias%/*}"
+              nm="${ipalias#*/}"
+              [ -z "$nm" ] || [ "$ip" == "$nm" ] && nm="32"
+              /sbin/ip address add ${ip}/${nm} dev ${1} label ${1}:${num}
+              num=$(($num + 1))
+            done
+          fi
+          if [ "${PROMISCUOUS[$i]}" = "yes" ]; then
+            # Set promiscuous mode on the interface
+            /sbin/ip link set dev ${1} promisc on
+          fi
         fi
       else # bring up interface using a static IP address
         if [ -n "${IPADDR[$i]}" ]; then # skip unconfigured interfaces
           # Set up the network card:
-          echo "/etc/rc.d/rc.inet1:  /sbin/ip address add ${IPADDR[$i]}/${NETMASK[$i]} dev ${1}" | $LOGGER
-          /sbin/ip address add ${IPADDR[$i]}/${NETMASK[$i]} dev ${1}
+          echo "/etc/rc.d/rc.inet1:  /sbin/ip address add ${IPADDR[$i]}/${NETMASK[$i]} broadcast + dev ${1}" | $LOGGER
+          /sbin/ip address add ${IPADDR[$i]}/${NETMASK[$i]} broadcast + dev ${1}
           if /sbin/ip link show dev ${1} | grep -wq "state DOWN" ; then
             /sbin/ip link set dev ${1} up  # Bring up interface
           fi
@@ -224,10 +233,17 @@ if_up() {
           if [ -n "${IPALIASES[$i]}" ]; then
             num=0
             for ipalias in ${IPALIASES[$i]}; do
-              /sbin/ip address add ${ipalias}/32 dev ${1} label ${1}:${num} ;
+              ip="${ipalias%/*}"
+              nm="${ipalias#*/}"
+              [ -z "$nm" ] || [ "$ip" == "$nm" ] && nm="32"
+              /sbin/ip address add ${ip}/${nm} dev ${1} label ${1}:${num}
               num=$(($num + 1))
             done
           fi
+          if [ "${PROMISCUOUS[$i]}" = "yes" ]; then
+            # Set promiscuous mode on the interface
+            /sbin/ip link set dev ${1} promisc on
+          fi
         else
           debug_log "${1} interface is not configured in /etc/rc.d/rc.inet1.conf"
         fi
@@ -268,6 +284,8 @@ if_down() {
     if [ -n "${BRNICS[$i]}" ]; then
       br_close $i
     fi
+    # Flush the address from the interface:
+    ip address flush dev ${1}
   fi
 }
 
diff --git a/source/l/libsigc++/libsigc++.SlackBuild b/source/l/libsigc++/libsigc++.SlackBuild
index 7c003a0ae..c20c6cea0 100755
--- a/source/l/libsigc++/libsigc++.SlackBuild
+++ b/source/l/libsigc++/libsigc++.SlackBuild
@@ -23,7 +23,7 @@
 cd $(dirname $0) ; CWD=$(pwd)
 
 PKGNAM=libsigc++
-VERSION=${VERSION:-$(echo $PKGNAM-*.tar.?z* | rev | cut -f 3- -d . | cut -f 1 -d - | rev)}
+VERSION=${VERSION:-$(echo $PKGNAM-*.tar.?z | rev | cut -f 3- -d . | cut -f 1 -d - | rev)}
 BUILD=${BUILD:-1}
 
 if [ -z "$ARCH" ]; then
@@ -64,9 +64,9 @@ fi
 rm -rf $PKG
 mkdir -p $TMP $PKG
 cd $TMP
-rm -rf $PKGNAM-$VERSION
-tar xvf $CWD/$PKGNAM-$VERSION.tar.xz || exit 1
-cd $PKGNAM-$VERSION || exit 1
+rm -rf libsigcplusplus-$VERSION $PKGNAM-$VERSION
+tar xvf $CWD/$PKGNAM-$VERSION.tar.?z || exit 1
+cd libsigcplusplus-$VERSION || cd $PKGNAM-$VERSION || exit 1
 chown -R root:root .
 find -L . \
  \( -perm 777 -o -perm 775 -o -perm 750 -o -perm 711 -o -perm 555 -o -perm 511 \) \
@@ -74,6 +74,10 @@ find -L . \
  \( -perm 666 -o -perm 664 -o -perm 600 -o -perm 444 -o -perm 440 -o -perm 400 \) \
  -exec chmod 644 {} \;
 
+if [ ! -r configure ]; then
+  autoreconf -vif
+fi
+
 CFLAGS="$SLKCFLAGS" \
 CXXFLAGS="$SLKCFLAGS -std=c++11" \
   ./configure \
diff --git a/source/n/iputils/iputils.SlackBuild b/source/n/iputils/iputils.SlackBuild
index 137ec39b1..b4fee0c84 100755
--- a/source/n/iputils/iputils.SlackBuild
+++ b/source/n/iputils/iputils.SlackBuild
@@ -74,7 +74,7 @@ find . \
   \( -perm 666 -o -perm 664 -o -perm 600 -o -perm 444 -o -perm 440 -o -perm 400 \) \
   -exec chmod 644 {} \;
 
-zcat $CWD/iputils.docbook.revert.diff.gz | patch -p1 -R --verbose || exit 1
+zcat $CWD/iputils.docbook.revert.diff.gz | patch -p1 --verbose || exit 1
 
 # Configure and build:
 export CFLAGS="$SLKCFLAGS"
diff --git a/source/n/iputils/iputils.docbook.revert.diff b/source/n/iputils/iputils.docbook.revert.diff
index a6cdc35bc..1658f89bf 100644
--- a/source/n/iputils/iputils.docbook.revert.diff
+++ b/source/n/iputils/iputils.docbook.revert.diff
@@ -1,164 +1,125 @@
-diff -u -r --new-file iputils-s20190324/doc/arping.xml iputils-s20190515/doc/arping.xml
---- iputils-s20190324/doc/arping.xml	2019-03-24 09:28:37.000000000 -0500
-+++ iputils-s20190515/doc/arping.xml	2019-05-15 15:14:10.000000000 -0500
+--- ./doc/rarpd.xml.orig	2019-07-09 15:55:49.000000000 -0500
++++ ./doc/rarpd.xml	2019-07-19 11:58:31.999331384 -0500
 @@ -1,4 +1,4 @@
--<refentry xmlns:db="http://docbook.org/ns/docbook" version="5.0"
-+<refentry xmlns="http://docbook.org/ns/docbook" version="5.0"
- xml:id="man.arping">
+-<refentry xmlns="http://docbook.org/ns/docbook" version="5.0"
++<refentry xmlns:db="http://docbook.org/ns/docbook" version="5.0"
+ xml:id="man.rarpd">
  
    <refentryinfo>
-diff -u -r --new-file iputils-s20190324/doc/clockdiff.xml iputils-s20190515/doc/clockdiff.xml
---- iputils-s20190324/doc/clockdiff.xml	2019-03-24 09:28:37.000000000 -0500
-+++ iputils-s20190515/doc/clockdiff.xml	2019-05-15 15:14:10.000000000 -0500
+--- ./doc/custom-man.xsl.orig	2019-07-09 15:55:49.000000000 -0500
++++ ./doc/custom-man.xsl	2019-07-19 11:58:31.966331383 -0500
+@@ -5,7 +5,7 @@
+                 extension-element-prefixes="exsl"
+                 version="1.0">
+ 
+-<xsl:import href="http://docbook.sourceforge.net/release/xsl-ns/current/manpages/docbook.xsl"/>
++<xsl:import href="http://docbook.sourceforge.net/release/xsl/current/manpages/docbook.xsl"/>
+ 
+ <xsl:template name="top.comment" />
+ 
+--- ./doc/ninfod.xml.orig	2019-07-09 15:55:49.000000000 -0500
++++ ./doc/ninfod.xml	2019-07-19 11:58:31.996331384 -0500
 @@ -1,4 +1,4 @@
--<refentry xmlns:db="http://docbook.org/ns/docbook" version="5.0"
-+<refentry xmlns="http://docbook.org/ns/docbook" version="5.0"
- xml:id="man.clockdiff">
+-<refentry xmlns="http://docbook.org/ns/docbook" version="5.0"
++<refentry xmlns:db="http://docbook.org/ns/docbook" version="5.0"
+ xml:id="man.ninfod">
  
    <refentryinfo>
-diff -u -r --new-file iputils-s20190324/doc/custom-html.xsl iputils-s20190515/doc/custom-html.xsl
---- iputils-s20190324/doc/custom-html.xsl	2019-03-24 09:28:37.000000000 -0500
-+++ iputils-s20190515/doc/custom-html.xsl	2019-05-15 15:14:10.000000000 -0500
-@@ -2,7 +2,7 @@
+--- ./doc/traceroute6.xml.orig	2019-07-09 15:55:49.000000000 -0500
++++ ./doc/traceroute6.xml	2019-07-19 11:58:32.004331384 -0500
+@@ -1,4 +1,4 @@
+-<refentry xmlns="http://docbook.org/ns/docbook" version="5.0"
++<refentry xmlns:db="http://docbook.org/ns/docbook" version="5.0"
+ xml:id="man.traceroute6">
  
- <xsl:stylesheet xmlns:xsl="http://www.w3.org/1999/XSL/Transform" version="1.0">
+   <refentryinfo>
+--- ./doc/rdisc.xml.orig	2019-07-09 15:55:49.000000000 -0500
++++ ./doc/rdisc.xml	2019-07-19 11:58:32.001331384 -0500
+@@ -1,4 +1,4 @@
+-<refentry xmlns="http://docbook.org/ns/docbook" version="5.0"
++<refentry xmlns:db="http://docbook.org/ns/docbook" version="5.0"
+ xml:id="man.rdisc">
  
--<xsl:import href="http://docbook.sourceforge.net/release/xsl/current/html/docbook.xsl"/>
-+<xsl:import href="http://docbook.sourceforge.net/release/xsl-ns/current/html/docbook.xsl"/>
- <!--
-   - The docbook stylesheet injects empty anchor tags into generated HTML, identified by an auto-generated ID.
-   - Ask the docbook stylesheet to generate reproducible output when generating (these) ID values.
-diff -u -r --new-file iputils-s20190324/doc/custom-man.xsl iputils-s20190515/doc/custom-man.xsl
---- iputils-s20190324/doc/custom-man.xsl	2019-03-24 09:28:37.000000000 -0500
-+++ iputils-s20190515/doc/custom-man.xsl	2019-05-15 15:14:10.000000000 -0500
-@@ -5,7 +5,7 @@
-                 extension-element-prefixes="exsl"
-                 version="1.0">
+   <refentryinfo>
+--- ./doc/clockdiff.xml.orig	2019-07-09 15:55:49.000000000 -0500
++++ ./doc/clockdiff.xml	2019-07-19 11:58:31.962331383 -0500
+@@ -1,4 +1,4 @@
+-<refentry xmlns="http://docbook.org/ns/docbook" version="5.0"
++<refentry xmlns:db="http://docbook.org/ns/docbook" version="5.0"
+ xml:id="man.clockdiff">
  
--<xsl:import href="http://docbook.sourceforge.net/release/xsl/current/manpages/docbook.xsl"/>
-+<xsl:import href="http://docbook.sourceforge.net/release/xsl-ns/current/manpages/docbook.xsl"/>
+   <refentryinfo>
+--- ./doc/arping.xml.orig	2019-07-09 15:55:49.000000000 -0500
++++ ./doc/arping.xml	2019-07-19 11:58:31.960331383 -0500
+@@ -1,4 +1,4 @@
+-<refentry xmlns="http://docbook.org/ns/docbook" version="5.0"
++<refentry xmlns:db="http://docbook.org/ns/docbook" version="5.0"
+ xml:id="man.arping">
  
- <xsl:template name="top.comment" />
+   <refentryinfo>
+--- ./doc/ping.xml.orig	2019-07-09 15:55:49.000000000 -0500
++++ ./doc/ping.xml	2019-07-19 11:58:31.998331384 -0500
+@@ -1,4 +1,4 @@
+-<refentry xmlns="http://docbook.org/ns/docbook" version="5.0"
++<refentry xmlns:db="http://docbook.org/ns/docbook" version="5.0"
+ xml:id="man.ping">
  
-diff -u -r --new-file iputils-s20190324/doc/meson.build iputils-s20190515/doc/meson.build
---- iputils-s20190324/doc/meson.build	2019-03-24 09:28:37.000000000 -0500
-+++ iputils-s20190515/doc/meson.build	2019-05-15 15:14:10.000000000 -0500
+   <refentryinfo>
+--- ./doc/meson.build.orig	2019-07-09 15:55:49.000000000 -0500
++++ ./doc/meson.build	2019-07-19 12:01:49.464337710 -0500
 @@ -38,7 +38,7 @@
  	manpages += ['ninfod']
  endif
  
--xsltproc = find_program('xsltproc', required : false)
-+xsltproc = find_program('xsltproc', required : true)
+-xsltproc = find_program('xsltproc', required : build_mans or build_html_mans)
++xsltproc = find_program('xsltproc', required : false)
  xsltproc_args = [
  	'--nonet',
  	'--stringparam', 'man.output.quietly', '1',
-@@ -48,15 +48,22 @@
- ]
- 
- if xsltproc.found()
--	testrun = run_command([xsltproc, '--nonet',
--		'http://docbook.sourceforge.net/release/xsl/current/manpages/docbook.xsl'])
-+	xsl = 'http://docbook.sourceforge.net/release/xsl/current/manpages/docbook.xsl'
-+	testrun = run_command([xsltproc, '--nonet', xsl])
- 	xsltproc_works = testrun.returncode() == 0
-+	if xsltproc_works == false
-+		warning('xsltproc: cannot process ' + xsl)
-+	endif
- else
- 	warning('No docbook stylesheet found for generating man pages')
- 	xsltproc_works = false
+@@ -59,10 +59,6 @@
+ 	foreach doc_target : doc_targets
+ 		xsl = 'http://docbook.sourceforge.net/release/xsl-ns/current/' + doc_target + '/docbook.xsl'
+ 		testrun = run_command([xsltproc, '--nonet', xsl])
+-		if testrun.returncode() != 0
+-			xsltproc_works = false
+-			message('WARNING: xsltproc: cannot process ' + xsl)
+-		endif
+ 	endforeach
  endif
  
--if build_mans and xsltproc_works
-+if xsltproc_works == false
-+	error('Man pages cannot be built: xsltproc does not work correctly')
-+endif
-+
-+if build_mans
- 	foreach man : manpages
- 		custom_target(man + '.8',
- 			output : man + '.8',
-@@ -74,7 +81,7 @@
+@@ -88,7 +84,7 @@
  	endforeach
  endif
  
--if build_html_mans and xsltproc_works
-+if build_html_mans
+-if build_html_mans
++if build_html_mans and xsltproc_works
  	foreach man : manpages
  		custom_target(man + '.html',
  			output : man + '.html',
-diff -u -r --new-file iputils-s20190324/doc/ninfod.xml iputils-s20190515/doc/ninfod.xml
---- iputils-s20190324/doc/ninfod.xml	2019-03-24 09:28:37.000000000 -0500
-+++ iputils-s20190515/doc/ninfod.xml	2019-05-15 15:14:10.000000000 -0500
-@@ -1,4 +1,4 @@
--<refentry xmlns:db="http://docbook.org/ns/docbook" version="5.0"
-+<refentry xmlns="http://docbook.org/ns/docbook" version="5.0"
- xml:id="man.ninfod">
- 
-   <refentryinfo>
-diff -u -r --new-file iputils-s20190324/doc/ping.xml iputils-s20190515/doc/ping.xml
---- iputils-s20190324/doc/ping.xml	2019-03-24 09:28:37.000000000 -0500
-+++ iputils-s20190515/doc/ping.xml	2019-05-15 15:14:10.000000000 -0500
-@@ -1,4 +1,4 @@
--<refentry xmlns:db="http://docbook.org/ns/docbook" version="5.0"
-+<refentry xmlns="http://docbook.org/ns/docbook" version="5.0"
- xml:id="man.ping">
- 
-   <refentryinfo>
-diff -u -r --new-file iputils-s20190324/doc/rarpd.xml iputils-s20190515/doc/rarpd.xml
---- iputils-s20190324/doc/rarpd.xml	2019-03-24 09:28:37.000000000 -0500
-+++ iputils-s20190515/doc/rarpd.xml	2019-05-15 15:14:10.000000000 -0500
-@@ -1,4 +1,4 @@
--<refentry xmlns:db="http://docbook.org/ns/docbook" version="5.0"
-+<refentry xmlns="http://docbook.org/ns/docbook" version="5.0"
- xml:id="man.rarpd">
- 
-   <refentryinfo>
-diff -u -r --new-file iputils-s20190324/doc/rdisc.xml iputils-s20190515/doc/rdisc.xml
---- iputils-s20190324/doc/rdisc.xml	2019-03-24 09:28:37.000000000 -0500
-+++ iputils-s20190515/doc/rdisc.xml	2019-05-15 15:14:10.000000000 -0500
-@@ -1,4 +1,4 @@
--<refentry xmlns:db="http://docbook.org/ns/docbook" version="5.0"
-+<refentry xmlns="http://docbook.org/ns/docbook" version="5.0"
- xml:id="man.rdisc">
+--- ./doc/custom-html.xsl.orig	2019-07-09 15:55:49.000000000 -0500
++++ ./doc/custom-html.xsl	2019-07-19 11:58:31.964331383 -0500
+@@ -2,7 +2,7 @@
  
-   <refentryinfo>
-diff -u -r --new-file iputils-s20190324/doc/tftpd.xml iputils-s20190515/doc/tftpd.xml
---- iputils-s20190324/doc/tftpd.xml	2019-03-24 09:28:37.000000000 -0500
-+++ iputils-s20190515/doc/tftpd.xml	2019-05-15 15:14:10.000000000 -0500
-@@ -1,4 +1,4 @@
--<refentry xmlns:db="http://docbook.org/ns/docbook" version="5.0"
-+<refentry xmlns="http://docbook.org/ns/docbook" version="5.0"
- xml:id="man.tftpd">
+ <xsl:stylesheet xmlns:xsl="http://www.w3.org/1999/XSL/Transform" version="1.0">
  
-   <refentryinfo>
-diff -u -r --new-file iputils-s20190324/doc/tracepath.xml iputils-s20190515/doc/tracepath.xml
---- iputils-s20190324/doc/tracepath.xml	2019-03-24 09:28:37.000000000 -0500
-+++ iputils-s20190515/doc/tracepath.xml	2019-05-15 15:14:10.000000000 -0500
+-<xsl:import href="http://docbook.sourceforge.net/release/xsl-ns/current/html/docbook.xsl"/>
++<xsl:import href="http://docbook.sourceforge.net/release/xsl/current/html/docbook.xsl"/>
+ <!--
+   - The docbook stylesheet injects empty anchor tags into generated HTML, identified by an auto-generated ID.
+   - Ask the docbook stylesheet to generate reproducible output when generating (these) ID values.
+--- ./doc/tracepath.xml.orig	2019-07-09 15:55:49.000000000 -0500
++++ ./doc/tracepath.xml	2019-07-19 11:58:32.003331384 -0500
 @@ -1,4 +1,4 @@
--<refentry xmlns:db="http://docbook.org/ns/docbook" version="5.0"
-+<refentry xmlns="http://docbook.org/ns/docbook" version="5.0"
+-<refentry xmlns="http://docbook.org/ns/docbook" version="5.0"
++<refentry xmlns:db="http://docbook.org/ns/docbook" version="5.0"
  xml:id="man.tracepath">
  
    <refentryinfo>
-diff -u -r --new-file iputils-s20190324/doc/traceroute6.xml iputils-s20190515/doc/traceroute6.xml
---- iputils-s20190324/doc/traceroute6.xml	2019-03-24 09:28:37.000000000 -0500
-+++ iputils-s20190515/doc/traceroute6.xml	2019-05-15 15:14:10.000000000 -0500
+--- ./doc/tftpd.xml.orig	2019-07-09 15:55:49.000000000 -0500
++++ ./doc/tftpd.xml	2019-07-19 11:58:32.002331384 -0500
 @@ -1,4 +1,4 @@
--<refentry xmlns:db="http://docbook.org/ns/docbook" version="5.0"
-+<refentry xmlns="http://docbook.org/ns/docbook" version="5.0"
- xml:id="man.traceroute6">
+-<refentry xmlns="http://docbook.org/ns/docbook" version="5.0"
++<refentry xmlns:db="http://docbook.org/ns/docbook" version="5.0"
+ xml:id="man.tftpd">
  
    <refentryinfo>
-diff -u -r --new-file iputils-s20190324/meson.build iputils-s20190515/meson.build
---- iputils-s20190324/meson.build	2019-03-24 09:28:37.000000000 -0500
-+++ iputils-s20190515/meson.build	2019-05-15 15:14:10.000000000 -0500
-@@ -3,7 +3,7 @@
- 		'c_std=c99',
- 		'warning_level=3',
- 	],
--	version : 's20190324') # keep in sync with: git describe | awk -F- '{print $1}'
-+	version : 's20190515') # keep in sync with: git describe | awk -F- '{print $1}'
- 
- cc = meson.get_compiler('c')
-