Tue Aug 7 05:51:28 UTC 201820180807055128

a/kernel-generic-4.14.61-x86_64-1.txz:  Upgraded.
a/kernel-huge-4.14.61-x86_64-1.txz:  Upgraded.
a/kernel-modules-4.14.61-x86_64-1.txz:  Upgraded.
a/sysvinit-scripts-2.1-noarch-15.txz:  Rebuilt.
  rc.S: clean up files in /var/lib/pkgtools/setup/tmp. Thanks to burdi01.
ap/hplip-3.18.7-x86_64-2.txz:  Rebuilt.
  Patched to fix libImageProcessor installation. Thanks to Matteo Bernardini.
d/kernel-headers-4.14.61-x86-1.txz:  Upgraded.
k/kernel-source-4.14.61-noarch-1.txz:  Upgraded.
l/opus-1.3_rc-x86_64-1.txz:  Upgraded.
n/iputils-s20180629-x86_64-1.txz:  Upgraded.
xap/mozilla-thunderbird-60.0-x86_64-1.txz:  Upgraded.
  This release contains security fixes and improvements.
  For more information, see:
    https://www.mozilla.org/en-US/thunderbird/60.0/releasenotes/
    https://www.mozilla.org/security/known-vulnerabilities/thunderbird.html
    https://www.mozilla.org/en-US/security/advisories/mfsa2018-19/
  (* Security fix *)
isolinux/initrd.img:  Rebuilt.
kernels/*:  Upgraded.
usb-and-pxe-installers/usbboot.img:  Rebuilt.

15 files changed, 127 insertions, 35 deletions

diff --git a/source/a/sysvinit-scripts/scripts/rc.S b/source/a/sysvinit-scripts/scripts/rc.S
index c32d41cb5..3b8218669 100644
--- a/source/a/sysvinit-scripts/scripts/rc.S
+++ b/source/a/sysvinit-scripts/scripts/rc.S
@@ -392,8 +392,12 @@ 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
diff --git a/source/a/sysvinit-scripts/sysvinit-scripts.SlackBuild b/source/a/sysvinit-scripts/sysvinit-scripts.SlackBuild
index a810b1507..7245717ce 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:-14}
+BUILD=${BUILD:-15}
 
 # 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/ap/hplip/hplip.SlackBuild b/source/ap/hplip/hplip.SlackBuild
index aa2a3d286..05f9e26c9 100755
--- a/source/ap/hplip/hplip.SlackBuild
+++ b/source/ap/hplip/hplip.SlackBuild
@@ -27,7 +27,7 @@ cd $(dirname $0) ; CWD=$(pwd)
 
 PKGNAM=hplip
 VERSION=${VERSION:-$(echo $PKGNAM-*.tar.?z | rev | cut -f 3- -d . | cut -f 1 -d - | rev)}
-BUILD=${BUILD:-1}
+BUILD=${BUILD:-2}
 
 NUMJOBS=${NUMJOBS:-" -j7 "}
 
@@ -96,6 +96,9 @@ sed -i.env-python -e 's,^#!/usr/bin/env python,#!/usr/bin/python3,' \
     prnt/filters/hpps \
     fax/filters/pstotiff
 
+# libImageProcessor installation is fubar in 3.18.7:
+zcat $CWD/hplip.libImageProcessor.diff.gz | patch -p1 -l --verbose || exit 1
+
 CFLAGS="$SLKCFLAGS" \
 CXXFLAGS="$SLKCFLAGS" \
 PYTHON=/usr/bin/python3 \
diff --git a/source/ap/hplip/hplip.libImageProcessor.diff b/source/ap/hplip/hplip.libImageProcessor.diff
new file mode 100644
index 000000000..99f3301b3
--- /dev/null
+++ b/source/ap/hplip/hplip.libImageProcessor.diff
@@ -0,0 +1,49 @@
+--- ./Makefile.in.orig	2018-07-15 15:10:08.000000000 -0500
++++ ./Makefile.in	2018-08-06 13:42:53.533490746 -0500
+@@ -9328,15 +9328,15 @@
+ 
+ 
+ install-data-hook:
+-@HPLIP_BUILD_TRUE@	if [ \( "$(UNAME)" = "x86_64" -a  -d "$(libdir)/" \) ]; then \
+-@HPLIP_BUILD_TRUE@		cp prnt/hpcups/libImageProcessor-x86_64.so $(libdir)/ ; \
+-@HPLIP_BUILD_TRUE@		chmod 775 $(libdir)/libImageProcessor-x86_64.so ; \
+-@HPLIP_BUILD_TRUE@		ln -sf $(libdir)/libImageProcessor-x86_64.so $(libdir)/libImageProcessor.so ; \
++@HPLIP_BUILD_TRUE@	if [ \( "$(UNAME)" = "x86_64" -a  -d "$(DESTDIR)$(libdir)/" \) ]; then \
++@HPLIP_BUILD_TRUE@		cp prnt/hpcups/libImageProcessor-x86_64.so $(DESTDIR)$(libdir)/ ; \
++@HPLIP_BUILD_TRUE@		chmod 775 $(DESTDIR)$(libdir)/libImageProcessor-x86_64.so ; \
++@HPLIP_BUILD_TRUE@		ln -sf libImageProcessor-x86_64.so $(DESTDIR)$(libdir)/libImageProcessor.so ; \
+ @HPLIP_BUILD_TRUE@	fi; \
+-@HPLIP_BUILD_TRUE@	if [ \( \( "$(UNAME)" = "i686" -o "$(UNAME)" = "i386" \) -a -d "$(libdir)/" \) ]; then \
+-@HPLIP_BUILD_TRUE@		cp prnt/hpcups/libImageProcessor-x86_32.so $(libdir)/ ; \
+-@HPLIP_BUILD_TRUE@		chmod 775 $(libdir)/libImageProcessor-x86_32.so ; \
+-@HPLIP_BUILD_TRUE@		ln -sf $(libdir)/libImageProcessor-x86_32.so $(libdir)/libImageProcessor.so ; \
++@HPLIP_BUILD_TRUE@	if [ \( \( "$(UNAME)" = "i686" -o "$(UNAME)" = "i386" \) -a -d "$(DESTDIR)$(libdir)/" \) ]; then \
++@HPLIP_BUILD_TRUE@		cp prnt/hpcups/libImageProcessor-x86_32.so $(DESTDIR)$(libdir)/ ; \
++@HPLIP_BUILD_TRUE@		chmod 775 $(DESTDIR)$(libdir)/libImageProcessor-x86_32.so ; \
++@HPLIP_BUILD_TRUE@		ln -sf libImageProcessor-x86_32.so $(DESTDIR)$(libdir)/libImageProcessor.so ; \
+ @HPLIP_BUILD_TRUE@	fi
+ #	   If scanner build, add hpaio entry to sane dll.conf.
+ @HPLIP_BUILD_TRUE@@HPLIP_CLASS_DRIVER_FALSE@	if [ "$(scan_build)" = "yes" ]; then \
+@@ -9349,14 +9349,16 @@
+ @HPLIP_BUILD_TRUE@@HPLIP_CLASS_DRIVER_FALSE@		  echo hpaio >>$(DESTDIR)/etc/sane.d/dll.conf ; \
+ @HPLIP_BUILD_TRUE@@HPLIP_CLASS_DRIVER_FALSE@	   fi; \
+ @HPLIP_BUILD_TRUE@@HPLIP_CLASS_DRIVER_FALSE@ 	   if [ \( "$(UNAME)" = "x86_64" -a  -d "$(libdir)/x86_64-linux-gnu/sane" \) ]; then \
+-@HPLIP_BUILD_TRUE@@HPLIP_CLASS_DRIVER_FALSE@	  	ln -sf $(libdir)/sane/libsane-hpaio.so $(libdir)/x86_64-linux-gnu/sane/ ; \
+-@HPLIP_BUILD_TRUE@@HPLIP_CLASS_DRIVER_FALSE@	  	ln -sf $(libdir)/sane/libsane-hpaio.so.1 $(libdir)/x86_64-linux-gnu/sane/ ; \
++@HPLIP_BUILD_TRUE@@HPLIP_CLASS_DRIVER_FALSE@	  	mkdir -p $(DESTDIR)$(libdir)/x86_64-linux-gnu/sane ; \
++@HPLIP_BUILD_TRUE@@HPLIP_CLASS_DRIVER_FALSE@	  	ln -sf $(libdir)/sane/libsane-hpaio.so $(DESTDIR)$(libdir)/x86_64-linux-gnu/sane/ ; \
++@HPLIP_BUILD_TRUE@@HPLIP_CLASS_DRIVER_FALSE@	  	ln -sf $(libdir)/sane/libsane-hpaio.so.1 $(DESTDIR)$(libdir)/x86_64-linux-gnu/sane/ ; \
+ @HPLIP_BUILD_TRUE@@HPLIP_CLASS_DRIVER_FALSE@	   fi; \
+ @HPLIP_BUILD_TRUE@@HPLIP_CLASS_DRIVER_FALSE@	   if [ \( \( "$(UNAME)" = "i686" -o "$(UNAME)" = "i386" \) -a -d "$(libdir)/i386-linux-gnu" \) ]; then \
+-@HPLIP_BUILD_TRUE@@HPLIP_CLASS_DRIVER_FALSE@	      ln -sf $(libdir)/libhpmud.so.0.0.6  $(libdir)/i386-linux-gnu/libhpmud.so ; \
+-@HPLIP_BUILD_TRUE@@HPLIP_CLASS_DRIVER_FALSE@	      ln -sf $(libdir)/libhpmud.so.0.0.6  $(libdir)/i386-linux-gnu/libhpmud.so.0 ; \
+-@HPLIP_BUILD_TRUE@@HPLIP_CLASS_DRIVER_FALSE@	      ln -sf $(libdir)/sane/libsane-hpaio.so.1.0.0 $(libdir)/i386-linux-gnu/sane/libsane-hpaio.so.1 ; \
+-@HPLIP_BUILD_TRUE@@HPLIP_CLASS_DRIVER_FALSE@	      ln -sf $(libdir)/sane/libsane-hpaio.so.1.0.0 $(libdir)/i386-linux-gnu/sane/libsane-hpaio.so ; \
++@HPLIP_BUILD_TRUE@@HPLIP_CLASS_DRIVER_FALSE@	      mkdir -p $(DESTDIR)$(libdir)/i386-linux-gnu/sane ; \
++@HPLIP_BUILD_TRUE@@HPLIP_CLASS_DRIVER_FALSE@	      ln -sf $(libdir)/libhpmud.so.0.0.6  $(DESTDIR)$(libdir)/i386-linux-gnu/libhpmud.so ; \
++@HPLIP_BUILD_TRUE@@HPLIP_CLASS_DRIVER_FALSE@	      ln -sf $(libdir)/libhpmud.so.0.0.6  $(DESTDIR)$(libdir)/i386-linux-gnu/libhpmud.so.0 ; \
++@HPLIP_BUILD_TRUE@@HPLIP_CLASS_DRIVER_FALSE@	      ln -sf $(libdir)/sane/libsane-hpaio.so.1.0.0 $(DESTDIR)$(libdir)/i386-linux-gnu/sane/libsane-hpaio.so.1 ; \
++@HPLIP_BUILD_TRUE@@HPLIP_CLASS_DRIVER_FALSE@	      ln -sf $(libdir)/sane/libsane-hpaio.so.1.0.0 $(DESTDIR)$(libdir)/i386-linux-gnu/sane/libsane-hpaio.so ; \
+ @HPLIP_BUILD_TRUE@@HPLIP_CLASS_DRIVER_FALSE@	   fi \
+ @HPLIP_BUILD_TRUE@@HPLIP_CLASS_DRIVER_FALSE@	fi
+ #	   Create hp-xxx commands in bindir.
diff --git a/source/k/kernel-configs/config-generic-4.14.60 b/source/k/kernel-configs/config-generic-4.14.61
index dc7c0ce79..fc320188b 100644
--- a/source/k/kernel-configs/config-generic-4.14.60
+++ b/source/k/kernel-configs/config-generic-4.14.61
@@ -1,6 +1,6 @@
 #
 # Automatically generated file; DO NOT EDIT.
-# Linux/x86 4.14.60 Kernel Configuration
+# Linux/x86 4.14.61 Kernel Configuration
 #
 # CONFIG_64BIT is not set
 CONFIG_X86_32=y
diff --git a/source/k/kernel-configs/config-generic-4.14.60.x64 b/source/k/kernel-configs/config-generic-4.14.61.x64
index 063b3823d..d380828f9 100644
--- a/source/k/kernel-configs/config-generic-4.14.60.x64
+++ b/source/k/kernel-configs/config-generic-4.14.61.x64
@@ -1,6 +1,6 @@
 #
 # Automatically generated file; DO NOT EDIT.
-# Linux/x86 4.14.60 Kernel Configuration
+# Linux/x86 4.14.61 Kernel Configuration
 #
 CONFIG_64BIT=y
 CONFIG_X86_64=y
diff --git a/source/k/kernel-configs/config-generic-smp-4.14.60-smp b/source/k/kernel-configs/config-generic-smp-4.14.61-smp
index c839727e3..3cace4599 100644
--- a/source/k/kernel-configs/config-generic-smp-4.14.60-smp
+++ b/source/k/kernel-configs/config-generic-smp-4.14.61-smp
@@ -1,6 +1,6 @@
 #
 # Automatically generated file; DO NOT EDIT.
-# Linux/x86 4.14.60 Kernel Configuration
+# Linux/x86 4.14.61 Kernel Configuration
 #
 # CONFIG_64BIT is not set
 CONFIG_X86_32=y
diff --git a/source/k/kernel-configs/config-huge-4.14.60 b/source/k/kernel-configs/config-huge-4.14.61
index 49946e7a9..fe68efdbb 100644
--- a/source/k/kernel-configs/config-huge-4.14.60
+++ b/source/k/kernel-configs/config-huge-4.14.61
@@ -1,6 +1,6 @@
 #
 # Automatically generated file; DO NOT EDIT.
-# Linux/x86 4.14.60 Kernel Configuration
+# Linux/x86 4.14.61 Kernel Configuration
 #
 # CONFIG_64BIT is not set
 CONFIG_X86_32=y
diff --git a/source/k/kernel-configs/config-huge-4.14.60.x64 b/source/k/kernel-configs/config-huge-4.14.61.x64
index 6768f7645..07be01015 100644
--- a/source/k/kernel-configs/config-huge-4.14.60.x64
+++ b/source/k/kernel-configs/config-huge-4.14.61.x64
@@ -1,6 +1,6 @@
 #
 # Automatically generated file; DO NOT EDIT.
-# Linux/x86 4.14.60 Kernel Configuration
+# Linux/x86 4.14.61 Kernel Configuration
 #
 CONFIG_64BIT=y
 CONFIG_X86_64=y
diff --git a/source/k/kernel-configs/config-huge-smp-4.14.60-smp b/source/k/kernel-configs/config-huge-smp-4.14.61-smp
index 2e29c39e8..ae34a5211 100644
--- a/source/k/kernel-configs/config-huge-smp-4.14.60-smp
+++ b/source/k/kernel-configs/config-huge-smp-4.14.61-smp
@@ -1,6 +1,6 @@
 #
 # Automatically generated file; DO NOT EDIT.
-# Linux/x86 4.14.60 Kernel Configuration
+# Linux/x86 4.14.61 Kernel Configuration
 #
 # CONFIG_64BIT is not set
 CONFIG_X86_32=y
diff --git a/source/l/opus/opus.SlackBuild b/source/l/opus/opus.SlackBuild
index 3e6d41c72..c2274fc80 100755
--- a/source/l/opus/opus.SlackBuild
+++ b/source/l/opus/opus.SlackBuild
@@ -24,7 +24,7 @@ cd $(dirname $0) ; CWD=$(pwd)
 
 PKGNAM=opus
 VERSION=${VERSION:-$(echo $PKGNAM-*.tar.?z | rev | cut -f 3- -d . | rev | cut -f 2- -d -)}
-BUILD=${BUILD:-2}
+BUILD=${BUILD:-1}
 
 # Automatically determine the architecture we're building on:
 if [ -z "$ARCH" ]; then
diff --git a/source/n/iputils/iputils.SlackBuild b/source/n/iputils/iputils.SlackBuild
index 3b6cc4d6a..238877998 100755
--- a/source/n/iputils/iputils.SlackBuild
+++ b/source/n/iputils/iputils.SlackBuild
@@ -23,8 +23,8 @@
 cd $(dirname $0) ; CWD=$(pwd)
 
 PKGNAM=iputils
-VERSION=s20140519
-BUILD=${BUILD:-2}
+VERSION=s20180629
+BUILD=${BUILD:-1}
 
 # Automatically determine the architecture we're building on:
 if [ -z "$ARCH" ]; then
@@ -64,9 +64,12 @@ mkdir -p $TMP $PKG
 
 cd $TMP
 rm -rf iputils-$VERSION
-tar xvf $CWD/iputils-$VERSION.tar.?z* || exit 1
+tar xvf $CWD/iputils-$VERSION.tar.?z || exit 1
 cd iputils-$VERSION || exit 1
 
+# Don't use nettle libraary for ping6:
+sed -i "s/USE_NETTLE=yes/USE_NETTLE=no/g" Makefile
+
 chown -R root:root .
 find . \
   \( -perm 777 -o -perm 775 -o -perm 711 -o -perm 555 -o -perm 511 \) \
@@ -90,7 +93,7 @@ make VPATH=/usr/lib${LIBDIRSUFFIX} || exit 1
     make || exit 1
 ) || exit 1
 
-strip arping clockdiff ninfod/ninfod ping ping6 rarpd rdisc tracepath tracepath6 traceroute6
+strip arping clockdiff ninfod/ninfod ping rarpd rdisc tracepath traceroute6
 mkdir -p $PKG/sbin
 cat arping > $PKG/sbin/arping
 chmod 755 $PKG/sbin/arping
@@ -101,14 +104,14 @@ cat ninfod/ninfod > $PKG/usr/sbin/ninfod
 chmod 755 $PKG/usr/sbin/ninfod
 mkdir -p $PKG/bin
 cat ping > $PKG/bin/ping
-cat ping6 > $PKG/bin/ping6
-chmod 4711 $PKG/bin/ping $PKG/bin/ping6
+chmod 4711 $PKG/bin/ping
+( cd $PKG/bin ; ln -sf ping ping6 )
 cat rarpd > $PKG/usr/sbin/rarpd
 cat rdisc > $PKG/usr/sbin/rdisc
 chmod 755 $PKG/usr/sbin/rarpd $PKG/usr/sbin/rdisc
 mkdir -p $PKG/usr/bin
 cat tracepath > $PKG/usr/bin/tracepath
-cat tracepath6 > $PKG/usr/bin/tracepath6
+( cd $PKG/usr/bin ; ln -sf tracepath tracepath6 )
 cat traceroute6 > $PKG/usr/bin/traceroute6
 chmod 755 $PKG/usr/bin/tracepath*
 chmod 4711 $PKG/usr/bin/traceroute6
@@ -125,7 +128,7 @@ mkdir -p $PKG/usr/man/man8
 
 mkdir -p $PKG/usr/doc/iputils-$VERSION
 cp -a \
-  RELNOTES \
+  INSTALL* LICENSE* README* RELNOTES* \
   $PKG/usr/doc/iputils-$VERSION
 chmod 644 $PKG/usr/doc/iputils-$VERSION/*
 
diff --git a/source/n/iputils/iputils.url b/source/n/iputils/iputils.url
new file mode 100644
index 000000000..91dfd08d8
--- /dev/null
+++ b/source/n/iputils/iputils.url
@@ -0,0 +1 @@
+https://github.com/iputils/iputils/releases
diff --git a/source/xap/mozilla-firefox/mozilla-firefox.SlackBuild b/source/xap/mozilla-firefox/mozilla-firefox.SlackBuild
index 149de510b..94a2204e9 100755
--- a/source/xap/mozilla-firefox/mozilla-firefox.SlackBuild
+++ b/source/xap/mozilla-firefox/mozilla-firefox.SlackBuild
@@ -68,7 +68,7 @@ fi
 # libxul. If it fails to build natively on x86 32-bit, it can be useful to
 # attempt the build using an x86_64 kernel and a 32-bit userspace. Detect this
 # situation and set the ARCH to i686. Later in the script we'll add some
-# options to the .mozconfig so that the compile will do the riight thing.
+# options to the .mozconfig so that the compile will do the right thing.
 if [ "$(uname -m)" = "x86_64" -a "$(file -L /usr/bin/gcc | grep 80386 | grep 32-bit)" != "" ]; then
   COMPILE_X86_UNDER_X86_64=true
   ARCH=i686
diff --git a/source/xap/mozilla-thunderbird/mozilla-thunderbird.SlackBuild b/source/xap/mozilla-thunderbird/mozilla-thunderbird.SlackBuild
index 494744216..fa0d4c022 100755
--- a/source/xap/mozilla-thunderbird/mozilla-thunderbird.SlackBuild
+++ b/source/xap/mozilla-thunderbird/mozilla-thunderbird.SlackBuild
@@ -28,7 +28,7 @@
 cd $(dirname $0) ; CWD=$(pwd)
 
 PKGNAM=mozilla-thunderbird
-VERSION=$(basename $(ls thunderbird-*.tar.?z* | cut -d - -f 2 | rev | cut -f 3- -d . | rev) .source)
+VERSION=$(basename $(ls thunderbird-*.tar.?z | cut -d - -f 2 | rev | cut -f 3- -d . | rev) .source)
 RELEASEVER=$(echo $VERSION | cut -f 1 -d e | cut -f 1 -d b)
 BUILD=${BUILD:-1}
 
@@ -51,7 +51,7 @@ fi
 # Automatically determine the architecture we're building on:
 if [ -z "$ARCH" ]; then
   case "$( uname -m )" in
-    i?86) export ARCH=i586 ;;
+    i?86) export ARCH=i686 ;;
     armv7hl) export ARCH=armv7hl ;;
     arm*) export ARCH=arm ;;
     # Unless $ARCH is already set, use uname -m for all other archs:
@@ -93,11 +93,35 @@ else
   OPTIMIZE=${OPTIMIZE:-"-O1"}
 fi
 
-# Link using gold.  This avoids running out of memory on 32-bit systems, and
-# avoids a recurring build failure with GNU ld on other systems.
-PATH="$(pwd)/gold:$PATH"
-export CC=${CC:-"gcc -B$(pwd)/gold"}
-export CXX=${CXX:-"g++ -B$(pwd)/gold"}
+# Thunderbord has been requiring more and more memory, especially while linking
+# libxul. If it fails to build natively on x86 32-bit, it can be useful to
+# attempt the build using an x86_64 kernel and a 32-bit userspace. Detect this
+# situation and set the ARCH to i686. Later in the script we'll add some
+# options to the .mozconfig so that the compile will do the right thing.
+if [ "$(uname -m)" = "x86_64" -a "$(file -L /usr/bin/gcc | grep 80386 | grep 32-bit)" != "" ]; then
+  COMPILE_X86_UNDER_X86_64=true
+  ARCH=i686
+  # Also use the gold linker for this:
+  PATH="$(pwd)/gold:$PATH"
+  export CC=${CC:-"gcc -B$(pwd)/gold"}
+  export CXX=${CXX:-"g++ -B$(pwd)/gold"}
+elif [ "$ARCH" = "i686" ]; then
+  # This might also help with the linker memory situation on some $ARCH. Feel free
+  # to match any other $ARCH that could benefit from this.
+  SLKLDFLAGS=" -Wl,--as-needed -Wl,--reduce-memory-overheads -Wl,--no-keep-memory -Wl,--stats"
+  export LDFLAGS="$SLKLDFLAGS"
+  export MOZ_LINK_FLAGS="$SLKLDFLAGS"
+else
+  # Link using gold.  This also helps prevent running out of memory on 32-bit
+  # systems, and avoids a recurring build failure with GNU ld on other systems.
+  PATH="$(pwd)/gold:$PATH"
+  export CC=${CC:-"gcc -B$(pwd)/gold"}
+  export CXX=${CXX:-"g++ -B$(pwd)/gold"}
+fi
+
+# Put Rust objects on a diet to keep the linker from running into memory
+# issues (especially on 32-bit):
+export RUSTFLAGS="-Cdebuginfo=0"
 
 TMP=${TMP:-/tmp}
 PKG=$TMP/package-mozilla-thunderbird
@@ -123,19 +147,19 @@ mkdir -p $TMP $PKG/usr/lib${LIBDIRSUFFIX}
 PATH=$TMP/autoconf-tmp/usr/bin:$PATH
 
 cd $TMP
-rm -rf thunderbird-$VERSION
+rm -rf thunderbird-$RELEASEVER
 # Unpack this in a subdirectory to prevent changing permissions on /tmp:
 rm -rf thunderbird-unpack
 mkdir thunderbird-unpack
 cd thunderbird-unpack
-tar xvf $CWD/thunderbird-$VERSION.source.tar.?z* || exit 1
+tar xvf $CWD/thunderbird-$VERSION.source.tar.?z || exit 1
 mv * ..
 cd ..
 rm -rf thunderbird-unpack
-cd thunderbird-$VERSION || exit 1
+cd thunderbird-$RELEASEVER || exit 1
 
 # Retain GTK+ v2 scrolling behavior:
-zcat $CWD/tb.ui.scrollToClick.diff.gz | patch -p1 --verbose || exit 1
+zcat $CWD/tb.ui.scrollToClick.diff.gz | patch -p2 --verbose || exit 1
 
 # Fetch localization, if requested:
 if [ ! -z $MOZLOCALIZE ]; then
@@ -168,10 +192,9 @@ OPTIONS="\
   --enable-official-branding \
   --prefix=/usr \
   --libdir=/usr/lib${LIBDIRSUFFIX} \
-  --with-default-mozilla-five-home=/usr/lib${LIBDIRSUFFIX}/thunderbird-$RELEASEVER \
   --with-system-zlib \
   --enable-alsa \
-  --enable-application=mail \
+  --enable-application=comm/mail \
   $ENABLE_CALENDAR \
   --enable-default-toolkit=cairo-gtk3 \
   --enable-startup-notification \
@@ -228,11 +251,20 @@ mkdir -p mozilla/obj
 # Set options for $OPTIMIZE:
 echo "ac_add_options --enable-optimize=\"${OPTIMIZE}\"" >> .mozconfig
 
+if [ "$COMPILE_X86_UNDER_X86_64" = "true" ]; then
+  # Compile for i686 under an x86_64 kernel:
+  echo "ac_add_options --host=i686-pc-linux-gnu" >> .mozconfig
+  echo "ac_add_options --target=i686-pc-linux-gnu" >> .mozconfig
+fi
+
 # Add the $OPTIONS above to .mozconfig:
 for option in $OPTIONS; do echo "ac_add_options $option" >> .mozconfig; done
 
-make -f client.mk build || exit 1
-make -f client.mk install DESTDIR=$PKG || exit 1
+# Disable tests on standard build:
+echo "ac_add_options --disable-tests" >> .mozconfig
+./mach build || exit 1
+./mach buildsymbols || exit 1
+DESTDIR=$PKG ./mach install || exit 1
 
 # We don't need these (just symlinks anyway):
 rm -rf $PKG/usr/lib${LIBDIRSUFFIX}/thunderbird-devel-$RELEASEVER
@@ -270,7 +302,7 @@ mkdir -p $PKG/usr/share/pixmaps
 
 # Need some default icons in the right place:
 for i in 16 22 24 32 48 256; do
-  install -m 0644 -D other-licenses/branding/thunderbird/mailicon${i}.png \
+  install -m 0644 -D comm/mail/branding/thunderbird/default${i}.png \
     $PKG/usr/share/icons/hicolor/${i}x${i}/apps/thunderbird.png
 done
 mkdir -p $PKG/usr/share/pixmaps