diff options
Diffstat (limited to 'net-misc/curl/files')
-rw-r--r-- | net-misc/curl/files/curl-7.88.0-test-gnuserv-tls-srp.patch | 39 | ||||
-rw-r--r-- | net-misc/curl/files/curl-7.88.0-test-uninitialised-value.patch | 30 |
2 files changed, 69 insertions, 0 deletions
diff --git a/net-misc/curl/files/curl-7.88.0-test-gnuserv-tls-srp.patch b/net-misc/curl/files/curl-7.88.0-test-gnuserv-tls-srp.patch new file mode 100644 index 000000000000..fb9e89fd48cb --- /dev/null +++ b/net-misc/curl/files/curl-7.88.0-test-gnuserv-tls-srp.patch @@ -0,0 +1,39 @@ +https://github.com/curl/curl/commit/2fdc1d816ebf3c77f43068103bec1b3a3767881a.patch +From: Daniel Stenberg <daniel@haxx.se> +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 +Closes #10524 +--- 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")) { +--- 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); + } + + diff --git a/net-misc/curl/files/curl-7.88.0-test-uninitialised-value.patch b/net-misc/curl/files/curl-7.88.0-test-uninitialised-value.patch new file mode 100644 index 000000000000..c5ce31d4e427 --- /dev/null +++ b/net-misc/curl/files/curl-7.88.0-test-uninitialised-value.patch @@ -0,0 +1,30 @@ +https://github.com/curl/curl/commit/f1d09231adfc695d15995b9ef2c8c6e568c28091 +From: Daniel Stenberg <daniel@haxx.se> +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 +Closes #10520 +--- 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); |