Attachment #180754 for bug #217732

View | Details | Raw Unified | Return to bug 217732
Collapse All | Expand All

Lines 9129-9131 Link Here

(-)MOVED (+1 lines)
9129	x11/rsibreak-kde4\|x11/rsibreak\|2017-03-11\|Renamed to drop the -kde4 suffix	9129	x11/rsibreak-kde4\|x11/rsibreak\|2017-03-11\|Renamed to drop the -kde4 suffix
9130	textproc/ack\|textproc/p5-ack\|2017-03-12\|Rename to match our perl naming	9130	textproc/ack\|textproc/p5-ack\|2017-03-12\|Rename to match our perl naming
9131	misc/p5-Geo-Coder-Geocoder-US\|\|2017-03-12\|Has expired: http://geocoder.us/ disappeared in late 2015	9131	misc/p5-Geo-Coder-Geocoder-US\|\|2017-03-12\|Has expired: http://geocoder.us/ disappeared in late 2015
		9132	net/softethervpn\|security/softether-devel\|2017-03-12\|Rename to matching non-devel port

Lines 1279-1285 Link Here

(-)net/Makefile (-1 lines)
1279	SUBDIR += socketpipe	1279	SUBDIR += socketpipe
1280	SUBDIR += socketw	1280	SUBDIR += socketw
1281	SUBDIR += sofia-sip	1281	SUBDIR += sofia-sip
1282	SUBDIR += softethervpn
1283	SUBDIR += spideroak	1282	SUBDIR += spideroak
1284	SUBDIR += splatd	1283	SUBDIR += splatd
1285	SUBDIR += spoofer	1284	SUBDIR += spoofer




# $FreeBSD$

PORTNAME=	softethervpn
PORTVERSION=	4.21.9613
CATEGORIES=	net

MAINTAINER=	hrs@FreeBSD.org
COMMENT=	Cross-platform Multi-protocol VPN Software

LICENSE=	GPLv2
LICENSE_FILE=	${WRKSRC}/LICENSE

USES=		dos2unix gmake iconv localbase readline ssl
DOS2UNIX_FILES=	src/Mayaqua/Network.c
USE_GITHUB=	yes
GH_ACCOUNT=	SoftEtherVPN
GH_PROJECT=	SoftEtherVPN
GH_TAGNAME=	1e17c9b
ALL_TARGET=	build
MAKE_ENV=	STAGEDIR=${STAGEDIR} ICONV_LIB=${ICONV_LIB}
USE_RC_SUBR=	vpnserver vpnclient vpnbridge
PORTDOCS=	AUTHORS.TXT BUILD_UNIX.TXT ChangeLog README THIRD_PARTY.TXT \
		WARNING.TXT

OPTIONS_DEFINE=	DOCS

post-patch:
	${INSTALL_DATA} ${WRKSRC}/src/makefiles/freebsd_32bit.mak \
	    ${WRKSRC}/Makefile

post-install-DOCS-on:
	@${MKDIR} ${STAGEDIR}${DOCSDIR}
	cd ${WRKSRC} && \
	    ${INSTALL_DATA} ${PORTDOCS} ${STAGEDIR}${DOCSDIR}

.include <bsd.port.mk>

Lines 1-3 Link Here

(-)net/softethervpn/distinfo (-3 lines)
1	TIMESTAMP = 1479531912
2	SHA256 (SoftEtherVPN-SoftEtherVPN-4.21.9613-1e17c9b_GH0.tar.gz) = 3ba427abd3684e6f3fa1896512d240890f07beee179aef0823cbfd165b06def5
3	SIZE (SoftEtherVPN-SoftEtherVPN-4.21.9613-1e17c9b_GH0.tar.gz) = 33681928




--- src/makefiles/freebsd_32bit.mak.orig	2016-04-24 14:49:31 UTC
+++ src/makefiles/freebsd_32bit.mak
@@ -25,19 +25,19 @@
 
 #CC=gcc
 
-OPTIONS_COMPILE_DEBUG=-D_DEBUG -DDEBUG -DUNIX -DUNIX_BSD -DBRIDGE_BPF -DNO_VLAN -D_REENTRANT -DREENTRANT -D_THREAD_SAFE -D_THREADSAFE -DTHREAD_SAFE -DTHREADSAFE -D_FILE_OFFSET_BITS=64 -I./src/ -I./src/Cedar/ -I./src/Mayaqua/ -I/usr/local/include -I/usr/include -g -fsigned-char
+OPTIONS_COMPILE_DEBUG=-D_DEBUG -DDEBUG -DUNIX -DUNIX_BSD -DBRIDGE_BPF -DNO_VLAN -D_REENTRANT -DREENTRANT -D_THREAD_SAFE -D_THREADSAFE -DTHREAD_SAFE -DTHREADSAFE -D_FILE_OFFSET_BITS=64 -I./src/ -I./src/Cedar/ -I./src/Mayaqua/ -g -fsigned-char
 
-OPTIONS_LINK_DEBUG=-g -fsigned-char -L/usr/local/lib -L/usr/lib -lm -lpthread -lssl -lcrypto -liconv -lreadline -lncurses -lz
+OPTIONS_LINK_DEBUG=-g -fsigned-char -lm -lpthread -lssl -lcrypto ${ICONV_LIB} -lreadline -lncurses -lz
 
-OPTIONS_COMPILE_RELEASE=-DNDEBUG -DVPN_SPEED -DUNIX -DUNIX_BSD -DBRIDGE_BPF -DNO_VLAN -D_REENTRANT -DREENTRANT -D_THREAD_SAFE -D_THREADSAFE -DTHREAD_SAFE -DTHREADSAFE -D_FILE_OFFSET_BITS=64 -I./src/ -I./src/Cedar/ -I./src/Mayaqua/ -I/usr/local/include -I/usr/include -O2 -fsigned-char
+OPTIONS_COMPILE_RELEASE=-DNDEBUG -DVPN_SPEED -DUNIX -DUNIX_BSD -DBRIDGE_BPF -DNO_VLAN -D_REENTRANT -DREENTRANT -D_THREAD_SAFE -D_THREADSAFE -DTHREAD_SAFE -DTHREADSAFE -D_FILE_OFFSET_BITS=64 -I./src/ -I./src/Cedar/ -I./src/Mayaqua/ -fsigned-char ${CFLAGS}
 
-OPTIONS_LINK_RELEASE=-O2 -fsigned-char -L/usr/local/lib -L/usr/lib -lm -lpthread -lssl -lcrypto -liconv -lreadline -lncurses -lz
+OPTIONS_LINK_RELEASE=-fsigned-char ${LDFLAGS} ${LIBS} -lm -lpthread -lssl -lcrypto ${ICONV_LIB} -lreadline -lncurses -lz
 
-INSTALL_BINDIR=/usr/bin/
-INSTALL_VPNSERVER_DIR=/usr/vpnserver/
-INSTALL_VPNBRIDGE_DIR=/usr/vpnbridge/
-INSTALL_VPNCLIENT_DIR=/usr/vpnclient/
-INSTALL_VPNCMD_DIR=/usr/vpncmd/
+INSTALL_BINDIR=${PREFIX}/sbin/
+INSTALL_VPNSERVER_DIR=${PREFIX}/softethervpn/vpnserver/
+INSTALL_VPNBRIDGE_DIR=${PREFIX}/softethervpn/vpnbridge/
+INSTALL_VPNCLIENT_DIR=${PREFIX}/softethervpn/vpnclient/
+INSTALL_VPNCMD_DIR=${PREFIX}/softethervpn/vpncmd/
 
 ifeq ($(DEBUG),YES)
 	OPTIONS_COMPILE=$(OPTIONS_COMPILE_DEBUG)
@@ -379,7 +379,7 @@ tmp/objs/vpncmd.o: src/vpncmd/vpncmd.c $
 	$(CC) $(OPTIONS_COMPILE) -c src/vpncmd/vpncmd.c -o tmp/objs/vpncmd.o
 
 # Install
-install: $(INSTALL_BINDIR)vpnserver $(INSTALL_BINDIR)vpnbridge $(INSTALL_BINDIR)vpnclient $(INSTALL_BINDIR)vpncmd
+install: $(STAGEDIR)$(INSTALL_BINDIR)vpnserver $(STAGEDIR)$(INSTALL_BINDIR)vpnbridge $(STAGEDIR)$(INSTALL_BINDIR)vpnclient $(STAGEDIR)$(INSTALL_BINDIR)vpncmd
 	@echo
 	@echo "--------------------------------------------------------------------"
 	@echo "Installation completed successfully."
@@ -391,41 +391,37 @@ install: $(INSTALL_BINDIR)vpnserver $(IN
 	@echo "--------------------------------------------------------------------"
 	@echo
 
-$(INSTALL_BINDIR)vpnserver: bin/vpnserver/hamcore.se2 bin/vpnserver/vpnserver
-	@mkdir -p $(INSTALL_VPNSERVER_DIR)
-	cp bin/vpnserver/hamcore.se2 $(INSTALL_VPNSERVER_DIR)hamcore.se2
-	cp bin/vpnserver/vpnserver $(INSTALL_VPNSERVER_DIR)vpnserver
-	echo "#!/bin/sh" > $(INSTALL_BINDIR)vpnserver
-	echo $(INSTALL_VPNSERVER_DIR)vpnserver '"$$@"' >> $(INSTALL_BINDIR)vpnserver
-	echo 'exit $$?' >> $(INSTALL_BINDIR)vpnserver
-	chmod 755 $(INSTALL_BINDIR)vpnserver
+$(STAGEDIR)$(INSTALL_BINDIR)vpnserver: bin/vpnserver/hamcore.se2 bin/vpnserver/vpnserver
+	@mkdir -p $(STAGEDIR)$(INSTALL_VPNSERVER_DIR)
+	cp bin/vpnserver/hamcore.se2 $(STAGEDIR)$(INSTALL_VPNSERVER_DIR)hamcore.se2
+	$(BSD_INSTALL_PROGRAM) bin/vpnserver/vpnserver $(STAGEDIR)$(INSTALL_VPNSERVER_DIR)vpnserver
+	echo "#!/bin/sh" > $(STAGEDIR)$(INSTALL_BINDIR)vpnserver
+	echo exec $(INSTALL_VPNSERVER_DIR)vpnserver '"$$@"' >> $(STAGEDIR)$(INSTALL_BINDIR)vpnserver
+	chmod 755 $(STAGEDIR)$(INSTALL_BINDIR)vpnserver
 
-$(INSTALL_BINDIR)vpnbridge: bin/vpnbridge/hamcore.se2 bin/vpnbridge/vpnbridge
-	@mkdir -p $(INSTALL_VPNBRIDGE_DIR)
-	cp bin/vpnbridge/hamcore.se2 $(INSTALL_VPNBRIDGE_DIR)hamcore.se2
-	cp bin/vpnbridge/vpnbridge $(INSTALL_VPNBRIDGE_DIR)vpnbridge
-	echo "#!/bin/sh" > $(INSTALL_BINDIR)vpnbridge
-	echo $(INSTALL_VPNBRIDGE_DIR)vpnbridge '"$$@"' >> $(INSTALL_BINDIR)vpnbridge
-	echo 'exit $$?' >> $(INSTALL_BINDIR)vpnbridge
-	chmod 755 $(INSTALL_BINDIR)vpnbridge
+$(STAGEDIR)$(INSTALL_BINDIR)vpnbridge: bin/vpnbridge/hamcore.se2 bin/vpnbridge/vpnbridge
+	@mkdir -p $(STAGEDIR)$(INSTALL_VPNBRIDGE_DIR)
+	cp bin/vpnbridge/hamcore.se2 $(STAGEDIR)$(INSTALL_VPNBRIDGE_DIR)hamcore.se2
+	$(BSD_INSTALL_PROGRAM) bin/vpnbridge/vpnbridge $(STAGEDIR)$(INSTALL_VPNBRIDGE_DIR)vpnbridge
+	echo "#!/bin/sh" > $(STAGEDIR)$(INSTALL_BINDIR)vpnbridge
+	echo exec $(INSTALL_VPNBRIDGE_DIR)vpnbridge '"$$@"' >> $(STAGEDIR)$(INSTALL_BINDIR)vpnbridge
+	chmod 755 $(STAGEDIR)$(INSTALL_BINDIR)vpnbridge
 
-$(INSTALL_BINDIR)vpnclient: bin/vpnclient/hamcore.se2 bin/vpnclient/vpnclient
-	@mkdir -p $(INSTALL_VPNCLIENT_DIR)
-	cp bin/vpnclient/hamcore.se2 $(INSTALL_VPNCLIENT_DIR)hamcore.se2
-	cp bin/vpnclient/vpnclient $(INSTALL_VPNCLIENT_DIR)vpnclient
-	echo "#!/bin/sh" > $(INSTALL_BINDIR)vpnclient
-	echo $(INSTALL_VPNCLIENT_DIR)vpnclient '"$$@"' >> $(INSTALL_BINDIR)vpnclient
-	echo 'exit $$?' >> $(INSTALL_BINDIR)vpnclient
-	chmod 755 $(INSTALL_BINDIR)vpnclient
+$(STAGEDIR)$(INSTALL_BINDIR)vpnclient: bin/vpnclient/hamcore.se2 bin/vpnclient/vpnclient
+	@mkdir -p $(STAGEDIR)$(INSTALL_VPNCLIENT_DIR)
+	cp bin/vpnclient/hamcore.se2 $(STAGEDIR)$(INSTALL_VPNCLIENT_DIR)hamcore.se2
+	$(BSD_INSTALL_PROGRAM) bin/vpnclient/vpnclient $(STAGEDIR)$(INSTALL_VPNCLIENT_DIR)vpnclient
+	echo "#!/bin/sh" > $(STAGEDIR)$(INSTALL_BINDIR)vpnclient
+	echo exec $(INSTALL_VPNCLIENT_DIR)vpnclient '"$$@"' >> $(STAGEDIR)$(INSTALL_BINDIR)vpnclient
+	chmod 755 $(STAGEDIR)$(INSTALL_BINDIR)vpnclient
 
-$(INSTALL_BINDIR)vpncmd: bin/vpncmd/hamcore.se2 bin/vpncmd/vpncmd
-	@mkdir -p $(INSTALL_VPNCMD_DIR)
-	cp bin/vpncmd/hamcore.se2 $(INSTALL_VPNCMD_DIR)hamcore.se2
-	cp bin/vpncmd/vpncmd $(INSTALL_VPNCMD_DIR)vpncmd
-	echo "#!/bin/sh" > $(INSTALL_BINDIR)vpncmd
-	echo $(INSTALL_VPNCMD_DIR)vpncmd '"$$@"' >> $(INSTALL_BINDIR)vpncmd
-	echo 'exit $$?' >> $(INSTALL_BINDIR)vpncmd
-	chmod 755 $(INSTALL_BINDIR)vpncmd
+$(STAGEDIR)$(INSTALL_BINDIR)vpncmd: bin/vpncmd/hamcore.se2 bin/vpncmd/vpncmd
+	@mkdir -p $(STAGEDIR)$(INSTALL_VPNCMD_DIR)
+	cp bin/vpncmd/hamcore.se2 $(STAGEDIR)$(INSTALL_VPNCMD_DIR)hamcore.se2
+	$(BSD_INSTALL_PROGRAM) bin/vpncmd/vpncmd $(STAGEDIR)$(INSTALL_VPNCMD_DIR)vpncmd
+	echo "#!/bin/sh" > $(STAGEDIR)$(INSTALL_BINDIR)vpncmd
+	echo exec $(INSTALL_VPNCMD_DIR)vpncmd '"$$@"' >> $(STAGEDIR)$(INSTALL_BINDIR)vpncmd
+	chmod 755 $(STAGEDIR)$(INSTALL_BINDIR)vpncmd
 
 # Clean
 clean:




--- src/Mayaqua/Network.c.orig	2017-01-12 14:15:02 UTC
+++ src/Mayaqua/Network.c
@@ -12983,7 +12983,11 @@ bool StartSSLEx(SOCK *sock, X *x, K *pri
 		{
 			if (client_tls == false)
 			{
+#ifndef OPENSSL_NO_SSL3_METHOD
 				SSL_CTX_set_ssl_version(ssl_ctx, SSLv3_method());
+#else
+				SSL_CTX_set_ssl_version(ssl_ctx, SSLv23_method());
+#endif
 			}
 			else
 			{




#!/bin/sh
#
# $FreeBSD$
#
# PROVIDE: vpnbridge
# REQUIRE: LOGIN
#
. /etc/rc.subr

name=vpnbridge
rcvar=${name}_enable
command=%%PREFIX%%/sbin/${name}
start_cmd="${name}_start"
stop_cmd="${name}_stop"

vpnbridge_start()
{

	$command start
}

vpnbridge_stop()
{

	$command stop
}

load_rc_config $name
: ${vpnbridge_enable:=NO}
run_rc_command "$1"




#!/bin/sh
#
# $FreeBSD$
#
# PROVIDE: vpnclient
# REQUIRE: LOGIN
#
. /etc/rc.subr

name=vpnclient
rcvar=${name}_enable
command=%%PREFIX%%/sbin/${name}
start_cmd="${name}_start"
stop_cmd="${name}_stop"

vpnclient_start()
{

	$command start
}

vpnclient_stop()
{

	$command stop
}

load_rc_config $name
: ${vpnclient_enable:=NO}
run_rc_command "$1"




#!/bin/sh
#
# $FreeBSD$
#
# PROVIDE: vpnserver
# REQUIRE: LOGIN
#
. /etc/rc.subr

name=vpnserver
rcvar=${name}_enable
command=%%PREFIX%%/sbin/${name}
start_cmd="${name}_start"
stop_cmd="${name}_stop"

vpnserver_start()
{

	$command start
}

vpnserver_stop()
{

	$command stop
}

load_rc_config $name
: ${vpnserver_enable:=NO}
run_rc_command "$1"

Lines 1-10 Link Here

(-)net/softethervpn/pkg-descr (-10 lines)
1	SoftEther VPN ("SoftEther" means "Software Ethernet") is one of the
2	world's most powerful and easy-to-use multi-protocol VPN software.
3
4	SoftEther VPN runs on Windows, Linux, Mac, FreeBSD and Solaris.
5
6	SoftEther VPN supports most of widely-used VPN protocols
7	including SSL-VPN, OpenVPN, IPsec, L2TP, MS-SSTP, L2TPv3 and EtherIP
8	by the single SoftEther VPN Server program.
9
10	WWW: http://www.softether.org/




sbin/vpnserver
sbin/vpnbridge
sbin/vpnclient
sbin/vpncmd
softethervpn/vpnbridge/hamcore.se2
softethervpn/vpnbridge/vpnbridge
softethervpn/vpnclient/hamcore.se2
softethervpn/vpnclient/vpnclient
softethervpn/vpncmd/hamcore.se2
softethervpn/vpncmd/vpncmd
softethervpn/vpnserver/hamcore.se2
softethervpn/vpnserver/vpnserver

Lines 1106-1111 Link Here

(-)security/Makefile (+1 lines)
1106	SUBDIR += snortsam	1106	SUBDIR += snortsam
1107	SUBDIR += snortsnarf	1107	SUBDIR += snortsnarf
1108	SUBDIR += softether	1108	SUBDIR += softether
		1109	SUBDIR += softether-devel
1109	SUBDIR += softhsm	1110	SUBDIR += softhsm
1110	SUBDIR += softhsm2	1111	SUBDIR += softhsm2
1111	SUBDIR += spass	1112	SUBDIR += spass

Lines 1-8 Link Here

(-)security/softether-devel/Makefile (-2 / +4 lines)
1	# $FreeBSD$	1	# $FreeBSD$
2		2
3	PORTNAME= softethervpn	3	PORTNAME= softether-devel
4	PORTVERSION= 4.21.9613	4	PORTVERSION= 4.21.9613
5	CATEGORIES= net	5	CATEGORIES= security
6		6
7	MAINTAINER= hrs@FreeBSD.org	7	MAINTAINER= hrs@FreeBSD.org
8	COMMENT= Cross-platform Multi-protocol VPN Software	8	COMMENT= Cross-platform Multi-protocol VPN Software
Lines 10-15 Link Here
10	LICENSE= GPLv2	10	LICENSE= GPLv2
11	LICENSE_FILE= ${WRKSRC}/LICENSE	11	LICENSE_FILE= ${WRKSRC}/LICENSE
12		12
		13	CONFLICTS_INSTALL= softether
		14
13	USES= dos2unix gmake iconv localbase readline ssl	15	USES= dos2unix gmake iconv localbase readline ssl
14	DOS2UNIX_FILES= src/Mayaqua/Network.c	16	DOS2UNIX_FILES= src/Mayaqua/Network.c
15	USE_GITHUB= yes	17	USE_GITHUB= yes

Return to bug 217732

Lines 1-36 Link Here

(-)net/softethervpn/Makefile (-36 lines)
1	# $FreeBSD$
2
3	PORTNAME= softethervpn
4	PORTVERSION= 4.21.9613
5	CATEGORIES= net
6
7	MAINTAINER= hrs@FreeBSD.org
8	COMMENT= Cross-platform Multi-protocol VPN Software
9
10	LICENSE= GPLv2
11	LICENSE_FILE= ${WRKSRC}/LICENSE
12
13	USES= dos2unix gmake iconv localbase readline ssl
14	DOS2UNIX_FILES= src/Mayaqua/Network.c
15	USE_GITHUB= yes
16	GH_ACCOUNT= SoftEtherVPN
17	GH_PROJECT= SoftEtherVPN
18	GH_TAGNAME= 1e17c9b
19	ALL_TARGET= build
20	MAKE_ENV= STAGEDIR=${STAGEDIR} ICONV_LIB=${ICONV_LIB}
21	USE_RC_SUBR= vpnserver vpnclient vpnbridge
22	PORTDOCS= AUTHORS.TXT BUILD_UNIX.TXT ChangeLog README THIRD_PARTY.TXT \
23	WARNING.TXT
24
25	OPTIONS_DEFINE= DOCS
26
27	post-patch:
28	${INSTALL_DATA} ${WRKSRC}/src/makefiles/freebsd_32bit.mak \
29	${WRKSRC}/Makefile
30
31	post-install-DOCS-on:
32	@${MKDIR} ${STAGEDIR}${DOCSDIR}
33	cd ${WRKSRC} && \
34	${INSTALL_DATA} ${PORTDOCS} ${STAGEDIR}${DOCSDIR}
35
36	.include <bsd.port.mk>

Lines 1-110 Link Here

(-)net/softethervpn/files/patch-src-makefiles-freebsd_32bit.mak (-110 lines)
1	--- src/makefiles/freebsd_32bit.mak.orig 2016-04-24 14:49:31 UTC
2	+++ src/makefiles/freebsd_32bit.mak
3	@@ -25,19 +25,19 @@
4
5	#CC=gcc
6
7	-OPTIONS_COMPILE_DEBUG=-D_DEBUG -DDEBUG -DUNIX -DUNIX_BSD -DBRIDGE_BPF -DNO_VLAN -D_REENTRANT -DREENTRANT -D_THREAD_SAFE -D_THREADSAFE -DTHREAD_SAFE -DTHREADSAFE -D_FILE_OFFSET_BITS=64 -I./src/ -I./src/Cedar/ -I./src/Mayaqua/ -I/usr/local/include -I/usr/include -g -fsigned-char
8	+OPTIONS_COMPILE_DEBUG=-D_DEBUG -DDEBUG -DUNIX -DUNIX_BSD -DBRIDGE_BPF -DNO_VLAN -D_REENTRANT -DREENTRANT -D_THREAD_SAFE -D_THREADSAFE -DTHREAD_SAFE -DTHREADSAFE -D_FILE_OFFSET_BITS=64 -I./src/ -I./src/Cedar/ -I./src/Mayaqua/ -g -fsigned-char
9
10	-OPTIONS_LINK_DEBUG=-g -fsigned-char -L/usr/local/lib -L/usr/lib -lm -lpthread -lssl -lcrypto -liconv -lreadline -lncurses -lz
11	+OPTIONS_LINK_DEBUG=-g -fsigned-char -lm -lpthread -lssl -lcrypto ${ICONV_LIB} -lreadline -lncurses -lz
12
13	-OPTIONS_COMPILE_RELEASE=-DNDEBUG -DVPN_SPEED -DUNIX -DUNIX_BSD -DBRIDGE_BPF -DNO_VLAN -D_REENTRANT -DREENTRANT -D_THREAD_SAFE -D_THREADSAFE -DTHREAD_SAFE -DTHREADSAFE -D_FILE_OFFSET_BITS=64 -I./src/ -I./src/Cedar/ -I./src/Mayaqua/ -I/usr/local/include -I/usr/include -O2 -fsigned-char
14	+OPTIONS_COMPILE_RELEASE=-DNDEBUG -DVPN_SPEED -DUNIX -DUNIX_BSD -DBRIDGE_BPF -DNO_VLAN -D_REENTRANT -DREENTRANT -D_THREAD_SAFE -D_THREADSAFE -DTHREAD_SAFE -DTHREADSAFE -D_FILE_OFFSET_BITS=64 -I./src/ -I./src/Cedar/ -I./src/Mayaqua/ -fsigned-char ${CFLAGS}
15
16	-OPTIONS_LINK_RELEASE=-O2 -fsigned-char -L/usr/local/lib -L/usr/lib -lm -lpthread -lssl -lcrypto -liconv -lreadline -lncurses -lz
17	+OPTIONS_LINK_RELEASE=-fsigned-char ${LDFLAGS} ${LIBS} -lm -lpthread -lssl -lcrypto ${ICONV_LIB} -lreadline -lncurses -lz
18
19	-INSTALL_BINDIR=/usr/bin/
20	-INSTALL_VPNSERVER_DIR=/usr/vpnserver/
21	-INSTALL_VPNBRIDGE_DIR=/usr/vpnbridge/
22	-INSTALL_VPNCLIENT_DIR=/usr/vpnclient/
23	-INSTALL_VPNCMD_DIR=/usr/vpncmd/
24	+INSTALL_BINDIR=${PREFIX}/sbin/
25	+INSTALL_VPNSERVER_DIR=${PREFIX}/softethervpn/vpnserver/
26	+INSTALL_VPNBRIDGE_DIR=${PREFIX}/softethervpn/vpnbridge/
27	+INSTALL_VPNCLIENT_DIR=${PREFIX}/softethervpn/vpnclient/
28	+INSTALL_VPNCMD_DIR=${PREFIX}/softethervpn/vpncmd/
29
30	ifeq ($(DEBUG),YES)
31	OPTIONS_COMPILE=$(OPTIONS_COMPILE_DEBUG)
32	@@ -379,7 +379,7 @@ tmp/objs/vpncmd.o: src/vpncmd/vpncmd.c $
33	$(CC) $(OPTIONS_COMPILE) -c src/vpncmd/vpncmd.c -o tmp/objs/vpncmd.o
34
35	# Install
36	-install: $(INSTALL_BINDIR)vpnserver $(INSTALL_BINDIR)vpnbridge $(INSTALL_BINDIR)vpnclient $(INSTALL_BINDIR)vpncmd
37	+install: $(STAGEDIR)$(INSTALL_BINDIR)vpnserver $(STAGEDIR)$(INSTALL_BINDIR)vpnbridge $(STAGEDIR)$(INSTALL_BINDIR)vpnclient $(STAGEDIR)$(INSTALL_BINDIR)vpncmd
38	@echo
39	@echo "--------------------------------------------------------------------"
40	@echo "Installation completed successfully."
41	@@ -391,41 +391,37 @@ install: $(INSTALL_BINDIR)vpnserver $(IN
42	@echo "--------------------------------------------------------------------"
43	@echo
44
45	-$(INSTALL_BINDIR)vpnserver: bin/vpnserver/hamcore.se2 bin/vpnserver/vpnserver
46	- @mkdir -p $(INSTALL_VPNSERVER_DIR)
47	- cp bin/vpnserver/hamcore.se2 $(INSTALL_VPNSERVER_DIR)hamcore.se2
48	- cp bin/vpnserver/vpnserver $(INSTALL_VPNSERVER_DIR)vpnserver
49	- echo "#!/bin/sh" > $(INSTALL_BINDIR)vpnserver
50	- echo $(INSTALL_VPNSERVER_DIR)vpnserver '"$$@"' >> $(INSTALL_BINDIR)vpnserver
51	- echo 'exit $$?' >> $(INSTALL_BINDIR)vpnserver
52	- chmod 755 $(INSTALL_BINDIR)vpnserver
53	+$(STAGEDIR)$(INSTALL_BINDIR)vpnserver: bin/vpnserver/hamcore.se2 bin/vpnserver/vpnserver
54	+ @mkdir -p $(STAGEDIR)$(INSTALL_VPNSERVER_DIR)
55	+ cp bin/vpnserver/hamcore.se2 $(STAGEDIR)$(INSTALL_VPNSERVER_DIR)hamcore.se2
56	+ $(BSD_INSTALL_PROGRAM) bin/vpnserver/vpnserver $(STAGEDIR)$(INSTALL_VPNSERVER_DIR)vpnserver
57	+ echo "#!/bin/sh" > $(STAGEDIR)$(INSTALL_BINDIR)vpnserver
58	+ echo exec $(INSTALL_VPNSERVER_DIR)vpnserver '"$$@"' >> $(STAGEDIR)$(INSTALL_BINDIR)vpnserver
59	+ chmod 755 $(STAGEDIR)$(INSTALL_BINDIR)vpnserver
60
61	-$(INSTALL_BINDIR)vpnbridge: bin/vpnbridge/hamcore.se2 bin/vpnbridge/vpnbridge
62	- @mkdir -p $(INSTALL_VPNBRIDGE_DIR)
63	- cp bin/vpnbridge/hamcore.se2 $(INSTALL_VPNBRIDGE_DIR)hamcore.se2
64	- cp bin/vpnbridge/vpnbridge $(INSTALL_VPNBRIDGE_DIR)vpnbridge
65	- echo "#!/bin/sh" > $(INSTALL_BINDIR)vpnbridge
66	- echo $(INSTALL_VPNBRIDGE_DIR)vpnbridge '"$$@"' >> $(INSTALL_BINDIR)vpnbridge
67	- echo 'exit $$?' >> $(INSTALL_BINDIR)vpnbridge
68	- chmod 755 $(INSTALL_BINDIR)vpnbridge
69	+$(STAGEDIR)$(INSTALL_BINDIR)vpnbridge: bin/vpnbridge/hamcore.se2 bin/vpnbridge/vpnbridge
70	+ @mkdir -p $(STAGEDIR)$(INSTALL_VPNBRIDGE_DIR)
71	+ cp bin/vpnbridge/hamcore.se2 $(STAGEDIR)$(INSTALL_VPNBRIDGE_DIR)hamcore.se2
72	+ $(BSD_INSTALL_PROGRAM) bin/vpnbridge/vpnbridge $(STAGEDIR)$(INSTALL_VPNBRIDGE_DIR)vpnbridge
73	+ echo "#!/bin/sh" > $(STAGEDIR)$(INSTALL_BINDIR)vpnbridge
74	+ echo exec $(INSTALL_VPNBRIDGE_DIR)vpnbridge '"$$@"' >> $(STAGEDIR)$(INSTALL_BINDIR)vpnbridge
75	+ chmod 755 $(STAGEDIR)$(INSTALL_BINDIR)vpnbridge
76
77	-$(INSTALL_BINDIR)vpnclient: bin/vpnclient/hamcore.se2 bin/vpnclient/vpnclient
78	- @mkdir -p $(INSTALL_VPNCLIENT_DIR)
79	- cp bin/vpnclient/hamcore.se2 $(INSTALL_VPNCLIENT_DIR)hamcore.se2
80	- cp bin/vpnclient/vpnclient $(INSTALL_VPNCLIENT_DIR)vpnclient
81	- echo "#!/bin/sh" > $(INSTALL_BINDIR)vpnclient
82	- echo $(INSTALL_VPNCLIENT_DIR)vpnclient '"$$@"' >> $(INSTALL_BINDIR)vpnclient
83	- echo 'exit $$?' >> $(INSTALL_BINDIR)vpnclient
84	- chmod 755 $(INSTALL_BINDIR)vpnclient
85	+$(STAGEDIR)$(INSTALL_BINDIR)vpnclient: bin/vpnclient/hamcore.se2 bin/vpnclient/vpnclient
86	+ @mkdir -p $(STAGEDIR)$(INSTALL_VPNCLIENT_DIR)
87	+ cp bin/vpnclient/hamcore.se2 $(STAGEDIR)$(INSTALL_VPNCLIENT_DIR)hamcore.se2
88	+ $(BSD_INSTALL_PROGRAM) bin/vpnclient/vpnclient $(STAGEDIR)$(INSTALL_VPNCLIENT_DIR)vpnclient
89	+ echo "#!/bin/sh" > $(STAGEDIR)$(INSTALL_BINDIR)vpnclient
90	+ echo exec $(INSTALL_VPNCLIENT_DIR)vpnclient '"$$@"' >> $(STAGEDIR)$(INSTALL_BINDIR)vpnclient
91	+ chmod 755 $(STAGEDIR)$(INSTALL_BINDIR)vpnclient
92
93	-$(INSTALL_BINDIR)vpncmd: bin/vpncmd/hamcore.se2 bin/vpncmd/vpncmd
94	- @mkdir -p $(INSTALL_VPNCMD_DIR)
95	- cp bin/vpncmd/hamcore.se2 $(INSTALL_VPNCMD_DIR)hamcore.se2
96	- cp bin/vpncmd/vpncmd $(INSTALL_VPNCMD_DIR)vpncmd
97	- echo "#!/bin/sh" > $(INSTALL_BINDIR)vpncmd
98	- echo $(INSTALL_VPNCMD_DIR)vpncmd '"$$@"' >> $(INSTALL_BINDIR)vpncmd
99	- echo 'exit $$?' >> $(INSTALL_BINDIR)vpncmd
100	- chmod 755 $(INSTALL_BINDIR)vpncmd
101	+$(STAGEDIR)$(INSTALL_BINDIR)vpncmd: bin/vpncmd/hamcore.se2 bin/vpncmd/vpncmd
102	+ @mkdir -p $(STAGEDIR)$(INSTALL_VPNCMD_DIR)
103	+ cp bin/vpncmd/hamcore.se2 $(STAGEDIR)$(INSTALL_VPNCMD_DIR)hamcore.se2
104	+ $(BSD_INSTALL_PROGRAM) bin/vpncmd/vpncmd $(STAGEDIR)$(INSTALL_VPNCMD_DIR)vpncmd
105	+ echo "#!/bin/sh" > $(STAGEDIR)$(INSTALL_BINDIR)vpncmd
106	+ echo exec $(INSTALL_VPNCMD_DIR)vpncmd '"$$@"' >> $(STAGEDIR)$(INSTALL_BINDIR)vpncmd
107	+ chmod 755 $(STAGEDIR)$(INSTALL_BINDIR)vpncmd
108
109	# Clean
110	clean:

Lines 1-14 Link Here

(-)net/softethervpn/files/patch-src_Mayaqua_Network.c (-14 lines)
1	--- src/Mayaqua/Network.c.orig 2017-01-12 14:15:02 UTC
2	+++ src/Mayaqua/Network.c
3	@@ -12983,7 +12983,11 @@ bool StartSSLEx(SOCK sock, X x, K *pri
4	{
5	if (client_tls == false)
6	{
7	+#ifndef OPENSSL_NO_SSL3_METHOD
8	SSL_CTX_set_ssl_version(ssl_ctx, SSLv3_method());
9	+#else
10	+ SSL_CTX_set_ssl_version(ssl_ctx, SSLv23_method());
11	+#endif
12	}
13	else
14	{

Lines 1-30 Link Here

(-)net/softethervpn/files/vpnbridge.in (-30 lines)
1	#!/bin/sh
2	#
3	# $FreeBSD$
4	#
5	# PROVIDE: vpnbridge
6	# REQUIRE: LOGIN
7	#
8	. /etc/rc.subr
9
10	name=vpnbridge
11	rcvar=${name}_enable
12	command=%%PREFIX%%/sbin/${name}
13	start_cmd="${name}_start"
14	stop_cmd="${name}_stop"
15
16	vpnbridge_start()
17	{
18
19	$command start
20	}
21
22	vpnbridge_stop()
23	{
24
25	$command stop
26	}
27
28	load_rc_config $name
29	: ${vpnbridge_enable:=NO}
30	run_rc_command "$1"

Lines 1-30 Link Here

(-)net/softethervpn/files/vpnclient.in (-30 lines)
1	#!/bin/sh
2	#
3	# $FreeBSD$
4	#
5	# PROVIDE: vpnclient
6	# REQUIRE: LOGIN
7	#
8	. /etc/rc.subr
9
10	name=vpnclient
11	rcvar=${name}_enable
12	command=%%PREFIX%%/sbin/${name}
13	start_cmd="${name}_start"
14	stop_cmd="${name}_stop"
15
16	vpnclient_start()
17	{
18
19	$command start
20	}
21
22	vpnclient_stop()
23	{
24
25	$command stop
26	}
27
28	load_rc_config $name
29	: ${vpnclient_enable:=NO}
30	run_rc_command "$1"

Lines 1-30 Link Here

(-)net/softethervpn/files/vpnserver.in (-30 lines)
1	#!/bin/sh
2	#
3	# $FreeBSD$
4	#
5	# PROVIDE: vpnserver
6	# REQUIRE: LOGIN
7	#
8	. /etc/rc.subr
9
10	name=vpnserver
11	rcvar=${name}_enable
12	command=%%PREFIX%%/sbin/${name}
13	start_cmd="${name}_start"
14	stop_cmd="${name}_stop"
15
16	vpnserver_start()
17	{
18
19	$command start
20	}
21
22	vpnserver_stop()
23	{
24
25	$command stop
26	}
27
28	load_rc_config $name
29	: ${vpnserver_enable:=NO}
30	run_rc_command "$1"

Lines 1-12 Link Here

(-)net/softethervpn/pkg-plist (-12 lines)
1	sbin/vpnserver
2	sbin/vpnbridge
3	sbin/vpnclient
4	sbin/vpncmd
5	softethervpn/vpnbridge/hamcore.se2
6	softethervpn/vpnbridge/vpnbridge
7	softethervpn/vpnclient/hamcore.se2
8	softethervpn/vpnclient/vpnclient
9	softethervpn/vpncmd/hamcore.se2
10	softethervpn/vpncmd/vpncmd
11	softethervpn/vpnserver/hamcore.se2
12	softethervpn/vpnserver/vpnserver