openvpn: update to 2.3.11

3 files changed, 3 insertions, 79 deletions

diff --git a/package/openvpn/Makefile b/package/openvpn/Makefile
index 88e1f9f6b..efa5a82b3 100644
--- a/package/openvpn/Makefile
+++ b/package/openvpn/Makefile
@@ -4,9 +4,9 @@
 include $(ADK_TOPDIR)/rules.mk
 
 PKG_NAME:=		openvpn
-PKG_VERSION:=		2.3.10
-PKG_RELEASE:=		2
-PKG_HASH:=		c54dbf91d47b9533fac3b94d2b5719bdbe0d081fe8245184f91ef8a871d22003
+PKG_VERSION:=		2.3.11
+PKG_RELEASE:=		1
+PKG_HASH:=		0f5f1ca1dc5743fa166d93dd4ec952f014b5f33bafd88f0ea34b455cae1434a7
 PKG_DESCR:=		vpn solution using ssl/tls
 PKG_KDEPENDS:=		tun
 PKG_SECTION:=		net/security
diff --git a/package/openvpn/patches/patch-src_openvpn_ssl_openssl_c b/package/openvpn/patches/patch-src_openvpn_ssl_openssl_c
deleted file mode 100644
index a0b61813c..000000000
--- a/package/openvpn/patches/patch-src_openvpn_ssl_openssl_c
+++ /dev/null
@@ -1,20 +0,0 @@
---- openvpn-2.3.10.orig/src/openvpn/ssl_openssl.c	2016-01-04 13:17:32.000000000 +0100
-+++ openvpn-2.3.10/src/openvpn/ssl_openssl.c	2016-02-07 15:42:02.000000000 +0100
-@@ -342,7 +342,7 @@ tls_ctx_check_cert_time (const struct tl
- 
-   ASSERT (ctx);
- 
--#if OPENSSL_VERSION_NUMBER >= 0x10002000L
-+#if OPENSSL_VERSION_NUMBER >= 0x10002000L && !defined(LIBRESSL_VERSION_NUMBER)
-   /* OpenSSL 1.0.2 and up */
-   cert = SSL_CTX_get0_certificate (ctx->ctx);
- #else
-@@ -377,7 +377,7 @@ tls_ctx_check_cert_time (const struct tl
-     }
- 
- cleanup:
--#if OPENSSL_VERSION_NUMBER < 0x10002000L
-+#if OPENSSL_VERSION_NUMBER < 0x10002000L || defined(LIBRESSL_VERSION_NUMBER)
-   SSL_free (ssl);
- #endif
-   return;
diff --git a/package/openvpn/patches/patch-tests_t_client_sh b/package/openvpn/patches/patch-tests_t_client_sh
deleted file mode 100644
index 03d86fc6a..000000000
--- a/package/openvpn/patches/patch-tests_t_client_sh
+++ /dev/null
@@ -1,56 +0,0 @@
---- openvpn-2.3.10.orig/tests/t_client.sh	2016-01-04 13:18:21.000000000 +0100
-+++ openvpn-2.3.10/tests/t_client.sh	2016-02-07 15:19:08.000000000 +0100
-@@ -1,4 +1,4 @@
--#!/bin/sh
-+#!/bin/bash
- #
- # run OpenVPN client against ``test reference'' server
- # - check that ping, http, ... via tunnel works
-@@ -86,12 +86,12 @@ fail()
- get_ifconfig_route()
- {
-     # linux / iproute2? (-> if configure got a path)
--    if [ -n "/usr/sbin/ip" ]
-+    if [ -n "/bin/ip" ]
-     then
- 	echo "-- linux iproute2 --"
--	/usr/sbin/ip addr show     | grep -v valid_lft
--	/usr/sbin/ip route show
--	/usr/sbin/ip -o -6 route show | grep -v ' cache' | sed -E -e 's/ expires [0-9]*sec//' -e 's/ (mtu|hoplimit|cwnd|ssthresh) [0-9]+//g' -e 's/ (rtt|rttvar) [0-9]+ms//g'
-+	/bin/ip addr show     | grep -v valid_lft
-+	/bin/ip route show
-+	/bin/ip -o -6 route show | grep -v ' cache' | sed -E -e 's/ expires [0-9]*sec//' -e 's/ (mtu|hoplimit|cwnd|ssthresh) [0-9]+//g' -e 's/ (rtt|rttvar) [0-9]+ms//g'
- 	return
-     fi
- 
-@@ -99,26 +99,26 @@ get_ifconfig_route()
-     case `uname -s` in
- 	Linux)
- 	   echo "-- linux / ifconfig --"
--	   LANG=C /usr/sbin/ifconfig -a |egrep  "( addr:|encap:)"
-+	   LANG=C /sbin/ifconfig -a |egrep  "( addr:|encap:)"
- 	   LANG=C netstat -rn -4 -6
- 	   return
- 	   ;;
- 	FreeBSD|NetBSD|Darwin)
- 	   echo "-- FreeBSD/NetBSD/Darwin [MacOS X] --"
--	   /usr/sbin/ifconfig -a | egrep "(flags=|inet)"
-+	   /sbin/ifconfig -a | egrep "(flags=|inet)"
- 	   netstat -rn | awk '$3 !~ /^UHL/ { print $1,$2,$3,$NF }'
- 	   return
- 	   ;;
- 	OpenBSD)
- 	   echo "-- OpenBSD --"
--	   /usr/sbin/ifconfig -a | egrep "(flags=|inet)" | \
-+	   /sbin/ifconfig -a | egrep "(flags=|inet)" | \
- 		sed -e 's/pltime [0-9]*//' -e 's/vltime [0-9]*//'
- 	   netstat -rn | awk '$3 !~ /^UHL/ { print $1,$2,$3,$NF }'
- 	   return
- 	   ;;
- 	SunOS)
- 	   echo "-- Solaris --"
--	   /usr/sbin/ifconfig -a | egrep "(flags=|inet)"
-+	   /sbin/ifconfig -a | egrep "(flags=|inet)"
- 	   netstat -rn | awk '$3 !~ /^UHL/ { print $1,$2,$3,$6 }'
- 	   return
- 	   ;;