vim-8.0.1542-2.parabola1: updating version

2 files changed, 20 insertions, 16 deletions

diff --git a/libre/vim/PKGBUILD b/libre/vim/PKGBUILD
index c125158d0..c1184972b 100644
--- a/libre/vim/PKGBUILD
+++ b/libre/vim/PKGBUILD
@@ -15,9 +15,10 @@
 
 pkgbase=vim
 pkgname=('vim' 'gvim' 'vim-runtime')
-pkgver=8.0.1436
+pkgver=8.0.1542
 _versiondir=80
-pkgrel=1.parabola1
+pkgrel=2.parabola1
+pkgdesc='Vi Improved, a highly configurable, improved version of the vi text editor'
 url='http://www.vim.org'
 arch=('x86_64' 'i686' 'armv7h')
 license=('custom:vim')
@@ -27,13 +28,13 @@ source=(vim-${pkgver}.tar.gz::https://github.com/vim/vim/archive/v${pkgver}.tar.
         vimrc
         parabola.vim
         vimdoc.hook)
-sha256sums=('5e56ba39e7156ec8516f0c5a35721dec69517cedf246c5d25258ff94c57368fb'
+sha256sums=('d0818df5c6da23db725aa68067c90c80f0779c2e3446811bd1389b1ac2c2df86'
             '6c22ef5791004dc3a1151400a3ce6aec35f660237aed734bcde0a8a16882cbc0'
-            'b84bae636f763ab6706d911eb03853416378608079b82d0d809fc71a49ba0781'
+            '42af0c3c2376c2a4f29631d56a827050945cf1e2f8e774526254da5f4a1fe524'
             '7095cafac21df7aa42749d6864d1c0549fe65771d8edda3102c931c60782b6b9')
-sha512sums=('fcbd5aa68f0f94baa2645265a7eb8dc705876930afffc312e3bec00c4c7543abb1017e8b4c68afed85d5fea625634a9dad305ee553814afc840b3352d8c35995'
+sha512sums=('f6d3af209018ea70c5f87f4b4cc9f8c9daaabd7925ad33a381b20cd744dd7d8e43540f5b0174cd1b01c104a71e3bb6116c585de09c7e5e670a02d93866591541'
             '33608b0551c0829d802fe8f710a2e0381fd9cf013b2321ebf3cbda36ce973d115139bf4dbbe19ce79f1df85f4ca5f571347269c561ecf3a70a22ddc9c42043f2'
-            '7d200149e28f91e0fc8ac62d3821529629d59e4e3ea6a785a5f6061099c3337bc5076d180b71933117f2ad775295b17ef94a949a9c076c053b3a639164bf0316'
+            '68803129e15fdb4e49b5aaf1f1f6fdd17824e399812cd0c14129ddd4bf4d0da3bbd234b4be619be338318186ce4b44cdbf38cf53d38fe38e75a086b58a448d37'
             '1e06e981691b17662fd0fddac5c00c87c920d1b4a1cbb6191c42d57cc40b00af12710e26b22fcfc0901bb8142b15f6a04aa65cec2d9b3bb9d5a06cb650d3ab9c')
 
 prepare() {
@@ -100,7 +101,10 @@ check() {
 }
 
 package_vim-runtime() {
-  pkgdesc='Runtime for vim and gvim (Parabola rebranded)'
+  pkgdesc+=' (shared runtime, Parabola rebranded)'
+  optdepends=('sh: support for some tools and macros'
+              'python: demoserver example tool'
+              'gawk: mve tools upport')
   backup=('etc/vimrc')
 
   cd vim-${pkgver}
@@ -132,8 +136,8 @@ package_vim-runtime() {
   install -Dm 644 runtime/rgb.txt \
     "${pkgdir}"/usr/share/vim/vim${_versiondir}/rgb.txt
 
-  # no desktop files and icons
-  rm -r "${pkgdir}"/usr/share/{applications,icons}
+  # remove gvim.desktop as not included
+  rm "${pkgdir}"/usr/share/applications/gvim.desktop
 
   # license
   install -dm 755 "${pkgdir}"/usr/share/licenses/vim-runtime
@@ -145,7 +149,6 @@ package_vim-runtime() {
 }
 
 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'
@@ -184,7 +187,7 @@ package_vim() {
 }
 
 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'
@@ -213,9 +216,6 @@ package_gvim() {
   # need to remove since this is provided by vim-runtime
   rm -r "${pkgdir}"/usr/share/vim
 
-  # keep gvim desktop file only, remove vim
-  rm "${pkgdir}"/usr/share/applications/vim.desktop
-
   # license
    install -Dm 644 runtime/doc/uganda.txt \
     "${pkgdir}"/usr/share/licenses/${pkgname}/license.txt
diff --git a/libre/vim/parabola.vim b/libre/vim/parabola.vim
index 62f438f6f..45424d969 100644
--- a/libre/vim/parabola.vim
+++ b/libre/vim/parabola.vim
@@ -1,7 +1,5 @@
 " The Parabola GNU/Linux-libre global vimrc - setting only a few sane defaults
 "
-" Maintainer:      Thomas Dziedzic [gostrc@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,12 @@ set ruler                       " show the cursor position all the time
 " 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
+if ! isdirectory('~/.vim/swap/')
+  silent! call system('install -dm 700 ~/.vim/swap')
+endif
+set directory=~/.vim/swap/
+
 if has('gui_running')
   " Make shift-insert work like in Xterm
   map <S-Insert> <MiddleMouse>