[DRE-commits] [ruby-httpclient] 02/03: Refresh patches

[Sruthi Chandran]

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

srud-guest pushed a commit to branch master
in repository ruby-httpclient.

commit 79ce544a136010c21551ea8673d5335b274a77b9
Author: Sruthi Chandran <srud at disroot.org>
Date:   Thu Jul 20 14:08:13 2017 +0530

    Refresh patches
---
 debian/patches/0001-Fix-port-allocation-in-tests.patch | 16 ++++++++--------
 debian/patches/0002-Disable-tests-for-NTLM.patch       | 10 +++++-----
 2 files changed, 13 insertions(+), 13 deletions(-)

diff --git a/debian/patches/0001-Fix-port-allocation-in-tests.patch b/debian/patches/0001-Fix-port-allocation-in-tests.patch
index bad2081..c814349 100644
--- a/debian/patches/0001-Fix-port-allocation-in-tests.patch
+++ b/debian/patches/0001-Fix-port-allocation-in-tests.patch
@@ -21,7 +21,7 @@ Subject: Fix port allocation in tests
 
 --- a/test/helper.rb
 +++ b/test/helper.rb
-@@ -71,7 +71,7 @@ module Helper
+@@ -71,7 +71,7 @@
      @proxyserver = WEBrick::HTTPProxyServer.new(
        :BindAddress => "localhost",
        :Logger => @proxylogger,
@@ -32,7 +32,7 @@ Subject: Fix port allocation in tests
      @proxyport = @proxyserver.config[:Port]
 --- a/test/test_auth.rb
 +++ b/test/test_auth.rb
-@@ -21,7 +21,7 @@ class TestAuth < Test::Unit::TestCase
+@@ -20,7 +20,7 @@
      @server = WEBrick::HTTPServer.new(
        :BindAddress => "localhost",
        :Logger => @logger,
@@ -41,7 +41,7 @@ Subject: Fix port allocation in tests
        :AccessLog => [],
        :DocumentRoot => File.dirname(File.expand_path(__FILE__))
      )
-@@ -88,7 +88,7 @@ class TestAuth < Test::Unit::TestCase
+@@ -87,7 +87,7 @@
        :ProxyAuthProc => @proxy_digest_auth.method(:authenticate).to_proc,
        :BindAddress => "localhost",
        :Logger => @proxylogger,
@@ -52,7 +52,7 @@ Subject: Fix port allocation in tests
      @proxyport = @proxyserver.config[:Port]
 --- a/test/test_http-access2.rb
 +++ b/test/test_http-access2.rb
-@@ -385,7 +385,7 @@ private
+@@ -387,7 +387,7 @@
      @server = WEBrick::HTTPServer.new(
        :BindAddress => "localhost",
        :Logger => @logger,
@@ -63,7 +63,7 @@ Subject: Fix port allocation in tests
      )
 --- a/test/test_httpclient.rb
 +++ b/test/test_httpclient.rb
-@@ -1862,7 +1862,7 @@ private
+@@ -1938,7 +1938,7 @@
      @server = WEBrick::HTTPServer.new(
        :BindAddress => "localhost",
        :Logger => @logger,
@@ -74,7 +74,7 @@ Subject: Fix port allocation in tests
      )
 --- a/test/test_ssl.rb
 +++ b/test/test_ssl.rb
-@@ -266,7 +266,7 @@ private
+@@ -447,7 +447,7 @@
      @server = WEBrick::HTTPServer.new(
        :BindAddress => "localhost",
        :Logger => logger,
@@ -83,7 +83,7 @@ Subject: Fix port allocation in tests
        :AccessLog => [],
        :DocumentRoot => DIR,
        :SSLEnable => true,
-@@ -293,7 +293,7 @@ private
+@@ -478,7 +478,7 @@
      @server = WEBrick::HTTPServer.new(
        :BindAddress => "localhost",
        :Logger => logger,
@@ -94,7 +94,7 @@ Subject: Fix port allocation in tests
        :SSLEnable => true,
 --- a/test/test_jsonclient.rb
 +++ b/test/test_jsonclient.rb
-@@ -69,7 +69,7 @@ class TestJSONClient < Test::Unit::TestC
+@@ -69,7 +69,7 @@
      @server = WEBrick::HTTPServer.new(
        :BindAddress => "localhost",
        :Logger => @logger,
diff --git a/debian/patches/0002-Disable-tests-for-NTLM.patch b/debian/patches/0002-Disable-tests-for-NTLM.patch
index b01db89..19b9840 100644
--- a/debian/patches/0002-Disable-tests-for-NTLM.patch
+++ b/debian/patches/0002-Disable-tests-for-NTLM.patch
@@ -8,16 +8,16 @@ Subject: Disable tests for NTLM
 
 --- a/test/test_auth.rb
 +++ b/test/test_auth.rb
-@@ -3,7 +3,7 @@ require 'digest/md5'
+@@ -2,7 +2,7 @@
+ require 'digest/md5'
  require 'rack'
  require 'rack/lint'
- require 'rack/showexceptions'
 -require 'rack-ntlm'
 +#require 'rack-ntlm'
  
  class TestAuth < Test::Unit::TestCase
    include Helper
-@@ -39,20 +39,20 @@ class TestAuth < Test::Unit::TestCase
+@@ -38,20 +38,20 @@
        WEBrick::HTTPServlet::ProcHandler.new(method(:do_digest_sess_auth).to_proc)
      )
      # NTLM endpoint
@@ -52,7 +52,7 @@ Subject: Disable tests for NTLM
      # Htpasswd
      htpasswd = File.join(File.dirname(__FILE__), 'htpasswd')
      htpasswd_userdb = WEBrick::HTTPAuth::Htpasswd.new(htpasswd)
-@@ -115,27 +115,27 @@ class TestAuth < Test::Unit::TestCase
+@@ -114,27 +114,27 @@
      res.body = 'digest_sess_auth OK' + req.query_string.to_s
    end
  
@@ -101,7 +101,7 @@ Subject: Disable tests for NTLM
  
    def test_basic_auth
      c = HTTPClient.new
-@@ -470,7 +470,7 @@ class TestAuth < Test::Unit::TestCase
+@@ -469,7 +469,7 @@
      end
    end
  

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