From be52f67dcb39210632ac8097cdf9dc580c84eeff Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?V=C3=ADt=20Ondruch?= Date: Fri, 18 Nov 2016 21:44:26 +0100 Subject: [PATCH] Update to Ruby 2.2.6. --- .gitignore | 1 + ...om-test-failure-introduced-by-r54698.patch | 40 ------------ ...sts-depends-on-Europe-Moscow-removed.patch | 63 ------------------- ruby.spec | 19 +++--- sources | 2 +- 5 files changed, 9 insertions(+), 116 deletions(-) delete mode 100644 ruby-2.2.6-Fix-random-test-failure-introduced-by-r54698.patch delete mode 100644 ruby-2.2.6-Tests-depends-on-Europe-Moscow-removed.patch diff --git a/.gitignore b/.gitignore index de6ff53..26786f1 100644 --- a/.gitignore +++ b/.gitignore @@ -5,3 +5,4 @@ /ruby-2.2.3.tar.xz /ruby-2.2.4.tar.xz /ruby-2.2.5.tar.xz +/ruby-2.2.6.tar.xz diff --git a/ruby-2.2.6-Fix-random-test-failure-introduced-by-r54698.patch b/ruby-2.2.6-Fix-random-test-failure-introduced-by-r54698.patch deleted file mode 100644 index 303d95c..0000000 --- a/ruby-2.2.6-Fix-random-test-failure-introduced-by-r54698.patch +++ /dev/null @@ -1,40 +0,0 @@ -From cf23ad429da3213fd3b1261c546dfa08e7dba2bf Mon Sep 17 00:00:00 2001 -From: usa -Date: Wed, 27 Apr 2016 13:17:50 +0000 -Subject: [PATCH] * compile.c (new_label_body): missed backporting r54548 in - r54698. this fixes randomly test failure introduced by r54698. cf. [Bug - #12082] - -git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_2_2@54799 b2dd03c8-39d4-4d8f-98ff-823fe69b080e ---- - ChangeLog | 6 ++++++ - compile.c | 2 ++ - 2 files changed, 8 insertions(+), 0 deletions(-) - -diff --git a/ChangeLog b/ChangeLog -index 2cfdb2c2..fe09b1e 100644 ---- a/ChangeLog -+++ b/ChangeLog -@@ -1,3 +1,9 @@ -+Wed Apr 27 22:16:04 2016 NAKAMURA Usaku -+ -+ * compile.c (new_label_body): missed backporting r54548 in r54698. -+ this fixes randomly test failure introduced by r54698. -+ cf. [Bug #12082] -+ - Fri Apr 29 20:11:38 2016 Tanaka Akira - - * test/ruby/test_time_tz.rb: Tests depends on Europe/Moscow removed -diff --git a/compile.c b/compile.c -index 001152a..cc8e748 100644 ---- a/compile.c -+++ b/compile.c -@@ -929,6 +929,8 @@ new_label_body(rb_iseq_t *iseq, long line) - labelobj->label_no = iseq->compile_data->label_no++; - labelobj->sc_state = 0; - labelobj->sp = -1; -+ labelobj->set = 0; -+ labelobj->rescued = LABEL_RESCUE_NONE; - return labelobj; - } - diff --git a/ruby-2.2.6-Tests-depends-on-Europe-Moscow-removed.patch b/ruby-2.2.6-Tests-depends-on-Europe-Moscow-removed.patch deleted file mode 100644 index a3ff8c6..0000000 --- a/ruby-2.2.6-Tests-depends-on-Europe-Moscow-removed.patch +++ /dev/null @@ -1,63 +0,0 @@ -From d16ff5c412b90b2766be97a5d3d689c5a18528d3 Mon Sep 17 00:00:00 2001 -From: usa -Date: Fri, 29 Apr 2016 11:12:17 +0000 -Subject: [PATCH] merge revision(s) 54706: - - * test/ruby/test_time_tz.rb: Tests depends on Europe/Moscow removed - to avoid test failures due to the tzdata change. - https://github.com/eggert/tz/commit/8ee11a301cf173afb0c76e0315b9f9ec8ebb9d95 - Found by naruse. - - -git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_2_2@54815 b2dd03c8-39d4-4d8f-98ff-823fe69b080e ---- - ChangeLog | 7 +++++++ - test/ruby/test_time_tz.rb | 13 ------------- - 2 files changed, 7 insertions(+), 13 deletions(-) - -diff --git a/ChangeLog b/ChangeLog -index fe09b1e..1351c74 100644 ---- a/ChangeLog -+++ b/ChangeLog -@@ -1,3 +1,10 @@ -+Fri Apr 29 20:11:38 2016 Tanaka Akira -+ -+ * test/ruby/test_time_tz.rb: Tests depends on Europe/Moscow removed -+ to avoid test failures due to the tzdata change. -+ https://github.com/eggert/tz/commit/8ee11a301cf173afb0c76e0315b9f9ec8ebb9d95 -+ Found by naruse. -+ - Tue Apr 26 13:38:31 2016 NAKAMURA Usaku - - * README.EXT{,.ja}: `nul` should be uppercase. -diff --git a/test/ruby/test_time_tz.rb b/test/ruby/test_time_tz.rb -index fb1ab9b..96a03b7 100644 ---- a/test/ruby/test_time_tz.rb -+++ b/test/ruby/test_time_tz.rb -@@ -169,13 +169,6 @@ def test_europe_lisbon - } - end if has_lisbon_tz - -- def test_europe_moscow -- with_tz(tz="Europe/Moscow") { -- assert_time_constructor(tz, "1992-03-29 00:00:00 +0400", :local, [1992,3,28,23,0,0]) -- assert_time_constructor(tz, "1992-03-29 00:59:59 +0400", :local, [1992,3,28,23,59,59]) -- } -- end -- - def test_pacific_kiritimati - with_tz(tz="Pacific/Kiritimati") { - assert_time_constructor(tz, "1994-12-31 23:59:59 -1000", :local, [1994,12,31,23,59,59]) -@@ -355,12 +348,6 @@ def self.gen_zdump_test(data) - Europe/London Sun Aug 10 01:00:00 1947 UTC = Sun Aug 10 02:00:00 1947 BST isdst=1 gmtoff=3600 - Europe/London Sun Nov 2 01:59:59 1947 UTC = Sun Nov 2 02:59:59 1947 BST isdst=1 gmtoff=3600 - Europe/London Sun Nov 2 02:00:00 1947 UTC = Sun Nov 2 02:00:00 1947 GMT isdst=0 gmtoff=0 --Europe/Moscow Sat Jan 18 23:59:59 1992 UTC = Sun Jan 19 01:59:59 1992 MSK isdst=0 gmtoff=7200 --Europe/Moscow Sun Jan 19 00:00:00 1992 UTC = Sun Jan 19 03:00:00 1992 MSK isdst=0 gmtoff=10800 --Europe/Moscow Sat Mar 28 19:59:59 1992 UTC = Sat Mar 28 22:59:59 1992 MSK isdst=0 gmtoff=10800 --Europe/Moscow Sat Mar 28 20:00:00 1992 UTC = Sun Mar 29 00:00:00 1992 MSD isdst=1 gmtoff=14400 --Europe/Moscow Sat Sep 26 18:59:59 1992 UTC = Sat Sep 26 22:59:59 1992 MSD isdst=1 gmtoff=14400 --Europe/Moscow Sat Sep 26 19:00:00 1992 UTC = Sat Sep 26 22:00:00 1992 MSK isdst=0 gmtoff=10800 - Pacific/Kiritimati Sun Jan 1 09:59:59 1995 UTC = Sat Dec 31 23:59:59 1994 LINT isdst=0 gmtoff=-36000 - Pacific/Kiritimati Sun Jan 1 10:00:00 1995 UTC = Mon Jan 2 00:00:00 1995 LINT isdst=0 gmtoff=50400 - End diff --git a/ruby.spec b/ruby.spec index 1a137b1..0087025 100644 --- a/ruby.spec +++ b/ruby.spec @@ -1,6 +1,6 @@ %global major_version 2 %global minor_version 2 -%global teeny_version 5 +%global teeny_version 6 %global major_minor_version %{major_version}.%{minor_version} %global ruby_version %{major_minor_version}.%{teeny_version} @@ -21,7 +21,7 @@ %endif -%global release 49 +%global release 50 %{!?release_string:%global release_string %{?development_release:0.}%{release}%{?development_release:.%{development_release}}%{?dist}} %global rubygems_version 2.4.5.1 @@ -115,13 +115,6 @@ Patch6: ruby-2.1.0-Allow-to-specify-additional-preludes-by-configuratio.patch # Use miniruby to regenerate prelude.c. # https://bugs.ruby-lang.org/issues/10554 Patch7: ruby-2.2.3-Generate-preludes-using-miniruby.patch -# Ignore Europe/Moscow TZ test, which fails due to change in tzdata. -# https://github.com/ruby/ruby/commit/d16ff5c412b90b2766be97a5d3d689c5a18528d3 -Patch8: ruby-2.2.6-Tests-depends-on-Europe-Moscow-removed.patch -# Fixes random TestRubyOptimization#test_tailcall_inhibited_by_rescue test -# suite failures. -# https://github.com/ruby/ruby/commit/cf23ad429da3213fd3b1261c546dfa08e7dba2bf -Patch9: ruby-2.2.6-Fix-random-test-failure-introduced-by-r54698.patch Requires: %{name}-libs%{?_isa} = %{version}-%{release} Requires: ruby(rubygems) >= %{rubygems_version} @@ -423,8 +416,6 @@ rm -rf ext/fiddle/libffi* %patch5 -p1 %patch6 -p1 %patch7 -p1 -%patch8 -p1 -%patch9 -p1 # Provide an example of usage of the tapset: cp -a %{SOURCE3} . @@ -484,7 +475,8 @@ for cert in \ EntrustnetSecureServerCertificationAuthority.pem \ GeoTrustGlobalCA.pem \ AddTrustExternalCARoot.pem \ - AddTrustExternalCARoot-2048.pem + AddTrustExternalCARoot-2048.pem \ + GlobalSignRootCA.pem do rm %{buildroot}%{rubygems_dir}/rubygems/ssl_certs/$cert done @@ -906,6 +898,9 @@ make check TESTS="-v $DISABLE_TESTS" %{ruby_libdir}/tkextlib %changelog +* Fri Nov 18 2016 Vít Ondruch - 2.2.6-50 +- Update to Ruby 2.2.6. + * Tue Jul 12 2016 Vít Ondruch - 2.2.5-49 - Make symlinks for json gem. diff --git a/sources b/sources index fffe26d..add4b51 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -4b9506c37e908b5b17215b66b2760438 ruby-2.2.5.tar.xz +7aa1c8021ba811fa75b733f698bd937e ruby-2.2.6.tar.xz