Tue Apr 20 19:44:02 UTC 202120210420194402

ap/slackpkg-15.0.2-noarch-1.txz:  Upgraded.
  Fix break error messages (dive)
  Remove now pointless if/then/else (dive)
  Safer config sourcing (dive)
  files/slackpkg: replace #!/bin/sh with #!/bin/bash (Eugen Wissner)
  Don't create blacklist when running update (dive)
  Add show-changelog & help to non-root commands (dive)
  Improve search blacklisting (dive)
  Fix package duplicate bug (PiterPunk)
  Thanks to Robby Workman.
ap/sqlite-3.35.5-x86_64-1.txz:  Upgraded.
kde/kwin-5.21.4-x86_64-2.txz:  Rebuilt.
  Delay closing Wayland streams. Thanks to LuckyCyborg.
kde/okteta-0.26.6-x86_64-1.txz:  Upgraded.
l/libtiff-4.3.0-x86_64-1.txz:  Upgraded.
n/libgcrypt-1.9.3-x86_64-1.txz:  Upgraded.
n/samba-4.14.3-x86_64-1.txz:  Upgraded.
x/xorg-cf-files-1.0.6-x86_64-6.txz:  Rebuilt.
  Patched to fix an incompatibility introduced by binutils-2.36.
  Thanks to BenCollver.
xap/seamonkey-2.53.7.1-x86_64-1.txz:  Upgraded.
  This update contains security fixes and improvements.
  For more information, see:
    https://www.seamonkey-project.org/releases/seamonkey2.53.7.1
  (* Security fix *)

18 files changed, 80 insertions, 33 deletions

diff --git a/source/ap/slackpkg/files/ChangeLog b/source/ap/slackpkg/files/ChangeLog
index 46971acd..b462b839 100644
--- a/source/ap/slackpkg/files/ChangeLog
+++ b/source/ap/slackpkg/files/ChangeLog
@@ -1,3 +1,14 @@
+
+Tue Apr 13 06:48:40 UTC 2021
+---------------
+	- Fix break error messages (dive)
+	- Remove now pointless if/then/else (dive)
+	- Safer config sourcing (dive)
+	- files/slackpkg: replace #!/bin/sh with #!/bin/bash (Eugen Wissner)
+	- Don't create blacklist when running update (dive)
+	- Add show-changelog & help to non-root commands (dive)
+	- Improve search blacklisting (dive)
+
 Sun Mar 14 15:17:21 UTC 2021
 ---------------
 	- Re-release slackpkg-15.0.1 (no package generated yet anyway)
diff --git a/source/ap/slackpkg/files/core-functions.sh b/source/ap/slackpkg/files/core-functions.sh
index 9591d652..2dc7f050 100644
--- a/source/ap/slackpkg/files/core-functions.sh
+++ b/source/ap/slackpkg/files/core-functions.sh
@@ -163,7 +163,7 @@ function system_setup() {
 
 	# Create initial blacklist of single package names from regexps in
 	# ${CONF}/blacklist.
-	mkregex_blacklist
+	[ "$CMD" != update ] && mkregex_blacklist
 
 	SLACKCFVERSION=$(grep "# v[0-9.]\+" $CONF/slackpkg.conf | cut -f2 -dv)
 	CHECKSUMSFILE=${WORKDIR}/CHECKSUMS.md5
@@ -327,6 +327,8 @@ to the closest mirror and is very slow.\n"
 	   [ "$CMD" != "search" ] && \
 	   [ "$CMD" != "file-search" ] && \
 	   [ "$CMD" != "check-updates" ] && \
+	   [ "$CMD" != "show-changelog" ] && \
+	   [ "$CMD" != "help" ] && \
 	   [ "$CMD" != "info" ]; then
 		echo -e "\n\
 Only root can install, upgrade, or remove packages.\n\
@@ -629,13 +631,9 @@ function makelist() {
 
 	INPUTLIST=$@
 
-	if echo $CMD | grep -q install ; then
-		ls -1 $ROOT/var/log/packages/* |
-			awk -f /usr/libexec/slackpkg/pkglist.awk > ${TMPDIR}/tmplist
-	else
-		ls -1 $ROOT/var/log/packages/* |
-			awk -f /usr/libexec/slackpkg/pkglist.awk > ${TMPDIR}/tmplist
-	fi
+	printf "%s\n" $ROOT/var/log/packages/* |
+		awk -f /usr/libexec/slackpkg/pkglist.awk > ${TMPDIR}/tmplist
+
 	cat ${WORKDIR}/pkglist > ${TMPDIR}/pkglist
 
 	touch ${TMPDIR}/waiting
@@ -784,9 +782,6 @@ function makelist() {
 			else
 				for i in ${PRIORITY[@]}; do
 
-					# Test for search pattern in blacklist first
-					grep -q "^${PATTERN}$" ${TMPDIR}/blacklist && continue
-
 					PKGS=$( cut -d\  -f1-7 ${TMPDIR}/pkglist |
 						grep "^${i}.*${PATTERN}" | cut -f6 -d\ )
 
@@ -800,14 +795,9 @@ function makelist() {
 				done
 			fi
 			rm -f $PKGNAMELIST
-			rm ${TMPDIR}/waiting
-
-			echo -e "DONE\n"
-			# We need to return early before the blacklist
-			return
 		;;	
 	esac
-	LIST=$( printf "%s\n" $LIST | applyblacklist | uniq )
+	LIST=$( printf "%s\n" $LIST | applyblacklist | sort | uniq )
 
 	rm ${TMPDIR}/waiting
 
diff --git a/source/ap/slackpkg/files/post-functions.sh b/source/ap/slackpkg/files/post-functions.sh
index a9f86f80..9191766a 100644
--- a/source/ap/slackpkg/files/post-functions.sh
+++ b/source/ap/slackpkg/files/post-functions.sh
@@ -242,19 +242,16 @@ EOF
 		answer
 		case $ANSWER in
 			K|k)
-				break
 			;;
 			O|o)
 				for i in $FILES; do
 					overold $i
 				done
-				break
 			;;
 			R|r)
 				for i in $FILES; do
 					removeold $i
 				done
-				break
 			;;
 			P|p)
 				echo "Select what you want file-by-file"
@@ -288,7 +285,6 @@ EOF
 						esac
 					done
 				done
-				break
 			;;
 			*)
 				echo "
diff --git a/source/ap/slackpkg/files/slackpkg b/source/ap/slackpkg/files/slackpkg
index 2553191d..1076ba33 100644
--- a/source/ap/slackpkg/files/slackpkg
+++ b/source/ap/slackpkg/files/slackpkg
@@ -1,4 +1,4 @@
-#!/bin/sh
+#!/bin/bash
 #
 # SlackPkg - An Automated packaging tool for Slackware Linux
 # Copyright (C) 2003-2011 Roberto F. Batista, Evaldo Gardenali
@@ -70,7 +70,7 @@ SOURCE=$(sed -n '
 	\@^local://@p
 	\@^https\{0,1\}://@p
 	\@^ftps\{0,1\}://@p' $CONF/mirrors)
-. $CONF/slackpkg.conf
+PATH='' builtin source $CONF/slackpkg.conf
 WORKDIR=${ROOT}/${WORKDIR}
 ERROR=""
 
diff --git a/source/ap/slackpkg/slackpkg.SlackBuild b/source/ap/slackpkg/slackpkg.SlackBuild
index 788eb52d..cff9f572 100755
--- a/source/ap/slackpkg/slackpkg.SlackBuild
+++ b/source/ap/slackpkg/slackpkg.SlackBuild
@@ -23,7 +23,7 @@
 cd $(dirname $0) ; CWD=$(pwd)
 
 PKGNAM=slackpkg
-VERSION=${VERSION:-15.0.1}
+VERSION=${VERSION:-15.0.2}
 ARCH="noarch"
 BUILD=${BUILD:-1}
 
diff --git a/source/ap/sqlite/sqlite.SlackBuild b/source/ap/sqlite/sqlite.SlackBuild
index 781f7d40..6e4df6f0 100755
--- a/source/ap/sqlite/sqlite.SlackBuild
+++ b/source/ap/sqlite/sqlite.SlackBuild
@@ -26,7 +26,7 @@
 cd $(dirname $0) ; CWD=$(pwd)
 
 PKGNAM=sqlite
-BUILD=${BUILD:-2}
+BUILD=${BUILD:-1}
 
 # First, convert the .zip file if needed:
 if ls *.zip 1> /dev/null 2> /dev/null ; then
diff --git a/source/installer/ChangeLog.txt b/source/installer/ChangeLog.txt
index bd58b89b..e40e0c17 100644
--- a/source/installer/ChangeLog.txt
+++ b/source/installer/ChangeLog.txt
@@ -1,3 +1,7 @@
+Tue Apr 20 18:46:38 UTC 2021
+  setup: run ldconfig after the packages are installed.
+  Thanks to average_user.
++--------------------------+
 Sat Apr 10 18:46:46 UTC 2021
   setup: update size estimate of a complete installation to 15+ GB.
 +--------------------------+
diff --git a/source/installer/sources/initrd/usr/lib/setup/setup b/source/installer/sources/initrd/usr/lib/setup/setup
index 07972314..a7734983 100755
--- a/source/installer/sources/initrd/usr/lib/setup/setup
+++ b/source/installer/sources/initrd/usr/lib/setup/setup
@@ -100,7 +100,7 @@ mkdir /var/log/mount 2> /dev/null
 
 while [ 0 ]; do
 
- dialog --title "Slackware Linux Setup (version 12.2)" \
+ dialog --title "Slackware Linux Setup (version 15.0)" \
 --menu \
 "Welcome to Slackware Linux Setup.\n\
 Select an option below using the UP/DOWN keys and SPACE or ENTER.\n\
@@ -322,6 +322,10 @@ to choose packages individually." 4 60
   else
     slackinstall --device noremount --promptmode $MODE --srcpath `cat $TMP/SeTDS` --mountpoint /var/log/mount --target $T_PX --series $SERIES
   fi
+  # Run ldconfig on the newly installed system:
+  if [ -x $T_PX/sbin/ldconfig ]; then
+    ( chroot $T_PX ; /sbin/ldconfig )
+  fi
   if [ $MODE = terse ]; then
     # Let's pause a moment and then restore the terminal settings
     sleep 1
diff --git a/source/kde/kde/build/kwin b/source/kde/kde/build/kwin
index d00491fd..0cfbf088 100644
--- a/source/kde/kde/build/kwin
+++ b/source/kde/kde/build/kwin
@@ -1 +1 @@
-1
+2
diff --git a/source/kde/kde/build/okteta b/source/kde/kde/build/okteta
index 0cfbf088..d00491fd 100644
--- a/source/kde/kde/build/okteta
+++ b/source/kde/kde/build/okteta
@@ -1 +1 @@
-2
+1
diff --git a/source/kde/kde/patch/kwin.patch b/source/kde/kde/patch/kwin.patch
new file mode 100644
index 00000000..c2063e72
--- /dev/null
+++ b/source/kde/kde/patch/kwin.patch
@@ -0,0 +1,2 @@
+# delay deletion of wayland streams:
+cat $CWD/patch/kwin/kwin.wayland.stream.diff | patch -p1 --verbose || { touch ${SLACK_KDE_BUILD_DIR}/${PKGNAME}.failed ; continue ; }
diff --git a/source/kde/kde/patch/kwin/kwin.wayland.stream.diff b/source/kde/kde/patch/kwin/kwin.wayland.stream.diff
new file mode 100644
index 00000000..e5c36882
--- /dev/null
+++ b/source/kde/kde/patch/kwin/kwin.wayland.stream.diff
@@ -0,0 +1,12 @@
+diff -urN kwin-5.21.4.orig/plugins/screencast/screencastmanager.cpp kwin-5.21.4/plugins/screencast/screencastmanager.cpp
+--- kwin-5.21.4.orig/plugins/screencast/screencastmanager.cpp	2021-04-06 15:27:01.000000000 +0300
++++ kwin-5.21.4/plugins/screencast/screencastmanager.cpp	2021-04-19 10:58:00.395022083 +0300
+@@ -131,7 +131,7 @@
+     connect(waylandStream, &KWaylandServer::ScreencastStreamV1Interface::finished, stream, &PipeWireStream::stop);
+     connect(stream, &PipeWireStream::stopStreaming, waylandStream, [stream, waylandStream] {
+         waylandStream->sendClosed();
+-        delete stream;
++        stream->deleteLater();
+     });
+     connect(stream, &PipeWireStream::streamReady, stream, [waylandStream] (uint nodeid) {
+         waylandStream->sendCreated(nodeid);
diff --git a/source/l/libtiff/libtiff.SlackBuild b/source/l/libtiff/libtiff.SlackBuild
index 44afea2c..cbadc142 100755
--- a/source/l/libtiff/libtiff.SlackBuild
+++ b/source/l/libtiff/libtiff.SlackBuild
@@ -24,7 +24,7 @@ cd $(dirname $0) ; CWD=$(pwd)
 
 PKGNAM=libtiff
 VERSION=${VERSION:-$(echo tiff-*.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:
 if [ -z "$ARCH" ]; then
diff --git a/source/n/samba/samba.SlackBuild b/source/n/samba/samba.SlackBuild
index 71b6212d..0761cb69 100755
--- a/source/n/samba/samba.SlackBuild
+++ b/source/n/samba/samba.SlackBuild
@@ -26,7 +26,7 @@ cd $(dirname $0) ; CWD=$(pwd)
 
 PKGNAM=samba
 VERSION=${VERSION:-$(echo samba-*.tar.?z | rev | cut -f 3- -d . | cut -f 1 -d - | rev)}
-BUILD=${BUILD:-2}
+BUILD=${BUILD:-1}
 
 if [ -e $CWD/machine.conf ]; then
   . $CWD/machine.conf ]
diff --git a/source/n/samba/samba.url b/source/n/samba/samba.url
index 6aa47a83..d5f3c17d 100644
--- a/source/n/samba/samba.url
+++ b/source/n/samba/samba.url
@@ -1,2 +1,2 @@
-https://download.samba.org/pub/samba/stable/samba-4.14.0.tar.gz
-https://download.samba.org/pub/samba/stable/samba-4.14.0.tar.asc
+https://download.samba.org/pub/samba/stable/samba-4.14.3.tar.gz
+https://download.samba.org/pub/samba/stable/samba-4.14.3.tar.asc
diff --git a/source/x/x11/build/xorg-cf-files b/source/x/x11/build/xorg-cf-files
index 7ed6ff82..1e8b3149 100644
--- a/source/x/x11/build/xorg-cf-files
+++ b/source/x/x11/build/xorg-cf-files
@@ -1 +1 @@
-5
+6
diff --git a/source/x/x11/patch/xorg-cf-files.patch b/source/x/x11/patch/xorg-cf-files.patch
new file mode 100644
index 00000000..f00f2628
--- /dev/null
+++ b/source/x/x11/patch/xorg-cf-files.patch
@@ -0,0 +1 @@
+zcat $CWD/patch/xorg-cf-files/Imake.tmpl-binutils-ar-2.36.patch.gz | patch -p1 || { touch ${SLACK_X_BUILD_DIR}/${PKGNAME}.failed ; continue ; }
diff --git a/source/x/x11/patch/xorg-cf-files/Imake.tmpl-binutils-ar-2.36.patch b/source/x/x11/patch/xorg-cf-files/Imake.tmpl-binutils-ar-2.36.patch
new file mode 100644
index 00000000..55b6d8dc
--- /dev/null
+++ b/source/x/x11/patch/xorg-cf-files/Imake.tmpl-binutils-ar-2.36.patch
@@ -0,0 +1,27 @@
+--- xorg-cf-files-1.0.6/Imake.tmpl.orig	2021-04-15 11:06:19.978750979 -0700
++++ xorg-cf-files-1.0.6/Imake.tmpl	2021-04-15 11:07:02.421749295 -0700
+@@ -1081,21 +1081,21 @@
+ #if HasLargeTmp || SystemV4
+ #define ArCmd ArCmdBase cq
+ #else
+-#define ArCmd ArCmdBase clq
++#define ArCmd ArCmdBase cq
+ #endif
+ #endif
+ #ifndef ArAddCmd
+ #if HasLargeTmp || SystemV4
+ #define ArAddCmd ArCmdBase ru
+ #else
+-#define ArAddCmd ArCmdBase rul
++#define ArAddCmd ArCmdBase ru
+ #endif
+ #endif
+ #ifndef ArExtCmd
+ #if HasLargeTmp || SystemV4
+ #define ArExtCmd ArCmdBase x
+ #else
+-#define ArExtCmd ArCmdBase xl
++#define ArExtCmd ArCmdBase x
+ #endif
+ #endif
+ #ifndef BootstrapCFlags