FreeBSD Bugzilla – Attachment 162699 Details for
Bug 204184
security/softether: Missing runtime library libiconv
Home
|
New
|
Browse
|
Search
|
[?]
|
Reports
|
Help
|
New Account
|
Log In
Remember
[x]
|
Forgot Password
Login:
[x]
[patch]
svn diff to address iconv issue and bug 203688
softether.patch (text/plain), 2.28 KB, created by
net
on 2015-11-02 11:22:27 UTC
(
hide
)
Description:
svn diff to address iconv issue and bug 203688
Filename:
MIME Type:
Creator:
net
Created:
2015-11-02 11:22:27 UTC
Size:
2.28 KB
patch
obsolete
>Index: softether/Makefile >=================================================================== >--- 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" >Index: softether/files/patch-src__Mayaqua__Network.c >=================================================================== >--- 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 >+ { > >Property changes on: softether/files/patch-src__Mayaqua__Network.c >___________________________________________________________________ >Added: svn:mime-type >## -0,0 +1 ## >+text/plain >\ No newline at end of property >Added: fbsd:nokeywords >## -0,0 +1 ## >+yes >\ No newline at end of property >Added: svn:eol-style >## -0,0 +1 ## >+native >\ No newline at end of property
You cannot view the attachment while viewing its details because your browser does not support IFRAMEs.
View the attachment on a separate page
.
View Attachment As Diff
View Attachment As Raw
Actions:
View
|
Diff
Attachments on
bug 204184
:
162698
| 162699