Attachment 239786 Details for Bug 269229 – patch

[patch] patch

mon.diff (text/plain), 3.82 KB, created by Kurt Jaeger on 2023-01-29 17:51:43 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Kurt Jaeger

Created: 2023-01-29 17:51:43 UTC

Size: 3.82 KB

patch

obsolete

>diff --git a/net-mgmt/monitoring-plugins/Makefile b/net-mgmt/monitoring-plugins/Makefile
>index 72b105b9bbfb..fec754a7c968 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:"));

Actions: View | Diff

Attachments on bug 269229: 239786