diff --git a/ruby-2.1.2-p79-hash.c-extra-states.patch b/ruby-2.1.2-p79-hash.c-extra-states.patch new file mode 100644 index 0000000..834bb4c --- /dev/null +++ b/ruby-2.1.2-p79-hash.c-extra-states.patch @@ -0,0 +1,33 @@ +From d5c45b5fb11748acbfc9ee6c7dbfeb04408de53d Mon Sep 17 00:00:00 2001 +From: naruse +Date: Sat, 1 Mar 2014 09:02:36 +0000 +Subject: [PATCH] merge revision(s) 44370: [Backport #9576] + + hash.c: extra states + + * hash.c (rb_hash_reject): use words "extra states". + + +git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_2_1@45227 b2dd03c8-39d4-4d8f-98ff-823fe69b080e +--- + hash.c | 2 +- + 1 files changed, 1 insertions(+), 1 deletions(-) + +diff --git a/hash.c b/hash.c +index 66cd94b..9a5814a 100644 +--- a/hash.c ++++ b/hash.c +@@ -1178,7 +1178,7 @@ struct shift_var { + #endif + } + } +-#if HASH_REJECT_COPY_MISC_ATTRIBUTES ++#if HASH_REJECT_COPY_EXTRA_STATES + result = rb_hash_dup_empty(hash); + #else + result = rb_hash_new(); +diff --git a/version.h b/version.h +index 8c8f900..59c80e3 100644 +-- +1.9.1 + diff --git a/ruby.spec b/ruby.spec index 4744e93..11d9a6d 100644 --- a/ruby.spec +++ b/ruby.spec @@ -139,6 +139,8 @@ Patch12: ruby-1.9.3-mkmf-verbose.patch # in support for ABRT. # http://bugs.ruby-lang.org/issues/8566 Patch17: ruby-2.1.0-Allow-to-specify-additional-preludes-by-configuratio.patch +# https://www.ruby-lang.org/en/news/2014/03/10/regression-of-hash-reject-in-ruby-2-1-1/ +Patch18: ruby-2.1.2-p79-hash.c-extra-states.patch Requires: %{name}-libs%{?_isa} = %{version}-%{release} Requires: ruby(rubygems) >= %{rubygems_version} @@ -399,6 +401,7 @@ Tcl/Tk interface for the object-oriented scripting language Ruby. %patch8 -p1 %patch12 -p1 %patch17 -p1 +%patch18 -p1 # Provide an example of usage of the tapset: cp -a %{SOURCE3} . @@ -881,8 +884,9 @@ OPENSSL_ENABLE_MD5_VERIFY=1 make check TESTS="-v $DISABLE_TESTS" %{ruby_libdir}/tkextlib %changelog -* Wed Mar 05 2014 Vít Ondruch - 2.1.1-18 +* Tue Apr 08 2014 Vít Ondruch - 2.1.1-18 - Update to Ruby 2.1.1. +- Revert regression of Hash#reject. * Mon Mar 03 2014 Vít Ondruch - 2.1.0-19 - Add RPM dependency generators for RubyGems.