From owner-svn-ports-all@freebsd.org Mon Dec 9 14:10:42 2019 Return-Path: Delivered-To: svn-ports-all@mailman.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mailman.nyi.freebsd.org (Postfix) with ESMTP id 2E6EF1D79DB; Mon, 9 Dec 2019 14:10:42 +0000 (UTC) (envelope-from mat@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) server-signature RSA-PSS (4096 bits) client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "Let's Encrypt Authority X3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 47WlTY707Qz4fWh; Mon, 9 Dec 2019 14:10:41 +0000 (UTC) (envelope-from mat@FreeBSD.org) Received: from repo.freebsd.org (repo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id C978E1BB0A; Mon, 9 Dec 2019 14:10:41 +0000 (UTC) (envelope-from mat@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id xB9EAfMW037635; Mon, 9 Dec 2019 14:10:41 GMT (envelope-from mat@FreeBSD.org) Received: (from mat@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id xB9EAeXk037629; Mon, 9 Dec 2019 14:10:40 GMT (envelope-from mat@FreeBSD.org) Message-Id: <201912091410.xB9EAeXk037629@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: mat set sender to mat@FreeBSD.org using -f From: Mathieu Arnold Date: Mon, 9 Dec 2019 14:10:40 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r519615 - in head/net-mgmt/nagios-plugins: . files X-SVN-Group: ports-head X-SVN-Commit-Author: mat X-SVN-Commit-Paths: in head/net-mgmt/nagios-plugins: . files X-SVN-Commit-Revision: 519615 X-SVN-Commit-Repository: ports MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-ports-all@freebsd.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: SVN commit messages for the ports tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 09 Dec 2019 14:10:42 -0000 Author: mat Date: Mon Dec 9 14:10:40 2019 New Revision: 519615 URL: https://svnweb.freebsd.org/changeset/ports/519615 Log: Update to 2.3.0. Added: head/net-mgmt/nagios-plugins/files/patch-plugins_check__load.c (contents, props changed) Deleted: head/net-mgmt/nagios-plugins/files/patch-plugins-check_ntp_time.c head/net-mgmt/nagios-plugins/files/patch-plugins-scripts_check__mailq.pl head/net-mgmt/nagios-plugins/files/patch-plugins_check__http.c head/net-mgmt/nagios-plugins/files/patch-plugins_check__nagios.c head/net-mgmt/nagios-plugins/files/patch-plugins_check__procs.c head/net-mgmt/nagios-plugins/files/patch-plugins_common.h 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__ntp.pl (contents, props changed) head/net-mgmt/nagios-plugins/pkg-plist (contents, props changed) Modified: head/net-mgmt/nagios-plugins/Makefile ============================================================================== --- head/net-mgmt/nagios-plugins/Makefile Mon Dec 9 14:10:35 2019 (r519614) +++ head/net-mgmt/nagios-plugins/Makefile Mon Dec 9 14:10:40 2019 (r519615) @@ -2,8 +2,7 @@ # $FreeBSD$ PORTNAME= nagios-plugins -PORTVERSION= 2.2.1 -PORTREVISION= 8 +DISTVERSION= 2.3.0 PORTEPOCH= 1 CATEGORIES= net-mgmt MASTER_SITES= https://www.nagios-plugins.org/download/ \ @@ -39,7 +38,7 @@ SSH_PORTABLE_DESC= Build check_ssh with ports openssh 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_BASE_DESC= Use drill for check_dig, check_dns not available DNS_BINDTOOLS_DESC= Use dig and nslookup from dns/bind-tools EXTRAOPTS_CONFIGURE_ENABLE= extra-opts Modified: head/net-mgmt/nagios-plugins/distinfo ============================================================================== --- head/net-mgmt/nagios-plugins/distinfo Mon Dec 9 14:10:35 2019 (r519614) +++ head/net-mgmt/nagios-plugins/distinfo Mon Dec 9 14:10:40 2019 (r519615) @@ -1,3 +1,3 @@ -TIMESTAMP = 1493720605 -SHA256 (nagios-plugins-2.2.1.tar.gz) = 647c0ba4583d891c965fc29b77c4ccfeccc21f409fdf259cb8af52cb39c21e18 -SIZE (nagios-plugins-2.2.1.tar.gz) = 2728818 +TIMESTAMP = 1575890689 +SHA256 (nagios-plugins-2.3.0.tar.gz) = 18dff0152120e904b16b4b5562867c18ba6e17d66046656d33730427790bcfff +SIZE (nagios-plugins-2.3.0.tar.gz) = 2833054 Modified: head/net-mgmt/nagios-plugins/files/patch-configure ============================================================================== --- head/net-mgmt/nagios-plugins/files/patch-configure Mon Dec 9 14:10:35 2019 (r519614) +++ head/net-mgmt/nagios-plugins/files/patch-configure Mon Dec 9 14:10:40 2019 (r519615) @@ -1,6 +1,6 @@ ---- configure.orig 2017-04-19 16:03:27 UTC +--- configure.orig 2019-12-04 21:53:36 UTC +++ configure -@@ -21973,6 +21973,15 @@ $as_echo "$as_me: error: I don't know ho +@@ -22045,6 +22045,15 @@ $as_echo "$as_me: error: I don't know how to build a 6 fi @@ -16,12 +16,3 @@ elif ps axwwo 'stat comm vsz rss user uid pid ppid args cgroup:256' 2>/dev/null | \ egrep -i "^ *STAT +[UCOMAND]+ +VSZ +RSS +USER +UID +PID +PPID +COMMAND +CGROUP" > /dev/null then -@@ -23798,7 +23807,7 @@ then - - if $PATH_TO_SWAPINFO -k 2>/dev/null | egrep -i "^Device +1K-blocks +Used +Avail" >/dev/null - then -- ac_cv_swap_format="%*s %f %*d %f" -+ ac_cv_swap_format="%*s %lf %*d %lf" - ac_cv_swap_conv=1024 - { $as_echo "$as_me:$LINENO: result: using FreeBSD format swapinfo" >&5 - $as_echo "using FreeBSD format swapinfo" >&6; } 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 Mon Dec 9 14:10:35 2019 (r519614) +++ head/net-mgmt/nagios-plugins/files/patch-plugins-scripts_check__ntp.pl Mon Dec 9 14:10:40 2019 (r519615) @@ -1,4 +1,4 @@ ---- plugins-scripts/check_ntp.pl.orig 2016-08-01 16:27:46 UTC +--- plugins-scripts/check_ntp.pl.orig 2019-12-04 21:53:08 UTC +++ plugins-scripts/check_ntp.pl @@ -314,7 +314,6 @@ if ($have_ntpq) { } @@ -8,12 +8,12 @@ } } -@@ -428,7 +427,7 @@ if ($ntpdate_error != $ERRORS{'OK'}) { - foreach my $key (keys %ERRORS) { +@@ -429,7 +428,7 @@ foreach my $key (keys %ERRORS) { if ($state==$ERRORS{$key}) { - # print ("NTP $key: $answer"); -- print ("NTP $key: $answer|offset=$offset, jitter=" . $jitter/1000 . ",peer_stratum=$stratum\n"); -+ print ("NTP $key: $answer|offset=$offset, jitter=" . ($jitter || 0)/1000 . ",peer_stratum=$stratum\n"); + print ("NTP $key: $answer|offset=$offset"); + if ($have_ntpq) { +- print (", jitter=" . $jitter/1000 . ",peer_stratum=$stratum"); ++ print (", jitter=" . ($jitter || 0)/1000 . ",peer_stratum=$stratum"); + } + print ("\n"); last; - } - } Added: head/net-mgmt/nagios-plugins/files/patch-plugins_check__load.c ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/net-mgmt/nagios-plugins/files/patch-plugins_check__load.c Mon Dec 9 14:10:40 2019 (r519615) @@ -0,0 +1,10 @@ +--- plugins/check_load.c.orig 2019-12-09 11:57:36 UTC ++++ plugins/check_load.c +@@ -351,6 +351,7 @@ int cmpstringp(const void *p1, const void *p2) { + pid_t kthread_ppid = 0; + int procvsz = 0; + int procrss = 0; ++ int procjid = 0; + float procpcpu = 0; + char procstat[8]; + #ifdef PS_USES_PROCETIME Modified: head/net-mgmt/nagios-plugins/pkg-plist ============================================================================== --- head/net-mgmt/nagios-plugins/pkg-plist Mon Dec 9 14:10:35 2019 (r519614) +++ head/net-mgmt/nagios-plugins/pkg-plist Mon Dec 9 14:10:40 2019 (r519615) @@ -55,6 +55,7 @@ libexec/nagios/check_smtp %%NETSNMP%%libexec/nagios/check_snmp libexec/nagios/check_spop libexec/nagios/check_ssh +libexec/nagios/check_ssl_validity libexec/nagios/check_ssmtp libexec/nagios/check_swap libexec/nagios/check_tcp @@ -64,6 +65,7 @@ libexec/nagios/check_ups libexec/nagios/check_users libexec/nagios/check_wave libexec/nagios/negate +libexec/nagios/remove_perfdata libexec/nagios/urlize libexec/nagios/utils.pm libexec/nagios/utils.sh