diff options
| author | J0WI <J0WI@users.noreply.github.com> | 2019-01-26 23:40:25 +0100 |
|---|---|---|
| committer | Leonardo Arena <rnalrd@alpinelinux.org> | 2019-02-06 14:20:43 +0000 |
| commit | b8661f636d315ce629ba1fa8c386b8bb5a9c76cf (patch) | |
| tree | 7226089783ecc3c929cb6d82ce075ba3af596fc6 /main/gnutls | |
| parent | 1fe28b50d3618c14970a75f80b2cfb0bf62971a8 (diff) | |
| download | aports-b8661f636d315ce629ba1fa8c386b8bb5a9c76cf.tar.bz2 aports-b8661f636d315ce629ba1fa8c386b8bb5a9c76cf.tar.xz | |
main/gnutls: upgrade to 3.6.6
Diffstat (limited to 'main/gnutls')
| -rw-r--r-- | main/gnutls/APKBUILD | 9 | ||||
| -rw-r--r-- | main/gnutls/tests-date-compat.patch | 12 |
2 files changed, 10 insertions, 11 deletions
diff --git a/main/gnutls/APKBUILD b/main/gnutls/APKBUILD index fde1a9df7f..e9998c13ff 100644 --- a/main/gnutls/APKBUILD +++ b/main/gnutls/APKBUILD @@ -2,12 +2,13 @@ # Contributor: Michael Mason <ms13sp@gmail.com> # Maintainer: Natanael Copa <ncopa@alpinelinux.org> pkgname=gnutls -pkgver=3.6.5 +pkgver=3.6.6 pkgrel=0 pkgdesc="A TLS protocol implementation" url="https://www.gnutls.org/" arch="all" license="GPL" +options="!check" # depends on datefudge checkdepends="diffutils" makedepends="nettle-dev zlib-dev libtasn1-dev p11-kit-dev libunistring-dev texinfo" subpackages="$pkgname-dbg $pkgname-doc $pkgname-dev $pkgname-utils $pkgname-c++:xx" @@ -43,8 +44,6 @@ build() { check() { cd "$builddir" - # XXX: Some tests fail on x86 and x86_64, most likely due to some problem - # on the builders (cannot reproduce it locally and it passes on others). make check } @@ -65,5 +64,5 @@ xx() { mv "$pkgdir"/usr/lib/lib*xx.so.* "$subpkgdir"/usr/lib/ } -sha512sums="127f053ce45c63cd745fa5a654a2d8e4fbc322f5e17dcc3740fb2e7b376dd18dad59318d66e6e93e37d6a179fca4b35cf2ae62d13be5645cd2d06badd79d4dce gnutls-3.6.5.tar.xz -14b1be86a0180c914aaaada261ccf01914d48df9510b57572e4f32683d1dd984a907ecf2c848cc4773b1c139059de26383a2c617f509f8c75b985668a23fd28d tests-date-compat.patch" +sha512sums="4ff34f38d7dc543bc5750d8fdfe9be84af60c66e8d41da45f6cffc11d6c6c726784fd2d471b3416604ca1f3f9efb22ff7a290d5c92c96deda38df6ae3e794cc1 gnutls-3.6.6.tar.xz +b9aefaca8a894b223b8bcc738524602e36edf6a49f458606235598470033c81b02e876bec18a41ac57760cb9644d44b4c35969be74d4a8120245fff716429531 tests-date-compat.patch" diff --git a/main/gnutls/tests-date-compat.patch b/main/gnutls/tests-date-compat.patch index 2717ab230e..82e3314d29 100644 --- a/main/gnutls/tests-date-compat.patch +++ b/main/gnutls/tests-date-compat.patch @@ -1,12 +1,12 @@ Busybox date does not support %N, this is GNU extension. --- a/tests/scripts/common.sh +++ b/tests/scripts/common.sh -@@ -59,7 +59,7 @@ - } - +@@ -61,7 +61,7 @@ # Find a port number not currently in use. --GETPORT='rc=0; myrandom=$(date +%N | sed s/^0*//) -+GETPORT='rc=0; myrandom=$(date +%s | sed s/^0*//) + GETPORT='rc=0; unset myrandom + if test -n "$RANDOM"; then myrandom=$(($RANDOM + $RANDOM)); fi +- if test -z "$myrandom"; then myrandom=$(date +%N | sed s/^0*//); fi ++ if test -z "$myrandom"; then myrandom=$(date +%s | sed s/^0*//); fi + if test -z "$myrandom"; then myrandom=0; fi while test $rc = 0;do PORT="$(((($$<<15)|$myrandom) % 63001 + 2000))" - check_if_port_in_use $PORT;rc=$? |