usa	2016-04-22 16:37:36 +0900 (Fri, 22 Apr 2016)

  New Revision: 54688

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

  Log:
    merge revision(s) 49576: [Backport #12288]
    
    * ext/openssl/extconf.rb: check RAND_edg to support libressl.
    
    * ext/openssl/ossl_rand.c (ossl_rand_egd): define only if RAND_edg
      is available.  [Fix GH-829]

  Modified directories:
    branches/ruby_2_2/
  Modified files:
    branches/ruby_2_2/ChangeLog
    branches/ruby_2_2/ext/openssl/extconf.rb
    branches/ruby_2_2/ext/openssl/ossl_rand.c
    branches/ruby_2_2/version.h
Index: ruby_2_2/version.h
===================================================================
--- ruby_2_2/version.h	(revision 54687)
+++ ruby_2_2/version.h	(revision 54688)
@@ -1,6 +1,6 @@ https://github.com/ruby/ruby/blob/trunk/ruby_2_2/version.h#L1
 #define RUBY_VERSION "2.2.5"
 #define RUBY_RELEASE_DATE "2016-04-22"
-#define RUBY_PATCHLEVEL 305
+#define RUBY_PATCHLEVEL 306
 
 #define RUBY_RELEASE_YEAR 2016
 #define RUBY_RELEASE_MONTH 4
Index: ruby_2_2/ChangeLog
===================================================================
--- ruby_2_2/ChangeLog	(revision 54687)
+++ ruby_2_2/ChangeLog	(revision 54688)
@@ -1,3 +1,10 @@ https://github.com/ruby/ruby/blob/trunk/ruby_2_2/ChangeLog#L1
+Fri Apr 22 16:37:14 2016  multisnow  <infinity.blick.winkel@g...>
+
+	* ext/openssl/extconf.rb: check RAND_edg to support libressl.
+
+	* ext/openssl/ossl_rand.c (ossl_rand_egd): define only if RAND_edg
+	  is available.  [Fix GH-829]
+
 Fri Apr 22 16:24:00 2016  Nobuyoshi Nakada  <nobu@r...>
 
 	* configure.in (rb_cv_lgamma_r_m0): fix the condition for
Index: ruby_2_2/ext/openssl/ossl_rand.c
===================================================================
--- ruby_2_2/ext/openssl/ossl_rand.c	(revision 54687)
+++ ruby_2_2/ext/openssl/ossl_rand.c	(revision 54688)
@@ -148,6 +148,7 @@ ossl_rand_pseudo_bytes(VALUE self, VALUE https://github.com/ruby/ruby/blob/trunk/ruby_2_2/ext/openssl/ossl_rand.c#L148
     return str;
 }
 
+#ifdef HAVE_RAND_EGD
 /*
  *  call-seq:
  *     egd(filename) -> true
@@ -186,6 +187,7 @@ ossl_rand_egd_bytes(VALUE self, VALUE fi https://github.com/ruby/ruby/blob/trunk/ruby_2_2/ext/openssl/ossl_rand.c#L187
     }
     return Qtrue;
 }
+#endif /* HAVE_RAND_EGD */
 
 /*
  *  call-seq:
@@ -219,8 +221,10 @@ Init_ossl_rand(void) https://github.com/ruby/ruby/blob/trunk/ruby_2_2/ext/openssl/ossl_rand.c#L221
     rb_define_module_function(mRandom, "write_random_file", ossl_rand_write_file, 1);
     rb_define_module_function(mRandom, "random_bytes", ossl_rand_bytes, 1);
     rb_define_module_function(mRandom, "pseudo_bytes", ossl_rand_pseudo_bytes, 1);
+#ifdef HAVE_RAND_EGD
     rb_define_module_function(mRandom, "egd", ossl_rand_egd, 1);
     rb_define_module_function(mRandom, "egd_bytes", ossl_rand_egd_bytes, 2);
+#endif /* HAVE_RAND_EGD */
     rb_define_module_function(mRandom, "status?", ossl_rand_status, 0);
 }
 
Index: ruby_2_2/ext/openssl/extconf.rb
===================================================================
--- ruby_2_2/ext/openssl/extconf.rb	(revision 54687)
+++ ruby_2_2/ext/openssl/extconf.rb	(revision 54688)
@@ -87,6 +87,7 @@ have_func("HMAC_CTX_init") https://github.com/ruby/ruby/blob/trunk/ruby_2_2/ext/openssl/extconf.rb#L87
 have_func("PEM_def_callback")
 have_func("PKCS5_PBKDF2_HMAC")
 have_func("PKCS5_PBKDF2_HMAC_SHA1")
+have_func("RAND_egd")
 have_func("X509V3_set_nconf")
 have_func("X509V3_EXT_nconf_nid")
 have_func("X509_CRL_add0_revoked")

Property changes on: ruby_2_2
___________________________________________________________________
Modified: svn:mergeinfo
   Merged /trunk:r49576


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