Mon Oct 25 19:30:42 UTC 202120211025193042

ap/slackpkg-15.0.8-noarch-1.txz:  Upgraded.
  Author: piterpunk <piterpunk@slackware.com>
  To make it easier to do an unattended slackpkg update/upgrade process,
  this commit provides different exit codes for many situations:
    0    Successful slackpkg execution.
    1    Something wrong happened.
    20   No package found to be downloaded, installed, reinstalled,
         upgraded, or removed.
    50   Slackpkg itself was upgraded and you need to re-run it.
    100  There are pending updates.
  Code and the main manpage are updated accordingly.
  In addition, this commit also:
  - removes the ChangeLog.txt in doinst.sh, so the needed
    'slackpkg update' after Slackpkg upgrade won't say it's all OK
    and doesn't need to redo the package lists
  - removes AUTHORS from manpage. Nowadays there is code from many
    people in Slackpkg and it seems a bit unfair to have only my and
    Evaldo's name listed there.
  Signed-off-by: Robby Workman <rworkman@slackware.com>
d/meson-0.60.0-x86_64-1.txz:  Upgraded.
l/ffmpeg-4.4.1-x86_64-1.txz:  Upgraded.
l/imagemagick-7.1.0_11-x86_64-1.txz:  Upgraded.
l/libcap-2.60-x86_64-1.txz:  Upgraded.
l/libsoup-2.74.1-x86_64-1.txz:  Upgraded.
l/sip-4.19.25-x86_64-3.txz:  Rebuilt.
  Drop the Qt4 modules. Thanks to gmgf.
n/dhcpcd-9.4.1-x86_64-1.txz:  Upgraded.
testing/packages/linux-5.14.x/kernel-generic-5.14.14-x86_64-3.txz:  Rebuilt.
testing/packages/linux-5.14.x/kernel-headers-5.14.14-x86-3.txz:  Rebuilt.
testing/packages/linux-5.14.x/kernel-huge-5.14.14-x86_64-3.txz:  Rebuilt.
testing/packages/linux-5.14.x/kernel-modules-5.14.14-x86_64-3.txz:  Rebuilt.
testing/packages/linux-5.14.x/kernel-source-5.14.14-noarch-3.txz:  Rebuilt.
  Let's enable SCHED_AUTOGROUP, which should improve desktop latency under a
  heavy CPU load while being mostly inert on servers. It may be disabled at
  boot time with a "noautogroup" kernel parameter, or at runtime like this:
  echo 0 > /proc/sys/kernel/sched_autogroup_enabled
  Thanks to gbschenkel.
  SCHED_AUTOGROUP n -> y

9 files changed, 34 insertions, 79 deletions

diff --git a/source/ap/mariadb/mariadb.SlackBuild b/source/ap/mariadb/mariadb.SlackBuild
index 63428060..bfbff136 100755
--- a/source/ap/mariadb/mariadb.SlackBuild
+++ b/source/ap/mariadb/mariadb.SlackBuild
@@ -90,13 +90,6 @@ rm -rf ${PKGNAM}-$VERSION
 tar xvf $CWD/${PKGNAM}-$VERSION.tar.?z || exit 1
 cd ${PKGNAM}-$VERSION || exit 1
 
-# Fix mysql_install_db if PAM is not installed:
-if [ ! -L /lib${LIBDIRSUFFIX}/libpam.so.? ]; then
-  zcat $CWD/mysql_install_db.nopam.diff.gz | patch -p1 --verbose || exit 1
-  # Also no PAM plugin then:
-  zcat $CWD/mysql.no.plugin_auth_pam.diff.gz | patch -p1 --verbose || exit 1
-fi
-
 chown -R root:root .
 find . \
  \( -perm 777 -o -perm 775 -o -perm 711 -o -perm 555 -o -perm 511 \) \
diff --git a/source/ap/mariadb/mysql.no.plugin_auth_pam.diff b/source/ap/mariadb/mysql.no.plugin_auth_pam.diff
deleted file mode 100644
index 34eedf5a..00000000
--- a/source/ap/mariadb/mysql.no.plugin_auth_pam.diff
+++ /dev/null
@@ -1,11 +0,0 @@
---- ./cmake/build_configurations/mysql_release.cmake.orig	2019-09-08 16:02:29.000000000 -0500
-+++ ./cmake/build_configurations/mysql_release.cmake	2019-09-11 14:56:53.845129062 -0500
-@@ -124,7 +124,7 @@
- 
- IF(UNIX)
-   SET(WITH_EXTRA_CHARSETS all CACHE STRING "")
--  SET(PLUGIN_AUTH_PAM YES)
-+  SET(PLUGIN_AUTH_PAM NO)
- 
-   IF(CMAKE_SYSTEM_NAME STREQUAL "Linux")
-     IF(NOT IGNORE_AIO_CHECK)
diff --git a/source/ap/mariadb/mysql_install_db.nopam.diff b/source/ap/mariadb/mysql_install_db.nopam.diff
deleted file mode 100644
index 70503865..00000000
--- a/source/ap/mariadb/mysql_install_db.nopam.diff
+++ /dev/null
@@ -1,48 +0,0 @@
---- ./scripts/mysql_install_db.sh.orig	2020-01-28 11:31:09.088303502 -0600
-+++ ./scripts/mysql_install_db.sh	2020-01-28 11:35:47.822283410 -0600
-@@ -480,25 +480,26 @@
- 
- if test -n "$user"
- then
--  if test -z "$srcdir" -a "$in_rpm" -eq 0
--  then
--    chown 0 "$pamtooldir/auth_pam_tool_dir/auth_pam_tool" && \
--    chmod 04755 "$pamtooldir/auth_pam_tool_dir/auth_pam_tool"
--    if test $? -ne 0
--    then
--        echo "Couldn't set an owner to '$pamtooldir/auth_pam_tool_dir/auth_pam_tool'."
--        echo "It must be root, the PAM authentication plugin doesn't work otherwise.."
--        echo
--    fi
--    chown $user "$pamtooldir/auth_pam_tool_dir" && \
--    chmod 0700 "$pamtooldir/auth_pam_tool_dir"
--    if test $? -ne 0
--    then
--        echo "Cannot change ownership of the '$pamtooldir/auth_pam_tool_dir' directory"
--        echo "to the '$user' user. Check that you have the necessary permissions and try again."
--        echo
--    fi
--  fi
-+  # Commented out since Slackware does not currently provide PAM:
-+  #if test -z "$srcdir" -a "$in_rpm" -eq 0
-+  #then
-+  #  chown 0 "$pamtooldir/auth_pam_tool_dir/auth_pam_tool" && \
-+  #  chmod 04755 "$pamtooldir/auth_pam_tool_dir/auth_pam_tool"
-+  #  if test $? -ne 0
-+  #  then
-+  #      echo "Couldn't set an owner to '$pamtooldir/auth_pam_tool_dir/auth_pam_tool'."
-+  #      echo "It must be root, the PAM authentication plugin doesn't work otherwise.."
-+  #      echo
-+  #  fi
-+  #  chown $user "$pamtooldir/auth_pam_tool_dir" && \
-+  #  chmod 0700 "$pamtooldir/auth_pam_tool_dir"
-+  #  if test $? -ne 0
-+  #  then
-+  #      echo "Cannot change ownership of the '$pamtooldir/auth_pam_tool_dir' directory"
-+  #      echo "to the '$user' user. Check that you have the necessary permissions and try again."
-+  #      echo
-+  #  fi
-+  #fi
-   args="$args --user=$user"
- fi
- 
diff --git a/source/ap/slackpkg/doinst.sh b/source/ap/slackpkg/doinst.sh
index 02790a48..77264140 100644
--- a/source/ap/slackpkg/doinst.sh
+++ b/source/ap/slackpkg/doinst.sh
@@ -39,5 +39,6 @@ copy_mirror_file
 config etc/slackpkg/mirrors.new
 config etc/slackpkg/slackpkg.conf.new
 config etc/slackpkg/blacklist.new
+rm -f var/lib/slackpkg/ChangeLog.txt
 rm -f var/lib/slackpkg/pkglist
 rm -f var/lib/slackpkg/CHECKSUMS.md5*
diff --git a/source/ap/slackpkg/files/ChangeLog b/source/ap/slackpkg/files/ChangeLog
index 8f875390..d61aa208 100644
--- a/source/ap/slackpkg/files/ChangeLog
+++ b/source/ap/slackpkg/files/ChangeLog
@@ -1,3 +1,8 @@
+Sun Oct 24 19:44:21 CDT 2021
+---------------
+	- Release 15.0.8
+	- New exit status for different situations (Piter PUNK)
+
 Mon Aug 16 02:14:02 UTC 2021
 ---------------
 	- Release 15.0.7
diff --git a/source/ap/slackpkg/files/core-functions.sh b/source/ap/slackpkg/files/core-functions.sh
index 1a506277..5969ffcc 100644
--- a/source/ap/slackpkg/files/core-functions.sh
+++ b/source/ap/slackpkg/files/core-functions.sh
@@ -7,7 +7,7 @@
 # Clean-up tmp and lock files
 #
 function cleanup() {
-	local retval=${PENDING_UPDATES:-0}
+	local retval=${EXIT_CODE:-0}
 	[ "$SPINNING" = "off" ] || tput cnorm
 	if [ -e $TMPDIR/error.log ]; then
 		retval=1
diff --git a/source/ap/slackpkg/files/slackpkg b/source/ap/slackpkg/files/slackpkg
index f606574a..de02d051 100644
--- a/source/ap/slackpkg/files/slackpkg
+++ b/source/ap/slackpkg/files/slackpkg
@@ -332,7 +332,7 @@ case "$CMD" in
 			echo "Slackpkg: No updated packages since last check."
 		else
 			echo "Slackpkg: Updated packages are available since last check." >&2
-			PENDING_UPDATES=1
+			EXIT_CODE=100
 		fi
 		;;
 	show-changelog)
@@ -368,6 +368,7 @@ case "$CMD" in
 			echo -e "No packages match the pattern for install. Try:"
 			echo -e "\n\t$0 reinstall|upgrade $2\n"
 			POSTINST=off
+			EXIT_CODE=20
 		fi
 	;;
 	reinstall)
@@ -379,6 +380,7 @@ case "$CMD" in
 			echo -e "No packages match the pattern for reinstall. Try:"
 			echo -e "\n\t$0 install|upgrade $2\n"
 			POSTINST=off
+			EXIT_CODE=20
 		fi
 	;;
 	upgrade)
@@ -391,6 +393,7 @@ case "$CMD" in
 			echo -e "No packages match the pattern for upgrade. Try:"
 			echo -e "\n\t$0 install|reinstall $2\n"
 			POSTINST=off
+			EXIT_CODE=20
 		fi
 	;;
 	download)
@@ -404,12 +407,14 @@ case "$CMD" in
 		else
 			echo -e "No packages match the pattern for download."
 			POSTINST=off
+			EXIT_CODE=20
 		fi
 	;;
 	remove)
 		makelist $INPUTLIST
 		if [ "$LIST" = "" ]; then
 			echo -e "The file(s) $INPUTLIST can't be removed - package not installed.\n"
+			EXIT_CODE=20
 			cleanup
 		fi
 		showlist "$LIST" $CMD
@@ -423,6 +428,7 @@ case "$CMD" in
 		else
 			echo -e "No packages match the pattern for clean-system\n"
 			POSTINST=off
+			EXIT_CODE=20
 		fi
 	;;
 	upgrade-all)
@@ -432,6 +438,7 @@ case "$CMD" in
 			echo -e "No packages match the pattern for upgrade. Try:"
 			echo -e "\n\t$0 install|reinstall $2\n"
 			POSTINST=off
+			EXIT_CODE=20
 		else
 			showlist "$LIST" upgrade
 			if [ "$DOWNLOAD_ALL" = "on" ]; then
@@ -447,8 +454,9 @@ case "$CMD" in
 			if [ "$FOUND" != "" ]; then 
 				getpkg $FOUND upgradepkg Upgrading
 				echo -e "slackpkg was upgraded - you will need start the upgrade process again...\n"
+				EXIT_CODE=50
 				cleanup
-				exit 0
+				exit ${EXIT_CODE}
 			fi
 			for i in pkgtools aaa_glibc-solibs glibc-solibs aaa_libraries aaa_elflibs readline sed; do
 				FOUND=""
@@ -466,6 +474,7 @@ case "$CMD" in
 			echo -e "No packages match the pattern for install. Try:"
 			echo -e "\n\t$0 upgrade|reinstall $2\n"
 			POSTINST=off
+			EXIT_CODE=20
 		else
 			showlist "$LIST" install
 			install_pkg
diff --git a/source/ap/slackpkg/files/slackpkg.8 b/source/ap/slackpkg/files/slackpkg.8
index ab36202e..46acc277 100644
--- a/source/ap/slackpkg/files/slackpkg.8
+++ b/source/ap/slackpkg/files/slackpkg.8
@@ -1,4 +1,4 @@
-.TH SLACKPKG 8 "March 12, 2021" slackpkg-15.0.1 ""
+.TH SLACKPKG 8 "Oct 8, 2021" slackpkg-15.0.8 ""
 .SH NAME
 .B slackpkg
 \- Automated tool for managing Slackware Linux packages
@@ -305,6 +305,20 @@ If you happen to be looking for a filename-with-space, you are safe to use the
 left-most part up to the space (in that the right-most part after the space
 will be ignored anyway (at best) or yield noise (at worst)).
 
+.SH EXIT STATUS
+.P
+.IP "\fB0\fP" 5
+Successful slackpkg execution.
+.IP "\fB1\fP" 5
+Something wrong happened.
+.IP "\fB20\fP" 5
+No package found to be downloaded, installed, reinstalled, upgraded, or
+removed.
+.IP "\fB50\fP" 5
+Slackpkg itself was upgraded and you need to re-run it.
+.IP "\fB100\fP" 5
+There are pending updates.
+
 .SH FILES
 .TP 5
 .B /etc/slackpkg/mirrors
@@ -333,11 +347,3 @@ ChangeLog.txt, list of files, etcetera...
 .BR explodepkg (8),
 .BR makepkg (8),
 .BR pkgtool (8).
-
-.SH AUTHORS
-.TP 5
-Piter PUNK aka Roberto F Batista
-<piterpk AT terra DOT com DOT br>
-.TP 5
-Evaldo Gardenali aka UdontKnow
-<evaldo AT fasternet DOT com DOT br>
diff --git a/source/ap/slackpkg/slackpkg.SlackBuild b/source/ap/slackpkg/slackpkg.SlackBuild
index 76c0347f..0cc9b56d 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.7}
+VERSION=${VERSION:-15.0.8}
 ARCH="noarch"
 BUILD=${BUILD:-1}