Mon Jan 13 00:11:55 UTC 202020200113001155

a/elvis-2.2_0-x86_64-5.txz:  Rebuilt.
  Don't make /usr/bin/{ex,vi} symlinks.
a/kernel-generic-5.4.11-x86_64-1.txz:  Upgraded.
a/kernel-huge-5.4.11-x86_64-1.txz:  Upgraded.
a/kernel-modules-5.4.11-x86_64-1.txz:  Upgraded.
a/nvi-1.81.6-x86_64-1.txz:  Added.
  This is an implementation of the classic ex/vi text editor written by Keith
  Bostic. Due to this having UTF8 support which elvis lacks, we'll have it
  take over the ex/vi symlinks if they aren't already pointing to a different
  choice. Note that the removal of vi/ex symlinks from the elvis and vim
  packages might cause your ex/vi symlinks to point to this after all the ex/vi
  packages have been upgraded. You can set them to your preferences using
  pkgtool -> Setup -> vi-ex.
a/pkgtools-15.0-noarch-29.txz:  Rebuilt.
  Added an installer/pkgtool menu to select the default ex/vi editor.
ap/vim-8.2.0114-x86_64-1.txz:  Upgraded.
  Don't make /usr/bin/{ex,vi} symlinks.
d/kernel-headers-5.4.11-x86-1.txz:  Upgraded.
d/python-setuptools-45.0.0-x86_64-1.txz:  Upgraded.
k/kernel-source-5.4.11-noarch-1.txz:  Upgraded.
l/imagemagick-7.0.9_15-x86_64-1.txz:  Upgraded.
n/ethtool-5.4-x86_64-1.txz:  Upgraded.
xap/vim-gvim-8.2.0114-x86_64-1.txz:  Upgraded.
isolinux/initrd.img:  Rebuilt.
kernels/*:  Upgraded.
usb-and-pxe-installers/usbboot.img:  Rebuilt.

7 files changed, 19 insertions, 16 deletions

diff --git a/slackware64/a/maketag b/slackware64/a/maketag
index 4279554e..737e3b4d 100644
--- a/slackware64/a/maketag
+++ b/slackware64/a/maketag
@@ -35,7 +35,7 @@ system. :^) Press ENTER when you are done."  21 76 10 \
 "efibootmgr" "Tool to modify UEFI boot entries" "on" \
 "efivar" "Library and tools to handle UEFI variables" "on" \
 "elilo" "Linux Loader for EFI-based platforms" "on" \
-"elvis" "elvis text editor (vi clone) - REQUIRED" "on" \
+"elvis" "elvis text editor (ex/vi clone)" "on" \
 "etc" "System config files & utilities - REQUIRED" "on" \
 "eudev" "Manages /dev and modules - REQUIRED" "on" \
 "f2fs-tools" "Flash-Friendly File System" "on" \
@@ -61,9 +61,9 @@ system. :^) Press ENTER when you are done."  21 76 10 \
 "jfsutils" "Utilities for IBM's Journaled Filesystem" "on" \
 "kbd" "Change keyboard and console mappings" "on" \
 "kernel-firmware" "Linux kernel firmware -- REQUIRED" "on" \
-"kernel-generic" "Generic 5.4.10 kernel (needs an initrd)" "on" \
-"kernel-huge" "Loaded 5.4.10 Linux kernel" "on" \
-"kernel-modules" "Linux 5.4.10 kernel modules -- REQUIRED" "on" \
+"kernel-generic" "Generic 5.4.11 kernel (needs an initrd)" "on" \
+"kernel-huge" "Loaded 5.4.11 Linux kernel" "on" \
+"kernel-modules" "Linux 5.4.11 kernel modules -- REQUIRED" "on" \
 "kmod" "Kernel module utilities -- REQUIRED" "on" \
 "lbzip2" "Parallel bzip2 compressor" "on" \
 "less" "A text pager utility - REQUIRED" "on" \
@@ -85,6 +85,7 @@ system. :^) Press ENTER when you are done."  21 76 10 \
 "mtx" "Controls tape autochangers" "on" \
 "ncompress" "The historic compress utility" "on" \
 "ntfs-3g" "FUSE-based NTFS read-write mount program" "on" \
+"nvi" "nvi text editor (ex/vi clone)" "on" \
 "openssl-solibs" "OpenSSL shared libraries -- REQUIRED" "on" \
 "openssl10-solibs" "OpenSSL shared libraries version 1.0.x" "on" \
 "os-prober" "A tool for finding bootable OS partitions" "on" \
@@ -130,7 +131,7 @@ if [ $? = 1 -o $? = 255 ]; then
  rm -f $TMP/SeTpkgs
  > $TMP/SeTnewtag
  for pkg in \
-aaa_base aaa_elflibs aaa_terminfo acl acpid attr bash bin btrfs-progs bzip2 coreutils cpio cpufrequtils cryptsetup dbus dcron devs dialog dosfstools e2fsprogs ed efibootmgr efivar elilo elvis etc eudev f2fs-tools file findutils floppy gawk genpower gettext glibc-solibs glibc-zoneinfo gpm gptfdisk grep grub gzip haveged hdparm hostname hwdata infozip inotify-tools jfsutils kbd kernel-firmware kernel-generic kernel-huge kernel-modules kmod lbzip2 less lhasa libcgroup libgudev lilo logrotate lrzip lvm2 lzip lzlib mcelog mdadm minicom mkinitrd mlocate mt-st mtx ncompress ntfs-3g openssl-solibs openssl10-solibs os-prober patch pciutils pcmciautils pkgtools plzip procps-ng quota reiserfsprogs rpm2tgz sdparm sed shadow sharutils smartmontools splitvt sysfsutils sysklogd syslinux sysvinit sysvinit-functions sysvinit-scripts tar tcsh time tree udisks udisks2 unarj upower usb_modeswitch usbutils utempter util-linux which xfsprogs xz zoo \
+aaa_base aaa_elflibs aaa_terminfo acl acpid attr bash bin btrfs-progs bzip2 coreutils cpio cpufrequtils cryptsetup dbus dcron devs dialog dosfstools e2fsprogs ed efibootmgr efivar elilo elvis etc eudev f2fs-tools file findutils floppy gawk genpower gettext glibc-solibs glibc-zoneinfo gpm gptfdisk grep grub gzip haveged hdparm hostname hwdata infozip inotify-tools jfsutils kbd kernel-firmware kernel-generic kernel-huge kernel-modules kmod lbzip2 less lhasa libcgroup libgudev lilo logrotate lrzip lvm2 lzip lzlib mcelog mdadm minicom mkinitrd mlocate mt-st mtx ncompress ntfs-3g nvi openssl-solibs openssl10-solibs os-prober patch pciutils pcmciautils pkgtools plzip procps-ng quota reiserfsprogs rpm2tgz sdparm sed shadow sharutils smartmontools splitvt sysfsutils sysklogd syslinux sysvinit sysvinit-functions sysvinit-scripts tar tcsh time tree udisks udisks2 unarj upower usb_modeswitch usbutils utempter util-linux which xfsprogs xz zoo \
   ; do
   echo "$pkg: SKP" >> $TMP/SeTnewtag
  done
@@ -138,7 +139,7 @@ aaa_base aaa_elflibs aaa_terminfo acl acpid attr bash bin btrfs-progs bzip2 core
 fi
 cat /dev/null > $TMP/SeTnewtag
 for PACKAGE in \
-aaa_base aaa_elflibs aaa_terminfo acl acpid attr bash bin btrfs-progs bzip2 coreutils cpio cpufrequtils cryptsetup dbus dcron devs dialog dosfstools e2fsprogs ed efibootmgr efivar elilo elvis etc eudev f2fs-tools file findutils floppy gawk genpower gettext glibc-solibs glibc-zoneinfo gpm gptfdisk grep grub gzip haveged hdparm hostname hwdata infozip inotify-tools jfsutils kbd kernel-firmware kernel-generic kernel-huge kernel-modules kmod lbzip2 less lhasa libcgroup libgudev lilo logrotate lrzip lvm2 lzip lzlib mcelog mdadm minicom mkinitrd mlocate mt-st mtx ncompress ntfs-3g openssl-solibs openssl10-solibs os-prober patch pciutils pcmciautils pkgtools plzip procps-ng quota reiserfsprogs rpm2tgz sdparm sed shadow sharutils smartmontools splitvt sysfsutils sysklogd syslinux sysvinit sysvinit-functions sysvinit-scripts tar tcsh time tree udisks udisks2 unarj upower usb_modeswitch usbutils utempter util-linux which xfsprogs xz zoo \
+aaa_base aaa_elflibs aaa_terminfo acl acpid attr bash bin btrfs-progs bzip2 coreutils cpio cpufrequtils cryptsetup dbus dcron devs dialog dosfstools e2fsprogs ed efibootmgr efivar elilo elvis etc eudev f2fs-tools file findutils floppy gawk genpower gettext glibc-solibs glibc-zoneinfo gpm gptfdisk grep grub gzip haveged hdparm hostname hwdata infozip inotify-tools jfsutils kbd kernel-firmware kernel-generic kernel-huge kernel-modules kmod lbzip2 less lhasa libcgroup libgudev lilo logrotate lrzip lvm2 lzip lzlib mcelog mdadm minicom mkinitrd mlocate mt-st mtx ncompress ntfs-3g nvi openssl-solibs openssl10-solibs os-prober patch pciutils pcmciautils pkgtools plzip procps-ng quota reiserfsprogs rpm2tgz sdparm sed shadow sharutils smartmontools splitvt sysfsutils sysklogd syslinux sysvinit sysvinit-functions sysvinit-scripts tar tcsh time tree udisks udisks2 unarj upower usb_modeswitch usbutils utempter util-linux which xfsprogs xz zoo \
  ; do
  if grep "\(^\| \)$PACKAGE\( \|$\)" $TMP/SeTpkgs 1> /dev/null 2> /dev/null ; then
   echo "$PACKAGE: ADD" >> $TMP/SeTnewtag
diff --git a/slackware64/a/maketag.ez b/slackware64/a/maketag.ez
index 4279554e..737e3b4d 100644
--- a/slackware64/a/maketag.ez
+++ b/slackware64/a/maketag.ez
@@ -35,7 +35,7 @@ system. :^) Press ENTER when you are done."  21 76 10 \
 "efibootmgr" "Tool to modify UEFI boot entries" "on" \
 "efivar" "Library and tools to handle UEFI variables" "on" \
 "elilo" "Linux Loader for EFI-based platforms" "on" \
-"elvis" "elvis text editor (vi clone) - REQUIRED" "on" \
+"elvis" "elvis text editor (ex/vi clone)" "on" \
 "etc" "System config files & utilities - REQUIRED" "on" \
 "eudev" "Manages /dev and modules - REQUIRED" "on" \
 "f2fs-tools" "Flash-Friendly File System" "on" \
@@ -61,9 +61,9 @@ system. :^) Press ENTER when you are done."  21 76 10 \
 "jfsutils" "Utilities for IBM's Journaled Filesystem" "on" \
 "kbd" "Change keyboard and console mappings" "on" \
 "kernel-firmware" "Linux kernel firmware -- REQUIRED" "on" \
-"kernel-generic" "Generic 5.4.10 kernel (needs an initrd)" "on" \
-"kernel-huge" "Loaded 5.4.10 Linux kernel" "on" \
-"kernel-modules" "Linux 5.4.10 kernel modules -- REQUIRED" "on" \
+"kernel-generic" "Generic 5.4.11 kernel (needs an initrd)" "on" \
+"kernel-huge" "Loaded 5.4.11 Linux kernel" "on" \
+"kernel-modules" "Linux 5.4.11 kernel modules -- REQUIRED" "on" \
 "kmod" "Kernel module utilities -- REQUIRED" "on" \
 "lbzip2" "Parallel bzip2 compressor" "on" \
 "less" "A text pager utility - REQUIRED" "on" \
@@ -85,6 +85,7 @@ system. :^) Press ENTER when you are done."  21 76 10 \
 "mtx" "Controls tape autochangers" "on" \
 "ncompress" "The historic compress utility" "on" \
 "ntfs-3g" "FUSE-based NTFS read-write mount program" "on" \
+"nvi" "nvi text editor (ex/vi clone)" "on" \
 "openssl-solibs" "OpenSSL shared libraries -- REQUIRED" "on" \
 "openssl10-solibs" "OpenSSL shared libraries version 1.0.x" "on" \
 "os-prober" "A tool for finding bootable OS partitions" "on" \
@@ -130,7 +131,7 @@ if [ $? = 1 -o $? = 255 ]; then
  rm -f $TMP/SeTpkgs
  > $TMP/SeTnewtag
  for pkg in \
-aaa_base aaa_elflibs aaa_terminfo acl acpid attr bash bin btrfs-progs bzip2 coreutils cpio cpufrequtils cryptsetup dbus dcron devs dialog dosfstools e2fsprogs ed efibootmgr efivar elilo elvis etc eudev f2fs-tools file findutils floppy gawk genpower gettext glibc-solibs glibc-zoneinfo gpm gptfdisk grep grub gzip haveged hdparm hostname hwdata infozip inotify-tools jfsutils kbd kernel-firmware kernel-generic kernel-huge kernel-modules kmod lbzip2 less lhasa libcgroup libgudev lilo logrotate lrzip lvm2 lzip lzlib mcelog mdadm minicom mkinitrd mlocate mt-st mtx ncompress ntfs-3g openssl-solibs openssl10-solibs os-prober patch pciutils pcmciautils pkgtools plzip procps-ng quota reiserfsprogs rpm2tgz sdparm sed shadow sharutils smartmontools splitvt sysfsutils sysklogd syslinux sysvinit sysvinit-functions sysvinit-scripts tar tcsh time tree udisks udisks2 unarj upower usb_modeswitch usbutils utempter util-linux which xfsprogs xz zoo \
+aaa_base aaa_elflibs aaa_terminfo acl acpid attr bash bin btrfs-progs bzip2 coreutils cpio cpufrequtils cryptsetup dbus dcron devs dialog dosfstools e2fsprogs ed efibootmgr efivar elilo elvis etc eudev f2fs-tools file findutils floppy gawk genpower gettext glibc-solibs glibc-zoneinfo gpm gptfdisk grep grub gzip haveged hdparm hostname hwdata infozip inotify-tools jfsutils kbd kernel-firmware kernel-generic kernel-huge kernel-modules kmod lbzip2 less lhasa libcgroup libgudev lilo logrotate lrzip lvm2 lzip lzlib mcelog mdadm minicom mkinitrd mlocate mt-st mtx ncompress ntfs-3g nvi openssl-solibs openssl10-solibs os-prober patch pciutils pcmciautils pkgtools plzip procps-ng quota reiserfsprogs rpm2tgz sdparm sed shadow sharutils smartmontools splitvt sysfsutils sysklogd syslinux sysvinit sysvinit-functions sysvinit-scripts tar tcsh time tree udisks udisks2 unarj upower usb_modeswitch usbutils utempter util-linux which xfsprogs xz zoo \
   ; do
   echo "$pkg: SKP" >> $TMP/SeTnewtag
  done
@@ -138,7 +139,7 @@ aaa_base aaa_elflibs aaa_terminfo acl acpid attr bash bin btrfs-progs bzip2 core
 fi
 cat /dev/null > $TMP/SeTnewtag
 for PACKAGE in \
-aaa_base aaa_elflibs aaa_terminfo acl acpid attr bash bin btrfs-progs bzip2 coreutils cpio cpufrequtils cryptsetup dbus dcron devs dialog dosfstools e2fsprogs ed efibootmgr efivar elilo elvis etc eudev f2fs-tools file findutils floppy gawk genpower gettext glibc-solibs glibc-zoneinfo gpm gptfdisk grep grub gzip haveged hdparm hostname hwdata infozip inotify-tools jfsutils kbd kernel-firmware kernel-generic kernel-huge kernel-modules kmod lbzip2 less lhasa libcgroup libgudev lilo logrotate lrzip lvm2 lzip lzlib mcelog mdadm minicom mkinitrd mlocate mt-st mtx ncompress ntfs-3g openssl-solibs openssl10-solibs os-prober patch pciutils pcmciautils pkgtools plzip procps-ng quota reiserfsprogs rpm2tgz sdparm sed shadow sharutils smartmontools splitvt sysfsutils sysklogd syslinux sysvinit sysvinit-functions sysvinit-scripts tar tcsh time tree udisks udisks2 unarj upower usb_modeswitch usbutils utempter util-linux which xfsprogs xz zoo \
+aaa_base aaa_elflibs aaa_terminfo acl acpid attr bash bin btrfs-progs bzip2 coreutils cpio cpufrequtils cryptsetup dbus dcron devs dialog dosfstools e2fsprogs ed efibootmgr efivar elilo elvis etc eudev f2fs-tools file findutils floppy gawk genpower gettext glibc-solibs glibc-zoneinfo gpm gptfdisk grep grub gzip haveged hdparm hostname hwdata infozip inotify-tools jfsutils kbd kernel-firmware kernel-generic kernel-huge kernel-modules kmod lbzip2 less lhasa libcgroup libgudev lilo logrotate lrzip lvm2 lzip lzlib mcelog mdadm minicom mkinitrd mlocate mt-st mtx ncompress ntfs-3g nvi openssl-solibs openssl10-solibs os-prober patch pciutils pcmciautils pkgtools plzip procps-ng quota reiserfsprogs rpm2tgz sdparm sed shadow sharutils smartmontools splitvt sysfsutils sysklogd syslinux sysvinit sysvinit-functions sysvinit-scripts tar tcsh time tree udisks udisks2 unarj upower usb_modeswitch usbutils utempter util-linux which xfsprogs xz zoo \
  ; do
  if grep "\(^\| \)$PACKAGE\( \|$\)" $TMP/SeTpkgs 1> /dev/null 2> /dev/null ; then
   echo "$PACKAGE: ADD" >> $TMP/SeTnewtag
diff --git a/slackware64/a/tagfile b/slackware64/a/tagfile
index 25849a4b..c91ef7de 100644
--- a/slackware64/a/tagfile
+++ b/slackware64/a/tagfile
@@ -72,6 +72,7 @@ mt-st:OPT
 mtx:REC
 ncompress:REC
 ntfs-3g:OPT
+nvi:ADD
 openssl-solibs:ADD
 openssl10-solibs:ADD
 os-prober:REC
diff --git a/slackware64/ap/maketag b/slackware64/ap/maketag
index 4a4a52db..f3c3a359 100644
--- a/slackware64/ap/maketag
+++ b/slackware64/ap/maketag
@@ -86,7 +86,7 @@ done." 22 72 12 \
 "tmux" "terminal multiplexer" "on" \
 "usbmuxd" "iOS USB connection daemon" "on" \
 "vbetool" "Video BIOS execution tool" "on" \
-"vim" "Improved vi clone" "on" \
+"vim" "Improved ex/vi clone" "on" \
 "vorbis-tools" "Ogg Vorbis encoder, player, and utilities" "on" \
 "xfsdump" "Backup/restore tools for the XFS filesystem" "on" \
 "xorriso" "ISO-9660 and Rock Ridge manipulation tool" "on" \
diff --git a/slackware64/ap/maketag.ez b/slackware64/ap/maketag.ez
index 4a4a52db..f3c3a359 100644
--- a/slackware64/ap/maketag.ez
+++ b/slackware64/ap/maketag.ez
@@ -86,7 +86,7 @@ done." 22 72 12 \
 "tmux" "terminal multiplexer" "on" \
 "usbmuxd" "iOS USB connection daemon" "on" \
 "vbetool" "Video BIOS execution tool" "on" \
-"vim" "Improved vi clone" "on" \
+"vim" "Improved ex/vi clone" "on" \
 "vorbis-tools" "Ogg Vorbis encoder, player, and utilities" "on" \
 "xfsdump" "Backup/restore tools for the XFS filesystem" "on" \
 "xorriso" "ISO-9660 and Rock Ridge manipulation tool" "on" \
diff --git a/slackware64/k/maketag b/slackware64/k/maketag
index 066c637f..e4ad5646 100644
--- a/slackware64/k/maketag
+++ b/slackware64/k/maketag
@@ -21,7 +21,7 @@ from series K. Use the UP/DOWN keys to scroll through the list, and \
 the SPACE key to deselect any items you don't want to install. \
 Press ENTER when you are \
 done." 11 70 1 \
-"kernel-source" "Linux 5.4.10 kernel source" "on" \
+"kernel-source" "Linux 5.4.11 kernel source" "on" \
 2> $TMP/SeTpkgs
 if [ $? = 1 -o $? = 255 ]; then
  rm -f $TMP/SeTpkgs
diff --git a/slackware64/k/maketag.ez b/slackware64/k/maketag.ez
index 066c637f..e4ad5646 100644
--- a/slackware64/k/maketag.ez
+++ b/slackware64/k/maketag.ez
@@ -21,7 +21,7 @@ from series K. Use the UP/DOWN keys to scroll through the list, and \
 the SPACE key to deselect any items you don't want to install. \
 Press ENTER when you are \
 done." 11 70 1 \
-"kernel-source" "Linux 5.4.10 kernel source" "on" \
+"kernel-source" "Linux 5.4.11 kernel source" "on" \
 2> $TMP/SeTpkgs
 if [ $? = 1 -o $? = 255 ]; then
  rm -f $TMP/SeTpkgs