[packages/nagios-nsca] fixunconditional syslog LOG_DEBUG

glen glen at pld-linux.org
Tue Dec 11 16:30:03 CET 2012


commit a23032feb7d803cc57a25d2c46d2a64b0cea5ea6
Author: Elan Ruusamäe <glen at delfi.ee>
Date:   Tue Dec 11 17:25:54 2012 +0200

    fixunconditional syslog LOG_DEBUG
    
    rest of the code checks for debug being true before logging to syslog.
    so should this

 missing-respect-debug.patch | 12 ++++++++++++
 nagios-nsca.spec            |  4 +++-
 2 files changed, 15 insertions(+), 1 deletion(-)
---
diff --git a/nagios-nsca.spec b/nagios-nsca.spec
index 64a0161..c953257 100644
--- a/nagios-nsca.spec
+++ b/nagios-nsca.spec
@@ -9,7 +9,7 @@ Summary:	NSCA daemon for Nagios
 Summary(pl.UTF-8):	Demon NSCA dla Nagiosa
 Name:		nagios-nsca
 Version:	2.9.1
-Release:	1.4
+Release:	2
 License:	GPL v2+
 Group:		Networking
 Source0:	http://downloads.sourceforge.net/nagios/nsca-%{version}.tar.gz
@@ -20,6 +20,7 @@ Source3:	nsca-command.cfg
 Patch0:		%{name}-groups.patch
 Patch1:		%{name}-config.patch
 Patch2:		nsca-2.9-fix_open_missing_arg.patch
+Patch3:		missing-respect-debug.patch
 URL:		http://exchange.nagios.org/directory/Addons/Passive-Checks/NSCA--2D-Nagios-Service-Check-Acceptor/details
 BuildRequires:	autoconf
 BuildRequires:	libltdl-devel
@@ -78,6 +79,7 @@ do centralnej maszyny, na której działa Nagios.
 %patch0 -p1
 %patch1 -p1
 %patch2 -p1
+%patch3 -p1
 
 %build
 %{__autoconf}
diff --git a/missing-respect-debug.patch b/missing-respect-debug.patch
new file mode 100644
index 0000000..9ab0bd3
--- /dev/null
+++ b/missing-respect-debug.patch
@@ -0,0 +1,12 @@
+--- nsca-2.9.1/./src/nsca.c~	2012-12-11 17:19:37.000000000 +0200
++++ nsca-2.9.1/./src/nsca.c	2012-12-11 17:21:43.768863034 +0200
+@@ -1263,7 +1263,8 @@
+         fclose(checkresult_file_fp);
+         /* create and close ok file */
+         asprintf(&checkresult_ok_file,"%s.ok",checkresult_file);
+-        syslog(LOG_DEBUG,"checkresult completion file '%s' open.",checkresult_ok_file);
++        if(debug==TRUE)
++			syslog(LOG_DEBUG,"checkresult completion file '%s' open.",checkresult_ok_file);
+         checkresult_ok_file_fp = fopen(checkresult_ok_file,"w");
+         fclose(checkresult_ok_file_fp);
+         /* reset umask */
================================================================

---- gitweb:

http://git.pld-linux.org/gitweb.cgi/packages/nagios-nsca.git/commitdiff/f6d714d532bdf11e8bc6ae64a975869d1651af7e



More information about the pld-cvs-commit mailing list