mirrors/aports
1
0
Fork 0
mirror of https://gitlab.alpinelinux.org/alpine/aports.git synced 2025-08-05 21:37:15 +02:00
Code Issues Packages Projects Releases Wiki Activity

community/icinga2: upgrade to 2.13.7

Browse Source
This commit is contained in:
Andy Postnikov 2023-04-24 00:39:19 +02:00 committed by Francesco Colista
parent 779c2e65bb
commit a6ba6f44a0
2 changed files with 4 additions and 35 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
community/icinga2/APKBUILD
View File

@ -1,8 +1,8 @@
# Contributor: Francesco Colista <fcolista@alpinelinux.org>
# Maintainer: Francesco Colista <fcolista@alpinelinux.org>
pkgname=icinga2
pkgver=2.13.6
pkgrel=2
pkgver=2.13.7
pkgrel=0
pkgdesc="An open source host, service and network monitoring program"
url="https://icinga.com"
arch="all !armhf !armv7 !s390x"
@ -126,9 +126,9 @@ vim() {
}
sha512sums="
5fcf480c305487c7988d6cacfcb64c768c0f0e749704247c3d0ded746284ff5485e0a3d25c82fba1305414d47067a9eb80f84de594267ddf050a0b913825cd71 icinga2-2.13.6.tar.gz
233b8c712b6c36e4d9e970213fac30b65ce72a3e078bbd900c3262c2b7f2b9cf3c1e606d2deb0a60bbb5d5bd3ea1be42bb884b91fc5a9801f4d774ffa1167357 icinga2-2.13.7.tar.gz
46890756104563b1a4bc60b5952a2d63f5263883cfe702de7ccc4616dfe5b20d380ff1bc190482741a06bcfe7e662ad14a6965e26b9ce916ef56a1248d6b524c icinga2.initd
523f93ab661e43915241bce70fbecfd6834830a38f5b3dce6f2c856712e2e5a58fe1b5f970d5f23295a1c5e0d811f7e3a5b54acdd74e31112b309e31a9dc05a6 avoid-bash-in-scripts.patch
11b204689b1907919c83ea665aacd358b3b47df4d87935ea11ebf3864174b2de418a75c4c732e66e0c85a856db1b226efd5757caa462efec4b2b3dadd9744f1a disable-failing-tests.patch
bf1d508f776d306363002c4e68c79411ad631cb5db7d950e4655edf3f15a012dda44f5ec64bc3492382ccac9b479ec42419e54d43a102610051accc89d9a4609 boost-1.81.patch
81ac38b64b49abf78f855ad7558afa1115175f7e84b20d407c402848bbd8484dcd76a3f4547fafc6b083b5e69927ee60a407a530e0fbd78a47ff73150a1a5fe8 boost-1.81.patch
"

31
community/icinga2/boost-1.81.patch
View File

@ -82,32 +82,10 @@ index 30240f7..d7548e2 100644
);
}
diff --git a/lib/remote/httphandler.cpp b/lib/remote/httphandler.cpp
index e1bb4f4..1e5d12c 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 cb07557..b6f1969 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);
}
@@ -511,7 +511,7 @@ void HttpServerConnection::ProcessMessages(boost::asio::yield_context yc)
parser.header_limit(1024 * 1024);
parser.body_limit(-1);
@ -117,15 +95,6 @@ index cb07557..b6f1969 100644
if (!EnsureValidHeaders(*m_Stream, buf, parser, response, m_ShuttingDown, yc)) {
break;
@@ -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");
diff --git a/plugins/check_nscp_api.cpp b/plugins/check_nscp_api.cpp
index 3f6843e..2eae6d2 100644
--- a/plugins/check_nscp_api.cpp