From nobody Sun Aug 28 17:27:14 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 4MG0r237jjz4b1jp; Sun, 28 Aug 2022 17:27:14 +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 4MG0r22Lsnz3Shj; Sun, 28 Aug 2022 17:27:14 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1661707634; 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=6W6AKmdrmAz7lZuwV0JoWnrJv+qqWYu+8k1Ss8/NOyg=; b=EKVIDW3zO8HGMSRAMnxk8GAmvhbzhF3refJM44h6PfiZwbfT5Wo0lBiVFbODmanrI7WNbK aHkyiZ7AMyGr0IRSQH2pzcWIw4QYjIOb07Iduh2DAZUilCoUGdiuHTAun2jVL1G2iMlREP my4P6NT8hH1Dw6VzoAzIL4GCs81fkSVf5wU7JAPwYMHbNkpZ2kpgaP0+Tt+WtIsr2LexO8 I6m2WcFMnTYSkjzYTkWmOGlDwPMfXk638F9uqtbUzZK9WIUTW1ZzbkIrNBQt1obGMxxB2r NgGHXBmkKv+l/iO21uk7OXplU2/nO6JHzEJ6YdDklYDKgzFDvslViVi99Re78w== 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 4MG0r21Mnqz18h9; Sun, 28 Aug 2022 17:27:14 +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 27SHREh0048458; Sun, 28 Aug 2022 17:27:14 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 27SHRERl048457; Sun, 28 Aug 2022 17:27:14 GMT (envelope-from git) Date: Sun, 28 Aug 2022 17:27:14 GMT Message-Id: <202208281727.27SHRERl048457@gitrepo.freebsd.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org From: Ryan Steinmetz Subject: git: f019b503d924 - main - security/openconnect: Update to 9.01 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: zi X-Git-Repository: ports X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: f019b503d924bf63042fda1714f8c5e721b66524 Auto-Submitted: auto-generated ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1661707634; 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=6W6AKmdrmAz7lZuwV0JoWnrJv+qqWYu+8k1Ss8/NOyg=; b=ULGwaESiNQ61Matknzd/4wbGrHTx7e6wKlOCC2w+FBhLa0SVN27mO4QDO1Th1GkCekpK9r Nx0LoSatgrJYRdd3UQNUMqTvJ3/lpkZWsf79OEJZFHCFJXXRbQ2vTc4oXk81gLzSpggFmY xmCCeh1U1QABSPk6yMnjZ59oN8NH3NPwMTO1E461+6VGH0qsutVXD/3rLmoSViizvBMg0C /ykRvfzRn0a1eQ9jSwisOqX6Xe4Cq7nAU24O7uAcGyZLWf4nCi+nAd3q9/MOWOfjEfD9kK 3yBbPZ7qW2URmiZ5KBGmXcQFX6O1uSD9pvAJZQCSSqup+cBSLuSf4znUersVRw== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1661707634; a=rsa-sha256; cv=none; b=eb13TS3YTFDOgGVoFhHl6AiGgWZc07Xlo5STuo/9L1RDCXVTOzKM4axZn4Mi5qJ7dlK8RF BzjrruylN9hsghJaECRHAVU04UNijuYlfsWHogezgl8A54G5XOEeNGkGwHMr8cGnuWA1LE 5GINy07Lf5gTy1dF/AiRmkhBLe2swhex9RT1USQUyqVkCXzQa54vfJ38qUifJ1M8bDHr1o 1x8ysOjT3iQhCTbkGcbWg70Tgh8h/Kkfk0zRQq6HC6fs7jZO8F6/+NO2lZjiu+gJAUz/10 13ZENVjtMK/yrQ0MW0wAlrYni4BfDdakk0hTF2X7KZVLA3906BzO6Ep3eh5H2Q== ARC-Authentication-Results: i=1; mx1.freebsd.org; none X-ThisMailContainsUnwantedMimeParts: N The branch main has been updated by zi: URL: https://cgit.FreeBSD.org/ports/commit/?id=f019b503d924bf63042fda1714f8c5e721b66524 commit f019b503d924bf63042fda1714f8c5e721b66524 Author: Ryan Steinmetz AuthorDate: 2022-08-28 17:25:15 +0000 Commit: Ryan Steinmetz CommitDate: 2022-08-28 17:26:56 +0000 security/openconnect: Update to 9.01 PR: 266079 Submitted by: Ihor Antonov --- 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 + #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