Thu Jan 19 21:07:32 UTC 202320230119210732

a/pkgtools-15.1-noarch-4.txz:  Rebuilt.
  makepkg: also let xz decide how many threads to use on ARM platforms aarch64
  and riscv64. Thanks to Stuart Winter.
  installpkg: fix reversed test for if a --threads option was given. It appears
  that it's been wrong for years but since xz didn't support threaded
  decompression yet it wasn't noticed.
a/xz-5.4.1-x86_64-2.txz:  Rebuilt.
  Reduce default verbosity from V_WARNING to V_ERROR to avoid sending non-fatal
  memory usage information to stderr.
kde/plasma-wayland-protocols-1.10.0-x86_64-1.txz:  Upgraded.
l/exiv2-0.27.6-x86_64-1.txz:  Upgraded.
l/tdb-1.4.8-x86_64-1.txz:  Upgraded.
x/igt-gpu-tools-1.27.1-x86_64-1.txz:  Upgraded.
x/libX11-1.8.3-x86_64-2.txz:  Rebuilt.
  [PATCH] Fix a9e845 and 797755 Allow X*IfEvent() to reenter libX11
  Thanks to marav.

3 files changed, 115 insertions, 3 deletions

diff --git a/source/installer/ChangeLog.txt b/source/installer/ChangeLog.txt
index a1f932521..584bb9bd0 100644
--- a/source/installer/ChangeLog.txt
+++ b/source/installer/ChangeLog.txt
@@ -1,3 +1,12 @@
+Thu Jan 19 20:44:24 UTC 2023
+  build_installer.sh: Switch /bin/dd from BusyBox's implementation to
+  Coreutils', which offers a richer feature set. For example, the command line
+  parameter 'status=progress' provides realtime visibility of critical metrics
+  (transfer speed, ETA, % complete). This helps when working with the storage,
+  where the installer is used as an preparation and test environment.
+  Thanks to Stuart Winter.
+  Added "bricktick", an ncurses based game (why not, it's only 31K)
++--------------------------+
 Wed Jan 18 20:30:13 UTC 2023
   /usr/lib/setup/INS-all-in-one:  Added.
   This detects the AiO (All in One Offline) partition labeled 'SLKins_aio-pkgs'
diff --git a/source/installer/build_installer.sh b/source/installer/build_installer.sh
index 0ded4adb1..80f4ca658 100755
--- a/source/installer/build_installer.sh
+++ b/source/installer/build_installer.sh
@@ -108,6 +108,7 @@ case $ARCH in
                           # The firmware we include by default is only for x86, but
     ADD_NETFIRMWARE=1     # we'll probably want to include some at some stage. For now supply -nf to this script.
     ADD_NANO=1
+    ADD_BRICKTICK=1
     ;;
   x86_64)
     ADD_NETMODS=1
@@ -124,6 +125,7 @@ case $ARCH in
     VERBOSE=1
     ADD_NETFIRMWARE=1     # Include the network card firmware
     ADD_NANO=1
+    ADD_BRICKTICK=1
     ;;
   i586)
     ADD_NETMODS=1
@@ -140,6 +142,7 @@ case $ARCH in
     VERBOSE=1
     ADD_NETFIRMWARE=1     # Include the network card firmware
     ADD_NANO=1
+    ADD_BRICKTICK=1
     ;;
   *)
     ADD_NETMODS=1         # add network modules
@@ -155,6 +158,7 @@ case $ARCH in
     VERBOSE=1             # show a lot of additional output
     ADD_NETFIRMWARE=1     # Include the network card firmware
     ADD_NANO=1
+    ADD_BRICKTICK=1
     ;;
 esac
 
@@ -235,6 +239,10 @@ while [ ! -z "$1" ]; do
       ADD_NETMODS=1
       shift
       ;;
+    -nb|--no-bricktick)
+      ADD_BRICKTICK=0
+      shift
+      ;;
     -nc|--no-compressmods)
       COMPRESS_MODS=0
       shift
@@ -670,9 +678,9 @@ make $SILENTMAKE $NUMJOBS CFLAGS="$SLKCFLAGS" || exit 1
 make $SILENTMAKE $NUMJOBS install || exit 1
 cd _install
 
-# Since Slackware 's installer uses the 'date' from coreutils, and 'zcat'
-# script from gzip, we delete the busybox symlinks:
-rm -f${VERBOSE1} bin/date bin/zcat
+# Since Slackware's installer uses the 'date' and 'dd' from coreutils,
+# and the 'zcat' script from gzip, we delete the busybox symlinks:
+rm -f${VERBOSE1} bin/{date,dd,zcat}
 
 # Likewise, we will remove the 'fdisk' applet which overwrites our shell script:
 rm -f${VERBOSE1} sbin/fdisk
@@ -829,6 +837,43 @@ fi
 }
 
 
+############### Build bricktick ################################################
+
+build_bricktick()
+{
+echo "--- Building bricktick ncurses game ---"
+# Extract source:
+cd $TMP
+if [ -d $CWD/sources/bricktick ]; then
+  echo "--- Using _your_ bricktick sources (not those in the Slacktree) ---"
+  BRICKTICKPATH=$CWD/sources/bricktick
+elif [ -d $SRCDIR/sources/bricktick ]; then
+  echo "--- Using _your_ bricktick sources (not those in the Slacktree) ---"
+  BRICKTICKPATH=$SRCDIR/sources/bricktick
+else
+  # Use the bricktick sources from the Slackware tree.
+  BRICKTICKPATH=$SLACKROOT/source/installer/bricktick
+fi
+[ ! -d $BRICKTICKPATH ] && ( echo "No directory '$BRICKTICKPATH'" ; exit 1 )
+BRICKTICKPKG=$(ls -1 $BRICKTICKPATH/bricktick-*.tar.?z | head -1)
+BRICKTICKVER=$(echo $BRICKTICKPKG | rev | cut -f 3- -d . | cut -f 1 -d - | rev)
+tar x${VERBOSE2}f $BRICKTICKPKG
+
+echo "--- Compiling BRICKTICK version '$BRICKTICKVER' ---"
+cd bricktick* || exit 1
+chown -R root:root .
+chmod -R u+w,go+r-w,a-s .
+
+# Build:
+make $NUMJOBS || make || exit 1
+
+# Install into installer's filesystem:
+mkdir -p $PKG/$ARCH-installer-filesystem/usr/bin
+cp -a bricktick $PKG/$ARCH-installer-filesystem/usr/bin/bricktick
+strip --strip-unneeded $PKG/$ARCH-installer-filesystem/usr/bin/bricktick
+
+}
+
 ############### Build dnsmasq ##################################################
 
 build_dnsmasq()
@@ -1015,6 +1060,7 @@ cp --remove-destination -fa${VERBOSE1} ${EXTRA_PKGS_BIN} \
         cp \
         cut \
         date \
+        dd \
         dialog \
         dircolors \
         findmnt \
@@ -2380,6 +2426,11 @@ else
     build_nano
   fi
 
+  # Are we adding the bricktick game?
+  if [ $ADD_BRICKTICK -eq 1 ]; then
+    build_bricktick
+  fi
+
   # Are we adding network modules?
   if [ $ADD_NETMODS -eq 1 ]; then
     add_netmods
diff --git a/source/installer/sources/bricktick/fetch-bricktick.sh b/source/installer/sources/bricktick/fetch-bricktick.sh
new file mode 100755
index 000000000..15a8e2b14
--- /dev/null
+++ b/source/installer/sources/bricktick/fetch-bricktick.sh
@@ -0,0 +1,52 @@
+#!/bin/sh
+
+# Copyright 2019, 2020  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=bricktick
+
+# Pull a stable branch + patches
+BRANCH=${1:-master}
+
+# Clear download area:
+rm -rf ${PKGNAM}
+
+# Clone repository:
+git clone https://github.com/Subsentient/${PKGNAM}
+
+# checkout $BRANCH:
+( cd ${PKGNAM} 
+  git checkout $BRANCH || exit 1
+)
+
+HEADISAT="$( cd ${PKGNAM} && git log -1 --format=%h )"
+DATE="$( cd ${PKGNAM} && git log -1 --format=%cd --date=format:%Y%m%d )"
+LONGDATE="$( cd ${PKGNAM} && git log -1 --format=%cd --date=format:%c )"
+# Cleanup.  We're not packing up the whole git repo.
+( cd ${PKGNAM} && find . -type d -name ".git*" -exec rm -rf {} \; 2> /dev/null )
+mv ${PKGNAM} ${PKGNAM}-${DATE}_${HEADISAT}
+tar cf ${PKGNAM}-${DATE}_${HEADISAT}.tar ${PKGNAM}-${DATE}_${HEADISAT}
+plzip -9 -f ${PKGNAM}-${DATE}_${HEADISAT}.tar
+rm -rf ${PKGNAM}-${DATE}_${HEADISAT}
+touch -d "$LONGDATE" ${PKGNAM}-${DATE}_${HEADISAT}.tar.lz
+echo
+echo "${PKGNAM} branch $BRANCH with HEAD at $HEADISAT packaged as ${PKGNAM}-${DATE}_${HEADISAT}.tar.lz"
+echo