pkgsrc-Changes archive
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]
CVS commit: pkgsrc/net/icinga2
Module Name: pkgsrc
Committed By: ryoon
Date: Sun Jan 22 17:34:20 UTC 2023
Modified Files:
pkgsrc/net/icinga2: Makefile distinfo
pkgsrc/net/icinga2/patches: patch-lib_base_string.cpp
patch-lib_base_string.hpp patch-lib_remote_httpserverconnection.cpp
Added Files:
pkgsrc/net/icinga2/patches: patch-lib_remote_httphandler.cpp
Removed Files:
pkgsrc/net/icinga2/patches: patch-CMakeLists.txt patch-RELEASE.md
patch-doc_21-development.md patch-lib_base_utility.cpp
patch-lib_perfdata_elasticsearchwriter.cpp
patch-lib_perfdata_influxdbwriter.cpp
patch-lib_remote_configfileshandler.cpp
patch-lib_remote_httputility.cpp patch-lib_remote_infohandler.cpp
Log Message:
icinga2: Update to 2.12.9
* Remove some patches backported from upstream.
* Fix build with Boost 1.81.0.
Changelog:
Not available for 2.12.9
To generate a diff of this commit:
cvs rdiff -u -r1.7 -r1.8 pkgsrc/net/icinga2/Makefile
cvs rdiff -u -r1.4 -r1.5 pkgsrc/net/icinga2/distinfo
cvs rdiff -u -r1.2 -r0 pkgsrc/net/icinga2/patches/patch-CMakeLists.txt \
pkgsrc/net/icinga2/patches/patch-lib_base_utility.cpp \
pkgsrc/net/icinga2/patches/patch-lib_perfdata_elasticsearchwriter.cpp \
pkgsrc/net/icinga2/patches/patch-lib_perfdata_influxdbwriter.cpp \
pkgsrc/net/icinga2/patches/patch-lib_remote_configfileshandler.cpp \
pkgsrc/net/icinga2/patches/patch-lib_remote_httputility.cpp \
pkgsrc/net/icinga2/patches/patch-lib_remote_infohandler.cpp
cvs rdiff -u -r1.1 -r0 pkgsrc/net/icinga2/patches/patch-RELEASE.md \
pkgsrc/net/icinga2/patches/patch-doc_21-development.md
cvs rdiff -u -r1.2 -r1.3 pkgsrc/net/icinga2/patches/patch-lib_base_string.cpp \
pkgsrc/net/icinga2/patches/patch-lib_base_string.hpp \
pkgsrc/net/icinga2/patches/patch-lib_remote_httpserverconnection.cpp
cvs rdiff -u -r0 -r1.1 \
pkgsrc/net/icinga2/patches/patch-lib_remote_httphandler.cpp
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: pkgsrc/net/icinga2/Makefile
diff -u pkgsrc/net/icinga2/Makefile:1.7 pkgsrc/net/icinga2/Makefile:1.8
--- pkgsrc/net/icinga2/Makefile:1.7 Thu Dec 8 21:27:21 2022
+++ pkgsrc/net/icinga2/Makefile Sun Jan 22 17:34:20 2023
@@ -1,7 +1,6 @@
-# $NetBSD: Makefile,v 1.7 2022/12/08 21:27:21 he Exp $
+# $NetBSD: Makefile,v 1.8 2023/01/22 17:34:20 ryoon Exp $
-DISTNAME= icinga2-2.12.3
-PKGREVISION= 4
+DISTNAME= icinga2-2.12.9
CATEGORIES= net sysutils
MASTER_SITES= ${MASTER_SITE_GITHUB:=icinga/}
GITHUB_TAG= v${PKGVERSION_NOREV}
@@ -143,7 +142,6 @@ CMAKE_ARGS+= -DICINGA2_WITH_TESTS=OFF
# Avoid a name clash with Boost header on case-insensitive file systems.
# Remove outdated GNUInstallDirs.cmake.
post-extract:
- ${MV} ${WRKSRC}/VERSION ${WRKSRC}/ICINGA2_VERSION
${RM} ${WRKSRC}/third-party/cmake/GNUInstallDirs.cmake
# The configuration files are installed in etc/icinga2. You can't tell CMAKE
Index: pkgsrc/net/icinga2/distinfo
diff -u pkgsrc/net/icinga2/distinfo:1.4 pkgsrc/net/icinga2/distinfo:1.5
--- pkgsrc/net/icinga2/distinfo:1.4 Tue Oct 26 11:05:47 2021
+++ pkgsrc/net/icinga2/distinfo Sun Jan 22 17:34:20 2023
@@ -1,18 +1,10 @@
-$NetBSD: distinfo,v 1.4 2021/10/26 11:05:47 nia Exp $
+$NetBSD: distinfo,v 1.5 2023/01/22 17:34:20 ryoon Exp $
-BLAKE2s (icinga2-2.12.3.tar.gz) = d5a70fc162ab1d79c4448c3bd5d705c38c6377e04c2e628dfc11062b5fd99ec8
-SHA512 (icinga2-2.12.3.tar.gz) = 28b87e03a8ffeb7a1d19ddf9555151b826f7bf1fd33b0139c2fc8abe7c89d66d96089d5b32d0aaccc3876040514b2bfbde9970416d5ec4ea3b023b17c0fb1799
-Size (icinga2-2.12.3.tar.gz) = 7534454 bytes
-SHA1 (patch-CMakeLists.txt) = 052745f5725a90bdc1a113352f21eac590a2cb31
-SHA1 (patch-RELEASE.md) = 94f2651853010185415c653e89ec8f5c96e37fa2
-SHA1 (patch-doc_21-development.md) = 05afac552f1558a2dbf556d7c707c3d5625fba56
-SHA1 (patch-lib_base_string.cpp) = 8ee9a1fa7a34355a855df7c29614fab2ff98323e
-SHA1 (patch-lib_base_string.hpp) = 6e407f77f607a58bd726cebe6468469bc96b030f
-SHA1 (patch-lib_base_utility.cpp) = 78f269ba2bd3e29d24876c66e56e36267baed346
-SHA1 (patch-lib_perfdata_elasticsearchwriter.cpp) = b0a71a92be7c150088148cf4b3f33d9969027ca7
-SHA1 (patch-lib_perfdata_influxdbwriter.cpp) = c47de3528b648fbb53dd4d1b81a39cfe35e172f9
-SHA1 (patch-lib_remote_configfileshandler.cpp) = 34cc8f1a6b127a98efcf6ee7835367998ea202a0
-SHA1 (patch-lib_remote_httpserverconnection.cpp) = 6aa6a7a7dd8fce3f54c8a7b6496286074a4fc434
-SHA1 (patch-lib_remote_httputility.cpp) = a04578f7c9f2abdd9f9ed27bcd8cdc8a0cf3dd85
-SHA1 (patch-lib_remote_infohandler.cpp) = 2a91f1d38cad0234bbc5f8b6b2032baac71db91e
+BLAKE2s (icinga2-2.12.9.tar.gz) = e0378b27195cb54552eee24b3f9817ad81ce4c333c10d764448e55741739e9ad
+SHA512 (icinga2-2.12.9.tar.gz) = c6d7f56af63a486024b667ce5b837537ba63a2dde33acc1d8dead636e0ff775b0b339afc66581e5aafa919be2bcb08d6936c9d31fead1ef3f5e18ef587b699a2
+Size (icinga2-2.12.9.tar.gz) = 7553000 bytes
+SHA1 (patch-lib_base_string.cpp) = f5a9cc4d98af33f37d469f558003d8378b236cf2
+SHA1 (patch-lib_base_string.hpp) = 86e61577c9540463cf93613db48c238bb738b09d
+SHA1 (patch-lib_remote_httphandler.cpp) = 46a91179dca58d4ca95f75e7594e41672e331083
+SHA1 (patch-lib_remote_httpserverconnection.cpp) = 29763f892aeda95f7fe46687dea9a40674af87b7
SHA1 (patch-third-party_cmake_FindMySQL.cmake) = a33567c30db47c4fab379f1b7c358174dd85fdd3
Index: pkgsrc/net/icinga2/patches/patch-lib_base_string.cpp
diff -u pkgsrc/net/icinga2/patches/patch-lib_base_string.cpp:1.2 pkgsrc/net/icinga2/patches/patch-lib_base_string.cpp:1.3
--- pkgsrc/net/icinga2/patches/patch-lib_base_string.cpp:1.2 Sun Jan 17 13:22:26 2021
+++ pkgsrc/net/icinga2/patches/patch-lib_base_string.cpp Sun Jan 22 17:34:20 2023
@@ -1,26 +1,27 @@
-$NetBSD: patch-lib_base_string.cpp,v 1.2 2021/01/17 13:22:26 wiz Exp $
+$NetBSD: patch-lib_base_string.cpp,v 1.3 2023/01/22 17:34:20 ryoon Exp $
-Support Boost 1.74 when setting HTTP headers
-Upstream Issue #8185, Pull Request #8575, commit eab07a7318f9e42157bc21d86585340d762759e7
+Fix build with Boost 1.81.0
+From: https://github.com/Icinga/icinga2/commit/5bcbc96e221bb3aafc370449941bfbd70939915c
---- lib/base/string.cpp.orig
+--- lib/base/string.cpp.orig 2022-06-29 17:15:18.000000000 +0000
+++ lib/base/string.cpp
-@@ -127,6 +127,18 @@ String::operator const std::string&() const
- return m_Data;
+@@ -128,15 +128,15 @@ String::operator const std::string&() co
}
-+/**
-+ * Conversion function to boost::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.
-+ */
-+String::operator boost::string_view() const
-+{
-+ return boost::string_view(m_Data);
-+}
-+
- const char *String::CStr() 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 m_Data.c_str();
+- return boost::string_view(m_Data);
++ return boost::beast::string_view(m_Data);
+ }
+
+ const char *String::CStr() const
Index: pkgsrc/net/icinga2/patches/patch-lib_base_string.hpp
diff -u pkgsrc/net/icinga2/patches/patch-lib_base_string.hpp:1.2 pkgsrc/net/icinga2/patches/patch-lib_base_string.hpp:1.3
--- pkgsrc/net/icinga2/patches/patch-lib_base_string.hpp:1.2 Sun Jan 17 13:22:26 2021
+++ pkgsrc/net/icinga2/patches/patch-lib_base_string.hpp Sun Jan 22 17:34:20 2023
@@ -1,23 +1,24 @@
-$NetBSD: patch-lib_base_string.hpp,v 1.2 2021/01/17 13:22:26 wiz Exp $
+$NetBSD: patch-lib_base_string.hpp,v 1.3 2023/01/22 17:34:20 ryoon Exp $
-Support Boost 1.74 when setting HTTP headers
-Upstream Issue #8185, Pull Request #8575, commit eab07a7318f9e42157bc21d86585340d762759e7
+Fix build with Boost 1.81.0
+From: https://github.com/Icinga/icinga2/commit/5bcbc96e221bb3aafc370449941bfbd70939915c
---- lib/base/string.hpp.orig
+--- lib/base/string.hpp.orig 2022-06-29 17:15:18.000000000 +0000
+++ lib/base/string.hpp
-@@ -6,6 +6,7 @@
+@@ -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 <boost/utility/string_view.hpp>
#include <string>
- #include <iosfwd>
-
-@@ -71,6 +72,7 @@ public:
+@@ -72,7 +73,7 @@ public:
bool operator<(const String& rhs) const;
operator const std::string&() const;
-+ operator boost::string_view() const;
+- operator boost::string_view() const;
++ operator boost::beast::string_view() const;
const char *CStr() const;
Index: pkgsrc/net/icinga2/patches/patch-lib_remote_httpserverconnection.cpp
diff -u pkgsrc/net/icinga2/patches/patch-lib_remote_httpserverconnection.cpp:1.2 pkgsrc/net/icinga2/patches/patch-lib_remote_httpserverconnection.cpp:1.3
--- pkgsrc/net/icinga2/patches/patch-lib_remote_httpserverconnection.cpp:1.2 Sun Jan 17 13:22:26 2021
+++ pkgsrc/net/icinga2/patches/patch-lib_remote_httpserverconnection.cpp Sun Jan 22 17:34:20 2023
@@ -1,52 +1,31 @@
-$NetBSD: patch-lib_remote_httpserverconnection.cpp,v 1.2 2021/01/17 13:22:26 wiz Exp $
+$NetBSD: patch-lib_remote_httpserverconnection.cpp,v 1.3 2023/01/22 17:34:20 ryoon Exp $
-Support Boost 1.74 when setting HTTP headers
-Upstream Issue #8185, Pull Request #8575, commit 339b37a985b5f67ce5f0d2e02211d2c5b98a5d45
-
---- lib/remote/httpserverconnection.cpp.orig 2020-08-03 15:43:47.000000000 +0200
-+++ lib/remote/httpserverconnection.cpp 2021-01-14 19:30:36.695215485 +0100
-@@ -186,7 +186,7 @@
- } else {
- response.set(http::field::content_type, "text/html");
- response.body() = String("<h1>Bad Request</h1><p><pre>") + errorMsg + "</pre></p>";
-- response.set(http::field::content_length, response.body().size());
-+ response.content_length(response.body().size());
- }
-
- response.set(http::field::connection, "close");
-@@ -259,7 +259,7 @@
- response.set(http::field::access_control_allow_methods, "GET, POST, PUT, DELETE");
- response.set(http::field::access_control_allow_headers, "Authorization, X-HTTP-Method-Override");
- response.body() = "Preflight OK";
-- response.set(http::field::content_length, response.body().size());
-+ response.content_length(response.body().size());
- response.set(http::field::connection, "close");
-
- boost::system::error_code ec;
-@@ -290,7 +290,7 @@
- response.result(http::status::bad_request);
- response.set(http::field::content_type, "text/html");
- response.body() = "<h1>Accept header is missing or not set to 'application/json'.</h1>";
-- response.set(http::field::content_length, response.body().size());
-+ response.content_length(response.body().size());
- response.set(http::field::connection, "close");
-
- boost::system::error_code ec;
-@@ -331,7 +331,7 @@
- } else {
- response.set(http::field::content_type, "text/html");
- response.body() = "<h1>Unauthorized. Please check your user credentials.</h1>";
-- response.set(http::field::content_length, response.body().size());
-+ response.content_length(response.body().size());
- }
-
- boost::system::error_code ec;
-@@ -423,7 +423,7 @@
- } else {
- response.set(http::field::content_type, "text/html");
- response.body() = String("<h1>Bad Request</h1><p><pre>") + ec.message() + "</pre></p>";
-- response.set(http::field::content_length, response.body().size());
-+ response.content_length(response.body().size());
- }
+--- lib/remote/httpserverconnection.cpp.orig 2022-06-29 17:15:18.000000000 +0000
++++ lib/remote/httpserverconnection.cpp
+@@ -32,7 +32,7 @@
+
+ using namespace icinga;
+
+-auto const l_ServerHeader ("Icinga/" + Application::GetAppVersion());
++auto const l_ServerHeader (("Icinga/" + Application::GetAppVersion()).CStr());
+
+ HttpServerConnection::HttpServerConnection(const String& identity, bool authenticated, const Shared<AsioTlsStream>::Ptr& stream)
+ : HttpServerConnection(identity, authenticated, stream, IoEngine::Get().GetIoContext())
+@@ -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::ProcessMessag
+ if (!authenticatedUser) {
+ CpuBoundWork fetchingAuthenticatedUser (yc);
+
+- authenticatedUser = ApiUser::GetByAuthHeader(request[http::field::authorization].to_string());
++ authenticatedUser = ApiUser::GetByAuthHeader(std::string(request[http::field::authorization]));
+ }
- response.set(http::field::connection, "close");
+ Log logMsg (LogInformation, "HttpServerConnection");
Added files:
Index: pkgsrc/net/icinga2/patches/patch-lib_remote_httphandler.cpp
diff -u /dev/null pkgsrc/net/icinga2/patches/patch-lib_remote_httphandler.cpp:1.1
--- /dev/null Sun Jan 22 17:34:20 2023
+++ pkgsrc/net/icinga2/patches/patch-lib_remote_httphandler.cpp Sun Jan 22 17:34:20 2023
@@ -0,0 +1,13 @@
+$NetBSD: patch-lib_remote_httphandler.cpp,v 1.1 2023/01/22 17:34:20 ryoon Exp $
+
+--- lib/remote/httphandler.cpp.orig 2022-06-29 17:15:18.000000000 +0000
++++ lib/remote/httphandler.cpp
+@@ -57,7 +57,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++) {
Home |
Main Index |
Thread Index |
Old Index