rhe	2016-06-09 15:03:55 +0900 (Thu, 09 Jun 2016)

  New Revision: 55335

  https://svn.ruby-lang.org/cgi-bin/viewvc.cgi?view=revision&revision=55335

  Log:
    openssl: fix build with OpenSSL 1.1.0 and no pkg-config
    
    * ext/openssl/extconf.rb: Check for CRYPTO_malloc() and SSL_new().
      OpenSSL_add_all_digests() and SSL_library_init() are deprecated and
      converted to macros in OpenSSL 1.1.0.
      [ruby-core:75225] [Feature #12324]

  Modified files:
    trunk/ChangeLog
    trunk/ext/openssl/extconf.rb
Index: ext/openssl/extconf.rb
===================================================================
--- ext/openssl/extconf.rb	(revision 55334)
+++ ext/openssl/extconf.rb	(revision 55335)
@@ -44,8 +44,8 @@ end https://github.com/ruby/ruby/blob/trunk/ext/openssl/extconf.rb#L44
 result = pkg_config("openssl") && have_header("openssl/ssl.h")
 unless result
   result = have_header("openssl/ssl.h")
-  result &&= %w[crypto libeay32].any? {|lib| have_library(lib, "OpenSSL_add_all_digests")}
-  result &&= %w[ssl ssleay32].any? {|lib| have_library(lib, "SSL_library_init")}
+  result &&= %w[crypto libeay32].any? {|lib| have_library(lib, "CRYPTO_malloc")}
+  result &&= %w[ssl ssleay32].any? {|lib| have_library(lib, "SSL_new")}
   unless result
     Logging::message "=== Checking for required stuff failed. ===\n"
     Logging::message "Makefile wasn't created. Fix the errors above.\n"
Index: ChangeLog
===================================================================
--- ChangeLog	(revision 55334)
+++ ChangeLog	(revision 55335)
@@ -1,3 +1,10 @@ https://github.com/ruby/ruby/blob/trunk/ChangeLog#L1
+Thu Jun  9 15:03:35 2016  Kazuki Yamaguchi  <k@r...>
+
+	* ext/openssl/extconf.rb: Check for CRYPTO_malloc() and SSL_new().
+	  OpenSSL_add_all_digests() and SSL_library_init() are deprecated and
+	  converted to macros in OpenSSL 1.1.0.
+	  [ruby-core:75225] [Feature #12324]
+
 Wed Jun  8 23:09:51 2016  Kazuhiro NISHIYAMA  <zn@m...>
 
 	* string.c (rb_str_ascii_casemap): fix compile error.

--
ML: ruby-changes@q...
Info: http://www.atdot.net/~ko1/quickml/