Index: Makefile
===================================================================
RCS file: /cvs/ports/net/rabbitmq/Makefile,v
retrieving revision 1.45
diff -u -p -r1.45 Makefile
--- Makefile 2 Aug 2022 05:06:08 -0000 1.45
+++ Makefile 3 Sep 2022 13:07:00 -0000
@@ -1,10 +1,9 @@
COMMENT = highly reliable Enterprise Messaging System
-V = 3.10.6
+V = 3.10.7
DISTNAME = rabbitmq-server-$V
PKGNAME = rabbitmq-$V
CATEGORIES = net
-REVISION = 0
HOMEPAGE = https://www.rabbitmq.com/
@@ -66,8 +65,10 @@ post-install:
${INSTALL_DATA} *conf*example ${PREFIX}/share/examples/rabbitmq
mv ${PREFIX}/lib/rabbitmq/{INSTALL,LICENSE*} \
${PREFIX}/share/doc/rabbitmq
- ${SUBST_CMD} -m 0644 -c ${FILESDIR}/rabbitmq.conf \
+ ${SUBST_CMD} -m 0644 -c ${FILESDIR}/rabbitmq-env.conf \
${PREFIX}/share/examples/rabbitmq/rabbitmq-env.conf
+ ${SUBST_CMD} -m 0644 -c ${FILESDIR}/rabbitmq.conf \
+ ${PREFIX}/share/examples/rabbitmq/rabbitmq.conf
sed -i 's,/usr/lib/rabbitmq/bin/rabbitmqctl,${PREFIX}/bin/rabbitmqctl,g' \
${PREFIX}/autocomplete/bash_autocomplete.sh
mv ${PREFIX}/autocomplete/bash_autocomplete.sh \
Index: distinfo
===================================================================
RCS file: /cvs/ports/net/rabbitmq/distinfo,v
retrieving revision 1.11
diff -u -p -r1.11 distinfo
--- distinfo 31 Jul 2022 12:20:42 -0000 1.11
+++ distinfo 3 Sep 2022 13:07:00 -0000
@@ -1,2 +1,2 @@
-SHA256 (rabbitmq-server-3.10.6.tar.xz) = oELL1E+VbZiWUL+l0mLg6ugvJ/RJ84O/aduDzDJyQeo=
-SIZE (rabbitmq-server-3.10.6.tar.xz) = 3577320
+SHA256 (rabbitmq-server-3.10.7.tar.xz) = tV4wWEGH8ZZQUFPbH+kGAerHyQY0Ff/4DbBsJH1pLrU=
+SIZE (rabbitmq-server-3.10.7.tar.xz) = 3579880
Index: files/rabbitmq-env.conf
===================================================================
RCS file: files/rabbitmq-env.conf
diff -N files/rabbitmq-env.conf
--- /dev/null 1 Jan 1970 00:00:00 -0000
+++ files/rabbitmq-env.conf 3 Sep 2022 13:07:00 -0000
@@ -0,0 +1,11 @@
+# I am a complete ${SYSCONFDIR}/rabbitmq/rabbitmq-env.conf file.
+# Comment lines start with a hash character.
+# This is a /bin/sh script file - use ordinary envt var syntax
+# NODENAME=hare
+
+# needed by rabbitmqctl to pick up auth token
+HOME=~_rabbitmq
+
+# Comment out both lines to have epmd listen on all interfaces
+export ERL_EPMD_ADDRESS=127.0.0.1
+export RABBITMQ_NODENAME=rabbit@localhost
Index: files/rabbitmq.conf
===================================================================
RCS file: /cvs/ports/net/rabbitmq/files/rabbitmq.conf,v
retrieving revision 1.4
diff -u -p -r1.4 rabbitmq.conf
--- files/rabbitmq.conf 19 Feb 2021 13:38:33 -0000 1.4
+++ files/rabbitmq.conf 3 Sep 2022 13:07:00 -0000
@@ -1,7 +1,2 @@
-# I am a complete ${SYSCONFDIR}/rabbitmq/rabbitmq.conf file.
-# Comment lines start with a hash character.
-# This is a /bin/sh script file - use ordinary envt var syntax
-# NODENAME=hare
-
-# needed by rabbitmqctl to pick up auth token
-HOME=~_rabbitmq
+# See ${LOCALBASE}/share/examples/rabbitmq/rabbitmq.conf.example for
+# available configuration options
Index: patches/patch-deps_rabbit_scripts_rabbitmq-defaults
===================================================================
RCS file: patches/patch-deps_rabbit_scripts_rabbitmq-defaults
diff -N patches/patch-deps_rabbit_scripts_rabbitmq-defaults
--- /dev/null 1 Jan 1970 00:00:00 -0000
+++ patches/patch-deps_rabbit_scripts_rabbitmq-defaults 3 Sep 2022 13:07:00 -0000
@@ -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"
Index: patches/patch-deps_rabbitmq_cli_mix_exs
===================================================================
RCS file: patches/patch-deps_rabbitmq_cli_mix_exs
diff -N patches/patch-deps_rabbitmq_cli_mix_exs
--- /dev/null 1 Jan 1970 00:00:00 -0000
+++ patches/patch-deps_rabbitmq_cli_mix_exs 3 Sep 2022 13:07:00 -0000
@@ -0,0 +1,14 @@
+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,
Index: pkg/PLIST
===================================================================
RCS file: /cvs/ports/net/rabbitmq/pkg/PLIST,v
retrieving revision 1.15
diff -u -p -r1.15 PLIST
--- pkg/PLIST 31 Jul 2022 12:20:42 -0000 1.15
+++ pkg/PLIST 3 Sep 2022 13:07:00 -0000
@@ -422,23 +422,23 @@ lib/rabbitmq/plugins/observer_cli-1.7.3/
lib/rabbitmq/plugins/observer_cli-1.7.3/ebin/observer_cli_system.beam
lib/rabbitmq/plugins/observer_cli-1.7.3/include/
lib/rabbitmq/plugins/observer_cli-1.7.3/include/observer_cli.hrl
-lib/rabbitmq/plugins/osiris-1.0.0/
-lib/rabbitmq/plugins/osiris-1.0.0/ebin/
-lib/rabbitmq/plugins/osiris-1.0.0/ebin/osiris.app
-lib/rabbitmq/plugins/osiris-1.0.0/ebin/osiris.beam
-lib/rabbitmq/plugins/osiris-1.0.0/ebin/osiris_app.beam
-lib/rabbitmq/plugins/osiris-1.0.0/ebin/osiris_bench.beam
-lib/rabbitmq/plugins/osiris-1.0.0/ebin/osiris_counters.beam
-lib/rabbitmq/plugins/osiris-1.0.0/ebin/osiris_log.beam
-lib/rabbitmq/plugins/osiris-1.0.0/ebin/osiris_replica.beam
-lib/rabbitmq/plugins/osiris-1.0.0/ebin/osiris_replica_reader.beam
-lib/rabbitmq/plugins/osiris-1.0.0/ebin/osiris_replica_reader_sup.beam
-lib/rabbitmq/plugins/osiris-1.0.0/ebin/osiris_retention.beam
-lib/rabbitmq/plugins/osiris-1.0.0/ebin/osiris_server_sup.beam
-lib/rabbitmq/plugins/osiris-1.0.0/ebin/osiris_sup.beam
-lib/rabbitmq/plugins/osiris-1.0.0/ebin/osiris_tracking.beam
-lib/rabbitmq/plugins/osiris-1.0.0/ebin/osiris_util.beam
-lib/rabbitmq/plugins/osiris-1.0.0/ebin/osiris_writer.beam
+lib/rabbitmq/plugins/osiris-1.3.0/
+lib/rabbitmq/plugins/osiris-1.3.0/ebin/
+lib/rabbitmq/plugins/osiris-1.3.0/ebin/osiris.app
+lib/rabbitmq/plugins/osiris-1.3.0/ebin/osiris.beam
+lib/rabbitmq/plugins/osiris-1.3.0/ebin/osiris_app.beam
+lib/rabbitmq/plugins/osiris-1.3.0/ebin/osiris_bench.beam
+lib/rabbitmq/plugins/osiris-1.3.0/ebin/osiris_counters.beam
+lib/rabbitmq/plugins/osiris-1.3.0/ebin/osiris_log.beam
+lib/rabbitmq/plugins/osiris-1.3.0/ebin/osiris_replica.beam
+lib/rabbitmq/plugins/osiris-1.3.0/ebin/osiris_replica_reader.beam
+lib/rabbitmq/plugins/osiris-1.3.0/ebin/osiris_replica_reader_sup.beam
+lib/rabbitmq/plugins/osiris-1.3.0/ebin/osiris_retention.beam
+lib/rabbitmq/plugins/osiris-1.3.0/ebin/osiris_server_sup.beam
+lib/rabbitmq/plugins/osiris-1.3.0/ebin/osiris_sup.beam
+lib/rabbitmq/plugins/osiris-1.3.0/ebin/osiris_tracking.beam
+lib/rabbitmq/plugins/osiris-1.3.0/ebin/osiris_util.beam
+lib/rabbitmq/plugins/osiris-1.3.0/ebin/osiris_writer.beam
lib/rabbitmq/plugins/prometheus-4.8.2/
lib/rabbitmq/plugins/prometheus-4.8.2/ebin/
lib/rabbitmq/plugins/prometheus-4.8.2/ebin/prometheus.app
@@ -1291,6 +1291,7 @@ lib/rabbitmq/plugins/rabbitmq_prelaunch-
lib/rabbitmq/plugins/rabbitmq_prelaunch-${V}/ebin/rabbitmq_prelaunch.app
lib/rabbitmq/plugins/rabbitmq_prometheus-${V}/
lib/rabbitmq/plugins/rabbitmq_prometheus-${V}/ebin/
+lib/rabbitmq/plugins/rabbitmq_prometheus-${V}/ebin/prometheus_process_collector.beam
lib/rabbitmq/plugins/rabbitmq_prometheus-${V}/ebin/prometheus_rabbitmq_alarm_metrics_collector.beam
lib/rabbitmq/plugins/rabbitmq_prometheus-${V}/ebin/prometheus_rabbitmq_core_metrics_collector.beam
lib/rabbitmq/plugins/rabbitmq_prometheus-${V}/ebin/prometheus_rabbitmq_global_metrics_collector.beam
@@ -1681,6 +1682,8 @@ share/examples/rabbitmq/
share/examples/rabbitmq/advanced.config.example
share/examples/rabbitmq/rabbitmq-env.conf
@sample ${SYSCONFDIR}/rabbitmq/rabbitmq-env.conf
+share/examples/rabbitmq/rabbitmq.conf
+@sample ${SYSCONFDIR}/rabbitmq/rabbitmq.conf
share/examples/rabbitmq/rabbitmq.conf.example
share/zsh/
share/zsh/site-functions/
* Update net/rabbitmq to version 3.10.7
* Pull in a patch to whitelist elixir 1.14.x
* Correctly name bundled rabbitmq-env.conf
* Have the automatically started epmd listen only on localhost by default
While rabbitmq itself is run as '_rabbit', epmd is run as root. Those
who set up erlang clusters will need to tweak their configurations
anyway, so I propose to go with a slightly safer default here.
* Add a rabbitmq.conf file with a comment referencing the example file
from documentation
I have a patch to update lang/elixir to 1.14 ready, but rabbitmq needs
to go in first so as to not break the build.
No comments:
Post a Comment