Mon Feb 8 05:13:26 UTC 202120210208051326

a/aaa_elflibs-15.0-x86_64-30.txz:  Removed.
  Renamed to aaa_libraries.
a/aaa_glibc-solibs-2.32-x86_64-2.txz:  Added.
  This package has been renamed from glibc-solibs, which helps avoid trouble
  if someone upgrades using "upgradepkg --install-new */*.txz" by upgrading
  this package before aaa_libraries. Otherwise, if aaa_libraries is upgraded
  first any libraries in it that are linked against a newer version of glibc
  than the one installed on the system would refuse to load.
a/aaa_libraries-15.0-x86_64-1.txz:  Added.
  This package has been renamed from aaa_elflibs to insure that it will come
  after aaa_glibc-solibs when upgraded in alphabetical order.
  Upgraded: libcap.so.2.48, libelf-0.183.so, libglib-2.0.so.0.6600.6,
  libgmodule-2.0.so.0.6600.6, libgobject-2.0.so.0.6600.6,
  libgthread-2.0.so.0.6600.6.
  Added: libtirpc.so.3.0.0.
a/btrfs-progs-5.10.1-x86_64-1.txz:  Upgraded.
a/glibc-solibs-2.32-x86_64-1.txz:  Removed.
  Renamed to aaa_glibc-solibs.
a/kernel-generic-5.10.14-x86_64-1.txz:  Upgraded.
a/kernel-huge-5.10.14-x86_64-1.txz:  Upgraded.
a/kernel-modules-5.10.14-x86_64-1.txz:  Upgraded.
ap/slackpkg-15.0-noarch-1.txz:  Upgraded.
  These are some of the important changes (see the ChangeLog for more):
  Note that this slackpkg release contains a backwards-incompatible change to
  the blacklisting syntax (e.g. glibc ---> glibc-*). This changes the prior
  behavior of the blacklist function; previously, adding "glibc" to the
  blacklist would cause glibc, glibc-profile, glibc-zoneinfo, et al to be
  ignored by slackpkg. The new behavior is that *only* the glibc package is
  ignored. If you want to blacklist all packages whose names begin with glibc,
  you would need to add "glibc.*" to the blacklist now. Also note that any
  special characters, e.g. "+", will need to be escaped in the blacklist file.
  To blacklist entire package sets, a trailing slash is now required: e.g. kde/
  Another backwards-incompatibility warning: check-updates will now return 1 if
  there are updates available - this will make it easier to use this feature
  with cron (thanks to Peter Hyman).
  Added support for Slackware-AArch64 (thanks to Stuart Winter).
  Added aaa_glibc-solibs and aaa_libraries to the "do these first" routine.
  Thanks to Robby Workman for the new slackpkg release!
ap/soma-3.3.7-noarch-1.txz:  Upgraded.
  Thanks to David Woodfall.
ap/xorriso-1.5.4.pl02-x86_64-1.txz:  Upgraded.
d/help2man-1.48.1-x86_64-1.txz:  Upgraded.
d/kernel-headers-5.10.14-x86-1.txz:  Upgraded.
k/kernel-source-5.10.14-noarch-1.txz:  Upgraded.
l/elfutils-0.183-x86_64-1.txz:  Upgraded.
l/glibc-2.32-x86_64-2.txz:  Rebuilt.
l/glibc-i18n-2.32-x86_64-2.txz:  Rebuilt.
l/glibc-profile-2.32-x86_64-2.txz:  Rebuilt.
l/lcms2-2.12-x86_64-1.txz:  Upgraded.
l/libburn-1.5.4-x86_64-1.txz:  Upgraded.
x/xf86-input-wacom-0.40.0-x86_64-1.txz:  Upgraded.
isolinux/initrd.img:  Rebuilt.
kernels/*:  Upgraded.
usb-and-pxe-installers/usbboot.img:  Rebuilt.

1 files changed, 45 insertions, 14 deletions

diff --git a/source/ap/slackpkg/files/post-functions.sh b/source/ap/slackpkg/files/post-functions.sh
index b5fecd395..593c47b0f 100644
--- a/source/ap/slackpkg/files/post-functions.sh
+++ b/source/ap/slackpkg/files/post-functions.sh
@@ -47,7 +47,7 @@ mergenew() {
 				;;
 				I|i)
 					if [ -f "${FULLNAME}.smerge" ]; then
-						if [ -e "${FULLNAME}" ]; then
+						if [ -e "${FULLNAME}" ] && [ "$ORIG_BACKUPS" != "off" ]; then
 							mv "${FULLNAME}" "${FULLNAME}.orig"
 						fi
 						mv "${FULLNAME}.smerge" "${FULLNAME}"
@@ -101,7 +101,7 @@ overold() {
 	FILEPATH=$(dirname $i)
 	FULLNAME="${FILEPATH}/${BASENAME}"
 
-	if [ -e ${FULLNAME} ]; then
+	if [ -e ${FULLNAME} ] && [ "$ORIG_BACKUPS" != "off" ]; then
 	    mv ${FULLNAME} ${FULLNAME}.orig
 	fi
 	mv ${FULLNAME}.new ${FULLNAME}
@@ -141,21 +141,52 @@ looknew() {
 		-not -name "shadow.new" \
 		-not -name "gshadow.new" 2>/dev/null | sort 2>/dev/null)
 	if [ "$FILES" != "" ]; then
-		echo -e "\n\
-Some packages had new configuration files installed.
+		newcount=$(echo "$FILES" | wc -l)
+		echo -ne "\n\
+Some packages had new configuration files installed ($newcount new files):\n\n"
+
+		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:
 
 	(K)eep the old files and consider .new files later
 
-	(O)verwrite all old files with the new ones. The
-	   old files will be stored with the suffix .orig
-
+	(O)verwrite all old files with the new ones"
+		[ "$ORIG_BACKUPS" != "off" ] && echo -ne ". The
+	   old files will be stored with the suffix .orig"
+		echo -e "\n\n\
 	(R)emove all .new files
 
 	(P)rompt K, O, R selection for every single file
-	
+
 What do you want (K/O/R/P)?"
-		answer	
+		answer
 		case $ANSWER in
 			K|k)
 				break
@@ -178,7 +209,7 @@ What do you want (K/O/R/P)?"
 					GOEX=0
 					while [ $GOEX -eq 0 ]; do
 						echo
-                                                showmenu $i "(K)eep" "(O)verwrite" "(R)emove" "(D)iff" "(M)erge" "(V)imdiff"
+						showmenu $i "(K)eep" "(O)verwrite" "(R)emove" "(D)iff" "(M)erge" "(V)imdiff"
 						read ANSWER
 						case $ANSWER in
 							O|o)
@@ -195,9 +226,9 @@ What do you want (K/O/R/P)?"
 							M|m)
 								mergenew $1
 							;;
-                                                        V|v)
-                                                                runvimdiff $1
-                                                        ;;
+							V|v)
+								runvimdiff $1
+							;;
 							K|k|*)
 								GOEX=1
 							;;
@@ -236,7 +267,7 @@ Your kernel image was updated, and lilo does not appear to be used on
 your system.  You may need to adjust your boot manager (like GRUB) to 
 boot the appropriate kernel (after generating an initrd if required)."
 		fi
-		echo -e "Press any key to continue...\n "
+		echo -e "Press the \"Enter\" key to continue...\n "
 		read _junk
 	fi
 }