Update patches for 7.28.0, disable ntlm-wb for ppc-amigaos

6 files changed, 63 insertions, 45 deletions

diff --git a/sdk/recipes/patches/libcurl/ppc-amigaos/lib.amigaos.c.p b/sdk/recipes/patches/libcurl/ppc-amigaos/lib.amigaos.c.p
new file mode 100644
index 0000000..7bb19d1
--- /dev/null
+++ b/sdk/recipes/patches/libcurl/ppc-amigaos/lib.amigaos.c.p
@@ -0,0 +1,11 @@
+--- lib/amigaos.c.old	2012-10-19 21:37:45.000000000 +0100
++++ lib/amigaos.c	2012-10-19 21:38:09.000000000 +0100
+@@ -22,7 +22,7 @@
+ 
+ #include "setup.h"
+ 
+-#if defined(__AMIGA__) && !defined(__ixemul__)
++#if defined(__AMIGA__) && !(defined(__ixemul__) || defined(__amigaos4__))
+ 
+ #include <amitcp/socketbasetags.h>
+ 
diff --git a/sdk/recipes/patches/libcurl/ppc-amigaos/lib.amigaos.h.p b/sdk/recipes/patches/libcurl/ppc-amigaos/lib.amigaos.h.p
new file mode 100644
index 0000000..27d3a13
--- /dev/null
+++ b/sdk/recipes/patches/libcurl/ppc-amigaos/lib.amigaos.h.p
@@ -0,0 +1,11 @@
+--- lib/amigaos.h.old	2012-10-19 21:36:23.000000000 +0100
++++ lib/amigaos.h	2012-10-19 21:37:26.000000000 +0100
+@@ -23,7 +23,7 @@
+  ***************************************************************************/
+ #include "setup.h"
+ 
+-#if defined(__AMIGA__) && !defined(__ixemul__)
++#if defined(__AMIGA__) && !(defined(__ixemul__) || defined(__amigaos4__))
+ 
+ bool Curl_amiga_init();
+ void Curl_amiga_cleanup();
diff --git a/sdk/recipes/patches/libcurl/ppc-amigaos/lib.easy.c.p b/sdk/recipes/patches/libcurl/ppc-amigaos/lib.easy.c.p
deleted file mode 100644
index c98b845..0000000
--- a/sdk/recipes/patches/libcurl/ppc-amigaos/lib.easy.c.p
+++ /dev/null
@@ -1,27 +0,0 @@
---- lib/easy.c.old	2010-12-29 16:14:23.000000000 +0000
-+++ lib/easy.c	2010-12-29 16:15:10.000000000 +0000
-@@ -263,13 +263,6 @@
-       return CURLE_FAILED_INIT;
-     }
- 
--#ifdef __AMIGA__
--  if(!amiga_init()) {
--    DEBUGF(fprintf(stderr, "Error: amiga_init failed\n"));
--    return CURLE_FAILED_INIT;
--  }
--#endif
--
- #ifdef NETWARE
-   if(netware_init()) {
-     DEBUGF(fprintf(stderr, "Warning: LONG namespace not available\n"));
-@@ -358,10 +351,6 @@
-   if(init_flags & CURL_GLOBAL_WIN32)
-     win32_cleanup();
- 
--#ifdef __AMIGA__
--  amiga_cleanup();
--#endif
--
- #if defined(USE_LIBSSH2) && defined(HAVE_LIBSSH2_EXIT)
-   (void)libssh2_exit();
- #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
new file mode 100644
index 0000000..531da65
--- /dev/null
+++ b/sdk/recipes/patches/libcurl/ppc-amigaos/lib.setup.h.p
@@ -0,0 +1,23 @@
+--- 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.main.c.p b/sdk/recipes/patches/libcurl/ppc-amigaos/src.main.c.p
deleted file mode 100644
index 846e19c..0000000
--- a/sdk/recipes/patches/libcurl/ppc-amigaos/src.main.c.p
+++ /dev/null
@@ -1,18 +0,0 @@
---- src/main.c.old	2010-12-29 16:18:04.000000000 +0000
-+++ src/main.c	2010-12-29 16:17:51.000000000 +0000
-@@ -64,6 +64,15 @@
- #endif
- #endif
- 
-+#ifdef __AMIGA__
-+ #ifdef __amigaos4__
-+  #ifndef __USE_INLINE__
-+   #define __USE_INLINE__
-+  #endif
-+ #endif
-+#include <proto/dos.h>
-+#endif
-+
- #include "version.h"
- 
- #ifdef HAVE_IO_H /* typical win32 habit */
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
new file mode 100644
index 0000000..9fa620c
--- /dev/null
+++ b/sdk/recipes/patches/libcurl/ppc-amigaos/src.tool_operate.c.p
@@ -0,0 +1,18 @@
+--- 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 @@
+           }
+         }
+ 
+-#ifdef __AMIGA__
+-        if(!res && outs.s_isreg && outs.filename) {
+-          /* Set the url (up to 80 chars) as comment for the file */
+-          if(strlen(url) > 78)
+-            url[79] = '\0';
+-          SetComment(outs.filename, url);
+-        }
+-#endif
+-
+ #ifdef HAVE_UTIME
+         /* File time can only be set _after_ the file has been closed */
+         if(!res && config->remote_time && outs.s_isreg && outs.filename) {