openconnect: update to 9.12

Remove upstream backport and fix libxml 1.12 compilation.

Signed-off-by: Rosen Penev <rosenp@gmail.com>

diff --git a/net/openconnect/Makefile b/net/openconnect/Makefile
index 8050d84075a78f52ad0041838d6c6a41ad21d5df..adfb936342a14467197c90c9e0ea9709138c53fb 100644 (file)
--- a/net/openconnect/Makefile
+++ b/net/openconnect/Makefile
@@ -8,12 +8,12 @@
 include $(TOPDIR)/rules.mk
 
 PKG_NAME:=openconnect
-PKG_VERSION:=9.01
-PKG_RELEASE:=2
+PKG_VERSION:=9.12
+PKG_RELEASE:=1
 
 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz
-PKG_SOURCE_URL:=ftp://ftp.infradead.org/pub/openconnect/
-PKG_HASH:=b3d7faf830e9793299d6a41e81d84cd4a3e2789c148c9e598e4585010090e4c7
+PKG_SOURCE_URL:=https://www.infradead.org/openconnect/download
+PKG_HASH:=a2bedce3aa4dfe75e36e407e48e8e8bc91d46def5335ac9564fbf91bd4b2413e
 
 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
new file mode 100644 (file)
index 0000000..b8c821f
--- /dev/null
+++ b/net/openconnect/patches/010-libxml212.patch
@@ -0,0 +1,11 @@
+--- 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