svn commit: r477249 - head/lang/ruby25/files

[Steve Wills]

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 <tj+freebsd_ports at a13.fr>
  Reported by:	Piotr Kubaj <pkubaj at anongoth.pl>
  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 <k at rhe.jp>
+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")