summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorRichard Brown <rbrown@gentoo.org>2007-12-23 10:37:34 +0000
committerRichard Brown <rbrown@gentoo.org>2007-12-23 10:37:34 +0000
commitbdf1399fed2b699ffc40074c9a375045c030ba18 (patch)
treee53cbab23168f194fb5a8c45a59d909b600dc130 /dev-lang/ruby/files
parentAdd dev-lang/ruby xemacs to package.use.mask on arm mips and sh (diff)
downloadgentoo-2-bdf1399fed2b699ffc40074c9a375045c030ba18.tar.gz
gentoo-2-bdf1399fed2b699ffc40074c9a375045c030ba18.tar.bz2
gentoo-2-bdf1399fed2b699ffc40074c9a375045c030ba18.zip
Version bump with patch for bug #199191
(Portage version: 2.1.3.19)
Diffstat (limited to 'dev-lang/ruby/files')
-rw-r--r--dev-lang/ruby/files/digest-ruby-1.8.6_p1116
-rw-r--r--dev-lang/ruby/files/ruby-1.8.6_p111-r13657.patch53
2 files changed, 59 insertions, 0 deletions
diff --git a/dev-lang/ruby/files/digest-ruby-1.8.6_p111 b/dev-lang/ruby/files/digest-ruby-1.8.6_p111
new file mode 100644
index 000000000000..5ba30b54de2c
--- /dev/null
+++ b/dev-lang/ruby/files/digest-ruby-1.8.6_p111
@@ -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 e1d38b7d4f1be55726d6927a3395ce3b ruby-1.8.6-p111.tar.bz2 3919396
+RMD160 8ff9b8592a80062742be61b2b4e1158282b61c4b ruby-1.8.6-p111.tar.bz2 3919396
+SHA256 85c694678313818a5083bcfd66ae389fc053b506d93b5ad46f3764981c120fbb ruby-1.8.6-p111.tar.bz2 3919396
diff --git a/dev-lang/ruby/files/ruby-1.8.6_p111-r13657.patch b/dev-lang/ruby/files/ruby-1.8.6_p111-r13657.patch
new file mode 100644
index 000000000000..2e0228be0471
--- /dev/null
+++ b/dev-lang/ruby/files/ruby-1.8.6_p111-r13657.patch
@@ -0,0 +1,53 @@
+Index: branches/ruby_1_8/ext/openssl/lib/net/telnets.rb
+===================================================================
+--- branches/ruby_1_8/ext/openssl/lib/net/telnets.rb (revision 13656)
++++ branches/ruby_1_8/ext/openssl/lib/net/telnets.rb (revision 13657)
+@@ -134,6 +134,9 @@
+ @sock.verify_callback = @options['VerifyCallback']
+ @sock.verify_depth = @options['VerifyDepth']
+ @sock.connect
++ if @options['VerifyMode'] != OpenSSL::SSL::VERIFY_NONE
++ @sock.post_connection_check(@options['Host'])
++ end
+ @ssl = true
+ end
+ ''
+Index: branches/ruby_1_8/ext/openssl/lib/net/ftptls.rb
+===================================================================
+--- branches/ruby_1_8/ext/openssl/lib/net/ftptls.rb (revision 13656)
++++ branches/ruby_1_8/ext/openssl/lib/net/ftptls.rb (revision 13657)
+@@ -29,13 +29,23 @@
+
+ module Net
+ class FTPTLS < FTP
++ def connect(host, port=FTP_PORT)
++ @hostname = host
++ super
++ end
++
+ def login(user = "anonymous", passwd = nil, acct = nil)
++ store = OpenSSL::X509::Store.new
++ store.set_default_paths
+ ctx = OpenSSL::SSL::SSLContext.new('SSLv23')
++ ctx.cert_store = store
++ ctx.verify_mode = OpenSSL::SSL::VERIFY_PEER
+ ctx.key = nil
+ ctx.cert = nil
+ voidcmd("AUTH TLS")
+ @sock = OpenSSL::SSL::SSLSocket.new(@sock, ctx)
+ @sock.connect
++ @sock.post_connection_check(@hostname)
+ super(user, passwd, acct)
+ voidcmd("PBSZ 0")
+ end
+--- branches/ruby_1_8/lib/net/imap.rb (revision 13656)
++++ branches/ruby_1_8/lib/net/imap.rb (revision 13657)
+@@ -900,6 +900,7 @@
+ end
+ @sock = SSLSocket.new(@sock, context)
+ @sock.connect # start ssl session.
++ @sock.post_connection_check(@host) if verify
+ else
+ @usessl = false
+ end
+