I would like to update net/rabbitmq to the 3.12.x release branch.
RabbitMQ 3.11.x will run out of community support on December 31st 2023, so
having an updated version in -ports for 7.5 would be a good idea anyway, plus
the 3.12.x release branch is the first one to support erlang26.
While at it, I propose to add a few other default configuration options to
make sure it's listening only on localhost per default.
Built and tested on amd64, works fine and even gets rid of some warnings that
I never got around to fixing in 3.11.x.
ok?
Index: Makefile
===================================================================
RCS file: /cvs/ports/net/rabbitmq/Makefile,v
retrieving revision 1.55
diff -u -p -r1.55 Makefile
--- Makefile 19 Sep 2023 22:05:56 -0000 1.55
+++ Makefile 6 Nov 2023 17:28:50 -0000
@@ -1,6 +1,6 @@
COMMENT = highly reliable Enterprise Messaging System
-V = 3.11.22
+V = 3.12.8
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.8.0 \
+COWBOY_VSN 2.10.0 \
COWLIB_VSN 2.12.1 \
CREDENTIALS_OBFUSCATION_VSN 3.4.0 \
CUTTLEFISH_VSN 3.1.0 \
@@ -64,20 +64,20 @@ 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.2 \
+OSIRIS_VSN 1.6.9 \
PROMETHEUS_VSN 4.10.0 \
QUANTILE_ESTIMATOR_VSN 0.2.1 \
RA_VSN 2.6.3 \
RANCH_VSN 2.1.0 \
RECON_VSN 2.5.3 \
REDBUG_VSN 2.0.7 \
-SESHAT_VSN 0.4.0 \
+SESHAT_VSN 0.6.1 \
STDOUT_FORMATTER_VSN 0.2.4 \
SYSLOG_VSN 4.0.0 \
SYSMON_HANDLER_VSN 1.3.0 \
SYSTEMD_VSN 0.6.1 \
THOAS_VSN 1.0.0
-
+
.for _n _v in ${PLUGIN_VERSIONS}
${_n} = ${_v}
RABBIT_${_n:S/_VSN//} = ${_n:S/_VSN//:L}-${_v}
Index: distinfo
===================================================================
RCS file: /cvs/ports/net/rabbitmq/distinfo,v
retrieving revision 1.17
diff -u -p -r1.17 distinfo
--- distinfo 1 Sep 2023 16:55:48 -0000 1.17
+++ distinfo 6 Nov 2023 17:28:50 -0000
@@ -1,2 +1,2 @@
-SHA256 (rabbitmq-server-3.11.22.tar.xz) =
3rZNDaD6XbDn6za6ly1B1Ibq+FE1H23pzoe/dAk4xOM=
-SIZE (rabbitmq-server-3.11.22.tar.xz) = 4421780
+SHA256 (rabbitmq-server-3.12.8.tar.xz) =
ggqTlKGeMr5jq64KkLIIHDmaR/otfE1nSSRjQICiR+Q=
+SIZE (rabbitmq-server-3.12.8.tar.xz) = 4442920
Index: files/rabbitmq.conf
===================================================================
RCS file: /cvs/ports/net/rabbitmq/files/rabbitmq.conf,v
retrieving revision 1.5
diff -u -p -r1.5 rabbitmq.conf
--- files/rabbitmq.conf 3 Sep 2022 14:02:22 -0000 1.5
+++ files/rabbitmq.conf 6 Nov 2023 17:28:50 -0000
@@ -1,2 +1,8 @@
# See ${LOCALBASE}/share/examples/rabbitmq/rabbitmq.conf.example for
# available configuration options
+
+# Delete to have rabbitmq listen on a public interface
+listeners.tcp.local = 127.0.0.1:5672
+listeners.tcp.local_v6 = ::1:5672
+management.tcp.ip = 127.0.0.1
+distribution.listener.interface = 127.0.0.1
Index: pkg/PLIST
===================================================================
RCS file: /cvs/ports/net/rabbitmq/pkg/PLIST,v
retrieving revision 1.21
diff -u -p -r1.21 PLIST
--- pkg/PLIST 19 Jul 2023 17:36:17 -0000 1.21
+++ pkg/PLIST 6 Nov 2023 17:28:50 -0000
@@ -17,7 +17,6 @@ bin/rabbitmq-plugins
bin/rabbitmq-queues
bin/rabbitmq-server
bin/rabbitmq-streams
-bin/rabbitmq-tanzu
bin/rabbitmq-upgrade
bin/rabbitmqctl
bin/vmware-rabbitmq
@@ -27,7 +26,6 @@ lib/rabbitmq/escript/rabbitmq-diagnostic
lib/rabbitmq/escript/rabbitmq-plugins
lib/rabbitmq/escript/rabbitmq-queues
lib/rabbitmq/escript/rabbitmq-streams
-lib/rabbitmq/escript/rabbitmq-tanzu
lib/rabbitmq/escript/rabbitmq-upgrade
lib/rabbitmq/escript/rabbitmqctl
lib/rabbitmq/escript/vmware-rabbitmq
@@ -536,6 +534,7 @@ lib/rabbitmq/plugins/rabbit-${V}/ebin/ra
lib/rabbitmq/plugins/rabbit-${V}/ebin/rabbit_access_control.beam
lib/rabbitmq/plugins/rabbit-${V}/ebin/rabbit_alarm.beam
lib/rabbitmq/plugins/rabbit-${V}/ebin/rabbit_amqqueue.beam
+lib/rabbitmq/plugins/rabbit-${V}/ebin/rabbit_amqqueue_control.beam
lib/rabbitmq/plugins/rabbit-${V}/ebin/rabbit_amqqueue_process.beam
lib/rabbitmq/plugins/rabbit-${V}/ebin/rabbit_amqqueue_sup.beam
lib/rabbitmq/plugins/rabbit-${V}/ebin/rabbit_amqqueue_sup_sup.beam
@@ -573,6 +572,17 @@ lib/rabbitmq/plugins/rabbit-${V}/ebin/ra
lib/rabbitmq/plugins/rabbit-${V}/ebin/rabbit_credential_validator_min_password_length.beam
lib/rabbitmq/plugins/rabbit-${V}/ebin/rabbit_credential_validator_password_regexp.beam
lib/rabbitmq/plugins/rabbit-${V}/ebin/rabbit_cuttlefish.beam
+lib/rabbitmq/plugins/rabbit-${V}/ebin/rabbit_db.beam
+lib/rabbitmq/plugins/rabbit-${V}/ebin/rabbit_db_binding.beam
+lib/rabbitmq/plugins/rabbit-${V}/ebin/rabbit_db_exchange.beam
+lib/rabbitmq/plugins/rabbit-${V}/ebin/rabbit_db_maintenance.beam
+lib/rabbitmq/plugins/rabbit-${V}/ebin/rabbit_db_msup.beam
+lib/rabbitmq/plugins/rabbit-${V}/ebin/rabbit_db_policy.beam
+lib/rabbitmq/plugins/rabbit-${V}/ebin/rabbit_db_queue.beam
+lib/rabbitmq/plugins/rabbit-${V}/ebin/rabbit_db_rtparams.beam
+lib/rabbitmq/plugins/rabbit-${V}/ebin/rabbit_db_topic_exchange.beam
+lib/rabbitmq/plugins/rabbit-${V}/ebin/rabbit_db_user.beam
+lib/rabbitmq/plugins/rabbit-${V}/ebin/rabbit_db_vhost.beam
lib/rabbitmq/plugins/rabbit-${V}/ebin/rabbit_db_vhost_defaults.beam
lib/rabbitmq/plugins/rabbit-${V}/ebin/rabbit_dead_letter.beam
lib/rabbitmq/plugins/rabbit-${V}/ebin/rabbit_definitions.beam
@@ -588,6 +598,7 @@ lib/rabbitmq/plugins/rabbit-${V}/ebin/ra
lib/rabbitmq/plugins/rabbit-${V}/ebin/rabbit_exchange.beam
lib/rabbitmq/plugins/rabbit-${V}/ebin/rabbit_exchange_decorator.beam
lib/rabbitmq/plugins/rabbit-${V}/ebin/rabbit_exchange_parameters.beam
+lib/rabbitmq/plugins/rabbit-${V}/ebin/rabbit_exchange_type.beam
lib/rabbitmq/plugins/rabbit-${V}/ebin/rabbit_exchange_type_direct.beam
lib/rabbitmq/plugins/rabbit-${V}/ebin/rabbit_exchange_type_fanout.beam
lib/rabbitmq/plugins/rabbit-${V}/ebin/rabbit_exchange_type_headers.beam
@@ -616,16 +627,15 @@ lib/rabbitmq/plugins/rabbit-${V}/ebin/ra
lib/rabbitmq/plugins/rabbit-${V}/ebin/rabbit_limiter.beam
lib/rabbitmq/plugins/rabbit-${V}/ebin/rabbit_log_channel.beam
lib/rabbitmq/plugins/rabbit-${V}/ebin/rabbit_log_connection.beam
-lib/rabbitmq/plugins/rabbit-${V}/ebin/rabbit_log_feature_flags.beam
lib/rabbitmq/plugins/rabbit-${V}/ebin/rabbit_log_mirroring.beam
lib/rabbitmq/plugins/rabbit-${V}/ebin/rabbit_log_prelaunch.beam
lib/rabbitmq/plugins/rabbit-${V}/ebin/rabbit_log_queue.beam
lib/rabbitmq/plugins/rabbit-${V}/ebin/rabbit_log_tail.beam
-lib/rabbitmq/plugins/rabbit-${V}/ebin/rabbit_log_upgrade.beam
lib/rabbitmq/plugins/rabbit-${V}/ebin/rabbit_logger_exchange_h.beam
lib/rabbitmq/plugins/rabbit-${V}/ebin/rabbit_looking_glass.beam
lib/rabbitmq/plugins/rabbit-${V}/ebin/rabbit_maintenance.beam
lib/rabbitmq/plugins/rabbit-${V}/ebin/rabbit_memory_monitor.beam
+lib/rabbitmq/plugins/rabbit-${V}/ebin/rabbit_message_interceptor.beam
lib/rabbitmq/plugins/rabbit-${V}/ebin/rabbit_metrics.beam
lib/rabbitmq/plugins/rabbit-${V}/ebin/rabbit_mirror_queue_coordinator.beam
lib/rabbitmq/plugins/rabbit-${V}/ebin/rabbit_mirror_queue_master.beam
@@ -649,6 +659,7 @@ lib/rabbitmq/plugins/rabbit-${V}/ebin/ra
lib/rabbitmq/plugins/rabbit-${V}/ebin/rabbit_nodes.beam
lib/rabbitmq/plugins/rabbit-${V}/ebin/rabbit_observer_cli.beam
lib/rabbitmq/plugins/rabbit-${V}/ebin/rabbit_observer_cli_classic_queues.beam
+lib/rabbitmq/plugins/rabbit-${V}/ebin/rabbit_observer_cli_quorum_queues.beam
lib/rabbitmq/plugins/rabbit-${V}/ebin/rabbit_osiris_metrics.beam
lib/rabbitmq/plugins/rabbit-${V}/ebin/rabbit_parameter_validation.beam
lib/rabbitmq/plugins/rabbit-${V}/ebin/rabbit_peer_discovery.beam
@@ -664,6 +675,7 @@ lib/rabbitmq/plugins/rabbit-${V}/ebin/ra
lib/rabbitmq/plugins/rabbit-${V}/ebin/rabbit_prelaunch_logging.beam
lib/rabbitmq/plugins/rabbit-${V}/ebin/rabbit_prequeue.beam
lib/rabbitmq/plugins/rabbit-${V}/ebin/rabbit_priority_queue.beam
+lib/rabbitmq/plugins/rabbit-${V}/ebin/rabbit_process.beam
lib/rabbitmq/plugins/rabbit-${V}/ebin/rabbit_queue_consumers.beam
lib/rabbitmq/plugins/rabbit-${V}/ebin/rabbit_queue_decorator.beam
lib/rabbitmq/plugins/rabbit-${V}/ebin/rabbit_queue_index.beam
@@ -694,11 +706,10 @@ lib/rabbitmq/plugins/rabbit-${V}/ebin/ra
lib/rabbitmq/plugins/rabbit-${V}/ebin/rabbit_sysmon_handler.beam
lib/rabbitmq/plugins/rabbit-${V}/ebin/rabbit_sysmon_minder.beam
lib/rabbitmq/plugins/rabbit-${V}/ebin/rabbit_table.beam
+lib/rabbitmq/plugins/rabbit-${V}/ebin/rabbit_time_travel_dbg.beam
lib/rabbitmq/plugins/rabbit-${V}/ebin/rabbit_trace.beam
lib/rabbitmq/plugins/rabbit-${V}/ebin/rabbit_tracking.beam
lib/rabbitmq/plugins/rabbit-${V}/ebin/rabbit_tracking_store.beam
-lib/rabbitmq/plugins/rabbit-${V}/ebin/rabbit_upgrade.beam
-lib/rabbitmq/plugins/rabbit-${V}/ebin/rabbit_upgrade_functions.beam
lib/rabbitmq/plugins/rabbit-${V}/ebin/rabbit_upgrade_preparation.beam
lib/rabbitmq/plugins/rabbit-${V}/ebin/rabbit_variable_queue.beam
lib/rabbitmq/plugins/rabbit-${V}/ebin/rabbit_version.beam
@@ -759,7 +770,6 @@ lib/rabbitmq/plugins/rabbit_common-${V}/
lib/rabbitmq/plugins/rabbit_common-${V}/ebin/rabbit_env.beam
lib/rabbitmq/plugins/rabbit_common-${V}/ebin/rabbit_error_logger_handler.beam
lib/rabbitmq/plugins/rabbit_common-${V}/ebin/rabbit_event.beam
-lib/rabbitmq/plugins/rabbit_common-${V}/ebin/rabbit_exchange_type.beam
lib/rabbitmq/plugins/rabbit_common-${V}/ebin/rabbit_framing.beam
lib/rabbitmq/plugins/rabbit_common-${V}/ebin/rabbit_framing_amqp_0_8.beam
lib/rabbitmq/plugins/rabbit_common-${V}/ebin/rabbit_framing_amqp_0_9_1.beam
@@ -901,6 +911,7 @@ lib/rabbitmq/plugins/rabbitmq_aws-${V}/p
lib/rabbitmq/plugins/rabbitmq_consistent_hash_exchange-${V}/
lib/rabbitmq/plugins/rabbitmq_consistent_hash_exchange-${V}/ebin/
lib/rabbitmq/plugins/rabbitmq_consistent_hash_exchange-${V}/ebin/Elixir.RabbitMQ.CLI.Diagnostics.Commands.ConsistentHashExchangeRingStateCommand.beam
+lib/rabbitmq/plugins/rabbitmq_consistent_hash_exchange-${V}/ebin/rabbit_db_ch_exchange.beam
lib/rabbitmq/plugins/rabbitmq_consistent_hash_exchange-${V}/ebin/rabbit_exchange_type_consistent_hash.beam
lib/rabbitmq/plugins/rabbitmq_consistent_hash_exchange-${V}/ebin/rabbitmq_consistent_hash_exchange.app
lib/rabbitmq/plugins/rabbitmq_consistent_hash_exchange-${V}/include/
@@ -956,6 +967,7 @@ lib/rabbitmq/plugins/rabbitmq_federation
lib/rabbitmq/plugins/rabbitmq_federation_management-${V}/priv/www/js/tmpl/federation.ejs
lib/rabbitmq/plugins/rabbitmq_jms_topic_exchange-${V}/
lib/rabbitmq/plugins/rabbitmq_jms_topic_exchange-${V}/ebin/
+lib/rabbitmq/plugins/rabbitmq_jms_topic_exchange-${V}/ebin/rabbit_db_jms_exchange.beam
lib/rabbitmq/plugins/rabbitmq_jms_topic_exchange-${V}/ebin/rabbit_jms_topic_exchange.beam
lib/rabbitmq/plugins/rabbitmq_jms_topic_exchange-${V}/ebin/rabbitmq_jms_topic_exchange.app
lib/rabbitmq/plugins/rabbitmq_jms_topic_exchange-${V}/ebin/sjx_evaluator.beam
@@ -976,6 +988,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_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
lib/rabbitmq/plugins/rabbitmq_management-${V}/ebin/rabbit_mgmt_sup.beam
@@ -1194,11 +1207,13 @@ lib/rabbitmq/plugins/rabbitmq_mqtt-${V}/
lib/rabbitmq/plugins/rabbitmq_mqtt-${V}/ebin/mqtt_node.beam
lib/rabbitmq/plugins/rabbitmq_mqtt-${V}/ebin/rabbit_mqtt.beam
lib/rabbitmq/plugins/rabbitmq_mqtt-${V}/ebin/rabbit_mqtt_collector.beam
-lib/rabbitmq/plugins/rabbitmq_mqtt-${V}/ebin/rabbit_mqtt_connection_info.beam
-lib/rabbitmq/plugins/rabbitmq_mqtt-${V}/ebin/rabbit_mqtt_connection_sup.beam
-lib/rabbitmq/plugins/rabbitmq_mqtt-${V}/ebin/rabbit_mqtt_frame.beam
+lib/rabbitmq/plugins/rabbitmq_mqtt-${V}/ebin/rabbit_mqtt_confirms.beam
+lib/rabbitmq/plugins/rabbitmq_mqtt-${V}/ebin/rabbit_mqtt_ff.beam
lib/rabbitmq/plugins/rabbitmq_mqtt-${V}/ebin/rabbit_mqtt_internal_event_handler.beam
+lib/rabbitmq/plugins/rabbitmq_mqtt-${V}/ebin/rabbit_mqtt_keepalive.beam
+lib/rabbitmq/plugins/rabbitmq_mqtt-${V}/ebin/rabbit_mqtt_packet.beam
lib/rabbitmq/plugins/rabbitmq_mqtt-${V}/ebin/rabbit_mqtt_processor.beam
+lib/rabbitmq/plugins/rabbitmq_mqtt-${V}/ebin/rabbit_mqtt_qos0_queue.beam
lib/rabbitmq/plugins/rabbitmq_mqtt-${V}/ebin/rabbit_mqtt_reader.beam
lib/rabbitmq/plugins/rabbitmq_mqtt-${V}/ebin/rabbit_mqtt_retained_msg_store.beam
lib/rabbitmq/plugins/rabbitmq_mqtt-${V}/ebin/rabbit_mqtt_retained_msg_store_dets.beam
@@ -1213,8 +1228,7 @@ lib/rabbitmq/plugins/rabbitmq_mqtt-${V}/
lib/rabbitmq/plugins/rabbitmq_mqtt-${V}/include/mqtt_machine.hrl
lib/rabbitmq/plugins/rabbitmq_mqtt-${V}/include/mqtt_machine_v0.hrl
lib/rabbitmq/plugins/rabbitmq_mqtt-${V}/include/rabbit_mqtt.hrl
-lib/rabbitmq/plugins/rabbitmq_mqtt-${V}/include/rabbit_mqtt_frame.hrl
-lib/rabbitmq/plugins/rabbitmq_mqtt-${V}/include/rabbit_mqtt_retained_msg_store.hrl
+lib/rabbitmq/plugins/rabbitmq_mqtt-${V}/include/rabbit_mqtt_packet.hrl
lib/rabbitmq/plugins/rabbitmq_mqtt-${V}/priv/
lib/rabbitmq/plugins/rabbitmq_mqtt-${V}/priv/schema/
lib/rabbitmq/plugins/rabbitmq_mqtt-${V}/priv/schema/rabbitmq_mqtt.schema
@@ -1305,6 +1319,7 @@ lib/rabbitmq/plugins/rabbitmq_prometheus
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_dynamic_collector.beam
lib/rabbitmq/plugins/rabbitmq_prometheus-${V}/ebin/prometheus_rabbitmq_global_metrics_collector.beam
lib/rabbitmq/plugins/rabbitmq_prometheus-${V}/ebin/rabbit_prometheus_app.beam
lib/rabbitmq/plugins/rabbitmq_prometheus-${V}/ebin/rabbit_prometheus_dispatcher.beam
@@ -1320,6 +1335,7 @@ lib/rabbitmq/plugins/rabbitmq_random_exc
lib/rabbitmq/plugins/rabbitmq_random_exchange-${V}/include/
lib/rabbitmq/plugins/rabbitmq_recent_history_exchange-${V}/
lib/rabbitmq/plugins/rabbitmq_recent_history_exchange-${V}/ebin/
+lib/rabbitmq/plugins/rabbitmq_recent_history_exchange-${V}/ebin/rabbit_db_rh_exchange.beam
lib/rabbitmq/plugins/rabbitmq_recent_history_exchange-${V}/ebin/rabbit_exchange_type_recent_history.beam
lib/rabbitmq/plugins/rabbitmq_recent_history_exchange-${V}/ebin/rabbitmq_recent_history_exchange.app
lib/rabbitmq/plugins/rabbitmq_recent_history_exchange-${V}/include/
@@ -1512,10 +1528,7 @@ lib/rabbitmq/plugins/rabbitmq_web_dispat
lib/rabbitmq/plugins/rabbitmq_web_mqtt-${V}/
lib/rabbitmq/plugins/rabbitmq_web_mqtt-${V}/ebin/
lib/rabbitmq/plugins/rabbitmq_web_mqtt-${V}/ebin/rabbit_web_mqtt_app.beam
-lib/rabbitmq/plugins/rabbitmq_web_mqtt-${V}/ebin/rabbit_web_mqtt_connection_info.beam
-lib/rabbitmq/plugins/rabbitmq_web_mqtt-${V}/ebin/rabbit_web_mqtt_connection_sup.beam
lib/rabbitmq/plugins/rabbitmq_web_mqtt-${V}/ebin/rabbit_web_mqtt_handler.beam
-lib/rabbitmq/plugins/rabbitmq_web_mqtt-${V}/ebin/rabbit_web_mqtt_middleware.beam
lib/rabbitmq/plugins/rabbitmq_web_mqtt-${V}/ebin/rabbit_web_mqtt_stream_handler.beam
lib/rabbitmq/plugins/rabbitmq_web_mqtt-${V}/ebin/rabbitmq_web_mqtt.app
lib/rabbitmq/plugins/rabbitmq_web_mqtt-${V}/priv/
@@ -1668,7 +1681,6 @@ lib/rabbitmq/sbin/rabbitmq-plugins
lib/rabbitmq/sbin/rabbitmq-queues
lib/rabbitmq/sbin/rabbitmq-server
lib/rabbitmq/sbin/rabbitmq-streams
-lib/rabbitmq/sbin/rabbitmq-tanzu
lib/rabbitmq/sbin/rabbitmq-upgrade
lib/rabbitmq/sbin/rabbitmqctl
lib/rabbitmq/sbin/vmware-rabbitmq
