[meta-networking][PATCH 099/109] openconnect: upgrade 9.12 -> 9.21

Khem Raj <[email protected]>
Newsgroups org.openembedded.lists.openembedded-devel
Message-ID <[email protected]>
Drop 0001-Shim-for-renaming-of-GNUTLS_NO_EXTENSIONS-in-GnuTLS-.patch:
it was a workaround for GnuTLS >= 3.8.1 renaming GNUTLS_NO_EXTENSIONS
before a compatibility shim landed upstream; that compatibility shim
is long merged and this openconnect release range no longer needs
the local re-definition (build succeeds without it).

AI-Generated: Uses Claude Code
Signed-off-by: Khem Raj <[email protected]>
---
 ...g-of-GNUTLS_NO_EXTENSIONS-in-GnuTLS-.patch | 43 -------------------
 ...penconnect_9.12.bb => openconnect_9.21.bb} |  3 +-
 2 files changed, 1 insertion(+), 45 deletions(-)
 delete mode 100644 meta-networking/recipes-connectivity/openconnect/openconnect/0001-Shim-for-renaming-of-GNUTLS_NO_EXTENSIONS-in-GnuTLS-.patch
 rename meta-networking/recipes-connectivity/openconnect/{openconnect_9.12.bb => openconnect_9.21.bb} (87%)

diff --git a/meta-networking/recipes-connectivity/openconnect/openconnect/0001-Shim-for-renaming-of-GNUTLS_NO_EXTENSIONS-in-GnuTLS-.patch b/meta-networking/recipes-connectivity/openconnect/openconnect/0001-Shim-for-renaming-of-GNUTLS_NO_EXTENSIONS-in-GnuTLS-.patch
deleted file mode 100644
index 9dd3da75ad..0000000000
--- a/meta-networking/recipes-connectivity/openconnect/openconnect/0001-Shim-for-renaming-of-GNUTLS_NO_EXTENSIONS-in-GnuTLS-.patch
+++ /dev/null
@@ -1,43 +0,0 @@
-From e4ea64134cfe3763332c16dcac52dd894b935880 Mon Sep 17 00:00:00 2001
-From: Daniel Lenski <[email protected]>
-Date: Tue, 22 Aug 2023 12:02:19 -0700
-Subject: [PATCH] Shim for renaming of GNUTLS_NO_EXTENSIONS in GnuTLS v3.8.1
-
-The constant `GNUTLS_NO_EXTENSIONS` was renamed in
-https://gitlab.com/gnutls/gnutls/-/commit/a7c4a04e (released in v3.8.1), and
-then a backwards-compatibility shim was belatedly added in
-https://gitlab.com/gnutls/gnutls/-/commit/abfa8634, which has not yet been
-released.
-
-We need to re-add the constant ourselves in order to build correctly with
-GnuTLS v3.8.1.  This should fix
-https://gitlab.com/openconnect/openconnect/-/issues/650.
-
-Upstream-Status: Backport [https://git.infradead.org/users/dwmw2/openconnect.git/commit/7512698217c4104aade7a2df669a20de68f3bb8c]
-Signed-off-by: Daniel Lenski <[email protected]>
----
- gnutls-dtls.c | 8 ++++++++
- 1 file changed, 8 insertions(+)
-
-diff --git a/gnutls-dtls.c b/gnutls-dtls.c
-index 3fd78e95..50a4bb4e 100644
---- a/gnutls-dtls.c
-+++ b/gnutls-dtls.c
-@@ -39,6 +39,14 @@
- # define GNUTLS_CIPHER_CHACHA20_POLY1305 23
- #endif
- 
-+#if GNUTLS_VERSION_NUMBER >= 0x030801 && !defined(GNUTLS_NO_EXTENSIONS)
-+/* XX: GNUTLS_NO_EXTENSIONS was renamed in GnuTLS v3.8.1. A
-+ * backwards-compatibility shim was added in a subsequent commit, but
-+ * not yet released.
-+ */
-+# define GNUTLS_NO_EXTENSIONS GNUTLS_NO_DEFAULT_EXTENSIONS
-+#endif
-+
- /* sets the DTLS MTU and returns the actual tunnel MTU */
- unsigned dtls_set_mtu(struct openconnect_info *vpninfo, unsigned mtu)
- {
--- 
-2.42.0
-
diff --git a/meta-networking/recipes-connectivity/openconnect/openconnect_9.12.bb b/meta-networking/recipes-connectivity/openconnect/openconnect_9.21.bb
similarity index 87%
rename from meta-networking/recipes-connectivity/openconnect/openconnect_9.12.bb
rename to meta-networking/recipes-connectivity/openconnect/openconnect_9.21.bb
index e1027747b6..2f7668c6e4 100644
--- a/meta-networking/recipes-connectivity/openconnect/openconnect_9.12.bb
+++ b/meta-networking/recipes-connectivity/openconnect/openconnect_9.21.bb
@@ -4,9 +4,8 @@ LIC_FILES_CHKSUM = "file://COPYING.LGPL;md5=4fbd65380cdd255951079008b364516c"
 
 SRC_URI = " \
     git://git.infradead.org/users/dwmw2/openconnect.git;branch=master \
-    file://0001-Shim-for-renaming-of-GNUTLS_NO_EXTENSIONS-in-GnuTLS-.patch \
 "
-SRCREV = "59f2e59eb3e436364ef82e630e5a2f88f32acd58"
+SRCREV = "8b702bf2dbaf11302ed98629214b1df5d50a12aa"
 
 DEPENDS = "vpnc libxml2 krb5 gettext-native"
 RDEPENDS:${PN} = "bash python3-core vpnc-script"
lmpx.com only provides a reader for public news (NNTP) servers. It is not affiliated with the servers or forums shown here and is not responsible for the content of articles, which is written by their respective authors.