aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorLeo <thinkabit.ukim@gmail.com>2020-04-05 16:07:58 -0300
committerLeo <thinkabit.ukim@gmail.com>2020-04-05 16:07:58 -0300
commit5f92eb8ad10133c22508f7e1ab4e46b4eb842ef7 (patch)
treee29ca40a56e14d711c493ca18a05a2c471d5814b
parent6036e9453de63200073e392cbb4393a8fa3cf42f (diff)
downloadaports-5f92eb8ad10133c22508f7e1ab4e46b4eb842ef7.tar.gz
aports-5f92eb8ad10133c22508f7e1ab4e46b4eb842ef7.tar.bz2
aports-5f92eb8ad10133c22508f7e1ab4e46b4eb842ef7.tar.xz
main/vim: modernize, fix pkgrel in secfixes
-rw-r--r--main/vim/APKBUILD18
1 files changed, 7 insertions, 11 deletions
diff --git a/main/vim/APKBUILD b/main/vim/APKBUILD
index d56682567f..acc36ac723 100644
--- a/main/vim/APKBUILD
+++ b/main/vim/APKBUILD
@@ -13,12 +13,12 @@ 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 gvim xxd"
-source="$pkgname-$pkgver.tar.gz::https://github.com/$pkgname/$pkgname/archive/v$pkgver.tar.gz
+source="$pkgname-$pkgver.tar.gz::https://github.com/vim/vim/archive/v$pkgver.tar.gz
vimrc
"
# secfixes:
-# 8.1.1365:
+# 8.1.1365-r0:
# - CVE-2019-12735
# 8.0.1521-r0:
# - CVE-2017-6350
@@ -29,14 +29,12 @@ source="$pkgname-$pkgver.tar.gz::https://github.com/$pkgname/$pkgname/archive/v$
# - CVE-2016-1248
prepare() {
- cd "$builddir"
# Read vimrc from /etc/vim
echo '#define SYS_VIMRC_FILE "/etc/vim/vimrc"' >> src/feature.h
cp -r "$builddir" "$builddir"-gvim
}
build() {
- cd "$builddir"
./configure \
--build=$CBUILD \
--host=$CHOST \
@@ -67,12 +65,10 @@ build() {
}
check() {
- cd "$builddir"
make test
}
package() {
- cd "$builddir"
make -j1 DESTDIR="$pkgdir/" install
install -Dm644 runtime/doc/uganda.txt \
@@ -90,7 +86,7 @@ gvim() {
"$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"
+ rm "$subpkgdir/usr/bin/xxd"
}
vimdiff() {
@@ -105,10 +101,10 @@ vimdiff() {
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/"
+ echo "$pkgdir" "$subpkgdir"
+ mkdir -p "$subpkgdir/usr/bin"
+ mv "$pkgdir/usr/bin/xxd" \
+ "$subpkgdir/usr/bin/"
}
sha512sums="0327c19929ef0c0d8d0b1dae0121444d9d07a4d3c9037d85a52bd77206b7ba5534483ad75f65ba26746d4838b68d90b9bee1f9bc992c5898600d2a6c106039de vim-8.2.0357.tar.gz