diff options
Diffstat (limited to 'user/gnutls')
| -rw-r--r-- | user/gnutls/APKBUILD | 8 | ||||
| -rw-r--r-- | user/gnutls/disable-certtool-test.patch | 13 | ||||
| -rw-r--r-- | user/gnutls/gnulib-tests-dont-require-gpg-passphrase.patch | 10 |
3 files changed, 10 insertions, 21 deletions
diff --git a/user/gnutls/APKBUILD b/user/gnutls/APKBUILD index 08967d27a..0afc05196 100644 --- a/user/gnutls/APKBUILD +++ b/user/gnutls/APKBUILD @@ -2,7 +2,7 @@ # Contributor: Michael Mason <ms13sp@gmail.com> # Maintainer: Zach van Rijn <me@zv.io> pkgname=gnutls -pkgver=3.6.16 +pkgver=3.7.4 pkgrel=0 pkgdesc="A TLS protocol implementation" url="https://www.gnutls.org/" @@ -22,7 +22,6 @@ case $pkgver in ;; esac source="https://www.gnupg.org/ftp/gcrypt/gnutls/v${_v}/$pkgname-$pkgver.tar.xz - gnulib-tests-dont-require-gpg-passphrase.patch disable-certtool-test.patch " @@ -85,6 +84,5 @@ xx() { mv "$pkgdir"/usr/lib/lib*xx.so.* "$subpkgdir"/usr/lib/ } -sha512sums="72c78d7fcb024393c1d15f2a1856608ae4460ba43cc5bbbb4c29b80508cae6cb822df4638029de2363437d110187e0a3cc19a7288c3b2f44b2f648399a028438 gnutls-3.6.16.tar.xz -abc24ee59cc67805fe953535b0bae33080fc8b0bf788304377f6d10ec8c162c4cf203a69c98a4ba3483b4c60ed7a204433cc7db9b8190eddb0d68f6fb6dad52d gnulib-tests-dont-require-gpg-passphrase.patch -25400be364c1f27b88451002a471cbf841b9738dd93c42dcbeaf7644c3deea6afc85300b40d5ae32d29dc4d441237e8b311f3e07f0af2fb4788701ee4e240c0f disable-certtool-test.patch" +sha512sums="38b488ca1223d9aa8fc25756df08db6f29aaf76fb5816fdeaa14bd89fb431a2e1c495fefc64094f726337d5b89e198146ec7dc22e9a1bca6841a9d881b0d99e6 gnutls-3.7.4.tar.xz +510b0fd3464592cfffefa6cbfd09935aa26ab057b9dab7e588527efa2373a6f1ff8344270b4c143c669697e1bfa14218da29730dbc14e27daa21f770a519af1b disable-certtool-test.patch" diff --git a/user/gnutls/disable-certtool-test.patch b/user/gnutls/disable-certtool-test.patch index 2ae16a38e..39cba942b 100644 --- a/user/gnutls/disable-certtool-test.patch +++ b/user/gnutls/disable-certtool-test.patch @@ -15,12 +15,13 @@ GNUTLS_PIN is set). The folks at Nix believe this is an incompatibility due to musl's getpass not falling back to stdin/stderr if it cannot connect to a tty, -as glibc does. +as glibc does. Upstream believes this test should only be run on glibc +systems, so we skip it. https://gitlab.com/gnutls/gnutls/-/issues/945 ---- gnutls-3.6.13/tests/cert-tests/certtool 2020-01-01 14:10:19.000000000 -0600 -+++ gnutls-3.6.13/tests/cert-tests/certtool 2020-06-02 20:36:20.380039844 -0500 +--- gnutls-3.6.13/tests/cert-tests/certtool.sh 2020-01-01 14:10:19.000000000 -0600 ++++ gnutls-3.6.13/tests/cert-tests/certtool.sh 2020-06-02 20:36:20.380039844 -0500 @@ -20,6 +20,9 @@ #set -e @@ -28,6 +29,6 @@ https://gitlab.com/gnutls/gnutls/-/issues/945 +echo 'this test is not compatible with musl' +exit 77 + - srcdir="${srcdir:-.}" - CERTTOOL="${CERTTOOL:-../../src/certtool${EXEEXT}}" - DIFF="${DIFF:-diff -b -B}" + : ${srcdir=.} + : ${CERTTOOL=../../src/certtool${EXEEXT}} + : ${DIFF=diff -b -B} diff --git a/user/gnutls/gnulib-tests-dont-require-gpg-passphrase.patch b/user/gnutls/gnulib-tests-dont-require-gpg-passphrase.patch deleted file mode 100644 index 2c9276cbc..000000000 --- a/user/gnutls/gnulib-tests-dont-require-gpg-passphrase.patch +++ /dev/null @@ -1,10 +0,0 @@ ---- gnutls-3.6.2/gl/tests/test-vc-list-files-git.sh 2018-01-03 18:36:29.000000000 -0600 -+++ gnutls-3.6.2/gl/tests/test-vc-list-files-git.sh 2018-06-18 21:57:08.305562148 -0500 -@@ -32,6 +32,7 @@ - touch d/a b c && - git config user.email "you@example.com" && - git config user.name "Your Name" && -+ git config commit.gpgsign false && - git add . > /dev/null && - git commit -q -a -m log && - printf '%s\n' b c d/a > expected && |