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 <redacted>

diff --git a/net/softethervpn5/Makefile b/net/softethervpn5/Makefile
index fbe3145481a3e601a10bcf28dee6928ea8325a3a..bb4cc6bc90ceac8a6d7ec234442ece00dfc8a9ce 100644 (file)
--- a/net/softethervpn5/Makefile
+++ b/net/softethervpn5/Makefile
@@ -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)

diff --git a/net/softethervpn5/patches/001-iconv-cmake-fix.patch b/net/softethervpn5/patches/001-iconv-cmake-fix.patch
index 1f15a444549e23fd0d09d2ba6341aa9799ae1929..5d7483465819ccbd1988c4e505302d358314399d 100644 (file)
--- a/net/softethervpn5/patches/001-iconv-cmake-fix.patch
+++ b/net/softethervpn5/patches/001-iconv-cmake-fix.patch
@@ -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)
- 

diff --git a/net/softethervpn5/patches/010-engines.patch b/net/softethervpn5/patches/010-engines.patch
deleted file mode 100644 (file)
index 89898b5..0000000
--- a/net/softethervpn5/patches/010-engines.patch
+++ /dev/null
@@ -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
- \r
- K *OpensslEngineToK(char *key_file_name, char *engine_name)\r
- {\r
-+#ifndef OPENSSL_NO_ENGINE\r
-     K *k;\r
- #if OPENSSL_API_COMPAT < 0x10100000L\r
-     ENGINE_load_dynamic();\r
-@@ -3140,6 +3141,9 @@ K *OpensslEngineToK(char *key_file_name,
-     k->pkey = pkey;\r
-     k->private_key = true;\r
-     return k;\r
-+#else\r
-+    return NULL;\r
-+#endif\r
- }\r
- \r
- // Convert the BUF to a K\r

diff --git a/net/softethervpn5/patches/101-add-config-write-syslog.patch b/net/softethervpn5/patches/101-add-config-write-syslog.patch
index e23644ec2c57d4c6c499228c718bbc1511c4446b..2cf45ae636c78d3bab2892dd20f555698efa2a82 100644 (file)
--- a/net/softethervpn5/patches/101-add-config-write-syslog.patch
+++ b/net/softethervpn5/patches/101-add-config-write-syslog.patch
@@ -8,7 +8,7 @@
  #include "Server.h"\r
  \r
  #include "Admin.h"\r
-@@ -6561,6 +6562,10 @@ UINT SiWriteConfigurationFile(SERVER *s)
+@@ -6593,6 +6594,10 @@ UINT SiWriteConfigurationFile(SERVER *s)
        {\r
                return 0;\r
        }\r