Skip to content

Commit acd8287

Browse files
committed
mingw-w64-curl: update to 8.13.0
Signed-off-by: Johannes Schindelin <johannes.schindelin@gmx.de>
1 parent ca94d09 commit acd8287

File tree

3 files changed

+26
-26
lines changed

3 files changed

+26
-26
lines changed

mingw-w64-curl/0001-Make-cURL-relocatable.patch

Lines changed: 19 additions & 19 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
From 2b2ba58fedbded8de6879fa89719196480708661 Mon Sep 17 00:00:00 2001
1+
From ff09ed1ebf7621d89007f56d472ec6390d8ed9ed Mon Sep 17 00:00:00 2001
22
From: Ray Donnelly <mingw.android@gmail.com>
33
Date: Wed, 22 Feb 2017 11:03:04 +0100
44
Subject: [PATCH 1/2] Make cURL relocatable
@@ -29,10 +29,10 @@ Signed-off-by: Johannes Schindelin <johannes.schindelin@gmx.de>
2929
4 files changed, 44 insertions(+)
3030

3131
diff --git a/configure.ac b/configure.ac
32-
index a4ea9f72d..166f370f6 100644
32+
index 7f5a2bff5..51653a12b 100644
3333
--- a/configure.ac
3434
+++ b/configure.ac
35-
@@ -3608,6 +3608,7 @@ dnl default includes
35+
@@ -3952,6 +3952,7 @@ dnl default includes
3636
]
3737
)
3838

@@ -41,18 +41,18 @@ index a4ea9f72d..166f370f6 100644
4141
dnl Checks for typedefs, structures, and compiler characteristics.
4242
AC_C_CONST
4343
diff --git a/lib/Makefile.inc b/lib/Makefile.inc
44-
index 66680f3ad..1772f7696 100644
44+
index a8e4da1cf..147500bf6 100644
4545
--- a/lib/Makefile.inc
4646
+++ b/lib/Makefile.inc
47-
@@ -197,6 +197,7 @@ LIB_CFILES = \
47+
@@ -204,6 +204,7 @@ LIB_CFILES = \
4848
noproxy.c \
4949
openldap.c \
5050
parsedate.c \
5151
+ pathtools.c \
5252
pingpong.c \
5353
pop3.c \
5454
progress.c \
55-
@@ -333,6 +334,7 @@ LIB_HFILES = \
55+
@@ -343,6 +344,7 @@ LIB_HFILES = \
5656
nonblock.h \
5757
noproxy.h \
5858
parsedate.h \
@@ -61,12 +61,12 @@ index 66680f3ad..1772f7696 100644
6161
pop3.h \
6262
progress.h \
6363
diff --git a/lib/curl_config.h.in b/lib/curl_config.h.in
64-
index 50e075947..6c540bb25 100644
64+
index b4754f3e2..608903328 100644
6565
--- a/lib/curl_config.h.in
6666
+++ b/lib/curl_config.h.in
67-
@@ -15,6 +15,9 @@
68-
/* Location of default ca path */
69-
#undef CURL_CA_PATH
67+
@@ -12,6 +12,9 @@
68+
/* If safe CA bundle search is enabled */
69+
#undef CURL_CA_SEARCH_SAFE
7070

7171
+/* Location of executable */
7272
+#undef CURL_BINDIR
@@ -75,24 +75,24 @@ index 50e075947..6c540bb25 100644
7575
#undef CURL_DEFAULT_SSL_BACKEND
7676

7777
diff --git a/lib/url.c b/lib/url.c
78-
index 2814d31ad..e7175be03 100644
78+
index 2125a97af..944f10e68 100644
7979
--- a/lib/url.c
8080
+++ b/lib/url.c
81-
@@ -119,6 +119,9 @@
82-
#include "altsvc.h"
81+
@@ -120,6 +120,9 @@
8382
#include "dynbuf.h"
8483
#include "headers.h"
84+
#include "strparse.h"
8585
+#if defined(__MINGW32__)
8686
+#include "pathtools.h"
8787
+#endif
88-
8988
/* The last 3 #include files should be in this order */
9089
#include "curl_printf.h"
91-
@@ -436,22 +439,57 @@ CURLcode Curl_init_userdefined(struct Curl_easy *data)
90+
#include "curl_memory.h"
91+
@@ -430,22 +433,57 @@ CURLcode Curl_init_userdefined(struct Curl_easy *data)
9292
if(Curl_ssl_backend() != CURLSSLBACKEND_SCHANNEL &&
9393
Curl_ssl_backend() != CURLSSLBACKEND_SECURETRANSPORT) {
94-
#if defined(CURL_CA_BUNDLE)
95-
+#if defined(__MINGW32__)
94+
#ifdef CURL_CA_BUNDLE
95+
+#ifdef __MINGW32__
9696
+ const size_t path_max = PATH_MAX;
9797
+ char relocated_bundle[path_max];
9898
+ get_dll_path(relocated_bundle, path_max);
@@ -120,8 +120,8 @@ index 2814d31ad..e7175be03 100644
120120
return result;
121121
#endif
122122
#endif
123-
#if defined(CURL_CA_PATH)
124-
+#if defined(__MINGW32__)
123+
#ifdef CURL_CA_PATH
124+
+#ifdef __MINGW32__
125125
+ const size_t path_max = PATH_MAX;
126126
+ char relocated_ca_path[path_max];
127127
+ get_dll_path(relocated_ca_path, path_max);

mingw-w64-curl/0002-Hack-make-relocation-work-inside-libexec-git-core-an.patch

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
From 7a53608fcbab8de7f8a725c6ea99a58086b2f6c6 Mon Sep 17 00:00:00 2001
1+
From d762df33fbdb126aea628485c95027d79f2cbb68 Mon Sep 17 00:00:00 2001
22
From: Johannes Schindelin <johannes.schindelin@gmx.de>
33
Date: Wed, 31 Oct 2018 10:52:59 +0100
44
Subject: [PATCH 2/2] Hack: make relocation work inside libexec/git-core/ and
@@ -30,10 +30,10 @@ Signed-off-by: Johannes Schindelin <johannes.schindelin@gmx.de>
3030
1 file changed, 20 insertions(+), 1 deletion(-)
3131

3232
diff --git a/lib/url.c b/lib/url.c
33-
index e7175be03..d46adbaa8 100644
33+
index 944f10e68..8762e597b 100644
3434
--- a/lib/url.c
3535
+++ b/lib/url.c
36-
@@ -445,10 +445,29 @@ CURLcode Curl_init_userdefined(struct Curl_easy *data)
36+
@@ -439,10 +439,29 @@ CURLcode Curl_init_userdefined(struct Curl_easy *data)
3737
get_dll_path(relocated_bundle, path_max);
3838
strip_n_suffix_folders(relocated_bundle, 1);
3939
strncat(relocated_bundle, "/", path_max - 1);

mingw-w64-curl/PKGBUILD

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@ pkgbase=mingw-w64-${_realname}
55
pkgname=("${MINGW_PACKAGE_PREFIX}-${_realname}"
66
"${MINGW_PACKAGE_PREFIX}-${_realname}-gnutls"
77
"${MINGW_PACKAGE_PREFIX}-${_realname}-winssl")
8-
pkgver=8.12.1
8+
pkgver=8.13.0
99
pkgrel=1
1010
pkgdesc="Command line tool and library for transferring data with URLs (mingw-w64)"
1111
arch=('any')
@@ -36,12 +36,12 @@ source=("https://github.com/curl/curl/releases/download/${_realname}-${pkgver//.
3636
"pathtools.h"
3737
"0001-Make-cURL-relocatable.patch"
3838
"0002-Hack-make-relocation-work-inside-libexec-git-core-an.patch")
39-
sha256sums=('18681d84e2791183e0e5e4650ccb2a080c1f3a4e57ed2fbc2457228579d68269'
39+
sha256sums=('e0d20499260760f9865cb6308928223f4e5128910310c025112f592a168e1473'
4040
'SKIP'
4141
'08209cbf1633fa92eae7e5d28f95f8df9d6184cc20fa878c99aec4709bb257fd'
4242
'965d3921ec4fdeec94a2718bc2c85ce5e1a00ea0e499330a554074a7ae15dfc6'
43-
'd34c9474a0b54d36497e58b4792699ef37cc8b043a4cd5daf287e1e33f660207'
44-
'418b5619b924d17ac71066323b5540d86d4e8055cabab925ece185770e9d1906')
43+
'40be5c358cc44684b27ed1d18fd0736e70ab10125f6355a54dec30f152a6e11c'
44+
'd0db1c981d1158872ff8681f0984da1ebbaa96be9538d808d0eed8abffe2d46c')
4545
validpgpkeys=('27EDEAF22F3ABCEB50DB9A125CC908FDB71E12C2') # Daniel Stenberg
4646

4747
if test -z "$WITHOUT_ALTERNATES"

0 commit comments

Comments
 (0)