refresh patches

Author: sorah

debian/patches/0001-rdoc-build-reproducible-documentation.patch

@@ -13,10 +13,10 @@ Signed-off-by: Christian Hofstaedtler <[email protected]>
  2 files changed, 3 insertions(+), 3 deletions(-)
 
 diff --git a/lib/rdoc/generator/json_index.rb b/lib/rdoc/generator/json_index.rb
-index e4cfe96..bcf5b00 100644
+index 3a10000..f40bb37 100644
 --- a/lib/rdoc/generator/json_index.rb
 +++ b/lib/rdoc/generator/json_index.rb
-@@ -175,7 +175,7 @@ def generate_gzipped
+@@ -178,7 +178,7 @@ def generate_gzipped
      debug_msg "Writing gzipped search index to %s" % outfile
 
      Zlib::GzipWriter.open(outfile) do |gz|
@@ -25,7 +25,7 @@ index e4cfe96..bcf5b00 100644
        gz.orig_name = search_index_file.basename.to_s
        gz.write search_index
        gz.close
-@@ -193,7 +193,7 @@ def generate_gzipped
+@@ -196,7 +196,7 @@ def generate_gzipped
          debug_msg "Writing gzipped file to %s" % outfile
 
          Zlib::GzipWriter.open(outfile) do |gz|
@@ -35,10 +35,10 @@ index e4cfe96..bcf5b00 100644
            gz.write data
            gz.close
 diff --git a/lib/rdoc/rdoc.rb b/lib/rdoc/rdoc.rb
-index 68775c8..9cc583f 100644
+index ca2c1ab..b387287 100644
 --- a/lib/rdoc/rdoc.rb
 +++ b/lib/rdoc/rdoc.rb
-@@ -315,7 +315,7 @@ def normalized_file_list(relative_files, force_doc = false,
+@@ -312,7 +312,7 @@ def normalized_file_list(relative_files, force_doc = false,
        end
      end
 

debian/patches/0002-lib-mkmf.rb-sort-list-of-object-files-in-generated-M.patch

@@ -14,10 +14,10 @@ Signed-off-by: Reiner Herrmann <[email protected]>
  1 file changed, 1 insertion(+), 1 deletion(-)
 
 diff --git a/lib/mkmf.rb b/lib/mkmf.rb
-index 74b4228..ae77bb4 100644
+index 0d9d3d9..3a18be8 100644
 --- a/lib/mkmf.rb
 +++ b/lib/mkmf.rb
-@@ -2284,7 +2284,7 @@ def create_makefile(target, srcprefix = nil)
+@@ -2297,7 +2297,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(' ')}

debian/patches/0003-Mark-Gemspec-reproducible-change-fixing-784225-too.patch

@@ -12,10 +12,10 @@ Signed-off-by: Christian Hofstaedtler <[email protected]>
  1 file changed, 3 insertions(+), 1 deletion(-)
 
 diff --git a/lib/rubygems/specification.rb b/lib/rubygems/specification.rb
-index 2560324..07fdd30 100644
+index bba3ffe..f6f0326 100644
 --- a/lib/rubygems/specification.rb
 +++ b/lib/rubygems/specification.rb
-@@ -1787,7 +1787,9 @@ def date= date
+@@ -1760,7 +1760,9 @@ def date=(date)
                  raise(Gem::InvalidSpecificationException,
                        "invalid date format in specification: #{date.inspect}")
                end

debian/patches/0004-Make-gemspecs-reproducible.patch

@@ -13,7 +13,7 @@ build unreproducible
  5 files changed, 5 insertions(+), 1 deletion(-)
 
 diff --git a/ext/bigdecimal/bigdecimal.gemspec b/ext/bigdecimal/bigdecimal.gemspec
-index c8c9087..9cf22f7 100644
+index 68d8f3c..c73fefe 100644
 --- a/ext/bigdecimal/bigdecimal.gemspec
 +++ b/ext/bigdecimal/bigdecimal.gemspec
 @@ -6,6 +6,7 @@
@@ -37,7 +37,7 @@ index b29f4ec..36ed213 100644
    spec.email         = ["[email protected]", "[email protected]"]
 
 diff --git a/ext/io/console/io-console.gemspec b/ext/io/console/io-console.gemspec
-index 822d3eb..18d2887 100644
+index 02da13f..353b559 100644
 --- a/ext/io/console/io-console.gemspec
 +++ b/ext/io/console/io-console.gemspec
 @@ -5,7 +5,7 @@
@@ -50,19 +50,19 @@ index 822d3eb..18d2887 100644
    s.email = "[email protected]"
    s.description = "add console capabilities to IO instances."
 diff --git a/lib/ipaddr.gemspec b/lib/ipaddr.gemspec
-index 16df170..433e43b 100644
+index 2de9ef4..9c27ab8 100644
 --- a/lib/ipaddr.gemspec
 +++ b/lib/ipaddr.gemspec
-@@ -5,6 +5,7 @@
+@@ -6,6 +6,7 @@
  Gem::Specification.new do |spec|
    spec.name          = "ipaddr"
-   spec.version       = "1.2.0"
-+  spec.date          = RUBY_RELEASE_DATE
+   spec.version       = "1.2.2"
++  spec.date             = RUBY_RELEASE_DATE
    spec.authors       = ["Akinori MUSHA", "Hajimu UMEMOTO"]
    spec.email         = ["[email protected]", "[email protected]"]
 
 diff --git a/lib/rdoc/rdoc.gemspec b/lib/rdoc/rdoc.gemspec
-index 8c92908..0e6c0c7 100644
+index 9c6fbe1..de748ed 100644
 --- a/lib/rdoc/rdoc.gemspec
 +++ b/lib/rdoc/rdoc.gemspec
 @@ -7,6 +7,7 @@
@@ -71,5 +71,5 @@ index 8c92908..0e6c0c7 100644
    s.name = "rdoc"
 +  s.date = RUBY_RELEASE_DATE
    s.version = RDoc::VERSION
-   s.date = "2017-12-24"
 
+   s.authors = [

debian/patches/0006-exclude-several-tests-unstable-in-Docker.patch renamed to debian/patches/0005-exclude-several-tests-unstable-in-Docker.patch

@@ -7,14 +7,14 @@ Subject: exclude several tests unstable in Docker
  1 file changed, 1 insertion(+)
 
 diff --git a/test/dtrace/helper.rb b/test/dtrace/helper.rb
-index 5828bcd..f38f052 100644
+index 023d116..500da5d 100644
 --- a/test/dtrace/helper.rb
 +++ b/test/dtrace/helper.rb
-@@ -21,6 +21,7 @@
-   end
+@@ -53,6 +53,7 @@
+   cmd = false
  end
- ok &= (`dtrace -V` rescue false)
+ ok &= system(*cmd, err: IO::NULL, out: IO::NULL) if cmd
 +ok = false # Doesn't work properly inside Docker build
+ 
  module DTrace
    class TestCase < Test::Unit::TestCase
-     INCLUDE = File.expand_path('..', File.dirname(__FILE__))

debian/patches/0005-ia64-update-ia64-specific-code-to-use-execution-cont.patch

@@ -14,7 +14,7 @@ Signed-off-by: Svante Signell <[email protected]>
  4 files changed, 26 insertions(+), 2 deletions(-)
 
 diff --git a/ext/socket/option.c b/ext/socket/option.c
-index bf3af17..8fa2932 100644
+index 5ad44cd..87ddbc9 100644
 --- a/ext/socket/option.c
 +++ b/ext/socket/option.c
 @@ -10,6 +10,7 @@ VALUE rb_cSockOpt;
@@ -26,7 +26,7 @@ index bf3af17..8fa2932 100644
      defined(__APPLE__) || \
      defined(_WIN32) || \
 diff --git a/ext/socket/raddrinfo.c b/ext/socket/raddrinfo.c
-index dcabb20..595bb5f 100644
+index 4c6a9b5..a432553 100644
 --- a/ext/socket/raddrinfo.c
 +++ b/ext/socket/raddrinfo.c
 @@ -1670,10 +1670,21 @@ addrinfo_mload(VALUE self, VALUE ary)
@@ -74,18 +74,18 @@ index dcabb20..595bb5f 100644
          e--;
      return rb_str_new(s, e-s);
 diff --git a/test/fiddle/test_handle.rb b/test/fiddle/test_handle.rb
-index 77559eb..040b16c 100644
+index c0fac39..3187800 100644
 --- a/test/fiddle/test_handle.rb
 +++ b/test/fiddle/test_handle.rb
-@@ -169,6 +169,7 @@ def test_DEFAULT
+@@ -173,6 +173,7 @@ def test_DEFAULT
      end unless /mswin|mingw/ =~ RUBY_PLATFORM
 
      def test_dlerror
 +      return if /kfreebsd/ =~ RUBY_PLATFORM
        # FreeBSD (at least 7.2 to 7.2) calls nsdispatch(3) when it calls
        # getaddrinfo(3). And nsdispatch(3) doesn't call dlerror(3) even if
        # it calls _nss_cache_cycle_prevention_function with dlsym(3).
-@@ -177,7 +178,7 @@ def test_dlerror
+@@ -181,7 +182,7 @@ def test_dlerror
        require 'socket'
        Socket.gethostbyname("localhost")
        Fiddle.dlopen("/lib/libc.so.7").sym('strcpy')
@@ -95,10 +95,10 @@ index 77559eb..040b16c 100644
      def test_no_memory_leak
        assert_no_memory_leak(%w[-W0 -rfiddle.so], '', '100_000.times {Fiddle::Handle.allocate}; GC.start', rss: true)
 diff --git a/test/socket/test_socket.rb b/test/socket/test_socket.rb
-index 126f789..f2d350d 100644
+index e07c1d6..88614cb 100644
 --- a/test/socket/test_socket.rb
 +++ b/test/socket/test_socket.rb
-@@ -507,7 +507,7 @@ def test_timestampns
+@@ -521,7 +521,7 @@ def test_timestampns
    end
 
    def test_bintime

debian/patches/0006-Fix-FTBFS-on-hurd.patch

@@ -2,8 +2,5 @@
 0002-lib-mkmf.rb-sort-list-of-object-files-in-generated-M.patch
 0003-Mark-Gemspec-reproducible-change-fixing-784225-too.patch
 0004-Make-gemspecs-reproducible.patch
-0005-ia64-update-ia64-specific-code-to-use-execution-cont.patch
-0006-exclude-several-tests-unstable-in-Docker.patch
-0006-Fix-FTBFS-on-hurd.patch
-0007-Port-to-kfreebsd-amd64.patch
-0009-Update-for-tzdata-2018f-r65365.patch
+0005-exclude-several-tests-unstable-in-Docker.patch
+0006-Port-to-kfreebsd-amd64.patch