Control: tags 834686 + patch Dear maintainer,
I've prepared an NMU for ruby-httpclient (versioned as 2.7.1-1.1). The diff is below (sorry for in-line, nmudiff failed to work properly for me). Due to the nature of the bug and the current freeze, I'll upload after sending this e-mail. Regards. diff -Nru ruby-httpclient-2.7.1/debian/changelog ruby-httpclient-2.7.1/debian/changelog --- ruby-httpclient-2.7.1/debian/changelog 2016-02-29 21:18:36.000000000 +0100 +++ ruby-httpclient-2.7.1/debian/changelog 2017-03-29 20:38:15.000000000 +0200 @@ -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 <elb...@debian.org> Wed, 29 Mar 2017 20:38:15 +0200 + ruby-httpclient (2.7.1-1) unstable; urgency=medium * New upstream release diff -Nru ruby-httpclient-2.7.1/debian/patches/0001-Fix-port-allocation-in-tests.patch ruby-httpclient-2.7.1/debian/patches/0001-Fix-port-allocation-in-tests.patch --- ruby-httpclient-2.7.1/debian/patches/0001-Fix-port-allocation-in-tests.patch 2016-02-29 21:18:36.000000000 +0100 +++ ruby-httpclient-2.7.1/debian/patches/0001-Fix-port-allocation-in-tests.patch 2017-03-29 20:38:15.000000000 +0200 @@ -83,3 +83,23 @@ :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 -Nru ruby-httpclient-2.7.1/debian/patches/0003-Try-to-wait-until-socket-is-free.patch ruby-httpclient-2.7.1/debian/patches/0003-Try-to-wait-until-socket-is-free.patch --- ruby-httpclient-2.7.1/debian/patches/0003-Try-to-wait-until-socket-is-free.patch 2016-02-29 21:18:36.000000000 +0100 +++ ruby-httpclient-2.7.1/debian/patches/0003-Try-to-wait-until-socket-is-free.patch 2017-03-29 20:38:15.000000000 +0200 @@ -112,3 +112,24 @@ 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
signature.asc
Description: OpenPGP digital signature