update to openvpn-2.3.11

This commit is contained in:
sthen 2016-05-14 13:14:46 +00:00
parent 1436dd274d
commit 402475cd62
6 changed files with 16 additions and 38 deletions

View File

@ -1,9 +1,8 @@
# $OpenBSD: Makefile,v 1.64 2016/04/25 18:21:09 sthen Exp $
# $OpenBSD: Makefile,v 1.65 2016/05/14 13:14:46 sthen Exp $
COMMENT= easy-to-use, robust, and highly configurable VPN
DISTNAME= openvpn-2.3.10
REVISION= 1
DISTNAME= openvpn-2.3.11
CATEGORIES= net security
HOMEPAGE= http://openvpn.net/

View File

@ -1,2 +1,2 @@
SHA256 (openvpn-2.3.10.tar.gz) = +LC1uS41u8odsafmtJ4EY55FY06azNRgRZtAssmeyPY=
SIZE (openvpn-2.3.10.tar.gz) = 1225636
SHA256 (openvpn-2.3.11.tar.gz) = kRekQ0/TXmHPlPnufvhLeuy8b6VW93n/WZVg8hl1YWM=
SIZE (openvpn-2.3.11.tar.gz) = 1242816

View File

@ -1,7 +1,7 @@
$OpenBSD: patch-Makefile_in,v 1.4 2015/06/25 08:46:49 sthen Exp $
--- Makefile.in.orig Mon Jun 8 07:19:09 2015
+++ Makefile.in Thu Jun 25 09:38:54 2015
@@ -455,8 +455,7 @@ EXTRA_DIST = \
$OpenBSD: patch-Makefile_in,v 1.5 2016/05/14 13:14:46 sthen Exp $
--- Makefile.in.orig Tue May 10 07:02:54 2016
+++ Makefile.in Sat May 14 13:45:56 2016
@@ -467,8 +467,7 @@ EXTRA_DIST = \
@GIT_CHECKOUT_TRUE@ config-version.h
SUBDIRS = build distro include src sample doc tests

View File

@ -1,7 +1,7 @@
$OpenBSD: patch-configure,v 1.11 2016/01/06 11:03:21 sthen Exp $
--- configure.orig Mon Jan 4 12:18:08 2016
+++ configure Wed Jan 6 10:21:16 2016
@@ -17062,7 +17062,7 @@ fi
$OpenBSD: patch-configure,v 1.12 2016/05/14 13:14:46 sthen Exp $
--- configure.orig Tue May 10 07:02:53 2016
+++ configure Sat May 14 13:45:56 2016
@@ -17544,7 +17544,7 @@ fi
plugindir="${with_plugindir}"

View File

@ -1,7 +1,7 @@
$OpenBSD: patch-include_Makefile_in,v 1.4 2015/06/25 08:46:49 sthen Exp $
--- include/Makefile.in.orig Mon Jun 8 07:19:09 2015
+++ include/Makefile.in Thu Jun 25 09:38:54 2015
@@ -310,7 +310,7 @@ host_cpu = @host_cpu@
$OpenBSD: patch-include_Makefile_in,v 1.5 2016/05/14 13:14:46 sthen Exp $
--- include/Makefile.in.orig Tue May 10 07:02:54 2016
+++ include/Makefile.in Sat May 14 13:45:56 2016
@@ -322,7 +322,7 @@ host_cpu = @host_cpu@
host_os = @host_os@
host_vendor = @host_vendor@
htmldir = @htmldir@

View File

@ -1,21 +0,0 @@
$OpenBSD: patch-src_openvpn_ssl_openssl_c,v 1.1 2016/01/06 11:03:21 sthen Exp $
--- src/openvpn/ssl_openssl.c.orig Wed Jan 6 10:58:58 2016
+++ src/openvpn/ssl_openssl.c Wed Jan 6 10:59:51 2016
@@ -342,7 +342,7 @@ tls_ctx_check_cert_time (const struct tls_root_ctx *ct
ASSERT (ctx);
-#if OPENSSL_VERSION_NUMBER >= 0x10002000L
+#if OPENSSL_VERSION_NUMBER >= 0x10002000L && !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 tls_root_ctx *ct
}
cleanup:
-#if OPENSSL_VERSION_NUMBER < 0x10002000L
+#if OPENSSL_VERSION_NUMBER < 0x10002000L || LIBRESSL_VERSION_NUMBER
SSL_free (ssl);
#endif
return;