Index: head/net-mgmt/monitoring-plugins/Makefile
===================================================================
--- head/net-mgmt/monitoring-plugins/Makefile	(revision 406047)
+++ head/net-mgmt/monitoring-plugins/Makefile	(revision 406048)
@@ -1,158 +1,158 @@
 # Created by: Blaz Zupan <blaz@si.FreeBSD.org>
 # $FreeBSD$
 
 PORTNAME=	monitoring-plugins
-PORTVERSION=	2.1.1
+PORTVERSION=	2.1.2
 PORTREVISION=	0
 CATEGORIES=	net-mgmt
 MASTER_SITES=	https://www.monitoring-plugins.org/download/ LOCAL/mat/${PORTNAME}
 
 MAINTAINER=	mat@FreeBSD.org
 COMMENT=	Monitoring Plugins for Nagios
 
 LICENSE=	GPLv3
 LICENSE_FILE=	${WRKSRC}/COPYING
 
 CONFLICTS_INSTALL=	nagios-plugins-*
 
 USES=		charsetfix gmake perl5 libtool
 USE_OPENSSL=	yes
 USE_SUBMAKE=	yes
 
 OPTIONS_DEFINE=	QSTAT FPING NETSNMP RADIUS MYSQL PGSQL LDAP IPV6 NLS DBI EXTRAOPTS SSH_PORTABLE
 OPTIONS_SINGLE=	DNS
 OPTIONS_SINGLE_DNS=	DNS_BASE DNS_BINDTOOLS DNS_BIND99 DNS_BIND910
 OPTIONS_DEFAULT=IPV6 EXTRAOPTS DNS_BASE
 OPTIONS_SUB=	yes
 
 QSTAT_DESC=	Game server query support (check_game)
 FPING_DESC=	Support for non-flooding fast ping (check_fping)
 NETSNMP_DESC=	SNMP support (check_snmp)
 RADIUS_DESC=	Radius support (check_radius)
 MYSQL_DESC=	MySQL support (check_mysql)
 PGSQL_DESC=	PostgreSQL support (check_pgsql)
 LDAP_DESC=	OpenLDAP support (check_ldap)
 DBI_DESC=	Check database using DBI
 EXTRAOPTS_DESC=	Parsing of plugins ini config files for extra options
 SSH_PORTABLE_DESC=	Build check_ssh with ports openssh (instead of base)
 
 DNS_DESC=	Configuration of check_dig and check_dns (see help)
 
 DNS_BASE_DESC=	>= 10 means drill for check_dig and no check_dns
 DNS_BINDTOOLS_DESC=	Use dig and nslookup from dns/bind-tools
 DNS_BIND99_DESC=	Use dig and nslookup from dns/bind99
 DNS_BIND910_DESC=	Use dig and nslookup from dns/bind910
 
 EXTRAOPTS_CONFIGURE_ENABLE=	extra-opts
 
 GNU_CONFIGURE=	yes
 
 NAGIOSDIR?=	/var/spool/nagios
 
 NAGIOSWWWDIR?=	www/nagios
 NAGIOSHTMURL?=	/nagios
 NAGIOSCGIURL?=	${NAGIOSHTMURL}/cgi-bin
 
 CONFIGURE_ARGS+=--with-cgiurl=${NAGIOSCGIURL} \
 		--sbindir=${PREFIX}/${NAGIOSWWWDIR}/cgi-bin \
 		--libexecdir=${PREFIX}/libexec/nagios \
 		--datadir=${PREFIX}/share \
 		--sysconfdir=${PREFIX}/etc/nagios \
 		--localstatedir=${NAGIOSDIR} \
 		--with-perl=${PERL} \
 		--prefix=${PREFIX}
 
 # Also, force some commands with their expected paths so that they don't get
 # disabled.
 CONFIGURE_ARGS+=ac_cv_path_PATH_TO_QMAIL_QSTAT=/var/qmail/bin/qmail-qstat \
 		ac_cv_path_PATH_TO_PING=/sbin/ping \
 		ac_cv_path_PATH_TO_PING6=/sbin/ping6 \
 		--with-ping-command="/sbin/ping -n -c %d %s" \
 		--with-ping6-command="/sbin/ping6 -n -c %d %s" \
 		ac_cv_path_PATH_TO_SMBCLIENT=${LOCALBASE}/bin/smbclient
 
 CPPFLAGS+=	-I${LOCALBASE}/include
 LIBS+=		-L${LOCALBASE}/lib
 
 QSTAT_BUILD_DEPENDS=	qstat:${PORTSDIR}/games/qstat
 QSTAT_RUN_DEPENDS=	qstat:${PORTSDIR}/games/qstat
 QSTAT_CONFIGURE_OFF=	ac_cv_path_PATH_TO_QUAKESTAT= \
 			ac_cv_path_PATH_TO_QSTAT=
 
 IPV6_CONFIGURE_WITH=	ipv6
 
 FPING_BUILD_DEPENDS=	fping:${PORTSDIR}/net/fping
 FPING_RUN_DEPENDS=	fping:${PORTSDIR}/net/fping
 FPING_CONFIGURE_OFF=	ac_cv_path_PATH_TO_FPING= \
 			ac_cv_path_PATH_TO_FPING6=
 
 NETSNMP_BUILD_DEPENDS=	snmpcheck:${PORTSDIR}/net-mgmt/net-snmp \
 		p5-Net-SNMP>=0:${PORTSDIR}/net-mgmt/p5-Net-SNMP
 NETSNMP_RUN_DEPENDS=	snmpcheck:${PORTSDIR}/net-mgmt/net-snmp \
 		p5-Net-SNMP>=0:${PORTSDIR}/net-mgmt/p5-Net-SNMP
 NETSNMP_CONFIGURE_OFF=	ac_cv_path_PATH_TO_SNMPGET= \
 			ac_cv_path_PATH_TO_SNMPGETNEXT=
 
 RADIUS_LIB_DEPENDS=	libradiusclient-ng.so:${PORTSDIR}/net/radiusclient
 RADIUS_CONFIGURE_WITH=	radius
 
 MYSQL_USE=	mysql=yes
 MYSQL_CONFIGURE_WITH=	mysql=${LOCALBASE}
 
 PGSQL_USES=	pgsql
 PGSQL_CONFIGURE_WITH=	pgsql=${LOCALBASE}
 
 LDAP_USE=	openldap=yes
 LDAP_CONFIGURE_WITH=	ldap
 
 NLS_USES=	gettext
 NLS_CONFIGURE_ENABLE=	nls
 
 DBI_LIB_DEPENDS=	libdbi.so:${PORTSDIR}/databases/libdbi
 DBI_CONFIGURE_WITH=	dbi
 
 DNS_BINDTOOLS_BUILD_DEPENDS=	${LOCALBASE}/bin/dig:${PORTSDIR}/dns/bind-tools
 DNS_BINDTOOLS_CONFIGURE_ON=	--with-dig-command=${LOCALBASE}/bin/dig \
 				--with-nslookup-command=${LOCALBASE}/bin/nslookup
 DNS_BIND99_BUILD_DEPENDS=	${LOCALBASE}/bin/dig:${PORTSDIR}/dns/bind99
 DNS_BIND99_CONFIGURE_ON=	--with-dig-command=${LOCALBASE}/bin/dig \
 				--with-nslookup-command=${LOCALBASE}/bin/nslookup
 DNS_BIND910_BUILD_DEPENDS=	${LOCALBASE}/bin/dig:${PORTSDIR}/dns/bind910
 DNS_BIND910_CONFIGURE_ON=	--with-dig-command=${LOCALBASE}/bin/dig \
 				--with-nslookup-command=${LOCALBASE}/bin/nslookup
 
 SSH_PORTABLE_BUILD_DEPENDS=	${LOCALBASE}/bin/ssh:${PORTSDIR}/security/openssh-portable
 SSH_PORTABLE_RUN_DEPENDS:=	${SSH_PORTABLE_BUILD_DEPENDS}
 SSH_PORTABLE_CONFIGURE_ON=	--with-ssh-command=${LOCALBASE}/bin/ssh
 
 .include <bsd.port.options.mk>
 
 .if ${OSVERSION} > 1000055 && ${PORT_OPTIONS:MDNS_BASE}
 EXTRA_PATCHES+=	${FILESDIR}/extra-patch-dig-to-drill.diff
 CONFIGURE_ARGS+=--with-dig-command=/usr/bin/drill \
 		ac_cv_path_PATH_TO_NSLOOKUP=
 PLIST_SUB+=	CHECK_DNS="@comment "
 .else
 .  if ${PORT_OPTIONS:MDNS_BASE}
 CONFIGURE_ARGS+=	--with-dig-command=/usr/bin/dig \
 			--with-nslookup-command=/usr/bin/nslookup
 .  endif
 PLIST_SUB+=	CHECK_DNS=""
 .endif
 
 .if !exists(/usr/bin/ssh) && empty(PORT_OPTIONS:MSSH_PORTABLE)
 PLIST_SUB+=	SSH="@comment "
 .else
 PLIST_SUB+=	SSH=""
 .endif
 
 post-patch:
 .for file in check_by_ssh.c check_disk.c check_http.c check_mrtgtraf.c \
 	check_nagios.c check_ntp.c check_ntp_peer.c check_ntp_time.c \
 	check_pgsql.c check_snmp.c check_ssh.c check_swap.c check_time.c \
 	check_users.c
 	@${REINPLACE_CMD} -e 's|setlocale (LC_ALL, "");|setlocale (LC_ALL, ""); setlocale(LC_NUMERIC, "C");|g' ${WRKSRC}/plugins/${file}
 .endfor
 	@${REINPLACE_CMD} -e 's|chown root|${TRUE}|g' ${WRKSRC}/plugins-root/Makefile.in
 
 .include <bsd.port.mk>
Index: head/net-mgmt/monitoring-plugins/distinfo
===================================================================
--- head/net-mgmt/monitoring-plugins/distinfo	(revision 406047)
+++ head/net-mgmt/monitoring-plugins/distinfo	(revision 406048)
@@ -1,2 +1,2 @@
-SHA256 (monitoring-plugins-2.1.1.tar.gz) = 44dbace8033eafb716cc501bfef26ca9071ae3d0329b2c118bd0230fd98dd1d3
-SIZE (monitoring-plugins-2.1.1.tar.gz) = 2612331
+SHA256 (monitoring-plugins-2.1.2.tar.gz) = 76c6b58f0867ab7b6c8c86c7e94fcce7183618f6daab63488990d0355f5600aa
+SIZE (monitoring-plugins-2.1.2.tar.gz) = 2613060
Index: head/net-mgmt/monitoring-plugins/files/patch-plugins__check_ssh.c
===================================================================
--- head/net-mgmt/monitoring-plugins/files/patch-plugins__check_ssh.c	(revision 406047)
+++ head/net-mgmt/monitoring-plugins/files/patch-plugins__check_ssh.c	(nonexistent)
@@ -1,18 +0,0 @@
---- plugins/check_ssh.c.orig	2014-11-30 22:28:21 UTC
-+++ plugins/check_ssh.c
-@@ -255,6 +255,7 @@ ssh_connect (char *haddr, int hport, cha
- 			printf
- 				(_("SSH WARNING - %s (protocol %s) version mismatch, expected '%s'\n"),
- 				 ssh_server, ssh_proto, remote_version);
-+			recv (sd, output, BUFF_SZ, 0);
- 			close(sd);
- 			exit (STATE_WARNING);
- 		}
-@@ -273,6 +274,7 @@ ssh_connect (char *haddr, int hport, cha
- 			(_("SSH OK - %s (protocol %s) | %s\n"),
- 			 ssh_server, ssh_proto, fperfdata("time", elapsed_time, "s",
- 			 FALSE, 0, FALSE, 0, TRUE, 0, TRUE, (int)socket_timeout));
-+		recv (sd, output, BUFF_SZ, 0);
- 		close(sd);
- 		exit (STATE_OK);
- 	}

Property changes on: head/net-mgmt/monitoring-plugins/files/patch-plugins__check_ssh.c
___________________________________________________________________
Deleted: fbsd:nokeywords
## -1 +0,0 ##
-yes
\ No newline at end of property
Deleted: svn:eol-style
## -1 +0,0 ##
-native
\ No newline at end of property
Deleted: svn:mime-type
## -1 +0,0 ##
-text/plain
\ No newline at end of property
Index: head/net-mgmt/monitoring-plugins/files/patch-plugins-scripts__check_ircd.pl
===================================================================
--- head/net-mgmt/monitoring-plugins/files/patch-plugins-scripts__check_ircd.pl	(revision 406047)
+++ head/net-mgmt/monitoring-plugins/files/patch-plugins-scripts__check_ircd.pl	(nonexistent)
@@ -1,19 +0,0 @@
---- plugins-scripts/check_ircd.pl.orig	2014-11-30 10:36:26 UTC
-+++ plugins-scripts/check_ircd.pl
-@@ -66,6 +66,7 @@ sub bindRemote ($$);
- $ENV{'PATH'}='@TRUSTED_PATH@';
- $ENV{'BASH_ENV'}=''; 
- $ENV{'ENV'}='';
-+$ENV{CDPATH} = "";
- 
- # -----------------------------------------------------------------[ Global ]--
- 
-@@ -153,7 +154,7 @@ sub bindRemote ($$)
- 	    print "IRCD UNKNOWN: Could not start socket ($!)\n";
- 	    exit $ERRORS{"UNKNOWN"};
- 	}
--	$sockaddr = 'S n a4 x8';
-+	$sockaddr = 'x C n a4 x8';
- 	$that = pack($sockaddr, AF_INET, $in_remoteport, $thataddr);
- 	if (!connect(ClientSocket, $that)) { 
- 	    print "IRCD UNKNOWN: Could not connect socket ($!)\n";

Property changes on: head/net-mgmt/monitoring-plugins/files/patch-plugins-scripts__check_ircd.pl
___________________________________________________________________
Deleted: fbsd:nokeywords
## -1 +0,0 ##
-yes
\ No newline at end of property
Deleted: svn:eol-style
## -1 +0,0 ##
-native
\ No newline at end of property
Deleted: svn:mime-type
## -1 +0,0 ##
-text/plain
\ No newline at end of property
Index: head/net-mgmt/monitoring-plugins/files/patch-plugins-root_check__dhcp.c
===================================================================
--- head/net-mgmt/monitoring-plugins/files/patch-plugins-root_check__dhcp.c	(revision 406047)
+++ head/net-mgmt/monitoring-plugins/files/patch-plugins-root_check__dhcp.c	(revision 406048)
@@ -1,21 +1,12 @@
---- plugins-root/check_dhcp.c.orig	2014-11-30 10:36:26 UTC
+--- plugins-root/check_dhcp.c.orig	2015-10-16 09:06:18 UTC
 +++ plugins-root/check_dhcp.c
 @@ -323,7 +323,8 @@ int get_hardware_address(int sock,char *
  #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;
-@@ -1182,7 +1183,7 @@ int call_getopt(int argc, char **argv){
- 		        }
- 	        }
- 
--	return i;
-+	return i+1;
-         }
- 
- 
Index: head/net-mgmt/monitoring-plugins/files/patch-plugins-scripts_check__ircd.pl
===================================================================
--- head/net-mgmt/monitoring-plugins/files/patch-plugins-scripts_check__ircd.pl	(nonexistent)
+++ head/net-mgmt/monitoring-plugins/files/patch-plugins-scripts_check__ircd.pl	(revision 406048)
@@ -0,0 +1,19 @@
+--- plugins-scripts/check_ircd.pl.orig	2014-11-30 10:36:26 UTC
++++ plugins-scripts/check_ircd.pl
+@@ -66,6 +66,7 @@ sub bindRemote ($$);
+ $ENV{'PATH'}='@TRUSTED_PATH@';
+ $ENV{'BASH_ENV'}=''; 
+ $ENV{'ENV'}='';
++$ENV{CDPATH} = "";
+ 
+ # -----------------------------------------------------------------[ Global ]--
+ 
+@@ -153,7 +154,7 @@ sub bindRemote ($$)
+ 	    print "IRCD UNKNOWN: Could not start socket ($!)\n";
+ 	    exit $ERRORS{"UNKNOWN"};
+ 	}
+-	$sockaddr = 'S n a4 x8';
++	$sockaddr = 'x C n a4 x8';
+ 	$that = pack($sockaddr, AF_INET, $in_remoteport, $thataddr);
+ 	if (!connect(ClientSocket, $that)) { 
+ 	    print "IRCD UNKNOWN: Could not connect socket ($!)\n";

Property changes on: head/net-mgmt/monitoring-plugins/files/patch-plugins-scripts_check__ircd.pl
___________________________________________________________________
Added: fbsd:nokeywords
## -0,0 +1 ##
+yes
\ No newline at end of property
Added: svn:eol-style
## -0,0 +1 ##
+native
\ No newline at end of property
Added: svn:mime-type
## -0,0 +1 ##
+text/plain
\ No newline at end of property
Index: head/net-mgmt/monitoring-plugins/files/patch-plugins_check__ssh.c
===================================================================
--- head/net-mgmt/monitoring-plugins/files/patch-plugins_check__ssh.c	(nonexistent)
+++ head/net-mgmt/monitoring-plugins/files/patch-plugins_check__ssh.c	(revision 406048)
@@ -0,0 +1,18 @@
+--- plugins/check_ssh.c.orig	2014-11-30 22:28:21 UTC
++++ plugins/check_ssh.c
+@@ -255,6 +255,7 @@ ssh_connect (char *haddr, int hport, cha
+ 			printf
+ 				(_("SSH WARNING - %s (protocol %s) version mismatch, expected '%s'\n"),
+ 				 ssh_server, ssh_proto, remote_version);
++			recv (sd, output, BUFF_SZ, 0);
+ 			close(sd);
+ 			exit (STATE_WARNING);
+ 		}
+@@ -273,6 +274,7 @@ ssh_connect (char *haddr, int hport, cha
+ 			(_("SSH OK - %s (protocol %s) | %s\n"),
+ 			 ssh_server, ssh_proto, fperfdata("time", elapsed_time, "s",
+ 			 FALSE, 0, FALSE, 0, TRUE, 0, TRUE, (int)socket_timeout));
++		recv (sd, output, BUFF_SZ, 0);
+ 		close(sd);
+ 		exit (STATE_OK);
+ 	}

Property changes on: head/net-mgmt/monitoring-plugins/files/patch-plugins_check__ssh.c
___________________________________________________________________
Added: fbsd:nokeywords
## -0,0 +1 ##
+yes
\ No newline at end of property
Added: svn:eol-style
## -0,0 +1 ##
+native
\ No newline at end of property
Added: svn:mime-type
## -0,0 +1 ##
+text/plain
\ No newline at end of property