Menu
▾
▴
[Nagios-checkins] nagios Changelog,1.64,1.65 Makefile.in,1.14,1.15 configure,1.63,1.64 configure.in,1.64,1.65 update-version,1.6,1.7
|
From: Ethan G. <ega...@us...> - 2004-12-16 01:16:22
|
Update of /cvsroot/nagios/nagios In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv24139 Modified Files: Changelog Makefile.in configure configure.in update-version Log Message: Bug fixes - setenv/unsetenv and install of config files Index: configure =================================================================== RCS file: /cvsroot/nagios/nagios/configure,v retrieving revision 1.63 retrieving revision 1.64 diff -C2 -d -r1.63 -r1.64 *** configure 14 Dec 2004 02:18:58 -0000 1.63 --- configure 16 Dec 2004 01:15:24 -0000 1.64 *************** *** 570,574 **** PKG_VERSION="2.0b1" PKG_HOME_URL="http://www.nagios.org/" ! PKG_REL_DATE="12-15-2005" ac_aux_dir= --- 570,574 ---- PKG_VERSION="2.0b1" PKG_HOME_URL="http://www.nagios.org/" ! PKG_REL_DATE="12-15-2004" ac_aux_dir= *************** *** 1775,1779 **** ! for ac_func in strdup strstr strtoul initgroups do echo $ac_n "checking for $ac_func""... $ac_c" 1>&6 --- 1775,1779 ---- ! for ac_func in initgroups setenv strdup strstr strtoul unsetenv do echo $ac_n "checking for $ac_func""... $ac_c" 1>&6 Index: update-version =================================================================== RCS file: /cvsroot/nagios/nagios/update-version,v retrieving revision 1.6 retrieving revision 1.7 diff -C2 -d -r1.6 -r1.7 *** update-version 14 Dec 2004 02:18:58 -0000 1.6 --- update-version 16 Dec 2004 01:15:25 -0000 1.7 *************** *** 14,18 **** # Last date ! LASTDATE=12-15-2005 if [ "x$1" = "x" ] --- 14,18 ---- # Last date ! LASTDATE=12-15-2004 if [ "x$1" = "x" ] Index: Changelog =================================================================== RCS file: /cvsroot/nagios/nagios/Changelog,v retrieving revision 1.64 retrieving revision 1.65 diff -C2 -d -r1.64 -r1.65 *** Changelog 9 Feb 2004 03:27:00 -0000 1.64 --- Changelog 16 Dec 2004 01:15:24 -0000 1.65 *************** *** 4,8 **** ! 2.0a1 - ??/??/???? ------------------ * Added triggered downtime --- 4,15 ---- ! 2.0b2 - ??/??/???? ! ------------------ ! * Removed (un)setenv() calls for systems that don't support it ! * Fixed problem with installing sample config files ! ! ! ! 2.0b1 - 12/15/2004 ------------------ * Added triggered downtime Index: Makefile.in =================================================================== RCS file: /cvsroot/nagios/nagios/Makefile.in,v retrieving revision 1.14 retrieving revision 1.15 diff -C2 -d -r1.14 -r1.15 *** Makefile.in 29 Oct 2004 18:03:39 -0000 1.14 --- Makefile.in 16 Dec 2004 01:15:24 -0000 1.15 *************** *** 2,6 **** # Makefile for Nagios # ! # Last Modified: 10-29-2004 ############################### --- 2,6 ---- # Makefile for Nagios # ! # Last Modified: 12-15-2004 ############################### *************** *** 209,222 **** $(INSTALL) -m 664 $(INSTALL_OPTS) sample-config/cgi.cfg $(DESTDIR)$(CFGDIR)/cgi.cfg-sample $(INSTALL) -m 660 $(INSTALL_OPTS) sample-config/resource.cfg $(DESTDIR)$(CFGDIR)/resource.cfg-sample $(INSTALL) -m 664 $(INSTALL_OPTS) sample-config/template-object/checkcommands.cfg $(DESTDIR)$(CFGDIR)/checkcommands.cfg-sample - $(INSTALL) -m 664 $(INSTALL_OPTS) sample-config/template-object/contactgroups.cfg $(DESTDIR)$(CFGDIR)/contactgroups.cfg-sample - $(INSTALL) -m 664 $(INSTALL_OPTS) sample-config/template-object/contacts.cfg $(DESTDIR)$(CFGDIR)/contacts.cfg-sample - $(INSTALL) -m 664 $(INSTALL_OPTS) sample-config/template-object/dependencies.cfg $(DESTDIR)$(CFGDIR)/dependencies.cfg-sample - $(INSTALL) -m 664 $(INSTALL_OPTS) sample-config/template-object/escalations.cfg $(DESTDIR)$(CFGDIR)/escalations.cfg-sample - $(INSTALL) -m 664 $(INSTALL_OPTS) sample-config/template-object/hostgroups.cfg $(DESTDIR)$(CFGDIR)/hostgroups.cfg-sample - $(INSTALL) -m 664 $(INSTALL_OPTS) sample-config/template-object/hosts.cfg $(DESTDIR)$(CFGDIR)/hosts.cfg-sample $(INSTALL) -m 664 $(INSTALL_OPTS) sample-config/template-object/misccommands.cfg $(DESTDIR)$(CFGDIR)/misccommands.cfg-sample - $(INSTALL) -m 664 $(INSTALL_OPTS) sample-config/template-object/services.cfg $(DESTDIR)$(CFGDIR)/services.cfg-sample - $(INSTALL) -m 664 $(INSTALL_OPTS) sample-config/template-object/timeperiods.cfg $(DESTDIR)$(CFGDIR)/timeperiods.cfg-sample @echo "" --- 209,216 ---- $(INSTALL) -m 664 $(INSTALL_OPTS) sample-config/cgi.cfg $(DESTDIR)$(CFGDIR)/cgi.cfg-sample $(INSTALL) -m 660 $(INSTALL_OPTS) sample-config/resource.cfg $(DESTDIR)$(CFGDIR)/resource.cfg-sample + $(INSTALL) -m 664 $(INSTALL_OPTS) sample-config/template-object/bigger.cfg $(DESTDIR)$(CFGDIR)/bigger.cfg-sample + $(INSTALL) -m 664 $(INSTALL_OPTS) sample-config/template-object/minimal.cfg $(DESTDIR)$(CFGDIR)/minimal.cfg-sample $(INSTALL) -m 664 $(INSTALL_OPTS) sample-config/template-object/checkcommands.cfg $(DESTDIR)$(CFGDIR)/checkcommands.cfg-sample $(INSTALL) -m 664 $(INSTALL_OPTS) sample-config/template-object/misccommands.cfg $(DESTDIR)$(CFGDIR)/misccommands.cfg-sample @echo "" *************** *** 302,315 **** $(INSTALL) -m 644 sample-config/cgi.cfg $(PACKDIR)$(CFGDIR)/cgi.cfg.$(VERSION) $(INSTALL) -m 640 sample-config/resource.cfg $(PACKDIR)$(CFGDIR)/resource.cfg.$(VERSION) ! $(INSTALL) -m 644 sample-config/template-object/checkcommands.cfg $(PACKDIR)$(CFGDIR)/checkcommands.cfg.$(VERSION) ! $(INSTALL) -m 644 sample-config/template-object/contactgroups.cfg $(PACKDIR)$(CFGDIR)/contactgroups.cfg.$(VERSION) ! $(INSTALL) -m 644 sample-config/template-object/contacts.cfg $(PACKDIR)$(CFGDIR)/contacts.cfg.$(VERSION) ! $(INSTALL) -m 644 sample-config/template-object/dependencies.cfg $(PACKDIR)$(CFGDIR)/dependencies.cfg.$(VERSION) ! $(INSTALL) -m 644 sample-config/template-object/escalations.cfg $(PACKDIR)$(CFGDIR)/escalations.cfg.$(VERSION) ! $(INSTALL) -m 644 sample-config/template-object/hostgroups.cfg $(PACKDIR)$(CFGDIR)/hostgroups.cfg.$(VERSION) ! $(INSTALL) -m 644 sample-config/template-object/hosts.cfg $(PACKDIR)$(CFGDIR)/hosts.cfg.$(VERSION) ! $(INSTALL) -m 644 sample-config/template-object/misccommands.cfg $(PACKDIR)$(CFGDIR)/misccommands.cfg.$(VERSION) ! $(INSTALL) -m 644 sample-config/template-object/services.cfg $(PACKDIR)$(CFGDIR)/services.cfg.$(VERSION) ! $(INSTALL) -m 644 sample-config/template-object/timeperiods.cfg $(PACKDIR)$(CFGDIR)/timeperiods.cfg.$(VERSION) cd contrib; $(MAKE) all; $(MAKE) DESTDIR=$(PACKDIR) INIT_OPTS='' INSTALL_OPTS='' COMMAND_OPTS='' nagios_grp='' nagios_usr='' install echo i pkginfo> Prototype --- 296,303 ---- $(INSTALL) -m 644 sample-config/cgi.cfg $(PACKDIR)$(CFGDIR)/cgi.cfg.$(VERSION) $(INSTALL) -m 640 sample-config/resource.cfg $(PACKDIR)$(CFGDIR)/resource.cfg.$(VERSION) ! $(INSTALL) -m 664 sample-config/template-object/bigger.cfg $(PACKDIR)$(CFGDIR)/bigger.cfg.$(VERSION) ! $(INSTALL) -m 664 sample-config/template-object/minimal.cfg $(PACKDIR)$(CFGDIR)/minimal.cfg.$(VERSION) ! $(INSTALL) -m 664 sample-config/template-object/checkcommands.cfg $(PACKDIR)$(CFGDIR)/checkcommands.cfg.$(VERSION) ! $(INSTALL) -m 664 sample-config/template-object/misccommands.cfg $(PACKDIR)$(CFGDIR)/misccommands.cfg.$(VERSION) cd contrib; $(MAKE) all; $(MAKE) DESTDIR=$(PACKDIR) INIT_OPTS='' INSTALL_OPTS='' COMMAND_OPTS='' nagios_grp='' nagios_usr='' install echo i pkginfo> Prototype Index: configure.in =================================================================== RCS file: /cvsroot/nagios/nagios/configure.in,v retrieving revision 1.64 retrieving revision 1.65 diff -C2 -d -r1.64 -r1.65 *** configure.in 14 Dec 2004 02:18:58 -0000 1.64 --- configure.in 16 Dec 2004 01:15:25 -0000 1.65 *************** *** 12,16 **** PKG_VERSION="2.0b1" PKG_HOME_URL="http://www.nagios.org/" ! PKG_REL_DATE="12-15-2005" dnl Figure out how to invoke "install" and what install options to use. --- 12,16 ---- PKG_VERSION="2.0b1" PKG_HOME_URL="http://www.nagios.org/" ! PKG_REL_DATE="12-15-2004" dnl Figure out how to invoke "install" and what install options to use. *************** *** 46,50 **** AC_CHECK_LIB(socket,socket,SOCKETLIBS="$SOCKETLIBS -lsocket") AC_SUBST(SOCKETLIBS) ! AC_CHECK_FUNCS(strdup strstr strtoul initgroups) AC_MSG_CHECKING(for type of socket size) --- 46,50 ---- AC_CHECK_LIB(socket,socket,SOCKETLIBS="$SOCKETLIBS -lsocket") AC_SUBST(SOCKETLIBS) ! AC_CHECK_FUNCS(initgroups setenv strdup strstr strtoul unsetenv) AC_MSG_CHECKING(for type of socket size) |