[DRE-commits] [ruby-httpclient] 01/01: Import Debian changes 2.7.1-1.1

[Antonio Terceiro]

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

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

commit 8831c807324ba31e63aa601c675280bd909abbf4
Author: Paul Gevers <elbrus at debian.org>
Date:   Wed Mar 29 20:38:15 2017 +0200

    Import Debian changes 2.7.1-1.1
    
    ruby-httpclient (2.7.1-1.1) unstable; urgency=medium
    
      * Non-maintainer upload.
      * Update 0001-Fix-port-allocation-in-tests.patch and
        0003-Try-to-wait-until-socket-is-free.patch to include missing
        instances of port 0 added in upstream 2.6.0.1-1~exp1 (Closes: #834686)
---
 debian/changelog                                    |  9 +++++++++
 .../patches/0001-Fix-port-allocation-in-tests.patch | 20 ++++++++++++++++++++
 .../0003-Try-to-wait-until-socket-is-free.patch     | 21 +++++++++++++++++++++
 3 files changed, 50 insertions(+)

diff --git a/debian/changelog b/debian/changelog
index 72f0fbf..1157a62 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,12 @@
+ruby-httpclient (2.7.1-1.1) unstable; urgency=medium
+
+  * Non-maintainer upload.
+  * Update 0001-Fix-port-allocation-in-tests.patch and
+    0003-Try-to-wait-until-socket-is-free.patch to include missing
+    instances of port 0 added in upstream 2.6.0.1-1~exp1 (Closes: #834686)
+
+ -- Paul Gevers <elbrus at debian.org>  Wed, 29 Mar 2017 20:38:15 +0200
+
 ruby-httpclient (2.7.1-1) unstable; urgency=medium
 
   * New upstream release
diff --git a/debian/patches/0001-Fix-port-allocation-in-tests.patch b/debian/patches/0001-Fix-port-allocation-in-tests.patch
index bec8267..bad2081 100644
--- a/debian/patches/0001-Fix-port-allocation-in-tests.patch
+++ b/debian/patches/0001-Fix-port-allocation-in-tests.patch
@@ -83,3 +83,23 @@ Subject: Fix port allocation in tests
        :AccessLog => [],
        :DocumentRoot => DIR,
        :SSLEnable => true,
+@@ -293,7 +293,7 @@ private
+     @server = WEBrick::HTTPServer.new(
+       :BindAddress => "localhost",
+       :Logger => logger,
+-      :Port => 0,
++      :Port => 50001,
+       :AccessLog => [],
+       :DocumentRoot => DIR,
+       :SSLEnable => true,
+--- a/test/test_jsonclient.rb
++++ b/test/test_jsonclient.rb
+@@ -69,7 +69,7 @@ class TestJSONClient < Test::Unit::TestC
+     @server = WEBrick::HTTPServer.new(
+       :BindAddress => "localhost",
+       :Logger => @logger,
+-      :Port => 0,
++      :Port => 50000,
+       :AccessLog => [],
+       :DocumentRoot => File.dirname(File.expand_path(__FILE__))
+     )
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 4621be2..3ebe681 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
@@ -112,3 +112,24 @@ Subject: Try to wait until socket is free
    end
  
    def setup_server_with_ssl_version(ssl_version)
+@@ -310,6 +313,9 @@ private
+       )
+     end
+     @server_thread = start_server_thread(@server)
++  rescue Errno::EADDRINUSE
++    sleep 1
++    retry
+   end
+ 
+   def do_hello(req, res)
+--- a/test/test_jsonclient.rb
++++ b/test/test_jsonclient.rb
+@@ -76,5 +76,8 @@ class TestJSONClient < Test::Unit::TestC
+     @serverport = @server.config[:Port]
+     @server.mount('/json', JSONServlet.new(@server))
+     @server_thread = start_server_thread(@server)
++  rescue Errno::EADDRINUSE
++    sleep 1
++    retry
+   end
+ end

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