From e10983ec6ff89032dba374d43d9e66b221f322e0 Mon Sep 17 00:00:00 2001
From: Ilya Shipitsin <chipitsine@gmail.com>
Date: Wed, 17 Jul 2019 11:58:30 +0500
Subject: [PATCH 1/2] enable sonar-scan in travis-ci builds

---
 .ci/sonarcloud.sh | 12 ++++++++++++
 .travis.yml       |  7 ++++++-
 2 files changed, 18 insertions(+), 1 deletion(-)
 create mode 100755 .ci/sonarcloud.sh

diff --git a/.ci/sonarcloud.sh b/.ci/sonarcloud.sh
new file mode 100755
index 00000000..fe4c673b
--- /dev/null
+++ b/.ci/sonarcloud.sh
@@ -0,0 +1,12 @@
+#!/bin/sh
+set -eu
+
+RUN_SONARCLOUD="${RUN_SONARCLOUD:-0}"
+
+if [ "${RUN_SONARCLOUD}" = "1" ] && [ ! -z ${SONAR_TOKEN+x} ]; then
+   ./configure
+   build-wrapper-linux-x86-64 --out-dir bw-output make -C tmp
+   sonar-scanner -Dsonar.projectKey=SoftEtherVPN_SoftEtherVPN -Dsonar.organization=softethervpn -Dsonar.sources=. -Dsonar.cfamily.build-wrapper-output=bw-output -Dsonar.host.url=https://sonarcloud.io -Dsonar.login=${SONAR_TOKEN}
+else
+    echo "Skipping sonar-scan because \$RUN_SONARCLOUD != \"1\" or \$SONAR_TOKEN is not set"
+fi
diff --git a/.travis.yml b/.travis.yml
index 63b8536a..b281339e 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -7,12 +7,16 @@ env:
   global:
     - OPENSSL_INSTALL_DIR="${HOME}/opt"
 
+addons:
+  sonarcloud:
+    organization: "softethervpn"
+
 matrix:
   include:
     - env: OPENSSL_VERSION="1.0.2o" BUILD_DEB="1"
       os: linux
       compiler: gcc
-    - env: OPENSSL_VERSION="1.1.0f"
+    - env: RUN_SONARCLOUD=1 OPENSSL_VERSION="1.1.0f"
       os: linux
       compiler: gcc
     - env: OPENSSL_VERSION="1.1.0f" LABEL="linux-ppc64le" CMAKE_VERSION="3.9.6"
@@ -70,6 +74,7 @@ script:
   - export LDFLAGS="-L${HOME}/opt/lib"
   - echo "check_certificate = off" > ~/.wgetrc
   - .ci/coverity.sh
+  - .ci/sonarcloud.sh
   - ./configure
   - make -j $(nproc || sysctl -n hw.ncpu || echo 4) -C tmp
   - ldd build/vpnserver

From 06fc93e08ea8dd48f87edc4e662fcf842ee12327 Mon Sep 17 00:00:00 2001
From: Ilya Shipitsin <chipitsine@gmail.com>
Date: Wed, 17 Jul 2019 12:05:51 +0500
Subject: [PATCH 2/2] travis-ci: update openssl, libressl

---
 .travis.yml | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

diff --git a/.travis.yml b/.travis.yml
index b281339e..5f72094c 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -13,13 +13,13 @@ addons:
 
 matrix:
   include:
-    - env: OPENSSL_VERSION="1.0.2o" BUILD_DEB="1"
+    - env: OPENSSL_VERSION="1.0.2s" BUILD_DEB="1"
       os: linux
       compiler: gcc
-    - env: RUN_SONARCLOUD=1 OPENSSL_VERSION="1.1.0f"
+    - env: RUN_SONARCLOUD=1 OPENSSL_VERSION="1.1.1c"
       os: linux
       compiler: gcc
-    - env: OPENSSL_VERSION="1.1.0f" LABEL="linux-ppc64le" CMAKE_VERSION="3.9.6"
+    - env: OPENSSL_VERSION="1.1.1c" LABEL="linux-ppc64le" CMAKE_VERSION="3.9.6"
       os: linux-ppc64le
       compiler: gcc
       install:
@@ -28,13 +28,13 @@ matrix:
         - ./bootstrap > build-deps.log 2>&1 || (cat build-deps.log && exit 1)
         - sudo make install > build-deps.log 2>&1 || (cat build-deps.log && exit 1)
         - cd ..
-    - env: OPENSSL_VERSION="1.0.2o" RUN_COVERITY="1"
+    - env: OPENSSL_VERSION="1.0.2s" RUN_COVERITY="1"
       os: linux
       compiler: clang
-    - env: OPENSSL_VERSION="1.1.0f"
+    - env: OPENSSL_VERSION="1.1.1c"
       os: linux
       compiler: clang
-    - env: LIBRESSL_VERSION="2.8.2"
+    - env: LIBRESSL_VERSION="2.9.2"
       os: linux
       compiler: gcc
       before_install: