Merge remote-tracking branch 'upstream/master'

.gitlab-ci.yml

@@ -7,6 +7,7 @@ variables:
   DOCKER_IMAGE_BASE: registry.icinga.com/build-docker
   ICINGA_BUILD_DEB_DEFAULT_ARCH: armhf
   ICINGA_BUILD_TYPE: snapshot
+  #ICINGA_BUILD_UPSTREAM_BRANCH:
 
 .build: &build
   stage: build
@@ -19,6 +20,7 @@ variables:
     key: "${CI_JOB_NAME}"
     paths:
       - ccache/
+      - 'icinga2.git'
   artifacts:
     paths:
       - build/*

jessie/debian/changelog

+icinga2 (2.10.4-1) icinga-jessie; urgency=medium
+
+  * Release 2.10.4
+
+ -- Michael Friedrich <michael.friedrich@icinga.com>  Tue, 19 Mar 2019 11:38:21 +0000
+
+icinga2 (2.10.3-2) icinga-jessie; urgency=medium
+
+  * Update to 2.10.3-2
+
+ -- Michael Friedrich <michael.friedrich@icinga.com>  Tue, 26 Feb 2019 11:56:42 +0000
+
+icinga2 (2.10.3-1) icinga-jessie; urgency=medium
+
+  * Update to 2.10.3
+
+ -- Michael Friedrich <michael.friedrich@icinga.com>  Tue, 26 Feb 2019 08:36:13 +0000
+
 icinga2 (2.10.2-1) icinga-jessie; urgency=medium
 
   * Update to 2.10.2

jessie/debian/control

@@ -2,7 +2,8 @@ Source: icinga2
 Section: admin
 Priority: extra
 Maintainer: Icinga Development Team <info@icinga.com>
-Build-Depends: bash-completion,
+Build-Depends:
+  bash-completion,
   bison,
   cmake (>= 2.8.7),
   pkg-config,
@@ -11,12 +12,15 @@ Build-Depends: bash-completion,
   libsystemd-dev,
   flex,
   g++ (>= 1.96),
-               libboost-dev,
-               libboost-program-options-dev,
-               libboost-regex-dev,
-               libboost-system-dev,
-               libboost-test-dev,
-               libboost-thread-dev,
+  libboost-dev (>= 1.66) | libboost1.67-dev | libboost1.67-icinga-dev,
+  libboost-context-dev (>= 1.66) | libboost-context1.67-dev | libboost-context1.67-icinga-dev,
+  libboost-coroutine-dev (>= 1.66) | libboost-coroutine1.67-dev | libboost-coroutine1.67-icinga-dev,
+  libboost-filesystem-dev (>= 1.66) | libboost-filesystem1.67-dev | libboost-filesystem1.67-icinga-dev,
+  libboost-program-options-dev (>= 1.66) | libboost-program-options1.67-dev | libboost-program-options1.67-icinga-dev,
+  libboost-regex-dev (>= 1.66) | libboost-regex1.67-dev | libboost-regex1.67-icinga-dev,
+  libboost-system-dev (>= 1.66) | libboost-system1.67-dev | libboost-system1.67-icinga-dev,
+  libboost-test-dev (>= 1.66) | libboost-test1.67-dev | libboost-test1.67-icinga-dev,
+  libboost-thread-dev (>= 1.66) | libboost-thread1.67-dev | libboost-thread1.67-icinga-dev,
   libmysqlclient-dev,
   libpq-dev,
   libssl-dev,

jessie/debian/icinga2-common.postinst

@@ -4,6 +4,11 @@
 set -e
 
 setperm() {
+    ownopt=
+    if [ "$1" = -R ]; then
+        ownopt="-R"
+        shift
+    fi
     user="$1"
     group="$2"
     mode="$3"
@@ -11,7 +16,7 @@ setperm() {
     shift 4
     # only do something when no setting exists
     if ! dpkg-statoverride --list "$file" >/dev/null 2>&1; then
-      chown "$user":"$group" "$file"
+      chown $ownopt "$user":"$group" "$file"
       chmod "$mode" "$file"
     fi
 }
@@ -27,6 +32,9 @@ is_fresh_install()
 dpkg-maintscript-helper rm_conffile \
    "/etc/bash_completion.d/icinga2" "2.4.1-2~" -- "$@"
 
+dpkg-maintscript-helper rm_conffile \
+   "/etc/icinga2/init.conf" "2.10.0~" -- "$@"
+
 case "$1" in
     configure)
         if ! getent passwd nagios > /dev/null ; then
@@ -37,8 +45,17 @@ case "$1" in
 
         # explicitly set permissions on some files that are dependent
         # on the uid/gid of the nagios user, which is dynamically created.
+        if ! dpkg-statoverride --list /etc/icinga2; then
             setperm nagios nagios 0750 /etc/icinga2
-        setperm nagios nagios 0700 /etc/icinga2/pki
+            setperm nagios nagios 0640 /etc/icinga2/icinga2.conf
+            setperm nagios nagios 0640 /etc/icinga2/constants.conf
+            setperm nagios nagios 0640 /etc/icinga2/zones.conf
+            setperm -R nagios nagios 0700 /etc/icinga2/pki
+            setperm -R nagios nagios 0750 /etc/icinga2/conf.d
+            setperm -R nagios nagios 0750 /etc/icinga2/features-enabled
+            setperm -R nagios nagios 0750 /etc/icinga2/features-available
+            setperm nagios nagios 0750 /etc/icinga2/zones.d
+        fi
 
         setperm nagios adm 2751 /var/log/icinga2
         setperm nagios adm 2751 /var/log/icinga2/compat

jessie/debian/patches/series

 21_config_changes
+

jessie/debian/rules

@@ -6,6 +6,15 @@ LTO_BUILD = -DICINGA2_LTO_BUILD=On
 
 DEB_HOST_ARCH = $(shell dpkg-architecture -qDEB_HOST_ARCH)
 
+ifneq (,$(wildcard /usr/include/icinga-boost))
+BOOST_FLAGS = \
+  -DBoost_NO_BOOST_CMAKE=TRUE \
+  -DBoost_NO_SYSTEM_PATHS=TRUE \
+  -DBOOST_LIBRARYDIR=/usr/lib/$(DEB_HOST_MULTIARCH)/icinga-boost \
+  -DBOOST_INCLUDEDIR=/usr/include/icinga-boost \
+	-DCMAKE_INSTALL_RPATH=/usr/lib/$(DEB_HOST_MULTIARCH)/icinga-boost
+endif
+
 # disable unity/lto builds for arches with low memory
 ifneq ($(findstring $(DEB_HOST_ARCH), armhf),)
 	UNITY_BUILD = -DICINGA2_UNITY_BUILD=Off
@@ -53,6 +62,7 @@ override_dh_auto_configure:
 		-DICINGA2_GIT_VERSION_INFO=false \
 		-DICINGA2_PLUGINDIR=/usr/lib/nagios/plugins \
 		-DUSE_SYSTEMD=ON \
+		$(BOOST_FLAGS) \
 		$(UNITY_BUILD) \
 		$(LTO_BUILD)
 

stretch/debian/changelog

+icinga2 (2.10.4-1) icinga-stretch; urgency=medium
+
+  * Release 2.10.4
+
+ -- Michael Friedrich <michael.friedrich@icinga.com>  Tue, 19 Mar 2019 11:38:21 +0000
+
+icinga2 (2.10.3-2) icinga-stretch; urgency=medium
+
+  * Update to 2.10.3-2
+
+ -- Michael Friedrich <michael.friedrich@icinga.com>  Tue, 26 Feb 2019 11:56:42 +0000
+
+icinga2 (2.10.3-1) icinga-stretch; urgency=medium
+
+  * Update to 2.10.3
+
+ -- Michael Friedrich <michael.friedrich@icinga.com>  Tue, 26 Feb 2019 08:36:13 +0000
+
 icinga2 (2.10.2-1) icinga-stretch; urgency=medium
 
   * Update to 2.10.2

stretch/debian/control

@@ -2,7 +2,8 @@ Source: icinga2
 Section: admin
 Priority: extra
 Maintainer: Icinga Development Team <info@icinga.com>
-Build-Depends: bash-completion,
+Build-Depends:
+  bash-completion,
   bison,
   cmake (>= 2.8.7),
   cmake (>= 3.2.2) | pkg-config,
@@ -11,12 +12,15 @@ Build-Depends: bash-completion,
   libsystemd-dev,
   flex,
   g++ (>= 1.96),
-               libboost-dev,
-               libboost-program-options-dev,
-               libboost-regex-dev,
-               libboost-system-dev,
-               libboost-test-dev,
-               libboost-thread-dev,
+  libboost-dev (>= 1.66) | libboost1.67-dev | libboost1.67-icinga-dev,
+  libboost-context-dev (>= 1.66) | libboost-context1.67-dev | libboost-context1.67-icinga-dev,
+  libboost-coroutine-dev (>= 1.66) | libboost-coroutine1.67-dev | libboost-coroutine1.67-icinga-dev,
+  libboost-filesystem-dev (>= 1.66) | libboost-filesystem1.67-dev | libboost-filesystem1.67-icinga-dev,
+  libboost-program-options-dev (>= 1.66) | libboost-program-options1.67-dev | libboost-program-options1.67-icinga-dev,
+  libboost-regex-dev (>= 1.66) | libboost-regex1.67-dev | libboost-regex1.67-icinga-dev,
+  libboost-system-dev (>= 1.66) | libboost-system1.67-dev | libboost-system1.67-icinga-dev,
+  libboost-test-dev (>= 1.66) | libboost-test1.67-dev | libboost-test1.67-icinga-dev,
+  libboost-thread-dev (>= 1.66) | libboost-thread1.67-dev | libboost-thread1.67-icinga-dev,
   default-libmysqlclient-dev | libmysqlclient-dev,
   libpq-dev,
   libssl-dev,

stretch/debian/icinga2-common.postinst

@@ -4,6 +4,11 @@
 set -e
 
 setperm() {
+    ownopt=
+    if [ "$1" = -R ]; then
+        ownopt="-R"
+        shift
+    fi
     user="$1"
     group="$2"
     mode="$3"
@@ -11,7 +16,7 @@ setperm() {
     shift 4
     # only do something when no setting exists
     if ! dpkg-statoverride --list "$file" >/dev/null 2>&1; then
-      chown "$user":"$group" "$file"
+      chown $ownopt "$user":"$group" "$file"
       chmod "$mode" "$file"
     fi
 }
@@ -27,6 +32,9 @@ is_fresh_install()
 dpkg-maintscript-helper rm_conffile \
    "/etc/bash_completion.d/icinga2" "2.4.1-2~" -- "$@"
 
+dpkg-maintscript-helper rm_conffile \
+   "/etc/icinga2/init.conf" "2.10.0~" -- "$@"
+
 case "$1" in
     configure)
         if ! getent passwd nagios > /dev/null ; then
@@ -37,8 +45,17 @@ case "$1" in
 
         # explicitly set permissions on some files that are dependent
         # on the uid/gid of the nagios user, which is dynamically created.
+        if ! dpkg-statoverride --list /etc/icinga2; then
             setperm nagios nagios 0750 /etc/icinga2
-        setperm nagios nagios 0700 /etc/icinga2/pki
+            setperm nagios nagios 0640 /etc/icinga2/icinga2.conf
+            setperm nagios nagios 0640 /etc/icinga2/constants.conf
+            setperm nagios nagios 0640 /etc/icinga2/zones.conf
+            setperm -R nagios nagios 0700 /etc/icinga2/pki
+            setperm -R nagios nagios 0750 /etc/icinga2/conf.d
+            setperm -R nagios nagios 0750 /etc/icinga2/features-enabled
+            setperm -R nagios nagios 0750 /etc/icinga2/features-available
+            setperm nagios nagios 0750 /etc/icinga2/zones.d
+        fi
 
         setperm nagios adm 2751 /var/log/icinga2
         setperm nagios adm 2751 /var/log/icinga2/compat

stretch/debian/patches/series

 21_config_changes
+

stretch/debian/rules

@@ -4,13 +4,28 @@
 
 DEB_HOST_ARCH = $(shell dpkg-architecture -qDEB_HOST_ARCH)
 
-MEM_TOTAL = $(shell grep MemTotal /proc/meminfo | awk '{ print $$2 }')
-MEM_REQUIRED_UNITY = 2097152 # 2gB
-MEM_ENOUGH = $(shell [ $(MEM_TOTAL) -gt $(MEM_REQUIRED_UNITY) ] && echo TRUE || echo FALSE)
+ifneq (,$(wildcard /usr/include/icinga-boost))
+BOOST_FLAGS = \
+  -DBoost_NO_BOOST_CMAKE=TRUE \
+  -DBoost_NO_SYSTEM_PATHS=TRUE \
+  -DBOOST_LIBRARYDIR=/usr/lib/$(DEB_HOST_MULTIARCH)/icinga-boost \
+  -DBOOST_INCLUDEDIR=/usr/include/icinga-boost \
+	-DCMAKE_INSTALL_RPATH=/usr/lib/$(DEB_HOST_MULTIARCH)/icinga-boost
+endif
+
+# disable unity/lto builds for arches with low memory
+ifneq ($(findstring $(DEB_HOST_ARCH), armhf),)
+	UNITY_BUILD = -DICINGA2_UNITY_BUILD=Off
+	LTO_BUILD = -DICINGA2_LTO_BUILD=Off
+endif
 
 UNITY_BUILD = -DICINGA2_UNITY_BUILD=On
 LTO_BUILD = -DICINGA2_LTO_BUILD=On
 
+MEM_TOTAL = $(shell grep MemTotal /proc/meminfo | awk '{ print $$2 }')
+MEM_REQUIRED_UNITY = 2097152 # 2gB
+MEM_ENOUGH = $(shell [ $(MEM_TOTAL) -gt $(MEM_REQUIRED_UNITY) ] && echo TRUE || echo FALSE)
+
 # disable unity/lto builds for arches with low memory
 ifneq ($(findstring mips,$(DEB_HOST_ARCH))$(findstring armhf,$(DEB_HOST_ARCH)),)
 ifneq ($(MEM_ENOUGH),TRUE)
@@ -49,6 +64,7 @@ override_dh_auto_configure:
 		-DICINGA2_GIT_VERSION_INFO=false \
 		-DICINGA2_PLUGINDIR=/usr/lib/nagios/plugins \
 		-DUSE_SYSTEMD=ON \
+		$(BOOST_FLAGS) \
 		$(UNITY_BUILD) \
 		$(LTO_BUILD)
 

testing/start_test.sh

@@ -11,13 +11,16 @@ if [ -d archive ]; then
     sudo apt-get update
 fi
 
-sudo bash -xe <<ROOT
+sudo bash -xe <<ROOTSHELL
     export DEBIAN_FRONTEND=noninteractive
 
+    if ! apt-get install -y default-mysql-server; then
+        # Fallback to non-metapackage on older distributions
         apt-get install -y mysql-server
+    fi
 
-    apt-get install -y icinga2 icinga2-ido-mysql
+    apt-get install --allow-unauthenticated -y icinga2 icinga2-ido-mysql
 
     icinga2 feature list
     icinga2 daemon -C
-ROOT
+ROOTSHELL

trusty/debian/changelog

+icinga2 (2.10.4-1) icinga-trusty; urgency=medium
+
+  * Release 2.10.4
+
+ -- Michael Friedrich <michael.friedrich@icinga.com>  Tue, 19 Mar 2019 11:38:21 +0000
+
+icinga2 (2.10.3-2) icinga-trusty; urgency=medium
+
+  * Update to 2.10.3-2
+
+ -- Michael Friedrich <michael.friedrich@icinga.com>  Tue, 26 Feb 2019 11:56:42 +0000
+
+icinga2 (2.10.3-1) icinga-trusty; urgency=medium
+
+  * Update to 2.10.3
+
+ -- Michael Friedrich <michael.friedrich@icinga.com>  Tue, 26 Feb 2019 08:36:14 +0000
+
 icinga2 (2.10.2-1) icinga-trusty; urgency=medium
 
   * Update to 2.10.2

trusty/debian/control

@@ -6,19 +6,23 @@ Maintainer: Icinga Development Team <info@icinga.com>
 #Uploaders: Markus Frosch <lazyfrosch@debian.org>,
 #           Jan Wagner <waja@cyconet.org>,
 #           Alexander Wirt <formorer@debian.org>
-Build-Depends: bash-completion,
+Build-Depends:
+  bash-completion,
   bison,
   cmake (>= 2.8.7),
   cmake (>= 3.2.2) | pkg-config,
   debhelper (>= 9),
   flex,
   g++ (>= 1.96),
-               libboost-dev,
-               libboost-program-options-dev,
-               libboost-regex-dev,
-               libboost-system-dev,
-               libboost-test-dev,
-               libboost-thread-dev,
+  libboost-dev (>= 1.66) | libboost1.67-dev | libboost1.67-icinga-dev,
+  libboost-context-dev (>= 1.66) | libboost-context1.67-dev | libboost-context1.67-icinga-dev,
+  libboost-coroutine-dev (>= 1.66) | libboost-coroutine1.67-dev | libboost-coroutine1.67-icinga-dev,
+  libboost-filesystem-dev (>= 1.66) | libboost-filesystem1.67-dev | libboost-filesystem1.67-icinga-dev,
+  libboost-program-options-dev (>= 1.66) | libboost-program-options1.67-dev | libboost-program-options1.67-icinga-dev,
+  libboost-regex-dev (>= 1.66) | libboost-regex1.67-dev | libboost-regex1.67-icinga-dev,
+  libboost-system-dev (>= 1.66) | libboost-system1.67-dev | libboost-system1.67-icinga-dev,
+  libboost-test-dev (>= 1.66) | libboost-test1.67-dev | libboost-test1.67-icinga-dev,
+  libboost-thread-dev (>= 1.66) | libboost-thread1.67-dev | libboost-thread1.67-icinga-dev,
   default-libmysqlclient-dev | libmysqlclient-dev,
   libpq-dev,
   libssl-dev,

trusty/debian/icinga2-common.postinst

@@ -4,6 +4,11 @@
 set -e
 
 setperm() {
+    ownopt=
+    if [ "$1" = -R ]; then
+        ownopt="-R"
+        shift
+    fi
     user="$1"
     group="$2"
     mode="$3"
@@ -11,7 +16,7 @@ setperm() {
     shift 4
     # only do something when no setting exists
     if ! dpkg-statoverride --list "$file" >/dev/null 2>&1; then
-      chown "$user":"$group" "$file"
+      chown $ownopt "$user":"$group" "$file"
       chmod "$mode" "$file"
     fi
 }
@@ -27,6 +32,9 @@ is_fresh_install()
 dpkg-maintscript-helper rm_conffile \
    "/etc/bash_completion.d/icinga2" "2.4.1-2~" -- "$@"
 
+dpkg-maintscript-helper rm_conffile \
+   "/etc/icinga2/init.conf" "2.10.0~" -- "$@"
+
 case "$1" in
     configure)
         if ! getent passwd nagios > /dev/null ; then
@@ -37,8 +45,17 @@ case "$1" in
 
         # explicitly set permissions on some files that are dependent
         # on the uid/gid of the nagios user, which is dynamically created.
+        if ! dpkg-statoverride --list /etc/icinga2; then
             setperm nagios nagios 0750 /etc/icinga2
-        setperm nagios nagios 0700 /etc/icinga2/pki
+            setperm nagios nagios 0640 /etc/icinga2/icinga2.conf
+            setperm nagios nagios 0640 /etc/icinga2/constants.conf
+            setperm nagios nagios 0640 /etc/icinga2/zones.conf
+            setperm -R nagios nagios 0700 /etc/icinga2/pki
+            setperm -R nagios nagios 0750 /etc/icinga2/conf.d
+            setperm -R nagios nagios 0750 /etc/icinga2/features-enabled
+            setperm -R nagios nagios 0750 /etc/icinga2/features-available
+            setperm nagios nagios 0750 /etc/icinga2/zones.d
+        fi
 
         setperm nagios adm 2751 /var/log/icinga2
         setperm nagios adm 2751 /var/log/icinga2/compat

trusty/debian/patches/series

 21_config_changes
+

trusty/debian/rules

@@ -6,6 +6,15 @@ LTO_BUILD = -DICINGA2_LTO_BUILD=On
 
 DEB_HOST_ARCH = $(shell dpkg-architecture -qDEB_HOST_ARCH)
 
+ifneq (,$(wildcard /usr/include/icinga-boost))
+BOOST_FLAGS = \
+  -DBoost_NO_BOOST_CMAKE=TRUE \
+  -DBoost_NO_SYSTEM_PATHS=TRUE \
+  -DBOOST_LIBRARYDIR=/usr/lib/$(DEB_HOST_MULTIARCH)/icinga-boost \
+  -DBOOST_INCLUDEDIR=/usr/include/icinga-boost \
+	-DCMAKE_INSTALL_RPATH=/usr/lib/$(DEB_HOST_MULTIARCH)/icinga-boost
+endif
+
 # disable unity/lto builds for arches with low memory
 ifneq ($(findstring $(DEB_HOST_ARCH), armhf),)
 	UNITY_BUILD = -DICINGA2_UNITY_BUILD=Off
@@ -49,6 +58,7 @@ override_dh_auto_configure:
 		-DICINGA2_COMMAND_GROUP=www-data \
 		-DICINGA2_GIT_VERSION_INFO=false \
 		-DICINGA2_PLUGINDIR=/usr/lib/nagios/plugins \
+		$(BOOST_FLAGS) \
 		$(UNITY_BUILD) \
 		$(LTO_BUILD)
 

wheezy/debian/changelog

+icinga2 (2.10.4-1) icinga-wheezy; urgency=medium
+
+  * Release 2.10.4
+
+ -- Michael Friedrich <michael.friedrich@icinga.com>  Tue, 19 Mar 2019 11:38:20 +0000
+
+icinga2 (2.10.3-2) icinga-wheezy; urgency=medium
+
+  * Update to 2.10.3-2
+
+ -- Michael Friedrich <michael.friedrich@icinga.com>  Tue, 26 Feb 2019 11:56:42 +0000
+
+icinga2 (2.10.3-1) icinga-wheezy; urgency=medium
+
+  * Update to 2.10.3
+
+ -- Michael Friedrich <michael.friedrich@icinga.com>  Tue, 26 Feb 2019 08:36:13 +0000
+
 icinga2 (2.10.2-1) icinga-wheezy; urgency=medium
 
   * Update to 2.10.2

wheezy/debian/patches/series

 21_config_changes
+