diff options
| author | Daniel Engberg <daniel.engberg.lists@pyret.net> | 2017-03-27 14:51:44 +0200 |
|---|---|---|
| committer | Felix Fietkau <nbd@nbd.name> | 2017-04-12 09:52:57 +0200 |
| commit | 210e96d4cfb6ba501c4ece5b7c7824183f7d3842 (patch) | |
| tree | 66069a14df393cf7b78042ef49ceebfb99b7ca5a /package/network | |
| parent | 2c6b8e4631176dfd403829e3adac9188f65954c6 (diff) | |
| download | upstream-210e96d4cfb6ba501c4ece5b7c7824183f7d3842.tar.gz upstream-210e96d4cfb6ba501c4ece5b7c7824183f7d3842.tar.bz2 upstream-210e96d4cfb6ba501c4ece5b7c7824183f7d3842.zip | |
OpenVPN: Update to 2.4.1
Update OpenVPN to 2.4.1
Remove 200-small_build_enable_occ.patch as it's included upstream.
Refresh patches
Add mirror and switch to HTTPS
Signed-off-by: Daniel Engberg <daniel.engberg.lists@pyret.net>
Diffstat (limited to 'package/network')
4 files changed, 12 insertions, 20 deletions
diff --git a/package/network/services/openvpn/Makefile b/package/network/services/openvpn/Makefile index ebfc51f955..0d3e0232b6 100644 --- a/package/network/services/openvpn/Makefile +++ b/package/network/services/openvpn/Makefile @@ -9,12 +9,14 @@ include $(TOPDIR)/rules.mk PKG_NAME:=openvpn -PKG_VERSION:=2.4.0 -PKG_RELEASE:=4 +PKG_VERSION:=2.4.1 +PKG_RELEASE:=1 -PKG_SOURCE_URL:=http://swupdate.openvpn.net/community/releases +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:=6f23ba49a1dbeb658f49c7ae17d9ea979de6d92c7357de3d55cd4525e1b2f87e +PKG_HASH:=fde9e22c6df7a335d2d58c6a4d5967be76df173c766a5c51ece57fd044c76ee5 PKG_BUILD_DIR:=$(BUILD_DIR)/$(PKG_NAME)-$(BUILD_VARIANT)/$(PKG_NAME)-$(PKG_VERSION) diff --git a/package/network/services/openvpn/patches/100-mbedtls-disable-runtime-version-check.patch b/package/network/services/openvpn/patches/100-mbedtls-disable-runtime-version-check.patch index 3b8248dd60..75e306234f 100644 --- a/package/network/services/openvpn/patches/100-mbedtls-disable-runtime-version-check.patch +++ b/package/network/services/openvpn/patches/100-mbedtls-disable-runtime-version-check.patch @@ -1,6 +1,6 @@ --- a/src/openvpn/ssl_mbedtls.c +++ b/src/openvpn/ssl_mbedtls.c -@@ -1333,7 +1333,7 @@ const char * +@@ -1337,7 +1337,7 @@ const char * get_ssl_library_version(void) { static char mbedtls_version[30]; diff --git a/package/network/services/openvpn/patches/200-small_build_enable_occ.patch b/package/network/services/openvpn/patches/200-small_build_enable_occ.patch deleted file mode 100644 index 96276d4723..0000000000 --- a/package/network/services/openvpn/patches/200-small_build_enable_occ.patch +++ /dev/null @@ -1,12 +0,0 @@ ---- a/src/openvpn/syshead.h -+++ b/src/openvpn/syshead.h -@@ -589,9 +589,7 @@ socket_defined (const socket_descriptor_ - /* - * Should we include OCC (options consistency check) code? - */ --#ifndef ENABLE_SMALL - #define ENABLE_OCC --#endif - - /* - * Should we include NTLM proxy functionality diff --git a/package/network/services/openvpn/patches/210-build_always_use_internal_lz4.patch b/package/network/services/openvpn/patches/210-build_always_use_internal_lz4.patch index 67191076d5..45a0207565 100644 --- a/package/network/services/openvpn/patches/210-build_always_use_internal_lz4.patch +++ b/package/network/services/openvpn/patches/210-build_always_use_internal_lz4.patch @@ -1,12 +1,12 @@ --- a/configure.ac +++ b/configure.ac -@@ -1014,37 +1014,14 @@ dnl +@@ -1058,37 +1058,14 @@ 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 - AC_CHECKING([for LZ4 Library and Header files]) - havelz4lib=1 - + - # if LZ4_LIBS is set, we assume it will work, otherwise test - if test -z "${LZ4_LIBS}"; then - AC_CHECK_LIB(lz4, LZ4_compress, @@ -19,7 +19,7 @@ + AC_MSG_RESULT([Using LZ4 library in src/compat/compat-lz4.*]) + AC_DEFINE([NEED_COMPAT_LZ4], [1], [use copy of LZ4 source in compat/]) + LZ4_LIBS="" - + - saved_CFLAGS="${CFLAGS}" - CFLAGS="${CFLAGS} ${LZ4_CFLAGS}" - AC_CHECK_HEADERS(lz4.h, @@ -39,3 +39,5 @@ AC_DEFINE(ENABLE_LZ4, 1, [Enable LZ4 compression library]) - CFLAGS="${saved_CFLAGS}" fi + + |