Merge pull request #3434 from ebfe/openvpn

openvpn: update to 2.3.10.
This commit is contained in:
Juan RP 2016-01-23 07:22:55 +01:00
commit 918b919d13
2 changed files with 42 additions and 3 deletions

View file

@ -0,0 +1,39 @@
From 9dfc2309c6b4143892137844197f5f84755f6580 Mon Sep 17 00:00:00 2001
From: Niels Ole Salscheider <niels_ole@salscheider-online.de>
Date: Sun, 10 Jan 2016 14:44:35 +0100
Subject: [PATCH] Fix build with libressl
Signed-off-by: Niels Ole Salscheider <niels_ole@salscheider-online.de>
Acked-by: Steffan Karger <steffan.karger@fox-it.com>
Message-Id: <1452433475-16779-1-git-send-email-niels_ole@salscheider-online.de>
URL: http://article.gmane.org/gmane.network.openvpn.devel/10975
Signed-off-by: Gert Doering <gert@greenie.muc.de>
---
src/openvpn/ssl_openssl.c | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git src/openvpn/ssl_openssl.c src/openvpn/ssl_openssl.c
index d2f40e7..e390f4d 100644
--- src/openvpn/ssl_openssl.c
+++ src/openvpn/ssl_openssl.c
@@ -358,7 +358,7 @@ tls_ctx_check_cert_time (const struct tls_root_ctx *ctx)
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
@@ -393,7 +393,7 @@ tls_ctx_check_cert_time (const struct tls_root_ctx *ctx)
}
cleanup:
-#if OPENSSL_VERSION_NUMBER < 0x10002000L
+#if OPENSSL_VERSION_NUMBER < 0x10002000L || defined(LIBRESSL_VERSION_NUMBER)
SSL_free (ssl);
#endif
return;
--
2.7.0

View file

@ -1,18 +1,18 @@
# Template file for 'openvpn' # Template file for 'openvpn'
pkgname=openvpn pkgname=openvpn
version=2.3.9 version=2.3.10
revision=1 revision=1
build_style=gnu-configure build_style=gnu-configure
configure_args="--enable-iproute2 --disable-systemd" configure_args="--enable-iproute2 --disable-systemd"
hostmakedepends="iproute2" hostmakedepends="iproute2"
makedepends="libressl-devel lzo-devel pam-devel" makedepends="libressl-devel lzo-devel pam-devel"
depends="iproute2" depends="iproute2"
short_desc="An easy-to-use, robust, and highly configurable VPN (Virtual Private Network)" short_desc="An easy-to-use, robust, and highly configurable VPN"
maintainer="Juan RP <xtraeme@voidlinux.eu>" maintainer="Juan RP <xtraeme@voidlinux.eu>"
license="GPL-2" license="GPL-2"
homepage="http://www.openvpn.net" homepage="http://www.openvpn.net"
distfiles="http://swupdate.openvpn.org/community/releases/${pkgname}-${version}.tar.gz" distfiles="http://swupdate.openvpn.org/community/releases/${pkgname}-${version}.tar.gz"
checksum=2c12fe9ea641ac1291e70322cc500641c84e5903dd4f40bf2eda7e9f209b2f9c checksum=f8b0b5b92e35bbca1db1a7e6b49e04639e45634e9accd460459b40b2c99ec8f6
post_install() { post_install() {
vmkdir usr/share/examples/${pkgname} vmkdir usr/share/examples/${pkgname}