From 50ae0353af76bd9add9ce78ca2e699f2268ba03c Mon Sep 17 00:00:00 2001 From: Ivan Pavlov Date: Fri, 18 Mar 2022 08:43:53 +0300 Subject: [PATCH] openvpn: update to 2.5.6 Maintainer: me / @mkrkn Compile tested: ramips/mt7620 TP-Link Archer C50 v1, ramips/mt7621 Xiaomi Mi router 3 Pro, ath79/generic TP-Link WDR-3500 Run tested: ramips/mt7620 TP-Link Archer C50 v1, ramips/mt7621 Xiaomi Mi router 3 Pro, ath79/generic TP-Link WDR-3500 bugfix release including one security fix ("Disallow multiple deferred authentication plug-ins.", CVE: 2022-0547) several build fixes, refer to https://github.com/OpenVPN/openvpn/blob/release/2.5/Changes.rst Signed-off-by: Ivan Pavlov (cherry picked from commit 172795b8584c43327d320b591ab64647e4b821d4) --- net/openvpn/Makefile | 4 ++-- net/openvpn/patches/002-add-wolfssl-support.patch | 2 +- net/openvpn/patches/210-build_always_use_internal_lz4.patch | 2 +- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/net/openvpn/Makefile b/net/openvpn/Makefile index b7421b9ac..fd89a5a67 100644 --- a/net/openvpn/Makefile +++ b/net/openvpn/Makefile @@ -9,14 +9,14 @@ include $(TOPDIR)/rules.mk PKG_NAME:=openvpn -PKG_VERSION:=2.5.5 +PKG_VERSION:=2.5.6 PKG_RELEASE:=1 PKG_SOURCE_URL:=\ https://build.openvpn.net/downloads/releases/ \ https://swupdate.openvpn.net/community/releases/ PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.xz -PKG_HASH:=119bd69fa0210838f6cdaa273696dc738efa200f454dbe11eb6dfb75dfb6003b +PKG_HASH:=13c7c3dc399d1b571cabf189c4d34ae34656ee72b6bde2a8059c1e9bc61574ed PKG_MAINTAINER:=Magnus Kroken diff --git a/net/openvpn/patches/002-add-wolfssl-support.patch b/net/openvpn/patches/002-add-wolfssl-support.patch index 98bc65815..a11278ed4 100644 --- a/net/openvpn/patches/002-add-wolfssl-support.patch +++ b/net/openvpn/patches/002-add-wolfssl-support.patch @@ -70,7 +70,7 @@ Signed-off-by: Gert Doering AC_ARG_VAR([PLUGINDIR], [Path of plug-in directory @<:@default=LIBDIR/openvpn/plugins@:>@]) if test -n "${PLUGINDIR}"; then plugindir="${PLUGINDIR}" -@@ -1026,6 +1033,105 @@ elif test "${with_crypto_library}" = "mb +@@ -1020,6 +1027,105 @@ elif test "${with_crypto_library}" = "mb AC_DEFINE([ENABLE_CRYPTO_MBEDTLS], [1], [Use mbed TLS library]) CRYPTO_CFLAGS="${MBEDTLS_CFLAGS}" CRYPTO_LIBS="${MBEDTLS_LIBS}" diff --git a/net/openvpn/patches/210-build_always_use_internal_lz4.patch b/net/openvpn/patches/210-build_always_use_internal_lz4.patch index 267f62049..ebca7fefe 100644 --- a/net/openvpn/patches/210-build_always_use_internal_lz4.patch +++ b/net/openvpn/patches/210-build_always_use_internal_lz4.patch @@ -1,6 +1,6 @@ --- a/configure.ac +++ b/configure.ac -@@ -1183,68 +1183,15 @@ dnl +@@ -1177,68 +1177,15 @@ dnl AC_ARG_VAR([LZ4_CFLAGS], [C compiler flags for lz4]) AC_ARG_VAR([LZ4_LIBS], [linker flags for lz4]) if test "$enable_lz4" = "yes" && test "$enable_comp_stub" = "no"; then