From owner-svn-ports-all@freebsd.org Wed Feb 8 15:42:19 2017 Return-Path: Delivered-To: svn-ports-all@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 43CC3CD5046; Wed, 8 Feb 2017 15:42:19 +0000 (UTC) (envelope-from madpilot@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 EE7C9C96; Wed, 8 Feb 2017 15:42:18 +0000 (UTC) (envelope-from madpilot@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id v18FgIl9031223; Wed, 8 Feb 2017 15:42:18 GMT (envelope-from madpilot@FreeBSD.org) Received: (from madpilot@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id v18FgIw5031222; Wed, 8 Feb 2017 15:42:18 GMT (envelope-from madpilot@FreeBSD.org) Message-Id: <201702081542.v18FgIw5031222@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: madpilot set sender to madpilot@FreeBSD.org using -f From: Guido Falsi Date: Wed, 8 Feb 2017 15:42:18 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r433654 - head/net/pjsip/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-all@freebsd.org X-Mailman-Version: 2.1.23 Precedence: list List-Id: SVN commit messages for the ports tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 08 Feb 2017 15:42:19 -0000 Author: madpilot Date: Wed Feb 8 15:42:17 2017 New Revision: 433654 URL: https://svnweb.freebsd.org/changeset/ports/433654 Log: Fix net/pjsip build with libressl. PR: 216898 Submitted by: OlivierW Added: head/net/pjsip/files/patch-pjlib_src_pj_ssl__sock__ossl.c (contents, props changed) Added: head/net/pjsip/files/patch-pjlib_src_pj_ssl__sock__ossl.c ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/net/pjsip/files/patch-pjlib_src_pj_ssl__sock__ossl.c Wed Feb 8 15:42:17 2017 (r433654) @@ -0,0 +1,47 @@ +--- pjlib/src/pj/ssl_sock_ossl.c.orig 2017-01-24 05:41:05 UTC ++++ pjlib/src/pj/ssl_sock_ossl.c +@@ -54,7 +54,7 @@ + #include + #include + +-#if !defined(OPENSSL_NO_EC) && OPENSSL_VERSION_NUMBER >= 0x1000200fL ++#if !defined(OPENSSL_NO_EC) && OPENSSL_VERSION_NUMBER >= 0x1000200fL && !defined(LIBRESSL_VERSION_NUMBER) + + # include + +@@ -112,7 +112,7 @@ static unsigned get_nid_from_cid(unsigne + #endif + + +-#if OPENSSL_VERSION_NUMBER >= 0x10100000L ++#if OPENSSL_VERSION_NUMBER >= 0x10100000L && !defined(LIBRESSL_VERSION_NUMBER) + # define OPENSSL_NO_SSL2 /* seems to be removed in 1.1.0 */ + # define M_ASN1_STRING_data(x) ASN1_STRING_get0_data(x) + # define M_ASN1_STRING_length(x) ASN1_STRING_length(x) +@@ -452,7 +452,7 @@ static pj_status_t init_openssl(void) + + SSL_set_session(ssl, SSL_SESSION_new()); + +-#if !defined(OPENSSL_NO_EC) && OPENSSL_VERSION_NUMBER >= 0x1000200fL ++#if !defined(OPENSSL_NO_EC) && OPENSSL_VERSION_NUMBER >= 0x1000200fL && !defined(LIBRESSL_VERSION_NUMBER) + openssl_curves_num = SSL_get_shared_curve(ssl,-1); + if (openssl_curves_num > PJ_ARRAY_SIZE(openssl_curves)) + openssl_curves_num = PJ_ARRAY_SIZE(openssl_curves); +@@ -1069,7 +1069,7 @@ static pj_status_t set_cipher_list(pj_ss + + static pj_status_t set_curves_list(pj_ssl_sock_t *ssock) + { +-#if !defined(OPENSSL_NO_EC) && OPENSSL_VERSION_NUMBER >= 0x1000200fL ++#if !defined(OPENSSL_NO_EC) && OPENSSL_VERSION_NUMBER >= 0x1000200fL && !defined(LIBRESSL_VERSION_NUMBER) + int ret; + int curves[PJ_SSL_SOCK_MAX_CURVES]; + unsigned cnt; +@@ -1100,7 +1100,7 @@ static pj_status_t set_curves_list(pj_ss + + static pj_status_t set_sigalgs(pj_ssl_sock_t *ssock) + { +-#if OPENSSL_VERSION_NUMBER >= 0x1000200fL ++#if OPENSSL_VERSION_NUMBER >= 0x1000200fL && !defined(LIBRESSL_VERSION_NUMBER) + int ret; + + if (ssock->param.sigalgs.ptr && ssock->param.sigalgs.slen) {