rabbitmq: updated to 3.8.2

RabbitMQ 3.8.2
Changes

Core Server

Enhancements

Raft implementation optimizations.

Quorum queue optimization: enables local (not going through the leader) delivery from Raft followers
when appropriate and safe.

If x-queue-type argument is not provided at queue declaration time, the type is assumed to be classic
instead of missing.

Quorum queue consumer timeout now can be configured using new style configuration file:

# Hard timeout for quorum queue consumer acknowledgemnts of two minutes
consumer_timeout = 120000

Bug Fixes

A quorum queue could produce an empty Raft log segment if node is killed at a particular moment in time,
which would prevent the node from successfully recovering the log after restart.

Quorum queue consumer count metric could be duplicated when reported via HTTP API or to a Prometheus scraper.

Quorum queue with single active consumer enabled crashes after some basic.get calls. Quorum queues now forbid basic.get when single active consumer is enabled.

CLI Tools

Enhancements

It is now possible to export and import definitions without the use of plugins with
rabbitmqctl export_definitions and rabbitmqctl import_definitions:

# export as a JSON file
rabbitmqctl export_definitions /path/to/target.file.json

# export as JSON to standard output and pipe to jq
rabbitmqctl export_definitions "-" | jq

# export as a compressed Erlang term file
rabbitmqctl export_definitions /path/to/target.file --format=erlang

# learn more
rabbitmqctl help export_definitions
# import from a JSON file
rabbitmqctl import_definitions /path/to/target.file.json

# import JSON from standard input
cat /path/to/definitions.json | rabbitmqctl import_definitions "-"

# import from a compressed Erlang term file
rabbitmqctl import_definitions /path/to/target.file --format=erlang

# learn more
rabbitmqctl help import_definitions

Entities with amq.* prefixes are now skipped during import instead of producing an error.

Bug Fixes

rabbitmqctl await_startup failed with an exception when RabbitMQ application was stopped but the
runtime (Erlang VM) was running.

Management Plugin

Bug Fixes

Definition import via HTTP API could fail in if performed via HTTP API (but not management UI)
and contained operator policies.

Enhancements

Metric aggregation optimizations.

MQTT Plugin

Enhancements

Throughput improvements ranging from 14 to 60 percent depending on workload.

Throughput improvements and reduced CPU usage but slightly higher per connection RAM footprint.

Bug Fixes

Client ID tracker could produce an empty Raft log segment if node is killed at a particular moment in time,
which would prevent the node from successfully recovering the log after restart.

Last Will messages that use QoS 2 will now be downgraded to QoS 1 just like with "regular" published messages.

AMQP 1.0 Plugin

Enhancements

Throughput improvements.

STOMP Plugin

Enhancements

Throughput improvements.

Web STOMP Plugin

Enhancements

Clients now can authenticate using an x.509 (TLS) certificate.

Prometheus Plugin

A small number of queue metrics were not read from the metric store correctly.

4 files changed, 94 insertions, 29 deletions

diff --git a/net/rabbitmq/Makefile b/net/rabbitmq/Makefile
index 18c9cd742a3..30c2a1fa696 100644
--- a/net/rabbitmq/Makefile
+++ b/net/rabbitmq/Makefile
@@ -1,17 +1,17 @@
-# $NetBSD: Makefile,v 1.44 2019/07/23 16:12:39 jperkin Exp $
+# $NetBSD: Makefile,v 1.45 2020/02/13 18:31:07 adam Exp $
 
-DISTNAME=		rabbitmq-server-3.7.16
-PKGNAME=		${DISTNAME:S/-server//}
-CATEGORIES=		net
-MASTER_SITES=		${MASTER_SITE_GITHUB:=rabbitmq/}
-EXTRACT_SUFX=		.tar.xz
-GITHUB_PROJECT=		rabbitmq-server
-GITHUB_RELEASE=		v${PKGVERSION_NOREV}
+DISTNAME=	rabbitmq-server-3.8.2
+PKGNAME=	${DISTNAME:S/-server//}
+CATEGORIES=	net
+MASTER_SITES=	${MASTER_SITE_GITHUB:=rabbitmq/}
+EXTRACT_SUFX=	.tar.xz
+GITHUB_PROJECT=	rabbitmq-server
+GITHUB_RELEASE=	v${PKGVERSION_NOREV}
 
-MAINTAINER=		pkgsrc-users@NetBSD.org
-HOMEPAGE=		http://www.rabbitmq.com/server.html
-COMMENT=		Implementation of AMQP that provides robust messaging for applications
-LICENSE=		mpl-1.1
+MAINTAINER=	pkgsrc-users@NetBSD.org
+HOMEPAGE=	https://www.rabbitmq.com/
+COMMENT=	Implementation of AMQP that provides robust messaging for applications
+LICENSE=	mpl-1.1
 
 USE_TOOLS+=		bash:run gmake unzip zip
 
@@ -28,7 +28,7 @@ BUILD_DEFS+=		VARBASE
 TOOLS_CREATE+=		mix
 TOOLS_SCRIPT.mix=	${PREFIX}/bin/elixir -r ${PREFIX}/bin/mix -- "$$@"
 
-.include		"../../mk/bsd.prefs.mk"
+.include "../../mk/bsd.prefs.mk"
 
 RMQ_USER?=		rabbitmq
 RMQ_GROUP?=		${RMQ_USER}
@@ -48,8 +48,8 @@ PKG_SHELL.${RMQ_USER}=	${RMQ_SHELL}
 PKG_SYSCONFSUBDIR=	${PKGBASE}
 CONF_FILES+=		share/examples/rabbitmq/rabbitmq-env.conf \
 			${PKG_SYSCONFDIR}/rabbitmq-env.conf
-CONF_FILES+=		share/examples/rabbitmq/rabbitmq.config.example \
-			${PKG_SYSCONFDIR}/rabbitmq.config
+CONF_FILES+=		share/examples/rabbitmq/rabbitmq.conf.example \
+			${PKG_SYSCONFDIR}/rabbitmq.conf
 
 FILES_SUBST+=		RMQ_USER=${RMQ_USER}
 FILES_SUBST+=		RMQ_GROUP=${RMQ_GROUP}
@@ -64,8 +64,8 @@ SCRIPTS_DIR=		${WRKSRC}/deps/rabbit/scripts
 SUBST_CLASSES+=		paths
 SUBST_MESSAGE.paths=	Setting standard paths
 SUBST_STAGE.paths=	pre-build
-SUBST_FILES.paths=	${SCRIPTS_DIR}/rabbitmqctl ${SCRIPTS_DIR}/rabbitmq-env
-SUBST_FILES.paths+=	${SCRIPTS_DIR}/rabbitmq-plugins ${SCRIPTS_DIR}/rabbitmq-server
+SUBST_FILES.paths=	${SCRIPTS_DIR}/rabbitmq-env
+SUBST_FILES.paths+=	${SCRIPTS_DIR}/rabbitmq-server
 SUBST_FILES.paths+=	${SCRIPTS_DIR}/rabbitmq-defaults
 SUBST_SED.paths=	-e 's|/etc/rabbitmq|${PKG_SYSCONFDIR}|g'
 SUBST_SED.paths+=	-e 's|/var/lib|${VARBASE}/db|g'
@@ -77,11 +77,15 @@ REPLACE_BASH+=		${SCRIPTS_DIR}/rabbitmqctl
 REPLACE_BASH+=		${SCRIPTS_DIR}/rabbitmq-defaults
 REPLACE_BASH+=		${SCRIPTS_DIR}/rabbitmq-env
 REPLACE_BASH+=		${SCRIPTS_DIR}/rabbitmq-plugins
+REPLACE_BASH+=		${SCRIPTS_DIR}/rabbitmq-queues
 REPLACE_BASH+=		${SCRIPTS_DIR}/rabbitmq-server
+REPLACE_BASH+=		${SCRIPTS_DIR}/rabbitmq-upgrade
 
 # 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
+CHECK_INTERPRETER_SKIP+=	${RABBITMQ_HOME}/escript/rabbitmq-queues
+CHECK_INTERPRETER_SKIP+=	${RABBITMQ_HOME}/escript/rabbitmq-upgrade
 CHECK_INTERPRETER_SKIP+=	${RABBITMQ_HOME}/escript/rabbitmqctl
 CHECK_INTERPRETER_SKIP+=	${RABBITMQ_HOME}/sbin/cuttlefish
 
@@ -95,7 +99,7 @@ INSTALL_TARGET=		install-erlapp install-scripts install-bin install-man
 TEST_TARGET=		check
 
 post-install:
-	${INSTALL_DATA} ${WRKSRC}/deps/rabbit/docs/rabbitmq.config.example \
+	${INSTALL_DATA} ${WRKSRC}/deps/rabbit/docs/rabbitmq.conf.example \
 		${DESTDIR}${PREFIX}/share/examples/rabbitmq
 	${INSTALL_DATA} ${FILESDIR}/rabbitmq-env.conf \
 		${DESTDIR}${PREFIX}/share/examples/rabbitmq
diff --git a/net/rabbitmq/PLIST b/net/rabbitmq/PLIST
index d81d100f2b7..957fc2482d9 100644
--- a/net/rabbitmq/PLIST
+++ b/net/rabbitmq/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.33 2019/07/23 16:12:39 jperkin Exp $
+@comment $NetBSD: PLIST,v 1.34 2020/02/13 18:31:07 adam Exp $
 lib/erlang/autocomplete/bash_autocomplete.sh
 lib/erlang/autocomplete/zsh_autocomplete.sh
 lib/erlang/lib/rabbitmq_server-${PKGVERSION}/INSTALL
@@ -19,14 +19,17 @@ lib/erlang/lib/rabbitmq_server-${PKGVERSION}/LICENSE-MIT-Sammy
 lib/erlang/lib/rabbitmq_server-${PKGVERSION}/LICENSE-MIT-Sammy060
 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/dtree.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
@@ -46,6 +49,7 @@ lib/erlang/lib/rabbitmq_server-${PKGVERSION}/ebin/rabbit_auth_mechanism_amqplain
 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
@@ -60,6 +64,7 @@ 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
@@ -67,10 +72,12 @@ lib/erlang/lib/rabbitmq_server-${PKGVERSION}/ebin/rabbit_credential_validator_ac
 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
@@ -79,7 +86,13 @@ lib/erlang/lib/rabbitmq_server-${PKGVERSION}/ebin/rabbit_exchange_type_fanout.be
 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
@@ -132,6 +145,9 @@ lib/erlang/lib/rabbitmq_server-${PKGVERSION}/ebin/rabbit_queue_location_min_mast
 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
@@ -159,9 +175,17 @@ 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
@@ -170,21 +194,34 @@ 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/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/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/lager-3.6.10.ez
-lib/erlang/lib/rabbitmq_server-${PKGVERSION}/plugins/observer_cli-1.5.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/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_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
@@ -200,6 +237,7 @@ 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_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
@@ -216,29 +254,36 @@ lib/erlang/lib/rabbitmq_server-${PKGVERSION}/plugins/rabbitmq_web_stomp-${PKGVER
 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/syslog-3.4.5.ez
-lib/erlang/lib/rabbitmq_server-${PKGVERSION}/plugins/sysmon_handler-1.1.0.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}/sbin/rabbitmq-defaults
 lib/erlang/lib/rabbitmq_server-${PKGVERSION}/sbin/rabbitmq-diagnostics
 lib/erlang/lib/rabbitmq_server-${PKGVERSION}/sbin/rabbitmq-env
 lib/erlang/lib/rabbitmq_server-${PKGVERSION}/sbin/rabbitmq-plugins
+lib/erlang/lib/rabbitmq_server-${PKGVERSION}/sbin/rabbitmq-queues
 lib/erlang/lib/rabbitmq_server-${PKGVERSION}/sbin/rabbitmq-server
+lib/erlang/lib/rabbitmq_server-${PKGVERSION}/sbin/rabbitmq-upgrade
 lib/erlang/lib/rabbitmq_server-${PKGVERSION}/sbin/rabbitmqctl
 man/man5/rabbitmq-env.conf.5
 man/man8/rabbitmq-diagnostics.8
 man/man8/rabbitmq-echopid.8
 man/man8/rabbitmq-plugins.8
+man/man8/rabbitmq-queues.8
 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
 sbin/rabbitmq-plugins
+sbin/rabbitmq-queues
 sbin/rabbitmq-server
+sbin/rabbitmq-upgrade
 sbin/rabbitmqctl
 share/examples/rabbitmq/rabbitmq-env.conf
-share/examples/rabbitmq/rabbitmq.config.example
+share/examples/rabbitmq/rabbitmq.conf.example
diff --git a/net/rabbitmq/distinfo b/net/rabbitmq/distinfo
index 826fbcec4ad..396245b22f4 100644
--- a/net/rabbitmq/distinfo
+++ b/net/rabbitmq/distinfo
@@ -1,9 +1,10 @@
-$NetBSD: distinfo,v 1.43 2019/07/23 16:12:39 jperkin Exp $
+$NetBSD: distinfo,v 1.44 2020/02/13 18:31:07 adam Exp $
 
-SHA1 (rabbitmq-server-3.7.16.tar.xz) = 992d50b3b8a80b37b8161a9be063a1317a68fb98
-RMD160 (rabbitmq-server-3.7.16.tar.xz) = 8737a8e601be8931a3f933483f2ba3246f0e4b22
-SHA512 (rabbitmq-server-3.7.16.tar.xz) = 4fe0a197cf79e32cc7594341227c199e5f885fbc25fb8b0fe162758a3bef5da27dde1cbc0b9d102e8b7f8f119cc6350146225ff4dcfd3bb5a0b429b77e63d924
-Size (rabbitmq-server-3.7.16.tar.xz) = 2778324 bytes
+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 (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
diff --git a/net/rabbitmq/patches/patch-deps_rabbitmq__cli_mix.exs b/net/rabbitmq/patches/patch-deps_rabbitmq__cli_mix.exs
new file mode 100644
index 00000000000..824efe95b6f
--- /dev/null
+++ b/net/rabbitmq/patches/patch-deps_rabbitmq__cli_mix.exs
@@ -0,0 +1,15 @@
+$NetBSD: patch-deps_rabbitmq__cli_mix.exs,v 1.3 2020/02/13 18:31:07 adam Exp $
+
+Allow newer elixir.
+
+--- deps/rabbitmq_cli/mix.exs.orig	2020-02-13 12:29:34.000000000 +0000
++++ deps/rabbitmq_cli/mix.exs
+@@ -20,7 +20,7 @@ defmodule RabbitMQCtl.MixfileBase do
+     [
+       app: :rabbitmqctl,
+       version: "3.8.0-dev",
+-      elixir: ">= 1.7.0 and < 1.10.0",
++      elixir: ">= 1.7.0",
+       build_embedded: Mix.env == :prod,
+       start_permanent: Mix.env == :prod,
+       escript: [main_module: RabbitMQCtl,