Sun Mar 22 01:55:55 UTC 202020200322015555

a/kernel-generic-5.4.27-x86_64-1.txz:  Upgraded.
a/kernel-huge-5.4.27-x86_64-1.txz:  Upgraded.
a/kernel-modules-5.4.27-x86_64-1.txz:  Upgraded.
a/tcsh-6.22.02-x86_64-3.txz:  Rebuilt.
  Actually apply the shell history patch this time. Thanks to jmccue.
ap/cups-filters-1.27.3-x86_64-1.txz:  Upgraded.
d/automake-1.16.2-noarch-1.txz:  Upgraded.
d/kernel-headers-5.4.27-x86-1.txz:  Upgraded.
d/parallel-20200322-noarch-1.txz:  Upgraded.
k/kernel-source-5.4.27-noarch-1.txz:  Upgraded.
l/gmime-3.2.7-x86_64-1.txz:  Upgraded.
l/pangomm-2.42.1-x86_64-1.txz:  Upgraded.
n/gnupg2-2.2.20-x86_64-1.txz:  Upgraded.
xap/xaos-3.7-x86_64-1.txz:  Upgraded.
xap/xscreensaver-5.44-x86_64-1.txz:  Upgraded.
isolinux/initrd.img:  Rebuilt.
kernels/*:  Upgraded.
testing/packages/PAM/xscreensaver-5.44-x86_64-1_pam.txz:  Upgraded.
usb-and-pxe-installers/usbboot.img:  Rebuilt.

11 files changed, 18 insertions, 38 deletions

diff --git a/source/a/tcsh/tcsh.SlackBuild b/source/a/tcsh/tcsh.SlackBuild
index 9c41d8b1..eeee6f18 100755
--- a/source/a/tcsh/tcsh.SlackBuild
+++ b/source/a/tcsh/tcsh.SlackBuild
@@ -24,7 +24,7 @@ cd $(dirname $0) ; CWD=$(pwd)
 
 PKGNAM=tcsh
 VERSION=${VERSION:-$(echo $PKGNAM-*.tar.?z | rev | cut -f 3- -d . | cut -f 1 -d - | rev)}
-BUILD=${BUILD:-2}
+BUILD=${BUILD:-3}
 
 # Automatically determine the architecture we're building on:
 if [ -z "$ARCH" ]; then
@@ -69,6 +69,9 @@ cd ${PKGNAM}-$VERSION || exit 1
 # built-in color ls:
 zcat $CWD/${PKGNAM}.nobuiltincolorls.diff.gz | patch -p1 --verbose || exit 1
 
+# Fix history merging:
+zcat $CWD/tcsh.sh.hist.diff.gz | patch -p1 --verbose || exit 1
+
 chown -R root:root .
 find . \
   \( -perm 777 -o -perm 775 -o -perm 711 -o -perm 555 -o -perm 511 \) \
diff --git a/source/d/automake/automake.SlackBuild b/source/d/automake/automake.SlackBuild
index 789b6844..962d106b 100755
--- a/source/d/automake/automake.SlackBuild
+++ b/source/d/automake/automake.SlackBuild
@@ -25,7 +25,7 @@ cd $(dirname $0) ; CWD=$(pwd)
 PKGNAM=automake
 VERSION=${VERSION:-$(echo automake-*.tar.?z | rev | cut -f 3- -d . | cut -f 1 -d - | rev)}
 NUMJOBS=${NUMJOBS:-" -j$(expr $(nproc) + 1) "}
-BUILD=${BUILD:-2}
+BUILD=${BUILD:-1}
 
 # Note: the package is _built_ as 'noarch'
 # Automatically determine architecture for build & packaging:
diff --git a/source/k/kernel-configs/config-generic-5.4.25 b/source/k/kernel-configs/config-generic-5.4.27
index 6f6f1a8f..e6b8ec05 100644
--- a/source/k/kernel-configs/config-generic-5.4.25
+++ b/source/k/kernel-configs/config-generic-5.4.27
@@ -1,6 +1,6 @@
 #
 # Automatically generated file; DO NOT EDIT.
-# Linux/x86 5.4.25 Kernel Configuration
+# Linux/x86 5.4.27 Kernel Configuration
 #
 
 #
diff --git a/source/k/kernel-configs/config-generic-5.4.25.x64 b/source/k/kernel-configs/config-generic-5.4.27.x64
index e1f3aa74..2cd24b52 100644
--- a/source/k/kernel-configs/config-generic-5.4.25.x64
+++ b/source/k/kernel-configs/config-generic-5.4.27.x64
@@ -1,6 +1,6 @@
 #
 # Automatically generated file; DO NOT EDIT.
-# Linux/x86 5.4.25 Kernel Configuration
+# Linux/x86 5.4.27 Kernel Configuration
 #
 
 #
diff --git a/source/k/kernel-configs/config-generic-smp-5.4.25-smp b/source/k/kernel-configs/config-generic-smp-5.4.27-smp
index 5c373ea2..200b88e2 100644
--- a/source/k/kernel-configs/config-generic-smp-5.4.25-smp
+++ b/source/k/kernel-configs/config-generic-smp-5.4.27-smp
@@ -1,6 +1,6 @@
 #
 # Automatically generated file; DO NOT EDIT.
-# Linux/x86 5.4.25 Kernel Configuration
+# Linux/x86 5.4.27 Kernel Configuration
 #
 
 #
diff --git a/source/k/kernel-configs/config-huge-5.4.25 b/source/k/kernel-configs/config-huge-5.4.27
index 212c3dc2..463e8c35 100644
--- a/source/k/kernel-configs/config-huge-5.4.25
+++ b/source/k/kernel-configs/config-huge-5.4.27
@@ -1,6 +1,6 @@
 #
 # Automatically generated file; DO NOT EDIT.
-# Linux/x86 5.4.25 Kernel Configuration
+# Linux/x86 5.4.27 Kernel Configuration
 #
 
 #
diff --git a/source/k/kernel-configs/config-huge-5.4.25.x64 b/source/k/kernel-configs/config-huge-5.4.27.x64
index ddb256e7..c81ae839 100644
--- a/source/k/kernel-configs/config-huge-5.4.25.x64
+++ b/source/k/kernel-configs/config-huge-5.4.27.x64
@@ -1,6 +1,6 @@
 #
 # Automatically generated file; DO NOT EDIT.
-# Linux/x86 5.4.25 Kernel Configuration
+# Linux/x86 5.4.27 Kernel Configuration
 #
 
 #
diff --git a/source/k/kernel-configs/config-huge-smp-5.4.25-smp b/source/k/kernel-configs/config-huge-smp-5.4.27-smp
index 9e84110d..332541ae 100644
--- a/source/k/kernel-configs/config-huge-smp-5.4.25-smp
+++ b/source/k/kernel-configs/config-huge-smp-5.4.27-smp
@@ -1,6 +1,6 @@
 #
 # Automatically generated file; DO NOT EDIT.
-# Linux/x86 5.4.25 Kernel Configuration
+# Linux/x86 5.4.27 Kernel Configuration
 #
 
 #
diff --git a/source/xap/xaos/slack-desc b/source/xap/xaos/slack-desc
index a370dddd..3977fed4 100644
--- a/source/xap/xaos/slack-desc
+++ b/source/xap/xaos/slack-desc
@@ -14,6 +14,6 @@ xaos: the user to smoothly zoom in or out of a fractal. Other features
 xaos: include autopilot mode, palette changing, PNG saving, and fractal
 xaos: inversion.
 xaos:
-xaos: Visit XaoS online: http://xaos.sf.net
+xaos: Homepage: https://github.com/xaos-project/XaoS
 xaos:
 xaos:
diff --git a/source/xap/xaos/xaos.SlackBuild b/source/xap/xaos/xaos.SlackBuild
index 627d4541..7f901ed2 100755
--- a/source/xap/xaos/xaos.SlackBuild
+++ b/source/xap/xaos/xaos.SlackBuild
@@ -61,8 +61,9 @@
 cd $(dirname $0) ; CWD=$(pwd)
 
 PKGNAM=xaos
-VERSION=${VERSION:-$(echo $PKGNAM-*.tar.?z* | rev | cut -f 3- -d . | cut -f 1 -d - | rev)}
-BUILD=${BUILD:-2}
+SRCNAM=XaoS-release
+VERSION=${VERSION:-$(echo $SRCNAM-*.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
@@ -103,11 +104,9 @@ fi
 rm -rf $PKG
 mkdir -p $TMP $PKG $OUTPUT
 cd $TMP
-rm -rf $PKGNAM-$VERSION
-tar xvf $CWD/$PKGNAM-$VERSION.tar.?z* || exit 1
-cd $PKGNAM-$VERSION || exit 1
-
-zcat $CWD/xaos.x86.registers.diff.gz | patch -p1 --verbose || exit 1
+rm -rf $SRCNAM-$VERSION
+tar xvf $CWD/$SRCNAM-$VERSION.tar.?z || exit 1
+cd $SRCNAM-$VERSION || exit 1
 
 chown -R root:root .
 chmod -R a-s,u+w,go+r-w .
diff --git a/source/xap/xaos/xaos.x86.registers.diff b/source/xap/xaos/xaos.x86.registers.diff
deleted file mode 100644
index 12d11aba..00000000
--- a/source/xap/xaos/xaos.x86.registers.diff
+++ /dev/null
@@ -1,22 +0,0 @@
---- ./src/engine/zoom.c.orig	2013-11-01 02:54:21.000000000 -0500
-+++ ./src/engine/zoom.c	2015-04-05 00:38:10.332028884 -0500
-@@ -933,6 +933,7 @@
- }
- 
- #ifndef USE_i386ASM
-+REGISTERS(0)
- static /*INLINE */ void
- moveoldpoints(void /*@unused@ */ *data1,
- 	      struct taskinfo /*@unused@ */ *task,
---- ./src/engine/zoomd.c.orig	2013-11-01 02:54:21.000000000 -0500
-+++ ./src/engine/zoomd.c	2015-04-05 00:38:55.436032139 -0500
-@@ -280,7 +280,8 @@
- #endif
- #undef bpp1
- 
--static INLINE void fillline(int line)
-+REGISTERS(0)
-+static void fillline(int line)
- {
-     register unsigned char *RESTRICT vbuff = cimage.currlines[line];
-     const struct filltable *RESTRICT table = (struct filltable *) tmpdata;