Mon Jun 7 18:53:49 UTC 202120210607185349

Hey folks! Sorry about the delay in getting this batch out but I had other
distractions going on here last week that prevented getting this one wrapped
up. Anyway, probably the highlight of this update set is that we've decided
to abandon the 5.10 LTS kernel in favor of following the latest one. We've
never really had a policy that required LTS in a stable release although that
is how it has been done for years, but based on comments from the Slackware
community it seems like 5.10 LTS isn't getting a lot of love and lacks
hardware support that people need now. Conversely, the reports on 5.12 have
been almost entirely positive, so we're going to provide what we think is the
best available kernel. It's unlikely that we'll see another LTS prior to
release, so the plan for maintenance is to keep following the latest kernels
as needed for security purposes. If that means we have to jump to a new branch
while supporting the stable release, we'll start the kernel out in testing
first until we've had some feedback that it's safe to move it to the patches
directory. Sooner or later we will end up on an LTS kernel again, and at that
point we'll just roll with that one. Feel free to comment (or complain) about
this plan on LQ... I'll be curious to see what people think. Anyway, enjoy!
a/hwdata-0.348-noarch-1.txz:  Upgraded.
a/kernel-generic-5.12.9-x86_64-1.txz:  Upgraded.
a/kernel-huge-5.12.9-x86_64-1.txz:  Upgraded.
a/kernel-modules-5.12.9-x86_64-1.txz:  Upgraded.
ap/ispell-3.4.04-x86_64-1.txz:  Upgraded.
ap/mpg123-1.28.0-x86_64-1.txz:  Upgraded.
ap/slackpkg-15.0.5-noarch-1.txz:  Upgraded.
  Add "--" option to "command cd" in bash completion file. (akinomyoga)
  shell-completions/slackpkg.bash: add "show-changelog".
  Import bash-completion file from upstream project.
  Added the new-config actions for specific files. (Piter PUNK)
  Harden slackpkg with respect to obtaining GPG key. (CRTS)
d/clisp-2.50_20191103_c26de7873-x86_64-5.txz:  Rebuilt.
  Upgraded to libffcall-2.3.
d/git-2.32.0-x86_64-1.txz:  Upgraded.
d/kernel-headers-5.12.9-x86-1.txz:  Upgraded.
d/poke-1.3-x86_64-1.txz:  Upgraded.
d/vala-0.52.4-x86_64-1.txz:  Upgraded.
k/kernel-source-5.12.9-noarch-1.txz:  Upgraded.
kde/calligra-3.2.1-x86_64-9.txz:  Rebuilt.
  Recompiled against poppler-21.06.1.
kde/cantor-21.04.1-x86_64-2.txz:  Rebuilt.
  Recompiled against poppler-21.06.1.
kde/digikam-7.2.0-x86_64-3.txz:  Rebuilt.
  Recompiled against imagemagick-7.0.11_14.
kde/kfilemetadata-5.82.0-x86_64-2.txz:  Rebuilt.
  Recompiled against poppler-21.06.1.
kde/kile-2.9.93-x86_64-9.txz:  Rebuilt.
  Recompiled against poppler-21.06.1.
kde/kitinerary-21.04.1-x86_64-2.txz:  Rebuilt.
  Recompiled against poppler-21.06.1.
kde/krita-4.4.3-x86_64-5.txz:  Rebuilt.
  Recompiled against poppler-21.06.1.
kde/okular-21.04.1-x86_64-2.txz:  Rebuilt.
  Recompiled against poppler-21.06.1.
l/alsa-lib-1.2.5-x86_64-2.txz:  Rebuilt.
  Account for unexpected packing of the conf file tarballs. We'll see if this
  is enough to make things work well again.
l/at-spi2-core-2.40.2-x86_64-1.txz:  Upgraded.
l/dvdauthor-0.7.2-x86_64-5.txz:  Rebuilt.
  Recompiled against imagemagick-7.0.11_14.
l/libogg-1.3.5-x86_64-1.txz:  Upgraded.
l/librsvg-2.50.7-x86_64-1.txz:  Upgraded.
l/pipewire-0.3.29-x86_64-1.txz:  Upgraded.
l/polkit-0.119-x86_64-1.txz:  Upgraded.
  This update includes a mitigation for local privilege escalation using
  polkit_system_bus_name_get_creds_sync().
  For more information, see:
    https://cve.mitre.org/cgi-bin/cvename.cgi?name=CVE-2021-3560
  (* Security fix *)
l/poppler-21.06.1-x86_64-1.txz:  Upgraded.
  Shared library .so-version bump.
l/pycairo-1.20.1-x86_64-1.txz:  Upgraded.
l/qca-2.3.3-x86_64-1.txz:  Upgraded.
l/vte-0.64.2-x86_64-1.txz:  Upgraded.
n/epic5-2.1.5-x86_64-1.txz:  Upgraded.
n/httpd-2.4.48-x86_64-1.txz:  Upgraded.
  This release contains security fixes and improvements.
  mod_http2: Fix a potential NULL pointer dereference.
  Unexpected <Location> section matching with 'MergeSlashes OFF'.
  mod_auth_digest: possible stack overflow by one nul byte while validating
  the Digest nonce.
  mod_session: Fix possible crash due to NULL pointer dereference, which
  could be used to cause a Denial of Service with a malicious backend
  server and SessionHeader.
  mod_session: Fix possible crash due to NULL pointer dereference, which
  could be used to cause a Denial of Service.
  mod_proxy_http: Fix possible crash due to NULL pointer dereference, which
  could be used to cause a Denial of Service.
  mod_proxy_wstunnel, mod_proxy_http: Handle Upgradable protocols end-to-end
  negotiation.
  For more information, see:
    https://cve.mitre.org/cgi-bin/cvename.cgi?name=CVE-2021-31618
    https://cve.mitre.org/cgi-bin/cvename.cgi?name=CVE-2021-30641
    https://cve.mitre.org/cgi-bin/cvename.cgi?name=CVE-2020-35452
    https://cve.mitre.org/cgi-bin/cvename.cgi?name=CVE-2021-26691
    https://cve.mitre.org/cgi-bin/cvename.cgi?name=CVE-2021-26690
    https://cve.mitre.org/cgi-bin/cvename.cgi?name=CVE-2020-13950
    https://cve.mitre.org/cgi-bin/cvename.cgi?name=CVE-2019-17567
  (* Security fix *)
n/libmbim-1.24.8-x86_64-1.txz:  Upgraded.
n/libqmi-1.28.6-x86_64-1.txz:  Upgraded.
n/nettle-3.7.3-x86_64-1.txz:  Upgraded.
n/openldap-2.4.59-x86_64-1.txz:  Upgraded.
n/p11-kit-0.24.0-x86_64-1.txz:  Upgraded.
n/php-7.4.20-x86_64-1.txz:  Upgraded.
n/vsftpd-3.0.4-x86_64-1.txz:  Upgraded.
n/whois-5.5.10-x86_64-1.txz:  Upgraded.
x/libX11-1.7.2-x86_64-1.txz:  Upgraded.
  This is a bug fix release, correcting a regression introduced by and
  improving the checks from the fix for CVE-2021-31535.
x/libinput-1.18.0-x86_64-1.txz:  Upgraded.
x/mesa-21.1.2-x86_64-1.txz:  Upgraded.
xap/blueman-2.2.1-x86_64-1.txz:  Upgraded.
xap/gnuplot-5.4.2-x86_64-1.txz:  Upgraded.
xap/mozilla-thunderbird-78.11.0-x86_64-1.txz:  Upgraded.
  This release contains security fixes and improvements.
  For more information, see:
    https://www.mozilla.org/en-US/thunderbird/78.11.0/releasenotes/
    https://www.mozilla.org/en-US/security/advisories/mfsa2021-26/
    https://cve.mitre.org/cgi-bin/cvename.cgi?name=CVE-2021-29964
    https://cve.mitre.org/cgi-bin/cvename.cgi?name=CVE-2021-29967
  (* Security fix *)
xap/pidgin-2.14.5-x86_64-1.txz:  Upgraded.
xap/xine-lib-1.2.11-x86_64-6.txz:  Rebuilt.
  Recompiled against poppler-21.06.1.
extra/bash-completion/bash-completion-2.11-noarch-2.txz:  Rebuilt.
  Removed the slackpkg completion file.
extra/php8/php8-8.0.7-x86_64-1.txz:  Upgraded.
isolinux/initrd.img:  Rebuilt.
kernels/*:  Upgraded.
usb-and-pxe-installers/usbboot.img:  Rebuilt.

7 files changed, 220 insertions, 24 deletions

diff --git a/source/ap/slackpkg/files/ChangeLog b/source/ap/slackpkg/files/ChangeLog
index 1b7172f52..08608ae58 100644
--- a/source/ap/slackpkg/files/ChangeLog
+++ b/source/ap/slackpkg/files/ChangeLog
@@ -1,3 +1,17 @@
+Sat Jun  5 03:54:45 UTC 2021
+---------------
+	- Release 15.0.5
+	- Add "--" option to "command cd" in bash completion file
+	  (akinomyoga)
+
+Sat Jun  5 03:30:43 UTC 2021
+---------------
+	- Release 15.0.4
+	- shell-completions/slackpkg.bash: add "show-changelog"
+	- Import bash-completion file from upstream project
+	- Added the new-config actions for specific files (Piter PUNK)
+	- Harden slackpkg with respect to obtaining GPG key (CRTS)
+
 Mon May  3 23:53:57 UTC 2021
 ---------------
 	- Release 15.0.3
diff --git a/source/ap/slackpkg/files/core-functions.sh b/source/ap/slackpkg/files/core-functions.sh
index a579f9fe0..69f80620f 100644
--- a/source/ap/slackpkg/files/core-functions.sh
+++ b/source/ap/slackpkg/files/core-functions.sh
@@ -64,9 +64,14 @@ function system_setup() {
 	# Create $WORKDIR just in case
 	mkdir -p "${WORKDIR}"
 
+	# Select the command to fetch files and packages from network sources
+	if [ "$DOWNLOADER" = "curl" ]; then
+		DOWNLOADER="curl ${CURLFLAGS} -o"
+	else
+               	DOWNLOADER="wget ${WGETFLAGS} -O"
+	fi
+
 	# Set LOCAL if mirror isn't through network 
-	# If mirror is through network, select the command to fetch
-	# files and packages from there.
 	#
 	MEDIA=${SOURCE%%:*}
 	if [ "$MEDIA" = "cdrom" ] || [ "$MEDIA" = "file" ] || \
@@ -75,11 +80,6 @@ function system_setup() {
 		LOCAL=1
 	else
 		LOCAL=0
-		if [ "$DOWNLOADER" = "curl" ]; then
-			DOWNLOADER="curl ${CURLFLAGS} -o"
-		else
-                	DOWNLOADER="wget ${WGETFLAGS} -O"
-		fi
 	fi
 
 	# Set MORECMD, EDITCMD and check BATCH mode 
@@ -555,6 +555,42 @@ function checkgpg() {
 	gpg --verify ${1}.asc ${1} 2>/dev/null && echo "1" || echo "0"
 }
 
+function get_gpg_key() {
+	if ping -c 1 slackware.com &>/dev/null; then
+		echo -e "\t\t\tGetting key from https://www.slackware.com/infra/keys/GPG-KEY"
+		$DOWNLOADER $TMPDIR/gpgkey https://www.slackware.com/infra/keys/GPG-KEY &>/dev/null
+	elif ping -c 1 mirrors.slackware.com &>/dev/null; then
+		echo -e "\t\t\tGetting key from https://mirrors.slackware.com/slackware/slackware-current/GPG-KEY"
+		$DOWNLOADER $TMPDIR/gpgkey https://mirrors.slackware.com/slackware/slackware-current/GPG-KEY &>/dev/null
+	else
+                echo -e "\
+slackpkg is unable to get the Slackware GPG key from either\n\
+slackware.com or mirrors.slackware.com; if you trust the\n\
+source you have configured in /etc/slackpkg/mirrors, slackpkg\n\
+can import the GPG key from that source.\n\
+The source currently in use is:\n\
+\t ${SOURCE}\n\
+Do you want to import the GPG key from this source? (YES|NO)\n"
+                read ANSWER
+                case "$ANSWER" in
+                        YES|Y|yes|y)
+                         	getfile ${SOURCE}GPG-KEY $TMPDIR/gpgkey
+                        ;;
+                        *)
+                                echo -e "\t\tslackpkg is unable to get the Slackware GPG key."
+				cleanup
+                        ;;
+                esac
+	fi
+}
+
+function import_gpg_key() {
+	mkdir -p ~/.gnupg
+	gpg --yes --batch --delete-key "$SLACKKEY" &>/dev/null
+	gpg --import $TMPDIR/gpgkey &>/dev/null && \
+	echo -e "\t\t\tSlackware Linux Project's GPG key added"
+}
+
 # Found packages in repository. 
 # This function selects the package from the higher priority
 # repository directories.
@@ -904,7 +940,7 @@ function getfile() {
                 echo -e "\t\t\tDownloading $1..."
 		$DOWNLOADER $2 $1
         fi
-}                                                       
+}
 
 # Function to download the correct package and many "checks"
 #
diff --git a/source/ap/slackpkg/files/post-functions.conf-sample b/source/ap/slackpkg/files/post-functions.conf-sample
new file mode 100644
index 000000000..1cbe04ad0
--- /dev/null
+++ b/source/ap/slackpkg/files/post-functions.conf-sample
@@ -0,0 +1,14 @@
+# You can list here the .new files and the default action 
+# to do for each file. The list format is:
+# 
+# /full/path/of/dot/new/file.new:action
+# 
+# The action can be:
+# 
+# O to Overwrite it with the new version
+# R to Remove the new file
+# K to Keep the current and the .new files
+#
+# E.g:
+#/etc/slackpkg/mirrors.new:K
+#/etc/ntp.conf.new:R
diff --git a/source/ap/slackpkg/files/post-functions.sh b/source/ap/slackpkg/files/post-functions.sh
index 9191766a0..e0036430f 100644
--- a/source/ap/slackpkg/files/post-functions.sh
+++ b/source/ap/slackpkg/files/post-functions.sh
@@ -137,6 +137,12 @@ looknew() {
 		ONLY_NEW_DOTNEW=""
 	fi
 
+	# if there is a /etc/slackpkg/post-functions.conf file, it will be
+	# used to take the pre-defined action to each file specified there.
+	if [ -f /etc/slackpkg/post-functions.conf ]; then
+		NEWCONFIG="/etc/slackpkg/post-functions.conf"
+	fi
+
 	printf "%s\n" "Searching for NEW configuration files..."
 
 	FILES=$( find \
@@ -179,8 +185,8 @@ What do you want (K/O/R/P)?
 		# No. of prompt etc. lines to print.
 		TEXTLINES=$(( $( printf %b "$PROMPTTEXT" | wc -l ) + 3 ))
 
-		if [ $(( newcount + TEXTLINES )) -lt $ROWS ]; then
-			# All files will fit on screen.
+		if [ $(( newcount + TEXTLINES )) -lt $ROWS ] || [ "${BATCH}" = "on" ]; then
+			# All files will fit on screen or is a batch execution.
 			printf "%s\n" "$FILES"
 		else
 			# Won't all fit, so scroll a screenfull at a time.
@@ -240,6 +246,9 @@ EOF
 
 		printf %b "$PROMPTTEXT"
 		answer
+		if [ "${BATCH}" = "on" ] && [ -n "${NEWCONFIG}" ]; then
+			ANSWER=P
+		fi
 		case $ANSWER in
 			K|k)
 			;;
@@ -256,11 +265,24 @@ EOF
 			P|p)
 				echo "Select what you want file-by-file"
 				for i in $FILES; do
+					if [ -n "${NEWCONFIG}" ]; then
+						AUTOANSWER="$(sed -ne 's#^'$i':\([ORK]\)#\1#p' $NEWCONFIG 2>/dev/null)"
+					fi	
 					GOEX=0
 					while [ $GOEX -eq 0 ]; do
 						echo
 						showmenu $i "(K)eep" "(O)verwrite" "(R)emove" "(D)iff" "(M)erge" "(V)imdiff"
-						read ANSWER
+						if [ -n "${AUTOANSWER}" ]; then
+							ANSWER=$AUTOANSWER
+							echo $ANSWER
+						else
+							if [ "${BATCH}" = "on" ]; then
+								ANSWER=K
+								echo $ANSWER
+							else
+								read ANSWER
+							fi
+						fi
 						case $ANSWER in
 							O|o)
 								overold $i
diff --git a/source/ap/slackpkg/files/shell-completion/slackpkg.bash b/source/ap/slackpkg/files/shell-completion/slackpkg.bash
new file mode 100644
index 000000000..7be2bb280
--- /dev/null
+++ b/source/ap/slackpkg/files/shell-completion/slackpkg.bash
@@ -0,0 +1,114 @@
+# bash completion for slackpkg(8)                          -*- shell-script -*-
+# options list is based on `grep '\-.*\=.*)' /usr/sbin/slackpkg | cut -f1 -d\)`
+
+_slackpkg()
+{
+    local cur prev words cword
+    _init_completion -n = || return
+
+    local split=false
+    if [[ $cur == -?*=* ]]; then
+        prev="${cur%%?(\\)=*}"
+        cur="${cur#*=}"
+        split=true
+    fi
+
+    case "$prev" in
+        -delall | -checkmd5 | -checkgpg | -checksize | -postinst | -onoff | \
+            -download_all | -dialog | -batch | -only_new_dotnew | \
+            -use_includes | -spinning)
+            COMPREPLY=($(compgen -W 'on off' -- "$cur"))
+            return
+            ;;
+        -default_answer)
+            COMPREPLY=($(compgen -W 'yes no' -- "$cur"))
+            return
+            ;;
+        -dialog_maxargs | -mirror)
+            # argument required but no completions available
+            return
+            ;;
+    esac
+
+    $split && return
+
+    if [[ $cur == -* ]]; then
+        compopt -o nospace
+        COMPREPLY=($(compgen -W '-delall= -checkmd5= -checkgpg=
+            -checksize= -postinst= -onoff= -download_all= -dialog=
+            -dialog_maxargs= -batch= -only_new_dotnew= -use_includes=
+            -spinning= -default_answer= -mirror=' -- "$cur"))
+        return
+    fi
+
+    local confdir="/etc/slackpkg"
+    local config="$confdir/slackpkg.conf"
+
+    [[ -r $config ]] || return
+    . "$config"
+
+    local i action
+    for ((i = 1; i < ${#words[@]}; i++)); do
+        if [[ ${words[i]} != -* ]]; then
+            action="${words[i]}"
+            break
+        fi
+    done
+
+    case "$action" in
+        generate-template | search | file-search)
+            # argument required but no completions available
+            return
+            ;;
+        install-template | remove-template)
+            if [[ -e $confdir/templates ]]; then
+                COMPREPLY=($(
+                    command cd -- "$confdir/templates"
+                    compgen -f -X "!*.template" -- "$cur"
+                ))
+                COMPREPLY=(${COMPREPLY[@]%.template})
+            fi
+            return
+            ;;
+        remove)
+            _filedir
+            COMPREPLY+=($(compgen -W 'a ap d e f k kde kdei l n t tcl x
+                xap xfce y' -- "$cur"))
+            COMPREPLY+=($(
+                command cd /var/log/packages
+                compgen -f -- "$cur"
+            ))
+            return
+            ;;
+        install | reinstall | upgrade | blacklist | download)
+            _filedir
+            COMPREPLY+=($(compgen -W 'a ap d e f k kde kdei l n t tcl x
+                xap xfce y' -- "$cur"))
+            COMPREPLY+=($(cut -f 6 -d\  "${WORKDIR}/pkglist" 2>/dev/null |
+                command grep "^$cur"))
+            return
+            ;;
+        info)
+            COMPREPLY=($(cut -f 6 -d\  "${WORKDIR}/pkglist" 2>/dev/null |
+                command grep "^$cur"))
+            return
+            ;;
+        update)
+            # we should complete the same as the next `list` + "gpg"
+            COMPREPLY=($(compgen -W 'gpg' -- "$cur"))
+            ;&
+        *)
+            COMPREPLY+=($(compgen -W 'install reinstall upgrade remove
+                blacklist download update install-new upgrade-all
+                clean-system new-config check-updates help generate-template
+                install-template remove-template search file-search info
+                show-changelog' -- \
+                "$cur"))
+            return
+            ;;
+    esac
+
+} &&
+    complete -F _slackpkg slackpkg
+
+# ex: filetype=sh
diff --git a/source/ap/slackpkg/files/slackpkg b/source/ap/slackpkg/files/slackpkg
index 1076ba330..f606574a1 100644
--- a/source/ap/slackpkg/files/slackpkg
+++ b/source/ap/slackpkg/files/slackpkg
@@ -350,17 +350,8 @@ case "$CMD" in
 		# the key
 		#
 		if [ "$UPARG" = "gpg" ] || [ "$GPGFIRSTTIME" = "0" ]; then
-			#
-			# Creates .gnupg directory if doesn't exist
-			# without this dir, gpg got an error.
-			#
-			if ! [ -e ~/.gnupg ]; then
-				mkdir ~/.gnupg
-			fi
-			getfile ${SOURCE}GPG-KEY $TMPDIR/gpgkey 
-			gpg --yes --batch --delete-key "$SLACKKEY" &>/dev/null
-			gpg --import $TMPDIR/gpgkey &>/dev/null && \
-			echo -e "\t\t\tSlackware Linux Project's GPG key added"
+			get_gpg_key && import_gpg_key
+
 			if [ "$UPARG" = "gpg" ]; then
 				cleanup
 			fi
diff --git a/source/ap/slackpkg/slackpkg.SlackBuild b/source/ap/slackpkg/slackpkg.SlackBuild
index eae23f859..60dcf16e6 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.3}
+VERSION=${VERSION:-15.0.5}
 ARCH="noarch"
 BUILD=${BUILD:-1}
 
@@ -55,7 +55,8 @@ chown root:root $PKG/usr/sbin/slackpkg
 
 # Prepare /etc directory:
 mkdir -pv $PKG/etc/slackpkg
-cp -av blacklist.new slackpkg.conf.new $PKG/etc/slackpkg
+cp -av blacklist.new slackpkg.conf.new post-functions.conf-sample \
+  $PKG/etc/slackpkg
 chmod 644 $PKG/etc/slackpkg/*
 chown root:root $PKG/etc/slackpkg/*
 mkdir -pv $PKG/etc/slackpkg/templates
@@ -99,6 +100,10 @@ chown -R root:root $PKG/usr/man
 # Compress manual pages
 find $PKG/usr/man -type f -exec gzip -9 {} \;
 
+# Install bash-completion file
+mkdir -p $PKG/usr/share/bash-completion/completions
+cat $CWD/files/shell-completion/slackpkg.bash > $PKG/usr/share/bash-completion/completions/slackpkg
+
 # Update version number:
 sed -i "s/@VERSION@/$VERSION/g" $PKG/usr/sbin/slackpkg