[DRE-commits] [ruby-httpclient] 03/05: Refresh patches
Antonio Terceiro
terceiro at moszumanska.debian.org
Mon Feb 29 20:22:09 UTC 2016
This is an automated email from the git hooks/post-receive script.
terceiro pushed a commit to branch master
in repository ruby-httpclient.
commit daf60457b89f4013f332e8d5e1e3b7f038c9fa3f
Author: Antonio Terceiro <terceiro at debian.org>
Date: Mon Feb 29 16:17:52 2016 -0300
Refresh patches
---
debian/changelog | 1 +
.../0001-Fix-port-allocation-in-tests.patch | 16 ++-----
debian/patches/0002-Disable-tests-for-NTLM.patch | 54 +++++++++++++---------
.../0003-Try-to-wait-until-socket-is-free.patch | 18 ++------
debian/patches/0005-tweak-test-dep-change.patch | 2 +-
5 files changed, 41 insertions(+), 50 deletions(-)
diff --git a/debian/changelog b/debian/changelog
index 4b45135..ee729f5 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,6 +1,7 @@
ruby-httpclient (2.7.1-1) UNRELEASED; urgency=medium
* New upstream release
+ * Refresh patches
-- Antonio Terceiro <terceiro at debian.org> Mon, 29 Feb 2016 16:14:40 -0300
diff --git a/debian/patches/0001-Fix-port-allocation-in-tests.patch b/debian/patches/0001-Fix-port-allocation-in-tests.patch
index f7e5f57..bec8267 100644
--- a/debian/patches/0001-Fix-port-allocation-in-tests.patch
+++ b/debian/patches/0001-Fix-port-allocation-in-tests.patch
@@ -19,11 +19,9 @@ Subject: Fix port allocation in tests
test/test_ssl.rb | 2 +-
5 files changed, 6 insertions(+), 6 deletions(-)
-diff --git a/test/helper.rb b/test/helper.rb
-index 0cd4c90..d89fa13 100644
--- a/test/helper.rb
+++ b/test/helper.rb
-@@ -69,7 +69,7 @@ module Helper
+@@ -71,7 +71,7 @@ module Helper
@proxyserver = WEBrick::HTTPProxyServer.new(
:BindAddress => "localhost",
:Logger => @proxylogger,
@@ -32,8 +30,6 @@ index 0cd4c90..d89fa13 100644
:AccessLog => []
)
@proxyport = @proxyserver.config[:Port]
-diff --git a/test/test_auth.rb b/test/test_auth.rb
-index 156d2f1..7d1fdba 100644
--- a/test/test_auth.rb
+++ b/test/test_auth.rb
@@ -21,7 +21,7 @@ class TestAuth < Test::Unit::TestCase
@@ -54,8 +50,6 @@ index 156d2f1..7d1fdba 100644
:AccessLog => []
)
@proxyport = @proxyserver.config[:Port]
-diff --git a/test/test_http-access2.rb b/test/test_http-access2.rb
-index 04080ed..23a941f 100644
--- a/test/test_http-access2.rb
+++ b/test/test_http-access2.rb
@@ -385,7 +385,7 @@ private
@@ -67,11 +61,9 @@ index 04080ed..23a941f 100644
:AccessLog => [],
:DocumentRoot => File.dirname(File.expand_path(__FILE__))
)
-diff --git a/test/test_httpclient.rb b/test/test_httpclient.rb
-index f65fe9c..b45deb1 100644
--- a/test/test_httpclient.rb
+++ b/test/test_httpclient.rb
-@@ -1821,7 +1821,7 @@ private
+@@ -1862,7 +1862,7 @@ private
@server = WEBrick::HTTPServer.new(
:BindAddress => "localhost",
:Logger => @logger,
@@ -80,11 +72,9 @@ index f65fe9c..b45deb1 100644
:AccessLog => [],
:DocumentRoot => File.dirname(File.expand_path(__FILE__))
)
-diff --git a/test/test_ssl.rb b/test/test_ssl.rb
-index 4ac45cf..c12f9e2 100644
--- a/test/test_ssl.rb
+++ b/test/test_ssl.rb
-@@ -207,7 +207,7 @@ private
+@@ -266,7 +266,7 @@ private
@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 ec98942..b01db89 100644
--- a/debian/patches/0002-Disable-tests-for-NTLM.patch
+++ b/debian/patches/0002-Disable-tests-for-NTLM.patch
@@ -6,8 +6,6 @@ Subject: Disable tests for NTLM
test/test_auth.rb | 62 +++++++++++++++++++++++++++----------------------------
1 file changed, 31 insertions(+), 31 deletions(-)
-diff --git a/test/test_auth.rb b/test/test_auth.rb
-index 7d1fdba..ff8f55f 100644
--- a/test/test_auth.rb
+++ b/test/test_auth.rb
@@ -3,7 +3,7 @@ require 'digest/md5'
@@ -54,10 +52,11 @@ index 7d1fdba..ff8f55f 100644
# Htpasswd
htpasswd = File.join(File.dirname(__FILE__), 'htpasswd')
htpasswd_userdb = WEBrick::HTTPAuth::Htpasswd.new(htpasswd)
-@@ -116,21 +116,21 @@ class TestAuth < Test::Unit::TestCase
+@@ -115,27 +115,27 @@ class TestAuth < Test::Unit::TestCase
+ res.body = 'digest_sess_auth OK' + req.query_string.to_s
end
- # TODO: monkey patching for rack-ntlm-test-services's incompat.
+- # TODO: monkey patching for rack-ntlm-test-services's incompat.
- module ::Net
- module NTLM
- # ruby-ntlm 0.3.0 -> 0.4.0
@@ -66,6 +65,7 @@ index 7d1fdba..ff8f55f 100644
- end
- # Make it work if @value == nil
- class SecurityBuffer < FieldSet
+- remove_method(:data_size) if method_defined?(:data_size)
- def data_size
- @active && @value ? @value.size : 0
- end
@@ -73,25 +73,35 @@ index 7d1fdba..ff8f55f 100644
- end
- end
- def test_ntlm_auth
-+ #module ::Net
-+ # module NTLM
-+ # # ruby-ntlm 0.3.0 -> 0.4.0
-+ # def self.decode_utf16le(*arg)
-+ # EncodeUtil.decode_utf16le(*arg)
-+ # end
-+ # # Make it work if @value == nil
-+ # class SecurityBuffer < FieldSet
-+ # def data_size
-+ # @active && @value ? @value.size : 0
-+ # end
-+ # end
-+ # end
-+ #end
-+ def disabled_test_ntlm_auth
+- c = HTTPClient.new
+- c.set_auth("http://localhost:#{serverport}/ntlm_auth", 'admin', 'admin')
+- assert_equal('ntlm_auth OK', c.get_content("http://localhost:#{serverport}/ntlm_auth"))
+- end
++ # # TODO: monkey patching for rack-ntlm-test-services's incompat.
++ # module ::Net
++ # module NTLM
++ # # ruby-ntlm 0.3.0 -> 0.4.0
++ # def self.decode_utf16le(*arg)
++ # EncodeUtil.decode_utf16le(*arg)
++ # end
++ # # Make it work if @value == nil
++ # class SecurityBuffer < FieldSet
++ # remove_method(:data_size) if method_defined?(:data_size)
++ # def data_size
++ # @active && @value ? @value.size : 0
++ # end
++ # end
++ # end
++ # end
++ # def test_ntlm_auth
++ # c = HTTPClient.new
++ # c.set_auth("http://localhost:#{serverport}/ntlm_auth", 'admin', 'admin')
++ # assert_equal('ntlm_auth OK', c.get_content("http://localhost:#{serverport}/ntlm_auth"))
++ # end
+
+ def test_basic_auth
c = HTTPClient.new
- c.set_auth("http://localhost:#{serverport}/ntlm_auth", 'admin', 'admin')
- assert_equal('ntlm_auth OK', c.get_content("http://localhost:#{serverport}/ntlm_auth"))
-@@ -450,7 +450,7 @@ class TestAuth < Test::Unit::TestCase
+@@ -470,7 +470,7 @@ class TestAuth < Test::Unit::TestCase
end
end
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 7d6c6ff..4621be2 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
@@ -10,11 +10,9 @@ Subject: Try to wait until socket is free
test/test_ssl.rb | 3 +++
5 files changed, 36 insertions(+), 14 deletions(-)
-diff --git a/test/helper.rb b/test/helper.rb
-index d89fa13..56418bb 100644
--- a/test/helper.rb
+++ b/test/helper.rb
-@@ -74,6 +74,9 @@ module Helper
+@@ -76,6 +76,9 @@ module Helper
)
@proxyport = @proxyserver.config[:Port]
@proxyserver_thread = start_server_thread(@proxyserver)
@@ -24,8 +22,6 @@ index d89fa13..56418bb 100644
end
def teardown_client
-diff --git a/test/test_auth.rb b/test/test_auth.rb
-index ff8f55f..3a9503d 100644
--- a/test/test_auth.rb
+++ b/test/test_auth.rb
@@ -18,13 +18,18 @@ class TestAuth < Test::Unit::TestCase
@@ -80,8 +76,6 @@ index ff8f55f..3a9503d 100644
@proxyport = @proxyserver.config[:Port]
@proxyserver_thread = start_server_thread(@proxyserver)
end
-diff --git a/test/test_http-access2.rb b/test/test_http-access2.rb
-index 23a941f..11e3555 100644
--- a/test/test_http-access2.rb
+++ b/test/test_http-access2.rb
@@ -398,6 +398,9 @@ private
@@ -94,11 +88,9 @@ index 23a941f..11e3555 100644
end
def escape_noproxy
-diff --git a/test/test_httpclient.rb b/test/test_httpclient.rb
-index b45deb1..95c2ca9 100644
--- a/test/test_httpclient.rb
+++ b/test/test_httpclient.rb
-@@ -1838,6 +1838,9 @@ private
+@@ -1879,6 +1879,9 @@ private
end
@server.mount('/servlet', TestServlet.new(@server))
@server_thread = start_server_thread(@server)
@@ -107,12 +99,10 @@ index b45deb1..95c2ca9 100644
+ retry
end
- def escape_noproxy
-diff --git a/test/test_ssl.rb b/test/test_ssl.rb
-index c12f9e2..d0a2afa 100644
+ def add_query_string(req)
--- a/test/test_ssl.rb
+++ b/test/test_ssl.rb
-@@ -226,6 +226,9 @@ private
+@@ -285,6 +285,9 @@ private
)
end
@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 4402d16..c4e831f 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
-@@ -171,8 +171,8 @@
+@@ -218,8 +218,8 @@ end
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
More information about the Pkg-ruby-extras-commits
mailing list