From owner-svn-ports-all@freebsd.org Mon Apr 2 07:39:30 2018 Return-Path: Delivered-To: svn-ports-all@mailman.ysv.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mailman.ysv.freebsd.org (Postfix) with ESMTP id 95122F79723; Mon, 2 Apr 2018 07:39:30 +0000 (UTC) (envelope-from brnrd@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client CN "mxrelay.nyi.freebsd.org", Issuer "Let's Encrypt Authority X3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4264C7266C; Mon, 2 Apr 2018 07:39:30 +0000 (UTC) (envelope-from brnrd@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 mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 36E0512BAB; Mon, 2 Apr 2018 07:39:30 +0000 (UTC) (envelope-from brnrd@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id w327dUWM085018; Mon, 2 Apr 2018 07:39:30 GMT (envelope-from brnrd@FreeBSD.org) Received: (from brnrd@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id w327dUR3085017; Mon, 2 Apr 2018 07:39:30 GMT (envelope-from brnrd@FreeBSD.org) Message-Id: <201804020739.w327dUR3085017@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: brnrd set sender to brnrd@FreeBSD.org using -f From: Bernard Spil Date: Mon, 2 Apr 2018 07:39:30 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r466206 - head/net-mgmt/sx/files X-SVN-Group: ports-head X-SVN-Commit-Author: brnrd X-SVN-Commit-Paths: head/net-mgmt/sx/files X-SVN-Commit-Revision: 466206 X-SVN-Commit-Repository: ports 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.25 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: Mon, 02 Apr 2018 07:39:30 -0000 Author: brnrd Date: Mon Apr 2 07:39:29 2018 New Revision: 466206 URL: https://svnweb.freebsd.org/changeset/ports/466206 Log: net-mgmt/sx: Fix build with LibreSSL 2.7 - LibreSSL 2.7 implements OpenSSL 1.1 API PR: 227188 Approved by: Neel Chauhan (maintainer) Added: head/net-mgmt/sx/files/patch-libsxclient_src_opensslcompat.h (contents, props changed) Added: head/net-mgmt/sx/files/patch-libsxclient_src_opensslcompat.h ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/net-mgmt/sx/files/patch-libsxclient_src_opensslcompat.h Mon Apr 2 07:39:29 2018 (r466206) @@ -0,0 +1,27 @@ +--- libsxclient/src/opensslcompat.h.orig 2016-11-16 13:50:12 UTC ++++ libsxclient/src/opensslcompat.h +@@ -13,7 +13,7 @@ + #define hmac_final(a, b, c) (HMAC_Final((a), (b), (c)), 1) + #endif + +-#if OPENSSL_VERSION_NUMBER < 0x10100000L|| defined (LIBRESSL_VERSION_NUMBER) ++#if OPENSSL_VERSION_NUMBER < 0x10100000L|| (defined (LIBRESSL_VERSION_NUMBER) && LIBRESSL_VERSION_NUMBER < 0x20700000L) + /* https://wiki.openssl.org/index.php/1.1_API_Changes#Adding_forward-compatible_code_to_older_versions */ + static HMAC_CTX *HMAC_CTX_new(void) + { +@@ -32,13 +32,13 @@ static void HMAC_CTX_free(HMAC_CTX *ctx) + } + #endif + +-#if (OPENSSL_VERSION_NUMBER < 0x10100000L) || defined (LIBRESSL_VERSION_NUMBER) ++#if (OPENSSL_VERSION_NUMBER < 0x10100000L) || (defined (LIBRESSL_VERSION_NUMBER) && LIBRESSL_VERSION_NUMBER < 0x20700000L) + /* EVP_MD_CTX_create() and EVP_MD_CTX_destroy() were renamed to EVP_MD_CTX_new() and EVP_MD_CTX_free() in OpenSSL 1.1. */ + #define EVP_MD_CTX_new EVP_MD_CTX_create + #define EVP_MD_CTX_free EVP_MD_CTX_destroy + #endif + +-#if (OPENSSL_VERSION_NUMBER < 0x10100000L) || defined(LIBRESSL_VERSION_NUMBER) ++#if (OPENSSL_VERSION_NUMBER < 0x10100000L) || (defined (LIBRESSL_VERSION_NUMBER) && LIBRESSL_VERSION_NUMBER < 0x20700000L) + #define ASN1_STRING_get0_data(x) ASN1_STRING_data(x) + #endif +