commit nagios

24 May 2006

Hello community,

here is the log from the commit of package nagios
checked in at Thu May 25 00:48:20 CEST 2006.

--------

--- nagios/nagios.changes	2006-05-03 22:52:06.000000000 +0200
+++ nagios/nagios.changes	2006-05-24 18:39:08.000000000 +0200
@@ -1,0 +2,7 @@
+Wed May 24 18:33:07 CEST 2006 - schwab@suse.de
+
+- Don't build as root.
+- Don't strip binaries.
+- Fix format string bug.
+
+-------------------------------------------------------------------

New:
----
  format-string.patch

++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++

Other differences:
------------------
++++++ nagios.spec ++++++
--- /var/tmp/diff_new_pack.cXFgUj/_old	2006-05-25 00:47:48.000000000 +0200
+++ /var/tmp/diff_new_pack.cXFgUj/_new	2006-05-25 00:47:48.000000000 +0200
@@ -8,12 +8,13 @@
 # Please submit bugfixes or comments via http://bugs.opensuse.org/
 #
 
+# norootforbuild
 
 Name:           nagios
 BuildRequires:  apache2-devel freetype2-devel gd-devel iputils libapr-util1-devel libjpeg-devel libpng-devel mailx pcre-devel xorg-x11-devel
 Summary:        The Nagios Network Monitor
 Version:        1.3
-Release:        14
+Release:        16
 URL:            http://www.nagios.org/
 License:        GPL
 Group:          System/Monitoring
@@ -25,13 +26,14 @@
 Patch2:         nagios-perl58.dif
 Patch3:         size.patch
 Patch4:         content_length.patch
+Patch5:         format-string.patch
 PreReq:         %insserv_prereq %fillup_prereq
 BuildRoot:      %{_tmppath}/%{name}-%{version}-build
 %define nsusr daemon
 %define nsgrp daemon
 %define cmdusr nobody
 %define cmdgrp www
-%define apxs2 apxs2-prefork
+%define apxs2 /usr/sbin/apxs2-prefork
 %define apache2_sysconfdir %(%{apxs2} -q SYSCONFDIR)
 
 %description
@@ -62,6 +64,7 @@
 %endif
 %patch3
 %patch4
+%patch5
 
 %build
 CFLAGS="$RPM_OPT_FLAGS" CXXFLAGS="$RPM_OPT_FLAGS" \
@@ -93,27 +96,24 @@
 make)
 
 %install
-[ "$RPM_BUILD_ROOT" != "/" ] && [ -d $RPM_BUILD_ROOT ] && rm -rf $RPM_BUILD_ROOT
 install -d -m 0775 ${RPM_BUILD_ROOT}/var/spool/nagios
 install -d -m 0755 ${RPM_BUILD_ROOT}%{_prefix}/include/nagios
 install -d -m 0755 ${RPM_BUILD_ROOT}/etc/init.d
 install -d -m 0755 ${RPM_BUILD_ROOT}/%{apache2_sysconfdir}/conf.d/
 install -d -m 0755 ${RPM_BUILD_ROOT}/etc/logrotate.d/
-make DESTDIR=$RPM_BUILD_ROOT INSTALL_OPTS="" COMMAND_OPTS="" install
+make DESTDIR=$RPM_BUILD_ROOT INSTALL_OPTS="" COMMAND_OPTS="" INIT_OPTS= STRIP=: install
 #make DESTDIR=$RPM_BUILD_ROOT INSTALL_OPTS="" COMMAND_OPTS="" install-commandmode
 #make DESTDIR=$RPM_BUILD_ROOT INSTALL_OPTS="" COMMAND_OPTS="" INIT_OPTS="" install-daemoninit
-make DESTDIR=$RPM_BUILD_ROOT INSTALL_OPTS="" COMMAND_OPTS="" CGICFGDIR=/etc/nagios install-config
+make DESTDIR=$RPM_BUILD_ROOT INSTALL_OPTS="" COMMAND_OPTS="" INIT_OPTS= CGICFGDIR=/etc/nagios install-config
 for i in $RPM_BUILD_ROOT/etc/nagios/*-sample ; do
   mv $i ${i%%-sample}
 done
-chown root:%{nsgrp} $RPM_BUILD_ROOT/etc/nagios/resource.cfg
-chmod 0640 $RPM_BUILD_ROOT/etc/nagios/resource.cfg
 cp -vf sample-config/template-object/minimal.cfg \
        $RPM_BUILD_ROOT/etc/nagios/minimal.cfg-sample
 # devel
 install -m 0644 common/locations.h ${RPM_BUILD_ROOT}%{_prefix}/include/nagios
 #
-cd contrib; make INSTALL=install CGIDIR=${RPM_BUILD_ROOT}%{_prefix}/lib/nagios/cgi install
+cd contrib; make INSTALL=install CGIDIR=${RPM_BUILD_ROOT}%{_prefix}/lib/nagios/cgi INSTALL_OPTS= install
 install -d -m 755 $RPM_BUILD_ROOT%{_prefix}/lib/nagios/plugins
 # install SuSE specials 
 cp %{SOURCE3} $RPM_BUILD_ROOT/%{apache2_sysconfdir}/conf.d/nagios.conf
@@ -150,9 +150,10 @@
 %dir /etc/nagios
 %dir %{_prefix}/include/nagios
 %{_prefix}/sbin/nagios
-%defattr(-,root,-)
+%defattr(-,root,root)
 %{_prefix}/include/nagios/locations.h
-%config(noreplace) /etc/nagios/*
+%config(noreplace) /etc/nagios/[!r]*
+%attr(640,root,%nsgrp) %config(noreplace) /etc/nagios/resource.cfg
 %config /etc/logrotate.d/nagios
 %doc Changelog LICENSE README* UPGRADING
 
@@ -167,6 +168,10 @@
 %config(noreplace) %{apache2_sysconfdir}/conf.d/*
 
 %changelog -n nagios
+* Wed May 24 2006 - schwab@suse.de
+- Don't build as root.
+- Don't strip binaries.
+- Fix format string bug.
 * Wed May 03 2006 - stark@suse.de
 - fixed possible buffer overflow in CGI scripts (#140494)
   (CVE-2006-2162)

++++++ format-string.patch ++++++
--- cgi/sap_log.c
+++ cgi/sap_log.c
@@ -183,7 +183,7 @@
 	        display_info_table("View SAP-Logs",TRUE,¤t_authdata);
         	printf("<div ALIGN=CENTER CLASS='statusTitle'>View SAP-Logfiles</div>\n");
 
-		printf("<br><br><center><table border = 0 width=90%>\n");
+		printf("<br><br><center><table border = 0 width=90%%>\n");
 		printf("<tr><th CLASS='status'>System</th><th CLASS='status'>Appl.Server</th><th CLASS='status'>Sys.Nr</th><th CLASS='status'>Date</th></tr>");
 
 	      }	




++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++



Remember to have fun...

    

root＠suse.de

tags

participants (1)