Update

7 files changed, 128 insertions, 84 deletions

diff --git a/.PKGBUILD.swo b/.PKGBUILD.swo
deleted file mode 100644
index 5659f05645ee..000000000000
--- a/.PKGBUILD.swo
+++ /dev/null
diff --git a/.PKGBUILD.swp b/.PKGBUILD.swp
deleted file mode 100644
index abf7f4e8e563..000000000000
--- a/.PKGBUILD.swp
+++ /dev/null
diff --git a/.SRCINFO b/.SRCINFO
index 6814c2061e10..f807eaf86021 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,31 +1,43 @@
 pkgbase = vim-clipboard
-	pkgver = 8.0.1092
+	pkgdesc = Vi Improved, a highly configurable, improved version of the vi text editor
+	pkgver = 8.2.2891
 	pkgrel = 1
-	url = http://www.vim.org
-	arch = i686
+	url = https://www.vim.org
 	arch = x86_64
 	license = custom:vim
+	makedepends = glibc
+	makedepends = libgcrypt
 	makedepends = gpm
 	makedepends = python2
 	makedepends = python
 	makedepends = ruby
 	makedepends = libxt
-	makedepends = gtk3
 	makedepends = lua
 	makedepends = gawk
 	makedepends = tcl
-	source = vim-8.0.1092.tar.gz::https://github.com/vim/vim/archive/v8.0.1092.tar.gz
+	makedepends = pcre
+	makedepends = zlib
+	source = https://github.com/vim/vim/archive/v8.2.2891/vim-clipboard-8.2.2891.tar.gz
 	source = vimrc
 	source = archlinux.vim
-	sha1sums = 3a7e6e8a5a592df8a3afed0d247c5c3b94fb75a5
-	sha1sums = 15ebf3f48693f1f219fe2d8edb7643683139eb6b
-	sha1sums = 94f7bb87b5d06bace86bc4b3ef1372813b4eedf2
+	source = vimdoc.hook
+	sha256sums = 3d0a424f637e4920dc514b124782d7e1f29a7b819031924989ca69e231ee686a
+	sha256sums = b16e85e457397ab2043a7ee0a3c84307c6b4eac157fd0b721694761f25b3ed5b
+	sha256sums = cc3d931129854c298eb22e993ec14c2ad86cc1e70a08a64496f5e06559289972
+	sha256sums = 8e9656934d9d7793063230d15a689e10455e6db9b9fe73afa0f294792795d8ae
+	sha512sums = a16f73720925f59db305f149f5d9bdea9fb2a4a993e7c07d4e83fdca5617ebb17b2e63b77a0d2ea05f8014f14edb0a41e6be633d848b81fce36162a45c23ccca
+	sha512sums = 4b5bed0813f22af9e158ea9aa56a4a9862dd786ba2d201f20159ccf652da6190164aaed0b6b7217d578f7b25c33a8adcc307bfcf3caa8d173a7ff29e2a00fee7
+	sha512sums = fe091d289d876f45319c898f6021ef86d6a238b540c225a279c46efc5c36fa7d868cd0cee73a111811c4be90df160f85340bb251be3a437727dbe5c699950363
+	sha512sums = a02ad0d66f300160911aeb81d8886c6c558436ac4ee3fcd161dd65c6b1e5d1f41b9005a7f5bb5ba68d57027fc1c8e43daabf055bd6207fb5a216a67f758df8d1
 
 pkgname = vim-clipboard
-	pkgdesc = Vi Improved, a highly configurable, improved version of the vi text editor
-	depends = vim-runtime=8.0.1092-1
+	depends = vim-runtime=8.2.2891-1
 	depends = gpm
 	depends = acl
+	depends = glibc
+	depends = libgcrypt
+	depends = pcre
+	depends = zlib
 	optdepends = python2: Python 2 language support
 	optdepends = python: Python 3 language support
 	optdepends = ruby: Ruby language support
@@ -33,13 +45,15 @@ pkgname = vim-clipboard
 	optdepends = perl: Perl language support
 	optdepends = tcl: Tcl language support
 	provides = xxd
+	provides = vim
 	provides = vim-minimal
 	provides = vim-python3
-	provides = vim
+	provides = vim-plugin-runtime
+	conflicts = vim
+	conflicts = gvim
 	conflicts = vim-minimal
 	conflicts = vim-python3
-	conflicts = vim
+	replaces = vim
 	replaces = vim-python3
 	replaces = vim-minimal
-	replaces = vim
-
+	replaces = gvim
diff --git a/PKGBUILD b/PKGBUILD
index d1d034bb713a..617ef20aec93 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -1,75 +1,81 @@
-# Maintainer: mesmer <mesmer@fisica.if.uff.br>
+# Maintainer: MGislv <nocentinigabriele91@gmail.com>
+# Contributor: mesmer <mesmer@fisica.if.uff.br>
 # Contributor: xiretza <xiretza+aur@gmail.com>
 # Contributor: TJM <tommy.mairo@gmail.com>
 
+# Directly based off of the official package
+
 pkgbase=vim-clipboard
-pkgname=(vim-clipboard)
-pkgver=8.0.1092
-_versiondir=80
+pkgname=vim-clipboard
+pkgver=8.2.2891
+_versiondir=82
 pkgrel=1
-arch=(i686 x86_64)
+pkgdesc='Vi Improved, a highly configurable, improved version of the vi text editor'
+url='https://www.vim.org'
+arch=('x86_64')
 license=('custom:vim')
-cores=$(nproc --all)
-url='http://www.vim.org'
-makedepends=(gpm python2 python ruby libxt gtk3 lua gawk tcl)
-source=(vim-$pkgver.tar.gz::https://github.com/vim/vim/archive/v$pkgver.tar.gz
+makedepends=('glibc' 'libgcrypt' 'gpm' 'python2' 'python' 'ruby' 'libxt' 'lua'
+             'gawk' 'tcl' 'pcre' 'zlib')
+source=(https://github.com/vim/vim/archive/v${pkgver}/${pkgbase}-${pkgver}.tar.gz
         vimrc
         archlinux.vim
-        )
-sha1sums=('3a7e6e8a5a592df8a3afed0d247c5c3b94fb75a5'
-          '15ebf3f48693f1f219fe2d8edb7643683139eb6b'
-          '94f7bb87b5d06bace86bc4b3ef1372813b4eedf2')
-prepare() {
-  cd $srcdir/vim-$pkgver/src
+        vimdoc.hook)
+sha256sums=('3d0a424f637e4920dc514b124782d7e1f29a7b819031924989ca69e231ee686a'
+            'b16e85e457397ab2043a7ee0a3c84307c6b4eac157fd0b721694761f25b3ed5b'
+            'cc3d931129854c298eb22e993ec14c2ad86cc1e70a08a64496f5e06559289972'
+            '8e9656934d9d7793063230d15a689e10455e6db9b9fe73afa0f294792795d8ae')
+sha512sums=('a16f73720925f59db305f149f5d9bdea9fb2a4a993e7c07d4e83fdca5617ebb17b2e63b77a0d2ea05f8014f14edb0a41e6be633d848b81fce36162a45c23ccca'
+            '4b5bed0813f22af9e158ea9aa56a4a9862dd786ba2d201f20159ccf652da6190164aaed0b6b7217d578f7b25c33a8adcc307bfcf3caa8d173a7ff29e2a00fee7'
+            'fe091d289d876f45319c898f6021ef86d6a238b540c225a279c46efc5c36fa7d868cd0cee73a111811c4be90df160f85340bb251be3a437727dbe5c699950363'
+            'a02ad0d66f300160911aeb81d8886c6c558436ac4ee3fcd161dd65c6b1e5d1f41b9005a7f5bb5ba68d57027fc1c8e43daabf055bd6207fb5a216a67f758df8d1')
 
+prepare() {
+  cd vim-${pkgver}/src
   # define the place for the global (g)vimrc file (set to /etc/vimrc)
-  sed -i 's|^.*\(#define SYS_.*VIMRC_FILE.*"\) .*$|\1|' feature.h
-  sed -i 's|^.*\(#define VIMRC_FILE.*"\) .*$|\1|' feature.h
-
+  sed -E 's|^.*(#define SYS_.*VIMRC_FILE.*").*$|\1|g' -i feature.h
+  sed -E 's|^.*(#define VIMRC_FILE.*").*$|\1|g' -i feature.h
   autoconf
-
-  cd "$srcdir"
-  cp -a vim-$pkgver gvim-$pkgver
 }
 
 build() {
-  cd "${srcdir}"/vim-$pkgver
-  ./configure \
-    --prefix=/usr \
-    --localstatedir=/var/lib/vim \
-    --with-features=huge \
-    --with-compiledby='Arch Linux' \
-    --enable-gpm \
-    --enable-acl \
-    --with-x=yes \
-    --disable-gui \
-    --enable-multibyte \
-    --enable-cscope \
-    --enable-netbeans \
-    --enable-perlinterp=dynamic \
-    --enable-pythoninterp=dynamic \
-    --enable-python3interp=dynamic \
-    --enable-rubyinterp=dynamic \
-    --enable-luainterp=dynamic \
-    --enable-tclinterp=dynamic
-  make -j$cores
+  cd vim-${pkgver}
+    ./configure \
+      --prefix=/usr \
+      --localstatedir=/var/lib/vim \
+      --with-features=huge \
+      --with-compiledby='Arch Linux' \
+      --enable-gpm \
+      --enable-acl \
+      --with-x=yes \
+      --disable-gui \
+      --enable-multibyte \
+      --enable-cscope \
+      --enable-netbeans \
+      --enable-perlinterp=dynamic \
+      --enable-pythoninterp=dynamic \
+      --enable-python3interp=dynamic \
+      --enable-rubyinterp=dynamic \
+      --enable-luainterp=dynamic \
+      --enable-tclinterp=dynamic \
+      --disable-canberra
+    make
 }
 
-package_vim-clipboard() {
-  pkgdesc='Vi Improved, a highly configurable, improved version of the vi text editor'
-  depends=("vim-runtime=${pkgver}-${pkgrel}" 'gpm' 'acl')
+package() {
+  depends=("vim-runtime=${pkgver}-${pkgrel}" 'gpm' 'acl' 'glibc' 'libgcrypt' 'pcre'
+           'zlib')
   optdepends=('python2: Python 2 language support'
               'python: Python 3 language support'
               'ruby: Ruby language support'
               'lua: Lua language support'
               'perl: Perl language support'
               'tcl: Tcl language support')
-  conflicts=('vim-minimal' 'vim-python3' 'vim')
-  provides=('xxd' 'vim-minimal' 'vim-python3' 'vim')
-  replaces=('vim-python3' 'vim-minimal' 'vim')
+  conflicts=('vim' 'gvim' 'vim-minimal' 'vim-python3')
+  provides=('xxd' 'vim' 'vim-minimal' 'vim-python3' 'vim-plugin-runtime')
+  replaces=('vim' 'vim-python3' 'vim-minimal' 'gvim')
 
-  cd "${srcdir}"/vim-$pkgver
-  make -j$cores VIMRCLOC=/etc DESTDIR="${pkgdir}" install
+  cd vim-${pkgver}
+  make VIMRCLOC=/etc DESTDIR="${pkgdir}" install
 
   # provided by (n)vi in core
   rm "${pkgdir}"/usr/bin/{ex,view}
@@ -77,7 +83,7 @@ package_vim-clipboard() {
   # delete some manpages
   find "${pkgdir}"/usr/share/man -type d -name 'man1' 2>/dev/null | \
     while read _mandir; do
-    cd ${_mandir}
+    cd "${_mandir}"
     rm -f ex.1 view.1 # provided by (n)vi
     rm -f evim.1    # this does not make sense if we have no GUI
   done
@@ -85,11 +91,12 @@ package_vim-clipboard() {
   # Runtime provided by runtime package
   rm -r "${pkgdir}"/usr/share/vim
 
-  # 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 -Dm644 runtime/doc/uganda.txt \
+  install -Dm 644 runtime/doc/uganda.txt \
     "${pkgdir}"/usr/share/licenses/${pkgname}/license.txt
 }
 
+# vim: ts=2 sw=2 et:
diff --git a/archlinux.vim b/archlinux.vim
index 80890685196b..2b71ccbe275d 100644
--- a/archlinux.vim
+++ b/archlinux.vim
@@ -1,25 +1,46 @@
-" The ArchLinux global vimrc - setting only a few sane defaults
+" The Arch Linux global vimrc - setting only a few sane defaults
 "
-" Maintainer:      Thomas Dziedzic [gostrc@gmail.com]
+" DO NOT EDIT THIS FILE. IT'S OVERWRITTEN UPON UPGRADES.
 "
-" NEVER EDIT THIS FILE, IT'S OVERWRITTEN UPON UPGRADES, GLOBAL CONFIGURATION
-" SHALL BE DONE IN /etc/vimrc, USER SPECIFIC CONFIGURATION IN ~/.vimrc
+" Use /etc/vimrc for system-wide and $HOME/.vimrc for personal configuration
+" (for details see ':help initialization').
+"
+" Use :help '<option>' to see the documentation for the given option.
 
-" Normally we use vim-extensions. If you want true vi-compatibility
-" remove change the following statements
-set nocompatible                " Use Vim defaults instead of 100% vi compatibility
-set backspace=indent,eol,start  " more powerful backspacing
+" Use Vim defaults instead of 100% vi compatibility
+" Avoid side-effects when nocompatible has already been set.
+if &compatible
+  set nocompatible
+endif
 
-" Now we set some defaults for the editor
-set history=50                  " keep 50 lines of command line history
-set ruler                       " show the cursor position all the time
+set backspace=indent,eol,start
+set ruler
+set suffixes+=.aux,.bbl,.blg,.brf,.cb,.dvi,.idx,.ilg,.ind,.inx,.jpg,.log,.out,.png,.toc
+set suffixes-=.h
+set suffixes-=.obj
 
-" Suffixes that get lower priority when doing tab completion for filenames.
-" 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 temporary files to a secure location to protect against CVE-2017-1000382
+if exists('$XDG_CACHE_HOME')
+  let &g:directory=$XDG_CACHE_HOME
+else
+  let &g:directory=$HOME . '/.cache'
+endif
+let &g:undodir=&g:directory . '/vim/undo//'
+let &g:backupdir=&g:directory . '/vim/backup//'
+let &g:directory.='/vim/swap//'
+" Create directories if they doesn't exist
+if ! isdirectory(expand(&g:directory))
+  silent! call mkdir(expand(&g:directory), 'p', 0700)
+endif
+if ! isdirectory(expand(&g:backupdir))
+  silent! call mkdir(expand(&g:backupdir), 'p', 0700)
+endif
+if ! isdirectory(expand(&g:undodir))
+  silent! call mkdir(expand(&g:undodir), 'p', 0700)
+endif
 
+" Make shift-insert work like in Xterm
 if has('gui_running')
-  " Make shift-insert work like in Xterm
   map <S-Insert> <MiddleMouse>
   map! <S-Insert> <MiddleMouse>
 endif
diff --git a/vimdoc.hook b/vimdoc.hook
index b77d5929f920..07af3cc50234 100644
--- a/vimdoc.hook
+++ b/vimdoc.hook
@@ -2,7 +2,7 @@
 Operation = Install
 Operation = Upgrade
 Operation= Remove
-Type = File
+Type = Path
 Target = usr/share/vim/vimfiles/doc/
 
 [Action]
diff --git a/vimrc b/vimrc
index 3642e25c9d1e..ee36a5269244 100644
--- a/vimrc
+++ b/vimrc
@@ -11,6 +11,8 @@
 runtime! archlinux.vim
 
 " If you prefer the old-style vim functionalty, add 'runtime! vimrc_example.vim'
-" Or better yet, read /usr/share/vim/vim74/vimrc_example.vim or the vim manual
+" Or better yet, read /usr/share/vim/vim80/vimrc_example.vim or the vim manual
 " and configure vim to your own liking!
 
+" do not load defaults if ~/.vimrc is missing
+"let skip_defaults_vim=1