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.

Package-Manager: portage-2.1.3.9

8 files changed, 654 insertions, 9 deletions

diff --git a/dev-lang/ruby/ChangeLog b/dev-lang/ruby/ChangeLog
index 76557cf75bf9..3b2490fdc57d 100644
--- a/dev-lang/ruby/ChangeLog
+++ b/dev-lang/ruby/ChangeLog
@@ -1,6 +1,16 @@
 # ChangeLog for dev-lang/ruby
 # Copyright 2002-2007 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-lang/ruby/ChangeLog,v 1.297 2007/09/24 12:49:03 rbrown Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-lang/ruby/ChangeLog,v 1.298 2007/09/30 08:44:50 rbrown Exp $
+
+*ruby-1.8.6_p110-r1 (30 Sep 2007)
+*ruby-1.8.5_p113 (30 Sep 2007)
+
+  30 Sep 2007; Richard Brown <rbrown@gentoo.org>
+  +files/ruby-1.8.5_p113-net-http-p114.patch,
+  +files/ruby-1.8.6_p110-net-http-p111.patch, +ruby-1.8.5_p113.ebuild,
+  +ruby-1.8.6_p110-r1.ebuild:
+  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.
 
   24 Sep 2007; Richard Brown <rbrown@gentoo.org> ruby-1.8.6_p110.ebuild:
   More fixes from gentoo-dev and graaff
diff --git a/dev-lang/ruby/Manifest b/dev-lang/ruby/Manifest
index 9b528e65bd97..d9a62d11db2f 100644
--- a/dev-lang/ruby/Manifest
+++ b/dev-lang/ruby/Manifest
@@ -6,6 +6,10 @@ AUX ruby-1.8.4-yaml.diff 457 RMD160 6bb5d1700c877d5dc4192da6eaae9bc6712f78b0 SHA
 MD5 2fade36ba9727ddc61257d1588b5db16 files/ruby-1.8.4-yaml.diff 457
 RMD160 6bb5d1700c877d5dc4192da6eaae9bc6712f78b0 files/ruby-1.8.4-yaml.diff 457
 SHA256 425847a21b2c794c4cf910bcd7d6603951bc20c55f39e768dd6befd99ea1a0bb files/ruby-1.8.4-yaml.diff 457
+AUX ruby-1.8.5_p113-net-http-p114.patch 4095 RMD160 bbe5be91bc1ce597f0ada3b80054a545f313ee61 SHA1 7b1bd5be7ddeb8b9250333e40c2a061b52ec952b SHA256 58f894e7823c68d4aac80a50a73018e51cc61afb171a39514c6a85d78ddaf287
+MD5 4354dfea640f9f858570fcc47d10b907 files/ruby-1.8.5_p113-net-http-p114.patch 4095
+RMD160 bbe5be91bc1ce597f0ada3b80054a545f313ee61 files/ruby-1.8.5_p113-net-http-p114.patch 4095
+SHA256 58f894e7823c68d4aac80a50a73018e51cc61afb171a39514c6a85d78ddaf287 files/ruby-1.8.5_p113-net-http-p114.patch 4095
 AUX ruby-1.8.6-exit-status.patch 2284 RMD160 09d777250a298848cff9d11fee5f00551cbab2a4 SHA1 7f3b4b4eba17ef8bf934e6c0d75c823bd0587a62 SHA256 41e7cd46b654e60b29333da68a70c110fac6a0794e35ec10cc13bbd35b150176
 MD5 677eaed33af3a3768f9e372ffe97695c files/ruby-1.8.6-exit-status.patch 2284
 RMD160 09d777250a298848cff9d11fee5f00551cbab2a4 files/ruby-1.8.6-exit-status.patch 2284
@@ -14,14 +18,20 @@ AUX ruby-1.8.6-memory-leak.diff 1351 RMD160 cba1335fcd52df26b4b2884dea14e0c74852
 MD5 9db609a7c1b7028c18dadd6a8a13bf83 files/ruby-1.8.6-memory-leak.diff 1351
 RMD160 cba1335fcd52df26b4b2884dea14e0c74852b67a files/ruby-1.8.6-memory-leak.diff 1351
 SHA256 90dbc7b444ed936ed8a1fadb443240ec494a6c748d38ff089af423e50bdd9528 files/ruby-1.8.6-memory-leak.diff 1351
+AUX ruby-1.8.6_p110-net-http-p111.patch 4093 RMD160 9a6242acde9681ceecd98968311507f72884dbe4 SHA1 0ae43c4c8d38b248de05da58945bc963288d07f5 SHA256 4514390d024a227bcd7c1cff275d4f0ab8e6030d374302b71887063d8e110999
+MD5 e1f08319d423a257fb45814abe180483 files/ruby-1.8.6_p110-net-http-p111.patch 4093
+RMD160 9a6242acde9681ceecd98968311507f72884dbe4 files/ruby-1.8.6_p110-net-http-p111.patch 4093
+SHA256 4514390d024a227bcd7c1cff275d4f0ab8e6030d374302b71887063d8e110999 files/ruby-1.8.6_p110-net-http-p111.patch 4093
 AUX ruby-1.8.6_p36-rb_thread_status_prototype.patch 814 RMD160 6d7a11a01635fd25c869ebf7c1b7a0bc16b7170d SHA1 9d5f562b9051d0d50e867dfcd94425bba7406f18 SHA256 13fbd5854117e96f7cb20f9951da92ec72673dd89e59e1f8b4a75f7fa4f3c196
 MD5 974baa2082c6ad34ec6a96bde01ca40a files/ruby-1.8.6_p36-rb_thread_status_prototype.patch 814
 RMD160 6d7a11a01635fd25c869ebf7c1b7a0bc16b7170d files/ruby-1.8.6_p36-rb_thread_status_prototype.patch 814
 SHA256 13fbd5854117e96f7cb20f9951da92ec72673dd89e59e1f8b4a75f7fa4f3c196 files/ruby-1.8.6_p36-rb_thread_status_prototype.patch 814
 DIST onigd2_5_4.tar.gz 212280 RMD160 6f694c6cf12f803d0bc608f493789c92c3cbcf68 SHA1 68438f08aed58bb4655e9268268a0311ea524df7 SHA256 cd4b4177633e8e42e34c26e3f41b0b9bccf747dc51d72a38943fef9cbc0eaa7b
 DIST onigd2_5_7.tar.gz 215529 RMD160 43cf52af1243acf21932690307ed7b0c81ff2771 SHA1 041cac9ce58f3002228a98db3c4c6934f5682593 SHA256 205b2857d77efc4caa3b98eaf91fd1cc8b8722b497df933d1fbd23f7a5186549
+DIST onigd2_5_8.tar.gz 218187 RMD160 82d10299ebac0d5ffe94e89f965d84f2f085c6d4 SHA1 8bf30b64c993a00a3d2febe1b2d8662916e49325 SHA256 11aa092d7cb1c21b7fb60980e9c5a9b931e670c29553ea9444927a8a468e526b
 DIST onigd2_5_9.tar.gz 221355 RMD160 ceeee9a0221d431d6576a566621ba9badab6423d SHA1 41ca5b916ae1d3b1675fcc45181a0ed04e8726b7 SHA256 b24df7c0fa6fc72ce37fd1e203f378359f29f739a3f4c5b6bdd40ca5f7d25db0
 DIST ruby-1.8.4.tar.gz 4312965 RMD160 1c0572a4ee369af57a3db68027b2566052eac944 SHA1 93999577c7fc4decc6b2fe8fefa96e743f278fbf SHA256 71432841b3965b7ab2d83f0dc7c3049195ea4e9267a8dc2d825a8a0466982930
+DIST ruby-1.8.5-p113.tar.gz 4484645 RMD160 3c83d411f5fea1b7656050ea8461bba320eaad5e SHA1 66a9d8d0974f30aa693215ceb29f2645025d1f30 SHA256 5df5d21f7414e2191dc73d4d388b1d95d14ddf689eb5fc0d16e04ba01ecf866e
 DIST ruby-1.8.5-p2.tar.gz 4519151 RMD160 3ad4c4a4d02930cbb1a582ea5fa19db04f55ab3b SHA1 f614bba73f447ddf35f8a4beb71ccc3df87831a5 SHA256 496844dc90571454a50552912f02a42df7fc4f89cef5bd3cd4854cecf3fd1d30
 DIST ruby-1.8.5-p35.tar.gz 4522314 RMD160 8a87fb77ce5eab0a663431a7ad689d48cd9ca06c SHA1 04067b47c27c4e5197a11e4e3ea2504842a46f66 SHA256 4d937d5c51e95b4f5c881e334c1c3f69c8e894deac1024ed7c9911c4f78548f0
 DIST ruby-1.8.6-p110.tar.gz 4546509 RMD160 6495c22a94149e4dbc3608f0bf2f0c75683060e0 SHA1 0954a9d308d12393e2a6880743f752eb171bbe81 SHA256 d3f11ecaf2b0bd7bd3f0bc24007b1c7c12640c55cd40e8e4cc396ba835186fbe
@@ -31,6 +41,10 @@ EBUILD ruby-1.8.4-r3.ebuild 3771 RMD160 ec30e7108ca305568d6a435944eee43d198c5b8d
 MD5 691fd9a765ea473f0511eb5f10959c7d ruby-1.8.4-r3.ebuild 3771
 RMD160 ec30e7108ca305568d6a435944eee43d198c5b8d ruby-1.8.4-r3.ebuild 3771
 SHA256 819b09c7279d9fbbd588236ad0a7bb98dc73d220b191007406cfc80adab77237 ruby-1.8.4-r3.ebuild 3771
+EBUILD ruby-1.8.5_p113.ebuild 5114 RMD160 12b74e4a922abe3a22cb2903d47ffb6d322980c3 SHA1 f41cd4bb2daa503bae0c93ea3ab3be19abced08f SHA256 eb0d70caf1b66b4e3bd3e86c746eee2cf79692af67567d89c2a4c83273dbda77
+MD5 f8ad55142dafc14e8c89254cef4f8f9b ruby-1.8.5_p113.ebuild 5114
+RMD160 12b74e4a922abe3a22cb2903d47ffb6d322980c3 ruby-1.8.5_p113.ebuild 5114
+SHA256 eb0d70caf1b66b4e3bd3e86c746eee2cf79692af67567d89c2a4c83273dbda77 ruby-1.8.5_p113.ebuild 5114
 EBUILD ruby-1.8.5_p2-r1.ebuild 3705 RMD160 3e63db3982accac72314c52eb63f1d61baaf7755 SHA1 87163b26eb53b1221fcb736c97906eecc30555d7 SHA256 3acc443bf52df1245d4003e682d78d8b8dc83891a5b33971865570a433025cfa
 MD5 ec499e09f4792c4d2f90f844df2007f9 ruby-1.8.5_p2-r1.ebuild 3705
 RMD160 3e63db3982accac72314c52eb63f1d61baaf7755 ruby-1.8.5_p2-r1.ebuild 3705
@@ -43,6 +57,10 @@ EBUILD ruby-1.8.6-r1.ebuild 4974 RMD160 9c3b1b305cdb0845d90949f4208ddfeb65be22a9
 MD5 f8cecf90037eeea8cc16fab2d3ead58c ruby-1.8.6-r1.ebuild 4974
 RMD160 9c3b1b305cdb0845d90949f4208ddfeb65be22a9 ruby-1.8.6-r1.ebuild 4974
 SHA256 e501162db6479de297170292ed828c110f49f606f4e5d1efe9cea158a416636d ruby-1.8.6-r1.ebuild 4974
+EBUILD ruby-1.8.6_p110-r1.ebuild 5187 RMD160 77a8d6da404e43125a1539f50d26da56c7b7f739 SHA1 5bc7c1064d49e5c99f4aefdf180b153316f61a6e SHA256 abf5f32214161aef1b64348eb9378e63bb7f575e8cfdc167e0a1d83f30c750c0
+MD5 62f7c3c132503299d6d6896700c0cf78 ruby-1.8.6_p110-r1.ebuild 5187
+RMD160 77a8d6da404e43125a1539f50d26da56c7b7f739 ruby-1.8.6_p110-r1.ebuild 5187
+SHA256 abf5f32214161aef1b64348eb9378e63bb7f575e8cfdc167e0a1d83f30c750c0 ruby-1.8.6_p110-r1.ebuild 5187
 EBUILD ruby-1.8.6_p110.ebuild 4814 RMD160 d04025fc537059c21487523a0410df7fe61b73da SHA1 580823767f5dc1d3f50a9e098713cad016d8c996 SHA256 8a1bff98db20762814833fa634c7c7fdaf2c34688ba6024bb336c5ee73157bd5
 MD5 5fa0573f254954153cc0a0678d77ec1f ruby-1.8.6_p110.ebuild 4814
 RMD160 d04025fc537059c21487523a0410df7fe61b73da ruby-1.8.6_p110.ebuild 4814
@@ -55,21 +73,20 @@ EBUILD ruby-1.8.6_p36-r4.ebuild 4990 RMD160 0a9f843a567e7c3bfb67f1ba0eb5bc9f025f
 MD5 f10edd5b59cb7c30163814381c396454 ruby-1.8.6_p36-r4.ebuild 4990
 RMD160 0a9f843a567e7c3bfb67f1ba0eb5bc9f025f19c9 ruby-1.8.6_p36-r4.ebuild 4990
 SHA256 c17692d08fe66f168ff61e1072bd12967f02b0eacb6a9191164e54ca47d20e2c ruby-1.8.6_p36-r4.ebuild 4990
-MISC ChangeLog 43374 RMD160 6a8fbc0e60c020947dbf9a3d70eb1e05c3e301b9 SHA1 bcef6964c7f79b164873d8e39b96cc330d895f8d SHA256 ccb00c836d7297b2c921efd7f37591b04ac8b6ee9f79de1b845013bee76ed8c1
-MD5 e182df656481245914fd0e6ff040691b ChangeLog 43374
-RMD160 6a8fbc0e60c020947dbf9a3d70eb1e05c3e301b9 ChangeLog 43374
-SHA256 ccb00c836d7297b2c921efd7f37591b04ac8b6ee9f79de1b845013bee76ed8c1 ChangeLog 43374
+MISC ChangeLog 43750 RMD160 65d06a184feeb5bc11a7856664fc8c11a591977e SHA1 f0d72a97450e6838d9c5f2f28a0e9c14f439a000 SHA256 dffa87f7bf04c2111f6cadace0676651775b463eb9c36675586717ae238ecdc8
+MD5 95423fa60e8eaab20c55ef70d38ae4f4 ChangeLog 43750
+RMD160 65d06a184feeb5bc11a7856664fc8c11a591977e ChangeLog 43750
+SHA256 dffa87f7bf04c2111f6cadace0676651775b463eb9c36675586717ae238ecdc8 ChangeLog 43750
 MISC metadata.xml 157 RMD160 5d9e2c7ecba96ffebd936d38acedf859cdea84e1 SHA1 8ce15dcc608eeb5616aeec610dc695cbe6f93e02 SHA256 11fba03a217e2d996f5cd8895493a5692ece8ddac2c1a2dfc71d0e830555121c
 MD5 3eec9f3fe48b51f49dbc1f171a3b026f metadata.xml 157
 RMD160 5d9e2c7ecba96ffebd936d38acedf859cdea84e1 metadata.xml 157
 SHA256 11fba03a217e2d996f5cd8895493a5692ece8ddac2c1a2dfc71d0e830555121c metadata.xml 157
-MISC ruby-1.8.6_p110.ebuild.orig 5004 RMD160 04e2707435a3fa05daf78b4832fedcdc66c61ac8 SHA1 d4fe25a059ded0dfb37e5a28e948285da90741bb SHA256 450e81cc1a01b92f89b5e29f78c626c266a368b271d4a10fcda1505697324661
-MD5 3e4b8e220f1031b06d524b561625c9a0 ruby-1.8.6_p110.ebuild.orig 5004
-RMD160 04e2707435a3fa05daf78b4832fedcdc66c61ac8 ruby-1.8.6_p110.ebuild.orig 5004
-SHA256 450e81cc1a01b92f89b5e29f78c626c266a368b271d4a10fcda1505697324661 ruby-1.8.6_p110.ebuild.orig 5004
 MD5 38ebdc02f8e5fe10b4c7bde101a57fa0 files/digest-ruby-1.8.4-r3 467
 RMD160 d80d4411e88a9afbdd9d5c7a9e3b118f64ac2af6 files/digest-ruby-1.8.4-r3 467
 SHA256 f9a1f94eb7aaa8da1e8ac2e65220ac6ea865b6c0b2dc0e1c8ecdfb4fca699b4a files/digest-ruby-1.8.4-r3 467
+MD5 5f8c993be3e4fddaeb2aa3d42fa29257 files/digest-ruby-1.8.5_p113 482
+RMD160 ff0a8fb4df3d1831421cd2ca2e8c55eb8fe21778 files/digest-ruby-1.8.5_p113 482
+SHA256 dc913264fa3b46de9c9a83bac3b6ff141524db58562b86c2dd4f37e22f149f8b files/digest-ruby-1.8.5_p113 482
 MD5 a0f9393d90ca3858fcfd6dd87f6221ba files/digest-ruby-1.8.5_p2-r1 476
 RMD160 7be7dc6b21f0cdf287cfc61a413e36eef54d702f files/digest-ruby-1.8.5_p2-r1 476
 SHA256 94ab349ecba8a20a6642d7d93f8cee673fdbf8f548990d0d79f1c18c41349ec4 files/digest-ruby-1.8.5_p2-r1 476
@@ -82,6 +99,9 @@ SHA256 06257e9ae516624582d8e9067e50d992537ffddab879573208164353cc3d8075 files/di
 MD5 d4962a07a9e96e82d477b51762b055b8 files/digest-ruby-1.8.6_p110 482
 RMD160 5c893aec8d7b5e57d435aa2fcb839d7548b58e31 files/digest-ruby-1.8.6_p110 482
 SHA256 9bc1c506ca3cd4d1813cb1756a00fef2f24386df406ae7eb77829ea3d1c51bb2 files/digest-ruby-1.8.6_p110 482
+MD5 d4962a07a9e96e82d477b51762b055b8 files/digest-ruby-1.8.6_p110-r1 482
+RMD160 5c893aec8d7b5e57d435aa2fcb839d7548b58e31 files/digest-ruby-1.8.6_p110-r1 482
+SHA256 9bc1c506ca3cd4d1813cb1756a00fef2f24386df406ae7eb77829ea3d1c51bb2 files/digest-ruby-1.8.6_p110-r1 482
 MD5 a3f4418fce22647071dd4933a1eadcf0 files/digest-ruby-1.8.6_p36-r3 479
 RMD160 3f088121f5c934ea461a83023031adabd210a0d4 files/digest-ruby-1.8.6_p36-r3 479
 SHA256 7a9bfbd900c349de6e3685df9d0879e5f026a00a03c6873f241bf17d03de1429 files/digest-ruby-1.8.6_p36-r3 479
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
diff --git a/dev-lang/ruby/ruby-1.8.5_p113.ebuild b/dev-lang/ruby/ruby-1.8.5_p113.ebuild
new file mode 100644
index 000000000000..b2eb8d241e6f
--- /dev/null
+++ b/dev-lang/ruby/ruby-1.8.5_p113.ebuild
@@ -0,0 +1,175 @@
+# Copyright 1999-2007 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/dev-lang/ruby/ruby-1.8.5_p113.ebuild,v 1.1 2007/09/30 08:44:50 rbrown Exp $
+
+WANT_AUTOCONF="latest"
+WANT_AUTOMAKE="latest"
+
+ONIGURUMA="onigd2_5_8"
+
+inherit autotools eutils flag-o-matic multilib versionator
+
+MY_P="${PN}-$(replace_version_separator 3 '-')"
+S=${WORKDIR}/${MY_P}
+
+SLOT=$(get_version_component_range 1-2)
+MY_SUFFIX=$(delete_version_separator 1 ${SLOT})
+
+DESCRIPTION="An object-oriented scripting language"
+HOMEPAGE="http://www.ruby-lang.org/"
+SRC_URI="ftp://ftp.ruby-lang.org/pub/ruby/${SLOT}/${MY_P}.tar.gz
+	cjk? ( http://www.geocities.jp/kosako3/oniguruma/archive/${ONIGURUMA}.tar.gz )"
+
+LICENSE="Ruby"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~sparc-fbsd ~x86 ~x86-fbsd"
+IUSE="cjk debug doc elibc_glibc examples ipv6 rubytests socks5 threads tk"
+
+RDEPEND=">=sys-libs/gdbm-1.8.0
+	>=sys-libs/readline-4.1
+	>=sys-libs/ncurses-5.2
+	socks5? ( >=net-proxy/dante-1.1.13 )
+	tk? ( dev-lang/tk )
+	>=dev-ruby/ruby-config-0.3.1
+	!=dev-lang/ruby-cvs-${SLOT}*
+	!dev-ruby/rdoc
+	!dev-ruby/rexml"
+DEPEND="${RDEPEND}"
+PROVIDE="virtual/ruby"
+
+src_unpack() {
+	unpack ${A}
+
+	if use cjk ; then
+		einfo "Applying ${ONIGURUMA}"
+		pushd ${WORKDIR}/oniguruma
+		econf --with-rubydir="${S}" || die "oniguruma econf failed"
+		emake $MY_SUFFIX || die "oniguruma emake failed"
+		popd
+	fi
+
+	cd "${S}"
+	epatch "${FILESDIR}/${P}-net-http-p114.patch"
+
+	# Fix a hardcoded lib path in configure script
+	sed -i -e "s:\(RUBY_LIB_PREFIX=\"\${prefix}/\)lib:\1$(get_libdir):" \
+		configure.in || die "sed failed"
+
+	eautoreconf
+}
+
+src_compile() {
+	# -fomit-frame-pointer makes ruby segfault, see bug #150413.
+	filter-flags -fomit-frame-pointer
+	# In many places aliasing rules are broken; play it safe
+	# as it's risky with newer compilers to leave it as it is.
+	append-flags -fno-strict-aliasing
+
+	# Socks support via dante
+	if use socks5 ; then
+		# Socks support can't be disabled as long as SOCKS_SERVER is
+		# set and socks library is present, so need to unset
+		# SOCKS_SERVER in that case.
+		unset SOCKS_SERVER
+	fi
+
+	# Increase GC_MALLOC_LIMIT if set (default is 8000000)
+	if [ -n "${RUBY_GC_MALLOC_LIMIT}" ] ; then
+		append-flags "-DGC_MALLOC_LIMIT=${RUBY_GC_MALLOC_LIMIT}"
+	fi
+
+	# Bug #168939
+	# We need to always enable ipv6, use --with-lookup-order-hack=INET
+	# when we don't want ipv6 with glibc
+	if use elibc_glibc; then
+		myconf="--enable-ipv6"
+		if ! use ipv6; then
+			myconf="${myconf} --with-lookup-order-hack=INET"
+		fi
+	else
+		myconf=$(use_enable ipv6)
+	fi
+
+	econf --program-suffix=$MY_SUFFIX --enable-shared \
+		$(use_enable socks5 socks) \
+		$(use_enable doc install-doc) \
+		$(use_enable threads pthread) \
+		$(use_enable debug) \
+		$(use_with tk) \
+		${myconf} \
+		--with-sitedir=/usr/$(get_libdir)/ruby/site_ruby \
+		|| die "econf failed"
+
+	emake EXTLDFLAGS="${LDFLAGS}" || die "emake failed"
+}
+
+src_test() {
+	emake -j1 test || die "make test failed"
+
+	elog "Ruby's make test has been run. Ruby also ships with a make check"
+	elog "that cannot be run until after ruby has been installed."
+	elog
+	if use rubytests; then
+		elog "You have enabled rubytests, so they will be installed to"
+		elog "/usr/share/${PN}-${SLOT}/test. To run them you must be a user other"
+		elog "than root, and you must place them into a writeable directory."
+		elog "Then call: "
+		elog
+		elog "ruby -C /location/of/tests runner.rb"
+	else
+		elog "Enable the rubytests USE flag to install the make check tests"
+	fi
+}
+
+src_install() {
+	LD_LIBRARY_PATH="${D}/usr/$(get_libdir)"
+	RUBYLIB="${S}:${D}/usr/$(get_libdir)/ruby/${SLOT}"
+	for d in $(find "${S}/ext" -type d) ; do
+		RUBYLIB="${RUBYLIB}:$d"
+	done
+	export LD_LIBRARY_PATH RUBYLIB
+
+	emake DESTDIR="${D}" install || die "make install failed"
+
+	MINIRUBY=$(echo -e 'include Makefile\ngetminiruby:\n\t@echo $(MINIRUBY)'|make -f - getminiruby)
+	keepdir $(${MINIRUBY} -rrbconfig -e "print Config::CONFIG['sitelibdir']")
+	keepdir $(${MINIRUBY} -rrbconfig -e "print Config::CONFIG['sitearchdir']")
+
+	if use doc; then
+		make DESTDIR="${D}" install-doc || die "make install-doc failed"
+	fi
+
+	if use examples; then
+		dodir /usr/share/doc/${PF}
+		cp -pPR sample "${D}/usr/share/doc/${PF}"
+	fi
+
+	dosym libruby$MY_SUFFIX$(get_libname ${PV%_*}) /usr/$(get_libdir)/libruby$(get_libname ${PV%.*})
+	dosym libruby$MY_SUFFIX$(get_libname ${PV%_*}) /usr/$(get_libdir)/libruby$(get_libname ${PV%_*})
+
+	dodoc ChangeLog NEWS README* ToDo
+
+	if use rubytests; then
+		dodir /usr/share/${PN}-${SLOT}
+		cp -pPR test "${D}/usr/share/${PN}-${SLOT}"
+	fi
+}
+
+pkg_postinst() {
+
+	ewarn "If you upgrade to >=sys-apps/coreutils-6.7-r1,"
+	ewarn "you should re-emerge ruby again."
+	ewarn "See bug #159922 for details"
+	ewarn
+	if [[ ! -n $(readlink "${ROOT}"usr/bin/ruby) ]] ; then
+		"${ROOT}usr/sbin/ruby-config" ruby$MY_SUFFIX
+	fi
+	elog
+	elog "You can change the default ruby interpreter by ${ROOT}usr/sbin/ruby-config"
+	elog
+}
+
+pkg_postrm() {
+	if [[ ! -n $(readlink "${ROOT}"usr/bin/ruby) ]] ; then
+		"${ROOT}usr/sbin/ruby-config" ruby$MY_SUFFIX
+	fi
+}
diff --git a/dev-lang/ruby/ruby-1.8.6_p110-r1.ebuild b/dev-lang/ruby/ruby-1.8.6_p110-r1.ebuild
new file mode 100644
index 000000000000..94513d46b213
--- /dev/null
+++ b/dev-lang/ruby/ruby-1.8.6_p110-r1.ebuild
@@ -0,0 +1,178 @@
+# Copyright 1999-2007 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/dev-lang/ruby/ruby-1.8.6_p110-r1.ebuild,v 1.1 2007/09/30 08:44:50 rbrown Exp $
+
+WANT_AUTOCONF="latest"
+WANT_AUTOMAKE="latest"
+
+ONIGURUMA="onigd2_5_9"
+
+inherit autotools eutils flag-o-matic multilib versionator
+
+MY_P="${PN}-$(replace_version_separator 3 '-')"
+S=${WORKDIR}/${MY_P}
+
+SLOT=$(get_version_component_range 1-2)
+MY_SUFFIX=$(delete_version_separator 1 ${SLOT})
+
+DESCRIPTION="An object-oriented scripting language"
+HOMEPAGE="http://www.ruby-lang.org/"
+SRC_URI="ftp://ftp.ruby-lang.org/pub/ruby/${SLOT}/${MY_P}.tar.gz
+	cjk? ( http://www.geocities.jp/kosako3/oniguruma/archive/${ONIGURUMA}.tar.gz )"
+
+LICENSE="Ruby"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~sparc-fbsd ~x86 ~x86-fbsd"
+IUSE="cjk debug doc elibc_glibc examples ipv6 rubytests socks5 threads tk"
+
+RDEPEND=">=sys-libs/gdbm-1.8.0
+	>=sys-libs/readline-4.1
+	>=sys-libs/ncurses-5.2
+	socks5? ( >=net-proxy/dante-1.1.13 )
+	tk? ( dev-lang/tk )
+	>=dev-ruby/ruby-config-0.3.1
+	!=dev-lang/ruby-cvs-${SLOT}*
+	!dev-ruby/rdoc
+	!dev-ruby/rexml"
+DEPEND="${RDEPEND}"
+PROVIDE="virtual/ruby"
+
+src_unpack() {
+	unpack ${A}
+
+	if use cjk ; then
+		einfo "Applying ${ONIGURUMA}"
+		pushd ${WORKDIR}/oniguruma
+		econf --with-rubydir="${S}" || die "oniguruma econf failed"
+		emake $MY_SUFFIX || die "oniguruma emake failed"
+		popd
+	fi
+
+	cd "${S}/ext/dl"
+	epatch "${FILESDIR}/${PN}-1.8.6-memory-leak.diff"
+	cd "${S}"
+
+	epatch "${FILESDIR}/${P}-net-http-p111.patch"
+
+	# Fix a hardcoded lib path in configure script
+	sed -i -e "s:\(RUBY_LIB_PREFIX=\"\${prefix}/\)lib:\1$(get_libdir):" \
+		configure.in || die "sed failed"
+
+	eautoreconf
+}
+
+src_compile() {
+	# -fomit-frame-pointer makes ruby segfault, see bug #150413.
+	filter-flags -fomit-frame-pointer
+	# In many places aliasing rules are broken; play it safe
+	# as it's risky with newer compilers to leave it as it is.
+	append-flags -fno-strict-aliasing
+
+	# Socks support via dante
+	if use socks5 ; then
+		# Socks support can't be disabled as long as SOCKS_SERVER is
+		# set and socks library is present, so need to unset
+		# SOCKS_SERVER in that case.
+		unset SOCKS_SERVER
+	fi
+
+	# Increase GC_MALLOC_LIMIT if set (default is 8000000)
+	if [ -n "${RUBY_GC_MALLOC_LIMIT}" ] ; then
+		append-flags "-DGC_MALLOC_LIMIT=${RUBY_GC_MALLOC_LIMIT}"
+	fi
+
+	# Bug #168939
+	# We need to always enable ipv6, use --with-lookup-order-hack=INET
+	# when we don't want ipv6 with glibc
+	if use elibc_glibc; then
+		myconf="--enable-ipv6"
+		if ! use ipv6; then
+			myconf="${myconf} --with-lookup-order-hack=INET"
+		fi
+	else
+		myconf=$(use_enable ipv6)
+	fi
+
+	econf --program-suffix=$MY_SUFFIX --enable-shared \
+		$(use_enable socks5 socks) \
+		$(use_enable doc install-doc) \
+		$(use_enable threads pthread) \
+		$(use_enable debug) \
+		$(use_with tk) \
+		${myconf} \
+		--with-sitedir=/usr/$(get_libdir)/ruby/site_ruby \
+		|| die "econf failed"
+
+	emake EXTLDFLAGS="${LDFLAGS}" || die "emake failed"
+}
+
+src_test() {
+	emake -j1 test || die "make test failed"
+
+	elog "Ruby's make test has been run. Ruby also ships with a make check"
+	elog "that cannot be run until after ruby has been installed."
+	elog
+	if use rubytests; then
+		elog "You have enabled rubytests, so they will be installed to"
+		elog "/usr/share/${PN}-${SLOT}/test. To run them you must be a user other"
+		elog "than root, and you must place them into a writeable directory."
+		elog "Then call: "
+		elog
+		elog "ruby -C /location/of/tests runner.rb"
+	else
+		elog "Enable the rubytests USE flag to install the make check tests"
+	fi
+}
+
+src_install() {
+	LD_LIBRARY_PATH="${D}/usr/$(get_libdir)"
+	RUBYLIB="${S}:${D}/usr/$(get_libdir)/ruby/${SLOT}"
+	for d in $(find "${S}/ext" -type d) ; do
+		RUBYLIB="${RUBYLIB}:$d"
+	done
+	export LD_LIBRARY_PATH RUBYLIB
+
+	emake DESTDIR="${D}" install || die "make install failed"
+
+	MINIRUBY=$(echo -e 'include Makefile\ngetminiruby:\n\t@echo $(MINIRUBY)'|make -f - getminiruby)
+	keepdir $(${MINIRUBY} -rrbconfig -e "print Config::CONFIG['sitelibdir']")
+	keepdir $(${MINIRUBY} -rrbconfig -e "print Config::CONFIG['sitearchdir']")
+
+	if use doc; then
+		make DESTDIR="${D}" install-doc || die "make install-doc failed"
+	fi
+
+	if use examples; then
+		dodir /usr/share/doc/${PF}
+		cp -pPR sample "${D}/usr/share/doc/${PF}"
+	fi
+
+	dosym libruby$MY_SUFFIX$(get_libname ${PV%_*}) /usr/$(get_libdir)/libruby$(get_libname ${PV%.*})
+	dosym libruby$MY_SUFFIX$(get_libname ${PV%_*}) /usr/$(get_libdir)/libruby$(get_libname ${PV%_*})
+
+	dodoc ChangeLog NEWS README* ToDo
+
+	if use rubytests; then
+		dodir /usr/share/${PN}-${SLOT}
+		cp -pPR test "${D}/usr/share/${PN}-${SLOT}"
+	fi
+}
+
+pkg_postinst() {
+
+	ewarn "If you upgrade to >=sys-apps/coreutils-6.7-r1,"
+	ewarn "you should re-emerge ruby again."
+	ewarn "See bug #159922 for details"
+	ewarn
+	if [[ ! -n $(readlink "${ROOT}"usr/bin/ruby) ]] ; then
+		"${ROOT}usr/sbin/ruby-config" ruby$MY_SUFFIX
+	fi
+	elog
+	elog "You can change the default ruby interpreter by ${ROOT}usr/sbin/ruby-config"
+	elog
+}
+
+pkg_postrm() {
+	if [[ ! -n $(readlink "${ROOT}"usr/bin/ruby) ]] ; then
+		"${ROOT}usr/sbin/ruby-config" ruby$MY_SUFFIX
+	fi
+}