diff options
author | taca <taca@pkgsrc.org> | 2007-10-06 06:12:35 +0000 |
---|---|---|
committer | taca <taca@pkgsrc.org> | 2007-10-06 06:12:35 +0000 |
commit | 971837995f569b0c9ae11b12556321751e113190 (patch) | |
tree | 4ebccc145872a4716d35933df443f0f7920ee6c8 /lang/ruby18-base/patches | |
parent | 3557192c6b24d3bf8f4b92ca961021b2dcf40d94 (diff) | |
download | pkgsrc-971837995f569b0c9ae11b12556321751e113190.tar.gz |
Update Ruby packages to 1.8.6-p111.
Basically, no change since previous update except Net::HTTP default
@enable_post_connection_check was wrongly set to true. (It might
cause compatibility problem.)
Diffstat (limited to 'lang/ruby18-base/patches')
-rw-r--r-- | lang/ruby18-base/patches/patch-ag | 13 | ||||
-rw-r--r-- | lang/ruby18-base/patches/patch-ai | 22 | ||||
-rw-r--r-- | lang/ruby18-base/patches/patch-dh | 37 | ||||
-rw-r--r-- | lang/ruby18-base/patches/patch-di | 29 |
4 files changed, 0 insertions, 101 deletions
diff --git a/lang/ruby18-base/patches/patch-ag b/lang/ruby18-base/patches/patch-ag deleted file mode 100644 index 6083b9eee61..00000000000 --- a/lang/ruby18-base/patches/patch-ag +++ /dev/null @@ -1,13 +0,0 @@ -$NetBSD: patch-ag,v 1.3 2007/09/30 04:08:16 taca Exp $ - ---- ext/openssl/lib/openssl/ssl.rb.orig 2007-02-13 08:01:19.000000000 +0900 -+++ ext/openssl/lib/openssl/ssl.rb -@@ -88,7 +88,7 @@ module OpenSSL - end - } - end -- raise SSLError, "hostname not match" -+ raise SSLError, "hostname was not match with the server certificate" - end - end - diff --git a/lang/ruby18-base/patches/patch-ai b/lang/ruby18-base/patches/patch-ai deleted file mode 100644 index 9b97d3b0d53..00000000000 --- a/lang/ruby18-base/patches/patch-ai +++ /dev/null @@ -1,22 +0,0 @@ -$NetBSD: patch-ai,v 1.1 2007/09/30 04:08:16 taca Exp $ - ---- ChangeLog.orig 2007-09-23 09:01:50.000000000 +0900 -+++ ChangeLog -@@ -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 diff --git a/lang/ruby18-base/patches/patch-dh b/lang/ruby18-base/patches/patch-dh deleted file mode 100644 index 9300c8b76f0..00000000000 --- a/lang/ruby18-base/patches/patch-dh +++ /dev/null @@ -1,37 +0,0 @@ -$NetBSD: patch-dh,v 1.1 2007/09/30 04:08:17 taca Exp $ - ---- lib/net/http.rb.orig 2007-02-13 08:01:19.000000000 +0900 -+++ lib/net/http.rb -@@ -470,6 +470,7 @@ module Net #:nodoc: - @debug_output = nil - @use_ssl = false - @ssl_context = nil -+ @enable_post_connection_check = true - end - - def inspect -@@ -526,6 +527,9 @@ module Net #:nodoc: - 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 @@ module Net #:nodoc: - 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/lang/ruby18-base/patches/patch-di b/lang/ruby18-base/patches/patch-di deleted file mode 100644 index fd052258ed5..00000000000 --- a/lang/ruby18-base/patches/patch-di +++ /dev/null @@ -1,29 +0,0 @@ -$NetBSD: patch-di,v 1.1 2007/09/30 04:08:17 taca Exp $ - ---- lib/open-uri.rb.orig 2007-02-13 08:01:19.000000000 +0900 -+++ lib/open-uri.rb -@@ -229,6 +229,7 @@ module OpenURI - 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 @@ module OpenURI - - 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] |