From 00d9480102022026bdfb498779c9d40733adf0b4 Mon Sep 17 00:00:00 2001 From: Florian Fainelli Date: Wed, 13 Feb 2008 14:44:39 +0000 Subject: [PATCH] Upgrade to 1.4.11 and fix compilation failure on check_pgsql SVN-Revision: 10454 --- net/nagios-plugins/Makefile | 4 +- net/nagios-plugins/patches/001-ping.patch | 19 ------- net/nagios-plugins/patches/002-plugins.patch | 54 ++++++++++++-------- 3 files changed, 36 insertions(+), 41 deletions(-) delete mode 100644 net/nagios-plugins/patches/001-ping.patch diff --git a/net/nagios-plugins/Makefile b/net/nagios-plugins/Makefile index e7cd2b99d..ae2948a33 100644 --- a/net/nagios-plugins/Makefile +++ b/net/nagios-plugins/Makefile @@ -9,12 +9,12 @@ include $(TOPDIR)/rules.mk PKG_NAME:=nagios-plugins -PKG_VERSION:=1.4.9 +PKG_VERSION:=1.4.11 PKG_RELEASE:=1 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz PKG_SOURCE_URL:=@SF/nagiosplug -PKG_MD5SUM:=6e617e95cadeedd92870cdbd2f13726c +PKG_MD5SUM:=042783a2180a6987e0b403870b3d01f7 PKG_BUILD_DIR:=$(BUILD_DIR)/$(PKG_NAME)-$(PKG_VERSION) diff --git a/net/nagios-plugins/patches/001-ping.patch b/net/nagios-plugins/patches/001-ping.patch deleted file mode 100644 index d559f91bd..000000000 --- a/net/nagios-plugins/patches/001-ping.patch +++ /dev/null @@ -1,19 +0,0 @@ ---- nagios-plugins-1.4.5/configure.orig 2006-11-15 16:48:54.000000000 +0100 -+++ nagios-plugins-1.4.5/configure 2006-11-15 16:49:07.000000000 +0100 -@@ -30041,16 +30041,6 @@ - - fi - --if test "x$ac_cv_ping_has_timeout" != "xno" --then -- --cat >>confdefs.h <<\_ACEOF --#define PING_HAS_TIMEOUT 1 --_ACEOF -- --fi -- -- - # Check whether --with-ping6_command or --without-ping6_command was given. - if test "${with_ping6_command+set}" = set; then - withval="$with_ping6_command" diff --git a/net/nagios-plugins/patches/002-plugins.patch b/net/nagios-plugins/patches/002-plugins.patch index deb097cc4..4b13de350 100644 --- a/net/nagios-plugins/patches/002-plugins.patch +++ b/net/nagios-plugins/patches/002-plugins.patch @@ -1,16 +1,16 @@ -diff -urN nagios-plugins-1.4.9/configure nagios-plugins-1.4.9.new/configure ---- nagios-plugins-1.4.9/configure 2007-06-11 09:58:56.000000000 +0200 -+++ nagios-plugins-1.4.9.new/configure 2007-06-11 10:02:45.000000000 +0200 -@@ -26234,7 +26234,7 @@ +diff -urN nagios-plugins-1.4.11/configure nagios-plugins-1.4.11.new/configure +--- nagios-plugins-1.4.11/configure 2007-12-13 23:42:38.000000000 +0100 ++++ nagios-plugins-1.4.11.new/configure 2008-02-11 07:56:02.000000000 +0100 +@@ -27226,7 +27226,7 @@ if test "$ac_cv_have_decl_swapctl" = "yes"; then - EXTRAS="$EXTRAS check_swap" + EXTRAS="$EXTRAS" - echo "$as_me:$LINENO: checking for 2-arg (SVR4) swapctl" >&5 - echo $ECHO_N "checking for 2-arg (SVR4) swapctl... $ECHO_C" >&6 + { echo "$as_me:$LINENO: checking for 2-arg (SVR4) swapctl" >&5 + echo $ECHO_N "checking for 2-arg (SVR4) swapctl... $ECHO_C" >&6; } if test "$ac_cv_type_swaptbl_t" = "yes" -a \ -@@ -26376,7 +26376,7 @@ +@@ -27365,7 +27365,7 @@ #define HAVE_SWAP 1 _ACEOF @@ -19,7 +19,7 @@ diff -urN nagios-plugins-1.4.9/configure nagios-plugins-1.4.9.new/configure fi if test "x$ac_cv_swap_command" != "x" then -@@ -26428,7 +26428,7 @@ +@@ -27417,7 +27417,7 @@ #define PROC_MEMINFO "$ac_cv_proc_meminfo" _ACEOF @@ -28,21 +28,23 @@ diff -urN nagios-plugins-1.4.9/configure nagios-plugins-1.4.9.new/configure fi # Extract the first word of "dig", so it can be a program name with args. -diff -urN nagios-plugins-1.4.9/plugins/Makefile.am nagios-plugins-1.4.9.new/plugins/Makefile.am ---- nagios-plugins-1.4.9/plugins/Makefile.am 2007-04-15 10:50:58.000000000 +0200 -+++ nagios-plugins-1.4.9.new/plugins/Makefile.am 2007-06-11 10:02:45.000000000 +0200 -@@ -23,7 +23,7 @@ +diff -urN nagios-plugins-1.4.11/plugins/Makefile.am nagios-plugins-1.4.11.new/plugins/Makefile.am +--- nagios-plugins-1.4.11/plugins/Makefile.am 2007-12-12 02:27:48.000000000 +0100 ++++ nagios-plugins-1.4.11.new/plugins/Makefile.am 2008-02-11 08:08:14.000000000 +0100 +@@ -22,8 +22,8 @@ + check_tcp_programs = check_ftp check_imap check_nntp check_pop \ check_udp check_clamd @check_tcp_ssl@ - EXTRA_PROGRAMS = check_mysql check_radius check_pgsql check_snmp check_hpjd \ +-EXTRA_PROGRAMS = check_mysql check_radius check_pgsql check_snmp check_hpjd \ - check_swap check_fping check_ldap check_game check_dig \ ++EXTRA_PROGRAMS = check_mysql check_radius check_snmp check_hpjd \ + check_fping check_ldap check_game check_dig \ check_nagios check_by_ssh check_dns check_nt check_ide_smart \ check_procs check_mysql_query check_apt -diff -urN nagios-plugins-1.4.9/plugins/Makefile.in nagios-plugins-1.4.9.new/plugins/Makefile.in ---- nagios-plugins-1.4.9/plugins/Makefile.in 2007-06-04 11:02:42.000000000 +0200 -+++ nagios-plugins-1.4.9.new/plugins/Makefile.in 2007-06-11 10:02:28.000000000 +0200 +diff -urN nagios-plugins-1.4.11/plugins/Makefile.in nagios-plugins-1.4.11.new/plugins/Makefile.in +--- nagios-plugins-1.4.11/plugins/Makefile.in 2007-12-13 23:42:36.000000000 +0100 ++++ nagios-plugins-1.4.11.new/plugins/Makefile.in 2008-02-11 08:08:22.000000000 +0100 @@ -35,7 +35,7 @@ build_triplet = @build@ host_triplet = @host@ @@ -51,13 +53,25 @@ diff -urN nagios-plugins-1.4.9/plugins/Makefile.in nagios-plugins-1.4.9.new/plug + check_dummy$(EXEEXT) check_http$(EXEEXT) \ check_load$(EXEEXT) check_mrtg$(EXEEXT) \ check_mrtgtraf$(EXEEXT) check_ntp$(EXEEXT) \ - check_nwstat$(EXEEXT) check_overcr$(EXEEXT) \ -@@ -45,7 +45,7 @@ - urlize$(EXEEXT) @EXTRAS@ + check_ntp_peer$(EXEEXT) check_nwstat$(EXEEXT) \ +@@ -44,8 +44,8 @@ + check_time$(EXEEXT) check_ntp_time$(EXEEXT) check_ups$(EXEEXT) \ + check_users$(EXEEXT) negate$(EXEEXT) urlize$(EXEEXT) @EXTRAS@ EXTRA_PROGRAMS = check_mysql$(EXEEXT) check_radius$(EXEEXT) \ - check_pgsql$(EXEEXT) check_snmp$(EXEEXT) check_hpjd$(EXEEXT) \ +- check_pgsql$(EXEEXT) check_snmp$(EXEEXT) check_hpjd$(EXEEXT) \ - check_swap$(EXEEXT) check_fping$(EXEEXT) check_ldap$(EXEEXT) \ ++ check_snmp$(EXEEXT) check_hpjd$(EXEEXT) \ + check_fping$(EXEEXT) check_ldap$(EXEEXT) \ check_game$(EXEEXT) check_dig$(EXEEXT) check_nagios$(EXEEXT) \ check_by_ssh$(EXEEXT) check_dns$(EXEEXT) check_nt$(EXEEXT) \ check_ide_smart$(EXEEXT) check_procs$(EXEEXT) \ +--- nagios-plugins-1.4.11/plugins/check_pgsql.c 2007-01-28 22:46:41.000000000 +0100 ++++ nagios-plugins-1.4.11.new/plugins/check_pgsql.c 2008-02-13 15:47:11.000000000 +0100 +@@ -45,6 +45,7 @@ + #include "netutils.h" + #include + ++#define NAMEDATALEN 64 + #define DEFAULT_DB "template1" + #define DEFAULT_HOST "127.0.0.1" + -- 2.30.2