aboutsummaryrefslogtreecommitdiffstats
path: root/main/vim
diff options
context:
space:
mode:
Diffstat (limited to 'main/vim')
-rw-r--r--main/vim/APKBUILD38
1 files changed, 6 insertions, 32 deletions
diff --git a/main/vim/APKBUILD b/main/vim/APKBUILD
index f8256e2e3a..f4e516e0dd 100644
--- a/main/vim/APKBUILD
+++ b/main/vim/APKBUILD
@@ -3,7 +3,7 @@
# Contributor: Sören Tempel <soeren+alpine@soeren-tempel.net>
# Maintainer: Natanael Copa <ncopa@alpinelinux.org>
pkgname=vim
-pkgver=8.2.3437
+pkgver=8.2.3500
pkgrel=0
pkgdesc="Improved vi-style text editor"
url="https://www.vim.org/"
@@ -11,8 +11,8 @@ arch="all"
license="Vim"
options="!check" # some tests are failing
depends="xxd"
-makedepends="ncurses-dev lua5.3-dev python3-dev gtk+3.0-dev libx11-dev libxt-dev"
-subpackages="$pkgname-doc ${pkgname}diff::noarch $pkgname-tutor $pkgname-help gvim xxd"
+makedepends="ncurses-dev lua5.3-dev python3-dev"
+subpackages="$pkgname-doc ${pkgname}diff::noarch $pkgname-tutor $pkgname-help xxd"
source="$pkgname-$pkgver.tar.gz::https://github.com/vim/vim/archive/v$pkgver.tar.gz
vimrc
"
@@ -20,6 +20,8 @@ source="$pkgname-$pkgver.tar.gz::https://github.com/vim/vim/archive/v$pkgver.tar
# secfixes:
# 8.2.3437-r0:
# - CVE-2021-3770
+# - CVE-2021-3778
+# - CVE-2021-3796
# 8.1.1365-r0:
# - CVE-2019-12735
# 8.0.1521-r0:
@@ -33,7 +35,6 @@ source="$pkgname-$pkgver.tar.gz::https://github.com/vim/vim/archive/v$pkgver.tar
prepare() {
# Read vimrc from /etc/vim
echo '#define SYS_VIMRC_FILE "/etc/vim/vimrc"' >> src/feature.h
- cp -r "$builddir" "$builddir"-gvim
default_prepare
}
@@ -51,20 +52,6 @@ build() {
--with-lua-prefix=/usr/lua5.3 \
--with-compiledby="Alpine Linux"
make
- cd "$builddir"-gvim
- ./configure \
- --build=$CBUILD \
- --host=$CHOST \
- --prefix=/usr \
- --enable-luainterp \
- --enable-python3interp=dynamic \
- --with-x \
- --disable-nls \
- --enable-multibyte \
- --enable-gui=gtk3 \
- --with-lua-prefix=/usr/lua5.3 \
- --with-compiledby="Alpine Linux"
- make
}
check() {
@@ -79,19 +66,6 @@ package() {
install -Dm644 "$srcdir"/vimrc "$pkgdir"/etc/vim/vimrc
}
-gvim() {
- pkgdesc="advanced text editor, with GUI"
- provides="vim"
- cd "$builddir"-gvim
- make -j1 DESTDIR="$subpkgdir/" install
-
- install -Dm644 runtime/doc/uganda.txt \
- "$subpkgdir/usr/share/licenses/$pkgname/LICENSE"
- install -Dm644 "$srcdir"/vimrc "$subpkgdir"/etc/vim/vimrc
- rm -rf "$subpkgdir"/usr/share/man
- rm "$subpkgdir/usr/bin/xxd"
-}
-
vimdiff() {
pkgdesc="view file diffs in vim"
depends="diffutils vim"
@@ -131,6 +105,6 @@ xxd() {
}
sha512sums="
-7f6fc24f8f4a4fa01d20702684cc09aa5c3b51cdc2c96f3afcb484bc60874fab5dcafc33a9daa5ff25f7ae7b90ba0b124a7667d33d9fa5d9553a11be9a1ee069 vim-8.2.3437.tar.gz
+acaf73df1007d368e96d11d8d02ca7e7ef30ff4226a553413911e54c46d15ef0c6e117a5289ac1ed1150c1280a5aab741b28c8bc4356b88b3ad8c865eb02f748 vim-8.2.3500.tar.gz
d9586b777881973cb5e48e18750336a522ed72c3127b2d6b6991e2b943468ca5b694476e7fa39ab469178c1375fc8f52627484e0fe377aea5811a513e35a7b02 vimrc
"