From patchwork Mon Apr 25 11:58:22 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Marc Becker X-Patchwork-Id: 2415 Return-Path: Delivered-To: patchwork@openvpn.net Delivered-To: patchwork@openvpn.net Received: from director10.mail.ord1d.rsapps.net ([172.27.255.54]) by backend41.mail.ord1d.rsapps.net with LMTP id F/gSA+gZZ2IBeQAAqwncew (envelope-from ) for ; Mon, 25 Apr 2022 18:00:08 -0400 Received: from proxy3.mail.iad3a.rsapps.net ([172.27.255.54]) by director10.mail.ord1d.rsapps.net with LMTP id sEEAGOgZZ2ICSgAApN4f7A (envelope-from ) for ; Mon, 25 Apr 2022 18:00:08 -0400 Received: from smtp37.gate.iad3a ([172.27.255.54]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) by proxy3.mail.iad3a.rsapps.net with LMTPS id UK3xEOgZZ2IbPQAAYaqY3Q (envelope-from ) for ; Mon, 25 Apr 2022 18:00:08 -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: smtp37.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=gmx.net; dmarc=fail (p=none; dis=none) header.from=gmx.de X-Suspicious-Flag: YES X-Classification-ID: 11754818-c4e3-11ec-a661-525400dc5f6a-1-1 Received: from [216.105.38.7] ([216.105.38.7:36626] helo=lists.sourceforge.net) by smtp37.gate.iad3a.rsapps.net (envelope-from ) (ecelerity 4.2.38.62370 r(:)) with ESMTPS (cipher=DHE-RSA-AES256-GCM-SHA384) id 78/96-04169-7E917626; Mon, 25 Apr 2022 18:00:07 -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 1nj6jA-0000Wz-MW; Mon, 25 Apr 2022 21:58:41 +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 1nj6j8-0000Ws-J4 for openvpn-devel@lists.sourceforge.net; Mon, 25 Apr 2022 21:58:39 +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:To:From:Sender:Reply-To:Cc: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=dLz9el3Lx8JWbLOSQTbujVxp2vFXJ1+aM1uZ4pAM70w=; b=F7JtHMtLl8m3MCoxKa5x+Wr8gn IhgZS+4e6PF/ff3SuJnTOkfHEdMxb3k4fmYOQXOQyWkz295mR7g0wTZj+1fvhAX9Rkl1P+rCXqpCL QAt35jm1g1jYuPPdDCn0Z77pLzr7Xwa8Iuu2bO8/l8ZM1Bt3tDTNI032myJ33EcjiSn8=; 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:To:From:Sender:Reply-To:Cc: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=dLz9el3Lx8JWbLOSQTbujVxp2vFXJ1+aM1uZ4pAM70w=; b=b1Pd8Y08FWcAMKhrc4eqkoegq7 jdHNQvUYxQ+qmmNPAESXO2aPVxjFz0McHFLfZcX2XZj/sXrsMQBApyVZR7iJsTo3qywA1uKw2qmOi Q3gLCe1Squ7rp0+UsSZpZqDYi5zBlanv5FCHimUzICxmHbEYNs1v66hzZGqQAcwn+JF4=; Received: from mout.gmx.net ([212.227.17.21]) by sfi-mx-2.v28.lw.sourceforge.com with esmtps (TLS1.2:ECDHE-RSA-AES256-GCM-SHA384:256) (Exim 4.94.2) id 1nj6j7-0001Ru-VW for openvpn-devel@lists.sourceforge.net; Mon, 25 Apr 2022 21:58:39 +0000 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=gmx.net; s=badeba3b8450; t=1650923907; bh=dLz9el3Lx8JWbLOSQTbujVxp2vFXJ1+aM1uZ4pAM70w=; h=X-UI-Sender-Class:From:To:Subject:Date:In-Reply-To:References; b=f1XBGSmtVhAlMDWHxVNSlkI/21YE5NpxbtR+SopztsecgAFgun4YXD8v70eXbM7ld s2Gs8vDGyBMjIcja0oZFA9iAIMQ8FV6KtqFC2yIWbpWtGyadFuAmq4wVpIzqjhnh9d gQnpZFszEaniixYjcCetrDwpTvTISRiv6fcVHxQQ= X-UI-Sender-Class: 01bb95c1-4bf8-414a-932a-4f6e2808ef9c Received: from moro ([85.212.243.249]) by mail.gmx.net (mrgmx104 [212.227.17.168]) with ESMTPSA (Nemesis) id 1N5mKJ-1nxthQ1p0t-017GZS for ; Mon, 25 Apr 2022 23:58:27 +0200 From: Marc Becker To: openvpn-devel@lists.sourceforge.net Date: Mon, 25 Apr 2022 23:58:22 +0200 Message-Id: <20220425215822.18569-1-becm@gmx.de> X-Mailer: git-send-email 2.30.2 In-Reply-To: <20220424192510.75385-1-becm@gmx.de> References: <20220424192510.75385-1-becm@gmx.de> MIME-Version: 1.0 X-Provags-ID: V03:K1:S+TPTcUQKqbxrrCHZUSrTINcaOJ28LwET7UGD2EGeZLBFGz42Ml 52JebJKnKlet9abpaPlO3KXb+WWqsv37mEzAD8AQsQoKi4DhcpbAlRtW1WuL47sd3wC21hI p6nczXfVspkWzLhksRd4rD6E0F/ez0wE0d+z0GdDIAl3dxf8l21CdMr+/WApIZsk86PKwjg 1uPM0LgObjhgvMAbEKOzg== X-UI-Out-Filterresults: notjunk:1;V03:K0:ycPEi4O4arU=:JbHEk0WGN3yH7uP0CPDM1v FnQMw2BfhMLlBJ70y7yL5YOegLxi4KEWvYHwttz0h47FQN1CqHI152uDPoBSJnGWdG4QOnbRQ nDZg/ZFOUKEhWcz+hoJ8Xb+3prKSqO7vcaPQX2wP3e2vdLem+kCZLfqk5IOi0LKAZK+z5HjPU SiikBe+XkK1IpPLzd6vEbqoi2bUH7vP6YHwu+B5lPpHnZW4WQpMhLKeH4QgWBU8QQOP+wtXdp KXWDNBa7Eo+qRLaGvV+UNSY6vSa/qPqbXOwdu5TBdsCbhb2buMe0u644BKr7LEdF8Tmhq3qWl M0V+3AiEBqygcciNE+65Y3eQnfSQOgRYAItrR78zaAq6GFHfQWp92i+QcZNoAdS+ZP0Mdqo8R y6ZeUna89OUsGEHmuQSlNrxBhKX8krnAS9NTzkrcRtL0nOB3nnapTnjMvQr6qze7Hae5LBigG A26ZHTOQNO6byGcX7Oxud3y59Jo+UjX/Vy1ITGgQI+GDkX9+jvviam7GQzNcBHi29hzgmAcWZ F/jaGRAVVUn6xtAwmSbcZWYpYDOwZdbdEN1VFBfiqL3RYYJWpzraAlAWIJWNVR0mWEYaWX+my sxxtzB+eFLEyMhu38IOP/ouD2IGvgHeueIIlIKmbm368p8qx83RlBYgkFUEihoMfkE1l7/jfJ 175/XPrCnT4cjdyUZm6rWZ4vAx4ZhLPKQglp/ljtgpmfX0yn5GwgMLiqIM3LWEZVgaceked+6 O5MijAYszKeHsDwVKy/koD1qPQp9kTrR0xjGo40gWxxyZtwjRtqcwjS8r7/2iVrSAPPNiDdJo pctxM1CpY0h4CkAmNlwfZ1yRDn3L6ADfXEm4Ka2UVUTLxt7dbTTWD8KE0H6gnFFgDPahAwyoT 8vKVzelrop6E5wM0WsWtwOnoCdPtSRMJQjaOpKEFQWHflueJV/JoKCiTmSirVP458T0FfYxdp nM9SnpDhIXgfXuV+7nDYHBiJQBbet1TpbaOH52AL2R2VfXSet+LnKSFG3xkwMcpN6xp4/KE3m uNlgH/h+3ssEUFiTS3XIusFvsUnYo2h/G/SJ6EwD/VBGPtzYtKE+dIYsN7jf4VYEIg== 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: replace hardcoded directory names with env variable version info bump pkcs11-helper version to 1.29.0 bump OpenSSL version to 1.1.1n add OpenSSL version to cache key use release file for pkcs11-helper [...] Content analysis details: (-0.7 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.227.17.21 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 [becm[at]gmx.de] -0.0 SPF_PASS SPF: sender matches SPF record 0.0 MIME_BASE64_TEXT RAW: Message text disguised using base64 encoding -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 X-Headers-End: 1nj6j7-0001Ru-VW Subject: [Openvpn-devel] [PATCH v2] fix GitHub workflow working directories in MinGW builds 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: , Errors-To: openvpn-devel-bounces@lists.sourceforge.net X-getmail-retrieved-from-mailbox: Inbox replace hardcoded directory names with env variable version info bump pkcs11-helper version to 1.29.0 bump OpenSSL version to 1.1.1n add OpenSSL version to cache key use release file for pkcs11-helper archive use OpenSSL URL endpoint with all/current versions Signed-off-by: Marc Becker Acked-by: Gert Doering --- fix whitespace (lost during SMTP transfer, retry with base64) .github/workflows/build.yaml | 36 ++++++++++++++++++------------------ 1 file changed, 18 insertions(+), 18 deletions(-) diff --git a/.github/workflows/build.yaml b/.github/workflows/build.yaml index fa99e12b..34a9d9b9 100644 --- a/.github/workflows/build.yaml +++ b/.github/workflows/build.yaml @@ -19,8 +19,8 @@ jobs: env: MAKEFLAGS: -j3 LZO_VERSION: "2.10" - PKCS11_HELPER_VERSION: "1.26" - OPENSSL_VERSION: "1.1.1j" + PKCS11_HELPER_VERSION: "1.29.0" + OPENSSL_VERSION: "1.1.1n" TAP_WINDOWS_VERSION: "9.23.3" CHOST: ${{ matrix.chost }} TARGET: ${{ matrix.target }} @@ -46,20 +46,20 @@ jobs: uses: actions/cache@v2 with: path: '~/mingw/' - key: ${{ matrix.target }}-mingw-${{ env.LZO_VERSION }}-${{ env.PKCS11_HELPER_VERSION }}-${{ env.TAP_WINDOWS_VERSION }} + key: ${{ matrix.target }}-mingw-${{ env.OPENSSL_VERSION }}-${{ env.LZO_VERSION }}-${{ env.PKCS11_HELPER_VERSION }}-${{ env.TAP_WINDOWS_VERSION }} # Repeating if: steps.cache.outputs.cache-hit != 'true' # on every step for building dependencies is ugly but # I haven't found a better solution so far. - - name: Download mingw depnendencies + - name: Download mingw dependencies if: steps.cache.outputs.cache-hit != 'true' run: | wget -c -P download-cache/ "https://build.openvpn.net/downloads/releases/tap-windows-${TAP_WINDOWS_VERSION}.zip" wget -c -P download-cache/ "https://www.oberhumer.com/opensource/lzo/download/lzo-${LZO_VERSION}.tar.gz" - wget -c -P download-cache/ "https://github.com/OpenSC/pkcs11-helper/archive/pkcs11-helper-${PKCS11_HELPER_VERSION}.tar.gz" - wget -c -P download-cache/ "https://www.openssl.org/source/old/1.1.1/openssl-${OPENSSL_VERSION}.tar.gz" - tar zxf "download-cache/pkcs11-helper-${PKCS11_HELPER_VERSION}.tar.gz" + wget -c -P download-cache/ "https://github.com/OpenSC/pkcs11-helper/releases/download/pkcs11-helper-${PKCS11_HELPER_VERSION}/pkcs11-helper-${PKCS11_HELPER_VERSION}.tar.bz2" + wget -c -P download-cache/ "https://www.openssl.org/source/openssl-${OPENSSL_VERSION}.tar.gz" + tar jxf "download-cache/pkcs11-helper-${PKCS11_HELPER_VERSION}.tar.bz2" tar zxf "download-cache/openssl-${OPENSSL_VERSION}.tar.gz" tar zxf "download-cache/lzo-${LZO_VERSION}.tar.gz" unzip download-cache/tap-windows-${TAP_WINDOWS_VERSION}.zip @@ -67,56 +67,56 @@ jobs: - name: Configure OpenSSL if: steps.cache.outputs.cache-hit != 'true' run: ./Configure --cross-compile-prefix=${CHOST}- shared ${{ matrix.target }} no-capieng --prefix="${HOME}/mingw/opt" --openssldir="${HOME}/mingw/opt" -static-libgcc - working-directory: "./openssl-1.1.1j" + working-directory: "./openssl-${{ env.OPENSSL_VERSION }}" - name: Build OpenSSL if: steps.cache.outputs.cache-hit != 'true' run: make - working-directory: "./openssl-1.1.1j/" + working-directory: "./openssl-${{ env.OPENSSL_VERSION }}" - name: Install OpenSSL if: steps.cache.outputs.cache-hit != 'true' run: make install - working-directory: "./openssl-1.1.1j/" + working-directory: "./openssl-${{ env.OPENSSL_VERSION }}" - name: autoreconf pkcs11-helper if: steps.cache.outputs.cache-hit != 'true' run: autoreconf -iv - working-directory: "./pkcs11-helper-pkcs11-helper-1.26" + working-directory: "./pkcs11-helper-${{ env.PKCS11_HELPER_VERSION }}" - name: configure pkcs11-helper if: steps.cache.outputs.cache-hit != 'true' run: OPENSSL_LIBS="-L${HOME}/mingw/opt/lib -lssl -lcrypto" OPENSSL_CFLAGS=-I$HOME/mingw/opt/include PKG_CONFIG_PATH=${HOME}/mingw/opt/lib/pkgconfig ./configure --host=${CHOST} --program-prefix='' --libdir=${HOME}/mingw/opt/lib --prefix=${HOME}/mingw/opt --build=x86_64-pc-linux-gnu --disable-crypto-engine-gnutls --disable-crypto-engine-nss --disable-crypto-engine-polarssl --disable-crypto-engine-mbedtls - working-directory: "./pkcs11-helper-pkcs11-helper-1.26" + working-directory: "./pkcs11-helper-${{ env.PKCS11_HELPER_VERSION }}" - name: build pkcs11-helper if: steps.cache.outputs.cache-hit != 'true' run: make all - working-directory: "./pkcs11-helper-pkcs11-helper-1.26" + working-directory: "./pkcs11-helper-${{ env.PKCS11_HELPER_VERSION }}" - name: install pkcs11-helper if: steps.cache.outputs.cache-hit != 'true' run: make install - working-directory: "./pkcs11-helper-pkcs11-helper-1.26" + working-directory: "./pkcs11-helper-${{ env.PKCS11_HELPER_VERSION }}" - name: Configure lzo if: steps.cache.outputs.cache-hit != 'true' run: ./configure --host=${CHOST} --program-prefix='' --libdir=${HOME}/mingw/opt/lib --prefix=${HOME}/mingw/opt --build=x86_64-pc-linux-gnu - working-directory: "./lzo-2.10" + working-directory: "./lzo-${{ env.LZO_VERSION }}" - name: build lzo if: steps.cache.outputs.cache-hit != 'true' - working-directory: "./lzo-2.10" + working-directory: "./lzo-${{ env.LZO_VERSION }}" run: make - name: install lzo if: steps.cache.outputs.cache-hit != 'true' - working-directory: "./lzo-2.10" + working-directory: "./lzo-${{ env.LZO_VERSION }}" run: make install - name: copy tap-windows.h header if: steps.cache.outputs.cache-hit != 'true' - run: cp ./tap-windows-9.23.3/include/tap-windows.h ${HOME}/mingw/opt/include/ + 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