--- softether/Makefile (revision 400645) +++ softether/Makefile (working copy) @@ -25,6 +25,7 @@ src/Mayaqua/Cfg.c \ src/Mayaqua/Cfg.h \ src/Mayaqua/Kernel.c \ + src/Mayaqua/Network.c \ src/Mayaqua/Table.h \ src/Mayaqua/Unix.c @@ -33,7 +34,7 @@ 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 @@ -50,10 +51,6 @@ 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 post-extract: .if ${ARCH} != "amd64" --- softether/files/patch-src__Mayaqua__Network.c (revision 0) +++ softether/files/patch-src__Mayaqua__Network.c (working copy) @@ -0,0 +1,19 @@ +--- src/Mayaqua/Network.c.orig 2015-07-26 08:38:18.000000000 +0200 ++++ src/Mayaqua/Network.c 2015-10-02 16:12:32.566180580 +0200 +@@ -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 + {