[gentoo-commits] repo/gentoo:master commit in: net-analyzer/icinga2/files/, net-analyzer/icinga2/

2024-03-27 Thread Andreas Sturmlechner 
commit: 06e0430747ee7d55f7f4c64c424b8b1e2c6fdacf
Author: Andreas Sturmlechner  gentoo  org>
AuthorDate: Thu Mar  7 10:15:14 2024 +
Commit: Andreas Sturmlechner  gentoo  org>
CommitDate: Wed Mar 27 11:49:00 2024 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=06e04307

net-analyzer/icinga2: drop 2.13.9

Signed-off-by: Andreas Sturmlechner  gentoo.org>

 net-analyzer/icinga2/Manifest  |   1 -
 net-analyzer/icinga2/files/icinga2.initd   |  81 
 net-analyzer/icinga2/icinga2-2.13.9.ebuild | 146 -
 3 files changed, 228 deletions(-)

diff --git a/net-analyzer/icinga2/Manifest b/net-analyzer/icinga2/Manifest
index 231d217b5a24..5e6efce507f8 100644
--- a/net-analyzer/icinga2/Manifest
+++ b/net-analyzer/icinga2/Manifest
@@ -1,2 +1 @@
-DIST icinga2-2.13.9.tar.gz 9675588 BLAKE2B 
3614d28939bbff056ff6d67217b09bb38369d720af36f3038fa6e2cd6b253faa59111e4e5096d4e5ce476ad14e347e0ad9183e77fa395f6f236ea5f555e55265
 SHA512 
dbdf1fb06b2cf3d7566194ed9f5883f05848cbc3f740a704f76868e985f2ac943389d56943f55bdba2900966c39472c6031bf032d815881fc64890c04de911dd
 DIST icinga2-2.14.2.tar.gz 9397382 BLAKE2B 
f533db06e693f9c9f0627c50615ded591696879b22fe9cb7bab115607d7f25ef3f30732de1e34f7adee594385c21ab2f22fdc925f4be18e8423fa69e94d3e1b9
 SHA512 
a7574254eed715c32317feaac57d5444a9d2bcccbfe06adbcee4d7d3c2928ecb1f381a5321c219406816bb39120eb9e95ca073399844cbafde274d289f619f57

diff --git a/net-analyzer/icinga2/files/icinga2.initd 
b/net-analyzer/icinga2/files/icinga2.initd
deleted file mode 100644
index 7faff11137d4..
--- a/net-analyzer/icinga2/files/icinga2.initd
+++ /dev/null
@@ -1,81 +0,0 @@
-#!/sbin/openrc-run
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-extra_started_commands="reload"
-
-DAEMON="/usr/sbin/icinga2"
-ICINGA2_CONFIG_FILE="/etc/icinga2/icinga2.conf"
-ICINGA2_RUN_DIR="/run/icinga2"
-ICINGA2_STATE_DIR="/var/cache/icinga2"
-ICINGA2_CMD_DIR="${ICINGA2_RUN_DIR}/cmd"
-ICINGA2_PID_FILE="${ICINGA2_RUN_DIR}/icinga2.pid"
-ICINGA2_DAEMON_ARGS="daemon -c $ICINGA2_CONFIG_FILE -e $ICINGA2_ERROR_LOG -d"
-
-depend() {
-need net
-}
-
-checkconfig() {
-if [ ! -e "$ICINGA2_CONFIG_FILE" ]; then
-   ewarn "Config file '$ICINGA2_CONFIG_FILE' does not exist."
-   eend 1
-fi
-
-ICINGA2_USER=$($DAEMON variable get --current RunAsUser)
-if [ $? != 0 ]; then
-eerror "Could not fetch RunAsUser variable: '$ICINGA2_USER'."
-return 1
-fi
-ICINGA2_GROUP=$($DAEMON variable get --current RunAsGroup)
-if [ $? != 0 ]; then
-eerror "Could not fetch RunAsGroup variable: '$ICINGA2_GROUP'."
-return 1
-fi
-
-checkpath -d -m 0750 -o $ICINGA2_USER:$ICINGA2_GROUP $ICINGA2_RUN_DIR
-checkpath -d -m 0750 -o $ICINGA2_USER:$ICINGA2_GROUP $ICINGA2_STATE_DIR
-checkpath -d -m 2750 -o $ICINGA2_USER:$ICINGA2_GROUP $ICINGA2_CMD_DIR
-
-if ! $DAEMON daemon -c $ICINGA2_CONFIG_FILE -C > $ICINGA2_STARTUP_LOG 
2>&1; then
-eerror "Icinga2 detected configuration errors. Check 
'$ICINGA2_STARTUP_LOG' for details."
-return 1
-fi
-}
-
-start() {
-checkconfig || return 1
-
-ebegin "Starting icinga2"
-start-stop-daemon --start --exec "${DAEMON}" \
---pidfile "${ICINGA2_PID_FILE}" \
--- $ICINGA2_DAEMON_ARGS > $ICINGA2_STARTUP_LOG 2>&1
-local retval=$?
-if [ $retval -ne 0 ]; then
-ewarn "Error starting icinga2. '$ICINGA2_STARTUP_LOG' for details."
-fi
-eend $retval
-}
-
-stop() {
-ebegin "Stopping icinga2"
-start-stop-daemon \
---stop \
---pidfile $ICINGA2_PID_FILE \
---retry "SIGTERM/15 SIGKILL/30" \
---progress
-eend $?
-}
-
-reload() {
-checkconfig || return 1
-
-ebegin "Reloading icinga2"
-start-stop-daemon --signal HUP --pidfile "$ICINGA2_PID_FILE"
-
-local retval=$?
-if [ $retval -ne 0 ]; then
-ewarn "Error reloading icinga2."
-fi
-eend $retval
-}

diff --git a/net-analyzer/icinga2/icinga2-2.13.9.ebuild 
b/net-analyzer/icinga2/icinga2-2.13.9.ebuild
deleted file mode 100644
index 1ce211b79dc7..
--- a/net-analyzer/icinga2/icinga2-2.13.9.ebuild
+++ /dev/null
@@ -1,146 +0,0 @@
-# Copyright 1999-2024 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit cmake systemd
-
-if [[ ${PV} !=  ]]; then
-   SRC_URI="https://github.com/Icinga/icinga2/archive/v${PV}.tar.gz -> 
${P}.tar.gz"
-   KEYWORDS="amd64 ~arm64 x86"
-else
-   inherit git-r3
-   EGIT_REPO_URI="https://github.com/Icinga/icinga2.git;
-fi
-
-DESCRIPTION="Distributed, general purpose, network monitoring engine"
-HOMEPAGE="https://icinga.com/;
-
-LICENSE="GPL-2"
-SLOT="0"
-IUSE="console jumbo-build mail mariadb minimal +mysql nano-syntax +plugins 
postgres systemd +vim-syntax"
-
-# Add accounts to DEPEND because of fowners in src_install
-DEPEND="
-

[gentoo-commits] repo/gentoo:master commit in: net-analyzer/icinga2/files/

2023-04-21 Thread Conrad Kostecki 
commit: 313e90af1c3da132445f2358da4a98f4d2bd8472
Author: Michael Mair-Keimberger  levelnine  at>
AuthorDate: Fri Apr 21 14:32:07 2023 +
Commit: Conrad Kostecki  gentoo  org>
CommitDate: Sat Apr 22 00:10:16 2023 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=313e90af

net-analyzer/icinga2: remove unused patch

Signed-off-by: Michael Mair-Keimberger  levelnine.at>
Closes: https://github.com/gentoo/gentoo/pull/30681
Signed-off-by: Conrad Kostecki  gentoo.org>

 .../icinga2/files/icinga2-2.13.6-boost-1.81.patch  | 93 --
 1 file changed, 93 deletions(-)

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..
--- 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" 
-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 
- #include 
- #include 
- #include 
-@@ -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" 
-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 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::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");

[gentoo-commits] repo/gentoo:master commit in: net-analyzer/icinga2/files/, net-analyzer/icinga2/

2023-01-14 Thread Sam James 
commit: 41387bfec00020779525cb7ae2f5549b90514e65
Author: Sam James  gentoo  org>
AuthorDate: Sat Jan 14 19:39:07 2023 +
Commit: Sam James  gentoo  org>
CommitDate: Sat Jan 14 19:39:48 2023 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=41387bfe

net-analyzer/icinga2: fix build w/ boost-1.81

Closes: https://bugs.gentoo.org/888063
Signed-off-by: Sam James  gentoo.org>

 .../icinga2/files/icinga2-2.13.6-boost-1.81.patch  |  93 +
 net-analyzer/icinga2/icinga2-2.13.6-r1.ebuild  | 149 +
 2 files changed, 242 insertions(+)

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
new file mode 100644
index ..426dc5a1daa5
--- /dev/null
+++ b/net-analyzer/icinga2/files/icinga2-2.13.6-boost-1.81.patch
@@ -0,0 +1,93 @@
+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" 
+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 
+ #include 
+ #include 
+ #include 
+@@ -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" 
+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 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::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");

diff --git a/net-analyzer/icinga2/icinga2-2.13.6-r1.ebuild 
b/net-analyzer/icinga2/icinga2-2.13.6-r1.ebuild
new file mode 100644
index ..3b4c1eedf0be
--- /dev/null
+++ b/net-analyzer/icinga2/icinga2-2.13.6-r1.ebuild
@@ -0,0 +1,149 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit cmake systemd
+
+if [[ ${PV} !=  ]]; then
+   SRC_URI="https://github.com/Icinga/icinga2/archive/v${PV}.tar.gz ->

[gentoo-commits] repo/gentoo:master commit in: net-analyzer/icinga2/files/

2021-07-13 Thread Conrad Kostecki 
commit: 4c492d4d300bdc3d6a56cd0f3067447e22d52280
Author: Michael Mair-Keimberger  levelnine  at>
AuthorDate: Mon Jul 12 18:15:17 2021 +
Commit: Conrad Kostecki  gentoo  org>
CommitDate: Tue Jul 13 21:14:27 2021 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=4c492d4d

net-analyzer/icinga2: remove unused patch

Closes: https://github.com/gentoo/gentoo/pull/21614
Package-Manager: Portage-3.0.20, Repoman-3.0.3
Signed-off-by: Michael Mair-Keimberger  levelnine.at>
Signed-off-by: Conrad Kostecki  gentoo.org>

 .../files/icinga2-2.12.1-boost-1.74.0.patch| 436 -
 1 file changed, 436 deletions(-)

diff --git a/net-analyzer/icinga2/files/icinga2-2.12.1-boost-1.74.0.patch 
b/net-analyzer/icinga2/files/icinga2-2.12.1-boost-1.74.0.patch
deleted file mode 100644
index e6ad4807993..000
--- a/net-analyzer/icinga2/files/icinga2-2.12.1-boost-1.74.0.patch
+++ /dev/null
@@ -1,436 +0,0 @@
-From c30bae2994f1e5f33f6da51eb96d423e9bf0f75c Mon Sep 17 00:00:00 2001
-From: Louis Sautier 
-Date: Thu, 20 Aug 2020 18:25:48 +0200
-Subject: [PATCH] =?UTF-8?q?Fix=20=E2=80=98fs::copy=5Foption=E2=80=99=20has?=
- =?UTF-8?q?=20not=20been=20declared=20with=20boost=201.74.0?=
-MIME-Version: 1.0
-Content-Type: text/plain; charset=UTF-8
-Content-Transfer-Encoding: 8bit
-
-It was deprecated in
-https://github.com/boostorg/filesystem/commit/f199152b7df036ff1606c85e4ea1b28edfeda6cc

- lib/base/utility.cpp | 4 
- 1 file changed, 4 insertions(+)
-
-diff --git a/lib/base/utility.cpp b/lib/base/utility.cpp
-index 1add7616c6..d8e6f20b0c 100644
 a/lib/base/utility.cpp
-+++ b/lib/base/utility.cpp
-@@ -725,7 +725,11 @@ void Utility::CopyFile(const String& source, const 
String& target)
- {
-   namespace fs = boost::filesystem;
- 
-+#if BOOST_VERSION >= 107400
-+  fs::copy_file(fs::path(source.Begin(), source.End()), 
fs::path(target.Begin(), target.End()), fs::copy_options::overwrite_existing);
-+#else /* BOOST_VERSION */
-   fs::copy_file(fs::path(source.Begin(), source.End()), 
fs::path(target.Begin(), target.End()), fs::copy_option::overwrite_if_exists);
-+#endif /* BOOST_VERSION */
- }
- 
- /*
-From 45dd71e0f9a93369e08d6cb26f97940f9c9594aa Mon Sep 17 00:00:00 2001
-From: "Alexander A. Klimov" 
-Date: Wed, 26 Aug 2020 13:56:26 +0200
-Subject: [PATCH] Introduce HttpUtility::Set()
-
-refs #8185

- lib/cli/consolecommand.cpp   |  9 ---
- lib/perfdata/elasticsearchwriter.cpp | 13 -
- lib/perfdata/influxdbwriter.cpp  |  7 ++---
- lib/remote/configfileshandler.cpp|  4 +--
- lib/remote/eventshandler.cpp |  2 +-
- lib/remote/httpserverconnection.cpp  | 40 ++--
- lib/remote/httputility.cpp   |  4 +--
- lib/remote/httputility.hpp   | 28 +++
- lib/remote/infohandler.cpp   |  6 ++---
- plugins/check_nscp_api.cpp   |  9 ---
- 10 files changed, 77 insertions(+), 45 deletions(-)
-
-diff --git a/lib/cli/consolecommand.cpp b/lib/cli/consolecommand.cpp
-index 41b6590e4c..42c5c63133 100644
 a/lib/cli/consolecommand.cpp
-+++ b/lib/cli/consolecommand.cpp
-@@ -3,6 +3,7 @@
- #include "cli/consolecommand.hpp"
- #include "config/configcompiler.hpp"
- #include "remote/consolehandler.hpp"
-+#include "remote/httputility.hpp"
- #include "remote/url.hpp"
- #include "base/configwriter.hpp"
- #include "base/serializer.hpp"
-@@ -580,11 +581,11 @@ Dictionary::Ptr ConsoleCommand::SendRequest()
- 
-   http::request request(http::verb::post, 
std::string(l_Url->Format(false)), 10);
- 
--  request.set(http::field::user_agent, "Icinga/DebugConsole/" + 
Application::GetAppVersion());
--  request.set(http::field::host, l_Url->GetHost() + ":" + 
l_Url->GetPort());
-+  HttpUtility::Set(request, http::field::user_agent, 
"Icinga/DebugConsole/" + Application::GetAppVersion());
-+  HttpUtility::Set(request, http::field::host, l_Url->GetHost() + ":" + 
l_Url->GetPort());
- 
--  request.set(http::field::accept, "application/json");
--  request.set(http::field::authorization, "Basic " + 
Base64::Encode(l_Url->GetUsername() + ":" + l_Url->GetPassword()));
-+  HttpUtility::Set(request, http::field::accept, "application/json");
-+  HttpUtility::Set(request, http::field::authorization, "Basic " + 
Base64::Encode(l_Url->GetUsername() + ":" + l_Url->GetPassword()));
- 
-   try {
-   http::write(*l_TlsStream, request);
-diff --git a/lib/perfdata/elasticsearchwriter.cpp 
b/lib/perfdata/elasticsearchwriter.cpp
-index 6870198e45..3764bf536b 100644
 a/lib/perfdata/elasticsearchwriter.cpp
-+++ b/lib/perfdata/elasticsearchwriter.cpp
-@@ -2,6 +2,7 @@
- 
- #include "perfdata/elasticsearchwriter.hpp"
- #include "perfdata/elasticsearchwriter-ti.cpp"
-+#include "remote/httputility.hpp"
- #include "remote/url.hpp"
- #include "icinga/compatutility.hpp"
- #include "icinga/service.hpp"
-@@ -474,27 +475,27 @@ void ElasticsearchWriter::SendRequest(const

[gentoo-commits] repo/gentoo:master commit in: net-analyzer/icinga2/files/

2019-03-30 Thread Matthew Thode 
commit: c83a82109aac924c7c574e5dee27f1ac509a64a0
Author: Michael Mair-Keimberger  gmail  com>
AuthorDate: Sat Mar 30 15:51:31 2019 +
Commit: Matthew Thode  gentoo  org>
CommitDate: Sat Mar 30 21:22:46 2019 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=c83a8210

net-analyzer/icinga2: remove unused file

Signed-off-by: Michael Mair-Keimberger  gmail.com>
Signed-off-by: Matthew Thode  gentoo.org>

 net-analyzer/icinga2/files/icinga2.initd-2 | 91 --
 1 file changed, 91 deletions(-)

diff --git a/net-analyzer/icinga2/files/icinga2.initd-2 
b/net-analyzer/icinga2/files/icinga2.initd-2
deleted file mode 100644
index b12716d4d44..000
--- a/net-analyzer/icinga2/files/icinga2.initd-2
+++ /dev/null
@@ -1,91 +0,0 @@
-#!/sbin/openrc-run
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-extra_started_commands="reload"
-
-# Set defaults, see /etc/conf.d/icinga2 to override
-: ${DAEMON:=/usr/sbin/icinga2}
-: ${ICINGA2_CONFIG_FILE:=/etc/icinga2/icinga2.conf}
-: ${ICINGA2_RUN_DIR:=/run/icinga2}
-: ${ICINGA2_STATE_DIR:=/var/cache/icinga2}
-: ${ICINGA2_PID_FILE:=${ICINGA2_RUN_DIR}/icinga2.pid}
-: ${ICINGA2_CMD_DIR:=${ICINGA2_RUN_DIR}/cmd}
-: ${ICINGA2_LOG_DIR:=/var/log/icinga2}
-: ${ICINGA2_ERROR_LOG:=/var/log/icinga2/error.log}
-: ${ICINGA2_STARTUP_LOG:=/var/log/icinga2/startup.log}
-: ${ICINGA2_LOG:=/var/log/icinga2/icinga2.log}
-: ${ICINGA2_CACHE_DIR:=/var/cache/icinga2}
-: ${ICINGA2_USER:=icinga}
-: ${ICINGA2_GROUP:=icingacmd}
-: ${ICINGA2_COMMAND_GROUP:=icingacmd}
-
-ICINGA2_DAEMON_ARGS="daemon -c $ICINGA2_CONFIG_FILE -e $ICINGA2_ERROR_LOG -d"
-
-depend() {
-need net
-}
-
-checkconfig() {
-if [ ! -e "$ICINGA2_CONFIG_FILE" ]; then
-   ewarn "Config file '$ICINGA2_CONFIG_FILE' does not exist."
-   eend 1
-fi
-
-ICINGA2_USER=$($DAEMON variable get --current RunAsUser)
-if [ $? != 0 ]; then
-eerror "Could not fetch RunAsUser variable: '$ICINGA2_USER'."
-return 1
-fi
-ICINGA2_GROUP=$($DAEMON variable get --current RunAsGroup)
-if [ $? != 0 ]; then
-eerror "Could not fetch RunAsGroup variable: '$ICINGA2_GROUP'."
-return 1
-fi
-
-checkpath -d -m 0750 -o $ICINGA2_USER:$ICINGA2_GROUP $ICINGA2_RUN_DIR
-checkpath -d -m 0750 -o $ICINGA2_USER:$ICINGA2_GROUP $ICINGA2_STATE_DIR
-checkpath -d -m 2750 -o $ICINGA2_USER:$ICINGA2_GROUP $ICINGA2_CMD_DIR
-
-if ! $DAEMON daemon -c $ICINGA2_CONFIG_FILE -C > $ICINGA2_STARTUP_LOG 
2>&1; then
-eerror "Icinga2 detected configuration errors. Check 
'$ICINGA2_STARTUP_LOG' for details."
-return 1
-fi
-}
-
-start() {
-checkconfig || return 1
-
-ebegin "Starting icinga2"
-start-stop-daemon --start --exec "${DAEMON}" \
---pidfile "${ICINGA2_PID_FILE}" \
--- $ICINGA2_DAEMON_ARGS > $ICINGA2_STARTUP_LOG 2>&1
-local retval=$?
-if [ $retval -ne 0 ]; then
-ewarn "Error starting icinga2. '$ICINGA2_STARTUP_LOG' for details."
-fi
-eend $retval
-}
-
-stop() {
-ebegin "Stopping icinga2"
-start-stop-daemon \
---stop \
---pidfile $ICINGA2_PID_FILE \
---retry "SIGTERM/15 SIGKILL/30" \
---progress
-eend $?
-}
-
-reload() {
-checkconfig || return 1
-
-ebegin "Reloading icinga2"
-start-stop-daemon --signal HUP --pidfile "$ICINGA2_PID_FILE"
-
-local retval=$?
-if [ $retval -ne 0 ]; then
-ewarn "Error reloading icinga2."
-fi
-eend $retval
-}

[gentoo-commits] repo/gentoo:master commit in: net-analyzer/icinga2/files/, net-analyzer/icinga2/

2018-10-20 Thread Matthew Thode 
commit: 11648313f20e3a3a175832764755c373edc71ec0
Author: Matthew Thode  gentoo  org>
AuthorDate: Sat Oct 20 17:05:34 2018 +
Commit: Matthew Thode  gentoo  org>
CommitDate: Sat Oct 20 17:05:34 2018 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=11648313

net-analyzer/icinga2: update init script

Do not require icinga2 to run before we start it.

Closes: https://bugs.gentoo.org/668506
Signed-off-by: Matthew Thode  gentoo.org>
Package-Manager: Portage-2.3.49, Repoman-2.3.11

 net-analyzer/icinga2/Manifest  |   1 -
 net-analyzer/icinga2/files/icinga2.initd-3 |  12 +-
 ...2-2.10.0-r1.ebuild => icinga2-2.10.1-r1.ebuild} |   0
 net-analyzer/icinga2/icinga2-2.10.1.ebuild | 172 -
 4 files changed, 1 insertion(+), 184 deletions(-)

diff --git a/net-analyzer/icinga2/Manifest b/net-analyzer/icinga2/Manifest
index 8d1baa7dc18..b0895c99616 100644
--- a/net-analyzer/icinga2/Manifest
+++ b/net-analyzer/icinga2/Manifest
@@ -1,4 +1,3 @@
-DIST icinga2-2.10.0.tar.gz 2227324 BLAKE2B 
fdbcb84d11b867e06804a2528ee3579dfd15df72bbe5f3b4334ee38282b710701889def9f4b44613c0196ea49f13466de86103f65049cf16f491c6f28b9390d1
 SHA512 
0997461371440521cfbb13d29f6801e889b423d46a4fb792edef5191db3cf39503b4452823fcd78a0d0934072eb7df53b17a56b6bae7c1fb21412f7022d4d0a5
 DIST icinga2-2.10.1.tar.gz 4406432 BLAKE2B 
60f63faabed43f9a99f313e3835c15afab9d70e1335f987f431f3187907fedb94451457fe4652886e950b1b058952957832bc7fb5ad5e8f6f4f1f47d4178
 SHA512 
88e0ef1dfd93a399535f3238cb675e86159ca23d1abfd78009797c3533d10ac5c5167008ff04dfc64d4b9f225e75d85947ce85c5a941250699c0d772be9c0aeb
 DIST icinga2-2.8.4.tar.gz 2510333 BLAKE2B 
f551a5eadc93d8455612af40e34a0922bc75f41b8064f9989c8f0c28dc2c3fb18963cf9b3272efa29f03973e7cf5824762bebff1bfa1a23c4ba39c93fc29c8e5
 SHA512 
b2cb5989962ac65da927cbdbac1b3345c913321d507b5113f32dd90bf969b2513478e68d52b9cd4cf255057d74428f9e42067288b7ddc59ad060ca7b84f4f114
 DIST icinga2-2.9.1.tar.gz 2193190 BLAKE2B 
29be491c4b43e218ef8aaa2128822040ccb0989e91d83f033cf7873216e4307cdbc8ee9052d79fd0c396efeb68759acc97938e3ee596e0820e3f6c8f73bc
 SHA512 
1d69a24f85249386e30ff1625cf522ba58e5f2ab641dbe950bf1764324a6c7516d1532942954e842002566823b0f30383747d5ec8b7bd36705aa5f0ccfa29533

diff --git a/net-analyzer/icinga2/files/icinga2.initd-3 
b/net-analyzer/icinga2/files/icinga2.initd-3
index 46990e3e4e2..5af259d5ddf 100644
--- a/net-analyzer/icinga2/files/icinga2.initd-3
+++ b/net-analyzer/icinga2/files/icinga2.initd-3
@@ -32,20 +32,10 @@ checkconfig() {
eend 1
 fi
 
-ICINGA2_USER=$($DAEMON variable get RunAsUser)
-if [ $? != 0 ]; then
-eerror "Could not fetch RunAsUser variable: '$ICINGA2_USER'."
-return 1
-fi
-ICINGA2_GROUP=$($DAEMON variable get RunAsGroup)
-if [ $? != 0 ]; then
-eerror "Could not fetch RunAsGroup variable: '$ICINGA2_GROUP'."
-return 1
-fi
-
 checkpath -d -m 0750 -o $ICINGA2_USER:$ICINGA2_GROUP $ICINGA2_RUN_DIR
 checkpath -d -m 0750 -o $ICINGA2_USER:$ICINGA2_GROUP $ICINGA2_STATE_DIR
 checkpath -d -m 2750 -o $ICINGA2_USER:$ICINGA2_GROUP $ICINGA2_CMD_DIR
+checkpath -d -m 0750 -o $ICINGA2_USER:$ICINGA2_GROUP $ICINGA2_CACHE_DIR
 
 if ! $DAEMON daemon -c $ICINGA2_CONFIG_FILE -C > $ICINGA2_STARTUP_LOG 
2>&1; then
 eerror "Icinga2 detected configuration errors. Check 
'$ICINGA2_STARTUP_LOG' for details."

diff --git a/net-analyzer/icinga2/icinga2-2.10.0-r1.ebuild 
b/net-analyzer/icinga2/icinga2-2.10.1-r1.ebuild
similarity index 100%
rename from net-analyzer/icinga2/icinga2-2.10.0-r1.ebuild
rename to net-analyzer/icinga2/icinga2-2.10.1-r1.ebuild

diff --git a/net-analyzer/icinga2/icinga2-2.10.1.ebuild 
b/net-analyzer/icinga2/icinga2-2.10.1.ebuild
deleted file mode 100644
index 913217ef694..000
--- a/net-analyzer/icinga2/icinga2-2.10.1.ebuild
+++ /dev/null
@@ -1,172 +0,0 @@
-# Copyright 1999-2018 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-if [[ ${PV} !=  ]]; then
-   inherit cmake-utils depend.apache eutils systemd toolchain-funcs user 
wxwidgets
-   SRC_URI="https://github.com/Icinga/icinga2/archive/v${PV}.tar.gz -> 
${P}.tar.gz"
-   KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~x86"
-else
-   inherit cmake-utils depend.apache eutils git-r3 systemd toolchain-funcs 
user wxwidgets
-   EGIT_REPO_URI="https://github.com/Icinga/icinga2.git;
-   EGIT_BRANCH="master"
-   KEYWORDS=""
-fi
-
-DESCRIPTION="Distributed, general purpose, network monitoring engine"
-HOMEPAGE="http://icinga.org/icinga2;
-
-LICENSE="GPL-2"
-SLOT="0"
-IUSE="classicui console libressl lto mail mariadb minimal +mysql nano-syntax 
+plugins postgres systemd +vim-syntax"
-WX_GTK_VER="3.0"
-
-CDEPEND="
-   !libressl? ( dev-libs/openssl:0= )
-   libressl? ( dev-libs/libressl:0= )
-   >=dev-libs/boost-1.58-r1
-   console? ( dev-libs/libedit )
-   mariadb? (

[gentoo-commits] repo/gentoo:master commit in: net-analyzer/icinga2/files/, net-analyzer/icinga2/

2018-10-14 Thread Matthew Thode 
commit: e66a341ec02cfbb13ac0875fd0c2ea55a1212f09
Author: Matthew Thode  gentoo  org>
AuthorDate: Sun Oct 14 18:38:17 2018 +
Commit: Matthew Thode  gentoo  org>
CommitDate: Sun Oct 14 18:40:01 2018 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=e66a341e

net-analyzer/icinga2: update init script

Closes: https://bugs.gentoo.org/668506
Signed-off-by: Matthew Thode  gentoo.org>
Package-Manager: Portage-2.3.49, Repoman-2.3.11

 net-analyzer/icinga2/files/icinga2.initd-3 | 91 ++
 ...nga2-2.10.0.ebuild => icinga2-2.10.0-r1.ebuild} |  2 +-
 net-analyzer/icinga2/icinga2-.ebuild   |  4 +-
 3 files changed, 94 insertions(+), 3 deletions(-)

diff --git a/net-analyzer/icinga2/files/icinga2.initd-3 
b/net-analyzer/icinga2/files/icinga2.initd-3
new file mode 100644
index 000..46990e3e4e2
--- /dev/null
+++ b/net-analyzer/icinga2/files/icinga2.initd-3
@@ -0,0 +1,91 @@
+#!/sbin/openrc-run
+# Copyright 1999-2018 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+extra_started_commands="reload"
+
+# Set defaults, see /etc/conf.d/icinga2 to override
+: ${DAEMON:=/usr/sbin/icinga2}
+: ${ICINGA2_CONFIG_FILE:=/etc/icinga2/icinga2.conf}
+: ${ICINGA2_RUN_DIR:=/run/icinga2}
+: ${ICINGA2_STATE_DIR:=/var/cache/icinga2}
+: ${ICINGA2_PID_FILE:=${ICINGA2_RUN_DIR}/icinga2.pid}
+: ${ICINGA2_CMD_DIR:=${ICINGA2_RUN_DIR}/cmd}
+: ${ICINGA2_LOG_DIR:=/var/log/icinga2}
+: ${ICINGA2_ERROR_LOG:=/var/log/icinga2/error.log}
+: ${ICINGA2_STARTUP_LOG:=/var/log/icinga2/startup.log}
+: ${ICINGA2_LOG:=/var/log/icinga2/icinga2.log}
+: ${ICINGA2_CACHE_DIR:=/var/cache/icinga2}
+: ${ICINGA2_USER:=icinga}
+: ${ICINGA2_GROUP:=icingacmd}
+: ${ICINGA2_COMMAND_GROUP:=icingacmd}
+
+ICINGA2_DAEMON_ARGS="daemon -c $ICINGA2_CONFIG_FILE -e $ICINGA2_ERROR_LOG -d"
+
+depend() {
+need net
+}
+
+checkconfig() {
+if [ ! -e "$ICINGA2_CONFIG_FILE" ]; then
+   ewarn "Config file '$ICINGA2_CONFIG_FILE' does not exist."
+   eend 1
+fi
+
+ICINGA2_USER=$($DAEMON variable get RunAsUser)
+if [ $? != 0 ]; then
+eerror "Could not fetch RunAsUser variable: '$ICINGA2_USER'."
+return 1
+fi
+ICINGA2_GROUP=$($DAEMON variable get RunAsGroup)
+if [ $? != 0 ]; then
+eerror "Could not fetch RunAsGroup variable: '$ICINGA2_GROUP'."
+return 1
+fi
+
+checkpath -d -m 0750 -o $ICINGA2_USER:$ICINGA2_GROUP $ICINGA2_RUN_DIR
+checkpath -d -m 0750 -o $ICINGA2_USER:$ICINGA2_GROUP $ICINGA2_STATE_DIR
+checkpath -d -m 2750 -o $ICINGA2_USER:$ICINGA2_GROUP $ICINGA2_CMD_DIR
+
+if ! $DAEMON daemon -c $ICINGA2_CONFIG_FILE -C > $ICINGA2_STARTUP_LOG 
2>&1; then
+eerror "Icinga2 detected configuration errors. Check 
'$ICINGA2_STARTUP_LOG' for details."
+return 1
+fi
+}
+
+start() {
+checkconfig || return 1
+
+ebegin "Starting icinga2"
+start-stop-daemon --start --exec "${DAEMON}" \
+--pidfile "${ICINGA2_PID_FILE}" \
+-- $ICINGA2_DAEMON_ARGS > $ICINGA2_STARTUP_LOG 2>&1
+local retval=$?
+if [ $retval -ne 0 ]; then
+ewarn "Error starting icinga2. '$ICINGA2_STARTUP_LOG' for details."
+fi
+eend $retval
+}
+
+stop() {
+ebegin "Stopping icinga2"
+start-stop-daemon \
+--stop \
+--pidfile $ICINGA2_PID_FILE \
+--retry "SIGTERM/15 SIGKILL/30" \
+--progress
+eend $?
+}
+
+reload() {
+checkconfig || return 1
+
+ebegin "Reloading icinga2"
+start-stop-daemon --signal HUP --pidfile "$ICINGA2_PID_FILE"
+
+local retval=$?
+if [ $retval -ne 0 ]; then
+ewarn "Error reloading icinga2."
+fi
+eend $retval
+}

diff --git a/net-analyzer/icinga2/icinga2-2.10.0.ebuild 
b/net-analyzer/icinga2/icinga2-2.10.0-r1.ebuild
similarity index 98%
rename from net-analyzer/icinga2/icinga2-2.10.0.ebuild
rename to net-analyzer/icinga2/icinga2-2.10.0-r1.ebuild
index e5caea793dd..913217ef694 100644
--- a/net-analyzer/icinga2/icinga2-2.10.0.ebuild
+++ b/net-analyzer/icinga2/icinga2-2.10.0-r1.ebuild
@@ -109,7 +109,7 @@ src_install() {
 
einstalldocs
 
-   newinitd "${FILESDIR}"/icinga2.initd-2 icinga2
+   newinitd "${FILESDIR}"/icinga2.initd-3 icinga2
 
if use mysql ; then
docinto schema

diff --git a/net-analyzer/icinga2/icinga2-.ebuild 
b/net-analyzer/icinga2/icinga2-.ebuild
index c0f291e4ea2..913217ef694 100644
--- a/net-analyzer/icinga2/icinga2-.ebuild
+++ b/net-analyzer/icinga2/icinga2-.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -109,7 +109,7 @@ src_install() {
 
einstalldocs
 
-   newinitd "${FILESDIR}"/icinga2.initd-2 icinga2
+   newinitd "${FILESDIR}"/icinga2.initd-3 icinga2
 
if use mysql ; then
docinto schema

[gentoo-commits] repo/gentoo:master commit in: net-analyzer/icinga2/files/, net-analyzer/icinga2/

2018-02-17 Thread Matt Thode 
commit: 7bb8b3c5bb63a41a917661b12dd291260ceb397f
Author: Matthew Thode  gentoo  org>
AuthorDate: Sun Feb 18 04:21:36 2018 +
Commit: Matt Thode  gentoo  org>
CommitDate: Sun Feb 18 04:23:35 2018 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=7bb8b3c5

net-analyzer/icinga2: 2.8.1 stable amd64 and x86 with cleanup

Package-Manager: Portage-2.3.19, Repoman-2.3.6

 net-analyzer/icinga2/Manifest  |   4 -
 .../files/fix-missing-include-2.7.1-2.patch|  24 ---
 .../icinga2/files/fix-missing-include-2.7.1.patch  |  22 ---
 net-analyzer/icinga2/icinga2-2.7.0-r1.ebuild   | 177 
 net-analyzer/icinga2/icinga2-2.7.1-r1.ebuild   | 182 -
 net-analyzer/icinga2/icinga2-2.7.2.ebuild  | 182 -
 net-analyzer/icinga2/icinga2-2.8.0.ebuild  | 179 
 net-analyzer/icinga2/icinga2-2.8.1.ebuild  |   2 +-
 8 files changed, 1 insertion(+), 771 deletions(-)

diff --git a/net-analyzer/icinga2/Manifest b/net-analyzer/icinga2/Manifest
index f9713a68300..b71de2bd5a1 100644
--- a/net-analyzer/icinga2/Manifest
+++ b/net-analyzer/icinga2/Manifest
@@ -1,5 +1 @@
-DIST icinga2-2.7.0.tar.gz 2435398 BLAKE2B 
06a717f818a7c51972d2d095ea1c588ff8d49473aaa765795d1c48ed4ffc12b2c5d560a03a2be3fe45d8d80de8df2b53edcf75d895e0f31cd4723c4883907b47
 SHA512 
470dd4ffa4ef608a018ede5c25b41f16213bf18c679eed8aaeed155fe6adc74a70abcc2e8be42ca20bf60f9b4b620c971ebbc96d608de2a90e480d72b93111bb
-DIST icinga2-2.7.1.tar.gz 2475348 BLAKE2B 
2e19a3c199b5cbcac78490a9ee1961c8e54f15787d08fa22150a977fb16aa7e736e76b97b66749ebd4070e9d0bfb0c8a484b8430288845de9ac456771d875682
 SHA512 
8233c33b7191706569a236d583fff689b35eba750fca01a06cfd14ef636b01314b6b142d78777987bd08a9df1cc53f42652fd1c900532b73f0a0363aa220c6cd
-DIST icinga2-2.7.2.tar.gz 2471098 BLAKE2B 
362897613616a15114577a044d56f01093246fa421c307faff1c6208a01e2c62dda2d1ff3aabc2e57b58c1cc6d4cb841a51758f0572945be2eced22390eb98ae
 SHA512 
69cd7c56eaae832712723fcd21e2177b8180b3975bcf773223ca52d3817d1ca538cfd620002bd7a9ccf2e89deffa80d07e628146295b21377de99170302d
-DIST icinga2-2.8.0.tar.gz 2497043 BLAKE2B 
06472b30ad1fa008796fb149ac067cf92062443d4c6ef62043b6e53b901e1c282c68d1949a3ac6eabc33456c3863bb5dfe45cd668b23ac22e705e3e346afbd59
 SHA512 
20399251c91aa3b07a0e884e0c52fa2540b645d24fd46cdb550fcc5accfbfa23a703f7d310ccde4fa68008c44e8dc6bcdc5351a21e82181e39b1add5a92d90c6
 DIST icinga2-2.8.1.tar.gz 2501182 BLAKE2B 
a32e60fd43eacedaee3cb33b719e2e405a6123710f7806b6c82eccb80eeb0ab0318a34302a5f3b310b258702214148f34719f166b3a3807ef2c9d4b28fa0
 SHA512 
27dcd2de1a9fa81327fa9cf25f25171e471715b4506dfd312bcd6c10408520cef86d260762f4340a00aaa7824c8ab65baadf541b7e104bd378204667dc92f762

diff --git a/net-analyzer/icinga2/files/fix-missing-include-2.7.1-2.patch 
b/net-analyzer/icinga2/files/fix-missing-include-2.7.1-2.patch
deleted file mode 100644
index 21779d140a4..000
--- a/net-analyzer/icinga2/files/fix-missing-include-2.7.1-2.patch
+++ /dev/null
@@ -1,24 +0,0 @@
-From 2d036e6886fb68707e861a6e5f75a6088d149832 Mon Sep 17 00:00:00 2001
-From: Michael 
-Date: Tue, 26 Sep 2017 22:01:07 +0200
-Subject: [PATCH] Fixed missing include statement in unit test
-
-This adds the missing iostream include to the notification unit test.
-
-refs #5613

- test/icinga-notification.cpp | 1 +
- 1 file changed, 1 insertion(+)
-
-diff --git a/test/icinga-notification.cpp b/test/icinga-notification.cpp
-index 8db93fa50..97f7838a1 100644
 a/test/icinga-notification.cpp
-+++ b/test/icinga-notification.cpp
-@@ -19,6 +19,7 @@
- 
- #include "icinga/notification.hpp"
- #include 
-+#include 
- 
- using namespace icinga;
- 

diff --git a/net-analyzer/icinga2/files/fix-missing-include-2.7.1.patch 
b/net-analyzer/icinga2/files/fix-missing-include-2.7.1.patch
deleted file mode 100644
index d170db478db..000
--- a/net-analyzer/icinga2/files/fix-missing-include-2.7.1.patch
+++ /dev/null
@@ -1,22 +0,0 @@
-From 631d1e85fc2575a26c700a15f309fccd9fb9ee4d Mon Sep 17 00:00:00 2001
-From: Michael 
-Date: Mon, 25 Sep 2017 01:07:50 +0200
-Subject: [PATCH] Fixed missing include statement in unit tests
-
-refs #5613

- test/icinga-checkresult.cpp | 1 +
- 1 file changed, 1 insertion(+)
-
-diff --git a/test/icinga-checkresult.cpp b/test/icinga-checkresult.cpp
-index 7f14dd365..a128e9519 100644
 a/test/icinga-checkresult.cpp
-+++ b/test/icinga-checkresult.cpp
-@@ -19,6 +19,7 @@
- 
- #include "icinga/host.hpp"
- #include 
-+#include 
- 
- using namespace icinga;
- 

diff --git a/net-analyzer/icinga2/icinga2-2.7.0-r1.ebuild 
b/net-analyzer/icinga2/icinga2-2.7.0-r1.ebuild
deleted file mode 100644
index 8e9f5f4f36c..000
--- a/net-analyzer/icinga2/icinga2-2.7.0-r1.ebuild
+++ /dev/null
@@ -1,177 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-if [[ ${PV} !=  ]]; then

[gentoo-commits] repo/gentoo:master commit in: net-analyzer/icinga2/files/, net-analyzer/icinga2/

2017-09-29 Thread Matt Thode 
commit: 41813146072d2c00fce004372960f387ed5f3038
Author: Matthew Thode  gentoo  org>
AuthorDate: Fri Sep 29 21:59:05 2017 +
Commit: Matt Thode  gentoo  org>
CommitDate: Fri Sep 29 21:59:05 2017 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=41813146

net-analyzer/icinga2: another missing include...

Package-Manager: Portage-2.3.8, Repoman-2.3.3

 .../files/fix-missing-include-2.7.1-2.patch| 24 ++
 ...cinga2-2.7.1.ebuild => icinga2-2.7.1-r1.ebuild} |  1 +
 2 files changed, 25 insertions(+)

diff --git a/net-analyzer/icinga2/files/fix-missing-include-2.7.1-2.patch 
b/net-analyzer/icinga2/files/fix-missing-include-2.7.1-2.patch
new file mode 100644
index 000..21779d140a4
--- /dev/null
+++ b/net-analyzer/icinga2/files/fix-missing-include-2.7.1-2.patch
@@ -0,0 +1,24 @@
+From 2d036e6886fb68707e861a6e5f75a6088d149832 Mon Sep 17 00:00:00 2001
+From: Michael 
+Date: Tue, 26 Sep 2017 22:01:07 +0200
+Subject: [PATCH] Fixed missing include statement in unit test
+
+This adds the missing iostream include to the notification unit test.
+
+refs #5613
+---
+ test/icinga-notification.cpp | 1 +
+ 1 file changed, 1 insertion(+)
+
+diff --git a/test/icinga-notification.cpp b/test/icinga-notification.cpp
+index 8db93fa50..97f7838a1 100644
+--- a/test/icinga-notification.cpp
 b/test/icinga-notification.cpp
+@@ -19,6 +19,7 @@
+ 
+ #include "icinga/notification.hpp"
+ #include 
++#include 
+ 
+ using namespace icinga;
+ 

diff --git a/net-analyzer/icinga2/icinga2-2.7.1.ebuild 
b/net-analyzer/icinga2/icinga2-2.7.1-r1.ebuild
similarity index 98%
rename from net-analyzer/icinga2/icinga2-2.7.1.ebuild
rename to net-analyzer/icinga2/icinga2-2.7.1-r1.ebuild
index 237a6187d8b..2f4dc84145d 100644
--- a/net-analyzer/icinga2/icinga2-2.7.1.ebuild
+++ b/net-analyzer/icinga2/icinga2-2.7.1-r1.ebuild
@@ -48,6 +48,7 @@ REQUIRED_USE="!minimal? ( || ( mysql postgres ) )"
 
 PATCHES=(
"${FILESDIR}/fix-missing-include-2.7.1.patch"
+   "${FILESDIR}/fix-missing-include-2.7.1-2.patch"
 )
 
 want_apache2

[gentoo-commits] repo/gentoo:master commit in: net-analyzer/icinga2/files/

2017-01-09 Thread Matt Thode 
commit: 98b2c18a3067be3984cff382c7eb9bd2b6fd964c
Author: Matthew Thode  gentoo  org>
AuthorDate: Mon Jan  9 20:03:59 2017 +
Commit: Matt Thode  gentoo  org>
CommitDate: Mon Jan  9 20:04:15 2017 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=98b2c18a

net-analyzer/icinga2: remove unused logrotate.patch

based on a pr from mm1ke

Package-Manager: portage-2.3.0

 net-analyzer/icinga2/files/logrotate.patch | 17 -
 1 file changed, 17 deletions(-)

diff --git a/net-analyzer/icinga2/files/logrotate.patch 
b/net-analyzer/icinga2/files/logrotate.patch
deleted file mode 100644
index 93d493a..
--- a/net-analyzer/icinga2/files/logrotate.patch
+++ /dev/null
@@ -1,17 +0,0 @@
-diff -ur icinga2-2.4.10/etc/logrotate.d/icinga2.cmake 
icinga2-2.4.10.new/etc/logrotate.d/icinga2.cmake
 icinga2-2.4.10/etc/logrotate.d/icinga2.cmake   2016-05-19 
06:39:29.0 -0500
-+++ icinga2-2.4.10.new/etc/logrotate.d/icinga2.cmake   2016-05-22 
17:52:45.547568144 -0500
-@@ -1,4 +1,5 @@
- @CMAKE_INSTALL_FULL_LOCALSTATEDIR@/log/icinga2/icinga2.log 
@CMAKE_INSTALL_FULL_LOCALSTATEDIR@/log/icinga2/debug.log {
-+  su icinga icingacmd
-   daily
-   rotate 7@LOGROTATE_USE_SU@
-   compress
-@@ -12,6 +13,7 @@
- }
- 
- @CMAKE_INSTALL_FULL_LOCALSTATEDIR@/log/icinga2/error.log {
-+  su icinga icingacmd
-   daily
-   rotate 90@LOGROTATE_USE_SU@
-   compress