[packages] nagios-plugins: update to v1.4.14

SVN-Revision: 17923

diff --git a/net/nagios-plugins/Makefile b/net/nagios-plugins/Makefile
index e39320058f54569bbaefb1987f70ae501d3b715d..57890433fb55fff88f55c1f80c57a87d39389592 100644 (file)
--- a/net/nagios-plugins/Makefile
+++ b/net/nagios-plugins/Makefile
@@ -8,12 +8,12 @@
 include $(TOPDIR)/rules.mk
 
 PKG_NAME:=nagios-plugins
-PKG_VERSION:=1.4.12
-PKG_RELEASE:=2
+PKG_VERSION:=1.4.14
+PKG_RELEASE:=1
 
 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz
 PKG_SOURCE_URL:=@SF/nagiosplug
-PKG_MD5SUM:=af68d00bbe2c39de02803d23e5eecca3
+PKG_MD5SUM:=a1835a48a777863ed2583de3c82446a9
 
 include $(INCLUDE_DIR)/package.mk
 

diff --git a/net/nagios-plugins/patches/002-plugins.patch b/net/nagios-plugins/patches/002-plugins.patch
index 392c4be9c4037dc2b671024d56b65c4b8e1ef7e2..402aabad7dc279d8ac690637257cb2675d3c511c 100644 (file)
--- a/net/nagios-plugins/patches/002-plugins.patch
+++ b/net/nagios-plugins/patches/002-plugins.patch
@@ -1,6 +1,6 @@
 --- a/configure
 +++ b/configure
-@@ -27981,7 +27981,7 @@
+@@ -28209,7 +28209,7 @@ fi
  
  if test "$ac_cv_have_decl_swapctl" = "yes";
  then
@@ -9,7 +9,7 @@
        { 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 \
-@@ -28120,7 +28120,7 @@
+@@ -28348,7 +28348,7 @@ cat >>confdefs.h <<\_ACEOF
  #define HAVE_SWAP 1
  _ACEOF
  
@@ -18,7 +18,7 @@
  fi
  if test "x$ac_cv_swap_command" != "x"
  then
-@@ -28172,7 +28172,7 @@
+@@ -28400,7 +28400,7 @@ cat >>confdefs.h <<_ACEOF
  #define PROC_MEMINFO "$ac_cv_proc_meminfo"
  _ACEOF
  
@@ -29,7 +29,7 @@
  # Extract the first word of "dig", so it can be a program name with args.
 --- a/plugins/Makefile.am
 +++ b/plugins/Makefile.am
-@@ -23,8 +23,8 @@
+@@ -34,8 +34,8 @@ libexec_PROGRAMS = check_apt check_clust
  check_tcp_programs = check_ftp check_imap check_nntp check_pop \
        check_udp check_clamd @check_tcp_ssl@
  
@@ -42,7 +42,7 @@
  
 --- a/plugins/Makefile.in
 +++ b/plugins/Makefile.in
-@@ -35,7 +35,7 @@
+@@ -32,7 +32,7 @@ POST_UNINSTALL = :
  build_triplet = @build@
  host_triplet = @host@
  libexec_PROGRAMS = check_apt$(EXEEXT) check_cluster$(EXEEXT) \
@@ -51,7 +51,7 @@
        check_load$(EXEEXT) check_mrtg$(EXEEXT) \
        check_mrtgtraf$(EXEEXT) check_ntp$(EXEEXT) \
        check_ntp_peer$(EXEEXT) check_nwstat$(EXEEXT) \
-@@ -44,8 +44,8 @@
+@@ -41,8 +41,8 @@ libexec_PROGRAMS = check_apt$(EXEEXT) ch
        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) \
@@ -64,7 +64,7 @@
        check_ide_smart$(EXEEXT) check_procs$(EXEEXT) \
 --- a/plugins/check_pgsql.c
 +++ b/plugins/check_pgsql.c
-@@ -43,6 +43,7 @@
+@@ -39,6 +39,7 @@ const char *email = "nagiosplug-devel@li
  #include <libpq-fe.h>
  #include <pg_config_manual.h>
  

diff --git a/net/nagios-plugins/patches/003-pgsl-header-fix.patch b/net/nagios-plugins/patches/003-pgsl-header-fix.patch
index 812975487dff37a39049caa0532d42b2e1560ad4..8496e80a40b27f600bb1da8a772af0d5a8567e56 100644 (file)
--- a/net/nagios-plugins/patches/003-pgsl-header-fix.patch
+++ b/net/nagios-plugins/patches/003-pgsl-header-fix.patch
@@ -1,6 +1,6 @@
---- nagios-plugins-1.4.12/plugins/check_pgsql.orig.c   2008-08-01 16:05:51.000000000 -0700
-+++ nagios-plugins-1.4.12/plugins/check_pgsql.c        2008-08-01 16:06:17.000000000 -0700
-@@ -41,7 +41,7 @@
+--- a/plugins/check_pgsql.c
++++ b/plugins/check_pgsql.c
+@@ -37,7 +37,7 @@ const char *email = "nagiosplug-devel@li
  
  #include "netutils.h"
  #include <libpq-fe.h>