From 084354fa0ede37384ff2366e3e472f00a91a33d17be4800cb783ec06fc20a4a7 Mon Sep 17 00:00:00 2001 From: Simon Lees Date: Sun, 28 Jul 2024 07:13:05 +0000 Subject: [PATCH] - Add curl-8.9.0-output.patch to fix test for different output with cURL 8.9.0. Part of upstream and will be part of 3.31.0. OBS-URL: https://build.opensuse.org/package/show/devel:tools:building/cmake?expand=0&rev=598 --- cmake.changes | 6 ++++++ cmake.spec | 2 ++ curl-8.9.0-output.patch | 20 ++++++++++++++++++++ 3 files changed, 28 insertions(+) create mode 100644 curl-8.9.0-output.patch diff --git a/cmake.changes b/cmake.changes index ede9bb5..89d0c12 100644 --- a/cmake.changes +++ b/cmake.changes @@ -1,3 +1,9 @@ +------------------------------------------------------------------- +Sat Jul 27 05:49:03 UTC 2024 - Christoph G + +- Add curl-8.9.0-output.patch to fix test for different output + with cURL 8.9.0. Part of upstream and will be part of 3.31.0. + ------------------------------------------------------------------- Fri Jul 19 16:27:30 UTC 2024 - Christoph G diff --git a/cmake.spec b/cmake.spec index d82f5e6..0a6a991 100644 --- a/cmake.spec +++ b/cmake.spec @@ -70,6 +70,8 @@ Patch0: cmake-fix-ruby-test.patch # Search for python interpreters from newest to oldest rather then picking up /usr/bin/python as first choice Patch1: feature-suse-python-interp-search-order.patch Patch2: cmake-zerojvm.patch +# upstream, adjust test to process output from cURL 8.9.0 +Patch3: curl-8.9.0-output.patch BuildRequires: fdupes BuildRequires: gcc-c++ BuildRequires: pkgconfig diff --git a/curl-8.9.0-output.patch b/curl-8.9.0-output.patch new file mode 100644 index 0000000..3e45eba --- /dev/null +++ b/curl-8.9.0-output.patch @@ -0,0 +1,20 @@ +From 7bfe120c07f9fb571ed3e6e30db99d01da52bf60 Mon Sep 17 00:00:00 2001 +From: Brad King +Date: Thu, 25 Jul 2024 11:00:36 -0400 +Subject: Tests/RunCMake/file-DOWNLOAD: Update bad host name + message for curl 8.9 + +--- + Tests/RunCMake/file-DOWNLOAD/bad-hostname-stdout.txt | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/Tests/RunCMake/file-DOWNLOAD/bad-hostname-stdout.txt b/Tests/RunCMake/file-DOWNLOAD/bad-hostname-stdout.txt +index 12278e0fb4..4aa7e93a9c 100644 +--- a/Tests/RunCMake/file-DOWNLOAD/bad-hostname-stdout.txt ++++ b/Tests/RunCMake/file-DOWNLOAD/bad-hostname-stdout.txt +@@ -1 +1 @@ +--- status='6;"Couldn't resolve host name"' ++-- status='6;"(Could not resolve hostname|Couldn't resolve host name)"' +-- +2.45.2 +