basesystem-jjsandbox/ToshikazuOhiwa/master-jj

recipes

5 files changed, 56 insertions, 67 deletions

diff --git a/external/meta-virtualization/recipes-extended/nagios/nagios-core_4.4.2.bb b/external/meta-virtualization/recipes-extended/nagios/nagios-core_4.4.3.bb
index b2196eb3..7a86653b 100644
--- a/external/meta-virtualization/recipes-extended/nagios/nagios-core_4.4.2.bb
+++ b/external/meta-virtualization/recipes-extended/nagios/nagios-core_4.4.3.bb
@@ -20,12 +20,12 @@ SRC_URI = "http://prdownloads.sourceforge.net/sourceforge/${SRCNAME}/${SRCNAME}-
            file://nagios-core-systemd-volatile.conf \
            "
 
-SRC_URI[md5sum] = "7a9736281d4e2ebe4f4569a782f733c5"
-SRC_URI[sha256sum] = "3418923f326aa86dc8c84cfd0df788fa495a90d772f8071acf40fdbef0736853"
+SRC_URI[md5sum] = "8beb253b1236ee1407f698b5d2a2d894"
+SRC_URI[sha256sum] = "bba8f0e8dc8cf72f7a7ae4e8ce9c60f5bd315629421b9ec34818a28b8da49f67"
 
 S = "${WORKDIR}/${SRCNAME}-${PV}"
 
-inherit autotools-brokensep update-rc.d systemd
+inherit autotools-brokensep update-rc.d systemd update-alternatives
 
 DEPENDS = "gd unzip-native"
 
@@ -149,3 +149,9 @@ USERADD_PARAM_${SRCNAME}-base = "-r -M -g ${NAGIOS_GROUP} ${NAGIOS_USER}"
 
 INITSCRIPT_NAME = "nagios"
 INITSCRIPT_PARAMS = "defaults"
+
+CVE_PRODUCT = "nagios_core"
+
+ALTERNATIVE_PRIORITY_${PN} = '20'
+ALTERNATIVE_${PN} = "nagios"
+ALTERNATIVE_LINK_NAME[nagios] = "${localstatedir}/nagios"
diff --git a/external/meta-virtualization/recipes-extended/nagios/nagios-nrpe/0001-Should-fix-235-nasty_metachars-was-not-being-returne.patch b/external/meta-virtualization/recipes-extended/nagios/nagios-nrpe/0001-Should-fix-235-nasty_metachars-was-not-being-returne.patch
new file mode 100644
index 00000000..7a12e730
--- /dev/null
+++ b/external/meta-virtualization/recipes-extended/nagios/nagios-nrpe/0001-Should-fix-235-nasty_metachars-was-not-being-returne.patch
@@ -0,0 +1,30 @@
+From 4f7dd1199f1f3f72f9197e8565da339a4a2490b7 Mon Sep 17 00:00:00 2001
+From: madlohe <swolf@nagios.com>
+Date: Thu, 23 Apr 2020 15:33:18 -0500
+Subject: [PATCH] Should fix #235 (nasty_metachars was not being returned when
+ specified in cfg file
+
+CVE: CVE-2020-6581
+Upstream Status: Backport [4f7dd1199f1f3f72f9197e8565da339a4a2490b7]
+
+Signed-off-by: Sakib Sajal <sakib.sajal@windriver.com>
+---
+ src/nrpe.c | 2 ++
+ 1 file changed, 2 insertions(+)
+
+diff --git a/src/nrpe.c b/src/nrpe.c
+index 01fbd1d..bf64963 100644
+--- a/src/nrpe.c
++++ b/src/nrpe.c
+@@ -823,6 +823,8 @@ char* process_metachars(const char* input)
+ 		}
+ 	}
+ 	copy[j] = '\0';
++
++	return copy;
+ }
+ 
+ /* read in the configuration file */
+-- 
+2.20.1
+
diff --git a/external/meta-virtualization/recipes-extended/nagios/nagios-nrpe_3.2.1.bb b/external/meta-virtualization/recipes-extended/nagios/nagios-nrpe_4.0.2.bb
index 94933367..d9c7b159 100644
--- a/external/meta-virtualization/recipes-extended/nagios/nagios-nrpe_3.2.1.bb
+++ b/external/meta-virtualization/recipes-extended/nagios/nagios-nrpe_4.0.2.bb
@@ -1,7 +1,7 @@
 require nagios-common.inc
 
 DESCRIPTION = "Nagios Remote Plugin Executor"
-HOMEPAGE = "http://exchange.nagios.org"
+HOMEPAGE = "http://www.nagios.com"
 SECTION = "console/network"
 PRIORITY = "optional"
 LICENSE = "GPLv2"
@@ -13,14 +13,18 @@ SRCNAME = "nrpe"
 SRC_URI = "https://github.com/NagiosEnterprises/nrpe/releases/download/${SRCNAME}-${PV}/${SRCNAME}-${PV}.tar.gz \
            file://check_nrpe.cfg \
            file://nagios-nrpe.service \
+           file://0001-Should-fix-235-nasty_metachars-was-not-being-returne.patch \
 "
 
-SRC_URI[md5sum] = "8997e195fea93cdceb8c7ed8ac1d43bc"
-SRC_URI[sha256sum] = "8ad2d1846ab9011fdd2942b8fc0c99dfad9a97e57f4a3e6e394a4ead99c0f1f0"
+SRC_URI[md5sum] = "37b9e23b3e8d75308f8b31f3b61ee8a4"
+SRC_URI[sha256sum] = "c5d9d7023eaa49e6fe8cf95c6d101731f07972cf0f8818fa130c171bc9eabd55"
+SRC_URI[sha1sum] = "2150e274fc7f24905c63b8a996ed7218e2967478"
+SRC_URI[sha384sum] = "0ece79fb312c8d1ee0e6bde1be499f8090a5a86cf90b0b8dcbebb95c5f8f70b2cf9ac0a4064f726bee091c4147b61d82"
+SRC_URI[sha512sum] = "4d7cf6abc974bc79df54afc42644418e3f086a279c8c17d0fd104f19e3c21c0f3dae4fb4268dd134446ff9fe505159b0446372c5cac71cfe03a97479ed41c09b"
 
 S = "${WORKDIR}/${SRCNAME}-${PV}"
 
-inherit autotools-brokensep update-rc.d systemd
+inherit autotools-brokensep update-rc.d systemd update-alternatives
 
 # IP address of server which proxy should connect to
 MONITORING_PROXY_SERVER_IP ??= "192.168.7.2"
@@ -39,7 +43,7 @@ EXTRA_OECONF_SSL = "--with-ssl=${STAGING_DIR_HOST} \
                     --with-ssl-lib=${STAGING_DIR_HOST}${libdir} \
 "
 
-PACKAGECONFIG[ssl] = "${EXTRA_OECONF_SSL},--disable-ssl,openssl,"
+PACKAGECONFIG[ssl] = "${EXTRA_OECONF_SSL},--disable-ssl,openssl-native openssl,"
 PACKAGECONFIG[cmdargs] = "--enable-command-args,--disable-command-args,,"
 PACKAGECONFIG[bashcomp] = "--enable-bash-command-substitution,--disable-bash-command-substitution,,"
 
@@ -73,8 +77,6 @@ do_install_append() {
         install -d ${D}${systemd_unitdir}/system
         install -m 644 ${WORKDIR}/nagios-nrpe.service ${D}${systemd_unitdir}/system/
     fi
-
-    rmdir -p --ignore-fail-on-non-empty ${D}${localstatedir}/nagios
 }
 
 PACKAGES = "${PN}-dbg ${PN}-plugin ${PN}-daemon"
@@ -86,6 +88,7 @@ FILES_${PN}-plugin = "${NAGIOS_PLUGIN_DIR} \
 FILES_${PN}-daemon = "${sysconfdir} \
                       ${bindir} \
                       ${nonarch_libdir}/tmpfiles.d/ \
+                      ${localstatedir} \
 "
 
 RDEPENDS_${PN}-daemon = "nagios-base"
@@ -98,3 +101,6 @@ SYSTEMD_AUTO_ENABLE_${PN}-daemon = "enable"
 INITSCRIPT_PACKAGES = "${PN}-daemon"
 INITSCRIPT_NAME_${PN}-daemon = "nrpe"
 INITSCRIPT_PARAMS_${PN}-daemon = "defaults"
+
+ALTERNATIVE_${PN}-daemon = "nagios"
+ALTERNATIVE_LINK_NAME[nagios] = "${localstatedir}/nagios"
diff --git a/external/meta-virtualization/recipes-extended/nagios/nagios-nsca/0001-Fix-missing-argument-in-open-calls.patch b/external/meta-virtualization/recipes-extended/nagios/nagios-nsca/0001-Fix-missing-argument-in-open-calls.patch
deleted file mode 100644
index 6b39fec5..00000000
--- a/external/meta-virtualization/recipes-extended/nagios/nagios-nsca/0001-Fix-missing-argument-in-open-calls.patch
+++ /dev/null
@@ -1,52 +0,0 @@
-From da37e6ce2a8cc315845440488cd2f8dab0a17bfe Mon Sep 17 00:00:00 2001
-From: "John C. Frickson" <jfrickson@nagios.com>
-Date: Wed, 7 Oct 2015 14:06:58 -0500
-Subject: [PATCH] Fix missing argument in open calls
-
-Commit b9f2c08dfdf31430f972a48781fc115c4af13cfe
-from https://github.com/NagiosEnterprises/nsca
-
-Fix for issue http://tracker.nagios.org/view.php?id=286
-
-Upstream-Status: Backport
-
-Singed-off-by: John C. Frickson <jfrickson@nagios.com>
-Signed-off-by: Chen Qi <Qi.Chen@windriver.com>
-[MA: Context updated to allow application to older version]
-Signed-off-by: Mark Asselstine <mark.asselstine@windriver.com>
----
- Changelog  | 4 ++++
- src/nsca.c | 2 +-
- 2 files changed, 5 insertions(+), 1 deletion(-)
-
-diff --git a/Changelog b/Changelog
-index 3a7edd4..00ea11e 100644
---- a/Changelog
-+++ b/Changelog
-@@ -2,6 +2,10 @@
- NSCA Changelog
- **************
- 
-+2.9.x - xx/xx/xxxx
-+------------------
-+- Fix missing argument in open calls (Xavier Bachelot / John Frickson)
-+
- 2.9.1 - 01/27/2012
- ------------------
- - Applied patch to allow packets arriving with a future time stamp (Daniel Wittenberg)
-diff --git a/src/nsca.c b/src/nsca.c
-index 6b0e436..0e70b8b 100644
---- a/src/nsca.c
-+++ b/src/nsca.c
-@@ -477,7 +477,7 @@ static int read_config_file(char *filename){
-                             int checkresult_test_fd=-1;
-                             char *checkresult_test=NULL;
-                             asprintf(&checkresult_test,"%s/nsca.test.%i",check_result_path,getpid());
--                            checkresult_test_fd=open(checkresult_test,O_WRONLY|O_CREAT);
-+                            checkresult_test_fd=open(checkresult_test,O_WRONLY|O_CREAT,S_IWUSR);
-                             if (checkresult_test_fd>0){
-                                     unlink(checkresult_test);
-                                     }
--- 
-2.11.0
-
diff --git a/external/meta-virtualization/recipes-extended/nagios/nagios-nsca_2.9.1.bb b/external/meta-virtualization/recipes-extended/nagios/nagios-nsca_2.9.2.bb
index f53a47a0..d342810c 100644
--- a/external/meta-virtualization/recipes-extended/nagios/nagios-nsca_2.9.1.bb
+++ b/external/meta-virtualization/recipes-extended/nagios/nagios-nsca_2.9.2.bb
@@ -6,18 +6,17 @@ SECTION = "console/network"
 PRIORITY = "optional"
 LICENSE = "GPLv2"
 
-LIC_FILES_CHKSUM = "file://src/nsca.c;beginline=1;endline=16;md5=c1bd17485c5c1dd42f664fe8b3528674"
+LIC_FILES_CHKSUM = "file://src/nsca.c;beginline=1;endline=16;md5=dd7a195cc7d8a3ebcfabd65360d0cab4"
 
 SRCNAME = "nsca"
 
 SRC_URI = "http://prdownloads.sourceforge.net/sourceforge/nagios/${SRCNAME}-${PV}.tar.gz \
            file://init-script.in \
            file://nagios-nsca.service \
-           file://0001-Fix-missing-argument-in-open-calls.patch \
 "
 
-SRC_URI[md5sum] = "3fe2576a8cc5b252110a93f4c8d978c6"
-SRC_URI[sha256sum] = "fb12349e50838c37954fe896ba6a026c09eaeff2f9408508ad7ede53e9ea9580"
+SRC_URI[md5sum] = "43f638c51367a3170476ed106fbb4858"
+SRC_URI[sha256sum] = "96eb04ef695873ce462e3f8db08e8a49456ff9595d11acf70a3dd8a2c4af3b5e"
 
 S = "${WORKDIR}/${SRCNAME}-${PV}"
 
@@ -26,7 +25,7 @@ inherit update-rc.d autotools-brokensep systemd dos2unix
 DEPENDS = "libmcrypt"
 
 EXTRA_OECONF += "--with-nsca-user=${NAGIOS_USER} \
-                 --with-nsca-group=${NAGIOS_GROUP} \
+                 --with-nsca-grp=${NAGIOS_GROUP} \
                  --with-libmcrypt-prefix=${STAGING_DIR_HOST} \
                  ac_cv_path_LIBMCRYPT_CONFIG=${STAGING_BINDIR_CROSS}/libmcrypt-config \
                  ac_cv_lib_wrap_main=no \