14 files changed, 136 insertions, 95 deletions
diff --git a/source/ap/ksh93/get-att-ast.sh b/source/ap/ksh93/fetch-ksh.sh
index af5226ad..d5c2dc13 100755
--- a/source/ap/ksh93/get-att-ast.sh
+++ b/source/ap/ksh93/fetch-ksh.sh
@@ -1,6 +1,6 @@
 #!/bin/sh
 
-# Copyright 2018, 2020  Patrick J. Volkerding, Sebeka, Minnesota, USA
+# Copyright 2018, 2020, 2021  Patrick J. Volkerding, Sebeka, Minnesota, USA
 # All rights reserved.
 #
 # Redistribution and use of this script, with or without modification, is
@@ -20,31 +20,31 @@
 #  OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF
 #  ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
-# Use 2020.0.1 branch. Verify first that there's no better branch with
+# Use master (ksh93u+m) branch. Verify first that there's no better branch with
 # "git branch -a" in the unpruned repo.
-BRANCH=${1:-2020.0.1}
+BRANCH=${1:-master}
 
 # Clear download area:
-rm -rf ast
+rm -rf ksh
 
 # Clone repository:
-git clone https://github.com/att/ast
+git clone https://github.com/ksh93/ksh
 
 # checkout $BRANCH:
-( cd ast 
+( cd ksh
   git checkout $BRANCH || exit 1
 )
 
-HEADISAT="$( cd ast && git log -1 --format=%h )"
-DATE="$( cd ast && git log -1 --format=%cd --date=format:%Y%m%d )"
+HEADISAT="$( cd ksh && git log -1 --format=%h )"
+DATE="$( cd ksh && git log -1 --format=%cd --date=format:%Y%m%d )"
 # Cleanup.  We're not packing up the whole git repo.
-( cd ast && find . -type d -name ".git*" -exec rm -rf {} \; 2> /dev/null )
+( cd ksh && find . -type d -name ".git*" -exec rm -rf {} \; 2> /dev/null )
 # No need to package these:
-( cd ast && rm -rf lib/package/tgz )
-mv ast att-ast-${DATE}_${HEADISAT}
-tar cf att-ast-${DATE}_${HEADISAT}.tar att-ast-${DATE}_${HEADISAT}
-plzip -9 -n 6 -f att-ast-${DATE}_${HEADISAT}.tar
-rm -rf att-ast-${DATE}_${HEADISAT}
+( cd ksh && rm -rf lib/package/tgz )
+mv ksh ksh-${DATE}_${HEADISAT}
+tar cf ksh-${DATE}_${HEADISAT}.tar ksh-${DATE}_${HEADISAT}
+plzip -9 -n 6 -f ksh-${DATE}_${HEADISAT}.tar
+rm -rf ksh-${DATE}_${HEADISAT}
 echo
-echo "ast branch $BRANCH with HEAD at $HEADISAT packaged as att-ast-${DATE}_${HEADISAT}.tar.lz"
+echo "ksh branch $BRANCH with HEAD at $HEADISAT packaged as ksh-${DATE}_${HEADISAT}.tar.lz"
 echo
diff --git a/source/ap/ksh93/ksh93.SlackBuild b/source/ap/ksh93/ksh93.SlackBuild
index e63a256b..2df90b08 100755
--- a/source/ap/ksh93/ksh93.SlackBuild
+++ b/source/ap/ksh93/ksh93.SlackBuild
@@ -1,7 +1,7 @@
-#!/bin/bash
+#!/bin/sh
 # Copyright 2001 BSDi, Inc. Concord, CA, USA
 # Copyright 2004 Slackware Linux, Inc.  Concord, CA, USA
-# Copyright 2007, 2008, 2009, 2010, 2013, 2016, 2018, 2019  Patrick J. Volkerding, Sebeka, MN, USA
+# Copyright 2007, 2008, 2009, 2010, 2013, 2016, 2021  Patrick J. Volkerding, Sebeka, MN, USA
 # All rights reserved.
 #
 # Redistribution and use of this script, with or without modification, is
@@ -24,9 +24,11 @@
 cd $(dirname $0) ; CWD=$(pwd)
 
 PKGNAM=ksh93
-SRCNAM=att-ast
-VERSION=${VERSION:-$(echo $SRCNAM-*.tar.?z | rev | cut -f 3- -d . | cut -f 1 -d - | rev)}
-BUILD=${BUILD:-3}
+VERSION=${VERSION:-$(echo ksh-*.tar.?z | rev | cut -f 3- -d . | cut -f 1 -d - | rev)}
+# Not packaged?
+# Seems to conflict with locations already used by glibc.
+#KSHLOCALE=2010-02-02
+BUILD=${BUILD:-1}
 
 # Automatically determine the architecture we're building on:
 if [ -z "$ARCH" ]; then
@@ -46,38 +48,25 @@ if [ ! -z "${PRINT_PACKAGE_NAME}" ]; then
   exit 0
 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=""
+# ast considers this an i386 arch, so we'll humor it
+# but package with our real arch label...
+if [ "$ARCH" = "x86_64" ]; then
+  SARCH=i386-64
 else
-  SLKCFLAGS="-O2"
-  LIBDIRSUFFIX=""
+  SARCH=i386
 fi
 
-TMP=${TMP:-/tmp}
-PKG=$TMP/package-$PKGNAM
+CWD=$(pwd)
+TMP=/tmp/build-ksh93
+PKG=/tmp/package-ksh93
 
-rm -rf $PKG
+rm -rf $TMP $PKG
 mkdir -p $TMP $PKG
-
 cd $TMP
-rm -rf $SRCNAM-$VERSION
-tar xvf $CWD/$SRCNAM-$VERSION.tar.?z || exit 1
-cd $SRCNAM-$VERSION || exit 1
+
+rm -rf $PKGNAM-$VERSION
+tar xvf $CWD/ksh-$VERSION.tar.?z || exit 1
+cd ksh-$VERSION || exit 1
 
 chown -R root:root .
 find . \
@@ -86,41 +75,52 @@ find . \
   \( -perm 666 -o -perm 664 -o -perm 600 -o -perm 444 -o -perm 440 -o -perm 400 \) \
   -exec chmod 644 {} \+
 
-# Configure, build, and install:
-export CC=clang
-export CFLAGS="$SLKCFLAGS"
-mkdir build
-cd build
-meson setup \
-  --prefix=/usr \
-  --libdir=lib${LIBDIRSUFFIX} \
-  --libexecdir=/usr/libexec \
-  --bindir=/usr/bin \
-  --sbindir=/usr/sbin \
-  --includedir=/usr/include \
-  --datadir=/usr/share \
-  --mandir=/usr/man \
-  --sysconfdir=/etc \
-  --localstatedir=/var \
-  --buildtype=release \
-  .. || exit 1
-  "${NINJA:=ninja}" $NUMJOBS || exit 1
-  DESTDIR=$PKG $NINJA install || exit 1
-cd ..
-
-# Stuff we don't ship:
-rm -f $PKG/usr/bin/pty
-rm -f $PKG/usr/bin/shcomp
-
-# Move the shell into /bin:
+/bin/ksh ./bin/package
+/bin/ksh ./bin/package make mamake ||:
+/bin/ksh ./bin/package make mamake ||:
+/bin/ksh ./bin/package make -S || exit 1
+
 mkdir -p $PKG/bin
-mv --verbose $PKG/usr/bin/ksh $PKG/bin/ksh.new || exit 1
-rmdir $PKG/usr/bin || exit 1
+cp arch/linux.$SARCH/bin/ksh $PKG/bin/ksh.new
 strip --strip-unneeded $PKG/bin/ksh.new
+
+#cp arch/linux.$SARCH/lib/libshell.so.1.1 /usr/lib
+#cp arch/linux.$SARCH/lib/libshell.a /usr/lib
+#cp arch/linux.$SARCH/lib/libast.so.5.4 /usr/lib
+#cp arch/linux.$SARCH/lib/libast.a /usr/lib
+#cp arch/linux.$SARCH/src/cmd/ksh93/cc-g,-fpic/libshell.so.1.1 /usr/lib
+#cp arch/linux.$SARCH/src/cmd/ksh93/cc-g,-fpic/libshell.a /usr/lib
+#cp arch/linux.$SARCH/src/lib/libast/libast.so.5.4 /usr/lib
+#cp arch/linux.$SARCH/src/cmd/ksh93/cc-g,-fpic/libast.a /usr/lib
+#strip /usr/lib/libast.so.5.4 /usr/lib/libshell.so.1.1
+
+mkdir -p $PKG/usr/man/man1
+sed -e "s#\.nr Z 0#\.nr Z 1#g" src/cmd/ksh93/sh.1 > \
+       $PKG/usr/man/man1/ksh.1
+#mkdir -p $PKG/usr/man/man1
+#cp src/cmd/ksh93/shell.3 $PKG/usr/man/man3
+#cp src/cmd/ksh93/nval.3 $PKG/usr/man/man3
+gzip -9 $PKG/usr/man/man?/*
+
+## Install locale files:
+#mkdir -p $PKG/usr/share
+#cp -a share/lib/locale $PKG/usr/share
+#chown -R root:root $PKG/usr/share
+#( cd $PKG/usr/share
+#  find . -type d -exec chmod 755 {} \;
+#  find . -type f -exec chmod 644 {} \;
+#)
+
+#cp src/cmd/ksh93/include/shell.h /usr/include
+
+# If anyone is actually using the ksh libraries, drop me some mail
+# and explain which libs you use and what they're for.  As it is, I
+# don't see a compeling reason to include them, as ksh itself doesn't
+# use them.
+#( cd /usr/lib ; ln -sf libshell.so.1.1 libshell.so )
+#( cd /usr/lib rm -rf libast.so ; ln -sf libast.so.5.4 libast.so )
+
 ( cd $PKG/bin ; ln -sf ksh rksh )
-if [ -r $PKG/usr/man/man1/ksh.1 ]; then
-  gzip -9 $PKG/usr/man/man1/ksh.1
-fi
 ( cd $PKG/usr/man/man1 ; ln -sf ksh.1.gz rksh.1.gz )
 
 mkdir -p $PKG/usr/doc/ksh93-$VERSION
@@ -136,6 +136,13 @@ cp -a lib/package/LICENSES/* $PKG/usr/doc/ksh93-$VERSION/LICENSE
 find . -name "*.def" -exec cp -a "{}" $PKG/usr/doc/ksh93-$VERSION/LICENSE \;
 find . -name "*.lic" -exec cp -a "{}" $PKG/usr/doc/ksh93-$VERSION/LICENSE \;
 
+chown -R root:root $PKG/usr/doc/ksh93-$VERSION
+find $PKG/usr/doc/ksh93-$VERSION -type f -exec chmod 644 "{}" \;
+find $PKG/usr/doc/ksh93-$VERSION -type d -exec chmod 755 "{}" \;
+
+#chmod 755 $PKG/usr/lib/libshell.so.1.1
+#chmod 755 $PKG/usr/lib/libast.so.5.4
+
 mkdir -p $PKG/install
 cat <<EOF >> $PKG/install/doinst.sh
 # Backup the old copy if we find one, move the new one in place
@@ -163,4 +170,3 @@ cat $CWD/slack-desc > $PKG/install/slack-desc
 
 cd $PKG
 /sbin/makepkg -l y -c n /tmp/ksh93-$VERSION-$ARCH-$BUILD.txz
-
diff --git a/source/k/kernel-configs/config-generic-5.15 b/source/k/kernel-configs/config-generic-5.15.1
index f2a5a135..92744b32 100644
--- a/source/k/kernel-configs/config-generic-5.15
+++ b/source/k/kernel-configs/config-generic-5.15.1
@@ -1,6 +1,6 @@
 #
 # Automatically generated file; DO NOT EDIT.
-# Linux/x86 5.15.0 Kernel Configuration
+# Linux/x86 5.15.1 Kernel Configuration
 #
 CONFIG_CC_VERSION_TEXT="gcc (GCC) 11.2.0"
 CONFIG_CC_IS_GCC=y
diff --git a/source/k/kernel-configs/config-generic-5.15.x64 b/source/k/kernel-configs/config-generic-5.15.1.x64
index 9c8edf39..74e536f6 100644
--- a/source/k/kernel-configs/config-generic-5.15.x64
+++ b/source/k/kernel-configs/config-generic-5.15.1.x64
@@ -1,6 +1,6 @@
 #
 # Automatically generated file; DO NOT EDIT.
-# Linux/x86 5.15.0 Kernel Configuration
+# Linux/x86 5.15.1 Kernel Configuration
 #
 CONFIG_CC_VERSION_TEXT="gcc (GCC) 11.2.0"
 CONFIG_CC_IS_GCC=y
diff --git a/source/k/kernel-configs/config-generic-smp-5.15-smp b/source/k/kernel-configs/config-generic-smp-5.15.1-smp
index ff7abb65..1ba7c426 100644
--- a/source/k/kernel-configs/config-generic-smp-5.15-smp
+++ b/source/k/kernel-configs/config-generic-smp-5.15.1-smp
@@ -1,6 +1,6 @@
 #
 # Automatically generated file; DO NOT EDIT.
-# Linux/x86 5.15.0 Kernel Configuration
+# Linux/x86 5.15.1 Kernel Configuration
 #
 CONFIG_CC_VERSION_TEXT="gcc (GCC) 11.2.0"
 CONFIG_CC_IS_GCC=y
diff --git a/source/k/kernel-configs/config-huge-5.15 b/source/k/kernel-configs/config-huge-5.15.1
index e7215658..4617d8cd 100644
--- a/source/k/kernel-configs/config-huge-5.15
+++ b/source/k/kernel-configs/config-huge-5.15.1
@@ -1,6 +1,6 @@
 #
 # Automatically generated file; DO NOT EDIT.
-# Linux/x86 5.15.0 Kernel Configuration
+# Linux/x86 5.15.1 Kernel Configuration
 #
 CONFIG_CC_VERSION_TEXT="gcc (GCC) 11.2.0"
 CONFIG_CC_IS_GCC=y
diff --git a/source/k/kernel-configs/config-huge-5.15.x64 b/source/k/kernel-configs/config-huge-5.15.1.x64
index b1862b53..c0f6be63 100644
--- a/source/k/kernel-configs/config-huge-5.15.x64
+++ b/source/k/kernel-configs/config-huge-5.15.1.x64
@@ -1,6 +1,6 @@
 #
 # Automatically generated file; DO NOT EDIT.
-# Linux/x86 5.15.0 Kernel Configuration
+# Linux/x86 5.15.1 Kernel Configuration
 #
 CONFIG_CC_VERSION_TEXT="gcc (GCC) 11.2.0"
 CONFIG_CC_IS_GCC=y
diff --git a/source/k/kernel-configs/config-huge-smp-5.15-smp b/source/k/kernel-configs/config-huge-smp-5.15.1-smp
index 264ffe7a..3b6f430a 100644
--- a/source/k/kernel-configs/config-huge-smp-5.15-smp
+++ b/source/k/kernel-configs/config-huge-smp-5.15.1-smp
@@ -1,6 +1,6 @@
 #
 # Automatically generated file; DO NOT EDIT.
-# Linux/x86 5.15.0 Kernel Configuration
+# Linux/x86 5.15.1 Kernel Configuration
 #
 CONFIG_CC_VERSION_TEXT="gcc (GCC) 11.2.0"
 CONFIG_CC_IS_GCC=y
diff --git a/source/l/libxml2/libxml2.SlackBuild b/source/l/libxml2/libxml2.SlackBuild
index 85006e47..0968495a 100755
--- a/source/l/libxml2/libxml2.SlackBuild
+++ b/source/l/libxml2/libxml2.SlackBuild
@@ -24,7 +24,7 @@ cd $(dirname $0) ; CWD=$(pwd)
 
 PKGNAM=libxml2
 VERSION=${VERSION:-$(echo $PKGNAM-*.tar.?z | rev | cut -f 3- -d . | cut -f 1 -d - | rev)}
-BUILD=${BUILD:-3}
+BUILD=${BUILD:-4}
 
 # Automatically determine the architecture we're building on:
 if [ -z "$ARCH" ]; then
@@ -80,6 +80,7 @@ find . \
   -exec chmod 644 {} \+
 
 zcat $CWD/libxml2.do-not-check-crc.diff.gz | patch -p1 --verbose || exit 1
+zcat $CWD/libxml2.python3-unicode-errors.patch.gz | patch -p1 --verbose || exit 1
 
 # Fixes for python-3.9.x:
 sed -i '/if Py/{s/Py/(Py/;s/)/))/}' python/{types.c,libxml.c}
diff --git a/source/l/libxml2/libxml2.python3-unicode-errors.patch b/source/l/libxml2/libxml2.python3-unicode-errors.patch
new file mode 100644
index 00000000..e87dcded
--- /dev/null
+++ b/source/l/libxml2/libxml2.python3-unicode-errors.patch
@@ -0,0 +1,34 @@
+Index: libxml2-2.9.5/python/libxml.c
+===================================================================
+--- libxml2-2.9.5.orig/python/libxml.c
++++ libxml2-2.9.5/python/libxml.c
+@@ -1620,6 +1620,7 @@ libxml_xmlErrorFuncHandler(ATTRIBUTE_UNU
+     PyObject *message;
+     PyObject *result;
+     char str[1000];
++    unsigned char *ptr = (unsigned char *)str;
+ 
+ #ifdef DEBUG_ERROR
+     printf("libxml_xmlErrorFuncHandler(%p, %s, ...) called\n", ctx, msg);
+@@ -1636,12 +1637,20 @@ libxml_xmlErrorFuncHandler(ATTRIBUTE_UNU
+ 	    str[999] = 0;
+         va_end(ap);
+ 
++#if PY_MAJOR_VERSION >= 3
++        /* Ensure the error string doesn't start at UTF8 continuation. */
++        while (*ptr && (*ptr & 0xc0) == 0x80)
++            ptr++;
++#endif
++
+         list = PyTuple_New(2);
+         PyTuple_SetItem(list, 0, libxml_xmlPythonErrorFuncCtxt);
+         Py_XINCREF(libxml_xmlPythonErrorFuncCtxt);
+-        message = libxml_charPtrConstWrap(str);
++        message = libxml_charPtrConstWrap(ptr);
+         PyTuple_SetItem(list, 1, message);
+         result = PyEval_CallObject(libxml_xmlPythonErrorFuncHandler, list);
++        /* Forget any errors caused in the error handler. */
++        PyErr_Clear();
+         Py_XDECREF(list);
+         Py_XDECREF(result);
+     }
diff --git a/source/l/python-pycparser/python-pycparser.SlackBuild b/source/l/python-pycparser/python-pycparser.SlackBuild
index 31ea8e42..cad99b5f 100755
--- a/source/l/python-pycparser/python-pycparser.SlackBuild
+++ b/source/l/python-pycparser/python-pycparser.SlackBuild
@@ -25,7 +25,7 @@ cd $(dirname $0) ; CWD=$(pwd)
 PKGNAM=python-pycparser
 SRCNAM=pycparser
 VERSION=${VERSION:-$(echo ${SRCNAM}-*.tar.?z | rev | cut -f 3- -d . | cut -f 1 -d - | rev)}
-BUILD=${BUILD:-3}
+BUILD=${BUILD:-1}
 
 if [ -z "$ARCH" ]; then
   case "$( uname -m )" in
diff --git a/source/tcl/tcl/tcl.SlackBuild b/source/tcl/tcl/tcl.SlackBuild
index 6fd90cca..c42d80af 100755
--- a/source/tcl/tcl/tcl.SlackBuild
+++ b/source/tcl/tcl/tcl.SlackBuild
@@ -23,9 +23,9 @@
 cd $(dirname $0) ; CWD=$(pwd)
 
 PKGNAM=tcl
-VERSION=${VERSION:-8.6.11}
+VERSION=${VERSION:-8.6.12}
 # See also version number 8.6 in the symlinks below...)
-BUILD=${BUILD:-3}
+BUILD=${BUILD:-1}
 
 # Automatically determine the architecture we're building on:
 if [ -z "$ARCH" ]; then
diff --git a/source/tcl/tk/tk.SlackBuild b/source/tcl/tk/tk.SlackBuild
index c025b44e..a1580849 100755
--- a/source/tcl/tk/tk.SlackBuild
+++ b/source/tcl/tk/tk.SlackBuild
@@ -23,9 +23,9 @@
 cd $(dirname $0) ; CWD=$(pwd)
 
 PKGNAM=tk
-VERSION=${VERSION:-8.6.11.1}
+VERSION=${VERSION:-8.6.12}
 # See also version number 8.6 in the symlinks below...)
-BUILD=${BUILD:-4}
+BUILD=${BUILD:-1}
 
 # Automatically determine the architecture we're building on:
 if [ -z "$ARCH" ]; then
diff --git a/source/xap/pan/pan.SlackBuild b/source/xap/pan/pan.SlackBuild
index 0fd7b9c1..dc71077a 100755
--- a/source/xap/pan/pan.SlackBuild
+++ b/source/xap/pan/pan.SlackBuild
@@ -23,7 +23,7 @@
 cd $(dirname $0) ; CWD=$(pwd)
 
 PKGNAM=pan
-VERSION=${VERSION:-$(echo $PKGNAM-*.tar.?z | cut -d - -f 2 | rev | cut -f 3- -d . | rev)}
+VERSION=${VERSION:-$(echo $PKGNAM-*.tar.?z | cut -d - -f 2 | rev | cut -f 3- -d . | rev | tr -d v)}
 BUILD=${BUILD:-1}
 
 # Automatically determine the architecture we're building on:
@@ -63,9 +63,9 @@ rm -rf $PKG
 mkdir -p $TMP $PKG
 
 cd $TMP
-rm -rf ${PKGNAM}-${VERSION}
-tar xvf $CWD/${PKGNAM}-$VERSION.tar.?z || exit 1
-cd ${PKGNAM}-$VERSION || exit 1
+rm -rf ${PKGNAM}-v${VERSION}
+tar xvf $CWD/${PKGNAM}-v$VERSION.tar.?z || exit 1
+cd ${PKGNAM}-v$VERSION || exit 1
 
 # Make sure ownerships and permissions are sane:
 chown -R root:root .