diff options
-rw-r--r-- | ChangeLog | 7 | ||||
-rw-r--r-- | NEWS | 6 | ||||
-rw-r--r-- | lib/rubygems.rb | 2 | ||||
-rw-r--r-- | lib/rubygems/version.rb | 2 | ||||
-rw-r--r-- | test/rubygems/test_gem_requirement.rb | 20 | ||||
-rw-r--r-- | test/rubygems/test_gem_version.rb | 12 | ||||
-rw-r--r-- | version.h | 2 |
7 files changed, 34 insertions, 17 deletions
@@ -1,3 +1,10 @@ +Fri Sep 27 01:24:20 2013 CHIKANAGA Tomoyuki <nagachika@ruby-lang.org> + + * lib/rubygems: Update to Rubygems 2.0.10. [ruby-core:57360] + [Backport #8950] + the patch is provided by drbrain (Eric Hodel). + this update contains a security fix for CVE-2013-4363. + Fri Sep 27 01:11:21 2013 Nobuyoshi Nakada <nobu@ruby-lang.org> * parse.y (lambda): adjust position to the beginning of the block. @@ -461,9 +461,11 @@ with all sufficient information, see the ChangeLog file. XML declaration is used for XML document encoding. * RubyGems - * Updated to 2.0.9. + * Updated to 2.0.10. This fixes CVE_2013-4363: - http://rubygems.rubyforge.org/rubygems-update/History_txt.html#label-2.0.9+%2F+2013-09-13 + http://rubygems.rubyforge.org/rubygems-update/CVE-2013-4363_txt.html + + See http://rubygems.rubyforge.org/rubygems-update/History_txt.html#label-2.0.10+%2F+2013-09-24 for release notes. * Updated to 2.0.8. This fixes CVE-2013-4287: diff --git a/lib/rubygems.rb b/lib/rubygems.rb index f8633d50df..c2ebfb97cd 100644 --- a/lib/rubygems.rb +++ b/lib/rubygems.rb @@ -8,7 +8,7 @@ require 'rbconfig' module Gem - VERSION = '2.0.9' + VERSION = '2.0.10' end # Must be first since it unloads the prelude from 1.9.2 diff --git a/lib/rubygems/version.rb b/lib/rubygems/version.rb index bbf04f5403..50849857fe 100644 --- a/lib/rubygems/version.rb +++ b/lib/rubygems/version.rb @@ -148,7 +148,7 @@ class Gem::Version # FIX: These are only used once, in .correct?. Do they deserve to be # constants? VERSION_PATTERN = '[0-9]+(?>\.[0-9a-zA-Z]+)*' # :nodoc: - ANCHORED_VERSION_PATTERN = /\A\s*(#{VERSION_PATTERN})*\s*\z/ # :nodoc: + ANCHORED_VERSION_PATTERN = /\A\s*(#{VERSION_PATTERN})?\s*\z/ # :nodoc: ## # A string representation of this Version. diff --git a/test/rubygems/test_gem_requirement.rb b/test/rubygems/test_gem_requirement.rb index 1de0f41f20..01db08e84f 100644 --- a/test/rubygems/test_gem_requirement.rb +++ b/test/rubygems/test_gem_requirement.rb @@ -47,18 +47,20 @@ class TestGemRequirement < Gem::TestCase end def test_parse_bad - e = assert_raises Gem::Requirement::BadRequirementError do - Gem::Requirement.parse nil - end - - assert_equal 'Illformed requirement [nil]', e.message + [ + nil, + '', + '! 1', + '= junk', + '1..2', + ].each do |bad| + e = assert_raises Gem::Requirement::BadRequirementError do + Gem::Requirement.parse bad + end - e = assert_raises Gem::Requirement::BadRequirementError do - Gem::Requirement.parse "" + assert_equal "Illformed requirement [#{bad.inspect}]", e.message end - assert_equal 'Illformed requirement [""]', e.message - assert_equal Gem::Requirement::BadRequirementError.superclass, ArgumentError end diff --git a/test/rubygems/test_gem_version.rb b/test/rubygems/test_gem_version.rb index da3b87dbca..47759507dc 100644 --- a/test/rubygems/test_gem_version.rb +++ b/test/rubygems/test_gem_version.rb @@ -67,12 +67,18 @@ class TestGemVersion < Gem::TestCase end def test_initialize_bad - ["junk", "1.0\n2.0"].each do |bad| - e = assert_raises ArgumentError do + %W[ + junk + 1.0\n2.0 + 1..2 + 1.2\ 3.4 + 1-2-3 + ].each do |bad| + e = assert_raises ArgumentError, bad do Gem::Version.new bad end - assert_equal "Malformed version number string #{bad}", e.message + assert_equal "Malformed version number string #{bad}", e.message, bad end end @@ -1,6 +1,6 @@ #define RUBY_VERSION "2.0.0" #define RUBY_RELEASE_DATE "2013-09-27" -#define RUBY_PATCHLEVEL 320 +#define RUBY_PATCHLEVEL 321 #define RUBY_RELEASE_YEAR 2013 #define RUBY_RELEASE_MONTH 9 |