rpms/nagios/FC-3 nagios.spec,1.6,1.7

[Dennis Gilmore (ausil)]

Author: ausil

Update of /cvs/extras/rpms/nagios/FC-3
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv21326

Modified Files:
	nagios.spec 
Log Message:
Update for CVE-2006-2489



Index: nagios.spec
===================================================================
RCS file: /cvs/extras/rpms/nagios/FC-3/nagios.spec,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- nagios.spec	15 Feb 2006 14:43:23 -0000	1.6
+++ nagios.spec	22 May 2006 00:49:28 -0000	1.7
@@ -1,14 +1,15 @@
 Name: nagios
-Version: 2.0
-Release: 0.6.rc2%{?dist}
+Version: 2.3.1
+Release: 1%{?dist}
 Summary: Host/service/network monitoring program
 
 Group: Applications/System
 License: GPL
 URL: http://www.nagios.org/
-Source0: http://dl.sourceforge.net/nagios/%{name}-%{version}rc2.tar.gz
+Source0: http://dl.sourceforge.net/nagios/%{name}-%{version}.tar.gz
 Source1: nagios.logrotate
 Source2: nagios.htaccess
+Patch0: nagios-initrd.patch
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildRequires: gd-devel > 1.8, mailx
@@ -50,7 +51,8 @@
 may compile against.
 
 %prep
-%setup -q -n nagios-2.0rc2
+%setup -q
+%patch0 -p0 
 
 %build
 ./configure \
@@ -76,9 +78,9 @@
 
 %{__sed} -e "s| package Embed::Persistent;|#\!%{_bindir}/perl\npackage Embed::Persistent;|" < p1.pl > p1.pl.fedora
 %{__sed} -e "s/# chkconfig: 345/# chkconfig: - /" \
-	 -e "s|NagiosCmd=/var/log/nagios/rw/nagios.cmd|NagiosCmd=%{_localstatedir}/spool/%{name}/nagios.cmd|" < daemon-init > daemon-init.fedora
+	 -e "s|NagiosCmd=/var/log/nagios/rw/nagios.cmd|NagiosCmd=%{_localstatedir}/spool/%{name}/cmd/nagios.cmd|" < daemon-init > daemon-init.fedora
 %{__sed} -e "s|resource.cfg|private/resource.cfg|" \
-	 -e "s|command_file=/var/log/nagios/rw/nagios.cmd|command_file=%{_localstatedir}/spool/%{name}/nagios.cmd|" < sample-config/nagios.cfg > sample-config/nagios.cfg.fedora
+	 -e "s|command_file=/var/log/nagios/rw/nagios.cmd|command_file=%{_localstatedir}/spool/%{name}/cmd/nagios.cmd|" < sample-config/nagios.cfg > sample-config/nagios.cfg.fedora
 %{__sed} -e "s|/usr/lib/|%{_libdir}/|" %{SOURCE2} > %{name}.htaccess
 %{__mv} -f sample-config/nagios.cfg.fedora sample-config/nagios.cfg
 echo >> html/stylesheets/common.css
@@ -86,7 +88,7 @@
 %install
 rm -rf %{buildroot}
 make DESTDIR=%{buildroot} INSTALL_OPTS="" COMMAND_OPTS="" install-config
-%{__install} -d -m 0775 %{buildroot}/%{_localstatedir}/spool/%{name}
+%{__install} -d -m 0775 %{buildroot}/%{_localstatedir}/spool/%{name}/cmd
 %{__install} -d -m 0755 %{buildroot}/%{_prefix}/include/%{name}
 %{__install} -d -m 0755 %{buildroot}/%{_sysconfdir}/%{name}
 %{__install} -d -m 0755 %{buildroot}/%{_sysconfdir}/%{name}/private
@@ -123,7 +125,7 @@
 %post
 /sbin/chkconfig --add %{name} || :
 /sbin/service httpd condrestart > /dev/null 2>&1 || :
-%{_sbindir}/usermod -G %{name} apache || :
+%{_sbindir}/usermod -a -G %{name} apache || :
 
 %postun
 /sbin/service httpd condrestart > /dev/null 2>&1 || :
@@ -145,9 +147,10 @@
 %config(noreplace) %{_sysconfdir}/logrotate.d/%{name}
 %config(noreplace) %{_sysconfdir}/%{name}/*cfg-sample
 
-%attr(0750,root,nagios) %dir %{_sysconfdir}/%{name}/private
-%attr(0640,root,nagios) %config(noreplace) %{_sysconfdir}/%{name}/private/resource.cfg-sample
-%attr(2775,nagios,nagios) %dir %{_localstatedir}/spool/%{name}
+%attr(0750,root,root) %dir %{_sysconfdir}/%{name}/private
+%attr(0640,root,root) %config(noreplace) %{_sysconfdir}/%{name}/private/resource.cfg-sample
+%attr(0755,nagios,nagios) %dir %{_localstatedir}/spool/%{name}
+%attr(2775,nagios,nagios) %dir %{_localstatedir}/spool/%{name}/cmd
 %attr(0755,nagios,nagios) %dir %{_localstatedir}/log/%{name}
 %attr(0755,nagios,nagios) %dir %{_localstatedir}/log/%{name}/archives
 
@@ -156,18 +159,49 @@
 %{_includedir}/%{name}
 
 %changelog
-* Wed Feb 15 2006 Mike McGrath <imlinux at gmail.com> 2.0-0.6.rc2
--Upgrade no longer uninstalls Nagios from chkconfig
-
-* Tue Feb 09 2006 Mike McGrath <imlinux at gmail.com> 2.0-0.5.rc2
-- Made /private/* group owner Nagios.  This fixes SIGHUP config read issue.
-
-* Mon Feb 06 2006 Mike McGrath <imlinux at gmail.com> 2.0-0.4.rc2
-- Added proper basic Auth to Apache config for non SSL users
+* Mon May 15 2006 Mike McGrath <imlinux at gmail.com> 2.3.1-1
+- Bug fix for HTTP content_length header integer overflow in CGIs
+- Updates no longer remove Nagios from starting up on reboot
+
+* Tue May 09 2006 Mike McGrath <imlinux at gmail.com> 2.3-3
+- updates to the init script that prevented nagios from shutting down
+
+* Wed May 03 2006 Mike McGrath <imlinux at gmail.com> 2.3-1
+- Upstream released 2.3
+- Bug fix for negative HTTP content_length header in CGIs
+- Added missing links for notes_url and action_url to service column of status detail page 
+
+* Tue May 02 2006 Mike McGrath <imlinux at gmail.com> 2.2-3
+- Upstream released 2.2
+- Updated the cmd file to point to /var/spool/nagios/cmd/nagios.cmd
+- 2.2 --------------------------------------------------
+- Minor bug fix in availability CGI
+- Bug fix with temporary file location used for retention data
+- Fix for segfault that occurred in 2.1 during service flapping notifications 
+- 2.1 --------------------------------------------------
+- Changed freshness logic so that passive checks don't immediately go stale after program restart
+- Bug fix for minor memory leak in object cleanup code
+- Bug fix for flapping notifications during scheduled downtime
+- Bug fix for $TOTALHOSTSDOWNUNHANDLED$ macro
+- Bug fix in sample minimal.cfg file
+- Bug fix in status CGI when displaying servicegroups
+- Bug fixes in computation of indeterminate time and scheduled downtime in availability CGI
+- Bug fix with not deleting all comments associated with a service
+- Lowered max plugin output length from 348 to 332 chars to run on 64-bit systems without problems
+- Minor fix to p1.pl for embedded Perl interpreter
+- Minor fixes to WAP interface (statuswml CGI)
+- Minor bug fix to VRML interface (statuswrl CGI)
+- Minor doc updates 
+
+* Tue Feb 21 2006 Mike McGrath <imlinux at gmail.com> 2.0-1
+- Upstream released 2.0 (changes below)
+- Fix for segfault in timed event queue
+- Removed length limitations for object vars/vals
+- Updated config.sub and config.guess to versions from automake-1.9
+- Doc updates
 
 * Sat Feb 04 2006 Mike McGrath <imlinux at gmail.com> 2.0-0.2.rc2
 - Fixed default options in Apache config
-- Fixed %{_libdir} in Apache config for x86_64 machines
 
 * Fri Jan 27 2006 Mike McGrath <imlinux at gmail.com> 2.0-0.1.rc2
 - Using 2.0rc2 tarball