Hello community, here is the log from the commit of package nsca for openSUSE:Factory checked in at 2013-02-15 18:48:48 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/nsca (Old) and /work/SRC/openSUSE:Factory/.nsca.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "nsca", Maintainer is "" Changes: -------- New Changes file: --- /dev/null 2013-02-09 11:18:20.872010756 +0100 +++ /work/SRC/openSUSE:Factory/.nsca.new/nsca.changes 2013-02-15 18:48:49.000000000 +0100 @@ -0,0 +1,218 @@ +------------------------------------------------------------------- +Thu Feb 14 09:51:38 UTC 2013 - l...@linux-schulserver.de + +- rename the package from nagios-nsca to nsca (following upstream + name) +- require 'monitoring_daemon' in init script as nsca also runs + together with icinga +- add man pages for send_nsca and nsca from Debian + +------------------------------------------------------------------- +Thu Oct 11 12:27:55 UTC 2012 - l...@linux-schulserver.de + +- recommend 'monitoring_daemon' to allow nsca to run with + compatible monitoring solutions + +------------------------------------------------------------------- +Fri Feb 3 09:48:56 UTC 2012 - l...@linux-schulserver.de + +- update to 2.9.1: + + Applied patch to allow packets arriving with a future time stamp + (Daniel Wittenberg) + + Updated server (nsca) to allow packets with older, smaller + packet size (Eric Stanley) +- use macros from nagios-rpm-macros package +- added rpmlintrc + +------------------------------------------------------------------- +Wed Dec 21 10:29:59 UTC 2011 - co...@suse.com + +- remove call to suse_update_config (very old work around) + +------------------------------------------------------------------- +Thu Nov 10 22:46:33 UTC 2011 - schneem...@b1-systems.de + +- update to version 2.9 +* Add config directive to submit directly to checkresults directory (Mike Lindsey) +* Support multi-line check output with 4000 character limit (Mike Lindsey) + +- fixes in skipped version 2.8 +* Added --with-log-facility option to control syslog logging (Ryan Ordway and Brian Seklecki) +* Fixed bug where daemon would segfault if mcrypt library was not initialized before timeout (Holger Weiss) +* Fixed bug with switching from dump file to command file when running under single mode (Ton Voon) +* Fix for small memory leak with running as a single process daemon (Daniel) + +------------------------------------------------------------------- +Fri Aug 31 11:16:58 CEST 2007 - tsie...@suse.de + +- cleanup spec file (removed unneeded %dir entry) + +------------------------------------------------------------------- +Mon Aug 13 07:25:49 CEST 2007 - tsie...@suse.de + +- update to version 2.7.2 +* fixed bug with NSCA daemon eating CPU if child process + couldn't accept a connection in multi-process mode (Chris Wilson) + +------------------------------------------------------------------- +Fri Feb 9 11:46:40 CET 2007 - tsie...@suse.de + +- update to version 2.7.1 + * Fixed bug that prevented single mode daemon from working properly + * Added sample scripts for testing functionality to nsca_tests/ + (Ton Voon/Altinity) + +------------------------------------------------------------------- +Mon Jan 29 15:11:00 CET 2007 - tsie...@suse.de + +- update to version 2.7 + * Fixed crash from malformed command line + (therefore removed removed nagios-nsca.send_nsca.formatstring.patch) + * Updated to config.sub and config.guess to latest from GNU Savannah + * changed default user and group to nagios nagios (#236135) + +------------------------------------------------------------------- +Thu Dec 7 17:18:24 CET 2006 - tsie...@suse.de + +- package split: nagios-nsca for the server and + nagios-nsca-client for the remote host +- removed unneeded BuildRequires (nagios) + +------------------------------------------------------------------- +Fri Dec 1 12:59:22 CET 2006 - tsie...@suse.de + +- update to version 2.6 + * spec file fix + * segfault fix in encryption library cleanup + * daemon now exits with an error if it can't drop privileges + * added chroot support (Sean Finney) + * added support for writing a PID file + * added support for reloading config files with SIGHUP + * removed obsolete patches which are included in upstream now + +- fix NscaBin location in init script + +------------------------------------------------------------------- +Tue Oct 10 11:57:22 CEST 2006 - o...@suse.de + +- fix send_nsca segfault with -c and -d options + +------------------------------------------------------------------- +Thu Feb 2 21:19:30 CET 2006 - st...@suse.de + +- fixed crash while encrypt_cleanup() + +------------------------------------------------------------------- +Wed Jan 25 21:38:33 CET 2006 - m...@suse.de + +- converted neededforbuild to BuildRequires + +------------------------------------------------------------------- +Sun Jan 22 13:17:48 CET 2006 - st...@suse.de + +- update to version 2.5 +- added init-script +- added xinetd configuration +- use -fstack-protector +- use tcp-wrapper + +------------------------------------------------------------------- +Wed Oct 12 06:42:06 CEST 2005 - st...@suse.de + +- fixed uninitialized variable and missing return-codes + +------------------------------------------------------------------- +Sun Jan 11 11:38:03 CET 2004 - adr...@suse.de + +- add %defattr + +------------------------------------------------------------------- +Thu Jul 24 07:49:12 CEST 2003 - st...@suse.de + +- update to 2.4 + * Better support for u_int32_t detection + * Minor bug fixes + +------------------------------------------------------------------- +Thu Jun 19 13:33:09 CEST 2003 - st...@suse.de + +- added nagios to neededforbuild (fixing directory ownership) + +------------------------------------------------------------------- +Wed Feb 5 13:25:38 CET 2003 - st...@suse.de + +- update to 2.3 + * Minor changes to daemon init code + * Minor Makefile fixes + +------------------------------------------------------------------- +Wed Jan 29 02:03:27 CET 2003 - r...@suse.de + +- fix compile for gcc-3.3 (wrong code ...) + +------------------------------------------------------------------- +Mon Jan 13 08:02:01 CET 2003 - st...@suse.de + +- update to 2.2 + * Syntax changes for command line arguments + * Added support for passive host checks (supported + only in Nagios 2.x and later) + * Added sample xinetd config file (nsca.xinetd) + * Minor mods and bug fixes + +------------------------------------------------------------------- +Fri Aug 16 11:32:24 CEST 2002 - ku...@suse.de + +- Remove libmcrypt-devel from requires, libmcrypt.la is now in + main libmcrypt package. + +------------------------------------------------------------------- +Wed Jun 12 07:11:57 CEST 2002 - st...@suse.de + +- update to 2.1 + +------------------------------------------------------------------- +Tue May 28 06:57:56 CEST 2002 - st...@suse.de + +- changed conf-dir to /etc/nagios + +------------------------------------------------------------------- +Mon Apr 29 10:00:48 CEST 2002 - st...@suse.de + +- switch to Nagios NSCA (which is only another name) + * update to version 2.0 + +------------------------------------------------------------------- +Thu Mar 21 07:31:42 CET 2002 - st...@suse.de + +- finally updated to 1.2.0 + +------------------------------------------------------------------- +Thu Feb 14 11:00:03 CET 2002 - st...@suse.de + +- modified patch to write to an alternative "command" file + if the NetSaint command-file doesn't exist + (backport from 1.2.0) + +------------------------------------------------------------------- ++++ 21 more lines (skipped) ++++ between /dev/null ++++ and /work/SRC/openSUSE:Factory/.nsca.new/nsca.changes New: ---- nsca-2.9.1.tar.bz2 nsca-SuSEfirewall2 nsca-rpmlintrc nsca.1 nsca.abuild.patch nsca.changes nsca.spec nsca.spooldir.patch nsca.xinetd.patch rcnsca send_nsca.1 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ nsca.spec ++++++ # # spec file for package nsca # # Copyright (c) 2013 SUSE LINUX Products GmbH, Nuernberg, Germany. # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed # upon. The license for this file, and modifications and additions to the # file, is the same license as for the pristine package itself (unless the # license for the pristine package is not an Open Source License, in which # case the license is the MIT License). An "Open Source License" is a # license that conforms to the Open Source Definition (Version 1.9) # published by the Open Source Initiative. # Please submit bugfixes or comments via http://bugs.opensuse.org/ # Name: nsca Version: 2.9.1 Release: 0 Summary: The Nagios Service Check Acceptor License: GPL-2.0+ Group: System/Monitoring Url: http://www.nagios.org/ Source0: %{name}-%{version}.tar.bz2 Source1: rcnsca Source2: nsca-rpmlintrc Source3: nsca-SuSEfirewall2 Source4: send_nsca.1 Source5: nsca.1 # PATCH-MISSING-TAG -- See http://en.opensuse.org/Packaging/Patches Patch1: nsca.abuild.patch # PATCH-MISSING-TAG -- See http://en.opensuse.org/Packaging/Patches Patch2: nsca.xinetd.patch # PATCH-MISSING-TAG -- See http://en.opensuse.org/Packaging/Patches Patch3: nsca.spooldir.patch BuildRequires: libmcrypt-devel BuildRequires: nagios-rpm-macros BuildRequires: tcpd-devel Recommends: monitoring_daemon Provides: nagios-nsca = %{version} Obsoletes: nagios-nsca < 2.9.2 BuildRoot: %{_tmppath}/%{name}-%{version}-build %description The purpose of this add-on is to allow the execution of NetSaint and Nagios plug-ins on a remote host in a manner that is as transparent as possible. This is the server part including the daemon without the client program. %package client Summary: The Nagios Service Check Acceptor Client Group: System/Monitoring Provides: nagios-nsca-client = %{version} Obsoletes: nagios-nsca-client < 2.9.2 %description client The purpose of this add-on is to allow the execution of NetSaint and Nagios plug-ins on a remote host in a manner that is as transparent as possible. This package includes only the client program. %prep %setup -q %patch1 %patch2 %patch3 %build export CFLAGS="%{optflags}" %if %suse_version > 1000 export CFLAGS="$CFLAGS -fstack-protector" %endif %configure \ --sysconfdir=%{_sysconfdir} \ --localstatedir=%{nagios_spooldir} \ --with-nsca-user=%{nagios_user} \ --with-nsca-grp=%{nagios_group} \ --with-nsca-port=5667 make all %install mkdir -p %{buildroot}%{_bindir} mkdir -p %{buildroot}%{_sbindir} mkdir -p %{buildroot}%{_sysconfdir} mkdir -p %{buildroot}%{_initddir}/ mkdir -p %{buildroot}%{_sysconfdir}/xinetd.d/ install -m 755 src/nsca %{buildroot}%{_bindir}/ install -m 755 src/send_nsca %{buildroot}%{_bindir}/ install -m 644 sample-config/nsca.cfg %{buildroot}%{_sysconfdir}/ install -m 644 sample-config/send_nsca.cfg %{buildroot}%{_sysconfdir}/ install -m 644 sample-config/nsca.xinetd %{buildroot}%{_sysconfdir}/xinetd.d/nsca install -m 755 %{SOURCE1} %{buildroot}%{_sysconfdir}/init.d/nsca ln -sf ../../%{_sysconfdir}/init.d/nsca %{buildroot}%{_sbindir}/rcnsca chmod 644 README # install SuSEfirewall2 script %if 0%{?suse_version} > 1020 install -Dm644 %{SOURCE3} %{buildroot}%{_sysconfdir}/sysconfig/SuSEfirewall2.d/services/%{name} %endif # install man pages install -Dm644 %{SOURCE4} %{buildroot}%{_mandir}/man1/send_nsca.1 install -m644 %{SOURCE5} %{buildroot}%{_mandir}/man1/nsca.1 %preun %stop_on_removal nsca %postun %restart_on_update nsca %insserv_cleanup %triggerpostun -- nagios-nrpe < 2.9.2 STATUS='/var/adm/update-scripts/%{name}' if [ -x %{_sysconfdir}/init.d/nsca ]; then %{_sysconfdir}/init.d/nsca status >/dev/null if test $? = 0; then echo "%{_sysconfdir}/init.d/nsca restart" >> "$STATUS" else touch "$STATUS" fi chmod +x "$STATUS" fi if [ -x %{_sysconfdir}/init.d/xinetd ]; then %{_sysconfdir}/init.d/xinetd status >/dev/null if test $? = 0; then echo "%{_sysconfdir}/init.d/xinetd try-restart" >> "$STATUS" else touch "$STATUS" fi chmod +x "$STATUS" fi %triggerpostun -- nagios-nsca < 2.9.2 # Move /etc/nagios/nsca.conf to /etc/nsca.conf when updating from an old version # and inform the admin about the move. pushd %{_sysconfdir} if test -e nagios/nsca.conf.rpmsave -a ! -e nsca.conf.rpmnew; then mv nsca/nsca.conf nsca.conf.rpmnew mv nagios/nsca.conf.rpmsave nsca.conf test -L %{nagios_sysconfdir}/nsca.conf || ln -s %{_sysconfdir}/nsca.conf %{nagios_sysconfdir}/nsca.conf %restart_on_update nsca fi sed -i "s|%{nagios_sysconfdir}/nsca.cfg|%{_sysconfdir}/nsca.cfg|g" %{_sysconfdir}/xinetd.d/nsca || : if [ -e /var/adm/update-scripts/%{name} ]; then /bin/sh /var/adm/update-scripts/%{name} rm /var/adm/update-scripts/%{name} fi %triggerpostun -- nagios-nsca-client < 2.9.2 # Move /etc/nagios/send_nsca.cfg to /etc/send_nsca.cfg when updating from an old version # and inform the admin about the move. pushd %{_sysconfdir} if test -e nagios/send_nsca.cfg.rpmsave -a ! -e send_nsca.cfg.rpmnew; then mv nsca/send_nsca.cfg send_nsca.cfg.rpmnew mv nagios/send_nsca.cfg send_nsca.cfg test -L %{nagios_sysconfdir}/send_nsca.cfg || ln -s %{_sysconfdir}/send_nsca.cfg %{nagios_sysconfdir}/send_nsca.cfg fi %clean rm -rf %{buildroot}; %files %defattr(-,root,root) %{_bindir}/nsca %{_sysconfdir}/init.d/nsca %{_sbindir}/rcnsca %config(noreplace) %{_sysconfdir}/nsca.cfg %config(noreplace) %{_sysconfdir}/xinetd.d/nsca %config(noreplace) %{_sysconfdir}/sysconfig/SuSEfirewall2.d/services/%{name} %{_mandir}/man1/nsca.1* %doc Changelog README SECURITY LEGAL %files client %defattr(-,root,root) %{_bindir}/send_nsca %{_mandir}/man1/send_nsca.1* %config(noreplace) %{_sysconfdir}/send_nsca.cfg %changelog ++++++ nsca-SuSEfirewall2 ++++++ ## Name: NSCA Service ## Description: Opens port for Nagios Service Check Acceptor Service to integrate passive alerts and checks from remote machines and applications with Nagios. # space separated list of allowed TCP ports TCP="5667" ++++++ nsca-rpmlintrc ++++++ # the init script name is very old and documented on various places # so leave it as it is addFilter("incoherent-init-script-name.*nsca.*"); ++++++ nsca.1 ++++++ .TH nsca "1" "December 2005" "nsca" .SH NAME nsca \- Nagios Service Check Acceptor .SH SYNOPSIS .B nsca \-c <config_file> [\-f] [--inetd|--daemon|--single] .br .SH DESCRIPTION .B nsca This program is designed to accept passive check results from remote hosts that use the send_nsca(1) utility. It can run as a service under inetd or xinetd (read the docs for info on this), or as a standalone daemon. .SH OPTIONS .TP config_file Name of config file to use .TP \-f run in the foreground (do not fork) .TP \-\-inetd Run as a service under inetd or xinetd .TP \-\-daemon Run as a standalone multi\-process daemon .TP \-\-single Run as a standalone single\-process daemon .SH SEE ALSO .TP nsca(1) .SH FILES .TP /etc/nsca.cfg nsca server configuration .TP /etc/send_nsca.cfg send_nsca configuration .SH AUTHOR NSCA was written by Ethan Galstad <nag...@nagios.org>. This manpage was written by sean finney <sean...@debian.org> for Debian (but it may be freely used by others). ++++++ nsca.abuild.patch ++++++ --- src/nsca.c 2011-11-04 19:21:29.000000000 +0100 +++ src/nsca.c.a 2011-11-11 08:36:52.000000000 +0100 @@ -477,7 +477,7 @@ 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,0666); if (checkresult_test_fd>0){ unlink(checkresult_test); } @@ -723,6 +723,7 @@ /* we couldn't find the read handler */ syslog(LOG_ERR, "Handler stack corrupt - aborting"); do_exit(STATE_CRITICAL); + return 0; /* not reached */ } @@ -739,6 +740,7 @@ /* we couldn't find the write handler */ syslog(LOG_ERR, "Handler stack corrupt - aborting"); do_exit(STATE_CRITICAL); + return 0; /* not reached */ } @@ -1247,7 +1249,7 @@ fprintf(checkresult_file_fp,"### NSCA Passive Check Result ###\n"); fprintf(checkresult_file_fp,"# Time: %s",ctime(¤t_time)); fprintf(checkresult_file_fp,"file_time=%d\n\n",current_time); - fprintf(checkresult_file_fp,"### %s Check Result ###\n",(svc_description=="")?"Host":"Service"); + fprintf(checkresult_file_fp,"### %s Check Result ###\n",( strcmp(svc_description,"") == 0 )?"Host":"Service"); fprintf(checkresult_file_fp,"host_name=%s\n",host_name); if(strcmp(svc_description,"")) fprintf(checkresult_file_fp,"service_description=%s\n",svc_description); ++++++ nsca.spooldir.patch ++++++ --- sample-config/nsca.cfg.in.a 2011-11-10 23:41:11.000000000 +0100 +++ sample-config/nsca.cfg.in 2011-11-10 23:42:22.000000000 +0100 @@ -73,7 +73,7 @@ # NOTE: if you specify this option, the command file will be opened # relative to this directory. -#nsca_chroot=/var/run/nagios/rw +#nsca_chroot=/var/run/nagios @@ -90,7 +90,7 @@ # This is the location of the Nagios command file that the daemon # should write all service check results that it receives. -command_file=@localstatedir@/rw/nagios.cmd +command_file=@localstatedir@/nagios.cmd # ALTERNATE DUMP FILE @@ -103,7 +103,7 @@ # it starts Nagios. Or you may simply choose to ignore any # check results received while Nagios was not running... -alternate_dump_file=@localstatedir@/rw/nsca.dump +alternate_dump_file=@localstatedir@/nsca.dump ++++++ nsca.xinetd.patch ++++++ --- sample-config/nsca.xinetd.in.a 2011-11-10 23:43:39.000000000 +0100 +++ sample-config/nsca.xinetd.in 2011-11-10 23:45:15.000000000 +0100 @@ -1,15 +1,17 @@ -# default: on +# default: off # description: NSCA (Nagios Service Check Acceptor) service nsca { flags = REUSE socket_type = stream + type = UNLISTED + port = @nsca_port@ wait = no user = @nsca_user@ - group = @nsca_grp@ + group = @nsca_grp@ server = @bindir@/nsca server_args = -c @sysconfdir@/nsca.cfg --inetd log_on_failure += USERID - disable = no - only_from = 127.0.0.1 + disable = yes +# only_from = 127.0.0.1 } ++++++ rcnsca ++++++ #!/bin/sh # # Copyright (c) 2006 SUSE Linux Products GmbH # # Contributors: # Stephan Lauffer <lauf...@ph-freiburg.de> # Wolfgang Rosenauer # ### BEGIN INIT INFO # Provides: nagios-nsca # Required-Start: $remote_fs $syslog $network monitoring_daemon # Required-Stop: $remote_fs $syslog # Default-Start: 3 5 # Default-Stop: 0 1 2 6 # Short-Description: NSCA Nagios Service Check Acceptor # Description: NSCA is a daemon for accepting service check result from applications # running on other hosts. ### END INIT INFO NscaBin=/usr/bin/nsca test -x $NscaBin || { echo "$NscaBin not installed"; if [ "$1" = "stop" ]; then exit 0; else exit 5; fi; } NscaCfg=/etc/nsca.cfg test -r $NscaCfg || { echo "$NscaCfg not existing"; if [ "$1" = "stop" ]; then exit 0; else exit 6; fi; } . /etc/rc.status rc_reset case "$1" in start) echo -n "Starting Nagios NSCA " /sbin/startproc $NscaBin -s -c $NscaCfg rc_status -v ;; stop) echo -n "Shutting down Nagios NSCA " /sbin/killproc -TERM $NscaBin rc_status -v ;; try-restart|condrestart) if test "$1" = "condrestart"; then echo "${attn} Use try-restart ${done}(LSB)${attn} rather than condrestart ${warn}(RH)${norm}" fi $0 status if test $? = 0; then $0 restart else rc_reset fi rc_status ;; restart) $0 stop $0 start rc_status ;; reload|force-reload) echo -n "Reload service Nagios NSCA " /sbin/killproc -HUP $NscaBin rc_status -v ;; status) echo -n "Checking for service Nagios NSCA " /sbin/checkproc $NscaBin rc_status -v ;; probe) test $NscaCfg -nt /var/run/nsca.pid && echo reload ;; *) echo "Usage: $0 {start|stop|status|try-restart|restart|force-reload|reload|probe}" exit 1 ;; esac rc_exit ++++++ send_nsca.1 ++++++ .TH send_nsca "1" "December 2005" "nsca" .SH NAME send_nsca \- send passive check results to an NSCA daemon .SH SYNOPSIS .B send_nsca \-H <host_address> [\-p port] [\-to to_sec] [\-d delim] [ \-c config_file] .br .SH DESCRIPTION .B send_nsca This utility is used to send passive check results to the NSCA daemon. Host and Service check data that is to be sent to the NSCA daemon is read from standard input. Input should be provided in the following format (tab\-delimited unless overriden with \-d command line argument, one entry per line): .TP Service Checks <host>\\t<svc_description>\\t<return_code>\\t<plugin_output>\\n .TP Host Checks: <host>\\t<return_code>\\t<plugin_output>\\n .SH OPTIONS .TP host_address The IP address of the host running the NSCA daemon .TP port The port on which the daemon is running \- default is 5667 .TP to_sec Number of seconds before connection attempt times out. (default timeout is 10 seconds) .TP delim Delimiter to use when parsing input (defaults to a tab) .TP config_file Name of config file to use .SH SEE ALSO .TP nsca(1) .SH FILES .TP /etc/nsca.cfg nsca server configuration .TP /etc/send_nsca.cfg send_nsca configuration .SH AUTHOR NSCA was written by Ethan Galstad <nag...@nagios.org>. This manpage was written by sean finney <sean...@debian.org> for Debian (but it may be freely used, modified, and redistributed by others). -- To unsubscribe, e-mail: opensuse-commit+unsubscr...@opensuse.org For additional commands, e-mail: opensuse-commit+h...@opensuse.org
