Date: Mon, 19 Oct 2015 23:32:26 +1100 From: Kubilay Kocak <koobs@FreeBSD.org> To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-branches@freebsd.org Subject: Re: svn commit: r399658 - in branches/2014Q4/net/turnserver: . files Message-ID: <5624E2DA.6080908@FreeBSD.org> In-Reply-To: <201510191110.t9JBApNr055459@repo.freebsd.org> References: <201510191110.t9JBApNr055459@repo.freebsd.org>
next in thread | previous in thread | raw e-mail | index | archive | help
On 19/10/2015 10:10 PM, Kubilay Kocak wrote: > Author: koobs > Date: Mon Oct 19 11:10:51 2015 > New Revision: 399658 > URL: https://svnweb.freebsd.org/changeset/ports/399658 > > Log: > MFH: r399657 > > net/turnserver: Fix build with No-SSLv3 > > turnserver will not build if OpenSSL was built without SSLv3 > (--no-ssl3). > > LibreSSL 2.3.0 has removed SSLv3 support completely. > > This change fixes the build when SSLv3 is not available > > While I'm here, add LICENSE_FILE > > PR: 203700 > Submitted by: cpbsdmail gmail com > Approved by: mom040267 gmail com (maintainer) > > Approved by: portmgr (erwin) > > Added: > branches/2014Q4/net/turnserver/files/patch-src_apps_common_apputils.c > - copied unchanged from r399657, head/net/turnserver/files/patch-src_apps_common_apputils.c > branches/2014Q4/net/turnserver/files/patch-src_apps_uclient_mainuclient.c > - copied unchanged from r399657, head/net/turnserver/files/patch-src_apps_uclient_mainuclient.c > Modified: > branches/2014Q4/net/turnserver/Makefile > Directory Properties: > branches/2014Q4/ (props changed) > > Modified: branches/2014Q4/net/turnserver/Makefile > ============================================================================== > --- branches/2014Q4/net/turnserver/Makefile Mon Oct 19 11:06:50 2015 (r399657) > +++ branches/2014Q4/net/turnserver/Makefile Mon Oct 19 11:10:51 2015 (r399658) > @@ -2,6 +2,7 @@ > > PORTNAME= turnserver > PORTVERSION= 3.2.4.4 > +PORTREVISION= 1 > CATEGORIES= net > MASTER_SITES= http://turnserver.open-sys.org/downloads/v${PORTVERSION}/:prog \ > http://turnserver.open-sys.org/downloads/extradocs/:xdocs \ > @@ -15,6 +16,7 @@ MAINTAINER= mom040267@gmail.com > COMMENT= STUN/TURN Server; IPv6, DTLS support; RFCs 5389, 5766, 6062, 6156 > > LICENSE= BSD3CLAUSE > +LICENSE_FILE= ${WRKSRC}/LICENSE > > LIB_DEPENDS= libevent.so:${PORTSDIR}/devel/libevent2 > > > Copied: branches/2014Q4/net/turnserver/files/patch-src_apps_common_apputils.c (from r399657, head/net/turnserver/files/patch-src_apps_common_apputils.c) > ============================================================================== > --- /dev/null 00:00:00 1970 (empty, because file is newly added) > +++ branches/2014Q4/net/turnserver/files/patch-src_apps_common_apputils.c Mon Oct 19 11:10:51 2015 (r399658, copy of r399657, head/net/turnserver/files/patch-src_apps_common_apputils.c) > @@ -0,0 +1,21 @@ > +--- src/apps/common/apputils.c.orig 2015-09-30 07:05:14 UTC > ++++ src/apps/common/apputils.c > +@@ -1037,13 +1037,15 @@ static const char* turn_get_method(const > + if(!method) > + return mdefault; > + else { > +- > ++#ifndef OPENSSL_NO_SSL3 > + if(method == SSLv3_server_method()) { > + return "SSLv3"; > + } else if(method == SSLv3_client_method()) { > + return "SSLv3"; > +- } else if(method == SSLv23_server_method()) { > +- return "SSLv23"; > ++ } else > ++#endif > ++ if(method == SSLv23_server_method()) { > ++ return "SSLv23"; > + } else if(method == SSLv23_client_method()) { > + return "SSLv23"; > + } else if(method == TLSv1_server_method()) { > > Copied: branches/2014Q4/net/turnserver/files/patch-src_apps_uclient_mainuclient.c (from r399657, head/net/turnserver/files/patch-src_apps_uclient_mainuclient.c) > ============================================================================== > --- /dev/null 00:00:00 1970 (empty, because file is newly added) > +++ branches/2014Q4/net/turnserver/files/patch-src_apps_uclient_mainuclient.c Mon Oct 19 11:10:51 2015 (r399658, copy of r399657, head/net/turnserver/files/patch-src_apps_uclient_mainuclient.c) > @@ -0,0 +1,14 @@ > +--- src/apps/uclient/mainuclient.c.orig 2015-09-30 07:05:14 UTC > ++++ src/apps/uclient/mainuclient.c > +@@ -483,9 +483,11 @@ int main(int argc, char **argv) > + root_tls_ctx[root_tls_ctx_num] = SSL_CTX_new(SSLv23_client_method()); > + SSL_CTX_set_cipher_list(root_tls_ctx[root_tls_ctx_num], csuite); > + root_tls_ctx_num++; > ++#ifndef OPENSSL_NO_SSL3 > + root_tls_ctx[root_tls_ctx_num] = SSL_CTX_new(SSLv3_client_method()); > + SSL_CTX_set_cipher_list(root_tls_ctx[root_tls_ctx_num], csuite); > + root_tls_ctx_num++; > ++#endif > + root_tls_ctx[root_tls_ctx_num] = SSL_CTX_new(TLSv1_client_method()); > + SSL_CTX_set_cipher_list(root_tls_ctx[root_tls_ctx_num], csuite); > + root_tls_ctx_num++; > OK pointyhat #2, this should have been 2015Q4
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?5624E2DA.6080908>