Hello community, here is the log from the commit of package nagios for openSUSE:Factory checked in at 2012-12-28 22:45:50 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/nagios (Old) and /work/SRC/openSUSE:Factory/.nagios.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "nagios", Maintainer is "lr...@suse.com" Changes: -------- --- /work/SRC/openSUSE:Factory/nagios/nagios.changes 2012-11-30 12:27:50.000000000 +0100 +++ /work/SRC/openSUSE:Factory/.nagios.new/nagios.changes 2012-12-28 22:45:53.000000000 +0100 @@ -1,0 +2,30 @@ +Mon Dec 17 10:29:13 UTC 2012 - l...@linux-schulserver.de + +- update to 3.4.3: + * Applied fix for pagination and sorting on status.cgi #381 + (Phil Randal) + * Fixed issue where deleting a downtime could cause Nagios to crash + (Eric Stanley) + * Corrected logic so that end times for flexible downtimes are + calculated from the downtime start rather than the current time + in the case where Nagios is restarted (Eric Stanley) + * Fixed issue introduced by fix for bug #124 where flexible + downtimes are not taken into account on Nagios restart. + (Scott Wilkerson, Eric Stanley) + * Fixed bug #247: If a service reports no performance data, the + perfdata log file has no line indicating the test. + (omnik...@free.fr) + * Fixed link for unhandled unreachable host problems on tactical + overview page (Rudolf Cejka) + * Fixed bug #345 with wild card searches not paging properly + on status.cgi (Phil Randal) + * Fixed bug #343 on status.cgi where Service Group Summary can + potentially show wrong totals (Mark Ziesemer) + * Fixed memory leaks on SIGHUP (Carlos Velasco) +- refreshed patches +- just require php not php5 to allow a switch to php53 +- do not compress logfiles per default to allow searching via + webinterface +- init script now uses daemonchk.cgi to check for status (if present) + +------------------------------------------------------------------- Old: ---- nagios-3.4.1.tar.bz2 New: ---- nagios-3.4.3.tar.bz2 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ nagios.spec ++++++ --- /var/tmp/diff_new_pack.rbTE7e/_old 2012-12-28 22:45:55.000000000 +0100 +++ /var/tmp/diff_new_pack.rbTE7e/_new 2012-12-28 22:45:55.000000000 +0100 @@ -20,7 +20,7 @@ Summary: The Nagios Network Monitor License: GPL-2.0+ Group: System/Monitoring -Version: 3.4.1 +Version: 3.4.3 Release: 0 Url: http://www.nagios.org/ Source0: %{name}-%{version}.tar.bz2 @@ -120,7 +120,7 @@ Requires: %{name} = %{version} Requires: gd Requires: mod_php_any -Requires: php5 +Requires: php %description www Nagios is a program that will monitor hosts and services on your @@ -157,10 +157,10 @@ %prep %setup -q -n %{name} -%patch2 -p1 -%patch3 -p1 +%patch2 -p0 +%patch3 -p0 %patch10 -p0 -%patch11 -p1 +%patch11 -p0 find -name ".gitignore" | xargs rm # fix p1.pl [dos] perl -p -i -e 's|\r\n|\n|' contrib/p1.pl @@ -351,33 +351,32 @@ fi %post -%{fillup_and_insserv nagios} # Update ? if [ ${1:-0} -gt 1 ]; then - if [ -f %{nagios_sysconfdir}/nagios.cfg ]; then + if [ -f '%{nagios_sysconfdir}/nagios.cfg' ]; then DATE=$(date "+%Y-%m-%d-%H:%M") TMPFILE=$(mktemp /tmp/%{name}-XXXXXX) - NAGIOS_CFG=%{nagios_sysconfdir}/nagios.cfg + NAGIOS_CFG='%{nagios_sysconfdir}/nagios.cfg' cp -f $NAGIOS_CFG ${NAGIOS_CFG}_${DATE} - if ! grep -q ^lock_file=%{nslockfile} $NAGIOS_CFG ; then + if ! grep -q ^lock_file=%{nslockfile} "$NAGIOS_CFG" ; then echo "- updating pid lock_file= to %{nslockfile} in $NAGIOS_CFG" >> $TMPFILE - sed -i "s@^lock_file=.*@lock_file=%{nslockfile}@" $NAGIOS_CFG + sed -i "s@^lock_file=.*@lock_file=%{nslockfile}@" "$NAGIOS_CFG" fi - if grep -q ^service_reaper_frequency $NAGIOS_CFG ; then + if grep -q ^service_reaper_frequency "$NAGIOS_CFG" ; then echo "- renaming service_reaper_frequency to check_result_reaper_frequency in $NAGIOS_CFG" >> $TMPFILE - sed -i "s@service_reaper_frequency@check_result_reaper_frequency@" $NAGIOS_CFG + sed -i "s@service_reaper_frequency@check_result_reaper_frequency@" "$NAGIOS_CFG" fi - if grep -q ^aggregate_status_updates $NAGIOS_CFG ; then + if grep -q ^aggregate_status_updates "$NAGIOS_CFG" ; then echo "- aggregate_status_updates option has been removed from $NAGIOS_CFG" >> $TMPFILE - sed -i "s@^aggregate_status_updates@# aggregate_status_updates@" $NAGIOS_CFG + sed -i "s@^aggregate_status_updates@# aggregate_status_updates@" "$NAGIOS_CFG" fi - if grep -q ^downtime_file $NAGIOS_CFG ; then - set -- $(grep ^downtime_file $NAGIOS_CFG | sed 's@=@ @') + if grep -q ^downtime_file "$NAGIOS_CFG" ; then + set -- $(grep ^downtime_file "$NAGIOS_CFG" | sed 's@=@ @') shift file=$(echo $*) if [ -n "$file" ]; then if [ -f "$file" ]; then - set -- $(grep ^state_retention_file $NAGIOS_CFG | sed 's@=@ @') + set -- $(grep ^state_retention_file "$NAGIOS_CFG" | sed 's@=@ @') shift state_retention_file=$(echo $*) echo "- adding the content of of $file to $state_retention_file" >> $TMPFILE @@ -385,10 +384,10 @@ fi fi echo "- removing downtime_file variable (no longer supported) in $NAGIOS_CFG" >> $TMPFILE - sed -i "s@^downtime_file@# downtime_file@" $NAGIOS_CFG + sed -i "s@^downtime_file@# downtime_file@" "$NAGIOS_CFG" fi - if grep -q ^comment_file $NAGIOS_CFG ; then - set -- $(grep ^comment_file $NAGIOS_CFG | sed 's@=@ @') + if grep -q ^comment_file "$NAGIOS_CFG" ; then + set -- $(grep ^comment_file "$NAGIOS_CFG" | sed 's@=@ @') shift file=$(echo $*) if [ -n "$file" ]; then @@ -398,9 +397,9 @@ fi fi echo "- removing comment_file variable (no longer supported) in $NAGIOS_CFG" >> $TMPFILE - sed -i "s@^comment_file@# comment_file@" $NAGIOS_CFG + sed -i "s@^comment_file@# comment_file@" "$NAGIOS_CFG" fi - %{nnmmsg} $(cat $TMPFILE) + #{nnmmsg} $(cat $TMPFILE) rm $TMPFILE fi else @@ -411,32 +410,25 @@ %{nnmmsg} "Added alias for user nagiosadmin to /etc/aliases" if [ -x usr/bin/newaliases ]; then usr/bin/newaliases &>/dev/null || true - else - %{nnmmsg} "Cannot execute newaliases. Please run it manually." fi fi fi fi +%{fillup_and_insserv nagios} %preun %stop_on_removal %{name} %postun -if [ -f %nslockfile ]; then - chown -v %{nagios_user} %{nslockfile} -fi %restart_on_update %{name} %{insserv_cleanup} %post www -wwwusr="" +wwwusr=%{nagios_command_user} if [ -f etc/apache2/uid.conf ]; then # If apache is installed, and we can find the apache user, set a shell var wwwusr=$(awk '/^[ \t]*User[ \t]+[a-zA-Z0-9]+/ {print $2}' etc/apache2/uid.conf) fi -if [ "z" = "z$wwwusr" ]; then # otherwise, use the default - wwwusr=%{nagios_command_user} -fi # if apache user is not in nagios_command_group, add it if id -Gn $wwwusr 2>/dev/null | grep -q %{nagios_command_group} >/dev/null 2>&1 ; then : # $wwwusr (default: %%nagios_command_user) is already in Nagios cmd group @@ -447,7 +439,7 @@ %else groupmod -A $wwwusr %{nagios_command_group} 2>/dev/null %endif - %nnmmsg "User $wwwusr added to group %{nagios_command_group} so sending commands to Nagios from the CGI is possible." + %{nnmmsg} "User $wwwusr added to group %{nagios_command_group} so sending commands to Nagios from the CGI is possible." fi # Update ? if [ ${1:-0} -eq 1 ]; then ++++++ nagios-3.4.1.tar.bz2 -> nagios-3.4.3.tar.bz2 ++++++ ++++ 1765 lines of diff (skipped) ++++++ nagios-disable_phone_home.patch ++++++ --- /var/tmp/diff_new_pack.rbTE7e/_old 2012-12-28 22:45:56.000000000 +0100 +++ /var/tmp/diff_new_pack.rbTE7e/_new 2012-12-28 22:45:56.000000000 +0100 @@ -2,10 +2,10 @@ base/utils.c | 129 ----------------------------------------------------------- 1 file changed, 1 insertion(+), 128 deletions(-) -Index: nagios/base/utils.c +Index: base/utils.c =================================================================== ---- nagios.orig/base/utils.c -+++ nagios/base/utils.c +--- base/utils.c.orig ++++ base/utils.c @@ -3803,138 +3803,11 @@ int check_for_nagios_updates(int force, /* checks for updates at api.nagios.org */ ++++++ nagios-fix_encoding_trends.cgi.patch ++++++ --- /var/tmp/diff_new_pack.rbTE7e/_old 2012-12-28 22:45:56.000000000 +0100 +++ /var/tmp/diff_new_pack.rbTE7e/_new 2012-12-28 22:45:56.000000000 +0100 @@ -2,10 +2,10 @@ cgi/getcgi.c | 3 +++ 1 file changed, 3 insertions(+) -Index: nagios/cgi/getcgi.c +Index: cgi/getcgi.c =================================================================== ---- nagios.orig/cgi/getcgi.c -+++ nagios/cgi/getcgi.c +--- cgi/getcgi.c.orig ++++ cgi/getcgi.c @@ -96,6 +96,9 @@ void unescape_cgi_input(char *input) { break; else if(input[x] == '%') { ++++++ nagios-fix_spurious_dollar_signs_added_to_command_lines.patch ++++++ --- /var/tmp/diff_new_pack.rbTE7e/_old 2012-12-28 22:45:56.000000000 +0100 +++ /var/tmp/diff_new_pack.rbTE7e/_new 2012-12-28 22:45:56.000000000 +0100 @@ -2,11 +2,11 @@ common/macros.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) -Index: nagios/common/macros.c +Index: common/macros.c =================================================================== ---- nagios.orig/common/macros.c -+++ nagios/common/macros.c -@@ -185,7 +185,8 @@ int process_macros_r(nagios_macros *mac, +--- common/macros.c.orig ++++ common/macros.c +@@ -221,7 +221,8 @@ int process_macros_r(nagios_macros *mac, *output_buffer = (char *)realloc(*output_buffer, strlen(*output_buffer) + strlen(temp_buffer) + 3); strcat(*output_buffer, "$"); strcat(*output_buffer, temp_buffer); ++++++ nagios-p1.pl-location.patch ++++++ --- /var/tmp/diff_new_pack.rbTE7e/_old 2012-12-28 22:45:56.000000000 +0100 +++ /var/tmp/diff_new_pack.rbTE7e/_new 2012-12-28 22:45:56.000000000 +0100 @@ -2,7 +2,7 @@ =================================================================== --- Makefile.in.orig +++ Makefile.in -@@ -25,6 +25,7 @@ +@@ -25,6 +25,7 @@ exec_prefix=@exec_prefix@ LOGDIR=@localstatedir@ CHECKRESULTDIR=@CHECKRESULTDIR@ CFGDIR=@sysconfdir@ @@ -10,7 +10,7 @@ BINDIR=@bindir@ CGIDIR=@sbindir@ LIBEXECDIR=@libexecdir@ -@@ -219,7 +220,7 @@ +@@ -239,7 +240,7 @@ install-basic: $(INSTALL) -m 775 $(INSTALL_OPTS) -d $(DESTDIR)$(LOGDIR)/archives $(INSTALL) -m 775 $(INSTALL_OPTS) -d $(DESTDIR)$(CHECKRESULTDIR) if [ $(INSTALLPERLSTUFF) = yes ]; then \ @@ -23,7 +23,7 @@ =================================================================== --- configure.in.orig +++ configure.in -@@ -16,6 +16,7 @@ +@@ -16,6 +16,7 @@ PKG_REL_DATE="11-30-2012" dnl Figure out how to invoke "install" and what install options to use. AC_PROG_INSTALL AC_SUBST(INSTALL) @@ -46,7 +46,7 @@ =================================================================== --- sample-config/nagios.cfg.in.orig +++ sample-config/nagios.cfg.in -@@ -1114,7 +1114,7 @@ +@@ -1142,7 +1142,7 @@ date_format=us # embedded Perl interpreter) is located. If you didn't compile # Nagios with embedded Perl support, this option has no effect. ++++++ nagios-rpmlintrc ++++++ --- /var/tmp/diff_new_pack.rbTE7e/_old 2012-12-28 22:45:56.000000000 +0100 +++ /var/tmp/diff_new_pack.rbTE7e/_new 2012-12-28 22:45:56.000000000 +0100 @@ -8,6 +8,5 @@ # The name of that package is used since years - no need to change it for this new 'policy' addFilter("name-repeated-in-summary.*Nagios") # avoid FollowSymlinks in apache configuration -addFilter("files-duplicated-waste.*/usr/share/nagios/images/.*"); -addFilter("files-duplicated-waste.*/usr/share/nagios/contexthelp/.*"); +addFilter("files-duplicated-waste"); addFilter("files-duplicate.*/usr/share/nagios/.*"); ++++++ nagios.sysconfig ++++++ --- /var/tmp/diff_new_pack.rbTE7e/_old 2012-12-28 22:45:56.000000000 +0100 +++ /var/tmp/diff_new_pack.rbTE7e/_new 2012-12-28 22:45:56.000000000 +0100 @@ -29,4 +29,4 @@ # to rotate his logfile in /etc/nagios/nagios.cfg # To save disk space, you can enable a cron job which compress the old # logfiles once a week. -NAGIOS_COMPRESS_LOGFILES="true" +NAGIOS_COMPRESS_LOGFILES="false" ++++++ rcnagios ++++++ --- /var/tmp/diff_new_pack.rbTE7e/_old 2012-12-28 22:45:56.000000000 +0100 +++ /var/tmp/diff_new_pack.rbTE7e/_new 2012-12-28 22:45:56.000000000 +0100 @@ -2,7 +2,7 @@ # Copyright (c) 1995-2001 SuSE GmbH Nuernberg, Germany. # 2002 SuSE Linux AG Nuernberg, Germany. # 2007 SuSE Linux GmbH Nuernberg, Germany. -# 2010 SUSE LINUX Products GmbH, Nuernberg, Germany +# 2010-2012 SUSE LINUX Products GmbH, Nuernberg, Germany # # Author: Wolfgang Rosenauer, Lars Vogdt # @@ -31,11 +31,12 @@ . /etc/rc.status -NAGIOS_BIN="/usr/sbin/nagios" -NAGIOS_CFG="/etc/nagios/nagios.cfg" -NAGIOS_PIDFILE="/var/run/nagios/nagios.pid" -NAGIOS_SYSCONFIG="/etc/sysconfig/nagios" -NAGIOS_CFG_ERR_LOG="/var/log/nagios/config.err" +NAGIOS_BIN='/usr/sbin/nagios' +NAGIOS_CFG='/etc/nagios/nagios.cfg' +NAGIOS_PIDFILE='/var/run/nagios/nagios.pid' +NAGIOS_SYSCONFIG='/etc/sysconfig/nagios' +NAGIOS_CFG_ERR_LOG='/var/log/nagios/config.err' +NAGIOS_DAEMONCHK='/usr/lib/nagios/cgi/daemonchk.cgi' # Read config and log errors in logfile function config_check () { @@ -270,8 +271,16 @@ rc_status -v ;; status) - echo -n "Checking for Nagios " - checkproc -p "$lock_file" "$NAGIOS_BIN" + echo -n "Checking for Nagios: " + if [ -x "$NAGIOS_DAEMONCHK" ]; then + if "$NAGIOS_DAEMONCHK" -l "$lock_file"; then + rc_failed 0 + else + rc_failed 1 + fi + else + checkproc -p "$lock_file" "$NAGIOS_BIN" + fi rc_status -v ;; check) -- To unsubscribe, e-mail: opensuse-commit+unsubscr...@opensuse.org For additional commands, e-mail: opensuse-commit+h...@opensuse.org
