rabbitmq: updated to 3.8.9

RabbitMQ 3.8.9 is a maintenance release.
It focuses on bug fixes and usability improvements.


RabbitMQ 3.8.8 is a maintenance release.
It focuses on bug fixes and usability improvements.

This releases introduces a new node operation mode, called the maintenance mode.
This feature is useful when performing rolling upgrades and is covered
in more detail below.


RabbitMQ 3.8.7 is a maintenance release that patches
a security vulnerability.


RabbitMQ 3.8.6 is a maintenance release.
It focuses on bug fixes and usability improvements.


RabbitMQ 3.8.5 is a maintenance release.
It focuses on bug fixes and usability improvements.


RabbitMQ 3.8.4 is a maintenance release. It focuses on bug fixes and usability
improvements. etcd peer discovery plugin includes potentially breaking changes which are covered in detail below.

5 files changed, 34 insertions, 218 deletions

diff --git a/net/rabbitmq/Makefile b/net/rabbitmq/Makefile
index ef5190b6693..51ba0743887 100644
--- a/net/rabbitmq/Makefile
+++ b/net/rabbitmq/Makefile
@@ -1,8 +1,7 @@
-# $NetBSD: Makefile,v 1.46 2020/12/04 20:45:35 nia Exp $
+# $NetBSD: Makefile,v 1.47 2021/01/15 12:13:11 adam Exp $
 
-DISTNAME=	rabbitmq-server-3.8.2
+DISTNAME=	rabbitmq-server-3.8.9
 PKGNAME=	${DISTNAME:S/-server//}
-PKGREVISION=	1
 CATEGORIES=	net
 MASTER_SITES=	${MASTER_SITE_GITHUB:=rabbitmq/}
 EXTRACT_SUFX=	.tar.xz
@@ -82,6 +81,8 @@ REPLACE_BASH+=		${SCRIPTS_DIR}/rabbitmq-queues
 REPLACE_BASH+=		${SCRIPTS_DIR}/rabbitmq-server
 REPLACE_BASH+=		${SCRIPTS_DIR}/rabbitmq-upgrade
 
+CHECK_PORTABILITY_SKIP+=	scripts/rabbitmq-server-ha.ocf
+
 # Too much effort to replace the shebang on generated files
 CHECK_INTERPRETER_SKIP+=	${RABBITMQ_HOME}/escript/rabbitmq-diagnostics
 CHECK_INTERPRETER_SKIP+=	${RABBITMQ_HOME}/escript/rabbitmq-plugins
diff --git a/net/rabbitmq/PLIST b/net/rabbitmq/PLIST
index 957fc2482d9..76e2a3ea13b 100644
--- a/net/rabbitmq/PLIST
+++ b/net/rabbitmq/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.34 2020/02/13 18:31:07 adam Exp $
+@comment $NetBSD: PLIST,v 1.35 2021/01/15 12:13:11 adam Exp $
 lib/erlang/autocomplete/bash_autocomplete.sh
 lib/erlang/autocomplete/zsh_autocomplete.sh
 lib/erlang/lib/rabbitmq_server-${PKGVERSION}/INSTALL
@@ -21,207 +21,43 @@ lib/erlang/lib/rabbitmq_server-${PKGVERSION}/LICENSE-MIT-jQuery
 lib/erlang/lib/rabbitmq_server-${PKGVERSION}/LICENSE-MIT-jQuery164
 lib/erlang/lib/rabbitmq_server-${PKGVERSION}/LICENSE-MPL
 lib/erlang/lib/rabbitmq_server-${PKGVERSION}/LICENSE-MPL-RabbitMQ
-lib/erlang/lib/rabbitmq_server-${PKGVERSION}/LICENSE-MPL2
 lib/erlang/lib/rabbitmq_server-${PKGVERSION}/LICENSE-erlcloud
 lib/erlang/lib/rabbitmq_server-${PKGVERSION}/LICENSE-httpc_aws
 lib/erlang/lib/rabbitmq_server-${PKGVERSION}/LICENSE-rabbitmq_aws
-lib/erlang/lib/rabbitmq_server-${PKGVERSION}/ebin/amqqueue.beam
-lib/erlang/lib/rabbitmq_server-${PKGVERSION}/ebin/amqqueue_v1.beam
-lib/erlang/lib/rabbitmq_server-${PKGVERSION}/ebin/background_gc.beam
-lib/erlang/lib/rabbitmq_server-${PKGVERSION}/ebin/code_server_cache.beam
-lib/erlang/lib/rabbitmq_server-${PKGVERSION}/ebin/dep_built
-lib/erlang/lib/rabbitmq_server-${PKGVERSION}/ebin/gatherer.beam
-lib/erlang/lib/rabbitmq_server-${PKGVERSION}/ebin/gm.beam
-lib/erlang/lib/rabbitmq_server-${PKGVERSION}/ebin/lager_exchange_backend.beam
-lib/erlang/lib/rabbitmq_server-${PKGVERSION}/ebin/lqueue.beam
-lib/erlang/lib/rabbitmq_server-${PKGVERSION}/ebin/mirrored_supervisor_sups.beam
-lib/erlang/lib/rabbitmq_server-${PKGVERSION}/ebin/pg_local.beam
-lib/erlang/lib/rabbitmq_server-${PKGVERSION}/ebin/rabbit.app
-lib/erlang/lib/rabbitmq_server-${PKGVERSION}/ebin/rabbit.beam
-lib/erlang/lib/rabbitmq_server-${PKGVERSION}/ebin/rabbit_access_control.beam
-lib/erlang/lib/rabbitmq_server-${PKGVERSION}/ebin/rabbit_alarm.beam
-lib/erlang/lib/rabbitmq_server-${PKGVERSION}/ebin/rabbit_amqqueue.beam
-lib/erlang/lib/rabbitmq_server-${PKGVERSION}/ebin/rabbit_amqqueue_process.beam
-lib/erlang/lib/rabbitmq_server-${PKGVERSION}/ebin/rabbit_amqqueue_sup.beam
-lib/erlang/lib/rabbitmq_server-${PKGVERSION}/ebin/rabbit_amqqueue_sup_sup.beam
-lib/erlang/lib/rabbitmq_server-${PKGVERSION}/ebin/rabbit_auth_backend_internal.beam
-lib/erlang/lib/rabbitmq_server-${PKGVERSION}/ebin/rabbit_auth_mechanism_amqplain.beam
-lib/erlang/lib/rabbitmq_server-${PKGVERSION}/ebin/rabbit_auth_mechanism_cr_demo.beam
-lib/erlang/lib/rabbitmq_server-${PKGVERSION}/ebin/rabbit_auth_mechanism_plain.beam
-lib/erlang/lib/rabbitmq_server-${PKGVERSION}/ebin/rabbit_autoheal.beam
-lib/erlang/lib/rabbitmq_server-${PKGVERSION}/ebin/rabbit_backing_queue.beam
-lib/erlang/lib/rabbitmq_server-${PKGVERSION}/ebin/rabbit_basic.beam
-lib/erlang/lib/rabbitmq_server-${PKGVERSION}/ebin/rabbit_binding.beam
-lib/erlang/lib/rabbitmq_server-${PKGVERSION}/ebin/rabbit_boot_steps.beam
-lib/erlang/lib/rabbitmq_server-${PKGVERSION}/ebin/rabbit_channel.beam
-lib/erlang/lib/rabbitmq_server-${PKGVERSION}/ebin/rabbit_channel_interceptor.beam
-lib/erlang/lib/rabbitmq_server-${PKGVERSION}/ebin/rabbit_channel_sup.beam
-lib/erlang/lib/rabbitmq_server-${PKGVERSION}/ebin/rabbit_channel_sup_sup.beam
-lib/erlang/lib/rabbitmq_server-${PKGVERSION}/ebin/rabbit_client_sup.beam
-lib/erlang/lib/rabbitmq_server-${PKGVERSION}/ebin/rabbit_config.beam
-lib/erlang/lib/rabbitmq_server-${PKGVERSION}/ebin/rabbit_connection_helper_sup.beam
-lib/erlang/lib/rabbitmq_server-${PKGVERSION}/ebin/rabbit_connection_sup.beam
-lib/erlang/lib/rabbitmq_server-${PKGVERSION}/ebin/rabbit_connection_tracking.beam
-lib/erlang/lib/rabbitmq_server-${PKGVERSION}/ebin/rabbit_connection_tracking_handler.beam
-lib/erlang/lib/rabbitmq_server-${PKGVERSION}/ebin/rabbit_control_pbe.beam
-lib/erlang/lib/rabbitmq_server-${PKGVERSION}/ebin/rabbit_core_ff.beam
-lib/erlang/lib/rabbitmq_server-${PKGVERSION}/ebin/rabbit_core_metrics_gc.beam
-lib/erlang/lib/rabbitmq_server-${PKGVERSION}/ebin/rabbit_credential_validation.beam
-lib/erlang/lib/rabbitmq_server-${PKGVERSION}/ebin/rabbit_credential_validator.beam
-lib/erlang/lib/rabbitmq_server-${PKGVERSION}/ebin/rabbit_credential_validator_accept_everything.beam
-lib/erlang/lib/rabbitmq_server-${PKGVERSION}/ebin/rabbit_credential_validator_min_password_length.beam
-lib/erlang/lib/rabbitmq_server-${PKGVERSION}/ebin/rabbit_credential_validator_password_regexp.beam
-lib/erlang/lib/rabbitmq_server-${PKGVERSION}/ebin/rabbit_dead_letter.beam
-lib/erlang/lib/rabbitmq_server-${PKGVERSION}/ebin/rabbit_definitions.beam
-lib/erlang/lib/rabbitmq_server-${PKGVERSION}/ebin/rabbit_diagnostics.beam
-lib/erlang/lib/rabbitmq_server-${PKGVERSION}/ebin/rabbit_direct.beam
-lib/erlang/lib/rabbitmq_server-${PKGVERSION}/ebin/rabbit_disk_monitor.beam
-lib/erlang/lib/rabbitmq_server-${PKGVERSION}/ebin/rabbit_epmd_monitor.beam
-lib/erlang/lib/rabbitmq_server-${PKGVERSION}/ebin/rabbit_event_consumer.beam
-lib/erlang/lib/rabbitmq_server-${PKGVERSION}/ebin/rabbit_exchange.beam
-lib/erlang/lib/rabbitmq_server-${PKGVERSION}/ebin/rabbit_exchange_decorator.beam
-lib/erlang/lib/rabbitmq_server-${PKGVERSION}/ebin/rabbit_exchange_parameters.beam
-lib/erlang/lib/rabbitmq_server-${PKGVERSION}/ebin/rabbit_exchange_type_direct.beam
-lib/erlang/lib/rabbitmq_server-${PKGVERSION}/ebin/rabbit_exchange_type_fanout.beam
-lib/erlang/lib/rabbitmq_server-${PKGVERSION}/ebin/rabbit_exchange_type_headers.beam
-lib/erlang/lib/rabbitmq_server-${PKGVERSION}/ebin/rabbit_exchange_type_invalid.beam
-lib/erlang/lib/rabbitmq_server-${PKGVERSION}/ebin/rabbit_exchange_type_topic.beam
-lib/erlang/lib/rabbitmq_server-${PKGVERSION}/ebin/rabbit_feature_flags.beam
-lib/erlang/lib/rabbitmq_server-${PKGVERSION}/ebin/rabbit_ff_extra.beam
-lib/erlang/lib/rabbitmq_server-${PKGVERSION}/ebin/rabbit_ff_registry.beam
-lib/erlang/lib/rabbitmq_server-${PKGVERSION}/ebin/rabbit_fhc_helpers.beam
-lib/erlang/lib/rabbitmq_server-${PKGVERSION}/ebin/rabbit_fifo.beam
-lib/erlang/lib/rabbitmq_server-${PKGVERSION}/ebin/rabbit_fifo_client.beam
-lib/erlang/lib/rabbitmq_server-${PKGVERSION}/ebin/rabbit_fifo_index.beam
-lib/erlang/lib/rabbitmq_server-${PKGVERSION}/ebin/rabbit_file.beam
-lib/erlang/lib/rabbitmq_server-${PKGVERSION}/ebin/rabbit_framing.beam
-lib/erlang/lib/rabbitmq_server-${PKGVERSION}/ebin/rabbit_guid.beam
-lib/erlang/lib/rabbitmq_server-${PKGVERSION}/ebin/rabbit_health_check.beam
-lib/erlang/lib/rabbitmq_server-${PKGVERSION}/ebin/rabbit_hipe.beam
-lib/erlang/lib/rabbitmq_server-${PKGVERSION}/ebin/rabbit_lager.beam
-lib/erlang/lib/rabbitmq_server-${PKGVERSION}/ebin/rabbit_limiter.beam
-lib/erlang/lib/rabbitmq_server-${PKGVERSION}/ebin/rabbit_log_tail.beam
-lib/erlang/lib/rabbitmq_server-${PKGVERSION}/ebin/rabbit_looking_glass.beam
-lib/erlang/lib/rabbitmq_server-${PKGVERSION}/ebin/rabbit_memory_monitor.beam
-lib/erlang/lib/rabbitmq_server-${PKGVERSION}/ebin/rabbit_metrics.beam
-lib/erlang/lib/rabbitmq_server-${PKGVERSION}/ebin/rabbit_mirror_queue_coordinator.beam
-lib/erlang/lib/rabbitmq_server-${PKGVERSION}/ebin/rabbit_mirror_queue_master.beam
-lib/erlang/lib/rabbitmq_server-${PKGVERSION}/ebin/rabbit_mirror_queue_misc.beam
-lib/erlang/lib/rabbitmq_server-${PKGVERSION}/ebin/rabbit_mirror_queue_mode.beam
-lib/erlang/lib/rabbitmq_server-${PKGVERSION}/ebin/rabbit_mirror_queue_mode_all.beam
-lib/erlang/lib/rabbitmq_server-${PKGVERSION}/ebin/rabbit_mirror_queue_mode_exactly.beam
-lib/erlang/lib/rabbitmq_server-${PKGVERSION}/ebin/rabbit_mirror_queue_mode_nodes.beam
-lib/erlang/lib/rabbitmq_server-${PKGVERSION}/ebin/rabbit_mirror_queue_slave.beam
-lib/erlang/lib/rabbitmq_server-${PKGVERSION}/ebin/rabbit_mirror_queue_sync.beam
-lib/erlang/lib/rabbitmq_server-${PKGVERSION}/ebin/rabbit_mnesia.beam
-lib/erlang/lib/rabbitmq_server-${PKGVERSION}/ebin/rabbit_mnesia_rename.beam
-lib/erlang/lib/rabbitmq_server-${PKGVERSION}/ebin/rabbit_msg_file.beam
-lib/erlang/lib/rabbitmq_server-${PKGVERSION}/ebin/rabbit_msg_store.beam
-lib/erlang/lib/rabbitmq_server-${PKGVERSION}/ebin/rabbit_msg_store_ets_index.beam
-lib/erlang/lib/rabbitmq_server-${PKGVERSION}/ebin/rabbit_msg_store_gc.beam
-lib/erlang/lib/rabbitmq_server-${PKGVERSION}/ebin/rabbit_networking.beam
-lib/erlang/lib/rabbitmq_server-${PKGVERSION}/ebin/rabbit_node_monitor.beam
-lib/erlang/lib/rabbitmq_server-${PKGVERSION}/ebin/rabbit_nodes.beam
-lib/erlang/lib/rabbitmq_server-${PKGVERSION}/ebin/rabbit_parameter_validation.beam
-lib/erlang/lib/rabbitmq_server-${PKGVERSION}/ebin/rabbit_password.beam
-lib/erlang/lib/rabbitmq_server-${PKGVERSION}/ebin/rabbit_password_hashing_md5.beam
-lib/erlang/lib/rabbitmq_server-${PKGVERSION}/ebin/rabbit_password_hashing_sha256.beam
-lib/erlang/lib/rabbitmq_server-${PKGVERSION}/ebin/rabbit_password_hashing_sha512.beam
-lib/erlang/lib/rabbitmq_server-${PKGVERSION}/ebin/rabbit_peer_discovery.beam
-lib/erlang/lib/rabbitmq_server-${PKGVERSION}/ebin/rabbit_peer_discovery_classic_config.beam
-lib/erlang/lib/rabbitmq_server-${PKGVERSION}/ebin/rabbit_peer_discovery_dns.beam
-lib/erlang/lib/rabbitmq_server-${PKGVERSION}/ebin/rabbit_plugins.beam
-lib/erlang/lib/rabbitmq_server-${PKGVERSION}/ebin/rabbit_policies.beam
-lib/erlang/lib/rabbitmq_server-${PKGVERSION}/ebin/rabbit_policy.beam
-lib/erlang/lib/rabbitmq_server-${PKGVERSION}/ebin/rabbit_policy_merge_strategy.beam
-lib/erlang/lib/rabbitmq_server-${PKGVERSION}/ebin/rabbit_prelaunch.beam
-lib/erlang/lib/rabbitmq_server-${PKGVERSION}/ebin/rabbit_prequeue.beam
-lib/erlang/lib/rabbitmq_server-${PKGVERSION}/ebin/rabbit_priority_queue.beam
-lib/erlang/lib/rabbitmq_server-${PKGVERSION}/ebin/rabbit_queue_consumers.beam
-lib/erlang/lib/rabbitmq_server-${PKGVERSION}/ebin/rabbit_queue_decorator.beam
-lib/erlang/lib/rabbitmq_server-${PKGVERSION}/ebin/rabbit_queue_index.beam
-lib/erlang/lib/rabbitmq_server-${PKGVERSION}/ebin/rabbit_queue_location_client_local.beam
-lib/erlang/lib/rabbitmq_server-${PKGVERSION}/ebin/rabbit_queue_location_min_masters.beam
-lib/erlang/lib/rabbitmq_server-${PKGVERSION}/ebin/rabbit_queue_location_random.beam
-lib/erlang/lib/rabbitmq_server-${PKGVERSION}/ebin/rabbit_queue_location_validator.beam
-lib/erlang/lib/rabbitmq_server-${PKGVERSION}/ebin/rabbit_queue_master_location_misc.beam
-lib/erlang/lib/rabbitmq_server-${PKGVERSION}/ebin/rabbit_queue_master_locator.beam
-lib/erlang/lib/rabbitmq_server-${PKGVERSION}/ebin/rabbit_quorum_memory_manager.beam
-lib/erlang/lib/rabbitmq_server-${PKGVERSION}/ebin/rabbit_quorum_queue.beam
-lib/erlang/lib/rabbitmq_server-${PKGVERSION}/ebin/rabbit_reader.beam
-lib/erlang/lib/rabbitmq_server-${PKGVERSION}/ebin/rabbit_recovery_terms.beam
-lib/erlang/lib/rabbitmq_server-${PKGVERSION}/ebin/rabbit_restartable_sup.beam
-lib/erlang/lib/rabbitmq_server-${PKGVERSION}/ebin/rabbit_router.beam
-lib/erlang/lib/rabbitmq_server-${PKGVERSION}/ebin/rabbit_runtime_parameters.beam
-lib/erlang/lib/rabbitmq_server-${PKGVERSION}/ebin/rabbit_ssl.beam
-lib/erlang/lib/rabbitmq_server-${PKGVERSION}/ebin/rabbit_sup.beam
-lib/erlang/lib/rabbitmq_server-${PKGVERSION}/ebin/rabbit_sysmon_handler.beam
-lib/erlang/lib/rabbitmq_server-${PKGVERSION}/ebin/rabbit_sysmon_minder.beam
-lib/erlang/lib/rabbitmq_server-${PKGVERSION}/ebin/rabbit_table.beam
-lib/erlang/lib/rabbitmq_server-${PKGVERSION}/ebin/rabbit_trace.beam
-lib/erlang/lib/rabbitmq_server-${PKGVERSION}/ebin/rabbit_upgrade.beam
-lib/erlang/lib/rabbitmq_server-${PKGVERSION}/ebin/rabbit_upgrade_functions.beam
-lib/erlang/lib/rabbitmq_server-${PKGVERSION}/ebin/rabbit_variable_queue.beam
-lib/erlang/lib/rabbitmq_server-${PKGVERSION}/ebin/rabbit_version.beam
-lib/erlang/lib/rabbitmq_server-${PKGVERSION}/ebin/rabbit_vhost.beam
-lib/erlang/lib/rabbitmq_server-${PKGVERSION}/ebin/rabbit_vhost_limit.beam
-lib/erlang/lib/rabbitmq_server-${PKGVERSION}/ebin/rabbit_vhost_msg_store.beam
-lib/erlang/lib/rabbitmq_server-${PKGVERSION}/ebin/rabbit_vhost_process.beam
-lib/erlang/lib/rabbitmq_server-${PKGVERSION}/ebin/rabbit_vhost_sup.beam
-lib/erlang/lib/rabbitmq_server-${PKGVERSION}/ebin/rabbit_vhost_sup_sup.beam
-lib/erlang/lib/rabbitmq_server-${PKGVERSION}/ebin/rabbit_vhost_sup_wrapper.beam
-lib/erlang/lib/rabbitmq_server-${PKGVERSION}/ebin/rabbit_vm.beam
-lib/erlang/lib/rabbitmq_server-${PKGVERSION}/ebin/supervised_lifecycle.beam
-lib/erlang/lib/rabbitmq_server-${PKGVERSION}/ebin/tcp_listener.beam
-lib/erlang/lib/rabbitmq_server-${PKGVERSION}/ebin/tcp_listener_sup.beam
-lib/erlang/lib/rabbitmq_server-${PKGVERSION}/ebin/term_to_binary_compat.beam
-lib/erlang/lib/rabbitmq_server-${PKGVERSION}/ebin/unconfirmed_messages.beam
-lib/erlang/lib/rabbitmq_server-${PKGVERSION}/ebin/vhost.beam
-lib/erlang/lib/rabbitmq_server-${PKGVERSION}/ebin/vhost_v1.beam
 lib/erlang/lib/rabbitmq_server-${PKGVERSION}/escript/rabbitmq-diagnostics
 lib/erlang/lib/rabbitmq_server-${PKGVERSION}/escript/rabbitmq-plugins
 lib/erlang/lib/rabbitmq_server-${PKGVERSION}/escript/rabbitmq-queues
 lib/erlang/lib/rabbitmq_server-${PKGVERSION}/escript/rabbitmq-upgrade
 lib/erlang/lib/rabbitmq_server-${PKGVERSION}/escript/rabbitmqctl
-lib/erlang/lib/rabbitmq_server-${PKGVERSION}/include/amqqueue.hrl
-lib/erlang/lib/rabbitmq_server-${PKGVERSION}/include/amqqueue_v1.hrl
-lib/erlang/lib/rabbitmq_server-${PKGVERSION}/include/amqqueue_v2.hrl
-lib/erlang/lib/rabbitmq_server-${PKGVERSION}/include/gm_specs.hrl
-lib/erlang/lib/rabbitmq_server-${PKGVERSION}/include/rabbit.hrl
-lib/erlang/lib/rabbitmq_server-${PKGVERSION}/include/rabbit_core_metrics.hrl
-lib/erlang/lib/rabbitmq_server-${PKGVERSION}/include/rabbit_framing.hrl
-lib/erlang/lib/rabbitmq_server-${PKGVERSION}/include/rabbit_log.hrl
-lib/erlang/lib/rabbitmq_server-${PKGVERSION}/include/rabbit_memory.hrl
-lib/erlang/lib/rabbitmq_server-${PKGVERSION}/include/rabbit_misc.hrl
-lib/erlang/lib/rabbitmq_server-${PKGVERSION}/include/rabbit_msg_store.hrl
-lib/erlang/lib/rabbitmq_server-${PKGVERSION}/include/resource.hrl
-lib/erlang/lib/rabbitmq_server-${PKGVERSION}/include/vhost.hrl
-lib/erlang/lib/rabbitmq_server-${PKGVERSION}/include/vhost_v1.hrl
-lib/erlang/lib/rabbitmq_server-${PKGVERSION}/include/vhost_v2.hrl
 lib/erlang/lib/rabbitmq_server-${PKGVERSION}/plugins/README
 lib/erlang/lib/rabbitmq_server-${PKGVERSION}/plugins/accept-0.3.5.ez
 lib/erlang/lib/rabbitmq_server-${PKGVERSION}/plugins/amqp10_client-${PKGVERSION}.ez
 lib/erlang/lib/rabbitmq_server-${PKGVERSION}/plugins/amqp10_common-${PKGVERSION}.ez
 lib/erlang/lib/rabbitmq_server-${PKGVERSION}/plugins/amqp_client-${PKGVERSION}.ez
-lib/erlang/lib/rabbitmq_server-${PKGVERSION}/plugins/aten-0.5.2.ez
-lib/erlang/lib/rabbitmq_server-${PKGVERSION}/plugins/base64url-1.0.1.ez
+lib/erlang/lib/rabbitmq_server-${PKGVERSION}/plugins/aten-0.5.5.ez
+lib/erlang/lib/rabbitmq_server-${PKGVERSION}/plugins/base64url-0.0.1.ez
 lib/erlang/lib/rabbitmq_server-${PKGVERSION}/plugins/cowboy-2.6.1.ez
 lib/erlang/lib/rabbitmq_server-${PKGVERSION}/plugins/cowlib-2.7.0.ez
-lib/erlang/lib/rabbitmq_server-${PKGVERSION}/plugins/credentials_obfuscation-1.1.0.ez
-lib/erlang/lib/rabbitmq_server-${PKGVERSION}/plugins/gen_batch_server-0.8.2.ez
+lib/erlang/lib/rabbitmq_server-${PKGVERSION}/plugins/credentials_obfuscation-2.2.0.ez
+lib/erlang/lib/rabbitmq_server-${PKGVERSION}/plugins/cuttlefish-2.4.1.ez
+lib/erlang/lib/rabbitmq_server-${PKGVERSION}/plugins/eetcd-0.3.3.ez
+lib/erlang/lib/rabbitmq_server-${PKGVERSION}/plugins/gen_batch_server-0.8.4.ez
+lib/erlang/lib/rabbitmq_server-${PKGVERSION}/plugins/getopt-1.0.1.ez
 lib/erlang/lib/rabbitmq_server-${PKGVERSION}/plugins/goldrush-0.1.9.ez
-lib/erlang/lib/rabbitmq_server-${PKGVERSION}/plugins/jose-1.8.4.ez
-lib/erlang/lib/rabbitmq_server-${PKGVERSION}/plugins/jsx-2.9.0.ez
+lib/erlang/lib/rabbitmq_server-${PKGVERSION}/plugins/gun-1.3.3.ez
+lib/erlang/lib/rabbitmq_server-${PKGVERSION}/plugins/jose-1.10.1.ez
+lib/erlang/lib/rabbitmq_server-${PKGVERSION}/plugins/jsx-2.11.0.ez
 lib/erlang/lib/rabbitmq_server-${PKGVERSION}/plugins/lager-3.8.0.ez
-lib/erlang/lib/rabbitmq_server-${PKGVERSION}/plugins/observer_cli-1.5.2.ez
-lib/erlang/lib/rabbitmq_server-${PKGVERSION}/plugins/prometheus-4.4.0.ez
-lib/erlang/lib/rabbitmq_server-${PKGVERSION}/plugins/ra-1.0.5.ez
+lib/erlang/lib/rabbitmq_server-${PKGVERSION}/plugins/observer_cli-1.5.4.ez
+lib/erlang/lib/rabbitmq_server-${PKGVERSION}/plugins/prometheus-4.6.0.ez
+lib/erlang/lib/rabbitmq_server-${PKGVERSION}/plugins/ra-1.1.6.ez
+lib/erlang/lib/rabbitmq_server-${PKGVERSION}/plugins/rabbit-3.8.9.ez
 lib/erlang/lib/rabbitmq_server-${PKGVERSION}/plugins/rabbit_common-${PKGVERSION}.ez
 lib/erlang/lib/rabbitmq_server-${PKGVERSION}/plugins/rabbitmq_amqp1_0-${PKGVERSION}.ez
 lib/erlang/lib/rabbitmq_server-${PKGVERSION}/plugins/rabbitmq_auth_backend_cache-${PKGVERSION}.ez
 lib/erlang/lib/rabbitmq_server-${PKGVERSION}/plugins/rabbitmq_auth_backend_http-${PKGVERSION}.ez
 lib/erlang/lib/rabbitmq_server-${PKGVERSION}/plugins/rabbitmq_auth_backend_ldap-${PKGVERSION}.ez
-lib/erlang/lib/rabbitmq_server-${PKGVERSION}/plugins/rabbitmq_auth_backend_oauth2-3.8.2.ez
+lib/erlang/lib/rabbitmq_server-${PKGVERSION}/plugins/rabbitmq_auth_backend_oauth2-3.8.9.ez
 lib/erlang/lib/rabbitmq_server-${PKGVERSION}/plugins/rabbitmq_auth_mechanism_ssl-${PKGVERSION}.ez
 lib/erlang/lib/rabbitmq_server-${PKGVERSION}/plugins/rabbitmq_aws-${PKGVERSION}.ez
 lib/erlang/lib/rabbitmq_server-${PKGVERSION}/plugins/rabbitmq_consistent_hash_exchange-${PKGVERSION}.ez
@@ -237,7 +73,8 @@ lib/erlang/lib/rabbitmq_server-${PKGVERSION}/plugins/rabbitmq_peer_discovery_com
 lib/erlang/lib/rabbitmq_server-${PKGVERSION}/plugins/rabbitmq_peer_discovery_consul-${PKGVERSION}.ez
 lib/erlang/lib/rabbitmq_server-${PKGVERSION}/plugins/rabbitmq_peer_discovery_etcd-${PKGVERSION}.ez
 lib/erlang/lib/rabbitmq_server-${PKGVERSION}/plugins/rabbitmq_peer_discovery_k8s-${PKGVERSION}.ez
-lib/erlang/lib/rabbitmq_server-${PKGVERSION}/plugins/rabbitmq_prometheus-3.8.2.ez
+lib/erlang/lib/rabbitmq_server-${PKGVERSION}/plugins/rabbitmq_prelaunch-3.8.9.ez
+lib/erlang/lib/rabbitmq_server-${PKGVERSION}/plugins/rabbitmq_prometheus-3.8.9.ez
 lib/erlang/lib/rabbitmq_server-${PKGVERSION}/plugins/rabbitmq_random_exchange-${PKGVERSION}.ez
 lib/erlang/lib/rabbitmq_server-${PKGVERSION}/plugins/rabbitmq_recent_history_exchange-${PKGVERSION}.ez
 lib/erlang/lib/rabbitmq_server-${PKGVERSION}/plugins/rabbitmq_sharding-${PKGVERSION}.ez
@@ -253,12 +90,10 @@ lib/erlang/lib/rabbitmq_server-${PKGVERSION}/plugins/rabbitmq_web_mqtt_examples-
 lib/erlang/lib/rabbitmq_server-${PKGVERSION}/plugins/rabbitmq_web_stomp-${PKGVERSION}.ez
 lib/erlang/lib/rabbitmq_server-${PKGVERSION}/plugins/rabbitmq_web_stomp_examples-${PKGVERSION}.ez
 lib/erlang/lib/rabbitmq_server-${PKGVERSION}/plugins/ranch-1.7.1.ez
-lib/erlang/lib/rabbitmq_server-${PKGVERSION}/plugins/recon-2.5.0.ez
-lib/erlang/lib/rabbitmq_server-${PKGVERSION}/plugins/stdout_formatter-0.2.2.ez
+lib/erlang/lib/rabbitmq_server-${PKGVERSION}/plugins/recon-2.5.1.ez
+lib/erlang/lib/rabbitmq_server-${PKGVERSION}/plugins/stdout_formatter-0.2.4.ez
 lib/erlang/lib/rabbitmq_server-${PKGVERSION}/plugins/syslog-3.4.5.ez
-lib/erlang/lib/rabbitmq_server-${PKGVERSION}/plugins/sysmon_handler-1.2.0.ez
-lib/erlang/lib/rabbitmq_server-${PKGVERSION}/priv/schema/rabbit.schema
-lib/erlang/lib/rabbitmq_server-${PKGVERSION}/sbin/cuttlefish
+lib/erlang/lib/rabbitmq_server-${PKGVERSION}/plugins/sysmon_handler-1.3.0.ez
 lib/erlang/lib/rabbitmq_server-${PKGVERSION}/sbin/rabbitmq-defaults
 lib/erlang/lib/rabbitmq_server-${PKGVERSION}/sbin/rabbitmq-diagnostics
 lib/erlang/lib/rabbitmq_server-${PKGVERSION}/sbin/rabbitmq-env
@@ -276,7 +111,6 @@ man/man8/rabbitmq-server.8
 man/man8/rabbitmq-service.8
 man/man8/rabbitmq-upgrade.8
 man/man8/rabbitmqctl.8
-sbin/cuttlefish
 sbin/rabbitmq-defaults
 sbin/rabbitmq-diagnostics
 sbin/rabbitmq-env
diff --git a/net/rabbitmq/distinfo b/net/rabbitmq/distinfo
index 396245b22f4..90d1daa5425 100644
--- a/net/rabbitmq/distinfo
+++ b/net/rabbitmq/distinfo
@@ -1,10 +1,9 @@
-$NetBSD: distinfo,v 1.44 2020/02/13 18:31:07 adam Exp $
+$NetBSD: distinfo,v 1.45 2021/01/15 12:13:11 adam Exp $
 
-SHA1 (rabbitmq-server-3.8.2.tar.xz) = 70076751de7573b0714f63b4bacf9efcbe962f33
-RMD160 (rabbitmq-server-3.8.2.tar.xz) = ff229291a36d4aad60afdb41d1b58eb9651c07a8
-SHA512 (rabbitmq-server-3.8.2.tar.xz) = ac8cfc002ccbff8cf95c3e5508956cf5622c1c145b730589308ec4ca9173e5efca338829e13aa7dc37db035868dc964ab0e3e0edba15de49c64e18c50247b918
-Size (rabbitmq-server-3.8.2.tar.xz) = 15178744 bytes
+SHA1 (rabbitmq-server-3.8.9.tar.xz) = dc945062816536124f0c2d6ac32d15c61d0b2f2a
+RMD160 (rabbitmq-server-3.8.9.tar.xz) = 749ea1fce9ab378df7480a719d0cb55a3f1a4b28
+SHA512 (rabbitmq-server-3.8.9.tar.xz) = 11e041235280c23012d967c6dbd78d1fc95a312fe1acb3aa51a7ed8731cc8c26acbcd7272a8100b8a5d75f49d38466980be194c6013921b017ed6fd09eb5ee55
+Size (rabbitmq-server-3.8.9.tar.xz) = 3074468 bytes
 SHA1 (patch-Makefile) = 088a3ed04dc72215f1ca3b34b49bb4047a531e89
 SHA1 (patch-deps_rabbit_scripts_rabbitmq-env) = db168c8ff5a5e7b22186f57947c27c7a1c5ccae6
-SHA1 (patch-deps_rabbitmq__cli_Makefile) = 45bfec63c47092122ad9051f2c9de4dd8333d4e7
-SHA1 (patch-deps_rabbitmq__cli_mix.exs) = 86ebd6834126e8bcf3e8b2bbe02cd6375a2024ee
+SHA1 (patch-deps_rabbitmq__cli_mix.exs) = 079cdc39871e23328ceaa42f03db336f5689aef3
diff --git a/net/rabbitmq/patches/patch-deps_rabbitmq__cli_Makefile b/net/rabbitmq/patches/patch-deps_rabbitmq__cli_Makefile
deleted file mode 100644
index 167588d844f..00000000000
--- a/net/rabbitmq/patches/patch-deps_rabbitmq__cli_Makefile
+++ /dev/null
@@ -1,18 +0,0 @@
-$NetBSD: patch-deps_rabbitmq__cli_Makefile,v 1.1 2018/02/02 16:20:21 fhajny Exp $
-
-Somehow there is a pre-existing file.
-
---- deps/rabbitmq_cli/Makefile.orig	2018-01-30 10:33:01.000000000 +0000
-+++ deps/rabbitmq_cli/Makefile
-@@ -61,9 +61,9 @@ escript/rabbitmq-plugins escript/rabbitm
- # the source was previously copied in that directory.
- 
- ifdef USE_SYMLINKS_IN_ESCRIPTS_DIR
--link_escript = ln -s "$(notdir $(1))" "$(2)"
-+link_escript = ln -sf "$(notdir $(1))" "$(2)"
- else
--link_escript = ln "$(dir $(2))$(notdir $(1))" "$(2)"
-+link_escript = ln -f "$(dir $(2))$(notdir $(1))" "$(2)"
- endif
- 
- app:: $(ESCRIPTS)
diff --git a/net/rabbitmq/patches/patch-deps_rabbitmq__cli_mix.exs b/net/rabbitmq/patches/patch-deps_rabbitmq__cli_mix.exs
index 824efe95b6f..a011af93fc3 100644
--- a/net/rabbitmq/patches/patch-deps_rabbitmq__cli_mix.exs
+++ b/net/rabbitmq/patches/patch-deps_rabbitmq__cli_mix.exs
@@ -1,4 +1,4 @@
-$NetBSD: patch-deps_rabbitmq__cli_mix.exs,v 1.3 2020/02/13 18:31:07 adam Exp $
+$NetBSD: patch-deps_rabbitmq__cli_mix.exs,v 1.4 2021/01/15 12:13:12 adam Exp $
 
 Allow newer elixir.
 
@@ -8,8 +8,8 @@ Allow newer elixir.
      [
        app: :rabbitmqctl,
        version: "3.8.0-dev",
--      elixir: ">= 1.7.0 and < 1.10.0",
-+      elixir: ">= 1.7.0",
+-      elixir: ">= 1.8.0 and < 1.11.0",
++      elixir: ">= 1.8.0",
        build_embedded: Mix.env == :prod,
        start_permanent: Mix.env == :prod,
        escript: [main_module: RabbitMQCtl,