update to monitoring-plugins-2.3.2

net/monitoring-plugins/Makefile

@@ -9,8 +9,7 @@ COMMENT-samba=	samba monitoring plugin
 COMMENT-snmp=	monitoring plugins using snmp
 COMMENT-radius=	RADIUS monitoring plugin
 
-V=		2.3.1
-REVISION=	3
+V=		2.3.2
 
 DISTNAME=	monitoring-plugins-$V
 PKGNAME-main=	monitoring-plugins-$V
@@ -43,37 +42,37 @@ 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} \
+
+LIB_DEPENDS-main= ${LIB_DEPENDS} \
 		net/curl \
 		www/uriparser
 
-FAKE_FLAGS=	setuid_root_mode=0555
-
 CONFIGURE_STYLE= autoconf
 AUTOCONF_VERSION= 2.69
 CONFIGURE_ENV+= LDFLAGS="-L${LOCALBASE}/lib"
+FAKE_FLAGS=	setuid_root_mode=0555
+
 # cgiurl is only used to produce an href to traceroute.cgi in check_ping output
-CONFIGURE_ARGS+= --libexecdir=${PREFIX}/libexec/nagios \
+CONFIGURE_ARGS+= \
+		--libexecdir=${PREFIX}/libexec/nagios \
 		--with-cgiurl=/cgi-bin/nagios \
 		--with-openssl=/usr \
 		--without-gnutls
-# builds done with proot on a nosuid filesystem can't run ping so the parameter
-# autodetection fails; hardcode it instead
-CONFIGURE_ARGS+= --with-ping-command="/sbin/ping -n -c %d %s" \
-		--with-ping6-command="/sbin/ping6 -n -c %d %s"
+
 # can autodetect command paths, but hard-coding avoids build dependencies
-# or a detection which relies on being able to run ping (
-CONFIGURE_ARGS+= --with-fping-command="${LOCALBASE}/sbin/fping -4" \
+# or a detection which relies on being able to run ping (builds done with
+# proot on a nosuid filesystem can't run ping)
+CONFIGURE_ARGS+= \
+		--with-dig-command=/usr/bin/dig \
+		--with-fping-command="${LOCALBASE}/sbin/fping -4" \
 		--with-fping6-command="${LOCALBASE}/sbin/fping -6" \
+		--with-nslookup-command=/usr/bin/nslookup \
+		--with-ping-command="/sbin/ping -n -c %d %s" \
+		--with-ping6-command="/sbin/ping6 -n -c %d %s" \
+		--with-qstat-command=${LOCALBASE}/bin/qstat \
 		--with-smbclient-command=${LOCALBASE}/bin/smbclient \
 		--with-snmpget-command=${LOCALBASE}/bin/snmpget \
-		--with-snmpgetnext-command=${LOCALBASE}/bin/snmpgetnext \
-		--with-qstat-command=${LOCALBASE}/bin/qstat
-# listed here to make it easier to move BIND to ports
-CONFIGURE_ARGS+= --with-dig-command=/usr/bin/dig \
-		--with-nslookup-command=/usr/bin/nslookup
-
-CFLAGS+=	-DLDAP_DEPRECATED
+		--with-snmpgetnext-command=${LOCALBASE}/bin/snmpgetnext
 
 PSEUDO_FLAVORS=	no_db
 FLAVOR?=

net/monitoring-plugins/distinfo

@@ -1,2 +1,2 @@
-SHA256 (monitoring-plugins-2.3.1.tar.gz) = 9W64SHGYP9cZJHJJ41MiKLN+LvquZXo5eb0UrB+Eo1s=
-SIZE (monitoring-plugins-2.3.1.tar.gz) = 2529669
+SHA256 (monitoring-plugins-2.3.2.tar.gz) = jZQFuvETqfJeT7lh1W+fIx2gLjraD0HbsPpGVFNPcXs=
+SIZE (monitoring-plugins-2.3.2.tar.gz) = 2766966

net/monitoring-plugins/patches/patch-configure_ac

@@ -1,6 +1,7 @@
---- 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,
+Index: configure.ac
+--- configure.ac.orig
++++ configure.ac
+@@ -209,13 +209,13 @@ AC_ARG_WITH(pgsql,
  	ACX_HELP_STRING([--with-pgsql=DIR],
  		[sets path to pgsql installation]),
  	PGSQL=$withval,)
@@ -17,7 +18,7 @@
    if test "$ac_cv_lib_pq_PQsetdbLogin" = "yes"; then
      AC_CHECK_HEADERS(pgsql/libpq-fe.h)
      AC_CHECK_HEADERS(postgresql/libpq-fe.h)
-@@ -226,8 +226,8 @@ if test "$ac_cv_lib_crypt_main" = "yes" -a "x$PGSQL" !
+@@ -227,8 +227,8 @@ if test "$ac_cv_lib_crypt_main" = "yes" -a "x$PGSQL" !
        PGLIBS="-lpq -lcrypt"
        PGINCLUDE="-I/usr/include/pgsql"
      elif test  "$ac_cv_header_postgresql_libpq_fe_h" = "yes"; then

net/monitoring-plugins/patches/patch-plugins-scripts_check_ircd_pl

@@ -1,9 +1,10 @@
 Fix unportable code which assumes sockaddr does not include a length field.
 https://github.com/monitoring-plugins/monitoring-plugins/pull/1463
 
---- plugins-scripts/check_ircd.pl.orig	Fri Jan 27 10:13:26 2017
-+++ plugins-scripts/check_ircd.pl	Fri Jan 27 10:13:57 2017
-@@ -144,7 +144,6 @@ sub bindRemote ($$)
+Index: plugins-scripts/check_ircd.pl
+--- plugins-scripts/check_ircd.pl.orig
++++ plugins-scripts/check_ircd.pl
+@@ -146,7 +146,6 @@ sub bindRemote ($$)
  {
  	my ($in_remotehost, $in_remoteport) = @_;
  	my $proto = getprotobyname('tcp');
@@ -11,7 +12,7 @@ https://github.com/monitoring-plugins/monitoring-plugins/pull/1463
  	my $that;
  	my ($name, $aliases,$type,$len,$thataddr) = gethostbyname($in_remotehost);
  
-@@ -152,8 +151,7 @@ sub bindRemote ($$)
+@@ -154,8 +153,7 @@ sub bindRemote ($$)
  	    print "IRCD UNKNOWN: Could not start socket ($!)\n";
  	    exit $ERRORS{"UNKNOWN"};
  	}

net/monitoring-plugins/patches/patch-plugins_check_http_c

@@ -4,7 +4,7 @@ that only allowed SNI-based connections
 Index: plugins/check_http.c
 --- plugins/check_http.c.orig
 +++ plugins/check_http.c
-@@ -966,7 +966,7 @@ check_http (void)
+@@ -984,7 +984,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)