diff options
Diffstat (limited to 'recipes-extended/nagios')
8 files changed, 15 insertions, 9 deletions
diff --git a/recipes-extended/nagios/nagios-core/eventhandlers_nagioscmd_path.patch b/recipes-extended/nagios/nagios-core/eventhandlers_nagioscmd_path.patch index c767162c..5c1f3303 100644 --- a/recipes-extended/nagios/nagios-core/eventhandlers_nagioscmd_path.patch +++ b/recipes-extended/nagios/nagios-core/eventhandlers_nagioscmd_path.patch @@ -3,6 +3,8 @@ change eventhandlers nagioscmd path Modify nagios.cmd path to the right location at "/var/nagios/rw/nagios.cmd" +Upstream-Status: Inappropriate [embedded specific] + Signed-off-by: Rickard Engberg <rickard.engberg@windriver.com> Signed-off-by: Vu Tran <vu.tran@windriver.com> diff --git a/recipes-extended/nagios/nagios-core_4.4.6.bb b/recipes-extended/nagios/nagios-core_4.4.6.bb index 01c8c0cc..59b70895 100644 --- a/recipes-extended/nagios/nagios-core_4.4.6.bb +++ b/recipes-extended/nagios/nagios-core_4.4.6.bb @@ -4,7 +4,7 @@ DESCRIPTION = "A host/service/network monitoring and management system core file HOMEPAGE = "http://www.nagios.org" SECTION = "console/network" PRIORITY = "optional" -LICENSE = "GPLv2" +LICENSE = "GPL-2.0-only" LIC_FILES_CHKSUM = "file://LICENSE;md5=4c4203caac58013115c9ca4b85f296ae" @@ -38,7 +38,7 @@ RDEPENDS:${PN} += "\ nagios-base \ " -PNBLACKLIST[nagios-core] ?= "${@bb.utils.contains('BBFILE_COLLECTIONS', 'webserver', '', 'Depends on apache2 from meta-webserver which is not included', d)}" +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" diff --git a/recipes-extended/nagios/nagios-nrpe/0001-Should-fix-235-nasty_metachars-was-not-being-returne.patch b/recipes-extended/nagios/nagios-nrpe/0001-Should-fix-235-nasty_metachars-was-not-being-returne.patch index 7a12e730..fb34c5c7 100644 --- a/recipes-extended/nagios/nagios-nrpe/0001-Should-fix-235-nasty_metachars-was-not-being-returne.patch +++ b/recipes-extended/nagios/nagios-nrpe/0001-Should-fix-235-nasty_metachars-was-not-being-returne.patch @@ -5,7 +5,7 @@ Subject: [PATCH] Should fix #235 (nasty_metachars was not being returned when specified in cfg file CVE: CVE-2020-6581 -Upstream Status: Backport [4f7dd1199f1f3f72f9197e8565da339a4a2490b7] +Upstream-Status: Backport [4f7dd1199f1f3f72f9197e8565da339a4a2490b7] Signed-off-by: Sakib Sajal <sakib.sajal@windriver.com> --- diff --git a/recipes-extended/nagios/nagios-nrpe/fix-compile-without-openssl.patch b/recipes-extended/nagios/nagios-nrpe/fix-compile-without-openssl.patch index ab913a8f..1e57d02a 100644 --- a/recipes-extended/nagios/nagios-nrpe/fix-compile-without-openssl.patch +++ b/recipes-extended/nagios/nagios-nrpe/fix-compile-without-openssl.patch @@ -6,6 +6,8 @@ this error: error: unknown type name 'SSL' void complete_SSL_shutdown( SSL *); +Upstream-Status: Inappropriate [embedded specific] + Signed-off-by: Rickard Engberg <rickard.engberg@windriver.com> Signed-off-by: Vu Tran <vu.tran@windriver.com> diff --git a/recipes-extended/nagios/nagios-nrpe/fix-configure-uses-host-openssl.patch b/recipes-extended/nagios/nagios-nrpe/fix-configure-uses-host-openssl.patch index 920aabfc..9342826b 100644 --- a/recipes-extended/nagios/nagios-nrpe/fix-configure-uses-host-openssl.patch +++ b/recipes-extended/nagios/nagios-nrpe/fix-configure-uses-host-openssl.patch @@ -6,6 +6,8 @@ openssl dhparam -C 512 just do not use openssl from host. +Upstream-Status: Inappropriate [embedded specific] + Signed-off-by: Rickard Engberg <rickard.engberg@windriver.com> Signed-off-by: Vu Tran <vu.tran@windriver.com> diff --git a/recipes-extended/nagios/nagios-nrpe_4.0.2.bb b/recipes-extended/nagios/nagios-nrpe_4.0.2.bb index 71604534..ac54469b 100644 --- a/recipes-extended/nagios/nagios-nrpe_4.0.2.bb +++ b/recipes-extended/nagios/nagios-nrpe_4.0.2.bb @@ -4,7 +4,7 @@ DESCRIPTION = "Nagios Remote Plugin Executor" HOMEPAGE = "http://www.nagios.com" SECTION = "console/network" PRIORITY = "optional" -LICENSE = "GPLv2" +LICENSE = "GPL-2.0-only" LIC_FILES_CHKSUM = "file://src/nrpe.c;beginline=1;endline=35;md5=0dadd78599abbc737af81432702e9161" @@ -26,7 +26,7 @@ S = "${WORKDIR}/${SRCNAME}-${PV}" inherit autotools-brokensep update-rc.d systemd update-alternatives -PNBLACKLIST[nagios-nrpe] ?= "${@bb.utils.contains('BBFILE_COLLECTIONS', 'webserver', '', 'Depends on nagios-core which depends on apache2 from meta-webserver which is not included', d)}" +SKIP_RECIPE[nagios-nrpe] ?= "${@bb.utils.contains('BBFILE_COLLECTIONS', 'webserver', '', 'Depends on nagios-core which depends on apache2 from meta-webserver which is not included', d)}" # IP address of server which proxy should connect to MONITORING_PROXY_SERVER_IP ??= "192.168.7.2" diff --git a/recipes-extended/nagios/nagios-nsca_2.9.2.bb b/recipes-extended/nagios/nagios-nsca_2.9.2.bb index 74e5b5b2..2db51238 100644 --- a/recipes-extended/nagios/nagios-nsca_2.9.2.bb +++ b/recipes-extended/nagios/nagios-nsca_2.9.2.bb @@ -4,7 +4,7 @@ DESCRIPTION = "Nagios Service Check Acceptor" HOMEPAGE = "http://exchange.nagios.org" SECTION = "console/network" PRIORITY = "optional" -LICENSE = "GPLv2" +LICENSE = "GPL-2.0-only" LIC_FILES_CHKSUM = "file://src/nsca.c;beginline=1;endline=16;md5=dd7a195cc7d8a3ebcfabd65360d0cab4" @@ -22,7 +22,7 @@ S = "${WORKDIR}/${SRCNAME}-${PV}" inherit update-rc.d autotools-brokensep systemd dos2unix -PNBLACKLIST[nagios-nsca] ?= "${@bb.utils.contains('BBFILE_COLLECTIONS', 'webserver', '', 'Rdepends on nagios-base provided by nagios-core which depends on apache2 from meta-webserver which is not included', d)}" +SKIP_RECIPE[nagios-nsca] ?= "${@bb.utils.contains('BBFILE_COLLECTIONS', 'webserver', '', 'Rdepends on nagios-base provided by nagios-core which depends on apache2 from meta-webserver which is not included', d)}" DEPENDS = "libmcrypt" diff --git a/recipes-extended/nagios/nagios-plugins_2.2.1.bb b/recipes-extended/nagios/nagios-plugins_2.2.1.bb index f61262ee..471d4b42 100644 --- a/recipes-extended/nagios/nagios-plugins_2.2.1.bb +++ b/recipes-extended/nagios/nagios-plugins_2.2.1.bb @@ -4,7 +4,7 @@ DESCRIPTION = "A host/service/network monitoring and management system plugins" HOMEPAGE = "http://www.nagios-plugins.org" SECTION = "console/network" PRIORITY = "optional" -LICENSE = "GPLv3" +LICENSE = "GPL-3.0-only" LIC_FILES_CHKSUM = "file://COPYING;md5=d32239bcb673463ab874e80d47fae504" @@ -18,7 +18,7 @@ S = "${WORKDIR}/${BPN}-${PV}" inherit autotools gettext -PNBLACKLIST[nagios-plugins] ?= "${@bb.utils.contains('BBFILE_COLLECTIONS', 'webserver', '', 'Depends on nagios-core which depends on apache2 from meta-webserver which is not included', d)}" +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)}" EXTRA_OECONF += "--with-sysroot=${STAGING_DIR_HOST} \ --with-nagios-user=${NAGIOS_USER} \ |