From a1328e9aabcc23a633ce3a7f3586330ee1db26cd Mon Sep 17 00:00:00 2001 From: Paul Menzel Date: Mon, 22 Apr 2024 13:03:17 +0200 Subject: [PATCH 1/2] Revert "gnutls: Build without p11-kit and PKCS#11 support" This reverts commit 16021d6acec4702457db95df3e0b085f13c37ef9. --- gnutls.be0 | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/gnutls.be0 b/gnutls.be0 index 1ca089971..612b4a4f6 100755 --- a/gnutls.be0 +++ b/gnutls.be0 @@ -23,8 +23,7 @@ SRCURL[0]="https://beehive.molgen.mpg.de/74b468201ef7e9035f78d44c3f0906c4/gnutls mee_configure() { bee_configure \ - --with-included-libtasn1 \ - --without-p11-kit + --with-included-libtasn1 } #mee_build() { From 349e81dd820d16aea8fc81d29e72f0e4df06e7da Mon Sep 17 00:00:00 2001 From: Paul Menzel Date: Mon, 22 Apr 2024 13:03:20 +0200 Subject: [PATCH 2/2] Revert "gnutls: Update version from 3.7.10 to 3.8.5" This reverts commit 684c3958f209c46bb2fc1c5aa89ce277245b566c. `rdesktop winter` fails with: Core(error): tcp_tls_connect(), TLS handshake failed. GnuTLS error: The encryption algorithm is not supported. [1]: https://gitlab.com/gnutls/gnutls/-/issues/1547 --- gnutls.be0 | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/gnutls.be0 b/gnutls.be0 index 612b4a4f6..20251cb3b 100755 --- a/gnutls.be0 +++ b/gnutls.be0 @@ -1,11 +1,11 @@ #!/usr/bin/env beesh -# BEE_VERSION gnutls-3.8.5-0 +# BEE_VERSION gnutls-3.7.10-0 # more info: https://gnutls.org/ -#SRCURL[0]="https://www.gnupg.org/ftp/gcrypt/gnutls/v3.8/gnutls-3.8.5.tar.xz" -SRCURL[0]="https://beehive.molgen.mpg.de/74b468201ef7e9035f78d44c3f0906c4/gnutls-3.8.5.tar.xz" +#SRCURL[0]="https://www.gnupg.org/ftp/gcrypt/gnutls/v3.7/gnutls-3.7.10.tar.xz" +SRCURL[0]="https://beehive.molgen.mpg.de/b049e76a9714698a35f8c4a6d59747b9/gnutls-3.7.10.tar.xz" # PATCHURL+=() @@ -23,7 +23,8 @@ SRCURL[0]="https://beehive.molgen.mpg.de/74b468201ef7e9035f78d44c3f0906c4/gnutls mee_configure() { bee_configure \ - --with-included-libtasn1 + --with-included-libtasn1 \ + --disable-guile } #mee_build() {