svn commit: r400650 - in head/security/softether: . files
Kurt Jaeger
pi at FreeBSD.org
Mon Nov 2 12:00:01 UTC 2015
Author: pi
Date: Mon Nov 2 11:59:59 2015
New Revision: 400650
URL: https://svnweb.freebsd.org/changeset/ports/400650
Log:
security/softether: fixes
- iconv build
- build with No-SSLv3
- MAKE_JOBS_UNSAFE=yes unconditionally
PR: 203688, 204184
Submitted by: net at arrishq.net (maintainer)
Added:
head/security/softether/files/patch-src__Mayaqua__Network.c (contents, props changed)
Modified:
head/security/softether/Makefile
Modified: head/security/softether/Makefile
==============================================================================
--- head/security/softether/Makefile Mon Nov 2 10:29:58 2015 (r400649)
+++ head/security/softether/Makefile Mon Nov 2 11:59:59 2015 (r400650)
@@ -2,6 +2,7 @@
PORTNAME= softether
PORTVERSION= 4.18.9570
+PORTREVISION= 1
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
@@ -24,6 +25,7 @@ DOS2UNIX_FILES= AUTHORS.TXT ChangeLog LI
src/Cedar/Server.c \
src/Mayaqua/Cfg.c \
src/Mayaqua/Cfg.h \
+ src/Mayaqua/Network.c \
src/Mayaqua/Kernel.c \
src/Mayaqua/Table.h \
src/Mayaqua/Unix.c
@@ -33,9 +35,10 @@ OPTIONS_DEFINE= DOCS
ONLY_FOR_ARCHS= i386 amd64
USE_OPENSSL= yes
-USES= dos2unix gmake iconv ncurses readline
+USES= dos2unix gmake iconv:translit iconv:wchar_t ncurses readline
USE_RC_SUBR= softether_bridge softether_client softether_server
SUB_FILES= vpncmd
+MAKE_JOBS_UNSAFE= yes
# a pity the source directory has such a naming scheme, but well
WRKSRC= ${WRKDIR}/v4.18-9570
@@ -47,11 +50,6 @@ ALL_TARGET= build
# requires OpenSSL from ports
.if ${OSVERSION} < 1000000
WITH_OPENSSL_PORT= yes
-MAKE_JOBS_UNSAFE= yes
-.endif
-
-.if ${OSVERSION} >= 1000000
-BUILD_DEPENDS= libiconv>=1.14:${PORTSDIR}/converters/libiconv
.endif
# skip configure at all and copy the corresponding Makefile in place
Added: head/security/softether/files/patch-src__Mayaqua__Network.c
==============================================================================
--- /dev/null 00:00:00 1970 (empty, because file is newly added)
+++ head/security/softether/files/patch-src__Mayaqua__Network.c Mon Nov 2 11:59:59 2015 (r400650)
@@ -0,0 +1,19 @@
+--- src/Mayaqua/Network.c.orig 2015-07-26 06:38:18 UTC
++++ src/Mayaqua/Network.c
+@@ -12920,7 +12920,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
+ {
More information about the svn-ports-all
mailing list