[DRE-commits] [SCM] ruby-net-http-persistent.git branch, master, updated. debian/2.7-2-8-g85d745d

[Christian Hofstaedtler]

The following commit has been merged in the master branch:
commit 40af5b04469ff14134385f8eebf83b3a5dea8ecc
Author: Christian Hofstaedtler <christian at hofstaedtler.name>
Date:   Tue May 7 23:08:40 2013 +0200

    Drop patch workaround_persistent_ssl_reuse_failing_test, applied upstream

diff --git a/debian/patches/series b/debian/patches/series
index 61bca98..eaed7ec 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,2 +1 @@
 skip_tests_requiring_net_connectivity
-workaround_persistent_ssl_reuse_failing_test.patch
diff --git a/debian/patches/workaround_persistent_ssl_reuse_failing_test.patch b/debian/patches/workaround_persistent_ssl_reuse_failing_test.patch
deleted file mode 100644
index 01af7aa..0000000
--- a/debian/patches/workaround_persistent_ssl_reuse_failing_test.patch
+++ /dev/null
@@ -1,17 +0,0 @@
-Description: Fix FTBFS with OpenSSL 1.0.1
- Using a key stricly greater than 745.
-Bug-Debian: http://bugs.debian.org/cgi-bin/bugreport.cgi?bug=665255
-Bug: https://github.com/drbrain/net-http-persistent/issues/25
-Origin: vendor
-
---- a/test/test_net_http_persistent_ssl_reuse.rb
-+++ b/test/test_net_http_persistent_ssl_reuse.rb
-@@ -21,7 +21,7 @@
-   def setup
-     @name = OpenSSL::X509::Name.parse 'CN=localhost'
- 
--    @key = OpenSSL::PKey::RSA.new 512
-+    @key = OpenSSL::PKey::RSA.new 1024
- 
-     @cert = OpenSSL::X509::Certificate.new
-     @cert.version = 2

-- 
ruby-net-http-persistent.git