From 054dcd3d5a3815a8088a3f92dd548f909ed23f40 Mon Sep 17 00:00:00 2001
From: Patrick J Volkerding <volkerdi@slackware.com>
Date: Fri, 13 Sep 2019 19:16:00 +0000
Subject: Fri Sep 13 19:16:00 UTC 2019

a/mkinitrd-1.4.11-x86_64-13.txz:  Rebuilt.
  Add libargon2 and libgcc_s for cryptsetup LUKS2 support.
  Add jfs (thanks to gus3 on LQ) and xfs (thanks to klipkyle on LQ) repair
  tools to initrd if those filesystems are used.
  Support PARTUUID in mkinitrd_command_generator.sh (thanks to luvr on LQ).
  Fixes and enhancements to docs suggested on LQ.
  Thanks to Robby Workman.
a/sysvinit-2.96-x86_64-1.txz:  Upgraded.
ap/vim-8.1.2022-x86_64-1.txz:  Upgraded.
d/bison-3.4.2-x86_64-1.txz:  Upgraded.
d/ccache-3.7.4-x86_64-1.txz:  Upgraded.
d/icecream-1.3-x86_64-1.txz:  Upgraded.
d/meson-0.51.2-x86_64-2.txz:  Rebuilt.
  Fix meson configure crash. Thanks to orbea.
l/dbus-python-1.2.12-x86_64-1.txz:  Upgraded.
l/pulseaudio-13.0-x86_64-1.txz:  Upgraded.
l/python-certifi-2019.9.11-x86_64-1.txz:  Upgraded.
x/libwacom-1.0-x86_64-1.txz:  Upgraded.
xap/vim-gvim-8.1.2022-x86_64-1.txz:  Upgraded.
---
 source/a/mkinitrd/mkinitrd                         | 14 +++++++
 source/a/mkinitrd/mkinitrd.8                       |  6 ++-
 source/a/mkinitrd/mkinitrd.SlackBuild              |  2 +-
 source/a/mkinitrd/mkinitrd_command_generator.sh    |  2 +-
 .../sysvinit.wrong.version.in.init.c.again.diff    |  2 +-
 source/d/icecream/icecream.SlackBuild              |  9 ++--
 ....47bdea504067d00e9bed522e9575bd2416bfe4ee.patch | 48 ++++++++++++++++++++++
 source/d/meson/meson.SlackBuild                    |  5 ++-
 source/l/pulseaudio/0131-alsa-lib-1.1.9.patch      | 39 ------------------
 source/l/pulseaudio/pulseaudio.SlackBuild          |  5 +--
 source/x/libwacom/libwacom.SlackBuild              |  1 +
 source/x/wqy-zenhei-font-ttf/slack-desc            |  2 +-
 12 files changed, 82 insertions(+), 53 deletions(-)
 create mode 100644 source/d/meson/meson.47bdea504067d00e9bed522e9575bd2416bfe4ee.patch
 delete mode 100644 source/l/pulseaudio/0131-alsa-lib-1.1.9.patch

(limited to 'source')

diff --git a/source/a/mkinitrd/mkinitrd b/source/a/mkinitrd/mkinitrd
index 6f4ff3c1..7f921e3b 100644
--- a/source/a/mkinitrd/mkinitrd
+++ b/source/a/mkinitrd/mkinitrd
@@ -53,6 +53,10 @@
 #   output filename. Thanks to SeB.
 # Modified by Patrick Volkerding <volkerdi@slackware.com> 04 Feb 2019
 #   Allow specifying more than one kernel version.
+# Modified by Robby Workman <rworkman@slackware.com> 05 September 2019
+#   to add libargon2 and libgcc_s for cryptsetup LUKS2 support; add
+#   jfs and xfs repair tools to initrd if those filesystems are used; 
+#   fixes and enhancements to docs
 
 MKINITRD_VERSION=1.4.11
 
@@ -620,6 +624,9 @@ if [ ! -z "$CRYPT" ]; then
   if [ -e /usr/sbin/cryptsetup ]; then
     mkdir -p $SOURCE_TREE/sbin
     cp /usr/sbin/cryptsetup $SOURCE_TREE/sbin/cryptsetup
+    find /lib /lib64 /usr/lib /usr/lib64 -name "libargon2*so*" 2> /dev/null | xargs -I'{}' cp -P --parents '{}' $SOURCE_TREE/
+    find /lib /lib64 /usr/lib /usr/lib64 -name "libgcc_s*so*" 2> /dev/null | xargs -I'{}' cp -P --parents '{}' $SOURCE_TREE/
+    MODULE_LIST="${MODULE_LIST}:algif_skcipher"
     if [ ! -e $SOURCE_TREE/sbin/udevadm ]; then
       cat << EOF > $SOURCE_TREE/sbin/udevadm
 #!/bin/sh
@@ -733,6 +740,13 @@ if [ ! -z "$MODULE_LIST" ]; then
       /sbin/modprobe --set-version $kver --show-depends --ignore-install $MODULE 2>/dev/null \
         | grep "^insmod " | cut -f 2 -d ' ' | while read SRCMOD; do
 
+        # If jfs or xfs filesystems are in use, add the repair tools to the initrd:
+        if [ "$(basename $SRCMOD .ko)" = "jfs" ]; then
+          cp -a /sbin/jfs_fsck $SOURCE_TREE/sbin/
+        elif [ "$(basename $SRCMOD .ko)" = "xfs" ]; then
+          cp -a /sbin/xfs_repair $SOURCE_TREE/sbin/
+        fi
+
         if ! grep -Eq " $(basename $SRCMOD .ko)(\.| |$)" $SOURCE_TREE/load_kernel_modules 2>/dev/null ; then
           LINE="$(echo "modprobe -v $(basename ${SRCMOD%%.gz} .ko)" )"
 
diff --git a/source/a/mkinitrd/mkinitrd.8 b/source/a/mkinitrd/mkinitrd.8
index 1874d814..92bd18aa 100644
--- a/source/a/mkinitrd/mkinitrd.8
+++ b/source/a/mkinitrd/mkinitrd.8
@@ -136,7 +136,8 @@ can be a device node path, UUID, or LABEL. See examples for \fB\-C\fR below.
 The directory to use as the source for the initrd.  (default: /boot/initrd-tree/)
 .TP
 .B \-u
-Include udev in the initrd.
+Include udev in the initrd (provided for backward compatibility, as udev is 
+always included in the initrd).
 .TP
 .B \-w
 The -w option specifies how long to wait in seconds before assuming that all the
@@ -217,6 +218,9 @@ available on the system.
 This option adds RAID support to the initrd, if a static mdadm binary is
 available on the system.
 .TP
+.B \-M
+This option add the files in /etc/modprobe.d/ and /lib/modprobe.d/ to the initrd.
+.TP
 .B \-V
 Display version information and exit.
 .SH EXAMPLES
diff --git a/source/a/mkinitrd/mkinitrd.SlackBuild b/source/a/mkinitrd/mkinitrd.SlackBuild
index 8aaa9b27..55057603 100755
--- a/source/a/mkinitrd/mkinitrd.SlackBuild
+++ b/source/a/mkinitrd/mkinitrd.SlackBuild
@@ -25,7 +25,7 @@ cd $(dirname $0) ; CWD=$(pwd)
 PKGNAM=mkinitrd
 VERSION=${VERSION:-1.4.11}
 BB=1.30.1
-BUILD=${BUILD:-12}
+BUILD=${BUILD:-13}
 
 # Automatically determine the architecture we're building on:
 if [ -z "$ARCH" ]; then
diff --git a/source/a/mkinitrd/mkinitrd_command_generator.sh b/source/a/mkinitrd/mkinitrd_command_generator.sh
index 489225be..739499f1 100644
--- a/source/a/mkinitrd/mkinitrd_command_generator.sh
+++ b/source/a/mkinitrd/mkinitrd_command_generator.sh
@@ -167,7 +167,7 @@ extended_usage() {
 get_root_device() {
   if [ -e $FSTAB ]; then
     RD=$(cat $FSTAB |tr '\t' ' ' |grep -v '^ *#' |tr -s ' ' |grep ' / ' |cut -f1 -d' ')
-    if [ "$(echo $RD | cut -f1 -d=)" = "LABEL" -o "$(echo $RD | cut -f1 -d=)" = "UUID" ]; then
+    if [ "$(echo $RD | cut -f1 -d=)" = "LABEL" -o "$(echo $RD | cut -f1 -d=)" = "UUID" -o "$(echo $RD | cut -f1 -d=)" = "PARTUUID" ]; then
       DKEY=$(echo $RD | cut -f1 -d=)
       # The value can be LABEL=foo or LABEL='foo' or LABEL="foo"
       DVAL=$(echo $RD | cut -f2 -d= | tr -d "'\042")
diff --git a/source/a/sysvinit/sysvinit.wrong.version.in.init.c.again.diff b/source/a/sysvinit/sysvinit.wrong.version.in.init.c.again.diff
index 65dc02d0..562b11b4 100644
--- a/source/a/sysvinit/sysvinit.wrong.version.in.init.c.again.diff
+++ b/source/a/sysvinit/sysvinit.wrong.version.in.init.c.again.diff
@@ -5,7 +5,7 @@
  Version information is not placed in the top-level Makefile by default
  */
 -#define VERSION "2.94"
-+#define VERSION "2.95"
++#define VERSION "2.96"
  /*
   *		This file is part of the sysvinit suite,
   *		Copyright (C) 1991-2004 Miquel van Smoorenburg.
diff --git a/source/d/icecream/icecream.SlackBuild b/source/d/icecream/icecream.SlackBuild
index fb724565..4819fc77 100755
--- a/source/d/icecream/icecream.SlackBuild
+++ b/source/d/icecream/icecream.SlackBuild
@@ -24,7 +24,8 @@
 cd $(dirname $0) ; CWD=$(pwd)
 
 PKGNAM=icecream
-VERSION=${VERSION:-$(echo $PKGNAM-*.tar.?z | rev | cut -f 3- -d . | cut -f 1 -d - | rev)}
+SRCNAM=icecc
+VERSION=${VERSION:-$(echo $SRCNAM-*.tar.?z | rev | cut -f 3- -d . | cut -f 1 -d - | rev)}
 BUILD=${BUILD:-1}
 
 if [ -z "$ARCH" ]; then
@@ -67,8 +68,8 @@ rm -rf $PKG
 mkdir -p $TMP $PKG $OUTPUT
 cd $TMP
 rm -rf $PKGNAM-$VERSION
-tar xvf $CWD/$PKGNAM-$VERSION.tar.lz || exit 1
-cd $PKGNAM-$VERSION || exit 1
+tar xvf $CWD/$SRCNAM-$VERSION.tar.lz || exit 1
+cd $SRCNAM-$VERSION || exit 1
 
 chown -R root:root .
 find -L . \
@@ -77,7 +78,7 @@ find -L . \
  \( -perm 666 -o -perm 664 -o -perm 640 -o -perm 600 -o -perm 444 \
  -o -perm 440 -o -perm 400 \) -exec chmod 644 {} \;
 
-./autogen.sh || exit 1
+#./autogen.sh || exit 1
 
 CFLAGS="$SLKCFLAGS" \
 CXXFLAGS="$SLKCFLAGS" \
diff --git a/source/d/meson/meson.47bdea504067d00e9bed522e9575bd2416bfe4ee.patch b/source/d/meson/meson.47bdea504067d00e9bed522e9575bd2416bfe4ee.patch
new file mode 100644
index 00000000..ee111cbe
--- /dev/null
+++ b/source/d/meson/meson.47bdea504067d00e9bed522e9575bd2416bfe4ee.patch
@@ -0,0 +1,48 @@
+From 47bdea504067d00e9bed522e9575bd2416bfe4ee Mon Sep 17 00:00:00 2001
+From: Daniel Mensinger <daniel@mensinger-ka.de>
+Date: Fri, 13 Sep 2019 12:23:06 +0200
+Subject: [PATCH] mconf: Fix meson configure crash (fixes #5909)
+
+---
+ mesonbuild/mconf.py | 4 ++--
+ run_unittests.py    | 4 ++++
+ 2 files changed, 6 insertions(+), 2 deletions(-)
+
+diff --git a/mesonbuild/mconf.py b/mesonbuild/mconf.py
+index cac9d61ce4..4f8014014d 100644
+--- a/mesonbuild/mconf.py
++++ b/mesonbuild/mconf.py
+@@ -181,7 +181,7 @@ def print_default_values_warning():
+         core_options = {k: o for k, o in self.coredata.builtins.items() if k in core_option_names}
+ 
+         self.print_options('Core options', core_options)
+-        if self.build.environment.is_cross_build():
++        if self.default_values_only or self.build.environment.is_cross_build():
+             self.print_options('Core options (for host machine)', self.coredata.builtins_per_machine.host)
+             self.print_options(
+                 'Core options (for build machine)',
+@@ -190,7 +190,7 @@ def print_default_values_warning():
+             self.print_options('Core options', self.coredata.builtins_per_machine.host)
+         self.print_options('Backend options', self.coredata.backend_options)
+         self.print_options('Base options', self.coredata.base_options)
+-        if self.build.environment.is_cross_build():
++        if self.default_values_only or self.build.environment.is_cross_build():
+             self.print_options('Compiler options (for host machine)', self.coredata.compiler_options.host)
+             self.print_options(
+                 'Compiler options (for build machine)',
+diff --git a/run_unittests.py b/run_unittests.py
+index f06be23aef..8cc9811482 100755
+--- a/run_unittests.py
++++ b/run_unittests.py
+@@ -3624,6 +3624,10 @@ def test_introspect_buildoptions_without_configured_build(self):
+         self.maxDiff = None
+         self.assertListEqual(res_nb, res_wb)
+ 
++    def test_meson_configure_from_source_does_not_crash(self):
++        testdir = os.path.join(self.unit_test_dir, '59 introspect buildoptions')
++        self._run(self.mconf_command + [testdir])
++
+     def test_introspect_json_dump(self):
+         testdir = os.path.join(self.unit_test_dir, '57 introspection')
+         self.init(testdir)
+
diff --git a/source/d/meson/meson.SlackBuild b/source/d/meson/meson.SlackBuild
index 38193377..860dd31f 100755
--- a/source/d/meson/meson.SlackBuild
+++ b/source/d/meson/meson.SlackBuild
@@ -25,7 +25,7 @@ cd $(dirname $0) ; CWD=$(pwd)
 
 PKGNAM=meson
 VERSION=${VERSION:-$(echo $PKGNAM-*.tar.?z | rev | cut -f 3- -d . | cut -f 1 -d - | rev)}
-BUILD=${BUILD:-1}
+BUILD=${BUILD:-2}
 
 if [ -z "$ARCH" ]; then
   case "$( uname -m )" in
@@ -60,6 +60,9 @@ find -L . \
  \( -perm 666 -o -perm 664 -o -perm 640 -o -perm 600 -o -perm 444 \
   -o -perm 440 -o -perm 400 \) -exec chmod 644 {} \;
 
+# Fix meson configure crash:
+zcat $CWD/meson.47bdea504067d00e9bed522e9575bd2416bfe4ee.patch.gz | patch -p1 --verbose || exit 1
+
 python3 setup.py install --root=$PKG || exit 1
 
 mv $PKG/usr/share/man $PKG/usr/
diff --git a/source/l/pulseaudio/0131-alsa-lib-1.1.9.patch b/source/l/pulseaudio/0131-alsa-lib-1.1.9.patch
deleted file mode 100644
index 1600417f..00000000
--- a/source/l/pulseaudio/0131-alsa-lib-1.1.9.patch
+++ /dev/null
@@ -1,39 +0,0 @@
-alsa: Fix inclusion of use-case.h
-The recent change in ALSA upstream stripped -I$include/alsa path from
-pkgconfig.  We already fixed for this change in some places but still
-the code for UCM was overlooked, and this resulted in the unresolved
-symbols in alsa card module. Fix them as well.
-
-Signed-off-by: Takashi Iwai <tiwai@suse.de>
-Diffstat
--rw-r--r--	configure.ac	2	
-		
--rw-r--r--	src/modules/alsa/alsa-ucm.h	2	
-		
-2 files changed, 2 insertions, 2 deletions
-diff --git a/configure.ac b/configure.ac
-index c004bd7..b44ed15 100644
---- a/configure.ac
-+++ b/configure.ac
-@@ -826,7 +826,7 @@ AS_IF([test "x$enable_alsa" = "xyes" && test "x$HAVE_ALSA" = "x0"],
- AS_IF([test "x$HAVE_ALSA" = "x1"],
-     [
-         save_CPPFLAGS="$CPPFLAGS"; CPPFLAGS="$CPPFLAGS $ASOUNDLIB_CFLAGS"
--        AC_CHECK_HEADERS([use-case.h], HAVE_ALSA_UCM=1, HAVE_ALSA_UCM=0)
-+        AC_CHECK_HEADERS([alsa/use-case.h], HAVE_ALSA_UCM=1, HAVE_ALSA_UCM=0)
-         CPPFLAGS="$save_CPPFLAGS"
-     ],
-     HAVE_ALSA_UCM=0)
-diff --git a/src/modules/alsa/alsa-ucm.h b/src/modules/alsa/alsa-ucm.h
-index 53abf3f..c926f3c 100644
---- a/src/modules/alsa/alsa-ucm.h
-+++ b/src/modules/alsa/alsa-ucm.h
-@@ -23,7 +23,7 @@
- ***/
- 
- #ifdef HAVE_ALSA_UCM
--#include <use-case.h>
-+#include <alsa/use-case.h>
- #else
- typedef void snd_use_case_mgr_t;
- #endif
diff --git a/source/l/pulseaudio/pulseaudio.SlackBuild b/source/l/pulseaudio/pulseaudio.SlackBuild
index 35f84b5a..9bbf22fe 100755
--- a/source/l/pulseaudio/pulseaudio.SlackBuild
+++ b/source/l/pulseaudio/pulseaudio.SlackBuild
@@ -27,7 +27,7 @@ cd $(dirname $0) ; CWD=$(pwd)
 
 PKGNAM=pulseaudio
 VERSION=${VERSION:-$(echo $PKGNAM-*.tar.?z* | rev | cut -f 3- -d . | cut -f 1 -d - | rev)}
-BUILD=${BUILD:-2}
+BUILD=${BUILD:-1}
 
 if [ -z "$ARCH" ]; then
   case "$( uname -m )" in
@@ -87,9 +87,6 @@ zcat $CWD/0002-allow-autospawn-for-root-default.diff.gz | patch -p1 --verbose ||
 # Do not log a warning every time root uses PulseAudio:
 zcat $CWD/0003-no-root-warn.diff.gz | patch -p1 --verbose || exit 1
 
-# Patch to fix building against alsa-lib-1.1.9:
-zcat $CWD/0131-alsa-lib-1.1.9.patch.gz | patch -p1 --verbose || exit 1
-
 sed -i -e '/@PA_BINARY@/ imkdir -p \$HOME/.config/pulse' src/daemon/start-pulseaudio-x11.in
 echo "X-MATE-Autostart-Phase=Initialization" >> src/daemon/pulseaudio.desktop.in
 
diff --git a/source/x/libwacom/libwacom.SlackBuild b/source/x/libwacom/libwacom.SlackBuild
index 4e5b963b..b2127690 100755
--- a/source/x/libwacom/libwacom.SlackBuild
+++ b/source/x/libwacom/libwacom.SlackBuild
@@ -89,6 +89,7 @@ CXXFLAGS="$SLKCFLAGS" \
   --mandir=/usr/man \
   --docdir=/usr/doc/$PKGNAM-$VERSION \
   --disable-static \
+  --with-udev-dir=/lib/udev \
   --build=$ARCH-slackware-linux || exit 1
 
 make $NUMJOBS || make || exit 1
diff --git a/source/x/wqy-zenhei-font-ttf/slack-desc b/source/x/wqy-zenhei-font-ttf/slack-desc
index 404b141e..c58ea3e0 100644
--- a/source/x/wqy-zenhei-font-ttf/slack-desc
+++ b/source/x/wqy-zenhei-font-ttf/slack-desc
@@ -15,5 +15,5 @@ wqy-zenhei-font-ttf: and on-screen display. This font is also targeted at platfo
 wqy-zenhei-font-ttf: independence and the utility for document exchange between various
 wqy-zenhei-font-ttf: operating systems.
 wqy-zenhei-font-ttf:
-wqy-zenhei-font-ttf: Homepage: http://wqy.sourceforge.net/en/
+wqy-zenhei-font-ttf: Homepage: https://sourceforge.net/projects/wqy/files/
 wqy-zenhei-font-ttf:
-- 
cgit v1.2.3