From 2b3c726e152915dc98ebcd405b09ab468f929896 Mon Sep 17 00:00:00 2001
From: John-Mark Bell <jmb@netsurf-browser.org>
Date: Wed, 15 Jan 2014 01:59:34 +0000
Subject: Update libcurl patches for ppc-amigaos / 7.34.0

---
 .../patches/libcurl/7.34.0-ipv6-trynextip.p        | 27 ++++++++++++++++++++++
 .../patches/libcurl/ppc-amigaos/lib.amigaos.c.p    |  2 +-
 .../patches/libcurl/ppc-amigaos/lib.amigaos.h.p    |  2 +-
 .../patches/libcurl/ppc-amigaos/lib.curl_setup.h.p | 23 ++++++++++++++++++
 .../patches/libcurl/ppc-amigaos/lib.setup.h.p      | 23 ------------------
 .../libcurl/ppc-amigaos/src.tool_operate.c.p       |  2 +-
 6 files changed, 53 insertions(+), 26 deletions(-)
 create mode 100644 sdk/recipes/patches/libcurl/7.34.0-ipv6-trynextip.p
 create mode 100644 sdk/recipes/patches/libcurl/ppc-amigaos/lib.curl_setup.h.p
 delete mode 100644 sdk/recipes/patches/libcurl/ppc-amigaos/lib.setup.h.p

(limited to 'sdk/recipes/patches/libcurl')

diff --git a/sdk/recipes/patches/libcurl/7.34.0-ipv6-trynextip.p b/sdk/recipes/patches/libcurl/7.34.0-ipv6-trynextip.p
new file mode 100644
index 0000000..7135203
--- /dev/null
+++ b/sdk/recipes/patches/libcurl/7.34.0-ipv6-trynextip.p
@@ -0,0 +1,27 @@
+Origin: https://github.com/bagder/curl/commit/2d435c7fb5b7691e8ca1f3052e1eb5bcd8a4ea27.diff
+
+diff --git a/lib/connect.c b/lib/connect.c
+index 33f7aec..05666eb 100644
+--- lib/connect.c
++++ lib/connect.c
+@@ -5,7 +5,7 @@
+  *                            | (__| |_| |  _ <| |___
+  *                             \___|\___/|_| \_\_____|
+  *
+- * Copyright (C) 1998 - 2013, Daniel Stenberg, <daniel@haxx.se>, et al.
++ * Copyright (C) 1998 - 2014, Daniel Stenberg, <daniel@haxx.se>, et al.
+  *
+  * This software is licensed as described in the file COPYING, which
+  * you should have received as part of this distribution. The terms
+@@ -556,7 +556,11 @@ static CURLcode trynextip(struct connectdata *conn,
+     else {
+       /* happy eyeballs - try the other protocol family */
+       int firstfamily = conn->tempaddr[0]->ai_family;
++#ifdef ENABLE_IPV6
+       family = (firstfamily == AF_INET) ? AF_INET6 : AF_INET;
++#else
++      family = firstfamily;
++#endif
+       ai = conn->tempaddr[0]->ai_next;
+     }
+ 
diff --git a/sdk/recipes/patches/libcurl/ppc-amigaos/lib.amigaos.c.p b/sdk/recipes/patches/libcurl/ppc-amigaos/lib.amigaos.c.p
index 7bb19d1..9833c94 100644
--- a/sdk/recipes/patches/libcurl/ppc-amigaos/lib.amigaos.c.p
+++ b/sdk/recipes/patches/libcurl/ppc-amigaos/lib.amigaos.c.p
@@ -2,7 +2,7 @@
 +++ lib/amigaos.c	2012-10-19 21:38:09.000000000 +0100
 @@ -22,7 +22,7 @@
  
- #include "setup.h"
+ #include "curl_setup.h"
  
 -#if defined(__AMIGA__) && !defined(__ixemul__)
 +#if defined(__AMIGA__) && !(defined(__ixemul__) || defined(__amigaos4__))
diff --git a/sdk/recipes/patches/libcurl/ppc-amigaos/lib.amigaos.h.p b/sdk/recipes/patches/libcurl/ppc-amigaos/lib.amigaos.h.p
index 27d3a13..050bea7 100644
--- a/sdk/recipes/patches/libcurl/ppc-amigaos/lib.amigaos.h.p
+++ b/sdk/recipes/patches/libcurl/ppc-amigaos/lib.amigaos.h.p
@@ -2,7 +2,7 @@
 +++ lib/amigaos.h	2012-10-19 21:37:26.000000000 +0100
 @@ -23,7 +23,7 @@
   ***************************************************************************/
- #include "setup.h"
+ #include "curl_setup.h"
  
 -#if defined(__AMIGA__) && !defined(__ixemul__)
 +#if defined(__AMIGA__) && !(defined(__ixemul__) || defined(__amigaos4__))
diff --git a/sdk/recipes/patches/libcurl/ppc-amigaos/lib.curl_setup.h.p b/sdk/recipes/patches/libcurl/ppc-amigaos/lib.curl_setup.h.p
new file mode 100644
index 0000000..7e47a50
--- /dev/null
+++ b/sdk/recipes/patches/libcurl/ppc-amigaos/lib.curl_setup.h.p
@@ -0,0 +1,23 @@
+--- lib/curl_setup.h.old	2012-10-19 21:58:12.000000000 +0100
++++ lib/curl_setup.h	2012-10-19 21:59:17.000000000 +0100
+@@ -323,11 +323,15 @@
+ 
+ #ifdef __AMIGA__
+ #  ifndef __ixemul__
+-#    include <exec/types.h>
+-#    include <exec/execbase.h>
+-#    include <proto/exec.h>
+-#    include <proto/dos.h>
+-#    define select(a,b,c,d,e) WaitSelect(a,b,c,d,e,0)
++#    ifdef __amigaos4__
++#      include <unistd.h>
++#    else
++#      include <exec/types.h>
++#      include <exec/execbase.h>
++#      include <proto/exec.h>
++#      include <proto/dos.h>
++#      define select(a,b,c,d,e) WaitSelect(a,b,c,d,e,0)
++#    endif
+ #  endif
+ #endif
+ 
diff --git a/sdk/recipes/patches/libcurl/ppc-amigaos/lib.setup.h.p b/sdk/recipes/patches/libcurl/ppc-amigaos/lib.setup.h.p
deleted file mode 100644
index 531da65..0000000
--- a/sdk/recipes/patches/libcurl/ppc-amigaos/lib.setup.h.p
+++ /dev/null
@@ -1,23 +0,0 @@
---- lib/setup.h.old	2012-10-19 21:58:12.000000000 +0100
-+++ lib/setup.h	2012-10-19 21:59:17.000000000 +0100
-@@ -312,11 +312,15 @@
- 
- #ifdef __AMIGA__
- #  ifndef __ixemul__
--#    include <exec/types.h>
--#    include <exec/execbase.h>
--#    include <proto/exec.h>
--#    include <proto/dos.h>
--#    define select(a,b,c,d,e) WaitSelect(a,b,c,d,e,0)
-+#    ifdef __amigaos4__
-+#      include <unistd.h>
-+#    else
-+#      include <exec/types.h>
-+#      include <exec/execbase.h>
-+#      include <proto/exec.h>
-+#      include <proto/dos.h>
-+#      define select(a,b,c,d,e) WaitSelect(a,b,c,d,e,0)
-+#    endif
- #  endif
- #endif
- 
diff --git a/sdk/recipes/patches/libcurl/ppc-amigaos/src.tool_operate.c.p b/sdk/recipes/patches/libcurl/ppc-amigaos/src.tool_operate.c.p
index 9fa620c..3f521af 100644
--- a/sdk/recipes/patches/libcurl/ppc-amigaos/src.tool_operate.c.p
+++ b/sdk/recipes/patches/libcurl/ppc-amigaos/src.tool_operate.c.p
@@ -1,6 +1,6 @@
 --- src/tool_operate.c.old	2012-10-19 21:42:57.000000000 +0100
 +++ src/tool_operate.c	2012-10-19 21:43:27.000000000 +0100
-@@ -1598,15 +1598,6 @@
+@@ -1731,15 +1731,6 @@
            }
          }
  
-- 
cgit v1.2.3