Mon Sep 26 19:43:54 UTC 202220220926194354

a/bash-5.2.000-x86_64-1.txz:  Upgraded.
ap/vim-9.0.0594-x86_64-1.txz:  Upgraded.
  Fixed stack-based buffer overflow.
  Thanks to marav for the heads-up.
  In addition, Mig21 pointed out an issue where the defaults.vim file might
  need to be edited for some purposes as its contents will override the
  settings in the system-wide vimrc. Usually this file is replaced whenever
  vim is upgraded, which in those situations would be inconvenient for the
  admin. So, I've added support for a file named defaults.vim.custom which
  (if it exists) will be used instead of the defaults.vim file shipped in
  the package and will persist through upgrades.
  For more information, see:
    https://cve.mitre.org/cgi-bin/cvename.cgi?name=CVE-2022-3296
  (* Security fix *)
l/fluidsynth-2.3.0-x86_64-1.txz:  Upgraded.
l/imagemagick-7.1.0_49-x86_64-1.txz:  Upgraded.
l/libcap-2.66-x86_64-1.txz:  Upgraded.
l/netpbm-10.99.03-x86_64-1.txz:  Upgraded.
l/readline-8.2.000-x86_64-1.txz:  Upgraded.
l/xapian-core-1.4.21-x86_64-1.txz:  Upgraded.
n/dnsmasq-2.87-x86_64-1.txz:  Upgraded.
  Fix write-after-free error in DHCPv6 server code.
  For more information, see:
    https://cve.mitre.org/cgi-bin/cvename.cgi?name=CVE-2022-0934
  (* Security fix *)
x/xterm-373-x86_64-1.txz:  Upgraded.
xap/vim-gvim-9.0.0594-x86_64-1.txz:  Upgraded.

2 files changed, 27 insertions, 16 deletions

diff --git a/source/ap/vim/doinst.sh b/source/ap/vim/doinst.sh
new file mode 100644
index 000000000..ebb76cc20
--- /dev/null
+++ b/source/ap/vim/doinst.sh
@@ -0,0 +1,25 @@
+#!/bin/bash
+config() {
+  NEW="$1"
+  OLD="$(dirname $NEW)/$(basename $NEW .new)"
+  # If there's no config file by that name, mv it over:
+  if [ ! -r $OLD ]; then
+    mv $NEW $OLD
+  elif [ "$(cat $OLD | md5sum)" = "$(cat $NEW | md5sum)" ]; then # toss the redundant copy
+    rm $NEW
+  fi
+  # Otherwise, we leave the .new copy for the admin to consider...
+}
+config usr/share/vim/vimrc.new
+
+# Responding to a report that in some cases the file
+# /usr/share/vim/vim90/defaults.vim must be edited in order to change settings
+# (some settings in the file will otherwise override those in
+# /usr/share/vim/vimrc), we will support a file in the same directory named
+# defaults.vim.custom. If this file exists, then it will replace the shipped
+# version of defaults.vim. The original file will be preserved as
+# defaults.vim.orig.
+if [ -r usr/share/vim/vim90/defaults.vim.custom ]; then
+  cp -a usr/share/vim/vim90/defaults.vim usr/share/vim/vim90/defaults.vim.orig
+  cp -a usr/share/vim/vim90/defaults.vim.custom usr/share/vim/vim90/defaults.vim
+fi
diff --git a/source/ap/vim/vim.SlackBuild b/source/ap/vim/vim.SlackBuild
index 503f5cf6d..07676fe49 100755
--- a/source/ap/vim/vim.SlackBuild
+++ b/source/ap/vim/vim.SlackBuild
@@ -1,6 +1,6 @@
 #!/bin/bash
 
-# Copyright 2008, 2009, 2010, 2013, 2016, 2018, 2019, 2020, 2021  Patrick J. Volkerding, Sebeka, Minnesota, USA
+# Copyright 2008, 2009, 2010, 2013, 2016, 2018, 2019, 2020, 2021, 2022  Patrick J. Volkerding, Sebeka, Minnesota, USA
 # All rights reserved.
 #
 # Redistribution and use of this script, with or without modification, is
@@ -216,22 +216,8 @@ find $PKG/usr/doc/vim-$VERSION -type f | xargs chmod 644
 ( cd $PKG/usr/doc/vim-$VERSION ; ln -sf /usr/share/vim/vim$(echo $VIMBRANCH | tr -d .) doc )
 
 mkdir -p $PKG/install
+zcat $CWD/doinst.sh.gz > $PKG/install/doinst.sh
 cat $CWD/slack-desc.vim > $PKG/install/slack-desc
-cat << EOF > $PKG/install/doinst.sh
-#!/bin/bash
-config() {
-  NEW="\$1"
-  OLD="\$(dirname \$NEW)/\$(basename \$NEW .new)"
-  # If there's no config file by that name, mv it over:
-  if [ ! -r \$OLD ]; then
-    mv \$NEW \$OLD
-  elif [ "\$(cat \$OLD | md5sum)" = "\$(cat \$NEW | md5sum)" ]; then # toss the redundant copy
-    rm \$NEW
-  fi
-  # Otherwise, we leave the .new copy for the admin to consider...
-}
-config usr/share/vim/vimrc.new
-EOF
 
 find $PKG | xargs file | grep -e "executable" -e "shared object" | grep ELF \
   | cut -f 1 -d : | xargs strip --strip-unneeded 2> /dev/null