openconnect: update to 9.21

remove all the upstreamed patches

Signed-off-by: Jimmy Qin <redacted>

diff --git a/net/openconnect/Makefile b/net/openconnect/Makefile
index 4fe4627c9e32090839b13cc32eca69b3fabcb2e0..2cd5206b749f3796be67c990671438647c488322 100644 (file)
--- a/net/openconnect/Makefile
+++ b/net/openconnect/Makefile
@@ -1,5 +1,5 @@
 #
-# Copyright (C) 2006-2015 OpenWrt.org
+# Copyright (C) 2006-2026 OpenWrt.org
 #
 # This is free software, licensed under the GNU General Public License v2.
 # See /LICENSE for more information.
@@ -8,12 +8,12 @@
 include $(TOPDIR)/rules.mk
 
 PKG_NAME:=openconnect
-PKG_VERSION:=9.12
-PKG_RELEASE:=7
+PKG_VERSION:=9.21
+PKG_RELEASE:=1
 
 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz
 PKG_SOURCE_URL:=https://www.infradead.org/openconnect/download
-PKG_HASH:=a2bedce3aa4dfe75e36e407e48e8e8bc91d46def5335ac9564fbf91bd4b2413e
+PKG_HASH:=5b32369467db6e5f317aa1ed12cfcbb81ed00bdbc765450b6bfcbdc300944a58
 
 PKG_LICENSE:=LGPL-2.1-or-later
 PKG_LICENSE_FILES:=COPYING.LGPL

diff --git a/net/openconnect/patches/010-libxml212.patch b/net/openconnect/patches/010-libxml212.patch
deleted file mode 100644 (file)
index b8c821f..0000000
--- a/net/openconnect/patches/010-libxml212.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- a/openconnect-internal.h
-+++ b/openconnect-internal.h
-@@ -84,7 +84,7 @@
- #endif
- #define N_(s) s
- 
--#include <libxml/tree.h>
-+#include <libxml/parser.h>
- #include <zlib.h>
- 
- #ifdef _WIN32

diff --git a/net/openconnect/patches/020-anyconnect.patch b/net/openconnect/patches/020-anyconnect.patch
deleted file mode 100644 (file)
index d2a0de7..0000000
--- a/net/openconnect/patches/020-anyconnect.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- a/main.c
-+++ b/main.c
-@@ -1774,7 +1774,7 @@ int main(int argc, char **argv)
- 
-       openconnect_init_ssl();
- 
--      vpninfo = openconnect_vpninfo_new("Open AnyConnect VPN Agent",
-+      vpninfo = openconnect_vpninfo_new("AnyConnect-compatible OpenConnect VPN Agent",
-               validate_peer_cert, NULL, process_auth_form_cb, write_progress, NULL);
-       if (!vpninfo) {
-               fprintf(stderr, _("Failed to allocate vpninfo structure\n"));