refresh patches

Author: sorah

…s/0010-Fix-IRBTestIRBHistory-tests.patch …s/0008-Fix-IRBTestIRBHistory-tests.patchdebian/patches/0010-Fix-IRBTestIRBHistory-tests.patch renamed to debian/patches/0008-Fix-IRBTestIRBHistory-tests.patch debian/patches/0010-Fix-IRBTestIRBHistory-tests.patch renamed to debian/patches/0008-Fix-IRBTestIRBHistory-tests.patch

@@ -1,13 +1,14 @@
-From b1509ce1c9d42bac9bc57b6ea96164711f0c85f7 Mon Sep 17 00:00:00 2001
 From: aycabta <[email protected]>
 Date: Mon, 5 Oct 2020 18:57:47 +0900
 Subject: [PATCH] Remove system method for E2E testing because depends on ruby
  command
 
 ---
- test/irb/test_history.rb | 129 +++++++++++++++++++++++----------------
- 1 file changed, 75 insertions(+), 54 deletions(-)
+ test/irb/test_history.rb | 146 +++++++++++++++++++++++++++--------------------
+ 1 file changed, 83 insertions(+), 63 deletions(-)
 
+diff --git a/test/irb/test_history.rb b/test/irb/test_history.rb
+index 3591f88..392a6af 100644
 --- a/test/irb/test_history.rb
 +++ b/test/irb/test_history.rb
 @@ -1,6 +1,7 @@
@@ -18,7 +19,7 @@ Subject: [PATCH] Remove system method for E2E testing because depends on ruby
  require 'readline'
 
  module TestIRB
-@@ -13,133 +14,152 @@
+@@ -13,133 +14,152 @@ module TestIRB
        IRB.conf[:RC_NAME_GENERATOR] = nil
      end
 

…atches/0012-Dont-use-relative-path.patch …atches/0009-Dont-use-relative-path.patchdebian/patches/0012-Dont-use-relative-path.patch renamed to debian/patches/0009-Dont-use-relative-path.patch debian/patches/0012-Dont-use-relative-path.patch renamed to debian/patches/0009-Dont-use-relative-path.patch

@@ -1,5 +1,4 @@
-From c48006c7b8dee9547b433ebd79d78cdc29002ab3 Mon Sep 17 00:00:00 2001
-From: =?UTF-8?q?David=20Rodr=C3=ADguez?= <[email protected]>
+From: =?utf-8?q?David_Rodr=C3=ADguez?= <[email protected]>
 Date: Tue, 6 Oct 2020 19:11:05 +0200
 Subject: [PATCH] Make lib/ and test/ more independent from each other
 
@@ -9,9 +8,11 @@ Subject: [PATCH] Make lib/ and test/ more independent from each other
  test/rubygems/test_gem_stub_specification.rb     | 8 ++++----
  3 files changed, 5 insertions(+), 7 deletions(-)
 
+diff --git a/lib/rubygems/test_case.rb b/lib/rubygems/test_case.rb
+index 8940320..53ba84a 100644
 --- a/lib/rubygems/test_case.rb
 +++ b/lib/rubygems/test_case.rb
-@@ -96,8 +96,6 @@
+@@ -96,8 +96,6 @@ class Gem::TestCase < (defined?(Minitest::Test) ? Minitest::Test : MiniTest::Uni
 
    TEST_PATH = ENV.fetch('RUBYGEMS_TEST_PATH', File.expand_path('../../../test/rubygems', __FILE__))
 
@@ -20,9 +21,11 @@ Subject: [PATCH] Make lib/ and test/ more independent from each other
    def assert_activate(expected, *specs)
      specs.each do |spec|
        case spec
+diff --git a/test/rubygems/test_gem_commands_build_command.rb b/test/rubygems/test_gem_commands_build_command.rb
+index 309e15f..aaca54f 100644
 --- a/test/rubygems/test_gem_commands_build_command.rb
 +++ b/test/rubygems/test_gem_commands_build_command.rb
-@@ -123,7 +123,7 @@
+@@ -123,7 +123,7 @@ class TestGemCommandsBuildCommand < Gem::TestCase
    end
 
    def test_execute_rubyforge_project_warning
@@ -31,9 +34,11 @@ Subject: [PATCH] Make lib/ and test/ more independent from each other
 
      @cmd.options[:args] = [rubyforge_gemspec]
 
+diff --git a/test/rubygems/test_gem_stub_specification.rb b/test/rubygems/test_gem_stub_specification.rb
+index 91a46d7..2579f8a 100644
 --- a/test/rubygems/test_gem_stub_specification.rb
 +++ b/test/rubygems/test_gem_stub_specification.rb
-@@ -4,14 +4,14 @@
+@@ -4,14 +4,14 @@ require "rubygems/stub_specification"
 
  class TestStubSpecification < Gem::TestCase
 

debian/patches/0010-Fix-getcwd-ENOENT.patch

@@ -1,16 +1,18 @@
 From: Antoni Villalonga <[email protected]>
 Date: Fri, 28 Aug 2020 02:09:42 +0200
 Subject: Rescue getcwd ENOENT error
-Forwarded: not-needed
-Bug-Debian: http://bugs.debian.org/969130
-Upstream-Author: David Rodríguez
 
 Rescue ENOENT error allowing run ruby scripts when cwd does not exists.
 Cherry-pick from upstream 96064e6f1ce100a37680dc8f9509f06b3350e9c8
+---
+ lib/rubygems/bundler_version_finder.rb | 17 ++++++++++++-----
+ 1 file changed, 12 insertions(+), 5 deletions(-)
 
+diff --git a/lib/rubygems/bundler_version_finder.rb b/lib/rubygems/bundler_version_finder.rb
+index 38da773..ea6698f 100644
 --- a/lib/rubygems/bundler_version_finder.rb
 +++ b/lib/rubygems/bundler_version_finder.rb
-@@ -82,12 +82,19 @@
+@@ -82,12 +82,19 @@ To install the missing version, run `gem install bundler:#{vr.first}`
    def self.lockfile_contents
      gemfile = ENV["BUNDLE_GEMFILE"]
      gemfile = nil if gemfile && gemfile.empty?

debian/patches/series

@@ -5,6 +5,6 @@
 0005-exclude-several-tests-unstable-in-Docker.patch
 0006-Fix-priority-order-of-paths-in-I-option.patch
 0007-Fix-FTBFS-on-x32-misdetected-as-i386-or-amd64.patch
-0010-Fix-IRBTestIRBHistory-tests.patch
-0012-Dont-use-relative-path.patch
+0008-Fix-IRBTestIRBHistory-tests.patch
+0009-Dont-use-relative-path.patch
 0010-Fix-getcwd-ENOENT.patch