I'll have to fiddle it a bit to avoid having to bump EPOCH, I didn't
realise earlier but 3.0.0rc2pl2 sorts higher than 3.0.0rc3 (I'll go for
3.0.0rc3pl0 for now).

pkg_check-version monitoring-plugins-3.0.0rc2pl2 monitoring-plugins-3.0.0rc3 monitoring-plugins-3.0.0rc3pl0 

Will update a few monitoring boxes and see how things go overnight.

On 2026/04/13 22:44, Alvar Penning wrote:
> Hi Stuart,
> Hi ports@,
> 
> A diff to update the monitoring plugins to their latest release
> candidate, rc3, before version 3.0.0 follows. In their IRC channel, they
> have announced this would be the last RC, unless something breaks.
> 
> Best,
> Alvar
> 
> 
> diff --git Makefile Makefile
> index 7c6e5ab96e3..c9a933e811d 100644
> --- Makefile
> +++ Makefile
> @@ -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.0rc3
>  #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/}
>  
>  DISTNAME=	monitoring-plugins-${V:S/rc/-rc/}
>  PKGNAME-main=	monitoring-plugins-$V
> diff --git distinfo distinfo
> index fac1dab44f3..66ce19f0c62 100644
> --- distinfo
> +++ distinfo
> @@ -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-rc3.tar.gz) = r8CkTQN0KQ1cTfwFNVRczZEEa7cWQFeyiF3eBzU8ZNQ=
> +SIZE (monitoring-plugins-3.0.0-rc3.tar.gz) = 2563356
> diff --git patches/patch-plugins_Makefile_am patches/patch-plugins_Makefile_am
> index 4d57b98dfe5..8bc39aa7e90 100644
> --- patches/patch-plugins_Makefile_am
> +++ patches/patch-plugins_Makefile_am
> @@ -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)
> diff --git patches/patch-plugins_check_disk_c patches/patch-plugins_check_disk_c
> new file mode 100644
> index 00000000000..511d3b6af63
> --- /dev/null
> +++ patches/patch-plugins_check_disk_c
> @@ -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);
> + 			}
> diff --git patches/patch-plugins_check_snmp_c patches/patch-plugins_check_snmp_c
> index a97a9290761..657e6badae3 100644
> --- patches/patch-plugins_check_snmp_c
> +++ patches/patch-plugins_check_snmp_c
> @@ -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) {
>