FreeBSD Bugzilla – Attachment 180304 Details for
Bug 209195
[maintainer] security/softether - port update
Home
|
New
|
Browse
|
Search
|
[?]
|
Reports
|
Help
|
New Account
|
Log In
Remember
[x]
|
Forgot Password
Login:
[x]
[patch]
svnlite diff
softether.diff (text/plain), 24.94 KB, created by
net
on 2017-02-25 23:12:44 UTC
(
hide
)
Description:
svnlite diff
Filename:
MIME Type:
Creator:
net
Created:
2017-02-25 23:12:44 UTC
Size:
24.94 KB
patch
obsolete
>Index: security/softether/Makefile >=================================================================== >--- security/softether/Makefile (revision 434775) >+++ security/softether/Makefile (working copy) >@@ -1,11 +1,10 @@ > # $FreeBSD$ > > PORTNAME= softether >-PORTVERSION= 4.18.9570 >-PORTREVISION= 1 >+PORTVERSION= 4.20.9608 > CATEGORIES= security >-MASTER_SITES= http://www.softether-download.com/files/softether/v4.18-9570-rtm-2015.07.26-tree/Source_Code/ >-DISTNAME= ${PORTNAME}-src-v4.18-9570-rtm >+MASTER_SITES= http://www.softether-download.com/files/softether/v4.20-9608-rtm-2016.04.17-tree/Source_Code/ >+DISTNAME= ${PORTNAME}-src-v4.20-9608-rtm > > MAINTAINER= net@arrishq.net > COMMENT= Softether VPN solution >@@ -12,6 +11,9 @@ > > LICENSE= GPLv2 > >+CPPFLAGS+= -I${LOCALBASE}/include >+LDFLAGS+= -L${LOCALBASE}/lib >+ > PORTDOCS= AUTHORS.TXT ChangeLog LICENSE README THIRD_PARTY.TXT WARNING.TXT > DOS2UNIX_FILES= AUTHORS.TXT ChangeLog LICENSE README THIRD_PARTY.TXT \ > WARNING.TXT \ >@@ -20,10 +22,14 @@ > src/Cedar/Client.h \ > src/Cedar/Nat.h \ > src/Cedar/Server.c \ >+ src/Cedar/Server.h \ >+ src/Cedar/Virtual.h \ > src/Mayaqua/Cfg.c \ > src/Mayaqua/Cfg.h \ >+ src/Mayaqua/Kernel.c \ >+ src/Mayaqua/Mayaqua.c \ > src/Mayaqua/Network.c \ >- src/Mayaqua/Kernel.c \ >+ src/Mayaqua/Network.h \ > src/Mayaqua/Table.h \ > src/Mayaqua/Unix.c > >@@ -32,18 +38,27 @@ > ONLY_FOR_ARCHS= i386 amd64 > > USE_OPENSSL= yes >-USES= dos2unix gmake iconv:wchar_t localbase:ldflags ncurses readline >-USE_RC_SUBR= softether_bridge softether_client softether_server >+USES= dos2unix gmake iconv:wchar_t ncurses readline >+USE_RC_SUBR= softether_client softether_bridge softether_server > SUB_FILES= vpncmd > MAKE_JOBS_UNSAFE= yes > >+LOGDIR?= /var/log/softether >+PLIST_SUB+= LOGDIR="${LOGDIR}" >+SUB_LIST= LOGDIR="${LOGDIR}" >+ > # a pity the source directory has such a naming scheme, but well >-WRKSRC= ${WRKDIR}/v4.18-9570 >+WRKSRC= ${WRKDIR}/v4.20-9608 > > ALL_TARGET= build > > .include <bsd.port.options.mk> > >+# requires OpenSSL from ports >+.if ${OSVERSION} < 1000000 >+WITH_OPENSSL_PORT= yes >+.endif >+ > # skip configure at all and copy the corresponding Makefile in place > post-extract: > .if ${ARCH} != "amd64" >@@ -60,15 +75,19 @@ > # into ${PREFIX}/sbin > do-install: > ${MKDIR} ${STAGEDIR}/${PREFIX}/libexec/softether >- ${INSTALL_PROGRAM} ${WRKSRC}/bin/vpnbridge/vpnbridge ${STAGEDIR}/${PREFIX}/libexec/${PORTNAME}/vpnbridge >- ${INSTALL_PROGRAM} ${WRKSRC}/bin/vpnclient/vpnclient ${STAGEDIR}/${PREFIX}/libexec/${PORTNAME}/vpnclient >- ${INSTALL_PROGRAM} ${WRKSRC}/bin/vpncmd/vpncmd ${STAGEDIR}/${PREFIX}/libexec/${PORTNAME}/vpncmd >- ${INSTALL_PROGRAM} ${WRKSRC}/bin/vpnserver/vpnserver ${STAGEDIR}/${PREFIX}/libexec/${PORTNAME}/vpnserver >+ ${INSTALL_SCRIPT} ${WRKSRC}/bin/vpnbridge/vpnbridge ${STAGEDIR}/${PREFIX}/libexec/${PORTNAME}/vpnbridge >+ ${INSTALL_SCRIPT} ${WRKSRC}/bin/vpnclient/vpnclient ${STAGEDIR}/${PREFIX}/libexec/${PORTNAME}/vpnclient >+ ${INSTALL_SCRIPT} ${WRKSRC}/bin/vpncmd/vpncmd ${STAGEDIR}/${PREFIX}/libexec/${PORTNAME}/vpncmd >+ ${INSTALL_SCRIPT} ${WRKSRC}/bin/vpnserver/vpnserver ${STAGEDIR}/${PREFIX}/libexec/${PORTNAME}/vpnserver > ${INSTALL_DATA} ${WRKSRC}/bin/vpnserver/hamcore.se2 ${STAGEDIR}/${PREFIX}/libexec/${PORTNAME}/hamcore.se2 > ${INSTALL_SCRIPT} ${WRKDIR}/vpncmd ${STAGEDIR}/${PREFIX}/sbin/vpncmd > >-post-install-DOCS-on: >+post-install: >+.for i in vpnbridge vpnclient vpncmd vpnserver >+ @${STRIP_CMD} ${STAGEDIR}${PREFIX}/libexec/${PORTNAME}/${i} >+.endfor > @${MKDIR} ${STAGEDIR}${DOCSDIR} >+ @${MKDIR} ${STAGEDIR}${LOGDIR} > .for doc in ${PORTDOCS} > ${INSTALL_DATA} ${WRKSRC}/${doc} ${STAGEDIR}${DOCSDIR} > .endfor >Index: security/softether/distinfo >=================================================================== >--- security/softether/distinfo (revision 434775) >+++ security/softether/distinfo (working copy) >@@ -1,2 +1,2 @@ >-SHA256 (softether-src-v4.18-9570-rtm.tar.gz) = 585d61e524d3cad90806cbeb52ebe54b5144359e6c44676e8e7fb5683ffd4574 >-SIZE (softether-src-v4.18-9570-rtm.tar.gz) = 35180998 >+SHA256 (softether-src-v4.20-9608-rtm.tar.gz) = e559644e34ec6feba43d99f4083f77f9b082dd0574d0bb1e416a65f32ccbc51e >+SIZE (softether-src-v4.20-9608-rtm.tar.gz) = 33691945 >Index: security/softether/files/patch-src_Cedar_Cedar.h >=================================================================== >--- security/softether/files/patch-src_Cedar_Cedar.h (nonexistent) >+++ security/softether/files/patch-src_Cedar_Cedar.h (working copy) >@@ -0,0 +1,75 @@ >+--- src/Cedar/Cedar.h.orig 2016-05-03 06:16:53 UTC >++++ src/Cedar/Cedar.h >+@@ -510,22 +510,22 @@ >+ #define LOG_ENGINE_BUFFER_CACHE_SIZE_MAX (10 * 1024 * 1024) // Write cache size >+ >+ // Constant such as a file name >+-#define SERVER_LOG_DIR_NAME "@server_log" >++#define SERVER_LOG_DIR_NAME "/var/log/softether/server" >+ #define BRIDGE_LOG_DIR_NAME SERVER_LOG_DIR_NAME >+ #define SERVER_LOG_PERFIX "vpn" >+ >+-#define HUB_SECURITY_LOG_DIR_NAME "@security_log" >+-#define HUB_SECURITY_LOG_FILE_NAME "@security_log/%s" >++#define HUB_SECURITY_LOG_DIR_NAME "/var/log/softether/security" >++#define HUB_SECURITY_LOG_FILE_NAME "/var/log/softether/security/%s" >+ #define HUB_SECURITY_LOG_PREFIX "sec" >+-#define HUB_PACKET_LOG_DIR_NAME "@packet_log" >+-#define HUB_PACKET_LOG_FILE_NAME "@packet_log/%s" >++#define HUB_PACKET_LOG_DIR_NAME "/var/log/softether/packet" >++#define HUB_PACKET_LOG_FILE_NAME "/var/log/softether/packet/%s" >+ #define HUB_PACKET_LOG_PREFIX "pkt" >+ >+-#define NAT_LOG_DIR_NAME "@secure_nat_log" >+-#define NAT_LOG_FILE_NAME "@secure_nat_log/%s" >++#define NAT_LOG_DIR_NAME "/var/log/softether/secure_nat" >++#define NAT_LOG_FILE_NAME "/var/log/softether/secure_nat/%s" >+ #define NAT_LOG_PREFIX "snat" >+ >+-#define CLIENT_LOG_DIR_NAME "@client_log" >++#define CLIENT_LOG_DIR_NAME "/var/log/softether/client" >+ #define CLIENT_LOG_PREFIX "client" >+ >+ // Packet log settings >+@@ -560,8 +560,8 @@ >+ #define DISK_FREE_CHECK_INTERVAL_DEFAULT (5 * 60 * 1000) >+ >+ // Simple log >+-#define TINY_LOG_DIRNAME "@tiny_log" >+-#define TINY_LOG_FILENAME "@tiny_log/%04u%02u%02u_%02u%02u%02u.log" >++#define TINY_LOG_DIRNAME "/var/log/softether/tiny" >++#define TINY_LOG_FILENAME "/var/log/softether/tiny/%04u%02u%02u_%02u%02u%02u.log" >+ >+ >+ ////////////////////////////////////////////////////////////////////// >+@@ -574,7 +574,7 @@ >+ //#define CE_SNAPSHOT_INTERVAL ((UINT64)(3000)) >+ #define CE_SNAPSHOT_POLLING_INTERVAL (1 * 1000) >+ #define CE_SNAPSHOT_POLLING_INTERVAL_LICENSE (30 * 1000) >+-#define CE_SNAPSHOT_DIR_NAME "@carrier_log" >++#define CE_SNAPSHOT_DIR_NAME "/var/log/softether/carrier" >+ #define CE_SNAPSHOT_PREFIX "carrier" >+ >+ >+@@ -591,7 +591,7 @@ >+ // Expiration date of random size cache >+ #define RAND_SIZE_CACHE_EXPIRE (24 * 60 * 60 * 1000) >+ // Management allowed IP address list file name >+-#define ADMINIP_TXT "@adminip.txt" >++#define ADMINIP_TXT "/var/db/softether/adminip.txt" >+ >+ #define NON_SSL_MIN_COUNT 60 >+ #define NON_SSL_ENTRY_EXPIRES (10 * 60 * 1000) >+@@ -642,9 +642,9 @@ >+ ////////////////////////////////////////////////////////////////////// >+ >+ #define EL_ADMIN_PORT 22888 >+-#define EL_CONFIG_FILENAME "@etherlogger.config" >+-#define EL_PACKET_LOG_DIR_NAME "@etherlogger_log" >+-#define EL_PACKET_LOG_FILE_NAME "@etherlogger_log/%s" >++#define EL_CONFIG_FILENAME "/var/db/softether/etherlogger.config" >++#define EL_PACKET_LOG_DIR_NAME "/var/log/softether/etherlogger" >++#define EL_PACKET_LOG_FILE_NAME "/var/log/softether/etherlogger/%s" >+ #define EL_PACKET_LOG_PREFIX "pkt" >+ #define EL_LICENSE_CHECK_SPAN (10 * 1000) >+ > >Property changes on: security/softether/files/patch-src_Cedar_Cedar.h >___________________________________________________________________ >Added: fbsd:nokeywords >## -0,0 +1 ## >+yes >\ No newline at end of property >Added: svn:eol-style >## -0,0 +1 ## >+native >\ No newline at end of property >Added: svn:mime-type >## -0,0 +1 ## >+text/plain >\ No newline at end of property >Index: security/softether/files/patch-src_Cedar_Client.h >=================================================================== >--- security/softether/files/patch-src_Cedar_Client.h (nonexistent) >+++ security/softether/files/patch-src_Cedar_Client.h (working copy) >@@ -0,0 +1,20 @@ >+--- src/Cedar/Client.h.orig 2016-05-03 06:16:53 UTC >++++ src/Cedar/Client.h >+@@ -125,7 +125,7 @@ >+ >+ >+ // Constants >+-#define CLIENT_CONFIG_FILE_NAME "@vpn_client.config" >++#define CLIENT_CONFIG_FILE_NAME "/var/db/softether/vpn_client.config" >+ #define CLIENT_DEFAULT_KEEPALIVE_HOST "keepalive.softether.org" >+ #define CLIENT_DEFAULT_KEEPALIVE_PORT 80 >+ #define CLIENT_DEFAULT_KEEPALIVE_INTERVAL KEEP_INTERVAL_DEFAULT >+@@ -145,7 +145,7 @@ >+ #define CLIENT_WIN32_EXE_FILENAME_X64 "vpnclient_x64.exe" >+ #define CLIENT_WIN32_EXE_FILENAME_IA64 "vpnclient_ia64.exe" >+ >+-#define CLIENT_CUSTOM_INI_FILENAME "@custom.ini" >++#define CLIENT_CUSTOM_INI_FILENAME "/var/db/softether/custom.ini" >+ >+ #define CLIENT_GLOBAL_PULSE_NAME "clientglobalpulse" >+ > >Property changes on: security/softether/files/patch-src_Cedar_Client.h >___________________________________________________________________ >Added: fbsd:nokeywords >## -0,0 +1 ## >+yes >\ No newline at end of property >Added: svn:eol-style >## -0,0 +1 ## >+native >\ No newline at end of property >Added: svn:mime-type >## -0,0 +1 ## >+text/plain >\ No newline at end of property >Index: security/softether/files/patch-src_Cedar_Nat.h >=================================================================== >--- security/softether/files/patch-src_Cedar_Nat.h (nonexistent) >+++ security/softether/files/patch-src_Cedar_Nat.h (working copy) >@@ -0,0 +1,11 @@ >+--- src/Cedar/Nat.h.orig 2016-05-03 06:16:53 UTC >++++ src/Cedar/Nat.h >+@@ -115,7 +115,7 @@ >+ #define NAT_H >+ >+ // Constants >+-#define NAT_CONFIG_FILE_NAME "@vpn_router.config" // NAT configuration file >++#define NAT_CONFIG_FILE_NAME "/var/db/softether/vpn_router.config" // NAT configuration file >+ #define DEFAULT_NAT_ADMIN_PORT 2828 // Default port number for management >+ #define NAT_ADMIN_PORT_LISTEN_INTERVAL 1000 // Interval for trying to open a port for management >+ #define NAT_FILE_SAVE_INTERVAL (30 * 1000) // Interval to save > >Property changes on: security/softether/files/patch-src_Cedar_Nat.h >___________________________________________________________________ >Added: fbsd:nokeywords >## -0,0 +1 ## >+yes >\ No newline at end of property >Added: svn:eol-style >## -0,0 +1 ## >+native >\ No newline at end of property >Added: svn:mime-type >## -0,0 +1 ## >+text/plain >\ No newline at end of property >Index: security/softether/files/patch-src_Cedar_Server.c >=================================================================== >--- security/softether/files/patch-src_Cedar_Server.c (nonexistent) >+++ security/softether/files/patch-src_Cedar_Server.c (working copy) >@@ -0,0 +1,30 @@ >+--- src/Cedar/Server.c.orig 2016-05-03 06:16:53 UTC >++++ src/Cedar/Server.c >+@@ -115,12 +115,12 @@ >+ >+ static SERVER *server = NULL; >+ static LOCK *server_lock = NULL; >+-char *SERVER_CONFIG_FILE_NAME = "@vpn_server.config"; >+-char *SERVER_CONFIG_FILE_NAME_IN_CLIENT = "@vpn_gate_svc.config"; >+-char *SERVER_CONFIG_FILE_NAME_IN_CLIENT_RELAY = "@vpn_gate_relay.config"; >+-char *BRIDGE_CONFIG_FILE_NAME = "@vpn_bridge.config"; >+-char *SERVER_CONFIG_TEMPLATE_NAME = "@vpn_server_template.config"; >+-char *BRIDGE_CONFIG_TEMPLATE_NAME = "@vpn_server_template.config"; >++char *SERVER_CONFIG_FILE_NAME = "/var/db/softether/vpn_server.config"; >++char *SERVER_CONFIG_FILE_NAME_IN_CLIENT = "/var/db/softether/vpn_gate_svc.config"; >++char *SERVER_CONFIG_FILE_NAME_IN_CLIENT_RELAY = "/var/db/softether/vpn_gate_relay.config"; >++char *BRIDGE_CONFIG_FILE_NAME = "/var/db/softether/vpn_bridge.config"; >++char *SERVER_CONFIG_TEMPLATE_NAME = "/var/db/softether/vpn_server_template.config"; >++char *BRIDGE_CONFIG_TEMPLATE_NAME = "/var/db/softether/vpn_server_template.config"; >+ >+ static bool server_reset_setting = false; >+ >+@@ -10916,7 +10916,7 @@ SERVER *SiNewServerEx(bool bridge, bool >+ #endif // OS_WIN32 >+ >+ #ifdef ENABLE_AZURE_SERVER >+- if (IsFileExists("@azureserver.config")) >++ if (IsFileExists("/var/db/softether/azureserver.config")) >+ { >+ DisableRDUPServerGlobally(); >+ s->AzureServer = NewAzureServer(s->Cedar); > >Property changes on: security/softether/files/patch-src_Cedar_Server.c >___________________________________________________________________ >Added: fbsd:nokeywords >## -0,0 +1 ## >+yes >\ No newline at end of property >Added: svn:eol-style >## -0,0 +1 ## >+native >\ No newline at end of property >Added: svn:mime-type >## -0,0 +1 ## >+text/plain >\ No newline at end of property >Index: security/softether/files/patch-src_Cedar_Server.h >=================================================================== >--- security/softether/files/patch-src_Cedar_Server.h (nonexistent) >+++ security/softether/files/patch-src_Cedar_Server.h (working copy) >@@ -0,0 +1,11 @@ >+--- src/Cedar/Server.h.orig 2016-05-03 06:16:53 UTC >++++ src/Cedar/Server.h >+@@ -152,7 +152,7 @@ extern char *SERVER_CONFIG_FILE_NAME; >+ >+ #define MAX_PUBLIC_PORT_NUM 128 >+ >+-#define MEMBER_SELECTOR_TXT_FILENAME "@member_selector.config" >++#define MEMBER_SELECTOR_TXT_FILENAME "/var/db/softether/member_selector.config" >+ #define MEMBER_SELECTOR_CONNECT_TIMEOUT 2000 >+ #define MEMBER_SELECTOR_DATA_TIMEOUT 5000 >+ > >Property changes on: security/softether/files/patch-src_Cedar_Server.h >___________________________________________________________________ >Added: fbsd:nokeywords >## -0,0 +1 ## >+yes >\ No newline at end of property >Added: svn:eol-style >## -0,0 +1 ## >+native >\ No newline at end of property >Added: svn:mime-type >## -0,0 +1 ## >+text/plain >\ No newline at end of property >Index: security/softether/files/patch-src_Cedar_Virtual.h >=================================================================== >--- security/softether/files/patch-src_Cedar_Virtual.h (nonexistent) >+++ security/softether/files/patch-src_Cedar_Virtual.h (working copy) >@@ -0,0 +1,11 @@ >+--- src/Cedar/Virtual.h.orig 2016-05-03 06:16:53 UTC >++++ src/Cedar/Virtual.h >+@@ -133,7 +133,7 @@ >+ #define NN_POLL_CONNECTIVITY_INTERVAL (1 * 60 * 1000) >+ >+ #define NN_MAX_QUEUE_LENGTH 10000 >+-#define NN_NO_NATIVE_NAT_FILENAME L"@no_native_nat_niclist.txt" >++#define NN_NO_NATIVE_NAT_FILENAME L"/var/db/softether/no_native_nat_niclist.txt" >+ >+ #define NN_TIMEOUT_FOR_UNESTBALISHED_TCP (10 * 1000) // Time-out period of a TCP connection incomplete session >+ > >Property changes on: security/softether/files/patch-src_Cedar_Virtual.h >___________________________________________________________________ >Added: fbsd:nokeywords >## -0,0 +1 ## >+yes >\ No newline at end of property >Added: svn:eol-style >## -0,0 +1 ## >+native >\ No newline at end of property >Added: svn:mime-type >## -0,0 +1 ## >+text/plain >\ No newline at end of property >Index: security/softether/files/patch-src_Mayaqua_Cfg.c >=================================================================== >--- security/softether/files/patch-src_Mayaqua_Cfg.c (nonexistent) >+++ security/softether/files/patch-src_Mayaqua_Cfg.c (working copy) >@@ -0,0 +1,11 @@ >+--- src/Mayaqua/Cfg.c.orig 2016-05-03 06:16:53 UTC >++++ src/Mayaqua/Cfg.c >+@@ -139,7 +139,7 @@ void BackupCfgWEx(CFG_RW *rw, FOLDER *f, >+ } >+ >+ // Determine the directory name >+- UniFormat(dirname, sizeof(dirname), L"@backup.%s", original[0] == L'@' ? original + 1 : original); >++ UniFormat(dirname, sizeof(dirname), L"/var/db/softether/backup.%s", original[0] == L'@' ? original + 1 : original); >+ >+ // Determine the file name >+ LocalTime(&st); > >Property changes on: security/softether/files/patch-src_Mayaqua_Cfg.c >___________________________________________________________________ >Added: fbsd:nokeywords >## -0,0 +1 ## >+yes >\ No newline at end of property >Added: svn:eol-style >## -0,0 +1 ## >+native >\ No newline at end of property >Added: svn:mime-type >## -0,0 +1 ## >+text/plain >\ No newline at end of property >Index: security/softether/files/patch-src_Mayaqua_Cfg.h >=================================================================== >--- security/softether/files/patch-src_Mayaqua_Cfg.h (nonexistent) >+++ security/softether/files/patch-src_Mayaqua_Cfg.h (working copy) >@@ -0,0 +1,11 @@ >+--- src/Mayaqua/Cfg.h.orig 2016-05-03 06:16:53 UTC >++++ src/Mayaqua/Cfg.h >+@@ -117,7 +117,7 @@ >+ // Macro >+ //#define CHECK_CFG_NAME_EXISTS // Check duplication of the existing name >+ >+-#define SAVE_BINARY_FILE_NAME_SWITCH L"@save_binary" >++#define SAVE_BINARY_FILE_NAME_SWITCH L"/var/db/softether/save_binary" >+ >+ // Constants >+ #define TAG_DECLARE "declare" > >Property changes on: security/softether/files/patch-src_Mayaqua_Cfg.h >___________________________________________________________________ >Added: fbsd:nokeywords >## -0,0 +1 ## >+yes >\ No newline at end of property >Added: svn:eol-style >## -0,0 +1 ## >+native >\ No newline at end of property >Added: svn:mime-type >## -0,0 +1 ## >+text/plain >\ No newline at end of property >Index: security/softether/files/patch-src_Mayaqua_Kernel.c >=================================================================== >--- security/softether/files/patch-src_Mayaqua_Kernel.c (nonexistent) >+++ security/softether/files/patch-src_Mayaqua_Kernel.c (working copy) >@@ -0,0 +1,11 @@ >+--- src/Mayaqua/Kernel.c.orig 2016-05-03 06:16:53 UTC >++++ src/Mayaqua/Kernel.c >+@@ -2213,7 +2213,7 @@ void AbortExitEx(char *msg) >+ msg = "Unknown Error"; >+ } >+ >+- f = fopen("abort_error_log.txt", "w"); >++ f = fopen("/var/db/softether/abort_error_log.txt", "w"); >+ if (f != NULL) >+ { >+ fwrite(msg, 1, strlen(msg), f); > >Property changes on: security/softether/files/patch-src_Mayaqua_Kernel.c >___________________________________________________________________ >Added: fbsd:nokeywords >## -0,0 +1 ## >+yes >\ No newline at end of property >Added: svn:eol-style >## -0,0 +1 ## >+native >\ No newline at end of property >Added: svn:mime-type >## -0,0 +1 ## >+text/plain >\ No newline at end of property >Index: security/softether/files/patch-src_Mayaqua_Mayaqua.c >=================================================================== >--- security/softether/files/patch-src_Mayaqua_Mayaqua.c (nonexistent) >+++ security/softether/files/patch-src_Mayaqua_Mayaqua.c (working copy) >@@ -0,0 +1,16 @@ >+--- src/Mayaqua/Mayaqua.c.orig 2016-05-03 06:16:53 UTC >++++ src/Mayaqua/Mayaqua.c >+@@ -306,11 +306,11 @@ void FreeProbe() >+ char filename[MAX_SIZE]; >+ >+ // Write all to the file >+- MakeDirEx("@probe_log"); >++ MakeDirEx("/var/db/softether/probe"); >+ >+ LocalTime(&st); >+ >+- snprintf(filename, sizeof(filename), "@probe_log/%04u%02u%02u_%02u%02u%02u.log", >++ snprintf(filename, sizeof(filename), "/var/db/softether/probe/%04u%02u%02u_%02u%02u%02u.log", >+ st.wYear, st.wMonth, st.wDay, st.wHour, st.wMinute, st.wSecond); >+ >+ DumpBuf(probe_buf, filename); > >Property changes on: security/softether/files/patch-src_Mayaqua_Mayaqua.c >___________________________________________________________________ >Added: fbsd:nokeywords >## -0,0 +1 ## >+yes >\ No newline at end of property >Added: svn:eol-style >## -0,0 +1 ## >+native >\ No newline at end of property >Added: svn:mime-type >## -0,0 +1 ## >+text/plain >\ No newline at end of property >Index: security/softether/files/patch-src_Mayaqua_Network.c >=================================================================== >--- security/softether/files/patch-src_Mayaqua_Network.c (nonexistent) >+++ security/softether/files/patch-src_Mayaqua_Network.c (working copy) >@@ -0,0 +1,19 @@ >+--- src/Mayaqua/Network.c.orig 2016-05-03 06:16:53 UTC >++++ src/Mayaqua/Network.c >+@@ -12983,7 +12983,16 @@ bool StartSSLEx(SOCK *sock, X *x, K *pri >+ { >+ if (client_tls == false) >+ { >++#ifndef OPENSSL_NO_SSL3 >+ SSL_CTX_set_ssl_version(ssl_ctx, SSLv3_method()); >++#else >++ SSL_CTX_set_ssl_version(ssl_ctx, SSLv23_method()); >++ SSL_CTX_set_options(ssl_ctx, SSL_OP_NO_SSLv2 | SSL_OP_NO_TLSv1 >++#ifdef SSL_OP_NO_TLSv1_2 >++ | SSL_OP_NO_TLSv1_1 | SSL_OP_NO_TLSv1_2 >++#endif >++ ); >++#endif >+ } >+ else >+ { > >Property changes on: security/softether/files/patch-src_Mayaqua_Network.c >___________________________________________________________________ >Added: fbsd:nokeywords >## -0,0 +1 ## >+yes >\ No newline at end of property >Added: svn:eol-style >## -0,0 +1 ## >+native >\ No newline at end of property >Added: svn:mime-type >## -0,0 +1 ## >+text/plain >\ No newline at end of property >Index: security/softether/files/patch-src_Mayaqua_Network.h >=================================================================== >--- security/softether/files/patch-src_Mayaqua_Network.h (nonexistent) >+++ security/softether/files/patch-src_Mayaqua_Network.h (working copy) >@@ -0,0 +1,15 @@ >+--- src/Mayaqua/Network.h.orig 2016-05-03 06:16:53 UTC >++++ src/Mayaqua/Network.h >+@@ -156,10 +156,10 @@ struct DYN_VALUE >+ >+ // SSL logging function >+ //#define ENABLE_SSL_LOGGING >+-#define SSL_LOGGING_DIRNAME "@ssl_log" >++#define SSL_LOGGING_DIRNAME "/var/log/softether/ssl" >+ >+ // Private IP list file >+-#define PRIVATE_IP_TXT_FILENAME "@private_ip.txt" >++#define PRIVATE_IP_TXT_FILENAME "/var/log/softether/private_ip.txt" >+ >+ // Start range of the random UDP port >+ #define RAND_UDP_PORT_START 5000 > >Property changes on: security/softether/files/patch-src_Mayaqua_Network.h >___________________________________________________________________ >Added: fbsd:nokeywords >## -0,0 +1 ## >+yes >\ No newline at end of property >Added: svn:eol-style >## -0,0 +1 ## >+native >\ No newline at end of property >Added: svn:mime-type >## -0,0 +1 ## >+text/plain >\ No newline at end of property >Index: security/softether/files/patch-src_Mayaqua_Table.h >=================================================================== >--- security/softether/files/patch-src_Mayaqua_Table.h (nonexistent) >+++ security/softether/files/patch-src_Mayaqua_Table.h (working copy) >@@ -0,0 +1,11 @@ >+--- src/Mayaqua/Table.h.orig 2016-05-03 06:16:53 UTC >++++ src/Mayaqua/Table.h >+@@ -117,7 +117,7 @@ >+ #define UNICODE_CACHE_FILE L".unicode_cache_%s.dat" >+ >+ #define LANGLIST_FILENAME "|languages.txt" >+-#define LANG_CONFIG_FILENAME L"@lang.config" >++#define LANG_CONFIG_FILENAME L"/var/db/softether/lang.config" >+ #define LANG_CONFIG_TEMPLETE "|lang.config" >+ >+ // Language constant > >Property changes on: security/softether/files/patch-src_Mayaqua_Table.h >___________________________________________________________________ >Added: fbsd:nokeywords >## -0,0 +1 ## >+yes >\ No newline at end of property >Added: svn:eol-style >## -0,0 +1 ## >+native >\ No newline at end of property >Added: svn:mime-type >## -0,0 +1 ## >+text/plain >\ No newline at end of property >Index: security/softether/files/patch-src_Mayaqua_Unix.c >=================================================================== >--- security/softether/files/patch-src_Mayaqua_Unix.c (nonexistent) >+++ security/softether/files/patch-src_Mayaqua_Unix.c (working copy) >@@ -0,0 +1,29 @@ >+--- src/Mayaqua/Unix.c.orig 2016-05-03 06:16:53 UTC >++++ src/Mayaqua/Unix.c >+@@ -931,7 +931,7 @@ void *UnixNewSingleInstance(char *instan >+ GetExeDir(dir, sizeof(dir)); >+ >+ // File name generation >+- Format(name, sizeof(name), "%s/.%s", dir, tmp); >++ Format(name, sizeof(name), "/var/db/softether/.%s", tmp); >+ >+ fd = open(name, O_WRONLY); >+ if (fd == -1) >+@@ -2320,7 +2320,7 @@ void UnixGenPidFileName(char *name, UINT >+ Hash(hash, exe_name, StrLen(exe_name), false); >+ BinToStr(tmp1, sizeof(tmp1), hash, sizeof(hash)); >+ >+- Format(name, size, "%s/.pid_%s", dir, tmp1); >++ Format(name, size, "/var/db/softether/%s.pid", tmp1); >+ } >+ >+ // Delete the PID file >+@@ -2365,7 +2365,7 @@ void UnixGenCtlFileName(char *name, UINT >+ Hash(hash, exe_name, StrLen(exe_name), false); >+ BinToStr(tmp1, sizeof(tmp1), hash, sizeof(hash)); >+ >+- Format(name, size, "%s/.ctl_%s", dir, tmp1); >++ Format(name, size, "/var/db/softether/.ctl_%s", tmp1); >+ } >+ >+ // Write the CTL file > >Property changes on: security/softether/files/patch-src_Mayaqua_Unix.c >___________________________________________________________________ >Added: fbsd:nokeywords >## -0,0 +1 ## >+yes >\ No newline at end of property >Added: svn:eol-style >## -0,0 +1 ## >+native >\ No newline at end of property >Added: svn:mime-type >## -0,0 +1 ## >+text/plain >\ No newline at end of property >Index: security/softether/pkg-message >=================================================================== >--- security/softether/pkg-message (revision 434775) >+++ security/softether/pkg-message (working copy) >@@ -1,5 +1,8 @@ > ************************************************************************** > >+To run softether vpn client from startup, add >+softether_client_enable="YES" in your rc.conf. >+ > To run softether vpn server from startup, add > softether_server_enable="YES" in your rc.conf. > >@@ -6,13 +9,13 @@ > To run softether vpn bridge from startup, add > softether_bridge_enable="YES" in your rc.conf. > >-To run softether vpn client from startup, add >-softether_client_enable="YES" in your rc.conf. >- > Initial and further configuration of all softether services can be > done either by using a Windows client to connect to the running > services or by vpncmd from command line. > >+Please note client and brige functionality is right now not fully >+supported on FreeBSD. >+ > When removing SoftEther VPN without the desire to reinstall, please > ensure to remove the directory /var/db/softether as well. > >Index: security/softether/pkg-plist >=================================================================== >--- security/softether/pkg-plist (revision 434775) >+++ security/softether/pkg-plist (working copy) >@@ -5,3 +5,4 @@ > libexec/softether/vpnserver > sbin/vpncmd > @dir libexec/softether >+@dir %%LOGDIR%%
You cannot view the attachment while viewing its details because your browser does not support IFRAMEs.
View the attachment on a separate page
.
View Attachment As Diff
View Attachment As Raw
Actions:
View
|
Diff
Attachments on
bug 209195
:
169873
|
169888
|
169931
|
176792
| 180304 |
180342