Update to Ruby 2.0.0-p247 (rhbz#979605).

Fix CVE-2013-4073.
Fix for wrong makefiles created by mkmf (rhbz#921650).
This commit is contained in:
Vít Ondruch 2013-07-01 12:03:01 +02:00
parent 63dd7b41ef
commit 26512adf37
4 changed files with 9 additions and 31 deletions

1
.gitignore vendored
View File

@ -19,3 +19,4 @@ ruby-rev415a3ef9ab82c65a7abc-ext_tk.tar.gz
/ruby-2.0.0-r39387.tar.gz /ruby-2.0.0-r39387.tar.gz
/ruby-2.0.0-p0.tar.gz /ruby-2.0.0-p0.tar.gz
/ruby-2.0.0-p195.tar.bz2 /ruby-2.0.0-p195.tar.bz2
/ruby-2.0.0-p247.tar.bz2

View File

@ -1,25 +0,0 @@
From d006c4d04aecbe80469a26a6114b776e9de4e3c8 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?V=C3=ADt=20Ondruch?= <vondruch@redhat.com>
Date: Mon, 19 Nov 2012 14:39:19 +0100
Subject: [PATCH] Fix s390x build.
---
ext/tk/extconf.rb | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/ext/tk/extconf.rb b/ext/tk/extconf.rb
index 8f3bff8..69e90a1 100644
--- a/ext/tk/extconf.rb
+++ b/ext/tk/extconf.rb
@@ -114,7 +114,7 @@ def is_macosx?
end
def maybe_64bit?
- /64|universal/ =~ RUBY_PLATFORM
+ /64|universal|s390x/ =~ RUBY_PLATFORM
end
def check_tcltk_version(version)
--
1.8.1

View File

@ -1,7 +1,7 @@
%global major_version 2 %global major_version 2
%global minor_version 0 %global minor_version 0
%global teeny_version 0 %global teeny_version 0
%global patch_level 195 %global patch_level 247
%global major_minor_version %{major_version}.%{minor_version} %global major_minor_version %{major_version}.%{minor_version}
@ -26,7 +26,7 @@
%endif %endif
%global release 8 %global release 9
%{!?release_string:%global release_string %{?development_release:0.}%{release}%{?development_release:.%{development_release}}%{?dist}} %{!?release_string:%global release_string %{?development_release:0.}%{release}%{?development_release:.%{development_release}}%{?dist}}
%global rubygems_version 2.0.2 %global rubygems_version 2.0.2
@ -111,8 +111,6 @@ Patch0: ruby-2.0.0-Prevent-duplicated-paths-when-empty-version-string-i.patch
# Force multiarch directories for i.86 to be always named i386. This solves # Force multiarch directories for i.86 to be always named i386. This solves
# some differencies in build between Fedora and RHEL. # some differencies in build between Fedora and RHEL.
Patch3: ruby-1.9.3-always-use-i386.patch Patch3: ruby-1.9.3-always-use-i386.patch
# http://redmine.ruby-lang.org/issues/5465
Patch4: ruby-1.9.3-fix-s390x-build.patch
# Fixes random WEBRick test failures. # Fixes random WEBRick test failures.
# https://bugs.ruby-lang.org/issues/6573. # https://bugs.ruby-lang.org/issues/6573.
Patch5: ruby-1.9.3.p195-fix-webrick-tests.patch Patch5: ruby-1.9.3.p195-fix-webrick-tests.patch
@ -402,7 +400,6 @@ Tcl/Tk interface for the object-oriented scripting language Ruby.
%patch0 -p1 %patch0 -p1
%patch3 -p1 %patch3 -p1
%patch4 -p1
%patch5 -p1 %patch5 -p1
%patch8 -p1 %patch8 -p1
%patch9 -p1 %patch9 -p1
@ -854,6 +851,11 @@ make check TESTS="-v $DISABLE_TESTS"
%{ruby_libdir}/tkextlib %{ruby_libdir}/tkextlib
%changelog %changelog
* Mon Jul 01 2013 Vít Ondruch <vondruch@redhat.com> - 2.0.0.247-9
- Update to Ruby 2.0.0-p247 (rhbz#979605).
- Fix CVE-2013-4073.
- Fix for wrong makefiles created by mkmf (rhbz#921650).
* Fri May 17 2013 Vít Ondruch <vondruch@redhat.com> - 2.0.0.195-8 * Fri May 17 2013 Vít Ondruch <vondruch@redhat.com> - 2.0.0.195-8
- Update to Ruby 2.0.0-p195 (rhbz#917374). - Update to Ruby 2.0.0-p195 (rhbz#917374).
- Fix object taint bypassing in DL and Fiddle (CVE-2013-2065). - Fix object taint bypassing in DL and Fiddle (CVE-2013-2065).

View File

@ -1 +1 @@
2f54faea6ee1ca500632ec3c0cb59cb6 ruby-2.0.0-p195.tar.bz2 60913f3eec0c4071f44df42600be2604 ruby-2.0.0-p247.tar.bz2