Thu Mar 18 23:54:14 UTC 202120210318235414

ap/slackpkg-15.0.1-noarch-1.txz:  Upgraded.
  Tweak default blacklist file's help text (thanks, dive).
  Fix display of blacklisted packages.
  Tweaks to slack-desc.
  Note that kernel-headers should not be blacklisted.
  Added Lithuania mirrors (Totoro-kun on LQ).
  Fix exit code for pending updates (dive).
  Avoid matching txz/tgz etc extension when blacklisting (dive).
  Use https for all slackpkg homepage links.
  Update mirror files (14.2 -> 15.0).
  Add blacklist to search option.
  Move applyblacklist to end of makelist().
  Clarify how to blacklist duplicate packages.
  Fix new-config dialog.
  Reduce false positives in DOUBLEFILES detection.
  Remove spaces in awk..
  More blacklisting fixups (see full commit msg).
  Escape plus signs in blacklist regex.
  Convert ${ROOT}/${WORKDIR} > ${WORKDIR} (dive).
  Convert ${ROOT}/${CONF} -> ${CONF} and tweak blacklists (dive).
  Further fixup/enhancement to blacklisting issues.
  Fix "slackpkg blacklist" so that it shows blacklist again.
  Fixup internal blacklist handling.
  Use ERE for sanity_check() function (David Woodfall).
  Remove "slackpkg blacklist" from manual pages.
  Fix aaa_elflibs --> aaa_libraries in sample blacklist file (mozes).
  Split aarch64 and arm mirrors into separate files (mozes).
  Allow new-config after slackpkg upgrade itself (PiterPUNK).
  Modify blacklist regex line ending.
  Thanks to Robby Workman.
ap/sqlite-3.35.2-x86_64-1.txz:  Upgraded.
kde/kid3-3.8.6-x86_64-1.txz:  Upgraded.
l/glib2-2.66.8-x86_64-1.txz:  Upgraded.
l/pango-1.48.3-x86_64-2.txz:  Rebuilt.
  Eliminate dangling symlink. Thanks to upnort.
n/bind-9.16.13-x86_64-1.txz:  Upgraded.
n/links-2.22-x86_64-1.txz:  Upgraded.
n/network-scripts-15.0-noarch-14.txz:  Rebuilt.
  Fix discrepancies between rc.inet1.conf versions.
  Move configuration of SLACC before DHCP.
  Don't bring up a bridge interface if it will be brought up later by IP config.
  Fix a typo in br_open when configuring IFOPTS: i->1.
  Add SLAAC security and privacy options.
  Fix typo of 'default'.
  Added debugging output around new SLAAC enhancements.
  Move enabling RA before SLAAC security section.  Thanks to davjohn on LQ.
  Fix domain name validation checks.  Thanks to xbeastx74 on LQ for the report.
  Thanks to Darren "Tadgy" Austin and Robby Workman.
n/wireless_tools-30.pre9-x86_64-5.txz:  Rebuilt.
  rc.wireless: don't leave interfaces in up state as it prevents SLAAC.
  Take interface down at exit from rc.wireless.  Thanks to davjohn.
x/libgee-0.20.4-x86_64-1.txz:  Upgraded.

1 files changed, 20 insertions, 17 deletions

diff --git a/source/ap/slackpkg/files/slackpkg b/source/ap/slackpkg/files/slackpkg
index 49a123764..2553191dc 100644
--- a/source/ap/slackpkg/files/slackpkg
+++ b/source/ap/slackpkg/files/slackpkg
@@ -17,7 +17,7 @@
 # along with this program; if not, write to the Free Software
 # Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
 #
-# Project Page: http://slackpkg.org/
+# Project Page: https://slackpkg.org/
 # Roberto F. Batista (aka PiterPunk) piterpunk@slackware.com
 # Evaldo Gardenali (aka UdontKnow) evaldogardenali@fasternet.com.br
 #
@@ -52,7 +52,10 @@ fi
 VERSION=@VERSION@
 PATH=/bin:/usr/bin:/sbin:/usr/sbin
 SLACKWARE_VERSION=$(cat /etc/slackware-version | cut -f2 -d\ )
-CONF=${CONF:-/etc/slackpkg}
+
+[ -z "$ROOT" ] && CONF=${CONF:-/etc/slackpkg}
+[ -n "$ROOT" ] && CONF=${CONF:-"${ROOT}/etc/slackpkg"}
+
 SOURCE=$(sed -n '
 	# Remove leading and trailing blanks
 	s/^[[:blank:]]*//
@@ -68,6 +71,7 @@ SOURCE=$(sed -n '
 	\@^https\{0,1\}://@p
 	\@^ftps\{0,1\}://@p' $CONF/mirrors)
 . $CONF/slackpkg.conf
+WORKDIR=${ROOT}/${WORKDIR}
 ERROR=""
 
 # Set temporary directory
@@ -238,6 +242,10 @@ while [ -n "$1" ] ; do
       fi
       shift $#
     ;;
+    blacklist)
+      CMD=$1
+      shift $#
+    ;;
     update)
       CMD=$1
       shift
@@ -324,12 +332,13 @@ 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
 		fi
 		;;
 	show-changelog)
 		# display changelog and exit
-		if [ -e ${ROOT}/${WORKDIR}/ChangeLog.txt ]; then
-			$MORECMD ${ROOT}/${WORKDIR}/ChangeLog.txt
+		if [ -e ${WORKDIR}/ChangeLog.txt ]; then
+			$MORECMD ${WORKDIR}/ChangeLog.txt
 		else
 			echo "ChangeLog.txt file not found. Aborting"
 		fi
@@ -472,17 +481,11 @@ case "$CMD" in
 		fi
 	;;
 	blacklist)
-		#
-		# If blacklist is called without package name, list
-		# all blacklisted packages
-		if [ "$INPUTLIST" = "" ]; then
-			echo -e "Packages in blacklist:\n"
-			grep -e "^\([a-z]\)" $CONF/blacklist | $MORECMD
-			cleanup
-		fi
-		
-		# As of 15.0, this function just runs /bin/false and exits with a comment
-		blacklist_pkg
+		echo -e "Edit /etc/slackpkg/blacklist to add or remove packages."
+		echo -e ""
+		echo -e "Packages in blacklist:\n"
+		grep -v "^#" $CONF/blacklist | $MORECMD
+		echo -e ""
 	;;
 	file-search)
 		PATTERN=$(echo $ARG | sed -e 's/\+/\\\+/g' -e 's/\./\\\./g' -e 's/ /\|/g')
@@ -523,7 +526,7 @@ case "$CMD" in
 				if ( found != 1 ) {
 			print \"No packages found! Try:\n\n\tslackpkg search $PATTERN\n\nand choose one (and ONLY one package).\n\"
 				}
-			}" ${ROOT}/${WORKDIR}/PACKAGES.TXT 2>/dev/null
+			}" ${WORKDIR}/PACKAGES.TXT 2>/dev/null
 	;;
 	new-config)
 		POSTINST=on
@@ -597,7 +600,7 @@ esac
 # That options don't change configurations files and, if 
 # someone remove the kernel, i hope he knows what is doing.
 #
-for i in check-updates remove search file-search update info \
+for i in check-updates remove search file-search update info blacklist \
 	 clean-system download generate-template remove-template; do
 	if [ "$CMD" = "$i" ]; then
 		POSTINST=off