softethervpn5: version update to 5.02.5181 (incl. vulnerability fixes)
softethervpn5: The softethervpn5 package is due for an update from recent source. This PR implements a Makefile update to pull December 2023 release, which includes fixes for recently-disclosed vulnerabilities. The build patches are also updated accordingly. Signed-off-by: Thomas Winkler <tewinkler86@gmail.com>
This commit is contained in:
parent
12d5029eb3
commit
1c2cee2b81
|
@ -3,15 +3,15 @@
|
|||
include $(TOPDIR)/rules.mk
|
||||
|
||||
PKG_NAME:=softethervpn5
|
||||
PKG_VERSION:=5.02.5180
|
||||
PKG_RELEASE:=3
|
||||
PKG_VERSION:=5.02.5181
|
||||
PKG_RELEASE:=1
|
||||
|
||||
PKG_LICENSE:=GPL-2.0
|
||||
PKG_LICENSE_FILES:=COPYING
|
||||
|
||||
PKG_SOURCE_URL:=https://github.com/SoftEtherVPN/SoftEtherVPN/releases/download/$(PKG_VERSION)/
|
||||
PKG_SOURCE:=SoftEtherVPN-$(PKG_VERSION).tar.xz
|
||||
PKG_HASH:=b5649a8ea3cc6477325e09e2248ef708d434ee3b2251eb8764bcfc15fb1de456
|
||||
PKG_HASH:=2222ef48b3f9102265ef7d27e496ad40a1bd1eaba8093bc5e696b48402c52441
|
||||
|
||||
HOST_BUILD_DIR:=$(BUILD_DIR_HOST)/SoftEtherVPN-$(PKG_VERSION)
|
||||
PKG_BUILD_DIR:=$(BUILD_DIR)/SoftEtherVPN-$(PKG_VERSION)
|
||||
|
|
|
@ -1,11 +1,11 @@
|
|||
--- a/src/Mayaqua/CMakeLists.txt
|
||||
+++ b/src/Mayaqua/CMakeLists.txt
|
||||
@@ -55,7 +55,7 @@ if(UNIX)
|
||||
@@ -80,7 +80,7 @@ if(UNIX)
|
||||
find_package(Threads REQUIRED)
|
||||
|
||||
# In some cases libiconv is not included in libc
|
||||
- find_library(LIB_ICONV iconv)
|
||||
+ find_library(LIB_ICONV iconv HINTS "${ICONV_LIB_PATH}")
|
||||
|
||||
find_library(LIB_M m)
|
||||
find_library(LIB_RT rt)
|
||||
|
||||
|
|
|
@ -1,30 +0,0 @@
|
|||
From ee3bf7f5079bcad51cc89197b6a9e34da746fc7e Mon Sep 17 00:00:00 2001
|
||||
From: Rosen Penev <rosenp@gmail.com>
|
||||
Date: Sat, 7 Aug 2021 20:05:04 -0700
|
||||
Subject: [PATCH] fix compilation without OpenSSL engines
|
||||
|
||||
Signed-off-by: Rosen Penev <rosenp@gmail.com>
|
||||
---
|
||||
src/Mayaqua/Encrypt.c | 4 ++++
|
||||
1 file changed, 4 insertions(+)
|
||||
|
||||
--- a/src/Mayaqua/Encrypt.c
|
||||
+++ b/src/Mayaqua/Encrypt.c
|
||||
@@ -3128,6 +3128,7 @@ bool IsEncryptedK(BUF *b, bool private_k
|
||||
|
||||
K *OpensslEngineToK(char *key_file_name, char *engine_name)
|
||||
{
|
||||
+#ifndef OPENSSL_NO_ENGINE
|
||||
K *k;
|
||||
#if OPENSSL_API_COMPAT < 0x10100000L
|
||||
ENGINE_load_dynamic();
|
||||
@@ -3140,6 +3141,9 @@ K *OpensslEngineToK(char *key_file_name,
|
||||
k->pkey = pkey;
|
||||
k->private_key = true;
|
||||
return k;
|
||||
+#else
|
||||
+ return NULL;
|
||||
+#endif
|
||||
}
|
||||
|
||||
// Convert the BUF to a K
|
|
@ -8,7 +8,7 @@
|
|||
#include "Server.h"
|
||||
|
||||
#include "Admin.h"
|
||||
@@ -6561,6 +6562,10 @@ UINT SiWriteConfigurationFile(SERVER *s)
|
||||
@@ -6593,6 +6594,10 @@ UINT SiWriteConfigurationFile(SERVER *s)
|
||||
{
|
||||
return 0;
|
||||
}
|
||||
|
|
Loading…
Reference in New Issue