From e6dca6f9460ca8b3504ff908a27d48bd533e4e16 Mon Sep 17 00:00:00 2001
From: Patrick J Volkerding <volkerdi@slackware.com>
Date: Fri, 11 Jan 2019 21:15:41 +0000
Subject: Fri Jan 11 21:15:41 UTC 2019
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

a/bash-5.0.000-x86_64-1.txz:  Upgraded.
a/glibc-zoneinfo-2018i-noarch-1.txz:  Upgraded.
a/lzlib-1.11-x86_64-1.txz:  Upgraded.
ap/vim-8.1.0727-x86_64-1.txz:  Upgraded.
  Fixed vimrc to work with "crontab -e" again now that cron's files have been
  moved into /run/cron/. Thanks to Andreas Vögel.
d/subversion-1.11.1-x86_64-1.txz:  Upgraded.
n/irssi-1.1.2-x86_64-1.txz:  Upgraded.
  This update addresses bugs including security and stability issues:
  A NULL pointer dereference occurs for an "empty" nick.
  Certain nick names could result in out-of-bounds access when printing
  theme strings.
  Crash due to a NULL pointer dereference w hen the number of windows
  exceeds the available space.
  Use-after-free when SASL messages are received in an unexpected order.
  Use-after-free when a server is disconnected during netsplits.
  Use-after-free when hidden lines were expired from the scroll buffer.
  For more information, see:
    https://cve.mitre.org/cgi-bin/cvename.cgi?name=CVE-2018-7050
    https://cve.mitre.org/cgi-bin/cvename.cgi?name=CVE-2018-7051
    https://cve.mitre.org/cgi-bin/cvename.cgi?name=CVE-2018-7052
    https://cve.mitre.org/cgi-bin/cvename.cgi?name=CVE-2018-7053
    https://cve.mitre.org/cgi-bin/cvename.cgi?name=CVE-2018-7054
    https://cve.mitre.org/cgi-bin/cvename.cgi?name=CVE-2019-5882
  (* Security fix *)
xap/vim-gvim-8.1.0727-x86_64-1.txz:  Upgraded.
---
 source/ap/vim/vim.SlackBuild | 4 ++--
 source/ap/vim/vim.vimrc.diff | 6 +++---
 2 files changed, 5 insertions(+), 5 deletions(-)

(limited to 'source/ap/vim')

diff --git a/source/ap/vim/vim.SlackBuild b/source/ap/vim/vim.SlackBuild
index b6b712bd..b808c303 100755
--- a/source/ap/vim/vim.SlackBuild
+++ b/source/ap/vim/vim.SlackBuild
@@ -148,11 +148,11 @@ make install DESTDIR=$PKG || exit 1
 rsync -lprvt $PKG/usr/share/man/ $PKG/usr/man/
 rm -r $PKG/usr/share/man
 
-cp -a runtime/vimrc_example.vim runtime/vimrc.new
-
 # Don't make backups in /var/spool/cron/*, which fixes "crontab -e":
 zcat $CWD/vim.vimrc.diff.gz | patch -p1 --verbose || exit 1
 
+cp -a runtime/vimrc_example.vim runtime/vimrc.new
+
 # Add patched vimrc to the package:
 cat runtime/vimrc.new > $PKG/usr/share/vim/vimrc.new
 
diff --git a/source/ap/vim/vim.vimrc.diff b/source/ap/vim/vim.vimrc.diff
index 2c26bb8e..ec350341 100644
--- a/source/ap/vim/vim.vimrc.diff
+++ b/source/ap/vim/vim.vimrc.diff
@@ -1,11 +1,11 @@
---- ./runtime/vimrc.new.orig	2016-08-10 16:02:45.000000000 -0500
-+++ ./runtime/vimrc.new	2016-08-11 11:46:09.385806714 -0500
+--- ./runtime/vimrc_example.vim.orig	2019-01-04 17:35:22.000000000 -0600
++++ ./runtime/vimrc_example.vim	2019-01-11 14:43:36.366302054 -0600
 @@ -49,6 +49,9 @@
  
  endif " has("autocmd")
  
 +" Make vim work with the 'crontab -e' command
-+set backupskip+=/var/spool/cron/*
++set backupskip+=/var/spool/cron/*,/run/cron/*
 +
  " Add optional packages.
  "
-- 
cgit v1.2.3