Hi Stuart,
Hi ports@,

A diff to update Icinga 2 to its next major version, 2.16.0, follows.

- https://icinga.com/blog/icinga-2-16/
- https://github.com/Icinga/icinga2/releases/tag/v2.16.0

Some notes regarding the diff:
- The license was elevated to GPL version 3, see the linked changelog.
- As a new dependency, protobuf was added, required for the newly
  introduced OpenTelemetry support.
- Some of the OpenBSD patches went upstream, making them obsolete here.
- With the future Icinga 2 release version 2.18.0, some deprecated
  features will get removed, such as the IDO. This was reflected in the
  README, advising users to migrate to Icinga DB, already available in
  the ports.

Best,
Alvar


diff --git Makefile Makefile
index 9d91bef1e95..bf62de21709 100644
--- Makefile
+++ Makefile
@@ -2,8 +2,7 @@ COMMENT-main =	network monitoring system
 COMMENT-mysql =	MySQL support for icinga2
 COMMENT-pgsql =	PostgreSQL support for icinga2
 
-V =		2.15.2
-REVISION-main =	0
+V =		2.16.0
 
 GH_PROJECT =	icinga2
 GH_TAGNAME =	v$V
@@ -17,14 +16,14 @@ EPOCH =		0
 SHARED_LIBS +=	mysql_shim                0.0
 SHARED_LIBS +=	pgsql_shim                0.0
 
-# GPLv2+ with OpenSSL exemption
+# GPLv3+
 PERMIT_PACKAGE =	Yes
 
 WANTLIB += ${COMPILER_LIBCXX} boost_atomic-mt boost_context-mt
 WANTLIB += boost_coroutine-mt boost_date_time-mt boost_filesystem-mt
 WANTLIB += boost_iostreams-mt boost_program_options-mt boost_random-mt
 WANTLIB += boost_regex-mt boost_thread-mt c curses
-WANTLIB += edit execinfo m crypto ssl
+WANTLIB += edit execinfo m crypto ssl protobuf
 
 MODULES =		devel/cmake
 
@@ -38,7 +37,8 @@ PSEUDO_FLAVORS =	no_mysql no_pgsql
 FLAVOR ?=
 
 LIB_DEPENDS-main +=	${LIB_DEPENDS} \
-			devel/boost,-md
+			devel/boost,-md \
+			devel/protobuf
 RUN_DEPENDS-main =	net/monitoring-plugins
 
 RUN_DEPENDS =		${BASE_PKGPATH},-main=${FULLPKGNAME-main:S/icinga2-//}
diff --git distinfo distinfo
index 78ee4804a28..bed0ebdf0d1 100644
--- distinfo
+++ distinfo
@@ -1,2 +1,2 @@
-SHA256 (icinga2-2.15.2.tar.gz) = mk6R73qeI5iBNK/ZaR0Un967e0YQbIRePDb++i2AVm4=
-SIZE (icinga2-2.15.2.tar.gz) = 9454903
+SHA256 (icinga2-2.16.0.tar.gz) = cfzX5U3m9sU3V8pMnxyRER3BTjBD7hynQxPR0HWQS0M=
+SIZE (icinga2-2.16.0.tar.gz) = 9585508
diff --git patches/patch-itl_plugins-contrib_d_web_conf patches/patch-itl_plugins-contrib_d_web_conf
index 0297e8ca741..96792d8a9e6 100644
--- patches/patch-itl_plugins-contrib_d_web_conf
+++ patches/patch-itl_plugins-contrib_d_web_conf
@@ -1,7 +1,7 @@
 Index: itl/plugins-contrib.d/web.conf
 --- itl/plugins-contrib.d/web.conf.orig
 +++ itl/plugins-contrib.d/web.conf
-@@ -229,7 +229,7 @@ object CheckCommand "squid" {
+@@ -230,7 +230,7 @@ object CheckCommand "squid" {
  		}
  		"--squidclient" = {
  			value = "$squid_client$"
@@ -10,7 +10,7 @@ Index: itl/plugins-contrib.d/web.conf
  		}
  		"--timeout" = {
  			value = "$squid_timeout$"
-@@ -238,7 +238,7 @@ object CheckCommand "squid" {
+@@ -239,7 +239,7 @@ object CheckCommand "squid" {
  	}
  
  	vars.squid_hostname = "$check_address$"
diff --git patches/patch-lib_base_library_cpp patches/patch-lib_base_library_cpp
deleted file mode 100644
index 82d0184d2e4..00000000000
--- patches/patch-lib_base_library_cpp
+++ /dev/null
@@ -1,12 +0,0 @@
-Index: lib/base/library.cpp
---- lib/base/library.cpp.orig
-+++ lib/base/library.cpp
-@@ -20,6 +20,8 @@ Library::Library(const String& name)
- 	path = name + ".dll";
- #elif defined(__APPLE__)
- 	path = "lib" + name + "." + Application::GetAppSpecVersion() + ".dylib";
-+#elif defined(__OpenBSD__)
-+	path = "lib" + name + ".so";
- #else /* __APPLE__ */
- 	path = "lib" + name + ".so." + Application::GetAppSpecVersion();
- #endif /* _WIN32 */
diff --git patches/patch-lib_base_utility_cpp patches/patch-lib_base_utility_cpp
deleted file mode 100644
index f1902f411e7..00000000000
--- patches/patch-lib_base_utility_cpp
+++ /dev/null
@@ -1,24 +0,0 @@
-OpenBSD has pthread_set_name_np as well
-There doesn't seem to be a cmake check to define HAVE_PTHREAD_SET_NAME_NP?
-
-Index: lib/base/utility.cpp
---- lib/base/utility.cpp.orig
-+++ lib/base/utility.cpp
-@@ -34,7 +34,7 @@
- #include <utf8.h>
- #include <vector>
- 
--#ifdef __FreeBSD__
-+#if defined(__FreeBSD__) || defined(__OpenBSD__)
- #	include <pthread_np.h>
- #endif /* __FreeBSD__ */
- 
-@@ -1294,7 +1294,7 @@ void Utility::SetThreadName(const String& name, bool o
- 	WindowsSetThreadName(name.CStr());
- #endif /* _WIN32 */
- 
--#ifdef HAVE_PTHREAD_SET_NAME_NP
-+#if 1 || defined(HAVE_PTHREAD_SET_NAME_NP)
- 	pthread_set_name_np(pthread_self(), name.CStr());
- #endif /* HAVE_PTHREAD_SET_NAME_NP */
- 
diff --git pkg/PLIST-main pkg/PLIST-main
index 764413f8a76..483b9598fe0 100644
--- pkg/PLIST-main
+++ pkg/PLIST-main
@@ -23,7 +23,7 @@ sbin/icinga2
 share/doc/icinga2/
 share/doc/icinga2/AUTHORS
 share/doc/icinga2/CHANGELOG.md
-share/doc/icinga2/COPYING
+share/doc/icinga2/LICENSE.md
 share/doc/icinga2/NEWS
 share/doc/icinga2/README.md
 share/doc/icinga2/markdown/
@@ -177,6 +177,13 @@ share/examples/icinga2/features-available/notification.conf
 @sample ${SYSCONFDIR}/icinga2/features-available/notification.conf
 share/examples/icinga2/features-available/opentsdb.conf
 @sample ${SYSCONFDIR}/icinga2/features-available/opentsdb.conf
+@mode
+@owner
+@group
+share/examples/icinga2/features-available/otlpmetrics.conf
+@mode 664
+@owner _icinga
+@group wheel
 share/examples/icinga2/features-available/perfdata.conf
 @sample ${SYSCONFDIR}/icinga2/features-available/perfdata.conf
 share/examples/icinga2/features-available/syslog.conf
@@ -235,6 +242,7 @@ share/icinga2/include/plugins-contrib.d/network-components.conf
 share/icinga2/include/plugins-contrib.d/network-services.conf
 share/icinga2/include/plugins-contrib.d/operating-system.conf
 share/icinga2/include/plugins-contrib.d/raid-controller.conf
+share/icinga2/include/plugins-contrib.d/smart-advanced.conf
 share/icinga2/include/plugins-contrib.d/smart-attributes.conf
 share/icinga2/include/plugins-contrib.d/storage.conf
 share/icinga2/include/plugins-contrib.d/systemd.conf
diff --git pkg/README-main pkg/README-main
index 522627e24d5..f0b117d4ffc 100644
--- pkg/README-main
+++ pkg/README-main
@@ -8,7 +8,7 @@ Getting Started
 The following information only includes notes specific to use on OpenBSD.
 Use them in conjunction with the main Icinga 2 documentation available
 in ${PREFIX}/share/doc/icinga2/markdown or online at
-http://docs.icinga.org/icinga2/latest/doc.
+https://icinga.com/docs/icinga-2/latest/.
 
 The included sample configuration carries out some simple checks
 on the local machine; these should work as-is.
@@ -37,11 +37,14 @@ Icinga Web 2.
 It is also possible to use Icinga 2 with the legacy CGI interface,
 or with Icinga Web 1, however this has not been tested by the maintainer.
 
-Upgrading from Icinga 1 or Nagios
-=================================
-Icinga 2 is not a drop-in replacement. Read the "Migration from Icinga 1.x"
-and the "Differences between Icinga 1.x and 2" sections in the documentation.
-
 Upgrading from previous versions of Icinga 2
---------------------------------------------
+============================================
+
 Follow the main documentation in ${PREFIX}/share/doc/icinga2/markdown/.
+
+Upgrading from IDO to Icinga DB
+===============================
+
+With Icinga 2 version 2.18, the IDO will be removed. This affects the
+icinga2-ido-mysql and icinga2-ido-pgsql packages. Please consider
+switching to Icinga DB, available as the icingadb package.