[DRE-commits] [ruby-curb] 03/07: Remove 'add-support-for-curl-7.33.0' patch; applied upstream

[David Suárez]

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

deiv-guest pushed a commit to branch master
in repository ruby-curb.

commit 2a2bda0f0a4a32db67f8f7a7e77a1ace8f922741
Author: David Suárez <david.sephirot at gmail.com>
Date:   Sun Sep 28 21:59:44 2014 +0200

    Remove 'add-support-for-curl-7.33.0' patch; applied upstream
---
 debian/patches/add-support-for-curl-7.33.0.patch | 76 ------------------------
 debian/patches/series                            |  1 -
 2 files changed, 77 deletions(-)

diff --git a/debian/patches/add-support-for-curl-7.33.0.patch b/debian/patches/add-support-for-curl-7.33.0.patch
deleted file mode 100644
index e185e87..0000000
--- a/debian/patches/add-support-for-curl-7.33.0.patch
+++ /dev/null
@@ -1,76 +0,0 @@
-Description: Add support for curl 7.33.0
- Handle the new error code 'CURLM_ADDED_ALREADY'. This fix the test
- 'test_reusing_handle' that fails because an unexpected exception.
-
-Author: David Suárez <david.sephirot at gmail.com>
-Forwarded: https://github.com/taf2/curb/pull/169
-Last-Update: 2013-10-20
-
---- a/ext/curb_errors.c
-+++ b/ext/curb_errors.c
-@@ -118,6 +118,9 @@ VALUE mCurlErrBadEasyHandle;
- VALUE mCurlErrOutOfMemory;
- VALUE mCurlErrInternalError;
- VALUE mCurlErrBadSocket;
-+#if HAVE_CURLM_ADDED_ALREADY
-+VALUE mCurlErrAddedAlready;
-+#endif
- VALUE mCurlErrUnknownOption;
- 
- /* binding errors */
-@@ -493,6 +496,11 @@ VALUE rb_curl_multi_error(CURLMcode code
-       exclz = mCurlErrUnknownOption;
-       break;
- #endif
-+#if HAVE_CURLM_ADDED_ALREADY
-+    case CURLM_ADDED_ALREADY: /* 7 */
-+      exclz = mCurlErrAddedAlready;
-+      break;
-+#endif
-     default:
-       exclz = eCurlErrError;
-       exmsg = "Unknown error result from libcurl";
-@@ -625,6 +633,9 @@ void init_curb_errors() {
-   mCurlErrOutOfMemory        = rb_define_class_under(mCurlErr, "MultiOutOfMemory", eCurlErrError);
-   mCurlErrInternalError      = rb_define_class_under(mCurlErr, "MultiInternalError", eCurlErrError);
-   mCurlErrBadSocket          = rb_define_class_under(mCurlErr, "MultiBadSocket", eCurlErrError);
-+#if HAVE_CURLM_ADDED_ALREADY
-+  mCurlErrAddedAlready       = rb_define_class_under(mCurlErr, "MultiAddedAlready", eCurlErrError);
-+#endif
-   mCurlErrUnknownOption      = rb_define_class_under(mCurlErr, "MultiUnknownOption", eCurlErrError);
- 
-   eCurlErrLDAPInvalidURL = rb_define_class_under(mCurlErr, "InvalidLDAPURLError", eCurlErrLDAPError);
---- a/ext/curb_errors.h
-+++ b/ext/curb_errors.h
-@@ -116,6 +116,9 @@ extern VALUE mCurlErrOutOfMemory;
- extern VALUE mCurlErrInternalError;
- extern VALUE mCurlErrBadSocket;
- extern VALUE mCurlErrUnknownOption;
-+#if HAVE_CURLM_ADDED_ALREADY
-+extern VALUE mCurlErrAddedAlready;
-+#endif
- 
- /* binding errors */
- extern VALUE eCurlErrInvalidPostField;
---- a/tests/tc_curl_multi.rb
-+++ b/tests/tc_curl_multi.rb
-@@ -466,7 +466,7 @@ class TestCurbCurlMulti < Test::Unit::Te
-     m.add(c)
-     m.add(c)
-   rescue => e
--    assert_equal Curl::Err::MultiBadEasyHandle, e.class
-+    assert Curl::Err::MultiBadEasyHandle == e.class || Curl::Err::MultiAddedAlready == e.class
-   end
- 
-   def test_multi_default_timeout
---- a/ext/extconf.rb
-+++ b/ext/extconf.rb
-@@ -357,6 +357,8 @@ have_constant "curlopt_gssapi_delegation
- have_constant "curlgssapi_delegation_policy_flag"
- have_constant "curlgssapi_delegation_flag"
- 
-+have_constant "CURLM_ADDED_ALREADY"
-+
- if try_compile('int main() { return 0; }','-Wall')
-   $CFLAGS << ' -Wall'
- end
diff --git a/debian/patches/series b/debian/patches/series
index fa1bea4..5f8264c 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,3 +1,2 @@
 disable_test_requiring_network.patch
 remove-local-extension-dir-from-tests-loadpath.patch
-add-support-for-curl-7.33.0.patch

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