From patchwork Thu May 5 00:41:42 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Lev Stipakov X-Patchwork-Id: 2434 Return-Path: Delivered-To: patchwork@openvpn.net Delivered-To: patchwork@openvpn.net Received: from director8.mail.ord1d.rsapps.net ([172.27.255.8]) by backend41.mail.ord1d.rsapps.net with LMTP id GOauGziqc2KVRgAAqwncew (envelope-from ) for ; Thu, 05 May 2022 06:43:04 -0400 Received: from proxy1.mail.iad3a.rsapps.net ([172.27.255.8]) by director8.mail.ord1d.rsapps.net with LMTP id QF/bNDiqc2LPKgAAfY0hYg (envelope-from ) for ; Thu, 05 May 2022 06:43:04 -0400 Received: from smtp9.gate.iad3a ([172.27.255.8]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) by proxy1.mail.iad3a.rsapps.net with LMTPS id 2LjrLTiqc2IjSgAA8TVjwQ (envelope-from ) for ; Thu, 05 May 2022 06:43:04 -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: smtp9.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: 2432ee86-cc60-11ec-bbb9-52540097fc8c-1-1 Received: from [216.105.38.7] ([216.105.38.7:33302] helo=lists.sourceforge.net) by smtp9.gate.iad3a.rsapps.net (envelope-from ) (ecelerity 4.2.38.62370 r(:)) with ESMTPS (cipher=DHE-RSA-AES256-GCM-SHA384) id 3B/EF-04747-83AA3726; Thu, 05 May 2022 06:43:04 -0400 Received: from [127.0.0.1] (helo=sfs-ml-4.v29.lw.sourceforge.com) by sfs-ml-4.v29.lw.sourceforge.com with esmtp (Exim 4.94.2) (envelope-from ) id 1nmYvx-0006J7-Rs; Thu, 05 May 2022 10:42:08 +0000 Received: from [172.30.20.202] (helo=mx.sourceforge.net) by sfs-ml-4.v29.lw.sourceforge.com with esmtps (TLS1.2) tls TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384 (Exim 4.94.2) (envelope-from ) id 1nmYvw-0006J1-Ek for openvpn-devel@lists.sourceforge.net; Thu, 05 May 2022 10:42:07 +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=lvqZhhp0cHFOtxTWotZElv6lQ6g1i+2FvNtHO+/ouas=; b=Gy+70CEQmGdmdOLK95PJb4FbJf No22Bu9JlrDYI2nyhdO3x6YAxL/e7kZgih8CTT2Dd2e0IWQX7qoHjRr8iaA6jD9s+M1usSyAtZF23 bH+fe+FZ2BORKliOBsEpHfCoNxm42Avahp3mh5sqDICTrAXLjan/X7bup54tb8JHxKto=; 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=lvqZhhp0cHFOtxTWotZElv6lQ6g1i+2FvNtHO+/ouas=; b=BRDjbCtjojctlyLuHIAgoDgv9P TISBpqbjV45oSKQWNQ9WHFGI72zqNfRZk18UT62+Q2iOoeUnETveKZpSOpEkyrUWBERG6ws656L8y MgMHAtbmXolbqDski08LjuJ+SP0I9vT5pUeYYNTMk4bVWxKt2dAASsjLlZInVVFD/YNo=; Received: from mail-lf1-f45.google.com ([209.85.167.45]) by sfi-mx-2.v28.lw.sourceforge.com with esmtps (TLS1.2:ECDHE-RSA-AES128-GCM-SHA256:128) (Exim 4.94.2) id 1nmYvr-0003Y4-8O for openvpn-devel@lists.sourceforge.net; Thu, 05 May 2022 10:42:06 +0000 Received: by mail-lf1-f45.google.com with SMTP id b18so6766370lfv.9 for ; Thu, 05 May 2022 03:42: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:in-reply-to:references; bh=lvqZhhp0cHFOtxTWotZElv6lQ6g1i+2FvNtHO+/ouas=; b=LLrCUzXdF1ud9OeLvl7/+tAbgeKBWa8tLtVMMC8LlfEfwgQs793o/2PlxItEXbjQru Ea9i1vqsIcsoM2r/aY0QagWHhjjL/lkHQ6FfGMlC/OFAEi4zH/GfgOpbyENog4hsV7yO PfjVwb7x/iqzuZsQz6JnLlCxqu4MjNIM18e9egDdWMRuo/rCnF8RBKtJAeQA7YYJbliJ YtRfLuEC80gCfT9vZ30/rZZzTigKTNSlWnV6GReEnQcJWCpMSLYB2QhOv0OzcTZLUfdT KpjKt/RdUQkpPDC/ipiejN/8s0sLvc1DbSfmMxx250FkRxJf/ronvCHUUipg9/OK3Hh9 H63A== 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=lvqZhhp0cHFOtxTWotZElv6lQ6g1i+2FvNtHO+/ouas=; b=xd9tQy4RRhOF0vM2NiXoBiM2seP5GiY01e4MH7qfm6P1C2LBvxX3z1IVBisZwDPLON Q4ucb5LHDvY5xE2OYYaV8DwIYzl6CI6Xj0yQicY02aB+T6NCs79k+r2ZEkjLgLcMsYbe /I02TStrITGG1YtHqF85meakVisFvxoTbS3vUpJvyQNFUnkzelFRKdYSBb8+f0GPJyZA nAQdINEFTw5hhCdoXdijHBtXIO+isJXh02BumRYOb8O1+Q2echXUNLczX1P+uwhPVsgR glKG2vfob/gTlkpjQrNUxUJ490CkjNRj8YmvdAtALSmUvjOzlU+JKNvcy8mHlmmSJNko 8xFA== X-Gm-Message-State: AOAM533nrgSwQ83r5B13J1XTmyxFDMEluGyLQrTRYLffKHabboyf47ZY 8DC9TWQbHNbtbe5XwpbmUfKtfI7KNVg= X-Google-Smtp-Source: ABdhPJxh27NW2JtGIcOL0d+nzk0eMVn1GolQjmcMEyR0RsDkkgGWufUlp39lFg18FAkAdcczQPqigw== X-Received: by 2002:ac2:4c54:0:b0:473:a414:1768 with SMTP id o20-20020ac24c54000000b00473a4141768mr9524703lfk.537.1651747314776; Thu, 05 May 2022 03:41:54 -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 v12-20020ac2558c000000b0047255d21133sm166008lfg.98.2022.05.05.03.41.53 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 05 May 2022 03:41:54 -0700 (PDT) From: Lev Stipakov To: openvpn-devel@lists.sourceforge.net Date: Thu, 5 May 2022 13:41:42 +0300 Message-Id: <20220505104142.230-1-lstipakov@gmail.com> X-Mailer: git-send-email 2.17.1 In-Reply-To: <20220505103838.122-1-lstipakov@gmail.com> References: <20220505103838.122-1-lstipakov@gmail.com> X-Spam-Report: Spam detection software, running on the system "util-spamd-2.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.167.45 listed in list.dnswl.org] -0.0 SPF_PASS SPF: sender matches SPF record 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 RCVD_IN_MSPIKE_H2 RBL: Average reputation (+2) [209.85.167.45 listed in wl.mailspike.net] -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.1 DKIM_VALID_AU Message has a valid DKIM or DK signature from author's domain -0.0 T_SCC_BODY_TEXT_LINE No description available. X-Headers-End: 1nmYvr-0003Y4-8O Subject: [Openvpn-devel] [PATCH v2 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 --- v2: add missing lz4 dependency .github/workflows/build.yaml | 15 ++++++--------- .gitignore | 1 + src/openvpn/openvpn.vcxproj | 9 +++++++++ src/openvpn/vcpkg.json | 19 +++++++++++++++++++ 4 files changed, 35 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..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" + } + ] +}