From patchwork Wed Nov 2 04:15:36 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Lev Stipakov X-Patchwork-Id: 2835 Return-Path: Delivered-To: patchwork@openvpn.net Delivered-To: patchwork@openvpn.net Received: from director7.mail.ord1d.rsapps.net ([172.31.255.6]) by backend30.mail.ord1d.rsapps.net with LMTP id 8CUYJ/qJYmOBbQAAIUCqbw (envelope-from ) for ; Wed, 02 Nov 2022 11:17:14 -0400 Received: from proxy3.mail.iad3b.rsapps.net ([172.31.255.6]) by director7.mail.ord1d.rsapps.net with LMTP id oFEFJ/qJYmMcIQAAovjBpQ (envelope-from ) for ; Wed, 02 Nov 2022 11:17:14 -0400 Received: from smtp1.gate.iad3b ([172.31.255.6]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) by proxy3.mail.iad3b.rsapps.net with LMTPS id +FwIIPqJYmMkdAAAM8Wetg (envelope-from ) for ; Wed, 02 Nov 2022 11:17:14 -0400 X-Spam-Threshold: 95 X-Spam-Score: 0 X-Spam-Flag: NO X-Virus-Scanned: OK X-Orig-To: openvpnslackdevel@openvpn.net X-Originating-Ip: [216.105.38.7] Authentication-Results: smtp1.gate.iad3b.rsapps.net; iprev=pass policy.iprev="216.105.38.7"; spf=pass smtp.mailfrom="openvpn-devel-bounces@lists.sourceforge.net" smtp.helo="lists.sourceforge.net"; dkim=fail (signature verification failed) header.d=sourceforge.net; dkim=fail (signature verification failed) header.d=sf.net; dkim=fail (signature verification failed) header.d=gmail.com; dmarc=fail (p=none; dis=none) header.from=gmail.com X-Suspicious-Flag: YES X-Classification-ID: 692cd0b6-5ac1-11ed-a5ef-5254008fd675-1-1 Received: from [216.105.38.7] ([216.105.38.7:51932] helo=lists.sourceforge.net) by smtp1.gate.iad3b.rsapps.net (envelope-from ) (ecelerity 4.2.38.62370 r(:)) with ESMTPS (cipher=DHE-RSA-AES256-GCM-SHA384) id 10/6C-25927-2F982636; Wed, 02 Nov 2022 11:17:06 -0400 Received: from [127.0.0.1] (helo=sfs-ml-1.v29.lw.sourceforge.com) by sfs-ml-1.v29.lw.sourceforge.com with esmtp (Exim 4.95) (envelope-from ) id 1oqFTM-0002gN-Rl; Wed, 02 Nov 2022 15:16:08 +0000 Received: from [172.30.20.202] (helo=mx.sourceforge.net) by sfs-ml-1.v29.lw.sourceforge.com with esmtps (TLS1.2) tls TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384 (Exim 4.95) (envelope-from ) id 1oqFTJ-0002g4-2c for openvpn-devel@lists.sourceforge.net; Wed, 02 Nov 2022 15:16:05 +0000 DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=sourceforge.net; s=x; h=Content-Transfer-Encoding:MIME-Version:Message-Id: Date:Subject:Cc:To:From:Sender:Reply-To:Content-Type:Content-ID: Content-Description:Resent-Date:Resent-From:Resent-Sender:Resent-To:Resent-Cc :Resent-Message-ID:In-Reply-To:References:List-Id:List-Help:List-Unsubscribe: List-Subscribe:List-Post:List-Owner:List-Archive; bh=0xzWFYwpqcffxD/kYiNATDDFaOt14eFKG4iHarXopVI=; b=Gg3chTFiFUV/TE0L9LYnI+vgh2 YS3HGzHPk+SdS3T3SBsUj6nkbHBopbWBY7Mj7lHfOuTtHrtxhCdwzFp4z8OVOweSrZFAPZ7JJQw1t S6TyvoZMf+ypjbD7tRW3jP/+M4gnCFimcmUzF3ffNNY2Rla5XzrhXNBbw24cAzZ4I5Lk=; DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=sf.net; s=x ; h=Content-Transfer-Encoding:MIME-Version:Message-Id:Date:Subject:Cc:To:From :Sender:Reply-To:Content-Type:Content-ID:Content-Description:Resent-Date: Resent-From:Resent-Sender:Resent-To:Resent-Cc:Resent-Message-ID:In-Reply-To: References:List-Id:List-Help:List-Unsubscribe:List-Subscribe:List-Post: List-Owner:List-Archive; bh=0xzWFYwpqcffxD/kYiNATDDFaOt14eFKG4iHarXopVI=; b=d YgP99btf2Iz02N/aqAr6QUKpt6RAQ+8r6+U9yoaxgPzj/Ns4Hi6IKG4/X0pX7QQXxLzsRBul6wAkS KkMxcpod9nfeHljKfalRfO55HrDK+fJMW3jTPmjH4feb0CRxyJsCBFX6OrCocy+DBHPAfYmr8aL22 kizHOzUW3Bw9XpCI=; Received: from mail-lf1-f45.google.com ([209.85.167.45]) by sfi-mx-1.v28.lw.sourceforge.com with esmtps (TLS1.2:ECDHE-RSA-AES128-GCM-SHA256:128) (Exim 4.95) id 1oqFTE-009Y4F-OM for openvpn-devel@lists.sourceforge.net; Wed, 02 Nov 2022 15:16:05 +0000 Received: by mail-lf1-f45.google.com with SMTP id d6so28725554lfs.10 for ; Wed, 02 Nov 2022 08:16:00 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20210112; h=content-transfer-encoding:mime-version:message-id:date:subject:cc :to:from:from:to:cc:subject:date:message-id:reply-to; bh=0xzWFYwpqcffxD/kYiNATDDFaOt14eFKG4iHarXopVI=; b=PdneT0sQLBvRa2D4Zwx9nEavX3lqgkksbJbK7wC3LjpFN2lsSosVbEPMvzoEJJNIYR PtS/qS0bJzCnq5Mto0Y/mLSXUgVYsZ/+a+0kbz+OMXzd9TYTCrzCAHiSp60+NadwiRDB x3RWjU8qWwpXuvcGz7oC+LxqrSdV8NmWhmczg2lnjP81gUm3+HaSLlXK8U56qRFADOla RA2ucSgMHWDY+sKbUHxdf12b9hWm7ryK/uw2OA+bnil4bQb8KwcZTEuA/O/wc0MSviT9 f6wrwUYuZCKs/F4F3pJw2LkowRWGTsdq7UlmXwqtxuNAbNhFoUAQkS3fUzArWPPkt45o xfMA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=content-transfer-encoding:mime-version:message-id:date:subject:cc :to:from:x-gm-message-state:from:to:cc:subject:date:message-id :reply-to; bh=0xzWFYwpqcffxD/kYiNATDDFaOt14eFKG4iHarXopVI=; b=aQ2intvwdgDNpRjc4i+xKKaQ/m8swMeaL2DUiMeKE4XOsNw1hKtlF+++IctDpYrhI2 hsmi+uApaK3tveZOTj+D447QOT6bCmXs4eyvl6nOKs2QmM7fbVd++nWWxXjv/4Q8LNcg VU+6NCzgwEgdOqQMPp5RhKaUzdCLahFqiLeV0mEAVmI6FQn+sjWFJFTcVGO/MvYcxbE+ rfNdFR5kXiCAzcmVfExHO0vX2jqVT5k/ejO7WetptMNPdnx+/qhFiVdGspRR6pQbaC7P 0jtGts2VV1rtnrv/WZML1xa03awtE3RY2E699iQBec1s930kQqtlh3CH1/fMmtNhp8XQ tvmA== X-Gm-Message-State: ACrzQf3lVmnYNgwCuq6IeKA03uziX2ksD/XrNna3QQmusUFkBqXPQcZX sRyx8sRNCQTWHWehiiAgWTaEiLfbZFU= X-Google-Smtp-Source: AMsMyM4tp1JWIqneEPNptzRGDXoby9wI4XkoKS7PY/st6JpcIqzxJOjhGS7CdCY27ekWCip8zfPTKw== X-Received: by 2002:a05:6512:1192:b0:4af:aa4d:1a1 with SMTP id g18-20020a056512119200b004afaa4d01a1mr10537716lfr.595.1667402153826; Wed, 02 Nov 2022 08:15:53 -0700 (PDT) Received: from LAPTOP-4L3N7KFS.localdomain (81-175-157-115.bb.dnainternet.fi. [81.175.157.115]) by smtp.gmail.com with ESMTPSA id s11-20020a056512214b00b0049a5a59aa68sm2056413lfr.10.2022.11.02.08.15.53 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 02 Nov 2022 08:15:53 -0700 (PDT) From: Lev Stipakov To: openvpn-devel@lists.sourceforge.net Date: Wed, 2 Nov 2022 17:15:36 +0200 Message-Id: <20221102151536.255-1-lstipakov@gmail.com> X-Mailer: git-send-email 2.34.1 MIME-Version: 1.0 X-Spam-Report: Spam detection software, running on the system "util-spamd-1.v13.lw.sourceforge.com", has NOT identified this incoming email as spam. The original message has been attached to this so you can view it or label similar future email. If you have any questions, see the administrator of that system for details. Content preview: From: Lev Stipakov By removing builin-baseline constraint, we force vcpkg to use latest versions of ports. As a side effect, this bumps OpenSSL to 3.0.7. While on it, update vcpkg commit in GHA. Content analysis details: (-0.2 points, 6.0 required) pts rule name description ---- ---------------------- -------------------------------------------------- 0.0 FREEMAIL_FROM Sender email is commonly abused enduser mail provider [lstipakov[at]gmail.com] 0.0 SPF_HELO_NONE SPF: HELO does not publish an SPF Record -0.0 SPF_PASS SPF: sender matches SPF record -0.0 RCVD_IN_MSPIKE_H2 RBL: Average reputation (+2) [209.85.167.45 listed in wl.mailspike.net] -0.1 DKIM_VALID_AU Message has a valid DKIM or DK signature from author's domain -0.1 DKIM_VALID_EF Message has a valid DKIM or DK signature from envelope-from domain 0.1 DKIM_SIGNED Message has a DKIM or DK signature, not necessarily valid -0.1 DKIM_VALID Message has at least one valid DKIM or DK signature -0.0 RCVD_IN_DNSWL_NONE RBL: Sender listed at https://www.dnswl.org/, no trust [209.85.167.45 listed in list.dnswl.org] X-Headers-End: 1oqFTE-009Y4F-OM Subject: [Openvpn-devel] [PATCH] vcpkg: use the latest versions of dependency ports X-BeenThere: openvpn-devel@lists.sourceforge.net X-Mailman-Version: 2.1.21 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Lev Stipakov Errors-To: openvpn-devel-bounces@lists.sourceforge.net X-getmail-retrieved-from-mailbox: Inbox From: Lev Stipakov By removing builin-baseline constraint, we force vcpkg to use latest versions of ports. As a side effect, this bumps OpenSSL to 3.0.7. While on it, update vcpkg commit in GHA. We also have to apply a workaround for GHA to make it use our vcpkg checkout instead of c:\vcpkg, see https://github.com/actions/runner-images/issues/6376 https://github.com/lukka/run-vcpkg/issues/170 Signed-off-by: Lev Stipakov Acked-by: Gert Doering --- .github/workflows/build.yaml | 6 ++++-- src/openvpn/vcpkg.json | 3 +-- 2 files changed, 5 insertions(+), 4 deletions(-) diff --git a/.github/workflows/build.yaml b/.github/workflows/build.yaml index f7d2d383..2db90bcd 100644 --- a/.github/workflows/build.yaml +++ b/.github/workflows/build.yaml @@ -342,13 +342,15 @@ jobs: - name: Restore artifacts, or setup vcpkg (do not install any package) uses: lukka/run-vcpkg@v10 with: - vcpkgGitCommitId: '9259a0719d94c402aae2ab7975bc096afdec15df' + vcpkgGitCommitId: 'cafd398be781144787573ca78390e951673c7055' appendedCacheKey: '${{matrix.triplet}}' - name: Run MSBuild consuming vcpkg.json working-directory: ${{env.GITHUB_WORKSPACE}} run: | - vcpkg integrate install + # workaround for GHA runner bug where vcpkg installation is detected at c:\vcpkg + # see https://github.com/lukka/run-vcpkg/issues/170 + ${{ github.workspace }}/vcpkg/vcpkg.exe integrate install msbuild /m /p:Configuration=${{env.BUILD_CONFIGURATION}} /p:Platform="${{ matrix.plat }}" . - name: Archive artifacts diff --git a/src/openvpn/vcpkg.json b/src/openvpn/vcpkg.json index 40db1fd2..80645677 100644 --- a/src/openvpn/vcpkg.json +++ b/src/openvpn/vcpkg.json @@ -8,6 +8,5 @@ "lzo", "lz4", "pkcs11-helper" - ], - "builtin-baseline": "9259a0719d94c402aae2ab7975bc096afdec15df" + ] }