From patchwork Thu May 5 00:38:38 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Lev Stipakov X-Patchwork-Id: 2433 Return-Path: Delivered-To: patchwork@openvpn.net Delivered-To: patchwork@openvpn.net Received: from director13.mail.ord1d.rsapps.net ([172.27.255.56]) by backend41.mail.ord1d.rsapps.net with LMTP id YBI5O4ypc2LQQwAAqwncew (envelope-from ) for ; Thu, 05 May 2022 06:40:12 -0400 Received: from proxy2.mail.iad3a.rsapps.net ([172.27.255.56]) by director13.mail.ord1d.rsapps.net with LMTP id YISBF42pc2JyXQAA91zNiA (envelope-from ) for ; Thu, 05 May 2022 06:40:13 -0400 Received: from smtp39.gate.iad3a ([172.27.255.56]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) by proxy2.mail.iad3a.rsapps.net with LMTPS id gEM3D42pc2JIDgAABcWvHw (envelope-from ) for ; Thu, 05 May 2022 06:40:13 -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: smtp39.gate.iad3a.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: bdf43b66-cc5f-11ec-bb66-525400eea4e4-1-1 Received: from [216.105.38.7] ([216.105.38.7:36214] helo=lists.sourceforge.net) by smtp39.gate.iad3a.rsapps.net (envelope-from ) (ecelerity 4.2.38.62370 r(:)) with ESMTPS (cipher=DHE-RSA-AES256-GCM-SHA384) id 16/74-30731-C89A3726; Thu, 05 May 2022 06:40:13 -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.94.2) (envelope-from ) id 1nmYt2-00024u-Ne; Thu, 05 May 2022 10:39:09 +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.94.2) (envelope-from ) id 1nmYt1-00024T-8g for openvpn-devel@lists.sourceforge.net; Thu, 05 May 2022 10:39:07 +0000 DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=sourceforge.net; s=x; h=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:In-Reply-To:References:List-Id:List-Help:List-Unsubscribe: List-Subscribe:List-Post:List-Owner:List-Archive; bh=Q2y2NLCBH3jhCGByTybyGwsB1XkcHAgrel0spwDhxyw=; b=aC9fOq6tF026RYhrp+QVK/RuNT XiWB1MVZteEZPKQU/Pn738DO2WSNkILdMrp8Je/IyebnHdRhJuPcDUHCeDW47dnIjRVBxs7uYWNX0 HbJ0JhWaEJhB6GYBmHR3lvN/CDxnZDykxkKoircwfH1FGYH3inj94yWM3f1prgfHCvOo=; DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=sf.net; s=x ; h=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: In-Reply-To:References:List-Id:List-Help:List-Unsubscribe:List-Subscribe: List-Post:List-Owner:List-Archive; bh=Q2y2NLCBH3jhCGByTybyGwsB1XkcHAgrel0spwDhxyw=; b=EvBTHcElN07Sfu18lSlYNe4u4Z m/lyBUuxzuoWUCXzP9vym5+tSt0WDkQYP+coE8HFdKv8onXQuOCokQCoj0xk53ZhNGUB/vSsP1hjj 83G4Somf8uNg8k/QpGfCrr9b0uYkYQYp66EkANdKUW/bhx2neTJ8/3K0LZODnn8lEp2w=; Received: from mail-lj1-f178.google.com ([209.85.208.178]) by sfi-mx-1.v28.lw.sourceforge.com with esmtps (TLS1.2:ECDHE-RSA-AES128-GCM-SHA256:128) (Exim 4.94.2) id 1nmYsy-0023Dv-01 for openvpn-devel@lists.sourceforge.net; Thu, 05 May 2022 10:39:07 +0000 Received: by mail-lj1-f178.google.com with SMTP id y19so5041708ljd.4 for ; Thu, 05 May 2022 03:39:03 -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; bh=Q2y2NLCBH3jhCGByTybyGwsB1XkcHAgrel0spwDhxyw=; b=FhAyYae0CLqePCbUsMqAp8sHkJLmkBUw5xEgGdqgayhcY0bkbtXO0MVDOzC5uhTkua cDGHKUiFV/GOk9IIFlflgW4TvjQgMKUktfCBFYaL0tis7hsu6YlEo7u6FL9IL9BCDpIs tcA4hPFjN4ybmzA5sshcwiOC9wSRjiaHVVKSsxIgciErbETYT250wy6sAwyU+x62xE2w fXBN2r2nhmNg5by1tgVmw6WGdqdwqjaIoSYgVoSVGOEYi36vga5pZ+llb4biS6MFX1LW PYQ7G5UX/6umozOtc54pjjhfSE/HCkXT9Zzy/dc4jYuS6XfKwMZv6rxe8534DX1GNz7C BVbw== 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; bh=Q2y2NLCBH3jhCGByTybyGwsB1XkcHAgrel0spwDhxyw=; b=GwS1Ex9RBf2s5R/OVufZNi0z7YHAiug5ZPIFUuLWxd4OSIyefeQ82382G9kpH9MiB5 z6CxZOu2OFV2YDgJyPnyKRQeyRoxsCzVwtU5J9+XE1bJuos44fBzLt75zEdwLQUNvJ1m r0XM98GnVRewpZ0pJgI2if14ZHBpQx9EOTB2UQr7aShC8j0V084vor7kKJ6GfBVNFzS9 GjXwtadf7r7THWnbSoPg2tRo3HgmAZ0g1AsWzZz9Fjh71VgTF75CypLBY8l9qKor9CRJ CaHStHgoXWEdlldoUsXGRvigSiNxTO81uiCEUY9i2aa7GPQfeHR4zPn8BRA+c/4rgYLQ YLbQ== X-Gm-Message-State: AOAM533ZoFkZhKROPt1bI1XBvYdydYv2v09aHVVrn6IlKxK5+xivKhff acZDwyU/dsYjMTyS1dru96HG4EXs3Vw= X-Google-Smtp-Source: ABdhPJzHcavB5uxAPaLN22ii127eJ2LO42F8dc8X4D/GwSF/Kwvw4ozxcqPllcRodUn25+Jx4EFh5A== X-Received: by 2002:a05:651c:19a3:b0:24f:4ed0:588 with SMTP id bx35-20020a05651c19a300b0024f4ed00588mr14327930ljb.465.1651747136924; Thu, 05 May 2022 03:38:56 -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 q12-20020ac25a0c000000b0047255d2112asm165456lfn.89.2022.05.05.03.38.54 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 05 May 2022 03:38:54 -0700 (PDT) From: Lev Stipakov To: openvpn-devel@lists.sourceforge.net Date: Thu, 5 May 2022 13:38:38 +0300 Message-Id: <20220505103838.122-1-lstipakov@gmail.com> X-Mailer: git-send-email 2.17.1 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 RCVD_IN_DNSWL_NONE RBL: Sender listed at https://www.dnswl.org/, no trust [209.85.208.178 listed in list.dnswl.org] 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_MSPIKE_H2 RBL: Average reputation (+2) [209.85.208.178 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: 1nmYsy-0023Dv-01 Subject: [Openvpn-devel] [PATCH 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 --- .github/workflows/build.yaml | 15 ++++++--------- .gitignore | 1 + src/openvpn/openvpn.vcxproj | 9 +++++++++ src/openvpn/vcpkg.json | 18 ++++++++++++++++++ 4 files changed, 34 insertions(+), 9 deletions(-) create mode 100644 src/openvpn/vcpkg.json diff --git a/.github/workflows/build.yaml b/.github/workflows/build.yaml index dbb05739..c1215cef 100644 --- a/.github/workflows/build.yaml +++ b/.github/workflows/build.yaml @@ -268,19 +268,16 @@ 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' - - 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..a5509736 --- /dev/null +++ b/src/openvpn/vcpkg.json @@ -0,0 +1,18 @@ +{ + "$schema": "https://raw.githubusercontent.com/microsoft/vcpkg/master/scripts/vcpkg.schema.json", + "name": "openvpn", + "version": "2.5", + "dependencies": [ + "openssl", + "tap-windows6", + "lzo", + "pkcs11-helper" + ], + "builtin-baseline": "4b766c1cd17205e1b768c4fadfd5f867c1d0510e", + "overrides": [ + { + "name": "openssl", + "version-string": "1.1.1n" + } + ] +}