[arch-commits] Commit in vim/trunk (PKGBUILD archlinux.vim)

Levente Polyak anthraxx at archlinux.org
Fri Feb 23 15:02:29 UTC 2018


    Date: Friday, February 23, 2018 @ 15:02:28
  Author: anthraxx
Revision: 317426

upgpkg: vim 8.0.1531-1 (includes workaround for CVE-2017-1000382)

- if shared swap files are required, they must be set to a appropriate
  directory on purpose, default will not include current directory
  anymore.

Modified:
  vim/trunk/PKGBUILD
  vim/trunk/archlinux.vim

---------------+
 PKGBUILD      |   19 +++++++++++--------
 archlinux.vim |    6 ++++--
 2 files changed, 15 insertions(+), 10 deletions(-)

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2018-02-23 14:34:17 UTC (rev 317425)
+++ PKGBUILD	2018-02-23 15:02:28 UTC (rev 317426)
@@ -9,9 +9,10 @@
 
 pkgbase=vim
 pkgname=('vim' 'gvim' 'vim-runtime')
-pkgver=8.0.1476
+pkgver=8.0.1531
 _versiondir=80
 pkgrel=1
+pkgdesc='Vi Improved, a highly configurable, improved version of the vi text editor'
 url='http://www.vim.org'
 arch=('x86_64')
 license=('custom:vim')
@@ -21,13 +22,13 @@
         vimrc
         archlinux.vim
         vimdoc.hook)
-sha256sums=('6b12aa3736d22a9802b0a11701fc4e8b80388804c10c6f8bee62e67bab1ed58f'
+sha256sums=('3e3634e8bb088b516320d5201f6bfc426f65d4e3f9c66428ebc8ae0cf8c5fa8c'
             'b16e85e457397ab2043a7ee0a3c84307c6b4eac157fd0b721694761f25b3ed5b'
-            '0cf8b42732111d0c66c3908a76d832736e8f8dc3abef81cb092ddf84cb862ea2'
+            'cef74d8fd3a22b2af83aeeef4a192ddd624afd0c6df6861db845e6e4f55b32de'
             '7095cafac21df7aa42749d6864d1c0549fe65771d8edda3102c931c60782b6b9')
-sha512sums=('02021e4f758b5923c156660dea2ca3fa7cc8ac7238ad80087f4274c855ae377099a16b25b1dd6c5dab74925a5c6682f8cf03b96d294989f58251073a2032bd39'
+sha512sums=('35c74d970c8e73c59587f90f2e5b79a4537501f5dca568ec4aa97c38bcd6b13db1fe396e4dcd2f6b67de36701bd2e9c9c8ba3ea227b18e3b628259d6dbb93663'
             '4b5bed0813f22af9e158ea9aa56a4a9862dd786ba2d201f20159ccf652da6190164aaed0b6b7217d578f7b25c33a8adcc307bfcf3caa8d173a7ff29e2a00fee7'
-            '935c15a4cc55b9209e6b6c974df765cc6683ae32ccea38acadc825bbc9c60b97ebe14aec8814b7e52080c0d0ded520a68ff1880ab64f320b08c181b6bf862edb'
+            '11fd92e385460dff3c0d6ab10ca9284fe47047a9032fba3d285d967c9e87720a04bdfaacfb72e2d7e0054d1f22121b6d60690df0673ca0b4820739f3b0081a2d'
             '1e06e981691b17662fd0fddac5c00c87c920d1b4a1cbb6191c42d57cc40b00af12710e26b22fcfc0901bb8142b15f6a04aa65cec2d9b3bb9d5a06cb650d3ab9c')
 
 prepare() {
@@ -94,7 +95,10 @@
 }
 
 package_vim-runtime() {
-  pkgdesc='Runtime for vim and gvim'
+  pkgdesc+=' (shared runtime)'
+  optdepends=('sh: support for some tools and macros'
+              'python: demoserver example tool'
+              'gawk: mve tools upport')
   backup=('etc/vimrc')
 
   cd vim-${pkgver}
@@ -139,7 +143,6 @@
 }
 
 package_vim() {
-  pkgdesc='Vi Improved, a highly configurable, improved version of the vi text editor'
   depends=("vim-runtime=${pkgver}-${pkgrel}" 'gpm' 'acl' 'glibc' 'libgcrypt' 'pcre'
            'zlib' 'libffi')
   optdepends=('python2: Python 2 language support'
@@ -178,7 +181,7 @@
 }
 
 package_gvim() {
-  pkgdesc='Vi Improved, a highly configurable, improved version of the vi text editor (with advanced features, such as a GUI)'
+  pkgdesc+=' (with advanced features, such as a GUI)'
   depends=("vim-runtime=${pkgver}-${pkgrel}" 'gpm' 'libxt' 'gtk3' 'glibc' 'libgcrypt' 'pcre'
            'zlib' 'libffi')
   optdepends=('python2: Python 2 language support'

Modified: archlinux.vim
===================================================================
--- archlinux.vim	2018-02-23 14:34:17 UTC (rev 317425)
+++ archlinux.vim	2018-02-23 15:02:28 UTC (rev 317426)
@@ -1,7 +1,5 @@
 " The ArchLinux global vimrc - setting only a few sane defaults
 "
-" Maintainer:      Thomas Dziedzic [gostrc at gmail.com]
-"
 " NEVER EDIT THIS FILE, IT'S OVERWRITTEN UPON UPGRADES, GLOBAL CONFIGURATION
 " SHALL BE DONE IN /etc/vimrc, USER SPECIFIC CONFIGURATION IN ~/.vimrc
 
@@ -18,6 +16,10 @@
 " These are files we are not likely to want to edit or read.
 set suffixes=.bak,~,.swp,.o,.info,.aux,.log,.dvi,.bbl,.blg,.brf,.cb,.ind,.idx,.ilg,.inx,.out,.toc,.png,.jpg
 
+" Move the swap file location to protect against CVE-2017-1000382
+silent !install -d -m 700 ~/.vim/swap/ 2>&1 > /dev/null
+set directory=~/.vim/swap/
+
 if has('gui_running')
   " Make shift-insert work like in Xterm
   map <S-Insert> <MiddleMouse>



More information about the arch-commits mailing list