Mailinglist Archive: opensuse-commit (1059 mails)

< Previous Next >
commit nagios-plugins
  • From: root@xxxxxxxxxxxxxxx (h_root)
  • Date: Mon, 07 Jan 2008 02:52:51 +0100
  • Message-id: <20080107015252.0D8E86781B8@xxxxxxxxxxxxxxx>

Hello community,

here is the log from the commit of package nagios-plugins
checked in at Mon Jan 7 02:52:51 CET 2008.

--------
--- nagios-plugins/nagios-plugins.changes 2007-10-26 13:56:04.000000000
+0200
+++ /mounts/work_src_done/STABLE/nagios-plugins/nagios-plugins.changes
2008-01-04 10:22:41.000000000 +0100
@@ -1,0 +2,18 @@
+Fri Jan 4 10:19:37 CET 2008 - olh@xxxxxxx
+
+- update to version 1.4.11
+ * Fix check_http regression in 1.4.10 where following redirects to
+ relative URLs on virtual hosts failed if both "-H" and "-I" were used
+ * check_ntp now return UNKNOWN instead of WARNING if jitter is unavailable
(jitter=-1.000000)
+ as long as the thresholds range inculde -1. If no offset threshold is
specified
+ and the offset is unavailable, will return UNKNOWN as well.
+ NOTE: If jitter thresholds are specified as integers it will return
CRITICAL if jitter
+ is "-1" as the default range starts at 0. See Examples in --help output.
+ * Fix broken usage2 in check_snmp and check_cluster
+ * check_cluster now accept all valid characters in its thresholds ("-", "@",
"~")
+ * Merge two new checks that deprecates check_ntp: check_ntp_peer and
check_ntp_time.
+ * Fix check_disk reporting OK if disk usage grows over 100% (bug #1348746).
+ The problem happens to be in Gnulib but a workaround have been implemented
in check_disk.c
+ * Fix check_load argument handling when not passing triplets (bug #1831890)
+
+-------------------------------------------------------------------

Old:
----
nagios-plugins-1.4.10.tar.bz2
nagios-plugins.check_http.redir.patch
nagios-plugins.check_snmp.overflow.patch

New:
----
nagios-plugins-1.4.11.tar.bz2

++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++

Other differences:
------------------
++++++ nagios-plugins.spec ++++++
--- /var/tmp/diff_new_pack.yP1235/_old 2008-01-07 02:51:57.000000000 +0100
+++ /var/tmp/diff_new_pack.yP1235/_new 2008-01-07 02:51:57.000000000 +0100
@@ -1,7 +1,7 @@
#
-# spec file for package nagios-plugins (Version 1.4.10)
+# spec file for package nagios-plugins (Version 1.4.11)
#
-# Copyright (c) 2007 SUSE LINUX Products GmbH, Nuernberg, Germany.
+# Copyright (c) 2008 SUSE LINUX Products GmbH, Nuernberg, Germany.
# This file and all modifications and additions to the pristine
# package are under the same license as the package itself.
#
@@ -11,7 +11,7 @@
# norootforbuild

Name: nagios-plugins
-BuildRequires: bind-utils dhcp-devel fping iputils libsmbclient
libsmbclient-devel mysql-devel nagios net-snmp-devel openldap2 openldap2-devel
openssh perl-Net-SNMP postfix postgresql-devel procps python-devel samba-client
+BuildRequires: bind-utils dhcp-devel fping iputils libsmbclient-devel
mysql-devel nagios net-snmp-devel openldap2 openldap2-devel openssh
perl-Net-SNMP postfix postgresql-devel procps python-devel samba-client
%if 0%{?suse_version}
%if 0%{?suse_version} > 1020
BuildRequires: freeradius-client-devel
@@ -25,8 +25,8 @@
BuildRequires: krb5-devel
%endif
Summary: The Nagios Plug-Ins
-Version: 1.4.10
-Release: 12
+Version: 1.4.11
+Release: 1
Url: http://nagiosplug.sourceforge.net/
License: GPL v2 or later
Group: System/Monitoring
@@ -42,14 +42,20 @@
Patch9: nagios-plugins.check_dhcp-char.patch
Patch10: nagios-plugins.asprintf.patch
Patch11: nagios-plugins.check_snmp.arrayaddress.patch
-Patch12: nagios-plugins.check_snmp.overflow.patch
-Patch13: nagios-plugins.check_http.redir.patch
BuildRoot: %{_tmppath}/%{name}-%{version}-build
Requires: perl-Net-SNMP
%define libexecdir %{_prefix}/lib/nagios/plugins

%description
-These plug-ins are needed for Nagios checks.
+Nagios is a program that will monitor hosts and services on your
+network, and to email or page you when a problem arises or is resolved.
+Nagios runs on a unix server as a background or daemon process,
+intermittently running checks on various services that you specify.
+
+The actual service checks are performed by separate "plugin" programs
+which return the status of the checks to Nagios.
+
+This package contains those plugins.



@@ -59,13 +65,14 @@
and others

%package extras
-Summary: Nagios Plug-Ins which Depend on Additional Packages
+Summary: Nagios Plug-Ins which depend on additional packages
Group: System/Monitoring
Requires: nagios-plugins net-snmp fping

%description extras
-These are additional plug-ins for Nagios. They depend on other packages
-which have to be installed.
+These are additional plug-ins for Nagios.
+
+They depend on other packages which have to be installed.



@@ -76,18 +83,16 @@

%prep
%setup -q
-%patch1
-%patch2
-%patch3
-%patch4
-%patch6
+%patch1 -p1
+%patch2 -p1
+%patch3 -p1
+%patch4 -p1
+%patch6 -p1
+%patch7 -p1
%patch8 -p1
%patch9 -p1
%patch10 -p1
%patch11 -p1
-%patch12 -p1
-%patch13 -p1
-#patch7

%build
autoconf
@@ -144,6 +149,8 @@
%{libexecdir}/check_nntp
%{libexecdir}/check_nt
%{libexecdir}/check_ntp
+%{libexecdir}/check_ntp_peer
+%{libexecdir}/check_ntp_time
%{libexecdir}/check_nwstat
%{libexecdir}/check_oracle
%{libexecdir}/check_overcr
@@ -177,7 +184,7 @@
%{libexecdir}/check_mysql
%{libexecdir}/check_mysql_query
%{libexecdir}/check_pgsql
-#%{libexecdir}/check_radius
+%{libexecdir}/check_radius
%{libexecdir}/check_snmp
%{libexecdir}/check_jabber
%{libexecdir}/check_nntps
@@ -185,7 +192,23 @@
%{libexecdir}/check_spop
%{libexecdir}/check_ssmtp
%{libexecdir}/check_apt
+
%changelog
+* Fri Jan 04 2008 - olh@xxxxxxx
+- update to version 1.4.11
+ * Fix check_http regression in 1.4.10 where following redirects to
+ relative URLs on virtual hosts failed if both "-H" and "-I" were used
+ * check_ntp now return UNKNOWN instead of WARNING if jitter is unavailable
(jitter=-1.000000)
+ as long as the thresholds range inculde -1. If no offset threshold is
specified
+ and the offset is unavailable, will return UNKNOWN as well.
+ NOTE: If jitter thresholds are specified as integers it will return CRITICAL
if jitter
+ is "-1" as the default range starts at 0. See Examples in --help output.
+ * Fix broken usage2 in check_snmp and check_cluster
+ * check_cluster now accept all valid characters in its thresholds ("-", "@",
"~")
+ * Merge two new checks that deprecates check_ntp: check_ntp_peer and
check_ntp_time.
+ * Fix check_disk reporting OK if disk usage grows over 100%% (bug #1348746).
+ The problem happens to be in Gnulib but a workaround have been implemented
in check_disk.c
+ * Fix check_load argument handling when not passing triplets (bug #1831890)
* Fri Oct 26 2007 - olh@xxxxxxx
- fix possible buffer overflow in check_snmp with snmpget replies (336002)
fix possible buffer overflow in check_http with redirects (331728)

++++++ nagios-plugins-1.4.10.tar.bz2 -> nagios-plugins-1.4.11.tar.bz2 ++++++
++++ 53138 lines of diff (skipped)

++++++ nagios-plugins-1.4.5-check_fping.c.patch ++++++
--- /var/tmp/diff_new_pack.yP1235/_old 2008-01-07 02:51:59.000000000 +0100
+++ /var/tmp/diff_new_pack.yP1235/_new 2008-01-07 02:51:59.000000000 +0100
@@ -1,6 +1,10 @@
---- plugins/check_fping.c
-+++ plugins/check_fping.c
-@@ -389,9 +389,9 @@
+---
+ plugins/check_fping.c | 4 ++--
+ 1 file changed, 2 insertions(+), 2 deletions(-)
+
+--- a/plugins/check_fping.c
++++ b/plugins/check_fping.c
+@@ -389,9 +389,9 @@ print_help (void)
printf (" %s\n", "-c, --critical=THRESHOLD");
printf (" %s\n", _("critical threshold pair"));
printf (" %s\n", "-b, --bytes=INTEGER");

++++++ nagios-plugins-1.4.5-check_mysql.c.patch ++++++
--- /var/tmp/diff_new_pack.yP1235/_old 2008-01-07 02:51:59.000000000 +0100
+++ /var/tmp/diff_new_pack.yP1235/_new 2008-01-07 02:51:59.000000000 +0100
@@ -1,6 +1,10 @@
---- plugins/check_mysql.c 2006-10-19 02:25:16.000000000 +0200
-+++ plugins/check_mysql.c 2006-11-17 13:02:47.000000000 +0100
-@@ -351,7 +351,7 @@
+---
+ plugins/check_mysql.c | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+--- a/plugins/check_mysql.c
++++ b/plugins/check_mysql.c
+@@ -351,7 +351,7 @@ validate_arguments (void)
db_host = strdup("");

if (db_pass == NULL)

++++++ nagios-plugins-1.4.5-check_mysql_query.c.patch ++++++
--- /var/tmp/diff_new_pack.yP1235/_old 2008-01-07 02:51:59.000000000 +0100
+++ /var/tmp/diff_new_pack.yP1235/_new 2008-01-07 02:51:59.000000000 +0100
@@ -1,6 +1,10 @@
---- plugins/check_mysql_query.c 2006-10-19 02:25:16.000000000 +0200
-+++ plugins/check_mysql_query.c 2006-11-17 12:57:41.000000000 +0100
-@@ -265,7 +265,7 @@
+---
+ plugins/check_mysql_query.c | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+--- a/plugins/check_mysql_query.c
++++ b/plugins/check_mysql_query.c
+@@ -265,7 +265,7 @@ validate_arguments (void)
db_host = strdup("");

if (db_pass == NULL)

++++++ nagios-plugins-1.4.5-check_procs.c.patch ++++++
--- /var/tmp/diff_new_pack.yP1235/_old 2008-01-07 02:51:59.000000000 +0100
+++ /var/tmp/diff_new_pack.yP1235/_new 2008-01-07 02:51:59.000000000 +0100
@@ -1,10 +1,14 @@
---- plugins/check_procs.c 2006-10-23 00:03:31.000000000 +0200
-+++ plugins/check_procs.c 2006-11-17 11:11:22.000000000 +0100
-@@ -43,6 +43,7 @@
+---
+ plugins/check_procs.c | 1 +
+ 1 file changed, 1 insertion(+)
+
+--- a/plugins/check_procs.c
++++ b/plugins/check_procs.c
+@@ -44,6 +44,7 @@ const char *email = "nagiosplug-devel@li
#include "common.h"
#include "popen.h"
#include "utils.h"
+#include "dirname.h"
-
+
#include <pwd.h>
-
+

++++++ nagios-plugins-1.4.6-freeradius.patch ++++++
--- /var/tmp/diff_new_pack.yP1235/_old 2008-01-07 02:51:59.000000000 +0100
+++ /var/tmp/diff_new_pack.yP1235/_new 2008-01-07 02:51:59.000000000 +0100
@@ -1,27 +1,34 @@
---- configure.in
-+++ configure.in
-@@ -196,10 +196,10 @@
-
- dnl Check for radius libraries
- _SAVEDLIBS="$LIBS"
--AC_CHECK_LIB(radiusclient,rc_read_config)
--if test "$ac_cv_lib_radiusclient_rc_read_config" = "yes"; then
-+AC_CHECK_LIB(freeradius-client,rc_read_config)
-+if test "$ac_cv_lib_freeradius_client_rc_read_config" = "yes"; then
- EXTRAS="$EXTRAS check_radius"
-- RADIUSLIBS="-lradiusclient"
-+ RADIUSLIBS="-lfreeradius-client"
+---
+ configure.in | 6 +++---
+ plugins/check_radius.c | 3 ++-
+ 2 files changed, 5 insertions(+), 4 deletions(-)
+
+--- a/configure.in
++++ b/configure.in
+@@ -218,10 +218,10 @@ if test "$ac_cv_lib_radiusclient_rc_read
+ RADIUSLIBS="-lradiusclient"
AC_SUBST(RADIUSLIBS)
else
- AC_MSG_WARN([Skipping radius plugin])
---- plugins/check_radius.c
-+++ plugins/check_radius.c
-@@ -43,7 +43,7 @@
+- AC_CHECK_LIB(radiusclient-ng,rc_read_config)
+- if test "$ac_cv_lib_radiusclient_ng_rc_read_config" = "yes"; then
++ AC_CHECK_LIB(freeradius-client,rc_read_config)
++ if test "$ac_cv_lib_freeradius_client_rc_read_config" = "yes"; then
+ EXTRAS="$EXTRAS check_radius"
+- RADIUSLIBS="-lradiusclient-ng"
++ RADIUSLIBS="-lfreeradius-client"
+ AC_SUBST(RADIUSLIBS)
+ else
+ AC_MSG_WARN([Skipping radius plugin])
+--- a/plugins/check_radius.c
++++ b/plugins/check_radius.c
+@@ -43,8 +43,9 @@ const char *email = "nagiosplug-devel@li
#include "utils.h"
#include "netutils.h"

--#include <radiusclient.h>
++#define HAVE_LIBRADIUSCLIENT_NG
+ #ifdef HAVE_LIBRADIUSCLIENT_NG
+-#include <radiusclient-ng.h>
+#include <freeradius-client.h>
-
- int process_arguments (int, char **);
- void print_help (void);
+ rc_handle *rch = NULL;
+ #else
+ #include <radiusclient.h>

++++++ nagios-plugins-1.4.6-no_chown.patch ++++++
--- /var/tmp/diff_new_pack.yP1235/_old 2008-01-07 02:51:59.000000000 +0100
+++ /var/tmp/diff_new_pack.yP1235/_new 2008-01-07 02:51:59.000000000 +0100
@@ -1,6 +1,11 @@
---- plugins-root/Makefile.am
-+++ plugins-root/Makefile.am
-@@ -36,7 +36,6 @@
+---
+ plugins-root/Makefile.am | 8 ++++----
+ plugins-root/Makefile.in | 9 ++++-----
+ 2 files changed, 8 insertions(+), 9 deletions(-)
+
+--- a/plugins-root/Makefile.am
++++ b/plugins-root/Makefile.am
+@@ -36,7 +36,6 @@ INSTALL_SUID = \
echo " $(INSTALL_PROGRAM) $$p $(DESTDIR)$(libexecdir)/$$p"; \
$(INSTALL_PROGRAM) $$p $(DESTDIR)$(libexecdir)/$$p; \
echo " chown root $(DESTDIR)$(libexecdir)/$$p"; \
@@ -8,7 +13,7 @@
echo " chmod $(setuid_root_mode) $(DESTDIR)$(libexecdir)/$$p"; \
chmod $(setuid_root_mode) $(DESTDIR)$(libexecdir)/$$p; \
done
-@@ -55,11 +54,12 @@
+@@ -55,11 +54,12 @@ install-exec-local: $(noinst_PROGRAMS)
&& chmod $(setuid_root_mode) $$TMPFILE > /dev/null 2>&1 \
&& can_create_suid_root_executable=yes; \
rm -f $$TMPFILE; \
@@ -24,9 +29,9 @@
fi

# /* Author Coreutils team sub-citation */
---- plugins-root/Makefile.in
-+++ plugins-root/Makefile.in
-@@ -366,7 +366,6 @@
+--- a/plugins-root/Makefile.in
++++ b/plugins-root/Makefile.in
+@@ -371,7 +371,6 @@ INSTALL_SUID = \
echo " $(INSTALL_PROGRAM) $$p $(DESTDIR)$(libexecdir)/$$p"; \
$(INSTALL_PROGRAM) $$p $(DESTDIR)$(libexecdir)/$$p; \
echo " chown root $(DESTDIR)$(libexecdir)/$$p"; \
@@ -34,7 +39,7 @@
echo " chmod $(setuid_root_mode) $(DESTDIR)$(libexecdir)/$$p"; \
chmod $(setuid_root_mode) $(DESTDIR)$(libexecdir)/$$p; \
done
-@@ -729,11 +728,11 @@
+@@ -734,11 +733,11 @@ install-exec-local: $(noinst_PROGRAMS)
&& chmod $(setuid_root_mode) $$TMPFILE > /dev/null 2>&1 \
&& can_create_suid_root_executable=yes; \
rm -f $$TMPFILE; \

++++++ nagios-plugins.asprintf.patch ++++++
--- /var/tmp/diff_new_pack.yP1235/_old 2008-01-07 02:51:59.000000000 +0100
+++ /var/tmp/diff_new_pack.yP1235/_new 2008-01-07 02:51:59.000000000 +0100
@@ -5,18 +5,18 @@

--- a/plugins/check_http.c
+++ b/plugins/check_http.c
-@@ -43,6 +43,8 @@ const char *revision = "$Revision: 1.104
+@@ -43,6 +43,8 @@ const char *revision = "$Revision: 1861
const char *copyright = "1999-2006";
const char *email = "nagiosplug-devel@xxxxxxxxxxxxxxxxxxxxx";

+#define _GNU_SOURCE
+#include <stdio.h>
#include <ctype.h>
- #include "common.h"
- #include "netutils.h"
+
+ #include <ctype.h>
--- a/plugins/check_tcp.c
+++ b/plugins/check_tcp.c
-@@ -37,6 +37,8 @@ const char *revision = "$Revision: 1.92
+@@ -37,6 +37,8 @@ const char *revision = "$Revision: 1729
const char *copyright = "1999-2006";
const char *email = "nagiosplug-devel@xxxxxxxxxxxxxxxxxxxxx";


++++++ nagios-plugins.check_dhcp-char.patch ++++++
--- /var/tmp/diff_new_pack.yP1235/_old 2008-01-07 02:51:59.000000000 +0100
+++ /var/tmp/diff_new_pack.yP1235/_new 2008-01-07 02:51:59.000000000 +0100
@@ -4,7 +4,7 @@

--- a/plugins-root/check_dhcp.c
+++ b/plugins-root/check_dhcp.c
-@@ -145,7 +145,7 @@ typedef struct dhcp_packet_struct{
+@@ -155,7 +155,7 @@ typedef struct dhcp_packet_struct{
unsigned char chaddr [MAX_DHCP_CHADDR_LENGTH]; /* hardware
address of this machine */
char sname [MAX_DHCP_SNAME_LENGTH]; /* name of DHCP server */
char file [MAX_DHCP_FILE_LENGTH]; /* boot file name (used for
diskless booting?) */
@@ -13,7 +13,7 @@
}dhcp_packet;


-@@ -783,7 +783,7 @@ int add_dhcp_offer(struct in_addr source
+@@ -847,7 +847,7 @@ int add_dhcp_offer(struct in_addr source
for(x=4;x<MAX_DHCP_OPTIONS_LENGTH;){

/* end of options (0 is really just a pad, but bail out anyway)
*/

++++++ nagios-plugins.check_snmp.arrayaddress.patch ++++++
--- /var/tmp/diff_new_pack.yP1235/_old 2008-01-07 02:51:59.000000000 +0100
+++ /var/tmp/diff_new_pack.yP1235/_new 2008-01-07 02:51:59.000000000 +0100
@@ -5,12 +5,12 @@

--- a/plugins/check_snmp.c
+++ b/plugins/check_snmp.c
-@@ -359,7 +359,7 @@ main (int argc, char **argv)
+@@ -370,7 +370,7 @@ main (int argc, char **argv)

- strcat(perfstr, "=");
- strcat(perfstr, show);
+ strncat(perfstr, "=", sizeof(perfstr)-strlen(perfstr)-1);
+ strncat(perfstr, show, sizeof(perfstr)-strlen(perfstr)-1);
- if (type)
+ if (type[0])
- strcat(perfstr, type);
- strcat(perfstr, " ");
+ strncat(perfstr, type,
sizeof(perfstr)-strlen(perfstr)-1);
+ strncat(perfstr, " ", sizeof(perfstr)-strlen(perfstr)-1);


++++++ nagios-plugins.ctypes.patch ++++++
--- /var/tmp/diff_new_pack.yP1235/_old 2008-01-07 02:51:59.000000000 +0100
+++ /var/tmp/diff_new_pack.yP1235/_new 2008-01-07 02:51:59.000000000 +0100
@@ -5,9 +5,9 @@

--- a/plugins/check_http.c
+++ b/plugins/check_http.c
-@@ -43,6 +43,7 @@ const char *revision = "$Revision: 1.104
- const char *copyright = "1999-2006";
- const char *email = "nagiosplug-devel@xxxxxxxxxxxxxxxxxxxxx";
+@@ -45,6 +45,7 @@ const char *email = "nagiosplug-devel@li
+
+ #include <ctype.h>

+#include <ctype.h>
#include "common.h"
@@ -15,7 +15,7 @@
#include "utils.h"
--- a/plugins/check_tcp.c
+++ b/plugins/check_tcp.c
-@@ -37,6 +37,7 @@ const char *revision = "$Revision: 1.92
+@@ -37,6 +37,7 @@ const char *revision = "$Revision: 1729
const char *copyright = "1999-2006";
const char *email = "nagiosplug-devel@xxxxxxxxxxxxxxxxxxxxx";



++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++



Remember to have fun...

---------------------------------------------------------------------
To unsubscribe, e-mail: opensuse-commit+unsubscribe@xxxxxxxxxxxx
For additional commands, e-mail: opensuse-commit+help@xxxxxxxxxxxx

< Previous Next >
This Thread
  • No further messages