aboutsummaryrefslogtreecommitdiffstats
path: root/main/vim/APKBUILD
diff options
context:
space:
mode:
Diffstat (limited to 'main/vim/APKBUILD')
-rw-r--r--main/vim/APKBUILD190
1 files changed, 157 insertions, 33 deletions
diff --git a/main/vim/APKBUILD b/main/vim/APKBUILD
index e8555966a1d..4ca0c1df109 100644
--- a/main/vim/APKBUILD
+++ b/main/vim/APKBUILD
@@ -3,22 +3,122 @@
# Contributor: Sören Tempel <soeren+alpine@soeren-tempel.net>
# Maintainer: Natanael Copa <ncopa@alpinelinux.org>
pkgname=vim
-pkgver=8.2.4836
-pkgrel=0
+pkgver=9.1.0
+pkgrel=2
pkgdesc="Improved vi-style text editor"
url="https://www.vim.org/"
arch="all"
license="Vim"
options="!check" # some tests are failing
-depends="xxd"
-makedepends="ncurses-dev lua5.4-dev python3-dev gtk+3.0-dev libx11-dev libxt-dev"
-subpackages="$pkgname-doc ${pkgname}diff::noarch $pkgname-tutor gvim xxd"
-source="$pkgname-$pkgver.tar.gz::https://github.com/vim/vim/archive/v$pkgver.tar.gz
+makedepends="
+ gtk+3.0-dev
+ libx11-dev
+ libxt-dev
+ lua5.4-dev
+ ncurses-dev
+ python3-dev
+ ruby-dev
+ "
+subpackages="
+ $pkgname-doc
+ ${pkgname}diff
+ $pkgname-tutor
+ $pkgname-common
+ gvim
+ xxd
+ "
+source="$pkgname-$pkgver.tar.gz::https://github.com/vim/vim/archive/refs/tags/v$pkgver.tar.gz
vimrc
"
-replaces="gvim" # this can be removed after alpine 3.16
# secfixes:
+# 9.0.2127-r0:
+# - CVE-2023-48706
+# 9.0.2112-r0:
+# - CVE-2023-48231
+# 9.0.2073-r0:
+# - CVE-2023-5535
+# 9.0.1994-r0:
+# - CVE-2023-5344
+# 9.0.1888-r0:
+# - CVE-2023-4733
+# - CVE-2023-4734
+# - CVE-2023-4735
+# - CVE-2023-4736
+# - CVE-2023-4738
+# - CVE-2023-4750
+# - CVE-2023-4752
+# - CVE-2023-4781
+# 9.0.1413-r0:
+# - CVE-2023-1264
+# 9.0.1395-r0:
+# - CVE-2023-1127
+# - CVE-2023-1170
+# - CVE-2023-1175
+# - CVE-2023-1355
+# 9.0.1251-r0:
+# - CVE-2023-0433
+# - CVE-2023-0512
+# 9.0.1198-r0:
+# - CVE-2023-0288
+# 9.0.1167-r0:
+# - CVE-2023-0049
+# - CVE-2023-0051
+# - CVE-2023-0054
+# 9.0.0999-r0:
+# - CVE-2022-4141
+# - CVE-2022-4292
+# - CVE-2022-4293
+# - CVE-2022-47024
+# 9.0.0815-r0:
+# - CVE-2022-3705
+# 9.0.0636-r0:
+# - CVE-2022-3352
+# 9.0.0598-r0:
+# - CVE-2022-3234
+# - CVE-2022-3235
+# - CVE-2022-3256
+# - CVE-2022-3278
+# 9.0.0437-r0:
+# - CVE-2022-3134
+# 9.0.0369-r0:
+# - CVE-2022-2980
+# - CVE-2022-2982
+# - CVE-2022-3016
+# - CVE-2022-3037
+# - CVE-2022-3099
+# 9.0.0270-r0:
+# - CVE-2022-2923
+# - CVE-2022-2946
+# 9.0.0224-r0:
+# - CVE-2022-2816
+# - CVE-2022-2817
+# - CVE-2022-2819
+# 9.0.0050-r0:
+# - CVE-2022-2264
+# - CVE-2022-2284
+# - CVE-2022-2285
+# - CVE-2022-2286
+# - CVE-2022-2287
+# - CVE-2022-2288
+# - CVE-2022-2289
+# - CVE-2022-2304
+# 8.2.5170-r0:
+# - CVE-2022-2124
+# - CVE-2022-2125
+# - CVE-2022-2126
+# - CVE-2022-2129
+# 8.2.5055-r0:
+# - CVE-2022-1851
+# - CVE-2022-1886
+# - CVE-2022-1898
+# 8.2.5000-r0:
+# - CVE-2022-1796
+# 8.2.4969-r0:
+# - CVE-2022-1619
+# - CVE-2022-1620
+# - CVE-2022-1621
+# - CVE-2022-1629
# 8.2.4836-r0:
# - CVE-2022-1381
# 8.2.4708-r0:
@@ -87,19 +187,23 @@ replaces="gvim" # this can be removed after alpine 3.16
prepare() {
# Read vimrc from /etc/vim
echo '#define SYS_VIMRC_FILE "/etc/vim/vimrc"' >> src/feature.h
+
cp -r "$builddir" "$builddir"-gvim
default_prepare
}
build() {
+ export CFLAGS="$CFLAGS -flto=auto"
./configure \
--build=$CBUILD \
--host=$CHOST \
--prefix=/usr \
- --enable-luainterp \
+ --enable-luainterp=dynamic \
--enable-python3interp=dynamic \
+ --enable-rubyinterp=dynamic \
--without-x \
--disable-nls \
+ --enable-acl \
--enable-multibyte \
--enable-gui=no \
--with-lua-prefix=/usr/lua5.4 \
@@ -110,10 +214,12 @@ build() {
--build=$CBUILD \
--host=$CHOST \
--prefix=/usr \
- --enable-luainterp \
+ --enable-luainterp=dynamic \
--enable-python3interp=dynamic \
+ --enable-rubyinterp=dynamic \
--with-x \
--disable-nls \
+ --enable-acl \
--enable-multibyte \
--enable-gui=gtk3 \
--with-lua-prefix=/usr/lua5.4 \
@@ -126,56 +232,74 @@ check() {
}
package() {
- make -j1 DESTDIR="$pkgdir/" install
+ depends="vim-common=$pkgver-r$pkgrel xxd=$pkgver-r$pkgrel"
+ provider_priority=10
+ replaces="gvim"
+
+ make -j1 DESTDIR="$pkgdir" install
install -Dm644 runtime/doc/uganda.txt \
"$pkgdir/usr/share/licenses/$pkgname/LICENSE"
install -Dm644 "$srcdir"/vimrc "$pkgdir"/etc/vim/vimrc
+
+ # only relevant to gvim
+ rm -r "$pkgdir"/usr/share/icons/
+ rm -r "$pkgdir"/usr/share/applications/
+}
+
+common() {
+ replaces="vim gvim"
+ arch="noarch"
+ amove etc/vim/vimrc
+ amove usr/share/vim
}
gvim() {
pkgdesc="advanced text editor, with GUI"
- provides="vim"
- cd "$builddir"-gvim
- make -j1 DESTDIR="$subpkgdir/" install
+ depends="vim-common=$pkgver-r$pkgrel xxd=$pkgver-r$pkgrel"
+ provides="vim=$pkgver-r$pkgrel"
+ provider_priority=1
+ replaces="vim"
- 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"
+ make -C "$builddir"-gvim -j1 DESTDIR="$subpkgdir" install
+
+ rm "$subpkgdir"/usr/bin/vimdiff
+ rm "$subpkgdir"/usr/bin/vimtutor
+ rm -r "$subpkgdir"/usr/share/man
+ rm -r "$subpkgdir"/usr/share/vim
+ rm "$subpkgdir"/usr/bin/xxd
}
vimdiff() {
pkgdesc="view file diffs in vim"
- depends="diffutils vim"
+ depends="diffutils vim=$pkgver-r$pkgrel"
+ replaces="vim gvim"
+ arch="noarch"
options="!tracedeps"
+ provides="cmd:vimdiff=$pkgver-r$pkgrel"
- install -d "$subpkgdir"/usr/bin
- mv "$pkgdir"/usr/bin/vimdiff "$subpkgdir"/usr/bin
+ amove usr/bin/vimdiff
}
tutor() {
pkgdesc="vim tutor and tutor files"
- depends="vim"
- options="!tracedeps"
+ depends="vim=$pkgver-r$pkgrel"
+ replaces="gvim vim"
+ arch="noarch"
- install -d "$subpkgdir"/usr/bin
- install -d "$subpkgdir"/usr/share/vim/vim82/tutor
- mv "$pkgdir"/usr/bin/vimtutor "$subpkgdir"/usr/bin
- mv "$pkgdir"/usr/share/vim/vim82/tutor "$subpkgdir"/usr/share/vim/vim82/
+ amove usr/bin/vimtutor
+ amove usr/share/vim/vim*/tutor
}
xxd() {
pkgdesc="tool to make (or reverse) a hex dump"
depends=""
- echo "$pkgdir" "$subpkgdir"
- mkdir -p "$subpkgdir/usr/bin"
- mv "$pkgdir/usr/bin/xxd" \
- "$subpkgdir/usr/bin/"
+ replaces="gvim vim"
+
+ amove usr/bin/xxd
}
sha512sums="
-e1afe03a3140c91fa928d88a8b3ad5e7c8808e5de5b7a07726b2a4f8f402adfdef2890be6a279e52848cc75346d15d4653f579f96da409544d58aba036abbbf7 vim-8.2.4836.tar.gz
-9ed58e38fe9d72f934eb507b27c18590c33c648eb7ca2639a9afdcaa1c2c4e0873a4e4252d2b6cc28127d1ded227a1e8ac338c93958526f98a3b66dbdf6afcc8 vimrc
+d7038c5c413bfd1a125a893c0b1d3e498e9ce6b5df7d45ef536faac966ce2846b08fe2982010c31f30b34fda07ba2c6922d795806509d05d73768626edc70374 vim-9.1.0.tar.gz
+bb4ac5bd2862754e741e63d7b521fd9e0cb1ac19769b952672928fd26471e9486182cd8a46a7e6f25e5b87759106e642293534c5e90c3c3958308291acb26875 vimrc
"