#16 WIP: Update to Ruby 2.5.1.
Closed 3 years ago by vondruch. Opened 3 years ago by pvalena.
rpms/ pvalena/ruby rebase  into  master

@@ -39,7 +39,7 @@ 

  index 028ef7ca3e..cdeff87871 100644

  --- a/configure.ac

  +++ b/configure.ac

- @@ -4395,6 +4395,13 @@ AC_SUBST(rubyarchhdrdir)dnl

+ @@ -4396,6 +4396,13 @@ AC_SUBST(rubyarchhdrdir)dnl

   AC_SUBST(sitearchhdrdir)dnl

   AC_SUBST(vendorarchhdrdir)dnl

   

@@ -11,7 +11,7 @@ 

  index 11fc237552..b77e88fc37 100644

  --- a/configure.ac

  +++ b/configure.ac

- @@ -3640,6 +3640,11 @@ AS_IF([test ${multiarch+set}], [

+ @@ -3641,6 +3641,11 @@ AS_IF([test ${multiarch+set}], [

   ])

   

   archlibdir='${libdir}/${arch}'

@@ -14,7 +14,7 @@ 

  index 999e2d6d5d..11fc237552 100644

  --- a/configure.ac

  +++ b/configure.ac

- @@ -4250,7 +4250,8 @@ AS_CASE(["$ruby_version_dir_name"],

+ @@ -4251,7 +4251,8 @@ AS_CASE(["$ruby_version_dir_name"],

   ruby_version_dir=/'${ruby_version_dir_name}'

   

   if test -z "${ruby_version_dir_name}"; then

@@ -11,7 +11,7 @@ 

  index b77e88fc37..6bba453e3c 100644

  --- a/configure.ac

  +++ b/configure.ac

- @@ -4314,6 +4314,8 @@ AC_SUBST(vendorarchdir)dnl

+ @@ -4315,6 +4315,8 @@ AC_SUBST(vendorarchdir)dnl

   AC_SUBST(CONFIGURE, "`echo $0 | sed 's|.*/||'`")dnl

   AC_SUBST(configure_args, "`echo "${ac_configure_args}" | sed 's/\\$/$$/g'`")dnl

   

@@ -15,7 +15,7 @@ 

  index 6bba453e3c..028ef7ca3e 100644

  --- a/configure.ac

  +++ b/configure.ac

- @@ -4286,6 +4286,10 @@ AC_ARG_WITH(vendorarchdir,

+ @@ -4287,6 +4287,10 @@ AC_ARG_WITH(vendorarchdir,

               [vendorarchdir=$withval],

               [vendorarchdir=${multiarch+'${rubysitearchprefix}/vendor_ruby'${ruby_version_dir}}${multiarch-'${vendorlibdir}/${sitearch}'}])

   
@@ -26,7 +26,7 @@ 

   AS_IF([test "${LOAD_RELATIVE+set}"], [

       AC_DEFINE_UNQUOTED(LOAD_RELATIVE, $LOAD_RELATIVE)

       RUBY_EXEC_PREFIX=''

- @@ -4310,6 +4314,7 @@ AC_SUBST(sitearchdir)dnl

+ @@ -4311,6 +4315,7 @@ AC_SUBST(sitearchdir)dnl

   AC_SUBST(vendordir)dnl

   AC_SUBST(vendorlibdir)dnl

   AC_SUBST(vendorarchdir)dnl

@@ -20,7 +20,7 @@ 

  index 8ea969412f..a00f2b6776 100644

  --- a/configure.ac

  +++ b/configure.ac

- @@ -4201,9 +4201,6 @@ AS_CASE(["$target_os"],

+ @@ -4202,9 +4202,6 @@ AS_CASE(["$target_os"],

       rubyw_install_name='$(RUBYW_INSTALL_NAME)'

       ])

   
@@ -30,7 +30,7 @@ 

   rubyarchprefix=${multiarch+'${archlibdir}/${RUBY_BASE_NAME}'}${multiarch-'${rubylibprefix}/${arch}'}

   AC_ARG_WITH(rubyarchprefix,

   	    AS_HELP_STRING([--with-rubyarchprefix=DIR],

- @@ -4226,56 +4223,62 @@ AC_ARG_WITH(ridir,

+ @@ -4227,56 +4224,62 @@ AC_ARG_WITH(ridir,

   AC_SUBST(ridir)

   AC_SUBST(RI_BASE_NAME)

   
@@ -120,7 +120,7 @@ 

   

   AS_IF([test "${LOAD_RELATIVE+set}"], [

       AC_DEFINE_UNQUOTED(LOAD_RELATIVE, $LOAD_RELATIVE)

- @@ -4292,6 +4295,7 @@ AC_SUBST(sitearchincludedir)dnl

+ @@ -4293,6 +4296,7 @@ AC_SUBST(sitearchincludedir)dnl

   AC_SUBST(arch)dnl

   AC_SUBST(sitearch)dnl

   AC_SUBST(ruby_version)dnl

@@ -1,30 +0,0 @@ 

- diff --git a/test/ruby/test_time_tz.rb b/test/ruby/test_time_tz.rb

- index 20a57fe7dd..5b9e5a8bde 100644

- --- a/test/ruby/test_time_tz.rb

- +++ b/test/ruby/test_time_tz.rb

- @@ -126,8 +126,8 @@ def test_asia_singapore

-  

-    def test_asia_tokyo

-      with_tz(tz="Asia/Tokyo") {

- -      assert_time_constructor(tz, "1951-05-06 03:00:00 +1000", :local, [1951,5,6,2,0,0])

- -      assert_time_constructor(tz, "1951-05-06 03:59:59 +1000", :local, [1951,5,6,2,59,59])

- +#      assert_time_constructor(tz, "1951-05-06 03:00:00 +1000", :local, [1951,5,6,2,0,0])

- +#      assert_time_constructor(tz, "1951-05-06 03:59:59 +1000", :local, [1951,5,6,2,59,59])

-        assert_time_constructor(tz, "2010-06-10 06:13:28 +0900", :local, [2010,6,10,6,13,28])

-      }

-    end

- @@ -329,10 +329,10 @@ def self.gen_zdump_test(data)

-  Asia/Singapore  Sun Aug  8 16:30:00 1965 UTC = Mon Aug  9 00:00:00 1965 SGT isdst=0 gmtoff=27000

-  Asia/Singapore  Thu Dec 31 16:29:59 1981 UTC = Thu Dec 31 23:59:59 1981 SGT isdst=0 gmtoff=27000

-  Asia/Singapore  Thu Dec 31 16:30:00 1981 UTC = Fri Jan  1 00:30:00 1982 SGT isdst=0 gmtoff=28800

- -Asia/Tokyo  Sat May  5 16:59:59 1951 UTC = Sun May  6 01:59:59 1951 JST isdst=0 gmtoff=32400

- -Asia/Tokyo  Sat May  5 17:00:00 1951 UTC = Sun May  6 03:00:00 1951 JDT isdst=1 gmtoff=36000

- -Asia/Tokyo  Fri Sep  7 15:59:59 1951 UTC = Sat Sep  8 01:59:59 1951 JDT isdst=1 gmtoff=36000

- -Asia/Tokyo  Fri Sep  7 16:00:00 1951 UTC = Sat Sep  8 01:00:00 1951 JST isdst=0 gmtoff=32400

- +#Asia/Tokyo  Sat May  5 16:59:59 1951 UTC = Sun May  6 01:59:59 1951 JST isdst=0 gmtoff=32400

- +#Asia/Tokyo  Sat May  5 17:00:00 1951 UTC = Sun May  6 03:00:00 1951 JDT isdst=1 gmtoff=36000

- +#Asia/Tokyo  Fri Sep  7 15:59:59 1951 UTC = Sat Sep  8 01:59:59 1951 JDT isdst=1 gmtoff=36000

- +#Asia/Tokyo  Fri Sep  7 16:00:00 1951 UTC = Sat Sep  8 01:00:00 1951 JST isdst=0 gmtoff=32400

-  America/St_Johns  Sun Mar 11 03:30:59 2007 UTC = Sun Mar 11 00:00:59 2007 NST isdst=0 gmtoff=-12600

-  America/St_Johns  Sun Mar 11 03:31:00 2007 UTC = Sun Mar 11 01:01:00 2007 NDT isdst=1 gmtoff=-9000

-  America/St_Johns  Sun Nov  4 02:30:59 2007 UTC = Sun Nov  4 00:00:59 2007 NDT isdst=1 gmtoff=-9000

@@ -1,80 +0,0 @@ 

- From: nobu <nobu@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>

- Date: Sun, 31 Dec 2017 11:25:38 +0000

- Subject: [PATCH] parse.y: assignable_error

- 

- * parse.y (assignable_gen): should return valid NODE always even

-   on errors.  [ruby-core:84565] [Bug #14261]

- 

- git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@61523 b2dd03c8-39d4-4d8f-98ff-823fe69b080e

- ---

-  parse.c                 | 14 ++++----------

-  test/ruby/test_parse.rb |  6 ++++++

-  2 files changed, 10 insertions(+), 10 deletions(-)

- 

- diff --git a/parse.c b/parse.c

- index 08c3461f7096..c260a046dc33 100644

- --- a/parse.c

- +++ b/parse.c

- @@ -6593,10 +6593,6 @@

-  #line 1984 "parse.y" /* yacc.c:1646  */

-      {

-  			(yyval.node) = assignable(var_field((yyvsp[0].id)), 0, &(yyloc));

- -		    /*%%%*/

- -			if (!(yyval.node)) (yyval.node) = new_begin(0, &(yyloc));

- -		    /*%

- -		    %*/

-  		    }

-  #line 6598 "parse.c" /* yacc.c:1646  */

-      break;

- @@ -6605,10 +6601,6 @@

-  #line 1992 "parse.y" /* yacc.c:1646  */

-      {

-  			(yyval.node) = assignable(var_field((yyvsp[0].id)), 0, &(yyloc));

- -		    /*%%%*/

- -			if (!(yyval.node)) (yyval.node) = new_begin(0, &(yyloc));

- -		    /*%

- -		    %*/

-  		    }

-  #line 6610 "parse.c" /* yacc.c:1646  */

-      break;

- @@ -16034,11 +16026,13 @@

-  #ifdef RIPPER

-      ID id = get_id(lhs);

-  # define assignable_result(x) (lhs)

- +# define assignable_error() (lhs)

-  # define parser_yyerror(parser, x) (lhs = assign_error_gen(parser, lhs))

-  #else

-  # define assignable_result(x) assignable_result0(x, location)

- +# define assignable_error() new_begin(0, location)

-  #endif

- -    if (!id) return assignable_result(0);

- +    if (!id) return assignable_error();

-      switch (id) {

-        case keyword_self:

-  	yyerror0("Can't change the value of self");

- @@ -16101,7 +16095,7 @@

-  	compile_error(PARSER_ARG "identifier %"PRIsVALUE" is not valid to set", rb_id2str(id));

-      }

-    error:

- -    return assignable_result(0);

- +    return assignable_error();

-  #undef assignable_result

-  #undef parser_yyerror

-  }

- diff --git a/test/ruby/test_parse.rb b/test/ruby/test_parse.rb

- index e26bcdc07e19..15c6245bac2e 100644

- --- a/test/ruby/test_parse.rb

- +++ b/test/ruby/test_parse.rb

- @@ -746,6 +746,12 @@ def foo

-          end

-        END

-      end

- +    assert_raise(SyntaxError) do

- +      eval "#{<<~"begin;"}\n#{<<~'end;'}", nil, __FILE__, __LINE__+1

- +      begin;

- +        x, true

- +      end;

- +    end

-    end

-  

-    def test_block_dup

@@ -1,602 +0,0 @@ 

- From 4663c224fa6c925ce54af32fd1c1cbac9508f5ec Mon Sep 17 00:00:00 2001

- From: normal <normal@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>

- Date: Tue, 13 Feb 2018 10:02:07 +0000

- Subject: [PATCH] st.c: retry operations if rebuilt

- 

- Calling the .eql? and .hash methods during a Hash operation can

- result in a thread switch or a signal handler to run: allowing

- one execution context to rebuild the hash table while another is

- still reading or writing the table.  This results in a

- use-after-free bug affecting the thread_safe-0.3.6 test suite

- and likely other bugs.

- 

- This bug did not affect users of commonly keys (String, Symbol,

- Fixnum) as those are optimized to avoid method dispatch

- for .eql? and .hash methods.

- 

- A separate version of this change needs to be ported to Ruby 2.3.x

- which had a different implementation of st.c but was affected

- by the same bug.

- 

- * st.c: Add comment about table rebuilding during comparison.

-   (DO_PTR_EQUAL_CHECK): New macro.

-   (REBUILT_TABLE_ENTRY_IND, REBUILT_TABLE_BIN_IND): New macros.

-   (find_entry, find_table_entry_ind, find_table_bin_ind): Use new

-   macros.  Return the rebuild flag.

-   (find_table_bin_ptr_and_reserve): Ditto.

-   (st_lookup, st_get_key, st_insert, st_insert2): Retry the

-   operation if the table was rebuilt.

-   (st_general_delete, st_shift, st_update, st_general_foreach):

-   Ditto.

-   (st_rehash_linear, st_rehash_indexed): Use DO_PTR_EQUAL_CHECK.

-   Return the rebuild flag.

-   (st_rehash): Retry the operation if the table was rebuilt.

-   [ruby-core:85510] [Ruby trunk Bug#14357]

- 

- Thanks to Vit Ondruch for reporting the bug.

- 

- From: Vladimir Makarov <vmakarov@redhat.com>

- 

- git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@62396 b2dd03c8-39d4-4d8f-98ff-823fe69b080e

- ---

-  st.c | 258 ++++++++++++++++++++++++++++++++++++++++++++++++-------------------

-  1 file changed, 185 insertions(+), 73 deletions(-)

- 

- diff --git a/st.c b/st.c

- index 56ae30ce47..0c52e7a2ef 100644

- --- a/st.c

- +++ b/st.c

- @@ -90,6 +90,11 @@

-     o To save more memory we use 8-, 16-, 32- and 64- bit indexes in

-       bins depending on the current hash table size.

-  

- +   o The implementation takes into account that the table can be

- +     rebuilt during hashing or comparison functions.  It can happen if

- +     the functions are implemented in Ruby and a thread switch occurs

- +     during their execution.

- +

-     This implementation speeds up the Ruby hash table benchmarks in

-     average by more 40% on Intel Haswell CPU.

-  

- @@ -174,6 +179,15 @@ static const struct st_hash_type type_strcasehash = {

-  #define PTR_EQUAL(tab, ptr, hash_val, key_) \

-      ((ptr)->hash == (hash_val) && EQUAL((tab), (key_), (ptr)->key))

-  

- +/* As PRT_EQUAL only its result is returned in RES.  REBUILT_P is set

- +   up to TRUE if the table is rebuilt during the comparison.  */

- +#define DO_PTR_EQUAL_CHECK(tab, ptr, hash_val, key, res, rebuilt_p) \

- +    do {							    \

- +	unsigned int _old_rebuilds_num = (tab)->rebuilds_num;       \

- +	res = PTR_EQUAL(tab, ptr, hash_val, key);		    \

- +	rebuilt_p = _old_rebuilds_num != (tab)->rebuilds_num;	    \

- +    } while (FALSE)

- +

-  /* Features of a table.  */

-  struct st_features {

-      /* Power of 2 used for number of allocated entries.  */

- @@ -380,6 +394,11 @@ set_bin(st_index_t *bins, int s, st_index_t n, st_index_t v)

-  #define UNDEFINED_ENTRY_IND (~(st_index_t) 0)

-  #define UNDEFINED_BIN_IND (~(st_index_t) 0)

-  

- +/* Entry and bin values returned when we found a table rebuild during

- +   the search.  */

- +#define REBUILT_TABLE_ENTRY_IND (~(st_index_t) 1)

- +#define REBUILT_TABLE_BIN_IND (~(st_index_t) 1)

- +

-  /* Mark I-th bin of table TAB as corresponding to a deleted table

-     entry.  Update number of entries in the table and number of bins

-     corresponding to deleted entries. */

- @@ -823,17 +842,22 @@ secondary_hash(st_index_t ind, st_table *tab, st_index_t *perterb)

-  

-  /* Find an entry with HASH_VALUE and KEY in TABLE using a linear

-     search.  Return the index of the found entry in array `entries`.

- -   If it is not found, return UNDEFINED_ENTRY_IND.  */

- +   If it is not found, return UNDEFINED_ENTRY_IND.  If the table was

- +   rebuilt during the search, return REBUILT_TABLE_ENTRY_IND.  */

-  static inline st_index_t

-  find_entry(st_table *tab, st_hash_t hash_value, st_data_t key)

-  {

- +    int eq_p, rebuilt_p;

-      st_index_t i, bound;

-      st_table_entry *entries;

-  

-      bound = tab->entries_bound;

-      entries = tab->entries;

-      for (i = tab->entries_start; i < bound; i++) {

- -	if (PTR_EQUAL(tab, &entries[i], hash_value, key))

- +	DO_PTR_EQUAL_CHECK(tab, &entries[i], hash_value, key, eq_p, rebuilt_p);

- +	if (EXPECT(rebuilt_p, 0))

- +	    return REBUILT_TABLE_ENTRY_IND;

- +	if (eq_p)

-  	    return i;

-      }

-      return UNDEFINED_ENTRY_IND;

- @@ -845,10 +869,12 @@ find_entry(st_table *tab, st_hash_t hash_value, st_data_t key)

-  /*#define QUADRATIC_PROBE*/

-  

-  /* Return index of entry with HASH_VALUE and KEY in table TAB.  If

- -   there is no such entry, return UNDEFINED_ENTRY_IND.  */

- +   there is no such entry, return UNDEFINED_ENTRY_IND.  If the table

- +   was rebuilt during the search, return REBUILT_TABLE_ENTRY_IND.  */

-  static st_index_t

-  find_table_entry_ind(st_table *tab, st_hash_t hash_value, st_data_t key)

-  {

- +    int eq_p, rebuilt_p;

-      st_index_t ind;

-  #ifdef QUADRATIC_PROBE

-      st_index_t d;

- @@ -869,10 +895,13 @@ find_table_entry_ind(st_table *tab, st_hash_t hash_value, st_data_t key)

-      FOUND_BIN;

-      for (;;) {

-          bin = get_bin(tab->bins, get_size_ind(tab), ind);

- -        if (! EMPTY_OR_DELETED_BIN_P(bin)

- -            && PTR_EQUAL(tab, &entries[bin - ENTRY_BASE], hash_value, key))

- -            break;

- -        else if (EMPTY_BIN_P(bin))

- +        if (! EMPTY_OR_DELETED_BIN_P(bin)) {

- +	    DO_PTR_EQUAL_CHECK(tab, &entries[bin - ENTRY_BASE], hash_value, key, eq_p, rebuilt_p);

- +	    if (EXPECT(rebuilt_p, 0))

- +		return REBUILT_TABLE_ENTRY_IND;

- +	    if (eq_p)

- +		break;

- +	} else if (EMPTY_BIN_P(bin))

-              return UNDEFINED_ENTRY_IND;

-  #ifdef QUADRATIC_PROBE

-  	ind = hash_bin(ind + d, tab);

- @@ -887,10 +916,12 @@ find_table_entry_ind(st_table *tab, st_hash_t hash_value, st_data_t key)

-  

-  /* Find and return index of table TAB bin corresponding to an entry

-     with HASH_VALUE and KEY.  If there is no such bin, return

- -   UNDEFINED_BIN_IND.  */

- +   UNDEFINED_BIN_IND.  If the table was rebuilt during the search,

- +   return REBUILT_TABLE_BIN_IND.  */

-  static st_index_t

-  find_table_bin_ind(st_table *tab, st_hash_t hash_value, st_data_t key)

-  {

- +    int eq_p, rebuilt_p;

-      st_index_t ind;

-  #ifdef QUADRATIC_PROBE

-      st_index_t d;

- @@ -911,10 +942,13 @@ find_table_bin_ind(st_table *tab, st_hash_t hash_value, st_data_t key)

-      FOUND_BIN;

-      for (;;) {

-          bin = get_bin(tab->bins, get_size_ind(tab), ind);

- -        if (! EMPTY_OR_DELETED_BIN_P(bin)

- -            && PTR_EQUAL(tab, &entries[bin - ENTRY_BASE], hash_value, key))

- -            break;

- -        else if (EMPTY_BIN_P(bin))

- +        if (! EMPTY_OR_DELETED_BIN_P(bin)) {

- +	    DO_PTR_EQUAL_CHECK(tab, &entries[bin - ENTRY_BASE], hash_value, key, eq_p, rebuilt_p);

- +	    if (EXPECT(rebuilt_p, 0))

- +		return REBUILT_TABLE_BIN_IND;

- +	    if (eq_p)

- +		break;

- +	} else if (EMPTY_BIN_P(bin))

-              return UNDEFINED_BIN_IND;

-  #ifdef QUADRATIC_PROBE

-  	ind = hash_bin(ind + d, tab);

- @@ -955,7 +989,7 @@ find_table_bin_ind_direct(st_table *tab, st_hash_t hash_value, st_data_t key)

-          bin = get_bin(tab->bins, get_size_ind(tab), ind);

-          if (EMPTY_OR_DELETED_BIN_P(bin))

-  	    return ind;

- -	st_assert (! PTR_EQUAL(tab, &entries[bin - ENTRY_BASE], hash_value, key));

- +	st_assert (entries[bin - ENTRY_BASE].hash != hash_value);

-  #ifdef QUADRATIC_PROBE

-  	ind = hash_bin(ind + d, tab);

-  	d++;

- @@ -973,11 +1007,13 @@ find_table_bin_ind_direct(st_table *tab, st_hash_t hash_value, st_data_t key)

-     bigger entries array.  Although we can reuse a deleted bin, the

-     result bin value is always empty if the table has no entry with

-     KEY.  Return the entries array index of the found entry or

- -   UNDEFINED_ENTRY_IND if it is not found.  */

- +   UNDEFINED_ENTRY_IND if it is not found.  If the table was rebuilt

- +   during the search, return REBUILT_TABLE_ENTRY_IND.  */

-  static st_index_t

-  find_table_bin_ptr_and_reserve(st_table *tab, st_hash_t *hash_value,

-  			       st_data_t key, st_index_t *bin_ind)

-  {

- +    int eq_p, rebuilt_p;

-      st_index_t ind;

-      st_hash_t curr_hash_value = *hash_value;

-  #ifdef QUADRATIC_PROBE

- @@ -1015,7 +1051,10 @@ find_table_bin_ptr_and_reserve(st_table *tab, st_hash_t *hash_value,

-              break;

-  	}

-  	else if (! DELETED_BIN_P(entry_index)) {

- -            if (PTR_EQUAL(tab, &entries[entry_index - ENTRY_BASE], curr_hash_value, key))

- +	    DO_PTR_EQUAL_CHECK(tab, &entries[entry_index - ENTRY_BASE], curr_hash_value, key, eq_p, rebuilt_p);

- +	    if (EXPECT(rebuilt_p, 0))

- +		return REBUILT_TABLE_ENTRY_IND;

- +            if (eq_p)

-                  break;

-  	}

-  	else if (first_deleted_bin_ind == UNDEFINED_BIN_IND)

- @@ -1040,13 +1079,18 @@ st_lookup(st_table *tab, st_data_t key, st_data_t *value)

-      st_index_t bin;

-      st_hash_t hash = do_hash(key, tab);

-  

- + retry:

-      if (tab->bins == NULL) {

-          bin = find_entry(tab, hash, key);

- +	if (EXPECT(bin == REBUILT_TABLE_ENTRY_IND, 0))

- +	    goto retry;

-  	if (bin == UNDEFINED_ENTRY_IND)

-  	    return 0;

-      }

-      else {

-          bin = find_table_entry_ind(tab, hash, key);

- +	if (EXPECT(bin == REBUILT_TABLE_ENTRY_IND, 0))

- +	    goto retry;

-  	if (bin == UNDEFINED_ENTRY_IND)

-  	    return 0;

-  	bin -= ENTRY_BASE;

- @@ -1064,13 +1108,18 @@ st_get_key(st_table *tab, st_data_t key, st_data_t *result)

-      st_index_t bin;

-      st_hash_t hash = do_hash(key, tab);

-  

- + retry:

-      if (tab->bins == NULL) {

-          bin = find_entry(tab, hash, key);

- +	if (EXPECT(bin == REBUILT_TABLE_ENTRY_IND, 0))

- +	    goto retry;

-  	if (bin == UNDEFINED_ENTRY_IND)

-  	    return 0;

-      }

-      else {

-          bin = find_table_entry_ind(tab, hash, key);

- +	if (EXPECT(bin == REBUILT_TABLE_ENTRY_IND, 0))

- +	    goto retry;

-  	if (bin == UNDEFINED_ENTRY_IND)

-  	    return 0;

-  	bin -= ENTRY_BASE;

- @@ -1104,10 +1153,13 @@ st_insert(st_table *tab, st_data_t key, st_data_t value)

-      st_index_t bin_ind;

-      int new_p;

-  

- -    rebuild_table_if_necessary(tab);

-      hash_value = do_hash(key, tab);

- + retry:

- +    rebuild_table_if_necessary(tab);

-      if (tab->bins == NULL) {

-          bin = find_entry(tab, hash_value, key);

- +	if (EXPECT(bin == REBUILT_TABLE_ENTRY_IND, 0))

- +	    goto retry;

-  	new_p = bin == UNDEFINED_ENTRY_IND;

-  	if (new_p)

-  	    tab->num_entries++;

- @@ -1116,6 +1168,8 @@ st_insert(st_table *tab, st_data_t key, st_data_t value)

-      else {

-          bin = find_table_bin_ptr_and_reserve(tab, &hash_value,

-  					     key, &bin_ind);

- +	if (EXPECT(bin == REBUILT_TABLE_ENTRY_IND, 0))

- +	    goto retry;

-  	new_p = bin == UNDEFINED_ENTRY_IND;

-  	bin -= ENTRY_BASE;

-      }

- @@ -1192,10 +1246,13 @@ st_insert2(st_table *tab, st_data_t key, st_data_t value,

-      st_index_t bin_ind;

-      int new_p;

-  

- -    rebuild_table_if_necessary (tab);

-      hash_value = do_hash(key, tab);

- + retry:

- +    rebuild_table_if_necessary (tab);

-      if (tab->bins == NULL) {

-          bin = find_entry(tab, hash_value, key);

- +	if (EXPECT(bin == REBUILT_TABLE_ENTRY_IND, 0))

- +	    goto retry;

-  	new_p = bin == UNDEFINED_ENTRY_IND;

-  	if (new_p)

-  	    tab->num_entries++;

- @@ -1204,6 +1261,8 @@ st_insert2(st_table *tab, st_data_t key, st_data_t value,

-      else {

-          bin = find_table_bin_ptr_and_reserve(tab, &hash_value,

-  					     key, &bin_ind);

- +	if (EXPECT(bin == REBUILT_TABLE_ENTRY_IND, 0))

- +	    goto retry;

-  	new_p = bin == UNDEFINED_ENTRY_IND;

-  	bin -= ENTRY_BASE;

-      }

- @@ -1212,7 +1271,6 @@ st_insert2(st_table *tab, st_data_t key, st_data_t value,

-          check = tab->rebuilds_num;

-          key = (*func)(key);

-          st_assert(check == tab->rebuilds_num);

- -	st_assert(do_hash(key, tab) == hash_value);

-          ind = tab->entries_bound++;

-          entry = &tab->entries[ind];

-          entry->hash = hash_value;

- @@ -1220,6 +1278,7 @@ st_insert2(st_table *tab, st_data_t key, st_data_t value,

-          entry->record = value;

-  	if (bin_ind != UNDEFINED_BIN_IND)

-  	    set_bin(tab->bins, get_size_ind(tab), bin_ind, ind + ENTRY_BASE);

- +	st_assert(do_hash(key, tab) == hash_value);

-  #ifdef ST_DEBUG

-  	st_check(tab);

-  #endif

- @@ -1281,8 +1340,11 @@ st_general_delete(st_table *tab, st_data_t *key, st_data_t *value)

-  

-      st_assert(tab != NULL);

-      hash = do_hash(*key, tab);

- + retry:

-      if (tab->bins == NULL) {

-          bin = find_entry(tab, hash, *key);

- +	if (EXPECT(bin == REBUILT_TABLE_ENTRY_IND, 0))

- +	    goto retry;

-  	if (bin == UNDEFINED_ENTRY_IND) {

-  	    if (value != 0) *value = 0;

-  	    return 0;

- @@ -1290,6 +1352,8 @@ st_general_delete(st_table *tab, st_data_t *key, st_data_t *value)

-      }

-      else {

-          bin_ind = find_table_bin_ind(tab, hash, *key);

- +	if (EXPECT(bin_ind == REBUILT_TABLE_BIN_IND, 0))

- +	    goto retry;

-  	if (bin_ind == UNDEFINED_BIN_IND) {

-  	    if (value != 0) *value = 0;

-  	    return 0;

- @@ -1344,21 +1408,33 @@ st_shift(st_table *tab, st_data_t *key, st_data_t *value)

-      for (i = tab->entries_start; i < bound; i++) {

-          curr_entry_ptr = &entries[i];

-  	if (! DELETED_ENTRY_P(curr_entry_ptr)) {

- +	    st_hash_t entry_hash = curr_entry_ptr->hash;

- +	    st_data_t entry_key = curr_entry_ptr->key;

- +

-  	    if (value != 0) *value = curr_entry_ptr->record;

- -	    *key = curr_entry_ptr->key;

- +	    *key = entry_key;

- +	retry:

-  	    if (tab->bins == NULL) {

- -	        bin = find_entry(tab, curr_entry_ptr->hash, curr_entry_ptr->key);

- +	        bin = find_entry(tab, entry_hash, entry_key);

- +		if (EXPECT(bin == REBUILT_TABLE_ENTRY_IND, 0)) {

- +		    entries = tab->entries;

- +		    goto retry;

- +		}

-  		st_assert(bin != UNDEFINED_ENTRY_IND);

- -		st_assert(&entries[bin] == curr_entry_ptr);

- +		curr_entry_ptr = &entries[bin];

-  	    }

-  	    else {

- -	        bin_ind = find_table_bin_ind(tab, curr_entry_ptr->hash,

- -					     curr_entry_ptr->key);

- +	        bin_ind = find_table_bin_ind(tab, entry_hash, entry_key);

- +		if (EXPECT(bin_ind == REBUILT_TABLE_BIN_IND, 0)) {

- +		    entries = tab->entries;

- +		    goto retry;

- +		}

-  		st_assert(bin_ind != UNDEFINED_BIN_IND);

- -		st_assert(&entries[get_bin(tab->bins, get_size_ind(tab), bin_ind)

- -				      - ENTRY_BASE] == curr_entry_ptr);

- +		curr_entry_ptr = &entries[get_bin(tab->bins, get_size_ind(tab), bin_ind)

- +					  - ENTRY_BASE];

-  		MARK_BIN_DELETED(tab, bin_ind);

-  	    }

- +	    st_assert(entry_hash != curr_entry_ptr->hash && entry_key == curr_entry_ptr->key);

-  	    MARK_ENTRY_DELETED(curr_entry_ptr);

-  	    tab->num_entries--;

-  	    update_range_for_deleted(tab, i);

- @@ -1402,15 +1478,20 @@ st_update(st_table *tab, st_data_t key,

-      int retval, existing;

-      st_hash_t hash = do_hash(key, tab);

-  

- + retry:

-      entries = tab->entries;

-      if (tab->bins == NULL) {

-          bin = find_entry(tab, hash, key);

- +	if (EXPECT(bin == REBUILT_TABLE_ENTRY_IND, 0))

- +	    goto retry;

-  	existing = bin != UNDEFINED_ENTRY_IND;

-  	entry = &entries[bin];

-  	bin_ind = UNDEFINED_BIN_IND;

-      }

-      else {

-          bin_ind = find_table_bin_ind(tab, hash, key);

- +	if (EXPECT(bin_ind == REBUILT_TABLE_BIN_IND, 0))

- +	    goto retry;

-  	existing = bin_ind != UNDEFINED_BIN_IND;

-  	if (existing) {

-  	    bin = get_bin(tab->bins, get_size_ind(tab), bin_ind) - ENTRY_BASE;

- @@ -1489,14 +1570,19 @@ st_general_foreach(st_table *tab, int (*func)(ANYARGS), st_data_t arg,

-  	hash = curr_entry_ptr->hash;

-  	retval = (*func)(key, curr_entry_ptr->record, arg, 0);

-  	if (rebuilds_num != tab->rebuilds_num) {

- +	retry:

-  	    entries = tab->entries;

-  	    packed_p = tab->bins == NULL;

-  	    if (packed_p) {

-  	        i = find_entry(tab, hash, key);

- +		if (EXPECT(i == REBUILT_TABLE_ENTRY_IND, 0))

- +		    goto retry;

-  		error_p = i == UNDEFINED_ENTRY_IND;

-  	    }

-  	    else {

-  	        i = find_table_entry_ind(tab, hash, key);

- +		if (EXPECT(i == REBUILT_TABLE_ENTRY_IND, 0))

- +		    goto retry;

-  		error_p = i == UNDEFINED_ENTRY_IND;

-  		i -= ENTRY_BASE;

-  	    }

- @@ -1512,36 +1598,44 @@ st_general_foreach(st_table *tab, int (*func)(ANYARGS), st_data_t arg,

-  	}

-  	switch (retval) {

-  	  case ST_CONTINUE:

- -	    break;

- +	      break;

-  	  case ST_CHECK:

- -	    if (check_p)

- -		break;

- +	      if (check_p)

- +		  break;

-  	  case ST_STOP:

-  #ifdef ST_DEBUG

- -	    st_check(tab);

- -#endif

- -	    return 0;

- -	  case ST_DELETE:

- -	    if (packed_p) {

- -	        bin = find_entry(tab, hash, curr_entry_ptr->key);

- -		if (bin == UNDEFINED_ENTRY_IND)

- -		    break;

- -	    }

- -	    else {

- -	        bin_ind = find_table_bin_ind(tab, hash, curr_entry_ptr->key);

- -		if (bin_ind == UNDEFINED_BIN_IND)

- -		    break;

- -		bin = get_bin(tab->bins, get_size_ind(tab), bin_ind) - ENTRY_BASE;

- -		MARK_BIN_DELETED(tab, bin_ind);

- -	    }

- -	    st_assert(&entries[bin] == curr_entry_ptr);

- -	    MARK_ENTRY_DELETED(curr_entry_ptr);

- -	    tab->num_entries--;

- -	    update_range_for_deleted(tab, bin);

- +	      st_check(tab);

- +#endif

- +	      return 0;

- +	  case ST_DELETE: {

- +	      st_data_t key = curr_entry_ptr->key;

- +

- +	      again:

- +	      if (packed_p) {

- +		  bin = find_entry(tab, hash, key);

- +		  if (EXPECT(bin == REBUILT_TABLE_ENTRY_IND, 0))

- +		      goto again;

- +		  if (bin == UNDEFINED_ENTRY_IND)

- +		      break;

- +	      }

- +	      else {

- +		  bin_ind = find_table_bin_ind(tab, hash, key);

- +		  if (EXPECT(bin_ind == REBUILT_TABLE_BIN_IND, 0))

- +		      goto again;

- +		  if (bin_ind == UNDEFINED_BIN_IND)

- +		      break;

- +		  bin = get_bin(tab->bins, get_size_ind(tab), bin_ind) - ENTRY_BASE;

- +		  MARK_BIN_DELETED(tab, bin_ind);

- +	      }

- +	      curr_entry_ptr = &entries[bin];

- +	      MARK_ENTRY_DELETED(curr_entry_ptr);

- +	      tab->num_entries--;

- +	      update_range_for_deleted(tab, bin);

-  #ifdef ST_DEBUG

- -	    st_check(tab);

- +	      st_check(tab);

-  #endif

- -	    break;

- +	      break;

- +	  }

-  	}

-      }

-  #ifdef ST_DEBUG

- @@ -2015,10 +2109,12 @@ st_expand_table(st_table *tab, st_index_t siz)

-      free(tmp);

-  }

-  

- -/* Rehash using linear search. */

- -static void

- +/* Rehash using linear search.  Return TRUE if we found that the table

- +   was rebuilt.  */

- +static int

-  st_rehash_linear(st_table *tab)

-  {

- +    int eq_p, rebuilt_p;

-      st_index_t i, j;

-      st_table_entry *p, *q;

-      if (tab->bins) {

- @@ -2033,7 +2129,10 @@ st_rehash_linear(st_table *tab)

-              q = &tab->entries[j];

-              if (DELETED_ENTRY_P(q))

-                  continue;

- -            if (PTR_EQUAL(tab, p, q->hash, q->key)) {

- +	    DO_PTR_EQUAL_CHECK(tab, p, q->hash, q->key, eq_p, rebuilt_p);

- +	    if (EXPECT(rebuilt_p, 0))

- +		return TRUE;

- +	    if (eq_p) {

-                  st_assert(p < q);

-                  *p = *q;

-                  MARK_ENTRY_DELETED(q);

- @@ -2042,12 +2141,15 @@ st_rehash_linear(st_table *tab)

-              }

-          }

-      }

- +    return FALSE;

-  }

-  

- -/* Rehash using index */

- -static void

- +/* Rehash using index.  Return TRUE if we found that the table was

- +   rebuilt.  */

- +static int

-  st_rehash_indexed(st_table *tab)

-  {

- +    int eq_p, rebuilt_p;

-      st_index_t i;

-      st_index_t const n = bins_size(tab);

-      unsigned int const size_ind = get_size_ind(tab);

- @@ -2076,26 +2178,32 @@ st_rehash_indexed(st_table *tab)

-                  set_bin(bins, size_ind, ind, i + ENTRY_BASE);

-                  break;

-              }

- -            else if (PTR_EQUAL(tab, q, p->hash, p->key)) {

- -                /* duplicated key; delete it */

- -                st_assert(q < p);

- -                q->record = p->record;

- -                MARK_ENTRY_DELETED(p);

- -                tab->num_entries--;

- -                update_range_for_deleted(tab, bin);

- -                break;

- -            }

-              else {

- -                /* hash collision; skip it */

- +		DO_PTR_EQUAL_CHECK(tab, q, p->hash, p->key, eq_p, rebuilt_p);

- +		if (EXPECT(rebuilt_p, 0))

- +		    return TRUE;

- +		if (eq_p) {

- +		    /* duplicated key; delete it */

- +		    st_assert(q < p);

- +		    q->record = p->record;

- +		    MARK_ENTRY_DELETED(p);

- +		    tab->num_entries--;

- +		    update_range_for_deleted(tab, bin);

- +		    break;

- +		}

- +		else {

- +		    /* hash collision; skip it */

-  #ifdef QUADRATIC_PROBE

- -                ind = hash_bin(ind + d, tab);

- -                d++;

- +		    ind = hash_bin(ind + d, tab);

- +		    d++;

-  #else

- -                ind = secondary_hash(ind, tab, &peterb);

- +		    ind = secondary_hash(ind, tab, &peterb);

-  #endif

- -            }

- +		}

- +	    }

-          }

-      }

- +    return FALSE;

-  }

-  

-  /* Reconstruct TAB's bins according to TAB's entries. This function

- @@ -2104,10 +2212,14 @@ st_rehash_indexed(st_table *tab)

-  static void

-  st_rehash(st_table *tab)

-  {

- -    if (tab->bin_power <= MAX_POWER2_FOR_TABLES_WITHOUT_BINS)

- -        st_rehash_linear(tab);

- -    else

- -        st_rehash_indexed(tab);

- +    int rebuilt_p;

- +

- +    do {

- +	if (tab->bin_power <= MAX_POWER2_FOR_TABLES_WITHOUT_BINS)

- +	    rebuilt_p = st_rehash_linear(tab);

- +	else

- +	    rebuilt_p = st_rehash_indexed(tab);

- +    } while (rebuilt_p);

-  }

-  

-  #ifdef RUBY

- -- 

- 2.16.1

- 

@@ -0,0 +1,115 @@ 

+ From 584b5929f9b769c4d0b03e322a9fddf2b2dd3454 Mon Sep 17 00:00:00 2001

+ From: nobu <nobu@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>

+ Date: Sun, 1 Apr 2018 13:02:11 +0000

+ Subject: [PATCH] test_time_tz.rb: Kiritimati tzdata fix

+ 

+ * test/ruby/test_time_tz.rb (gen_zdump_test): fix the expected

+   data at the Kiritimati's skip of New Year's Eve 1994.

+   [Bug #14655]

+ 

+ git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@63055 b2dd03c8-39d4-4d8f-98ff-823fe69b080e

+ ---

+  test/ruby/test_time_tz.rb | 9 +++++++++

+  1 file changed, 9 insertions(+)

+ 

+ diff --git a/test/ruby/test_time_tz.rb b/test/ruby/test_time_tz.rb

+ index dfe139033ed3..ac5f81892878 100644

+ --- a/test/ruby/test_time_tz.rb

+ +++ b/test/ruby/test_time_tz.rb

+ @@ -364,9 +364,18 @@ 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

+ +End

+ +  if CORRECT_KIRITIMATI_SKIP_1994

+ +    gen_zdump_test <<'End'

+ +Pacific/Kiritimati  Sat Dec 31 09:59:59 1994 UTC = Fri Dec 30 23:59:59 1994 LINT isdst=0 gmtoff=-36000

+ +Pacific/Kiritimati  Sat Dec 31 10:00:00 1994 UTC = Sun Jan  1 00:00:00 1995 LINT isdst=0 gmtoff=50400

+ +End

+ +  else

+ +    gen_zdump_test <<'End'

+  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

+ +  end

+    gen_zdump_test <<'End' if has_right_tz

+  right/America/Los_Angeles  Fri Jun 30 23:59:60 1972 UTC = Fri Jun 30 16:59:60 1972 PDT isdst=1 gmtoff=-25200

+  right/America/Los_Angeles  Wed Dec 31 23:59:60 2008 UTC = Wed Dec 31 15:59:60 2008 PST isdst=0 gmtoff=-28800

+ --

+ 

+ From 2965c2d4df78e6f5acf8759f84c88ce14a4e70f1 Mon Sep 17 00:00:00 2001

+ From: nobu <nobu@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>

+ Date: Sun, 1 Apr 2018 02:00:36 +0000

+ Subject: [PATCH] test_time_tz.rb: Kiritimati tzdata fix

+ 

+ * test/ruby/test_time_tz.rb (TestTimeTZ#test_pacific_kiritimati):

+   fix the expected data at the skip of New Year's Eve 1994.

+   [Bug #14655]

+ 

+ git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@63054 b2dd03c8-39d4-4d8f-98ff-823fe69b080e

+ ---

+  test/ruby/test_time_tz.rb | 17 ++++++++++++++---

+  1 file changed, 14 insertions(+), 3 deletions(-)

+ 

+ diff --git a/test/ruby/test_time_tz.rb b/test/ruby/test_time_tz.rb

+ index 39b830d28a3d..dfe139033ed3 100644

+ --- a/test/ruby/test_time_tz.rb

+ +++ b/test/ruby/test_time_tz.rb

+ @@ -89,6 +89,9 @@ def group_by(e, &block)

+        Time.local(1951, 5, 6, 1, 0, 0).dst?   # DST with fixed tzdata

+      end

+    }

+ +  CORRECT_KIRITIMATI_SKIP_1994 = with_tz("Pacific/Kiritimati") {

+ +    Time.local(1994, 12, 31, 0, 0, 0).year == 1995

+ +  }

+  

+    def time_to_s(t)

+      t.to_s

+ @@ -178,9 +181,17 @@ def test_europe_lisbon

+  

+    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])

+ -      assert_time_constructor(tz, "1995-01-02 00:00:00 +1400", :local, [1995,1,1,0,0,0])

+ -      assert_time_constructor(tz, "1995-01-02 23:59:59 +1400", :local, [1995,1,1,23,59,59])

+ +      assert_time_constructor(tz, "1994-12-30 00:00:00 -1000", :local, [1994,12,30,0,0,0])

+ +      assert_time_constructor(tz, "1994-12-30 23:59:59 -1000", :local, [1994,12,30,23,59,59])

+ +      if CORRECT_KIRITIMATI_SKIP_1994

+ +        assert_time_constructor(tz, "1995-01-01 00:00:00 +1400", :local, [1994,12,31,0,0,0])

+ +        assert_time_constructor(tz, "1995-01-01 23:59:59 +1400", :local, [1994,12,31,23,59,59])

+ +        assert_time_constructor(tz, "1995-01-01 00:00:00 +1400", :local, [1995,1,1,0,0,0])

+ +      else

+ +        assert_time_constructor(tz, "1994-12-31 23:59:59 -1000", :local, [1994,12,31,23,59,59])

+ +        assert_time_constructor(tz, "1995-01-02 00:00:00 +1400", :local, [1995,1,1,0,0,0])

+ +        assert_time_constructor(tz, "1995-01-02 23:59:59 +1400", :local, [1995,1,1,23,59,59])

+ +      end

+        assert_time_constructor(tz, "1995-01-02 00:00:00 +1400", :local, [1995,1,2,0,0,0])

+      }

+    end

+ --

+ 

+ From a0e6607a8172f9eaf9a15f03065736deb2035771 Mon Sep 17 00:00:00 2001

+ From: nobu <nobu@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>

+ Date: Sun, 1 Apr 2018 13:16:14 +0000

+ Subject: [PATCH] test_time_tz.rb: Lisbon tzdata fix

+ 

+ * test/ruby/test_time_tz.rb (gen_variational_zdump_test): Update

+   Lisbon zdump data, which fixed the 1912-01-01 transition for

+   Portugual and its colonies.  [Bug #14655]

+ 

+ git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@63056 b2dd03c8-39d4-4d8f-98ff-823fe69b080e

+ ---

+  test/ruby/test_time_tz.rb | 1 +

+  1 file changed, 1 insertion(+)

+ 

+ diff --git a/test/ruby/test_time_tz.rb b/test/ruby/test_time_tz.rb

+ index ac5f81892878..b32caff9c539 100644

+ --- a/test/ruby/test_time_tz.rb

+ +++ b/test/ruby/test_time_tz.rb

+ @@ -434,5 +434,6 @@ def self.gen_variational_zdump_test(hint, data)

+    gen_variational_zdump_test "lisbon", <<'End' if has_lisbon_tz

+  Europe/Lisbon  Mon Jan  1 00:36:31 1912 UTC = Sun Dec 31 23:59:59 1911 LMT isdst=0 gmtoff=-2192

+  Europe/Lisbon  Mon Jan  1 00:36:44 1912 UT = Sun Dec 31 23:59:59 1911 LMT isdst=0 gmtoff=-2205

+ +Europe/Lisbon  Sun Dec 31 23:59:59 1911 UT = Sun Dec 31 23:23:14 1911 LMT isdst=0 gmtoff=-2205

+  End

+  end

@@ -27,7 +27,7 @@ 

   

   AC_DEFUN([RUBY_RM_RECURSIVE], [

   m4_version_prereq([2.70], [-1], [

- @@ -2937,13 +2938,11 @@ AS_IF([test x"$enable_pthread" = xyes], [

+ @@ -2938,13 +2939,11 @@ AS_IF([test x"$enable_pthread" = xyes], [

   	AC_DEFINE(_THREAD_SAFE)

   	AC_DEFINE(HAVE_LIBPTHREAD)

   	AC_CHECK_HEADERS(pthread_np.h, [], [], [@%:@include <pthread.h>])
@@ -46,7 +46,7 @@ 

       ], [

   	AC_MSG_WARN("Don't know how to find pthread library on your system -- thread support disabled")

       ])

- @@ -3622,7 +3621,7 @@ LIBRUBY_A='lib$(RUBY_SO_NAME)-static.a'

+ @@ -3623,7 +3622,7 @@ LIBRUBY_A='lib$(RUBY_SO_NAME)-static.a'

   LIBRUBY='$(LIBRUBY_A)'

   LIBRUBYARG_STATIC='-l$(RUBY_SO_NAME)-static'

   LIBRUBYARG='$(LIBRUBYARG_STATIC)'
@@ -55,7 +55,7 @@ 

   

   AS_CASE(["$target_os"],

     [cygwin*|mingw*|haiku*|darwin*], [

- @@ -3688,9 +3687,6 @@ AS_CASE("$enable_shared", [yes], [

+ @@ -3689,9 +3688,6 @@ AS_CASE("$enable_shared", [yes], [

     LIBRUBY_RELATIVE=no

     test -z "$CCDLFLAGS" || CFLAGS="$CFLAGS $CCDLFLAGS"

     ENABLE_SHARED=yes
@@ -65,7 +65,7 @@ 

   

     # libdir can be overridden in config.site file (on OpenSUSE at least).

     libdir_basename=lib

- @@ -3725,7 +3721,6 @@ AS_CASE("$enable_shared", [yes], [

+ @@ -3726,7 +3722,6 @@ AS_CASE("$enable_shared", [yes], [

   	])

   	],

       [freebsd*|dragonfly*], [
@@ -73,7 +73,7 @@ 

   	LIBRUBY_SO='lib$(RUBY_SO_NAME).$(SOEXT).$(MAJOR)$(MINOR)'

   	LIBRUBY_SONAME='$(LIBRUBY_SO)'

   	AS_IF([test "$rb_cv_binary_elf" != "yes" ], [

- @@ -3734,7 +3729,6 @@ AS_CASE("$enable_shared", [yes], [

+ @@ -3735,7 +3730,6 @@ AS_CASE("$enable_shared", [yes], [

   	])

   	],

       [netbsd*], [
@@ -81,7 +81,7 @@ 

   	LIBRUBY_SONAME='lib$(RUBY_SO_NAME).$(SOEXT).$(MAJOR)$(MINOR)'

   	LIBRUBY_SO="${LIBRUBY_SONAME}"'.$(TEENY)'

   	RUBY_APPEND_OPTIONS(LIBRUBY_DLDFLAGS, ['-Wl,-soname,$(LIBRUBY_SONAME)' "$LDFLAGS_OPTDIR"])

- @@ -3745,11 +3739,9 @@ AS_CASE("$enable_shared", [yes], [

+ @@ -3746,11 +3740,9 @@ AS_CASE("$enable_shared", [yes], [

   	])

   	],

       [openbsd*|mirbsd*], [
@@ -93,7 +93,7 @@ 

   	LIBRUBY_SO='lib$(RUBY_SO_NAME).$(SOEXT).$(MAJOR)'

   	LIBRUBY_SONAME='lib$(RUBY_SO_NAME).$(SOEXT).$(RUBY_PROGRAM_VERSION)'

   	LIBRUBY_ALIASES='$(LIBRUBY_SONAME) lib$(RUBY_SO_NAME).$(SOEXT)'

- @@ -3767,7 +3759,7 @@ AS_CASE("$enable_shared", [yes], [

+ @@ -3768,7 +3760,7 @@ AS_CASE("$enable_shared", [yes], [

       [aix*], [

   	RUBY_APPEND_OPTIONS(LIBRUBY_DLDFLAGS, ["${linker_flag}-bnoentry" "$XLDFLAGS" "$LDFLAGS_OPTDIR"])

   	LIBRUBYARG_SHARED='-L${libdir} -l${RUBY_SO_NAME}'
@@ -102,7 +102,7 @@ 

   	],

       [darwin*], [

   	LIBRUBY_LDSHARED='$(CC) -dynamiclib'

- @@ -3787,7 +3779,6 @@ AS_CASE("$enable_shared", [yes], [

+ @@ -3788,7 +3780,6 @@ AS_CASE("$enable_shared", [yes], [

   	LIBRUBY_SO='lib$(RUBY_SO_NAME).$(SOEXT)'

   	LIBRUBY_SONAME='lib$(RUBY_BASE_NAME).$(RUBY_API_VERSION).$(SOEXT)'

   	LIBRUBY_ALIASES='$(LIBRUBY_SONAME) lib$(RUBY_INSTALL_NAME).$(SOEXT)'
@@ -110,7 +110,7 @@ 

   	],

       [interix*], [

   	LIBRUBYARG_SHARED='-L. -L${libdir} -l$(RUBY_SO_NAME)'

- @@ -4030,7 +4021,6 @@ AS_CASE(["$target_os"],

+ @@ -4031,7 +4022,6 @@ AS_CASE(["$target_os"],

   	    ])

   	LIBRUBY_ALIASES=''

   	FIRSTMAKEFILE=GNUmakefile:cygwin/GNUmakefile.in
@@ -118,7 +118,7 @@ 

   	AS_IF([test x"$enable_shared" = xyes], [

   	    LIBRUBY='lib$(RUBY_SO_NAME).dll.a'

   	], [

- @@ -4130,6 +4120,13 @@ AS_IF([test "${universal_binary-no}" = yes ], [

+ @@ -4131,6 +4121,13 @@ AS_IF([test "${universal_binary-no}" = yes ], [

   		[rb_cv_architecture_available=yes], [rb_cv_architecture_available=no]))

   ])

   

file modified
+8 -22
@@ -1,6 +1,6 @@ 

  %global major_version 2

  %global minor_version 5

- %global teeny_version 0

+ %global teeny_version 1

  %global major_minor_version %{major_version}.%{minor_version}

  

  %global ruby_version %{major_minor_version}.%{teeny_version}
@@ -21,7 +21,7 @@ 

  %endif

  

  

- %global release 91

+ %global release 92

  %{!?release_string:%global release_string %{?development_release:0.}%{release}%{?development_release:.%{development_release}}%{?dist}}

  

  # The RubyGems library has to stay out of Ruby directory three, since the
@@ -136,19 +136,9 @@ 

  # Add Gem.operating_system_defaults to allow packagers to override defaults.

  # https://github.com/rubygems/rubygems/pull/2116

  Patch10: ruby-2.5.0-Add-Gem.operating_system_defaults.patch

- # Fix segfault during generating documentation.

- # https://bugs.ruby-lang.org/issues/14343

- Patch11: ruby-2.5.0-parse.y-assignable_error.patch

- # Recent tzdata change breaks Ruby test suite.

- # https://bugs.ruby-lang.org/issues/14438

- Patch12: ruby-2.5.0-Disable-Tokyo-TZ-tests.patch

- # Fix thread_safe tests suite segfaults.

- # https://bugs.ruby-lang.org/issues/14357

- Patch13: ruby-2.5.0-st.c-retry-operations-if-rebuilt.patch

- # Fix: Multiple vulnerabilities in RubyGems

- # https://bugzilla.redhat.com/show_bug.cgi?id=1547431

- # https://www.ruby-lang.org/en/news/2018/02/17/multiple-vulnerabilities-in-rubygems/

- Patch14: rubygems-2.5.0-multiple-vulnerabilities.patch

+ # TestTimeTZ test failures Kiritimati and Lisbon

+ # https://bugs.ruby-lang.org/issues/14655

+ Patch11: ruby-2.5.1-TestTimeTZ-test-failures-Kiritimati-and-Lisbon.patch

  # Don't force libraries used to build Ruby to its dependencies.

  # https://bugs.ruby-lang.org/issues/14422

  Patch15: ruby-2.6.0-library-options-to-MAINLIBS.patch
@@ -537,9 +527,6 @@ 

  %patch9 -p1

  %patch10 -p1

  %patch11 -p1

- %patch12 -p1

- %patch13 -p1

- %patch14 -p0

  %patch15 -p1

  

  # Provide an example of usage of the tapset:
@@ -756,10 +743,6 @@ 

  

  DISABLE_TESTS=""

  

- # https://bugs.ruby-lang.org/issues/11480

- # Once seen: http://koji.fedoraproject.org/koji/taskinfo?taskID=12556650

- DISABLE_TESTS="$DISABLE_TESTS -x test_fork.rb"

- 

  # SIGSEV handler does not provide correct output on AArch64.

  # https://bugs.ruby-lang.org/issues/13758

  %ifarch aarch64
@@ -1090,6 +1073,9 @@ 

  %{gem_dir}/specifications/xmlrpc-%{xmlrpc_version}.gemspec

  

  %changelog

+ * Thu Mar 29 2018 Pavel Valena <pvalena@redhat.com> - 2.5.1-92

+ - Update to Ruby 2.5.1.

+ 

  * Mon Mar 05 2018 Vít Ondruch <vondruch@redhat.com> - 2.5.0-91

  - Don't force libraries used to build Ruby to its dependencies.

  - Re-enable GMP dependency.

@@ -1,2349 +0,0 @@ 

- diff --git lib/rubygems.rb lib/rubygems.rb

- index 0475ced164..2762bfcb88 100644

- --- lib/rubygems.rb

- +++ lib/rubygems.rb

- @@ -10,7 +10,7 @@

-  require 'thread'

-  

-  module Gem

- -  VERSION = "2.7.3"

- +  VERSION = "2.7.6"

-  end

-  

-  # Must be first since it unloads the prelude from 1.9.2

- @@ -161,7 +161,7 @@ module Gem

-    # these are defined in Ruby 1.8.7, hence the need for this convoluted setup.

-  

-    READ_BINARY_ERRORS = begin

- -    read_binary_errors = [Errno::EACCES, Errno::EROFS]

- +    read_binary_errors = [Errno::EACCES, Errno::EROFS, Errno::ENOSYS]

-      read_binary_errors << Errno::ENOTSUP if Errno.const_defined?(:ENOTSUP)

-      read_binary_errors

-    end.freeze

- @@ -171,7 +171,7 @@ module Gem

-    # these are defined in Ruby 1.8.7.

-  

-    WRITE_BINARY_ERRORS = begin

- -    write_binary_errors = []

- +    write_binary_errors = [Errno::ENOSYS]

-      write_binary_errors << Errno::ENOTSUP if Errno.const_defined?(:ENOTSUP)

-      write_binary_errors

-    end.freeze

- @@ -871,19 +871,19 @@ def self.refresh

-    # Safely read a file in binary mode on all platforms.

-  

-    def self.read_binary(path)

- -    open path, 'rb+' do |f|

- +    File.open path, 'rb+' do |f|

-        f.flock(File::LOCK_EX)

-        f.read

-      end

-    rescue *READ_BINARY_ERRORS

- -    open path, 'rb' do |f|

- +    File.open path, 'rb' do |f|

-        f.read

-      end

-    rescue Errno::ENOLCK # NFS

-      if Thread.main != Thread.current

-        raise

-      else

- -      open path, 'rb' do |f|

- +      File.open path, 'rb' do |f|

-          f.read

-        end

-      end

- diff --git lib/rubygems/commands/generate_index_command.rb lib/rubygems/commands/generate_index_command.rb

- index 01f1f88405..0b677b73a9 100644

- --- lib/rubygems/commands/generate_index_command.rb

- +++ lib/rubygems/commands/generate_index_command.rb

- @@ -68,7 +68,7 @@ def execute

-  

-      if not File.exist?(options[:directory]) or

-         not File.directory?(options[:directory]) then

- -      alert_error "unknown directory name #{directory}."

- +      alert_error "unknown directory name #{options[:directory]}."

-        terminate_interaction 1

-      else

-        indexer = Gem::Indexer.new options.delete(:directory), options

- diff --git lib/rubygems/commands/owner_command.rb lib/rubygems/commands/owner_command.rb

- index 8e2271657a..637b5bdc4d 100644

- --- lib/rubygems/commands/owner_command.rb

- +++ lib/rubygems/commands/owner_command.rb

- @@ -64,7 +64,7 @@ def show_owners name

-      end

-  

-      with_response response do |resp|

- -      owners = YAML.load resp.body

- +      owners = Gem::SafeYAML.load resp.body

-  

-        say "Owners for gem: #{name}"

-        owners.each do |owner|

- diff --git lib/rubygems/commands/setup_command.rb lib/rubygems/commands/setup_command.rb

- index 5d1414d102..6966cde01a 100644

- --- lib/rubygems/commands/setup_command.rb

- +++ lib/rubygems/commands/setup_command.rb

- @@ -350,7 +350,9 @@ def fake_spec.full_gem_path

-    def install_default_bundler_gem

-      return unless Gem::USE_BUNDLER_FOR_GEMDEPS

-  

- -    mkdir_p Gem::Specification.default_specifications_dir

- +    specs_dir = Gem::Specification.default_specifications_dir

- +    File.join(options[:destdir], specs_dir) unless Gem.win_platform?

- +    mkdir_p specs_dir

-  

-      # Workaround for non-git environment.

-      gemspec = File.open('bundler/bundler.gemspec', 'rb'){|f| f.read.gsub(/`git ls-files -z`/, "''") }

- @@ -359,23 +361,36 @@ def install_default_bundler_gem

-      bundler_spec = Gem::Specification.load("bundler/bundler.gemspec")

-      bundler_spec.files = Dir.chdir("bundler") { Dir["{*.md,{lib,exe,man}/**/*}"] }

-      bundler_spec.executables -= %w[bundler bundle_ruby]

- -    Dir.entries(Gem::Specification.default_specifications_dir).

- +

- +    # Remove bundler-*.gemspec in default specification directory.

- +    Dir.entries(specs_dir).

-        select {|gs| gs.start_with?("bundler-") }.

- -      each {|gs| File.delete(File.join(Gem::Specification.default_specifications_dir, gs)) }

- +      each {|gs| File.delete(File.join(specs_dir, gs)) }

-  

- -    default_spec_path = File.join(Gem::Specification.default_specifications_dir, "#{bundler_spec.full_name}.gemspec")

- +    default_spec_path = File.join(specs_dir, "#{bundler_spec.full_name}.gemspec")

-      Gem.write_binary(default_spec_path, bundler_spec.to_ruby)

-  

-      bundler_spec = Gem::Specification.load(default_spec_path)

-  

- +    # Remove gemspec that was same version of vendored bundler.

- +    normal_gemspec = File.join(Gem.default_dir, "specifications", "bundler-#{bundler_spec.version}.gemspec")

- +    if File.file? normal_gemspec

- +      File.delete normal_gemspec

- +    end

- +

- +    # Remove gem files that were same version of vendored bundler.

-      if File.directory? bundler_spec.gems_dir

-        Dir.entries(bundler_spec.gems_dir).

- -        select {|default_gem| File.basename(default_gem).match(/^bundler-#{Gem::Version::VERSION_PATTERN}$/) }.

- +        select {|default_gem| File.basename(default_gem) == "bundler-#{bundler_spec.version}" }.

-          each {|default_gem| rm_r File.join(bundler_spec.gems_dir, default_gem) }

-      end

-  

- -    mkdir_p bundler_spec.bin_dir

- -    bundler_spec.executables.each {|e| cp File.join("bundler", bundler_spec.bindir, e), File.join(bundler_spec.bin_dir, e) }

- +    bundler_bin_dir = File.join(Gem.default_dir, 'gems', bundler_spec.full_name, bundler_spec.bindir)

- +    File.join(options[:destdir], bundler_bin_dir) unless Gem.win_platform?

- +    mkdir_p bundler_bin_dir

- +    bundler_spec.executables.each do |e|

- +      cp File.join("bundler", bundler_spec.bindir, e), File.join(bundler_bin_dir, e)

- +    end

-  

-      if Gem.win_platform?

-        require 'rubygems/installer'

- diff --git lib/rubygems/commands/unpack_command.rb lib/rubygems/commands/unpack_command.rb

- index eb7f550673..b873f20d28 100644

- --- lib/rubygems/commands/unpack_command.rb

- +++ lib/rubygems/commands/unpack_command.rb

- @@ -94,7 +94,7 @@ def execute

-  

-          spec_file = File.basename spec.spec_file

-  

- -        open spec_file, 'w' do |io|

- +        File.open spec_file, 'w' do |io|

-            io.write metadata

-          end

-        else

- @@ -176,7 +176,7 @@ def get_metadata path, security_policy = nil

-  

-      metadata = nil

-  

- -    open path, Gem.binary_mode do |io|

- +    File.open path, Gem.binary_mode do |io|

-        tar = Gem::Package::TarReader.new io

-        tar.each_entry do |entry|

-          case entry.full_name

- diff --git lib/rubygems/config_file.rb lib/rubygems/config_file.rb

- index a4efed0f5a..c0d19dbfc2 100644

- --- lib/rubygems/config_file.rb

- +++ lib/rubygems/config_file.rb

- @@ -458,7 +458,7 @@ def to_yaml # :nodoc:

-  

-    # Writes out this config file, replacing its source.

-    def write

- -    open config_file_name, 'w' do |io|

- +    File.open config_file_name, 'w' do |io|

-        io.write to_yaml

-      end

-    end

- diff --git lib/rubygems/ext/builder.rb lib/rubygems/ext/builder.rb

- index a1619c97d7..eb9db199d5 100644

- --- lib/rubygems/ext/builder.rb

- +++ lib/rubygems/ext/builder.rb

- @@ -212,7 +212,7 @@ def write_gem_make_out output # :nodoc:

-  

-      FileUtils.mkdir_p @spec.extension_dir

-  

- -    open destination, 'wb' do |io| io.puts output end

- +    File.open destination, 'wb' do |io| io.puts output end

-  

-      destination

-    end

- diff --git lib/rubygems/indexer.rb lib/rubygems/indexer.rb

- index 871cc09d8d..3ea994414b 100644

- --- lib/rubygems/indexer.rb

- +++ lib/rubygems/indexer.rb

- @@ -2,6 +2,7 @@

-  require 'rubygems'

-  require 'rubygems/package'

-  require 'time'

- +require 'tmpdir'

-  

-  begin

-    gem 'builder'

- @@ -64,7 +65,7 @@ def initialize(directory, options = {})

-      @build_modern = options[:build_modern]

-  

-      @dest_directory = directory

- -    @directory = File.join(Dir.tmpdir, "gem_generate_index_#{$$}")

- +    @directory = Dir.mktmpdir 'gem_generate_index'

-  

-      marshal_name = "Marshal.#{Gem.marshal_version}"

-  

- @@ -123,7 +124,7 @@ def build_marshal_gemspecs specs

-          marshal_name = File.join @quick_marshal_dir, spec_file_name

-  

-          marshal_zipped = Gem.deflate Marshal.dump(spec)

- -        open marshal_name, 'wb' do |io| io.write marshal_zipped end

- +        File.open marshal_name, 'wb' do |io| io.write marshal_zipped end

-  

-          files << marshal_name

-  

- @@ -261,7 +262,7 @@ def compress(filename, extension)

-  

-      zipped = Gem.deflate data

-  

- -    open "#{filename}.#{extension}", 'wb' do |io|

- +    File.open "#{filename}.#{extension}", 'wb' do |io|

-        io.write zipped

-      end

-    end

- @@ -427,7 +428,7 @@ def update_specs_index(index, source, dest)

-  

-      specs_index = compact_specs specs_index.uniq.sort

-  

- -    open dest, 'wb' do |io|

- +    File.open dest, 'wb' do |io|

-        Marshal.dump specs_index, io

-      end

-    end

- diff --git lib/rubygems/installer.rb lib/rubygems/installer.rb

- index 0cbca0791b..ee5fedeb64 100644

- --- lib/rubygems/installer.rb

- +++ lib/rubygems/installer.rb

- @@ -206,7 +206,7 @@ def check_executable_overwrite filename # :nodoc:

-      ruby_executable = false

-      existing = nil

-  

- -    open generated_bin, 'rb' do |io|

- +    File.open generated_bin, 'rb' do |io|

-        next unless io.gets =~ /^#!/ # shebang

-        io.gets # blankline

-  

- @@ -427,7 +427,7 @@ def default_spec_file

-    # specifications directory.

-  

-    def write_spec

- -    open spec_file, 'w' do |file|

- +    File.open spec_file, 'w' do |file|

-        spec.installed_by_version = Gem.rubygems_version

-  

-        file.puts spec.to_ruby_for_cache

- @@ -464,7 +464,12 @@ def generate_windows_script(filename, bindir)

-    def generate_bin # :nodoc:

-      return if spec.executables.nil? or spec.executables.empty?

-  

- -    Dir.mkdir @bin_dir unless File.exist? @bin_dir

- +    begin

- +      Dir.mkdir @bin_dir

- +    rescue SystemCallError

- +      raise unless File.directory? @bin_dir

- +    end

- +

-      raise Gem::FilePermissionError.new(@bin_dir) unless File.writable? @bin_dir

-  

-      spec.executables.each do |filename|

- @@ -863,7 +868,7 @@ def write_build_info_file

-  

-      build_info_file = File.join build_info_dir, "#{spec.full_name}.info"

-  

- -    open build_info_file, 'w' do |io|

- +    File.open build_info_file, 'w' do |io|

-        @build_args.each do |arg|

-          io.puts arg

-        end

- diff --git lib/rubygems/package.rb lib/rubygems/package.rb

- index 77811ed5ec..b924122827 100644

- --- lib/rubygems/package.rb

- +++ lib/rubygems/package.rb

- @@ -219,7 +219,7 @@ def add_files tar # :nodoc:

-        next unless stat.file?

-  

-        tar.add_file_simple file, stat.mode, stat.size do |dst_io|

- -        open file, 'rb' do |src_io|

- +        File.open file, 'rb' do |src_io|

-            dst_io.write src_io.read 16384 until src_io.eof?

-          end

-        end

- @@ -378,9 +378,9 @@ def extract_tar_gz io, destination_dir, pattern = "*" # :nodoc:

-              File.dirname destination

-            end

-  

- -        FileUtils.mkdir_p mkdir, mkdir_options

- +        mkdir_p_safe mkdir, mkdir_options, destination_dir, entry.full_name

-  

- -        open destination, 'wb' do |out|

- +        File.open destination, 'wb' do |out|

-            out.write entry.read

-            FileUtils.chmod entry.header.mode, destination

-          end if entry.file?

- @@ -416,20 +416,35 @@ def install_location filename, destination_dir # :nodoc:

-      raise Gem::Package::PathError.new(filename, destination_dir) if

-        filename.start_with? '/'

-  

- -    destination_dir = File.realpath destination_dir if

- -      File.respond_to? :realpath

- +    destination_dir = realpath destination_dir

-      destination_dir = File.expand_path destination_dir

-  

-      destination = File.join destination_dir, filename

-      destination = File.expand_path destination

-  

-      raise Gem::Package::PathError.new(destination, destination_dir) unless

- -      destination.start_with? destination_dir

- +      destination.start_with? destination_dir + '/'

-  

-      destination.untaint

-      destination

-    end

-  

- +  def mkdir_p_safe mkdir, mkdir_options, destination_dir, file_name

- +    destination_dir = realpath File.expand_path(destination_dir)

- +    parts = mkdir.split(File::SEPARATOR)

- +    parts.reduce do |path, basename|

- +      path = realpath path  unless path == ""

- +      path = File.expand_path(path + File::SEPARATOR + basename)

- +      lstat = File.lstat path rescue nil

- +      if !lstat || !lstat.directory?

- +        unless path.start_with? destination_dir and (FileUtils.mkdir path, mkdir_options rescue false)

- +          raise Gem::Package::PathError.new(file_name, destination_dir)

- +        end

- +      end

- +      path

- +    end

- +  end

- +

-    ##

-    # Loads a Gem::Specification from the TarEntry +entry+

-  

- @@ -603,6 +618,10 @@ def verify_files gem

-        raise Gem::Package::FormatError.new \

-                'package content (data.tar.gz) is missing', @gem

-      end

- +

- +    if duplicates = @files.group_by {|f| f }.select {|k,v| v.size > 1 }.map(&:first) and duplicates.any?

- +      raise Gem::Security::Exception, "duplicate files in the package: (#{duplicates.map(&:inspect).join(', ')})"

- +    end

-    end

-  

-    ##

- @@ -616,6 +635,16 @@ def verify_gz entry # :nodoc:

-      raise Gem::Package::FormatError.new(e.message, entry.full_name)

-    end

-  

- +  if File.respond_to? :realpath

- +    def realpath file

- +      File.realpath file

- +    end

- +  else

- +    def realpath file

- +      file

- +    end

- +  end

- +

-  end

-  

-  require 'rubygems/package/digest_io'

- diff --git lib/rubygems/package/file_source.rb lib/rubygems/package/file_source.rb

- index 1a4dc4c824..ecc3a68677 100644

- --- lib/rubygems/package/file_source.rb

- +++ lib/rubygems/package/file_source.rb

- @@ -23,11 +23,11 @@ def present?

-    end

-  

-    def with_write_io &block

- -    open path, 'wb', &block

- +    File.open path, 'wb', &block

-    end

-  

-    def with_read_io &block

- -    open path, 'rb', &block

- +    File.open path, 'rb', &block

-    end

-  

-  end

- diff --git lib/rubygems/package/old.rb lib/rubygems/package/old.rb

- index f6e6e67c38..322d682ca8 100644

- --- lib/rubygems/package/old.rb

- +++ lib/rubygems/package/old.rb

- @@ -80,7 +80,7 @@ def extract_files destination_dir

-  

-          FileUtils.mkdir_p File.dirname destination

-  

- -        open destination, 'wb', entry['mode'] do |out|

- +        File.open destination, 'wb', entry['mode'] do |out|

-            out.write file_data

-          end

-  

- diff --git lib/rubygems/package/tar_header.rb lib/rubygems/package/tar_header.rb

- index c54bd14d57..d557357114 100644

- --- lib/rubygems/package/tar_header.rb

- +++ lib/rubygems/package/tar_header.rb

- @@ -104,25 +104,30 @@ def self.from(stream)

-      fields = header.unpack UNPACK_FORMAT

-  

-      new :name     => fields.shift,

- -        :mode     => fields.shift.oct,

- -        :uid      => fields.shift.oct,

- -        :gid      => fields.shift.oct,

- -        :size     => fields.shift.oct,

- -        :mtime    => fields.shift.oct,

- -        :checksum => fields.shift.oct,

- +        :mode     => strict_oct(fields.shift),

- +        :uid      => strict_oct(fields.shift),

- +        :gid      => strict_oct(fields.shift),

- +        :size     => strict_oct(fields.shift),

- +        :mtime    => strict_oct(fields.shift),

- +        :checksum => strict_oct(fields.shift),

-          :typeflag => fields.shift,

-          :linkname => fields.shift,

-          :magic    => fields.shift,

- -        :version  => fields.shift.oct,

- +        :version  => strict_oct(fields.shift),

-          :uname    => fields.shift,

-          :gname    => fields.shift,

- -        :devmajor => fields.shift.oct,

- -        :devminor => fields.shift.oct,

- +        :devmajor => strict_oct(fields.shift),

- +        :devminor => strict_oct(fields.shift),

-          :prefix   => fields.shift,

-  

-          :empty => empty

-    end

-