From owner-svn-ports-all@freebsd.org Wed Aug 15 18:23:47 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 0B852106B472; Wed, 15 Aug 2018 18:23:47 +0000 (UTC) (envelope-from swills@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 666DF72B49; Wed, 15 Aug 2018 18:23:46 +0000 (UTC) (envelope-from swills@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 4917562C0; Wed, 15 Aug 2018 18:23:46 +0000 (UTC) (envelope-from swills@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id w7FINkls089096; Wed, 15 Aug 2018 18:23:46 GMT (envelope-from swills@FreeBSD.org) Received: (from swills@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id w7FINkL0089095; Wed, 15 Aug 2018 18:23:46 GMT (envelope-from swills@FreeBSD.org) Message-Id: <201808151823.w7FINkL0089095@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: swills set sender to swills@FreeBSD.org using -f From: Steve Wills Date: Wed, 15 Aug 2018 18:23:46 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r477249 - head/lang/ruby25/files X-SVN-Group: ports-head X-SVN-Commit-Author: swills X-SVN-Commit-Paths: head/lang/ruby25/files X-SVN-Commit-Revision: 477249 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.27 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, 15 Aug 2018 18:23:47 -0000 Author: swills Date: Wed Aug 15 18:23:45 2018 New Revision: 477249 URL: https://svnweb.freebsd.org/changeset/ports/477249 Log: lang/ruby25: Fix with ports OpenSSL and LibreSSL PR: 229119 PR: 226852 Submitted by: Thibault Jouan Reported by: Piotr Kubaj With hat: ruby@ Added: head/lang/ruby25/files/patch-ext-openssl-extconf.rb - copied unchanged from r477248, head/lang/ruby24/files/patch-ext-openssl-extconf.rb Deleted: head/lang/ruby25/files/patch-ext_openssl_openssl__missing.h Copied: head/lang/ruby25/files/patch-ext-openssl-extconf.rb (from r477248, head/lang/ruby24/files/patch-ext-openssl-extconf.rb) ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/lang/ruby25/files/patch-ext-openssl-extconf.rb Wed Aug 15 18:23:45 2018 (r477249, copy of r477248, head/lang/ruby24/files/patch-ext-openssl-extconf.rb) @@ -0,0 +1,28 @@ +From 75de15ddcdab6efe7faf3ca1f6b5c6e5b6ba57cc Mon Sep 17 00:00:00 2001 +From: Kazuki Yamaguchi +Date: Sat, 24 Mar 2018 01:44:37 +0900 +Subject: [PATCH] extconf.rb: fix build with LibreSSL 2.7.0 + +Our compat implementation of accessor functions that were introduced in +OpenSSL 1.1.0 conflicts with those from LibreSSL 2.7.0. Use the +HAVE_OPAQUE_OPENSSL code path when LibreSSL 2.7 or newer is detected. + +Fix suggested by Joel Sing. + +Fixes: https://github.com/ruby/openssl/issues/192 + +--- ext/openssl/extconf.rb.orig ++++ ext/openssl/extconf.rb +@@ -157,8 +157,11 @@ def find_openssl_library + have_func("SSL_is_server") + + # added in 1.1.0 ++if !have_struct_member("SSL", "ctx", "openssl/ssl.h") || ++ try_static_assert("LIBRESSL_VERSION_NUMBER >= 0x2070000fL", "openssl/opensslv.h") ++ $defs.push("-DHAVE_OPAQUE_OPENSSL") ++end + have_func("CRYPTO_lock") || $defs.push("-DHAVE_OPENSSL_110_THREADING_API") +-have_struct_member("SSL", "ctx", "openssl/ssl.h") || $defs.push("-DHAVE_OPAQUE_OPENSSL") + have_func("BN_GENCB_new") + have_func("BN_GENCB_free") + have_func("BN_GENCB_get_arg")