Script 'mail_helper' called by obssrc Hello community, here is the log from the commit of package warzone2100 for openSUSE:Factory checked in at 2023-10-19 22:47:41 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/warzone2100 (Old) and /work/SRC/openSUSE:Factory/.warzone2100.new.1945 (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "warzone2100" Thu Oct 19 22:47:41 2023 rev:28 rq:1118634 version:4.3.5 Changes: -------- --- /work/SRC/openSUSE:Factory/warzone2100/warzone2100.changes 2023-09-04 22:53:56.304522952 +0200 +++ /work/SRC/openSUSE:Factory/.warzone2100.new.1945/warzone2100.changes 2023-10-19 22:50:09.420607012 +0200 @@ -1,0 +2,7 @@ +Mon Oct 16 16:59:45 UTC 2023 - Carsten Ziepke <kiel...@gmail.com> + +- Add warzone2100_fix_build_with_newer_curl.patch, fix building + with cURL >= 8.3.0 + https://github.com/Warzone2100/warzone2100/pull/3406 + +------------------------------------------------------------------- New: ---- warzone2100_fix_build_with_newer_curl.patch ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ warzone2100.spec ++++++ --- /var/tmp/diff_new_pack.greFPd/_old 2023-10-19 22:50:10.988663883 +0200 +++ /var/tmp/diff_new_pack.greFPd/_new 2023-10-19 22:50:10.992664029 +0200 @@ -34,6 +34,8 @@ Source99: %{name}.changes # PATCH-FIX-UPSTREAM - warzone2100_fix_build_with_newer_vulkan.patch - fix building with vulkan >= 1.3.260 Patch0: warzone2100_fix_build_with_newer_vulkan.patch +# PATCH-FIX-UPSTREAM - warzone2100_fix_build_with_newer_curl.patch - fix building with cURL >= 8.3.0 +Patch1: warzone2100_fix_build_with_newer_curl.patch BuildRequires: asciidoc BuildRequires: cmake >= 3.5 BuildRequires: fdupes @@ -115,6 +117,7 @@ %if %{with vulkan} %patch0 -p1 %endif +%patch1 -p1 # constant timestamp for reproducible builds modified="$(sed -n '/^----/n;s/ - .*$//;p;q' "%{SOURCE99}")" ++++++ warzone2100_fix_build_with_newer_curl.patch ++++++ >From df072b0d910ab7ded37b737e8dcc297bfccf6f6b Mon Sep 17 00:00:00 2001 From: past-due <30942300+past-...@users.noreply.github.com> Date: Wed, 11 Oct 2023 10:42:52 -0400 Subject: [PATCH] urlrequest.cpp: cURL removed NSS support, so eliminate use of CURLSSLBACKEND_NSS --- src/urlrequest.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/urlrequest.cpp b/src/urlrequest.cpp index 5ae28d2ff19..6d9e41065b8 100644 --- a/src/urlrequest.cpp +++ b/src/urlrequest.cpp @@ -1270,7 +1270,7 @@ void urlSelectSSLBackend() return; } // Note: Use CURLSSLBACKEND_DARWINSSL instead of CURLSSLBACKEND_SECURETRANSPORT to support older cURL versions - const std::vector<curl_sslbackend> backendPreferencesOrder = {CURLSSLBACKEND_SCHANNEL, CURLSSLBACKEND_DARWINSSL, CURLSSLBACKEND_GNUTLS, CURLSSLBACKEND_NSS}; + const std::vector<curl_sslbackend> backendPreferencesOrder = {CURLSSLBACKEND_SCHANNEL, CURLSSLBACKEND_DARWINSSL, CURLSSLBACKEND_GNUTLS}; std::vector<curl_sslbackend> ignoredBackends; #if !defined(USE_OPENSSL_LOCKS_INIT) && !defined(CURL_OPENSSL_DOES_NOT_REQUIRE_LOCKS_INIT) // Did not compile with support for thread-safety / locks for OpenSSL, so ignore it
