Sun Aug 21 18:58:29 UTC 202220220821185829

a/kernel-generic-5.19.3-x86_64-1.txz:  Upgraded.
a/kernel-huge-5.19.3-x86_64-1.txz:  Upgraded.
a/kernel-modules-5.19.3-x86_64-1.txz:  Upgraded.
d/gcc-12.2.0-x86_64-1.txz:  Upgraded.
d/gcc-g++-12.2.0-x86_64-1.txz:  Upgraded.
d/gcc-gdc-12.2.0-x86_64-1.txz:  Upgraded.
d/gcc-gfortran-12.2.0-x86_64-1.txz:  Upgraded.
d/gcc-gnat-12.2.0-x86_64-1.txz:  Upgraded.
d/gcc-go-12.2.0-x86_64-1.txz:  Upgraded.
d/gcc-objc-12.2.0-x86_64-1.txz:  Upgraded.
d/kernel-headers-5.19.3-x86-1.txz:  Upgraded.
d/libtool-2.4.7-x86_64-3.txz:  Rebuilt.
  Recompiled to update embedded GCC version number.
d/python-setuptools-65.1.1-x86_64-1.txz:  Upgraded.
  Make libdir = platlib to agree with the paths in python3.
k/kernel-source-5.19.3-noarch-1.txz:  Upgraded.
xfce/xfce4-panel-4.16.5-x86_64-1.txz:  Upgraded.
xfce/xfdesktop-4.16.1-x86_64-1.txz:  Upgraded.
isolinux/initrd.img:  Rebuilt.
  /etc/rc.d/rc.S:  Added support for setting the Installer's root password
  from a kernel cmdline key value pair: instrootpw=yourpassword
  This is intended for network installations where otherwise the root password
  would be unset. Note: this does not configure the OS root password.
  Thanks to Stuart Winter.
kernels/*:  Upgraded.
usb-and-pxe-installers/usbboot.img:  Rebuilt.
  /etc/rc.d/rc.S:  Added support for setting the Installer's root password
  from a kernel cmdline key value pair: instrootpw=yourpassword
  This is intended for network installations where otherwise the root password
  would be unset. Note: this does not configure the OS root password.
  Thanks to Stuart Winter.

17 files changed, 102 insertions, 117 deletions

diff --git a/source/d/gcc/gcc.SlackBuild b/source/d/gcc/gcc.SlackBuild
index b639d0cf..f69d92d0 100755
--- a/source/d/gcc/gcc.SlackBuild
+++ b/source/d/gcc/gcc.SlackBuild
@@ -163,10 +163,6 @@ cd gcc-$SRCVER || exit 1
 # Smite the fixincludes:
 zcat $CWD/patches/gcc-no_fixincludes.diff.gz | patch -p1 --verbose --backup --suffix=.orig || exit 1
 
-# Fix compile with glibc-2.36:
-zcat $CWD/patches/2701442d0cf6292f6624443c15813d6d1a3562fe.diff.gz | patch -p1 --verbose --backup --suffix=.orig || exit 1
-zcat $CWD/patches/f35d65517a59565758107c5b1a51a5fa382f8d1a.diff.gz | patch -p1 --verbose --backup --suffix=.orig || exit 1
-
 # Fix perms/owners:
 chown -R root:root .
 find . \
diff --git a/source/d/gcc/patches/2701442d0cf6292f6624443c15813d6d1a3562fe.diff b/source/d/gcc/patches/2701442d0cf6292f6624443c15813d6d1a3562fe.diff
deleted file mode 100644
index a39baef4..00000000
--- a/source/d/gcc/patches/2701442d0cf6292f6624443c15813d6d1a3562fe.diff
+++ /dev/null
@@ -1,43 +0,0 @@
-From 2701442d0cf6292f6624443c15813d6d1a3562fe Mon Sep 17 00:00:00 2001
-From: Martin Liska <mliska@suse.cz>
-Date: Mon, 11 Jul 2022 22:03:14 +0200
-Subject: [PATCH] libsanitizer: cherry-pick 9cf13067cb5088626ba7 from upstream
-
-9cf13067cb5088626ba7ee1ec4c42ec59c7995a0 [sanitizer] Remove #include <linux/fs.h> to resolve fsconfig_command/mount_attr conflict with glibc 2.36
----
- .../sanitizer_platform_limits_posix.cpp                | 10 ++++++----
- 1 file changed, 6 insertions(+), 4 deletions(-)
-
-diff --git a/libsanitizer/sanitizer_common/sanitizer_platform_limits_posix.cpp b/libsanitizer/sanitizer_common/sanitizer_platform_limits_posix.cpp
-index 8ed3e92d270..97fd07acf9d 100644
---- a/libsanitizer/sanitizer_common/sanitizer_platform_limits_posix.cpp
-+++ b/libsanitizer/sanitizer_common/sanitizer_platform_limits_posix.cpp
-@@ -73,7 +73,9 @@
- #include <sys/vt.h>
- #include <linux/cdrom.h>
- #include <linux/fd.h>
-+#if SANITIZER_ANDROID
- #include <linux/fs.h>
-+#endif
- #include <linux/hdreg.h>
- #include <linux/input.h>
- #include <linux/ioctl.h>
-@@ -869,10 +871,10 @@ unsigned struct_ElfW_Phdr_sz = sizeof(Elf_Phdr);
-   unsigned IOCTL_EVIOCGPROP = IOCTL_NOT_PRESENT;
-   unsigned IOCTL_EVIOCSKEYCODE_V2 = IOCTL_NOT_PRESENT;
- #endif
--  unsigned IOCTL_FS_IOC_GETFLAGS = FS_IOC_GETFLAGS;
--  unsigned IOCTL_FS_IOC_GETVERSION = FS_IOC_GETVERSION;
--  unsigned IOCTL_FS_IOC_SETFLAGS = FS_IOC_SETFLAGS;
--  unsigned IOCTL_FS_IOC_SETVERSION = FS_IOC_SETVERSION;
-+  unsigned IOCTL_FS_IOC_GETFLAGS = _IOR('f', 1, long);
-+  unsigned IOCTL_FS_IOC_GETVERSION = _IOR('v', 1, long);
-+  unsigned IOCTL_FS_IOC_SETFLAGS = _IOW('f', 2, long);
-+  unsigned IOCTL_FS_IOC_SETVERSION = _IOW('v', 2, long);
-   unsigned IOCTL_GIO_CMAP = GIO_CMAP;
-   unsigned IOCTL_GIO_FONT = GIO_FONT;
-   unsigned IOCTL_GIO_UNIMAP = GIO_UNIMAP;
--- 
-2.31.1
-
-
diff --git a/source/d/gcc/patches/f35d65517a59565758107c5b1a51a5fa382f8d1a.diff b/source/d/gcc/patches/f35d65517a59565758107c5b1a51a5fa382f8d1a.diff
deleted file mode 100644
index 61c552e2..00000000
--- a/source/d/gcc/patches/f35d65517a59565758107c5b1a51a5fa382f8d1a.diff
+++ /dev/null
@@ -1,46 +0,0 @@
-From f35d65517a59565758107c5b1a51a5fa382f8d1a Mon Sep 17 00:00:00 2001
-From: Ian Lance Taylor <iant@golang.org>
-Date: Tue, 12 Jul 2022 19:42:43 -0700
-Subject: [PATCH] libgo: don't include <linux/fs.h> when building
- gen-sysinfo.go
-
-Removing this doesn't change anything at least with glibc 2.33.
-The include was added in https://go.dev/cl/6100049 but it's not
-clear why.
-
-Fixes PR go/106266
-
-Reviewed-on: https://go-review.googlesource.com/c/gofrontend/+/417294
----
- gcc/go/gofrontend/MERGE | 2 +-
- libgo/sysinfo.c         | 3 ---
- 2 files changed, 1 insertion(+), 4 deletions(-)
-
-diff --git a/gcc/go/gofrontend/MERGE b/gcc/go/gofrontend/MERGE
-index 7c5c45672d7..5ea0406cd8e 100644
---- a/gcc/go/gofrontend/MERGE
-+++ b/gcc/go/gofrontend/MERGE
-@@ -1,4 +1,4 @@
--70ca85f08edf63f46c87d540fa99c45e2903edc2
-+ff68b1a147eb60082fd60c198db0ef5477ade938
- 
- The first line of this file holds the git revision number of the last
- merge done from the gofrontend repository.
-diff --git a/libgo/sysinfo.c b/libgo/sysinfo.c
-index a4259c02ded..fc0210992fa 100644
---- a/libgo/sysinfo.c
-+++ b/libgo/sysinfo.c
-@@ -158,9 +158,6 @@
- #if defined(HAVE_LINUX_ETHER_H)
- #include <linux/ether.h>
- #endif
--#if defined(HAVE_LINUX_FS_H)
--#include <linux/fs.h>
--#endif
- #if defined(HAVE_LINUX_REBOOT_H)
- #include <linux/reboot.h>
- #endif
--- 
-2.31.1
-
-
diff --git a/source/d/gcc/slack-desc.gcc-gnat b/source/d/gcc/slack-desc.gcc-gnat
index 9c1eb771..8994a053 100644
--- a/source/d/gcc/slack-desc.gcc-gnat
+++ b/source/d/gcc/slack-desc.gcc-gnat
@@ -11,9 +11,9 @@ gcc-gnat:
 gcc-gnat: Ada support for the GNU Compiler Collection.
 gcc-gnat:
 gcc-gnat: This package contains those parts of the compiler collection needed to
-gcc-gnat: compile Ada code. GNAT implements Ada 95, Ada 2005 and Ada 2012, and
-gcc-gnat: it may also be invoked in Ada 83 compatibility mode. By default, GNAT
-gcc-gnat: assumes Ada 2012.
+gcc-gnat: compile Ada code. GNAT implements Ada 95, Ada 2005, Ada 2012 and Ada
+gcc-gnat: 2022, and it may also be invoked in Ada 83 compatibility mode.
+gcc-gnat: By default, GNAT assumes Ada 2012.
 gcc-gnat:
 gcc-gnat:
 gcc-gnat:
diff --git a/source/d/libtool/libtool.SlackBuild b/source/d/libtool/libtool.SlackBuild
index 451ef718..7c9ebec7 100755
--- a/source/d/libtool/libtool.SlackBuild
+++ b/source/d/libtool/libtool.SlackBuild
@@ -24,7 +24,7 @@ cd $(dirname $0) ; CWD=$(pwd)
 
 PKGNAM=libtool
 VERSION=${VERSION:-$(echo libtool-*.tar.xz | rev | cut -f 3- -d . | cut -f 1 -d - | rev)}
-BUILD=${BUILD:-2}
+BUILD=${BUILD:-3}
 
 NUMJOBS=${NUMJOBS:-" -j$(expr $(nproc) + 1) "}
 
diff --git a/source/d/python-setuptools/python-setuptools.SlackBuild b/source/d/python-setuptools/python-setuptools.SlackBuild
index 366b4f9c..694f68ac 100755
--- a/source/d/python-setuptools/python-setuptools.SlackBuild
+++ b/source/d/python-setuptools/python-setuptools.SlackBuild
@@ -1,7 +1,7 @@
 #!/bin/bash
 
 # Copyright 2013-2014 Audrius Kažukauskas <audrius@neutrino.lt>
-# Copyright 2014, 2017, 2018  Patrick J. Volkerding, Sebeka, MN, USA
+# Copyright 2014, 2017, 2018, 2022  Patrick J. Volkerding, Sebeka, MN, USA
 # All rights reserved.
 #
 # Redistribution and use of this script, with or without modification, is
@@ -47,6 +47,21 @@ if [ -z "$ARCH" ]; then
   esac
 fi
 
+if [ "$ARCH" = "i586" ]; then
+  LIBDIRSUFFIX=""
+elif [ "$ARCH" = "i686" ]; then
+  LIBDIRSUFFIX=""
+elif [ "$ARCH" = "s390" ]; then
+  LIBDIRSUFFIX=""
+elif [ "$ARCH" = "x86_64" ]; then
+  LIBDIRSUFFIX="64"
+elif [ "$ARCH" = "armv7hl" ]; then
+  LIBDIRSUFFIX=""
+else
+  LIBDIRSUFFIX=""
+fi
+
+
 # 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
 # could be useful to other scripts.
@@ -73,6 +88,17 @@ find -L . \
 
 rm -f setuptools/*.exe
 
+# Recent Python versions support both a libdir (for pure Python modules) and a
+# platlib (for $ARCH specific modules). We've always patched Python to use
+# the platform directory (such as /usr/lib64/python3.9/site-packages on x86_64)
+# for all modules. Perhaps we will rethink this, but since an installed
+# setuptools now takes priority for reporting the libdir (and this no longer
+# matches the platlib on architectures such as x86_64), let's patch setuptools
+# to agree with Python:
+if [ "$LIBDIRSUFFIX" = "64" ]; then
+  zcat $CWD/setuptools.x86_64.diff.gz | patch -p1 --verbose || exit 1
+fi
+
 python3 setup.py install --root=$PKG || exit 1
 
 mkdir -p $PKG/usr/doc/$PKGNAM-$VERSION
diff --git a/source/d/python-setuptools/setuptools.x86_64.diff b/source/d/python-setuptools/setuptools.x86_64.diff
new file mode 100644
index 00000000..a9731d73
--- /dev/null
+++ b/source/d/python-setuptools/setuptools.x86_64.diff
@@ -0,0 +1,31 @@
+--- ./setuptools/_distutils/sysconfig.py.orig	2022-08-21 02:05:13.000000000 -0500
++++ ./setuptools/_distutils/sysconfig.py	2022-08-21 13:33:52.738969315 -0500
+@@ -234,7 +234,7 @@
+             libdir = getattr(sys, "platlibdir", "lib")
+         else:
+             # Pure Python
+-            libdir = "lib"
++            libdir = "lib64"
+         implementation = 'pypy' if IS_PYPY else 'python'
+         libpython = os.path.join(prefix, libdir, implementation + get_python_version())
+         return _posix_lib(standard_lib, libpython, early_prefix, prefix)
+--- ./setuptools/_distutils/command/install.py.orig	2022-08-21 13:33:52.738969315 -0500
++++ ./setuptools/_distutils/command/install.py	2022-08-21 13:35:11.919964935 -0500
+@@ -34,7 +34,7 @@
+ 
+ INSTALL_SCHEMES = {
+     'posix_prefix': {
+-        'purelib': '{base}/lib/{implementation_lower}{py_version_short}/site-packages',
++        'purelib': '{base}/lib64/{implementation_lower}{py_version_short}/site-packages',
+         'platlib': '{platbase}/{platlibdir}/{implementation_lower}'
+         '{py_version_short}/site-packages',
+         'headers': '{base}/include/{implementation_lower}'
+@@ -43,7 +43,7 @@
+         'data': '{base}',
+     },
+     'posix_home': {
+-        'purelib': '{base}/lib/{implementation_lower}',
++        'purelib': '{base}/lib64/{implementation_lower}',
+         'platlib': '{base}/{platlibdir}/{implementation_lower}',
+         'headers': '{base}/include/{implementation_lower}/{dist_name}',
+         'scripts': '{base}/bin',
diff --git a/source/installer/ChangeLog.txt b/source/installer/ChangeLog.txt
index 3b32fc69..8850f9c0 100644
--- a/source/installer/ChangeLog.txt
+++ b/source/installer/ChangeLog.txt
@@ -1,3 +1,13 @@
+Fri Aug 19 08:08:08 UTC 2022
+  /etc/rc.d/rc.S:  Added support for setting the Installer's root password
+  from a Kernel cmdline key value pair, instrootpw=yourpassword
+  This is intended for network installations where otherwise the root password
+  would be unset.
+  Note: this does not configure the OS root password.
+  Passwords should be set as follows within the Kernel cmdline:
+    instrootpw=yourpassword
+  MoZes.
++--------------------------+
 Wed Jun 29 19:13:25 UTC 2022
   Added smartctl, smartctl.8, and dmidecode.8.
 +--------------------------+
diff --git a/source/installer/sources/initrd/etc/rc.d/rc.S b/source/installer/sources/initrd/etc/rc.d/rc.S
index fcd5fea2..a5c52f54 100755
--- a/source/installer/sources/initrd/etc/rc.d/rc.S
+++ b/source/installer/sources/initrd/etc/rc.d/rc.S
@@ -13,6 +13,16 @@
 # Mount sysfs next:
 /sbin/mount -v sysfs /sys -t sysfs 1> /dev/null
 
+# Set a root password for the Slackware Installer if set as a Kernel cmdline:
+# This is intended for network installations where otherwise the root password
+# would be unset.
+# Note: this does not configure the OS root password.
+# Passwords should be set as follows within the Kernel cmdline:
+#   instrootpw=yourpassword
+if grep.bin -qoP 'instrootpw=\K\S+' /proc/cmdline ; then
+  /bin/echo "root:$( grep.bin -oP 'instrootpw=\K\S+' /proc/cmdline )" | /bin/busybox chpasswd
+fi
+
 # Activate swap:
 /sbin/swapon -a 1> /dev/null
 
diff --git a/source/k/kernel-configs/config-generic-5.19.2 b/source/k/kernel-configs/config-generic-5.19.3
index 850d38b9..22c1793b 100644
--- a/source/k/kernel-configs/config-generic-5.19.2
+++ b/source/k/kernel-configs/config-generic-5.19.3
@@ -1,10 +1,10 @@
 #
 # Automatically generated file; DO NOT EDIT.
-# Linux/x86 5.19.2 Kernel Configuration
+# Linux/x86 5.19.3 Kernel Configuration
 #
-CONFIG_CC_VERSION_TEXT="gcc (GCC) 12.1.0"
+CONFIG_CC_VERSION_TEXT="gcc (GCC) 12.2.0"
 CONFIG_CC_IS_GCC=y
-CONFIG_GCC_VERSION=120100
+CONFIG_GCC_VERSION=120200
 CONFIG_CLANG_VERSION=0
 CONFIG_AS_IS_GNU=y
 CONFIG_AS_VERSION=23900
diff --git a/source/k/kernel-configs/config-generic-5.19.2.x64 b/source/k/kernel-configs/config-generic-5.19.3.x64
index 7a8a5abf..2b3e2819 100644
--- a/source/k/kernel-configs/config-generic-5.19.2.x64
+++ b/source/k/kernel-configs/config-generic-5.19.3.x64
@@ -1,10 +1,10 @@
 #
 # Automatically generated file; DO NOT EDIT.
-# Linux/x86 5.19.2 Kernel Configuration
+# Linux/x86 5.19.3 Kernel Configuration
 #
-CONFIG_CC_VERSION_TEXT="gcc (GCC) 12.1.0"
+CONFIG_CC_VERSION_TEXT="gcc (GCC) 12.2.0"
 CONFIG_CC_IS_GCC=y
-CONFIG_GCC_VERSION=120100
+CONFIG_GCC_VERSION=120200
 CONFIG_CLANG_VERSION=0
 CONFIG_AS_IS_GNU=y
 CONFIG_AS_VERSION=23900
diff --git a/source/k/kernel-configs/config-generic-smp-5.19.2-smp b/source/k/kernel-configs/config-generic-smp-5.19.3-smp
index 1616cf1c..5a1537fd 100644
--- a/source/k/kernel-configs/config-generic-smp-5.19.2-smp
+++ b/source/k/kernel-configs/config-generic-smp-5.19.3-smp
@@ -1,10 +1,10 @@
 #
 # Automatically generated file; DO NOT EDIT.
-# Linux/x86 5.19.2 Kernel Configuration
+# Linux/x86 5.19.3 Kernel Configuration
 #
-CONFIG_CC_VERSION_TEXT="gcc (GCC) 12.1.0"
+CONFIG_CC_VERSION_TEXT="gcc (GCC) 12.2.0"
 CONFIG_CC_IS_GCC=y
-CONFIG_GCC_VERSION=120100
+CONFIG_GCC_VERSION=120200
 CONFIG_CLANG_VERSION=0
 CONFIG_AS_IS_GNU=y
 CONFIG_AS_VERSION=23900
diff --git a/source/k/kernel-configs/config-huge-5.19.2 b/source/k/kernel-configs/config-huge-5.19.3
index b043c3c1..2860479c 100644
--- a/source/k/kernel-configs/config-huge-5.19.2
+++ b/source/k/kernel-configs/config-huge-5.19.3
@@ -1,10 +1,10 @@
 #
 # Automatically generated file; DO NOT EDIT.
-# Linux/x86 5.19.2 Kernel Configuration
+# Linux/x86 5.19.3 Kernel Configuration
 #
-CONFIG_CC_VERSION_TEXT="gcc (GCC) 12.1.0"
+CONFIG_CC_VERSION_TEXT="gcc (GCC) 12.2.0"
 CONFIG_CC_IS_GCC=y
-CONFIG_GCC_VERSION=120100
+CONFIG_GCC_VERSION=120200
 CONFIG_CLANG_VERSION=0
 CONFIG_AS_IS_GNU=y
 CONFIG_AS_VERSION=23900
diff --git a/source/k/kernel-configs/config-huge-5.19.2.x64 b/source/k/kernel-configs/config-huge-5.19.3.x64
index 57aee727..2f914fe2 100644
--- a/source/k/kernel-configs/config-huge-5.19.2.x64
+++ b/source/k/kernel-configs/config-huge-5.19.3.x64
@@ -1,10 +1,10 @@
 #
 # Automatically generated file; DO NOT EDIT.
-# Linux/x86 5.19.2 Kernel Configuration
+# Linux/x86 5.19.3 Kernel Configuration
 #
-CONFIG_CC_VERSION_TEXT="gcc (GCC) 12.1.0"
+CONFIG_CC_VERSION_TEXT="gcc (GCC) 12.2.0"
 CONFIG_CC_IS_GCC=y
-CONFIG_GCC_VERSION=120100
+CONFIG_GCC_VERSION=120200
 CONFIG_CLANG_VERSION=0
 CONFIG_AS_IS_GNU=y
 CONFIG_AS_VERSION=23900
diff --git a/source/k/kernel-configs/config-huge-smp-5.19.2-smp b/source/k/kernel-configs/config-huge-smp-5.19.3-smp
index b456ab85..eb05687d 100644
--- a/source/k/kernel-configs/config-huge-smp-5.19.2-smp
+++ b/source/k/kernel-configs/config-huge-smp-5.19.3-smp
@@ -1,10 +1,10 @@
 #
 # Automatically generated file; DO NOT EDIT.
-# Linux/x86 5.19.2 Kernel Configuration
+# Linux/x86 5.19.3 Kernel Configuration
 #
-CONFIG_CC_VERSION_TEXT="gcc (GCC) 12.1.0"
+CONFIG_CC_VERSION_TEXT="gcc (GCC) 12.2.0"
 CONFIG_CC_IS_GCC=y
-CONFIG_GCC_VERSION=120100
+CONFIG_GCC_VERSION=120200
 CONFIG_CLANG_VERSION=0
 CONFIG_AS_IS_GNU=y
 CONFIG_AS_VERSION=23900
diff --git a/source/xfce/xfdesktop/xfdesktop.SlackBuild b/source/xfce/xfdesktop/xfdesktop.SlackBuild
index 6876929c..e0648495 100755
--- a/source/xfce/xfdesktop/xfdesktop.SlackBuild
+++ b/source/xfce/xfdesktop/xfdesktop.SlackBuild
@@ -24,7 +24,7 @@ cd $(dirname $0) ; CWD=$(pwd)
 
 PKGNAM=xfdesktop
 VERSION=${VERSION:-$(echo $PKGNAM-*.tar.?z* | rev | cut -f 3- -d . | cut -f 1 -d - | rev)}
-BUILD=${BUILD:-3}
+BUILD=${BUILD:-1}
 
 # Automatically determine the architecture we're building on:
 MARCH=$( uname -m )
diff --git a/source/xfce/xfdesktop/xfdesktop.url b/source/xfce/xfdesktop/xfdesktop.url
new file mode 100644
index 00000000..ec602cfa
--- /dev/null
+++ b/source/xfce/xfdesktop/xfdesktop.url
@@ -0,0 +1 @@
+https://archive.xfce.org/src/xfce/xfdesktop/4.16/