shyouhei	2011-06-26 17:58:06 +0900 (Sun, 26 Jun 2011)

  New Revision: 32234

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

  Log:
    merge revision(s) 31346,31528:
    * 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_8_7/ChangeLog
    branches/ruby_1_8_7/ext/openssl/extconf.rb
    branches/ruby_1_8_7/ext/openssl/ossl_ssl.c
    branches/ruby_1_8_7/version.h

Index: ruby_1_8_7/ext/openssl/ossl_ssl.c
===================================================================
--- ruby_1_8_7/ext/openssl/ossl_ssl.c	(revision 32233)
+++ ruby_1_8_7/ext/openssl/ossl_ssl.c	(revision 32234)
@@ -101,9 +101,12 @@
     OSSL_SSL_METHOD_ENTRY(TLSv1),
     OSSL_SSL_METHOD_ENTRY(TLSv1_server),
     OSSL_SSL_METHOD_ENTRY(TLSv1_client),
+#if defined(HAVE_SSLV2_METHOD) && defined(HAVE_SSLV2_SERVER_METHOD) && \
+        defined(HAVE_SSLV2_CLIENT_METHOD)	
     OSSL_SSL_METHOD_ENTRY(SSLv2),
     OSSL_SSL_METHOD_ENTRY(SSLv2_server),
     OSSL_SSL_METHOD_ENTRY(SSLv2_client),
+#endif
     OSSL_SSL_METHOD_ENTRY(SSLv3),
     OSSL_SSL_METHOD_ENTRY(SSLv3_server),
     OSSL_SSL_METHOD_ENTRY(SSLv3_client),
Index: ruby_1_8_7/ext/openssl/extconf.rb
===================================================================
--- ruby_1_8_7/ext/openssl/extconf.rb	(revision 32233)
+++ ruby_1_8_7/ext/openssl/extconf.rb	(revision 32234)
@@ -100,6 +100,12 @@
 if try_compile("#define FOO(...) foo(__VA_ARGS__)\n int x(){FOO(1);FOO(1,2);FOO(1,2,3);}\n")
   $defs.push("-DHAVE_VA_ARGS_MACRO")
 end
+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
 if have_header("openssl/engine.h")
   have_func("ENGINE_add")
   have_func("ENGINE_load_builtin_engines")
Index: ruby_1_8_7/ChangeLog
===================================================================
--- ruby_1_8_7/ChangeLog	(revision 32233)
+++ ruby_1_8_7/ChangeLog	(revision 32234)
@@ -1,3 +1,16 @@
+Sun Jun 26 17:52:32 2011  Nobuhiro Iwamatsu  <iwamatsu@n...>
+
+        * ext/openssl/ossl_ssl.c: By trunk@31346, function check of SSLv2 is executed.
+        However, the problem is not revised in this.
+        This adds the control of using function of SSLv2 in made macro by function check.
+
+Sun Jun 26 17:52:32 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
+
 Sun Jun 26 17:46:43 2011  URABE Shyouhei  <shyouhei@r...>
 
 	* ext/tk/extconf.rb: copy from trunk, as requested by Hidetoshi NAGAI.
Index: ruby_1_8_7/version.h
===================================================================
--- ruby_1_8_7/version.h	(revision 32233)
+++ ruby_1_8_7/version.h	(revision 32234)
@@ -2,7 +2,7 @@
 #define RUBY_RELEASE_DATE "2011-06-26"
 #define RUBY_VERSION_CODE 187
 #define RUBY_RELEASE_CODE 20110626
-#define RUBY_PATCHLEVEL 350
+#define RUBY_PATCHLEVEL 351
 
 #define RUBY_VERSION_MAJOR 1
 #define RUBY_VERSION_MINOR 8

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