From 831b5ad2ddc7b85ee2c7c8e3719e9d57ad967610 Mon Sep 17 00:00:00 2001 From: "A. Wilcox" Date: Mon, 25 Jun 2018 03:29:38 -0500 Subject: system/pcre2: [PD] overhaul check and fix metadata --- system/pcre2/APKBUILD | 27 ++++++--------------------- 1 file changed, 6 insertions(+), 21 deletions(-) (limited to 'system/pcre2/APKBUILD') diff --git a/system/pcre2/APKBUILD b/system/pcre2/APKBUILD index d06c4b22c..e32e86bb0 100644 --- a/system/pcre2/APKBUILD +++ b/system/pcre2/APKBUILD @@ -1,12 +1,12 @@ # Contributor: Jakub Jirutka -# Maintainer: Jakub Jirutka +# Maintainer: pkgname=pcre2 -pkgver=10.30 -pkgrel=1 +pkgver=10.31 +pkgrel=0 pkgdesc="Perl-compatible regular expression library" url="http://pcre.sourceforge.net/" arch="all" -license="BSD" +license="BSD-3-Clause" depends="" depends_dev="libedit-dev zlib-dev" makedepends="$depends_dev paxmark" @@ -42,26 +42,11 @@ build() { make } -# Note: RunTest and pcre2_jit_test generates some binaries in .libs that needs -# to disable MPROTECT on grsecurity kernel. That's why it's so complicated... check() { cd "$builddir" - local is_pax=$(grep -q PaX /proc/$$/status && echo 'yes' || echo 'no') - - if [ "$is_pax" = yes ]; then - timeout -t 1 -s KILL ./RunTest 2>/dev/null || true - find .libs -type f ! -name 'lib*' | xargs paxmark m - fi ./RunTest - - if [ -n "$_enable_jit" ]; then - if [ "$is_pax" = yes ]; then - timeout -t 1 -s KILL ./pcre2_jit_test >/dev/null || true - find .libs -type f ! -name 'lib*' | xargs paxmark m - fi - ./pcre2_jit_test - fi + [ ! -n "$_enable_jit" ] || ./pcre2_jit_test } package() { @@ -85,4 +70,4 @@ tools() { mv "$pkgdir"/usr/bin "$subpkgdir"/usr/ } -sha512sums="af6c7cd8e25ec1ed538c89808b144a508ee6f5ca08134f04119e4786d69643bea99bec3c9527d201cec47ba52032d55ad7692b448b4696d68fd4ed1081dbaa62 pcre2-10.30.tar.gz" +sha512sums="f333c97684d70daf4d892d60b36d94eb62132f9f53d2603e1e95f1230c93d482a1a793fe1c1bb3dca98bc894c86e4956f18b0eba9aac49e24bffbf3e1efcfd2d pcre2-10.31.tar.gz" -- cgit v1.2.3-60-g2f50