diff --git a/net/softethervpn5/Makefile b/net/softethervpn5/Makefile index 7db7e3d6..c3970fa3 100644 --- a/net/softethervpn5/Makefile +++ b/net/softethervpn5/Makefile @@ -3,15 +3,16 @@ include $(TOPDIR)/rules.mk PKG_NAME:=softethervpn5 -PKG_VERSION:=5.02.5181 +PKG_VERSION:=5.02.5180 PKG_RELEASE:=1 +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:=2222ef48b3f9102265ef7d27e496ad40a1bd1eaba8093bc5e696b48402c52441 +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) @@ -41,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 @@ -91,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 @@ -99,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 @@ -124,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 @@ -132,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 @@ -140,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/001-iconv-defines-fix.patch b/net/softethervpn5/patches/001-iconv-defines-fix.patch deleted file mode 100644 index 88c8dc37..00000000 --- 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-iconv-cmake-fix.patch b/net/softethervpn5/patches/002-iconv-cmake-fix.patch deleted file mode 100644 index 3683627e..00000000 --- a/net/softethervpn5/patches/002-iconv-cmake-fix.patch +++ /dev/null @@ -1,11 +0,0 @@ ---- a/src/Mayaqua/CMakeLists.txt -+++ b/src/Mayaqua/CMakeLists.txt -@@ -59,7 +59,7 @@ if(UNIX) - find_package(ZLIB 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_RT rt) - 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 00000000..5c80d562 --- /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 9ceacb1b..0677a8fe 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/150_remove-restriction.patch b/net/softethervpn5/patches/150_remove-restriction.patch deleted file mode 100644 index d03bd836..00000000 --- a/net/softethervpn5/patches/150_remove-restriction.patch +++ /dev/null @@ -1,10 +0,0 @@ ---- a/src/Cedar/Server.c 2020-04-30 16:48:22.000000000 +0800 -+++ b/src/Cedar/Server.c 2022-08-12 15:08:36.000000000 +0800 -@@ -10624,6 +10624,7 @@ - // - bool SiIsEnterpriseFunctionsRestrictedOnOpenSource(CEDAR *c) - { -+ return false; - char region[128]; - bool ret = false; - // Validate arguments diff --git a/net/softethervpn5/patches/151-fix-openvpn-static-route-push.patch b/net/softethervpn5/patches/151-fix-openvpn-static-route-push.patch deleted file mode 100644 index 8efc64b0..00000000 --- a/net/softethervpn5/patches/151-fix-openvpn-static-route-push.patch +++ /dev/null @@ -1,13 +0,0 @@ ---- a/src/Cedar/Proto_OpenVPN.c 2020-04-30 16:48:22.000000000 +0800 -+++ b/src/Cedar/Proto_OpenVPN.c 2022-08-12 15:12:00.000000000 +0800 -@@ -2436,8 +2436,8 @@ - if (r->Exists) - { - Format(l3_options, sizeof(l3_options), -- ",route %r %r vpn_gateway", -- &r->Network, &r->SubnetMask); -+ ",route %r %r %r", -+ &r->Network, &r->SubnetMask, &r->Gateway); - - StrCat(option_str, sizeof(option_str), l3_options); - }