Merge pull request #124 from snowflakedb/ssl_upgrade

Ssl upgrade

deps-build/darwin/aws/lib/cmake/aws-cpp-sdk-core/aws-cpp-sdk-core-targets.cmake

@@ -56,7 +56,7 @@ add_library(aws-cpp-sdk-core STATIC IMPORTED)
 set_target_properties(aws-cpp-sdk-core PROPERTIES
   INTERFACE_COMPILE_DEFINITIONS "AWS_SDK_VERSION_MAJOR=1;AWS_SDK_VERSION_MINOR=3;AWS_SDK_VERSION_PATCH=50"
   INTERFACE_INCLUDE_DIRECTORIES "${_IMPORT_PREFIX}/include"
-  INTERFACE_LINK_LIBRARIES "pthread;/Users/stakeda/git/libsnowflakeclient/deps-build/darwin/curl/lib"
+  INTERFACE_LINK_LIBRARIES "pthread;/Users/stakeda/git/libsnowflakeclient/scripts/../deps-build/darwin/curl/lib"
 )
 
 if(CMAKE_VERSION VERSION_LESS 2.8.12)

deps-build/darwin/curl/bin/curl-config

@@ -21,7 +21,7 @@
 #
 ###########################################################################
 
-prefix=/Users/kristopherwagner/libsnowflakeclient/scripts/../deps-build/darwin/curl
+prefix=/Users/stakeda/git/libsnowflakeclient/scripts/../deps-build/darwin/curl
 exec_prefix=${prefix}
 includedir=${prefix}/include
 cppflag_curl_staticlib=-DCURL_STATICLIB
@@ -160,15 +160,15 @@ while test $# -gt 0; do
 
     --static-libs)
         if test "Xyes" != "Xno" ; then
-          echo ${exec_prefix}/lib/libcurl.a -L/Users/kristopherwagner/libsnowflakeclient/scripts/../deps-build/darwin/openssl/lib -lssl -lcrypto -lz -ldl
+          echo ${exec_prefix}/lib/libcurl.a -L/Users/stakeda/git/libsnowflakeclient/scripts/../deps-build/darwin/openssl/lib -lssl -lcrypto -lz -ldl
         else
           echo "curl was built with static libraries disabled" >&2
           exit 1
         fi
         ;;
 
     --configure)
-        echo " '--with-ssl=/Users/kristopherwagner/libsnowflakeclient/scripts/../deps-build/darwin/openssl' '--without-nss' '--enable-static' '--disable-shared' '--prefix=/Users/kristopherwagner/libsnowflakeclient/scripts/../deps-build/darwin/curl' '--without-libssh2' '--disable-rtsp' '--disable-ldap' '--disable-ldaps' '--disable-telnet' '--disable-tftp' '--disable-imap' '--disable-smb' '--disable-smtp' '--disable-gopher' '--disable-pop3' '--disable-ftp' '--disable-dict' '--disable-file' '--disable-manual' 'CC=clang' 'CFLAGS=-arch x86_64 -Xarch_x86_64 -DSIZEOF_LONG_INT=8 -mmacosx-version-min=10.11' 'LIBS=-ldl'"
+        echo " '--with-ssl=/Users/stakeda/git/libsnowflakeclient/scripts/../deps-build/darwin/openssl' '--without-nss' '--enable-static' '--disable-shared' '--prefix=/Users/stakeda/git/libsnowflakeclient/scripts/../deps-build/darwin/curl' '--without-libssh2' '--disable-rtsp' '--disable-ldap' '--disable-ldaps' '--disable-telnet' '--disable-tftp' '--disable-imap' '--disable-smb' '--disable-smtp' '--disable-gopher' '--disable-pop3' '--disable-ftp' '--disable-dict' '--disable-file' '--disable-manual' 'CC=clang' 'CFLAGS=-arch x86_64 -Xarch_x86_64 -DSIZEOF_LONG_INT=8 -mmacosx-version-min=10.11' 'LIBS=-ldl'"
         ;;
 
     *)

deps-build/darwin/curl/lib/pkgconfig/libcurl.pc

@@ -23,7 +23,7 @@
 # This should most probably benefit from getting a "Requires:" field added
 # dynamically by configure.
 #
-prefix=/Users/kristopherwagner/libsnowflakeclient/scripts/../deps-build/darwin/curl
+prefix=/Users/stakeda/git/libsnowflakeclient/scripts/../deps-build/darwin/curl
 exec_prefix=${prefix}
 libdir=${exec_prefix}/lib
 includedir=${prefix}/include

deps-build/darwin/curl/share/man/man1/curl-config.1

@@ -0,0 +1,103 @@
+.\" **************************************************************************
+.\" *                                  _   _ ____  _
+.\" *  Project                     ___| | | |  _ \| |
+.\" *                             / __| | | | |_) | |
+.\" *                            | (__| |_| |  _ <| |___
+.\" *                             \___|\___/|_| \_\_____|
+.\" *
+.\" * Copyright (C) 1998 - 2017, Daniel Stenberg, <[email protected]>, et al.
+.\" *
+.\" * This software is licensed as described in the file COPYING, which
+.\" * you should have received as part of this distribution. The terms
+.\" * are also available at https://curl.haxx.se/docs/copyright.html.
+.\" *
+.\" * You may opt to use, copy, modify, merge, publish, distribute and/or sell
+.\" * copies of the Software, and permit persons to whom the Software is
+.\" * furnished to do so, under the terms of the COPYING file.
+.\" *
+.\" * This software is distributed on an "AS IS" basis, WITHOUT WARRANTY OF ANY
+.\" * KIND, either express or implied.
+.\" *
+.\" **************************************************************************
+.\"
+.TH curl-config 1 "November 30, 2017" "Curl 7.58.0" "curl-config manual"
+
+.SH NAME
+curl-config \- Get information about a libcurl installation
+.SH SYNOPSIS
+.B curl-config [options]
+.SH DESCRIPTION
+.B curl-config
+displays information about the curl and libcurl installation.
+.SH OPTIONS
+.IP "--ca"
+Displays the built-in path to the CA cert bundle this libcurl uses.
+.IP "--cc"
+Displays the compiler used to build libcurl.
+.IP "--cflags"
+Set of compiler options (CFLAGS) to use when compiling files that use
+libcurl. Currently that is only the include path to the curl include files.
+.IP "--checkfor [version]"
+Specify the oldest possible libcurl version string you want, and this
+script will return 0 if the current installation is new enough or it
+returns 1 and outputs a text saying that the current version is not new
+enough. (Added in 7.15.4)
+.IP "--configure"
+Displays the arguments given to configure when building curl.
+.IP "--feature"
+Lists what particular main features the installed libcurl was built with. At
+the time of writing, this list may include SSL, KRB4 or IPv6. Do not assume
+any particular order. The keywords will be separated by newlines. There may be
+none, one, or several keywords in the list.
+.IP "--help"
+Displays the available options.
+.IP "--libs"
+Shows the complete set of libs and other linker options you will need in order
+to link your application with libcurl.
+.IP "--prefix"
+This is the prefix used when libcurl was installed. Libcurl is then installed
+in $prefix/lib and its header files are installed in $prefix/include and so
+on. The prefix is set with "configure --prefix".
+.IP "--protocols"
+Lists what particular protocols the installed libcurl was built to support. At
+the time of writing, this list may include HTTP, HTTPS, FTP, FTPS, FILE,
+TELNET, LDAP, DICT. Do not assume any particular order. The protocols will
+be listed using uppercase and are separated by newlines. There may be none,
+one, or several protocols in the list. (Added in 7.13.0)
+.IP "--ssl-backends"
+Lists the SSL backends that were enabled when libcurl was built. It might be
+no, one or several names. If more than one name, they will appear
+comma-separated. (Added in 7.58.0)
+.IP "--static-libs"
+Shows the complete set of libs and other linker options you will need in order
+to link your application with libcurl statically. (Added in 7.17.1)
+.IP "--version"
+Outputs version information about the installed libcurl.
+.IP "--vernum"
+Outputs version information about the installed libcurl, in numerical mode.
+This outputs the version number, in hexadecimal, with 8 bits for each part;
+major, minor, patch. So that libcurl 7.7.4 would appear as 070704 and libcurl
+12.13.14 would appear as 0c0d0e... Note that the initial zero might be
+omitted. (This option was broken in the 7.15.0 release.)
+.SH "EXAMPLES"
+What linker options do I need when I link with libcurl?
+
+  $ curl-config --libs
+
+What compiler options do I need when I compile using libcurl functions?
+
+  $ curl-config --cflags
+
+How do I know if libcurl was built with SSL support?
+
+  $ curl-config --feature | grep SSL
+
+What's the installed libcurl version?
+
+  $ curl-config --version
+
+How do I build a single file with a one-line command?
+
+  $ `curl-config --cc --cflags` -o example example.c `curl-config --libs`
+.SH "SEE ALSO"
+.BR curl (1)