[ruby/f19] Update to Ruby 2.0.0-p353.
Vít Ondruch
vondruch at fedoraproject.org
Thu Nov 28 12:17:38 UTC 2013
commit 6feeae977a1e3eaf5beb9934edcb2db0860dcf6d
Author: Vít Ondruch <vondruch at redhat.com>
Date: Wed Nov 27 16:07:24 2013 +0100
Update to Ruby 2.0.0-p353.
- Fix heap overflow in floating point parsing (CVE-2013-4164).
.gitignore | 1 +
...d-against-OpenSSL-with-enabled-ECC-curves.patch | 85 --------------------
ruby.spec | 14 ++--
...fy-global-Specification.dirs-during-insta.patch | 3 +-
rubygems-2.0.0-Fixes-for-empty-ruby-version.patch | 49 +-----------
sources | 2 +-
6 files changed, 10 insertions(+), 144 deletions(-)
---
diff --git a/.gitignore b/.gitignore
index b883574..552398f 100644
--- a/.gitignore
+++ b/.gitignore
@@ -20,3 +20,4 @@ ruby-rev415a3ef9ab82c65a7abc-ext_tk.tar.gz
/ruby-2.0.0-p0.tar.gz
/ruby-2.0.0-p195.tar.bz2
/ruby-2.0.0-p247.tar.bz2
+/ruby-2.0.0-p353.tar.bz2
diff --git a/ruby.spec b/ruby.spec
index 9aea8a4..1887d34 100644
--- a/ruby.spec
+++ b/ruby.spec
@@ -1,7 +1,7 @@
%global major_version 2
%global minor_version 0
%global teeny_version 0
-%global patch_level 247
+%global patch_level 353
%global major_minor_version %{major_version}.%{minor_version}
@@ -26,7 +26,7 @@
%endif
-%global release 15
+%global release 16
%{!?release_string:%global release_string %{?development_release:0.}%{release}%{?development_release:.%{development_release}}%{?dist}}
%global rubygems_version 2.0.3
@@ -139,11 +139,6 @@ Patch13: rubygems-2.0.0-Do-not-modify-global-Specification.dirs-during-insta.pat
# This prevents issues, when ruby configuration specifies --with-ruby-version=''.
# https://github.com/rubygems/rubygems/pull/455
Patch14: rubygems-2.0.0-Fixes-for-empty-ruby-version.patch
-# Although this does not directly affects Fedora ATM, it might be issue when
-# rebuilding package on different platform (RHEL7). Please keep the patch until
-# it is resolved in upstream.
-# https://bugs.ruby-lang.org/issues/8384
-Patch15: ruby-2.0.0-p195-Fix-build-against-OpenSSL-with-enabled-ECC-curves.patch
# Adds aarch64 support.
# http://bugs.ruby-lang.org/issues/8331
# https://bugzilla.redhat.com/show_bug.cgi?id=926463
@@ -424,7 +419,6 @@ Tcl/Tk interface for the object-oriented scripting language Ruby.
%patch12 -p1
%patch13 -p1
%patch14 -p1
-%patch15 -p1
%patch16 -p1
%patch17 -p1
%patch18 -p1
@@ -893,6 +887,10 @@ make check TESTS="-v $DISABLE_TESTS"
%{ruby_libdir}/tkextlib
%changelog
+* Mon Nov 25 2013 Vít Ondruch <vondruch at redhat.com> - 2.0.0.353-16
+- Update to Ruby 2.0.0-p353.
+- Fix heap overflow in floating point parsing (CVE-2013-4164).
+
* Tue Jul 30 2013 Vít Ondruch <vondruch at redhat.com> - 2.0.0.247-15
- Move Psych symlinks to vendor dir, to prevent F18 -> F19 upgrade issues
(rhbz#988490).
diff --git a/rubygems-2.0.0-Do-not-modify-global-Specification.dirs-during-insta.patch b/rubygems-2.0.0-Do-not-modify-global-Specification.dirs-during-insta.patch
index 607e028..98013a7 100644
--- a/rubygems-2.0.0-Do-not-modify-global-Specification.dirs-during-insta.patch
+++ b/rubygems-2.0.0-Do-not-modify-global-Specification.dirs-during-insta.patch
@@ -44,7 +44,7 @@ diff --git a/lib/rubygems/dependency_installer.rb b/lib/rubygems/dependency_inst
index dffa8df..841f26a 100644
--- a/lib/rubygems/dependency_installer.rb
+++ b/lib/rubygems/dependency_installer.rb
-@@ -57,17 +57,14 @@ class Gem::DependencyInstaller
+@@ -57,16 +57,14 @@ class Gem::DependencyInstaller
# :build_args:: See Gem::Installer::new
def initialize(options = {})
@@ -54,7 +54,6 @@ index dffa8df..841f26a 100644
- # HACK shouldn't change the global settings, needed for -i behavior
- # maybe move to the install command? See also github #442
- Gem::Specification.dirs = @install_dir
-- Gem.ensure_gem_subdirectories @install_dir
+ Gem.ensure_gem_subdirectories options[:install_dir]
end
diff --git a/rubygems-2.0.0-Fixes-for-empty-ruby-version.patch b/rubygems-2.0.0-Fixes-for-empty-ruby-version.patch
index e443a46..365dc7b 100644
--- a/rubygems-2.0.0-Fixes-for-empty-ruby-version.patch
+++ b/rubygems-2.0.0-Fixes-for-empty-ruby-version.patch
@@ -1,7 +1,7 @@
From c9b2eff36728266052ccfff54d3ac0a0624fd0f1 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?V=C3=ADt=20Ondruch?= <vondruch at redhat.com>
Date: Thu, 14 Feb 2013 11:50:41 +0100
-Subject: [PATCH 1/2] Use File.join insteado of manual path creation.
+Subject: [PATCH] Use File.join insteado of manual path creation.
This prevents issues, when File.join in #new_default_spec removes
superfluous slashes while they are kept in expected paths. E.g. the test
@@ -32,50 +32,3 @@ index 60df53f..35c9631 100644
--
1.8.1.2
-
-From b022cef7b2e6c2d138388a6c2db02cca8c408cc6 Mon Sep 17 00:00:00 2001
-From: =?UTF-8?q?V=C3=ADt=20Ondruch?= <vondruch at redhat.com>
-Date: Thu, 14 Feb 2013 13:35:20 +0100
-Subject: [PATCH 2/2] Do not add last slash to Gem.user_dir if ruby_version
- string is empty.
-
----
- lib/rubygems/defaults.rb | 4 +++-
- test/rubygems/test_gem.rb | 6 ++++--
- 2 files changed, 7 insertions(+), 3 deletions(-)
-
-diff --git a/lib/rubygems/defaults.rb b/lib/rubygems/defaults.rb
-index ea84e5c..05c35bb 100644
---- a/lib/rubygems/defaults.rb
-+++ b/lib/rubygems/defaults.rb
-@@ -54,7 +54,9 @@ module Gem
- # Path for gems in the user's home directory
-
- def self.user_dir
-- File.join Gem.user_home, '.gem', ruby_engine, ConfigMap[:ruby_version]
-+ parts = [Gem.user_home, '.gem', ruby_engine]
-+ parts << ConfigMap[:ruby_version] unless ConfigMap[:ruby_version].empty?
-+ File.join parts
- end
-
- ##
-diff --git a/test/rubygems/test_gem.rb b/test/rubygems/test_gem.rb
-index bf77009..9ee78f7 100644
---- a/test/rubygems/test_gem.rb
-+++ b/test/rubygems/test_gem.rb
-@@ -1198,8 +1198,10 @@ class TestGem < Gem::TestCase
- end
-
- def test_self_user_dir
-- assert_equal File.join(@userhome, '.gem', Gem.ruby_engine,
-- Gem::ConfigMap[:ruby_version]), Gem.user_dir
-+ parts = [@userhome, '.gem', Gem.ruby_engine]
-+ parts << Gem::ConfigMap[:ruby_version] unless Gem::ConfigMap[:ruby_version].empty?
-+
-+ assert_equal File.join(parts), Gem.user_dir
- end
-
- def test_self_user_home
---
-1.8.1.2
-
diff --git a/sources b/sources
index 44c414b..0c071c1 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-60913f3eec0c4071f44df42600be2604 ruby-2.0.0-p247.tar.bz2
+20eb8f067d20f6b76b7e16cce2a85a55 ruby-2.0.0-p353.tar.bz2
More information about the scm-commits
mailing list