[Pkg-nagios-devel] nagios/patches 999_cvs_1x_bugfixes.dpatch,1.1,1.2
joerg@haydn.debian.org
joerg@haydn.debian.org
- Previous message: [Pkg-nagios-devel] nagios install,NONE,1.1 nagios-mysql.dirs,NONE,1.1 nagios-mysql.install,NONE,1.1 nagios-pgsql.dirs,NONE,1.1 nagios-pgsql.install,NONE,1.1 nagios-text.dirs,NONE,1.1 changelog,1.2,1.3 control,1.2,1.3 docs,1.1.1.1,1.2 examples,1.1.1.1,1.2 rules,1.2,1.3
- Next message: [Pkg-nagios-devel] nagios changelog,1.3,1.4 control,1.3,1.4 rules,1.3,1.4
- Messages sorted by:
[ date ]
[ thread ]
[ subject ]
[ author ]
Update of /cvsroot/pkg-nagios/nagios/patches
In directory haydn:/tmp/cvs-serv23595/patches
Modified Files:
999_cvs_1x_bugfixes.dpatch
Log Message:
Continue changes.
Not finished, DO NOT UPLOAD.
Index: 999_cvs_1x_bugfixes.dpatch
===================================================================
RCS file: /cvsroot/pkg-nagios/nagios/patches/999_cvs_1x_bugfixes.dpatch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -d -r1.1 -r1.2
--- 999_cvs_1x_bugfixes.dpatch 31 Oct 2004 14:52:45 -0000 1.1
+++ 999_cvs_1x_bugfixes.dpatch 31 Oct 2004 22:00:09 -0000 1.2
@@ -5,9 +5,9 @@
## DP: Update to latest CVS of 1.x Bugfix tree
@DPATCH@
-diff -urNad nagios-1.2/base/checks.c nagios-1.2/base/checks.c
+diff -urNad nagios-1.2/base/checks.c /home/joerg/tmp/dpep.VuUghd/nagios-1.2/base/checks.c
--- nagios-1.2/base/checks.c 2003-12-05 03:01:44.000000000 +0100
-+++ nagios-1.2/base/checks.c 2004-10-25 04:32:14.000000000 +0200
++++ /home/joerg/tmp/dpep.VuUghd/nagios-1.2/base/checks.c 2004-10-31 19:16:26.589758142 +0100
@@ -2,8 +2,8 @@
*
* CHECKS.C - Service and host check functions for Nagios
@@ -28,9 +28,9 @@
buffer[sizeof(buffer)-1]='\x0';
write_to_logs_and_console(buffer,NSLOG_RUNTIME_WARNING,TRUE);
-diff -urNad nagios-1.2/base/commands.c nagios-1.2/base/commands.c
+diff -urNad nagios-1.2/base/commands.c /home/joerg/tmp/dpep.VuUghd/nagios-1.2/base/commands.c
--- nagios-1.2/base/commands.c 2003-07-02 01:12:24.000000000 +0200
-+++ nagios-1.2/base/commands.c 2004-10-25 04:32:15.000000000 +0200
++++ /home/joerg/tmp/dpep.VuUghd/nagios-1.2/base/commands.c 2004-10-31 19:16:26.590758201 +0100
@@ -2,8 +2,8 @@
*
* COMMANDS.C - External command functions for Nagios
@@ -50,9 +50,9 @@
#include "../common/statusdata.h"
#include "sretention.h"
#include "nagios.h"
-diff -urNad nagios-1.2/base/config.c nagios-1.2/base/config.c
+diff -urNad nagios-1.2/base/config.c /home/joerg/tmp/dpep.VuUghd/nagios-1.2/base/config.c
--- nagios-1.2/base/config.c 2003-08-07 05:30:14.000000000 +0200
-+++ nagios-1.2/base/config.c 2004-10-25 04:32:16.000000000 +0200
++++ /home/joerg/tmp/dpep.VuUghd/nagios-1.2/base/config.c 2004-10-31 19:16:26.590758201 +0100
@@ -2,8 +2,8 @@
*
* CONFIG.C - Configuration input and verification routines for Nagios
@@ -73,9 +73,9 @@
#endif
read_resource_file(value);
}
-diff -urNad nagios-1.2/base/nagios.c nagios-1.2/base/nagios.c
+diff -urNad nagios-1.2/base/nagios.c /home/joerg/tmp/dpep.VuUghd/nagios-1.2/base/nagios.c
--- nagios-1.2/base/nagios.c 2004-02-03 05:45:08.000000000 +0100
-+++ nagios-1.2/base/nagios.c 2004-10-25 04:32:18.000000000 +0200
++++ /home/joerg/tmp/dpep.VuUghd/nagios-1.2/base/nagios.c 2004-10-31 19:16:26.630760568 +0100
@@ -3,12 +3,12 @@
* NAGIOS.C - Core Program Code For Nagios
*
@@ -352,9 +352,9 @@
}
-
-
-diff -urNad nagios-1.2/base/nagios.h.in nagios-1.2/base/nagios.h.in
+diff -urNad nagios-1.2/base/nagios.h.in /home/joerg/tmp/dpep.VuUghd/nagios-1.2/base/nagios.h.in
--- nagios-1.2/base/nagios.h.in 2002-08-08 07:00:51.000000000 +0200
-+++ nagios-1.2/base/nagios.h.in 2004-10-25 04:32:18.000000000 +0200
++++ /home/joerg/tmp/dpep.VuUghd/nagios-1.2/base/nagios.h.in 2004-10-31 19:16:26.631760627 +0100
@@ -2,7 +2,7 @@
*
* Nagios Main Header File
@@ -381,9 +381,9 @@
/**** Flap Detection Functions ****/
-diff -urNad nagios-1.2/base/notifications.c nagios-1.2/base/notifications.c
+diff -urNad nagios-1.2/base/notifications.c /home/joerg/tmp/dpep.VuUghd/nagios-1.2/base/notifications.c
--- nagios-1.2/base/notifications.c 2003-12-05 03:01:44.000000000 +0100
-+++ nagios-1.2/base/notifications.c 2004-03-24 06:39:47.000000000 +0100
++++ /home/joerg/tmp/dpep.VuUghd/nagios-1.2/base/notifications.c 2004-10-31 19:16:26.631760627 +0100
@@ -2,8 +2,8 @@
*
* NOTIFICATIONS.C - Service and host notification functions for Nagios
@@ -415,9 +415,9 @@
svc->no_more_notifications=TRUE;
else
svc->no_more_notifications=FALSE;
-diff -urNad nagios-1.2/base/sretention.h nagios-1.2/base/sretention.h
+diff -urNad nagios-1.2/base/sretention.h /home/joerg/tmp/dpep.VuUghd/nagios-1.2/base/sretention.h
--- nagios-1.2/base/sretention.h 2002-02-26 05:03:28.000000000 +0100
-+++ nagios-1.2/base/sretention.h 2004-10-25 04:32:18.000000000 +0200
++++ /home/joerg/tmp/dpep.VuUghd/nagios-1.2/base/sretention.h 2004-10-31 19:16:26.632760686 +0100
@@ -2,8 +2,8 @@
*
* SRETENTION.H - Header for state retention routines
@@ -446,9 +446,9 @@
+
+
+#endif
-diff -urNad nagios-1.2/cgi/avail.c nagios-1.2/cgi/avail.c
+diff -urNad nagios-1.2/cgi/avail.c /home/joerg/tmp/dpep.VuUghd/nagios-1.2/cgi/avail.c
--- nagios-1.2/cgi/avail.c 2002-10-27 06:49:53.000000000 +0100
-+++ nagios-1.2/cgi/avail.c 2004-10-25 04:32:19.000000000 +0200
++++ /home/joerg/tmp/dpep.VuUghd/nagios-1.2/cgi/avail.c 2004-10-31 19:16:26.669762875 +0100
@@ -2,8 +2,8 @@
*
* AVAIL.C - Nagios Availability CGI
@@ -468,9 +468,9 @@
int have_some_real_data=FALSE;
hoststatus *hststatus=NULL;
servicestatus *svcstatus=NULL;
-diff -urNad nagios-1.2/cgi/cgiutils.c nagios-1.2/cgi/cgiutils.c
+diff -urNad nagios-1.2/cgi/cgiutils.c /home/joerg/tmp/dpep.VuUghd/nagios-1.2/cgi/cgiutils.c
--- nagios-1.2/cgi/cgiutils.c 2002-11-11 04:52:13.000000000 +0100
-+++ nagios-1.2/cgi/cgiutils.c 2004-10-26 01:25:19.000000000 +0200
++++ /home/joerg/tmp/dpep.VuUghd/nagios-1.2/cgi/cgiutils.c 2004-10-31 19:16:26.670762934 +0100
@@ -2,8 +2,8 @@
*
* CGIUTILS.C - Common utilities for Nagios CGIs
@@ -493,9 +493,9 @@
encoded_url_string[y]=input[x];
y++;
}
-diff -urNad nagios-1.2/cgi/extinfo.c nagios-1.2/cgi/extinfo.c
+diff -urNad nagios-1.2/cgi/extinfo.c /home/joerg/tmp/dpep.VuUghd/nagios-1.2/cgi/extinfo.c
--- nagios-1.2/cgi/extinfo.c 2004-01-21 06:12:34.000000000 +0100
-+++ nagios-1.2/cgi/extinfo.c 2004-10-25 04:32:19.000000000 +0200
++++ /home/joerg/tmp/dpep.VuUghd/nagios-1.2/cgi/extinfo.c 2004-10-31 19:16:26.691764176 +0100
@@ -3,7 +3,7 @@
* EXTINFO.C - Nagios Extended Information CGI
*
@@ -544,9 +544,9 @@
int days;
int hours;
int minutes;
-diff -urNad nagios-1.2/cgi/status.c nagios-1.2/cgi/status.c
+diff -urNad nagios-1.2/cgi/status.c /home/joerg/tmp/dpep.VuUghd/nagios-1.2/cgi/status.c
--- nagios-1.2/cgi/status.c 2003-11-23 02:37:22.000000000 +0100
-+++ nagios-1.2/cgi/status.c 2004-10-25 04:32:19.000000000 +0200
++++ /home/joerg/tmp/dpep.VuUghd/nagios-1.2/cgi/status.c 2004-10-31 19:16:26.692764235 +0100
@@ -2,8 +2,8 @@
*
* STATUS.C - Nagios Status CGI
@@ -623,9 +623,9 @@
int current_item;
-diff -urNad nagios-1.2/cgi/statusmap.c nagios-1.2/cgi/statusmap.c
+diff -urNad nagios-1.2/cgi/statusmap.c /home/joerg/tmp/dpep.VuUghd/nagios-1.2/cgi/statusmap.c
--- nagios-1.2/cgi/statusmap.c 2004-01-21 05:37:15.000000000 +0100
-+++ nagios-1.2/cgi/statusmap.c 2004-10-25 04:32:20.000000000 +0200
++++ /home/joerg/tmp/dpep.VuUghd/nagios-1.2/cgi/statusmap.c 2004-10-31 19:16:26.693764294 +0100
@@ -3,7 +3,7 @@
* STATUSMAP.C - Nagios Network Status Map CGI
*
@@ -661,9 +661,9 @@
hostextinfo *temp_hostextinfo;
/* calculate all host coords, starting with first layer */
-diff -urNad nagios-1.2/cgi/statuswrl.c nagios-1.2/cgi/statuswrl.c
+diff -urNad nagios-1.2/cgi/statuswrl.c /home/joerg/tmp/dpep.VuUghd/nagios-1.2/cgi/statuswrl.c
--- nagios-1.2/cgi/statuswrl.c 2002-10-23 02:01:40.000000000 +0200
-+++ nagios-1.2/cgi/statuswrl.c 2004-10-25 04:32:20.000000000 +0200
++++ /home/joerg/tmp/dpep.VuUghd/nagios-1.2/cgi/statuswrl.c 2004-10-31 19:16:26.694764353 +0100
@@ -2,8 +2,8 @@
*
* STATUSWRL.C - Nagios 3-D (VRML) Network Status View
@@ -694,9 +694,9 @@
/******************************/
-diff -urNad nagios-1.2/cgi/summary.c nagios-1.2/cgi/summary.c
+diff -urNad nagios-1.2/cgi/summary.c /home/joerg/tmp/dpep.VuUghd/nagios-1.2/cgi/summary.c
--- nagios-1.2/cgi/summary.c 2003-01-08 05:29:03.000000000 +0100
-+++ nagios-1.2/cgi/summary.c 2004-10-25 04:32:20.000000000 +0200
++++ /home/joerg/tmp/dpep.VuUghd/nagios-1.2/cgi/summary.c 2004-10-31 19:16:26.694764353 +0100
@@ -2,8 +2,8 @@
*
* SUMMARY.C - Nagios Alert Summary CGI
@@ -719,9 +719,9 @@
int days, hours, minutes, seconds;
hostgroup *temp_hostgroup;
time_t t3;
-diff -urNad nagios-1.2/cgi/trends.c nagios-1.2/cgi/trends.c
+diff -urNad nagios-1.2/cgi/trends.c /home/joerg/tmp/dpep.VuUghd/nagios-1.2/cgi/trends.c
--- nagios-1.2/cgi/trends.c 2003-11-23 02:37:22.000000000 +0100
-+++ nagios-1.2/cgi/trends.c 2004-05-20 07:48:00.000000000 +0200
++++ /home/joerg/tmp/dpep.VuUghd/nagios-1.2/cgi/trends.c 2004-10-31 19:16:26.696764472 +0100
@@ -2,8 +2,8 @@
*
* TRENDS.C - Nagios State Trends CGI
@@ -742,9 +742,9 @@
/* determine next start and end time range with zoom factor */
if(zoom_factor>0){
-diff -urNad nagios-1.2/Changelog nagios-1.2/Changelog
+diff -urNad nagios-1.2/Changelog /home/joerg/tmp/dpep.VuUghd/nagios-1.2/Changelog
--- nagios-1.2/Changelog 2004-02-03 05:45:08.000000000 +0100
-+++ nagios-1.2/Changelog 2004-10-25 04:32:12.000000000 +0200
++++ /home/joerg/tmp/dpep.VuUghd/nagios-1.2/Changelog 2004-10-31 19:16:26.696764472 +0100
@@ -3,6 +3,19 @@
###################
@@ -765,9 +765,9 @@
1.2 - 02/02/2004
----------------
* Host stalking bug fix
-diff -urNad nagios-1.2/common/common.h nagios-1.2/common/common.h
+diff -urNad nagios-1.2/common/common.h /home/joerg/tmp/dpep.VuUghd/nagios-1.2/common/common.h
--- nagios-1.2/common/common.h 2004-02-03 05:45:08.000000000 +0100
-+++ nagios-1.2/common/common.h 2004-10-25 04:32:20.000000000 +0200
++++ /home/joerg/tmp/dpep.VuUghd/nagios-1.2/common/common.h 2004-10-31 19:16:26.696764472 +0100
@@ -22,8 +22,8 @@
************************************************************************/
@@ -779,9 +779,9 @@
/***************************** COMMANDS *********************************/
-diff -urNad nagios-1.2/common/downtime.c nagios-1.2/common/downtime.c
+diff -urNad nagios-1.2/common/downtime.c /home/joerg/tmp/dpep.VuUghd/nagios-1.2/common/downtime.c
--- nagios-1.2/common/downtime.c 2002-10-18 02:07:05.000000000 +0200
-+++ nagios-1.2/common/downtime.c 2004-10-25 04:32:20.000000000 +0200
++++ /home/joerg/tmp/dpep.VuUghd/nagios-1.2/common/downtime.c 2004-10-31 19:16:26.696764472 +0100
@@ -2,8 +2,8 @@
*
* DOWNTIME.C - Scheduled downtime functions for Nagios
@@ -835,9 +835,9 @@
return result;
}
-diff -urNad nagios-1.2/configure nagios-1.2/configure
+diff -urNad nagios-1.2/configure /home/joerg/tmp/dpep.VuUghd/nagios-1.2/configure
--- nagios-1.2/configure 2004-02-03 05:45:08.000000000 +0100
-+++ nagios-1.2/configure 2004-10-25 04:32:13.000000000 +0200
++++ /home/joerg/tmp/dpep.VuUghd/nagios-1.2/configure 2004-10-31 19:16:26.697764531 +0100
@@ -87,9 +87,9 @@
ac_help="$ac_help
--disable-statuswrl=disables compilation of statuswrl (VRML) CGI"
@@ -862,9 +862,9 @@
ac_aux_dir=
for ac_dir in $srcdir $srcdir/.. $srcdir/../..; do
-diff -urNad nagios-1.2/configure.in nagios-1.2/configure.in
+diff -urNad nagios-1.2/configure.in /home/joerg/tmp/dpep.VuUghd/nagios-1.2/configure.in
--- nagios-1.2/configure.in 2004-02-03 05:45:08.000000000 +0100
-+++ nagios-1.2/configure.in 2004-10-25 04:32:13.000000000 +0200
++++ /home/joerg/tmp/dpep.VuUghd/nagios-1.2/configure.in 2004-10-31 19:16:26.698764590 +0100
@@ -4,9 +4,9 @@
AC_PREFIX_DEFAULT(/usr/local/nagios)
@@ -888,9 +888,9 @@
AC_SUBST(htmurl)
AC_SUBST(cgiurl)
-diff -urNad nagios-1.2/contrib/database/create_mysql nagios-1.2/contrib/database/create_mysql
+diff -urNad nagios-1.2/contrib/database/create_mysql /home/joerg/tmp/dpep.VuUghd/nagios-1.2/contrib/database/create_mysql
--- nagios-1.2/contrib/database/create_mysql 2002-04-17 05:44:50.000000000 +0200
-+++ nagios-1.2/contrib/database/create_mysql 2004-10-21 05:14:34.000000000 +0200
++++ /home/joerg/tmp/dpep.VuUghd/nagios-1.2/contrib/database/create_mysql 2004-10-31 19:16:26.698764590 +0100
@@ -9,7 +9,7 @@
#
@@ -927,9 +927,9 @@
host_name varchar(75) NOT NULL,
service_description varchar(128) NOT NULL,
entry_time datetime DEFAULT '0000-00-00 00:00:00' NOT NULL,
-diff -urNad nagios-1.2/contrib/eventhandlers/distributed-monitoring/submit_check_result_via_nsca nagios-1.2/contrib/eventhandlers/distributed-monitoring/submit_check_result_via_nsca
+diff -urNad nagios-1.2/contrib/eventhandlers/distributed-monitoring/submit_check_result_via_nsca /home/joerg/tmp/dpep.VuUghd/nagios-1.2/contrib/eventhandlers/distributed-monitoring/submit_check_result_via_nsca
--- nagios-1.2/contrib/eventhandlers/distributed-monitoring/submit_check_result_via_nsca 2002-02-26 05:03:37.000000000 +0100
-+++ nagios-1.2/contrib/eventhandlers/distributed-monitoring/submit_check_result_via_nsca 2004-02-20 05:35:38.000000000 +0100
++++ /home/joerg/tmp/dpep.VuUghd/nagios-1.2/contrib/eventhandlers/distributed-monitoring/submit_check_result_via_nsca 2004-10-31 19:16:26.699764649 +0100
@@ -2,7 +2,7 @@
# SUBMIT_CHECK_RESULT_VIA_NSCA
@@ -962,9 +962,9 @@
# EOF
-diff -urNad nagios-1.2/contrib/eventhandlers/redundancy-scenario1/handle-master-host-event nagios-1.2/contrib/eventhandlers/redundancy-scenario1/handle-master-host-event
+diff -urNad nagios-1.2/contrib/eventhandlers/redundancy-scenario1/handle-master-host-event /home/joerg/tmp/dpep.VuUghd/nagios-1.2/contrib/eventhandlers/redundancy-scenario1/handle-master-host-event
--- nagios-1.2/contrib/eventhandlers/redundancy-scenario1/handle-master-host-event 2002-02-26 05:03:37.000000000 +0100
-+++ nagios-1.2/contrib/eventhandlers/redundancy-scenario1/handle-master-host-event 2004-02-20 05:35:39.000000000 +0100
++++ /home/joerg/tmp/dpep.VuUghd/nagios-1.2/contrib/eventhandlers/redundancy-scenario1/handle-master-host-event 2004-10-31 19:16:26.699764649 +0100
@@ -2,7 +2,7 @@
# REDUNDANCY EVENT HANDLER SCRIPT
@@ -992,9 +992,9 @@
;;
-diff -urNad nagios-1.2/contrib/mini_epn.c nagios-1.2/contrib/mini_epn.c
+diff -urNad nagios-1.2/contrib/mini_epn.c /home/joerg/tmp/dpep.VuUghd/nagios-1.2/contrib/mini_epn.c
--- nagios-1.2/contrib/mini_epn.c 2003-04-10 05:49:51.000000000 +0200
-+++ nagios-1.2/contrib/mini_epn.c 2004-02-11 05:45:23.000000000 +0100
++++ /home/joerg/tmp/dpep.VuUghd/nagios-1.2/contrib/mini_epn.c 2004-10-31 19:16:26.699764649 +0100
@@ -23,7 +23,7 @@
#define MAX_COMMANDLINE_LENGTH 160
@@ -1036,9 +1036,9 @@
+ perl_free(my_perl);
exit(exitstatus);
}
-diff -urNad nagios-1.2/html/docs/distributed.html nagios-1.2/html/docs/distributed.html
+diff -urNad nagios-1.2/html/docs/distributed.html /home/joerg/tmp/dpep.VuUghd/nagios-1.2/html/docs/distributed.html
--- nagios-1.2/html/docs/distributed.html 2002-09-23 05:08:06.000000000 +0200
-+++ nagios-1.2/html/docs/distributed.html 2004-02-20 05:35:39.000000000 +0100
++++ /home/joerg/tmp/dpep.VuUghd/nagios-1.2/html/docs/distributed.html 2004-10-31 19:16:26.699764649 +0100
@@ -171,7 +171,7 @@
# in turn transmits the data to the nsca daemon on the central
# monitoring server
@@ -1048,9 +1048,9 @@
</pre>
</p>
-diff -urNad nagios-1.2/html/docs/embeddedperl.html nagios-1.2/html/docs/embeddedperl.html
+diff -urNad nagios-1.2/html/docs/embeddedperl.html /home/joerg/tmp/dpep.VuUghd/nagios-1.2/html/docs/embeddedperl.html
--- nagios-1.2/html/docs/embeddedperl.html 2003-05-30 21:25:56.000000000 +0200
-+++ nagios-1.2/html/docs/embeddedperl.html 2004-02-20 05:35:39.000000000 +0100
++++ /home/joerg/tmp/dpep.VuUghd/nagios-1.2/html/docs/embeddedperl.html 2004-02-20 05:35:39.000000000 +0100
@@ -273,7 +273,7 @@
# service[check_nfs]=NFS;24x7;3;5;5;unix-admin;60;24x7;1;1;1;;check_rpc
#
@@ -1060,9 +1060,9 @@
#
# Copyright Notice: GPL
#
-diff -urNad nagios-1.2/html/docs/notifications.html nagios-1.2/html/docs/notifications.html
+diff -urNad nagios-1.2/html/docs/notifications.html /home/joerg/tmp/dpep.VuUghd/nagios-1.2/html/docs/notifications.html
--- nagios-1.2/html/docs/notifications.html 2002-08-12 03:46:38.000000000 +0200
-+++ nagios-1.2/html/docs/notifications.html 2004-03-24 06:39:47.000000000 +0100
++++ /home/joerg/tmp/dpep.VuUghd/nagios-1.2/html/docs/notifications.html 2004-10-31 19:16:26.700764708 +0100
@@ -55,7 +55,7 @@
<p>
<ul>
@@ -1072,9 +1072,9 @@
</ul>
</p>
-diff -urNad nagios-1.2/html/docs/xoddefault.html nagios-1.2/html/docs/xoddefault.html
+diff -urNad nagios-1.2/html/docs/xoddefault.html /home/joerg/tmp/dpep.VuUghd/nagios-1.2/html/docs/xoddefault.html
--- nagios-1.2/html/docs/xoddefault.html 2002-02-26 05:03:41.000000000 +0100
-+++ nagios-1.2/html/docs/xoddefault.html 2004-03-24 06:39:47.000000000 +0100
++++ /home/joerg/tmp/dpep.VuUghd/nagios-1.2/html/docs/xoddefault.html 2004-10-31 19:16:26.701764768 +0100
@@ -129,7 +129,7 @@
<tr>
<td valign="top"><strong><notification_interval></strong></td>
@@ -1084,9 +1084,9 @@
</td>
</tr>
<tr>
-diff -urNad nagios-1.2/html/docs/xodtemplate.html nagios-1.2/html/docs/xodtemplate.html
+diff -urNad nagios-1.2/html/docs/xodtemplate.html /home/joerg/tmp/dpep.VuUghd/nagios-1.2/html/docs/xodtemplate.html
--- nagios-1.2/html/docs/xodtemplate.html 2002-10-18 00:49:37.000000000 +0200
-+++ nagios-1.2/html/docs/xodtemplate.html 2004-03-24 06:39:47.000000000 +0100
++++ /home/joerg/tmp/dpep.VuUghd/nagios-1.2/html/docs/xodtemplate.html 2004-10-31 19:16:26.701764768 +0100
@@ -544,7 +544,7 @@
<tr>
<td valign="top"><strong>notification_interval</strong>:</td>
@@ -1096,9 +1096,9 @@
</td>
</tr>
<tr>
-diff -urNad nagios-1.2/html/main.html nagios-1.2/html/main.html
+diff -urNad nagios-1.2/html/main.html /home/joerg/tmp/dpep.VuUghd/nagios-1.2/html/main.html
--- nagios-1.2/html/main.html 2004-02-03 05:45:09.000000000 +0100
-+++ nagios-1.2/html/main.html 2004-10-25 04:32:20.000000000 +0200
++++ /home/joerg/tmp/dpep.VuUghd/nagios-1.2/html/main.html 2004-10-31 19:16:26.702764827 +0100
@@ -35,8 +35,8 @@
<P>
@@ -1110,9 +1110,9 @@
</div>
</P>
-diff -urNad nagios-1.2/Makefile.in nagios-1.2/Makefile.in
+diff -urNad nagios-1.2/Makefile.in /home/joerg/tmp/dpep.VuUghd/nagios-1.2/Makefile.in
--- nagios-1.2/Makefile.in 2002-10-26 02:47:15.000000000 +0200
-+++ nagios-1.2/Makefile.in 2004-03-24 06:39:47.000000000 +0100
++++ /home/joerg/tmp/dpep.VuUghd/nagios-1.2/Makefile.in 2004-10-31 19:16:26.702764827 +0100
@@ -1,7 +1,7 @@
###############################
# Makefile for Nagios
@@ -1131,9 +1131,9 @@
@echo "the documentation for more information on how to actually define"
@echo "services, hosts, etc. to fit your particular needs."
@echo ""
-diff -urNad nagios-1.2/nagios.spec nagios-1.2/nagios.spec
+diff -urNad nagios-1.2/nagios.spec /home/joerg/tmp/dpep.VuUghd/nagios-1.2/nagios.spec
--- nagios-1.2/nagios.spec 2003-07-02 01:12:24.000000000 +0200
-+++ nagios-1.2/nagios.spec 2004-10-25 04:32:13.000000000 +0200
++++ /home/joerg/tmp/dpep.VuUghd/nagios-1.2/nagios.spec 2004-10-31 19:16:26.702764827 +0100
@@ -1,5 +1,5 @@
%define name nagios
-%define version 1.2
@@ -1141,9 +1141,9 @@
%define release 1
%define nsusr nagios
%define nsgrp nagios
-diff -urNad nagios-1.2/xdata/xcddb.c nagios-1.2/xdata/xcddb.c
---- nagios-1.2/xdata/xcddb.c 2003-05-31 22:44:27.000000000 +0200
-+++ nagios-1.2/xdata/xcddb.c 2004-10-21 05:14:35.000000000 +0200
+diff -urNad nagios-1.2/xdata/xcddb.c /home/joerg/tmp/dpep.VuUghd/nagios-1.2/xdata/xcddb.c
+--- nagios-1.2/xdata/xcddb.c 2004-10-31 19:16:25.849714368 +0100
++++ /home/joerg/tmp/dpep.VuUghd/nagios-1.2/xdata/xcddb.c 2004-10-31 19:16:26.703764886 +0100
@@ -711,7 +711,7 @@
snprintf(sql_statement,sizeof(sql_statement)-1,"INSERT INTO %s (host_name,persistent,entry_time,author_name,comment_data) VALUES ('%s','%d',FROM_UNIXTIME(%lu),'%s','%s')",XCDDB_HOSTCOMMENTS_TABLE,escaped_host_name,persistent,entry_time,escaped_author_name,escaped_comment_data);
#endif
@@ -1162,9 +1162,9 @@
#endif
sql_statement[sizeof(sql_statement)-1]='\x0';
-diff -urNad nagios-1.2/xdata/xdddb.c nagios-1.2/xdata/xdddb.c
---- nagios-1.2/xdata/xdddb.c 2003-05-31 22:44:27.000000000 +0200
-+++ nagios-1.2/xdata/xdddb.c 2004-10-21 05:14:35.000000000 +0200
+diff -urNad nagios-1.2/xdata/xdddb.c /home/joerg/tmp/dpep.VuUghd/nagios-1.2/xdata/xdddb.c
+--- nagios-1.2/xdata/xdddb.c 2004-10-31 19:16:25.849714368 +0100
++++ /home/joerg/tmp/dpep.VuUghd/nagios-1.2/xdata/xdddb.c 2004-10-31 19:16:26.703764886 +0100
@@ -751,7 +751,7 @@
snprintf(sql_statement,sizeof(sql_statement)-1,"INSERT INTO %s (host_name,entry_time,author_name,comment_data,start_time,end_time,fixed,duration) VALUES ('%s',FROM_UNIXTIME(%lu),'%s','%s',FROM_UNIXTIME(%lu),FROM_UNIXTIME(%lu),'%d','%lu')",XDDDB_HOSTDOWNTIME_TABLE,escaped_host_name,entry_time,escaped_author_name,escaped_comment_data,start_time,end_time,fixed,duration);
#endif
@@ -1183,9 +1183,9 @@
#endif
sql_statement[sizeof(sql_statement)-1]='\x0';
-diff -urNad nagios-1.2/xdata/xedtemplate.c nagios-1.2/xdata/xedtemplate.c
+diff -urNad nagios-1.2/xdata/xedtemplate.c /home/joerg/tmp/dpep.VuUghd/nagios-1.2/xdata/xedtemplate.c
--- nagios-1.2/xdata/xedtemplate.c 2002-11-11 02:13:10.000000000 +0100
-+++ nagios-1.2/xdata/xedtemplate.c 2004-10-25 04:32:21.000000000 +0200
++++ /home/joerg/tmp/dpep.VuUghd/nagios-1.2/xdata/xedtemplate.c 2004-10-31 19:16:26.704764945 +0100
@@ -2,8 +2,8 @@
*
* XEDTEMPLATE.C - Template-based extended information data input routines
@@ -1231,9 +1231,9 @@
}
-diff -urNad nagios-1.2/xdata/xodtemplate.c nagios-1.2/xdata/xodtemplate.c
+diff -urNad nagios-1.2/xdata/xodtemplate.c /home/joerg/tmp/dpep.VuUghd/nagios-1.2/xdata/xodtemplate.c
--- nagios-1.2/xdata/xodtemplate.c 2003-11-23 02:37:22.000000000 +0100
-+++ nagios-1.2/xdata/xodtemplate.c 2004-10-25 04:32:21.000000000 +0200
++++ /home/joerg/tmp/dpep.VuUghd/nagios-1.2/xdata/xodtemplate.c 2004-10-31 19:16:26.707765123 +0100
@@ -2,8 +2,8 @@
*
* XODTEMPLATE.C - Template-based object configuration data input routines
@@ -1495,9 +1495,9 @@
temp_buffer[sizeof(temp_buffer)-1]='\x0';
write_to_logs_and_console(temp_buffer,NSLOG_CONFIG_ERROR,TRUE);
#endif
-diff -urNad nagios-1.2/xdata/xrddefault.c nagios-1.2/xdata/xrddefault.c
+diff -urNad nagios-1.2/xdata/xrddefault.c /home/joerg/tmp/dpep.VuUghd/nagios-1.2/xdata/xrddefault.c
--- nagios-1.2/xdata/xrddefault.c 2004-02-03 00:36:08.000000000 +0100
-+++ nagios-1.2/xdata/xrddefault.c 2004-10-25 04:32:21.000000000 +0200
++++ /home/joerg/tmp/dpep.VuUghd/nagios-1.2/xdata/xrddefault.c 2004-10-31 19:16:26.707765123 +0100
@@ -3,7 +3,7 @@
* XRDDEFAULT.C - Default external state retention routines for Nagios
*
@@ -1524,9 +1524,9 @@
temp_buffer[sizeof(temp_buffer)-1]='\x0';
fputs(temp_buffer,fp);
-diff -urNad nagios-1.2/xdata/xsddb.c nagios-1.2/xdata/xsddb.c
---- nagios-1.2/xdata/xsddb.c 2003-05-31 22:44:27.000000000 +0200
-+++ nagios-1.2/xdata/xsddb.c 2004-10-21 05:14:36.000000000 +0200
+diff -urNad nagios-1.2/xdata/xsddb.c /home/joerg/tmp/dpep.VuUghd/nagios-1.2/xdata/xsddb.c
+--- nagios-1.2/xdata/xsddb.c 2004-10-31 19:16:25.851714486 +0100
++++ /home/joerg/tmp/dpep.VuUghd/nagios-1.2/xdata/xsddb.c 2004-10-31 19:16:26.709765241 +0100
@@ -909,7 +909,7 @@
snprintf(sql_statement,sizeof(sql_statement)-1,"INSERT INTO %s (last_update,program_start,nagios_pid,daemon_mode,last_command_check,last_log_rotation,enable_notifications,execute_service_checks,accept_passive_service_checks,enable_event_handlers,obsess_over_services,enable_flap_detection,enable_failure_prediction,process_performance_data) VALUES (FROM_UNIXTIME(%lu),FROM_UNIXTIME(%lu),'%d','%d',FROM_UNIXTIME(%lu),FROM_UNIXTIME(%lu),'%d','%d','%d','%d','%d','%d','%d','%d')",XSDDB_PROGRAMSTATUS_TABLE,(unsigned long)current_time,(unsigned long)_program_start,_nagios_pid,_daemon_mode,(unsigned long)_last_command_check,(unsigned long)_last_log_rotation,_enable_notifications,_execute_service_checks,_accept_passive_service_checks,_enable_event_handlers,_obsess_over_services,_enable_flap_detection,_enable_failure_prediction,_process_performance_data);
#endif
- Previous message: [Pkg-nagios-devel] nagios install,NONE,1.1 nagios-mysql.dirs,NONE,1.1 nagios-mysql.install,NONE,1.1 nagios-pgsql.dirs,NONE,1.1 nagios-pgsql.install,NONE,1.1 nagios-text.dirs,NONE,1.1 changelog,1.2,1.3 control,1.2,1.3 docs,1.1.1.1,1.2 examples,1.1.1.1,1.2 rules,1.2,1.3
- Next message: [Pkg-nagios-devel] nagios changelog,1.3,1.4 control,1.3,1.4 rules,1.3,1.4
- Messages sorted by:
[ date ]
[ thread ]
[ subject ]
[ author ]