[Pkg-nagios-changes] [pkg-nagios] r1328 - ndoutils/trunk/debian
Hendrik Frenzel
hfrenzel-guest at alioth.debian.org
Mon Feb 11 15:14:49 UTC 2008
Author: hfrenzel-guest
Date: 2008-02-11 15:14:49 +0000 (Mon, 11 Feb 2008)
New Revision: 1328
Added:
ndoutils/trunk/debian/ndoutils-NG-DB.docs.in
Removed:
ndoutils/trunk/debian/docs
Modified:
ndoutils/trunk/debian/changelog
ndoutils/trunk/debian/control
ndoutils/trunk/debian/ndoutils-NG-DB.ndoutils.default.in
ndoutils/trunk/debian/ndoutils-NG-DB.postinst.in
ndoutils/trunk/debian/ndoutils-NG-DB.postrm.in
ndoutils/trunk/debian/rules
Log:
enabled build for nagios3
Modified: ndoutils/trunk/debian/changelog
===================================================================
--- ndoutils/trunk/debian/changelog 2008-02-10 19:52:57 UTC (rev 1327)
+++ ndoutils/trunk/debian/changelog 2008-02-11 15:14:49 UTC (rev 1328)
@@ -1,3 +1,9 @@
+ndoutils (1.4b7-6) UNRELEASED; urgency=low
+
+ * enabled building for nagios3
+
+ -- Hendrik Frenzel <hfrenzel at scunc.net> Tue, 05 Feb 2008 21:49:20 +0100
+
ndoutils (1.4b7-5) unstable; urgency=low
* fixed build on GNU/kFreeBSD as building with -fPIC (Closes: #462718)
Modified: ndoutils/trunk/debian/control
===================================================================
--- ndoutils/trunk/debian/control 2008-02-10 19:52:57 UTC (rev 1327)
+++ ndoutils/trunk/debian/control 2008-02-11 15:14:49 UTC (rev 1328)
@@ -13,7 +13,7 @@
Package: ndoutils-nagios2-mysql
Architecture: any
Provides: ndoutils, ndoutils-mysql
-Conflicts: ndoutils-pgsql
+Conflicts: ndoutils-pgsql, ndoutils-nagios3-mysql
Depends: nagios2, mysql-client, ucf, debconf, dbconfig-common, ${shlibs:Depends}, ${misc:Depends}
Recommends: mysql-server
Suggests: ndoutils-doc
@@ -22,8 +22,22 @@
and event information from Nagios to a database for later retrieval and
processing.
.
- This package uses MySQL databases.
+ This package uses Nagios 2 and MySQL databases.
+Package: ndoutils-nagios3-mysql
+Architecture: any
+Provides: ndoutils, ndoutils-mysql
+Conflicts: ndoutils-pgsql, ndoutils-nagios2-mysql
+Depends: nagios3, mysql-client, ucf, debconf, dbconfig-common, ${shlibs:Depends}, ${misc:Depends}
+Recommends: mysql-server
+Suggests: ndoutils-doc
+Description: This provides the NDOUtils for Nagios with MySQL support
+ The NDOUtils (Nagios Data Output Utils) addon allows you to move status
+ and event information from Nagios to a database for later retrieval and
+ processing.
+ .
+ This package uses Nagios 3 and MySQL databases.
+
Package: ndoutils-doc
Section: doc
Architecture: all
Deleted: ndoutils/trunk/debian/docs
===================================================================
--- ndoutils/trunk/debian/docs 2008-02-10 19:52:57 UTC (rev 1327)
+++ ndoutils/trunk/debian/docs 2008-02-11 15:14:49 UTC (rev 1328)
@@ -1,2 +0,0 @@
-README
-TODO
Added: ndoutils/trunk/debian/ndoutils-NG-DB.docs.in
===================================================================
--- ndoutils/trunk/debian/ndoutils-NG-DB.docs.in (rev 0)
+++ ndoutils/trunk/debian/ndoutils-NG-DB.docs.in 2008-02-11 15:14:49 UTC (rev 1328)
@@ -0,0 +1,2 @@
+README
+TODO
Modified: ndoutils/trunk/debian/ndoutils-NG-DB.ndoutils.default.in
===================================================================
--- ndoutils/trunk/debian/ndoutils-NG-DB.ndoutils.default.in 2008-02-10 19:52:57 UTC (rev 1327)
+++ ndoutils/trunk/debian/ndoutils-NG-DB.ndoutils.default.in 2008-02-11 15:14:49 UTC (rev 1328)
@@ -11,4 +11,4 @@
ENABLE_NDOUTILS=0
# Additional options that are passed to the Daemon.
-DAEMON_OPTS="-c /etc/nagios2/ndo2db.cfg"
+DAEMON_OPTS="-c /etc/@@NG@@/ndo2db.cfg"
Modified: ndoutils/trunk/debian/ndoutils-NG-DB.postinst.in
===================================================================
--- ndoutils/trunk/debian/ndoutils-NG-DB.postinst.in 2008-02-10 19:52:57 UTC (rev 1327)
+++ ndoutils/trunk/debian/ndoutils-NG-DB.postinst.in 2008-02-11 15:14:49 UTC (rev 1328)
@@ -8,7 +8,7 @@
. /usr/share/debconf/confmodule
if [ -f /usr/share/dbconfig-common/dpkg/postinst.@@DB@@ ]; then
. /usr/share/dbconfig-common/dpkg/postinst.@@DB@@
- dbc_generate_include='template:/etc/nagios2/ndo2db.cfg'
+ dbc_generate_include='template:/etc/@@NG@@/ndo2db.cfg'
dbc_generate_include_owner='nagios:nagios'
dbc_generate_include_args='--ucf -o template_infile=/usr/share/@@PACKAGE@@/tmpl/ndo2db.cfg '
dbc_go @@PKG_SHORT@@ $@
@@ -29,7 +29,7 @@
case "$1" in
configure)
- ucf /usr/share/@@PACKAGE@@/tmpl/ndomod.cfg /etc/nagios2/ndomod.cfg
+ ucf /usr/share/@@PACKAGE@@/tmpl/ndomod.cfg /etc/@@NG@@/ndomod.cfg
;;
abort-upgrade|abort-remove|abort-deconfigure)
Modified: ndoutils/trunk/debian/ndoutils-NG-DB.postrm.in
===================================================================
--- ndoutils/trunk/debian/ndoutils-NG-DB.postrm.in 2008-02-10 19:52:57 UTC (rev 1327)
+++ ndoutils/trunk/debian/ndoutils-NG-DB.postrm.in 2008-02-11 15:14:49 UTC (rev 1328)
@@ -16,8 +16,8 @@
if [ "$1" = "purge" ]; then
for f in ndomod.cfg ndo2db.cfg; do
- rm -f /etc/nagios2/$f
- ucf --purge /etc/nagios2/$f
+ rm -f /etc/@@NG@@/$f
+ ucf --purge /etc/@@NG@@/$f
done
fi
Modified: ndoutils/trunk/debian/rules
===================================================================
--- ndoutils/trunk/debian/rules 2008-02-10 19:52:57 UTC (rev 1327)
+++ ndoutils/trunk/debian/rules 2008-02-11 15:14:49 UTC (rev 1328)
@@ -63,9 +63,9 @@
rm -f \
src/*-mysql src/*-mysql-2x* src/*-mysql-3x* \
src/*-pgsql src/*-pgsql-2x* src/*-pgsql-3x*
- rm -f install-stamp configure-stamp build-stamp
rm -f \
debian/ndoutils-nagios2-mysql.dirs \
+ debian/ndoutils-nagios2-mysql.docs \
debian/ndoutils-nagios2-mysql.manpages \
debian/ndoutils-nagios2-mysql.ndoutils.default \
debian/ndoutils-nagios2-mysql.ndoutils.init \
@@ -83,12 +83,33 @@
debian/ndoutils-nagios2-pgsql.prerm \
debian/ndoutils-nagios2-pgsql.postinst \
debian/ndoutils-nagios2-pgsql.postrm
+ rm -f \
+ debian/ndoutils-nagios3-mysql.dirs \
+ debian/ndoutils-nagios3-mysql.docs \
+ debian/ndoutils-nagios3-mysql.manpages \
+ debian/ndoutils-nagios3-mysql.ndoutils.default \
+ debian/ndoutils-nagios3-mysql.ndoutils.init \
+ debian/ndoutils-nagios3-mysql.config \
+ debian/ndoutils-nagios3-mysql.preinst \
+ debian/ndoutils-nagios3-mysql.prerm \
+ debian/ndoutils-nagios3-mysql.postinst \
+ debian/ndoutils-nagios3-mysql.postrm \
+ debian/ndoutils-nagios3-pgsql.dirs \
+ debian/ndoutils-nagios3-pgsql.manpages \
+ debian/ndoutils-nagios3-pgsql.ndoutils.default \
+ debian/ndoutils-nagios3-pgsql.ndoutils.init \
+ debian/ndoutils-nagios3-pgsql.config \
+ debian/ndoutils-nagios3-pgsql.preinst \
+ debian/ndoutils-nagios3-pgsql.prerm \
+ debian/ndoutils-nagios3-pgsql.postinst \
+ debian/ndoutils-nagios3-pgsql.postrm
+
rm -f debian/doc/NDOUTILS\ DB\ Model.odt \
debian/doc/NDOUtils\ Documentation.sxw
dh_clean
-config-ndoutils-nagios2-mysql: config-ndoutils-nagios2-mysql-stamp
-config-ndoutils-nagios2-mysql-stamp: patch
+config-ndoutils-mysql: config-ndoutils-mysql-stamp
+config-ndoutils-mysql-stamp: patch
dh_testdir -a
@echo " ### Doing $@"
$(CONFIG_MYSQL)
@@ -102,14 +123,16 @@
# $(CONFIG_PGSQL)
# touch $@
-build-ndoutils-nagios2-mysql: build-ndoutils-nagios2-mysql-stamp
-build-ndoutils-nagios2-mysql-stamp: config-ndoutils-nagios2-mysql-stamp
+build-ndoutils-mysql: build-ndoutils-mysql-stamp
+build-ndoutils-mysql-stamp: config-ndoutils-mysql-stamp
dh_testdir -a
@echo " ### Doing $@"
$(MAKE) && \
(cd src && \
mv ndomod-2x.o ndomod-mysql-2x.o && \
+ mv ndomod-3x.o ndomod-mysql-3x.o && \
mv ndo2db-2x ndo2db-mysql-2x && \
+ mv ndo2db-3x ndo2db-mysql-3x && \
mv log2ndo log2ndo-mysql && \
mv sockdebug sockdebug-mysql && \
mv file2sock file2sock-mysql \
@@ -131,15 +154,15 @@
# touch $@
# TODO: ndoutils-pgsql
-binary-arch: ndoutils-nagios2-mysql
+binary-arch: ndoutils-nagios2-mysql ndoutils-nagios3-mysql
dh_testdir -a
dh_testroot -a
binary-indep: ndoutils-doc
-ndoutils-nagios2-mysql: build-ndoutils-nagios2-mysql
+ndoutils-nagios2-mysql: build-ndoutils-mysql
@echo " ### Doing $@"
- for script in dirs ndoutils.default ndoutils.init config preinst postinst prerm postrm manpages; do \
+ for script in dirs docs ndoutils.default ndoutils.init config preinst postinst prerm postrm manpages; do \
test -e debian/ndoutils-NG-DB.$${script}.in && \
sed "s/@@NG@@/nagios2/g;s/@@DB@@/mysql/g;s/@@PACKAGE@@/$@/g;s/@@PKG_SHORT@@/ndoutils-mysql/g;s/@@DBPORT@@/3306/g" \
< debian/ndoutils-NG-DB.$${script}.in > debian/$@.$${script}; \
@@ -184,7 +207,7 @@
# use debhelper
dh_installchangelogs -p$@ -P$(b)/$@
dh_installdebconf -p$@ -P$(b)/$@
- dh_installdocs -p$@ -P$(b)/$@
+ dh_installdocs -p$@ -P$(b)/$@ --all
dh_installinit -p$@ -P$(b)/$@ --name=ndoutils
dh_installman -p$@ -P$(b)/$@
dh_link -p$@ -P$(b)/$@ \
@@ -202,6 +225,77 @@
dh_md5sums -p$@ -P$(b)/$@
dh_builddeb -p$@ -P$(b)/$@
+ndoutils-nagios3-mysql: build-ndoutils-mysql
+ @echo " ### Doing $@"
+ for script in dirs docs ndoutils.default ndoutils.init config preinst postinst prerm postrm manpages; do \
+ test -e debian/ndoutils-NG-DB.$${script}.in && \
+ sed "s/@@NG@@/nagios3/g;s/@@DB@@/mysql/g;s/@@PACKAGE@@/$@/g;s/@@PKG_SHORT@@/ndoutils-mysql/g;s/@@DBPORT@@/3306/g" \
+ < debian/ndoutils-NG-DB.$${script}.in > debian/$@.$${script}; \
+ done
+ dh_installdirs -p$@ -P$(b)/$@
+ # install the binaries
+ install -m 755 src/ndomod-mysql-3x.o debian/$@/usr/lib/ndoutils/ndomod.o
+ install -m 755 src/ndo2db-mysql-3x debian/$@/usr/lib/ndoutils/ndo2db
+ install -m 755 src/sockdebug-mysql debian/$@/usr/lib/ndoutils/sockdebug
+ install -m 755 src/file2sock-mysql debian/$@/usr/lib/ndoutils/file2sock
+ install -m 755 src/log2ndo-mysql debian/$@/usr/lib/ndoutils/log2ndo
+ # install the config templates
+ install -m 644 config/ndomod.cfg debian/$@/usr/share/$@/tmpl/
+ sed -e 's/nagios2/nagios3/g' \
+ < debian/$@/usr/share/$@/tmpl/ndomod.cfg \
+ > debian/$@/usr/share/$@/tmpl/ndomod.cfg.sed && \
+ mv debian/$@/usr/share/$@/tmpl/ndomod.cfg.sed \
+ debian/$@/usr/share/$@/tmpl/ndomod.cfg
+ install -m 644 config/ndo2db.cfg debian/$@/usr/share/$@/tmpl/
+ sed -e 's/^ *[^#]* *\(\<db_servertype\) *=.*$$/\1=_DBC_DBTYPE_/' \
+ -e 's/^ *[^#]* *\(\<db_host\) *=.*$$/\1=_DBC_DBSERVER_/' \
+ -e 's/^ *[^#]* *\(\<db_port\) *=.*$$/\1=_DBC_DBPORT_/' \
+ -e 's/^ *[^#]* *\(\<db_name\) *=.*$$/\1=_DBC_DBNAME_/' \
+ -e 's/^ *[^#]* *\(\<db_user\) *=.*$$/\1=_DBC_DBUSER_/' \
+ -e 's/^ *[^#]* *\(\<db_pass\) *=.*$$/\1=_DBC_DBPASS_/' \
+ -e 's/nagios2/nagios3/g' \
+ < debian/$@/usr/share/$@/tmpl/ndo2db.cfg \
+ > debian/$@/usr/share/$@/tmpl/ndo2db.cfg.sed && \
+ mv debian/$@/usr/share/$@/tmpl/ndo2db.cfg.sed \
+ debian/$@/usr/share/$@/tmpl/ndo2db.cfg
+
+ # install the SQL schemes
+ install -m 644 db/mysql.sql \
+ debian/$@/usr/share/dbconfig-common/data/$@/install/mysql
+ install -m 644 db/mysql-upgrade-1.3.sql \
+ debian/$@/usr/share/dbconfig-common/data/$@/upgrade/mysql/1.3
+ install -m 644 db/mysql-upgrade-1.4b1.sql \
+ debian/$@/usr/share/dbconfig-common/data/$@/upgrade/mysql/1.4b1
+ install -m 644 db/mysql-upgrade-1.4b2.sql \
+ debian/$@/usr/share/dbconfig-common/data/$@/upgrade/mysql/1.4b2
+ install -m 644 db/mysql-upgrade-1.4b3.sql \
+ debian/$@/usr/share/dbconfig-common/data/$@/upgrade/mysql/1.4b3
+ install -m 644 db/mysql-upgrade-1.4b4.sql \
+ debian/$@/usr/share/dbconfig-common/data/$@/upgrade/mysql/1.4b4
+ install -m 644 db/mysql-mods-1.4b5.sql \
+ debian/$@/usr/share/dbconfig-common/data/$@/upgrade/mysql/1.4b5
+
+ # use debhelper
+ dh_installchangelogs -p$@ -P$(b)/$@
+ dh_installdebconf -p$@ -P$(b)/$@
+ dh_installdocs -p$@ -P$(b)/$@ --all
+ dh_installinit -p$@ -P$(b)/$@ --name=ndoutils
+ dh_installman -p$@ -P$(b)/$@
+ dh_link -p$@ -P$(b)/$@ \
+ usr/lib/ndoutils/ndo2db usr/sbin/ndo2db \
+ usr/lib/ndoutils/sockdebug usr/sbin/sockdebug \
+ usr/lib/ndoutils/file2sock usr/sbin/file2sock \
+ usr/lib/ndoutils/log2ndo usr/sbin/log2ndo
+ dh_strip -p$@ -P$(b)/$@
+ dh_compress -p$@ -P$(b)/$@
+ dh_fixperms -p$@ -P$(b)/$@
+ dh_makeshlibs -p$@ -P$(b)/$@ -V
+ dh_installdeb -p$@ -P$(b)/$@
+ dh_shlibdeps -p$@ -P$(b)/$@
+ dh_gencontrol -p$@ -P$(b)/$@
+ dh_md5sums -p$@ -P$(b)/$@
+ dh_builddeb -p$@ -P$(b)/$@
+
#ndoutils-pgsql: build-ndoutils-pgsql
# @echo " ### Doing $@"
# dh_installdirs -p$@ -P$(b)/$@
@@ -291,4 +385,4 @@
# dh_builddeb
binary: binary-arch binary-indep
-.PHONY: build clean binary-indep binary-arch binary-nagios2-mysql-arch binary install install-indep install-arch
+.PHONY: build clean binary-indep binary-arch binary install install-indep install-arch
More information about the Pkg-nagios-changes
mailing list