[arch-commits] Commit in libcurl/trunk (2 files)
Christian Hesse
eworm at gemini.archlinux.org
Wed Sep 22 06:46:49 UTC 2021
Date: Wednesday, September 22, 2021 @ 06:46:49
Author: eworm
Revision: 1021362
upgpkg: libcurl 7.79.1-1: new upstream release
Modified:
libcurl/trunk/PKGBUILD
Deleted:
libcurl/trunk/0001-Curl_http2_setup-do-not-change-connection-data-on-repeat-invokes.patch
-----------------------------------------------------------------------------+
0001-Curl_http2_setup-do-not-change-connection-data-on-repeat-invokes.patch | 47 ----------
PKGBUILD | 18 +--
2 files changed, 5 insertions(+), 60 deletions(-)
Deleted: 0001-Curl_http2_setup-do-not-change-connection-data-on-repeat-invokes.patch
===================================================================
--- 0001-Curl_http2_setup-do-not-change-connection-data-on-repeat-invokes.patch 2021-09-22 06:27:11 UTC (rev 1021361)
+++ 0001-Curl_http2_setup-do-not-change-connection-data-on-repeat-invokes.patch 2021-09-22 06:46:49 UTC (rev 1021362)
@@ -1,47 +0,0 @@
-From 901804ef95777b8e735a55b77f8dd630a58c575b Mon Sep 17 00:00:00 2001
-From: Daniel Stenberg <daniel at haxx.se>
-Date: Thu, 16 Sep 2021 08:50:54 +0200
-Subject: [PATCH] Curl_http2_setup: don't change connection data on repeat
- invokes
-
-Regression from 3cb8a748670ab88c (releasde in 7.79.0). That change moved
-transfer oriented inits to before the check but also erroneously moved a
-few connection oriented ones, which causes problems.
-
-Reported-by: Evangelos Foutras
-Fixes #7730
-Closes #7731
----
- lib/http2.c | 12 ++++++------
- 1 file changed, 6 insertions(+), 6 deletions(-)
-
-diff --git a/lib/http2.c b/lib/http2.c
-index a3de607c7d24..6d63f43636a5 100644
---- a/lib/http2.c
-+++ b/lib/http2.c
-@@ -2221,12 +2221,6 @@ CURLcode Curl_http2_setup(struct Curl_easy *data,
- stream->mem = data->state.buffer;
- stream->len = data->set.buffer_size;
-
-- httpc->inbuflen = 0;
-- httpc->nread_inbuf = 0;
--
-- httpc->pause_stream_id = 0;
-- httpc->drain_total = 0;
--
- multi_connchanged(data->multi);
- /* below this point only connection related inits are done, which only needs
- to be done once per connection */
-@@ -2252,6 +2246,12 @@ CURLcode Curl_http2_setup(struct Curl_easy *data,
- conn->httpversion = 20;
- conn->bundle->multiuse = BUNDLE_MULTIPLEX;
-
-+ httpc->inbuflen = 0;
-+ httpc->nread_inbuf = 0;
-+
-+ httpc->pause_stream_id = 0;
-+ httpc->drain_total = 0;
-+
- infof(data, "Connection state changed (HTTP/2 confirmed)");
-
- return CURLE_OK;
Modified: PKGBUILD
===================================================================
--- PKGBUILD 2021-09-22 06:27:11 UTC (rev 1021361)
+++ PKGBUILD 2021-09-22 06:46:49 UTC (rev 1021362)
@@ -4,8 +4,8 @@
pkgbase=libcurl
pkgname=(libcurl-compat libcurl-gnutls)
_pkgname=curl
-pkgver=7.79.0
-pkgrel=2
+pkgver=7.79.1
+pkgrel=1
pkgdesc='An URL retrieval library'
arch=('x86_64')
url='https://curl.haxx.se'
@@ -13,11 +13,9 @@
depends=("${_pkgname}")
makedepends=('gnutls' 'openssl')
options=('strip')
-source=("https://curl.haxx.se/download/curl-${pkgver}.tar.gz"{,.asc}
- '0001-Curl_http2_setup-do-not-change-connection-data-on-repeat-invokes.patch')
-sha512sums=('6529645774bd2687535cfaec5949281f305c2910da3bd4de22713ab370fde0d05c416579b46aef7eaaf5f73d882e96b8268b80b6802b978f9c54b0a837420dad'
- 'SKIP'
- 'f83ba83073a90ab369c7c0e06d440d6d8be87c72800095c35d803bca246ea5ee73b811b210ce9d8a7ee137583ca3e839afd8eb9accf699f655e9db82a7bdef71')
+source=("https://curl.haxx.se/download/curl-${pkgver}.tar.gz"{,.asc})
+sha512sums=('0f9546285bef741f69d25f20bcd5b961d29fc88084d9f3ebe0c66a6674f4c69a531b41f8e3cc57474f528abdd90aa7981e653c339c5e8383353c36a82efaafc4'
+ 'SKIP')
validpgpkeys=('27EDEAF22F3ABCEB50DB9A125CC908FDB71E12C2') # Daniel Stenberg
_configure_options=(
@@ -35,12 +33,6 @@
--with-ca-bundle='/etc/ssl/certs/ca-certificates.crt'
)
-prepare() {
- cd "curl-${pkgver}"
-
- patch -Np1 < ../0001-Curl_http2_setup-do-not-change-connection-data-on-repeat-invokes.patch
-}
-
build() {
mkdir build-{compat,gnutls}
More information about the arch-commits
mailing list