Fix bug #194236. Bump 1.8.6 to p111 as p110-r1. Bump 1.8.5 to p114 as p113, using 1.8.6-p110 as base ebuild.

(Portage version: 2.1.3.9)

4 files changed, 262 insertions, 0 deletions

diff --git a/dev-lang/ruby/files/digest-ruby-1.8.5_p113 b/dev-lang/ruby/files/digest-ruby-1.8.5_p113
new file mode 100644
index 000000000000..27510456223d
--- /dev/null
+++ b/dev-lang/ruby/files/digest-ruby-1.8.5_p113
@@ -0,0 +1,6 @@
+MD5 82cd47ded85f854149ae620a9fa728e5 onigd2_5_8.tar.gz 218187
+RMD160 82d10299ebac0d5ffe94e89f965d84f2f085c6d4 onigd2_5_8.tar.gz 218187
+SHA256 11aa092d7cb1c21b7fb60980e9c5a9b931e670c29553ea9444927a8a468e526b onigd2_5_8.tar.gz 218187
+MD5 26cf9d6833908e1d8f351035b98d71eb ruby-1.8.5-p113.tar.gz 4484645
+RMD160 3c83d411f5fea1b7656050ea8461bba320eaad5e ruby-1.8.5-p113.tar.gz 4484645
+SHA256 5df5d21f7414e2191dc73d4d388b1d95d14ddf689eb5fc0d16e04ba01ecf866e ruby-1.8.5-p113.tar.gz 4484645
diff --git a/dev-lang/ruby/files/digest-ruby-1.8.6_p110-r1 b/dev-lang/ruby/files/digest-ruby-1.8.6_p110-r1
new file mode 100644
index 000000000000..408fe1eb2248
--- /dev/null
+++ b/dev-lang/ruby/files/digest-ruby-1.8.6_p110-r1
@@ -0,0 +1,6 @@
+MD5 7e4c2b197387232afd9a11378feeb246 onigd2_5_9.tar.gz 221355
+RMD160 ceeee9a0221d431d6576a566621ba9badab6423d onigd2_5_9.tar.gz 221355
+SHA256 b24df7c0fa6fc72ce37fd1e203f378359f29f739a3f4c5b6bdd40ca5f7d25db0 onigd2_5_9.tar.gz 221355
+MD5 5d9f903eae163cda2374ef8fdba5c0a5 ruby-1.8.6-p110.tar.gz 4546509
+RMD160 6495c22a94149e4dbc3608f0bf2f0c75683060e0 ruby-1.8.6-p110.tar.gz 4546509
+SHA256 d3f11ecaf2b0bd7bd3f0bc24007b1c7c12640c55cd40e8e4cc396ba835186fbe ruby-1.8.6-p110.tar.gz 4546509
diff --git a/dev-lang/ruby/files/ruby-1.8.5_p113-net-http-p114.patch b/dev-lang/ruby/files/ruby-1.8.5_p113-net-http-p114.patch
new file mode 100644
index 000000000000..88246a10c457
--- /dev/null
+++ b/dev-lang/ruby/files/ruby-1.8.5_p113-net-http-p114.patch
@@ -0,0 +1,125 @@
+Index: ext/openssl/lib/openssl/ssl.rb
+===================================================================
+--- ext/openssl/lib/openssl/ssl.rb	(revision 13501)
++++ ext/openssl/lib/openssl/ssl.rb	(revision 13502)
+@@ -88,7 +88,7 @@
+             end
+           }
+         end
+-        raise SSLError, "hostname not match"
++        raise SSLError, "hostname was not match with the server certificate"
+       end
+     end
+ 
+Index: ChangeLog
+===================================================================
+--- ChangeLog	(revision 13501)
++++ ChangeLog	(revision 13502)
+@@ -1,3 +1,17 @@
++Sun Sep 23 21:57:25 2007  GOTOU Yuuzou  <gotoyuzo@notwork.org>  
++
++	* lib/net/http.rb: an SSL verification (the server hostname should
++	  be matched with its certificate's commonName) is added.
++	  this verification can be skipped by
++	  "Net::HTTP#enable_post_connection_check=(false)".
++	  suggested by Chris Clark <cclark at isecpartners.com>
++
++	* lib/net/open-uri.rb: use Net::HTTP#enable_post_connection_check to
++	  perform SSL post connection check.
++
++	* ext/openssl/lib/openssl/ssl.c
++	(OpenSSL::SSL::SSLSocket#post_connection_check): refine error message.
++
+ Sun Sep 23 06:08:38 2007  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+ 
+ 	* ext/stringio/stringio.c (strio_init): separate from strio_initialize
+Index: version.h
+===================================================================
+--- version.h	(revision 13501)
++++ version.h	(revision 13502)
+@@ -1,15 +1,15 @@
+ #define RUBY_VERSION "1.8.5"
+-#define RUBY_RELEASE_DATE "2007-09-23"
++#define RUBY_RELEASE_DATE "2007-09-24"
+ #define RUBY_VERSION_CODE 185
+-#define RUBY_RELEASE_CODE 20070923
+-#define RUBY_PATCHLEVEL 113
++#define RUBY_RELEASE_CODE 20070924
++#define RUBY_PATCHLEVEL 114
+ 
+ #define RUBY_VERSION_MAJOR 1
+ #define RUBY_VERSION_MINOR 8
+ #define RUBY_VERSION_TEENY 5
+ #define RUBY_RELEASE_YEAR 2007
+ #define RUBY_RELEASE_MONTH 9
+-#define RUBY_RELEASE_DAY 23
++#define RUBY_RELEASE_DAY 24
+ 
+ #ifdef RUBY_EXTERN
+ RUBY_EXTERN const char ruby_version[];
+Index: lib/open-uri.rb
+===================================================================
+--- lib/open-uri.rb	(revision 13501)
++++ lib/open-uri.rb	(revision 13502)
+@@ -229,6 +229,7 @@
+     if target.class == URI::HTTPS
+       require 'net/https'
+       http.use_ssl = true
++      http.enable_post_connection_check = true
+       http.verify_mode = OpenSSL::SSL::VERIFY_PEER
+       store = OpenSSL::X509::Store.new
+       store.set_default_paths
+@@ -240,16 +241,6 @@
+ 
+     resp = nil
+     http.start {
+-      if target.class == URI::HTTPS
+-        # xxx: information hiding violation
+-        sock = http.instance_variable_get(:@socket)
+-        if sock.respond_to?(:io)
+-          sock = sock.io # 1.9
+-        else
+-          sock = sock.instance_variable_get(:@socket) # 1.8
+-        end
+-        sock.post_connection_check(target_host)
+-      end
+       req = Net::HTTP::Get.new(request_uri, header)
+       if options.include? :http_basic_authentication
+         user, pass = options[:http_basic_authentication]
+Index: lib/net/http.rb
+===================================================================
+--- lib/net/http.rb	(revision 13501)
++++ lib/net/http.rb	(revision 13502)
+@@ -470,6 +470,7 @@
+       @debug_output = nil
+       @use_ssl = false
+       @ssl_context = nil
++      @enable_post_connection_check = false
+     end
+ 
+     def inspect
+@@ -526,6 +527,9 @@
+       false   # redefined in net/https
+     end
+ 
++    # specify enabling SSL server certificate and hostname checking.
++    attr_accessor :enable_post_connection_check
++
+     # Opens TCP connection and HTTP session.
+     # 
+     # When this method is called with block, gives a HTTP object
+@@ -584,6 +588,14 @@
+           HTTPResponse.read_new(@socket).value
+         end
+         s.connect
++        if @ssl_context.verify_mode != OpenSSL::SSL::VERIFY_NONE
++          begin
++            s.post_connection_check(@address)
++          rescue OpenSSL::SSL::SSLError => ex
++            raise ex if @enable_post_connection_check
++            warn ex.message
++          end
++        end
+       end
+       on_connect
+     end
diff --git a/dev-lang/ruby/files/ruby-1.8.6_p110-net-http-p111.patch b/dev-lang/ruby/files/ruby-1.8.6_p110-net-http-p111.patch
new file mode 100644
index 000000000000..82bc32d36824
--- /dev/null
+++ b/dev-lang/ruby/files/ruby-1.8.6_p110-net-http-p111.patch
@@ -0,0 +1,125 @@
+Index: ext/openssl/lib/openssl/ssl.rb
+===================================================================
+--- ext/openssl/lib/openssl/ssl.rb	(revision 13503)
++++ ext/openssl/lib/openssl/ssl.rb	(revision 13504)
+@@ -88,7 +88,7 @@
+             end
+           }
+         end
+-        raise SSLError, "hostname not match"
++        raise SSLError, "hostname was not match with the server certificate"
+       end
+     end
+ 
+Index: ChangeLog
+===================================================================
+--- ChangeLog	(revision 13503)
++++ ChangeLog	(revision 13504)
+@@ -1,3 +1,17 @@
++Sun Sep 23 21:57:25 2007  GOTOU Yuuzou  <gotoyuzo@notwork.org>  
++
++	* lib/net/http.rb: an SSL verification (the server hostname should
++	  be matched with its certificate's commonName) is added.
++	  this verification can be skipped by
++	  "Net::HTTP#enable_post_connection_check=(false)".
++	  suggested by Chris Clark <cclark at isecpartners.com>
++
++	* lib/net/open-uri.rb: use Net::HTTP#enable_post_connection_check to
++	  perform SSL post connection check.
++
++	* ext/openssl/lib/openssl/ssl.c
++	(OpenSSL::SSL::SSLSocket#post_connection_check): refine error message.
++
+ Sun Sep 23 07:49:49 2007  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+ 
+ 	* eval.c, intern.h, ext/thread/thread.c: should not free queue while
+Index: version.h
+===================================================================
+--- version.h	(revision 13503)
++++ version.h	(revision 13504)
+@@ -1,15 +1,15 @@
+ #define RUBY_VERSION "1.8.6"
+-#define RUBY_RELEASE_DATE "2007-09-23"
++#define RUBY_RELEASE_DATE "2007-09-24"
+ #define RUBY_VERSION_CODE 186
+-#define RUBY_RELEASE_CODE 20070923
+-#define RUBY_PATCHLEVEL 110
++#define RUBY_RELEASE_CODE 20070924
++#define RUBY_PATCHLEVEL 111
+ 
+ #define RUBY_VERSION_MAJOR 1
+ #define RUBY_VERSION_MINOR 8
+ #define RUBY_VERSION_TEENY 6
+ #define RUBY_RELEASE_YEAR 2007
+ #define RUBY_RELEASE_MONTH 9
+-#define RUBY_RELEASE_DAY 23
++#define RUBY_RELEASE_DAY 24
+ 
+ #ifdef RUBY_EXTERN
+ RUBY_EXTERN const char ruby_version[];
+Index: lib/open-uri.rb
+===================================================================
+--- lib/open-uri.rb	(revision 13503)
++++ lib/open-uri.rb	(revision 13504)
+@@ -229,6 +229,7 @@
+     if target.class == URI::HTTPS
+       require 'net/https'
+       http.use_ssl = true
++      http.enable_post_connection_check = true
+       http.verify_mode = OpenSSL::SSL::VERIFY_PEER
+       store = OpenSSL::X509::Store.new
+       store.set_default_paths
+@@ -240,16 +241,6 @@
+ 
+     resp = nil
+     http.start {
+-      if target.class == URI::HTTPS
+-        # xxx: information hiding violation
+-        sock = http.instance_variable_get(:@socket)
+-        if sock.respond_to?(:io)
+-          sock = sock.io # 1.9
+-        else
+-          sock = sock.instance_variable_get(:@socket) # 1.8
+-        end
+-        sock.post_connection_check(target_host)
+-      end
+       req = Net::HTTP::Get.new(request_uri, header)
+       if options.include? :http_basic_authentication
+         user, pass = options[:http_basic_authentication]
+Index: lib/net/http.rb
+===================================================================
+--- lib/net/http.rb	(revision 13503)
++++ lib/net/http.rb	(revision 13504)
+@@ -470,6 +470,7 @@
+       @debug_output = nil
+       @use_ssl = false
+       @ssl_context = nil
++      @enable_post_connection_check = false
+     end
+ 
+     def inspect
+@@ -526,6 +527,9 @@
+       false   # redefined in net/https
+     end
+ 
++    # specify enabling SSL server certificate and hostname checking.
++    attr_accessor :enable_post_connection_check
++
+     # Opens TCP connection and HTTP session.
+     # 
+     # When this method is called with block, gives a HTTP object
+@@ -584,6 +588,14 @@
+           HTTPResponse.read_new(@socket).value
+         end
+         s.connect
++        if @ssl_context.verify_mode != OpenSSL::SSL::VERIFY_NONE
++          begin
++            s.post_connection_check(@address)
++          rescue OpenSSL::SSL::SSLError => ex
++            raise ex if @enable_post_connection_check
++            warn ex.message
++          end
++        end
+       end
+       on_connect
+     end