From a2a9702f8a446e569b7b93f739d3eb420452f384 Mon Sep 17 00:00:00 2001 From: Andy Walsh Date: Sat, 10 Jul 2021 21:07:47 +0200 Subject: [PATCH] softethervpn5: update to 5.02.5180 * update to 5.02.5180 * add dep: libsodium Signed-off-by: Andy Walsh --- net/softethervpn5/Makefile | 41 +++++++++++-------- ...ke-fix.patch => 001-iconv-cmake-fix.patch} | 4 +- .../patches/001-iconv-defines-fix.patch | 11 ----- .../patches/002-pthread-include-fix.patch | 13 ++++++ .../100-increase-cfg-save-intervall.patch | 2 +- .../patches/101-add-config-write-syslog.patch | 13 +++--- 6 files changed, 46 insertions(+), 38 deletions(-) rename net/softethervpn5/patches/{002-iconv-cmake-fix.patch => 001-iconv-cmake-fix.patch} (79%) delete mode 100644 net/softethervpn5/patches/001-iconv-defines-fix.patch create mode 100644 net/softethervpn5/patches/002-pthread-include-fix.patch diff --git a/net/softethervpn5/Makefile b/net/softethervpn5/Makefile index 1c08ab6bdf..566d7beb10 100644 --- a/net/softethervpn5/Makefile +++ b/net/softethervpn5/Makefile @@ -3,16 +3,16 @@ include $(TOPDIR)/rules.mk PKG_NAME:=softethervpn5 -PKG_VERSION:=5.01.9674 -PKG_RELEASE:=1 +PKG_VERSION:=5.02.5180 +PKG_RELEASE:=$(AUTORELEASE) PKG_MAINTAINER:=Andy Walsh PKG_LICENSE:=GPL-2.0 PKG_LICENSE_FILES:=COPYING PKG_SOURCE_URL:=https://github.com/SoftEtherVPN/SoftEtherVPN/releases/download/$(PKG_VERSION)/ -PKG_SOURCE:=softether-vpn-src-$(PKG_VERSION).tar.gz -PKG_HASH:=c4dc53f4912605a25c18357b0a0bf6dc059286ca901cb981abdf1a22d1649ddc +PKG_SOURCE:=SoftEtherVPN-$(PKG_VERSION).tar.xz +PKG_HASH:=b5649a8ea3cc6477325e09e2248ef708d434ee3b2251eb8764bcfc15fb1de456 HOST_BUILD_DIR:=$(BUILD_DIR_HOST)/SoftEtherVPN-$(PKG_VERSION) PKG_BUILD_DIR:=$(BUILD_DIR)/SoftEtherVPN-$(PKG_VERSION) @@ -42,7 +42,7 @@ endef define Package/softethervpn5-libs $(call Package/softethervpn5/Default) - DEPENDS:=+libpthread +librt +libreadline +libopenssl +libncurses +kmod-tun +zlib $(ICONV_DEPENDS) + DEPENDS:=+libsodium +libpthread +librt +libreadline +libopenssl +libncurses +kmod-tun +zlib $(ICONV_DEPENDS) TITLE+= libs HIDDEN:=1 endef @@ -84,7 +84,7 @@ export USE_MUSL=YES # BUG: outdated host/include/elf.h HOST_CFLAGS += $(FPIC) -DAT_HWCAP2=26 TARGET_CFLAGS += $(FPIC) -CMAKE_OPTIONS = -DICONV_LIB_PATH="$(ICONV_PREFIX)/lib" +CMAKE_OPTIONS += -DICONV_LIB_PATH="$(ICONV_PREFIX)/lib" # static build for host (hamcorebuilder), avoid -fpic on ncurses/host and shared libs can't be found on host define Host/Prepare @@ -92,6 +92,7 @@ define Host/Prepare $(SED) 's,SHARED,STATIC,g' $(HOST_BUILD_DIR)/src/Mayaqua/CMakeLists.txt $(SED) 's,SHARED,STATIC,g' $(HOST_BUILD_DIR)/src/Cedar/CMakeLists.txt $(SED) 's,readline,libreadline.a,g' $(HOST_BUILD_DIR)/src/Cedar/CMakeLists.txt + $(SED) 's,libsodium REQUIRED,libsodium,g' $(HOST_BUILD_DIR)/src/Cedar/CMakeLists.txt endef define Host/Compile @@ -100,23 +101,29 @@ endef define Host/Install $(INSTALL_DIR) $(STAGING_DIR_HOSTPKG)/bin/ - $(INSTALL_BIN) $(HOST_BUILD_DIR)/tmp/hamcorebuilder $(STAGING_DIR_HOSTPKG)/bin/ + $(INSTALL_BIN) $(HOST_BUILD_DIR)/src/hamcorebuilder/hamcorebuilder $(STAGING_DIR_HOSTPKG)/bin/ +endef + +# disable SSE detection, disables BLAKE2 lib +define Build/Prepare + $(call Build/Prepare/Default) + $(SED) 's,cmake_host_system_information,#cmake_host_system_information,g' $(PKG_BUILD_DIR)/src/Cedar/CMakeLists.txt endef define Build/Compile $(call Build/Compile/Default,vpnserver vpnbridge vpnclient vpncmd hamcore-archive-build) endef -define Build/Install -endef - define Package/softethervpn5-libs/install $(INSTALL_DIR) $(1)/usr/lib - $(CP) $(PKG_BUILD_DIR)/build/libcedar.so $(1)/usr/lib/ - $(CP) $(PKG_BUILD_DIR)/build/libmayaqua.so $(1)/usr/lib/ + $(CP) $(PKG_INSTALL_DIR)/usr/lib/libcedar.so $(1)/usr/lib/ + $(CP) $(PKG_INSTALL_DIR)/usr/lib/libmayaqua.so $(1)/usr/lib/ $(INSTALL_DIR) $(1)/usr/libexec/softethervpn - $(CP) $(PKG_BUILD_DIR)/build/hamcore.se2 $(1)/usr/libexec/softethervpn/ - $(INSTALL_BIN) $(PKG_BUILD_DIR)/build/vpncmd $(1)/usr/libexec/softethervpn/ + $(CP) $(PKG_INSTALL_DIR)/usr/libexec/softether/vpncmd/hamcore.se2 $(1)/usr/libexec/softethervpn/ + $(INSTALL_BIN) $(PKG_INSTALL_DIR)/usr/libexec/softether/vpncmd/vpncmd $(1)/usr/libexec/softethervpn/ + $(INSTALL_DIR) $(1)/usr/bin + if [ -f $(PKG_INSTALL_DIR)/usr/bin/list_cpu_features ]; then \ + $(INSTALL_BIN) $(PKG_INSTALL_DIR)/usr/bin/list_cpu_features $(1)/usr/bin/ ; fi $(INSTALL_BIN) files/launcher.sh $(1)/usr/libexec/softethervpn/ $(INSTALL_DATA) files/dummy $(1)/usr/libexec/softethervpn/lang.config $(INSTALL_DIR) $(1)/usr/bin @@ -125,7 +132,7 @@ endef define Package/softethervpn5-server/install $(INSTALL_DIR) $(1)/usr/libexec/softethervpn - $(INSTALL_BIN) $(PKG_BUILD_DIR)/build/vpnserver $(1)/usr/libexec/softethervpn/ + $(INSTALL_BIN) $(PKG_INSTALL_DIR)/usr/libexec/softether/vpnserver/vpnserver $(1)/usr/libexec/softethervpn/ $(INSTALL_DATA) files/dummy $(1)/usr/libexec/softethervpn/vpn_server.config $(INSTALL_DIR) $(1)/etc/init.d $(INSTALL_BIN) files/vpnserver.init $(1)/etc/init.d/softethervpnserver @@ -133,7 +140,7 @@ endef define Package/softethervpn5-bridge/install $(INSTALL_DIR) $(1)/usr/libexec/softethervpn - $(INSTALL_BIN) $(PKG_BUILD_DIR)/build/vpnbridge $(1)/usr/libexec/softethervpn/ + $(INSTALL_BIN) $(PKG_INSTALL_DIR)/usr/libexec/softether/vpnbridge/vpnbridge $(1)/usr/libexec/softethervpn/ $(INSTALL_DATA) files/dummy $(1)/usr/libexec/softethervpn/vpn_bridge.config $(INSTALL_DIR) $(1)/etc/init.d $(INSTALL_BIN) files/vpnbridge.init $(1)/etc/init.d/softethervpnbridge @@ -141,7 +148,7 @@ endef define Package/softethervpn5-client/install $(INSTALL_DIR) $(1)/usr/libexec/softethervpn - $(INSTALL_BIN) $(PKG_BUILD_DIR)/build/vpnclient $(1)/usr/libexec/softethervpn/ + $(INSTALL_BIN) $(PKG_INSTALL_DIR)/usr/libexec/softether/vpnclient/vpnclient $(1)/usr/libexec/softethervpn/ $(INSTALL_DATA) files/dummy $(1)/usr/libexec/softethervpn/vpn_client.config $(INSTALL_DIR) $(1)/etc/init.d $(INSTALL_BIN) files/vpnclient.init $(1)/etc/init.d/softethervpnclient diff --git a/net/softethervpn5/patches/002-iconv-cmake-fix.patch b/net/softethervpn5/patches/001-iconv-cmake-fix.patch similarity index 79% rename from net/softethervpn5/patches/002-iconv-cmake-fix.patch rename to net/softethervpn5/patches/001-iconv-cmake-fix.patch index 3683627e62..1f15a44454 100644 --- a/net/softethervpn5/patches/002-iconv-cmake-fix.patch +++ b/net/softethervpn5/patches/001-iconv-cmake-fix.patch @@ -1,7 +1,7 @@ --- a/src/Mayaqua/CMakeLists.txt +++ b/src/Mayaqua/CMakeLists.txt -@@ -59,7 +59,7 @@ if(UNIX) - find_package(ZLIB REQUIRED) +@@ -55,7 +55,7 @@ if(UNIX) + find_package(Threads REQUIRED) # In some cases libiconv is not included in libc - find_library(LIB_ICONV iconv) diff --git a/net/softethervpn5/patches/001-iconv-defines-fix.patch b/net/softethervpn5/patches/001-iconv-defines-fix.patch deleted file mode 100644 index 88c8dc37c0..0000000000 --- a/net/softethervpn5/patches/001-iconv-defines-fix.patch +++ /dev/null @@ -1,11 +0,0 @@ ---- a/src/Mayaqua/Mayaqua.h -+++ b/src/Mayaqua/Mayaqua.h -@@ -184,7 +184,7 @@ int PASCAL WinMain(HINSTANCE hInst, HINS - #include - #endif // MAYAQUA_SUPPORTS_GETIFADDRS - --#ifdef UNIX_LINUX -+#if 0 - typedef void *iconv_t; - iconv_t iconv_open (__const char *__tocode, __const char *__fromcode); - size_t iconv (iconv_t __cd, char **__restrict __inbuf, diff --git a/net/softethervpn5/patches/002-pthread-include-fix.patch b/net/softethervpn5/patches/002-pthread-include-fix.patch new file mode 100644 index 0000000000..5c80d5624f --- /dev/null +++ b/net/softethervpn5/patches/002-pthread-include-fix.patch @@ -0,0 +1,13 @@ +--- a/src/Mayaqua/Encrypt.h ++++ b/src/Mayaqua/Encrypt.h +@@ -9,7 +9,9 @@ + #define ENCRYPT_H + + #include "MayaType.h" +- ++#ifdef linux ++ #include ++#endif + #include + + // Constant diff --git a/net/softethervpn5/patches/100-increase-cfg-save-intervall.patch b/net/softethervpn5/patches/100-increase-cfg-save-intervall.patch index 9ceacb1b47..0677a8feda 100644 --- a/net/softethervpn5/patches/100-increase-cfg-save-intervall.patch +++ b/net/softethervpn5/patches/100-increase-cfg-save-intervall.patch @@ -1,6 +1,6 @@ --- a/src/Cedar/Server.h +++ b/src/Cedar/Server.h -@@ -32,10 +32,10 @@ extern char *SERVER_CONFIG_FILE_NAME; +@@ -35,10 +35,10 @@ extern char *SERVER_CONFIG_FILE_NAME; #define SERVER_CONTROL_TCP_TIMEOUT (60 * 1000) #define SERVER_FARM_CONTROL_INTERVAL (10 * 1000) diff --git a/net/softethervpn5/patches/101-add-config-write-syslog.patch b/net/softethervpn5/patches/101-add-config-write-syslog.patch index 86b1ad2056..e23644ec2c 100644 --- a/net/softethervpn5/patches/101-add-config-write-syslog.patch +++ b/net/softethervpn5/patches/101-add-config-write-syslog.patch @@ -1,15 +1,14 @@ --- a/src/Cedar/Server.c +++ b/src/Cedar/Server.c -@@ -4,7 +4,7 @@ - +@@ -5,6 +5,7 @@ // Server.c // VPN Server module -- -+#include - #include "CedarPch.h" - static SERVER *server = NULL; -@@ -6492,6 +6492,10 @@ UINT SiWriteConfigurationFile(SERVER *s) ++#include + #include "Server.h" + + #include "Admin.h" +@@ -6561,6 +6562,10 @@ UINT SiWriteConfigurationFile(SERVER *s) { return 0; }