f09028fcdb
Update SoftEther VPN to the latest rtm version 4.29-9680
Compile tested: Atheros AR7xxx/AR9xxx, TP-LINK Archer C7 v2, 18.06.4
Signed-off-by: Philipp Schuster <philippschuster@gmx.com>
(rebased and refreshed patches).
Signed-off-by: Rosen Penev <rosenp@gmail.com>
(cherry picked from commit 34db38520b)
39 lines
2 KiB
Diff
39 lines
2 KiB
Diff
diff --git a/src/Mayaqua/Mayaqua.h b/src/Mayaqua/Mayaqua.h
|
|
index 194f8e6..177129e 100644
|
|
--- a/src/Mayaqua/Mayaqua.h
|
|
+++ b/src/Mayaqua/Mayaqua.h
|
|
@@ -283,7 +283,7 @@ int PASCAL WinMain(HINSTANCE hInst, HINSTANCE hPrev, char *CmdLine, int CmdShow)
|
|
#include <ifaddrs.h>
|
|
#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/src/makefiles/linux_32bit.mak b/src/makefiles/linux_32bit.mak
|
|
index 8219d5d..8020290 100644
|
|
--- a/src/makefiles/linux_32bit.mak
|
|
+++ b/src/makefiles/linux_32bit.mak
|
|
@@ -68,7 +68,7 @@ OPTIONS_LINK_DEBUG=-g -fsigned-char -lm -ldl -lrt -lpthread -lssl -lcrypto -lrea
|
|
|
|
OPTIONS_COMPILE_RELEASE=-DNDEBUG -DVPN_SPEED -DUNIX -DUNIX_LINUX -D_REENTRANT -DREENTRANT -D_THREAD_SAFE -D_THREADSAFE -DTHREAD_SAFE -DTHREADSAFE -D_FILE_OFFSET_BITS=64 -I./src/ -I./src/Cedar/ -I./src/Mayaqua/ -O2 -fsigned-char
|
|
|
|
-OPTIONS_LINK_RELEASE=-O2 -fsigned-char -lm -ldl -lrt -lpthread -lssl -lcrypto -lreadline -lncurses -lz
|
|
+OPTIONS_LINK_RELEASE=-O2 -fsigned-char -lm -ldl -lrt -liconv -lpthread -lssl -lcrypto -lreadline -lncurses -lz
|
|
|
|
INSTALL_BINDIR=/usr/bin/
|
|
INSTALL_VPNSERVER_DIR=/usr/vpnserver/
|
|
diff --git a/src/makefiles/linux_64bit.mak b/src/makefiles/linux_64bit.mak
|
|
index 7f81b58..a36e0de 100644
|
|
--- a/src/makefiles/linux_64bit.mak
|
|
+++ b/src/makefiles/linux_64bit.mak
|
|
@@ -68,7 +68,7 @@ OPTIONS_LINK_DEBUG=-g -fsigned-char -m64 -lm -ldl -lrt -lpthread -lssl -lcrypto
|
|
|
|
OPTIONS_COMPILE_RELEASE=-DNDEBUG -DVPN_SPEED -DUNIX -DUNIX_LINUX -DCPU_64 -D_REENTRANT -DREENTRANT -D_THREAD_SAFE -D_THREADSAFE -DTHREAD_SAFE -DTHREADSAFE -D_FILE_OFFSET_BITS=64 -I./src/ -I./src/Cedar/ -I./src/Mayaqua/ -O2 -fsigned-char
|
|
|
|
-OPTIONS_LINK_RELEASE=-O2 -fsigned-char -lm -ldl -lrt -lpthread -lssl -lcrypto -lreadline -lncurses -lz
|
|
+OPTIONS_LINK_RELEASE=-O2 -fsigned-char -lm -ldl -lrt -liconv -lpthread -lssl -lcrypto -lreadline -lncurses -lz
|
|
|
|
INSTALL_BINDIR=/usr/bin/
|
|
INSTALL_VPNSERVER_DIR=/usr/vpnserver/
|