git: 7b70ed68e845 - main - security/openconnect: Update to 8.20

The branch main has been updated by jkim:

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

commit 7b70ed68e845929c64c82dcdcb258b1f21cef223
Author:     Jung-uk Kim <jkim@FreeBSD.org>
AuthorDate: 2022-03-22 15:34:18 +0000
Commit:     Jung-uk Kim <jkim@FreeBSD.org>
CommitDate: 2022-03-22 15:34:18 +0000

    security/openconnect: Update to 8.20
    
    PR:             262721
    Approved by:    zi (maintainer)
---
 security/openconnect/Makefile             |  2 +-
 security/openconnect/distinfo             |  6 +++---
 security/openconnect/files/patch-stoken.c | 22 ++++++++++++++++++++++
 security/openconnect/pkg-plist            |  6 +++---
 4 files changed, 29 insertions(+), 7 deletions(-)

diff --git a/security/openconnect/Makefile b/security/openconnect/Makefile
index 6c5a4b0aaa39..6145c92c005c 100644
--- a/security/openconnect/Makefile
+++ b/security/openconnect/Makefile
@@ -1,7 +1,7 @@
 # Created by: Damian Gerow <dgerow@afflictions.org>
 
 PORTNAME=	openconnect
-PORTVERSION=	8.10
+PORTVERSION=	8.20
 CATEGORIES=	security net-vpn
 MASTER_SITES=	ftp://ftp.infradead.org/pub/openconnect/ \
 		ZI
diff --git a/security/openconnect/distinfo b/security/openconnect/distinfo
index 7df8edbaf509..ba3ee893e685 100644
--- a/security/openconnect/distinfo
+++ b/security/openconnect/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1598282005
-SHA256 (openconnect-8.10.tar.gz) = 30e64c6eca4be47bbf1d61f53dc003c6621213738d4ea7a35e5cf1ac2de9bab1
-SIZE (openconnect-8.10.tar.gz) = 2084534
+TIMESTAMP = 1647961578
+SHA256 (openconnect-8.20.tar.gz) = c1452384c6f796baee45d4e919ae1bfc281d6c88862e1f646a2cc513fc44e58b
+SIZE (openconnect-8.20.tar.gz) = 2651542
diff --git a/security/openconnect/files/patch-stoken.c b/security/openconnect/files/patch-stoken.c
new file mode 100644
index 000000000000..e265f5ef3cd9
--- /dev/null
+++ b/security/openconnect/files/patch-stoken.c
@@ -0,0 +1,22 @@
+--- 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 20fbfe078cce..567156d9232a 100644
--- a/security/openconnect/pkg-plist
+++ b/security/openconnect/pkg-plist
@@ -1,14 +1,14 @@
-sbin/openconnect
 include/openconnect.h
 lib/libopenconnect.so
 lib/libopenconnect.so.5
-lib/libopenconnect.so.5.6.0
+lib/libopenconnect.so.5.7.0
 libdata/pkgconfig/openconnect.pc
 libexec/openconnect/csd-post.sh
 libexec/openconnect/csd-wrapper.sh
+libexec/openconnect/hipreport-android.sh
 libexec/openconnect/hipreport.sh
 libexec/openconnect/tncc-emulate.py
 libexec/openconnect/tncc-wrapper.py
 man/man8/openconnect.8.gz
-libexec/openconnect/hipreport-android.sh
+sbin/openconnect
 share/bash-completion/completions/openconnect