Commit 4a7cbd15 authored by Milan P. Stanić's avatar Milan P. Stanić Committed by Carlo Landmeter

main/curl: fix segfault when running cargo

Patch is taken from upstream at https://github.com/curl/curls
The http2 code for connection checking needs a transfer to use. Make
sure a working one is set before handler->connection_check() is called.
parent afd2b0f5
...@@ -4,7 +4,7 @@ ...@@ -4,7 +4,7 @@
# Maintainer: Natanael Copa <ncopa@alpinelinux.org> # Maintainer: Natanael Copa <ncopa@alpinelinux.org>
pkgname=curl pkgname=curl
pkgver=7.64.0 pkgver=7.64.0
pkgrel=0 pkgrel=1
pkgdesc="URL retrival utility and library" pkgdesc="URL retrival utility and library"
url="https://curl.haxx.se" url="https://curl.haxx.se"
arch="all" arch="all"
...@@ -14,7 +14,8 @@ depends_dev="openssl-dev libssh2-dev nghttp2-dev zlib-dev" ...@@ -14,7 +14,8 @@ depends_dev="openssl-dev libssh2-dev nghttp2-dev zlib-dev"
checkdepends="python2" checkdepends="python2"
makedepends="$depends_dev autoconf automake groff libtool perl" makedepends="$depends_dev autoconf automake groff libtool perl"
subpackages="$pkgname-dbg $pkgname-doc $pkgname-dev libcurl" subpackages="$pkgname-dbg $pkgname-doc $pkgname-dev libcurl"
source="https://curl.haxx.se/download/$pkgname-$pkgver.tar.xz" source="https://curl.haxx.se/download/$pkgname-$pkgver.tar.xz
url-fix-7.64.patch"
options="!check" # sftp tests failing options="!check" # sftp tests failing
builddir="$srcdir/$pkgname-$pkgver" builddir="$srcdir/$pkgname-$pkgver"
...@@ -115,4 +116,5 @@ libcurl() { ...@@ -115,4 +116,5 @@ libcurl() {
mv "$pkgdir"/usr/lib "$subpkgdir"/usr mv "$pkgdir"/usr/lib "$subpkgdir"/usr
} }
sha512sums="953f1f5336ce5dfd1b9f933624432d401552d91ee02d39ecde6f023c956f99ec6aae8d7746d7c34b6eb2d6452f114e67da4e64d9c8dd90b7644b7844e7b9b423 curl-7.64.0.tar.xz" sha512sums="953f1f5336ce5dfd1b9f933624432d401552d91ee02d39ecde6f023c956f99ec6aae8d7746d7c34b6eb2d6452f114e67da4e64d9c8dd90b7644b7844e7b9b423 curl-7.64.0.tar.xz
9b0cd3bfb705e804f21b3c87929ec5c3bbd6f17748e82cda75c3edbca5ea66cbcb0260c666635a2cbdaa6d4081008a9c445b4f266e9b970d3deaed21f9b352a1 url-fix-7.64.patch"
--- a/lib/url.c
+++ b/lib/url.c
@@ -965,6 +965,7 @@
/* The protocol has a special method for checking the state of the
connection. Use it to check if the connection is dead. */
unsigned int state;
+ conn->data = data; /* use this transfer for now */
state = conn->handler->connection_check(conn, CONNCHECK_ISDEAD);
dead = (state & CONNRESULT_DEAD);
}
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment