Merge pull request #603 from mxaddict/fix-curl-ssl

Updated depends to use winssl for windows and darwinssl for osx

Author: proletesseract

depends/packages/curl.mk

@@ -1,8 +1,8 @@
 package=curl
-$(package)_version=7.64.1
+$(package)_version=7.65.3
 $(package)_download_path=https://curl.haxx.se/download/
 $(package)_file_name=$(package)-$($(package)_version).tar.xz
-$(package)_sha256_hash=9252332a7f871ce37bfa7f78bdd0a0e3924d8187cc27cb57c76c9474a7168fb3
+$(package)_sha256_hash=f2d98854813948d157f6a91236ae34ca4a1b4cb302617cebad263d79b0235fea
 $(package)_dependencies=openssl
 $(package)_patches=fix_lib_order.patch
 
@@ -11,9 +11,10 @@ define $(package)_preprocess_cmds
 endef
 
 define $(package)_set_vars
-  $(package)_config_env=CURL_CFLAG_EXTRAS="-DBUILDING_LIBCURL"
-  $(package)_config_opts=--with-ssl=$(host_prefix) --enable-static --disable-shared --without-libidn2 --with-pic
-  $(package)_config_opts_mingw32=--with-random=/dev/urandom
+  $(package)_config_opts=--enable-static --disable-shared --without-libidn2 --with-pic
+  $(package)_config_opts_linux=--with-ssl=$(host_prefix)
+  $(package)_config_opts_darwin=--without-ssl --with-secure-transport
+  $(package)_config_opts_mingw32=--without-ssl --with-schannel --with-random=/dev/urandom
   $(package)_config_opts_x86_64_mingw32=--target=x86_64-w64-mingw32
   $(package)_config_opts_i686_mingw32=--target=i686-w64-mingw32
 endef

depends/patches/curl/fix_lib_order.patch

@@ -1,16 +1,15 @@
---- old/configure.ac	2015-08-10 14:53:48.000000000 +0200
-+++ new/configure.ac	2017-03-16 06:25:39.388000000 +0100
-@@ -1480,7 +1480,7 @@
-     *-*-msys* | *-*-mingw*)
-       AC_MSG_CHECKING([for gdi32])
-       my_ac_save_LIBS=$LIBS
--      LIBS="-lgdi32 $LIBS"
-+      LIBS="$LIBS -lgdi32"
-       AC_TRY_LINK([#include <windef.h>
-                    #include <wingdi.h>],
-                    [GdiFlush();],
---- old/configure	2017-03-16 06:34:00.292000000 +0100
-+++ new/configure	2017-03-16 06:34:39.192000000 +0100
+--- a/configure
++++ b/configure
+@@ -22234,8 +22234,7 @@ fi
+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether to enable Secure Transport" >&5
+ $as_echo_n "checking whether to enable Secure Transport... " >&6; }
+ if test -z "$ssl_backends" -o "x$OPT_SECURETRANSPORT" != xno; then
+-  if test "x$OPT_SECURETRANSPORT" != "xno" &&
+-     test -d "/System/Library/Frameworks/Security.framework"; then
++  if test "x$OPT_SECURETRANSPORT" != "xno"; then
+     { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
+ $as_echo "yes" >&6; }
+
 @@ -21647,7 +21647,7 @@
        { $as_echo "$as_me:${as_lineno-$LINENO}: checking for gdi32" >&5
  $as_echo_n "checking for gdi32... " >&6; }
@@ -20,14 +19,14 @@
        cat confdefs.h - <<_ACEOF >conftest.$ac_ext
  /* end confdefs.h.  */
  #include <windef.h>
---- old/src/Makefile.am	2015-06-11 19:50:43.000000000 +0200
-+++ new/src/Makefile.am	2017-03-19 00:35:23.656000000 +0100
-@@ -54,7 +54,7 @@
- include Makefile.inc
- 
+--- a/src/Makefile.am
++++ b/src/Makefile.am
+@@ -55,7 +55,7 @@ include Makefile.inc
+ curl_SOURCES = $(CURL_FILES)
+
  # This might hold -Werror
 -CFLAGS += @CURL_CFLAG_EXTRAS@
 +CFLAGS += @CURL_CFLAG_EXTRAS@ -DBUILDING_LIBCURL
- 
+
  # Prevent LIBS from being used for all link targets
  LIBS = $(BLANK_AT_MAKETIME)