4 files changed, 21 insertions, 57 deletions

diff --git a/net-mgmt/icinga2/Makefile b/net-mgmt/icinga2/Makefile
index bd5d16b3585a..dd5090b90726 100644
--- a/net-mgmt/icinga2/Makefile
+++ b/net-mgmt/icinga2/Makefile
@@ -2,8 +2,7 @@
 
 PORTNAME=	icinga2
 DISTVERSIONPREFIX=	v
-DISTVERSION=	2.8.2
-PORTREVISION=	1
+DISTVERSION=	2.8.4
 CATEGORIES=	net-mgmt
 
 MAINTAINER=	lme@FreeBSD.org
diff --git a/net-mgmt/icinga2/distinfo b/net-mgmt/icinga2/distinfo
index 8aaf66f345ae..c03ffaad1006 100644
--- a/net-mgmt/icinga2/distinfo
+++ b/net-mgmt/icinga2/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1522240144
-SHA256 (icinga-icinga2-v2.8.2_GH0.tar.gz) = 508820905c86906117a616e90eb16b646007e178621b0df9f27fcaf1a491151c
-SIZE (icinga-icinga2-v2.8.2_GH0.tar.gz) = 2507304
+TIMESTAMP = 1524755477
+SHA256 (icinga-icinga2-v2.8.4_GH0.tar.gz) = 36f6ae3ccd5d93599459ee093011e6b64f0c56cc16bc28d37e2e6acd0c63aae6
+SIZE (icinga-icinga2-v2.8.4_GH0.tar.gz) = 2510333
diff --git a/net-mgmt/icinga2/files/patch-boost-1.67 b/net-mgmt/icinga2/files/patch-boost-1.67
deleted file mode 100644
index 821f857642f6..000000000000
--- a/net-mgmt/icinga2/files/patch-boost-1.67
+++ /dev/null
@@ -1,35 +0,0 @@
-https://github.com/Icinga/icinga2/pull/6230
-
---- lib/base/timer.cpp.orig	2018-03-22 10:26:19 UTC
-+++ lib/base/timer.cpp
-@@ -266,7 +266,7 @@ void Timer::TimerThreadProc(void)
- 
- 		if (wait > 0.01) {
- 			/* Wait for the next timer. */
--			l_TimerCV.timed_wait(lock, boost::posix_time::milliseconds(wait * 1000));
-+			l_TimerCV.timed_wait(lock, boost::posix_time::milliseconds(long(wait * 1000)));
- 
- 			continue;
- 		}
---- lib/checker/checkercomponent.cpp.orig	2018-03-22 10:26:19 UTC
-+++ lib/checker/checkercomponent.cpp
-@@ -130,7 +130,7 @@ void CheckerComponent::CheckThreadProc(void)
- 
- 		if (wait > 0) {
- 			/* Wait for the next check. */
--			m_CV.timed_wait(lock, boost::posix_time::milliseconds(wait * 1000));
-+			m_CV.timed_wait(lock, boost::posix_time::milliseconds(long(wait * 1000)));
- 
- 			continue;
- 		}
---- lib/remote/eventqueue.cpp.orig	2018-03-22 10:26:19 UTC
-+++ lib/remote/eventqueue.cpp
-@@ -114,7 +114,7 @@ Dictionary::Ptr EventQueue::WaitForEvent(void *client,
- 			return result;
- 		}
- 
--		if (!m_CV.timed_wait(lock, boost::posix_time::milliseconds(timeout * 1000)))
-+		if (!m_CV.timed_wait(lock, boost::posix_time::milliseconds(long(timeout * 1000))))
- 			return Dictionary::Ptr();
- 	}
- }
diff --git a/net-mgmt/icinga2/pkg-plist b/net-mgmt/icinga2/pkg-plist
index 742609d45632..6c86062f49f4 100644
--- a/net-mgmt/icinga2/pkg-plist
+++ b/net-mgmt/icinga2/pkg-plist
@@ -37,39 +37,39 @@ etc/bash_completion.d/icinga2
 @sample %%ETCDIR%%/zones.conf.sample
 %%ETCDIR%%/zones.d/README
 lib/icinga2/libbase.so
-lib/icinga2/libbase.so.2.8.2
+lib/icinga2/libbase.so.2.8.4
 lib/icinga2/libchecker.so
-lib/icinga2/libchecker.so.2.8.2
+lib/icinga2/libchecker.so.2.8.4
 lib/icinga2/libcli.so
-lib/icinga2/libcli.so.2.8.2
+lib/icinga2/libcli.so.2.8.4
 lib/icinga2/libcompat.so
-lib/icinga2/libcompat.so.2.8.2
+lib/icinga2/libcompat.so.2.8.4
 lib/icinga2/libconfig.so
-lib/icinga2/libconfig.so.2.8.2
+lib/icinga2/libconfig.so.2.8.4
 %%DBBACKEND%%lib/icinga2/libdb_ido.so
-%%DBBACKEND%%lib/icinga2/libdb_ido.so.2.8.2
+%%DBBACKEND%%lib/icinga2/libdb_ido.so.2.8.4
 %%MYSQL%%lib/icinga2/libdb_ido_mysql.so
-%%MYSQL%%lib/icinga2/libdb_ido_mysql.so.2.8.2
+%%MYSQL%%lib/icinga2/libdb_ido_mysql.so.2.8.4
 %%PGSQL%%lib/icinga2/libdb_ido_pgsql.so
-%%PGSQL%%lib/icinga2/libdb_ido_pgsql.so.2.8.2
+%%PGSQL%%lib/icinga2/libdb_ido_pgsql.so.2.8.4
 lib/icinga2/libexecvpe.so
-lib/icinga2/libexecvpe.so.2.8.2
+lib/icinga2/libexecvpe.so.2.8.4
 lib/icinga2/libicinga.so
-lib/icinga2/libicinga.so.2.8.2
+lib/icinga2/libicinga.so.2.8.4
 lib/icinga2/liblivestatus.so
-lib/icinga2/liblivestatus.so.2.8.2
+lib/icinga2/liblivestatus.so.2.8.4
 lib/icinga2/libmethods.so
-lib/icinga2/libmethods.so.2.8.2
+lib/icinga2/libmethods.so.2.8.4
 lib/icinga2/libmmatch.so
-lib/icinga2/libmmatch.so.2.8.2
+lib/icinga2/libmmatch.so.2.8.4
 lib/icinga2/libnotification.so
-lib/icinga2/libnotification.so.2.8.2
+lib/icinga2/libnotification.so.2.8.4
 lib/icinga2/libperfdata.so
-lib/icinga2/libperfdata.so.2.8.2
+lib/icinga2/libperfdata.so.2.8.4
 lib/icinga2/libremote.so
-lib/icinga2/libremote.so.2.8.2
+lib/icinga2/libremote.so.2.8.4
 lib/icinga2/libsocketpair.so
-lib/icinga2/libsocketpair.so.2.8.2
+lib/icinga2/libsocketpair.so.2.8.4
 lib/icinga2/sbin/icinga2
 libexec/nagios/check_nscp_api
 man/man8/icinga2.8.gz