Date: Mon, 27 Feb 2017 20:56:32 +0000 (UTC) From: Kurt Jaeger <pi@FreeBSD.org> To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r434989 - in head/security/softether: . files Message-ID: <201702272056.v1RKuW2d067239@repo.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: pi Date: Mon Feb 27 20:56:31 2017 New Revision: 434989 URL: https://svnweb.freebsd.org/changeset/ports/434989 Log: security/softether: update 4.18.9570 -> 4.20.9608 PR: 209195 Submitted by: net@arrishq.net (maintainer) Changes: http://www.softether.org/5-download/history Modified: head/security/softether/Makefile head/security/softether/distinfo head/security/softether/files/patch-src__Cedar__Cedar.h head/security/softether/files/patch-src__Cedar__Client.h head/security/softether/files/patch-src__Cedar__Nat.h head/security/softether/files/patch-src__Cedar__Server.c head/security/softether/files/patch-src__Mayaqua__Cfg.c head/security/softether/files/patch-src__Mayaqua__Cfg.h head/security/softether/files/patch-src__Mayaqua__Kernel.c head/security/softether/files/patch-src__Mayaqua__Network.c head/security/softether/files/patch-src__Mayaqua__Table.h head/security/softether/files/patch-src__Mayaqua__Unix.c head/security/softether/pkg-message head/security/softether/pkg-plist Modified: head/security/softether/Makefile ============================================================================== --- head/security/softether/Makefile Mon Feb 27 20:50:05 2017 (r434988) +++ head/security/softether/Makefile Mon Feb 27 20:56:31 2017 (r434989) @@ -1,17 +1,19 @@ # $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 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 @@ DOS2UNIX_FILES= AUTHORS.TXT ChangeLog LI 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/Network.c \ src/Mayaqua/Kernel.c \ + src/Mayaqua/Mayaqua.c \ + src/Mayaqua/Network.c \ + src/Mayaqua/Network.h \ src/Mayaqua/Table.h \ src/Mayaqua/Unix.c @@ -31,14 +37,18 @@ OPTIONS_DEFINE= DOCS ONLY_FOR_ARCHS= i386 amd64 -USE_OPENSSL= yes -USES= dos2unix gmake iconv:wchar_t localbase:ldflags ncurses readline +USES= dos2unix gmake iconv:wchar_t localbase:ldflags ncurses \ + readline ssl USE_RC_SUBR= softether_bridge softether_client 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 @@ -60,15 +70,19 @@ post-extract: # 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 Modified: head/security/softether/distinfo ============================================================================== --- head/security/softether/distinfo Mon Feb 27 20:50:05 2017 (r434988) +++ head/security/softether/distinfo Mon Feb 27 20:56:31 2017 (r434989) @@ -1,2 +1,3 @@ -SHA256 (softether-src-v4.18-9570-rtm.tar.gz) = 585d61e524d3cad90806cbeb52ebe54b5144359e6c44676e8e7fb5683ffd4574 -SIZE (softether-src-v4.18-9570-rtm.tar.gz) = 35180998 +TIMESTAMP = 1488228971 +SHA256 (softether-src-v4.20-9608-rtm.tar.gz) = e559644e34ec6feba43d99f4083f77f9b082dd0574d0bb1e416a65f32ccbc51e +SIZE (softether-src-v4.20-9608-rtm.tar.gz) = 33691945 Modified: head/security/softether/files/patch-src__Cedar__Cedar.h ============================================================================== --- head/security/softether/files/patch-src__Cedar__Cedar.h Mon Feb 27 20:50:05 2017 (r434988) +++ head/security/softether/files/patch-src__Cedar__Cedar.h Mon Feb 27 20:56:31 2017 (r434989) @@ -1,57 +1,57 @@ ---- src/Cedar/Cedar.h.orig 2014-06-08 06:19:15 UTC +--- src/Cedar/Cedar.h.orig 2016-05-03 06:16:53 UTC +++ src/Cedar/Cedar.h -@@ -477,22 +477,22 @@ +@@ -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/db/softether/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/db/softether/security_log" -+#define HUB_SECURITY_LOG_FILE_NAME "/var/db/softether/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/db/softether/packet_log" -+#define HUB_PACKET_LOG_FILE_NAME "/var/db/softether/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/db/softether/secure_nat_log" -+#define NAT_LOG_FILE_NAME "/var/db/softether/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/db/softether/client_log" ++#define CLIENT_LOG_DIR_NAME "/var/log/softether/client" #define CLIENT_LOG_PREFIX "client" // Packet log settings -@@ -527,8 +527,8 @@ - #define DISK_FREE_CHECK_INTERVAL (5 * 60 * 1000) +@@ -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/db/softether/tiny_log" -+#define TINY_LOG_FILENAME "/var/db/softether/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" ////////////////////////////////////////////////////////////////////// -@@ -541,7 +541,7 @@ +@@ -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/db/softether/carrier_log" ++#define CE_SNAPSHOT_DIR_NAME "/var/log/softether/carrier" #define CE_SNAPSHOT_PREFIX "carrier" -@@ -558,7 +558,7 @@ +@@ -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 @@ -60,7 +60,7 @@ #define NON_SSL_MIN_COUNT 60 #define NON_SSL_ENTRY_EXPIRES (10 * 60 * 1000) -@@ -609,9 +609,9 @@ +@@ -642,9 +642,9 @@ ////////////////////////////////////////////////////////////////////// #define EL_ADMIN_PORT 22888 @@ -68,8 +68,8 @@ -#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/db/softether/etherlogger_log" -+#define EL_PACKET_LOG_FILE_NAME "/var/db/softether/etherlogger_log/%s" ++#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) Modified: head/security/softether/files/patch-src__Cedar__Client.h ============================================================================== --- head/security/softether/files/patch-src__Cedar__Client.h Mon Feb 27 20:50:05 2017 (r434988) +++ head/security/softether/files/patch-src__Cedar__Client.h Mon Feb 27 20:56:31 2017 (r434989) @@ -1,4 +1,4 @@ ---- src/Cedar/Client.h.orig 2014-06-08 06:19:15 UTC +--- src/Cedar/Client.h.orig 2016-05-03 06:16:53 UTC +++ src/Cedar/Client.h @@ -125,7 +125,7 @@ Modified: head/security/softether/files/patch-src__Cedar__Nat.h ============================================================================== --- head/security/softether/files/patch-src__Cedar__Nat.h Mon Feb 27 20:50:05 2017 (r434988) +++ head/security/softether/files/patch-src__Cedar__Nat.h Mon Feb 27 20:56:31 2017 (r434989) @@ -1,4 +1,4 @@ ---- src/Cedar/Nat.h.orig 2014-06-08 06:19:15 UTC +--- src/Cedar/Nat.h.orig 2016-05-03 06:16:53 UTC +++ src/Cedar/Nat.h @@ -115,7 +115,7 @@ #define NAT_H Modified: head/security/softether/files/patch-src__Cedar__Server.c ============================================================================== --- head/security/softether/files/patch-src__Cedar__Server.c Mon Feb 27 20:50:05 2017 (r434988) +++ head/security/softether/files/patch-src__Cedar__Server.c Mon Feb 27 20:56:31 2017 (r434989) @@ -1,4 +1,4 @@ ---- src/Cedar/Server.c.orig 2014-06-08 06:19:15 UTC +--- src/Cedar/Server.c.orig 2016-05-03 06:16:53 UTC +++ src/Cedar/Server.c @@ -115,12 +115,12 @@ @@ -19,3 +19,12 @@ 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); Modified: head/security/softether/files/patch-src__Mayaqua__Cfg.c ============================================================================== --- head/security/softether/files/patch-src__Mayaqua__Cfg.c Mon Feb 27 20:50:05 2017 (r434988) +++ head/security/softether/files/patch-src__Mayaqua__Cfg.c Mon Feb 27 20:56:31 2017 (r434989) @@ -1,6 +1,6 @@ ---- src/Mayaqua/Cfg.c.orig 2014-06-08 06:19:14 UTC +--- src/Mayaqua/Cfg.c.orig 2016-05-03 06:16:53 UTC +++ src/Mayaqua/Cfg.c -@@ -124,7 +124,7 @@ +@@ -139,7 +139,7 @@ void BackupCfgWEx(CFG_RW *rw, FOLDER *f, } // Determine the directory name Modified: head/security/softether/files/patch-src__Mayaqua__Cfg.h ============================================================================== --- head/security/softether/files/patch-src__Mayaqua__Cfg.h Mon Feb 27 20:50:05 2017 (r434988) +++ head/security/softether/files/patch-src__Mayaqua__Cfg.h Mon Feb 27 20:56:31 2017 (r434989) @@ -1,6 +1,6 @@ ---- src/Mayaqua/Cfg.h.orig 2014-06-08 06:19:14 UTC +--- src/Mayaqua/Cfg.h.orig 2016-05-03 06:16:53 UTC +++ src/Mayaqua/Cfg.h -@@ -102,7 +102,7 @@ +@@ -117,7 +117,7 @@ // Macro //#define CHECK_CFG_NAME_EXISTS // Check duplication of the existing name Modified: head/security/softether/files/patch-src__Mayaqua__Kernel.c ============================================================================== --- head/security/softether/files/patch-src__Mayaqua__Kernel.c Mon Feb 27 20:50:05 2017 (r434988) +++ head/security/softether/files/patch-src__Mayaqua__Kernel.c Mon Feb 27 20:56:31 2017 (r434989) @@ -1,6 +1,6 @@ ---- src/Mayaqua/Kernel.c.orig 2014-06-08 06:19:14 UTC +--- src/Mayaqua/Kernel.c.orig 2016-05-03 06:16:53 UTC +++ src/Mayaqua/Kernel.c -@@ -2160,7 +2160,7 @@ +@@ -2213,7 +2213,7 @@ void AbortExitEx(char *msg) msg = "Unknown Error"; } Modified: head/security/softether/files/patch-src__Mayaqua__Network.c ============================================================================== --- head/security/softether/files/patch-src__Mayaqua__Network.c Mon Feb 27 20:50:05 2017 (r434988) +++ head/security/softether/files/patch-src__Mayaqua__Network.c Mon Feb 27 20:56:31 2017 (r434989) @@ -1,6 +1,6 @@ ---- src/Mayaqua/Network.c.orig 2015-07-26 06:38:18 UTC +--- src/Mayaqua/Network.c.orig 2016-05-03 06:16:53 UTC +++ src/Mayaqua/Network.c -@@ -12920,7 +12920,16 @@ bool StartSSLEx(SOCK *sock, X *x, K *pri +@@ -12983,7 +12983,16 @@ bool StartSSLEx(SOCK *sock, X *x, K *pri { if (client_tls == false) { Modified: head/security/softether/files/patch-src__Mayaqua__Table.h ============================================================================== --- head/security/softether/files/patch-src__Mayaqua__Table.h Mon Feb 27 20:50:05 2017 (r434988) +++ head/security/softether/files/patch-src__Mayaqua__Table.h Mon Feb 27 20:56:31 2017 (r434989) @@ -1,6 +1,6 @@ ---- src/Mayaqua/Table.h.orig 2014-06-08 06:19:14 UTC +--- src/Mayaqua/Table.h.orig 2016-05-03 06:16:53 UTC +++ src/Mayaqua/Table.h -@@ -102,7 +102,7 @@ +@@ -117,7 +117,7 @@ #define UNICODE_CACHE_FILE L".unicode_cache_%s.dat" #define LANGLIST_FILENAME "|languages.txt" Modified: head/security/softether/files/patch-src__Mayaqua__Unix.c ============================================================================== --- head/security/softether/files/patch-src__Mayaqua__Unix.c Mon Feb 27 20:50:05 2017 (r434988) +++ head/security/softether/files/patch-src__Mayaqua__Unix.c Mon Feb 27 20:56:31 2017 (r434989) @@ -1,6 +1,6 @@ ---- src/Mayaqua/Unix.c.orig 2014-06-08 06:19:14 UTC +--- src/Mayaqua/Unix.c.orig 2016-05-03 06:16:53 UTC +++ src/Mayaqua/Unix.c -@@ -916,7 +916,7 @@ +@@ -931,7 +931,7 @@ void *UnixNewSingleInstance(char *instan GetExeDir(dir, sizeof(dir)); // File name generation @@ -9,16 +9,16 @@ fd = open(name, O_WRONLY); if (fd == -1) -@@ -2254,7 +2254,7 @@ +@@ -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/.pid_%s", tmp1); ++ Format(name, size, "/var/db/softether/%s.pid", tmp1); } // Delete the PID file -@@ -2299,7 +2299,7 @@ +@@ -2365,7 +2365,7 @@ void UnixGenCtlFileName(char *name, UINT Hash(hash, exe_name, StrLen(exe_name), false); BinToStr(tmp1, sizeof(tmp1), hash, sizeof(hash)); Modified: head/security/softether/pkg-message ============================================================================== --- head/security/softether/pkg-message Mon Feb 27 20:50:05 2017 (r434988) +++ head/security/softether/pkg-message Mon Feb 27 20:56:31 2017 (r434989) @@ -1,18 +1,21 @@ ************************************************************************** +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. 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 bridge functionality is not fully +supported on FreeBSD right now. + When removing SoftEther VPN without the desire to reinstall, please ensure to remove the directory /var/db/softether as well. Modified: head/security/softether/pkg-plist ============================================================================== --- head/security/softether/pkg-plist Mon Feb 27 20:50:05 2017 (r434988) +++ head/security/softether/pkg-plist Mon Feb 27 20:56:31 2017 (r434989) @@ -5,3 +5,4 @@ libexec/softether/vpncmd libexec/softether/vpnserver sbin/vpncmd @dir libexec/softether +@dir %%LOGDIR%%
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201702272056.v1RKuW2d067239>