net-analyzer/nagios-core: Rev bump to fix upstream issue #337
authorThomas Deutschmann <whissi@gentoo.org>
Thu, 2 Mar 2017 19:31:12 +0000 (20:31 +0100)
committerThomas Deutschmann <whissi@gentoo.org>
Thu, 2 Mar 2017 19:35:35 +0000 (20:35 +0100)
Ebuild changes:
===============
- Cherry picked commit e03e4fd470 to stop nagios-core from flooding
  syslog every 15 seconds due to debug leftovers [Upstream Issue #337].

Upstream Issue #337: https://github.com/NagiosEnterprises/nagioscore/issues/337

Acked-by: Michael Orlitzky <mjo@gentoo.org>
Package-Manager: Portage-2.3.3, Repoman-2.3.1

net-analyzer/nagios-core/files/nagios-core-4.3.1-fix-upstream-issue-337.patch [new file with mode: 0644]
net-analyzer/nagios-core/nagios-core-4.3.1-r1.ebuild [moved from net-analyzer/nagios-core/nagios-core-4.3.1.ebuild with 99% similarity]

diff --git a/net-analyzer/nagios-core/files/nagios-core-4.3.1-fix-upstream-issue-337.patch b/net-analyzer/nagios-core/files/nagios-core-4.3.1-fix-upstream-issue-337.patch
new file mode 100644 (file)
index 0000000..d5344a6
--- /dev/null
@@ -0,0 +1,21 @@
+From e03e4fd470fbc8d4304d860d7b3b523c5d78373d Mon Sep 17 00:00:00 2001
+From: "John C. Frickson" <jfrickson@nagios.com>
+Date: Thu, 2 Mar 2017 10:24:24 -0600
+Subject: [PATCH] every 15sec /var/log/messages is flooded with "nagios:
+ set_environment_var"
+
+Fix for https://github.com/NagiosEnterprises/nagioscore/issues/337
+diff --git a/base/utils.c b/base/utils.c
+index 733fdef..19e20c7 100644
+--- a/base/utils.c
++++ b/base/utils.c
+@@ -872,9 +872,6 @@ int set_environment_var(char *name, char *value, int set) {
+       /* set the environment variable */
+       if(set == TRUE) {
+-              log_debug_info(DEBUGL_EVENTS, 0, "set_environment_var '%s'='%s'\n", name, value);
+-              syslog(LOG_DAEMON|LOG_INFO, "set_environment_var '%s'='%s'\n", name, value);
+-
+ #ifdef HAVE_SETENV
+               setenv(name, (value == NULL) ? "" : value, 1);
+ #else
similarity index 99%
rename from net-analyzer/nagios-core/nagios-core-4.3.1.ebuild
rename to net-analyzer/nagios-core/nagios-core-4.3.1-r1.ebuild
index fa4f42259999674343518adbb1a8239957a3ea19..c86bbcf9dfc8ed23ba9ef9146448b5d1a05b0c46 100644 (file)
@@ -71,6 +71,8 @@ RDEPEND="${DEPEND}
 
 S="${WORKDIR}/${MY_P}"
 
+PATCHES=( "${FILESDIR}"/${PN}-4.3.1-fix-upstream-issue-337.patch )
+
 pkg_setup() {
        enewgroup nagios
        enewuser nagios -1 /bin/bash /var/nagios/home nagios