From 867ad9fde2dfa82b478b3ba2070b982b17b28c91 Mon Sep 17 00:00:00 2001
From: "Kali Kaneko (leap communications)" <kali@leap.se>
Date: Thu, 22 Jun 2017 17:18:59 +0200
Subject: [pkg] build openvpn 2.4.3

- Resolves: #8946
---
 pkg/thirdparty/openvpn/build.mk         |  3 +--
 pkg/thirdparty/openvpn/build_openvpn.sh | 19 ++++++++++---------
 2 files changed, 11 insertions(+), 11 deletions(-)

diff --git a/pkg/thirdparty/openvpn/build.mk b/pkg/thirdparty/openvpn/build.mk
index dadc0bad..df87eb28 100644
--- a/pkg/thirdparty/openvpn/build.mk
+++ b/pkg/thirdparty/openvpn/build.mk
@@ -1,9 +1,8 @@
 build_static_openvpn:
 	pkg/thirdparty/openvpn/build_openvpn.sh
-	strip ~/openvpn_build/openvpn/install/sbin/openvpn
 
 upload_openvpn:
-	rsync --rsh='ssh' -avztlpog --progress --partial ~/openvpn_build/openvpn/install/sbin/openvpn downloads.leap.se:./public/thirdparty/linux/openvpn/
+	rsync --rsh='ssh' -avztlpog --progress --partial ~/openvpn_build/sbin/openvpn* downloads.leap.se:./public/thirdparty/linux/openvpn/
 
 download_openvpn:
 	wget https://downloads.leap.se/thirdparty/linux/openvpn/openvpn
diff --git a/pkg/thirdparty/openvpn/build_openvpn.sh b/pkg/thirdparty/openvpn/build_openvpn.sh
index 121674f6..b62ebadf 100755
--- a/pkg/thirdparty/openvpn/build_openvpn.sh
+++ b/pkg/thirdparty/openvpn/build_openvpn.sh
@@ -25,8 +25,8 @@ mkdir -p $SRC
 
 LZO="lzo-2.10"
 ZLIB="zlib-1.2.11"
-MBEDTLS="mbedtls-2.4.2"
-OPENVPN="openvpn-2.4.2"
+MBEDTLS="mbedtls-2.5.1"
+OPENVPN="openvpn-2.4.3"
 
 WGET="wget --prefer-family=IPv4"
 DEST=$BASE/install
@@ -37,8 +37,6 @@ CXXFLAGS=$CFLAGS
 CONFIGURE="./configure --prefix=/install"
 MAKE="make -j2"
 
-echo "DEST" $DEST
-
 
 ######## ####################################################################
 # ZLIB # ####################################################################
@@ -122,7 +120,7 @@ function build_openvpn()
 	cd $OPENVPN
 
 	MBEDTLS_CFLAGS=-I$BASE/install/usr/local/include/ \
-    MBEDTLS_LIBS="$DEST/usr/local/lib/libmbedtls.a $DEST/usr/local/lib/libmbedcrypto.a $DEST/usr/local/lib/libmbedx509.a" \
+	MBEDTLS_LIBS="$DEST/usr/local/lib/libmbedtls.a $DEST/usr/local/lib/libmbedcrypto.a $DEST/usr/local/lib/libmbedx509.a" \
 	LDFLAGS=$LDFLAGS \
 	CPPFLAGS=$CPPFLAGS \
 	CFLAGS="$CFLAGS -I$BASE/install/usr/local/include" \
@@ -135,14 +133,17 @@ function build_openvpn()
 
 	$MAKE LIBS="-all-static -lz -llzo2"
 	make install DESTDIR=$BASE/openvpn
+	mkdir $BASE/sbin/
+	cp $BASE/openvpn/install/sbin/openvpn $BASE/sbin/$OPENVPN
+	strip $BASE/sbin/$OPENVPN
 }
 
 function build_all()
 {
-      build_zlib
-	  build_lzo2
-	  build_mbedtls
-	  build_openvpn
+	build_zlib
+	build_lzo2
+	build_mbedtls
+	build_openvpn
 }
 
 function main()
-- 
cgit v1.2.3