Wed Jul 10 23:56:13 UTC 201920190710235613

a/glibc-zoneinfo-2019b-noarch-1.txz:  Upgraded.
a/kernel-generic-4.19.58-x86_64-1.txz:  Upgraded.
a/kernel-huge-4.19.58-x86_64-1.txz:  Upgraded.
a/kernel-modules-4.19.58-x86_64-1.txz:  Upgraded.
d/Cython-0.29.12-x86_64-1.txz:  Upgraded.
d/kernel-headers-4.19.58-x86-1.txz:  Upgraded.
d/mercurial-5.0.2-x86_64-1.txz:  Upgraded.
d/python3-3.7.4-x86_64-1.txz:  Upgraded.
k/kernel-source-4.19.58-noarch-1.txz:  Upgraded.
l/glib2-2.60.5-x86_64-1.txz:  Upgraded.
n/gnupg2-2.2.17-x86_64-1.txz:  Upgraded.
n/iproute2-5.2.0-x86_64-1.txz:  Upgraded.
n/samba-4.10.6-x86_64-1.txz:  Upgraded.
x/libva-utils-2.5.0-x86_64-1.txz:  Upgraded.
x/mesa-19.1.2-x86_64-1.txz:  Upgraded.
xap/mozilla-firefox-68.0esr-x86_64-1.txz:  Upgraded.
  This release contains security fixes and improvements. Some of the patched
  flaws are considered critical, and could be used to run attacker code and
  install software, requiring no user interaction beyond normal browsing.
  For more information, see:
    https://www.mozilla.org/security/known-vulnerabilities/firefoxESR.html
    https://www.mozilla.org/en-US/security/advisories/mfsa2019-22/
    https://cve.mitre.org/cgi-bin/cvename.cgi?name=CVE-2019-9811
    https://cve.mitre.org/cgi-bin/cvename.cgi?name=CVE-2019-11711
    https://cve.mitre.org/cgi-bin/cvename.cgi?name=CVE-2019-11712
    https://cve.mitre.org/cgi-bin/cvename.cgi?name=CVE-2019-11713
    https://cve.mitre.org/cgi-bin/cvename.cgi?name=CVE-2019-11729
    https://cve.mitre.org/cgi-bin/cvename.cgi?name=CVE-2019-11715
    https://cve.mitre.org/cgi-bin/cvename.cgi?name=CVE-2019-11717
    https://cve.mitre.org/cgi-bin/cvename.cgi?name=CVE-2019-11719
    https://cve.mitre.org/cgi-bin/cvename.cgi?name=CVE-2019-11730
    https://cve.mitre.org/cgi-bin/cvename.cgi?name=CVE-2019-11709
  (* Security fix *)
xap/mozilla-thunderbird-60.8.0-x86_64-1.txz:  Upgraded.
  This is a bugfix release.
  For more information, see:
    https://www.mozilla.org/en-US/thunderbird/60.8.0/releasenotes/
xfce/garcon-0.6.3-x86_64-2.txz:  Rebuilt.
  Patched crash bug.
  Installed gtk-doc HTML docs.
  Thanks to Robby Workman.
isolinux/initrd.img:  Rebuilt.
kernels/*:  Upgraded.
testing/packages/blueman-2.1.1-x86_64-1.txz:  Upgraded.
usb-and-pxe-installers/usbboot.img:  Rebuilt.

24 files changed, 276 insertions, 50 deletions

diff --git a/source/d/python3/python3.SlackBuild b/source/d/python3/python3.SlackBuild
index 3e8a0b28b..1b47ad068 100755
--- a/source/d/python3/python3.SlackBuild
+++ b/source/d/python3/python3.SlackBuild
@@ -29,7 +29,7 @@ PKGNAM=python3
 SRCNAM=Python
 VERSION=$(echo $SRCNAM-*.tar.xz | rev | cut -f 3- -d . | cut -f 1 -d - | rev)
 BRANCH_VERSION=$(echo $VERSION | cut -f 1,2 -d . )
-BUILD=${BUILD:-2}
+BUILD=${BUILD:-1}
 
 NUMJOBS=${NUMJOBS:-" -j$(expr $(nproc) + 1) "}
 
diff --git a/source/d/python3/python3.url b/source/d/python3/python3.url
new file mode 100644
index 000000000..8738d0b14
--- /dev/null
+++ b/source/d/python3/python3.url
@@ -0,0 +1 @@
+http://www.python.org/ftp/python/
diff --git a/source/installer/ChangeLog.txt b/source/installer/ChangeLog.txt
index 8feca1529..3f47f5ec7 100644
--- a/source/installer/ChangeLog.txt
+++ b/source/installer/ChangeLog.txt
@@ -1,3 +1,7 @@
+Wed Jul 10 22:33:27 UTC 2019
+  /sbin/reboot: shell script to call the real reboot with "reboot -f" to
+  prevent a reboot hang after installation.
++--------------------------+
 Sat Apr 27 19:53:20 UTC 2019
   build_installer.sh: remove final dangling symlink check. This gets into
   a filesystem loop that takes a bit of time, and has never turned up any
diff --git a/source/installer/build_installer.sh b/source/installer/build_installer.sh
index e9bcac8c2..2b0cf1d08 100755
--- a/source/installer/build_installer.sh
+++ b/source/installer/build_installer.sh
@@ -996,6 +996,20 @@ cp --remove-destination -fa${VERBOSE1} ${EXTRA_PKGS_SBIN} \
 cp --remove-destination -fa${VERBOSE1} fdisk \
    $PKG/$ARCH-installer-filesystem/sbin/fdisk.bin
 
+# Hack reboot to call reboot -f:
+rm -f $PKG/$ARCH-installer-filesystem/sbin/reboot
+( cd $PKG/$ARCH-installer-filesystem/bin ; ln -sf busybox reboot )
+cat << EOF > $PKG/$ARCH-installer-filesystem/sbin/reboot
+#!/bin/sh
+sync
+if [ -z "\$*" ]; then
+  /bin/reboot -f
+else
+  /bin/reboot \$*
+fi
+EOF
+chmod 755 $PKG/$ARCH-installer-filesystem/sbin/reboot
+
 # Copy binaries from /usr/bin into the installer's /usr/bin/
 cd $TMP/extract-packages/usr/bin
 cp --remove-destination -fa${VERBOSE1} ${EXTRA_PKGS_USRBIN} \
diff --git a/source/k/kernel-configs/config-generic-4.19.57 b/source/k/kernel-configs/config-generic-4.19.58
index 58197b17a..beb5154f5 100644
--- a/source/k/kernel-configs/config-generic-4.19.57
+++ b/source/k/kernel-configs/config-generic-4.19.58
@@ -1,6 +1,6 @@
 #
 # Automatically generated file; DO NOT EDIT.
-# Linux/x86 4.19.57 Kernel Configuration
+# Linux/x86 4.19.58 Kernel Configuration
 #
 
 #
diff --git a/source/k/kernel-configs/config-generic-4.19.57.x64 b/source/k/kernel-configs/config-generic-4.19.58.x64
index 7246babdc..b70e44b8d 100644
--- a/source/k/kernel-configs/config-generic-4.19.57.x64
+++ b/source/k/kernel-configs/config-generic-4.19.58.x64
@@ -1,6 +1,6 @@
 #
 # Automatically generated file; DO NOT EDIT.
-# Linux/x86 4.19.57 Kernel Configuration
+# Linux/x86 4.19.58 Kernel Configuration
 #
 
 #
diff --git a/source/k/kernel-configs/config-generic-smp-4.19.57-smp b/source/k/kernel-configs/config-generic-smp-4.19.58-smp
index 371e1517c..ff6fe022e 100644
--- a/source/k/kernel-configs/config-generic-smp-4.19.57-smp
+++ b/source/k/kernel-configs/config-generic-smp-4.19.58-smp
@@ -1,6 +1,6 @@
 #
 # Automatically generated file; DO NOT EDIT.
-# Linux/x86 4.19.57 Kernel Configuration
+# Linux/x86 4.19.58 Kernel Configuration
 #
 
 #
diff --git a/source/k/kernel-configs/config-huge-4.19.57 b/source/k/kernel-configs/config-huge-4.19.58
index 316e8536f..a709c98a1 100644
--- a/source/k/kernel-configs/config-huge-4.19.57
+++ b/source/k/kernel-configs/config-huge-4.19.58
@@ -1,6 +1,6 @@
 #
 # Automatically generated file; DO NOT EDIT.
-# Linux/x86 4.19.57 Kernel Configuration
+# Linux/x86 4.19.58 Kernel Configuration
 #
 
 #
diff --git a/source/k/kernel-configs/config-huge-4.19.57.x64 b/source/k/kernel-configs/config-huge-4.19.58.x64
index ab5add19c..46e21e36b 100644
--- a/source/k/kernel-configs/config-huge-4.19.57.x64
+++ b/source/k/kernel-configs/config-huge-4.19.58.x64
@@ -1,6 +1,6 @@
 #
 # Automatically generated file; DO NOT EDIT.
-# Linux/x86 4.19.57 Kernel Configuration
+# Linux/x86 4.19.58 Kernel Configuration
 #
 
 #
diff --git a/source/k/kernel-configs/config-huge-smp-4.19.57-smp b/source/k/kernel-configs/config-huge-smp-4.19.58-smp
index 9ee07206e..bcbde3b34 100644
--- a/source/k/kernel-configs/config-huge-smp-4.19.57-smp
+++ b/source/k/kernel-configs/config-huge-smp-4.19.58-smp
@@ -1,6 +1,6 @@
 #
 # Automatically generated file; DO NOT EDIT.
-# Linux/x86 4.19.57 Kernel Configuration
+# Linux/x86 4.19.58 Kernel Configuration
 #
 
 #
diff --git a/source/n/samba/samba.url b/source/n/samba/samba.url
index eb9e00c86..690f4cf0e 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.10.4.tar.gz
-https://download.samba.org/pub/samba/stable/samba-4.10.4.tar.asc
+https://download.samba.org/pub/samba/stable/samba-4.10.6.tar.gz
+https://download.samba.org/pub/samba/stable/samba-4.10.6.tar.asc
diff --git a/source/x/mesa/mesa.SlackBuild b/source/x/mesa/mesa.SlackBuild
index 9b4cbe56c..886bb67ed 100755
--- a/source/x/mesa/mesa.SlackBuild
+++ b/source/x/mesa/mesa.SlackBuild
@@ -25,7 +25,7 @@ cd $(dirname $0) ; CWD=$(pwd)
 PKGNAM=mesa
 VERSION=${VERSION:-$(echo $PKGNAM-1*.tar.xz | rev | cut -f 3- -d . | cut -f 1 -d - | rev)}
 DEMOVERS=${DEMOVERS:-8.4.0}
-BUILD=${BUILD:-2}
+BUILD=${BUILD:-1}
 
 NUMJOBS=${NUMJOBS:-" -j$(expr $(nproc) + 1) "}
 
diff --git a/source/xap/mozilla-firefox/build-deps.sh b/source/xap/mozilla-firefox/build-deps.sh
new file mode 100755
index 000000000..af9d440e2
--- /dev/null
+++ b/source/xap/mozilla-firefox/build-deps.sh
@@ -0,0 +1,41 @@
+#!/bin/bash
+
+# Copyright 2019  Patrick J. Volkerding, Sebeka, Minnesota, USA
+# All rights reserved.
+#
+# Redistribution and use of this script, with or without modification, is
+# permitted provided that the following conditions are met:
+#
+# 1. Redistributions of this script must retain the above copyright
+#    notice, this list of conditions and the following disclaimer.
+#
+#  THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR IMPLIED
+#  WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF
+#  MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED.  IN NO
+#  EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+#  SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
+#  PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS;
+#  OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY,
+#  WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR
+#  OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF
+#  ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+
+# Clear out any existing build deps:
+rm -rf $TMP/mozilla-firefox-build-deps
+mkdir -p $TMP/mozilla-firefox-build-deps
+# This will be at the beginning of the $PATH, so protect against nonsense
+# happening in /tmp:
+chmod 700 $TMP/mozilla-firefox-build-deps
+PATH=$TMP/mozilla-firefox-build-deps/usr/bin:$HOME/.cargo/bin:$PATH
+
+# cbindgen is a build-time dependency:
+( cd $CWD/build-deps/cbindgen ; ./cbindgen.build ) || exit 1
+
+if /bin/ls build-deps*.txz 1> /dev/null 2> /dev/null ; then # use prebuilt autoconf/nodejs
+  ( cd $TMP/mozilla-firefox-build-deps ; tar xf $CWD/build-deps*.txz )
+else
+  # We need to use the incredibly ancient autoconf-2.13 for this  :/
+  ( cd $CWD/build-deps/autoconf ; ./autoconf.build ) || exit 1
+  # And node.js... WHY
+  ( cd $CWD/build-deps/nodejs ; ./nodejs.build ) || exit 1
+fi
diff --git a/source/xap/mozilla-firefox/autoconf/autoconf-2.13-consolidated_fixes-1.patch b/source/xap/mozilla-firefox/build-deps/autoconf/autoconf-2.13-consolidated_fixes-1.patch
index 5e7b23113..5e7b23113 100644
--- a/source/xap/mozilla-firefox/autoconf/autoconf-2.13-consolidated_fixes-1.patch
+++ b/source/xap/mozilla-firefox/build-deps/autoconf/autoconf-2.13-consolidated_fixes-1.patch
diff --git a/source/xap/mozilla-firefox/autoconf/autoconf.build b/source/xap/mozilla-firefox/build-deps/autoconf/autoconf.build
index 7dae1bad1..b9ae59749 100755
--- a/source/xap/mozilla-firefox/autoconf/autoconf.build
+++ b/source/xap/mozilla-firefox/build-deps/autoconf/autoconf.build
@@ -30,7 +30,7 @@ NUMJOBS=${NUMJOBS:-" -j7 "}
 # Automatically determine the architecture we're building on:
 if [ -z "$ARCH" ]; then
   case "$( uname -m )" in
-    i?86) export ARCH=i486 ;;
+    i?86) export ARCH=i586 ;;
     arm*) export ARCH=arm ;;
     # Unless $ARCH is already set, use uname -m for all other archs:
        *) export ARCH=$( uname -m ) ;;
@@ -61,19 +61,13 @@ find . \
 # Build a temporary copy of autoconf-2.13 only to be used to compile
 # Firefox, since it somewhat inexplicably requires this ancient version:
 
-rm -rf $TMP/autoconf-tmp
-mkdir -p $TMP/autoconf-tmp
-# This will be at the beginning of the $PATH, so protect against nonsense
-# happening in /tmp:
-chmod 700 $TMP/autoconf-tmp
-rm -rf $TMP/autoconf-tmp/*
-mkdir -p $TMP/autoconf-tmp/usr
+mkdir -p $TMP/mozilla-firefox-build-deps/usr
 
 ./configure \
-  --prefix=$TMP/autoconf-tmp/usr \
+  --prefix=$TMP/mozilla-firefox-build-deps/usr \
   --program-suffix=-2.13 \
-  --infodir=$TMP/autoconf-tmp/usr/info \
-  --mandir=$TMP/autoconf-tmp/usr/man \
+  --infodir=$TMP/mozilla-firefox-build-deps/usr/info \
+  --mandir=$TMP/mozilla-firefox-build-deps/usr/man \
   --build=$ARCH-slackware-linux || exit 1
 
 make $NUMJOBS || make || exit 1
diff --git a/source/xap/mozilla-firefox/build-deps/cbindgen/cbindgen.build b/source/xap/mozilla-firefox/build-deps/cbindgen/cbindgen.build
new file mode 100755
index 000000000..06116e435
--- /dev/null
+++ b/source/xap/mozilla-firefox/build-deps/cbindgen/cbindgen.build
@@ -0,0 +1,54 @@
+#!/bin/sh
+
+# Copyright 2019  Patrick J. Volkerding, Sebeka, Minnesota, USA
+# All rights reserved.
+#
+# Redistribution and use of this script, with or without modification, is
+# permitted provided that the following conditions are met:
+#
+# 1. Redistributions of this script must retain the above copyright
+#    notice, this list of conditions and the following disclaimer.
+#
+#  THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR IMPLIED
+#  WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF
+#  MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED.  IN NO
+#  EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+#  SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
+#  PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS;
+#  OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY,
+#  WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR
+#  OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF
+#  ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+
+
+PKGNAM=cbindgen
+VERSION=${VERSION:-$(echo $PKGNAM-*.tar.?z | rev | cut -f 3- -d . | cut -f 1 -d - | rev)}
+
+# Automatically determine the architecture we're building on:
+if [ -z "$ARCH" ]; then
+  case "$( uname -m )" in
+    i?86) export ARCH=i586 ;;
+    arm*) export ARCH=arm ;;
+    # Unless $ARCH is already set, use uname -m for all other archs:
+       *) export ARCH=$( uname -m ) ;;
+  esac
+fi
+
+CWD=$(pwd)
+TMP=${TMP:-/tmp}
+
+mkdir -p $TMP
+
+cd $TMP
+rm -rf cbindgen-$VERSION
+tar xvf $CWD/cbindgen-$VERSION.tar.?z || exit 1
+cd cbindgen-$VERSION
+
+chown -R root:root .
+find . \
+  \( -perm 777 -o -perm 775 -o -perm 711 -o -perm 555 -o -perm 511 \) \
+  -exec chmod 755 {} \; -o \
+  \( -perm 666 -o -perm 664 -o -perm 600 -o -perm 444 -o -perm 440 -o -perm 400 \) \
+  -exec chmod 644 {} \;
+
+cargo install --force cbindgen
diff --git a/source/xap/mozilla-firefox/build-deps/nodejs/nodejs.build b/source/xap/mozilla-firefox/build-deps/nodejs/nodejs.build
new file mode 100755
index 000000000..d0813df0e
--- /dev/null
+++ b/source/xap/mozilla-firefox/build-deps/nodejs/nodejs.build
@@ -0,0 +1,91 @@
+#!/bin/sh
+
+# Copyright 2019  Patrick J. Volkerding, Sebeka, Minnesota, USA
+# All rights reserved.
+#
+# Redistribution and use of this script, with or without modification, is
+# permitted provided that the following conditions are met:
+#
+# 1. Redistributions of this script must retain the above copyright
+#    notice, this list of conditions and the following disclaimer.
+#
+#  THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR IMPLIED
+#  WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF
+#  MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED.  IN NO
+#  EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+#  SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
+#  PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS;
+#  OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY,
+#  WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR
+#  OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF
+#  ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+
+
+PKGNAM=node
+VERSION=${VERSION:-$(echo $PKGNAM-*.tar.?z | rev | cut -f 3- -d . | cut -f 1 -d - | rev)}
+
+# Automatically determine the architecture we're building on:
+if [ -z "$ARCH" ]; then
+  case "$( uname -m )" in
+    i?86) export ARCH=i586 ;;
+    arm*) export ARCH=arm ;;
+    # Unless $ARCH is already set, use uname -m for all other archs:
+       *) export ARCH=$( uname -m ) ;;
+  esac
+fi
+
+NUMJOBS=${NUMJOBS:-" -j$(expr $(nproc) + 1) "}
+
+if [ "$ARCH" = "i586" ]; then
+  SLKCFLAGS="-O2 -march=i586 -mtune=i686"
+  LIBDIRSUFFIX=""
+elif [ "$ARCH" = "i686" ]; then
+  SLKCFLAGS="-O2 -march=i686"
+  LIBDIRSUFFIX=""
+elif [ "$ARCH" = "s390" ]; then
+  SLKCFLAGS="-O2"
+  LIBDIRSUFFIX=""
+elif [ "$ARCH" = "x86_64" ]; then
+  SLKCFLAGS="-O2 -fPIC"
+  LIBDIRSUFFIX="64"
+elif [ "$ARCH" = "armv7hl" ]; then
+  SLKCFLAGS="-O3 -march=armv7-a -mfpu=vfpv3-d16"
+  LIBDIRSUFFIX=""
+else
+  SLKCFLAGS="-O2"
+  LIBDIRSUFFIX=""
+fi
+
+CWD=$(pwd)
+TMP=${TMP:-/tmp}
+
+mkdir -p $TMP
+mkdir -p $TMP/mozilla-firefox-build-deps/usr
+
+cd $TMP
+rm -rf node-$VERSION
+tar xvf $CWD/node-$VERSION.tar.?z || exit 1
+cd node-$VERSION
+
+chown -R root:root .
+find . \
+  \( -perm 777 -o -perm 775 -o -perm 711 -o -perm 555 -o -perm 511 \) \
+  -exec chmod 755 {} \; -o \
+  \( -perm 666 -o -perm 664 -o -perm 600 -o -perm 444 -o -perm 440 -o -perm 400 \) \
+  -exec chmod 644 {} \;
+
+# Fix paths for $LIBDIRSUFFIX (if needed):
+if [ ! -z $LIBDIRSUFFIX ]; then
+  sed -i "s|\"lib\"|\"lib${LIBDIRSUFFIX}\"|" deps/npm/lib/npm.js
+  sed -i "s/'lib'/'lib${LIBDIRSUFFIX}'/" lib/module.js
+  sed -i "s|lib/|lib${LIBDIRSUFFIX}/|g" tools/install.py
+fi
+
+CFLAGS="$SLKCFLAGS" \
+CXXFLAGS="$SLKCFLAGS" \
+./configure \
+  --prefix=$TMP/mozilla-firefox-build-deps/usr \
+  --shared-zlib \
+  --without-ssl
+  make $NUMJOBS || make || exit 1
+  make install DESTDIR=$PKG || exit 1
diff --git a/source/xap/mozilla-firefox/build-deps/nodejs/nodejs.url b/source/xap/mozilla-firefox/build-deps/nodejs/nodejs.url
new file mode 100644
index 000000000..75f7f4d38
--- /dev/null
+++ b/source/xap/mozilla-firefox/build-deps/nodejs/nodejs.url
@@ -0,0 +1,2 @@
+https://nodejs.org/dist/v10.16.0/node-v10.16.0.tar.gz
+#https://github.com/nodejs/node
diff --git a/source/xap/mozilla-firefox/ff.ui.scrollToClick.diff b/source/xap/mozilla-firefox/ff.ui.scrollToClick.diff
index 6bb7ea67a..f5cca210f 100644
--- a/source/xap/mozilla-firefox/ff.ui.scrollToClick.diff
+++ b/source/xap/mozilla-firefox/ff.ui.scrollToClick.diff
@@ -1,12 +1,12 @@
---- ./modules/libpref/init/all.js.orig	2017-04-10 21:13:21.000000000 -0500
-+++ ./modules/libpref/init/all.js	2017-05-21 15:29:42.803757223 -0500
-@@ -235,6 +235,9 @@
+--- ./modules/libpref/init/all.js.orig	2019-07-08 13:28:45.106153934 -0500
++++ ./modules/libpref/init/all.js	2019-07-08 13:41:02.035201116 -0500
+@@ -258,6 +258,9 @@
  // If true, all popups won't hide automatically on blur
  pref("ui.popup.disable_autohide", false);
  
 +// Default to GTK+ v2 type scrolling:
 +pref("ui.scrollToClick", 0);
 +
- pref("browser.display.use_document_fonts",  1);  // 0 = never, 1 = quick, 2 = always
- // 0 = default: always, except in high contrast mode
- // 1 = always
+ #ifdef XP_MACOSX
+ pref("ui.touchbar.layout", "Back,Forward,Reload,OpenLocation,NewTab,Share");
+ #endif
diff --git a/source/xap/mozilla-firefox/mozilla-firefox.SlackBuild b/source/xap/mozilla-firefox/mozilla-firefox.SlackBuild
index 3649ce8ef..363e2cf7d 100755
--- a/source/xap/mozilla-firefox/mozilla-firefox.SlackBuild
+++ b/source/xap/mozilla-firefox/mozilla-firefox.SlackBuild
@@ -1,6 +1,6 @@
 #!/bin/bash
 
-# Copyright 2008, 2009, 2010, 2011, 2012, 2013, 2014, 2015, 2016, 2018  Patrick J. Volkerding, Sebeka, Minnesota, USA
+# Copyright 2008, 2009, 2010, 2011, 2012, 2013, 2014, 2015, 2016, 2018, 2019  Patrick J. Volkerding, Sebeka, Minnesota, USA
 # All rights reserved.
 #
 # Redistribution and use of this script, with or without modification, is
@@ -75,8 +75,8 @@ if [ "$(uname -m)" = "x86_64" -a "$(file -L /usr/bin/gcc | grep 80386 | grep 32-
 fi
 
 # Choose a compiler (gcc/g++ or clang/clang++):
-export CC=${CC:-gcc}
-export CXX=${CXX:-g++}
+export CC=${CC:-clang}
+export CXX=${CXX:-clang++}
 
 # Keep memory usage as low as possible when linking:
 SLKLDFLAGS=" -Wl,--as-needed -Wl,--no-keep-memory -Wl,--stats"
@@ -160,9 +160,8 @@ NUMJOBS=${NUMJOBS:-" -j$(expr $(nproc) + 1) "}
 rm -rf $PKG
 mkdir -p $TMP $PKG/usr/lib${LIBDIRSUFFIX}
 
-# We need to use the incredibly ancient autoconf-2.13 for this  :/
-( cd $CWD/autoconf ; ./autoconf.build )
-PATH=$TMP/autoconf-tmp/usr/bin:$PATH
+# Build or unpack build-time dependencies:
+. build-deps.sh
 
 cd $TMP
 rm -rf firefox-$RELEASEVER
@@ -176,6 +175,9 @@ cd ..
 rm -rf firefox-unpack
 cd firefox-$RELEASEVER || exit 1
 
+# Delete object directory if it was mistakenly included in the tarball:
+rm -rf obj-x86_64-pc-linux-gnu
+
 # Prevent failures building gkrust by suppressing useless warnings:
 sed -i.allow-warnings -e '/#!\[deny(warnings)\]/a #![allow(unused_imports)]' \
   servo/components/style/lib.rs
@@ -303,6 +305,9 @@ fi
 ./mach buildsymbols || exit 1
 DESTDIR=$PKG ./mach install || exit 1
 
+# Clean up the build time dependencies:
+rm -rf $TMP/mozilla-firefox-build-deps
+
 # We don't need these (just symlinks anyway):
 rm -rf $PKG/usr/lib${LIBDIRSUFFIX}/firefox-devel-$RELEASEVER
 
diff --git a/source/xap/mozilla-firefox/unbreakdocs.diff b/source/xap/mozilla-firefox/unbreakdocs.diff
index b76dc71d7..03d8e6b42 100644
--- a/source/xap/mozilla-firefox/unbreakdocs.diff
+++ b/source/xap/mozilla-firefox/unbreakdocs.diff
@@ -1,11 +1,5 @@
-
-https://lists.freebsd.org/pipermail/freebsd-gecko/2019-March/009206.html
-https://github.com/grahamperrin/Waterfox/pull/7/files
-
-
-diff -urN firefox-60.6.0_orig/servo/components/style/lib.rs firefox-60.6.0/servo/components/style/lib.rs
---- firefox-60.6.0_orig/servo/components/style/lib.rs	2019-03-13 21:33:48.000000000 +0000
-+++ firefox-60.6.0/servo/components/style/lib.rs	2019-03-20 13:06:18.611024453 +0000
+--- ./servo/components/style/lib.rs.orig	2019-07-05 20:44:35.000000000 -0500
++++ ./servo/components/style/lib.rs	2019-07-08 13:51:55.460242952 -0500
 @@ -23,7 +23,7 @@
  //! [cssparser]: ../cssparser/index.html
  //! [selectors]: ../selectors/index.html
@@ -15,7 +9,7 @@ diff -urN firefox-60.6.0_orig/servo/components/style/lib.rs firefox-60.6.0/servo
  
  extern crate app_units;
  extern crate arrayvec;
-@@ -148,7 +148,7 @@
+@@ -196,7 +196,7 @@
  /// Generated from the properties.mako.rs template by build.rs
  #[macro_use]
  #[allow(unsafe_code)]
@@ -24,15 +18,14 @@ diff -urN firefox-60.6.0_orig/servo/components/style/lib.rs firefox-60.6.0/servo
  pub mod properties {
      include!(concat!(env!("OUT_DIR"), "/properties.rs"));
  }
-diff -urN firefox-60.6.0_orig/servo/components/style_traits/lib.rs firefox-60.6.0/servo/components/style_traits/lib.rs
---- firefox-60.6.0_orig/servo/components/style_traits/lib.rs	2019-03-13 21:33:48.000000000 +0000
-+++ firefox-60.6.0/servo/components/style_traits/lib.rs	2019-03-20 13:06:47.137024070 +0000
-@@ -9,7 +9,7 @@
+--- ./servo/components/style_traits/lib.rs.orig	2019-07-08 13:51:55.462242953 -0500
++++ ./servo/components/style_traits/lib.rs	2019-07-08 13:53:44.853249956 -0500
+@@ -8,7 +8,7 @@
+ 
  #![crate_name = "style_traits"]
  #![crate_type = "rlib"]
- 
 -#![deny(unsafe_code, missing_docs)]
 +#![deny(unsafe_code)]
  
  extern crate app_units;
- #[macro_use] extern crate bitflags;
+ #[macro_use]
diff --git a/source/xfce/garcon/0001-Fix-use-after-free-crash-Bug-15679.patch b/source/xfce/garcon/0001-Fix-use-after-free-crash-Bug-15679.patch
new file mode 100644
index 000000000..92ba106b3
--- /dev/null
+++ b/source/xfce/garcon/0001-Fix-use-after-free-crash-Bug-15679.patch
@@ -0,0 +1,25 @@
+From 6f452937366bb1599fb0ae986958786d52946f15 Mon Sep 17 00:00:00 2001
+From: Andre Miranda <andreldm@xfce.org>
+Date: Sat, 6 Jul 2019 13:42:20 -0300
+Subject: [PATCH] Fix use after free crash (Bug #15679)
+
+---
+ garcon/garcon-menu-item.c | 2 ++
+ 1 file changed, 2 insertions(+)
+
+diff --git a/garcon/garcon-menu-item.c b/garcon/garcon-menu-item.c
+index 35f6bed..5f23467 100644
+--- a/garcon/garcon-menu-item.c
++++ b/garcon/garcon-menu-item.c
+@@ -1154,6 +1154,8 @@ garcon_menu_item_reload_from_file (GarconMenuItem  *item,
+ 
+   /* Update application actions */
+   _garcon_g_list_free_full (item->priv->actions, garcon_menu_item_action_unref);
++  item->priv->actions = NULL;
++
+   str_list = xfce_rc_read_list_entry (rc, G_KEY_FILE_DESKTOP_KEY_ACTIONS, ";");
+   if (G_LIKELY (str_list != NULL))
+     {
+-- 
+2.22.0
+
diff --git a/source/xfce/garcon/garcon.SlackBuild b/source/xfce/garcon/garcon.SlackBuild
index 3954dc4e9..405d00aac 100755
--- a/source/xfce/garcon/garcon.SlackBuild
+++ b/source/xfce/garcon/garcon.SlackBuild
@@ -24,7 +24,7 @@ cd $(dirname $0) ; CWD=$(pwd)
 
 PKGNAM=garcon
 VERSION=${VERSION:-$(echo $PKGNAM-*.tar.?z | rev | cut -f 3- -d . | cut -f 1 -d - | rev)}
-BUILD=${BUILD:-1}
+BUILD=${BUILD:-2}
 
 # Automatically determine the architecture we're building on:
 MARCH=$( uname -m )
@@ -80,6 +80,8 @@ find . \
   \( -perm 666 -o -perm 664 -o -perm 600 -o -perm 444 -o -perm 440 -o -perm 400 \) \
   -exec chmod 644 {} \;
 
+zcat $CWD/0001-Fix-use-after-free-crash-Bug-15679.patch.gz | patch -p1 --verbose || exit 1
+
 if [ ! -r configure ]; then
   NOCONFIGURE=1 ./autogen.sh
 fi
diff --git a/source/xfce/garcon/garcon.url b/source/xfce/garcon/garcon.url
index 9980ede87..2c03b35ca 100644
--- a/source/xfce/garcon/garcon.url
+++ b/source/xfce/garcon/garcon.url
@@ -1 +1 @@
-https://github.com/xfce-mirror/garcon/releases
+http://archive.xfce.org/src/xfce/garcon/0.6/garcon-0.6.3.tar.bz2