Attachment #180304 for bug #209195




# $FreeBSD$

PORTNAME=	softether
PORTVERSION=	4.20.9608
PORTREVISION=	1
CATEGORIES=	security
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 \

		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/Network.h \
		src/Mayaqua/Table.h \
		src/Mayaqua/Unix.c


ONLY_FOR_ARCHS=	i386 amd64

USE_OPENSSL=	yes
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.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"

# into ${PREFIX}/sbin
do-install:
	${MKDIR} ${STAGEDIR}/${PREFIX}/libexec/softether
	${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:
.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

Lines 1-2 Link Here

(-)security/softether/distinfo (-2 / +2 lines)
1	SHA256 (softether-src-v4.18-9570-rtm.tar.gz) = 585d61e524d3cad90806cbeb52ebe54b5144359e6c44676e8e7fb5683ffd4574	1	SHA256 (softether-src-v4.20-9608-rtm.tar.gz) = e559644e34ec6feba43d99f4083f77f9b082dd0574d0bb1e416a65f32ccbc51e
2	SIZE (softether-src-v4.18-9570-rtm.tar.gz) = 35180998	2	SIZE (softether-src-v4.20-9608-rtm.tar.gz) = 33691945




--- 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)
 




--- 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"
 

Line 0 Link Here

(-)security/softether/files/patch-src_Cedar_Nat.h (+11 lines)
	1	--- src/Cedar/Nat.h.orig 2016-05-03 06:16:53 UTC
	2	+++ src/Cedar/Nat.h
	3	@@ -115,7 +115,7 @@
	4	#define NAT_H
	5
	6	// Constants
	7	-#define NAT_CONFIG_FILE_NAME "@vpn_router.config" // NAT configuration file
	8	+#define NAT_CONFIG_FILE_NAME "/var/db/softether/vpn_router.config" // NAT configuration file
	9	#define DEFAULT_NAT_ADMIN_PORT 2828 // Default port number for management
	10	#define NAT_ADMIN_PORT_LISTEN_INTERVAL 1000 // Interval for trying to open a port for management
	11	#define NAT_FILE_SAVE_INTERVAL (30 * 1000) // Interval to save




--- 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);

Line 0 Link Here

(-)security/softether/files/patch-src_Cedar_Server.h (+11 lines)
	1	--- src/Cedar/Server.h.orig 2016-05-03 06:16:53 UTC
	2	+++ src/Cedar/Server.h
	3	@@ -152,7 +152,7 @@ extern char *SERVER_CONFIG_FILE_NAME;
	4
	5	#define MAX_PUBLIC_PORT_NUM 128
	6
	7	-#define MEMBER_SELECTOR_TXT_FILENAME "@member_selector.config"
	8	+#define MEMBER_SELECTOR_TXT_FILENAME "/var/db/softether/member_selector.config"
	9	#define MEMBER_SELECTOR_CONNECT_TIMEOUT 2000
	10	#define MEMBER_SELECTOR_DATA_TIMEOUT 5000
	11

Line 0 Link Here

(-)security/softether/files/patch-src_Cedar_Virtual.h (+11 lines)
	1	--- src/Cedar/Virtual.h.orig 2016-05-03 06:16:53 UTC
	2	+++ src/Cedar/Virtual.h
	3	@@ -133,7 +133,7 @@
	4	#define NN_POLL_CONNECTIVITY_INTERVAL (1 * 60 * 1000)
	5
	6	#define NN_MAX_QUEUE_LENGTH 10000
	7	-#define NN_NO_NATIVE_NAT_FILENAME L"@no_native_nat_niclist.txt"
	8	+#define NN_NO_NATIVE_NAT_FILENAME L"/var/db/softether/no_native_nat_niclist.txt"
	9
	10	#define NN_TIMEOUT_FOR_UNESTBALISHED_TCP (10 * 1000) // Time-out period of a TCP connection incomplete session
	11

Line 0 Link Here

(-)security/softether/files/patch-src_Mayaqua_Cfg.c (+11 lines)
	1	--- src/Mayaqua/Cfg.c.orig 2016-05-03 06:16:53 UTC
	2	+++ src/Mayaqua/Cfg.c
	3	@@ -139,7 +139,7 @@ void BackupCfgWEx(CFG_RW rw, FOLDER f,
	4	}
	5
	6	// Determine the directory name
	7	- UniFormat(dirname, sizeof(dirname), L"@backup.%s", original[0] == L'@' ? original + 1 : original);
	8	+ UniFormat(dirname, sizeof(dirname), L"/var/db/softether/backup.%s", original[0] == L'@' ? original + 1 : original);
	9
	10	// Determine the file name
	11	LocalTime(&st);

Line 0 Link Here

(-)security/softether/files/patch-src_Mayaqua_Cfg.h (+11 lines)
	1	--- src/Mayaqua/Cfg.h.orig 2016-05-03 06:16:53 UTC
	2	+++ src/Mayaqua/Cfg.h
	3	@@ -117,7 +117,7 @@
	4	// Macro
	5	//#define CHECK_CFG_NAME_EXISTS // Check duplication of the existing name
	6
	7	-#define SAVE_BINARY_FILE_NAME_SWITCH L"@save_binary"
	8	+#define SAVE_BINARY_FILE_NAME_SWITCH L"/var/db/softether/save_binary"
	9
	10	// Constants
	11	#define TAG_DECLARE "declare"

Line 0 Link Here

(-)security/softether/files/patch-src_Mayaqua_Kernel.c (+11 lines)
	1	--- src/Mayaqua/Kernel.c.orig 2016-05-03 06:16:53 UTC
	2	+++ src/Mayaqua/Kernel.c
	3	@@ -2213,7 +2213,7 @@ void AbortExitEx(char *msg)
	4	msg = "Unknown Error";
	5	}
	6
	7	- f = fopen("abort_error_log.txt", "w");
	8	+ f = fopen("/var/db/softether/abort_error_log.txt", "w");
	9	if (f != NULL)
	10	{
	11	fwrite(msg, 1, strlen(msg), f);




--- 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);




--- 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
 			{




--- 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

Line 0 Link Here

(-)security/softether/files/patch-src_Mayaqua_Table.h (+11 lines)
	1	--- src/Mayaqua/Table.h.orig 2016-05-03 06:16:53 UTC
	2	+++ src/Mayaqua/Table.h
	3	@@ -117,7 +117,7 @@
	4	#define UNICODE_CACHE_FILE L".unicode_cache_%s.dat"
	5
	6	#define LANGLIST_FILENAME "\|languages.txt"
	7	-#define LANG_CONFIG_FILENAME L"@lang.config"
	8	+#define LANG_CONFIG_FILENAME L"/var/db/softether/lang.config"
	9	#define LANG_CONFIG_TEMPLETE "\|lang.config"
	10
	11	// Language constant




--- 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

Lines 1-5 Link Here

(-)security/softether/pkg-message (-3 / +6 lines)
1	**************************************************************************	1	**************************************************************************
2		2
		3	To run softether vpn client from startup, add
		4	softether_client_enable="YES" in your rc.conf.
		5
3	To run softether vpn server from startup, add	6	To run softether vpn server from startup, add
4	softether_server_enable="YES" in your rc.conf.	7	softether_server_enable="YES" in your rc.conf.
5		8
Lines 6-18 Link Here
6	To run softether vpn bridge from startup, add	9	To run softether vpn bridge from startup, add
7	softether_bridge_enable="YES" in your rc.conf.	10	softether_bridge_enable="YES" in your rc.conf.
8		11
9	To run softether vpn client from startup, add
10	softether_client_enable="YES" in your rc.conf.
11
12	Initial and further configuration of all softether services can be	12	Initial and further configuration of all softether services can be
13	done either by using a Windows client to connect to the running	13	done either by using a Windows client to connect to the running
14	services or by vpncmd from command line.	14	services or by vpncmd from command line.
15		15
		16	Please note client and brige functionality is right now not fully
		17	supported on FreeBSD.
		18
16	When removing SoftEther VPN without the desire to reinstall, please	19	When removing SoftEther VPN without the desire to reinstall, please
17	ensure to remove the directory /var/db/softether as well.	20	ensure to remove the directory /var/db/softether as well.
18		21

Lines 5-7 Link Here

(-)security/softether/pkg-plist (+1 lines)
5	libexec/softether/vpnserver	5	libexec/softether/vpnserver
6	sbin/vpncmd	6	sbin/vpncmd
7	@dir libexec/softether	7	@dir libexec/softether
		8	@dir %%LOGDIR%%

Return to bug 209195

Lines 1-11 Link Here

(-)security/softether/Makefile (-13 / +32 lines)
1	# $FreeBSD$	1	# $FreeBSD$
2		2
3	PORTNAME= softether	3	PORTNAME= softether
4	PORTVERSION= 4.18.9570	4	PORTVERSION= 4.20.9608
5	PORTREVISION= 1
6	CATEGORIES= security	5	CATEGORIES= security
7	MASTER_SITES= http://www.softether-download.com/files/softether/v4.18-9570-rtm-2015.07.26-tree/Source_Code/	6	MASTER_SITES= http://www.softether-download.com/files/softether/v4.20-9608-rtm-2016.04.17-tree/Source_Code/
8	DISTNAME= ${PORTNAME}-src-v4.18-9570-rtm	7	DISTNAME= ${PORTNAME}-src-v4.20-9608-rtm
9		8
10	MAINTAINER= net@arrishq.net	9	MAINTAINER= net@arrishq.net
11	COMMENT= Softether VPN solution	10	COMMENT= Softether VPN solution
Lines 12-17 Link Here
12		11
13	LICENSE= GPLv2	12	LICENSE= GPLv2
14		13
		14	CPPFLAGS+= -I${LOCALBASE}/include
		15	LDFLAGS+= -L${LOCALBASE}/lib
		16
15	PORTDOCS= AUTHORS.TXT ChangeLog LICENSE README THIRD_PARTY.TXT WARNING.TXT	17	PORTDOCS= AUTHORS.TXT ChangeLog LICENSE README THIRD_PARTY.TXT WARNING.TXT
16	DOS2UNIX_FILES= AUTHORS.TXT ChangeLog LICENSE README THIRD_PARTY.TXT \	18	DOS2UNIX_FILES= AUTHORS.TXT ChangeLog LICENSE README THIRD_PARTY.TXT \
17	WARNING.TXT \	19	WARNING.TXT \
Lines 20-29 Link Here
20	src/Cedar/Client.h \	22	src/Cedar/Client.h \
21	src/Cedar/Nat.h \	23	src/Cedar/Nat.h \
22	src/Cedar/Server.c \	24	src/Cedar/Server.c \
		25	src/Cedar/Server.h \
		26	src/Cedar/Virtual.h \
23	src/Mayaqua/Cfg.c \	27	src/Mayaqua/Cfg.c \
24	src/Mayaqua/Cfg.h \	28	src/Mayaqua/Cfg.h \
		29	src/Mayaqua/Kernel.c \
		30	src/Mayaqua/Mayaqua.c \
25	src/Mayaqua/Network.c \	31	src/Mayaqua/Network.c \
26	src/Mayaqua/Kernel.c \	32	src/Mayaqua/Network.h \
27	src/Mayaqua/Table.h \	33	src/Mayaqua/Table.h \
28	src/Mayaqua/Unix.c	34	src/Mayaqua/Unix.c
29		35
Lines 32-49 Link Here
32	ONLY_FOR_ARCHS= i386 amd64	38	ONLY_FOR_ARCHS= i386 amd64
33		39
34	USE_OPENSSL= yes	40	USE_OPENSSL= yes
35	USES= dos2unix gmake iconv:wchar_t localbase:ldflags ncurses readline	41	USES= dos2unix gmake iconv:wchar_t ncurses readline
36	USE_RC_SUBR= softether_bridge softether_client softether_server	42	USE_RC_SUBR= softether_client softether_bridge softether_server
37	SUB_FILES= vpncmd	43	SUB_FILES= vpncmd
38	MAKE_JOBS_UNSAFE= yes	44	MAKE_JOBS_UNSAFE= yes
39		45
		46	LOGDIR?= /var/log/softether
		47	PLIST_SUB+= LOGDIR="${LOGDIR}"
		48	SUB_LIST= LOGDIR="${LOGDIR}"
		49
40	# a pity the source directory has such a naming scheme, but well	50	# a pity the source directory has such a naming scheme, but well
41	WRKSRC= ${WRKDIR}/v4.18-9570	51	WRKSRC= ${WRKDIR}/v4.20-9608
42		52
43	ALL_TARGET= build	53	ALL_TARGET= build
44		54
45	.include <bsd.port.options.mk>	55	.include <bsd.port.options.mk>
46		56
		57	# requires OpenSSL from ports
		58	.if ${OSVERSION} < 1000000
		59	WITH_OPENSSL_PORT= yes
		60	.endif
		61
47	# skip configure at all and copy the corresponding Makefile in place	62	# skip configure at all and copy the corresponding Makefile in place
48	post-extract:	63	post-extract:
49	.if ${ARCH} != "amd64"	64	.if ${ARCH} != "amd64"
Lines 60-74 Link Here
60	# into ${PREFIX}/sbin	75	# into ${PREFIX}/sbin
61	do-install:	76	do-install:
62	${MKDIR} ${STAGEDIR}/${PREFIX}/libexec/softether	77	${MKDIR} ${STAGEDIR}/${PREFIX}/libexec/softether
63	${INSTALL_PROGRAM} ${WRKSRC}/bin/vpnbridge/vpnbridge ${STAGEDIR}/${PREFIX}/libexec/${PORTNAME}/vpnbridge	78	${INSTALL_SCRIPT} ${WRKSRC}/bin/vpnbridge/vpnbridge ${STAGEDIR}/${PREFIX}/libexec/${PORTNAME}/vpnbridge
64	${INSTALL_PROGRAM} ${WRKSRC}/bin/vpnclient/vpnclient ${STAGEDIR}/${PREFIX}/libexec/${PORTNAME}/vpnclient	79	${INSTALL_SCRIPT} ${WRKSRC}/bin/vpnclient/vpnclient ${STAGEDIR}/${PREFIX}/libexec/${PORTNAME}/vpnclient
65	${INSTALL_PROGRAM} ${WRKSRC}/bin/vpncmd/vpncmd ${STAGEDIR}/${PREFIX}/libexec/${PORTNAME}/vpncmd	80	${INSTALL_SCRIPT} ${WRKSRC}/bin/vpncmd/vpncmd ${STAGEDIR}/${PREFIX}/libexec/${PORTNAME}/vpncmd
66	${INSTALL_PROGRAM} ${WRKSRC}/bin/vpnserver/vpnserver ${STAGEDIR}/${PREFIX}/libexec/${PORTNAME}/vpnserver	81	${INSTALL_SCRIPT} ${WRKSRC}/bin/vpnserver/vpnserver ${STAGEDIR}/${PREFIX}/libexec/${PORTNAME}/vpnserver
67	${INSTALL_DATA} ${WRKSRC}/bin/vpnserver/hamcore.se2 ${STAGEDIR}/${PREFIX}/libexec/${PORTNAME}/hamcore.se2	82	${INSTALL_DATA} ${WRKSRC}/bin/vpnserver/hamcore.se2 ${STAGEDIR}/${PREFIX}/libexec/${PORTNAME}/hamcore.se2
68	${INSTALL_SCRIPT} ${WRKDIR}/vpncmd ${STAGEDIR}/${PREFIX}/sbin/vpncmd	83	${INSTALL_SCRIPT} ${WRKDIR}/vpncmd ${STAGEDIR}/${PREFIX}/sbin/vpncmd
69		84
70	post-install-DOCS-on:	85	post-install:
		86	.for i in vpnbridge vpnclient vpncmd vpnserver
		87	@${STRIP_CMD} ${STAGEDIR}${PREFIX}/libexec/${PORTNAME}/${i}
		88	.endfor
71	@${MKDIR} ${STAGEDIR}${DOCSDIR}	89	@${MKDIR} ${STAGEDIR}${DOCSDIR}
		90	@${MKDIR} ${STAGEDIR}${LOGDIR}
72	.for doc in ${PORTDOCS}	91	.for doc in ${PORTDOCS}
73	${INSTALL_DATA} ${WRKSRC}/${doc} ${STAGEDIR}${DOCSDIR}	92	${INSTALL_DATA} ${WRKSRC}/${doc} ${STAGEDIR}${DOCSDIR}
74	.endfor	93	.endfor

Line 0 Link Here

(-)security/softether/files/patch-src_Cedar_Cedar.h (+75 lines)
		1	--- src/Cedar/Cedar.h.orig 2016-05-03 06:16:53 UTC
		2	+++ src/Cedar/Cedar.h
		3	@@ -510,22 +510,22 @@
		4	#define LOG_ENGINE_BUFFER_CACHE_SIZE_MAX (10 * 1024 * 1024) // Write cache size
		5
		6	// Constant such as a file name
		7	-#define SERVER_LOG_DIR_NAME "@server_log"
		8	+#define SERVER_LOG_DIR_NAME "/var/log/softether/server"
		9	#define BRIDGE_LOG_DIR_NAME SERVER_LOG_DIR_NAME
		10	#define SERVER_LOG_PERFIX "vpn"
		11
		12	-#define HUB_SECURITY_LOG_DIR_NAME "@security_log"
		13	-#define HUB_SECURITY_LOG_FILE_NAME "@security_log/%s"
		14	+#define HUB_SECURITY_LOG_DIR_NAME "/var/log/softether/security"
		15	+#define HUB_SECURITY_LOG_FILE_NAME "/var/log/softether/security/%s"
		16	#define HUB_SECURITY_LOG_PREFIX "sec"
		17	-#define HUB_PACKET_LOG_DIR_NAME "@packet_log"
		18	-#define HUB_PACKET_LOG_FILE_NAME "@packet_log/%s"
		19	+#define HUB_PACKET_LOG_DIR_NAME "/var/log/softether/packet"
		20	+#define HUB_PACKET_LOG_FILE_NAME "/var/log/softether/packet/%s"
		21	#define HUB_PACKET_LOG_PREFIX "pkt"
		22
		23	-#define NAT_LOG_DIR_NAME "@secure_nat_log"
		24	-#define NAT_LOG_FILE_NAME "@secure_nat_log/%s"
		25	+#define NAT_LOG_DIR_NAME "/var/log/softether/secure_nat"
		26	+#define NAT_LOG_FILE_NAME "/var/log/softether/secure_nat/%s"
		27	#define NAT_LOG_PREFIX "snat"
		28
		29	-#define CLIENT_LOG_DIR_NAME "@client_log"
		30	+#define CLIENT_LOG_DIR_NAME "/var/log/softether/client"
		31	#define CLIENT_LOG_PREFIX "client"
		32
		33	// Packet log settings
		34	@@ -560,8 +560,8 @@
		35	#define DISK_FREE_CHECK_INTERVAL_DEFAULT (5 * 60 * 1000)
		36
		37	// Simple log
		38	-#define TINY_LOG_DIRNAME "@tiny_log"
		39	-#define TINY_LOG_FILENAME "@tiny_log/%04u%02u%02u_%02u%02u%02u.log"
		40	+#define TINY_LOG_DIRNAME "/var/log/softether/tiny"
		41	+#define TINY_LOG_FILENAME "/var/log/softether/tiny/%04u%02u%02u_%02u%02u%02u.log"
		42
		43
		44	//////////////////////////////////////////////////////////////////////
		45	@@ -574,7 +574,7 @@
		46	//#define CE_SNAPSHOT_INTERVAL ((UINT64)(3000))
		47	#define CE_SNAPSHOT_POLLING_INTERVAL (1 * 1000)
		48	#define CE_SNAPSHOT_POLLING_INTERVAL_LICENSE (30 * 1000)
		49	-#define CE_SNAPSHOT_DIR_NAME "@carrier_log"
		50	+#define CE_SNAPSHOT_DIR_NAME "/var/log/softether/carrier"
		51	#define CE_SNAPSHOT_PREFIX "carrier"
		52
		53
		54	@@ -591,7 +591,7 @@
		55	// Expiration date of random size cache
		56	#define RAND_SIZE_CACHE_EXPIRE (24 * 60 * 60 * 1000)
		57	// Management allowed IP address list file name
		58	-#define ADMINIP_TXT "@adminip.txt"
		59	+#define ADMINIP_TXT "/var/db/softether/adminip.txt"
		60
		61	#define NON_SSL_MIN_COUNT 60
		62	#define NON_SSL_ENTRY_EXPIRES (10 * 60 * 1000)
		63	@@ -642,9 +642,9 @@
		64	//////////////////////////////////////////////////////////////////////
65
66	#define EL_ADMIN_PORT 22888
67	-#define EL_CONFIG_FILENAME "@etherlogger.config"
68	-#define EL_PACKET_LOG_DIR_NAME "@etherlogger_log"
69	-#define EL_PACKET_LOG_FILE_NAME "@etherlogger_log/%s"
70	+#define EL_CONFIG_FILENAME "/var/db/softether/etherlogger.config"
71	+#define EL_PACKET_LOG_DIR_NAME "/var/log/softether/etherlogger"
72	+#define EL_PACKET_LOG_FILE_NAME "/var/log/softether/etherlogger/%s"
73	#define EL_PACKET_LOG_PREFIX "pkt"
74	#define EL_LICENSE_CHECK_SPAN (10 * 1000)
75

Line 0 Link Here

(-)security/softether/files/patch-src_Cedar_Client.h (+20 lines)
	1	--- src/Cedar/Client.h.orig 2016-05-03 06:16:53 UTC
	2	+++ src/Cedar/Client.h
	3	@@ -125,7 +125,7 @@
	4
	5
	6	// Constants
	7	-#define CLIENT_CONFIG_FILE_NAME "@vpn_client.config"
	8	+#define CLIENT_CONFIG_FILE_NAME "/var/db/softether/vpn_client.config"
	9	#define CLIENT_DEFAULT_KEEPALIVE_HOST "keepalive.softether.org"
	10	#define CLIENT_DEFAULT_KEEPALIVE_PORT 80
	11	#define CLIENT_DEFAULT_KEEPALIVE_INTERVAL KEEP_INTERVAL_DEFAULT
	12	@@ -145,7 +145,7 @@
	13	#define CLIENT_WIN32_EXE_FILENAME_X64 "vpnclient_x64.exe"
	14	#define CLIENT_WIN32_EXE_FILENAME_IA64 "vpnclient_ia64.exe"
	15
	16	-#define CLIENT_CUSTOM_INI_FILENAME "@custom.ini"
	17	+#define CLIENT_CUSTOM_INI_FILENAME "/var/db/softether/custom.ini"
	18
	19	#define CLIENT_GLOBAL_PULSE_NAME "clientglobalpulse"
	20

Line 0 Link Here

(-)security/softether/files/patch-src_Cedar_Server.c (+30 lines)
	1	--- src/Cedar/Server.c.orig 2016-05-03 06:16:53 UTC
	2	+++ src/Cedar/Server.c
	3	@@ -115,12 +115,12 @@
	4
	5	static SERVER *server = NULL;
	6	static LOCK *server_lock = NULL;
	7	-char *SERVER_CONFIG_FILE_NAME = "@vpn_server.config";
	8	-char *SERVER_CONFIG_FILE_NAME_IN_CLIENT = "@vpn_gate_svc.config";
	9	-char *SERVER_CONFIG_FILE_NAME_IN_CLIENT_RELAY = "@vpn_gate_relay.config";
	10	-char *BRIDGE_CONFIG_FILE_NAME = "@vpn_bridge.config";
	11	-char *SERVER_CONFIG_TEMPLATE_NAME = "@vpn_server_template.config";
	12	-char *BRIDGE_CONFIG_TEMPLATE_NAME = "@vpn_server_template.config";
	13	+char *SERVER_CONFIG_FILE_NAME = "/var/db/softether/vpn_server.config";
	14	+char *SERVER_CONFIG_FILE_NAME_IN_CLIENT = "/var/db/softether/vpn_gate_svc.config";
	15	+char *SERVER_CONFIG_FILE_NAME_IN_CLIENT_RELAY = "/var/db/softether/vpn_gate_relay.config";
	16	+char *BRIDGE_CONFIG_FILE_NAME = "/var/db/softether/vpn_bridge.config";
	17	+char *SERVER_CONFIG_TEMPLATE_NAME = "/var/db/softether/vpn_server_template.config";
	18	+char *BRIDGE_CONFIG_TEMPLATE_NAME = "/var/db/softether/vpn_server_template.config";
	19
	20	static bool server_reset_setting = false;
	21
	22	@@ -10916,7 +10916,7 @@ SERVER *SiNewServerEx(bool bridge, bool
	23	#endif // OS_WIN32
	24
	25	#ifdef ENABLE_AZURE_SERVER
	26	- if (IsFileExists("@azureserver.config"))
	27	+ if (IsFileExists("/var/db/softether/azureserver.config"))
	28	{
	29	DisableRDUPServerGlobally();
	30	s->AzureServer = NewAzureServer(s->Cedar);

Line 0 Link Here

(-)security/softether/files/patch-src_Mayaqua_Mayaqua.c (+16 lines)
	1	--- src/Mayaqua/Mayaqua.c.orig 2016-05-03 06:16:53 UTC
	2	+++ src/Mayaqua/Mayaqua.c
	3	@@ -306,11 +306,11 @@ void FreeProbe()
	4	char filename[MAX_SIZE];
	5
	6	// Write all to the file
	7	- MakeDirEx("@probe_log");
	8	+ MakeDirEx("/var/db/softether/probe");
	9
	10	LocalTime(&st);
	11
	12	- snprintf(filename, sizeof(filename), "@probe_log/%04u%02u%02u_%02u%02u%02u.log",
	13	+ snprintf(filename, sizeof(filename), "/var/db/softether/probe/%04u%02u%02u_%02u%02u%02u.log",
	14	st.wYear, st.wMonth, st.wDay, st.wHour, st.wMinute, st.wSecond);
	15
	16	DumpBuf(probe_buf, filename);

Line 0 Link Here

(-)security/softether/files/patch-src_Mayaqua_Network.c (+19 lines)
	1	--- src/Mayaqua/Network.c.orig 2016-05-03 06:16:53 UTC
	2	+++ src/Mayaqua/Network.c
	3	@@ -12983,7 +12983,16 @@ bool StartSSLEx(SOCK sock, X x, K *pri
	4	{
	5	if (client_tls == false)
	6	{
	7	+#ifndef OPENSSL_NO_SSL3
	8	SSL_CTX_set_ssl_version(ssl_ctx, SSLv3_method());
	9	+#else
	10	+ SSL_CTX_set_ssl_version(ssl_ctx, SSLv23_method());
	11	+ SSL_CTX_set_options(ssl_ctx, SSL_OP_NO_SSLv2 \| SSL_OP_NO_TLSv1
	12	+#ifdef SSL_OP_NO_TLSv1_2
	13	+ \| SSL_OP_NO_TLSv1_1 \| SSL_OP_NO_TLSv1_2
	14	+#endif
	15	+ );
	16	+#endif
	17	}
	18	else
	19	{

Line 0 Link Here

(-)security/softether/files/patch-src_Mayaqua_Network.h (+15 lines)
	1	--- src/Mayaqua/Network.h.orig 2016-05-03 06:16:53 UTC
	2	+++ src/Mayaqua/Network.h
	3	@@ -156,10 +156,10 @@ struct DYN_VALUE
	4
	5	// SSL logging function
	6	//#define ENABLE_SSL_LOGGING
	7	-#define SSL_LOGGING_DIRNAME "@ssl_log"
	8	+#define SSL_LOGGING_DIRNAME "/var/log/softether/ssl"
	9
	10	// Private IP list file
	11	-#define PRIVATE_IP_TXT_FILENAME "@private_ip.txt"
	12	+#define PRIVATE_IP_TXT_FILENAME "/var/log/softether/private_ip.txt"
	13
	14	// Start range of the random UDP port
	15	#define RAND_UDP_PORT_START 5000

Line 0 Link Here

(-)security/softether/files/patch-src_Mayaqua_Unix.c (+29 lines)
	1	--- src/Mayaqua/Unix.c.orig 2016-05-03 06:16:53 UTC
	2	+++ src/Mayaqua/Unix.c
	3	@@ -931,7 +931,7 @@ void UnixNewSingleInstance(char instan
	4	GetExeDir(dir, sizeof(dir));
	5
	6	// File name generation
	7	- Format(name, sizeof(name), "%s/.%s", dir, tmp);
	8	+ Format(name, sizeof(name), "/var/db/softether/.%s", tmp);
	9
	10	fd = open(name, O_WRONLY);
	11	if (fd == -1)
	12	@@ -2320,7 +2320,7 @@ void UnixGenPidFileName(char *name, UINT
	13	Hash(hash, exe_name, StrLen(exe_name), false);
	14	BinToStr(tmp1, sizeof(tmp1), hash, sizeof(hash));
	15
	16	- Format(name, size, "%s/.pid_%s", dir, tmp1);
	17	+ Format(name, size, "/var/db/softether/%s.pid", tmp1);
	18	}
	19
	20	// Delete the PID file
	21	@@ -2365,7 +2365,7 @@ void UnixGenCtlFileName(char *name, UINT
	22	Hash(hash, exe_name, StrLen(exe_name), false);
	23	BinToStr(tmp1, sizeof(tmp1), hash, sizeof(hash));
	24
	25	- Format(name, size, "%s/.ctl_%s", dir, tmp1);
	26	+ Format(name, size, "/var/db/softether/.ctl_%s", tmp1);
	27	}
	28
	29	// Write the CTL file