git: f019b503d924 - main - security/openconnect: Update to 9.01

From: Ryan Steinmetz <zi_at_FreeBSD.org>
Date: Sun, 28 Aug 2022 17:27:14 UTC
The branch main has been updated by zi:

URL: https://cgit.FreeBSD.org/ports/commit/?id=f019b503d924bf63042fda1714f8c5e721b66524

commit f019b503d924bf63042fda1714f8c5e721b66524
Author:     Ryan Steinmetz <zi@FreeBSD.org>
AuthorDate: 2022-08-28 17:25:15 +0000
Commit:     Ryan Steinmetz <zi@FreeBSD.org>
CommitDate: 2022-08-28 17:26:56 +0000

    security/openconnect: Update to 9.01
    
    PR:             266079
    Submitted by:   Ihor Antonov <ihor@antonovs.family>
---
 security/openconnect/Makefile                      |  4 ++--
 security/openconnect/distinfo                      |  6 +++---
 .../openconnect/files/patch-openconnect-internal.h | 14 ++++++++++++++
 security/openconnect/files/patch-stoken.c          | 22 ----------------------
 security/openconnect/pkg-plist                     |  2 +-
 5 files changed, 20 insertions(+), 28 deletions(-)

diff --git a/security/openconnect/Makefile b/security/openconnect/Makefile
index b1e147518103..50ca7bf03dfd 100644
--- a/security/openconnect/Makefile
+++ b/security/openconnect/Makefile
@@ -1,6 +1,6 @@
 PORTNAME=	openconnect
-PORTVERSION=	8.20
-PORTREVISION=	2
+PORTVERSION=	9.01
+PORTREVISION=	1
 CATEGORIES=	security net-vpn
 MASTER_SITES=	ftp://ftp.infradead.org/pub/openconnect/ \
 		ZI
diff --git a/security/openconnect/distinfo b/security/openconnect/distinfo
index ba3ee893e685..3059c341dc77 100644
--- a/security/openconnect/distinfo
+++ b/security/openconnect/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1647961578
-SHA256 (openconnect-8.20.tar.gz) = c1452384c6f796baee45d4e919ae1bfc281d6c88862e1f646a2cc513fc44e58b
-SIZE (openconnect-8.20.tar.gz) = 2651542
+TIMESTAMP = 1661626668
+SHA256 (openconnect-9.01.tar.gz) = b3d7faf830e9793299d6a41e81d84cd4a3e2789c148c9e598e4585010090e4c7
+SIZE (openconnect-9.01.tar.gz) = 2718526
diff --git a/security/openconnect/files/patch-openconnect-internal.h b/security/openconnect/files/patch-openconnect-internal.h
new file mode 100644
index 000000000000..ca02258192c0
--- /dev/null
+++ b/security/openconnect/files/patch-openconnect-internal.h
@@ -0,0 +1,14 @@
+--- openconnect-internal.h.orig	2022-08-27 20:09:15 UTC
++++ openconnect-internal.h
+@@ -135,6 +135,11 @@
+ #include <spawn.h>
+ #endif
+ 
++
++#ifdef __FreeBSD__
++extern char **environ;
++#endif
++
+ /* Equivalent of "/dev/null" on Windows.
+  * See https://stackoverflow.com/a/44163934
+  */
diff --git a/security/openconnect/files/patch-stoken.c b/security/openconnect/files/patch-stoken.c
deleted file mode 100644
index e265f5ef3cd9..000000000000
--- a/security/openconnect/files/patch-stoken.c
+++ /dev/null
@@ -1,22 +0,0 @@
---- stoken.c.orig	2021-07-01 20:58:46 UTC
-+++ stoken.c
-@@ -100,6 +100,7 @@ static int decrypt_stoken(struct openconnect_info *vpn
- 
- 	form.opts = opts;
- 	form.message = _("Enter credentials to unlock software token.");
-+	form.auth_id = "_rsa_unlock";
- 
- 	if (stoken_devid_required(vpninfo->stoken_ctx)) {
- 		opt->type = OC_FORM_OPT_TEXT;
-@@ -206,9 +207,10 @@ static int request_stoken_pin(struct openconnect_info 
- 
- 	form.opts = opts;
- 	form.message = _("Enter software token PIN.");
-+	form.auth_id = "_rsa_pin";
- 
- 	opt->type = OC_FORM_OPT_PASSWORD;
--	opt->name = (char *)"password";
-+	opt->name = (char *)"pin";
- 	opt->label = _("PIN:");
- 	opt->flags = OC_FORM_OPT_NUMERIC;
- 
diff --git a/security/openconnect/pkg-plist b/security/openconnect/pkg-plist
index 567156d9232a..7d71f786b6cf 100644
--- a/security/openconnect/pkg-plist
+++ b/security/openconnect/pkg-plist
@@ -1,7 +1,7 @@
 include/openconnect.h
 lib/libopenconnect.so
 lib/libopenconnect.so.5
-lib/libopenconnect.so.5.7.0
+lib/libopenconnect.so.5.8.0
 libdata/pkgconfig/openconnect.pc
 libexec/openconnect/csd-post.sh
 libexec/openconnect/csd-wrapper.sh