[DRE-commits] [bundler] 04/14: d/patches:unvendorize: refresh patch

[Samuel Henrique]

This is an automated email from the git hooks/post-receive script.

samueloph-guest pushed a commit to branch master
in repository bundler.

commit d7105a288aca726c76dde97528a6a98801c36c2e
Author: Samuel Henrique <samueloph at gmail.com>
Date:   Thu Dec 28 20:00:03 2017 -0200

    d/patches:unvendorize: refresh patch
---
 debian/patches/unvendorize | 50 +++++++++++++++++++---------------------------
 1 file changed, 20 insertions(+), 30 deletions(-)

diff --git a/debian/patches/unvendorize b/debian/patches/unvendorize
index bac4494..66f3d41 100644
--- a/debian/patches/unvendorize
+++ b/debian/patches/unvendorize
@@ -10,25 +10,35 @@ Origin: vendor
  lib/bundler/vendored_thor.rb       | 4 ++--
  3 files changed, 3 insertions(+), 5 deletions(-)
 
---- a/lib/bundler/vendored_molinillo.rb
-+++ b/lib/bundler/vendored_molinillo.rb
-@@ -1,3 +1,3 @@
+Index: bundler/lib/bundler/vendored_molinillo.rb
+===================================================================
+--- bundler.orig/lib/bundler/vendored_molinillo.rb
++++ bundler/lib/bundler/vendored_molinillo.rb
+@@ -1,4 +1,4 @@
  # frozen_string_literal: true
+ 
  module Bundler; end
 -require "bundler/vendor/molinillo/lib/molinillo"
 +require "molinillo"
---- a/lib/bundler/vendored_persistent.rb
-+++ b/lib/bundler/vendored_persistent.rb
-@@ -14,4 +14,4 @@ module Bundler
+Index: bundler/lib/bundler/vendored_persistent.rb
+===================================================================
+--- bundler.orig/lib/bundler/vendored_persistent.rb
++++ bundler/lib/bundler/vendored_persistent.rb
+@@ -15,7 +15,7 @@ module Bundler
      end
    end
  end
 -require "bundler/vendor/net-http-persistent/lib/net/http/persistent"
 +require "net/http/persistent"
---- a/lib/bundler/vendored_thor.rb
-+++ b/lib/bundler/vendored_thor.rb
-@@ -1,7 +1,7 @@
- # frozen_string_literal: true
+ 
+ module Bundler
+   class PersistentHTTP < Persistent::Net::HTTP::Persistent
+Index: bundler/lib/bundler/vendored_thor.rb
+===================================================================
+--- bundler.orig/lib/bundler/vendored_thor.rb
++++ bundler/lib/bundler/vendored_thor.rb
+@@ -2,7 +2,7 @@
+ 
  module Bundler
    def self.require_thor_actions
 -    Kernel.send(:require, "bundler/vendor/thor/lib/thor/actions")
@@ -37,23 +47,3 @@ Origin: vendor
  end
 -require "bundler/vendor/thor/lib/thor"
 +require "thor"
---- a/lib/bundler/fetcher.rb
-+++ b/lib/bundler/fetcher.rb
-@@ -237,7 +237,7 @@ module Bundler
-           Bundler.settings[:ssl_client_cert]
-         raise SSLError if needs_ssl && !defined?(OpenSSL::SSL)
- 
--        con = Bundler::Persistent::Net::HTTP::Persistent.new "bundler", :ENV
-+        con = Net::HTTP::Persistent.new "bundler", :ENV
-         if gem_proxy = Bundler.rubygems.configuration[:http_proxy]
-           con.proxy = URI.parse(gem_proxy) if gem_proxy != :no_proxy
-         end
-@@ -273,7 +273,7 @@ module Bundler
-       Timeout::Error, EOFError, SocketError, Errno::ENETDOWN, Errno::ENETUNREACH,
-       Errno::EINVAL, Errno::ECONNRESET, Errno::ETIMEDOUT, Errno::EAGAIN,
-       Net::HTTPBadResponse, Net::HTTPHeaderSyntaxError, Net::ProtocolError,
--      Bundler::Persistent::Net::HTTP::Persistent::Error, Zlib::BufError, Errno::EHOSTUNREACH
-+      Net::HTTP::Persistent::Error, Zlib::BufError, Errno::EHOSTUNREACH
-     ].freeze
- 
-     def bundler_cert_store

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-ruby-extras/bundler.git