svn commit: r419525 - in head/net-mgmt/nagios-plugins: . files
Mathieu Arnold
mat at FreeBSD.org
Wed Aug 3 14:21:36 UTC 2016
Author: mat
Date: Wed Aug 3 14:21:35 2016
New Revision: 419525
URL: https://svnweb.freebsd.org/changeset/ports/419525
Log:
Update to 2.1.2.
Reported by: portscout
Sponsored by: Absolight
Deleted:
head/net-mgmt/nagios-plugins/files/patch-plugins-root_check__dhcp.c
head/net-mgmt/nagios-plugins/files/patch-plugins-scripts_check__file__age.pl
head/net-mgmt/nagios-plugins/files/patch-plugins-scripts_check__mailq.pl
head/net-mgmt/nagios-plugins/files/patch-plugins_sslutils.c
Modified:
head/net-mgmt/nagios-plugins/Makefile (contents, props changed)
head/net-mgmt/nagios-plugins/distinfo (contents, props changed)
head/net-mgmt/nagios-plugins/files/patch-configure (contents, props changed)
head/net-mgmt/nagios-plugins/files/patch-plugins-scripts_check__ircd.pl (contents, props changed)
head/net-mgmt/nagios-plugins/files/patch-plugins-scripts_check__ntp.pl (contents, props changed)
head/net-mgmt/nagios-plugins/files/patch-plugins_netutils.c (contents, props changed)
Modified: head/net-mgmt/nagios-plugins/Makefile
==============================================================================
--- head/net-mgmt/nagios-plugins/Makefile Wed Aug 3 14:21:24 2016 (r419524)
+++ head/net-mgmt/nagios-plugins/Makefile Wed Aug 3 14:21:35 2016 (r419525)
@@ -2,8 +2,8 @@
# $FreeBSD$
PORTNAME= nagios-plugins
-PORTVERSION= 2.1.1
-PORTREVISION= 5
+PORTVERSION= 2.1.2
+PORTREVISION= 0
PORTEPOCH= 1
CATEGORIES= net-mgmt
MASTER_SITES= https://www.nagios-plugins.org/download/ \
@@ -23,7 +23,7 @@ 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_SINGLE_DNS= DNS_BASE DNS_BINDTOOLS DNS_BIND99 DNS_BIND910 DNS_BIND911
OPTIONS_DEFAULT=EXTRAOPTS DNS_BASE
OPTIONS_SUB= yes
@@ -44,6 +44,7 @@ DNS_BASE_DESC= >= 10 means drill for che
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
+DNS_BIND911_DESC= Use dig and nslookup from dns/bind911
EXTRAOPTS_CONFIGURE_ENABLE= extra-opts
@@ -127,6 +128,9 @@ DNS_BIND99_CONFIGURE_ON= --with-dig-comm
DNS_BIND910_BUILD_DEPENDS= ${LOCALBASE}/bin/dig:dns/bind910
DNS_BIND910_CONFIGURE_ON= --with-dig-command=${LOCALBASE}/bin/dig \
--with-nslookup-command=${LOCALBASE}/bin/nslookup
+DNS_BIND911_BUILD_DEPENDS= ${LOCALBASE}/bin/dig:dns/bind911
+DNS_BIND911_CONFIGURE_ON= --with-dig-command=${LOCALBASE}/bin/dig \
+ --with-nslookup-command=${LOCALBASE}/bin/nslookup
SSH_PORTABLE_BUILD_DEPENDS= ${LOCALBASE}/bin/ssh:security/openssh-portable
SSH_PORTABLE_RUN_DEPENDS:= ${SSH_PORTABLE_BUILD_DEPENDS}
Modified: head/net-mgmt/nagios-plugins/distinfo
==============================================================================
--- head/net-mgmt/nagios-plugins/distinfo Wed Aug 3 14:21:24 2016 (r419524)
+++ head/net-mgmt/nagios-plugins/distinfo Wed Aug 3 14:21:35 2016 (r419525)
@@ -1,2 +1,3 @@
-SHA256 (nagios-plugins-2.1.1.tar.gz) = c7daf95ecbf6909724258e55a319057b78dcca23b2a6cc0a640b90c90d4feae3
-SIZE (nagios-plugins-2.1.1.tar.gz) = 2677352
+TIMESTAMP = 1470231717
+SHA256 (nagios-plugins-2.1.2.tar.gz) = f2ed5d07b1823341f9db56b187ae5c0ee9018b6c69a152b6a240c5e14cd94ea4
+SIZE (nagios-plugins-2.1.2.tar.gz) = 2695301
Modified: head/net-mgmt/nagios-plugins/files/patch-configure
==============================================================================
--- head/net-mgmt/nagios-plugins/files/patch-configure Wed Aug 3 14:21:24 2016 (r419524)
+++ head/net-mgmt/nagios-plugins/files/patch-configure Wed Aug 3 14:21:35 2016 (r419525)
@@ -1,11 +1,11 @@
---- configure.orig 2015-07-31 17:47:20 UTC
+--- configure.orig 2016-08-01 16:28:00 UTC
+++ configure
-@@ -22224,7 +22224,7 @@ then
+@@ -21947,7 +21947,7 @@ then
$as_echo "$ac_cv_ps_command" >&6; }
- elif ps -axwo 'stat comm vsz rss user uid pid ppid args' 2>/dev/null | \
+ elif ps -axwwo 'stat comm vsz rss user uid pid ppid args' 2>/dev/null | \
- egrep -i "^ *STAT +[UCOMAND]+ +VSZ +RSS +USER +UID +PID +PPID +COMMAND" > /dev/null
+ egrep -i "^ *STAT +COMMAND +VSZ +RSS +USER +UID +PID +PPID +COMMAND" > /dev/null
then
ac_cv_ps_varlist="procstat,&procuid,&procpid,&procppid,&procvsz,&procrss,&procpcpu,procprog,&pos"
- ac_cv_ps_command="$PATH_TO_PS -axwo 'stat uid pid ppid vsz rss pcpu comm args'"
+ ac_cv_ps_command="$PATH_TO_PS -axwwo 'stat uid pid ppid vsz rss pcpu comm args'"
Modified: head/net-mgmt/nagios-plugins/files/patch-plugins-scripts_check__ircd.pl
==============================================================================
--- head/net-mgmt/nagios-plugins/files/patch-plugins-scripts_check__ircd.pl Wed Aug 3 14:21:24 2016 (r419524)
+++ head/net-mgmt/nagios-plugins/files/patch-plugins-scripts_check__ircd.pl Wed Aug 3 14:21:35 2016 (r419525)
@@ -1,6 +1,6 @@
---- plugins-scripts/check_ircd.pl.orig 2015-07-30 21:40:06 UTC
+--- plugins-scripts/check_ircd.pl.orig 2016-08-01 16:27:46 UTC
+++ plugins-scripts/check_ircd.pl
-@@ -67,6 +67,7 @@ sub bindRemote ($$);
+@@ -68,6 +68,7 @@ sub bindRemote ($$);
$ENV{'PATH'}='@TRUSTED_PATH@';
$ENV{'BASH_ENV'}='';
$ENV{'ENV'}='';
@@ -8,7 +8,7 @@
# -----------------------------------------------------------------[ Global ]--
-@@ -154,7 +155,7 @@ sub bindRemote ($$)
+@@ -155,7 +156,7 @@ sub bindRemote ($$)
print "IRCD UNKNOWN: Could not start socket ($!)\n";
exit $ERRORS{"UNKNOWN"};
}
Modified: head/net-mgmt/nagios-plugins/files/patch-plugins-scripts_check__ntp.pl
==============================================================================
--- head/net-mgmt/nagios-plugins/files/patch-plugins-scripts_check__ntp.pl Wed Aug 3 14:21:24 2016 (r419524)
+++ head/net-mgmt/nagios-plugins/files/patch-plugins-scripts_check__ntp.pl Wed Aug 3 14:21:35 2016 (r419525)
@@ -1,6 +1,6 @@
---- plugins-scripts/check_ntp.pl.orig 2015-07-30 21:40:06 UTC
+--- plugins-scripts/check_ntp.pl.orig 2016-08-01 16:27:46 UTC
+++ plugins-scripts/check_ntp.pl
-@@ -313,7 +313,6 @@ if ($have_ntpq) {
+@@ -314,7 +314,6 @@ if ($have_ntpq) {
}
} else {
print "No match!\n" if $verbose;
@@ -8,7 +8,7 @@
}
}
-@@ -427,7 +426,7 @@ if ($ntpdate_error != $ERRORS{'OK'}) {
+@@ -428,7 +427,7 @@ if ($ntpdate_error != $ERRORS{'OK'}) {
foreach my $key (keys %ERRORS) {
if ($state==$ERRORS{$key}) {
# print ("NTP $key: $answer");
Modified: head/net-mgmt/nagios-plugins/files/patch-plugins_netutils.c
==============================================================================
--- head/net-mgmt/nagios-plugins/files/patch-plugins_netutils.c Wed Aug 3 14:21:24 2016 (r419524)
+++ head/net-mgmt/nagios-plugins/files/patch-plugins_netutils.c Wed Aug 3 14:21:35 2016 (r419525)
@@ -1,6 +1,6 @@
---- plugins/netutils.c.orig 2015-07-30 21:40:06 UTC
+--- plugins/netutils.c.orig 2016-08-01 16:27:46 UTC
+++ plugins/netutils.c
-@@ -158,7 +158,7 @@ int
+@@ -179,7 +179,7 @@ int
np_net_connect (const char *host_name, int port, int *sd, int proto)
{
struct addrinfo hints;
@@ -9,7 +9,7 @@
struct sockaddr_un su;
char port_str[6], host[MAX_HOST_ADDRESS_LENGTH];
size_t len;
-@@ -185,12 +185,13 @@ np_net_connect (const char *host_name, i
+@@ -206,7 +206,7 @@ np_net_connect (const char *host_name, i
memcpy (host, host_name, len);
host[len] = '\0';
snprintf (port_str, sizeof (port_str), "%d", port);
@@ -17,14 +17,16 @@
+ result = getaddrinfo (host, port_str, &hints, &res0);
if (result != 0) {
- printf ("%s\n", gai_strerror (result));
+ if (result == EAI_NONAME)
+@@ -215,6 +215,7 @@ np_net_connect (const char *host_name, i
+ printf ("%s\n", gai_strerror (result));
return STATE_UNKNOWN;
}
+ res = res0;
while (res) {
/* attempt to create a socket */
-@@ -198,7 +199,7 @@ np_net_connect (const char *host_name, i
+@@ -222,7 +223,7 @@ np_net_connect (const char *host_name, i
if (*sd < 0) {
printf ("%s\n", _("Socket creation failed"));
@@ -33,7 +35,7 @@
return STATE_UNKNOWN;
}
-@@ -221,7 +222,7 @@ np_net_connect (const char *host_name, i
+@@ -245,7 +246,7 @@ np_net_connect (const char *host_name, i
close (*sd);
res = res->ai_next;
}
More information about the svn-ports-all
mailing list