From f715dd8d406a8d16ee4f0cb570003b47acc3ea5b Mon Sep 17 00:00:00 2001 From: Waldemar Brodkorb Date: Mon, 21 Mar 2022 11:09:03 +0100 Subject: openvpn: update to 2.5.6 --- package/openvpn/Makefile | 6 +++-- .../patches/patch-src_openvpn_ssl_openssl_c | 29 ---------------------- 2 files changed, 4 insertions(+), 31 deletions(-) delete mode 100644 package/openvpn/patches/patch-src_openvpn_ssl_openssl_c diff --git a/package/openvpn/Makefile b/package/openvpn/Makefile index 0d2cb25a5..92b03daf4 100644 --- a/package/openvpn/Makefile +++ b/package/openvpn/Makefile @@ -4,9 +4,9 @@ include $(ADK_TOPDIR)/rules.mk PKG_NAME:= openvpn -PKG_VERSION:= 2.4.7 +PKG_VERSION:= 2.5.6 PKG_RELEASE:= 1 -PKG_HASH:= a42f53570f669eaf10af68e98d65b531015ff9e12be7a62d9269ea684652f648 +PKG_HASH:= 333a7ef3d5b317968aca2c77bdc29aa7c6d6bb3316eb3f79743b59c53242ad3d PKG_DESCR:= vpn solution using ssl/tls PKG_DEPENDS:= libressl PKG_BUILDDEP:= libressl @@ -15,6 +15,8 @@ PKG_SECTION:= net/security PKG_URL:= http://openvpn.net/ PKG_SITES:= http://swupdate.openvpn.org/community/releases/ +DISTFILES:= ${PKG_NAME}-${PKG_VERSION}.tar.gz + PKG_FLAVOURS_OPENVPN:= WITH_LZO WITH_LZ4 WITH_MANAGEMENT WITH_SMALL PKGFD_WITH_LZO:= enable lzo compression support PKGFS_WITH_LZO:= liblzo 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 efcbc2600..000000000 --- a/package/openvpn/patches/patch-src_openvpn_ssl_openssl_c +++ /dev/null @@ -1,29 +0,0 @@ ---- openvpn-2.4.7.orig/src/openvpn/ssl_openssl.c 2019-02-20 13:28:23.000000000 +0100 -+++ openvpn-2.4.7/src/openvpn/ssl_openssl.c 2019-10-07 21:44:52.473323073 +0200 -@@ -459,7 +459,7 @@ tls_ctx_restrict_ciphers_tls13(struct tl - return; - } - --#if (OPENSSL_VERSION_NUMBER < 0x1010100fL) -+#if (OPENSSL_VERSION_NUMBER < 0x1010100fL) || defined(LIBRESSL_VERSION_NUMBER) - crypto_msg(M_WARN, "Not compiled with OpenSSL 1.1.1 or higher. " - "Ignoring TLS 1.3 only tls-ciphersuites '%s' setting.", - ciphers); -@@ -1846,7 +1846,7 @@ show_available_tls_ciphers_list(const ch - crypto_msg(M_FATAL, "Cannot create SSL_CTX object"); - } - --#if (OPENSSL_VERSION_NUMBER >= 0x1010100fL) -+#if (OPENSSL_VERSION_NUMBER >= 0x1010100fL && !defined(LIBRESSL_VERSION_NUMBER)) - if (tls13) - { - SSL_CTX_set_min_proto_version(tls_ctx.ctx, TLS1_3_VERSION); -@@ -1867,7 +1867,7 @@ show_available_tls_ciphers_list(const ch - crypto_msg(M_FATAL, "Cannot create SSL object"); - } - --#if (OPENSSL_VERSION_NUMBER < 0x1010000fL) -+#if (OPENSSL_VERSION_NUMBER < 0x1010000fL) || defined(LIBRESSL_VERSION_NUMBER) - STACK_OF(SSL_CIPHER) *sk = SSL_get_ciphers(ssl); - #else - STACK_OF(SSL_CIPHER) *sk = SSL_get1_supported_ciphers(ssl); -- cgit v1.2.3