remove local changes

sorah · sorah · commit 10f58c0f45ca · 2017-12-14T19:26:25.000Z
diff --git a/debian/patches/0001-rdoc-build-reproducible-documentation.patch b/debian/patches/0001-rdoc-build-reproducible-documentation.patch
@@ -13,7 +13,7 @@ Signed-off-by: Christian Hofstaedtler <zeha@debian.org>
  2 files changed, 3 insertions(+), 3 deletions(-)
 
 diff --git a/lib/rdoc/generator/json_index.rb b/lib/rdoc/generator/json_index.rb
-index ea9384e..3ad0152 100644
+index e4cfe96..bcf5b00 100644
 --- a/lib/rdoc/generator/json_index.rb
 +++ b/lib/rdoc/generator/json_index.rb
 @@ -175,7 +175,7 @@ def generate_gzipped
@@ -35,7 +35,7 @@ index ea9384e..3ad0152 100644
            gz.write data
            gz.close
 diff --git a/lib/rdoc/rdoc.rb b/lib/rdoc/rdoc.rb
-index adcb65b..f07dba1 100644
+index 68775c8..9cc583f 100644
 --- a/lib/rdoc/rdoc.rb
 +++ b/lib/rdoc/rdoc.rb
 @@ -315,7 +315,7 @@ def normalized_file_list(relative_files, force_doc = false,
diff --git a/debian/patches/0002-lib-mkmf.rb-sort-list-of-object-files-in-generated-M.patch b/debian/patches/0002-lib-mkmf.rb-sort-list-of-object-files-in-generated-M.patch
@@ -14,10 +14,10 @@ Signed-off-by: Reiner Herrmann <reiner@reiner-h.de>
  1 file changed, 1 insertion(+), 1 deletion(-)
 
 diff --git a/lib/mkmf.rb b/lib/mkmf.rb
-index 7e40c2d..a7e9d77 100644
+index 7f53bb4..7219ab9 100644
 --- a/lib/mkmf.rb
 +++ b/lib/mkmf.rb
-@@ -2281,7 +2281,7 @@ def create_makefile(target, srcprefix = nil)
+@@ -2283,7 +2283,7 @@ def create_makefile(target, srcprefix = nil)
  LIBS = #{$LIBRUBYARG} #{$libs} #{$LIBS}
  ORIG_SRCS = #{orig_srcs.collect(&File.method(:basename)).join(' ')}
  SRCS = $(ORIG_SRCS) #{(srcs - orig_srcs).collect(&File.method(:basename)).join(' ')}
diff --git a/debian/patches/0004-Make-gemspecs-reproducible.patch b/debian/patches/0004-Make-gemspecs-reproducible.patch
@@ -11,12 +11,12 @@ unreproducible
  3 files changed, 3 insertions(+), 1 deletion(-)
 
 diff --git a/ext/bigdecimal/bigdecimal.gemspec b/ext/bigdecimal/bigdecimal.gemspec
-index 4efe438..c0d19e7 100644
+index c1f7da4..30bad7e 100644
 --- a/ext/bigdecimal/bigdecimal.gemspec
 +++ b/ext/bigdecimal/bigdecimal.gemspec
-@@ -5,6 +5,7 @@
+@@ -6,6 +6,7 @@
    s.name          = "bigdecimal"
-   s.version       = _VERSION
+   s.version       = bigdecimal_version
    s.authors       = ["Kenta Murata", "Zachary Scott", "Shigeo Kobayashi"]
 +  s.date          = RUBY_RELEASE_DATE
    s.email         = ["mrkn@mrkn.jp"]
@@ -36,7 +36,7 @@ index 1256162..99e18bd 100644
    s.email = "nobu@ruby-lang.org"
    s.description = "add console capabilities to IO instances."
 diff --git a/lib/rdoc/rdoc.gemspec b/lib/rdoc/rdoc.gemspec
-index 2787f07..578c023 100644
+index 57a6698..5a8a96c 100644
 --- a/lib/rdoc/rdoc.gemspec
 +++ b/lib/rdoc/rdoc.gemspec
 @@ -7,6 +7,7 @@
@@ -45,5 +45,5 @@ index 2787f07..578c023 100644
    s.name = "rdoc"
 +  s.date = RUBY_RELEASE_DATE
    s.version = RDoc::VERSION
-   s.date = "2017-10-10"
+   s.date = "2017-12-05"
  
diff --git a/ext/bigdecimal/bigdecimal.gemspec b/ext/bigdecimal/bigdecimal.gemspec
@@ -5,7 +5,6 @@ bigdecimal_version = '1.3.3'
 Gem::Specification.new do |s|
   s.name          = "bigdecimal"
   s.version       = bigdecimal_version
-  s.date          = RUBY_RELEASE_DATE
   s.authors       = ["Kenta Murata", "Zachary Scott", "Shigeo Kobayashi"]
   s.email         = ["mrkn@mrkn.jp"]
 
diff --git a/ext/io/console/io-console.gemspec b/ext/io/console/io-console.gemspec
@@ -1,10 +1,11 @@
 # -*- ruby -*-
 _VERSION = "0.4.6"
+date = %w$Date::                           $[1]
 
 Gem::Specification.new do |s|
   s.name = "io-console"
   s.version = _VERSION
-  s.date = RUBY_RELEASE_DATE
+  s.date = date
   s.summary = "Console interface"
   s.email = "nobu@ruby-lang.org"
   s.description = "add console capabilities to IO instances."
diff --git a/lib/mkmf.rb b/lib/mkmf.rb
@@ -2283,7 +2283,7 @@ def create_makefile(target, srcprefix = nil)
 LIBS = #{$LIBRUBYARG} #{$libs} #{$LIBS}
 ORIG_SRCS = #{orig_srcs.collect(&File.method(:basename)).join(' ')}
 SRCS = $(ORIG_SRCS) #{(srcs - orig_srcs).collect(&File.method(:basename)).join(' ')}
-OBJS = #{$objs.sort.join(" ")}
+OBJS = #{$objs.join(" ")}
 HDRS = #{hdrs.map{|h| '$(srcdir)/' + File.basename(h)}.join(' ')}
 LOCAL_HDRS = #{$headers.join(' ')}
 TARGET = #{target}
diff --git a/lib/rdoc/generator/json_index.rb b/lib/rdoc/generator/json_index.rb
@@ -175,7 +175,7 @@ def generate_gzipped
     debug_msg "Writing gzipped search index to %s" % outfile
 
     Zlib::GzipWriter.open(outfile) do |gz|
-      gz.mtime = -1
+      gz.mtime = File.mtime(search_index_file)
       gz.orig_name = search_index_file.basename.to_s
       gz.write search_index
       gz.close
@@ -193,7 +193,7 @@ def generate_gzipped
         debug_msg "Writing gzipped file to %s" % outfile
 
         Zlib::GzipWriter.open(outfile) do |gz|
-          gz.mtime = -1
+          gz.mtime = File.mtime(dest)
           gz.orig_name = dest.basename.to_s
           gz.write data
           gz.close
diff --git a/lib/rdoc/rdoc.gemspec b/lib/rdoc/rdoc.gemspec
@@ -7,7 +7,6 @@ end
 
 Gem::Specification.new do |s|
   s.name = "rdoc"
-  s.date = RUBY_RELEASE_DATE
   s.version = RDoc::VERSION
   s.date = "2017-12-05"
 
diff --git a/lib/rdoc/rdoc.rb b/lib/rdoc/rdoc.rb
@@ -315,7 +315,7 @@ def normalized_file_list(relative_files, force_doc = false,
       end
     end
 
-    file_list.flatten.sort
+    file_list.flatten
   end
 
   ##
diff --git a/lib/rubygems/specification.rb b/lib/rubygems/specification.rb
@@ -1786,9 +1786,7 @@ def date= date
                 raise(Gem::InvalidSpecificationException,
                       "invalid date format in specification: #{date.inspect}")
               end
-            when Time then
-              Time.utc(date.utc.year, date.utc.month, date.utc.day)
-            when DateLike then
+            when Time, DateLike then
               Time.utc(date.year, date.month, date.day)
             else
               TODAY
diff --git a/test/excludes/TestProcess.rb b/test/excludes/TestProcess.rb
diff --git a/test/excludes/TestRefinement.rb b/test/excludes/TestRefinement.rb
diff --git a/test/ruby/test_array.rb b/test/ruby/test_array.rb
@@ -1963,8 +1963,7 @@ def test_permutation
 
   def test_permutation_stack_error
     bug9932 = '[ruby-core:63103] [Bug #9932]'
-    # On some platforms (armel, mips), permutation is very expensive/slow.
-    assert_separately([], "#{<<~"begin;"}\n#{<<~'end;'}", timeout: 60)
+    assert_separately([], "#{<<~"begin;"}\n#{<<~'end;'}", timeout: 30)
     bug = "#{bug9932}"
     begin;
       assert_nothing_raised(SystemStackError, bug) do
diff --git a/test/ruby/test_dir.rb b/test/ruby/test_dir.rb
@@ -329,7 +329,7 @@ def test_glob_legacy_short_name
     end
   end
 
-  def xtest_home
+  def test_home
     env_home = ENV["HOME"]
     env_logdir = ENV["LOGDIR"]
     ENV.delete("HOME")
diff --git a/test/ruby/test_file_exhaustive.rb b/test/ruby/test_file_exhaustive.rb
@@ -1076,7 +1076,7 @@ def test_expand_path_for_existent_username
     user = ENV['USER']
     skip "ENV['USER'] is not set" unless user
     assert_equal(ENV['HOME'], File.expand_path("~#{user}"))
-  end if false  # does not work in sbuild/buildd environments
+  end unless DRIVE
 
   def test_expand_path_error_for_nonexistent_username
     user = "\u{3086 3046 3066 3044}:\u{307F 3084 304A 3046}"
diff --git a/test/ruby/test_gc.rb b/test/ruby/test_gc.rb
@@ -212,7 +212,7 @@ def test_gc_parameter
     assert_in_out_err([env, "-w", "-e", "exit"], "", [], /RUBY_GC_HEAP_OLDOBJECT_LIMIT_FACTOR=0\.9/, "")
 
     # always full GC when RUBY_GC_HEAP_OLDOBJECT_LIMIT_FACTOR < 1.0
-    assert_in_out_err([env, "-e", "1000_000.times{Object.new}; p(GC.stat[:minor_gc_count] < GC.stat[:major_gc_count])"], "", ['true'], //, "", timeout: 30) if use_rgengc?
+    assert_in_out_err([env, "-e", "1000_000.times{Object.new}; p(GC.stat[:minor_gc_count] < GC.stat[:major_gc_count])"], "", ['true'], //, "") if use_rgengc?
 
     # check obsolete
     assert_in_out_err([{'RUBY_FREE_MIN' => '100'}, '-w', '-eexit'], '', [],
