From 5b5c7736bf1b65a84d28a87dd6b0f8ef11bfc49d Mon Sep 17 00:00:00 2001
From: Lionel Sambuc <lionel@minix3.org>
Date: Sat, 19 Apr 2014 16:04:36 +0200
Subject: [PATCH] www/curl

---
 www/curl/distinfo                    |  3 +-
 www/curl/patches/patch-aa            | 74 +++++++++++++++++++++++-----
 www/curl/patches/patch-lib_connect.c | 11 +++++
 3 files changed, 75 insertions(+), 13 deletions(-)
 create mode 100644 www/curl/patches/patch-lib_connect.c

diff --git a/www/curl/distinfo b/www/curl/distinfo
index ce1c6d55a..b017b313b 100644
--- a/www/curl/distinfo
+++ b/www/curl/distinfo
@@ -3,5 +3,6 @@ $NetBSD: distinfo,v 1.93 2014/03/30 12:57:54 spz Exp $
 SHA1 (curl-7.36.0.tar.bz2) = c39b120585a8a8d64ef14459d6d5f22831d4a7c4
 RMD160 (curl-7.36.0.tar.bz2) = 864f0fe3a15f016cf79bf47172a2ae6a54e0cce4
 Size (curl-7.36.0.tar.bz2) = 2809266 bytes
-SHA1 (patch-aa) = 41bbc1e6c17c8ff1bf826d7d8ccdaec9ad9e97ed
+SHA1 (patch-aa) = fbd7da36b484ccc29974d66239fe3167a8b2eb59
 SHA1 (patch-curl-config.in) = fd87c97b601a6b9269f67fbc066604ee7e22570e
+SHA1 (patch-lib_connect.c) = afe17a36b02d0694542a2d22b20c4231b966cf57
diff --git a/www/curl/patches/patch-aa b/www/curl/patches/patch-aa
index fbc989d71..74665e0fd 100644
--- a/www/curl/patches/patch-aa
+++ b/www/curl/patches/patch-aa
@@ -1,11 +1,6 @@
-$NetBSD: patch-aa,v 1.26 2014/03/30 12:57:54 spz Exp $
-
-builtin krb5-config in platforms such as solaris do not support
-the gssapi option, and need an explicit -lgss
-
---- configure.orig	2014-03-25 10:29:28.000000000 +0000
-+++ configure
-@@ -3641,6 +3641,7 @@ $as_echo "$as_me: $xc_bad_var_msg librar
+--- configure.orig	Tue Mar 25 10:29:28 2014
++++ configure	Fri Apr 18 15:44:26 2014
+@@ -3641,6 +3641,7 @@ $as_echo "$as_me: $xc_bad_var_msg libraries. Use LIBS 
          ;;
      esac
    done
@@ -13,7 +8,62 @@ the gssapi option, and need an explicit -lgss
    if test $xc_bad_var_cflags = yes; then
      { $as_echo "$as_me:${as_lineno-$LINENO}: using CFLAGS: $CFLAGS" >&5
  $as_echo "$as_me: using CFLAGS: $CFLAGS" >&6;}
-@@ -16620,7 +16621,7 @@ squeeze() {
+@@ -8381,7 +8382,7 @@ else
+     lt_cv_sys_max_cmd_len=8192;
+     ;;
+ 
+-  netbsd* | freebsd* | openbsd* | darwin* | dragonfly*)
++  minix* | netbsd* | freebsd* | openbsd* | darwin* | dragonfly*)
+     # This has been around since 386BSD, at least.  Likely further.
+     if test -x /sbin/sysctl; then
+       lt_cv_sys_max_cmd_len=`/sbin/sysctl -n kern.argmax`
+@@ -8872,7 +8873,7 @@ linux* | k*bsd*-gnu | kopensolaris*-gnu | gnu*)
+   lt_cv_deplibs_check_method=pass_all
+   ;;
+ 
+-netbsd* | netbsdelf*-gnu)
++minix* | netbsd* | netbsdelf*-gnu)
+   if echo __ELF__ | $CC -E - | $GREP __ELF__ > /dev/null; then
+     lt_cv_deplibs_check_method='match_pattern /lib[^/]+(\.so\.[0-9]+\.[0-9]+|_pic\.a)$'
+   else
+@@ -12641,7 +12642,7 @@ _LT_EOF
+       fi
+       ;;
+ 
+-    netbsd* | netbsdelf*-gnu)
++    minix* | netbsd* | netbsdelf*-gnu)
+       if echo __ELF__ | $CC -E - | $GREP __ELF__ >/dev/null; then
+ 	archive_cmds='$LD -Bshareable $libobjs $deplibs $linker_flags -o $lib'
+ 	wlarc=
+@@ -13270,7 +13271,7 @@ $as_echo "$lt_cv_irix_exported_symbol" >&6; }
+       link_all_deplibs=yes
+       ;;
+ 
+-    netbsd* | netbsdelf*-gnu)
++    minix* | netbsd* | netbsdelf*-gnu)
+       if echo __ELF__ | $CC -E - | $GREP __ELF__ >/dev/null; then
+ 	archive_cmds='$LD -Bshareable -o $lib $libobjs $deplibs $linker_flags'  # a.out
+       else
+@@ -14286,6 +14287,18 @@ fi
+   dynamic_linker='GNU/Linux ld.so'
+   ;;
+ 
++minix*)
++  version_type=linux
++  need_lib_prefix=no
++  need_version=no
++  library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major ${libname}${shared_ext}'
++  soname_spec='${libname}${release}${shared_ext}$major'
++  shlibpath_var=LD_LIBRARY_PATH
++  shlibpath_overrides_runpath=no
++  hardcode_into_libs=yes
++  dynamic_linker='Minix ld.elf_so'
++  ;;
++
+ netbsdelf*-gnu)
+   version_type=linux
+   need_lib_prefix=no
+@@ -16620,7 +16633,7 @@ squeeze() {
  
  
        #
@@ -22,7 +72,7 @@ the gssapi option, and need an explicit -lgss
      #
      if test "$compiler_id" = "GNU_C" ||
        test "$compiler_id" = "CLANG"; then
-@@ -21079,7 +21080,12 @@ $as_echo "yes" >&6; }
+@@ -21079,7 +21092,12 @@ $as_echo "yes" >&6; }
  
    if test -z "$GSSAPI_INCS"; then
       if test -f "$GSSAPI_ROOT/bin/krb5-config"; then
@@ -36,7 +86,7 @@ the gssapi option, and need an explicit -lgss
       elif test "$GSSAPI_ROOT" != "yes"; then
          GSSAPI_INCS="-I$GSSAPI_ROOT/include"
       fi
-@@ -21227,13 +21233,18 @@ $as_echo "#define HAVE_GSSAPI 1" >>confd
+@@ -21227,13 +21245,18 @@ $as_echo "#define HAVE_GSSAPI 1" >>confdefs.h
          ;;
       *)
          if test -f "$GSSAPI_ROOT/bin/krb5-config"; then
@@ -58,7 +108,7 @@ the gssapi option, and need an explicit -lgss
          fi
          ;;
       esac
-@@ -21244,7 +21255,7 @@ $as_echo "#define HAVE_GSSAPI 1" >>confd
+@@ -21244,7 +21267,7 @@ $as_echo "#define HAVE_GSSAPI 1" >>confdefs.h
          LIBS="-lgss $LIBS"
          ;;
       *)
diff --git a/www/curl/patches/patch-lib_connect.c b/www/curl/patches/patch-lib_connect.c
new file mode 100644
index 000000000..57f862bbb
--- /dev/null
+++ b/www/curl/patches/patch-lib_connect.c
@@ -0,0 +1,11 @@
+--- lib/connect.c.orig	Fri Apr 18 15:48:42 2014
++++ lib/connect.c	Fri Apr 18 15:49:19 2014
+@@ -506,7 +506,7 @@ static bool verifyconnect(curl_socket_t sockfd, int *e
+     err = 0;
+   }
+ #endif
+-#ifdef __minix
++#if defined EBADIOCTL && defined __minix
+   /* Minix 3.1.x doesn't support getsockopt on UDP sockets */
+   if(EBADIOCTL == err) {
+     SET_SOCKERRNO(0);