Date: Mon, 2 Nov 2015 19:44:44 +0000 (UTC) From: Kurt Jaeger <pi@FreeBSD.org> To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-branches@freebsd.org Subject: svn commit: r400670 - in branches/2015Q4/security/softether: . files Message-ID: <201511021944.tA2JiiZn034421@repo.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: pi Date: Mon Nov 2 19:44:44 2015 New Revision: 400670 URL: https://svnweb.freebsd.org/changeset/ports/400670 Log: MFH: r400650 - iconv build - build with No-SSLv3 - MAKE_JOBS_UNSAFE=yes unconditionally PR: 204184 Approved by: ports-secteam (feld) Added: branches/2015Q4/security/softether/files/patch-src__Mayaqua__Network.c (contents, props changed) Modified: branches/2015Q4/security/softether/Makefile Modified: branches/2015Q4/security/softether/Makefile ============================================================================== --- branches/2015Q4/security/softether/Makefile Mon Nov 2 19:09:55 2015 (r400669) +++ branches/2015Q4/security/softether/Makefile Mon Nov 2 19:44:44 2015 (r400670) @@ -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: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: branches/2015Q4/security/softether/files/patch-src__Mayaqua__Network.c ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ branches/2015Q4/security/softether/files/patch-src__Mayaqua__Network.c Mon Nov 2 19:44:44 2015 (r400670) @@ -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 + {
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201511021944.tA2JiiZn034421>