Package: release.debian.org
Severity: normal
User: release.debian....@packages.debian.org
Usertags: unblock
-----BEGIN PGP SIGNED MESSAGE-----
Hash: SHA256
Please unblock package ruby-httpclient
I fixed RC bug #834686 which is about FTBFS due to errors in the test-suite. I
applied similar fixes as are already available in the package for other
instances of the same issue. The package just missed these updates for
additions in new upstream releases.
Debdiff attached.
unblock ruby-httpclient/2.7.1-1.1
- -- System Information:
Debian Release: 9.0
APT prefers testing-debug
APT policy: (500, 'testing-debug'), (500, 'testing'), (200, 'testing'), (50,
'testing')
Architecture: amd64 (x86_64)
Kernel: Linux 4.9.0-2-amd64 (SMP w/2 CPU cores)
Locale: LANG=en_US.UTF-8, LC_CTYPE=en_US.UTF-8 (charmap=UTF-8)
Shell: /bin/sh linked to /bin/dash
Init: systemd (via /run/systemd/system)
-----BEGIN PGP SIGNATURE-----
iQEzBAEBCAAdFiEEWLZtSHNr6TsFLeZynFyZ6wW9dQoFAljdT3AACgkQnFyZ6wW9
dQrTSwf/aSZZmrWsVaG3Z0+KA7cyA3brQ0UWhBPqA5oiDnSO/luhgMiFiy3B5BAz
YUsc9q9/WlPgtlzGXD+hZkGeIXqdvcxLYUiSs1Lk5mpKtiYWAfqJDRsudNjpVcY3
uNAgkgK1QQT7pcG8u7Axs/uOzVZj4kF6HseKCSL4g4D7mYBUa00dPByBNTrPiOXn
zeS8zMwgd0HmP+/hFdcu0QY7J9ombMC9qlii9M9lLEiienKqSrwfIC1UTD6fdBsN
L+FnUva8CTfk+k+6VwV13JCk1BknwfjERgdcJ2NADE+88zZKTC+f+sF54d45S8Vb
CfuxAVojE1PH1aZrt0L99K0AZ3fb+Q==
=dEFp
-----END PGP SIGNATURE-----
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
