yugui	2011-05-30 13:44:32 +0900 (Mon, 30 May 2011)

  New Revision: 31816

  http://svn.ruby-lang.org/cgi-bin/viewvc.cgi?view=rev&revision=31816

  Log:
    merges r31346 from trunk into ruby_1_9_2.
    --
    * ext/openssl/extconf.rb: Should check SSLv2_*method.
      openssl compiled with "no-ssl2" the extconf don't fail 
      when running `make' having this compilation errors.
      Patched by Laurent Arnoud. fixes #4562, #4556

  Modified files:
    branches/ruby_1_9_2/ChangeLog
    branches/ruby_1_9_2/ext/openssl/extconf.rb
    branches/ruby_1_9_2/version.h

Index: ruby_1_9_2/ChangeLog
===================================================================
--- ruby_1_9_2/ChangeLog	(revision 31815)
+++ ruby_1_9_2/ChangeLog	(revision 31816)
@@ -1,3 +1,10 @@
+Mon Apr 25 21:31:36 2011  Nobuhiro Iwamatsu  <iwamatsu@n...>
+
+	* ext/openssl/extconf.rb: Should check SSLv2_*method.
+	  openssl compiled with "no-ssl2" the extconf don't fail
+	  when running `make' having this compilation errors.
+	  Patched by Laurent Arnoud. fixes #4562, #4556
+
 Mon Apr 25 20:53:32 2011  Tajima, Akio <artonx@y...>
 
 	* win32/win32.c (kill): accept 0 only sig is SIGINT #4596
Index: ruby_1_9_2/ext/openssl/extconf.rb
===================================================================
--- ruby_1_9_2/ext/openssl/extconf.rb	(revision 31815)
+++ ruby_1_9_2/ext/openssl/extconf.rb	(revision 31816)
@@ -97,6 +97,9 @@
 have_func("SSL_SESSION_get_id")
 have_func("SSL_SESSION_cmp")
 have_func("OPENSSL_cleanse")
+have_func("SSLv2_method")
+have_func("SSLv2_server_method")
+have_func("SSLv2_client_method")
 unless have_func("SSL_set_tlsext_host_name", ['openssl/ssl.h'])
 	have_macro("SSL_set_tlsext_host_name", ['openssl/ssl.h']) && $defs.push("-DHAVE_SSL_SET_TLSEXT_HOST_NAME")
 end
Index: ruby_1_9_2/version.h
===================================================================
--- ruby_1_9_2/version.h	(revision 31815)
+++ ruby_1_9_2/version.h	(revision 31816)
@@ -1,5 +1,5 @@
 #define RUBY_VERSION "1.9.2"
-#define RUBY_PATCHLEVEL 240
+#define RUBY_PATCHLEVEL 241
 #define RUBY_VERSION_MAJOR 1
 #define RUBY_VERSION_MINOR 9
 #define RUBY_VERSION_TEENY 1

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