From nobody Tue Mar 22 15:35:13 2022 X-Original-To: dev-commits-ports-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id D9E8E1A250B6; Tue, 22 Mar 2022 15:35:13 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4KNFt95F9vz4kYl; Tue, 22 Mar 2022 15:35:13 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1647963313; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=J0JGfVxoA30eD2TVU5Ej7YTzxYrtHeMd7rwDsSEZ7Ys=; b=xYdDYKCGGkDohFU+5ZoMvR0ynxUmOHkJxT2+OmtGOynI4hlHUxKLgoIiV6H0U24Tx4cL5c z2IiO2hbtV0gnjuL4GyO7qIu659ZLMEmRzRbjSfJ8kIXfD1hF70hxrSzvxmeuzoLk0XU5A F2NA217w0LpYnPnM0laP5rCdPzHSZre9wF1M+FIaUrqaATsi+RZzZDdHE4Ep2dgzgdZZwd 7N5HggDs9oh9kE2r94iW0fR2kkxQK4ulJ7bsubYYTJQU/hOcTTM6IrnRG7R5CFrFrkWXQb KxVfj2EEDYThA1yx9ojewFdTTLv3jyH3Du6dyQKRH4/LidyhbUR1M8h6Wqh2HA== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 87A9D1211E; Tue, 22 Mar 2022 15:35:13 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.16.1/8.16.1) with ESMTP id 22MFZDoX029213; Tue, 22 Mar 2022 15:35:13 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 22MFZDXu029212; Tue, 22 Mar 2022 15:35:13 GMT (envelope-from git) Date: Tue, 22 Mar 2022 15:35:13 GMT Message-Id: <202203221535.22MFZDXu029212@gitrepo.freebsd.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org From: Jung-uk Kim Subject: git: 7b70ed68e845 - main - security/openconnect: Update to 8.20 List-Id: Commits to the main branch of the FreeBSD ports repository List-Archive: https://lists.freebsd.org/archives/dev-commits-ports-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-ports-main@freebsd.org X-BeenThere: dev-commits-ports-main@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: jkim X-Git-Repository: ports X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 7b70ed68e845929c64c82dcdcb258b1f21cef223 Auto-Submitted: auto-generated ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1647963313; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=J0JGfVxoA30eD2TVU5Ej7YTzxYrtHeMd7rwDsSEZ7Ys=; b=R1gS1IiSJlpjr3xr92Chw0i8bU0gW3OO8b0sucwzyqnjvHHZF6lR1zFppXWN1xoSMhIKrX dGEsNq1rSdjAF5204BobNT9AosALGiYwoVNKOJ3as9sOsGQtE/6zd+Pk3HWmzonognaw9e e34EqoM7zSPk+f06RrmFe5qJGWm+bU/UWTXdqMtrBYNes+nvDY8b7GVbnXYXm6JJcEaJjy PeKcy3Z41/54zGF6Jashxw/x+wn67hMPYLGYJzuQc50GGXi/sakmcFa7YcMW24SE8+ndnw dxlF7/5lsYvtWPzMZfYOZCtJO2E4lPp8Sqqb5f7UJp4xQYA23QGQiL1O6U5KXA== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1647963313; a=rsa-sha256; cv=none; b=qpvjBjUWxlycvZUKmvUTXrz4oHu13ZK6wpjFVEb+0Bi8QmqezHrE6Nqj2EIkQkcGQ52pKH fqGn1pt0JnTJOBy+QrfCGK65AGbjN6wi5/LyW/H4Fg526HblmzK4Lnar4U99k3vUf54qh2 FUEnoVx4SCU/B5a1A5W7xtZbPcB4jgirdNgvEu42GR3f7skQL9Bve67GkCmiAr/J9rf3hy 6F8qJDCAL+4iKNMeDPllE8MYEdFKy5m2M2aDSjp19t2BxZE4FhZVALoT3irqFXWnSmF7ox 3QDS9ye0Ot1el3AbA9m9ekzbv+Bh4AQGgcC0KmZEPilG/HqJjLiMTNShiZa/Vw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none X-ThisMailContainsUnwantedMimeParts: N The branch main has been updated by jkim: URL: https://cgit.FreeBSD.org/ports/commit/?id=7b70ed68e845929c64c82dcdcb258b1f21cef223 commit 7b70ed68e845929c64c82dcdcb258b1f21cef223 Author: Jung-uk Kim AuthorDate: 2022-03-22 15:34:18 +0000 Commit: Jung-uk Kim 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 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