[Pkg-nagios-devel] nagios changelog,1.30,1.31 rules,1.11,1.12
seanius@haydn.debian.org
seanius@haydn.debian.org
Update of /cvsroot/pkg-nagios/nagios
In directory haydn:/org/alioth.debian.org/chroot/home/users/seanius/tmp/cvs-serv23575
Modified Files:
changelog rules
Log Message:
- using new cvs snapshot
- removed patches that incorporated these changes
- cleanup/fixes in debian/rules to fix extinfo always being template based
- don't leak db password in syslog messages
- new debconf translations
Index: changelog
===================================================================
RCS file: /cvsroot/pkg-nagios/nagios/changelog,v
retrieving revision 1.30
retrieving revision 1.31
diff -u -d -r1.30 -r1.31
--- changelog 16 Jan 2005 18:58:36 -0000 1.30
+++ changelog 17 Jan 2005 18:34:52 -0000 1.31
@@ -1,6 +1,8 @@
-nagios (2:1.3.cvs.20041119-2) unstable; urgency=low
+nagios (2:1.3-cvs.20050116-1) unstable; urgency=low
* Sean Finney:
+ - built against a new upstream cvs snapshot, removed dpatch patches
+ that previously incorporated these post 1.2 changes.
- nagios-pgsql now recommends libdbd-pg-perl, and likewise for
nagios-mysql. thanks to raphaël 'SurcouF' Bordet <surcouf@debianfr.net>
for pointing this out with nagios-pgsql (closes: #285550).
@@ -17,7 +19,11 @@
Claus Hindsgaul <claus_h@image.dk> (closes: #290739).
- don't disclose the database password in the error logs. thanks to
Mikael Magnusson <mikma@users.sourceforge.net> for pointing this
- out (closes #290319).
+ out (closes: #290319).
+ - fixes to calling configure in debian/rules. among other things this
+ should resolve issues with nagios packages not accessing hostextinfo
+ as they should. thanks to Roy Bonser <rbonser@spyder-monkey.com>
+ for pointing out these symptoms (closes: #290681).
-- Sean Finney <seanius@debian.org> Mon, 10 Jan 2005 15:13:21 -0800
Index: rules
===================================================================
RCS file: /cvsroot/pkg-nagios/nagios/rules,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -d -r1.11 -r1.12
--- rules 20 Nov 2004 04:14:48 -0000 1.11
+++ rules 17 Jan 2005 18:34:52 -0000 1.12
@@ -25,28 +25,32 @@
endif
SHELL = /bin/sh -e
-CONFIGURE = CFLAGS='$(CFLAGS)' ./configure --prefix=/usr --mandir=/usr/share/man \
- --bindir=/usr/sbin --sbindir=/usr/lib/cgi-bin/nagios \
+CONFIGURE = CFLAGS='$(CFLAGS)' ./configure --prefix=/usr \
+ --mandir=/usr/share/man \
+ --bindir=/usr/sbin \
+ --sbindir=/usr/lib/cgi-bin/nagios \
--datadir=/usr/share/nagios/htdocs \
- --sysconfdir=/etc/nagios --infodir=/usr/share/info \
+ --sysconfdir=/etc/nagios \
+ --infodir=/usr/share/info \
--libexecdir=/usr/lib/nagios/plugins \
- --localstatedir=/var/log/nagios \
+ --localstatedir=/var/log/nagios \
--with-ping-command="/bin/ping -n %s -c %d" \
--with-mail=/usr/bin/mail --with-perlcache \
- --with-nagios-user=nagios --with-nagios-grp=nagios \
- --with-template-objects --with-template-extinfo --with-default-extinfo
- --build=$(DEB_BUILD_GNU_TYPE) --host=$(DEB_HOST_HNU_TYPE)
+ --with-nagios-user=nagios \
+ --with-nagios-grp=nagios \
+ --with-template-objects \
+ --build=$(DEB_BUILD_GNU_TYPE) \
+ --host=$(DEB_HOST_GNU_TYPE)
DEPENDS = XSDC=xsddb.c XSDH=xsddb.h XCDC=xcddb.c XCDH=xcddb.h XEDC=xeddb.c \
XEDH=xeddb.h XDDC=xdddb.c XDDH=xdddb.h XRDC=xrddb.c XRDH=xrddb.h
-CONFIGUREPG = $(CONFIGURE) --with-pgsql-comments --with-pgsql-downtime \
- --with-pgsql-extinfo --with-pgsql-retention \
- --with-pgsql-status --with-pgsql-xdata
+CONFIGUREPG = $(CONFIGURE) --with-pgsql-xdata
+
+CONFIGUREMY = $(CONFIGURE) --with-mysql-xdata
+
+CONFIGUREFI = $(CONFIGURE)
-CONFIGUREMY = $(CONFIGURE) --with-mysql-comments --with-mysql-downtime \
- --with-mysql-extinfo --with-mysql-retention \
- --with-mysql-status --with-mysql-xdata
# --------- CLEAN TARGETS
@@ -54,23 +58,46 @@
clean-patched:
dh_testdir -a
dh_testroot -a
-
- -rm -Rf docs examples build-nagios-{text,pgsql,mysql}-stamp
+ -rm -Rf docs examples {build,config}-nagios-{text,pgsql,mysql}-stamp
-make distclean
-rm -Rf {cgi,base}/*.{mysql,pgsql,text}
-rm {patch,patch-no-defaults,install,configure,build}-stamp
-rm debian/templates.merged subst
-
dh_clean
+ debconf-updatepo
-# --------- BINARY TARGETS
+# configuration, seperated from the binary build targets
-build-nagios-text: build-nagios-text-stamp
-build-nagios-text-stamp:
+config-nagios-text: config-nagios-text-stamp
+config-nagios-text-stamp:
dh_testdir -a
@echo "Doing $@"
+ -make clean;
+ $(CONFIGUREFI)
+ touch config-nagios-text-stamp
- $(CONFIGURE)
+config-nagios-mysql: config-nagios-mysql-stamp
+config-nagios-mysql-stamp:
+ dh_testdir -a
+ @echo "Doing $@"
+ -make clean;
+ $(CONFIGUREMY)
+ touch config-nagios-mysql-stamp
+
+config-nagios-pgsql: config-nagios-pgsql-stamp
+config-nagios-pgsql-stamp:
+ dh_testdir -a
+ @echo "Doing $@"
+ -make clean;
+ $(CONFIGUREPG)
+ touch config-nagios-pgsql-stamp
+
+# --------- BINARY TARGETS
+
+build-nagios-text: build-nagios-text-stamp
+build-nagios-text-stamp: config-nagios-text-stamp
+ dh_testdir -a
+ @echo "Doing $@"
$(MAKE) all && \
(cd base && mv nagios nagios.text); \
(cd cgi && \
@@ -80,28 +107,21 @@
touch build-nagios-text-stamp
build-nagios-pgsql: build-nagios-pgsql-stamp
-build-nagios-pgsql-stamp:
+build-nagios-pgsql-stamp: config-nagios-pgsql-stamp
dh_testdir -a
@echo "Doing $@"
-
- -make clean;
- $(CONFIGUREPG)
$(MAKE) all && \
(cd base && mv nagios nagios.pgsql); \
(cd cgi && \
for bin in $(CGIBINS); do \
mv $$bin.cgi $$bin.cgi.pgsql; \
done);
-
touch build-nagios-pgsql-stamp
build-nagios-mysql: build-nagios-mysql-stamp
-build-nagios-mysql-stamp:
+build-nagios-mysql-stamp: config-nagios-mysql-stamp
dh_testdir -a
@echo "Doing $@"
-
- -make clean;
- $(CONFIGUREMY)
$(MAKE) all && \
(cd base && mv nagios nagios.mysql); \
(cd cgi && \
@@ -230,4 +250,4 @@
rm -rf patch-stamp debian/patched
binary: binary-arch binary-indep
-.PHONY: binary-indep binary-arch build-nagios-text build-nagios-pgsql build-nagios-mysql binary install patch unpatch
+.PHONY: binary-indep binary-arch build-nagios-text build-nagios-pgsql build-nagios-mysql config-nagios-text config-nagios-mysql config-nagios-pgsql binary install patch unpatch