diff options
Diffstat (limited to 'system/vim')
| -rw-r--r-- | system/vim/APKBUILD | 42 | ||||
| -rw-r--r-- | system/vim/no-default-mouse.patch | 16 |
2 files changed, 32 insertions, 26 deletions
diff --git a/system/vim/APKBUILD b/system/vim/APKBUILD index 3b1ee667c..0023238ee 100644 --- a/system/vim/APKBUILD +++ b/system/vim/APKBUILD @@ -1,10 +1,12 @@ -# Contributor: Sergei Lukin <sergej.lukin@gmail.com> +# Contributor: Sergey Lukin <sergej.lukin@gmail.com> # Contributor: Łukasz Jendrysik <scadu@yandex.com> # Contributor: Sören Tempel <soeren+alpine@soeren-tempel.net> # Contributor: Natanael Copa <ncopa@alpinelinux.org> -# Maintainer: Kiyoshi Aman <kiyoshi.aman+adelie@gmail.com> +# Maintainer: Síle Ekaterin Liszka <sheila@vulpine.house> pkgname=vim -pkgver=8.1.2100 +pkgver=9.1.0378 +_pkgver=${pkgver%.*.*}${pkgver#*.} +_pkgver=${_pkgver%.*} pkgrel=0 pkgdesc="advanced text editor" url="https://www.vim.org" @@ -17,11 +19,33 @@ makedepends_host="acl-dev ncurses-dev" subpackages="$pkgname-doc ${pkgname}diff::noarch" source="$pkgname-$pkgver.tar.gz::https://github.com/$pkgname/$pkgname/archive/v$pkgver.tar.gz vimrc - no-default-mouse.patch " builddir="$srcdir/$pkgname-$pkgver" # secfixes: +# 9.1.0148-r0: +# - CVE-2023-4752 +# - CVE-2023-4781 +# - CVE-2023-5344 +# - CVE-2023-5441 +# - CVE-2023-5535 +# - CVE-2023-46246 +# - CVE-2023-48231 +# - CVE-2023-48232 +# - CVE-2023-48233 +# - CVE-2023-48234 +# - CVE-2023-48235 +# - CVE-2023-48236 +# - CVE-2023-48237 +# - CVE-2023-48706 +# - CVE-2024-22667 +# 9.0.1385-r0: +# - CVE-2023-0049 +# - CVE-2023-0051 +# - CVE-2023-0054 +# - CVE-2023-0288 +# - CVE-2023-0433 +# - CVE-2023-0512 # 8.0.0329-r0: # - CVE-2017-5953 # 8.0.0056-r0: @@ -34,7 +58,6 @@ prepare() { } build() { - local _onlynative [ "$CBUILD" != "$CHOST" ] || _onlynative="--enable-perlinterp=dynamic --enable-python3interp=dynamic" ./configure \ --build=$CBUILD \ @@ -49,7 +72,7 @@ build() { --with-compiledby="Adélie Linux" \ vim_cv_toupper_broken=no \ vim_cv_terminfo=yes \ - vim_cv_tgent=zero \ + vim_cv_tgetent=zero \ vim_cv_tty_group=world \ vim_cv_getcwd_broken=no \ vim_cv_stat_ignores_slash=no \ @@ -67,7 +90,7 @@ package() { # the following properly belong to gvim. rm -r "$pkgdir"/usr/share/applications - rm "$pkgdir"/usr/share/vim/vim81/gvimrc_example.vim + rm "$pkgdir"/usr/share/vim/vim$_pkgver/gvimrc_example.vim rm -r "$pkgdir"/usr/share/icons } @@ -79,6 +102,5 @@ vimdiff() { mv "$pkgdir"/usr/bin/vimdiff "$subpkgdir"/usr/bin } -sha512sums="57f7c0970f7627ecd56972647d3b0826cd28c800dfaded1b51787bade859420f9c256fb66d589656c7c03a74b836291c84d6dd92157f2327444f575be33efdc0 vim-8.1.2100.tar.gz -12ee3f96c94d74215159fba379ed61907ec5982a9f1643575dcb7c3d5e30824665d683de95f97b5067718b3f2a1238fb7534a70803bc170614498ad026f352d8 vimrc -16026a3ed3e080b3f8281948579ab678e9acd724ad594463279712fbf1024bcd923155a133bd08118848d2c6cdf11c69489d85b1c7438f60b4c279094714d181 no-default-mouse.patch" +sha512sums="d1c31de1e39bd3504a462aa324b699bb81ff11717171529047e5518c9bb2aec651b0b40a18b66f4df92a1b2065abc68a523df61681f32228839e69ba0f383e6b vim-9.1.0378.tar.gz +12ee3f96c94d74215159fba379ed61907ec5982a9f1643575dcb7c3d5e30824665d683de95f97b5067718b3f2a1238fb7534a70803bc170614498ad026f352d8 vimrc" diff --git a/system/vim/no-default-mouse.patch b/system/vim/no-default-mouse.patch deleted file mode 100644 index c34b9cae7..000000000 --- a/system/vim/no-default-mouse.patch +++ /dev/null @@ -1,16 +0,0 @@ -diff -Nurd vim-8.1.0712/runtime/defaults.vim vim-8.1.0712.new/runtime/defaults.vim ---- vim-8.1.0712/runtime/defaults.vim 2019-01-09 16:02:43.000000000 -0600 -+++ vim-8.1.0712.new/runtime/defaults.vim 2019-01-27 01:18:04.196123398 -0600 -@@ -73,12 +73,6 @@ - " Revert with ":iunmap <C-U>". - inoremap <C-U> <C-G>u<C-U> - --" In many terminal emulators the mouse works just fine. By enabling it you --" can position the cursor, Visually select and scroll with the mouse. --if has('mouse') -- set mouse=a --endif -- - " Switch syntax highlighting on when the terminal has colors or when using the - " GUI (which always has colors). - if &t_Co > 2 || has("gui_running") |