From patchwork Thu Aug 25 22:41:11 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Antonio Quartulli X-Patchwork-Id: 2726 Return-Path: Delivered-To: patchwork@openvpn.net Delivered-To: patchwork@openvpn.net Received: from director10.mail.ord1d.rsapps.net ([172.31.255.6]) by backend30.mail.ord1d.rsapps.net with LMTP id KAinGZqHCGMQBAAAIUCqbw (envelope-from ) for ; Fri, 26 Aug 2022 04:43:06 -0400 Received: from proxy7.mail.iad3b.rsapps.net ([172.31.255.6]) by director10.mail.ord1d.rsapps.net with LMTP id SClwGZqHCGNEXwAApN4f7A (envelope-from ) for ; Fri, 26 Aug 2022 04:43:06 -0400 Received: from smtp35.gate.iad3b ([172.31.255.6]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) by proxy7.mail.iad3b.rsapps.net with LMTPS id N7yBEpqHCGNUewAAQkQ5tQ (envelope-from ) for ; Fri, 26 Aug 2022 04:43:06 -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: smtp35.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=unstable.cc; dmarc=none (p=nil; dis=none) header.from=unstable.cc X-Suspicious-Flag: YES X-Classification-ID: 1a3734be-251b-11ed-9386-525400503131-1-1 Received: from [216.105.38.7] ([216.105.38.7:37868] helo=lists.sourceforge.net) by smtp35.gate.iad3b.rsapps.net (envelope-from ) (ecelerity 4.2.38.62370 r(:)) with ESMTPS (cipher=DHE-RSA-AES256-GCM-SHA384) id FA/59-23682-99788036; Fri, 26 Aug 2022 04:43:05 -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.95) (envelope-from ) id 1oRUul-0004jp-3I; Fri, 26 Aug 2022 08:42:07 +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.95) (envelope-from ) id 1oRUue-0004jV-C3 for openvpn-devel@lists.sourceforge.net; Fri, 26 Aug 2022 08:42:03 +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:References: In-Reply-To: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:List-Id:List-Help:List-Unsubscribe: List-Subscribe:List-Post:List-Owner:List-Archive; bh=wwDGBB/+CsMz5dGBW8w2GIcG+Xzu5xDpGYggi50/sm4=; b=fe/dVCunzMHLjHUifhAPVFIYth qW/H3+zrpyKkW4gmNkWdb3Uj/EuLzJGQdwn5rV4FBSoaRHJAhPPx8bvBfuCfXwLKzvRF6XhMA4O0E ZUl16HPfRJzECvIUWB03ZmRUEB9MJAvZlBSn/ka9nUC5zGK2tJKBU4s/SL9gXGXECRLM=; DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=sf.net; s=x ; h=Content-Transfer-Encoding:MIME-Version:References:In-Reply-To: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:List-Id:List-Help:List-Unsubscribe:List-Subscribe: List-Post:List-Owner:List-Archive; bh=wwDGBB/+CsMz5dGBW8w2GIcG+Xzu5xDpGYggi50/sm4=; b=OrXiVFIG4UCsDlwgj4nERdaEI8 dwqgh8dxLPQQrv4uedW8AHzOa6ZNzb1VQnk/WHbXwUveKkCEGrk7jpMO1b+m1zfVCE8ekMdrOo9nF JD6KohG4A+WJFL43JPstGRabtec68BCEOGGi68dxEEvawn1XcezwhyTXFEPYKNx2SfpU=; Received: from wilbur.contactoffice.com ([212.3.242.68]) by sfi-mx-1.v28.lw.sourceforge.com with esmtps (TLS1.2:ECDHE-RSA-AES256-GCM-SHA384:256) (Exim 4.95) id 1oRUuU-001CiP-8f for openvpn-devel@lists.sourceforge.net; Fri, 26 Aug 2022 08:42:00 +0000 Received: from smtpauth2.co-bxl (smtpauth2.co-bxl [10.2.0.24]) by wilbur.contactoffice.com (Postfix) with ESMTP id CDD792404; Fri, 26 Aug 2022 10:41:36 +0200 (CEST) DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; t=1661503296; s=20220809-q8oc; d=unstable.cc; i=a@unstable.cc; h=From:Cc:Date:Message-Id:In-Reply-To:References:MIME-Version:Content-Transfer-Encoding; l=2105; bh=wwDGBB/+CsMz5dGBW8w2GIcG+Xzu5xDpGYggi50/sm4=; b=rRPyVfdtIpYG6MMHAdqNCes7Vy7AQq2vLMNo2WYJdEEGNecH9ufZUMjKLeTBcF5R sfecA7YqryBAOkRl80PZj47MUy8QNHJMCvljtr2QUnIe3UbEmIKmo8oD/sAFw5NUPhF dSznqgp0f2DMkXUFCEw2Q1sGIVDuoP3l8P9PY63+BfDBS5b5NQzD+SZTLR1PIM2jQes RVIYAWWT6LcpKgPsDq8+HC0Z08YNVzK9wSewLTDxchl+vplt4BItkTbqUfeg91JvyRb r2blpxgczG8rtdgXiBJ6ybBw3Oce7/tvlIyAWmge2UW0M255wZEFKxJWmTMp0sSEEYO ENHrHfNR1w== Received: by smtp.mailfence.com with ESMTPSA ; Fri, 26 Aug 2022 10:41:33 +0200 (CEST) From: Antonio Quartulli To: openvpn-devel@lists.sourceforge.net Date: Fri, 26 Aug 2022 10:41:11 +0200 Message-Id: <20220826084111.239523-1-a@unstable.cc> X-Mailer: git-send-email 2.30.2 In-Reply-To: <20220813204224.22576-5-a@unstable.cc> References: MIME-Version: 1.0 X-Spam-Status: No, hits=-2.9 required=4.7 symbols=ALL_TRUSTED, BAYES_00, T_SCC_BODY_TEXT_LINE device=10.2.0.21 X-ContactOffice-Account: com:375058688 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: In order to build OpenVPN with DCO support on Windows there is no need to pull the full ovpn-dco-win source code, because we now ship the UAPI header within OpenVPN directly. This also eliminates the [...] Content analysis details: (-0.9 points, 6.0 required) pts rule name description ---- ---------------------- -------------------------------------------------- -0.7 RCVD_IN_DNSWL_LOW RBL: Sender listed at https://www.dnswl.org/, low trust [212.3.242.68 listed in list.dnswl.org] -0.0 SPF_PASS SPF: sender matches SPF record 0.0 SPF_HELO_NONE SPF: HELO does not publish an SPF Record -0.1 DKIM_VALID_EF Message has a valid DKIM or DK signature from envelope-from domain -0.1 DKIM_VALID_AU Message has a valid DKIM or DK signature from author's domain -0.1 DKIM_VALID Message has at least one valid DKIM or DK signature 0.1 DKIM_SIGNED Message has a DKIM or DK signature, not necessarily valid -0.0 T_SCC_BODY_TEXT_LINE No description available. X-Headers-End: 1oRUuU-001CiP-8f Subject: [Openvpn-devel] [PATCH v102 5/7] dco-win: update GH Actions config file 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 , Antonio Quartulli Errors-To: openvpn-devel-bounces@lists.sourceforge.net X-getmail-retrieved-from-mailbox: Inbox In order to build OpenVPN with DCO support on Windows there is no need to pull the full ovpn-dco-win source code, because we now ship the UAPI header within OpenVPN directly. This also eliminates the need to specify the DCO_SOURCEDIR var. At the same time, DCO is always enabled therefore passing --enable-dco at configure time is not needed anymore. Signed-off-by: Lev Stipakov Signed-off-by: Antonio Quartulli Acked-by: Gert Doering --- Changes from v101: * rebased .github/workflows/build.yaml | 7 +------ 1 file changed, 1 insertion(+), 6 deletions(-) diff --git a/.github/workflows/build.yaml b/.github/workflows/build.yaml index b0f67a78..f182a4fe 100644 --- a/.github/workflows/build.yaml +++ b/.github/workflows/build.yaml @@ -59,11 +59,6 @@ jobs: steps: - name: Install dependencies run: sudo apt update && sudo apt install -y mingw-w64 libtool automake autoconf man2html unzip - - name: Checkout ovpn-dco-win - uses: actions/checkout@v3 - with: - repository: OpenVPN/ovpn-dco-win - path: ovpn-dco-win - name: Checkout OpenVPN uses: actions/checkout@v3 with: @@ -151,7 +146,7 @@ jobs: run: cp ./tap-windows-${TAP_WINDOWS_VERSION}/include/tap-windows.h ${HOME}/mingw/opt/include/ - name: configure OpenVPN - run: PKG_CONFIG_PATH=${HOME}/mingw/opt/lib/pkgconfig DCO_SOURCEDIR=$(realpath ../ovpn-dco-win) LDFLAGS=-L$HOME/mingw/opt/lib CFLAGS=-I$HOME/mingw/opt/include OPENSSL_LIBS="-L${HOME}/opt/lib -lssl -lcrypto" OPENSSL_CFLAGS=-I$HOME/mingw/opt/include PREFIX=$HOME/mingw/opt LZO_CFLAGS=-I$HOME/mingw/opt/include LZO_LIBS="-L${HOME}/mingw/opt/lib -llzo2" ./configure --host=${CHOST} --disable-lz4 --enable-dco + run: PKG_CONFIG_PATH=${HOME}/mingw/opt/lib/pkgconfig LDFLAGS=-L$HOME/mingw/opt/lib CFLAGS=-I$HOME/mingw/opt/include OPENSSL_LIBS="-L${HOME}/opt/lib -lssl -lcrypto" OPENSSL_CFLAGS=-I$HOME/mingw/opt/include PREFIX=$HOME/mingw/opt LZO_CFLAGS=-I$HOME/mingw/opt/include LZO_LIBS="-L${HOME}/mingw/opt/lib -llzo2" ./configure --host=${CHOST} --disable-lz4 working-directory: openvpn - name: build OpenVPN