bump(main/softether-vpn): 5.2.5188

- Fixes https://github.com/termux/termux-packages/issues/22075

- Convert source to LF before patching

- Disable `OQS_ENABLE_KEM_NTRUPRIME` to avoid https://github.com/open-quantum-safe/liboqs/issues/2324

- Disable `install` CMake targets of vendored `cpu_features` to avoid conflict with `libcpufeatures`

packages/softether-vpn/build.sh

@@ -2,17 +2,16 @@ TERMUX_PKG_HOMEPAGE=https://www.softether.org/
 TERMUX_PKG_DESCRIPTION="An open-source cross-platform multi-protocol VPN program"
 TERMUX_PKG_LICENSE="Apache-2.0"
 TERMUX_PKG_MAINTAINER="@termux"
-TERMUX_PKG_VERSION=(5.02.5180)
-TERMUX_PKG_REVISION=5
-TERMUX_PKG_VERSION+=(1.0.18)
+TERMUX_PKG_VERSION=(5.2.5188)
+TERMUX_PKG_VERSION+=(1.0.20)
 TERMUX_PKG_SRCURL=(https://github.com/SoftEtherVPN/SoftEtherVPN/releases/download/${TERMUX_PKG_VERSION}/SoftEtherVPN-${TERMUX_PKG_VERSION}.tar.xz
                    https://github.com/jedisct1/libsodium/archive/${TERMUX_PKG_VERSION[1]}-RELEASE.tar.gz)
-TERMUX_PKG_SHA256=(b5649a8ea3cc6477325e09e2248ef708d434ee3b2251eb8764bcfc15fb1de456
-                   b7292dd1da67a049c8e78415cd498ec138d194cfdb302e716b08d26b80fecc10)
+TERMUX_PKG_SHA256=(e89278e7edd7e137bd521851b42c2bf9ce4e5cae2489db406588d3388646b147
+                   8e5aeca07a723a27bbecc3beef14b0068d37e7fc0e97f51b3f1c82d2a58005c1)
 TERMUX_PKG_DEPENDS="libiconv, libsodium, ncurses, openssl, readline, resolv-conf, zlib"
+TERMUX_PKG_BUILD_DEPENDS="dos2unix"
 TERMUX_PKG_FORCE_CMAKE=true
 TERMUX_PKG_EXTRA_CONFIGURE_ARGS="
--DCMAKE_POLICY_VERSION_MINIMUM=3.5
 -DHAS_SSE2=OFF
 "
 TERMUX_PKG_HOSTBUILD=true
@@ -20,6 +19,18 @@ TERMUX_PKG_RM_AFTER_INSTALL="lib/systemd"
 
 termux_step_post_get_source() {
 	mv libsodium-${TERMUX_PKG_VERSION[1]}-RELEASE libsodium
+
+	# convert CRLF to LF like in libpluto package
+	if [[ "$TERMUX_ON_DEVICE_BUILD" == "false" ]]; then
+		DOS2UNIX="$TERMUX_PKG_TMPDIR/dos2unix"
+		(. "$TERMUX_SCRIPTDIR/packages/dos2unix/build.sh"; TERMUX_PKG_SRCDIR="$DOS2UNIX" termux_step_get_source)
+		pushd "$DOS2UNIX"
+		make dos2unix
+		popd # DOS2UNIX
+		export PATH="$DOS2UNIX:$PATH"
+	fi
+
+	find "$TERMUX_PKG_SRCDIR" -type f -print0 | xargs -0 dos2unix
 }
 
 termux_step_host_build() {
@@ -35,7 +46,7 @@ termux_step_host_build() {
 	export PKG_CONFIG_PATH=$_PREFIX_FOR_BUILD/lib/pkgconfig
 
 	termux_setup_cmake
-	cmake -DCMAKE_POLICY_VERSION_MINIMUM=3.5 $TERMUX_PKG_SRCDIR
+	cmake $TERMUX_PKG_SRCDIR
 	make -j $TERMUX_PKG_MAKE_PROCESSES
 
 	unset PKG_CONFIG_PATH

packages/softether-vpn/src-Cedar-Cedar.c.patch

@@ -1,11 +1,11 @@
 --- a/src/Cedar/Cedar.c
 +++ b/src/Cedar/Cedar.c
 @@ -1290,7 +1290,7 @@
- // Initialize net service list
- void InitNetSvcList(CEDAR *cedar)
- {
--	char filename[MAX_PATH] = "/etc/services";
-+	char filename[MAX_PATH] = "@TERMUX_PREFIX@/etc/services";
- 	BUF *b;
- 	// Validate arguments
- 	if (cedar == NULL)
+ // Initialize net service list
+ void InitNetSvcList(CEDAR *cedar)
+ {
+-	char filename[MAX_PATH] = "/etc/services";
++	char filename[MAX_PATH] = "@TERMUX_PREFIX@/etc/services";
+ 	BUF *b;
+ 	// Validate arguments
+ 	if (cedar == NULL)

packages/softether-vpn/src-Mayaqua-3rdparty-cpu_features-ndk_compat-CMakeLists.txt.patch

@@ -0,0 +1,35 @@
+--- a/src/Mayaqua/3rdparty/cpu_features/ndk_compat/CMakeLists.txt
++++ b/src/Mayaqua/3rdparty/cpu_features/ndk_compat/CMakeLists.txt
+@@ -20,18 +20,6 @@ target_link_libraries(ndk_compat PUBLIC ${CMAKE_DL_LIBS} ${CMAKE_THREAD_LIBS_INI
+ set_target_properties(ndk_compat PROPERTIES PUBLIC_HEADER "${NDK_COMPAT_HDRS}")
+ 
+ include(GNUInstallDirs)
+-install(TARGETS ndk_compat
+-  EXPORT CpuFeaturesNdkCompatTargets
+-  PUBLIC_HEADER DESTINATION ${CMAKE_INSTALL_INCLUDEDIR}/ndk_compat
+-  ARCHIVE DESTINATION ${CMAKE_INSTALL_LIBDIR}
+-  LIBRARY DESTINATION ${CMAKE_INSTALL_LIBDIR}
+-  RUNTIME DESTINATION ${CMAKE_INSTALL_BINDIR}
+-)
+-install(EXPORT CpuFeaturesNdkCompatTargets
+-  NAMESPACE CpuFeatures::
+-  DESTINATION ${CMAKE_INSTALL_LIBDIR}/cmake/CpuFeaturesNdkCompat
+-  COMPONENT Devel
+-)
+ include(CMakePackageConfigHelpers)
+ configure_package_config_file(${PROJECT_SOURCE_DIR}/cmake/CpuFeaturesNdkCompatConfig.cmake.in
+   "${PROJECT_BINARY_DIR}/CpuFeaturesNdkCompatConfig.cmake"
+@@ -43,13 +31,6 @@ write_basic_package_version_file(
+   "${PROJECT_BINARY_DIR}/CpuFeaturesNdkCompatConfigVersion.cmake"
+   COMPATIBILITY SameMajorVersion
+ )
+-install(
+-  FILES
+-    "${PROJECT_BINARY_DIR}/CpuFeaturesNdkCompatConfig.cmake"
+-    "${PROJECT_BINARY_DIR}/CpuFeaturesNdkCompatConfigVersion.cmake"
+-  DESTINATION "${CMAKE_INSTALL_LIBDIR}/cmake/CpuFeaturesNdkCompat"
+-  COMPONENT Devel
+-)
+ 
+ #
+ # program : NDK compat test program

packages/softether-vpn/src-Mayaqua-CMakeLists.txt.patch

@@ -0,0 +1,13 @@
+Avoids https://github.com/open-quantum-safe/liboqs/issues/2324
+
+--- a/src/Mayaqua/3rdparty/liboqs/.CMake/alg_support.cmake
++++ b/src/Mayaqua/3rdparty/liboqs/.CMake/alg_support.cmake
+@@ -105,7 +105,7 @@ cmake_dependent_option(OQS_ENABLE_KEM_frodokem_976_shake "" ON "OQS_ENABLE_KEM_F
+ cmake_dependent_option(OQS_ENABLE_KEM_frodokem_1344_aes "" ON "OQS_ENABLE_KEM_FRODOKEM" OFF)
+ cmake_dependent_option(OQS_ENABLE_KEM_frodokem_1344_shake "" ON "OQS_ENABLE_KEM_FRODOKEM" OFF)
+ 
+-option(OQS_ENABLE_KEM_NTRUPRIME "Enable ntruprime algorithm family" ON)
++option(OQS_ENABLE_KEM_NTRUPRIME "Enable ntruprime algorithm family" OFF)
+ cmake_dependent_option(OQS_ENABLE_KEM_ntruprime_sntrup761 "" ON "OQS_ENABLE_KEM_NTRUPRIME" OFF)
+ if(CMAKE_SYSTEM_NAME MATCHES "Linux|Darwin")
+ if(OQS_DIST_X86_64_BUILD OR (OQS_USE_AVX2_INSTRUCTIONS))

packages/softether-vpn/src-Mayaqua-FileIO.c.orig.patch

@@ -1,13 +1,13 @@
 --- a/src/Mayaqua/FileIO.c
 +++ b/src/Mayaqua/FileIO.c
 @@ -20,8 +20,8 @@
- 
- #include <Hamcore.h>
- 
--static char exe_file_name[MAX_SIZE] = "/tmp/a.out";
--static wchar_t exe_file_name_w[MAX_SIZE] = L"/tmp/a.out";
-+static char exe_file_name[MAX_SIZE] = "@TERMUX_PREFIX@/tmp/a.out";
-+static wchar_t exe_file_name_w[MAX_SIZE] = L"@TERMUX_PREFIX@/tmp/a.out";
- static LIST *hamcore = NULL;
- static HAMCORE *hamcore_io = NULL;
- 
+ 
+ #include <Hamcore.h>
+ 
+-static char exe_file_name[MAX_SIZE] = "/tmp/a.out";
+-static wchar_t exe_file_name_w[MAX_SIZE] = L"/tmp/a.out";
++static char exe_file_name[MAX_SIZE] = "@TERMUX_PREFIX@/tmp/a.out";
++static wchar_t exe_file_name_w[MAX_SIZE] = L"@TERMUX_PREFIX@/tmp/a.out";
+ static LIST *hamcore = NULL;
+ static HAMCORE *hamcore_io = NULL;
+ 

packages/softether-vpn/src-Mayaqua-Mayaqua.c.orig.patch

@@ -1,25 +1,25 @@
 --- a/src/Mayaqua/Mayaqua.c
 +++ b/src/Mayaqua/Mayaqua.c
 @@ -620,11 +620,11 @@
- 		UINT64 now = SystemTime64();
- 		IO *o;
- 
--		MakeDir("/tmp");
-+		MakeDir("@TERMUX_PREFIX@/tmp");
- 
- 		Format(tmp2, sizeof(tmp2), "%I64u", now);
- 
--		Format(tmp, sizeof(tmp), "/tmp/.%s", tmp2);
-+		Format(tmp, sizeof(tmp), "@TERMUX_PREFIX@/tmp/.%s", tmp2);
- 
- 		o = FileCreate(tmp);
- 		if (o == NULL)
+ 		UINT64 now = SystemTime64();
+ 		IO *o;
+ 
+-		MakeDir("/tmp");
++		MakeDir("@TERMUX_PREFIX@/tmp");
+ 
+ 		Format(tmp2, sizeof(tmp2), "%I64u", now);
+ 
+-		Format(tmp, sizeof(tmp), "/tmp/.%s", tmp2);
++		Format(tmp, sizeof(tmp), "@TERMUX_PREFIX@/tmp/.%s", tmp2);
+ 
+ 		o = FileCreate(tmp);
+ 		if (o == NULL)
 @@ -632,7 +632,7 @@
- 			o = FileOpen(tmp, false);
- 			if (o == NULL)
- 			{
--				Print("Unable to use /tmp.\n\n");
-+				Print("Unable to use @TERMUX_PREFIX@/tmp.\n\n");
- 				exit(0);
- 			}
- 		}
+ 			o = FileOpen(tmp, false);
+ 			if (o == NULL)
+ 			{
+-				Print("Unable to use /tmp.\n\n");
++				Print("Unable to use @TERMUX_PREFIX@/tmp.\n\n");
+ 				exit(0);
+ 			}
+ 		}

packages/softether-vpn/src-Mayaqua-Network.c.orig.patch

@@ -1,29 +1,29 @@
 --- a/src/Mayaqua/Network.c
 +++ b/src/Mayaqua/Network.c
 @@ -8024,7 +8024,7 @@
- 
- 		GetLocalHostIP4(ip);
- 
--		b = ReadDump("/etc/resolv.conf");
-+		b = ReadDump("@TERMUX_PREFIX@/etc/resolv.conf");
- 		if (b != NULL)
- 		{
- 			char *s;
+ 
+ 		GetLocalHostIP4(ip);
+ 
+-		b = ReadDump("/etc/resolv.conf");
++		b = ReadDump("@TERMUX_PREFIX@/etc/resolv.conf");
+ 		if (b != NULL)
+ 		{
+ 			char *s;
 @@ -9980,7 +9980,7 @@
- bool UnixGetDomainName(char *name, UINT size)
- {
- 	bool ret = false;
--	BUF *b = ReadDump("/etc/resolv.conf");
-+	BUF *b = ReadDump("@TERMUX_PREFIX@/etc/resolv.conf");
- 
- 	if (b == NULL)
- 	{
+ bool UnixGetDomainName(char *name, UINT size)
+ {
+ 	bool ret = false;
+-	BUF *b = ReadDump("/etc/resolv.conf");
++	BUF *b = ReadDump("@TERMUX_PREFIX@/etc/resolv.conf");
+ 
+ 	if (b == NULL)
+ 	{
 @@ -14907,7 +14907,7 @@
- 		return false;
- 	}
- 
--	b = ReadDump("/etc/hosts");
-+	b = ReadDump("@TERMUX_PREFIX@/etc/hosts");
- 	if (b == NULL)
- 	{
- 		return false;
+ 		return false;
+ 	}
+ 
+-	b = ReadDump("/etc/hosts");
++	b = ReadDump("@TERMUX_PREFIX@/etc/hosts");
+ 	if (b == NULL)
+ 	{
+ 		return false;

packages/softether-vpn/src-Mayaqua-Unix.c.orig.patch

@@ -1,37 +1,25 @@
 --- a/src/Mayaqua/Unix.c
 +++ b/src/Mayaqua/Unix.c
-@@ -239,9 +239,9 @@
- 	return &t;
- }
- 
--static void *signal_received_for_ignore(int sig, siginfo_t *info, void *ucontext) 
-+static void signal_received_for_ignore(int sig, siginfo_t *info, void *ucontext) 
- {
--	return NULL;
-+	return;
- }
- 
- // Ignore the signal flew to the thread
-@@ -298,7 +298,7 @@
- 	char *vm_str_list = "Hypervisor detected,VMware Virtual Platform,VMware Virtual USB,qemu,xen,paravirtualized,virtual hd,virtualhd,virtual pc,virtualpc,kvm,oracle vm,oraclevm,parallels,xvm,bochs";
- 
- #ifdef	UNIX_LINUX
--	t = UnixExec("/bin/dmesg");
-+	t = UnixExec("@TERMUX_PREFIX@/bin/dmesg");
- 
- 	if (t != NULL)
- 	{
+@@ -310,7 +310,7 @@ bool UnixIsInVmMain()
+ #endif
+ 
+ #if defined(UNIX_LINUX)
+-	t = UnixExec("/bin/dmesg");
++	t = UnixExec("@TERMUX_PREFIX@/bin/dmesg");
+ #elif defined(__FreeBSD__)
+ 	t = UnixExec("/sbin/sysctl -n kern.vm_guest");
+ #endif
 @@ -363,11 +363,11 @@
- 		// Mac OS X
- 		if (b)
- 		{
--			UnixExecSilent("/usr/sbin/sysctl -w net.inet.ipsec.esp_port=4500");
-+			UnixExecSilent("@TERMUX_PREFIX@/bin/sysctl -w net.inet.ipsec.esp_port=4500");
- 		}
- 		else
- 		{
--			UnixExecSilent("/usr/sbin/sysctl -w net.inet.ipsec.esp_port=4501");
-+			UnixExecSilent("@TERMUX_PREFIX@/bin/sysctl -w net.inet.ipsec.esp_port=4501");
- 		}
- 	}
- }
+ 		// Mac OS X
+ 		if (b)
+ 		{
+-			UnixExecSilent("/usr/sbin/sysctl -w net.inet.ipsec.esp_port=4500");
++			UnixExecSilent("@TERMUX_PREFIX@/bin/sysctl -w net.inet.ipsec.esp_port=4500");
+ 		}
+ 		else
+ 		{
+-			UnixExecSilent("/usr/sbin/sysctl -w net.inet.ipsec.esp_port=4501");
++			UnixExecSilent("@TERMUX_PREFIX@/bin/sysctl -w net.inet.ipsec.esp_port=4501");
+ 		}
+ 	}
+ }