From patchwork Sat Feb 1 02:36:30 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Ilya Shipitsin X-Patchwork-Id: 971 Return-Path: Delivered-To: patchwork@openvpn.net Delivered-To: patchwork@openvpn.net Received: from director12.mail.ord1d.rsapps.net ([172.27.255.53]) by backend30.mail.ord1d.rsapps.net with LMTP id 8IjuCyl/NV4LGgAAIUCqbw for ; Sat, 01 Feb 2020 08:37:45 -0500 Received: from proxy19.mail.iad3a.rsapps.net ([172.27.255.53]) by director12.mail.ord1d.rsapps.net with LMTP id gFvUCSl/NV4kNQAAIasKDg ; Sat, 01 Feb 2020 08:37:45 -0500 Received: from smtp12.gate.iad3a ([172.27.255.53]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) by proxy19.mail.iad3a.rsapps.net with LMTP id MI+0BCl/NV4LQQAAXy6Yeg ; Sat, 01 Feb 2020 08:37:45 -0500 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: smtp12.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: 066d7548-44f8-11ea-aee4-525400068c1c-1-1 Received: from [216.105.38.7] ([216.105.38.7:55404] helo=lists.sourceforge.net) by smtp12.gate.iad3a.rsapps.net (envelope-from ) (ecelerity 4.2.38.62370 r(:)) with ESMTPS (cipher=DHE-RSA-AES256-GCM-SHA384) id 48/5A-30513-82F753E5; Sat, 01 Feb 2020 08:37:44 -0500 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.90_1) (envelope-from ) id 1ixsx1-0007Av-OD; Sat, 01 Feb 2020 13:36:43 +0000 Received: from [172.30.20.202] (helo=mx.sourceforge.net) by sfs-ml-4.v29.lw.sourceforge.com with esmtps (TLSv1.2:ECDHE-RSA-AES256-GCM-SHA384:256) (Exim 4.90_1) (envelope-from ) id 1ixswz-0007Ao-Vm for openvpn-devel@lists.sourceforge.net; Sat, 01 Feb 2020 13:36:41 +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: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:In-Reply-To:References:List-Id:List-Help:List-Unsubscribe: List-Subscribe:List-Post:List-Owner:List-Archive; bh=BGCprS3yKijf4rPUM+Lmwj3ZmDSqXihH+DR/5SWfGSo=; b=kuzHr87+wGcgaoWgx6Q6iLCFiR GMITLOhds95vBciTrPnroXPSsBp3gormyYPREm95AhX5AqSmm5b/o4VCcY5AII7XcOK9Ck6lKByML D21gOStRJufKGn1mwkvV+FBd5vgx+nXyqQ00WXWHUTwdbJhJddygT1KWNT0JyMaNNqeA=; 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: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:In-Reply-To: References:List-Id:List-Help:List-Unsubscribe:List-Subscribe:List-Post: List-Owner:List-Archive; bh=BGCprS3yKijf4rPUM+Lmwj3ZmDSqXihH+DR/5SWfGSo=; b=V r/f+RFcU/EEomK2LnBKvbs8eHBi7DVqWlibeH4irfd7Co+AQHGYm6jEcyiNUWCOOEXevhc07GL18u HRmAxZWcZOIendGKnIZlkS99+F0kj19O0wcpbQNxvK/SgX+aRvMU4g3KIyUm2JahSVS3qHLxg3Zjf yOi4MaEiHc433mqk=; Received: from mail-lj1-f175.google.com ([209.85.208.175]) by sfi-mx-1.v28.lw.sourceforge.com with esmtps (TLSv1.2:ECDHE-RSA-AES128-GCM-SHA256:128) (Exim 4.92.2) id 1ixswy-00DClL-Eh for openvpn-devel@lists.sourceforge.net; Sat, 01 Feb 2020 13:36:41 +0000 Received: by mail-lj1-f175.google.com with SMTP id y6so10046513lji.0 for ; Sat, 01 Feb 2020 05:36:40 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:cc:subject:date:message-id:mime-version :content-transfer-encoding; bh=BGCprS3yKijf4rPUM+Lmwj3ZmDSqXihH+DR/5SWfGSo=; b=qPHLU2JlMb13dwl7cRwFE9ySAXw2OsSjdEkoK87OID/qwJmKHvyzMLZUGAwcJeXuvN Wmc6S/0ZXSBGfkSThn7f7k5olUVeCbBaaCgNKLotxUiA6BqrT4JrEXjKIMS1j1RQOdoK OkmdfcH3rOmUvaF9snlEnl5uuTDEE91sjpa/fSSuQNBaF6+Vq1GmVefr/Z8YQY0mbZzW zlCFlXoeowN2n8CZYrNP4wsrea7vDcl+85nr4tVlji5RDJpMHEa4xrQs8FqAlv80HfIm PgFrV1TfjJasqiNhxKRlsxg4Uc6sjO8XQ7FLMacUoPYMAmqw5IAKsOpfkVPY2a6YZ2mc /k+g== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:mime-version :content-transfer-encoding; bh=BGCprS3yKijf4rPUM+Lmwj3ZmDSqXihH+DR/5SWfGSo=; b=f3x/4Lm8soqIU4GHMdml8KolNwgg7zsa7326GZBuDYMKSOuqwV7faCEZvYBd/eKwym uELghwFnZesKpUjPG78JONgALrJ+Fq3B1jiC/qjW5OsC4dJnSLEQ2V+VYs7TZP2kaETh bSo0wxmlvgiSnk/1JYuzmOnG/xwZaAkWIJo11tHfUF7ZcByYXdeggPvRN3XhY9wEUFXk dwqRR1Mvrv5u+9DYnUCplMufx2y5Jg+IOT0U6y2LGru0mtjsGWnlevjaU0ZTdQDweiR7 hz3fn9GChSFyqwr8kVv8pOrd42D8ukMW8RMFDwsQcIf+Qrz72EUbaIjDNM3mHKPzzVFc QImw== X-Gm-Message-State: APjAAAX2o4oqatpcl5lu9uivZaisyVjcjoq1ryQ98s0bKAGXG44cU6ZQ Dsz2YIVK92r+KcKPqn6enVxvF2lJlf4= X-Google-Smtp-Source: APXvYqy2fgFBHXIKL3EtQXBQ2ULuGQ/JLSU0hLOKU5WpUQ3rB+keSpOFTBRd6jjyh26/YyVkTeMFUw== X-Received: by 2002:a2e:b4e7:: with SMTP id s7mr9276479ljm.58.1580564193270; Sat, 01 Feb 2020 05:36:33 -0800 (PST) Received: from localhost.localdomain ([212.75.137.249]) by smtp.gmail.com with ESMTPSA id g25sm6355699ljn.107.2020.02.01.05.36.32 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sat, 01 Feb 2020 05:36:32 -0800 (PST) From: chipitsine@gmail.com To: openvpn-devel@lists.sourceforge.net Date: Sat, 1 Feb 2020 18:36:30 +0500 Message-Id: <20200201133630.17331-1-chipitsine@gmail.com> X-Mailer: git-send-email 2.24.1 MIME-Version: 1.0 X-Spam-Report: Spam Filtering performed by mx.sourceforge.net. See http://spamassassin.org/tag/ for more details. 0.0 URIBL_BLOCKED ADMINISTRATOR NOTICE: The query to URIBL was blocked. See http://wiki.apache.org/spamassassin/DnsBlocklists#dnsbl-block for more information. [URIs: travis-ci.com] -0.0 RCVD_IN_DNSWL_NONE RBL: Sender listed at https://www.dnswl.org/, no trust [209.85.208.175 listed in list.dnswl.org] 0.0 FREEMAIL_FROM Sender email is commonly abused enduser mail provider (chipitsine[at]gmail.com) -0.0 RCVD_IN_MSPIKE_H2 RBL: Average reputation (+2) [209.85.208.175 listed in wl.mailspike.net] -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_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 X-Headers-End: 1ixswy-00DClL-Eh Subject: [Openvpn-devel] [PATCH] travis-ci: add arm64, s390x 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 From: Ilya Shipitsin as described on https://docs.travis-ci.com/user/multi-cpu-architectures travis-ci now supports amd64, ppcle, arm64, s390 architectures. Add arm64 and s390x. "sudo" is deprecated, let us remove it, also "matrix" is deprecated in favour of "jobs". LD_LIBRARY_PATH was replaced by using "rpath" in LDFLAGS, which is more elegant way of linking. also, dependencies were upgraded to the latest versions. travis_wait was added for long openssl builds. https://docs.travis-ci.com/user/multi-cpu-architectures --- .travis.yml | 24 ++++++++++-------------- .travis/build-check.sh | 10 +--------- .travis/build-deps.sh | 10 ++++++---- .travis/run-build-deps.sh | 10 ---------- 4 files changed, 17 insertions(+), 37 deletions(-) delete mode 100755 .travis/run-build-deps.sh diff --git a/.travis.yml b/.travis.yml index 057fbb91..9f9db954 100644 --- a/.travis.yml +++ b/.travis.yml @@ -1,5 +1,4 @@ -sudo: required -dist: xenial +dist: bionic os: linux @@ -10,9 +9,9 @@ env: - JOBS=3 - PREFIX="${HOME}/opt" - TAP_WINDOWS_VERSION=9.23.3 - - LZO_VERSION=2.11 - - PKCS11_HELPER_VERSION=1.25.1 - - MBEDTLS_VERSION=2.16.1 + - LZO_VERSION=2.10 + - PKCS11_HELPER_VERSION=1.26 + - MBEDTLS_VERSION=2.16.4 - MBEDTLS_CFLAGS="-I${PREFIX}/include" - MBEDTLS_LIBS="-L${PREFIX}/lib -lmbedtls -lmbedx509 -lmbedcrypto" - OPENSSL_VERSION=1.0.2u @@ -22,7 +21,7 @@ env: # via the "travis encrypt" command using the project repo's public key - secure: "l9mSnEW4LJqjxftH5i1NdDaYfGmQB1mPXnSB3DXnsjzkCWZ+yJLfBemfQ0tx/wS7chBYxqUaUIMT0hw4zJVp/LANFJo2vfh//ymTS6h0uApRY1ofg9Pp1BFcV1laG6/u8pwSZ2EBy/GhCd3DS436oE8sYBRaFM9FU62L/oeQBfJ7r4ID/0eB1b8bqlbD4paty9MHui2P8EZJwR+KAD84prtfpZOcrSMxPh9OUhJxzxUvvVoP4s4+lZ5Kgg1bBQ3yzKGDqe8VOgK2BWCEuezqhMMc8oeKmAe7CUkoz5gsGYH++k3I9XzP9Z4xeJKoQnC/82qi4xkJmlaOxdionej9bHIcjfRt7D8j1J0U+wOj4p8VrDy7yHaxuN2fi0K5MGa/CaXQSrkna8dePniCng+xQ2MY/zxuRX2gA6xPNLUyQLU9LqIug7wj4z84Hk9iWib4L20MoPjeEo+vAUNq8FtjOPxMuHNpv4iGGx6kgJm7RXl5vC5hxfK6MprrnYe2U5Mcd8jpzagKBaKHL3zV2FxX9k0jRO9Mccz7M2WnaV0MQ6zcngzTN4+s0kCjhfGKd2F2ANT2Gkhj3Me36eNHfuE0dBbvYCMh4b3Mgd7b/OuXwQWdJ8PjJ1WHXjSOw5sHw1suaV6cEO2Meyz5j1tOkyOi0M9QF+LFenQ9vLH4sBCww8U=" -matrix: +jobs: include: - env: - SSLLIB="openssl" @@ -39,12 +38,13 @@ matrix: compiler: gcc - env: SSLLIB="openssl" OPENSSL_VERSION="1.1.1d" os: linux + arch: amd64 compiler: gcc - env: SSLLIB="openssl" OPENSSL_VERSION="1.1.1d" os: linux arch: ppc64le compiler: gcc - - env: SSLLIB="openssl" OPENSSL_VERSION="1.1.1d" + - env: SSLLIB="openssl" OPENSSL_VERSION="1.1.1d" os: linux arch: arm64 compiler: gcc @@ -91,15 +91,11 @@ matrix: addons: apt: - sources: - - ubuntu-toolchain-r-test - - sourceline: 'deb https://apt.llvm.org/xenial/ llvm-toolchain-xenial-9 main' - key_url: 'https://apt.llvm.org/llvm-snapshot.gpg.key' update: true - packages: [ liblzo2-dev, libpam0g-dev, liblz4-dev, linux-libc-dev, man2html, mingw-w64, clang-9 ] + packages: [ liblzo2-dev, libpam0g-dev, liblz4-dev, linux-libc-dev, man2html, mingw-w64, clang-9, libcmocka-dev ] homebrew: update: true - packages: [ lzo ] + packages: [ lzo, lz4, cmocka ] cache: directories: @@ -109,7 +105,7 @@ cache: install: - if [ ! -z "${CHOST}" ]; then unset CC; fi - - .travis/run-build-deps.sh + - travis_wait 30 .travis/build-deps.sh > build-deps.log 2>&1 || (cat build-deps.log && exit 1) before_script: - .travis/coverity.sh diff --git a/.travis/build-check.sh b/.travis/build-check.sh index f794704c..4e1b7243 100755 --- a/.travis/build-check.sh +++ b/.travis/build-check.sh @@ -6,14 +6,6 @@ if [ "${TRAVIS_OS_NAME}" = "windows" ]; then MSBuild.exe openvpn.sln //p:Platform=x64 && exit 0 fi -if [ "${TRAVIS_OS_NAME}" = "linux" ]; then - export LD_LIBRARY_PATH="${PREFIX}/lib:${LD_LIBRARY_PATH:-}" -fi - -if [ "${TRAVIS_OS_NAME}" = "osx" ]; then - export DYLD_LIBRARY_PATH="${PREFIX}/lib:${DYLD_LIBRARY_PATH:-}" -fi - autoreconf -vi if [ -z ${CHOST+x} ]; then @@ -21,7 +13,7 @@ if [ -z ${CHOST+x} ]; then export EXTRA_CONFIG="${EXTRA_CONFIG:-} --enable-werror" fi ./configure --with-crypto-library="${SSLLIB}" ${EXTRA_CONFIG:-} || (cat config.log && exit 1) - make -j$JOBS + make LDFLAGS="-Wl,-rpath,${PREFIX}/lib" -j$JOBS src/openvpn/openvpn --version || true if [ "${TRAVIS_OS_NAME}" = "linux" ]; then ldd src/openvpn/openvpn; diff --git a/.travis/build-deps.sh b/.travis/build-deps.sh index 4c5cb05e..0c8d69b8 100755 --- a/.travis/build-deps.sh +++ b/.travis/build-deps.sh @@ -44,17 +44,19 @@ build_lzo () { } download_pkcs11_helper () { - if [ ! -f "pkcs11-helper-${PKCS11_HELPER_VERSION}.tar.bz2" ]; then + if [ ! -f "pkcs11-helper-${PKCS11_HELPER_VERSION}.tar.gz" ]; then wget -P download-cache/ \ - "https://github.com/OpenSC/pkcs11-helper/releases/download/pkcs11-helper-${PKCS11_HELPER_VERSION}/pkcs11-helper-${PKCS11_HELPER_VERSION}.tar.bz2" + "https://github.com/OpenSC/pkcs11-helper/archive/pkcs11-helper-${PKCS11_HELPER_VERSION}.tar.gz" fi } build_pkcs11_helper () { if [ "$(cat ${PREFIX}/.pkcs11_helper-version)" != "${PKCS11_HELPER_VERSION}" ]; then - tar jxf download-cache/pkcs11-helper-${PKCS11_HELPER_VERSION}.tar.bz2 + tar xf download-cache/pkcs11-helper-${PKCS11_HELPER_VERSION}.tar.gz ( - cd "pkcs11-helper-${PKCS11_HELPER_VERSION}" + cd "pkcs11-helper-pkcs11-helper-${PKCS11_HELPER_VERSION}" + + autoreconf -iv ./configure --host=${CHOST} --program-prefix='' --libdir=${PREFIX}/lib \ --prefix=${PREFIX} --build=x86_64-pc-linux-gnu \ diff --git a/.travis/run-build-deps.sh b/.travis/run-build-deps.sh deleted file mode 100755 index b8eb41c5..00000000 --- a/.travis/run-build-deps.sh +++ /dev/null @@ -1,10 +0,0 @@ -#!/bin/sh -set -eux - -if [ "${TRAVIS_OS_NAME}" = "windows" ]; then - # for windows we need to print output since openssl build - # might take more than 10 minutes, which causes build abort - .travis/build-deps.sh -else - .travis/build-deps.sh > build-deps.log 2>&1 || (cat build-deps.log && exit 1) -fi