summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--ChangeLog9
-rw-r--r--NEWS4
-rw-r--r--lib/rubygems.rb4
-rw-r--r--lib/rubygems/version.rb2
-rw-r--r--version.h6
5 files changed, 18 insertions, 7 deletions
diff --git a/ChangeLog b/ChangeLog
index 198f520daa..0118540a92 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,10 @@
+Sat Sep 14 00:01:20 2013 CHIKANAGA Tomoyuki <nagachika@ruby-lang.org>
+
+ * lib/rubygems: Update to RubyGems to 2.0.8. [ruby-core:57155]
+ [Backport #8900]
+ the patch is provided by drbrain (Eric Hodel).
+ this update contains a security fix for CVE-2013-4287.
+
Fri Sep 13 23:20:29 2013 Kenichi Kamiya <kachick1@gmail.com>
* object.c (Init_Object): undef Module#prepend_features on Class, as
@@ -136,7 +143,7 @@ Sat Aug 17 00:36:24 2013 Charlie Somerville <charliesome@ruby-lang.org>
Sat Aug 17 00:32:17 2013 CHIKANAGA Tomoyuki <nagachika@ruby-lang.org>
- * lib/rubygems: update to RubyGems 2.0.6. the patch by drbrain.
+ * lib/rubygems: update to RubyGems 2.0.7. the patch by drbrain.
[ruby-core:56633] [Backport #8787]
Sat Aug 10 23:59:47 2013 NAKAMURA Usaku <usa@ruby-lang.org>
diff --git a/NEWS b/NEWS
index 5e0c0585a2..c2547ee4c9 100644
--- a/NEWS
+++ b/NEWS
@@ -461,6 +461,10 @@ with all sufficient information, see the ChangeLog file.
XML declaration is used for XML document encoding.
* RubyGems
+ * Updated to 2.0.8. This fixes CVE-2013-4287:
+
+ http://rubygems.rubyforge.org/rubygems-update/CVE-2013-4287_txt.html
+
* Updated to 2.0.3. See
http://rubygems.rubyforge.org/rubygems-update/History_txt.html#label-2.0.3+%2F+2012-03-1
for release notes.
diff --git a/lib/rubygems.rb b/lib/rubygems.rb
index 5a3a3a1846..78bdc4867d 100644
--- a/lib/rubygems.rb
+++ b/lib/rubygems.rb
@@ -8,7 +8,7 @@
require 'rbconfig'
module Gem
- VERSION = '2.0.7'
+ VERSION = '2.0.8'
end
# Must be first since it unloads the prelude from 1.9.2
@@ -307,7 +307,7 @@ module Gem
@paths = nil
@user_home = nil
Gem::Specification.reset
- Gem::Security.reset if const_defined? :Security
+ Gem::Security.reset if defined?(Gem::Security)
end
##
diff --git a/lib/rubygems/version.rb b/lib/rubygems/version.rb
index e983751c17..bbf04f5403 100644
--- a/lib/rubygems/version.rb
+++ b/lib/rubygems/version.rb
@@ -147,7 +147,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:
+ VERSION_PATTERN = '[0-9]+(?>\.[0-9a-zA-Z]+)*' # :nodoc:
ANCHORED_VERSION_PATTERN = /\A\s*(#{VERSION_PATTERN})*\s*\z/ # :nodoc:
##
diff --git a/version.h b/version.h
index d14f291176..74a1395a19 100644
--- a/version.h
+++ b/version.h
@@ -1,10 +1,10 @@
#define RUBY_VERSION "2.0.0"
-#define RUBY_RELEASE_DATE "2013-09-13"
-#define RUBY_PATCHLEVEL 312
+#define RUBY_RELEASE_DATE "2013-09-14"
+#define RUBY_PATCHLEVEL 313
#define RUBY_RELEASE_YEAR 2013
#define RUBY_RELEASE_MONTH 9
-#define RUBY_RELEASE_DAY 13
+#define RUBY_RELEASE_DAY 14
#include "ruby/version.h"