Thu May 31 04:55:33 UTC 201820180531045533

a/kernel-generic-4.14.47-x86_64-1.txz:  Upgraded.
a/kernel-huge-4.14.47-x86_64-1.txz:  Upgraded.
  SCSI_DPT_I2O m -> y
  SCSI_ISCI m -> y (thanks to wael_h)
a/kernel-modules-4.14.47-x86_64-1.txz:  Upgraded.
a/pkgtools-15.0-noarch-14.txz:  Rebuilt.
  installpkg: rarely, an uncompressed size that's not quite to the next level
  (e.g., 1020K) will exceed the expected length and cause a --terse line to
  be one character longer than --terselength. Chop lines to --terselength
  before outputting them. The trailing ']' might be dropped, but no big deal.
ap/slackpkg-2.83.0-noarch-1.txz:  Upgraded.
  Release 2.83.0; thanks to orbea, Didier Spaier, burdi01, David Allen,
  Eduard Rozenberg, and Stuart Winter for various fixes and enhancements.
  Allow using vimdiff to compare .new and original files
  Numerous fixups for alternate $ROOT
  .new config files are sorted so that display order should be consistent
  among multiple machines
  Abort operation if system date is near epoch (mostly relevant for ARM
  machines and others with no RTC)
  Update Slackware ARM gpg key
  Update Slackware ARM mirror list
  No longer offer to run lilo - simply advise user that the kernel image has
  changed and give advice, but also require a keypress to (hopefully) confirm
  that the message was actually read
  mandoc lint fixes to slackpkg.8
  Warn user if a -current mirror is selected (but only warn once)
d/git-2.17.1-x86_64-1.txz:  Upgraded.
d/kernel-headers-4.14.47-x86-1.txz:  Upgraded.
d/rust-1.26.1-x86_64-1.txz:  Upgraded.
k/kernel-source-4.14.47-noarch-1.txz:  Upgraded.
l/fftw-3.3.8-x86_64-1.txz:  Upgraded.
l/imagemagick-6.9.9_48-x86_64-1.txz:  Upgraded.
n/network-scripts-15.0-noarch-8.txz:  Rebuilt.
  Allow setting an interface in promiscuous mode; this is needed for networking
  to function properly in containers
  Fixup setting of IPALIASES (allow non /32 masks; not only is the /32 mask not
  required and even undesirable in some cases, this makes ipv6 support easier
  to integrate (and Darren is working on that as well)
  Thanks to Darren Austin.
n/stunnel-5.46-x86_64-1.txz:  Upgraded.
n/ulogd-2.0.7-x86_64-2.txz:  Rebuilt.
  Fixed empty logrotate file.
x/xorg-server-1.20.0-x86_64-2.txz:  Rebuilt.
  Patched to fix nouveau segfault. Thanks to Rod3775 for the patch.
x/xorg-server-xephyr-1.20.0-x86_64-2.txz:  Rebuilt.
x/xorg-server-xnest-1.20.0-x86_64-2.txz:  Rebuilt.
x/xorg-server-xvfb-1.20.0-x86_64-2.txz:  Rebuilt.
xap/network-manager-applet-1.8.12-x86_64-2.txz:  Rebuilt.
  Patched crash bug. Thanks to gmgf.
isolinux/initrd.img:  Rebuilt.
kernels/*:  Upgraded.
usb-and-pxe-installers/usbboot.img:  Rebuilt.

1 files changed, 34 insertions, 13 deletions

diff --git a/source/ap/slackpkg/files/post-functions.sh b/source/ap/slackpkg/files/post-functions.sh
index c286e7af7..b5fecd395 100644
--- a/source/ap/slackpkg/files/post-functions.sh
+++ b/source/ap/slackpkg/files/post-functions.sh
@@ -111,6 +111,18 @@ removeold() {
 	rm $i
 }
 
+runvimdiff() {
+        BASENAME=$(basename $i .new)
+        FILEPATH=$(dirname $i)
+        FULLNAME="${FILEPATH}/${BASENAME}"
+
+        if [ -e ${FULLNAME} ]; then
+            vimdiff ${FULLNAME} ${FULLNAME}.new
+        else
+            echo "file $FULLNAME doesn't exist"
+        fi
+}
+
 looknew() {
 
 	# with ONLY_NEW_DOTNEW set, slackpkg will search only for
@@ -122,12 +134,12 @@ looknew() {
 	fi
 
 	echo -e "\nSearching for NEW configuration files"
-	FILES=$(find /etc /var/yp /usr/share/vim -name "*.new" ${ONLY_NEW_DOTNEW} \
+	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)
+		-not -name "gshadow.new" 2>/dev/null | sort 2>/dev/null)
 	if [ "$FILES" != "" ]; then
 		echo -e "\n\
 Some packages had new configuration files installed.
@@ -166,7 +178,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"
+                                                showmenu $i "(K)eep" "(O)verwrite" "(R)emove" "(D)iff" "(M)erge" "(V)imdiff"
 						read ANSWER
 						case $ANSWER in
 							O|o)
@@ -183,6 +195,9 @@ What do you want (K/O/R/P)?"
 							M|m)
 								mergenew $1
 							;;
+                                                        V|v)
+                                                                runvimdiff $1
+                                                        ;;
 							K|k|*)
 								GOEX=1
 							;;
@@ -203,19 +218,25 @@ What do you want (K/O/R/P)?"
 lookkernel() {
 	NEWKERNELMD5=$(md5sum /boot/vmlinuz 2>/dev/null)
 	if [ "$KERNELMD5" != "$NEWKERNELMD5" ]; then
-		if [ -x /sbin/lilo ]; then
+		if [ -x /sbin/lilo ] && [ -r /etc/lilo.conf ] && grep -q initrd /etc/lilo.conf ; then
+			echo -e "\n
+Your kernel image was updated, and your /etc/lilo.conf indicates
+the use of an initrd for at least one of your kernels. Be sure to
+regenerate the initrd for the new kernel and handle any needed 
+updates to your bootloader.
+"
+		elif [ -x /sbin/lilo ] && [ -r /etc/lilo.conf ] ; then
 			echo -e "\n
-Your kernel image was updated.  We highly recommend you run: lilo
-Do you want slackpkg to run lilo now? (Y/n)"
-			answer
-			if [ "$ANSWER" != "n" ] && [ "$ANSWER" != "N" ]; then
-				/sbin/lilo
-			fi
+Your kernel image was updated.  Be sure to handle any needed updates
+to your bootloader (possibly as simple as running /sbin/lilo).
+"
 		else
 			echo -e "\n
-Your kernel image was updated and lilo is not found on your system.
-You may need to adjust your boot manager (like GRUB) to boot appropriate
-kernel."
+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 "
+		read _junk
 	fi
 }