Script 'mail_helper' called by obssrc Hello community, here is the log from the commit of package icinga2 for openSUSE:Factory checked in at 2023-02-03 22:05:52 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/icinga2 (Old) and /work/SRC/openSUSE:Factory/.icinga2.new.4462 (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "icinga2" Fri Feb 3 22:05:52 2023 rev:43 rq:1062997 version:2.13.6 Changes: -------- --- /work/SRC/openSUSE:Factory/icinga2/icinga2.changes 2022-11-09 12:58:00.364540938 +0100 +++ /work/SRC/openSUSE:Factory/.icinga2.new.4462/icinga2.changes 2023-02-03 22:09:35.680806299 +0100 @@ -1,0 +2,6 @@ +Fri Feb 3 07:46:47 UTC 2023 - ecsos <ec...@opensuse.org> + +- Add icinga2-boost.patch to make compilable on Boost v1.81 + and fix build error on Tumbleweed. + +------------------------------------------------------------------- New: ---- icinga2-boost.patch ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ icinga2.spec ++++++ --- /var/tmp/diff_new_pack.4tWkiX/_old 2023-02-03 22:09:36.108808786 +0100 +++ /var/tmp/diff_new_pack.4tWkiX/_new 2023-02-03 22:09:36.112808809 +0100 @@ -110,6 +110,8 @@ Patch0: icinga2-graphite.patch # PATCH-FIX-OPENSUSE lrupp -- fixing the syntax file for vim >= 8.x Patch1: icinga2-vim_syntax.patch +# PATCH-UPSTREAM -- Fix build error with boost 1.81 - See: https://github.com/Icinga/icinga2/issues/9618 and https://github.com/Icinga/icinga2/pull/9624 +Patch2: icinga2-boost.patch %endif BuildRoot: %{_tmppath}/%{name}-%{version}-build @@ -326,6 +328,7 @@ find . -type f -name '*.sh' -exec sed -i -e 's|\/usr\/bin\/env bash|\/bin\/bash|g' {} \; %patch0 -p1 %patch1 -p1 +%patch2 -p1 %endif %build ++++++ icinga2-boost.patch ++++++ >From 5bcbc96e221bb3aafc370449941bfbd70939915c Mon Sep 17 00:00:00 2001 From: "Alexander A. Klimov" <alexander.kli...@icinga.com> Date: Wed, 4 Jan 2023 17:02:19 +0100 Subject: [PATCH 1/2] Handle boost::beast::http::basic_fields#set() signature change (v1.81) Make String convertible to boost::beast::string_view (always working), not boost::string_view (broken). --- lib/base/string.cpp | 8 ++++---- lib/base/string.hpp | 3 ++- 2 files changed, 6 insertions(+), 5 deletions(-) diff --git a/lib/base/string.cpp b/lib/base/string.cpp index e4e5c273c2..3c440cd77a 100644 --- a/lib/base/string.cpp +++ b/lib/base/string.cpp @@ -128,15 +128,15 @@ String::operator const std::string&() const } /** - * Conversion function to boost::string_view. + * Conversion function to boost::beast::string_view. * * This allows using String as the value for HTTP headers in boost::beast::http::basic_fields::set. * - * @return A boost::string_view representing this string. + * @return A boost::beast::string_view representing this string. */ -String::operator boost::string_view() const +String::operator boost::beast::string_view() const { - return boost::string_view(m_Data); + return boost::beast::string_view(m_Data); } const char *String::CStr() const diff --git a/lib/base/string.hpp b/lib/base/string.hpp index 10ddaf9779..0eb08b5273 100644 --- a/lib/base/string.hpp +++ b/lib/base/string.hpp @@ -5,6 +5,7 @@ #include "base/i2-base.hpp" #include "base/object.hpp" +#include <boost/beast/core.hpp> #include <boost/range/iterator.hpp> #include <boost/utility/string_view.hpp> #include <functional> @@ -73,7 +74,7 @@ class String bool operator<(const String& rhs) const; operator const std::string&() const; - operator boost::string_view() const; + operator boost::beast::string_view() const; const char *CStr() const; >From 99c2d69dc85dfcd044e4a83d4894aa52eedfe09d Mon Sep 17 00:00:00 2001 From: "Alexander A. Klimov" <alexander.kli...@icinga.com> Date: Wed, 4 Jan 2023 17:34:49 +0100 Subject: [PATCH 2/2] Handle boost::beast::http::basic_fields#operator[]() signature change (v1.81) Use always working std::string(x), not broken x.to_string(). (x is a return value.) --- lib/remote/httphandler.cpp | 2 +- lib/remote/httpserverconnection.cpp | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/lib/remote/httphandler.cpp b/lib/remote/httphandler.cpp index e1bb4f401f..afe510fb8b 100644 --- a/lib/remote/httphandler.cpp +++ b/lib/remote/httphandler.cpp @@ -58,7 +58,7 @@ void HttpHandler::ProcessRequest( Dictionary::Ptr node = m_UrlTree; std::vector<HttpHandler::Ptr> handlers; - Url::Ptr url = new Url(request.target().to_string()); + Url::Ptr url = new Url(std::string(request.target())); auto& path (url->GetPath()); for (std::vector<String>::size_type i = 0; i <= path.size(); i++) { diff --git a/lib/remote/httpserverconnection.cpp b/lib/remote/httpserverconnection.cpp index cb07557afe..c07c19a38b 100644 --- a/lib/remote/httpserverconnection.cpp +++ b/lib/remote/httpserverconnection.cpp @@ -246,7 +246,7 @@ bool HandleAccessControl( if (!allowedOrigins.empty()) { auto& origin (request[http::field::origin]); - if (allowedOrigins.find(origin.to_string()) != allowedOrigins.end()) { + if (allowedOrigins.find(std::string(origin)) != allowedOrigins.end()) { response.set(http::field::access_control_allow_origin, origin); } @@ -536,7 +536,7 @@ void HttpServerConnection::ProcessMessages(boost::asio::yield_context yc) if (!authenticatedUser) { CpuBoundWork fetchingAuthenticatedUser (yc); - authenticatedUser = ApiUser::GetByAuthHeader(request[http::field::authorization].to_string()); + authenticatedUser = ApiUser::GetByAuthHeader(std::string(request[http::field::authorization])); } Log logMsg (LogInformation, "HttpServerConnection");
