From patchwork Sun Apr 24 09:25:10 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Marc Becker X-Patchwork-Id: 2413 Return-Path: Delivered-To: patchwork@openvpn.net Delivered-To: patchwork@openvpn.net Received: from director10.mail.ord1d.rsapps.net ([172.30.191.6]) by backend41.mail.ord1d.rsapps.net with LMTP id CGybHXukZWIpUwAAqwncew (envelope-from ) for ; Sun, 24 Apr 2022 15:26:51 -0400 Received: from proxy6.mail.ord1d.rsapps.net ([172.30.191.6]) by director10.mail.ord1d.rsapps.net with LMTP id kKhXAXykZWJABgAApN4f7A (envelope-from ) for ; Sun, 24 Apr 2022 15:26:52 -0400 Received: from smtp13.gate.ord1d ([172.30.191.6]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) by proxy6.mail.ord1d.rsapps.net with LMTPS id gE4hAXykZWLHbwAAQyIf0w (envelope-from ) for ; Sun, 24 Apr 2022 15:26:52 -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: smtp13.gate.ord1d.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: 7dc8b66a-c404-11ec-aa57-525400b197d9-1-1 Received: from [216.105.38.7] ([216.105.38.7:54108] helo=lists.sourceforge.net) by smtp13.gate.ord1d.rsapps.net (envelope-from ) (ecelerity 4.2.38.62370 r(:)) with ESMTPS (cipher=DHE-RSA-AES256-GCM-SHA384) id 69/97-20852-B74A5626; Sun, 24 Apr 2022 15:26:51 -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 1nihrU-0001eF-30; Sun, 24 Apr 2022 19:25:37 +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 1nihrR-0001e9-Qd for openvpn-devel@lists.sourceforge.net; Sun, 24 Apr 2022 19:25:34 +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: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:In-Reply-To:References:List-Id:List-Help:List-Unsubscribe: List-Subscribe:List-Post:List-Owner:List-Archive; bh=cmCfrf8wgGadHRNi8kdjPIXWpP86hpY/4aEfuL5Mtpo=; b=R1CRC9ArGcPN9E4DsTgPjLY4CO IqN+PgxA01l/0rUTzPKFLDX8u+viRARUl7s9Zl8uY8mMVMDnEsUSGVtmTNeKURnqoytZbPa3HIRjZ Y3rtr2UyM2zRmaidaiT5iC5cLHG7JdIECNC24/RLfBtXHoiC0KlD21CNFiesuD5vWYvc=; DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=sf.net; s=x ; h=Content-Transfer-Encoding:MIME-Version: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:In-Reply-To: References:List-Id:List-Help:List-Unsubscribe:List-Subscribe:List-Post: List-Owner:List-Archive; bh=cmCfrf8wgGadHRNi8kdjPIXWpP86hpY/4aEfuL5Mtpo=; b=W HV3tUjyVyqAhjlnyNINduJHnPqnQSBNeD6rskAC0ye57rKRIqGDkar93kgvaQc2SNGGton/Hzp4NT BESTicfBzlb51zHNy3t6t37KN1uRH80+I3T6IT9TuIUsifknMk0qGHxw8u4JSpubK7huZRxwdVPTv urnDco8g5b9ympfQ=; Received: from mout.gmx.net ([212.227.17.22]) by sfi-mx-1.v28.lw.sourceforge.com with esmtps (TLS1.2:ECDHE-RSA-AES256-GCM-SHA384:256) (Exim 4.94.2) id 1nihrO-0091iy-IG for openvpn-devel@lists.sourceforge.net; Sun, 24 Apr 2022 19:25:34 +0000 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=gmx.net; s=badeba3b8450; t=1650828320; bh=mkxGelweAQqb+wI5QLNyRd7T7shoXgEJxZ61+VBmhM4=; h=X-UI-Sender-Class:From:To:Subject:Date; b=Jg8jSYZLbuCdWcfhq6zplUqqjGjUe5NvKd+WLamoMlZGrhN/rFotTqtOM1kXbsQ5V QdbxlFaz2hBRNmB/oFeI20n/iHdMZw+kX0H1pS91r8msZ7BPY3PB8DaNJrWCb7eXZd MkC6Mwo6YJC/MqW7vZu08pPW/u2W0ZB+GRWftL6s= X-UI-Sender-Class: 01bb95c1-4bf8-414a-932a-4f6e2808ef9c Received: from moro ([85.212.252.249]) by mail.gmx.net (mrgmx105 [212.227.17.168]) with ESMTPSA (Nemesis) id 1MvK0X-1nzxnF1qfB-00rI5z for ; Sun, 24 Apr 2022 21:25:20 +0200 From: Marc Becker To: openvpn-devel@lists.sourceforge.net Date: Sun, 24 Apr 2022 21:25:10 +0200 Message-Id: <20220424192510.75385-1-becm@gmx.de> X-Mailer: git-send-email 2.30.2 MIME-Version: 1.0 X-Provags-ID: V03:K1:CI8ti9ZUBV+lCS0IQN5wokkyGwXDQFLocRtkhlkC4kdjpMR2LEX mTelzpstQxoJnvj9X9iFFUfLfYXhWCTLHCUEymL728vMXZXi7u5P5SG/VUWRI6OsWAJMSHb BJoZkXsumY3oG5VdhuO9Id6upGPJZcea/HuYiemf26TPyeWPJC5hz7HQjN14p1sOLNsMBXc UKFGJvqIZ3XXyiKzgMF+w== X-UI-Out-Filterresults: notjunk:1;V03:K0:BIvp5RmqwCs=:Zent5sh2QxkRCtCE9DW2nW gBOPGZj9gkn8EtOi/MiHakzjJj4UzM16YA5/yCw3ooXYuELqc64RESwzlKKkgTGi/sG9Aje3l oNabtaipcnhTXw44lqk3hGDdHmOweTYje2IfD2WlCY8q7FSQoHSzcGY81A/aASsYCeSFKmOUk 6yiJNpfUYjdY6IpaeeCm2EWr/umwqGk+v2lwUJ7UXzowdQ0r6dubgdwKlmdRe4enST43pcDUg EllLDWIUwhHPVcxHiygQ9KjiefECtOhc3NW8ZvI2niRFQGbzmeyTRGYJlcyJepkNEYEUH/mpq DdkxRPAr10huLWGbVvVXxT+NGR5+g/NigLcjDBKxuPeBs3hkIYA3RJnTCFsv8o/iqP6xbO5CB WLuPLR/UqTrqVytcZaa6Rc90DdxffaA3YVDi4HLkNgKPbIvw8yvl5VnJPMcIsQReOknOvv/PX zKxkDvYUZaIARZVV3Ero72H4lEIggPLEbUcA/UfmfOhfAs4BpmLn8voD78AzV/Ud0po9u6Cww VNQirNJXe6y4ypJxZMrElFNgZ+TMpUSxAkX4dDshMFK0Y2067lpvjHVeN++wKZfFroWEBZrpe uJNbJrrbWJ9DdhcakUMIkmyXbOkXSzymrZiv4uI/Jx0LGzcmd/lwciJNPmReU9dQrYY0CSaTA KgyddlB3S2wAjcNXpBtpZzdmT9OMXF9peSUclvkWXqaPCObOadRB7ZMxyidu0eyb1cqcQvDEc Zs5qtVfCHYjV3yW9IDADBVKy91mAEcDBdatwdYxCO9mAZJUnytbg0AgepTKisNOea+7akdyaJ ZjEH409pVPV/1IeGUGfdnChAB+8Nf8eADR2RWyPybEv7VFqmOLYwdNPoWlyd8AC0AHxz3K+qd xYEiQKLopgX7MqPbpAXRsqYlWawBgfV4EWyr/4mZKu4plDILU8JzxCO3lfCZzR3opMQYGRxQB BxKc545T2bqEHqh/jIbGU6MdDz11QyTDg6EuuJKmACCFlsdgvuufZsful0GCOFa3F0cyKV2rX 3ffun9JVpBLRAloOvCZpSq66St2fPGdWx1wjLaqfdGGZdGuMisDfGHuFvyqTEVFsbQ== 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.22 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.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: 1nihrO-0091iy-IG Subject: [Openvpn-devel] [PATCH] 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 Signed-off-by: Marc Becker <becm@gmx.de>
--- .github/workflows/build.yaml | 36 ++++++++++++++++++------------------ 1 file changed, 18 insertions(+), 18 deletions(-) -- 2.30.2 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