[DRE-commits] [ruby-httpclient] 01/06: 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-httpclient.

commit 173a811dcc61123cd97316cdbea051f8dc40914d
Author: Pirate Praveen <praveen at debian.org>
Date:   Mon Jul 31 19:54:32 2017 +0530

    refresh patches
---
 .../patches/0003-Try-to-wait-until-socket-is-free.patch  | 16 ++++++++--------
 debian/patches/0005-tweak-test-dep-change.patch          |  2 +-
 2 files changed, 9 insertions(+), 9 deletions(-)

diff --git a/debian/patches/0003-Try-to-wait-until-socket-is-free.patch b/debian/patches/0003-Try-to-wait-until-socket-is-free.patch
index 3ebe681..5414c32 100644
--- a/debian/patches/0003-Try-to-wait-until-socket-is-free.patch
+++ b/debian/patches/0003-Try-to-wait-until-socket-is-free.patch
@@ -12,7 +12,7 @@ Subject: Try to wait until socket is free
 
 --- a/test/helper.rb
 +++ b/test/helper.rb
-@@ -76,6 +76,9 @@ module Helper
+@@ -76,6 +76,9 @@
      )
      @proxyport = @proxyserver.config[:Port]
      @proxyserver_thread = start_server_thread(@proxyserver)
@@ -24,7 +24,7 @@ Subject: Try to wait until socket is free
    def teardown_client
 --- a/test/test_auth.rb
 +++ b/test/test_auth.rb
-@@ -18,13 +18,18 @@ class TestAuth < Test::Unit::TestCase
+@@ -17,13 +17,18 @@
    end
  
    def setup_server
@@ -50,7 +50,7 @@ Subject: Try to wait until socket is free
      @serverport = @server.config[:Port]
      @server.mount(
        '/basic_auth',
-@@ -84,13 +89,18 @@ class TestAuth < Test::Unit::TestCase
+@@ -83,13 +88,18 @@
        :UserDB => htdigest_userdb
      )
  
@@ -78,7 +78,7 @@ Subject: Try to wait until socket is free
    end
 --- a/test/test_http-access2.rb
 +++ b/test/test_http-access2.rb
-@@ -398,6 +398,9 @@ private
+@@ -400,6 +400,9 @@
      end
      @server.mount('/servlet', TestServlet.new(@server))
      @server_thread = start_server_thread(@server)
@@ -90,7 +90,7 @@ Subject: Try to wait until socket is free
    def escape_noproxy
 --- a/test/test_httpclient.rb
 +++ b/test/test_httpclient.rb
-@@ -1879,6 +1879,9 @@ private
+@@ -1955,6 +1955,9 @@
      end
      @server.mount('/servlet', TestServlet.new(@server))
      @server_thread = start_server_thread(@server)
@@ -102,7 +102,7 @@ Subject: Try to wait until socket is free
    def add_query_string(req)
 --- a/test/test_ssl.rb
 +++ b/test/test_ssl.rb
-@@ -285,6 +285,9 @@ private
+@@ -466,6 +466,9 @@
        )
      end
      @server_thread = start_server_thread(@server)
@@ -112,7 +112,7 @@ Subject: Try to wait until socket is free
    end
  
    def setup_server_with_ssl_version(ssl_version)
-@@ -310,6 +313,9 @@ private
+@@ -522,6 +525,9 @@
        )
      end
      @server_thread = start_server_thread(@server)
@@ -124,7 +124,7 @@ Subject: Try to wait until socket is free
    def do_hello(req, res)
 --- a/test/test_jsonclient.rb
 +++ b/test/test_jsonclient.rb
-@@ -76,5 +76,8 @@ class TestJSONClient < Test::Unit::TestC
+@@ -76,5 +76,8 @@
      @serverport = @server.config[:Port]
      @server.mount('/json', JSONServlet.new(@server))
      @server_thread = start_server_thread(@server)
diff --git a/debian/patches/0005-tweak-test-dep-change.patch b/debian/patches/0005-tweak-test-dep-change.patch
index c4e831f..68927e1 100644
--- a/debian/patches/0005-tweak-test-dep-change.patch
+++ b/debian/patches/0005-tweak-test-dep-change.patch
@@ -8,7 +8,7 @@ Last-Update: 2016-01-12
 This patch header follows DEP-3: http://dep.debian.net/deps/dep3/
 --- a/test/test_ssl.rb
 +++ b/test/test_ssl.rb
-@@ -218,8 +218,8 @@ end
+@@ -247,8 +247,8 @@
  
    def test_no_sslv3
      teardown_server

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