5 files changed, 38 insertions, 88 deletions

diff --git a/recipes-extended/nagios/nagios-core/0001-fix-autoheader-error.patch b/recipes-extended/nagios/nagios-core/0001-fix-autoheader-error.patch
deleted file mode 100644
index 014ed1d8..00000000
--- a/recipes-extended/nagios/nagios-core/0001-fix-autoheader-error.patch
+++ /dev/null
@@ -1,63 +0,0 @@
-From 3c51d942f6da08045351ce61cc7f426fa0855489 Mon Sep 17 00:00:00 2001
-From: Chen Qi <Qi.Chen@windriver.com>
-Date: Fri, 31 Aug 2018 10:51:36 +0800
-Subject: [PATCH] fix autoheader error
-
-Upstream-Status: Pending
-
-Signed-off-by: Chen Qi <Qi.Chen@windriver.com>
----
- configure.ac | 12 ++++++------
- 1 file changed, 6 insertions(+), 6 deletions(-)
-
-diff --git a/configure.ac b/configure.ac
-index 17e436d..16b3e71 100644
---- a/configure.ac
-+++ b/configure.ac
-@@ -388,7 +388,7 @@ AC_ARG_WITH(iobroker,
- case $IOBROKER_METHOD in
- epoll*)
-        if test "$GLIBC_NEWER_2_4" -eq 1 -a "x$ac_cv_header_sys_epoll_h" = "xyes"; then
--               AC_DEFINE([IOBROKER_USES_EPOLL])
-+               AC_DEFINE([IOBROKER_USES_EPOLL], [1], [iobroker uses epoll])
-        else
-                echo "\"epoll\" is not available as an iobroker method."
-                echo "Please use one of the other options."
-@@ -397,7 +397,7 @@ epoll*)
-        ;;
- poll*)
-        if test "x$ac_cv_header_sys_poll_h" = "xyes" -o "x$ac_cv_header_poll_h" = "xyes"; then
--               AC_DEFINE([IOBROKER_USES_POLL])
-+               AC_DEFINE([IOBROKER_USES_POLL], [1], [iobroker uses poll])
-        else
-                echo "\"poll\" is not available as an iobroker method."
-                echo "Please use one of the other options."
-@@ -406,7 +406,7 @@ poll*)
-        ;;
- select*)
-        if test "x$ac_cv_header_sys_select_h" = "xyes"; then
--               AC_DEFINE([IOBROKER_USES_SELECT])
-+               AC_DEFINE([IOBROKER_USES_SELECT], [1], [iobroker uses select])
-        else
-                echo "\"select\" is not available as an iobroker method."
-                echo "Please use one of the other options."
-@@ -415,13 +415,13 @@ select*)
-        ;;
- none*)
-        if test "$GLIBC_NEWER_2_4" -eq 1 -a "x$ac_cv_header_sys_epoll_h" = "xyes"; then
--               AC_DEFINE([IOBROKER_USES_EPOLL])
-+               AC_DEFINE([IOBROKER_USES_EPOLL], [1], [iobroker uses epoll])
-                IOBROKER_METHOD="epoll"
-        elif test "x$ac_cv_header_sys_poll_h" = "xyes" -o "x$ac_cv_header_poll_h" = "xyes"; then
--               AC_DEFINE([IOBROKER_USES_POLL])
-+               AC_DEFINE([IOBROKER_USES_POLL], [1], [iobroker uses poll])
-                IOBROKER_METHOD="poll"
-        elif test "x$ac_cv_header_sys_select_h" = "xyes"; then
--               AC_DEFINE([IOBROKER_USES_SELECT])
-+               AC_DEFINE([IOBROKER_USES_SELECT], [1], [iobroker uses select])
-                IOBROKER_METHOD="select"
-        else
-                echo "There are no available options for iobroker polling"
--- 
-2.7.4
-
diff --git a/recipes-extended/nagios/nagios-core_4.4.6.bb b/recipes-extended/nagios/nagios-core_git.bb
index 59b70895..5ffb4e17 100644
--- a/recipes-extended/nagios/nagios-core_4.4.6.bb
+++ b/recipes-extended/nagios/nagios-core_git.bb
@@ -10,9 +10,10 @@ LIC_FILES_CHKSUM = "file://LICENSE;md5=4c4203caac58013115c9ca4b85f296ae"
 
 SRCNAME = "nagios"
 
-SRC_URI = "http://prdownloads.sourceforge.net/sourceforge/${SRCNAME}/${SRCNAME}-${PV}.tar.gz \
+SRCREV = "2706fa7a451afe48bd4dc240d72d23fdcec0d9ef"
+
+SRC_URI = "git://github.com/NagiosEnterprises/nagioscore.git;protocol=https;branch=master \
            file://eventhandlers_nagioscmd_path.patch \
-           file://0001-fix-autoheader-error.patch \
            file://0001-fix-compile-error-of-missing-headers.patch \
            file://0001-fix-segment-fault.patch \
            file://volatiles \
@@ -20,14 +21,13 @@ SRC_URI = "http://prdownloads.sourceforge.net/sourceforge/${SRCNAME}/${SRCNAME}-
            file://nagios-core-systemd-volatile.conf \
            "
 
-SRC_URI[md5sum] = "ba849e9487e13859381eb117127bfee2"
-SRC_URI[sha256sum] = "ab0d5a52caf01e6f4dcd84252c4eb5df5a24f90bb7f951f03875eef54f5ab0f4"
+PV = "4.5.9+git"
 
-S = "${WORKDIR}/${SRCNAME}-${PV}"
+S = "${WORKDIR}/git"
 
-inherit autotools-brokensep update-rc.d systemd update-alternatives
+inherit autotools-brokensep update-rc.d systemd update-alternatives pkgconfig
 
-DEPENDS = "gd unzip-native"
+DEPENDS = "gd unzip-native openssl"
 
 RDEPENDS:${PN} += "\
     gd \
@@ -41,6 +41,7 @@ RDEPENDS:${PN} += "\
 SKIP_RECIPE[nagios-core] ?= "${@bb.utils.contains('BBFILE_COLLECTIONS', 'webserver', '', 'Depends on apache2 from meta-webserver which is not included', d)}"
 
 acpaths = "-I ${S}/autoconf-macros"
+EXTRA_AUTORECONF += "-I ${S}/m4 -I ${S}/autoconf-macros"
 
 # Set default password for the hardcoded Nagios admin user "nagiosadmin".
 # If this variable is empty then will prompt user for password.
@@ -52,7 +53,9 @@ EXTRA_OECONF += "--sbindir=${NAGIOS_CGIBIN_DIR} \
                  --with-command-group=nagcmd \
                  --with-httpd-conf=${sysconfdir}/apache2/conf.d \
                  --with-lockfile=${localstatedir}/run/nagios/nagios.pid \
-                 --with-init-dir=${sysconfdir}/init.d \
+                 --with-initdir=${sysconfdir}/init.d \
+                 --with-init-type=${@bb.utils.contains('DISTRO_FEATURES', 'systemd', 'systemd', 'sysv', d)} \
+                 --with-inetd-type=${@bb.utils.contains('DISTRO_FEATURES', 'systemd', 'systemd', 'inetd', d)} \
 "
 
 # Prevent nagios from stripping binaries, bitbake will take care of that
@@ -106,14 +109,17 @@ do_install() {
 
     if ${@bb.utils.contains('DISTRO_FEATURES', 'systemd', 'true', 'false', d)}; then
         install -d ${D}${systemd_unitdir}/system
-        install -m 644 ${WORKDIR}/nagios-core.service ${D}${systemd_unitdir}/system/
+        install -m 644 ${UNPACKDIR}/nagios-core.service ${D}${systemd_unitdir}/system/
         # use our own service file
-        rm -f ${D}${systemd_unitdir}/system/nagios.service
+        nagios_default_service=$(find ${D} -name 'nagios.service')
+        if [ -n "$nagios_default_service" ]; then
+            rm -f $nagios_default_service
+        fi
         install -d ${D}${sysconfdir}/tmpfiles.d
-        install -m 755 ${WORKDIR}/nagios-core-systemd-volatile.conf ${D}${sysconfdir}/tmpfiles.d/nagios-core-volatile.conf
+        install -m 755 ${UNPACKDIR}/nagios-core-systemd-volatile.conf ${D}${sysconfdir}/tmpfiles.d/nagios-core-volatile.conf
     else
         install -d ${D}${sysconfdir}/default/volatiles
-        install -m 0644 ${WORKDIR}/volatiles ${D}${sysconfdir}/default/volatiles/99_nagios
+        install -m 0644 ${UNPACKDIR}/volatiles ${D}${sysconfdir}/default/volatiles/99_nagios
     fi
 }
 
diff --git a/recipes-extended/nagios/nagios-nrpe_4.0.2.bb b/recipes-extended/nagios/nagios-nrpe_4.0.2.bb
index ac54469b..503ef547 100644
--- a/recipes-extended/nagios/nagios-nrpe_4.0.2.bb
+++ b/recipes-extended/nagios/nagios-nrpe_4.0.2.bb
@@ -73,11 +73,11 @@ do_install:append() {
         -i ${D}${NAGIOS_CONF_DIR}/nrpe.cfg
 
     install -d ${D}${NAGIOS_PLUGIN_CONF_DIR}
-    install -m 664 ${WORKDIR}/check_nrpe.cfg ${D}${NAGIOS_PLUGIN_CONF_DIR}
+    install -m 664 ${UNPACKDIR}/check_nrpe.cfg ${D}${NAGIOS_PLUGIN_CONF_DIR}
 
     if ${@bb.utils.contains('DISTRO_FEATURES', 'systemd', 'true', 'false', d)}; then
         install -d ${D}${systemd_unitdir}/system
-        install -m 644 ${WORKDIR}/nagios-nrpe.service ${D}${systemd_unitdir}/system/
+        install -m 644 ${UNPACKDIR}/nagios-nrpe.service ${D}${systemd_unitdir}/system/
     fi
 }
 
diff --git a/recipes-extended/nagios/nagios-nsca_2.9.2.bb b/recipes-extended/nagios/nagios-nsca_2.9.2.bb
index 2db51238..a400b68f 100644
--- a/recipes-extended/nagios/nagios-nsca_2.9.2.bb
+++ b/recipes-extended/nagios/nagios-nsca_2.9.2.bb
@@ -35,7 +35,7 @@ EXTRA_OECONF += "--with-nsca-user=${NAGIOS_USER} \
 "
 
 do_configure() {
-    cp ${WORKDIR}/init-script.in ${S}/init-script.in
+    cp ${UNPACKDIR}/init-script.in ${S}/init-script.in
     oe_runconf || die "make failed"
 }
 
@@ -55,7 +55,7 @@ do_install() {
 
     if ${@bb.utils.contains('DISTRO_FEATURES', 'systemd', 'true', 'false', d)}; then
         install -d ${D}${systemd_unitdir}/system
-        install -m 644 ${WORKDIR}/nagios-nsca.service ${D}${systemd_unitdir}/system/
+        install -m 644 ${UNPACKDIR}/nagios-nsca.service ${D}${systemd_unitdir}/system/
     fi
 }
 
diff --git a/recipes-extended/nagios/nagios-plugins_2.2.1.bb b/recipes-extended/nagios/nagios-plugins_git.bb
index 471d4b42..82263def 100644
--- a/recipes-extended/nagios/nagios-plugins_2.2.1.bb
+++ b/recipes-extended/nagios/nagios-plugins_git.bb
@@ -8,15 +8,13 @@ LICENSE = "GPL-3.0-only"
 
 LIC_FILES_CHKSUM = "file://COPYING;md5=d32239bcb673463ab874e80d47fae504"
 
-SRC_URI = "https://www.nagios-plugins.org/download/${BPN}-${PV}.tar.gz \
-"
-
-SRC_URI[md5sum] = "fb521d5c05897f165b0b1862c1e5cb27"
-SRC_URI[sha256sum] = "647c0ba4583d891c965fc29b77c4ccfeccc21f409fdf259cb8af52cb39c21e18"
+SRCREV = "7c74420158c3e228b3d66d4c781a6abc7a93075a"
+SRC_URI = "git://github.com/nagios-plugins/nagios-plugins.git;protocol=https;branch=master"
 
-S = "${WORKDIR}/${BPN}-${PV}"
+PV = "2.4.12+git"
+S = "${WORKDIR}/git"
 
-inherit autotools gettext
+inherit autotools gettext pkgconfig autotools-brokensep
 
 SKIP_RECIPE[nagios-plugins] ?= "${@bb.utils.contains('BBFILE_COLLECTIONS', 'webserver', '', 'Depends on nagios-core which depends on apache2 from meta-webserver which is not included', d)}"
 
@@ -25,6 +23,12 @@ EXTRA_OECONF += "--with-sysroot=${STAGING_DIR_HOST} \
                  --with-nagios-group=${NAGIOS_GROUP} \
                  --without-apt-get-command \
                  --with-trusted-path=/bin:/sbin:/usr/bin:/usr/sbin \
+                 --with-sudo-command=${bindir}/sudo \
+                 --with-ssh-command=${bindir}/ssh \
+                 --with-ps-command=${bindir}/ps \
+                 --with-ps-format='%*s %s %d %d %d %*s %*s %*s %*s %*s %*s %*s %*s %n%s' \
+                 --with-ps-varlist='procstat,&procuid,&procpid,&procppid,&pos,procprog' \
+                 --with-ps-cols=6 \
                  ac_cv_path_PERL=${bindir}/perl \
 "
 
@@ -55,8 +59,11 @@ PACKAGECONFIG[snmp] = "\
 
 PACKAGECONFIG ??= "ssl gnutls"
 
-do_configure() {
-    oe_runconf || die "make failed"
+do_configure:prepend() {
+    # rename these macros to have .m4 suffix so that autoreconf could recognize them
+    for macro in `ls ${S}/autoconf-macros/ax_nagios_get_*`; do
+        mv $macro $macro.m4
+    done
 }
 
 do_install:append() {