curl: Update to 7.47.1

mingw-w64-curl/0001-curl-relocation.patch

@@ -630,12 +630,8 @@ diff -urN curl-7.37.1.orig/lib/url.c curl-7.37.1/lib/url.c
 +  result = setstropt(&set->str[STRING_SSL_CAFILE], (char *) relocated);
 +  free((void*)relative);
 +#else
-   result = setstropt(&set->str[STRING_SSL_CAFILE], (char *) CURL_CA_BUNDLE);
+   result = setstropt(&set->str[STRING_SSL_CAFILE], CURL_CA_BUNDLE);
 +#endif /* defined(__MINGW32__) */
    if(result)
      return result;
- #elif defined(CURL_CA_PATH)
-   result = setstropt(&set->str[STRING_SSL_CAPATH], (char *) CURL_CA_PATH);
-   if(result)
-     return result;
  #endif

mingw-w64-curl/0002-curl-mingw-enable-static.patch

@@ -1,12 +0,0 @@
-diff -urN curl-7.40.0.orig/configure.ac curl-7.40.0/configure.ac
---- curl-7.40.0.orig/m4/xc-lt-iface.m4	2014-07-14 19:49:18.000000000 +0100
-+++ curl-7.40.0/m4/xc-lt-iface.m4	2014-08-28 21:39:53.352497100 +0100
-@@ -72,7 +72,7 @@
- if test "x$xc_lt_want_enable_shared" = 'xyes' &&
-   test "x$xc_lt_want_enable_static" = 'xyes'; then
-   case $host_os in @%:@ (
--    mingw* | pw32* | cegcc* | os2* | aix*)
-+    pw32* | cegcc* | os2* | aix*)
-       xc_lt_want_enable_static='no'
-       ;;
-   esac

mingw-w64-curl/0003-curl-detect-ipv6-on-windows.patch

@@ -1,71 +0,0 @@
-From: Johannes Schindelin <johannes.schindelin@gmx.de>
-Date: Thu, 17 Sep 2015 20:03:34 +0200
-Subject: [PATCH] Auto-detect IPv6 support even on Windows
-
-Signed-off-by: Johannes Schindelin <johannes.schindelin@gmx.de>
----
- configure.ac         | 11 ++++++++++-
- m4/curl-functions.m4 | 10 ++++++++++
- 2 files changed, 20 insertions(+), 1 deletion(-)
-
-diff --git a/configure.ac b/configure.ac
-index be2634a..9ff200d 100644
---- a/configure.ac
-+++ b/configure.ac
-@@ -1081,7 +1081,11 @@ AC_HELP_STRING([--disable-ipv6],[Disable IPv6 support]),
- 
-   AC_TRY_RUN([ /* is AF_INET6 available? */
- #include <sys/types.h>
-+#ifdef HAVE_WINSOCK2_H
-+#include <winsock2.h>
-+#else
- #include <sys/socket.h>
-+#endif
- #include <stdlib.h> /* for exit() */
- main()
- {
-@@ -1108,7 +1112,12 @@ if test "$ipv6" = yes; then
-   AC_MSG_CHECKING([if struct sockaddr_in6 has sin6_scope_id member])
-   AC_TRY_COMPILE([
- #include <sys/types.h>
--#include <netinet/in.h>] ,
-+#ifdef HAVE_WINSOCK2_H
-+#include <winsock2.h>
-+#include <ws2tcpip.h>
-+#else
-+#include <netinet/in.h>
-+#endif] ,
-   struct sockaddr_in6 s; s.sin6_scope_id = 0; , have_sin6_scope_id=yes)
-   if test "$have_sin6_scope_id" = yes; then
-     AC_MSG_RESULT([yes])
-diff --git a/m4/curl-functions.m4 b/m4/curl-functions.m4
-index 0d65421..9f04661 100644
---- a/m4/curl-functions.m4
-+++ b/m4/curl-functions.m4
-@@ -44,6 +44,10 @@ curl_includes_arpa_inet="\
- #ifdef HAVE_ARPA_INET_H
- #  include <arpa/inet.h>
- #endif
-+#ifdef HAVE_WINSOCK2_H
-+#include <winsock2.h>
-+#include <ws2tcpip.h>
-+#endif
- /* includes end */"
-   AC_CHECK_HEADERS(
-     sys/types.h sys/socket.h netinet/in.h arpa/inet.h,
-@@ -2098,6 +2102,12 @@ AC_DEFUN([CURL_CHECK_FUNC_GETADDRINFO], [
-         struct addrinfo *ai = 0;
-         int error;
- 
-+        #ifdef HAVE_WINSOCK2_H
-+        WSADATA wsa;
-+        if (WSAStartup(MAKEWORD(2,2), &wsa))
-+                exit(2);
-+        #endif
-+
-         memset(&hints, 0, sizeof(hints));
-         hints.ai_flags = AI_NUMERICHOST;
-         hints.ai_family = AF_UNSPEC;
--- 
-2.5.2.windows.2
-

mingw-w64-curl/PKGBUILD

@@ -6,8 +6,8 @@ _variant=-openssl
 _realname=curl
 pkgbase=mingw-w64-${_realname}
 pkgname="${MINGW_PACKAGE_PREFIX}-${_realname}"
-pkgver=7.46.0
-pkgrel=2
+pkgver=7.47.1
+pkgrel=1
 pkgdesc="An URL retrival utility and library. (mingw-w64)"
 arch=('any')
 url="https://curl.haxx.se"
@@ -27,16 +27,12 @@ depends=("${MINGW_PACKAGE_PREFIX}-gcc-libs"
             "${MINGW_PACKAGE_PREFIX}-gnutls")
          )
 options=('staticlibs')
-source=("$url/download/${_realname}-${pkgver}.tar.bz2"{,.asc}
+source=("${url}/download/${_realname}-${pkgver}.tar.bz2"{,.asc}
         "0001-curl-relocation.patch"
-        "0002-curl-mingw-enable-static.patch"
-        "0003-curl-detect-ipv6-on-windows.patch"
         "0004-cURL-Get-relocatable-base-from-dll.patch")
-sha256sums=('b7d726cdd8ed4b6db0fa1b474a3c59ebbbe4dcd4c61ac5e7ade0e0270d3195ad'
+sha256sums=('ddc643ab9382e24bbe4747d43df189a0a6ce38fcb33df041b9cb0b3cd47ae98f'
             'SKIP'
-            '595a04a94e55558d155432c343f8be41fa599abd6a74deace458d102a20f9411'
-            '8303f03962e03a4bf45e6953df21ff670e9c8cf85dc6b6dd1b7fbd287a370c17'
-            '9fba19f06d06728dbe891afb6d17bbe54267e8c2319404d434c45b53a9445bb3'
+            '99327833b310a2a05197bf48d43e5a8bb89b8ec3f7315d6b1adba327d4bf8074'
             'e21fb106ebda8559ba2d34633a9d7d94be541de02de01982f92d67048bb9854b')
 validpgpkeys=('914C533DF9B2ADA2204F586D78E11C6B279D5C91')  # Daniel Stenberg
 
@@ -44,8 +40,6 @@ prepare() {
   cd "${_realname}-${pkgver}"
   rm -f lib/pathtools.h lib/pathtools.c > /dev/null 2>&1 || true
   patch -p1 -i "${srcdir}/0001-curl-relocation.patch"
-  patch -p1 -i "${srcdir}/0002-curl-mingw-enable-static.patch"
-  patch -p1 -i "${srcdir}/0003-curl-detect-ipv6-on-windows.patch"
   patch -p1 -i "${srcdir}/0004-cURL-Get-relocatable-base-from-dll.patch"
   autoreconf -vfi
 }