gnutls: Upgrade to 3.8.8

In 3.8.7 is that the linkage to compression libraries were changed to use a new
tool called dlwrap, this caused issues during the last upgrade but is resolved
now with the update to 3.8.8. Remove the workarounds for the update hence.

Changes in 3.8.8 include:
* libgnutls:
   * Experimental support for X25519MLKEM768 and SecP256r1MLKEM768
     key exchange in TLS 1.3
   * All records included in an OCSP response are now checked in TLS
   * Handling of malformed compress_certificate extension is now more standard
     compliant
* More flexible library linking options for compression libraries, TPM, and
  liboqs support. The configure options, --with-zstd, --with-brotli, --with-zlib,
   --with-tpm2, and --with-liboqs now take 4 states:
   yes/link/dlopen/no, to specify how the libraries are linked or
   loaded.

Do not set a specific library linking option but use the default(yes).

(From OE-Core rev: 6620623ce280d20c2430ba87ba276a0490b05080)

Signed-off-by: Simone Weiß <simone.p.weiss@posteo.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>

2 files changed, 1 insertions, 47 deletions

diff --git a/meta/recipes-support/gnutls/gnutls/conditional.patch b/meta/recipes-support/gnutls/gnutls/conditional.patch
deleted file mode 100644
index 2ff532fb53..0000000000
--- a/meta/recipes-support/gnutls/gnutls/conditional.patch
+++ /dev/null
@@ -1,42 +0,0 @@
-From 292f96f26d7ce80e4a165c903c4fd569b85c1c1f Mon Sep 17 00:00:00 2001
-From: Daiki Ueno <ueno@gnu.org>
-Date: Fri, 16 Aug 2024 09:42:15 +0900
-Subject: [PATCH] build: fix setting AM_CONDITIONAL for brotli and zstd
-
-As the with_{libbrotli,libzsttd} variables are unset if configured
-with --without-{brotli,zstd}, check the unequality to "no" doesn't
-work; use explicit matching with "yes" instead.
-
-Signed-off-by: Daiki Ueno <ueno@gnu.org>
-
-Upstream-Status: Backport
-Signed-off-by: Ross Burton <ross.burton@arm.com>
----
- configure.ac | 4 ++--
- 1 file changed, 2 insertions(+), 2 deletions(-)
-
-diff --git a/configure.ac b/configure.ac
-index 95ec4c1515..a476176800 100644
---- a/configure.ac
-+++ b/configure.ac
-@@ -1158,7 +1158,7 @@ if test x$ac_brotli != xno; then
- else
-     AC_MSG_RESULT(no)
- fi
--AM_CONDITIONAL(HAVE_LIBBROTLI, test "$with_libbrotlienc" != "no" && test "$with_libbrotlidec" != "no")
-+AM_CONDITIONAL(HAVE_LIBBROTLI, test "$with_libbrotlienc" = yes && test "$with_libbrotlidec" = yes)
- 
- AS_IF([test "$ac_cv_dlopen_soname_works" = yes], [
-     save_CFLAGS=$CFLAGS
-@@ -1203,7 +1203,7 @@ if test x$ac_zstd != xno; then
- else
-     AC_MSG_RESULT(no)
- fi
--AM_CONDITIONAL(HAVE_LIBZSTD, test "$with_libzstd" != "no")
-+AM_CONDITIONAL(HAVE_LIBZSTD, test "$with_libzstd" = yes)
- 
- AS_IF([test "$ac_cv_dlopen_soname_works" = yes], [
-     save_CFLAGS=$CFLAGS
--- 
-GitLab
-
diff --git a/meta/recipes-support/gnutls/gnutls_3.8.7.1.bb b/meta/recipes-support/gnutls/gnutls_3.8.8.bb
index b381520e2e..213b9ff803 100644
--- a/meta/recipes-support/gnutls/gnutls_3.8.7.1.bb
+++ b/meta/recipes-support/gnutls/gnutls_3.8.8.bb
@@ -21,15 +21,11 @@ SHRT_VER = "${@d.getVar('PV').split('.')[0]}.${@d.getVar('PV').split('.')[1]}"
 SRC_URI = "https://www.gnupg.org/ftp/gcrypt/gnutls/v${SHRT_VER}/gnutls-${PV}.tar.xz \
            file://arm_eabi.patch \
            file://0001-Creating-.hmac-file-should-be-excuted-in-target-envi.patch \
-           file://conditional.patch \
            file://run-ptest \
            file://Add-ptest-support.patch \
            "
 
-SRC_URI[sha256sum] = "9ca0ddaccce28a74fa18d738744190afb3b0daebef74e6ad686bf7bef99abd60"
-
-# This is only needed for 3.8.7.1, remove when upgrading to 3.8.8 onwards
-S = "${WORKDIR}/gnutls-3.8.7"
+SRC_URI[sha256sum] = "ac4f020e583880b51380ed226e59033244bc536cad2623f2e26f5afa2939d8fb"
 
 inherit autotools texinfo pkgconfig gettext lib_package gtk-doc ptest