diff --git a/c00e94fa0a131994de70d97838de83d32a1f7a82.patch b/c00e94fa0a131994de70d97838de83d32a1f7a82.patch deleted file mode 100644 index 1b528fb40fc2e71379d82ef2374fedd8218cf5e2..0000000000000000000000000000000000000000 --- a/c00e94fa0a131994de70d97838de83d32a1f7a82.patch +++ /dev/null @@ -1,35 +0,0 @@ -From c00e94fa0a131994de70d97838de83d32a1f7a82 Mon Sep 17 00:00:00 2001 -From: Daniel Stenberg -Date: Wed, 15 Feb 2023 13:03:21 +0100 -Subject: [PATCH] runtests: fix "uninitialized value $port" - -by using a more appropriate variable - -Reported-by: fundawang on github -Fixes #10518 ---- - tests/runtests.pl | 4 ++-- - 1 file changed, 2 insertions(+), 2 deletions(-) - -diff --git a/tests/runtests.pl b/tests/runtests.pl -index 71644ad18e855..5cd87897a393c 100755 ---- a/tests/runtests.pl -+++ b/tests/runtests.pl -@@ -1740,7 +1740,7 @@ sub runhttpserver { - } - - # where is it? -- my $port; -+ my $port = 0; - if(!$port_or_path) { - $port = $port_or_path = pidfromfile($portfile); - } -@@ -1758,7 +1758,7 @@ sub runhttpserver { - $pid2 = $pid3; - - if($verbose) { -- logmsg "RUN: $srvrname server is on PID $httppid port $port\n"; -+ logmsg "RUN: $srvrname server is on PID $httppid port $port_or_path\n"; - } - - return ($httppid, $pid2, $port); diff --git a/curl-7.88.0.tar.xz b/curl-7.88.0.tar.xz deleted file mode 100644 index 156a89116bee7add05b52656bcce4e4a2db97990..0000000000000000000000000000000000000000 Binary files a/curl-7.88.0.tar.xz and /dev/null differ diff --git a/curl-7.88.1.tar.xz b/curl-7.88.1.tar.xz new file mode 100644 index 0000000000000000000000000000000000000000..fe94b69a26ff1e5ff6670175a70bf559784ee689 Binary files /dev/null and b/curl-7.88.1.tar.xz differ diff --git a/curl.spec b/curl.spec index 561a4c2a4fd1ba4cdc7a3b96498db90d2d5c6648..41909c1dc68fa41a5d499a8239bdaa38f9dd94bd 100644 --- a/curl.spec +++ b/curl.spec @@ -1,16 +1,12 @@ -%define anolis_release 2 +%define anolis_release 1 Summary: A utility for getting files from remote servers (FTP, HTTP, and others) Name: curl -Version: 7.88.0 +Version: 7.88.1 Release: %{anolis_release}%{?dist} License: MIT Source0: https://curl.se/download/%{name}-%{version}.tar.xz # Upstream patch -# https://github.com/curl/curl/issues/10518 -Patch1001: https://github.com/curl/curl/commit/c00e94fa0a131994de70d97838de83d32a1f7a82.patch -# https://github.com/curl/curl/issues/10522 -Patch1002: https://github.com/curl/curl/commit/e1985b9c3057bf464d1a75b4dcca9791383e0ffc.patch Provides: curl-full = %{version}-%{release} Provides: webclient @@ -383,6 +379,9 @@ rm -rf ${RPM_BUILD_ROOT}%{_datadir}/fish %doc docs/TheArtOfHttpScripting.md %changelog +* Mon Feb 20 2023 Funda Wang - 7.88.1-1 +- New version 7.88.1 + * Fri Feb 17 2023 Chunmei Xu - 7.88.0-2 - require at least the version of nghttp2 that built with diff --git a/e1985b9c3057bf464d1a75b4dcca9791383e0ffc.patch b/e1985b9c3057bf464d1a75b4dcca9791383e0ffc.patch deleted file mode 100644 index 6bc8b4e88d3c6a099a5ba08bb55d0e6fc3c20dd2..0000000000000000000000000000000000000000 --- a/e1985b9c3057bf464d1a75b4dcca9791383e0ffc.patch +++ /dev/null @@ -1,47 +0,0 @@ -From e1985b9c3057bf464d1a75b4dcca9791383e0ffc Mon Sep 17 00:00:00 2001 -From: Daniel Stenberg -Date: Wed, 15 Feb 2023 15:04:07 +0100 -Subject: [PATCH] tests: make sure gnuserv-tls has SRP support before using it - -Reported-by: fundawang on github -Fixes #10522 ---- - tests/runtests.pl | 2 +- - tests/sshhelp.pm | 11 ++++++++++- - 2 files changed, 11 insertions(+), 2 deletions(-) - -diff --git a/tests/runtests.pl b/tests/runtests.pl -index 71644ad18e855..a2eb9d20437b4 100755 ---- a/tests/runtests.pl -+++ b/tests/runtests.pl -@@ -5382,7 +5382,7 @@ sub startservers { - elsif($what eq "httptls") { - if(!$httptlssrv) { - # for now, we can't run http TLS-EXT tests without gnutls-serv -- return "no gnutls-serv"; -+ return "no gnutls-serv (with SRP support)"; - } - if($torture && $run{'httptls'} && - !responsive_httptls_server($verbose, "IPv4")) { -diff --git a/tests/sshhelp.pm b/tests/sshhelp.pm -index 2a25ca734c6be..6cba41d9efb37 100644 ---- a/tests/sshhelp.pm -+++ b/tests/sshhelp.pm -@@ -408,7 +408,16 @@ sub find_sshkeygen { - # Find httptlssrv (gnutls-serv) and return canonical filename - # - sub find_httptlssrv { -- return find_exe_file_hpath($httptlssrvexe); -+ my $p = find_exe_file_hpath($httptlssrvexe); -+ my @o = `$p -l`; -+ my $found; -+ for(@o) { -+ if(/Key exchange: SRP/) { -+ $found = 1; -+ last; -+ } -+ } -+ return $p if($found); - } - -