From patchwork Sun Mar 22 01:29:41 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Ilya Shipitsin X-Patchwork-Id: 1046 Return-Path: Delivered-To: patchwork@openvpn.net Delivered-To: patchwork@openvpn.net Received: from director12.mail.ord1d.rsapps.net ([172.27.255.52]) by backend30.mail.ord1d.rsapps.net with LMTP id SJHoEGJdd16dGgAAIUCqbw for ; Sun, 22 Mar 2020 08:43:14 -0400 Received: from proxy10.mail.iad3a.rsapps.net ([172.27.255.52]) by director12.mail.ord1d.rsapps.net with LMTP id cBtSDmJdd168fAAAIasKDg ; Sun, 22 Mar 2020 08:43:14 -0400 Received: from smtp16.gate.iad3a ([172.27.255.52]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) by proxy10.mail.iad3a.rsapps.net with LMTP id 8BGCCGJdd15KTQAAnQ/bqA ; Sun, 22 Mar 2020 08:43:14 -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: smtp16.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: b12914b0-6c3a-11ea-85f4-5254004ee196-1-1 Received: from [216.105.38.7] ([216.105.38.7:34334] helo=lists.sourceforge.net) by smtp16.gate.iad3a.rsapps.net (envelope-from ) (ecelerity 4.2.38.62370 r(:)) with ESMTPS (cipher=DHE-RSA-AES256-GCM-SHA384) id 8D/C0-28913-06D577E5; Sun, 22 Mar 2020 08:43:13 -0400 Received: from [127.0.0.1] (helo=sfs-ml-1.v29.lw.sourceforge.com) by sfs-ml-1.v29.lw.sourceforge.com with esmtp (Exim 4.90_1) (envelope-from ) id 1jFzw1-0003Sf-46; Sun, 22 Mar 2020 12:42:33 +0000 Received: from [172.30.20.202] (helo=mx.sourceforge.net) by sfs-ml-1.v29.lw.sourceforge.com with esmtps (TLSv1.2:ECDHE-RSA-AES256-GCM-SHA384:256) (Exim 4.90_1) (envelope-from ) id 1jFzw0-0003SN-5M for openvpn-devel@lists.sourceforge.net; Sun, 22 Mar 2020 12:42:32 +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=XQcyVH2jIvvbHgYMW9JbzCuBdAt/ANamhSdAjJAgQiM=; b=Kg2HVG+qI0lETxy+0QCAqRvvet r0Qsjz18N0RSTYGNtdtAnxSZDlbzUj4dVQM8ZYTvCUtWJi+1SqE3nfmq+p6RFTar8NEPh+MjYEcjb AgrqGP/Etjh6TCdj0N/M9UHlZ6Ha/D+aKzp1rrDv3wuzthpURe4i8wCKuhHg0R3mMBTQ=; 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=XQcyVH2jIvvbHgYMW9JbzCuBdAt/ANamhSdAjJAgQiM=; b=J xBvJFGze1/a3rGR+GnJGqEZ23epsStwEVPhlcUi4yxsx15IAI+mW3gHtQ9nk905H7fP6GpRrAQoiX I/iHjSw0b3NDnn2+a09L7cVxVfZMN6LPo+mu5ccqqMV+lt7AvcsPt6v1OF304XiKLXzCdNUejinGP bVKg7P0g/VqyuYyg=; Received: from mail-ed1-f66.google.com ([209.85.208.66]) by sfi-mx-3.v28.lw.sourceforge.com with esmtps (TLSv1.2:ECDHE-RSA-AES128-GCM-SHA256:128) (Exim 4.92.2) id 1jFzvy-00HMxr-9B for openvpn-devel@lists.sourceforge.net; Sun, 22 Mar 2020 12:42:32 +0000 Received: by mail-ed1-f66.google.com with SMTP id z65so13095966ede.0 for ; Sun, 22 Mar 2020 05:42:30 -0700 (PDT) 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=XQcyVH2jIvvbHgYMW9JbzCuBdAt/ANamhSdAjJAgQiM=; b=B1vAgLuCu2gQmy51CZROAdwxek1CIRx698pngT63G02rQZAnAwzGI/yPEsJB7YiBb2 vrA4bNgCBHuH8kcw3sRrabO6exutIIFbLYBo0xWmuyO2YJaW6JlDlgV83+BuFRi70LME 9YOx0fY/WlA3J0yE66/EQXuJrqYCIx6bFfeXIqExT1BqBTSBIw6xYLDiCDQGl8/frRp/ 81yV9Bk4il63PHEc5SW0AYLyz21l5OAVqvXJhfGJadrPru3Q6V1128L88zYtDh0g7UFO hEhgkVIQd925DKjXLXmqhSkIXsoCxk+lUnuND13l3FrrlplPS+vHrYssdxemDFHJsKyK XAQQ== 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=XQcyVH2jIvvbHgYMW9JbzCuBdAt/ANamhSdAjJAgQiM=; b=PTjwGEkNoV44RNhckCKFtR98dr10HTsjBqqEy1aErVhe62yr+jev0famaHcSgYFokE 0LRHF11PgyHTsMebaXjzZB2mp8Et1ICfmog93v8VkpC67fdyTSCRR1e3FMdP0avrHdA8 dKW/eNeAwBc99GhPtr7NikebKaPiqdw8o5Ol+pqGLQyjKgjd2+1DWKmcm6+h5NjI+DLv m+Uk/GG6u1CDVwnvzDliZX5k0sCOJq6jvO3qZojVbtkERLCdAvDWW0lrQqLIpy7vFK9O kr+Bc6062EAa3B0AMgG3AFf0Rr5IS8Oc08BiL0WxEWIsmvbrnTCJgSry6YqgETFQWIG4 CwCw== X-Gm-Message-State: ANhLgQ28SP7fKktd6fkNK7QNJF9F04pj5gqWkO/3yTSEmDS00CA7f1Th TQn1LwC6lrfzhYGfTZ4+3yXH5Cle X-Google-Smtp-Source: ADFU+vuyxeALLSiGiYswRiYK4SzFzivPQioEKQewHrW4ghMHJOPlxLKVtCmADlpnKIvRXLbeNUqNEw== X-Received: by 2002:ac2:5933:: with SMTP id v19mr9254035lfi.64.1584880185902; Sun, 22 Mar 2020 05:29:45 -0700 (PDT) Received: from localhost.localdomain ([195.64.208.237]) by smtp.gmail.com with ESMTPSA id w29sm481219lfq.27.2020.03.22.05.29.44 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sun, 22 Mar 2020 05:29:45 -0700 (PDT) From: chipitsine@gmail.com To: openvpn-devel@lists.sourceforge.net Date: Sun, 22 Mar 2020 17:29:41 +0500 Message-Id: <20200322122941.17556-1-chipitsine@gmail.com> X-Mailer: git-send-email 2.25.1 MIME-Version: 1.0 X-Spam-Report: Spam Filtering performed by mx.sourceforge.net. See http://spamassassin.org/tag/ for more details. 1.5 RCVD_IN_SORBS_WEB RBL: SORBS: sender is an abusable web server [195.64.208.237 listed in dnsbl.sorbs.net] 0.0 FREEMAIL_FROM Sender email is commonly abused enduser mail provider (chipitsine[at]gmail.com) -0.0 RCVD_IN_DNSWL_NONE RBL: Sender listed at https://www.dnswl.org/, no trust [209.85.208.66 listed in list.dnswl.org] -0.0 RCVD_IN_MSPIKE_H2 RBL: Average reputation (+2) [209.85.208.66 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: 1jFzvy-00HMxr-9B Subject: [Openvpn-devel] [PATCH v2] 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. travis-ci images were upgraded to bionic. "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. cmocka was added to linux and osx builds. --- v2 resolved travis_wait output redirection issue, now it works as expected. I had to specify "names" for jobs, without names travis puts secure variable as job name .travis.yml | 87 +++++++++++++++++++++++++-------------- .travis/build-check.sh | 10 +---- .travis/build-deps.sh | 10 +++-- .travis/run-build-deps.sh | 10 ----- 4 files changed, 62 insertions(+), 55 deletions(-) delete mode 100755 .travis/run-build-deps.sh diff --git a/.travis.yml b/.travis.yml index 40296d87..925d09ea 100644 --- a/.travis.yml +++ b/.travis.yml @@ -1,5 +1,4 @@ -sudo: required -dist: xenial +dist: bionic os: linux @@ -11,86 +10,111 @@ env: - PREFIX="${HOME}/opt" - TAP_WINDOWS_VERSION=9.23.3 - LZO_VERSION=2.10 - - PKCS11_HELPER_VERSION=1.25.1 - - MBEDTLS_VERSION=2.16.1 + - 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.2s + - OPENSSL_VERSION=1.0.2u - OPENSSL_CFLAGS="-I${PREFIX}/include" - OPENSSL_LIBS="-L${PREFIX}/lib -lssl -lcrypto" # The next declaration is the encrypted COVERITY_SCAN_TOKEN, created # 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: + - name: cl + env: - SSLLIB="openssl" - OPENSSL_VERSION="1.1.1d" - P7Z="c:\Program Files\7-Zip\7z.exe" - CC="cl" os: windows compiler: cl - - env: SSLLIB="openssl" RUN_COVERITY="1" + - name: Coverity scan + env: SSLLIB="openssl" RUN_COVERITY="1" os: linux compiler: gcc - - env: SSLLIB="openssl" OPENSSL_VERSION="1.0.1u" + - name: gcc | openssl-1.0.1u + env: SSLLIB="openssl" OPENSSL_VERSION="1.0.1u" os: linux compiler: gcc - - env: SSLLIB="openssl" OPENSSL_VERSION="1.1.1c" + - name: gcc | openssl-1.1.1d + env: SSLLIB="openssl" OPENSSL_VERSION="1.1.1d" os: linux + arch: amd64 compiler: gcc - - env: SSLLIB="openssl" OPENSSL_VERSION="1.1.1c" LABEL="linux-ppc64le" - os: linux-ppc64le + - name: gcc | openssl-1.1.1d + env: SSLLIB="openssl" OPENSSL_VERSION="1.1.1d" + os: linux + arch: ppc64le + compiler: gcc + - name: gcc | openssl-1.1.1d + env: SSLLIB="openssl" OPENSSL_VERSION="1.1.1d" + os: linux + arch: arm64 + compiler: gcc + - name: gcc | openssl-1.1.1d + env: SSLLIB="openssl" OPENSSL_VERSION="1.1.1d" + os: linux + arch: s390x compiler: gcc - - env: SSLLIB="openssl" EXTRA_CONFIG="--enable-iproute2" + - name: gcc | openssl-1.0.2u | iproute2 + env: SSLLIB="openssl" EXTRA_CONFIG="--enable-iproute2" os: linux compiler: gcc - - env: SSLLIB="openssl" CFLAGS="-fsanitize=address" CC=clang-9 + - name: clang+asan | openssl-1.0.2u + env: SSLLIB="openssl" CFLAGS="-fsanitize=address" CC=clang-9 os: linux compiler: clang - - env: SSLLIB="openssl" OPENSSL_VERSION="1.1.1c" CC=clang-9 + - name: clang | openssl-1.1.1d + env: SSLLIB="openssl" OPENSSL_VERSION="1.1.1d" CC=clang-9 os: linux compiler: clang - - env: SSLLIB="mbedtls" + - name: gcc | mbedtls + env: SSLLIB="mbedtls" os: linux compiler: gcc - - env: SSLLIB="mbedtls" CFLAGS="-fsanitize=address" CC=clang-9 + - name: clang+asan | mbedtls + env: SSLLIB="mbedtls" CFLAGS="-fsanitize=address" CC=clang-9 os: linux compiler: clang - - env: SSLLIB="openssl" + - name: clang | openssl-1.0.2u + env: SSLLIB="openssl" os: osx compiler: clang - - env: SSLLIB="mbedtls" + - name: clang | mbedtls + env: SSLLIB="mbedtls" os: osx compiler: clang - - env: SSLLIB="openssl" CHOST=x86_64-w64-mingw32 OPENSSL_VERSION="1.0.1u" + - name: mingw64 | openssl-1.0.1u + env: SSLLIB="openssl" CHOST=x86_64-w64-mingw32 OPENSSL_VERSION="1.0.1u" os: linux compiler: ": Win64 build only" - - env: SSLLIB="openssl" CHOST=x86_64-w64-mingw32 OPENSSL_VERSION="1.1.1c" + - name: mingw64 | openssl-1.1.1d + env: SSLLIB="openssl" CHOST=x86_64-w64-mingw32 OPENSSL_VERSION="1.1.1d" os: linux compiler: ": Win64 build only" - - env: SSLLIB="openssl" CHOST=i686-w64-mingw32 + - name: mingw32 | openssl-1.0.2u + env: SSLLIB="openssl" CHOST=i686-w64-mingw32 os: linux compiler: ": Win32 build only" - - env: SSLLIB="openssl" EXTRA_CONFIG="--disable-lzo" EXTRA_SCRIPT="make distcheck" CC=clang-9 + - name: clang | openssl-1.0.2u | disable-lzo | distcheck + env: SSLLIB="openssl" EXTRA_CONFIG="--disable-lzo" EXTRA_SCRIPT="make distcheck" CC=clang-9 os: linux compiler: clang - - env: SSLLIB="openssl" EXTRA_CONFIG="--enable-small" CC=clang-9 + - name: clang | openssl-1.0.2u | enable-small + env: SSLLIB="openssl" EXTRA_CONFIG="--enable-small" CC=clang-9 os: linux compiler: clang 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 ] + 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: @@ -99,9 +123,8 @@ cache: - ${HOME}/Library/Caches/Homebrew install: - - if [ "$TRAVIS_OS_NAME" = "linux" ] && [ "$TRAVIS_CPU_ARCH" != "ppc64le" ]; then sudo apt-get install clang-9; fi - if [ ! -z "${CHOST}" ]; then unset CC; fi - - .travis/run-build-deps.sh + - travis_wait 30 bash -c '.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