Difuse/packages
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

openconnect: update to 9.12

Browse source 
Remove upstream backport and fix libxml 1.12 compilation.

Signed-off-by: Rosen Penev <rosenp@gmail.com>
This commit is contained in:
Rosen Penev 2023-12-24 22:01:33 -08:00
parent 86bdfc7fb6
commit 02a5264214
3 changed files with 15 additions and 38 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
net/openconnect/Makefile
View file

@ -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

34
net/openconnect/patches/001-Use-OpenSSL_version-not-deprecated-SSLeay_version.patch
View file

@ -1,34 +0,0 @@
From 01b7e75034e6d838d7750a828eccaa8dd534f152 Mon Sep 17 00:00:00 2001
From: David Woodhouse <dwmw2@infradead.org>
Date: Thu, 12 May 2022 15:55:59 +0100
Subject: [PATCH] Use OpenSSL_version() not deprecated SSLeay_version()
Fixes: #428
Signed-off-by: David Woodhouse <dwmw2@infradead.org>
---
openssl.c | 6 +++++-
1 file changed, 5 insertions(+), 1 deletion(-)
--- a/openssl.c
+++ b/openssl.c
@@ -49,6 +49,8 @@
typedef int (*X509_STORE_CTX_get_issuer_fn)(X509 **issuer,
X509_STORE_CTX *ctx, X509 *x);
#define X509_STORE_CTX_get_get_issuer(ctx) ((ctx)->get_issuer)
+#define OpenSSL_version SSLeay_version
+#define OPENSSL_VERSION SSLEAY_VERSION
#endif
static char tls_library_version[32] = "";
@@ -56,7 +58,9 @@ static char tls_library_version[32] = ""
const char *openconnect_get_tls_library_version(void)
{
if (!*tls_library_version) {
- strncpy(tls_library_version, SSLeay_version(SSLEAY_VERSION), sizeof(tls_library_version));
+ strncpy(tls_library_version,
+ OpenSSL_version(OPENSSL_VERSION),
+ sizeof(tls_library_version));
tls_library_version[sizeof(tls_library_version)-1]='\0';
}
return tls_library_version;

11
net/openconnect/patches/010-libxml212.patch Normal file
View file

@ -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