[DRE-commits] [ruby-http] 04/05: refresh patches

[Praveen Arimbrathodiyil]

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

praveen pushed a commit to branch master
in repository ruby-http.

commit fc4fa623c123cd6fc9188e2210c761533abe1df2
Author: Pirate Praveen <praveen at debian.org>
Date:   Thu Jul 27 15:53:23 2017 +0530

    refresh patches
---
 .../patches/add-missing-x509v3-extensions-in-spec  | 10 ++++------
 debian/patches/disable-network-tests.patch         | 22 +++++++++-------------
 2 files changed, 13 insertions(+), 19 deletions(-)

diff --git a/debian/patches/add-missing-x509v3-extensions-in-spec b/debian/patches/add-missing-x509v3-extensions-in-spec
index bf36b4c..1ea6ccd 100644
--- a/debian/patches/add-missing-x509v3-extensions-in-spec
+++ b/debian/patches/add-missing-x509v3-extensions-in-spec
@@ -1,8 +1,6 @@
-Index: ruby-http/spec/support/ssl_helper.rb
-===================================================================
---- ruby-http.orig/spec/support/ssl_helper.rb	2016-12-05 22:51:31.319414848 -0500
-+++ ruby-http/spec/support/ssl_helper.rb	2016-12-05 22:53:22.212685884 -0500
-@@ -33,6 +33,8 @@
+--- a/spec/support/ssl_helper.rb
++++ b/spec/support/ssl_helper.rb
+@@ -34,6 +34,8 @@
    end
  
    class ChildCertificate < ::CertificateAuthority::Certificate
@@ -11,7 +9,7 @@ Index: ruby-http/spec/support/ssl_helper.rb
      def initialize(parent)
        super()
  
-@@ -43,7 +45,8 @@
+@@ -44,7 +46,8 @@
  
        self.parent = parent
  
diff --git a/debian/patches/disable-network-tests.patch b/debian/patches/disable-network-tests.patch
index 8917ce2..6db056b 100644
--- a/debian/patches/disable-network-tests.patch
+++ b/debian/patches/disable-network-tests.patch
@@ -3,11 +3,9 @@ Author: Matthias Klose <doko at ubuntu.com>
 Origin: vendor
 Forwarded: not-needed
 
-Index: ruby-http/spec/lib/http/client_spec.rb
-===================================================================
---- ruby-http.orig/spec/lib/http/client_spec.rb
-+++ ruby-http/spec/lib/http/client_spec.rb
-@@ -87,7 +87,7 @@ RSpec.describe HTTP::Client do
+--- a/spec/lib/http/client_spec.rb
++++ b/spec/lib/http/client_spec.rb
+@@ -88,7 +88,7 @@
      end
  
      context "with non-ASCII URLs" do
@@ -16,7 +14,7 @@ Index: ruby-http/spec/lib/http/client_spec.rb
          client = StubbedClient.new(:follow => true).stub(
            "http://example.com/"      => redirect_response("/könig"),
            "http://example.com/könig" => simple_response("OK")
-@@ -96,7 +96,7 @@ RSpec.describe HTTP::Client do
+@@ -97,7 +97,7 @@
          expect { client.get "http://example.com/könig" }.not_to raise_error
        end
  
@@ -25,7 +23,7 @@ Index: ruby-http/spec/lib/http/client_spec.rb
          url    = "http://git.io/jNeY"
          client = HTTP.follow
          expect(client.get(url).to_s).to include "support for non-ascii URIs"
-@@ -172,12 +172,12 @@ RSpec.describe HTTP::Client do
+@@ -173,12 +173,12 @@
  
    describe "#request" do
      context "with non-ASCII URLs" do
@@ -40,7 +38,7 @@ Index: ruby-http/spec/lib/http/client_spec.rb
          url     = "https://github.com/httprb/http.rb/pull/197/ö無"
          client  = HTTP.follow
          expect(client.get(url).to_s).to include "support for non-ascii URIs"
-@@ -188,7 +188,7 @@ RSpec.describe HTTP::Client do
+@@ -189,7 +189,7 @@
        let(:headers) { {"Host" => "another.example.com"} }
        let(:client)  { described_class.new :headers => headers }
  
@@ -49,11 +47,9 @@ Index: ruby-http/spec/lib/http/client_spec.rb
          expect(client).to receive(:perform) do |req, _|
            expect(req["Host"]).to eq "another.example.com"
          end
-Index: ruby-http/spec/lib/http_spec.rb
-===================================================================
---- ruby-http.orig/spec/lib/http_spec.rb
-+++ ruby-http/spec/lib/http_spec.rb
-@@ -259,16 +259,16 @@ RSpec.describe HTTP do
+--- a/spec/lib/http_spec.rb
++++ b/spec/lib/http_spec.rb
+@@ -272,16 +272,16 @@
  
      context "with host only given" do
        subject { HTTP.persistent host }

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