Update of /cvsroot/pkg-nagios/nagios/patches
In directory haydn:/tmp/cvs-serv31177/patches

Added Files:
	00list 01_fix_postgresql_path.dpatch 
	02_reasonable_config.dpatch 03_no_service_depends.dpatch 
	04_command_pipe_move.dpatch 05_fix_script_errors.dpatch 
	06_makefile.in_delete_defaults.dpatch 
	999_cvs_1x_bugfixes.dpatch 
Removed Files:
	001_fix-postgresql-include-paths 002_resonable-configuration 
	003_no-service-depends 004_commandpipe-path 005_script-errors 
	006_Makefile.in-no_defaults 100_nagios-1-x-bugfixes 
Log Message:
Changed Maintainers and Uploaders, modified copyright for new team.
- Moved nagios to dpatch for its patches, converted them all.
- Updated to Standards 3.6.1
- Moved /var/log/nagios/rw/nagios.cmd to /var/run/nagios/nagios.cmd to
  follow the FHS. Updated 04_command_pipe_move.dpatch for this.
  Added NEWS entry - if you use some other tools which access the file
  in the old location - add a symlink until they are fixed.
(Yes, actually Piotr fixed the init-script for this with his NMU, but
he forgot all the other things where it is mentioned. And var/run fits
better IMO).

Not finished, but as i need to stop the work for at least 2 hours I commit
it, will do the rest after 18:00 today.
Left over for then: Some things for Standards 3.6.1, a cleaner build, some
debhelper compat level 4 improvements.

--- NEW FILE: 00list ---
01_fix_postgresql_path.dpatch
02_reasonable_config.dpatch
03_no_service_depends.dpatch
04_command_pipe_move.dpatch
05_fix_script_errors.dpatch
06_makefile.in_delete_defaults.dpatch
999_cvs_1x_bugfixes.dpatch

--- NEW FILE: 01_fix_postgresql_path.dpatch ---
#! /bin/sh /usr/share/dpatch/dpatch-run
## 01_fix_postgresql_path.dpatch by Joerg Jaspert <joerg@debian.org>
##
## All lines beginning with `## DP:' are a description of the patch.
## DP: Fix include path's for postgresql.

@DPATCH@
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-31 14:07:16.054902453 +0100
@@ -51,7 +51,7 @@
 #endif
 
 #ifdef USE_XCDPGSQL
-#include <pgsql/libpq-fe.h>
+#include <postgresql/libpq-fe.h>
 #endif
 
 
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-31 14:07:16.097896105 +0100
@@ -51,7 +51,7 @@
 #endif
 
 #ifdef USE_XDDPGSQL
-#include <pgsql/libpq-fe.h>
+#include <postgresql/libpq-fe.h>
 #endif
 
 
diff -urNad nagios-1.2/xdata/xeddb.c nagios-1.2/xdata/xeddb.c
--- nagios-1.2/xdata/xeddb.c	2002-02-26 05:04:09.000000000 +0100
+++ nagios-1.2/xdata/xeddb.c	2004-10-31 14:07:16.097896105 +0100
@@ -44,7 +44,7 @@
 #endif
 
 #ifdef USE_XEDPGSQL
-#include <pgsql/libpq-fe.h>
+#include <postgresql/libpq-fe.h>
 #endif
 
 
diff -urNad nagios-1.2/xdata/xrddb.c nagios-1.2/xdata/xrddb.c
--- nagios-1.2/xdata/xrddb.c	2002-05-16 04:46:11.000000000 +0200
+++ nagios-1.2/xdata/xrddb.c	2004-10-31 14:07:16.098895957 +0100
@@ -43,7 +43,7 @@
 #endif
 
 #ifdef USE_XRDPGSQL
-#include <pgsql/libpq-fe.h>
+#include <postgresql/libpq-fe.h>
 #endif
 
 
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-31 14:07:16.098895957 +0100
@@ -48,7 +48,7 @@
 #endif
 
 #ifdef USE_XSDPGSQL
-#include <pgsql/libpq-fe.h>
+#include <postgresql/libpq-fe.h>
 #endif
 
 

--- NEW FILE: 02_reasonable_config.dpatch ---
#! /bin/sh /usr/share/dpatch/dpatch-run
## 01_reasonable_config.dpatch by Joerg Jaspert <joerg@debian.org>
##
## All lines beginning with `## DP:' are a description of the patch.
## DP: Fix the config.

@DPATCH@
diff -urNad nagios-1.2/sample-config/cgi.cfg.in nagios-1.2/sample-config/cgi.cfg.in
--- nagios-1.2/sample-config/cgi.cfg.in	2002-10-30 01:05:35.000000000 +0100
+++ nagios-1.2/sample-config/cgi.cfg.in	2004-10-31 14:10:43.773238243 +0100
@@ -68,7 +68,7 @@
 # Nagios.  Run the 'ps' command manually to see what the command
 # line entry for the Nagios process looks like.
 
-#nagios_check_command=@libexecdir@/check_nagios @localstatedir@/status.log 5 '@bindir@/nagios'
+nagios_check_command=@libexecdir@/check_nagios @localstatedir@/status.log 5 'nagios'
 
 
 
[...2230 lines suppressed...]
+
+# Service definition
+#define service{
+#	use				generic-service		; Name of service template to use
+#
+#	host_name			printer3
+#	service_description		PING
+#	is_volatile			0
+#	check_period			workhours
+#	max_check_attempts		4
+#	normal_check_interval		5
+#	retry_check_interval		1
+#	contact_groups			printer-admins
+#	notification_interval		960
+#	notification_period		workhours
+#	notification_options		c,r
+#	check_command			check_ping!100.0,20%!500.0,60%
+#	}
 
 

--- NEW FILE: 03_no_service_depends.dpatch ---
#! /bin/sh /usr/share/dpatch/dpatch-run
## 03_no_service_depends.dpatch by Joerg Jaspert <joerg@debian.org>
##
## All lines beginning with `## DP:' are a description of the patch.
## DP: Remove Service dependencys

@DPATCH@
diff -urNad nagios-1.2/sample-config/template-object/dependencies.cfg.in nagios-1.2/sample-config/template-object/dependencies.cfg.in
--- nagios-1.2/sample-config/template-object/dependencies.cfg.in	2002-03-08 04:38:36.000000000 +0100
+++ nagios-1.2/sample-config/template-object/dependencies.cfg.in	2004-10-31 14:12:33.652036019 +0100
@@ -18,25 +18,25 @@
 ################################################################################
 
 # Servicedependency definition
-define servicedependency{
-	host_name			nt1
-	service_description		IIS Process
-	dependent_host_name		nt1
-	dependent_service_description	Website #1
-	execution_failure_criteria	n	; These are the criteria for which check execution will be supressed
-	notification_failure_criteria	w,u,c	; These are the criteria for which notifications will be supressed
-	}
+#define servicedependency{
+#	host_name			nt1
+#	service_description		IIS Process
+#	dependent_host_name		nt1
+#	dependent_service_description	Website #1
+#	execution_failure_criteria	n	; These are the criteria for which check execution will be supressed
+#	notification_failure_criteria	w,u,c	; These are the criteria for which notifications will be supressed
+#	}
 
 
 # Servicedependency definition
-define servicedependency{
-	host_name			nt1
-	service_description		IIS Process
-	dependent_host_name		nt1
-	dependent_service_description	Website #2
-	execution_failure_criteria	w,u,c	; These are the criteria for which check execution will be supressed
-	notification_failure_criteria	w,u,c	; These are the criteria for which notifications will be supressed
-	}
+#define servicedependency{
+#	host_name			nt1
+#	service_description		IIS Process
+#	dependent_host_name		nt1
+#	dependent_service_description	Website #2
+#	execution_failure_criteria	w,u,c	; These are the criteria for which check execution will be supressed
+#	notification_failure_criteria	w,u,c	; These are the criteria for which notifications will be supressed
+#	}
 
 
 ################################################################################

--- NEW FILE: 04_command_pipe_move.dpatch ---
#! /bin/sh /usr/share/dpatch/dpatch-run
## 04_command_pipe_move.dpatch by Joerg Jaspert <joerg@debian.org>
##
## All lines beginning with `## DP:' are a description of the patch.
## DP: The command pipe is moved to a sane FHS location.

@DPATCH@
diff -urNad nagios-1.2/contrib/eventhandlers/disable_active_service_checks nagios-1.2/contrib/eventhandlers/disable_active_service_checks
--- nagios-1.2/contrib/eventhandlers/disable_active_service_checks	2002-02-26 05:03:37.000000000 +0100
+++ nagios-1.2/contrib/eventhandlers/disable_active_service_checks	2004-10-31 14:28:17.730713096 +0100
@@ -16,7 +16,7 @@
 
 echocmd="/bin/echo"
 
-CommandFile="/usr/local/nagios/var/rw/nagios.cmd"
+CommandFile="/var/run/nagios/nagios.cmd"
 
 # get the current date/time in seconds since UNIX epoch
 datetime=`date +%s`
diff -urNad nagios-1.2/contrib/eventhandlers/disable_notifications nagios-1.2/contrib/eventhandlers/disable_notifications
--- nagios-1.2/contrib/eventhandlers/disable_notifications	2002-02-26 05:03:37.000000000 +0100
+++ nagios-1.2/contrib/eventhandlers/disable_notifications	2004-10-31 14:28:32.270565910 +0100
@@ -14,7 +14,7 @@
 
 echocmd="/bin/echo"
 
-CommandFile="/usr/local/nagios/var/rw/nagios.cmd"
+CommandFile="/var/run/nagios/nagios.cmd"
 
 # get the current date/time in seconds since UNIX epoch
 datetime=`date +%s`
diff -urNad nagios-1.2/contrib/eventhandlers/enable_active_service_checks nagios-1.2/contrib/eventhandlers/enable_active_service_checks
--- nagios-1.2/contrib/eventhandlers/enable_active_service_checks	2002-02-26 05:03:37.000000000 +0100
+++ nagios-1.2/contrib/eventhandlers/enable_active_service_checks	2004-10-31 14:28:46.259500044 +0100
@@ -16,7 +16,7 @@
 
 echocmd="/bin/echo"
 
-CommandFile="/usr/local/nagios/var/rw/nagios.cmd"
+CommandFile="/var/run/nagios/nagios.cmd"
 
 # get the current date/time in seconds since UNIX epoch
 datetime=`date +%s`
diff -urNad nagios-1.2/contrib/eventhandlers/enable_notifications nagios-1.2/contrib/eventhandlers/enable_notifications
--- nagios-1.2/contrib/eventhandlers/enable_notifications	2002-02-26 05:03:37.000000000 +0100
+++ nagios-1.2/contrib/eventhandlers/enable_notifications	2004-10-31 14:29:01.866195226 +0100
@@ -14,7 +14,7 @@
 
 echocmd="/bin/echo"
 
-CommandFile="/usr/local/nagios/var/rw/nagios.cmd"
+CommandFile="/var/run/nagios/nagios.cmd"
 
 # get the current date/time in seconds since UNIX epoch
 datetime=`date +%s`
diff -urNad nagios-1.2/contrib/eventhandlers/submit_check_result nagios-1.2/contrib/eventhandlers/submit_check_result
--- nagios-1.2/contrib/eventhandlers/submit_check_result	2002-02-26 05:03:37.000000000 +0100
+++ nagios-1.2/contrib/eventhandlers/submit_check_result	2004-10-31 14:29:14.915268086 +0100
@@ -24,7 +24,7 @@
  
 echocmd="/bin/echo"
  
-CommandFile="/usr/local/nagios/var/rw/nagios.cmd"
+CommandFile="/var/run/nagios/nagios.cmd"
  
 # get the current date/time in seconds since UNIX epoch
 datetime=`date +%s`
diff -urNad nagios-1.2/html/docs/configmain.html nagios-1.2/html/docs/configmain.html
--- nagios-1.2/html/docs/configmain.html	2003-04-15 02:19:07.000000000 +0200
+++ nagios-1.2/html/docs/configmain.html	2004-10-31 14:29:40.656466427 +0100
@@ -700,7 +700,7 @@
 </tr>
 <tr>
 <td>Example:</td>
-<td><font color="red"><strong>command_file=/usr/local/nagios/var/rw/nagios.cmd</strong></font></td>
+<td><font color="red"><strong>command_file=/var/run/nagios/nagios.cmd</strong></font></td>
 </tr>
 </table>
 </p>
diff -urNad nagios-1.2/html/docs/volatileservices.html nagios-1.2/html/docs/volatileservices.html
--- nagios-1.2/html/docs/volatileservices.html	2002-02-26 05:03:40.000000000 +0100
+++ nagios-1.2/html/docs/volatileservices.html	2004-10-31 14:29:56.720093961 +0100
@@ -117,7 +117,7 @@
  
 	echocmd="/bin/echo"
  
-	CommandFile="/usr/local/nagios/var/rw/nagios.cmd"
+	CommandFile="/var/run/nagios/nagios.cmd"
  
 	# get the current date/time in seconds since UNIX epoch
 	datetime=`date +%s`

--- NEW FILE: 05_fix_script_errors.dpatch ---
#! /bin/sh /usr/share/dpatch/dpatch-run
## 05_fix_script_errors.dpatch by Joerg Jaspert <joerg@debian.org>
##
## All lines beginning with `## DP:' are a description of the patch.
## DP: fix some script errors

@DPATCH@
diff -urNad nagios-1.2/contrib/eventhandlers/redundancy-scenario1/handle-master-proc-event nagios-1.2/contrib/eventhandlers/redundancy-scenario1/handle-master-proc-event
--- nagios-1.2/contrib/eventhandlers/redundancy-scenario1/handle-master-proc-event	2002-02-26 05:03:37.000000000 +0100
+++ nagios-1.2/contrib/eventhandlers/redundancy-scenario1/handle-master-proc-event	2004-10-31 14:30:44.407050710 +0100
@@ -13,16 +13,13 @@
 mailcmd="/bin/mail"
 
 # Location of the event handlers
-eventhandlerdir="/usr/local/nagios/libexec/eventhandlers"
-
+eventhandlerdir="/usr/lib/nagios/plugins/eventhandlers"
 
 # Only take action on hard service states...
 case "$2" in
 HARD)
-
 	case "$1" in
 	CRITICAL)
-
 		# The master Nagios process is not running!
 		# We should now become the master host and
 		# take over the responsibility of monitoring
@@ -31,9 +28,7 @@
 		`$eventhandlerdir/enable_active_service_checks`
 		;;
 
-	WARNING)
-	UNKNOWN)
-
+	    WARNING|UNKNOWN)
 		# The master Nagios process may or may not
 		# be running.. We won't do anything here, but
 		# to be on the safe side you may decide you 
@@ -42,18 +37,16 @@
 		;;
 
 	OK)
-
 		# The master Nagios process running again!
 		# We should go back to being the slave host, 
 		# so disable active checks
 
-		`eventhandlerdir/disable_active_service_checks`
+		`$eventhandlerdir/disable_active_service_checks`
 		;;
-
 	esac
 	;;
-
 esac
+
 exit 0
 
  

--- NEW FILE: 06_makefile.in_delete_defaults.dpatch ---
#! /bin/sh /usr/share/dpatch/dpatch-run
## 06_makefile.in_delete_defaults.dpatch by Joerg Jaspert <joerg@debian.org>
##
## All lines beginning with `## DP:' are a description of the patch.
## DP: Delete defaults from Makefile.in

@DPATCH@
diff -urNad nagios-1.2/base/Makefile.in nagios-1.2/base/Makefile.in
--- nagios-1.2/base/Makefile.in	2002-11-11 04:52:13.000000000 +0100
+++ nagios-1.2/base/Makefile.in	2004-10-31 14:31:30.421254111 +0100
@@ -88,7 +88,7 @@
 OBJS=checks.o config.o commands.o flapping.o logging.o notifications.o sehandlers.o utils.o $(RDATALIBS) $(CDATALIBS) $(ODATALIBS) $(SDATALIBS) $(PDATALIBS) $(DDATALIBS) $(BASEEXTRALIBS) $(SNPRINTF_O)
 
 nagios: nagios.c $(OBJS) nagios.h $(SRC_COMMON)/locations.h
-	$(CC) $(CFLAGS) $(LDFLAGS) nagios.c $(OBJS) $(PERLLIBS) $(MATHLIBS) -o $@
+	$(CC) $(CFLAGS) $(LDFLAGS) $(EXTRAFLAGS) nagios.c $(OBJS) $(PERLLIBS) $(MATHLIBS) -o $@
 
 #$(SRC_COMMON)/locations.h: $(SRC_COMMON)/locations.sub
 #	perl -pe 's|\$${prefix}|${prefix}|g;s|\$${exec_prefix}|${exec_prefix}|g;s|\$${htmurl}|$(HTMURL)|g;s|\$${cgiurl}|$(CGIURL)|g;' $(SRC_COMMON)/locations.sub > $(SRC_COMMON)/locations.h
diff -urNad nagios-1.2/cgi/Makefile.in nagios-1.2/cgi/Makefile.in
--- nagios-1.2/cgi/Makefile.in	2002-08-26 01:53:00.000000000 +0200
+++ nagios-1.2/cgi/Makefile.in	2004-10-31 14:31:30.421254111 +0100
@@ -95,58 +95,58 @@
 $(COMMENTLIBS): $(COMMENTHDRS)
 
 avail.cgi: avail.c $(CGIDEPS)
-	$(CC) $(CFLAGS) $(LDFLAGS) avail.c $(CGILIBS) -o $@
+	$(CC) $(CFLAGS) $(LDFLAGS) $(EXTRAFLAGS) avail.c $(CGILIBS) -o $@
 
 checksanity.cgi: checksanity.c $(CGIDEPS) $(CDATADEPS) $(EDATADEPS) $(DDATADEPS)
-	$(CC) $(CFLAGS) $(LDFLAGS) checksanity.c $(CGILIBS) $(CDATALIBS) $(EDATALIBS) $(DDATALIBS) -o $@
+	$(CC) $(CFLAGS) $(LDFLAGS) $(EXTRAFLAGS) checksanity.c $(CGILIBS) $(CDATALIBS) $(EDATALIBS) $(DDATALIBS) -o $@
 
 cmd.cgi: cmd.c $(CGIDEPS) $(CDATADEPS)
-	$(CC) $(CFLAGS) $(LDFLAGS) cmd.c  $(CGILIBS) $(CDATALIBS) $(DDATALIBS) -o $@
+	$(CC) $(CFLAGS) $(LDFLAGS) $(EXTRAFLAGS) cmd.c  $(CGILIBS) $(CDATALIBS) $(DDATALIBS) -o $@
 
 config.cgi: config.c $(CGIDEPS)
-	$(CC) $(CFLAGS) $(LDFLAGS) config.c  $(CGILIBS) -o $@
+	$(CC) $(CFLAGS) $(LDFLAGS) $(EXTRAFLAGS) config.c  $(CGILIBS) -o $@
 
 extinfo.cgi: extinfo.c $(CGIDEPS) $(CDATADEPS) $(EDATADEPS) $(DDATADEPS)
-	$(CC) $(CFLAGS) $(LDFLAGS) extinfo.c $(CGILIBS) $(CDATALIBS) $(EDATALIBS) $(DDATALIBS) -o $@
+	$(CC) $(CFLAGS) $(LDFLAGS) $(EXTRAFLAGS) extinfo.c $(CGILIBS) $(CDATALIBS) $(EDATALIBS) $(DDATALIBS) -o $@
 
 history.cgi: history.c $(CGIDEPS) $(LIFODEPS)
-	$(CC) $(CFLAGS) $(LDFLAGS) history.c $(CGILIBS) $(LIFOLIBS) -o $@
+	$(CC) $(CFLAGS) $(LDFLAGS) $(EXTRAFLAGS) history.c $(CGILIBS) $(LIFOLIBS) -o $@
 
 ministatus.cgi: ministatus.c $(CGIDEPS)
-	$(CC) $(CFLAGS) $(LDFLAGS) ministatus.c $(CGILIBS) -o $@
+	$(CC) $(CFLAGS) $(LDFLAGS) $(EXTRAFLAGS) ministatus.c $(CGILIBS) -o $@
 
 notifications.cgi: notifications.c $(CGIDEPS) $(LIFODEPS)
-	$(CC) $(CFLAGS) $(LDFLAGS) notifications.c $(CGILIBS) $(LIFOLIBS) -o $@
+	$(CC) $(CFLAGS) $(LDFLAGS) $(EXTRAFLAGS) notifications.c $(CGILIBS) $(LIFOLIBS) -o $@
 
 outages.cgi: outages.c $(CGIDEPS) $(CDATADEPS)
-	$(CC) $(CFLAGS) $(LDFLAGS) outages.c $(CGILIBS) $(CDATALIBS) -o $@
+	$(CC) $(CFLAGS) $(LDFLAGS) $(EXTRAFLAGS) outages.c $(CGILIBS) $(CDATALIBS) -o $@
 
 showlog.cgi: showlog.c $(CGIDEPS) $(LIFODEPS)
-	$(CC) $(CFLAGS) $(LDFLAGS) showlog.c $(CGILIBS) $(LIFOLIBS) -o $@
+	$(CC) $(CFLAGS) $(LDFLAGS) $(EXTRAFLAGS) showlog.c $(CGILIBS) $(LIFOLIBS) -o $@
 
 status.cgi: status.c $(CGIDEPS) $(CDATADEPS) $(EDATADEPS)
-	$(CC) $(CFLAGS) $(LDFLAGS) status.c $(CGILIBS) $(CDATALIBS) $(EDATALIBS) -o $@
+	$(CC) $(CFLAGS) $(LDFLAGS) $(EXTRAFLAGS) status.c $(CGILIBS) $(CDATALIBS) $(EDATALIBS) -o $@
 
 statuswml.cgi: statuswml.c $(CGIDEPS)
-	$(CC) $(CFLAGS) $(LDFLAGS) statuswml.c $(CGILIBS) -o $@
+	$(CC) $(CFLAGS) $(LDFLAGS) $(EXTRAFLAGS) statuswml.c $(CGILIBS) -o $@
 
 statusmap.cgi: statusmap.c $(CGIDEPS) $(EDATADEPS)
-	$(CC) $(CFLAGS) $(LDFLAGS) statusmap.c $(CGILIBS) $(GDLIBS) $(EDATALIBS) -o $@
+	$(CC) $(CFLAGS) $(LDFLAGS) $(EXTRAFLAGS) statusmap.c $(CGILIBS) $(GDLIBS) $(EDATALIBS) -o $@
 
 statuswrl.cgi: statuswrl.c $(CGIDEPS) $(EDATADEPS)
-	$(CC) $(CFLAGS) $(LDFLAGS) statuswrl.c $(CGILIBS) $(MATHLIBS) $(EDATALIBS) -o $@
+	$(CC) $(CFLAGS) $(LDFLAGS) $(EXTRAFLAGS) statuswrl.c $(CGILIBS) $(MATHLIBS) $(EDATALIBS) -o $@
 
 summary.cgi: summary.c $(CGIDEPS)
-	$(CC) $(CFLAGS) $(LDFLAGS) summary.c $(CGILIBS) -o $@
+	$(CC) $(CFLAGS) $(LDFLAGS) $(EXTRAFLAGS) summary.c $(CGILIBS) -o $@
 
 tac.cgi: tac.c $(CGIDEPS) $(CDATADEPS) $(EDATADEPS)
-	$(CC) $(CFLAGS) $(LDFLAGS) tac.c $(CGILIBS) $(CDATALIBS) $(EDATALIBS) -o $@
+	$(CC) $(CFLAGS) $(LDFLAGS) $(EXTRAFLAGS) tac.c $(CGILIBS) $(CDATALIBS) $(EDATALIBS) -o $@
 
 trends.cgi: trends.c $(CGIDEPS)
-	$(CC) $(CFLAGS) $(LDFLAGS) trends.c $(CGILIBS) $(GDLIBS) -o $@
+	$(CC) $(CFLAGS) $(LDFLAGS) $(EXTRAFLAGS) trends.c $(CGILIBS) $(GDLIBS) -o $@
 
 histogram.cgi: histogram.c $(CGIDEPS)
-	$(CC) $(CFLAGS) $(LDFLAGS) histogram.c $(CGILIBS) $(GDLIBS) -o $@
+	$(CC) $(CFLAGS) $(LDFLAGS) $(EXTRAFLAGS) histogram.c $(CGILIBS) $(GDLIBS) -o $@
 
 clean:
 	rm -f $(CGIS) *.o *.cfg *.sub core

--- NEW FILE: 999_cvs_1x_bugfixes.dpatch ---
#! /bin/sh /usr/share/dpatch/dpatch-run
## 99_cvs_1x_bugfixes.dpatch by Joerg Jaspert <joerg@debian.org>
##
## All lines beginning with `## DP:' are a description of the patch.
## 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
--- 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
@@ -2,8 +2,8 @@
  *
  * CHECKS.C - Service and host check functions for Nagios
  *
- * Copyright (c) 1999-2002 Ethan Galstad (nagios@nagios.org)
- * Last Modified:   11-14-2002
+ * Copyright (c) 1999-2004 Ethan Galstad (nagios@nagios.org)
+ * Last Modified:   10-24-2004
  *
[...1580 lines suppressed...]
 		        }
 
@@ -1175,7 +1175,7 @@
 			snprintf(sql_statement,sizeof(sql_statement)-1,"UPDATE %s SET service_status='PENDING',last_update=FROM_UNIXTIME(%lu),current_attempt='%d',max_attempts='%d',state_type='%s',last_check=FROM_UNIXTIME(%lu),next_check=FROM_UNIXTIME(%lu),should_be_scheduled='%d',check_type='%s',checks_enabled='%d',accept_passive_checks='%d',event_handler_enabled='%d',last_state_change=FROM_UNIXTIME(%lu),problem_acknowledged='%d',last_hard_state='%s',time_ok='%lu',time_warning='%lu',time_unknown='%lu',time_critical='%lu',last_notification=FROM_UNIXTIME(%lu),current_notification='%d',notifications_enabled='%d',latency='%d',execution_time='%d',flap_detection_enabled='%d',is_flapping='%d',percent_state_change='%f',scheduled_downtime_depth='%d',failure_prediction_enabled='%d',process_performance_data='%d',obsess_over_service='%d',plugin_output='%s' WHERE host_name='%s' AND service_description='%s'",XSDDB_SERVICESTATUS_TABLE,(unsigned long)last_update,current_attempt,max_attempts,(state_type==HARD_STATE)?"HARD":"SOFT",(unsigned long)last_check,(unsigned long)next_check,should_be_scheduled,(check_type==SERVICE_CHECK_ACTIVE)?"ACTIVE":"PASSIVE",checks_enabled,accept_passive_service_checks,event_handler_enabled,(unsigned long)last_state_change,problem_has_been_acknowledged,last_hard_state,time_ok,time_warning,time_unknown,time_critical,(unsigned long)last_notification,current_notification_number,notifications_enabled,latency,execution_time,flap_detection_enabled,is_flapping,percent_state_change,scheduled_downtime_depth,failure_prediction_enabled,process_performance_data,obsess_over_service,buffer,escaped_host_name,escaped_description);
 #endif
 #ifdef USE_XSDPGSQL
-			snprintf(sql_statement,sizeof(sql_statement)-1,"UPDATE %s SET service_status='PENDING',last_update=%lu::abstime::timestamp,current_attempt='%d',max_attempts='%d',state_type='%s',last_check=%lu::abstime::timestamp,next_check=%lu::abstime::timestamp,should_be_scheduled='%d',check_type='%s',checks_enabled='%d',accept_passive_checks='%d',event_handler_enabled='%d',last_state_change=%lu::abstime::timestamp,problem_acknowledged='%d',last_hard_state='%s',time_ok='%lu',time_warning='%lu',time_unknown='%lu',time_critical='%lu',last_notification=%lu::abstime::timestamp,current_notification='%d',notifications_enabled='%d',latency='%d',execution_time='%d',flap_detection_enabled='%d',is_flapping='%d',percent_state_change='%f',scheduled_downtime_depth='%d',failure_prediction_enabled='%d',process_performance_data='%d',obsess_over_service='%d',plugin_output='%s' WHERE host_name='%s' AND service_description='%s'",XSDDB_SERVICESTATUS_TABLE,(unsigned long)last_update,current_attempt,max_attempts,(state_type==HARD_STATE)?"HARD":"SOFT",(unsigned long)last_check,(unsigned long)next_check,should_be_scheduled,(check_type==SERVICE_CHECK_ACTIVE)?"ACTIVE":"PASSIVE",checks_enabled,accept_passive_service_checks,event_handler_enabled,(unsigned long)last_state_change,problem_has_been_acknowledged,last_hard_state,time_ok,time_warning,time_unknown,time_critical,(unsigned long)last_notification,current_notification_number,notifications_enabled,latency,execution_time,flap_detection_enabled,is_flapping,percent_state_change,scheduled_downtime_depth,failure_prediction_enabled,process_performance_data,obsess_over_service,buffer,escaped_host_name,escaped_description);
+			snprintf(sql_statement,sizeof(sql_statement)-1,"UPDATE %s SET service_status='PENDING',last_update=%lu::int4::abstime::timestamp,current_attempt='%d',max_attempts='%d',state_type='%s',last_check=%lu::int4::abstime::timestamp,next_check=%lu::int4::abstime::timestamp,should_be_scheduled='%d',check_type='%s',checks_enabled='%d',accept_passive_checks='%d',event_handler_enabled='%d',last_state_change=%lu::int4::abstime::timestamp,problem_acknowledged='%d',last_hard_state='%s',time_ok='%lu',time_warning='%lu',time_unknown='%lu',time_critical='%lu',last_notification=%lu::int4::abstime::timestamp,current_notification='%d',notifications_enabled='%d',latency='%d',execution_time='%d',flap_detection_enabled='%d',is_flapping='%d',percent_state_change='%f',scheduled_downtime_depth='%d',failure_prediction_enabled='%d',process_performance_data='%d',obsess_over_service='%d',plugin_output='%s' WHERE host_name='%s' AND service_description='%s'",XSDDB_SERVICESTATUS_TABLE,(unsigned long)last_update,current_attempt,max_attempts,(state_type==HARD_STATE)?"HARD":"SOFT",(unsigned long)last_check,(unsigned long)next_check,should_be_scheduled,(check_type==SERVICE_CHECK_ACTIVE)?"ACTIVE":"PASSIVE",checks_enabled,accept_passive_service_checks,event_handler_enabled,(unsigned long)last_state_change,problem_has_been_acknowledged,last_hard_state,time_ok,time_warning,time_unknown,time_critical,(unsigned long)last_notification,current_notification_number,notifications_enabled,latency,execution_time,flap_detection_enabled,is_flapping,percent_state_change,scheduled_downtime_depth,failure_prediction_enabled,process_performance_data,obsess_over_service,buffer,escaped_host_name,escaped_description);
 #endif
 		        }
 
@@ -1185,7 +1185,7 @@
 			snprintf(sql_statement,sizeof(sql_statement)-1,"UPDATE %s SET service_status='%s',last_update=FROM_UNIXTIME(%lu),current_attempt='%d',max_attempts='%d',state_type='%s',last_check=FROM_UNIXTIME(%lu),next_check=FROM_UNIXTIME(%lu),should_be_scheduled='%d',check_type='%s',checks_enabled='%d',accept_passive_checks='%d',event_handler_enabled='%d',last_state_change=FROM_UNIXTIME(%lu),problem_acknowledged='%d',last_hard_state='%s',time_ok='%lu',time_warning='%lu',time_unknown='%lu',time_critical='%lu',last_notification=FROM_UNIXTIME(%lu),current_notification='%d',notifications_enabled='%d',latency='%d',execution_time='%d',flap_detection_enabled='%d',is_flapping='%d',percent_state_change='%f',scheduled_downtime_depth='%d',failure_prediction_enabled='%d',process_performance_data='%d',obsess_over_service='%d',plugin_output='%s' WHERE host_name='%s' AND service_description='%s'",XSDDB_SERVICESTATUS_TABLE,status,(unsigned long)last_update,current_attempt,max_attempts,(state_type==HARD_STATE)?"HARD":"SOFT",(unsigned long)last_check,(unsigned long)next_check,should_be_scheduled,(check_type==SERVICE_CHECK_ACTIVE)?"ACTIVE":"PASSIVE",checks_enabled,accept_passive_service_checks,event_handler_enabled,(unsigned long)last_state_change,problem_has_been_acknowledged,last_hard_state,time_ok,time_warning,time_unknown,time_critical,(unsigned long)last_notification,current_notification_number,notifications_enabled,latency,execution_time,flap_detection_enabled,is_flapping,percent_state_change,scheduled_downtime_depth,failure_prediction_enabled,process_performance_data,obsess_over_service,escaped_plugin_output,escaped_host_name,escaped_description);
 #endif
 #ifdef USE_XSDPGSQL
-			snprintf(sql_statement,sizeof(sql_statement)-1,"UPDATE %s SET service_status='%s',last_update=%lu::abstime::timestamp,current_attempt='%d',max_attempts='%d',state_type='%s',last_check=%lu::abstime::timestamp,next_check=%lu::abstime::timestamp,should_be_scheduled='%d',check_type='%s',checks_enabled='%d',accept_passive_checks='%d',event_handler_enabled='%d',last_state_change=%lu::abstime::timestamp,problem_acknowledged='%d',last_hard_state='%s',time_ok='%lu',time_warning='%lu',time_unknown='%lu',time_critical='%lu',last_notification=%lu::abstime::timestamp,current_notification='%d',notifications_enabled='%d',latency='%d',execution_time='%d',flap_detection_enabled='%d',is_flapping='%d',percent_state_change='%f',scheduled_downtime_depth='%d',failure_prediction_enabled='%d',process_performance_data='%d',obsess_over_service='%d',plugin_output='%s' WHERE host_name='%s' AND service_description='%s'",XSDDB_SERVICESTATUS_TABLE,status,(unsigned long)last_update,current_attempt,max_attempts,(state_type==HARD_STATE)?"HARD":"SOFT",(unsigned long)last_check,(unsigned long)next_check,should_be_scheduled,(check_type==SERVICE_CHECK_ACTIVE)?"ACTIVE":"PASSIVE",checks_enabled,accept_passive_service_checks,event_handler_enabled,(unsigned long)last_state_change,problem_has_been_acknowledged,last_hard_state,time_ok,time_warning,time_unknown,time_critical,(unsigned long)last_notification,current_notification_number,notifications_enabled,latency,execution_time,flap_detection_enabled,is_flapping,percent_state_change,scheduled_downtime_depth,failure_prediction_enabled,process_performance_data,obsess_over_service,escaped_plugin_output,escaped_host_name,escaped_description);
+			snprintf(sql_statement,sizeof(sql_statement)-1,"UPDATE %s SET service_status='%s',last_update=%lu::int4::abstime::timestamp,current_attempt='%d',max_attempts='%d',state_type='%s',last_check=%lu::int4::abstime::timestamp,next_check=%lu::int4::abstime::timestamp,should_be_scheduled='%d',check_type='%s',checks_enabled='%d',accept_passive_checks='%d',event_handler_enabled='%d',last_state_change=%lu::int4::abstime::timestamp,problem_acknowledged='%d',last_hard_state='%s',time_ok='%lu',time_warning='%lu',time_unknown='%lu',time_critical='%lu',last_notification=%lu::int4::abstime::timestamp,current_notification='%d',notifications_enabled='%d',latency='%d',execution_time='%d',flap_detection_enabled='%d',is_flapping='%d',percent_state_change='%f',scheduled_downtime_depth='%d',failure_prediction_enabled='%d',process_performance_data='%d',obsess_over_service='%d',plugin_output='%s' WHERE host_name='%s' AND service_description='%s'",XSDDB_SERVICESTATUS_TABLE,status,(unsigned long)last_update,current_attempt,max_attempts,(state_type==HARD_STATE)?"HARD":"SOFT",(unsigned long)last_check,(unsigned long)next_check,should_be_scheduled,(check_type==SERVICE_CHECK_ACTIVE)?"ACTIVE":"PASSIVE",checks_enabled,accept_passive_service_checks,event_handler_enabled,(unsigned long)last_state_change,problem_has_been_acknowledged,last_hard_state,time_ok,time_warning,time_unknown,time_critical,(unsigned long)last_notification,current_notification_number,notifications_enabled,latency,execution_time,flap_detection_enabled,is_flapping,percent_state_change,scheduled_downtime_depth,failure_prediction_enabled,process_performance_data,obsess_over_service,escaped_plugin_output,escaped_host_name,escaped_description);
 #endif
 		        }
 	        }

--- 001_fix-postgresql-include-paths DELETED ---

--- 002_resonable-configuration DELETED ---

--- 003_no-service-depends DELETED ---

--- 004_commandpipe-path DELETED ---

--- 005_script-errors DELETED ---

--- 006_Makefile.in-no_defaults DELETED ---

--- 100_nagios-1-x-bugfixes DELETED ---



