diff options
| author | Sören Tempel <soeren+git@soeren-tempel.net> | 2016-04-06 23:38:11 +0200 |
|---|---|---|
| committer | Sören Tempel <soeren+git@soeren-tempel.net> | 2016-04-06 23:38:40 +0200 |
| commit | cfb358842c4d0a288c8e5b22ee15e31489cc5b68 (patch) | |
| tree | acba0b18e8cf65ae12ea067adcf194fb78dc65da /testing | |
| parent | 9dd7a679aeeaf9c8024a46a986f926f5105bf022 (diff) | |
| download | aports-cfb358842c4d0a288c8e5b22ee15e31489cc5b68.tar.bz2 aports-cfb358842c4d0a288c8e5b22ee15e31489cc5b68.tar.xz | |
testing/vis: upgrade to 0.2
Diffstat (limited to 'testing')
| -rw-r--r-- | testing/vis/APKBUILD | 30 | ||||
| -rw-r--r-- | testing/vis/fortify-source.patch | 22 |
2 files changed, 29 insertions, 23 deletions
diff --git a/testing/vis/APKBUILD b/testing/vis/APKBUILD index 0e492c93e7..7c146a5b4d 100644 --- a/testing/vis/APKBUILD +++ b/testing/vis/APKBUILD @@ -1,35 +1,41 @@ # Contributor: Sören Tempel <soeren+alpine@soeren-tempel.net> # Maintainer: Sören Tempel <soeren+alpine@soeren-tempel.net> pkgname=vis -pkgver=0.1 -pkgrel=1 +pkgver=0.2 +pkgrel=0 pkgdesc="A vim like text editor" url="https://github.com/martanne/vis" arch="all" license="ISC" depends="!outils-vis lua5.2-lpeg" depends_dev="" -makedepends="libtermkey-dev ncurses-dev lua5.2-dev" +makedepends="libtermkey-dev ncurses-dev acl-dev lua5.2-dev" install="" subpackages="$pkgname-doc" source="$pkgname-$pkgver.tar.gz::https://github.com/martanne/$pkgname/archive/v$pkgver.tar.gz fortify-source.patch" -_builddir="$srcdir"/$pkgname-$pkgver +builddir="$srcdir"/$pkgname-$pkgver build() { - make -C "$_builddir" || return 1 + cd "$builddir" + ./configure \ + --prefix=/usr \ + --enable-lua \ + --enable-acl \ + || return 1 + make || return 1 } package() { - make -C "$_builddir" \ + make -C "$builddir" \ PREFIX=/usr \ DESTDIR="$pkgdir" \ install || return 1 } -md5sums="1e4a2b14cce65dee1458c6c4bd47b28e vis-0.1.tar.gz -4cdc22b04428fc837feb78cc4cedbe2f fortify-source.patch" -sha256sums="c695b095f85f4360590865b0b7007aa019463b24c1026c0e624a78b31f3ac54b vis-0.1.tar.gz -71928d8b7408e52c396aca154e0fefc0aa07b1da744afc2d486b1f8b0984f89b fortify-source.patch" -sha512sums="f2647971660ceb14a16371129e01027264c80818e1143684dffd19a7b99df5ee83978751b497b5678bb36a910203f9546366db335ccaf721b906b8e5b1bb9100 vis-0.1.tar.gz -46a0220123a1878cd2f96fe69009ce14fea4c2362e6c285d63237faf140062125a4132668dc01124723ac0f697ae3ad625c5ea242330e427b0496436fe300d5b fortify-source.patch" +md5sums="60487df2369c6bf6bed0ee9eb8cfa07e vis-0.2.tar.gz +8f2a9c50a44a7a1a9f30c144d6aaa113 fortify-source.patch" +sha256sums="3e5b81d760849c56ee378421e9ba0f653c641bf78e7594f71d85357be99a752d vis-0.2.tar.gz +5722c02bf2d08c8700970831b428930ef2780234350c1d0716c709ffc01f7f92 fortify-source.patch" +sha512sums="ded2566105b890e21ee010f2f2809986e405f76bed2f7a969d2f818bcf437f3969a140ed0be2af7631e36b3c7fb6b73a3d715ba9ddb7fdd67a2e983b0765918a vis-0.2.tar.gz +53a2f70a67e4fdb7462904428bbd556f5452989ada746ec8d67b7a90aabbf806377ef7d66d760d0d74ab3101d4af2154b1a59403fce60b20ef11476242cba713 fortify-source.patch" diff --git a/testing/vis/fortify-source.patch b/testing/vis/fortify-source.patch index bb790c703d..763c73e7ab 100644 --- a/testing/vis/fortify-source.patch +++ b/testing/vis/fortify-source.patch @@ -2,15 +2,15 @@ 010_all_default-fortify-source.patch patch in main/gcc. Disabling it here silences a bunch of compiler warnings. -diff -upr vis-0.1.orig/config.mk vis-0.1/config.mk ---- vis-0.1.orig/config.mk 2016-02-27 17:42:14.812754756 +0100 -+++ vis-0.1/config.mk 2016-02-27 17:42:23.349390641 +0100 -@@ -64,7 +64,7 @@ STRIP ?= strip +diff -upr vis-0.2.orig/configure vis-0.2/configure +--- vis-0.2.orig/configure 2016-04-06 23:36:44.232477390 +0200 ++++ vis-0.2/configure 2016-04-06 23:36:59.705671155 +0200 +@@ -199,7 +199,7 @@ tryflag CFLAGS_TRY -Werror=unused-com + tryldflag LDFLAGS_TRY -Werror=unknown-warning-option + tryldflag LDFLAGS_TRY -Werror=unused-command-line-argument - # Hardening - ifeq (${CC},gcc) -- CFLAGS += -fPIC -fstack-protector-all -D_FORTIFY_SOURCE=2 -+ CFLAGS += -fPIC -fstack-protector-all - LDFLAGS += -z now -z relro -pie - else ifeq (${CC},clang) - CFLAGS += -fPIE -fstack-protector-all -D_FORTIFY_SOURCE=2 +-CFLAGS_STD="-std=c99 -D_POSIX_C_SOURCE=200809L -D_XOPEN_SOURCE=700 -DNDEBUG -D_FORTIFY_SOURCE=2" ++CFLAGS_STD="-std=c99 -D_POSIX_C_SOURCE=200809L -D_XOPEN_SOURCE=700 -DNDEBUG" + LDFLAGS_STD="-lc" + + OS=$(uname) |