Update to ruby 2.0.0p353, fixing heap overflow in floating point parser

(CVE-2013-4164).
This commit is contained in:
jeremy 2013-11-24 02:25:26 +00:00
parent ac8d178545
commit f406295617
6 changed files with 15 additions and 45 deletions

View File

@ -1,4 +1,4 @@
# $OpenBSD: Makefile,v 1.7 2013/09/04 18:15:19 landry Exp $
# $OpenBSD: Makefile,v 1.8 2013/11/24 02:25:26 jeremy Exp $
BROKEN-sparc64 = segfaults during build
BROKEN-hppa = miniruby abort trap when generating rdoc
@ -10,7 +10,7 @@ COMMENT-tk = tk interface for ruby
COMMENT-ri_docs = ri documentation files for ruby
VERSION = 2.0.0
PATCHLEVEL = 247
PATCHLEVEL = 353
RUBYLIBREV = 2.0
DISTNAME = ruby-${VERSION}-p${PATCHLEVEL}

View File

@ -1,2 +1,2 @@
SHA256 (ruby-2.0.0-p247.tar.gz) = PnEEKHLHdyZAlGDoZHovMECDoVrg3v6Q2AAKaZF+INM=
SIZE (ruby-2.0.0-p247.tar.gz) = 13652782
SHA256 (ruby-2.0.0-p353.tar.gz) = Rlr8d9IBtYFbt842YKH1oTH0Qpo/pIPBJs5mkj5HJsw=
SIZE (ruby-2.0.0-p353.tar.gz) = 13572794

View File

@ -1,16 +0,0 @@
$OpenBSD: patch-ext_openssl_lib_openssl_ssl_rb,v 1.1 2013/07/17 15:52:55 jeremy Exp $
Backport fix for regression introduced by fix for CVE-2013-4073 from
ruby svn r41805.
--- ext/openssl/lib/openssl/ssl.rb.orig Thu Jun 27 04:13:08 2013
+++ ext/openssl/lib/openssl/ssl.rb Sun Jul 14 19:24:37 2013
@@ -88,7 +88,7 @@ module OpenSSL
should_verify_common_name = true
cert.extensions.each{|ext|
next if ext.oid != "subjectAltName"
- id, ostr = OpenSSL::ASN1.decode(ext.to_der).value
+ ostr = OpenSSL::ASN1.decode(ext.to_der).value.last
sequence = OpenSSL::ASN1.decode(ostr.value)
sequence.value.each{|san|
case san.tag

View File

@ -1,14 +0,0 @@
$OpenBSD: patch-include_ruby_intern_h,v 1.1 2013/07/17 15:52:55 jeremy Exp $
Don't break ABI in a patch level release, from ruby svn r41875.
--- include/ruby/intern.h.orig Sun Jul 14 19:25:14 2013
+++ include/ruby/intern.h Sun Jul 14 19:25:28 2013
@@ -350,6 +350,7 @@ VALUE rb_require_safe(VALUE, int);
void rb_obj_call_init(VALUE, int, VALUE*);
VALUE rb_class_new_instance(int, VALUE*, VALUE);
VALUE rb_block_proc(void);
+VALUE rb_f_lambda(void);
VALUE rb_block_lambda(void);
VALUE rb_proc_new(VALUE (*)(ANYARGS/* VALUE yieldarg[, VALUE procarg] */), VALUE);
VALUE rb_obj_is_proc(VALUE);

View File

@ -1,4 +1,4 @@
@comment $OpenBSD: PLIST-main,v 1.2 2013/05/17 20:11:43 jeremy Exp $
@comment $OpenBSD: PLIST-main,v 1.3 2013/11/24 02:25:26 jeremy Exp $
@option no-default-conflict
@conflict ruby->=2.0,<2.1
bin/erb20
@ -854,11 +854,10 @@ lib/ruby/${RUBYLIBREV}/rubygems/source_specific_file.rb
lib/ruby/${RUBYLIBREV}/rubygems/spec_fetcher.rb
lib/ruby/${RUBYLIBREV}/rubygems/specification.rb
lib/ruby/${RUBYLIBREV}/rubygems/ssl_certs/
lib/ruby/${RUBYLIBREV}/rubygems/ssl_certs/AddTrustExternalCARoot.pem
lib/ruby/${RUBYLIBREV}/rubygems/ssl_certs/Entrust_net-Secure-Server-Certification-Authority.pem
lib/ruby/${RUBYLIBREV}/rubygems/ssl_certs/GeoTrust_Global_CA.pem
lib/ruby/${RUBYLIBREV}/rubygems/ssl_certs/VerisignClass3PublicPrimaryCertificationAuthority-G2.pem
lib/ruby/${RUBYLIBREV}/rubygems/ssl_certs/ca-bundle.pem
lib/ruby/${RUBYLIBREV}/rubygems/ssl_certs/Class3PublicPrimaryCertificationAuthority.pem
lib/ruby/${RUBYLIBREV}/rubygems/ssl_certs/DigiCertHighAssuranceEVRootCA.pem
lib/ruby/${RUBYLIBREV}/rubygems/ssl_certs/EntrustnetSecureServerCertificationAuthority.pem
lib/ruby/${RUBYLIBREV}/rubygems/ssl_certs/GeoTrustGlobalCA.pem
lib/ruby/${RUBYLIBREV}/rubygems/syck_hack.rb
lib/ruby/${RUBYLIBREV}/rubygems/test_case.rb
lib/ruby/${RUBYLIBREV}/rubygems/test_utilities.rb

View File

@ -1,4 +1,4 @@
@comment $OpenBSD: PLIST-ri_docs,v 1.3 2013/07/17 15:52:56 jeremy Exp $
@comment $OpenBSD: PLIST-ri_docs,v 1.4 2013/11/24 02:25:26 jeremy Exp $
share/ri/
share/ri/${RUBYLIBREV}/
share/ri/${RUBYLIBREV}/system/
@ -2719,6 +2719,7 @@ share/ri/${RUBYLIBREV}/system/Gem/Commands/RdocCommand/execute-i.ri
share/ri/${RUBYLIBREV}/system/Gem/Commands/RdocCommand/new-c.ri
share/ri/${RUBYLIBREV}/system/Gem/Commands/SearchCommand/
share/ri/${RUBYLIBREV}/system/Gem/Commands/SearchCommand/cdesc-SearchCommand.ri
share/ri/${RUBYLIBREV}/system/Gem/Commands/SearchCommand/execute-i.ri
share/ri/${RUBYLIBREV}/system/Gem/Commands/SearchCommand/new-c.ri
share/ri/${RUBYLIBREV}/system/Gem/Commands/ServerCommand/
share/ri/${RUBYLIBREV}/system/Gem/Commands/ServerCommand/cdesc-ServerCommand.ri
@ -2739,6 +2740,7 @@ share/ri/${RUBYLIBREV}/system/Gem/Commands/SetupCommand/pem_files_in-i.ri
share/ri/${RUBYLIBREV}/system/Gem/Commands/SetupCommand/rb_files_in-i.ri
share/ri/${RUBYLIBREV}/system/Gem/Commands/SetupCommand/remove_old_bin_files-i.ri
share/ri/${RUBYLIBREV}/system/Gem/Commands/SetupCommand/remove_old_lib_files-i.ri
share/ri/${RUBYLIBREV}/system/Gem/Commands/SetupCommand/show_release_notes-i.ri
share/ri/${RUBYLIBREV}/system/Gem/Commands/SetupCommand/uninstall_old_gemcutter-i.ri
share/ri/${RUBYLIBREV}/system/Gem/Commands/SourcesCommand/
share/ri/${RUBYLIBREV}/system/Gem/Commands/SourcesCommand/cdesc-SourcesCommand.ri
@ -3203,6 +3205,7 @@ share/ri/${RUBYLIBREV}/system/Gem/NameTuple/to_s-i.ri
share/ri/${RUBYLIBREV}/system/Gem/NameTuple/version-i.ri
share/ri/${RUBYLIBREV}/system/Gem/NoAliasYAMLTree/
share/ri/${RUBYLIBREV}/system/Gem/NoAliasYAMLTree/cdesc-NoAliasYAMLTree.ri
share/ri/${RUBYLIBREV}/system/Gem/NoAliasYAMLTree/create-c.ri
share/ri/${RUBYLIBREV}/system/Gem/NoAliasYAMLTree/format_time-i.ri
share/ri/${RUBYLIBREV}/system/Gem/NoAliasYAMLTree/register-i.ri
share/ri/${RUBYLIBREV}/system/Gem/NoAliasYAMLTree/visit_String-i.ri
@ -3383,6 +3386,7 @@ share/ri/${RUBYLIBREV}/system/Gem/RemoteFetcher/correct_for_windows_path-i.ri
share/ri/${RUBYLIBREV}/system/Gem/RemoteFetcher/download-i.ri
share/ri/${RUBYLIBREV}/system/Gem/RemoteFetcher/download_to_cache-i.ri
share/ri/${RUBYLIBREV}/system/Gem/RemoteFetcher/escape-i.ri
share/ri/${RUBYLIBREV}/system/Gem/RemoteFetcher/escape_auth_info-i.ri
share/ri/${RUBYLIBREV}/system/Gem/RemoteFetcher/fetch_file-i.ri
share/ri/${RUBYLIBREV}/system/Gem/RemoteFetcher/fetch_http-i.ri
share/ri/${RUBYLIBREV}/system/Gem/RemoteFetcher/fetch_https-i.ri
@ -3399,6 +3403,7 @@ share/ri/${RUBYLIBREV}/system/Gem/RemoteFetcher/normalize_uri-i.ri
share/ri/${RUBYLIBREV}/system/Gem/RemoteFetcher/request-i.ri
share/ri/${RUBYLIBREV}/system/Gem/RemoteFetcher/reset-i.ri
share/ri/${RUBYLIBREV}/system/Gem/RemoteFetcher/unescape-i.ri
share/ri/${RUBYLIBREV}/system/Gem/RemoteFetcher/unescape_auth_info-i.ri
share/ri/${RUBYLIBREV}/system/Gem/RemoteFetcher/uri_escaper-i.ri
share/ri/${RUBYLIBREV}/system/Gem/RemoteFetcher/user_agent-i.ri
share/ri/${RUBYLIBREV}/system/Gem/RemoteInstallationCancelled/
@ -3636,7 +3641,6 @@ share/ri/${RUBYLIBREV}/system/Gem/Specification/author%3d-i.ri
share/ri/${RUBYLIBREV}/system/Gem/Specification/author-i.ri
share/ri/${RUBYLIBREV}/system/Gem/Specification/authors%3d-i.ri
share/ri/${RUBYLIBREV}/system/Gem/Specification/authors-i.ri
share/ri/${RUBYLIBREV}/system/Gem/Specification/autorequire-i.ri
share/ri/${RUBYLIBREV}/system/Gem/Specification/base_dir-i.ri
share/ri/${RUBYLIBREV}/system/Gem/Specification/bin_dir-i.ri
share/ri/${RUBYLIBREV}/system/Gem/Specification/bin_file-i.ri
@ -3691,9 +3695,6 @@ share/ri/${RUBYLIBREV}/system/Gem/Specification/full_gem_path-i.ri
share/ri/${RUBYLIBREV}/system/Gem/Specification/full_name-i.ri
share/ri/${RUBYLIBREV}/system/Gem/Specification/gem_dir-i.ri
share/ri/${RUBYLIBREV}/system/Gem/Specification/gems_dir-i.ri
share/ri/${RUBYLIBREV}/system/Gem/Specification/has_rdoc%3d-i.ri
share/ri/${RUBYLIBREV}/system/Gem/Specification/has_rdoc%3f-i.ri
share/ri/${RUBYLIBREV}/system/Gem/Specification/has_rdoc-i.ri
share/ri/${RUBYLIBREV}/system/Gem/Specification/has_unit_tests%3f-i.ri
share/ri/${RUBYLIBREV}/system/Gem/Specification/homepage-i.ri
share/ri/${RUBYLIBREV}/system/Gem/Specification/initialize_copy-i.ri