gentoo auto-resync : 22:04:2023 - 06:03:54

2 files changed, 0 insertions, 94 deletions

diff --git a/net-analyzer/icinga2/Manifest b/net-analyzer/icinga2/Manifest
index 0c2888644f22..51d6fb546a1c 100644
--- a/net-analyzer/icinga2/Manifest
+++ b/net-analyzer/icinga2/Manifest
@@ -1,4 +1,3 @@
-AUX icinga2-2.13.6-boost-1.81.patch 3325 BLAKE2B 8eda4f4ff774baafcdbb12d6e0ee978f3d12bfd659a5662ef0613512b299530fe4ea8afc50114f24e8698797443430da5d6b2774da08004b7f0d4889463bcaaa SHA512 00f0332a7cbdf205f6f01d5fcebb182ce0b0d68d5038a6646c6b76fbfe5416daa59f7bad9e8bf312f5ccb5c39ae4fce6888dc35718acca8b84cddee0d6d28f11
 AUX icinga2.initd 2276 BLAKE2B 9573c876cb1fc6ff641d4503d5446840725d94ac2a824cd124872af84032519a5ee1237b0ebc38783e673cb87169feb48b7690978e9b7d2e38549a7272f403fc SHA512 5b31f748eda8f52d8efe2c744c3c1adacffdb40c04d93cdaf7ee82129d632783362f6ea51b5a4c05ca9cd98d3343abfcfc86c98e99afd429d6bce390b9ffd082
 AUX icinga2.initd-3 2390 BLAKE2B 1ead1dd958d978324dfa043abcc58be7ed389207e2bf4dc4786bd2705f94c70a03b84f34a55435f6d9dfcc0483e35da60c1f536dec1060bdc232108c622e0615 SHA512 a43911717fe891e70690647daa57426f70d10f9cb02c721962be4c13cfe8a95bc3ff84b9ba2a293adafc8ddacf8ea6771bd66e7ff6dabe3e732176bf6e6e474a
 DIST icinga2-2.13.7.tar.gz 9667526 BLAKE2B 0c3e9736ac66bdcbb3f5d94cc132b3e7e49fdf472bfdbf6900651d72ee9dbea38a06fc9df7c2a266f183b11132391d8174f6d5bd5c5045c4566fb8c3fb28bab9 SHA512 233b8c712b6c36e4d9e970213fac30b65ce72a3e078bbd900c3262c2b7f2b9cf3c1e606d2deb0a60bbb5d5bd3ea1be42bb884b91fc5a9801f4d774ffa1167357
diff --git a/net-analyzer/icinga2/files/icinga2-2.13.6-boost-1.81.patch b/net-analyzer/icinga2/files/icinga2-2.13.6-boost-1.81.patch
deleted file mode 100644
index 426dc5a1daa5..000000000000
--- a/net-analyzer/icinga2/files/icinga2-2.13.6-boost-1.81.patch
+++ /dev/null
@@ -1,93 +0,0 @@
-https://bugs.gentoo.org/888063
-https://github.com/Icinga/icinga2/issues/9618
-https://github.com/Icinga/icinga2/pull/9624
-
-From 5bcbc96e221bb3aafc370449941bfbd70939915c Mon Sep 17 00:00:00 2001
-From: "Alexander A. Klimov" <alexander.klimov@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).
---- 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
---- 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.klimov@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.)
---- 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++) {
---- 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");