update to monitoring-plugins-2.3

net/monitoring-plugins/Makefile

@@ -1,4 +1,4 @@
-# $OpenBSD: Makefile,v 1.27 2020/07/11 22:54:37 sthen Exp $
+# $OpenBSD: Makefile,v 1.28 2020/12/10 19:52:15 sthen Exp $
 
 COMMENT-main=	monitoring plugins (for Nagios, Icinga, etc)
 COMMENT-dbi=	dbi monitoring plugin
@@ -11,8 +11,7 @@ COMMENT-samba=	samba monitoring plugin
 COMMENT-snmp=	monitoring plugins using snmp
 COMMENT-radius=	RADIUS monitoring plugin
 
-V=		2.2
-REVISION=	11
+V=		2.3
 DISTNAME=	monitoring-plugins-$V
 PKGNAME-main=	monitoring-plugins-$V
 PKGNAME-dbi=	monitoring-plugins-dbi-$V
@@ -34,7 +33,6 @@ MAINTAINER=	Stuart Henderson <stu.ports@spacehopper.org>
 PERMIT_PACKAGE=	Yes
 
 WANTLIB=	c iconv intl pthread
-WANTLIB-main=	${WANTLIB} crypto m ssl
 
 COMPILER =		base-clang ports-gcc base-gcc
 
@@ -42,6 +40,11 @@ MASTER_SITES=	https://www.monitoring-plugins.org/download/
 
 LIB_DEPENDS=	devel/gettext,-runtime
 
+WANTLIB-main=	${WANTLIB} crypto curl m nghttp2 ssl uriparser z
+LIB_DEPENDS-main=${LIB_DEPENDS} \
+		net/curl \
+		www/uriparser
+
 FAKE_FLAGS=	setuid_root_mode=0555
 
 CONFIGURE_STYLE= autoconf
@@ -96,7 +99,7 @@ RUN_DEPENDS-snmp=	${RUN_DEPENDS} \
 
 LIB_DEPENDS-radius=	net/radcli
 WANTLIB-radius+=	${WANTLIB} ffi gmp gnutls hogweed idn2 nettle
-WANTLIB-radius+=	p11-kit radcli tasn1 unistring z
+WANTLIB-radius+=	p11-kit radcli tasn1 unistring
 
 # MYSQL
 .if !${BUILD_PACKAGES:M-mysql}
@@ -105,7 +108,7 @@ CONFIGURE_ARGS += --without-mysql
 CONFIGURE_ARGS += --with-mysql=${LOCALBASE}
 .endif
 LIB_DEPENDS-mysql = ${LIB_DEPENDS} databases/mariadb
-WANTLIB-mysql = ${WANTLIB} crypto m mysqlclient ssl ${COMPILER_LIBCXX} z
+WANTLIB-mysql = ${WANTLIB} crypto m mariadb ssl z
 
 # PGSQL
 .if !${BUILD_PACKAGES:M-pgsql}
@@ -114,7 +117,7 @@ CONFIGURE_ARGS += --without-pgsql
 CONFIGURE_ARGS += --with-pgsql=${LOCALBASE}
 .endif
 LIB_DEPENDS-pgsql = ${LIB_DEPENDS} databases/postgresql
-WANTLIB-pgsql += ${WANTLIB} crypto pq ssl
+WANTLIB-pgsql += ${WANTLIB} crypto m pq ssl
 
 # DBI
 .if !${BUILD_PACKAGES:M-dbi}
@@ -125,6 +128,6 @@ WANTLIB-dbi = ${WANTLIB} dbi m
 
 # LDAP
 LIB_DEPENDS-ldap = ${LIB_DEPENDS} databases/openldap
-WANTLIB-ldap += ${WANTLIB} crypto lber-2.4 ldap-2.4 sasl2 ssl
+WANTLIB-ldap += ${WANTLIB} crypto lber ldap sasl2 ssl
 
 .include <bsd.port.mk>

net/monitoring-plugins/distinfo

@@ -1,2 +1,2 @@
-SHA256 (monitoring-plugins-2.2.tar.gz) = KWpTjwCpy+9/Uo/y1DrzV6RLOE3JijI4mmdbYqbdNmU=
-SIZE (monitoring-plugins-2.2.tar.gz) = 2461548
+SHA256 (monitoring-plugins-2.3.tar.gz) = P9lu+qdRx2Rv47ol+XFIWaIEF2oVXRL+DuQg456Q9Ww=
+SIZE (monitoring-plugins-2.3.tar.gz) = 2528556

net/monitoring-plugins/patches/patch-plugins-root_check_dhcp_c

@@ -1,29 +0,0 @@
-$OpenBSD: patch-plugins-root_check_dhcp_c,v 1.2 2019/01/09 16:51:01 martijn Exp $
-Fix stack smashing.
-
-Upstream merge request:
-https://github.com/monitoring-plugins/monitoring-plugins/pull/1500
-
-MSG_PEEK causes the packet to be counted multiple times.
-Index: plugins-root/check_dhcp.c
---- plugins-root/check_dhcp.c.orig
-+++ plugins-root/check_dhcp.c
-@@ -323,7 +323,8 @@ int get_hardware_address(int sock,char *interface_name
- #elif defined(__bsd__)
- 						/* King 2004	see ACKNOWLEDGEMENTS */
- 
--        int                     mib[6], len;
-+        int                     mib[6];
-+        size_t                  len;
-         char                    *buf;
-         unsigned char           *ptr;
-         struct if_msghdr        *ifm;
-@@ -693,7 +694,7 @@ int receive_dhcp_packet(void *buffer, int buffer_size,
-         else{
- 		bzero(&source_address,sizeof(source_address));
- 		address_size=sizeof(source_address);
--                recv_result=recvfrom(sock,(char *)buffer,buffer_size,MSG_PEEK,(struct sockaddr *)&source_address,&address_size);
-+                recv_result=recvfrom(sock,(char *)buffer,buffer_size,0,(struct sockaddr *)&source_address,&address_size);
- 		if(verbose)
- 			printf("recv_result: %d\n",recv_result);
- 

net/monitoring-plugins/patches/patch-plugins_check_http_c

@@ -1,4 +1,4 @@
-$OpenBSD: patch-plugins_check_http_c,v 1.1 2019/03/21 10:03:22 sthen Exp $
+$OpenBSD: patch-plugins_check_http_c,v 1.2 2020/12/10 19:52:15 sthen Exp $
 
 avoid segfault with SSL errors, seen when connecting to an IIS host
 that only allowed SNI-based connections
@@ -6,7 +6,7 @@ that only allowed SNI-based connections
 Index: plugins/check_http.c
 --- plugins/check_http.c.orig
 +++ plugins/check_http.c
-@@ -936,7 +936,7 @@ check_http (void)
+@@ -966,7 +966,7 @@ check_http (void)
      result = np_net_ssl_init_with_hostname_version_and_cert(sd, (use_sni ? host_name : NULL), ssl_version, client_cert, client_privkey);
      if (verbose) printf ("SSL initialized\n");
      if (result != STATE_OK)

net/monitoring-plugins/patches/patch-plugins_common_h

@@ -1,20 +0,0 @@
-$OpenBSD: patch-plugins_common_h,v 1.1 2019/05/10 01:22:11 jca Exp $
-
-plugins/common.h: Set default MySQL port
-https://github.com/nagios-plugins/nagios-plugins/pull/340/commits/930ede8378245eb6bd31eaf1d9103f027df0f7a0
-
-Index: plugins/common.h
---- plugins/common.h.orig
-+++ plugins/common.h
-@@ -168,6 +168,11 @@
- #  endif
- #endif
- 
-+/* MariaDB 10.2 client does not set MYSQL_PORT */
-+#ifndef MYSQL_PORT
-+#  define MYSQL_PORT 3306
-+#endif
-+
- /*
-  *
-  * Standard Values

net/monitoring-plugins/pkg/PLIST-main

@@ -1,4 +1,4 @@
-@comment $OpenBSD: PLIST-main,v 1.1 2014/07/11 20:08:04 sthen Exp $
+@comment $OpenBSD: PLIST-main,v 1.2 2020/12/10 19:52:15 sthen Exp $
 @conflict nagios-plugins-*
 @conflict nagios-plugins-ntp-*
 @pkgpath net/nagios/plugins
@@ -10,6 +10,7 @@ libexec/nagios/
 @bin libexec/nagios/check_by_ssh
 libexec/nagios/check_clamd
 @bin libexec/nagios/check_cluster
+@bin libexec/nagios/check_curl
 @bin libexec/nagios/check_dhcp
 @bin libexec/nagios/check_dig
 @bin libexec/nagios/check_disk
@@ -56,6 +57,7 @@ libexec/nagios/check_ssmtp
 @bin libexec/nagios/check_time
 libexec/nagios/check_udp
 @bin libexec/nagios/check_ups
+libexec/nagios/check_uptime
 @bin libexec/nagios/check_users
 libexec/nagios/check_wave
 @bin libexec/nagios/negate