net/softethervpn: rename to security/softether-devel

PR:		217732
Submitted by:	pi
Approved by:	hrs (maintainer timeout)

10 files changed, 278 insertions, 0 deletions

diff --git a/security/Makefile b/security/Makefile
index 984f8ef35d51..9f17f248856e 100644
--- a/security/Makefile
+++ b/security/Makefile
@@ -1122,6 +1122,7 @@
     SUBDIR += snortsam
     SUBDIR += snortsnarf
     SUBDIR += softether
+    SUBDIR += softether-devel
     SUBDIR += softhsm
     SUBDIR += softhsm2
     SUBDIR += spass
diff --git a/security/softether-devel/Makefile b/security/softether-devel/Makefile
new file mode 100644
index 000000000000..a020d59dbfd9
--- /dev/null
+++ b/security/softether-devel/Makefile
@@ -0,0 +1,38 @@
+# $FreeBSD$
+
+PORTNAME=	softether-devel
+PORTVERSION=	4.21.9613
+CATEGORIES=	security
+
+MAINTAINER=	hrs@FreeBSD.org
+COMMENT=	Cross-platform Multi-protocol VPN Software
+
+LICENSE=	GPLv2
+LICENSE_FILE=	${WRKSRC}/LICENSE
+
+CONFLICTS_INSTALL=	softether
+
+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>
diff --git a/security/softether-devel/distinfo b/security/softether-devel/distinfo
new file mode 100644
index 000000000000..ff2fbe4bf07e
--- /dev/null
+++ b/security/softether-devel/distinfo
@@ -0,0 +1,3 @@
+TIMESTAMP = 1479531912
+SHA256 (SoftEtherVPN-SoftEtherVPN-4.21.9613-1e17c9b_GH0.tar.gz) = 3ba427abd3684e6f3fa1896512d240890f07beee179aef0823cbfd165b06def5
+SIZE (SoftEtherVPN-SoftEtherVPN-4.21.9613-1e17c9b_GH0.tar.gz) = 33681928
diff --git a/security/softether-devel/files/patch-src-makefiles-freebsd_32bit.mak b/security/softether-devel/files/patch-src-makefiles-freebsd_32bit.mak
new file mode 100644
index 000000000000..6324c81bdbe2
--- /dev/null
+++ b/security/softether-devel/files/patch-src-makefiles-freebsd_32bit.mak
@@ -0,0 +1,110 @@
+--- 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:
diff --git a/security/softether-devel/files/patch-src_Mayaqua_Network.c b/security/softether-devel/files/patch-src_Mayaqua_Network.c
new file mode 100644
index 000000000000..68d0bb575b99
--- /dev/null
+++ b/security/softether-devel/files/patch-src_Mayaqua_Network.c
@@ -0,0 +1,14 @@
+--- 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
+ 			{
diff --git a/security/softether-devel/files/vpnbridge.in b/security/softether-devel/files/vpnbridge.in
new file mode 100644
index 000000000000..a089d719bb74
--- /dev/null
+++ b/security/softether-devel/files/vpnbridge.in
@@ -0,0 +1,30 @@
+#!/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"
diff --git a/security/softether-devel/files/vpnclient.in b/security/softether-devel/files/vpnclient.in
new file mode 100644
index 000000000000..c099dbea9c01
--- /dev/null
+++ b/security/softether-devel/files/vpnclient.in
@@ -0,0 +1,30 @@
+#!/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"
diff --git a/security/softether-devel/files/vpnserver.in b/security/softether-devel/files/vpnserver.in
new file mode 100644
index 000000000000..16aff5c9df5d
--- /dev/null
+++ b/security/softether-devel/files/vpnserver.in
@@ -0,0 +1,30 @@
+#!/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"
diff --git a/security/softether-devel/pkg-descr b/security/softether-devel/pkg-descr
new file mode 100644
index 000000000000..440fbaecb503
--- /dev/null
+++ b/security/softether-devel/pkg-descr
@@ -0,0 +1,10 @@
+SoftEther VPN ("SoftEther" means "Software Ethernet") is one of the
+world's most powerful and easy-to-use multi-protocol VPN software.
+
+SoftEther VPN runs on Windows, Linux, Mac, FreeBSD and Solaris.
+
+SoftEther VPN supports most of widely-used VPN protocols
+including SSL-VPN, OpenVPN, IPsec, L2TP, MS-SSTP, L2TPv3 and EtherIP
+by the single SoftEther VPN Server program.
+
+WWW: http://www.softether.org/
diff --git a/security/softether-devel/pkg-plist b/security/softether-devel/pkg-plist
new file mode 100644
index 000000000000..8dc075f75d7c
--- /dev/null
+++ b/security/softether-devel/pkg-plist
@@ -0,0 +1,12 @@
+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