update to monitoring-plugins-3.0.0rc3, from Alvar Penning, + tweak to pkgnames

This commit is contained in:
sthen
2026-04-14 14:44:22 +00:00
parent 497510d3ad
commit 7df81eb608
5 changed files with 23 additions and 8 deletions
+2 -3
View File
@@ -8,12 +8,11 @@ COMMENT-pgsql= postgresql monitoring plugin
COMMENT-snmp= monitoring plugins using snmp
COMMENT-radius= RADIUS monitoring plugin
V= 3.0.0rc2pl2
V= 3.0.0rc3pl0
#SITES= https://www.monitoring-plugins.org/download/
GH_ACCOUNT= monitoring-plugins
GH_PROJECT= monitoring-plugins
#GH_TAGNAME= v${V:S/rc/-rc/}
GH_COMMIT= a793000948039afa1af9792dd776e2f9cda5b538
GH_TAGNAME= v${V:S/rc/-rc/:S/pl0//}
DISTNAME= monitoring-plugins-${V:S/rc/-rc/}
PKGNAME-main= monitoring-plugins-$V
+2 -2
View File
@@ -1,2 +1,2 @@
SHA256 (monitoring-plugins-3.0.0-rc2pl2-a7930009.tar.gz) = pgo4q9QyMlaQ7YjEyRGADNdymQls09w7oC3kL49TaOs=
SIZE (monitoring-plugins-3.0.0-rc2pl2-a7930009.tar.gz) = 2589035
SHA256 (monitoring-plugins-3.0.0-rc3pl0.tar.gz) = r8CkTQN0KQ1cTfwFNVRczZEEa7cWQFeyiF3eBzU8ZNQ=
SIZE (monitoring-plugins-3.0.0-rc3pl0.tar.gz) = 2563356
@@ -11,7 +11,7 @@ Index: plugins/Makefile.am
check_snmp_SOURCES = check_snmp.c check_snmp.d/check_snmp_helpers.c
check_snmp_LDADD = $(BASEOBJS)
check_snmp_LDFLAGS = $(AM_LDFLAGS) -lm `net-snmp-config --libs`
-check_snmp_CFLAGS = $(AM_CFLAGS) `net-snmp-config --cflags`
-check_snmp_CFLAGS = $(AM_CFLAGS) `net-snmp-config --cflags | sed 's/-Werror=declaration-after-statement//'`
+check_snmp_CFLAGS = $(AM_CFLAGS) `pkg-config --cflags netsnmp`
check_smtp_LDADD = $(SSLOBJS)
check_ssh_LDADD = $(NETLIBS)
@@ -0,0 +1,16 @@
https://github.com/monitoring-plugins/monitoring-plugins/pull/2211
Index: plugins/check_disk.c
--- plugins/check_disk.c.orig
+++ plugins/check_disk.c
@@ -263,8 +263,8 @@ int main(int argc, char **argv) {
*filesystem = get_path_stats(*filesystem, fsp, config.freespace_ignore_reserved);
if (verbose >= 3) {
- printf("For %s, used_units=%lu free_units=%lu total_units=%lu "
- "fsp.fsu_blocksize=%lu\n",
+ printf("For %s, used_units=%llu free_units=%llu total_units=%llu "
+ "fsp.fsu_blocksize=%llu\n",
mount_entry->me_mountdir, filesystem->used_bytes, filesystem->free_bytes,
filesystem->total_bytes, fsp.fsu_blocksize);
}
@@ -15,7 +15,7 @@ Index: plugins/check_snmp.c
switch (entries[i].type) {
case ASN_GAUGE:
printf("Type GAUGE\n");
@@ -197,7 +197,7 @@ recover_state_data_type recover_state_data(char *state
@@ -198,7 +198,7 @@ recover_state_data_type recover_state_data(char *state
(size_t)outlen / sizeof(check_snmp_state_entry), outlen);
for (size_t i = 0; i < (size_t)outlen / sizeof(check_snmp_state_entry); i++) {
@@ -24,7 +24,7 @@ Index: plugins/check_snmp.c
ctime(&result.state[i].timestamp));
switch (result.state[i].type) {
case ASN_GAUGE:
@@ -286,7 +286,7 @@ int main(int argc, char **argv) {
@@ -288,7 +288,7 @@ int main(int argc, char **argv) {
time(&current_time);
if (verbose > 2) {