Hello community, here is the log from the commit of package nagios for openSUSE:Factory checked in at Mon Nov 16 15:02:45 CET 2009. -------- --- nagios/nagios.changes 2009-03-27 11:29:06.000000000 +0100 +++ /mounts/work_src_done/STABLE/nagios/nagios.changes 2009-11-06 21:51:17.000000000 +0100 @@ -1,0 +2,110 @@ +Fri Nov 6 19:10:21 UTC 2009 - chris@computersalat.de + +- added lost changes + o Jun 24 2009 + o Jun 23 2009 +- spec mods + o removed changelog + o added LEGAL to doc + o simplify install of extra SOURCES +- added support for centreon + o centreon is frontend GUI for nagios + o changed perms/ownership in files section + +------------------------------------------------------------------- +Fri Aug 21 12:16:49 UTC 2009 - chris@computersalat.de + +- cleanup spec + o fixed header + o sorted TAGS +- fixed deps + o added missing Req nagios-plugins + +------------------------------------------------------------------- +Fri Aug 14 12:15:31 CEST 2009 - cschneemann@suse.de + +- added Requires php and mod_php_any + +------------------------------------------------------------------- +Thu Aug 13 11:15:30 CET 2009 - cschneemann@suse.de + +- added ndo2db to Should-Start/Should-Stop in rcnagios + changed permission of resource.cfg (needed by centreon) + (Changes by chris@computersalat.de) + +------------------------------------------------------------------- +Wed Aug 12 22:02:30 CET 2009 - cschneemann@suse.de + +- update to 3.2.0: + * Fix for read-only permissions bug in CGIs that caused problems viewing + comments (bug #0000029) + * Fix for incorrect CGI reports (availability, trends, etc.) when + reporting period spans Daylight Savings Time (bug #0000046) + * Fix for detection of truecolor support in GD library (Lars Hecking) + * Reverted to use --datadir configure script option instead of the more + recently introduced --datarootdir option + * Status and retention files are now flushed/synced to disk to prevent + incomplete information being displayed in CGIs + * Fix for incorrect next service check time calculation when Nagios is + reloaded with different timeperiod ranges + * Updated Fedora quickstart guide to indicate PHP requirements + * Known issue: Service checks that are defined with timeperiods that + contain "exclude" directives are incorrectly re-scheduled. Don't use + these for now - we'll get this fixed for 3.4 + +------------------------------------------------------------------- +Wed Jun 24 11:26:03 CEST 2009 - cschneemann@suse.de + +- update to 3.1.2 + - fixes bug in host/service schduling logic that caused excessive + CPU usage introduced with 3.1.0 + +------------------------------------------------------------------- +Tue Jun 23 10:48:36 CEST 2009 - cschneemann@suse.de +- update to 3.1.1 + * New "important check command" flag for use in service templates, to + aid configuration in distributed environments + * Fix for nagios validation error when no services defined + * Fix for stylesheet link + * Fix for extinfo.cgi error message when cgi.cfg doesn't exist + * Fix for notifications.cgi where Update button on right didn't retain + host information when no host= was in query parameters + * Fix for potential bug where a contactgroup with no members could cause + parsing errors + * Fix for W3 validation for history.cgi + * Fix for W3 validation for extinfo.cgi + * Fix for nagiostats to return non-zero with failures in MRTG mode + * Added t/ directory for tests. Use make test to run. Requires perl on + development server + * Fix for duplicate event_id attributes in status and retention data + * Fix for duplicate unlink() during check processing + * Added missing check period column to host config display (CGI) + * Fix for embedded Perl initialization under FreeBSD + * Fix for incorrect re-initialization of mutext after program restart + * Fix for incorrect weighting in host flap detection logic + * Added libtap to distribution. Use ./configure --enable-libtap to compile + * nagios.log permissions are now kept after log rotation + * Fix for "Max concurrent service checks (X) has been reached" messages + - will now push services 5 + random(10) seconds ahead for retry + * Fix for removing old HTML files for web frontend that are now replaced + with PHP equivalents (in dex/main/side.html) + * Fix for incorrect service history link text in CGIs + * Fix for useless code loop in netutils.c + * Fix for potential divide by zero in event scheduling code + * Fix for trailing backslash in plugin output causing memory corruption + in CGIs + * Fix for bug that could affect host/service scheduling during clock + time skew or changes to time perod definitions between restarts + * Leading whitespace from continuation lines in configuration files is + now stripped out + * Fix for bug where pipe (used by IPC) file descriptors get inherited by + child processed (e.g. event handlers) (bug #0000026) + * Fix for failure to daemonize - Nagios now bails (bug #0000011) + * Fix for notifications about flapping starting not processed properly + by retention data + * Patch to add transparency to statusmap icons for truecolor images + * Patch to add read-only permissions to extinfo CGI + * Security fix for statuswml.cgi where arbitrary shell injection was + possible + +------------------------------------------------------------------- @@ -32 +141,0 @@ -- fixes bnc#442275 : nagios: CSRF bug calling whatdependson for head-i586 Old: ---- nagios-3.0.6.tar.bz2 New: ---- nagios-3.2.0.tar.bz2 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ nagios.spec ++++++ --- /var/tmp/diff_new_pack.nULIyn/_old 2009-11-16 14:41:28.000000000 +0100 +++ /var/tmp/diff_new_pack.nULIyn/_new 2009-11-16 14:41:28.000000000 +0100 @@ -1,5 +1,5 @@ # -# spec file for package nagios (Version 3.0.6) +# spec file for package nagios (Version 3.2.0) # # Copyright (c) 2009 SUSE LINUX Products GmbH, Nuernberg, Germany. # @@ -19,20 +19,40 @@ Name: nagios +%define realname nagios +%define nsusr nagios +%define nsgrp nagios +%define cmdusr wwwrun +%define cmdgrp nagcmd +%define nslockfile_dir /var/run/%{realname} +%define nslockfile %nslockfile_dir/%{realname}.pid +%define apache2_sysconfdir %(/usr/sbin/apxs2 -q SYSCONFDIR)/conf.d +# Macro that print mesages to syslog at package (un)install time +%define nnmmsg logger -t %{realname}/rpm Summary: The Nagios Network Monitor -Version: 3.0.6 -Release: 3 -Url: http://www.nagios.org/ +Version: 3.2.0 +Release: 1 License: GPL v2 or later Group: System/Monitoring +Url: http://www.nagios.org/ +Source0: %{realname}-%{version}.tar.bz2 +Source1: rc%{name} +Source2: %{name}-rpmlintrc +Source3: %{name}.sysconfig +Source4: suse.de-nagios +Source10: %{name}-README.SuSE +# +Patch1: nagios.run_async_service_check.return.patch +Patch10: nagios-p1.pl-location.patch +# +BuildRoot: %{_tmppath}/%{name}-%{version}-build PreReq: %insserv_prereq PreReq: %fillup_prereq PreReq: /bin/logger -PreReq: sed -PreReq: grep PreReq: coreutils +PreReq: grep PreReq: pwdutils -Requires: mailx +PreReq: sed BuildRequires: apache2-devel BuildRequires: freetype2-devel BuildRequires: gd-devel @@ -52,32 +72,14 @@ BuildRequires: libapr-util1-devel BuildRequires: xorg-x11-devel Recommends: cron -Recommends: %name-www +Recommends: %{name}-www # we enable nagios embedded perl, but if people disable it... Recommends: perl = %{perl_version} %endif %if 0%{?suse_version} > 1020 BuildRequires: fdupes %endif -BuildRoot: %{_tmppath}/%{name}-%{version}-build -%define realname nagios -%define nsusr nagios -%define nsgrp nagios -%define cmdusr wwwrun -%define cmdgrp nagcmd -%define nslockfile_dir /var/run/%{realname} -%define nslockfile %nslockfile_dir/%{realname}.pid -%define apache2_sysconfdir %(/usr/sbin/apxs2 -q SYSCONFDIR)/conf.d -# Macro that print mesages to syslog at package (un)install time -%define nnmmsg logger -t %{realname}/rpm -Source0: %{realname}-%{version}.tar.bz2 -Source1: rc%{name} -Source2: %{name}-rpmlintrc -Source3: %{name}.sysconfig -Source4: suse.de-nagios -Source10: %{name}-README.SuSE -Patch1: nagios.run_async_service_check.return.patch -Patch10: nagios-p1.pl-location.patch +Requires: mailx %{realname}-plugins %description Nagios is a program that will monitor hosts and services on your @@ -105,7 +107,7 @@ Group: System/Monitoring Summary: Provides the HTML and CGI files for the Nagios web interface Requires: %{name} = %{version} -Requires: gd +Requires: gd php5 mod_php_any PreReq: apache2 PreReq: coreutils PreReq: pwdutils @@ -226,10 +228,8 @@ %install mkdir -p %buildroot/var/log/%realname/archives mkdir -p %buildroot/%_sbindir -mkdir -p %buildroot/%_sysconfdir/init.d mkdir -p %buildroot/%apache2_sysconfdir/ mkdir -p %buildroot/%nslockfile_dir -mkdir -p %buildroot/%_sysconfdir/cron.weekly %{__make} install install-commandmode install-config install-webconf \ DESTDIR="%buildroot" \ INSTALL_OPTS="" \ @@ -269,25 +269,25 @@ # README.SuSE file sed -e 's@DATADIR@%_datadir/%realname@g' -e 's@SYSCONFDIR@%_sysconfdir/%realname@g' %{SOURCE10} > %_builddir/%realname-%version/README.SuSE # init-script -install -m755 %{SOURCE1} %buildroot/%_sysconfdir/init.d/%realname +%{__install} -D -m 0755 %{S:1} %buildroot/%_sysconfdir/init.d/%realname ln -sf ../../etc/init.d/%realname %buildroot/%_sbindir/rc%realname # sysconfig script -mkdir -p %buildroot/var/adm/fillup-templates/ -install -m 644 %{SOURCE3} %buildroot/var/adm/fillup-templates/sysconfig.nagios -%if 0%{?suse_version} > 1020 -%fdupes -s %buildroot -%endif +%{__install} -D -m 0644 %{S:3} %buildroot/var/adm/fillup-templates/sysconfig.%realname # install cronjob (gzip' the logfiles) -install -m640 %{SOURCE4} %buildroot/%_sysconfdir/cron.weekly/ +%{__install} -D -m 0640 %{S:4} %buildroot/%_sysconfdir/cron.weekly/%realname # important ghost files touch %buildroot%_sysconfdir/%realname/htpasswd.users touch %buildroot/var/lib/%realname/retention.dat touch %buildroot/var/lib/%realname/status.dat touch %buildroot/var/log/%realname/config.err touch %buildroot%nslockfile +# some rpmlint stuff +%if 0%{?suse_version} > 1020 +%fdupes -s %buildroot +%endif %clean -rm -rf %buildroot +%{__rm} -rf %buildroot %pre # Create user and group on the system if necessary @@ -432,9 +432,9 @@ %files %defattr(-,root,root) -%doc Changelog LICENSE README README.SuSE sample-config/ -%dir %_sysconfdir/%realname -%dir %_sysconfdir/%realname/objects +%doc Changelog LEGAL LICENSE README README.SuSE sample-config/ +%dir %attr(775,%{nsusr},%{cmdgrp}) %_sysconfdir/%realname +%dir %attr(775,%{nsusr},%{cmdgrp}) %_sysconfdir/%realname/objects %dir %attr(755,%nsusr,%nsgrp) /var/lib/%realname %dir %attr(755,%nsusr,%nsgrp) /var/log/%realname %dir %attr(755,%nsusr,%nsgrp) /var/log/%realname/archives @@ -445,23 +445,27 @@ %attr(0600,%nsusr,%nsgrp) %verify(not md5 size mtime) %ghost %config(missingok,noreplace) /var/lib/%realname/retention.dat %attr(0664,%nsusr,%nsgrp) %verify(not md5 size mtime) %ghost %config(missingok,noreplace) /var/lib/%realname/status.dat %ghost %config(missingok,noreplace) /var/log/%realname/config.err -%config(noreplace) %_sysconfdir/%realname/*.cfg -%config(noreplace) %_sysconfdir/%realname/objects/*.cfg -/var/adm/fillup-templates/sysconfig.nagios +%config(noreplace) %attr(664,%{nsusr},%{cmdgrp}) %_sysconfdir/%realname/cgi.cfg +%config(noreplace) %attr(664,%{nsusr},%{cmdgrp}) %_sysconfdir/%realname/%{realname}.cfg +%config(noreplace) %attr(660,%{nsusr},%{cmdgrp}) %_sysconfdir/%realname/resource.cfg +%config(noreplace) %attr(664,%{nsusr},%{cmdgrp}) %_sysconfdir/%realname/objects/*.cfg +/var/adm/fillup-templates/sysconfig.%{realname} +# defattr change %defattr(755,root,root) -%_sbindir/nagios -%_sbindir/nagiostats -%_sbindir/mini_epn -%_sbindir/new_mini_epn -%_sbindir/convertcfg -%_sbindir/rc%realname %_sysconfdir/cron.weekly/* %_prefix/lib/%realname/ %exclude %_prefix/lib/%realname/cgi/* +%_sbindir/convertcfg +%_sbindir/mini_epn +%attr(0750,root,%{cmdgrp}) %_sbindir/%{realname} +%attr(0750,root,%{cmdgrp}) %_sbindir/nagiostats +%_sbindir/new_mini_epn +%_sbindir/rc%realname %files www %defattr(755,root,root) %_prefix/lib/%realname/cgi/* +# defattr change %defattr(-,root,root) %_datadir/%realname/ %config(noreplace) %{apache2_sysconfdir}/%realname.conf ++++++ nagios-3.0.6.tar.bz2 -> nagios-3.2.0.tar.bz2 ++++++ ++++ 129876 lines of diff (skipped) ++++++ rcnagios ++++++ --- /var/tmp/diff_new_pack.nULIyn/_old 2009-11-16 14:41:30.000000000 +0100 +++ /var/tmp/diff_new_pack.nULIyn/_new 2009-11-16 14:41:30.000000000 +0100 @@ -18,8 +18,8 @@ # Provides: nagios # Required-Start: $local_fs $remote_fs $syslog $network # Required-Stop: $local_fs $remote_fs $syslog $network -# Should-Start: $time sendmail httpd2 xntpd $named cron -# Should-Stop: sendmail +# Should-Start: $time sendmail httpd2 xntpd $named cron ndo2db +# Should-Stop: sendmail ndo2db # Default-Start: 3 5 # Default-Stop: 0 1 2 6 # Short-Description: Network monitor Nagios @@ -66,7 +66,7 @@ chown $nagios_user:$nagios_cmdgrp $file fi done - chmod 640 $resource_file + chmod 660 $resource_file chown $nagios_user:$nagios_cmdgrp $resource_file # remove some perhaps left over files for file in $command_file $lock_file $status_file $temp_file /var/lock/subsys/nagios; do ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Remember to have fun... -- To unsubscribe, e-mail: opensuse-commit+unsubscribe@opensuse.org For additional commands, e-mail: opensuse-commit+help@opensuse.org