[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]

update: nagios



Hi!

Attached diff updates nagios to 2.0b4 and plugins to 1.4.1. Tests on
busy machines and especially 64bit machines highly appreciated.

Nikolay
Index: nagios/Makefile
===================================================================
RCS file: /a/devel/cvs/ports/net/nagios/nagios/Makefile,v
retrieving revision 1.2
diff -u -r1.2 Makefile
--- nagios/Makefile	25 Jul 2005 19:23:47 -0000	1.2
+++ nagios/Makefile	3 Aug 2005 12:23:05 -0000
@@ -3,10 +3,10 @@
 COMMENT=	"host and service monitor"
 COMMENT-web=	"cgis and webpages for nagios"
 
-V=		2.0b3
+V=		2.0b4
 DISTNAME=	nagios-${V}
-PKGNAME=	${DISTNAME}p0
-PKGNAME-web=	nagios-web-${V}p0
+PKGNAME=	${DISTNAME}
+PKGNAME-web=	nagios-web-${V}
 CATEGORIES=	net
 
 HOMEPAGE=	http://www.nagios.org/
@@ -25,7 +25,7 @@
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE:=nagios/}
 
 BUILD_DEPENDS=	:gd-*:graphics/gd
-RUN_DEPENDS=	::net/nagios/plugins
+RUN_DEPENDS=	:nagios-plugins-*:net/nagios/plugins
 
 CONFIGURE_STYLE=gnu
 CONFIGURE_ARGS+=--datadir=/var/www/nagios \
Index: nagios/distinfo
===================================================================
RCS file: /a/devel/cvs/ports/net/nagios/nagios/distinfo,v
retrieving revision 1.1.1.1
diff -u -r1.1.1.1 distinfo
--- nagios/distinfo	25 Jul 2005 16:32:05 -0000	1.1.1.1
+++ nagios/distinfo	3 Aug 2005 08:22:00 -0000
@@ -1,4 +1,4 @@
-MD5 (nagios-2.0b3.tar.gz) = 051760458d961b6ee015b5932a8437c4
-RMD160 (nagios-2.0b3.tar.gz) = 8f84a4406e1f4d5bd10d55a6fccbe58e01af489a
-SHA1 (nagios-2.0b3.tar.gz) = 2bb8a58f68ba68f9e2914cd4a267bb9335b374d7
-SIZE (nagios-2.0b3.tar.gz) = 1704070
+MD5 (nagios-2.0b4.tar.gz) = 206ea26230d1360cc8871c0fee80b4c4
+RMD160 (nagios-2.0b4.tar.gz) = 8e27fd13f51b80114894565d60ed53718bd55f8f
+SHA1 (nagios-2.0b4.tar.gz) = 72ba370b1987c27cab4708320837a69b1beec545
+SIZE (nagios-2.0b4.tar.gz) = 1710293
Index: nagios/patches/patch-configure
===================================================================
RCS file: /a/devel/cvs/ports/net/nagios/nagios/patches/patch-configure,v
retrieving revision 1.1.1.1
diff -u -r1.1.1.1 patch-configure
--- nagios/patches/patch-configure	25 Jul 2005 16:32:05 -0000	1.1.1.1
+++ nagios/patches/patch-configure	3 Aug 2005 10:38:12 -0000
@@ -1,6 +1,6 @@
 $OpenBSD: patch-configure,v 1.1.1.1 2005/07/25 16:32:05 sturm Exp $
---- configure.orig	Tue Dec 14 03:18:58 2004
-+++ configure	Sun Jan 30 17:47:03 2005
+--- configure.orig	Wed Aug  3 01:58:24 2005
++++ configure	Wed Aug  3 12:38:09 2005
 @@ -371,7 +371,7 @@ EOF
      ac_prev=sysconfdir ;;
    -sysconfdir=* | --sysconfdir=* | --sysconfdi=* | --sysconfd=* | --sysconf=* \
@@ -10,23 +10,14 @@
  
    -target | --target | --targe | --targ | --tar | --ta | --t)
      ac_prev=target ;;
-@@ -1901,7 +1901,7 @@ LIBS="$ac_save_LIBS"
- fi
- if eval "test \"`echo '$ac_cv_lib_'$ac_lib_var`\" = yes"; then
-   echo "$ac_t""yes" 1>&6
--  THREADLIBS="$THREADLIBS -lpthread"
-+  THREADLIBS="$THREADLIBS -pthread"
- else
-   echo "$ac_t""no" 1>&6
- fi
-@@ -1910,14 +1910,14 @@ if test $ac_cv_lib_cma_pthread_create = 
+@@ -1834,14 +1834,14 @@ if test $ac_cv_lib_cma_pthread_create = 
  	have_pthreads="yes"
  fi
  
 -echo $ac_n "checking for pthread_create in -lpthread""... $ac_c" 1>&6
--echo "configure:1915: checking for pthread_create in -lpthread" >&5
+-echo "configure:1839: checking for pthread_create in -lpthread" >&5
 +echo $ac_n "checking for pthread_create in -pthread""... $ac_c" 1>&6
-+echo "configure:1915: checking for pthread_create in -pthread" >&5
++echo "configure:1839: checking for pthread_create in -pthread" >&5
  ac_lib_var=`echo pthread'_'pthread_create | sed 'y%./+-%__p_%'`
  if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
    echo $ac_n "(cached) $ac_c" 1>&6
@@ -35,36 +26,9 @@
 -LIBS="-lpthread  $LIBS"
 +LIBS="-pthread  $LIBS"
  cat > conftest.$ac_ext <<EOF
- #line 1923 "configure"
- #include "confdefs.h"
-@@ -1945,7 +1945,7 @@ LIBS="$ac_save_LIBS"
- fi
- if eval "test \"`echo '$ac_cv_lib_'$ac_lib_var`\" = yes"; then
-   echo "$ac_t""yes" 1>&6
--  THREADLIBS="$THREADLIBS -lpthread"
-+  THREADLIBS="$THREADLIBS -pthread"
- else
-   echo "$ac_t""no" 1>&6
- fi
-@@ -1953,14 +1953,14 @@ fi
- if test $ac_cv_lib_pthread_pthread_create = yes; then
- 	have_pthreads="yes"
- else
--		echo $ac_n "checking for pthread_mutex_init in -lpthread""... $ac_c" 1>&6
--echo "configure:1958: checking for pthread_mutex_init in -lpthread" >&5
-+		echo $ac_n "checking for pthread_mutex_init in -pthread""... $ac_c" 1>&6
-+echo "configure:1958: checking for pthread_mutex_init in -pthread" >&5
- ac_lib_var=`echo pthread'_'pthread_mutex_init | sed 'y%./+-%__p_%'`
- if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
-   echo $ac_n "(cached) $ac_c" 1>&6
- else
-   ac_save_LIBS="$LIBS"
--LIBS="-lpthread  $LIBS"
-+LIBS="-pthread  $LIBS"
- cat > conftest.$ac_ext <<EOF
- #line 1966 "configure"
+ #line 1847 "configure"
  #include "confdefs.h"
-@@ -1988,7 +1988,7 @@ LIBS="$ac_save_LIBS"
+@@ -1869,7 +1869,7 @@ LIBS="$ac_save_LIBS"
  fi
  if eval "test \"`echo '$ac_cv_lib_'$ac_lib_var`\" = yes"; then
    echo "$ac_t""yes" 1>&6
@@ -73,7 +37,7 @@
  else
    echo "$ac_t""no" 1>&6
  fi
-@@ -2227,7 +2227,7 @@ cat >> confdefs.h <<EOF
+@@ -2151,7 +2151,7 @@ cat >> confdefs.h <<EOF
  #define DEFAULT_NAGIOS_GROUP "$nagios_grp"
  EOF
  
Index: nagios/patches/patch-include_config_h_in
===================================================================
RCS file: nagios/patches/patch-include_config_h_in
diff -N nagios/patches/patch-include_config_h_in
--- /dev/null	1 Jan 1970 00:00:00 -0000
+++ nagios/patches/patch-include_config_h_in	3 Aug 2005 08:56:36 -0000
@@ -0,0 +1,27 @@
+$OpenBSD$
+--- include/config.h.in.orig	Wed Aug  3 10:55:04 2005
++++ include/config.h.in	Wed Aug  3 10:56:30 2005
+@@ -108,11 +108,6 @@
+ #include <stdio.h>
+ #include <stdlib.h>
+ 
+-#undef HAVE_SYS_RESOURCE_H
+-#ifdef HAVE_SYS_RESOURCE_H
+-#include <sys/resource.h>
+-#endif
+-
+ #undef HAVE_PWD_H
+ #ifdef HAVE_PWD_H
+ #include <pwd.h>
+@@ -195,6 +190,11 @@
+ #undef HAVE_SYS_TIMEB_H
+ #if HAVE_SYS_TIMEB_H
+ #include <sys/timeb.h>
++#endif
++
++#undef HAVE_SYS_RESOURCE_H
++#ifdef HAVE_SYS_RESOURCE_H
++#include <sys/resource.h>
+ #endif
+ 
+ #undef HAVE_SYS_IPC_H
Index: plugins/Makefile
===================================================================
RCS file: /a/devel/cvs/ports/net/nagios/plugins/Makefile,v
retrieving revision 1.1.1.1
diff -u -r1.1.1.1 Makefile
--- plugins/Makefile	25 Jul 2005 16:32:06 -0000	1.1.1.1
+++ plugins/Makefile	3 Aug 2005 12:20:36 -0000
@@ -10,8 +10,8 @@
 COMMENT-samba=	"samba plugin"
 COMMENT-snmp=	"plugins using snmp"
 
-V=		1.4
-DISTNAME=	nagios-plugins-${V:S,_,-,}
+V=		1.4.1
+DISTNAME=	nagios-plugins-${V}
 PKGNAME=	nagios-plugins-${V}
 PKGNAME-fping=	nagios-plugins-fping-${V}
 PKGNAME-game=	nagios-plugins-game-${V}
Index: plugins/distinfo
===================================================================
RCS file: /a/devel/cvs/ports/net/nagios/plugins/distinfo,v
retrieving revision 1.1.1.1
diff -u -r1.1.1.1 distinfo
--- plugins/distinfo	25 Jul 2005 16:32:06 -0000	1.1.1.1
+++ plugins/distinfo	3 Aug 2005 11:31:29 -0000
@@ -1,4 +1,4 @@
-MD5 (nagios-plugins-1.4.tar.gz) = 9b21b92acc4b2b0dbb2d12bca6b27582
-RMD160 (nagios-plugins-1.4.tar.gz) = e50c16b07754b146483cdeecb04ab86b03f1c84d
-SHA1 (nagios-plugins-1.4.tar.gz) = 10b030431aeda1c9219040d6e1d44647b159af43
-SIZE (nagios-plugins-1.4.tar.gz) = 972810
+MD5 (nagios-plugins-1.4.1.tar.gz) = 5bdd5dd7fca92a2aeb29683866ee42f1
+RMD160 (nagios-plugins-1.4.1.tar.gz) = fe02a63fe99635552376736ab445957d374fb38b
+SHA1 (nagios-plugins-1.4.1.tar.gz) = a0da111905a2af8a31c044c14527b173acace9f1
+SIZE (nagios-plugins-1.4.1.tar.gz) = 967552
Index: plugins/patches/patch-configure
===================================================================
RCS file: /a/devel/cvs/ports/net/nagios/plugins/patches/patch-configure,v
retrieving revision 1.1.1.1
diff -u -r1.1.1.1 patch-configure
--- plugins/patches/patch-configure	25 Jul 2005 16:32:07 -0000	1.1.1.1
+++ plugins/patches/patch-configure	3 Aug 2005 11:59:39 -0000
@@ -1,7 +1,7 @@
 $OpenBSD: patch-configure,v 1.1.1.1 2005/07/25 16:32:07 sturm Exp $
---- configure.orig	Thu Dec 30 18:21:18 2004
-+++ configure	Sun Jan 30 19:00:14 2005
-@@ -8257,13 +8257,13 @@ if test "${with_pgsql+set}" = set; then
+--- configure.orig	Mon Aug  1 23:34:46 2005
++++ configure	Wed Aug  3 13:59:35 2005
+@@ -8339,13 +8339,13 @@ if test "${with_pgsql+set}" = set; then
    PGSQL=$withval
  fi;
  
@@ -18,7 +18,7 @@
  cat >conftest.$ac_ext <<_ACEOF
  /* confdefs.h.  */
  _ACEOF
-@@ -8320,7 +8320,7 @@ if test $ac_cv_lib_crypt_main = yes; the
+@@ -8402,7 +8402,7 @@ if test $ac_cv_lib_crypt_main = yes; the
  #define HAVE_LIBCRYPT 1
  _ACEOF
  
@@ -27,7 +27,7 @@
  
  fi
  
-@@ -8336,7 +8336,7 @@ if test "${ac_cv_lib_pq_PQsetdbLogin+set
+@@ -8418,7 +8418,7 @@ if test "${ac_cv_lib_pq_PQsetdbLogin+set
    echo $ECHO_N "(cached) $ECHO_C" >&6
  else
    ac_check_lib_save_LIBS=$LIBS
@@ -36,7 +36,7 @@
  cat >conftest.$ac_ext <<_ACEOF
  /* confdefs.h.  */
  _ACEOF
-@@ -8855,16 +8855,16 @@ fi
+@@ -8937,16 +8937,16 @@ fi
  done
  
      if [ -n "$PGSQL" -a "$ac_cv_header_libpq_fe_h" = "yes" ]; then
@@ -45,12 +45,14 @@
        PGINCLUDE="-I$PGSQL/include"
      elif test  "$ac_cv_header_pgsql_libpq_fe_h" = "yes"; then
 -      PGLIBS="-lpq -lcrypt"
-+      PGLIBS="-lpq -lcrypto"
-       PGINCLUDE="-I/usr/include/pgsql"
+-      PGINCLUDE="-I/usr/include/pgsql"
++      PGLIBS="-L$PGSQL/lib -lpq -lcrypto"
++      PGINCLUDE="-I$PGSQL/include/pgsql"
      elif test  "$ac_cv_header_postgresql_libpq_fe_h" = "yes"; then
 -      PGLIBS="-L$PGSQL/lib -lpq -lcrypt"
+-      PGINCLUDE="-I/usr/include/postgresql"
 +      PGLIBS="-L$PGSQL/lib -lpq -lcrypto"
-       PGINCLUDE="-I/usr/include/postgresql"
++      PGINCLUDE="-I$PGSQL/include/postgresql"
      elif test  "$ac_cv_header_libpq_fe_h" = "yes"; then
 -      PGLIBS="-L$PGSQL/lib -lpq -lcrypt"
 +      PGLIBS="-L$PGSQL/lib -lpq -lcrypto"
Index: plugins/patches/patch-plugins_check_pgsql_c
===================================================================
RCS file: plugins/patches/patch-plugins_check_pgsql_c
diff -N plugins/patches/patch-plugins_check_pgsql_c
--- plugins/patches/patch-plugins_check_pgsql_c	25 Jul 2005 16:32:07 -0000	1.1.1.1
+++ /dev/null	1 Jan 1970 00:00:00 -0000
@@ -1,12 +0,0 @@
-$OpenBSD: patch-plugins_check_pgsql_c,v 1.1.1.1 2005/07/25 16:32:07 sturm Exp $
---- plugins/check_pgsql.c.orig	Sun Jan 30 19:15:16 2005
-+++ plugins/check_pgsql.c	Sun Jan 30 19:15:30 2005
-@@ -27,7 +27,7 @@ const char *email = "nagiosplug-devel_(_at_)_li
- #include "utils.h"
- 
- #include "netutils.h"
--#include <libpq-fe.h>
-+#include <postgresql/libpq-fe.h>
- 
- #define DEFAULT_DB "template1"
- #define DEFAULT_HOST "127.0.0.1"
Index: plugins/patches/patch-plugins_check_smtp_c
===================================================================
RCS file: plugins/patches/patch-plugins_check_smtp_c
diff -N plugins/patches/patch-plugins_check_smtp_c
--- plugins/patches/patch-plugins_check_smtp_c	25 Jul 2005 16:32:07 -0000	1.1.1.1
+++ /dev/null	1 Jan 1970 00:00:00 -0000
@@ -1,21 +0,0 @@
-$OpenBSD: patch-plugins_check_smtp_c,v 1.1.1.1 2005/07/25 16:32:07 sturm Exp $
---- plugins/check_smtp.c.orig	Sat Jan  1 17:15:39 2005
-+++ plugins/check_smtp.c	Mon Jul 18 22:55:58 2005
-@@ -76,7 +76,7 @@ int my_close(void);
- char regex_expect[MAX_INPUT_BUFFER] = "";
- regex_t preg;
- regmatch_t pmatch[10];
--char timestamp[10] = "";
-+char timestamp[20] = "";
- char errbuf[MAX_INPUT_BUFFER];
- int cflags = REG_EXTENDED | REG_NOSUB | REG_NEWLINE;
- int eflags = 0;
-@@ -667,7 +667,7 @@ check_certificate (X509 ** certificate)
-   
-   days_left = (mktime (&stamp) - time (NULL)) / 86400;
-   snprintf
--    (timestamp, 16, "%02d/%02d/%04d %02d:%02d",
-+    (timestamp, sizeof(timestamp), "%02d/%02d/%04d %02d:%02d",
-      stamp.tm_mon + 1,
-      stamp.tm_mday, stamp.tm_year + 1900, stamp.tm_hour, stamp.tm_min);
-   
Index: plugins/pkg/PLIST
===================================================================
RCS file: /a/devel/cvs/ports/net/nagios/plugins/pkg/PLIST,v
retrieving revision 1.1.1.1
diff -u -r1.1.1.1 PLIST
--- plugins/pkg/PLIST	25 Jul 2005 16:32:07 -0000	1.1.1.1
+++ plugins/pkg/PLIST	3 Aug 2005 12:00:58 -0000
@@ -36,6 +36,7 @@
 libexec/nagios/check_smtp
 libexec/nagios/check_spop
 libexec/nagios/check_ssh
+libexec/nagios/check_ssmtp
 libexec/nagios/check_swap
 libexec/nagios/check_tcp
 libexec/nagios/check_time

Visit your host, monkey.org