aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorSören Tempel <soeren+git@soeren-tempel.net>2018-03-20 11:27:04 +0100
committerSören Tempel <soeren+git@soeren-tempel.net>2018-03-20 11:32:28 +0100
commit27b284e2f02065457a6a902ee8cafe7c924cea72 (patch)
tree4198221a3b0476aa65bab00f5ef285bb34a62e6b
parent768de4d843729c7dcc23cbd97f8eb091d012dd71 (diff)
downloadaports-27b284e2f02065457a6a902ee8cafe7c924cea72.tar.bz2
aports-27b284e2f02065457a6a902ee8cafe7c924cea72.tar.xz
main/opnenvpn: upgrade to 2.4.5
-rw-r--r--main/openvpn/APKBUILD8
-rw-r--r--main/openvpn/libressl.patch23
2 files changed, 28 insertions, 3 deletions
diff --git a/main/openvpn/APKBUILD b/main/openvpn/APKBUILD
index 0b29168f33..9bab2d49b1 100644
--- a/main/openvpn/APKBUILD
+++ b/main/openvpn/APKBUILD
@@ -1,8 +1,8 @@
# Contributor: Valery Kartel <valery.kartel@gmail.com>
# Maintainer: Natanael Copa <ncopa@alpinelinux.org>
pkgname=openvpn
-pkgver=2.4.4
-pkgrel=1
+pkgver=2.4.5
+pkgrel=0
pkgdesc="A robust, and highly configurable VPN (Virtual Private Network)"
url="http://openvpn.sourceforge.net/"
arch="all"
@@ -12,6 +12,7 @@ depends="iproute2"
makedepends="libressl-dev lzo-dev linux-pam-dev linux-headers"
install="$pkgname.pre-install"
source="http://swupdate.openvpn.net/community/releases/$pkgname-$pkgver.tar.gz
+ libressl.patch
openvpn.initd
openvpn.confd
openvpn.up
@@ -57,7 +58,8 @@ pam() {
"$subpkgdir"/usr/lib/openvpn/plugins/
}
-sha512sums="3c3cb77397569e21c5af52b065b081714ce53e2dd0b890c881de8e57220dc23d97cd61eaf5a6bf8e5e89186414c4c93da22a3ab65f4b61f80b04d862b4116e76 openvpn-2.4.4.tar.gz
+sha512sums="a2e3e23bb5374e26d5af393f75686af1962980838c46aee062bc65cc9ffb6f1d20c2c261d1f9abae56ff84a5d22da4a5edb21e39943b33f4a205f809190383c6 openvpn-2.4.5.tar.gz
+5a083cdf8216db5e6e4577c00ccfe8e03ca318935ec9daa2018a8a6d4d7fd2b04fe395d7b329f16108101d69a6c0b70690883fda2cb552db7abf2f8246cc561f libressl.patch
8a4080b7784faa156aa0775f7b73fe5c054707270af2a3139150629450ad0f1f5954dce5fc850f1bfd7b93bcc47ed4bc9b22159c536874698c78d81ba99338a7 openvpn.initd
982ade883afbe2e656a9cbbe36c31c0e8b4f7bbbe5b63df9f7b834f02a9153032fb7445c85d3e91f62c68a7ddd13c3afbf420fb71cdd13d9c4b69f867bdd9f37 openvpn.confd
f904d6125ed1ddb48ea632c3b290a7a4a7a7436be0d46b323fc8c92f919f9d076fdc78ff7bed0dd65675f0bc3559e531e372b805fc11ef287efeeb4d54fe52f4 openvpn.up
diff --git a/main/openvpn/libressl.patch b/main/openvpn/libressl.patch
new file mode 100644
index 0000000000..620359744f
--- /dev/null
+++ b/main/openvpn/libressl.patch
@@ -0,0 +1,23 @@
+Patch for building OpenVPN with libressl, taken from Void Linux.
+
+diff -upr openvpn-2.4.5.orig/src/openvpn/openssl_compat.h openvpn-2.4.5/src/openvpn/openssl_compat.h
+--- openvpn-2.4.5.orig/src/openvpn/openssl_compat.h 2018-03-20 11:29:16.324926371 +0100
++++ openvpn-2.4.5/src/openvpn/openssl_compat.h 2018-03-20 11:29:22.118289384 +0100
+@@ -711,7 +711,7 @@ SSL_CTX_get_max_proto_version(SSL_CTX *c
+ }
+ #endif /* SSL_CTX_get_max_proto_version */
+
+-#ifndef SSL_CTX_set_min_proto_version
++#if !defined(SSL_CTX_set_min_proto_version) && !defined(LIBRESSL_VERSION_NUMBER)
+ /** Mimics SSL_CTX_set_min_proto_version for OpenSSL < 1.1 */
+ static inline int
+ SSL_CTX_set_min_proto_version(SSL_CTX *ctx, long tls_ver_min)
+@@ -740,7 +740,7 @@ SSL_CTX_set_min_proto_version(SSL_CTX *c
+ }
+ #endif /* SSL_CTX_set_min_proto_version */
+
+-#ifndef SSL_CTX_set_max_proto_version
++#if !defined(SSL_CTX_set_max_proto_version) && !defined(LIBRESSL_VERSION_NUMBER)
+ /** Mimics SSL_CTX_set_max_proto_version for OpenSSL < 1.1 */
+ static inline int
+ SSL_CTX_set_max_proto_version(SSL_CTX *ctx, long tls_ver_max)