[Pkg-nagios-changes] [pkg-nagios] r959 - in
nagios-plugins/trunk/debian: . patches
Sean Finney
seanius at costa.debian.org
Sat Jul 8 10:00:38 UTC 2006
Author: seanius
Date: 2006-07-08 10:00:34 +0000 (Sat, 08 Jul 2006)
New Revision: 959
Modified:
nagios-plugins/trunk/debian/changelog
nagios-plugins/trunk/debian/control
nagios-plugins/trunk/debian/patches/10_config.h_debiandefaults.dpatch
nagios-plugins/trunk/debian/rules
Log:
- updated debiandefaults patch to apply against snapshot
- martin pitt's libpq changes.
Modified: nagios-plugins/trunk/debian/changelog
===================================================================
--- nagios-plugins/trunk/debian/changelog 2006-07-07 21:48:35 UTC (rev 958)
+++ nagios-plugins/trunk/debian/changelog 2006-07-08 10:00:34 UTC (rev 959)
@@ -1,10 +1,33 @@
-nagios-plugins (1.4.3-1.0) UNRELEASED; urgency=low
+nagios-plugins (1.4.3.0cvs.20060707-1) UNRELEASED; urgency=low
- * NOT RELEASED YET
+ [sean finney]
+ * new release based on latest upstream CVS HEAD, as backporting some
+ of the changes would involve either massive patches to the autofoo
+ generated files (Makefile/Configure etc) or by changing the packages
+ to autogenerate the autofoo stuff as part of the build process,
+ neither of which i like.
+ * anyway, the goodies:
+ - upstream incorporated fix for F'ing TBFS due to the broken .la files
+ installed in the libradius-dev package
+ - new check_apt plugin to check that a host is up to date wrt the debian
+ package management system (run with --help for more information)
+ Closes: #317763.
+ - new check_ntp plugin written in C, which performs much faster and more
+ reliably than the perl plugin, and does everything natively
+ (sending/recieving the packets itself instead of parsing the output
+ of ntpdate/ntpq). Closes: #351257, #360549, #360774.
+ - as a result, we no longer need to depend on any of the NTP stuff.
+ * modified debian/control to reflect new lack of dependency on ntp
+ * modified debian/rules to keep check_ntp in the -basic package, as
+ there's no reason to keep it in standard now.
+ * finally incorporate martin pitt's request about transitioning to
+ the new postgres build system. Closes: #377201.
+
+ [marc haber]
* make package build fail if /proc is not mounted, before I end up
filing that bug a fourth time. Closes: #344389, #354215
- -- Marc Haber <mh+debian-packages at zugschlus.de> Fri, 9 Jun 2006 13:18:50 +0000
+ -- sean finney <seanius at debian.org> Sun, 04 Jun 2006 00:57:17 +0200
nagios-plugins (1.4.3-1) unstable; urgency=low
Modified: nagios-plugins/trunk/debian/control
===================================================================
--- nagios-plugins/trunk/debian/control 2006-07-07 21:48:35 UTC (rev 958)
+++ nagios-plugins/trunk/debian/control 2006-07-08 10:00:34 UTC (rev 959)
@@ -3,7 +3,7 @@
Priority: extra
Maintainer: Debian Nagios Maintainer Group <pkg-nagios-devel at lists.alioth.debian.org>
Uploaders: sean finney <seanius at debian.org>, Guido Trotter <ultrotter at debian.org>
-Build-Depends: debhelper (>= 4.0.0), dpatch (>= 2.0.9), autotools-dev, libldap2-dev, postgresql-dev, libmysqlclient15-dev | libmysqlclient12-dev | libmysqlclient-dev, libsnmp9-dev | libsnmp5-dev | libsnmp-dev, libradius1-dev, libkrb5-dev, libnet-snmp-perl, procps, coreutils, iputils-ping, snmp, mawk | awk
+Build-Depends: debhelper (>= 4.0.0), dpatch (>= 2.0.9), autotools-dev, libldap2-dev, libpq-dev, libmysqlclient15-dev | libmysqlclient12-dev | libmysqlclient-dev, libsnmp9-dev | libsnmp5-dev | libsnmp-dev, libradius1-dev, libkrb5-dev, libnet-snmp-perl, procps, coreutils, iputils-ping, snmp, mawk | awk
Standards-Version: 3.6.2
Package: nagios-plugins
@@ -56,7 +56,7 @@
Architecture: any
Conflicts: nagios-plugins (<= 1.4.2-3)
Replaces: nagios-plugins
-Depends: ${shlibs:Depends}, ${misc:Depends}, fping, qstat, snmp, radiusclient1, libnet-snmp-perl, dnsutils, bind9-host | host, ntpdate, ntp, smbclient
+Depends: ${shlibs:Depends}, ${misc:Depends}, fping, qstat, snmp, radiusclient1, libnet-snmp-perl, dnsutils, bind9-host | host, smbclient
Suggests: nagios-text | nagios
Description: Plugins for the nagios network monitoring and management system
Nagios is a host/service/network monitoring and management system. It has
Modified: nagios-plugins/trunk/debian/patches/10_config.h_debiandefaults.dpatch
===================================================================
--- nagios-plugins/trunk/debian/patches/10_config.h_debiandefaults.dpatch 2006-07-07 21:48:35 UTC (rev 958)
+++ nagios-plugins/trunk/debian/patches/10_config.h_debiandefaults.dpatch 2006-07-08 10:00:34 UTC (rev 959)
@@ -14,21 +14,13 @@
-EXTRAS=
+#EXTRAS=
+ EXTRAS_ROOT=
LDFLAGS="$LDFLAGS -L."
-
-@@ -27037,7 +27037,6 @@
- unset FOUNDINCLUDE
- if test x"$with_openssl" != x"/usr" ; then
- CPPFLAGS="$CPPFLAGS -I$with_openssl/include"
-- LDFLAGS="$LDFLAGS -R$with_openssl/lib"
- fi
-
-
diff -urNad --exclude=CVS --exclude=.svn ./np-debian.h /home/sean/tmp/dpep-work.XeNnAd/nagios-plugins-1.4.3/np-debian.h
--- ./np-debian.h 1970-01-01 01:00:00.000000000 +0100
+++ /home/sean/tmp/dpep-work.XeNnAd/nagios-plugins-1.4.3/np-debian.h 2006-05-27 21:29:42.000000000 +0200
-@@ -0,0 +1,25 @@
+@@ -0,0 +1,19 @@
+#ifndef _NP_DEBIAN_H_
+#define _NP_DEBIAN_H_
+
@@ -47,12 +39,6 @@
+#undef PATH_TO_SMBCLIENT
+#define PATH_TO_SMBCLIENT "/usr/bin/smbclient"
+
-+#undef PATH_TO_NTPDATE
-+#define PATH_TO_NTPDATE "/usr/sbin/ntpdate"
-+
-+#undef PATH_TO_NTPQ
-+#define PATH_TO_NTPQ "/usr/bin/ntpq"
-+
+#endif /* _NP_DEBIAN_H_ */
diff -urNad --exclude=CVS --exclude=.svn ./plugins/common.h /home/sean/tmp/dpep-work.XeNnAd/nagios-plugins-1.4.3/plugins/common.h
--- ./plugins/common.h 2005-12-07 16:10:27.000000000 +0100
@@ -68,18 +54,12 @@
diff -urNad --exclude=CVS --exclude=.svn ./plugins-scripts/utils.pm.in /home/sean/tmp/dpep-work.XeNnAd/nagios-plugins-1.4.3/plugins-scripts/utils.pm.in
--- ./plugins-scripts/utils.pm.in 2003-04-13 06:25:36.000000000 +0200
+++ /home/sean/tmp/dpep-work.XeNnAd/nagios-plugins-1.4.3/plugins-scripts/utils.pm.in 2006-05-27 21:29:42.000000000 +0200
-@@ -35,13 +35,13 @@
+@@ -35,10 +35,10 @@
sub is_hostname;
## updated by autoconf
-$PATH_TO_RPCINFO = "@PATH_TO_RPCINFO@" ;
--$PATH_TO_NTPDATE = "@PATH_TO_NTPDATE@" ;
--$PATH_TO_NTPDC = "@PATH_TO_NTPDC@" ;
--$PATH_TO_NTPQ = "@PATH_TO_NTPQ@" ;
+$PATH_TO_RPCINFO = "/usr/bin/rpcinfo";
-+$PATH_TO_NTPDATE = "/usr/sbin/ntpdate";
-+$PATH_TO_NTPDC = "/usr/bin/ntpdc";
-+$PATH_TO_NTPQ = "/usr/bin/ntpq";
$PATH_TO_LMSTAT = "@PATH_TO_LMSTAT@" ;
-$PATH_TO_SMBCLIENT = "@PATH_TO_SMBCLIENT@" ;
-$PATH_TO_MAILQ = "@PATH_TO_MAILQ@";
Modified: nagios-plugins/trunk/debian/rules
===================================================================
--- nagios-plugins/trunk/debian/rules 2006-07-07 21:48:35 UTC (rev 958)
+++ nagios-plugins/trunk/debian/rules 2006-07-08 10:00:34 UTC (rev 959)
@@ -24,9 +24,9 @@
std_plugins:=check_breeze check_ifoperstatus check_hpjd check_ifstatus \
check_rpc check_snmp check_wave check_fping check_game \
check_radius check_mysql check_pgsql check_disk_smb check_ldap \
- check_dns check_dig check_flexlm check_ntp check_oracle
+ check_dns check_dig check_flexlm check_oracle
std_plugin_cfgs:=breeze dns flexlm games hppjd ifstatus ldap mrtg mysql \
- netware nt ntp pgsql radius snmp
+ netware nt pgsql radius snmp
PATH = /bin:/sbin:/usr/bin:/usr/sbin
@@ -57,8 +57,9 @@
rm -f config.cache
# Add here commands to configure the package.
- EXTRAS="check_game check_fping check_by_ssh check_dig check_dns" PATH_TO_DIG="/usr/bin/dig" PATH_TO_NSLOOKUP="/usr/bin/nslookup" NSLOOKUP_COMMAND="/usr/bin/nslookup -sil" PATH_TO_HOST="/usr/bin/host" CFLAGS="$(CFLAGS)" ./configure --host=$(DEB_HOST_GNU_TYPE) --build=$(DEB_BUILD_GNU_TYPE) --prefix=/usr --mandir=/usr/share/man --infodir=/usr/share/info --libexecdir=${NP_LIBEXEC} --with-nagios-user=nagios --with-nagios-group=nagios --with-trusted-path=/bin:/sbin:/usr/bin:/usr/sbin --with-mysql=/usr --disable-rpath
+ EXTRAS="check_game check_fping check_by_ssh check_dig check_dns" PATH_TO_DIG="/usr/bin/dig" PATH_TO_NSLOOKUP="/usr/bin/nslookup" NSLOOKUP_COMMAND="/usr/bin/nslookup -sil" PATH_TO_HOST="/usr/bin/host" CFLAGS="$(CFLAGS)" ./configure --host=$(DEB_HOST_GNU_TYPE) --build=$(DEB_BUILD_GNU_TYPE) --prefix=/usr --mandir=/usr/share/man --infodir=/usr/share/info --libexecdir=${NP_LIBEXEC} --with-nagios-user=nagios --with-nagios-group=nagios --with-trusted-path=/bin:/sbin:/usr/bin:/usr/sbin --with-mysql=/usr --disable-rpath PGINCLUDE="-I`pg_config --includedir`" PGLIBS="-lpq -lcrypt"
+
build: patch-stamp build-stamp
build-stamp: config.status
More information about the Pkg-nagios-changes
mailing list