View | Details | Raw Unified | Return to bug 209195 | Differences between
and this patch

Collapse All | Expand All

(-)softether/Makefile (-7 / +16 lines)
Lines 1-12 Link Here
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
9
7
8
DISTNAME=	${PORTNAME}-src-v4.20-9608-rtm
9
10
MAINTAINER=	net@arrishq.net
10
MAINTAINER=	net@arrishq.net
11
COMMENT=	Softether VPN solution
11
COMMENT=	Softether VPN solution
12
12
Lines 23-32 Link Here
23
		src/Cedar/Client.h \
23
		src/Cedar/Client.h \
24
		src/Cedar/Nat.h \
24
		src/Cedar/Nat.h \
25
		src/Cedar/Server.c \
25
		src/Cedar/Server.c \
26
		src/Cedar/Server.h \
27
		src/Cedar/Virtual.h \
26
		src/Mayaqua/Cfg.c \
28
		src/Mayaqua/Cfg.c \
27
		src/Mayaqua/Cfg.h \
29
		src/Mayaqua/Cfg.h \
30
		src/Mayaqua/Kernel.c \
31
		src/Mayaqua/Mayaqua.c \
28
		src/Mayaqua/Network.c \
32
		src/Mayaqua/Network.c \
29
		src/Mayaqua/Kernel.c \
33
		src/Mayaqua/Network.h \
30
		src/Mayaqua/Table.h \
34
		src/Mayaqua/Table.h \
31
		src/Mayaqua/Unix.c
35
		src/Mayaqua/Unix.c
32
36
Lines 36-47 Link Here
36
40
37
USE_OPENSSL=	yes
41
USE_OPENSSL=	yes
38
USES=		dos2unix gmake iconv:wchar_t ncurses readline
42
USES=		dos2unix gmake iconv:wchar_t ncurses readline
39
USE_RC_SUBR=	softether_bridge softether_client softether_server
43
USE_RC_SUBR=	softether_client softether_bridge softether_server
40
SUB_FILES=	vpncmd
44
SUB_FILES=	vpncmd
41
MAKE_JOBS_UNSAFE=	yes
45
MAKE_JOBS_UNSAFE=	yes
42
46
47
LOGDIR?=	/var/log/softether
48
PLIST_SUB+=	LOGDIR="${LOGDIR}"
49
SUB_LIST=	LOGDIR="${LOGDIR}"
50
43
# a pity the source directory has such a naming scheme, but well
51
# a pity the source directory has such a naming scheme, but well
44
WRKSRC=		${WRKDIR}/v4.18-9570
52
WRKSRC=		${WRKDIR}/v4.20-9608
45
53
46
ALL_TARGET=	build
54
ALL_TARGET=	build
47
55
Lines 80-85 Link Here
80
	@${STRIP_CMD} ${STAGEDIR}${PREFIX}/libexec/${PORTNAME}/${i}
88
	@${STRIP_CMD} ${STAGEDIR}${PREFIX}/libexec/${PORTNAME}/${i}
81
.endfor
89
.endfor
82
	@${MKDIR} ${STAGEDIR}${DOCSDIR}
90
	@${MKDIR} ${STAGEDIR}${DOCSDIR}
91
	@${MKDIR} ${STAGEDIR}${LOGDIR}
83
.for doc in ${PORTDOCS}
92
.for doc in ${PORTDOCS}
84
	${INSTALL_DATA} ${WRKSRC}/${doc} ${STAGEDIR}${DOCSDIR}
93
	${INSTALL_DATA} ${WRKSRC}/${doc} ${STAGEDIR}${DOCSDIR}
85
.endfor
94
.endfor
(-)softether/distinfo (-2 / +2 lines)
Lines 1-2 Link Here
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
(-)softether/files/patch-src__Cedar__Cedar.h (-21 / +21 lines)
Lines 1-57 Link Here
1
--- src/Cedar/Cedar.h.orig	2014-06-08 06:19:15 UTC
1
--- src/Cedar/Cedar.h.orig	2016-04-21 11:35:52.896232000 +0200
2
+++ src/Cedar/Cedar.h
2
+++ src/Cedar/Cedar.h	2016-04-21 11:35:17.696745000 +0200
3
@@ -477,22 +477,22 @@
3
@@ -510,22 +510,22 @@
4
 #define	LOG_ENGINE_BUFFER_CACHE_SIZE_MAX	(10 * 1024 * 1024)	// Write cache size
4
 #define	LOG_ENGINE_BUFFER_CACHE_SIZE_MAX	(10 * 1024 * 1024)	// Write cache size
5
 
5
 
6
 // Constant such as a file name
6
 // Constant such as a file name
7
-#define	SERVER_LOG_DIR_NAME			"@server_log"
7
-#define	SERVER_LOG_DIR_NAME			"@server_log"
8
+#define	SERVER_LOG_DIR_NAME			"/var/db/softether/server_log"
8
+#define	SERVER_LOG_DIR_NAME			"/var/log/softether/server"
9
 #define	BRIDGE_LOG_DIR_NAME			SERVER_LOG_DIR_NAME
9
 #define	BRIDGE_LOG_DIR_NAME			SERVER_LOG_DIR_NAME
10
 #define	SERVER_LOG_PERFIX			"vpn"
10
 #define	SERVER_LOG_PERFIX			"vpn"
11
 
11
 
12
-#define	HUB_SECURITY_LOG_DIR_NAME	"@security_log"
12
-#define	HUB_SECURITY_LOG_DIR_NAME	"@security_log"
13
-#define	HUB_SECURITY_LOG_FILE_NAME	"@security_log/%s"
13
-#define	HUB_SECURITY_LOG_FILE_NAME	"@security_log/%s"
14
+#define	HUB_SECURITY_LOG_DIR_NAME	"/var/db/softether/security_log"
14
+#define	HUB_SECURITY_LOG_DIR_NAME	"/var/log/softether/security"
15
+#define	HUB_SECURITY_LOG_FILE_NAME	"/var/db/softether/security_log/%s"
15
+#define	HUB_SECURITY_LOG_FILE_NAME	"/var/log/softether/security/%s"
16
 #define	HUB_SECURITY_LOG_PREFIX		"sec"
16
 #define	HUB_SECURITY_LOG_PREFIX		"sec"
17
-#define	HUB_PACKET_LOG_DIR_NAME		"@packet_log"
17
-#define	HUB_PACKET_LOG_DIR_NAME		"@packet_log"
18
-#define	HUB_PACKET_LOG_FILE_NAME	"@packet_log/%s"
18
-#define	HUB_PACKET_LOG_FILE_NAME	"@packet_log/%s"
19
+#define	HUB_PACKET_LOG_DIR_NAME		"/var/db/softether/packet_log"
19
+#define	HUB_PACKET_LOG_DIR_NAME		"/var/log/softether/packet"
20
+#define	HUB_PACKET_LOG_FILE_NAME	"/var/db/softether/packet_log/%s"
20
+#define	HUB_PACKET_LOG_FILE_NAME	"/var/log/softether/packet/%s"
21
 #define	HUB_PACKET_LOG_PREFIX		"pkt"
21
 #define	HUB_PACKET_LOG_PREFIX		"pkt"
22
 
22
 
23
-#define	NAT_LOG_DIR_NAME			"@secure_nat_log"
23
-#define	NAT_LOG_DIR_NAME			"@secure_nat_log"
24
-#define	NAT_LOG_FILE_NAME			"@secure_nat_log/%s"
24
-#define	NAT_LOG_FILE_NAME			"@secure_nat_log/%s"
25
+#define	NAT_LOG_DIR_NAME			"/var/db/softether/secure_nat_log"
25
+#define	NAT_LOG_DIR_NAME			"/var/log/softether/secure_nat"
26
+#define	NAT_LOG_FILE_NAME			"/var/db/softether/secure_nat_log/%s"
26
+#define	NAT_LOG_FILE_NAME			"/var/log/softether/secure_nat/%s"
27
 #define	NAT_LOG_PREFIX				"snat"
27
 #define	NAT_LOG_PREFIX				"snat"
28
 
28
 
29
-#define	CLIENT_LOG_DIR_NAME			"@client_log"
29
-#define	CLIENT_LOG_DIR_NAME			"@client_log"
30
+#define	CLIENT_LOG_DIR_NAME			"/var/db/softether/client_log"
30
+#define	CLIENT_LOG_DIR_NAME			"/var/log/softether/client"
31
 #define	CLIENT_LOG_PREFIX			"client"
31
 #define	CLIENT_LOG_PREFIX			"client"
32
 
32
 
33
 // Packet log settings
33
 // Packet log settings
34
@@ -527,8 +527,8 @@
34
@@ -560,8 +560,8 @@
35
 #define	DISK_FREE_CHECK_INTERVAL	(5 * 60 * 1000)
35
 #define	DISK_FREE_CHECK_INTERVAL_DEFAULT	(5 * 60 * 1000)
36
 
36
 
37
 // Simple log
37
 // Simple log
38
-#define TINY_LOG_DIRNAME			"@tiny_log"
38
-#define TINY_LOG_DIRNAME			"@tiny_log"
39
-#define TINY_LOG_FILENAME			"@tiny_log/%04u%02u%02u_%02u%02u%02u.log"
39
-#define TINY_LOG_FILENAME			"@tiny_log/%04u%02u%02u_%02u%02u%02u.log"
40
+#define TINY_LOG_DIRNAME			"/var/db/softether/tiny_log"
40
+#define TINY_LOG_DIRNAME			"/var/log/softether/tiny"
41
+#define TINY_LOG_FILENAME			"/var/db/softether/tiny_log/%04u%02u%02u_%02u%02u%02u.log"
41
+#define TINY_LOG_FILENAME			"/var/log/softether/tiny/%04u%02u%02u_%02u%02u%02u.log"
42
 
42
 
43
 
43
 
44
 //////////////////////////////////////////////////////////////////////
44
 //////////////////////////////////////////////////////////////////////
45
@@ -541,7 +541,7 @@
45
@@ -574,7 +574,7 @@
46
 //#define CE_SNAPSHOT_INTERVAL		((UINT64)(3000))
46
 //#define CE_SNAPSHOT_INTERVAL		((UINT64)(3000))
47
 #define CE_SNAPSHOT_POLLING_INTERVAL	(1 * 1000)
47
 #define CE_SNAPSHOT_POLLING_INTERVAL	(1 * 1000)
48
 #define CE_SNAPSHOT_POLLING_INTERVAL_LICENSE	(30 * 1000)
48
 #define CE_SNAPSHOT_POLLING_INTERVAL_LICENSE	(30 * 1000)
49
-#define CE_SNAPSHOT_DIR_NAME		"@carrier_log"
49
-#define CE_SNAPSHOT_DIR_NAME		"@carrier_log"
50
+#define CE_SNAPSHOT_DIR_NAME		"/var/db/softether/carrier_log"
50
+#define CE_SNAPSHOT_DIR_NAME		"/var/log/softether/carrier"
51
 #define CE_SNAPSHOT_PREFIX			"carrier"
51
 #define CE_SNAPSHOT_PREFIX			"carrier"
52
 
52
 
53
 
53
 
54
@@ -558,7 +558,7 @@
54
@@ -591,7 +591,7 @@
55
 // Expiration date of random size cache
55
 // Expiration date of random size cache
56
 #define	RAND_SIZE_CACHE_EXPIRE		(24 * 60 * 60 * 1000)
56
 #define	RAND_SIZE_CACHE_EXPIRE		(24 * 60 * 60 * 1000)
57
 // Management allowed IP address list file name
57
 // Management allowed IP address list file name
Lines 60-66 Link Here
60
 
60
 
61
 #define NON_SSL_MIN_COUNT			60
61
 #define NON_SSL_MIN_COUNT			60
62
 #define NON_SSL_ENTRY_EXPIRES		(10 * 60 * 1000)
62
 #define NON_SSL_ENTRY_EXPIRES		(10 * 60 * 1000)
63
@@ -609,9 +609,9 @@
63
@@ -642,9 +642,9 @@
64
 //////////////////////////////////////////////////////////////////////
64
 //////////////////////////////////////////////////////////////////////
65
 
65
 
66
 #define	EL_ADMIN_PORT			22888
66
 #define	EL_ADMIN_PORT			22888
Lines 68-75 Link Here
68
-#define	EL_PACKET_LOG_DIR_NAME	"@etherlogger_log"
68
-#define	EL_PACKET_LOG_DIR_NAME	"@etherlogger_log"
69
-#define	EL_PACKET_LOG_FILE_NAME	"@etherlogger_log/%s"
69
-#define	EL_PACKET_LOG_FILE_NAME	"@etherlogger_log/%s"
70
+#define	EL_CONFIG_FILENAME		"/var/db/softether/etherlogger.config"
70
+#define	EL_CONFIG_FILENAME		"/var/db/softether/etherlogger.config"
71
+#define	EL_PACKET_LOG_DIR_NAME	"/var/db/softether/etherlogger_log"
71
+#define	EL_PACKET_LOG_DIR_NAME	"/var/log/softether/etherlogger"
72
+#define	EL_PACKET_LOG_FILE_NAME	"/var/db/softether/etherlogger_log/%s"
72
+#define	EL_PACKET_LOG_FILE_NAME	"/var/log/softether/etherlogger/%s"
73
 #define	EL_PACKET_LOG_PREFIX	"pkt"
73
 #define	EL_PACKET_LOG_PREFIX	"pkt"
74
 #define	EL_LICENSE_CHECK_SPAN	(10 * 1000)
74
 #define	EL_LICENSE_CHECK_SPAN	(10 * 1000)
75
 
75
 
(-)softether/files/patch-src__Cedar__Client.h (-2 / +2 lines)
Lines 1-5 Link Here
1
--- src/Cedar/Client.h.orig	2014-06-08 06:19:15 UTC
1
--- src/Cedar/Client.h.orig	2016-04-21 11:37:48.434422000 +0200
2
+++ src/Cedar/Client.h
2
+++ src/Cedar/Client.h	2016-04-21 11:37:32.295812000 +0200
3
@@ -125,7 +125,7 @@
3
@@ -125,7 +125,7 @@
4
 
4
 
5
 
5
 
(-)softether/files/patch-src__Cedar__Nat.h (-2 / +2 lines)
Lines 1-5 Link Here
1
--- src/Cedar/Nat.h.orig	2014-06-08 06:19:15 UTC
1
--- src/Cedar/Nat.h.orig	2016-04-21 11:38:18.000000000 +0200
2
+++ src/Cedar/Nat.h
2
+++ src/Cedar/Nat.h	2016-04-21 11:38:34.351169000 +0200
3
@@ -115,7 +115,7 @@
3
@@ -115,7 +115,7 @@
4
 #define	NAT_H
4
 #define	NAT_H
5
 
5
 
(-)softether/files/patch-src__Cedar__Server.c (-2 / +11 lines)
Lines 1-5 Link Here
1
--- src/Cedar/Server.c.orig	2014-06-08 06:19:15 UTC
1
--- src/Cedar/Server.c.orig	2016-04-21 11:38:18.000000000 +0200
2
+++ src/Cedar/Server.c
2
+++ src/Cedar/Server.c	2016-04-21 11:40:28.695678000 +0200
3
@@ -115,12 +115,12 @@
3
@@ -115,12 +115,12 @@
4
 
4
 
5
 static SERVER *server = NULL;
5
 static SERVER *server = NULL;
Lines 19-21 Link Here
19
 
19
 
20
 static bool server_reset_setting = false;
20
 static bool server_reset_setting = false;
21
 
21
 
22
@@ -10916,7 +10916,7 @@
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);
(-)softether/files/patch-src__Mayaqua__Cfg.c (-3 / +3 lines)
Lines 1-6 Link Here
1
--- src/Mayaqua/Cfg.c.orig	2014-06-08 06:19:14 UTC
1
--- src/Mayaqua/Cfg.c.orig	2016-04-21 11:32:32.000000000 +0200
2
+++ src/Mayaqua/Cfg.c
2
+++ src/Mayaqua/Cfg.c	2016-04-21 11:46:23.041271000 +0200
3
@@ -124,7 +124,7 @@
3
@@ -139,7 +139,7 @@
4
 	}
4
 	}
5
 
5
 
6
 	// Determine the directory name
6
 	// Determine the directory name
(-)softether/files/patch-src__Mayaqua__Cfg.h (-3 / +3 lines)
Lines 1-6 Link Here
1
--- src/Mayaqua/Cfg.h.orig	2014-06-08 06:19:14 UTC
1
--- src/Mayaqua/Cfg.h.orig	2016-04-21 11:32:32.000000000 +0200
2
+++ src/Mayaqua/Cfg.h
2
+++ src/Mayaqua/Cfg.h	2016-04-21 11:46:58.865530000 +0200
3
@@ -102,7 +102,7 @@
3
@@ -117,7 +117,7 @@
4
 // Macro
4
 // Macro
5
 //#define	CHECK_CFG_NAME_EXISTS			// Check duplication of the existing name
5
 //#define	CHECK_CFG_NAME_EXISTS			// Check duplication of the existing name
6
 
6
 
(-)softether/files/patch-src__Mayaqua__Kernel.c (-3 / +3 lines)
Lines 1-6 Link Here
1
--- src/Mayaqua/Kernel.c.orig	2014-06-08 06:19:14 UTC
1
--- src/Mayaqua/Kernel.c.orig	2016-04-21 11:32:32.000000000 +0200
2
+++ src/Mayaqua/Kernel.c
2
+++ src/Mayaqua/Kernel.c	2016-04-21 11:47:38.200923000 +0200
3
@@ -2160,7 +2160,7 @@
3
@@ -2213,7 +2213,7 @@
4
 		msg = "Unknown Error";
4
 		msg = "Unknown Error";
5
 	}
5
 	}
6
 
6
 
(-)softether/files/patch-src__Mayaqua__Table.h (-3 / +3 lines)
Lines 1-6 Link Here
1
--- src/Mayaqua/Table.h.orig	2014-06-08 06:19:14 UTC
1
--- src/Mayaqua/Table.h.orig	2016-04-21 11:32:32.000000000 +0200
2
+++ src/Mayaqua/Table.h
2
+++ src/Mayaqua/Table.h	2016-04-21 11:50:45.815610000 +0200
3
@@ -102,7 +102,7 @@
3
@@ -117,7 +117,7 @@
4
 #define	UNICODE_CACHE_FILE		L".unicode_cache_%s.dat"
4
 #define	UNICODE_CACHE_FILE		L".unicode_cache_%s.dat"
5
 
5
 
6
 #define	LANGLIST_FILENAME		"|languages.txt"
6
 #define	LANGLIST_FILENAME		"|languages.txt"
(-)softether/files/patch-src__Mayaqua__Unix.c (-6 / +8 lines)
Lines 1-6 Link Here
1
--- src/Mayaqua/Unix.c.orig	2014-06-08 06:19:14 UTC
1
--- src/Mayaqua/Unix.c.orig	2016-05-02 19:37:03.000000000 +0200
2
+++ src/Mayaqua/Unix.c
2
+++ src/Mayaqua/Unix.c	2016-05-02 19:42:59.886235000 +0200
3
@@ -916,7 +916,7 @@
3
--- Unix.c.orig	2016-05-02 19:45:15.568261000 +0200
4
+++ Unix.c	2016-05-02 19:45:42.378823000 +0200
5
@@ -931,7 +931,7 @@
4
 	GetExeDir(dir, sizeof(dir));
6
 	GetExeDir(dir, sizeof(dir));
5
 
7
 
6
 	// File name generation
8
 	// File name generation
Lines 9-24 Link Here
9
 
11
 
10
 	fd = open(name, O_WRONLY);
12
 	fd = open(name, O_WRONLY);
11
 	if (fd == -1)
13
 	if (fd == -1)
12
@@ -2254,7 +2254,7 @@
14
@@ -2320,7 +2320,7 @@
13
 	Hash(hash, exe_name, StrLen(exe_name), false);
15
 	Hash(hash, exe_name, StrLen(exe_name), false);
14
 	BinToStr(tmp1, sizeof(tmp1), hash, sizeof(hash));
16
 	BinToStr(tmp1, sizeof(tmp1), hash, sizeof(hash));
15
 
17
 
16
-	Format(name, size, "%s/.pid_%s", dir, tmp1);
18
-	Format(name, size, "%s/.pid_%s", dir, tmp1);
17
+	Format(name, size, "/var/db/softether/.pid_%s", tmp1);
19
+	Format(name, size, "/var/db/softether/%s.pid", tmp1);
18
 }
20
 }
19
 
21
 
20
 // Delete the PID file
22
 // Delete the PID file
21
@@ -2299,7 +2299,7 @@
23
@@ -2365,7 +2365,7 @@
22
 	Hash(hash, exe_name, StrLen(exe_name), false);
24
 	Hash(hash, exe_name, StrLen(exe_name), false);
23
 	BinToStr(tmp1, sizeof(tmp1), hash, sizeof(hash));
25
 	BinToStr(tmp1, sizeof(tmp1), hash, sizeof(hash));
24
 
26
 
(-)softether/pkg-message (-3 / +3 lines)
Lines 6-18 Link Here
6
To run softether vpn bridge from startup, add
6
To run softether vpn bridge from startup, add
7
softether_bridge_enable="YES" in your rc.conf.
7
softether_bridge_enable="YES" in your rc.conf.
8
8
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
9
Initial and further configuration of all softether services can be
13
done either by using a Windows client to connect to the running
10
done either by using a Windows client to connect to the running
14
services or by vpncmd from command line.
11
services or by vpncmd from command line.
15
12
13
Please note client and brige functionality is right now not fully
14
supported on FreeBSD.
15
16
When removing SoftEther VPN without the desire to reinstall, please
16
When removing SoftEther VPN without the desire to reinstall, please
17
ensure to remove the directory /var/db/softether as well.
17
ensure to remove the directory /var/db/softether as well.
18
18
(-)softether/pkg-plist (+1 lines)
Lines 5-7 Link Here
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