From owner-svn-ports-head@freebsd.org Mon Oct 19 11:06:52 2015 Return-Path: Delivered-To: svn-ports-head@mailman.ysv.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) by mailman.ysv.freebsd.org (Postfix) with ESMTP id DE4F6A18622; Mon, 19 Oct 2015 11:06:51 +0000 (UTC) (envelope-from koobs@FreeBSD.org) Received: from repo.freebsd.org (repo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id B7A4A6EF; Mon, 19 Oct 2015 11:06:51 +0000 (UTC) (envelope-from koobs@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id t9JB6o9l055091; Mon, 19 Oct 2015 11:06:50 GMT (envelope-from koobs@FreeBSD.org) Received: (from koobs@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id t9JB6oZ6055088; Mon, 19 Oct 2015 11:06:50 GMT (envelope-from koobs@FreeBSD.org) Message-Id: <201510191106.t9JB6oZ6055088@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: koobs set sender to koobs@FreeBSD.org using -f From: Kubilay Kocak Date: Mon, 19 Oct 2015 11:06:50 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r399657 - in head/net/turnserver: . files X-SVN-Group: ports-head MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-ports-head@freebsd.org X-Mailman-Version: 2.1.20 Precedence: list List-Id: SVN commit messages for the ports tree for head List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 19 Oct 2015 11:06:52 -0000 Author: koobs Date: Mon Oct 19 11:06:50 2015 New Revision: 399657 URL: https://svnweb.freebsd.org/changeset/ports/399657 Log: 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) MFH: 2014Q4 Added: head/net/turnserver/files/patch-src_apps_common_apputils.c (contents, props changed) head/net/turnserver/files/patch-src_apps_uclient_mainuclient.c (contents, props changed) Modified: head/net/turnserver/Makefile Modified: head/net/turnserver/Makefile ============================================================================== --- head/net/turnserver/Makefile Mon Oct 19 10:30:47 2015 (r399656) +++ head/net/turnserver/Makefile Mon Oct 19 11:06:50 2015 (r399657) @@ -2,6 +2,7 @@ PORTNAME= turnserver PORTVERSION= 4.5.0.2 +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 Added: head/net/turnserver/files/patch-src_apps_common_apputils.c ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/net/turnserver/files/patch-src_apps_common_apputils.c Mon Oct 19 11:06:50 2015 (r399657) @@ -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()) { Added: head/net/turnserver/files/patch-src_apps_uclient_mainuclient.c ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/net/turnserver/files/patch-src_apps_uclient_mainuclient.c Mon Oct 19 11:06:50 2015 (r399657) @@ -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++;