Hello community,
here is the log from the commit of package nagios
checked in at Thu Jan 18 01:51:17 CET 2007.
--------
--- nagios/nagios.changes 2007-01-10 21:12:14.000000000 +0100
+++ /mounts/work_src_done/STABLE/nagios/nagios.changes 2007-01-17 18:32:06.000000000 +0100
@@ -1,0 +2,25 @@
+Wed Jan 17 18:31:49 CET 2007 - olh@suse.de
+
+- fix more comparison with string literal in avail.c
+
+-------------------------------------------------------------------
+Thu Jan 11 13:08:56 CET 2007 - olh@suse.de
+
+- FATE #301512
+
+-------------------------------------------------------------------
+Thu Jan 11 13:05:31 CET 2007 - olh@suse.de
+
+- fix typo in html docu, perdata.html -> perfdata.html
+
+-------------------------------------------------------------------
+Thu Jan 11 11:49:01 CET 2007 - olh@suse.de
+
+- correct link to external FAQ website
+
+-------------------------------------------------------------------
+Thu Jan 11 11:34:54 CET 2007 - olh@suse.de
+
+- correct Alias in nagios-httpd.conf
+
+-------------------------------------------------------------------
New:
----
nagios.doc.faq-link.patch
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ nagios.spec ++++++
--- /var/tmp/diff_new_pack.K16064/_old 2007-01-18 01:50:23.000000000 +0100
+++ /var/tmp/diff_new_pack.K16064/_new 2007-01-18 01:50:23.000000000 +0100
@@ -14,7 +14,7 @@
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: 2.6
-Release: 13
+Release: 14
URL: http://www.nagios.org/
License: GNU General Public License (GPL)
Group: System/Monitoring
@@ -35,6 +35,7 @@
Patch: nagios.sehandlers.end_time.patch
Patch1: nagios.avail.host_name.patch
Patch2: nagios.sample-config.email-admin-localhost.patch
+Patch3: nagios.doc.faq-link.patch
%description
The Nagios Network Monitor
@@ -61,6 +62,7 @@
%patch -p1
%patch1 -p1
%patch2 -p1
+%patch3 -p1
%build
CFLAGS="$RPM_OPT_FLAGS" CXXFLAGS="$RPM_OPT_FLAGS" \
@@ -186,6 +188,16 @@
%config(noreplace) %{apache2_sysconfdir}/conf.d/*
%changelog -n nagios
+* Wed Jan 17 2007 - olh@suse.de
+- fix more comparison with string literal in avail.c
+* Thu Jan 11 2007 - olh@suse.de
+- FATE #301512
+* Thu Jan 11 2007 - olh@suse.de
+- fix typo in html docu, perdata.html -> perfdata.html
+* Thu Jan 11 2007 - olh@suse.de
+- correct link to external FAQ website
+* Thu Jan 11 2007 - olh@suse.de
+- correct Alias in nagios-httpd.conf
* Wed Jan 10 2007 - olh@suse.de
- update the default example config to mail to nagios%%localhost
instead to non-existant nagios-admin%%localhost
++++++ nagios.avail.host_name.patch ++++++
--- /var/tmp/diff_new_pack.K16064/_old 2007-01-18 01:50:23.000000000 +0100
+++ /var/tmp/diff_new_pack.K16064/_new 2007-01-18 01:50:23.000000000 +0100
@@ -3,8 +3,8 @@
avail.c:2483: warning: comparison with string literal
---
- cgi/avail.c | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
+ cgi/avail.c | 8 ++++----
+ 1 file changed, 4 insertions(+), 4 deletions(-)
Index: nagios-2.6/cgi/avail.c
===================================================================
@@ -19,3 +19,30 @@
/* we're only displaying a specific host (and summaries for all services associated with it) */
if(show_all_hosts==FALSE){
+@@ -2499,7 +2499,7 @@ void create_subject_list(void){
+ }
+
+ /* we're displaying a specific service */
+- else if(display_type==DISPLAY_SERVICE_AVAIL && svc_description!=""){
++ else if(display_type==DISPLAY_SERVICE_AVAIL && strcmp(svc_description, "")){
+
+ /* we're only displaying a specific service */
+ if(show_all_services==FALSE)
+@@ -2513,7 +2513,7 @@ void create_subject_list(void){
+ }
+
+ /* we're displaying one or more hostgroups (the host members of the groups) */
+- else if(display_type==DISPLAY_HOSTGROUP_AVAIL && hostgroup_name!=""){
++ else if(display_type==DISPLAY_HOSTGROUP_AVAIL && strcmp(hostgroup_name, "")){
+
+ /* we're displaying all hostgroups */
+ if(show_all_hostgroups==TRUE){
+@@ -2533,7 +2533,7 @@ void create_subject_list(void){
+ }
+
+ /* we're displaying one or more servicegroups (the host and service members of the groups) */
+- else if(display_type==DISPLAY_SERVICEGROUP_AVAIL && servicegroup_name!=""){
++ else if(display_type==DISPLAY_SERVICEGROUP_AVAIL && strcmp(servicegroup_name, "")){
+
+ /* we're displaying all servicegroups */
+ if(show_all_servicegroups==TRUE){
++++++ nagios.doc.faq-link.patch ++++++
---
html/docs/cgis.html | 10 +++++-----
html/docs/configmain.html | 8 ++++----
html/docs/networkreachability.html | 2 +-
html/docs/perfdata.html | 1 +
html/docs/redundancy.html | 4 ++--
html/docs/volatileservices.html | 2 +-
html/docs/whatsnew.html | 4 ++--
7 files changed, 16 insertions(+), 15 deletions(-)
Index: nagios-2.6/html/docs/cgis.html
===================================================================
--- nagios-2.6.orig/html/docs/cgis.html
+++ nagios-2.6/html/docs/cgis.html
@@ -129,7 +129,7 @@ This is the most important CGI included
<td align=left valign=top width="50%">
<p>
<strong>Description:</strong><br>
-This CGI creates a map of all hosts that you have defined on your network. The CGI uses Thomas Boutell's <a href="http://www.boutell.com/gd">gd</a> library (version 1.6.3 or higher) to create a PNG image of your network layout. The coordinates used when drawing each host (along with the optional pretty icons) are taken from <a href="configextinfo.html">extended host information</a> definitions. If you'd prefer to let the CGI automatically generate drawing coordinates for you, use the <a href="configcgi.html#default_statusmap_layout">default_statusmap_layout</a> directive to specify a layout algorithm that should be used. If you can't seem to find this CGI, or if you have get errors when trying to compile or run it, read <a href="faqs.html#gd_library_problems">this FAQ</a>.
+This CGI creates a map of all hosts that you have defined on your network. The CGI uses Thomas Boutell's <a href="http://www.boutell.com/gd">gd</a> library (version 1.6.3 or higher) to create a PNG image of your network layout. The coordinates used when drawing each host (along with the optional pretty icons) are taken from <a href="configextinfo.html">extended host information</a> definitions. If you'd prefer to let the CGI automatically generate drawing coordinates for you, use the <a href="configcgi.html#default_statusmap_layout">default_statusmap_layout</a> directive to specify a layout algorithm that should be used. If you can't seem to find this CGI, or if you have get errors when trying to compile or run it, read <a href="http://www.nagios.org/faqs/">this FAQ</a>.
</p>
<p>
<strong>Authorization Requirements:</strong><br>
@@ -404,7 +404,7 @@ This CGI allows you to send commands to
<p>
<ul>
<li>If you have chosen not to <a href="configcgi.html#use_authentication">use authentication</a> with the CGIs, this CGI will <i>not</i> allow anyone to issue commands to Nagios. This is done for your own protection. I would suggest removing this CGI altogether if you decide not to use authentication with the CGIs.
-<li>In order for the CGI to issue commands to Nagios, you will have to set the proper file and directory permissions as described in <a href="faqs.html#command_file_permissions">this FAQ</a>.
+<li>In order for the CGI to issue commands to Nagios, you will have to set the proper file and directory permissions as described in <a href="http://www.nagios.org/faqs/">this FAQ</a>.
</ul>
</p>
</td>
@@ -616,7 +616,7 @@ This CGI is used to display host and ser
<td align=left valign=top width="50%">
<p>
<strong>Description:</strong><br>
-This CGI is used to create a graph of host or service states over an arbitrary period of time. In order for this CGI to be of much use, you should enable <a href="configmain.html#log_rotation_method">log rotation</a> and keep archived logs in the path specified by the <a href="configmain.html#log_archive_path">log_archive_path</a> directive. The CGI uses Thomas Boutell's <a href="http://www.boutell.com/gd">gd</a> library (version 1.6.3 or higher) to create the trends image. If you can't seem to find this CGI or if you have get errors when trying to compile or run it, read <a href="faqs.html#gd_library_problems">this FAQ</a>.
+This CGI is used to create a graph of host or service states over an arbitrary period of time. In order for this CGI to be of much use, you should enable <a href="configmain.html#log_rotation_method">log rotation</a> and keep archived logs in the path specified by the <a href="configmain.html#log_archive_path">log_archive_path</a> directive. The CGI uses Thomas Boutell's <a href="http://www.boutell.com/gd">gd</a> library (version 1.6.3 or higher) to create the trends image. If you can't seem to find this CGI or if you have get errors when trying to compile or run it, read <a href="http://www.nagios.org/faqs/">this FAQ</a>.
</p>
<p>
<strong>Authorization Requirements:</strong><br>
@@ -706,7 +706,7 @@ This CGI is used to report on the availa
<td align=left valign=top width="50%">
<p>
<strong>Description:</strong><br>
-This CGI is used to report on the availability of hosts and services over a user-specified period of time. In order for this CGI to be of much use, you should enable <a href="configmain.html#log_rotation_method">log rotation</a> and keep archived logs in the path specified by the <a href="configmain.html#log_archive_path">log_archive_path</a> directive. The CGI uses Thomas Boutell's <a href="http://www.boutell.com/gd">gd</a> library (version 1.6.3 or higher) to create the histogram image. If you can't seem to find this CGI or if you have get errors when trying to compile or run it, read <a href="faqs.html#gd_library_problems">this FAQ</a>.
+This CGI is used to report on the availability of hosts and services over a user-specified period of time. In order for this CGI to be of much use, you should enable <a href="configmain.html#log_rotation_method">log rotation</a> and keep archived logs in the path specified by the <a href="configmain.html#log_archive_path">log_archive_path</a> directive. The CGI uses Thomas Boutell's <a href="http://www.boutell.com/gd">gd</a> library (version 1.6.3 or higher) to create the histogram image. If you can't seem to find this CGI or if you have get errors when trying to compile or run it, read <a href="http://www.nagios.org/faqs/">this FAQ</a>.
</p>
<p>
<strong>Authorization Requirements:</strong><br>
@@ -769,4 +769,4 @@ This CGI provides some generic reports a
<hr>
</body>
-</html>
\ No newline at end of file
+</html>
Index: nagios-2.6/html/docs/configmain.html
===================================================================
--- nagios-2.6.orig/html/docs/configmain.html
+++ nagios-2.6/html/docs/configmain.html
@@ -767,7 +767,7 @@ This is the directory where Nagios shoul
</p>
<p>
-This option determines whether or not Nagios will check the <a href="#command_file">command file</a> for commands that should be executed. This option must be enabled if you plan on using the <a href="cgis.html#command_cgi">command CGI</a> to issue commands via the web interface. Third party programs can also issue commands to Nagios by writing to the command file, provided proper rights to the file have been granted as outlined in <a href="faqs.html#command_file_permissions">this FAQ</a>. More information on external commands can be found <a href="extcommands.html">here</a>.
+This option determines whether or not Nagios will check the <a href="#command_file">command file</a> for commands that should be executed. This option must be enabled if you plan on using the <a href="cgis.html#command_cgi">command CGI</a> to issue commands via the web interface. Third party programs can also issue commands to Nagios by writing to the command file, provided proper rights to the file have been granted as outlined in <a href="http://www.nagios.org/faqs/">this FAQ</a>. More information on external commands can be found <a href="extcommands.html">here</a>.
</p>
<p>
<ul>
@@ -2313,7 +2313,7 @@ This option allows you to specify a comm
</tr>
</table>
</p>
-This option allows you to specify a command to be run after <i>every</i> service check to process service <a href="perdata.html">performance data</a> that may be returned from the check. The <i>command</i> argument is the short name of a <a href="xodtemplate.html#command">command definition</a> that you define in your object configuration file. This command is only executed if the <a href="#process_performance_data">process_performance_data</a> option is enabled globally and if the <i>process_perf_data</i> directive in the <a href="xodtemplate.html#service">service definition</a> is enabled.
+This option allows you to specify a command to be run after <i>every</i> service check to process service <a href="perfdata.html">performance data</a> that may be returned from the check. The <i>command</i> argument is the short name of a <a href="xodtemplate.html#command">command definition</a> that you define in your object configuration file. This command is only executed if the <a href="#process_performance_data">process_performance_data</a> option is enabled globally and if the <i>process_perf_data</i> directive in the <a href="xodtemplate.html#service">service definition</a> is enabled.
</p>
@@ -2338,7 +2338,7 @@ This option allows you to specify a comm
</tr>
</table>
</p>
-This option allows you to specify a file to which host <a href="perdata.html">performance data</a> will be written after every host check. Data will be written to the performance file as specified by the <a href="#host_perfdata_file_template">host_perfdata_file_template</a> option. Performance data is only written to this file if the <a href="#process_performance_data">process_performance_data</a> option is enabled globally and if the <i>process_perf_data</i> directive in the <a href="xodtemplate.html#host">host definition</a> is enabled.
+This option allows you to specify a file to which host <a href="perfdata.html">performance data</a> will be written after every host check. Data will be written to the performance file as specified by the <a href="#host_perfdata_file_template">host_perfdata_file_template</a> option. Performance data is only written to this file if the <a href="#process_performance_data">process_performance_data</a> option is enabled globally and if the <i>process_perf_data</i> directive in the <a href="xodtemplate.html#host">host definition</a> is enabled.
</p>
@@ -2363,7 +2363,7 @@ This option allows you to specify a file
</tr>
</table>
</p>
-This option allows you to specify a file to which service <a href="perdata.html">performance data</a> will be written after every service check. Data will be written to the performance file as specified by the <a href="#service_perfdata_file_template">service_perfdata_file_template</a> option. Performance data is only written to this file if the <a href="#process_performance_data">process_performance_data</a> option is enabled globally and if the <i>process_perf_data</i> directive in the <a href="xodtemplate.html#service">service definition</a> is enabled.
+This option allows you to specify a file to which service <a href="perfdata.html">performance data</a> will be written after every service check. Data will be written to the performance file as specified by the <a href="#service_perfdata_file_template">service_perfdata_file_template</a> option. Performance data is only written to this file if the <a href="#process_performance_data">process_performance_data</a> option is enabled globally and if the <i>process_perf_data</i> directive in the <a href="xodtemplate.html#service">service definition</a> is enabled.
</p>
Index: nagios-2.6/html/docs/networkreachability.html
===================================================================
--- nagios-2.6.orig/html/docs/networkreachability.html
+++ nagios-2.6/html/docs/networkreachability.html
@@ -94,7 +94,7 @@ If a host check command for a remote hos
</p>
<p>
-I get lots of email from people asking why Nagios is sending notifications out about hosts that are unreachable. The answer is because you configured it to do that. If you want to disable UNREACHABLE notifications for hosts, modify the <i>notification_options</i> argument of your host definitions to not include the <i>u</i> (unreachable) option. More information can be found in <a href="faqs.html#unreachable_notifications">this FAQ</a>.
+I get lots of email from people asking why Nagios is sending notifications out about hosts that are unreachable. The answer is because you configured it to do that. If you want to disable UNREACHABLE notifications for hosts, modify the <i>notification_options</i> argument of your host definitions to not include the <i>u</i> (unreachable) option. More information can be found in <a href="http://www.nagios.org/faqs/">this FAQ</a>.
</p>
<hr>
Index: nagios-2.6/html/docs/redundancy.html
===================================================================
--- nagios-2.6.orig/html/docs/redundancy.html
+++ nagios-2.6/html/docs/redundancy.html
@@ -60,7 +60,7 @@ Before you can even think about implemen
<ul>
<li>Implementing <a href="eventhandlers.html">event handlers</a> for hosts and services
<li>Issuing <a href="extcommands.html">external commands</a> to Nagios via shell scripts
-<li>Executing plugins on <a href="faqs.html#remote_host_monitoring">remote hosts</a> using either the <a href="addons.html#nrpe">nrpe addon</a> or some other method
+<li>Executing plugins on <a href="http://www.nagios.org/faqs/">remote hosts</a> using either the <a href="addons.html#nrpe">nrpe addon</a> or some other method
<li>Checking the status of the Nagios process with the <a href="plugins.html#check_nagios">check_nagios</a> plugin
</ul>
</p>
@@ -148,7 +148,7 @@ I will assume that you have the master h
<p>
<ul>
<li>The host definition for host A (in the host E configuration file) should have a host <a href="eventhandlers.html">event handler</a> defined. Lets say the name of the host event handler is <font color="red">handle-master-host-event</font>.
-<li>The configuration file on host E should have a service defined to check the status of the Nagios process on host A. Lets assume that you define this service check to run the <i>check_nagios</i> plugin on host A. This can be done by using one of the methods described in <a href="faqs.html#remote_host_monitoring">this FAQ</a>.
+<li>The configuration file on host E should have a service defined to check the status of the Nagios process on host A. Lets assume that you define this service check to run the <i>check_nagios</i> plugin on host A. This can be done by using one of the methods described in <a href="http://www.nagios.org/faqs/">this FAQ</a>.
<li>The service definition for the Nagios process check on host A should have an <a href="eventhandlers.html">event handler</a> defined. Lets say the name of the service event handler is <font color="red">handle-master-proc-event</font>.
</ul>
</p>
Index: nagios-2.6/html/docs/perfdata.html
===================================================================
--- nagios-2.6.orig/html/docs/perfdata.html
+++ nagios-2.6/html/docs/perfdata.html
@@ -1,3 +1,4 @@
+
<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0 Transitional//EN">
<html>
Index: nagios-2.6/html/docs/volatileservices.html
===================================================================
--- nagios-2.6.orig/html/docs/volatileservices.html
+++ nagios-2.6/html/docs/volatileservices.html
@@ -132,7 +132,7 @@ Create a shell script in the <i>/usr/loc
</p>
<p>
-Note that if you are running PortSentry as root, you will have to make additions to the script to reset file ownership and permissions so that Nagios and the CGIs can read/modify the command file. Details on permissions/ownership of the command file can be found <a href="faqs.html#command_file_permissions">here</a>.
+Note that if you are running PortSentry as root, you will have to make additions to the script to reset file ownership and permissions so that Nagios and the CGIs can read/modify the command file. Details on permissions/ownership of the command file can be found <a href="http://www.nagios.org/faqs/">here</a>.
</p>
<p>
Index: nagios-2.6/html/docs/whatsnew.html
===================================================================
--- nagios-2.6.orig/html/docs/whatsnew.html
+++ nagios-2.6/html/docs/whatsnew.html
@@ -24,7 +24,7 @@
<hr>
<p>
-<font color='red'><strong>Important:</strong></font> Make sure you read through the documentation (especially the <a href="faqs.html">FAQs</a>) before sending a question to the mailing lists.
+<font color='red'><strong>Important:</strong></font> Make sure you read through the documentation (especially the <a href="http://www.nagios.org/faqs/">FAQs</a>) before sending a question to the mailing lists.
</p>
@@ -144,4 +144,4 @@ There is a known issue that can affect N
<hr>
</body>
-</html>
\ No newline at end of file
+</html>
++++++ nagios-httpd.conf ++++++
--- nagios/nagios-httpd.conf 2005-05-14 21:12:42.000000000 +0200
+++ /mounts/work_src_done/STABLE/nagios/nagios-httpd.conf 2007-01-11 11:34:47.000000000 +0100
@@ -6,7 +6,7 @@
allow from 127.0.0.1
</Directory>
-Alias /nagios/ /usr/share/nagios/
+Alias /nagios /usr/share/nagios/