yugui	2010-12-23 21:45:44 +0900 (Thu, 23 Dec 2010)

  New Revision: 30320

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

  Log:
    merges r30213 from trunk into ruby_1_9_2.
    --
            * ext/openssl/ossl_x509ext.c (ossl_x509extfactory_set_config):
      fix compile error when !HAVE_X509V3_SET_NCONF. Thanks
      Chikanaga-san. [ruby-dev:42761] [Ruby 1.9-Bug#4158]

  Modified files:
    branches/ruby_1_9_2/ChangeLog
    branches/ruby_1_9_2/ext/openssl/ossl_x509ext.c
    branches/ruby_1_9_2/version.h

Index: ruby_1_9_2/ChangeLog
===================================================================
--- ruby_1_9_2/ChangeLog	(revision 30319)
+++ ruby_1_9_2/ChangeLog	(revision 30320)
@@ -1,3 +1,9 @@
+Wed Dec 15 04:02:00 2010  KOSAKI Motohiro  <kosaki.motohiro@g...>
+
+	* ext/openssl/ossl_x509ext.c (ossl_x509extfactory_set_config):
+	  fix compile error when !HAVE_X509V3_SET_NCONF. Thanks
+	  Chikanaga-san. [ruby-dev:42761] [Ruby 1.9-Bug#4158]
+
 Sat Dec 11 05:48:28 2010  Hidetoshi NAGAI  <nagai@a...>
 
 	* ext/tk/lib/multi-tk.rb: infinite loop on method_missing at loading.
Index: ruby_1_9_2/ext/openssl/ossl_x509ext.c
===================================================================
--- ruby_1_9_2/ext/openssl/ossl_x509ext.c	(revision 30319)
+++ ruby_1_9_2/ext/openssl/ossl_x509ext.c	(revision 30320)
@@ -178,7 +178,7 @@
     return config;
 }
 #else
-#define rb_f_fork rb_f_notimplement
+#define ossl_x509extfactory_set_config rb_f_notimplement
 #endif
 
 static VALUE
Index: ruby_1_9_2/version.h
===================================================================
--- ruby_1_9_2/version.h	(revision 30319)
+++ ruby_1_9_2/version.h	(revision 30320)
@@ -1,5 +1,5 @@
 #define RUBY_VERSION "1.9.2"
-#define RUBY_PATCHLEVEL 125
+#define RUBY_PATCHLEVEL 126
 #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/