[PATCH 0/2] uprev nagios-core and nagios-nsca

[PATCH 0/2] uprev nagios-core and nagios-nsca

[Hongzhi.Song]

nagios-core: from v4.4.2 to v4.4.3
nagios-nsca: from v2.9.1 to v2.9.2

Hongzhi.Song (2):
  nagios-nsca: uprev to v2.9.2
  nagios-core: uprev to v4.4.3

 ...ios-core_4.4.2.bb => nagios-core_4.4.3.bb} |  4 +-
 ...1-Fix-missing-argument-in-open-calls.patch | 52 -------------------
 ...ios-nsca_2.9.1.bb => nagios-nsca_2.9.2.bb} |  9 ++--
 3 files changed, 6 insertions(+), 59 deletions(-)
 rename recipes-extended/nagios/{nagios-core_4.4.2.bb => nagios-core_4.4.3.bb} (97%)
 delete mode 100644 recipes-extended/nagios/nagios-nsca/0001-Fix-missing-argument-in-open-calls.patch
 rename recipes-extended/nagios/{nagios-nsca_2.9.1.bb => nagios-nsca_2.9.2.bb} (88%)

-- 
2.17.1

[PATCH 1/2] nagios-nsca: uprev to v2.9.2

[Hongzhi.Song]

Signed-off-by: Hongzhi.Song <hongzhi.song@windriver.com>
---
 ...1-Fix-missing-argument-in-open-calls.patch | 52 -------------------
 ...ios-nsca_2.9.1.bb => nagios-nsca_2.9.2.bb} |  9 ++--
 2 files changed, 4 insertions(+), 57 deletions(-)
 delete mode 100644 recipes-extended/nagios/nagios-nsca/0001-Fix-missing-argument-in-open-calls.patch
 rename recipes-extended/nagios/{nagios-nsca_2.9.1.bb => nagios-nsca_2.9.2.bb} (88%)

diff --git a/recipes-extended/nagios/nagios-nsca/0001-Fix-missing-argument-in-open-calls.patch b/recipes-extended/nagios/nagios-nsca/0001-Fix-missing-argument-in-open-calls.patch
deleted file mode 100644
index 6b39fec..0000000
--- a/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/recipes-extended/nagios/nagios-nsca_2.9.1.bb b/recipes-extended/nagios/nagios-nsca_2.9.2.bb
similarity index 88%
rename from recipes-extended/nagios/nagios-nsca_2.9.1.bb
rename to recipes-extended/nagios/nagios-nsca_2.9.2.bb
index f53a47a..d342810 100644
--- a/recipes-extended/nagios/nagios-nsca_2.9.1.bb
+++ b/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 \
-- 
2.17.1

[PATCH 2/2] nagios-core: uprev to v4.4.3

[Hongzhi.Song]

Signed-off-by: Hongzhi.Song <hongzhi.song@windriver.com>
---
 .../nagios/{nagios-core_4.4.2.bb => nagios-core_4.4.3.bb}     | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)
 rename recipes-extended/nagios/{nagios-core_4.4.2.bb => nagios-core_4.4.3.bb} (97%)

diff --git a/recipes-extended/nagios/nagios-core_4.4.2.bb b/recipes-extended/nagios/nagios-core_4.4.3.bb
similarity index 97%
rename from recipes-extended/nagios/nagios-core_4.4.2.bb
rename to recipes-extended/nagios/nagios-core_4.4.3.bb
index b2196eb..cf37924 100644
--- a/recipes-extended/nagios/nagios-core_4.4.2.bb
+++ b/recipes-extended/nagios/nagios-core_4.4.3.bb
@@ -20,8 +20,8 @@ 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}"
 
-- 
2.17.1

Re: [PATCH 0/2] uprev nagios-core and nagios-nsca

[Bruce Ashfield]

merged

Bruce

On Fri, Mar 15, 2019 at 4:55 AM Hongzhi.Song <hongzhi.song@windriver.com> wrote:
>
> nagios-core: from v4.4.2 to v4.4.3
> nagios-nsca: from v2.9.1 to v2.9.2
>
> Hongzhi.Song (2):
>   nagios-nsca: uprev to v2.9.2
>   nagios-core: uprev to v4.4.3
>
>  ...ios-core_4.4.2.bb => nagios-core_4.4.3.bb} |  4 +-
>  ...1-Fix-missing-argument-in-open-calls.patch | 52 -------------------
>  ...ios-nsca_2.9.1.bb => nagios-nsca_2.9.2.bb} |  9 ++--
>  3 files changed, 6 insertions(+), 59 deletions(-)
>  rename recipes-extended/nagios/{nagios-core_4.4.2.bb => nagios-core_4.4.3.bb} (97%)
>  delete mode 100644 recipes-extended/nagios/nagios-nsca/0001-Fix-missing-argument-in-open-calls.patch
>  rename recipes-extended/nagios/{nagios-nsca_2.9.1.bb => nagios-nsca_2.9.2.bb} (88%)
>
> --
> 2.17.1
>


-- 
- Thou shalt not follow the NULL pointer, for chaos and madness await
thee at its end
- "Use the force Harry" - Gandalf, Star Trek II