diff --git a/mingw-w64-curl/0001-curl-relocation.patch b/mingw-w64-curl/0001-curl-relocation.patch index 23c434a47e..6f36acd66a 100644 --- a/mingw-w64-curl/0001-curl-relocation.patch +++ b/mingw-w64-curl/0001-curl-relocation.patch @@ -38,8 +38,8 @@ diff -aur curl-7.49.1/lib/Makefile.inc.orig curl-7.49.1/lib/Makefile.inc curl_sasl.h curl_multibyte.h hostcheck.h conncache.h \ curl_setup_once.h multihandle.h setup-vms.h pipeline.h dotdot.h \ x509asn1.h http2.h sigpipe.h smb.h curl_endian.h curl_des.h \ -- curl_printf.h system_win32.h -+ curl_printf.h pathtools.h system_win32.h +- curl_printf.h system_win32.h rand.h ++ curl_printf.h pathtools.h system_win32.h rand.h LIB_RCFILES = libcurl.rc @@ -625,12 +625,11 @@ diff -aur curl-7.49.0/lib/url.c.orig curl-7.49.0/lib/url.c + char * relative = get_relative_path(CURL_BINDIR, CURL_CA_BUNDLE); + strncat(relocated, relative, path_max); + simplify_path(relocated); -+ result = setstropt(&set->str[STRING_SSL_CAFILE], (char *) relocated); ++ result = setstropt(&set->str[STRING_SSL_CAFILE_ORIG], (char *) relocated); + free((void*)relative); +#else - result = setstropt(&set->str[STRING_SSL_CAFILE], CURL_CA_BUNDLE); + result = setstropt(&set->str[STRING_SSL_CAFILE_ORIG], CURL_CA_BUNDLE); +#endif /* defined(__MINGW32__) */ if(result) return result; #endif - diff --git a/mingw-w64-curl/PKGBUILD b/mingw-w64-curl/PKGBUILD index cb644921aa..8c9e0f3a96 100644 --- a/mingw-w64-curl/PKGBUILD +++ b/mingw-w64-curl/PKGBUILD @@ -6,7 +6,7 @@ _variant=-openssl _realname=curl pkgbase=mingw-w64-${_realname} pkgname="${MINGW_PACKAGE_PREFIX}-${_realname}" -pkgver=7.51.0 +pkgver=7.52.1 pkgrel=1 pkgdesc="An URL retrival utility and library. (mingw-w64)" arch=('any') @@ -32,9 +32,9 @@ options=('staticlibs') source=("${url}/download/${_realname}-${pkgver}.tar.bz2"{,.asc} "0001-curl-relocation.patch" "0004-cURL-Get-relocatable-base-from-dll.patch") -sha256sums=('7f8240048907e5030f67be0a6129bc4b333783b9cca1391026d700835a788dde' +sha256sums=('d16185a767cb2c1ba3d5b9096ec54e5ec198b213f45864a38b3bda4bbf87389b' 'SKIP' - '3aa3e42dc35daba84470def39d7b6e16ce15f3397e99d341b844d8cd8796bab5' + 'c09b2bcc1b85912c2e96c3b976d2a9fd016ac5debcdd9ad6a009faa04940d782' 'e21fb106ebda8559ba2d34633a9d7d94be541de02de01982f92d67048bb9854b') validpgpkeys=('914C533DF9B2ADA2204F586D78E11C6B279D5C91' # Daniel Stenberg '27EDEAF22F3ABCEB50DB9A125CC908FDB71E12C2' @@ -97,4 +97,7 @@ build() { package() { cd "${srcdir}/build-${CARCH}" make DESTDIR="${pkgdir}" install + + local PREFIX_DEPS=$(cygpath -am ${MINGW_PREFIX}) + sed -s "s|${PREFIX_DEPS}|${MINGW_PREFIX}|g" -i ${pkgdir}${MINGW_PREFIX}/bin/curl-config }