From patchwork Thu May 5 02:42:05 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Lev Stipakov X-Patchwork-Id: 2438 Return-Path: Delivered-To: patchwork@openvpn.net Delivered-To: patchwork@openvpn.net Received: from director11.mail.ord1d.rsapps.net ([172.28.255.1]) by backend41.mail.ord1d.rsapps.net with LMTP id OGpNFXrGc2ISYwAAqwncew (envelope-from ) for ; Thu, 05 May 2022 08:43:38 -0400 Received: from proxy4.mail.ord1c.rsapps.net ([172.28.255.1]) by director11.mail.ord1d.rsapps.net with LMTP id WKiFGnrGc2JFSgAAvGGmqA (envelope-from ) for ; Thu, 05 May 2022 08:43:38 -0400 Received: from smtp11.gate.ord1c ([172.28.255.1]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) by proxy4.mail.ord1c.rsapps.net with LMTPS id UKIrGXjGc2K3PwAAjcXvpA (envelope-from ) for ; Thu, 05 May 2022 08:43:36 -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: smtp11.gate.ord1c.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: fbc9f3b6-cc70-11ec-9eb5-bc305beffa54-1-1 Received: from [216.105.38.7] ([216.105.38.7:35818] helo=lists.sourceforge.net) by smtp11.gate.ord1c.rsapps.net (envelope-from ) (ecelerity 4.2.38.62370 r(:)) with ESMTPS (cipher=DHE-RSA-AES256-GCM-SHA384) id CA/51-03661-976C3726; Thu, 05 May 2022 08:43:38 -0400 Received: from [127.0.0.1] (helo=sfs-ml-2.v29.lw.sourceforge.com) by sfs-ml-2.v29.lw.sourceforge.com with esmtp (Exim 4.94.2) (envelope-from ) id 1nmaoR-0001KQ-Jd; Thu, 05 May 2022 12:42:30 +0000 Received: from [172.30.20.202] (helo=mx.sourceforge.net) by sfs-ml-2.v29.lw.sourceforge.com with esmtps (TLS1.2) tls TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384 (Exim 4.94.2) (envelope-from ) id 1nmaoR-0001KK-2M for openvpn-devel@lists.sourceforge.net; Thu, 05 May 2022 12:42:30 +0000 DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=sourceforge.net; s=x; h=References:In-Reply-To:Message-Id:Date:Subject:Cc: To:From:Sender:Reply-To:MIME-Version:Content-Type:Content-Transfer-Encoding: Content-ID:Content-Description:Resent-Date:Resent-From:Resent-Sender: Resent-To:Resent-Cc:Resent-Message-ID:List-Id:List-Help:List-Unsubscribe: List-Subscribe:List-Post:List-Owner:List-Archive; bh=hliC0ikyLC7JaZYxzAJClYNYhkYx3ndq8dkgdv/DGGY=; b=IIVBN2Z7LXMbXjHtg0+dgydO81 lx+kQe24rXrNFB3MFqrPyrvHObm+ayjPVJxZdTo5ll/RN7bJTMj9tEW5PT4hHOLNuZvftj09y2b7P ve0wahWdXDHU2upIAeFhwU5U7LhpXWOQ/WdJ60r6UWVVYO6EAU3ehq4UxGiZ5aEAw7Zg=; DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=sf.net; s=x ; h=References:In-Reply-To:Message-Id:Date:Subject:Cc:To:From:Sender:Reply-To :MIME-Version:Content-Type:Content-Transfer-Encoding:Content-ID: Content-Description:Resent-Date:Resent-From:Resent-Sender:Resent-To:Resent-Cc :Resent-Message-ID:List-Id:List-Help:List-Unsubscribe:List-Subscribe: List-Post:List-Owner:List-Archive; bh=hliC0ikyLC7JaZYxzAJClYNYhkYx3ndq8dkgdv/DGGY=; b=Gr27+eZGq6M/2Q3qsJJgBnmK3T jqvoYXsuT0XzZlFgqb7QqMrzujD2y2bBhy/UVIV6QLGMZIvqrnjroRAwdbHV3A9qmiFZU9nlv3Aze zWcps7mh9m5zAf1AnBEwb2iysdfRWS6zuNNQ6xHFCXrJYtAt6c86BLB219piUTSo4o7E=; Received: from mail-lf1-f50.google.com ([209.85.167.50]) by sfi-mx-1.v28.lw.sourceforge.com with esmtps (TLS1.2:ECDHE-RSA-AES128-GCM-SHA256:128) (Exim 4.94.2) id 1nmaoN-0027Gj-Uu for openvpn-devel@lists.sourceforge.net; Thu, 05 May 2022 12:42:29 +0000 Received: by mail-lf1-f50.google.com with SMTP id w19so7247852lfu.11 for ; Thu, 05 May 2022 05:42:27 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20210112; h=from:to:cc:subject:date:message-id:in-reply-to:references; bh=hliC0ikyLC7JaZYxzAJClYNYhkYx3ndq8dkgdv/DGGY=; b=C7+/S+v0TXTB9yOZcUZPORpBIzFPvMOo2mwvsLBzb2O8qA+49N+HZDZBw027P4Rzw3 1X217K6uqUiXy2/oXCWRHh4eDQBSdZDIOhkdIiSkQ6O++RT68n/9OaNZsIV24t2EtJTC y7g4gP5zRqxF+HqrOUJUTAqz//v7SnK4LN8/B2iE7/1CIZKyqM02sLBBwzFEOeWzDT8V rqASO+hdOfGsaHgF6VW6LygaTH2RHxIl8g6RxeWz+ta6YCvxosdo+LT0Nq/FtpY5ayMw zOvQpJ4ZLOX8nBFTgbMfLeSap1YD9O0wAbhYcn2ePGDy3p8hIzucW5DkiiLPw3FZiZqh PTqg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references; bh=hliC0ikyLC7JaZYxzAJClYNYhkYx3ndq8dkgdv/DGGY=; b=W1kDvbCMLo1D+qIMvABZHtTe7WbscSB/z+4h1Bt5GLhGeGZjZtYoQzH0xtiu5xmBtm 3zV3hDz4FIxKdsCXR910ehU1Qaf+B+nnb59kY8/+1vPE0hi5e42/LPhCq1fVxIBGiIUX fVdqNOPln/Md6QXVO3Pp4y4A48ZCm9zM40LQdgm7wLCoVAL+sdE6BMSNwnSTzRlyXMjJ L8vb9+rBgRhzSC4OqRTCgNDf6xP7iUfXwlOf+QmWgcOp06dyO9RQQcO4bCQKZTch1nHS K/2u/z0+WUq47XsDMwWrqUxim4POnUD/khPhWbGeNWvnyI68fi/bXbPOeHXxQXJ+0q9f 3Wyg== X-Gm-Message-State: AOAM532frg9aIFjZK+hQylLbZZFMxV6jn190/mALJkX97XRmRPV5xK8k ZFxMfdqCqVCuFb41V2XlbTKiS0HB+Pk= X-Google-Smtp-Source: ABdhPJxkRLXwpBJ3yI1Ibpxst+V5oZ5zjPJ6/kGKYqhraMOWVVCHirIfI6miRx3wqkt6nLh2S6hBEg== X-Received: by 2002:a05:6512:4003:b0:472:5d5d:fd0 with SMTP id br3-20020a056512400300b004725d5d0fd0mr15057924lfb.452.1651754540986; Thu, 05 May 2022 05:42:20 -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 e24-20020ac25478000000b0047255d21127sm205376lfn.86.2022.05.05.05.42.20 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 05 May 2022 05:42:20 -0700 (PDT) From: Lev Stipakov To: openvpn-devel@lists.sourceforge.net Date: Thu, 5 May 2022 15:42:05 +0300 Message-Id: <20220505124205.435-1-lstipakov@gmail.com> X-Mailer: git-send-email 2.17.1 In-Reply-To: <20220505104142.230-1-lstipakov@gmail.com> References: <20220505104142.230-1-lstipakov@gmail.com> 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 Add vcpkg manifest file which lists dependencies and enable manifest usage in project file. This simplifies build process by eliminating separate "vcpkg install" step to install dependencies. Content analysis details: (-0.2 points, 6.0 required) pts rule name description ---- ---------------------- -------------------------------------------------- 0.0 SPF_HELO_NONE SPF: HELO does not publish an SPF Record 0.0 FREEMAIL_FROM Sender email is commonly abused enduser mail provider [lstipakov[at]gmail.com] -0.0 SPF_PASS SPF: sender matches SPF record -0.0 RCVD_IN_DNSWL_NONE RBL: Sender listed at https://www.dnswl.org/, no trust [209.85.167.50 listed in list.dnswl.org] -0.0 RCVD_IN_MSPIKE_H2 RBL: Average reputation (+2) [209.85.167.50 listed in wl.mailspike.net] -0.1 DKIM_VALID Message has at least one valid DKIM or DK signature -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_AU Message has a valid DKIM or DK signature from author's domain X-Headers-End: 1nmaoN-0027Gj-Uu Subject: [Openvpn-devel] [PATCH v3 release/2.5] vcpkg: switch to manifest 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 MIME-Version: 1.0 Errors-To: openvpn-devel-bounces@lists.sourceforge.net X-getmail-retrieved-from-mailbox: Inbox From: Lev Stipakov Add vcpkg manifest file which lists dependencies and enable manifest usage in project file. This simplifies build process by eliminating separate "vcpkg install" step to install dependencies. Signed-off-by: Lev Stipakov Acked-by: Gert Doering --- v3: fix GitHub Actions cache v2: add missing lz4 dependency .github/workflows/build.yaml | 16 +++++++--------- .gitignore | 1 + src/openvpn/openvpn.vcxproj | 9 +++++++++ src/openvpn/vcpkg.json | 19 +++++++++++++++++++ 4 files changed, 36 insertions(+), 9 deletions(-) create mode 100644 src/openvpn/vcpkg.json diff --git a/.github/workflows/build.yaml b/.github/workflows/build.yaml index dbb05739..fb53fb8b 100644 --- a/.github/workflows/build.yaml +++ b/.github/workflows/build.yaml @@ -268,19 +268,17 @@ jobs: - name: Install rst2html run: python -m pip install --upgrade pip rst2html - - name: Restore artifacts, or run vcpkg, build and cache artifacts - uses: lukka/run-vcpkg@v7.4 + - name: Restore artifacts, or setup vcpkg (do not install any package) + uses: lukka/run-vcpkg@v10 with: - vcpkgGitCommitId: 'a69b65229b3956b7f45abd81671b7330114bcaad' - vcpkgArguments: 'openssl lz4 lzo pkcs11-helper tap-windows6' - vcpkgTriplet: '${{ matrix.triplet }}-windows-ovpn' - cleanAfterBuild: false + vcpkgGitCommitId: '4b766c1cd17205e1b768c4fadfd5f867c1d0510e' + appendedCacheKey: '${{matrix.triplet}}' - - name: Build + - name: Run MSBuild consuming vcpkg.json working-directory: ${{env.GITHUB_WORKSPACE}} run: | - vcpkg integrate install - msbuild /m /p:Configuration=${{env.BUILD_CONFIGURATION}} /p:Platform="${{ matrix.plat }}" . + vcpkg integrate install + msbuild /m /p:Configuration=${{env.BUILD_CONFIGURATION}} /p:Platform="${{ matrix.plat }}" . - name: Archive artifacts uses: actions/upload-artifact@v2 diff --git a/.gitignore b/.gitignore index 178076ed..7335154f 100644 --- a/.gitignore +++ b/.gitignore @@ -44,6 +44,7 @@ m4/ltoptions.m4 m4/ltsugar.m4 m4/ltversion.m4 m4/lt~obsolete.m4 +vcpkg_installed version.sh msvc-env-local.bat diff --git a/src/openvpn/openvpn.vcxproj b/src/openvpn/openvpn.vcxproj index 05c63b03..7f09249b 100644 --- a/src/openvpn/openvpn.vcxproj +++ b/src/openvpn/openvpn.vcxproj @@ -124,26 +124,35 @@ true arm64-windows-ovpn + --overlay-triplets=$(SolutionDir)contrib\vcpkg-triplets --overlay-ports=$(SolutionDir)contrib\vcpkg-ports true arm64-windows-ovpn + --overlay-triplets=$(SolutionDir)contrib\vcpkg-triplets --overlay-ports=$(SolutionDir)contrib\vcpkg-ports true x86-windows-ovpn + --overlay-triplets=$(SolutionDir)contrib\vcpkg-triplets --overlay-ports=$(SolutionDir)contrib\vcpkg-ports true x86-windows-ovpn + --overlay-triplets=$(SolutionDir)contrib\vcpkg-triplets --overlay-ports=$(SolutionDir)contrib\vcpkg-ports true x64-windows-ovpn + --overlay-triplets=$(SolutionDir)contrib\vcpkg-triplets --overlay-ports=$(SolutionDir)contrib\vcpkg-ports true x64-windows-ovpn + --overlay-triplets=$(SolutionDir)contrib\vcpkg-triplets --overlay-ports=$(SolutionDir)contrib\vcpkg-ports + + + true diff --git a/src/openvpn/vcpkg.json b/src/openvpn/vcpkg.json new file mode 100644 index 00000000..6537fdd6 --- /dev/null +++ b/src/openvpn/vcpkg.json @@ -0,0 +1,19 @@ +{ + "$schema": "https://raw.githubusercontent.com/microsoft/vcpkg/master/scripts/vcpkg.schema.json", + "name": "openvpn", + "version": "2.5", + "dependencies": [ + "openssl", + "tap-windows6", + "lzo", + "lz4", + "pkcs11-helper" + ], + "builtin-baseline": "4b766c1cd17205e1b768c4fadfd5f867c1d0510e", + "overrides": [ + { + "name": "openssl", + "version-string": "1.1.1n" + } + ] +}