[Pkg-nagios-changes] [pkg-nagios] r1823 - in ndoutils/trunk/debian: . patches
Hendrik Frenzel
hfrenzel-guest at alioth.debian.org
Wed Feb 17 15:56:14 UTC 2010
tags 569973 pending
thanks
Author: hfrenzel-guest
Date: 2010-02-17 15:56:13 +0000 (Wed, 17 Feb 2010)
New Revision: 1823
Removed:
ndoutils/trunk/debian/patches/03-kfbsd_fpic.dpatch
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/patches/00list
ndoutils/trunk/debian/patches/01-pathnames.dpatch
ndoutils/trunk/debian/patches/02-makefiles.dpatch
ndoutils/trunk/debian/rules
Log:
* updated to new upstream and fixed some bugs
Modified: ndoutils/trunk/debian/changelog
===================================================================
--- ndoutils/trunk/debian/changelog 2010-02-17 10:29:18 UTC (rev 1822)
+++ ndoutils/trunk/debian/changelog 2010-02-17 15:56:13 UTC (rev 1823)
@@ -1,5 +1,6 @@
-ndoutils (1.4b7-12) unstable; urgency=low
+ndoutils (1.4b9-1) unstable; urgency=low
+ * New upstream version (Closes: 569973)
* Removes socket on (re)start if ndoutils isn't running (Closes: 560681)
* Enabled ucf --debconf-ok in postinst script (Closes: 545435)
Modified: ndoutils/trunk/debian/control
===================================================================
--- ndoutils/trunk/debian/control 2010-02-17 10:29:18 UTC (rev 1822)
+++ ndoutils/trunk/debian/control 2010-02-17 15:56:13 UTC (rev 1823)
@@ -13,7 +13,7 @@
Package: ndoutils-nagios3-mysql
Architecture: any
Provides: ndoutils, ndoutils-mysql
-Conflicts: ndoutils-nagios2-mysql (< ${source:Version}), ndoutils-pgsql
+Conflicts: ndoutils-nagios2-mysql (<= ${source:Version}), ndoutils-pgsql
Depends: ndoutils-common (>= ${source:Version}), nagios3, mysql-client, ucf, debconf, dbconfig-common, ${shlibs:Depends}, ${misc:Depends}
Recommends: mysql-server
Suggests: ndoutils-doc
@@ -26,7 +26,7 @@
Package: ndoutils-common
Architecture: any
-Conflicts: ndoutils-nagios2-mysql (< ${source:Version})
+Conflicts: ndoutils-nagios2-mysql (<= ${source:Version})
Depends: ndoutils | ndoutils-nagios3, ucf, dbconfig-common, ${shlibs:Depends}, ${misc:Depends}
Suggests: ndoutils-doc
Description: This provides the NDOUtils for Nagios with MySQL support
Modified: ndoutils/trunk/debian/ndoutils-NG-DB.ndoutils.default.in
===================================================================
--- ndoutils/trunk/debian/ndoutils-NG-DB.ndoutils.default.in 2010-02-17 10:29:18 UTC (rev 1822)
+++ ndoutils/trunk/debian/ndoutils-NG-DB.ndoutils.default.in 2010-02-17 15:56:13 UTC (rev 1823)
@@ -12,3 +12,6 @@
# Additional options that are passed to the Daemon.
DAEMON_OPTS="-c /etc/@@NG@@/ndo2db.cfg"
+
+# Path to the socket. Default: /var/cache/nagios3/ndo.sock
+#SOCKET=/var/cache/nagios3/ndo.sock
Modified: ndoutils/trunk/debian/ndoutils-NG-DB.postinst.in
===================================================================
--- ndoutils/trunk/debian/ndoutils-NG-DB.postinst.in 2010-02-17 10:29:18 UTC (rev 1822)
+++ ndoutils/trunk/debian/ndoutils-NG-DB.postinst.in 2010-02-17 15:56:13 UTC (rev 1823)
@@ -10,7 +10,7 @@
. /usr/share/dbconfig-common/dpkg/postinst.@@DB@@
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_generate_include_args='--ucf -o template_infile=/usr/share/@@PACKAGE@@/tmpl/ndo2db.cfg-sample'
dbc_go @@PKG_SHORT@@ $@
fi
@@ -28,7 +28,7 @@
case "$1" in
configure)
- ucf --debconf-ok /usr/share/@@PACKAGE@@/tmpl/ndomod.cfg /etc/@@NG@@/ndomod.cfg
+ ucf --debconf-ok /usr/share/@@PACKAGE@@/tmpl/ndomod.cfg-sample /etc/@@NG@@/ndomod.cfg
;;
abort-upgrade|abort-remove|abort-deconfigure)
Modified: ndoutils/trunk/debian/patches/00list
===================================================================
--- ndoutils/trunk/debian/patches/00list 2010-02-17 10:29:18 UTC (rev 1822)
+++ ndoutils/trunk/debian/patches/00list 2010-02-17 15:56:13 UTC (rev 1823)
@@ -1,3 +1,2 @@
01-pathnames
02-makefiles
-03-kfbsd_fpic
Modified: ndoutils/trunk/debian/patches/01-pathnames.dpatch
===================================================================
--- ndoutils/trunk/debian/patches/01-pathnames.dpatch 2010-02-17 10:29:18 UTC (rev 1822)
+++ ndoutils/trunk/debian/patches/01-pathnames.dpatch 2010-02-17 15:56:13 UTC (rev 1823)
@@ -5,65 +5,6 @@
## DP: No description.
@DPATCH@
-diff -urNad ndoutils-1.4b7~/config/misccommands.cfg ndoutils-1.4b7/config/misccommands.cfg
---- ndoutils-1.4b7~/config/misccommands.cfg 2007-01-08 01:35:58.000000000 +0100
-+++ ndoutils-1.4b7/config/misccommands.cfg 2008-04-08 21:54:37.000000000 +0200
-@@ -7,5 +7,5 @@
-
- define command{
- command_name rotate_ndo_log
-- command_line /bin/mv /usr/local/nagios/var/ndo.dat /usr/local/nagios/var/ndo.`date +%s`
-+ command_line /bin/mv /var/cache/_NAGIOS_/ndo.dat /var/cache/_NAGIOS_/ndo.`date +%s`
- }
-diff -urNad ndoutils-1.4b7~/config/nagios.cfg ndoutils-1.4b7/config/nagios.cfg
---- ndoutils-1.4b7~/config/nagios.cfg 2007-01-08 01:35:58.000000000 +0100
-+++ ndoutils-1.4b7/config/nagios.cfg 2008-04-08 21:57:23.000000000 +0200
-@@ -5,7 +5,7 @@
- # configuration file (nagios.cfg). Adjust the paths, etc. to suit your needs.
-
- # Uncomment the line below if you're running Nagios 2.x
--broker_module=/usr/local/nagios/bin/ndomod-2x.o config_file=/usr/local/nagios/etc/ndomod.cfg
-+broker_module=/usr/lib/ndoutils/ndomod-2x.o config_file=/etc/nagios2/ndomod-2x.cfg
-
- # Uncomment the line below if you're running Nagios 3.x
--#broker_module=/usr/local/nagios/bin/ndomod-3x.o config_file=/usr/local/nagios/etc/ndomod.cfg
-+#broker_module=/usr/lib/ndoutils/ndomod-3x.o config_file=/etc/ndoutils/ndomod-3x.cfg
-diff -urNad ndoutils-1.4b7~/config/ndo2db.cfg ndoutils-1.4b7/config/ndo2db.cfg
---- ndoutils-1.4b7~/config/ndo2db.cfg 2007-10-31 19:17:04.000000000 +0100
-+++ ndoutils-1.4b7/config/ndo2db.cfg 2008-04-08 21:52:20.000000000 +0200
-@@ -32,7 +32,7 @@
- # This option is only valid if the socket type specified above
- # is "unix".
-
--socket_name=/usr/local/nagios/var/ndo.sock
-+socket_name=/var/cache/_NAGIOS_/ndo.sock
-
-
-
-diff -urNad ndoutils-1.4b7~/config/ndomod.cfg ndoutils-1.4b7/config/ndomod.cfg
---- ndoutils-1.4b7~/config/ndomod.cfg 2007-09-27 18:47:44.000000000 +0200
-+++ ndoutils-1.4b7/config/ndomod.cfg 2008-04-08 22:01:08.000000000 +0200
-@@ -35,9 +35,9 @@
- # of fully qualified domain name of the host that the module should
- # connect to for sending output.
-
--#output=/usr/local/nagios/var/ndo.dat
-+#output=/var/cache/nagios2/ndo.dat
- #output=127.0.0.1
--output=/usr/local/nagios/var/ndo.sock
-+output=/var/cache/_NAGIOS_/ndo.sock
-
-
-
-@@ -68,7 +68,7 @@
- # Nagios (re)starts, the NDO NEB module will read the contents of this
- # file and send it to the NDO2DB daemon for processing.
-
--buffer_file=/usr/local/nagios/var/ndomod.tmp
-+buffer_file=/var/cache/_NAGIOS_/ndomod.tmp
-
-
-
diff -urNad ndoutils-1.4b7~/include/nagios-2x/locations.h ndoutils-1.4b7/include/nagios-2x/locations.h
--- ndoutils-1.4b7~/include/nagios-2x/locations.h 2007-10-31 19:17:05.000000000 +0100
+++ ndoutils-1.4b7/include/nagios-2x/locations.h 2008-04-08 21:52:20.000000000 +0200
Modified: ndoutils/trunk/debian/patches/02-makefiles.dpatch
===================================================================
--- ndoutils/trunk/debian/patches/02-makefiles.dpatch 2010-02-17 10:29:18 UTC (rev 1822)
+++ ndoutils/trunk/debian/patches/02-makefiles.dpatch 2010-02-17 15:56:13 UTC (rev 1823)
@@ -5,310 +5,6 @@
## DP: No description.
@DPATCH@
-diff -urNad ndoutils-1.4b7~/configure ndoutils-1.4b7/configure
---- ndoutils-1.4b7~/configure 2007-10-31 19:17:03.000000000 +0100
-+++ ndoutils-1.4b7/configure 2008-01-07 18:02:55.000000000 +0100
-@@ -5466,67 +5466,67 @@
-
-
-
--echo "$as_me:$LINENO: checking for main in -lnsl" >&5
--echo $ECHO_N "checking for main in -lnsl... $ECHO_C" >&6
--if test "${ac_cv_lib_nsl_main+set}" = set; then
-- echo $ECHO_N "(cached) $ECHO_C" >&6
--else
-- ac_check_lib_save_LIBS=$LIBS
--LIBS="-lnsl $LIBS"
--cat >conftest.$ac_ext <<_ACEOF
--/* confdefs.h. */
--_ACEOF
--cat confdefs.h >>conftest.$ac_ext
--cat >>conftest.$ac_ext <<_ACEOF
--/* end confdefs.h. */
--
--
--int
--main ()
--{
--main ();
-- ;
-- return 0;
--}
--_ACEOF
--rm -f conftest.$ac_objext conftest$ac_exeext
--if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
-- (eval $ac_link) 2>conftest.er1
-- ac_status=$?
-- grep -v '^ *+' conftest.er1 >conftest.err
-- rm -f conftest.er1
-- cat conftest.err >&5
-- echo "$as_me:$LINENO: \$? = $ac_status" >&5
-- (exit $ac_status); } &&
-- { ac_try='test -z "$ac_c_werror_flag"
-- || test ! -s conftest.err'
-- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-- (eval $ac_try) 2>&5
-- ac_status=$?
-- echo "$as_me:$LINENO: \$? = $ac_status" >&5
-- (exit $ac_status); }; } &&
-- { ac_try='test -s conftest$ac_exeext'
-- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-- (eval $ac_try) 2>&5
-- ac_status=$?
-- echo "$as_me:$LINENO: \$? = $ac_status" >&5
-- (exit $ac_status); }; }; then
-- ac_cv_lib_nsl_main=yes
--else
-- echo "$as_me: failed program was:" >&5
--sed 's/^/| /' conftest.$ac_ext >&5
--
--ac_cv_lib_nsl_main=no
--fi
--rm -f conftest.err conftest.$ac_objext \
-- conftest$ac_exeext conftest.$ac_ext
--LIBS=$ac_check_lib_save_LIBS
--fi
--echo "$as_me:$LINENO: result: $ac_cv_lib_nsl_main" >&5
--echo "${ECHO_T}$ac_cv_lib_nsl_main" >&6
--if test $ac_cv_lib_nsl_main = yes; then
-- SOCKETLIBS="$SOCKETLIBS -lnsl"
--fi
-+#echo "$as_me:$LINENO: checking for main in -lnsl" >&5
-+#echo $ECHO_N "checking for main in -lnsl... $ECHO_C" >&6
-+#if test "${ac_cv_lib_nsl_main+set}" = set; then
-+# echo $ECHO_N "(cached) $ECHO_C" >&6
-+#else
-+# ac_check_lib_save_LIBS=$LIBS
-+#LIBS="-lnsl $LIBS"
-+#cat >conftest.$ac_ext <<_ACEOF
-+#/* confdefs.h. */
-+#_ACEOF
-+#cat confdefs.h >>conftest.$ac_ext
-+#cat >>conftest.$ac_ext <<_ACEOF
-+#/* end confdefs.h. */
-+#
-+#
-+#int
-+#main ()
-+#{
-+#main ();
-+# ;
-+# return 0;
-+#}
-+#_ACEOF
-+#rm -f conftest.$ac_objext conftest$ac_exeext
-+#if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
-+# (eval $ac_link) 2>conftest.er1
-+# ac_status=$?
-+# grep -v '^ *+' conftest.er1 >conftest.err
-+# rm -f conftest.er1
-+# cat conftest.err >&5
-+# echo "$as_me:$LINENO: \$? = $ac_status" >&5
-+# (exit $ac_status); } &&
-+# { ac_try='test -z "$ac_c_werror_flag"
-+# || test ! -s conftest.err'
-+# { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-+# (eval $ac_try) 2>&5
-+# ac_status=$?
-+# echo "$as_me:$LINENO: \$? = $ac_status" >&5
-+# (exit $ac_status); }; } &&
-+# { ac_try='test -s conftest$ac_exeext'
-+# { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-+# (eval $ac_try) 2>&5
-+# ac_status=$?
-+# echo "$as_me:$LINENO: \$? = $ac_status" >&5
-+# (exit $ac_status); }; }; then
-+# ac_cv_lib_nsl_main=yes
-+#else
-+# echo "$as_me: failed program was:" >&5
-+#sed 's/^/| /' conftest.$ac_ext >&5
-+#
-+#ac_cv_lib_nsl_main=no
-+#fi
-+#rm -f conftest.err conftest.$ac_objext \
-+# conftest$ac_exeext conftest.$ac_ext
-+#LIBS=$ac_check_lib_save_LIBS
-+#fi
-+#echo "$as_me:$LINENO: result: $ac_cv_lib_nsl_main" >&5
-+#echo "${ECHO_T}$ac_cv_lib_nsl_main" >&6
-+#if test $ac_cv_lib_nsl_main = yes; then
-+# SOCKETLIBS="$SOCKETLIBS -lnsl"
-+#fi
-
- echo "$as_me:$LINENO: checking for socket in -lsocket" >&5
- echo $ECHO_N "checking for socket in -lsocket... $ECHO_C" >&6
-@@ -5993,78 +5993,78 @@
- MYSQLLIBFOUND=no
-
-
--echo "$as_me:$LINENO: checking for compress in -lz" >&5
--echo $ECHO_N "checking for compress in -lz... $ECHO_C" >&6
--if test "${ac_cv_lib_z_compress+set}" = set; then
-- echo $ECHO_N "(cached) $ECHO_C" >&6
--else
-- ac_check_lib_save_LIBS=$LIBS
--LIBS="-lz $LIBS"
--cat >conftest.$ac_ext <<_ACEOF
--/* confdefs.h. */
--_ACEOF
--cat confdefs.h >>conftest.$ac_ext
--cat >>conftest.$ac_ext <<_ACEOF
--/* end confdefs.h. */
--
--/* Override any gcc2 internal prototype to avoid an error. */
--#ifdef __cplusplus
--extern "C"
--#endif
--/* We use char because int might match the return type of a gcc2
-- builtin and then its argument prototype would still apply. */
--char compress ();
--int
--main ()
--{
--compress ();
-- ;
-- return 0;
--}
--_ACEOF
--rm -f conftest.$ac_objext conftest$ac_exeext
--if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
-- (eval $ac_link) 2>conftest.er1
-- ac_status=$?
-- grep -v '^ *+' conftest.er1 >conftest.err
-- rm -f conftest.er1
-- cat conftest.err >&5
-- echo "$as_me:$LINENO: \$? = $ac_status" >&5
-- (exit $ac_status); } &&
-- { ac_try='test -z "$ac_c_werror_flag"
-- || test ! -s conftest.err'
-- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-- (eval $ac_try) 2>&5
-- ac_status=$?
-- echo "$as_me:$LINENO: \$? = $ac_status" >&5
-- (exit $ac_status); }; } &&
-- { ac_try='test -s conftest$ac_exeext'
-- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-- (eval $ac_try) 2>&5
-- ac_status=$?
-- echo "$as_me:$LINENO: \$? = $ac_status" >&5
-- (exit $ac_status); }; }; then
-- ac_cv_lib_z_compress=yes
--else
-- echo "$as_me: failed program was:" >&5
--sed 's/^/| /' conftest.$ac_ext >&5
--
--ac_cv_lib_z_compress=no
--fi
--rm -f conftest.err conftest.$ac_objext \
-- conftest$ac_exeext conftest.$ac_ext
--LIBS=$ac_check_lib_save_LIBS
--fi
--echo "$as_me:$LINENO: result: $ac_cv_lib_z_compress" >&5
--echo "${ECHO_T}$ac_cv_lib_z_compress" >&6
--if test $ac_cv_lib_z_compress = yes; then
-- cat >>confdefs.h <<_ACEOF
--#define HAVE_LIBZ 1
--_ACEOF
--
-- LIBS="-lz $LIBS"
--
--fi
-+#echo "$as_me:$LINENO: checking for compress in -lz" >&5
-+#echo $ECHO_N "checking for compress in -lz... $ECHO_C" >&6
-+#if test "${ac_cv_lib_z_compress+set}" = set; then
-+# echo $ECHO_N "(cached) $ECHO_C" >&6
-+#else
-+# ac_check_lib_save_LIBS=$LIBS
-+#LIBS="-lz $LIBS"
-+#cat >conftest.$ac_ext <<_ACEOF
-+#/* confdefs.h. */
-+#_ACEOF
-+#cat confdefs.h >>conftest.$ac_ext
-+#cat >>conftest.$ac_ext <<_ACEOF
-+#/* end confdefs.h. */
-+#
-+#/* Override any gcc2 internal prototype to avoid an error. */
-+##ifdef __cplusplus
-+#extern "C"
-+##endif
-+#/* We use char because int might match the return type of a gcc2
-+# builtin and then its argument prototype would still apply. */
-+#char compress ();
-+#int
-+#main ()
-+#{
-+#compress ();
-+# ;
-+# return 0;
-+#}
-+#_ACEOF
-+#rm -f conftest.$ac_objext conftest$ac_exeext
-+#if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
-+# (eval $ac_link) 2>conftest.er1
-+# ac_status=$?
-+# grep -v '^ *+' conftest.er1 >conftest.err
-+# rm -f conftest.er1
-+# cat conftest.err >&5
-+# echo "$as_me:$LINENO: \$? = $ac_status" >&5
-+# (exit $ac_status); } &&
-+# { ac_try='test -z "$ac_c_werror_flag"
-+# || test ! -s conftest.err'
-+# { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-+# (eval $ac_try) 2>&5
-+# ac_status=$?
-+# echo "$as_me:$LINENO: \$? = $ac_status" >&5
-+# (exit $ac_status); }; } &&
-+# { ac_try='test -s conftest$ac_exeext'
-+# { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-+# (eval $ac_try) 2>&5
-+# ac_status=$?
-+# echo "$as_me:$LINENO: \$? = $ac_status" >&5
-+# (exit $ac_status); }; }; then
-+# ac_cv_lib_z_compress=yes
-+#else
-+# echo "$as_me: failed program was:" >&5
-+#sed 's/^/| /' conftest.$ac_ext >&5
-+#
-+#ac_cv_lib_z_compress=no
-+#fi
-+#rm -f conftest.err conftest.$ac_objext \
-+# conftest$ac_exeext conftest.$ac_ext
-+#LIBS=$ac_check_lib_save_LIBS
-+#fi
-+#echo "$as_me:$LINENO: result: $ac_cv_lib_z_compress" >&5
-+#echo "${ECHO_T}$ac_cv_lib_z_compress" >&6
-+#if test $ac_cv_lib_z_compress = yes; then
-+# cat >>confdefs.h <<_ACEOF
-+##define HAVE_LIBZ 1
-+#_ACEOF
-+#
-+# LIBS="-lz $LIBS"
-+#
-+#fi
-
- echo "$as_me:$LINENO: checking for mysql_store_result in -lmysqlclient" >&5
- echo $ECHO_N "checking for mysql_store_result in -lmysqlclient... $ECHO_C" >&6
-diff -urNad ndoutils-1.4b7~/configure.in ndoutils-1.4b7/configure.in
---- ndoutils-1.4b7~/configure.in 2007-10-31 19:17:03.000000000 +0100
-+++ ndoutils-1.4b7/configure.in 2008-01-07 18:04:56.000000000 +0100
-@@ -87,7 +87,7 @@
- AC_SUBST(OTHERLIBS)
-
- dnl Checks for library functions.
--AC_CHECK_LIB(nsl,main,SOCKETLIBS="$SOCKETLIBS -lnsl")
-+dnl AC_CHECK_LIB(nsl,main,SOCKETLIBS="$SOCKETLIBS -lnsl")
- AC_CHECK_LIB(socket,socket,SOCKETLIBS="$SOCKETLIBS -lsocket")
- AC_SUBST(SOCKETLIBS)
- AC_CHECK_LIB(wrap,main,[
-@@ -205,7 +205,7 @@
- MYSQLLIBFOUND=no
-
- dnl check compress lib for Mac OSX as well...
-- AC_CHECK_LIB(z,compress)
-+ dnl AC_CHECK_LIB(z,compress)
- dnl AC_CHECK_LIB(mysqlclient,mysql_store_result,MYSQLLIBFOUND=yes,MYSQLLIBFOUND=no)
- AC_CHECK_LIB(mysqlclient,mysql_store_result,MYSQLLIBFOUND=yes,)
- AC_CHECK_LIB(mysqlclient,mysql_connect,MYSQLLIBFOUND=yes,)
diff -urNad ndoutils-1.4b7~/src/Makefile.in ndoutils-1.4b7/src/Makefile.in
--- ndoutils-1.4b7~/src/Makefile.in 2007-10-03 03:02:58.000000000 +0200
+++ ndoutils-1.4b7/src/Makefile.in 2008-01-07 17:57:50.000000000 +0100
Deleted: ndoutils/trunk/debian/patches/03-kfbsd_fpic.dpatch
===================================================================
--- ndoutils/trunk/debian/patches/03-kfbsd_fpic.dpatch 2010-02-17 10:29:18 UTC (rev 1822)
+++ ndoutils/trunk/debian/patches/03-kfbsd_fpic.dpatch 2010-02-17 15:56:13 UTC (rev 1823)
@@ -1,31 +0,0 @@
-#! /bin/sh /usr/share/dpatch/dpatch-run
-## kfbsd_fpic.dpatch by Hendrik Frenzel <hfrenzel at scunc.net>
-##
-## All lines beginning with `## DP:' are a description of the patch.
-## DP: No description.
-
- at DPATCH@
-diff -urNad ndoutils-1.4b7~/configure ndoutils-1.4b7/configure
---- ndoutils-1.4b7~/configure 2007-10-31 19:17:03.000000000 +0100
-+++ ndoutils-1.4b7/configure 2008-01-27 18:53:19.000000000 +0100
-@@ -5905,7 +5905,7 @@
- MOD_LDFLAGS="-bundle -flat_namespace -undefined suppress"
- MOD_CFLAGS="$MOD_CFLAGS -fno-common"
- ;;
-- linux*)
-+ linux* | k*bsd*-gnu*)
- # assume GNU linker and ELF
- MOD_LDFLAGS="-shared"
- MOD_CFLAGS="-fPIC"
-diff -urNad ndoutils-1.4b7~/configure.in ndoutils-1.4b7/configure.in
---- ndoutils-1.4b7~/configure.in 2007-10-31 19:17:03.000000000 +0100
-+++ ndoutils-1.4b7/configure.in 2008-01-27 18:53:33.000000000 +0100
-@@ -147,7 +147,7 @@
- MOD_LDFLAGS="-bundle -flat_namespace -undefined suppress"
- MOD_CFLAGS="$MOD_CFLAGS -fno-common"
- ;;
-- linux*)
-+ linux* | k*bsd*-gnu*)
- # assume GNU linker and ELF
- MOD_LDFLAGS="-shared"
- MOD_CFLAGS="-fPIC"
Modified: ndoutils/trunk/debian/rules
===================================================================
--- ndoutils/trunk/debian/rules 2010-02-17 10:29:18 UTC (rev 1822)
+++ ndoutils/trunk/debian/rules 2010-02-17 15:56:13 UTC (rev 1823)
@@ -39,7 +39,7 @@
# --infodir=\$${prefix}/share/info \
# CFLAGS="$(CFLAGS)" LDFLAGS="-Wl,-z,defs"
-CONFIGURE = ./configure
+CONFIGURE = ./configure --localstatedir=/var/cache/nagios3/
CONFIG_MYSQL = CPPFLAGS=`mysql_config --include` $(CONFIGURE) \
--enable-mysql --disable-pgsql
#CONFIG_PGSQL = CPPFLAGS="-I`pg_config --includedir`" $(CONFIGURE) \
@@ -165,7 +165,7 @@
done
# install the config templates
- for cfg in ndo2db.cfg ndomod.cfg; do \
+ for cfg in ndo2db.cfg-sample ndomod.cfg-sample; do \
sed -e 's/^ *[^#]* *\(\<db_servertype\) *=.*$$/\1=_DBC_DBTYPE_/' \
-e 's/^ *[^#]* *\(\<db_host\) *=.*$$/\1=_DBC_DBSERVER_/' \
-e 's/^ *[^#]* *\(\<db_port\) *=.*$$/\1=_DBC_DBPORT_/' \
More information about the Pkg-nagios-changes
mailing list