Hello community, here is the log from the commit of package nagios checked in at Wed Jan 10 23:38:15 CET 2007. -------- --- nagios/nagios.changes 2007-01-08 22:30:28.000000000 +0100 +++ /mounts/work_src_done/STABLE/nagios/nagios.changes 2007-01-10 21:12:14.000000000 +0100 @@ -1,0 +2,11 @@ +Wed Jan 10 18:05:04 CET 2007 - olh@suse.de + +- update the default example config to mail to nagios%localhost + instead to non-existant nagios-admin%localhost + +------------------------------------------------------------------- +Wed Jan 10 11:58:32 CET 2007 - olh@suse.de + +- fix comparison with string literal (#232415) + +------------------------------------------------------------------- New: ---- nagios.avail.host_name.patch nagios.sample-config.email-admin-localhost.patch ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ nagios.spec ++++++ --- /var/tmp/diff_new_pack.US1720/_old 2007-01-10 23:37:42.000000000 +0100 +++ /var/tmp/diff_new_pack.US1720/_new 2007-01-10 23:37:42.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: 12 +Release: 13 URL: http://www.nagios.org/ License: GNU General Public License (GPL) Group: System/Monitoring @@ -33,6 +33,8 @@ Source3: nagios-httpd.conf Source6: nagios.logrotate Patch: nagios.sehandlers.end_time.patch +Patch1: nagios.avail.host_name.patch +Patch2: nagios.sample-config.email-admin-localhost.patch %description The Nagios Network Monitor @@ -57,6 +59,8 @@ %prep %setup -q %patch -p1 +%patch1 -p1 +%patch2 -p1 %build CFLAGS="$RPM_OPT_FLAGS" CXXFLAGS="$RPM_OPT_FLAGS" \ @@ -182,6 +186,11 @@ %config(noreplace) %{apache2_sysconfdir}/conf.d/* %changelog -n nagios +* Wed Jan 10 2007 - olh@suse.de +- update the default example config to mail to nagios%%localhost + instead to non-existant nagios-admin%%localhost +* Wed Jan 10 2007 - olh@suse.de +- fix comparison with string literal (#232415) * Mon Jan 08 2007 - olh@suse.de - move pid file to /var/run/nagios/ (#231169) * Fri Dec 01 2006 - tsieden@suse.de ++++++ nagios.avail.host_name.patch ++++++ https://bugzilla.novell.com/show_bug.cgi?id=232415 avail.c:2483: warning: comparison with string literal --- cgi/avail.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) Index: nagios-2.6/cgi/avail.c =================================================================== --- nagios-2.6.orig/cgi/avail.c +++ nagios-2.6/cgi/avail.c @@ -2480,7 +2480,7 @@ void create_subject_list(void){ char *last_host_name=""; /* we're displaying one or more hosts */ - if(display_type==DISPLAY_HOST_AVAIL && host_name!=""){ + if(display_type==DISPLAY_HOST_AVAIL && strcmp(host_name, "")){ /* we're only displaying a specific host (and summaries for all services associated with it) */ if(show_all_hosts==FALSE){ ++++++ nagios.sample-config.email-admin-localhost.patch ++++++ Mail to nagios@localhost instead of non-existant nagios-admin@localhost --- sample-config/template-object/localhost.cfg.in | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) Index: nagios-2.6/sample-config/template-object/localhost.cfg.in =================================================================== --- nagios-2.6.orig/sample-config/template-object/localhost.cfg.in +++ nagios-2.6/sample-config/template-object/localhost.cfg.in @@ -91,8 +91,6 @@ define timeperiod{ ############################################################################### # In this simple config file, a single contact will receive all alerts. -# This assumes that you have an account (or email alias) called -# "@nagios_user@-admin" on the local host. define contact{ contact_name @nagios_user@-admin @@ -103,7 +101,7 @@ define contact{ host_notification_options d,r service_notification_commands notify-by-email host_notification_commands host-notify-by-email - email @nagios_user@-admin@localhost + email @nagios_user@@localhost } ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Remember to have fun... --------------------------------------------------------------------- To unsubscribe, e-mail: opensuse-commit+unsubscribe@opensuse.org For additional commands, e-mail: opensuse-commit+help@opensuse.org