[DRE-commits] [ruby-curb] 01/01: Update 'add-support-for-curl-7.33.0' patch

[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 236f65a23a7bfe53f1d1a63b33cb1fb1f1d72b7e
Author: David Suárez <david.sephirot at gmail.com>
Date:   Sun Nov 3 21:34:44 2013 +0100

    Update 'add-support-for-curl-7.33.0' patch
---
 debian/patches/add-support-for-curl-7.33.0.patch |   41 ++++++++++++++++------
 1 file changed, 30 insertions(+), 11 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
index b8aa5a5..e185e87 100644
--- a/debian/patches/add-support-for-curl-7.33.0.patch
+++ b/debian/patches/add-support-for-curl-7.33.0.patch
@@ -6,52 +6,71 @@ Author: David Suárez <david.sephirot at gmail.com>
 Forwarded: https://github.com/taf2/curb/pull/169
 Last-Update: 2013-10-20
 
---- ruby-curb-0.8.5.orig/ext/curb_errors.c
-+++ ruby-curb-0.8.5/ext/curb_errors.c
-@@ -118,6 +118,7 @@ VALUE mCurlErrBadEasyHandle;
+--- 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 +494,9 @@ VALUE rb_curl_multi_error(CURLMcode code
+@@ -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 +629,7 @@ void init_curb_errors() {
+@@ -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);
---- ruby-curb-0.8.5.orig/ext/curb_errors.h
-+++ ruby-curb-0.8.5/ext/curb_errors.h
-@@ -116,6 +116,7 @@ extern VALUE mCurlErrOutOfMemory;
+--- 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;
---- ruby-curb-0.8.5.orig/tests/tc_curl_multi.rb
-+++ ruby-curb-0.8.5/tests/tc_curl_multi.rb
+--- 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_equal Curl::Err::MultiAddedAlready, 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

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