update to rabbitmq-3.10.13, from Volker Schlecht

This commit is contained in:
sthen 2023-01-16 12:07:53 +00:00
parent cc264f1cdc
commit 53b57cb99a
8 changed files with 581 additions and 544 deletions

View File

@ -1,10 +1,9 @@
COMMENT = highly reliable Enterprise Messaging System
V = 3.10.7
V = 3.10.13
DISTNAME = rabbitmq-server-$V
PKGNAME = rabbitmq-$V
CATEGORIES = net
REVISION = 1
HOMEPAGE = https://www.rabbitmq.com/
@ -50,6 +49,40 @@ NO_TEST = Yes
ALL_TARGET = all manpages
INSTALL_TARGET = install install-bin
PLUGIN_VERSIONS= \
ACCEPT_VSN 0.3.5 \
ATEN_VSN 0.5.8 \
BASE64URL_VSN 1.0.1 \
COWBOY_VSN 2.8.0 \
COWLIB_VSN 2.9.1 \
CREDENTIALS_OBFUSCATION_VSN 3.2.0 \
CUTTLEFISH_VSN 3.1.0 \
EETCD_VSN 0.3.6 \
ENOUGH_VSN 0.1.0 \
GEN_BATCH_SERVER_VSN 0.8.8 \
GETOPT_VSN 1.0.2 \
GUN_VSN 1.3.3 \
JOSE_VSN 1.11.1 \
JSX_VSN 3.1.0 \
OBSERVER_CLI_VSN 1.7.3 \
OSIRIS_VSN 1.3.3 \
PROMETHEUS_VSN 4.9.1 \
QUANTILE_ESTIMATOR_VSN 0.2.1 \
RA_VSN 2.4.5 \
RANCH_VSN 2.1.0 \
RECON_VSN 2.5.2 \
SESHAT_VSN 0.4.0 \
STDOUT_FORMATTER_VSN 0.2.4 \
SYSLOG_VSN 4.0.0 \
SYSMON_HANDLER_VSN 1.3.0 \
SYSTEMD_VSN 0.6.1
.for _n _v in ${PLUGIN_VERSIONS}
${_n} = ${_v}
RABBIT_${_n:S/_VSN//} = ${_n:S/_VSN//:L}-${_v}
SUBST_VARS += RABBIT_${_n:S/_VSN//}
.endfor
pre-configure:
${SUBST_CMD} ${WRKSRC}/deps/rabbit/scripts/rabbitmq-{server,env}

View File

@ -1,2 +1,2 @@
SHA256 (rabbitmq-server-3.10.7.tar.xz) = tV4wWEGH8ZZQUFPbH+kGAerHyQY0Ff/4DbBsJH1pLrU=
SIZE (rabbitmq-server-3.10.7.tar.xz) = 3579880
SHA256 (rabbitmq-server-3.10.13.tar.xz) = 2YEOXVVSyRD8R92kg2t7QqcLd1HMRmm0IE1Xd4PD87A=
SIZE (rabbitmq-server-3.10.13.tar.xz) = 3648572

View File

@ -0,0 +1,15 @@
Index: deps/rabbit/scripts/rabbitmq-defaults
--- deps/rabbit/scripts/rabbitmq-defaults.orig
+++ deps/rabbit/scripts/rabbitmq-defaults
@@ -9,6 +9,11 @@
### next line potentially updated in package install steps
SYS_PREFIX=
+export RABBITMQ_MNESIA_BASE=/var/rabbitmq/mnesia
+export RABBITMQ_CONF_ENV_FILE=/etc/rabbitmq/rabbitmq-env.conf
+# ensure VM and Elixir scripts are running under the same locale
+export LANG=en_US.UTF-8
+
CLEAN_BOOT_FILE=start_clean
SASL_BOOT_FILE=start_sasl
BOOT_MODULE="rabbit"

View File

@ -1,7 +1,7 @@
Index: deps/rabbit/scripts/rabbitmq-env
--- deps/rabbit/scripts/rabbitmq-env.orig
+++ deps/rabbit/scripts/rabbitmq-env
@@ -177,7 +177,7 @@ run_escript()
@@ -188,7 +188,7 @@ run_escript()
# Important: do not quote RABBITMQ_CTL_ERL_ARGS as they must be
# word-split
# shellcheck disable=SC2086

View File

@ -1,7 +1,7 @@
Index: deps/rabbit/scripts/rabbitmq-server
--- deps/rabbit/scripts/rabbitmq-server.orig
+++ deps/rabbit/scripts/rabbitmq-server
@@ -70,7 +70,7 @@ start_rabbitmq_server() {
@@ -65,7 +65,7 @@ start_rabbitmq_server() {
check_start_params

View File

@ -1,14 +0,0 @@
Whitelist Elixir 1.14. Already committed upstream with
https://github.com/rabbitmq/rabbitmq-server/commit/c4bc7b60154dee39282231e22e1fe40fb73ca7d7
Index: deps/rabbitmq_cli/mix.exs
--- deps/rabbitmq_cli/mix.exs.orig
+++ deps/rabbitmq_cli/mix.exs
@@ -11,7 +11,7 @@ defmodule RabbitMQCtl.MixfileBase do
[
app: :rabbitmqctl,
version: "3.8.0-dev",
- elixir: ">= 1.10.4 and < 1.14.0",
+ elixir: ">= 1.10.4 and < 1.15.0",
build_embedded: Mix.env == :prod,
start_permanent: Mix.env == :prod,
escript: [main_module: RabbitMQCtl,

File diff suppressed because it is too large Load Diff

View File

@ -5,6 +5,7 @@ daemon_user="_rabbitmq"
. /etc/rc.d/rc.subr
pexp="${TRUEPREFIX}/lib/erlang${MODERL_VERSION}/erts.*bin/beam.*-s rabbit boot.*"
rc_reload=NO
rc_usercheck=NO
@ -12,10 +13,6 @@ rc_pre() {
install -d -o ${daemon_user} /var/run/rabbitmq
}
rc_check() {
${TRUEPREFIX}/bin/rabbitmqctl status
}
rc_stop() {
${TRUEPREFIX}/bin/rabbitmqctl stop
}