From: Volker Schlecht <openbsd-ports@schlecht.dev>
Subject: Re: [Update] net/rabbitmq 3.12.13
To: ports@openbsd.org
Date: Sun, 24 Mar 2024 20:43:45 +0100

... and of course, it does build and work with the version of lang/elixir
currently in ports.

On 2024-03-24 20:21, Volker Schlecht wrote:
>Updates net/rabbitmq to the latest stable release (which will build and work
>with lang/elixir 1.16.x)

>Index: Makefile
>===================================================================
>RCS file: /cvs/ports/net/rabbitmq/Makefile,v
>retrieving revision 1.56
>diff -u -p -r1.56 Makefile
>--- Makefile	30 Dec 2023 20:30:12 -0000	1.56
>+++ Makefile	24 Mar 2024 19:15:39 -0000
>@@ -1,6 +1,6 @@
> COMMENT =	highly reliable Enterprise Messaging System
>
>-V =		3.12.10
>+V =		3.12.13
> DISTNAME =	rabbitmq-server-${V}
> PKGNAME =	rabbitmq-${V}
> CATEGORIES =	net
>@@ -53,7 +53,7 @@ PLUGIN_VERSIONS= \
> ACCEPT_VSN	0.3.5 \
> ATEN_VSN	0.5.8 \
> BASE64URL_VSN	1.0.1 \
>-COWBOY_VSN	2.10.0 \
>+COWBOY_VSN	2.11.0 \
> COWLIB_VSN	2.12.1 \
> CREDENTIALS_OBFUSCATION_VSN	3.4.0 \
> CUTTLEFISH_VSN	3.1.0 \
>@@ -64,8 +64,8 @@ GETOPT_VSN	1.0.2 \
> GUN_VSN		1.3.3 \
> JOSE_VSN	1.11.3 \
> OBSERVER_CLI_VSN	1.7.3 \
>-OSIRIS_VSN	1.6.9 \
>-PROMETHEUS_VSN	4.10.0 \
>+OSIRIS_VSN	1.7.2 \
>+PROMETHEUS_VSN	4.11.0 \
> QUANTILE_ESTIMATOR_VSN	0.2.1 \
> RA_VSN		2.6.3 \
> RANCH_VSN	2.1.0 \
>@@ -85,7 +85,8 @@ SUBST_VARS +=	RABBIT_${_n:S/_VSN//}
> .endfor
>
> pre-configure:
>-	${SUBST_CMD} ${WRKSRC}/deps/rabbit/scripts/rabbitmq-{server,env}
>+	${SUBST_CMD} ${WRKSRC}/deps/rabbit/scripts/rabbitmq-{server,env} \
>+		${WRKSRC}/deps/rabbit/scripts/rabbitmq-env
>
> pre-build:
> 	ln -fs ${LOCALBASE}/bin/${GMAKE} ${WRKDIR}/bin/make
>Index: distinfo
>===================================================================
>RCS file: /cvs/ports/net/rabbitmq/distinfo,v
>retrieving revision 1.18
>diff -u -p -r1.18 distinfo
>--- distinfo	30 Dec 2023 20:30:12 -0000	1.18
>+++ distinfo	24 Mar 2024 19:15:39 -0000
>@@ -1,2 +1,2 @@
>-SHA256 (rabbitmq-server-3.12.10.tar.xz) = 5CcOrER/OYinBPgCE3PjksSCUKjuX9uynToFOpc07Tk=
>-SIZE (rabbitmq-server-3.12.10.tar.xz) = 4445108
>+SHA256 (rabbitmq-server-3.12.13.tar.xz) = UjUkiS8ay66DDzeW9EXOJPQVHHxC1sXT8mCn+KVXSQ4=
>+SIZE (rabbitmq-server-3.12.13.tar.xz) = 4506300
>Index: patches/patch-deps_rabbit_scripts_rabbitmq-env
>===================================================================
>RCS file: /cvs/ports/net/rabbitmq/patches/patch-deps_rabbit_scripts_rabbitmq-env,v
>retrieving revision 1.4
>diff -u -p -r1.4 patch-deps_rabbit_scripts_rabbitmq-env
>--- patches/patch-deps_rabbit_scripts_rabbitmq-env	16 Jan 2023 12:07:53 -0000	1.4
>+++ patches/patch-deps_rabbit_scripts_rabbitmq-env	24 Mar 2024 19:15:39 -0000
>@@ -1,12 +1,14 @@
>+Execute escripts with the right version of escript, don't rely on the shebang
>+
> Index: deps/rabbit/scripts/rabbitmq-env
> --- deps/rabbit/scripts/rabbitmq-env.orig
> +++ deps/rabbit/scripts/rabbitmq-env
>-@@ -188,7 +188,7 @@ run_escript()
>-     # Important: do not quote RABBITMQ_CTL_ERL_ARGS as they must be
>-     # word-split
>-     # shellcheck disable=SC2086
>--    exec erl +B \
>-+    exec ${MODERL_ERL} +B \
>-         -boot "$CLEAN_BOOT_FILE" \
>-         -noinput -noshell -hidden -smp enable \
>-         $RABBITMQ_CTL_ERL_ARGS \
>+@@ -193,7 +193,7 @@ run_escript()
>+         tmp_erl_flags="-noinput $tmp_erl_flags"
>+     fi
>+
>+-    ERL_FLAGS="$tmp_erl_flags" "$escript" "$@"
>++    ERL_FLAGS="$tmp_erl_flags" ${LOCALBASE}/bin/escript${MODERL_VERSION} "$escript" "$@"
>+
>+     unset tmp_erl_flags
>+ }
>Index: pkg/PLIST
>===================================================================
>RCS file: /cvs/ports/net/rabbitmq/pkg/PLIST,v
>retrieving revision 1.22
>diff -u -p -r1.22 PLIST
>--- pkg/PLIST	30 Dec 2023 20:30:23 -0000	1.22
>+++ pkg/PLIST	24 Mar 2024 19:15:39 -0000
>@@ -120,6 +120,7 @@ lib/rabbitmq/plugins/${RABBIT_COWBOY}/eb
> lib/rabbitmq/plugins/${RABBIT_COWBOY}/ebin/cowboy_clock.beam
> lib/rabbitmq/plugins/${RABBIT_COWBOY}/ebin/cowboy_compress_h.beam
> lib/rabbitmq/plugins/${RABBIT_COWBOY}/ebin/cowboy_constraints.beam
>+lib/rabbitmq/plugins/${RABBIT_COWBOY}/ebin/cowboy_decompress_h.beam
> lib/rabbitmq/plugins/${RABBIT_COWBOY}/ebin/cowboy_handler.beam
> lib/rabbitmq/plugins/${RABBIT_COWBOY}/ebin/cowboy_http.beam
> lib/rabbitmq/plugins/${RABBIT_COWBOY}/ebin/cowboy_http2.beam
>@@ -988,6 +989,7 @@ lib/rabbitmq/plugins/rabbitmq_management
> lib/rabbitmq/plugins/rabbitmq_management-${V}/ebin/rabbit_mgmt_hsts.beam
> lib/rabbitmq/plugins/rabbitmq_management-${V}/ebin/rabbit_mgmt_load_definitions.beam
> lib/rabbitmq/plugins/rabbitmq_management-${V}/ebin/rabbit_mgmt_login.beam
>+lib/rabbitmq/plugins/rabbitmq_management-${V}/ebin/rabbit_mgmt_nodes.beam
> lib/rabbitmq/plugins/rabbitmq_management-${V}/ebin/rabbit_mgmt_oauth_bootstrap.beam
> lib/rabbitmq/plugins/rabbitmq_management-${V}/ebin/rabbit_mgmt_reset_handler.beam
> lib/rabbitmq/plugins/rabbitmq_management-${V}/ebin/rabbit_mgmt_stats.beam