Mon Sep 10 21:00:00 UTC 201820180910210000

a/kernel-generic-4.14.69-x86_64-1.txz:  Upgraded.
a/kernel-huge-4.14.69-x86_64-1.txz:  Upgraded.
a/kernel-modules-4.14.69-x86_64-1.txz:  Upgraded.
a/xfsprogs-4.18.0-x86_64-1.txz:  Upgraded.
ap/nano-3.0-x86_64-1.txz:  Upgraded.
d/cmake-3.12.2-x86_64-1.txz:  Upgraded.
d/kernel-headers-4.14.69-x86-1.txz:  Upgraded.
k/kernel-source-4.14.69-noarch-1.txz:  Upgraded.
  Config changes since 4.14.68:
   CRYPTO_LZO m -> y
   FRONTSWAP n -> y
   ZBUD n -> m
   ZPOOL m -> y
  +ZSWAP y
  Thanks to Darth Vader.
l/glib2-2.56.2-x86_64-2.txz:  Rebuilt.
  Make links in the documentation directory to all of the API documentation
  found under /usr/share/gtk-doc/html. Thanks to Didier Spaier.
l/libarchive-3.3.3-x86_64-1.txz:  Upgraded.
n/links-2.17-x86_64-1.txz:  Upgraded.
xfce/tumbler-0.2.2-x86_64-1.txz:  Upgraded.
isolinux/initrd.img:  Rebuilt.
kernels/*:  Upgraded.
usb-and-pxe-installers/usbboot.img:  Rebuilt.

14 files changed, 81 insertions, 40 deletions

diff --git a/source/ap/nano/nano.SlackBuild b/source/ap/nano/nano.SlackBuild
index 28ad4d07..e0816b31 100755
--- a/source/ap/nano/nano.SlackBuild
+++ b/source/ap/nano/nano.SlackBuild
@@ -73,6 +73,27 @@ PKG=$TMP/package-${PKGNAM}
 rm -rf $PKG
 mkdir -p $TMP $PKG
 
+# Don't use icecream:
+for path_element in $(echo $PATH | tr ':' '\n') ; do
+  if [ "$path_element" = "/usr/libexec/icecc/bin" ]; then
+    continue
+  fi
+  if [ -z "$REVERSE_PATH" ]; then
+    REVERSE_PATH="$path_element"
+  else
+    REVERSE_PATH="${REVERSE_PATH}:$path_element"
+  fi
+done
+for path_element in $(echo $REVERSE_PATH | tr ':' '\n') ; do
+  if [ -z "$FORWARD_PATH" ]; then
+    FORWARD_PATH="$path_element"
+  else
+    FORWARD_PATH="${FORWARD_PATH}:$path_element"
+  fi
+done
+PATH=$FORWARD_PATH
+unset FORWARD_PATH REVERSE_PATH
+
 cd $TMP
 rm -rf ${PKGNAM}-${VERSION}
 tar xvf $CWD/${PKGNAM}-$VERSION.tar.xz || exit 1
@@ -151,7 +172,7 @@ chmod 644 $PKG/etc/nanorc.new
 # Add a documentation directory:
 mkdir -p $PKG/usr/doc/${PKGNAM}-$VERSION
 cp -a \
-  ABOUT-NLS AUTHORS BUGS COPYING* INSTALL NEWS README* THANKS TODO UPGRADE \
+  ABOUT-NLS AUTHORS BUGS COPYING* IMPROVEMENTS INSTALL NEWS README* THANKS TODO UPGRADE \
   doc/faq.html doc/nanorc.sample \
   $PKG/usr/doc/${PKGNAM}-$VERSION
 
diff --git a/source/installer/ChangeLog.txt b/source/installer/ChangeLog.txt
index adc0fb7e..173f898f 100644
--- a/source/installer/ChangeLog.txt
+++ b/source/installer/ChangeLog.txt
@@ -1,3 +1,11 @@
+Mon Sep 10 20:41:59 UTC 2018
+  Switch to ter-114v.psf.gz as the consolefont. It has been reported that the
+  font we were using (ter-v14v.psf.gz) restricts the available console colors
+  from 16 to 8 due to needing an extra bit for the higher number of available
+  glyphs (though in testing here I couldn't see any difference). The new font
+  covers ISO8859-1, ISO8859-15, and Windows-1252 codepages. I'm still not sure
+  it's the best choice, so additional input is welcomed.
++--------------------------+
 Wed Jul 25 03:29:26 UTC 2018
   Use ter-v14v.psf.gz as the consolefont. It supports more character sets, and
   the larger font was causing wraparound on UEFI (at least on bare metal here).
diff --git a/source/installer/build_installer.sh b/source/installer/build_installer.sh
index 60aeb5b9..954bc4a5 100755
--- a/source/installer/build_installer.sh
+++ b/source/installer/build_installer.sh
@@ -1010,7 +1010,7 @@ cp --remove-destination -fa${VERBOSE1} ${EXTRA_PKGS_USRBIN} \
 cd $TMP/extract-packages/usr/share/kbd/consolefonts
 mkdir -p $PKG/$ARCH-installer-filesystem/usr/share/kbd/consolefonts
 cp --remove-destination -fa${VERBOSE1} \
-  ter-v14v.psf.gz \
+  ter-114v.psf.gz \
   $PKG/$ARCH-installer-filesystem/usr/share/kbd/consolefonts
 
 # Copy binaries from /usr/sbin into the installer's /usr/sbin/
diff --git a/source/k/kernel-configs/config-generic-4.14.68 b/source/k/kernel-configs/config-generic-4.14.69
index b5f90f5d..5179acbe 100644
--- a/source/k/kernel-configs/config-generic-4.14.68
+++ b/source/k/kernel-configs/config-generic-4.14.69
@@ -1,6 +1,6 @@
 #
 # Automatically generated file; DO NOT EDIT.
-# Linux/x86 4.14.68 Kernel Configuration
+# Linux/x86 4.14.69 Kernel Configuration
 #
 # CONFIG_64BIT is not set
 CONFIG_X86_32=y
@@ -562,10 +562,11 @@ CONFIG_TRANSPARENT_HUGEPAGE_MADVISE=y
 CONFIG_TRANSPARENT_HUGE_PAGECACHE=y
 CONFIG_NEED_PER_CPU_KM=y
 # CONFIG_CLEANCACHE is not set
-# CONFIG_FRONTSWAP is not set
+CONFIG_FRONTSWAP=y
 # CONFIG_CMA is not set
-CONFIG_ZPOOL=m
-# CONFIG_ZBUD is not set
+CONFIG_ZSWAP=y
+CONFIG_ZPOOL=y
+CONFIG_ZBUD=m
 CONFIG_Z3FOLD=m
 CONFIG_ZSMALLOC=m
 # CONFIG_PGTABLE_MAPPING is not set
@@ -7912,7 +7913,7 @@ CONFIG_CRYPTO_TWOFISH_586=y
 # Compression
 #
 CONFIG_CRYPTO_DEFLATE=y
-CONFIG_CRYPTO_LZO=m
+CONFIG_CRYPTO_LZO=y
 CONFIG_CRYPTO_842=m
 CONFIG_CRYPTO_LZ4=m
 CONFIG_CRYPTO_LZ4HC=m
diff --git a/source/k/kernel-configs/config-generic-4.14.68.x64 b/source/k/kernel-configs/config-generic-4.14.69.x64
index 17492d6b..ad735f58 100644
--- a/source/k/kernel-configs/config-generic-4.14.68.x64
+++ b/source/k/kernel-configs/config-generic-4.14.69.x64
@@ -1,6 +1,6 @@
 #
 # Automatically generated file; DO NOT EDIT.
-# Linux/x86 4.14.68 Kernel Configuration
+# Linux/x86 4.14.69 Kernel Configuration
 #
 CONFIG_64BIT=y
 CONFIG_X86_64=y
@@ -588,11 +588,12 @@ CONFIG_ARCH_WANTS_THP_SWAP=y
 CONFIG_THP_SWAP=y
 CONFIG_TRANSPARENT_HUGE_PAGECACHE=y
 # CONFIG_CLEANCACHE is not set
-# CONFIG_FRONTSWAP is not set
+CONFIG_FRONTSWAP=y
 # CONFIG_CMA is not set
 # CONFIG_MEM_SOFT_DIRTY is not set
-CONFIG_ZPOOL=m
-# CONFIG_ZBUD is not set
+CONFIG_ZSWAP=y
+CONFIG_ZPOOL=y
+CONFIG_ZBUD=m
 CONFIG_Z3FOLD=m
 CONFIG_ZSMALLOC=m
 # CONFIG_PGTABLE_MAPPING is not set
@@ -7867,7 +7868,7 @@ CONFIG_CRYPTO_TWOFISH_AVX_X86_64=m
 # Compression
 #
 CONFIG_CRYPTO_DEFLATE=y
-CONFIG_CRYPTO_LZO=m
+CONFIG_CRYPTO_LZO=y
 CONFIG_CRYPTO_842=m
 CONFIG_CRYPTO_LZ4=m
 CONFIG_CRYPTO_LZ4HC=m
diff --git a/source/k/kernel-configs/config-generic-smp-4.14.68-smp b/source/k/kernel-configs/config-generic-smp-4.14.69-smp
index 2524dc92..fb59ccdf 100644
--- a/source/k/kernel-configs/config-generic-smp-4.14.68-smp
+++ b/source/k/kernel-configs/config-generic-smp-4.14.69-smp
@@ -1,6 +1,6 @@
 #
 # Automatically generated file; DO NOT EDIT.
-# Linux/x86 4.14.68 Kernel Configuration
+# Linux/x86 4.14.69 Kernel Configuration
 #
 # CONFIG_64BIT is not set
 CONFIG_X86_32=y
@@ -596,10 +596,11 @@ CONFIG_TRANSPARENT_HUGEPAGE_MADVISE=y
 # CONFIG_ARCH_WANTS_THP_SWAP is not set
 CONFIG_TRANSPARENT_HUGE_PAGECACHE=y
 # CONFIG_CLEANCACHE is not set
-# CONFIG_FRONTSWAP is not set
+CONFIG_FRONTSWAP=y
 # CONFIG_CMA is not set
-CONFIG_ZPOOL=m
-# CONFIG_ZBUD is not set
+CONFIG_ZSWAP=y
+CONFIG_ZPOOL=y
+CONFIG_ZBUD=m
 CONFIG_Z3FOLD=m
 CONFIG_ZSMALLOC=m
 # CONFIG_PGTABLE_MAPPING is not set
@@ -7968,7 +7969,7 @@ CONFIG_CRYPTO_TWOFISH_586=y
 # Compression
 #
 CONFIG_CRYPTO_DEFLATE=y
-CONFIG_CRYPTO_LZO=m
+CONFIG_CRYPTO_LZO=y
 CONFIG_CRYPTO_842=m
 CONFIG_CRYPTO_LZ4=m
 CONFIG_CRYPTO_LZ4HC=m
diff --git a/source/k/kernel-configs/config-huge-4.14.68 b/source/k/kernel-configs/config-huge-4.14.69
index bbf2e673..24f8dbb3 100644
--- a/source/k/kernel-configs/config-huge-4.14.68
+++ b/source/k/kernel-configs/config-huge-4.14.69
@@ -1,6 +1,6 @@
 #
 # Automatically generated file; DO NOT EDIT.
-# Linux/x86 4.14.68 Kernel Configuration
+# Linux/x86 4.14.69 Kernel Configuration
 #
 # CONFIG_64BIT is not set
 CONFIG_X86_32=y
@@ -562,10 +562,11 @@ CONFIG_TRANSPARENT_HUGEPAGE_MADVISE=y
 CONFIG_TRANSPARENT_HUGE_PAGECACHE=y
 CONFIG_NEED_PER_CPU_KM=y
 # CONFIG_CLEANCACHE is not set
-# CONFIG_FRONTSWAP is not set
+CONFIG_FRONTSWAP=y
 # CONFIG_CMA is not set
-CONFIG_ZPOOL=m
-# CONFIG_ZBUD is not set
+CONFIG_ZSWAP=y
+CONFIG_ZPOOL=y
+CONFIG_ZBUD=m
 CONFIG_Z3FOLD=m
 CONFIG_ZSMALLOC=m
 # CONFIG_PGTABLE_MAPPING is not set
@@ -7912,7 +7913,7 @@ CONFIG_CRYPTO_TWOFISH_586=y
 # Compression
 #
 CONFIG_CRYPTO_DEFLATE=y
-CONFIG_CRYPTO_LZO=m
+CONFIG_CRYPTO_LZO=y
 CONFIG_CRYPTO_842=m
 CONFIG_CRYPTO_LZ4=m
 CONFIG_CRYPTO_LZ4HC=m
diff --git a/source/k/kernel-configs/config-huge-4.14.68.x64 b/source/k/kernel-configs/config-huge-4.14.69.x64
index 9a96a38d..1ef5e598 100644
--- a/source/k/kernel-configs/config-huge-4.14.68.x64
+++ b/source/k/kernel-configs/config-huge-4.14.69.x64
@@ -1,6 +1,6 @@
 #
 # Automatically generated file; DO NOT EDIT.
-# Linux/x86 4.14.68 Kernel Configuration
+# Linux/x86 4.14.69 Kernel Configuration
 #
 CONFIG_64BIT=y
 CONFIG_X86_64=y
@@ -588,11 +588,12 @@ CONFIG_ARCH_WANTS_THP_SWAP=y
 CONFIG_THP_SWAP=y
 CONFIG_TRANSPARENT_HUGE_PAGECACHE=y
 # CONFIG_CLEANCACHE is not set
-# CONFIG_FRONTSWAP is not set
+CONFIG_FRONTSWAP=y
 # CONFIG_CMA is not set
 # CONFIG_MEM_SOFT_DIRTY is not set
-CONFIG_ZPOOL=m
-# CONFIG_ZBUD is not set
+CONFIG_ZSWAP=y
+CONFIG_ZPOOL=y
+CONFIG_ZBUD=m
 CONFIG_Z3FOLD=m
 CONFIG_ZSMALLOC=m
 # CONFIG_PGTABLE_MAPPING is not set
@@ -7867,7 +7868,7 @@ CONFIG_CRYPTO_TWOFISH_AVX_X86_64=m
 # Compression
 #
 CONFIG_CRYPTO_DEFLATE=y
-CONFIG_CRYPTO_LZO=m
+CONFIG_CRYPTO_LZO=y
 CONFIG_CRYPTO_842=m
 CONFIG_CRYPTO_LZ4=m
 CONFIG_CRYPTO_LZ4HC=m
diff --git a/source/k/kernel-configs/config-huge-smp-4.14.68-smp b/source/k/kernel-configs/config-huge-smp-4.14.69-smp
index 7baca83b..64943200 100644
--- a/source/k/kernel-configs/config-huge-smp-4.14.68-smp
+++ b/source/k/kernel-configs/config-huge-smp-4.14.69-smp
@@ -1,6 +1,6 @@
 #
 # Automatically generated file; DO NOT EDIT.
-# Linux/x86 4.14.68 Kernel Configuration
+# Linux/x86 4.14.69 Kernel Configuration
 #
 # CONFIG_64BIT is not set
 CONFIG_X86_32=y
@@ -596,10 +596,11 @@ CONFIG_TRANSPARENT_HUGEPAGE_MADVISE=y
 # CONFIG_ARCH_WANTS_THP_SWAP is not set
 CONFIG_TRANSPARENT_HUGE_PAGECACHE=y
 # CONFIG_CLEANCACHE is not set
-# CONFIG_FRONTSWAP is not set
+CONFIG_FRONTSWAP=y
 # CONFIG_CMA is not set
-CONFIG_ZPOOL=m
-# CONFIG_ZBUD is not set
+CONFIG_ZSWAP=y
+CONFIG_ZPOOL=y
+CONFIG_ZBUD=m
 CONFIG_Z3FOLD=m
 CONFIG_ZSMALLOC=m
 # CONFIG_PGTABLE_MAPPING is not set
@@ -7968,7 +7969,7 @@ CONFIG_CRYPTO_TWOFISH_586=y
 # Compression
 #
 CONFIG_CRYPTO_DEFLATE=y
-CONFIG_CRYPTO_LZO=m
+CONFIG_CRYPTO_LZO=y
 CONFIG_CRYPTO_842=m
 CONFIG_CRYPTO_LZ4=m
 CONFIG_CRYPTO_LZ4HC=m
diff --git a/source/l/glib2/glib2.SlackBuild b/source/l/glib2/glib2.SlackBuild
index bbb80679..ff7b4b89 100755
--- a/source/l/glib2/glib2.SlackBuild
+++ b/source/l/glib2/glib2.SlackBuild
@@ -24,7 +24,7 @@ cd $(dirname $0) ; CWD=$(pwd)
 
 PKGNAM=glib2
 VERSION=${VERSION:-$(echo glib-*.tar.?z* | rev | cut -f 3- -d . | cut -f 1 -d - | rev)}
-BUILD=${BUILD:-1}
+BUILD=${BUILD:-2}
 
 NUMJOBS=${NUMJOBS:-" -j7 "}
 
@@ -126,7 +126,13 @@ cp -a \
   AUTHORS COPYING* NEWS README* \
   $PKG/usr/doc/glib-$VERSION
   rm -f $PKG/usr/doc/glib-$VERSION/README.{in,win32}
-( cd $PKG/usr/doc/glib-$VERSION ; ln -s /usr/share/gtk-doc/html/gobject html )
+
+# Make links to the documentation in /usr/share/gtk-doc/:
+( cd $PKG/usr/doc/glib-$VERSION
+  for dir in $PKG/usr/share/gtk-doc/html/* ; do
+    ln -s /usr/share/gtk-doc/html/$(basename $dir) .
+  done
+)
 
 # If there's a ChangeLog, installing at least part of the recent history
 # is useful, but don't let it get totally out of control:
diff --git a/source/l/libarchive/libarchive.SlackBuild b/source/l/libarchive/libarchive.SlackBuild
index 625f8b4d..c6530e21 100755
--- a/source/l/libarchive/libarchive.SlackBuild
+++ b/source/l/libarchive/libarchive.SlackBuild
@@ -26,8 +26,8 @@
 cd $(dirname $0) ; CWD=$(pwd)
 
 PKGNAM=libarchive
-VERSION=${VERSION:-$(echo $PKGNAM-*.tar.?z* | rev | cut -f 3- -d . | cut -f 1 -d - | rev)}
-BUILD=${BUILD:-3}
+VERSION=${VERSION:-$(echo $PKGNAM-*.tar.?z | rev | cut -f 3- -d . | cut -f 1 -d - | rev)}
+BUILD=${BUILD:-1}
 
 # Automatically determine the architecture we're building on:
 if [ -z "$ARCH" ]; then
@@ -70,7 +70,7 @@ rm -rf $PKG
 mkdir -p $TMP $PKG
 cd $TMP
 rm -rf $PKGNAM-$VERSION
-tar xvf $CWD/$PKGNAM-$VERSION.tar.?z* || exit 1
+tar xvf $CWD/$PKGNAM-$VERSION.tar.?z || exit 1
 cd $PKGNAM-$VERSION || exit 1
 chown -R root:root .
 find . \
diff --git a/source/n/links/links.SlackBuild b/source/n/links/links.SlackBuild
index 7de32409..8b5baafe 100755
--- a/source/n/links/links.SlackBuild
+++ b/source/n/links/links.SlackBuild
@@ -24,7 +24,7 @@ cd $(dirname $0) ; CWD=$(pwd)
 
 PKGNAM=links
 VERSION=${VERSION:-$(echo $PKGNAM-*.tar.?z | rev | cut -f 3- -d . | cut -f 1 -d - | rev)}
-BUILD=${BUILD:-2}
+BUILD=${BUILD:-1}
 
 # Automatically determine the architecture we're building on:
 if [ -z "$ARCH" ]; then
diff --git a/source/xfce/tumbler/tumbler.SlackBuild b/source/xfce/tumbler/tumbler.SlackBuild
index af446f97..47345318 100755
--- a/source/xfce/tumbler/tumbler.SlackBuild
+++ b/source/xfce/tumbler/tumbler.SlackBuild
@@ -24,7 +24,7 @@ cd $(dirname $0) ; CWD=$(pwd)
 
 PKGNAM=tumbler
 VERSION=${VERSION:-$(echo $PKGNAM-*.tar.?z* | rev | cut -f 3- -d . | cut -f 1 -d - | rev)}
-BUILD=${BUILD:-6}
+BUILD=${BUILD:-1}
 
 # Automatically determine the architecture we're building on:
 MARCH=$( uname -m )
diff --git a/source/xfce/tumbler/tumbler.url b/source/xfce/tumbler/tumbler.url
index b5e7e85f..a2f41336 100644
--- a/source/xfce/tumbler/tumbler.url
+++ b/source/xfce/tumbler/tumbler.url
@@ -1 +1 @@
-http://archive.xfce.org/src/apps/tumbler/0.2/tumbler-0.2.1.tar.bz2
+http://archive.xfce.org/src/apps/tumbler/0.2/tumbler-0.2.2.tar.bz2