update to monitoring-plugins-2.1.2

This commit is contained in:
sthen 2015-10-18 10:42:56 +00:00
parent ef33bc5fe1
commit b5a8fd2828
4 changed files with 8 additions and 24 deletions

View File

@ -1,4 +1,4 @@
# $OpenBSD: Makefile,v 1.6 2015/10/08 21:23:32 sthen Exp $
# $OpenBSD: Makefile,v 1.7 2015/10/18 10:42:56 sthen Exp $
COMMENT-main= monitoring plugins (for Nagios, Icinga, etc)
COMMENT-dbi= dbi monitoring plugin
@ -10,8 +10,7 @@ COMMENT-pgsql= postgresql monitoring plugin
COMMENT-samba= samba monitoring plugin
COMMENT-snmp= monitoring plugins using snmp
V= 2.1.1
REVISION-main= 0
V= 2.1.2
DISTNAME= monitoring-plugins-$V
PKGNAME-main= monitoring-plugins-$V
PKGNAME-dbi= monitoring-plugins-dbi-$V
@ -41,6 +40,7 @@ FAKE_FLAGS= setuid_root_mode=0555
CONFIGURE_STYLE= autoconf
AUTOCONF_VERSION= 2.69
# cgiurl is only used to produce an href to traceroute.cgi in check_ping output
CONFIGURE_ARGS+= --libexecdir=${PREFIX}/libexec/nagios \
--with-cgiurl=/cgi-bin/nagios \
--with-openssl=/usr \

View File

@ -1,2 +1,2 @@
SHA256 (monitoring-plugins-2.1.1.tar.gz) = RNus6AM+r7cWzFAb/vJsqQca49AymywRi9AjD9mN0dM=
SIZE (monitoring-plugins-2.1.1.tar.gz) = 2612331
SHA256 (monitoring-plugins-2.1.2.tar.gz) = dsa1jwhnq3tsjIbH6U/M5xg2GPbaq2NIiZDQNV9WAKo=
SIZE (monitoring-plugins-2.1.2.tar.gz) = 2613060

View File

@ -1,6 +1,6 @@
$OpenBSD: patch-configure_ac,v 1.2 2014/10/16 15:23:42 sthen Exp $
--- configure.ac.orig Wed Oct 15 13:10:13 2014
+++ configure.ac Wed Oct 15 19:42:57 2014
$OpenBSD: patch-configure_ac,v 1.3 2015/10/18 10:42:56 sthen Exp $
--- configure.ac.orig Fri Oct 16 10:18:36 2015
+++ configure.ac Sun Oct 18 11:22:40 2015
@@ -208,13 +208,13 @@ AC_ARG_WITH(pgsql,
ACX_HELP_STRING([--with-pgsql=DIR],
[sets path to pgsql installation]),

View File

@ -1,16 +0,0 @@
$OpenBSD: patch-plugins_sslutils_c,v 1.1 2015/07/18 21:29:46 sthen Exp $
--- plugins/sslutils.c.orig Sat Jul 18 14:56:08 2015
+++ plugins/sslutils.c Sat Jul 18 14:56:43 2015
@@ -66,7 +66,12 @@ int np_net_ssl_init_with_hostname_version_and_cert(int
#endif
break;
case 3: /* SSLv3 protocol */
+#if defined(OPENSSL_NO_SSL3)
+ printf(("%s\n", _("CRITICAL - SSL protocol version 3 is not supported by your SSL library.")));
+ return STATE_CRITICAL;
+#else
method = SSLv3_client_method();
+#endif
break;
default: /* Unsupported */
printf("%s\n", _("CRITICAL - Unsupported SSL protocol version."));