From nobody Thu Feb 16 18:49:05 2023 X-Original-To: dev-commits-ports-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4PHkW53R5Nz3rKs3; Thu, 16 Feb 2023 18:49:05 +0000 (UTC) (envelope-from git@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) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4PHkW52tcqz3m2J; Thu, 16 Feb 2023 18:49:05 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1676573345; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=UAndsCFlsXaQi5xqfj5oMEPNmP7UAmFJX2hFI8zcwRE=; b=ZIrqHc7JkynRjo63JADi5tHkvfKPblJ1VUkFHvdKuhmr09QLh5tI3ufp4gMFk8psIMV0fc XrTzhchk8XizF/RsqNU0UsgxFYdEMqZosOISSaahVD0RItby+hSwS4QroOqUfAPSFKUdwq aqrf2xDMuf4lmPWpMKbo5MuFlMeSeFCw6DHAyqodRLhOGqrCZfhQq6uf8NDCLaKzhVyuS9 htn/mHfyJENxnTflujeURjawlWC/PKUSsxiHOHd3Y/ycQWN7kwkYALiKxzKjqif2DXYQ+P HvJTAORvM/b18C0z9rgFyBA7Kb69NXoVCGG/TiVUS2PQ5Rm6LsTU51YDd2ZxYw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1676573345; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=UAndsCFlsXaQi5xqfj5oMEPNmP7UAmFJX2hFI8zcwRE=; b=uylHq+EtDymzhwI4DF4Jmd43o55AdJFAyl0KKwJm6gfTYOX3z31aW33fjB+jx7kIqkm07f cLXifMic9lD6ipMm2qbUEx3Wa/5PIQNY7hE8N8vLmTmjXUlyorMJQY74UYpeMeFNQ2pL5W iebhyPTEvdpuzIc/41CZ2wLKC+1LKcHZ4w34BF9fR4NhkFbUxrCp/UrxmLlM1I3v1wj5mL R+5x8eFhBqPldwSDO9WTZUIXCP1STvCAsZMhpgJQ7b7UC3mwgpgDe5Idws9YnJZjRk6raM m52GAZSAO1EXv9AOba3rYQBuAyDzR7BWa6b4PtXHdqb+9Jmr8OdttrozIe2/Mg== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1676573345; a=rsa-sha256; cv=none; b=Zgv1A7D4h80dyShILJwL3+rlVbacBIaaFRuIBaMoJPm1XhhcQ64gqTkipGNypMSCsrmGRG K9GSNUUs+IlT9X4htUGgtEL62xUZerjPruD0nL8/JW4SPnjwciHOen+GfziqaAM8Wz84ga w6RqXBrXz6mequXJTvPHoDgGuXuT+ddNGnKCBViK10pXX4keTlNvS9uOkO2UHJoDSL36mW 0TsVPyHfXCTK3M+yvDBHF2bVAt4hvhMiq4MgABW9ZTn2uCvj3XFzWrqRkdWFY+Kz5WLFH8 59N45aVqZKcbTbU0z5aBwkRHqYzDYNgW+yQmw8nSZknNBsOszcDICWmknIP3kA== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4PHkW51w26zFMs; Thu, 16 Feb 2023 18:49:05 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.16.1/8.16.1) with ESMTP id 31GIn574045417; Thu, 16 Feb 2023 18:49:05 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 31GIn51n045416; Thu, 16 Feb 2023 18:49:05 GMT (envelope-from git) Date: Thu, 16 Feb 2023 18:49:05 GMT Message-Id: <202302161849.31GIn51n045416@gitrepo.freebsd.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org From: Jochen Neumeister Subject: git: c0bd039ca446 - main - net-mgmt/monitoring-plugins: Update to 2.3.3 List-Id: Commit messages for all branches of the ports repository List-Archive: https://lists.freebsd.org/archives/dev-commits-ports-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-ports-all@freebsd.org X-BeenThere: dev-commits-ports-all@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: joneum X-Git-Repository: ports X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: c0bd039ca44643af1dc89899707f61ab4c3b7a03 Auto-Submitted: auto-generated X-ThisMailContainsUnwantedMimeParts: N The branch main has been updated by joneum: URL: https://cgit.FreeBSD.org/ports/commit/?id=c0bd039ca44643af1dc89899707f61ab4c3b7a03 commit c0bd039ca44643af1dc89899707f61ab4c3b7a03 Author: Kurt Jaeger AuthorDate: 2023-02-16 18:46:51 +0000 Commit: Jochen Neumeister CommitDate: 2023-02-16 18:48:39 +0000 net-mgmt/monitoring-plugins: Update to 2.3.3 Update to 2.3.2, fick check_icmp bug PR: 269229 264342 Sponsored by: Netzkommune GmbH --- net-mgmt/monitoring-plugins/Makefile | 2 +- net-mgmt/monitoring-plugins/distinfo | 6 +++--- .../files/patch-plugins_check__procs.c | 22 +++++++++++----------- 3 files changed, 15 insertions(+), 15 deletions(-) diff --git a/net-mgmt/monitoring-plugins/Makefile b/net-mgmt/monitoring-plugins/Makefile index 586896560c23..0e8772642da9 100644 --- a/net-mgmt/monitoring-plugins/Makefile +++ b/net-mgmt/monitoring-plugins/Makefile @@ -1,5 +1,5 @@ PORTNAME= monitoring-plugins -PORTVERSION= 2.3.1 +PORTVERSION= 2.3.2 CATEGORIES= net-mgmt MASTER_SITES= https://www.monitoring-plugins.org/download/ \ LOCAL/mat/${PORTNAME} diff --git a/net-mgmt/monitoring-plugins/distinfo b/net-mgmt/monitoring-plugins/distinfo index 3ae6f554dbdb..7ee1ab6702b9 100644 --- a/net-mgmt/monitoring-plugins/distinfo +++ b/net-mgmt/monitoring-plugins/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1618242026 -SHA256 (monitoring-plugins-2.3.1.tar.gz) = f56eb84871983fd719247249e3532228b37e2efaae657a3979bd14ac1f84a35b -SIZE (monitoring-plugins-2.3.1.tar.gz) = 2529669 +TIMESTAMP = 1675013208 +SHA256 (monitoring-plugins-2.3.2.tar.gz) = 8d9405baf113a9f25e4fb961d56f9f231da02e3ada0f41dbb0fa4654534f717b +SIZE (monitoring-plugins-2.3.2.tar.gz) = 2766966 diff --git a/net-mgmt/monitoring-plugins/files/patch-plugins_check__procs.c b/net-mgmt/monitoring-plugins/files/patch-plugins_check__procs.c index 8dde83b32b9c..c74d61575410 100644 --- a/net-mgmt/monitoring-plugins/files/patch-plugins_check__procs.c +++ b/net-mgmt/monitoring-plugins/files/patch-plugins_check__procs.c @@ -1,4 +1,4 @@ ---- plugins/check_procs.c.orig 2020-12-09 21:38:01 UTC +--- plugins/check_procs.c.orig 2022-10-19 12:50:27 UTC +++ plugins/check_procs.c @@ -70,6 +70,7 @@ int options = 0; /* bitmask of filter criteria to test #define PCPU 256 @@ -8,7 +8,7 @@ #define KTHREAD_PARENT "kthreadd" /* the parent process of kernel threads: ppid of procs are compared to pid of this proc*/ -@@ -101,6 +102,7 @@ char *fails; +@@ -101,6 +102,7 @@ int usepid = 0; /* whether to test for pid or /proc/pi char tmp[MAX_INPUT_BUFFER]; int kthread_filter = 0; int usepid = 0; /* whether to test for pid or /proc/pid/exe */ @@ -28,11 +28,11 @@ procseconds = convert_to_seconds(procetime); if (verbose >= 3) -- printf ("proc#=%d uid=%d vsz=%d rss=%d pid=%d ppid=%d pcpu=%.2f stat=%s etime=%s prog=%s args=%s\n", -+ printf ("proc#=%d uid=%d vsz=%d rss=%d pid=%d ppid=%d jid=%d pcpu=%.2f stat=%s etime=%s prog=%s args=%s\n", +- printf ("proc#=%d uid=%d vsz=%d rss=%d pid=%d ppid=%d pcpu=%.2f stat=%s etime=%s prog=%s args=%s\n", ++ printf ("proc#=%d uid=%d vsz=%d rss=%d pid=%d ppid=%d jid=%d pcpu=%.2f stat=%s etime=%s prog=%s args=%s\n", procs, procuid, procvsz, procrss, -- procpid, procppid, procpcpu, procstat, -+ procpid, procppid, procjid, procpcpu, procstat, +- procpid, procppid, procpcpu, procstat, ++ procpid, procppid, procjid, procpcpu, procstat, procetime, procprog, procargs); /* Ignore self */ @@ -49,11 +49,11 @@ procs++; if (verbose >= 2) { -- printf ("Matched: uid=%d vsz=%d rss=%d pid=%d ppid=%d pcpu=%.2f stat=%s etime=%s prog=%s args=%s\n", -+ printf ("Matched: uid=%d vsz=%d rss=%d pid=%d ppid=%d jid=%d pcpu=%.2f stat=%s etime=%s prog=%s args=%s\n", +- printf ("Matched: uid=%d vsz=%d rss=%d pid=%d ppid=%d pcpu=%.2f stat=%s etime=%s prog=%s args=%s\n", ++ printf ("Matched: uid=%d vsz=%d rss=%d pid=%d ppid=%d jid=%d pcpu=%.2f stat=%s etime=%s prog=%s args=%s\n", procuid, procvsz, procrss, -- procpid, procppid, procpcpu, procstat, -+ procpid, procppid, procjid, procpcpu, procstat, +- procpid, procppid, procpcpu, procstat, ++ procpid, procppid, procjid, procpcpu, procstat, procetime, procprog, procargs); } @@ -96,7 +96,7 @@ printf (" %s\n", "-z, --vsz=VSZ"); printf (" %s\n", _("Only scan for processes with VSZ higher than indicated.")); printf (" %s\n", "-r, --rss=RSS"); -@@ -784,7 +798,7 @@ void +@@ -784,7 +798,7 @@ print_usage (void) print_usage (void) { printf ("%s\n", _("Usage:"));