From ec00105eaaa7cff1eee88c5f2d14ad54233a9f6d Mon Sep 17 00:00:00 2001 From: anolis-bot Date: Wed, 22 Feb 2023 02:23:54 +0800 Subject: [PATCH] update to curl-7.61.1-25.el8_7.2 Signed-off-by: anolis-bot --- 0046-curl-7.61.1-h2-window-size.patch | 44 +++++++++++++++++++++++++++ curl.spec | 38 +++++++++-------------- 2 files changed, 59 insertions(+), 23 deletions(-) create mode 100644 0046-curl-7.61.1-h2-window-size.patch diff --git a/0046-curl-7.61.1-h2-window-size.patch b/0046-curl-7.61.1-h2-window-size.patch new file mode 100644 index 0000000..805afff --- /dev/null +++ b/0046-curl-7.61.1-h2-window-size.patch @@ -0,0 +1,44 @@ +From 4bbd1947aeb26d5dbcddbb058652e0e64771b71d Mon Sep 17 00:00:00 2001 +From: Kamil Dudka +Date: Mon, 6 Feb 2023 17:46:36 +0100 +Subject: [PATCH] h2: lower initial window size to 32 MiB + +Cherry-picked from upstream commit +15f51474c837679c0b79825c23356ac681ffabde which was focused on paused +transfers but required an update of nghttp2 to work properly. + +Bug: https://bugzilla.redhat.com/2166254 +--- + lib/http2.c | 2 +- + tests/data/test1800 | 2 +- + 2 files changed, 2 insertions(+), 2 deletions(-) + +diff --git a/lib/http2.c b/lib/http2.c +index 3071097..1fd2233 100644 +--- a/lib/http2.c ++++ b/lib/http2.c +@@ -63,7 +63,7 @@ + #define NGHTTP2_HAS_SET_LOCAL_WINDOW_SIZE 1 + #endif + +-#define HTTP2_HUGE_WINDOW_SIZE (1 << 30) ++#define HTTP2_HUGE_WINDOW_SIZE (32 * 1024 * 1024) /* 32 MB */ + + #ifdef DEBUG_HTTP2 + #define H2BUGF(x) x +diff --git a/tests/data/test1800 b/tests/data/test1800 +index 0110184..c308c99 100644 +--- a/tests/data/test1800 ++++ b/tests/data/test1800 +@@ -48,7 +48,7 @@ Host: %HOSTIP:%HTTPPORT + Accept: */* + Connection: Upgrade, HTTP2-Settings + Upgrade: %H2CVER +-HTTP2-Settings: AAMAAABkAARAAAAAAAIAAAAA ++HTTP2-Settings: AAMAAABkAAQCAAAAAAIAAAAA + + + +-- +2.39.1 + diff --git a/curl.spec b/curl.spec index 06bb183..a79794b 100644 --- a/curl.spec +++ b/curl.spec @@ -1,8 +1,7 @@ -%define anolis_release .0.2 Summary: A utility for getting files from remote servers (FTP, HTTP, and others) Name: curl Version: 7.61.1 -Release: 25%{anolis_release}%{?dist}.1 +Release: 25%{?dist}.2 License: MIT Source: https://curl.haxx.se/download/%{name}-%{version}.tar.xz @@ -125,6 +124,9 @@ Patch42: 0042-curl-7.61.1-ssh-known-hosts.patch # upon HTTP_1_1_REQUIRED, retry the request with HTTP/1.1 (#2139337) Patch44: 0044-curl-7.61.1-retry-http11.patch +# h2: lower initial window size to 32 MiB (#2166254) +Patch46: 0046-curl-7.61.1-h2-window-size.patch + # patch making libcurl multilib ready Patch101: 0101-curl-7.32.0-multilib.patch @@ -142,8 +144,6 @@ Patch105: 0105-curl-7.61.1-test-ports.patch Provides: curl-full = %{version}-%{release} Provides: webclient -Provides: /usr/bin/curl -Requires: glibc URL: https://curl.haxx.se/ BuildRequires: automake BuildRequires: brotli-devel @@ -283,14 +283,6 @@ comes with a limited set of features compared to the 'libcurl' package. On the other hand, the package is smaller and requires fewer run-time dependencies to be installed. -%package doc -Summary: Documents for %{name} -BuildArch: noarch -Requires: %{name} = %{version}-%{release} - -%description doc -Doc pages for %{name}. - %prep %setup -q @@ -351,6 +343,7 @@ sed -e 's|:8992/|:%{?__isa_bits}92/|g' -i tests/data/test97{3..6} %patch41 -p1 %patch42 -p1 %patch44 -p1 +%patch46 -p1 # make tests/*.py use Python 3 sed -e '1 s|^#!/.*python|#!%{__python3}|' -i tests/*.py @@ -479,15 +472,22 @@ rm -f ${RPM_BUILD_ROOT}%{_libdir}/libcurl.la %ldconfig_scriptlets -n libcurl-minimal %files +%doc CHANGES README* +%doc docs/BUGS docs/FAQ docs/FEATURES +%doc docs/MANUAL docs/RESOURCES +%doc docs/TheArtOfHttpScripting docs/TODO %{_bindir}/curl %{_mandir}/man1/curl.1* %{_datadir}/zsh/site-functions %files -n libcurl +%license COPYING %{_libdir}/libcurl.so.4 %{_libdir}/libcurl.so.4.[0-9].[0-9] %files -n libcurl-devel +%doc docs/examples/*.c docs/examples/Makefile.example docs/INTERNALS.md +%doc docs/CONTRIBUTE.md docs/libcurl/ABI %{_bindir}/curl-config* %{_includedir}/curl %{_libdir}/*.so @@ -501,21 +501,13 @@ rm -f ${RPM_BUILD_ROOT}%{_libdir}/libcurl.la %{_mandir}/man1/curl.1* %files -n libcurl-minimal +%license COPYING %{_libdir}/libcurl.so.4.minimal %{_libdir}/libcurl.so.4.[0-9].[0-9].minimal -%files doc -%license COPYING -%doc docs/examples/*.c docs/examples/Makefile.example docs/INTERNALS.md -%doc docs/CONTRIBUTE.md docs/libcurl/ABI -%doc CHANGES README* -%doc docs/BUGS docs/FAQ docs/FEATURES -%doc docs/MANUAL docs/RESOURCES -%doc docs/TheArtOfHttpScripting docs/TODO - %changelog -* Mon Jan 30 2023 Weisson - 7.61.1-25.0.2.1 -- Add doc sub package +* Tue Feb 07 2023 Kamil Dudka - 7.61.1-25.el8_7.2 +- h2: lower initial window size to 32 MiB (#2166254) * Fri Nov 18 2022 Kamil Dudka - 7.61.1-25.el8_7.1 - upon HTTP_1_1_REQUIRED, retry the request with HTTP/1.1 (#2139337) -- Gitee