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, 94 insertions, 39 deletions

diff --git a/source/ap/slackpkg/files/post-functions.sh b/source/ap/slackpkg/files/post-functions.sh
index 593c47b0f..a9f86f80e 100644
--- a/source/ap/slackpkg/files/post-functions.sh
+++ b/source/ap/slackpkg/files/post-functions.sh
@@ -124,6 +124,10 @@ runvimdiff() {
 }
 
 looknew() {
+	local ROWS SIZE FILES PROMPTTEXT TEXTLINES MAXROWS
+	local newcount f n fn
+	f=0
+	n=0
 
 	# with ONLY_NEW_DOTNEW set, slackpkg will search only for
 	# .new files installed in actual slackpkg's execution
@@ -133,59 +137,108 @@ looknew() {
 		ONLY_NEW_DOTNEW=""
 	fi
 
-	echo -e "\nSearching for NEW configuration files"
-	FILES=$(find ${ROOT}/etc ${ROOT}/var/yp ${ROOT}/usr/share/vim -name "*.new" ${ONLY_NEW_DOTNEW} \
+	printf "%s\n" "Searching for NEW configuration files..."
+
+	FILES=$( find \
+		${ROOT}/etc \
+		${ROOT}/var/yp \
+		${ROOT}/usr/share/vim \
+		-name "*.new" \
+		${ONLY_NEW_DOTNEW} \
 		-not -name "rc.inet1.conf.new" \
 		-not -name "group.new" \
 		-not -name "passwd.new" \
 		-not -name "shadow.new" \
-		-not -name "gshadow.new" 2>/dev/null | sort 2>/dev/null)
-	if [ "$FILES" != "" ]; then
-		newcount=$(echo "$FILES" | wc -l)
-		echo -ne "\n\
-Some packages had new configuration files installed ($newcount new files):\n\n"
+		-not -name "gshadow.new" 2>/dev/null |
+		sort -V 2>/dev/null )
 
-		SIZE=$(stty size)
+	if [ -n "$FILES" ]; then
+		newcount=$( echo "$FILES" | wc -l )
+		SIZE=$( stty size )
 		ROWS=${SIZE% *}
-		LISTMAX=$((ROWS-20))
 
-		if [ $newcount -le $LISTMAX ]; then
-			echo -e "$FILES"
-		else
-			F=0
-			for FN in $FILES; do
-				F=$((F+1))
-				echo "$FN"
-
-				if [ $F -ge $LISTMAX ]; then
-					F=0
-					echo -ne "\nPress SPACE for more, ENTER to skip"
-					IFS=$'\n' read -rn 1 junk
-					echo -e "\n"
-					
-					if [ "$junk" = " " ]; then
-						continue
-					elif [ "$junk" = "" ]; then
-						break
-					fi
-				fi
-			done
-		fi
-
-		echo -ne "\n\
-You have four choices:
+		# Set here so we can count the No. of lines
+		PROMPTTEXT="\n\
+What do you want (K/O/R/P)?
 
 	(K)eep the old files and consider .new files later
 
 	(O)verwrite all old files with the new ones"
-		[ "$ORIG_BACKUPS" != "off" ] && echo -ne ". The
+
+		[ "$ORIG_BACKUPS" != "off" ] && PROMPTTEXT+=". The
 	   old files will be stored with the suffix .orig"
-		echo -e "\n\n\
+
+		PROMPTTEXT+="\n\n\
 	(R)emove all .new files
 
-	(P)rompt K, O, R selection for every single file
+	(P)rompt K, O, R selection for every single file\n"
+
+		printf "%s %s\n\n" "Some packages had new configuration" \
+			"files installed ($newcount new files):"
+
+		# 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.
+			printf "%s\n" "$FILES"
+		else
+			# Won't all fit, so scroll a screenfull at a time.
+			# No. of lines minus 'Searching for' + 'Press SPACE...'
+			MAXROWS=$(( ROWS - 5 ))
+
+			for fn in $FILES; do
+				junk=" "
+				f=$(( f + 1 ))
+				n=$(( n + 1 ))
+				echo "$fn"
+
+				# Stop printing at bottom of screen
+				if [ $f -ge $MAXROWS ]; then
+
+					# No. of lines minus 'Press SPACE...'
+					MAXROWS=$(( ROWS - 2 ))
+					f=0
+					IFS=$( printf "\n" ) read -rn 1 -p "
+	Press SPACE for more, ENTER to skip" junk
+
+					# Enter pressed
+					if [ -z "$junk" ]; then
+						tput -S <<EOF
+						cuu 1
+						el 2
+						cuu 1
+						el 2
+EOF
+						break
+					else
+						# Space pressed
+						printf "\n"
+						tput -S <<EOF
+						cuu 1
+						el 2
+						cuu 1
+						el 2
+EOF
+					fi
+				fi
+			done
+
+			# Final prompt to stop list scrolling off the top
+			if [ ! -z "$junk" ] && [ $f -ne 0 ]; then
+				IFS=$( printf "\n" ) read -rn 1 -p "
+	Press any key to continue" junk
+				printf "\n"
+				tput -S <<EOF
+				cuu 1
+				el 2
+				cuu 1
+				el 2
+EOF
+			fi
+		fi
 
-What do you want (K/O/R/P)?"
+		printf %b "$PROMPTTEXT"
 		answer
 		case $ANSWER in
 			K|k)
@@ -238,7 +291,9 @@ What do you want (K/O/R/P)?"
 				break
 			;;
 			*)
-				echo "OK! Your choice is nothing! slackpkg will Keep the old files for you to deal with later"
+				echo "
+OK! Your choice is nothing! slackpkg will Keep the old files \
+for you to deal with later"
 			;;
 		esac
 	else