[pkg-nagios-changes] [Git][nagios-team/pkg-monitoring-plugins][master] Adding upstream patches fixing (u)int64_t on 32-bit machines (Closes: #1023280)

[Jan Wagner (@waja)]

Jan Wagner pushed to branch master at Debian Nagios Maintainer Group / pkg-monitoring-plugins


Commits:
5a11a704 by Jan Wagner at 2022-11-03T12:31:22+00:00
Adding upstream patches fixing (u)int64_t on 32-bit machines (Closes: #1023280)

- - - - -


3 changed files:

- + debian/patches/14_PRId64_PRIu64_1
- + debian/patches/15_PRId64_PRIu64_2
- debian/patches/series


Changes:

=====================================
debian/patches/14_PRId64_PRIu64_1
=====================================
@@ -0,0 +1,81 @@
+From 817ac2e5dad1ce5d0e0ea96fa7f726566251b08d Mon Sep 17 00:00:00 2001
+From: Andreas Baumann <202930+andreasbaumann at users.noreply.github.com>
+Date: Fri, 21 Oct 2022 18:31:12 +0200
+Subject: [PATCH] using PRId64 and PRIu64 instead of %ld directly (#1800)
+
+---
+ plugins/utils.c | 24 ++++++++++++------------
+ 1 file changed, 12 insertions(+), 12 deletions(-)
+
+diff --git a/plugins/utils.c b/plugins/utils.c
+index 17dd58146..f75cf03b7 100644
+--- a/plugins/utils.c
++++ b/plugins/utils.c
+@@ -615,27 +615,27 @@ char *perfdata_uint64 (const char *label,
+ 	char *data = NULL;
+ 
+ 	if (strpbrk (label, "'= "))
+-		xasprintf (&data, "'%s'=%ld%s;", label, val, uom);
++		xasprintf (&data, "'%s'=%" PRId64 "%s;", label, val, uom);
+ 	else
+-		xasprintf (&data, "%s=%ld%s;", label, val, uom);
++		xasprintf (&data, "%s=%" PRId64 "%s;", label, val, uom);
+ 
+ 	if (warnp)
+-		xasprintf (&data, "%s%lu;", data, warn);
++		xasprintf (&data, "%s%" PRIu64 ";", data, warn);
+ 	else
+ 		xasprintf (&data, "%s;", data);
+ 
+ 	if (critp)
+-		xasprintf (&data, "%s%lu;", data, crit);
++		xasprintf (&data, "%s%" PRIu64 ";", data, crit);
+ 	else
+ 		xasprintf (&data, "%s;", data);
+ 
+ 	if (minp)
+-		xasprintf (&data, "%s%lu;", data, minv);
++		xasprintf (&data, "%s%" PRIu64 ";", data, minv);
+ 	else
+ 		xasprintf (&data, "%s;", data);
+ 
+ 	if (maxp)
+-		xasprintf (&data, "%s%lu", data, maxv);
++		xasprintf (&data, "%s%" PRIu64, data, maxv);
+ 
+ 	return data;
+ }
+@@ -656,27 +656,27 @@ char *perfdata_int64 (const char *label,
+ 	char *data = NULL;
+ 
+ 	if (strpbrk (label, "'= "))
+-		xasprintf (&data, "'%s'=%ld%s;", label, val, uom);
++		xasprintf (&data, "'%s'=%" PRId64 "%s;", label, val, uom);
+ 	else
+-		xasprintf (&data, "%s=%ld%s;", label, val, uom);
++		xasprintf (&data, "%s=%" PRId64 "%s;", label, val, uom);
+ 
+ 	if (warnp)
+-		xasprintf (&data, "%s%ld;", data, warn);
++		xasprintf (&data, "%s%" PRId64 ";", data, warn);
+ 	else
+ 		xasprintf (&data, "%s;", data);
+ 
+ 	if (critp)
+-		xasprintf (&data, "%s%ld;", data, crit);
++		xasprintf (&data, "%s%" PRId64 ";", data, crit);
+ 	else
+ 		xasprintf (&data, "%s;", data);
+ 
+ 	if (minp)
+-		xasprintf (&data, "%s%ld;", data, minv);
++		xasprintf (&data, "%s%" PRId64 ";", data, minv);
+ 	else
+ 		xasprintf (&data, "%s;", data);
+ 
+ 	if (maxp)
+-		xasprintf (&data, "%s%ld", data, maxv);
++		xasprintf (&data, "%s%" PRId64, data, maxv);
+ 
+ 	return data;
+ }


=====================================
debian/patches/15_PRId64_PRIu64_2
=====================================
@@ -0,0 +1,25 @@
+From eb2dfdd5c24b87198b66397b224d6406c468a0bc Mon Sep 17 00:00:00 2001
+From: Andreas Baumann <202930+andreasbaumann at users.noreply.github.com>
+Date: Thu, 27 Oct 2022 22:48:18 +0200
+Subject: [PATCH] fixed two PRId64 to PRIu64 in perfdata_uint64 (#1802)
+
+---
+ plugins/utils.c | 4 ++--
+ 1 file changed, 2 insertions(+), 2 deletions(-)
+
+diff --git a/plugins/utils.c b/plugins/utils.c
+index f75cf03b..b4214c61 100644
+--- a/plugins/utils.c
++++ b/plugins/utils.c
+@@ -615,9 +615,9 @@ char *perfdata_uint64 (const char *label,
+ 	char *data = NULL;
+ 
+ 	if (strpbrk (label, "'= "))
+-		xasprintf (&data, "'%s'=%" PRId64 "%s;", label, val, uom);
++		xasprintf (&data, "'%s'=%" PRIu64 "%s;", label, val, uom);
+ 	else
+-		xasprintf (&data, "%s=%" PRId64 "%s;", label, val, uom);
++		xasprintf (&data, "%s=%" PRIu64 "%s;", label, val, uom);
+ 
+ 	if (warnp)
+ 		xasprintf (&data, "%s%" PRIu64 ";", data, warn);


=====================================
debian/patches/series
=====================================
@@ -2,3 +2,5 @@
 03_epn
 # commited upstream
 13_check_http_fix_superflous_crlf
+14_PRId64_PRIu64_1
+15_PRId64_PRIu64_2



View it on GitLab: https://salsa.debian.org/nagios-team/pkg-monitoring-plugins/-/commit/5a11a70409ee744454ff311d7ed5ea326c0c2ee7

-- 
View it on GitLab: https://salsa.debian.org/nagios-team/pkg-monitoring-plugins/-/commit/5a11a70409ee744454ff311d7ed5ea326c0c2ee7
You're receiving this email because of your account on salsa.debian.org.


-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://alioth-lists.debian.net/pipermail/pkg-nagios-changes/attachments/20221103/5a799e12/attachment-0001.htm>