cpet/openbsd-ports
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

update to nagios plugins 1.4.1

Browse Source
This commit is contained in:
sturm 2005-08-07 10:47:00 +00:00
parent 39c1b63570
commit 697f94b2db
6 changed files with 21 additions and 51 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
net/nagios/plugins/Makefile
View File

@ -1,4 +1,4 @@
# $OpenBSD: Makefile,v 1.1.1.1 2005/07/25 16:32:06 sturm Exp $
# $OpenBSD: Makefile,v 1.2 2005/08/07 10:47:00 sturm Exp $
COMMENT= "nagios base plugins"
COMMENT-fping= "fping plugin"
@ -10,8 +10,8 @@ COMMENT-pgsql= "postgresql plugin"
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}

8
net/nagios/plugins/distinfo
View File

@ -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

22
net/nagios/plugins/patches/patch-configure
View File

@ -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
$OpenBSD: patch-configure,v 1.2 2005/08/07 10:47:00 sturm Exp $
--- 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 @@ $OpenBSD: patch-configure,v 1.1.1.1 2005/07/25 16:32:07 sturm Exp $
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 @@ $OpenBSD: patch-configure,v 1.1.1.1 2005/07/25 16:32:07 sturm Exp $
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 @@ $OpenBSD: patch-configure,v 1.1.1.1 2005/07/25 16:32:07 sturm Exp $
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 @@ $OpenBSD: patch-configure,v 1.1.1.1 2005/07/25 16:32:07 sturm Exp $
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"

12
net/nagios/plugins/patches/patch-plugins_check_pgsql_c
View File

@ -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@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"

21
net/nagios/plugins/patches/patch-plugins_check_smtp_c
View File

@ -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);

3
net/nagios/plugins/pkg/PLIST
View File

@ -1,4 +1,4 @@
@comment $OpenBSD: PLIST,v 1.1.1.1 2005/07/25 16:32:07 sturm Exp $
@comment $OpenBSD: PLIST,v 1.2 2005/08/07 10:47:01 sturm Exp $
libexec/nagios/
libexec/nagios/check_by_ssh
libexec/nagios/check_dhcp
@ -36,6 +36,7 @@ libexec/nagios/check_simap
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