3 files changed, 46 insertions, 11 deletions

diff --git a/net/rabbitmq/Makefile b/net/rabbitmq/Makefile
index 7bc700334f42..4445589d5ea6 100644
--- a/net/rabbitmq/Makefile
+++ b/net/rabbitmq/Makefile
@@ -2,7 +2,7 @@
 # $FreeBSD$
 
 PORTNAME=	rabbitmq
-PORTVERSION=	3.7.17
+DISTVERSION=	3.8.1
 CATEGORIES=	net
 MASTER_SITES=	https://github.com/rabbitmq/rabbitmq-server/releases/download/v${PORTVERSION}/
 DISTNAME=	${PORTNAME}-server-${PORTVERSION}
@@ -69,8 +69,10 @@ post-install:
 	@${MKDIR} ${STAGEDIR}${PREFIX}/etc/rabbitmq
 	@${MKDIR} ${STAGEDIR}/var/db/rabbitmq/mnesia
 	@${MKDIR} ${STAGEDIR}/var/log/rabbitmq
-	${INSTALL_DATA} ${WRKSRC}/deps/rabbit/docs/rabbitmq.config.example \
-	${STAGEDIR}${PREFIX}/etc/rabbitmq/rabbitmq.config.sample
+	${INSTALL_DATA} ${WRKSRC}/deps/rabbit/docs/advanced.config.example \
+	${STAGEDIR}${PREFIX}/etc/rabbitmq/advanced.config.sample
+	${INSTALL_DATA} ${WRKSRC}/deps/rabbit/docs/rabbitmq.conf.example \
+	${STAGEDIR}${PREFIX}/etc/rabbitmq/rabbitmq.conf.sample
 .for _file in rabbitmq-defaults rabbitmq-diagnostics rabbitmq-env rabbitmq-plugins rabbitmq-server rabbitmqctl
 	${LN} -s ../lib/rabbitmq_server-${PORTVERSION}/sbin/${_file} ${STAGEDIR}${PREFIX}/sbin
 .endfor
diff --git a/net/rabbitmq/distinfo b/net/rabbitmq/distinfo
index 3200c64fb577..7956ad2af7e1 100644
--- a/net/rabbitmq/distinfo
+++ b/net/rabbitmq/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1565703922
-SHA256 (rabbitmq-server-3.7.17.tar.xz) = 397f4515aa5e8e81ceda4d0946860b1ac2b881e22f93cbdc55339ab8e47e90f9
-SIZE (rabbitmq-server-3.7.17.tar.xz) = 2808260
+TIMESTAMP = 1572633485
+SHA256 (rabbitmq-server-3.8.1.tar.xz) = 30bff750079b3efda80d062a51044dbab787d071c80531dc938494f19ffcd59f
+SIZE (rabbitmq-server-3.8.1.tar.xz) = 15167384
diff --git a/net/rabbitmq/pkg-plist b/net/rabbitmq/pkg-plist
index 41132b623f57..04163e86f6ce 100644
--- a/net/rabbitmq/pkg-plist
+++ b/net/rabbitmq/pkg-plist
@@ -1,4 +1,5 @@
-@sample %%ETCDIR%%/rabbitmq.config.sample
+@sample %%ETCDIR%%/advanced.config.sample
+@sample %%ETCDIR%%/rabbitmq.conf.sample
 %%ADMIN%%bin/rabbitmqadmin
 lib/rabbitmq_server-%%VERSION%%/INSTALL
 lib/rabbitmq_server-%%VERSION%%/LICENSE
@@ -25,9 +26,10 @@ lib/rabbitmq_server-%%VERSION%%/LICENSE-erlcloud
 lib/rabbitmq_server-%%VERSION%%/LICENSE-httpc_aws
 lib/rabbitmq_server-%%VERSION%%/LICENSE-rabbitmq_aws
 lib/rabbitmq_server-%%VERSION%%/ebin/amqqueue.beam
+lib/rabbitmq_server-%%VERSION%%/ebin/amqqueue_v1.beam
 lib/rabbitmq_server-%%VERSION%%/ebin/background_gc.beam
 lib/rabbitmq_server-%%VERSION%%/ebin/code_server_cache.beam
-lib/rabbitmq_server-%%VERSION%%/ebin/dtree.beam
+lib/rabbitmq_server-%%VERSION%%/ebin/dep_built
 lib/rabbitmq_server-%%VERSION%%/ebin/gatherer.beam
 lib/rabbitmq_server-%%VERSION%%/ebin/gm.beam
 lib/rabbitmq_server-%%VERSION%%/ebin/lager_exchange_backend.beam
@@ -47,6 +49,7 @@ lib/rabbitmq_server-%%VERSION%%/ebin/rabbit_auth_mechanism_amqplain.beam
 lib/rabbitmq_server-%%VERSION%%/ebin/rabbit_auth_mechanism_cr_demo.beam
 lib/rabbitmq_server-%%VERSION%%/ebin/rabbit_auth_mechanism_plain.beam
 lib/rabbitmq_server-%%VERSION%%/ebin/rabbit_autoheal.beam
+lib/rabbitmq_server-%%VERSION%%/ebin/rabbit_backing_queue.beam
 lib/rabbitmq_server-%%VERSION%%/ebin/rabbit_basic.beam
 lib/rabbitmq_server-%%VERSION%%/ebin/rabbit_binding.beam
 lib/rabbitmq_server-%%VERSION%%/ebin/rabbit_boot_steps.beam
@@ -61,6 +64,7 @@ lib/rabbitmq_server-%%VERSION%%/ebin/rabbit_connection_sup.beam
 lib/rabbitmq_server-%%VERSION%%/ebin/rabbit_connection_tracking.beam
 lib/rabbitmq_server-%%VERSION%%/ebin/rabbit_connection_tracking_handler.beam
 lib/rabbitmq_server-%%VERSION%%/ebin/rabbit_control_pbe.beam
+lib/rabbitmq_server-%%VERSION%%/ebin/rabbit_core_ff.beam
 lib/rabbitmq_server-%%VERSION%%/ebin/rabbit_core_metrics_gc.beam
 lib/rabbitmq_server-%%VERSION%%/ebin/rabbit_credential_validation.beam
 lib/rabbitmq_server-%%VERSION%%/ebin/rabbit_credential_validator.beam
@@ -72,6 +76,7 @@ lib/rabbitmq_server-%%VERSION%%/ebin/rabbit_diagnostics.beam
 lib/rabbitmq_server-%%VERSION%%/ebin/rabbit_direct.beam
 lib/rabbitmq_server-%%VERSION%%/ebin/rabbit_disk_monitor.beam
 lib/rabbitmq_server-%%VERSION%%/ebin/rabbit_epmd_monitor.beam
+lib/rabbitmq_server-%%VERSION%%/ebin/rabbit_event_consumer.beam
 lib/rabbitmq_server-%%VERSION%%/ebin/rabbit_exchange.beam
 lib/rabbitmq_server-%%VERSION%%/ebin/rabbit_exchange_decorator.beam
 lib/rabbitmq_server-%%VERSION%%/ebin/rabbit_exchange_parameters.beam
@@ -84,6 +89,9 @@ lib/rabbitmq_server-%%VERSION%%/ebin/rabbit_feature_flags.beam
 lib/rabbitmq_server-%%VERSION%%/ebin/rabbit_ff_extra.beam
 lib/rabbitmq_server-%%VERSION%%/ebin/rabbit_ff_registry.beam
 lib/rabbitmq_server-%%VERSION%%/ebin/rabbit_fhc_helpers.beam
+lib/rabbitmq_server-%%VERSION%%/ebin/rabbit_fifo.beam
+lib/rabbitmq_server-%%VERSION%%/ebin/rabbit_fifo_client.beam
+lib/rabbitmq_server-%%VERSION%%/ebin/rabbit_fifo_index.beam
 lib/rabbitmq_server-%%VERSION%%/ebin/rabbit_file.beam
 lib/rabbitmq_server-%%VERSION%%/ebin/rabbit_framing.beam
 lib/rabbitmq_server-%%VERSION%%/ebin/rabbit_guid.beam
@@ -136,6 +144,9 @@ lib/rabbitmq_server-%%VERSION%%/ebin/rabbit_queue_location_min_masters.beam
 lib/rabbitmq_server-%%VERSION%%/ebin/rabbit_queue_location_random.beam
 lib/rabbitmq_server-%%VERSION%%/ebin/rabbit_queue_location_validator.beam
 lib/rabbitmq_server-%%VERSION%%/ebin/rabbit_queue_master_location_misc.beam
+lib/rabbitmq_server-%%VERSION%%/ebin/rabbit_queue_master_locator.beam
+lib/rabbitmq_server-%%VERSION%%/ebin/rabbit_quorum_memory_manager.beam
+lib/rabbitmq_server-%%VERSION%%/ebin/rabbit_quorum_queue.beam
 lib/rabbitmq_server-%%VERSION%%/ebin/rabbit_reader.beam
 lib/rabbitmq_server-%%VERSION%%/ebin/rabbit_recovery_terms.beam
 lib/rabbitmq_server-%%VERSION%%/ebin/rabbit_restartable_sup.beam
@@ -163,11 +174,16 @@ lib/rabbitmq_server-%%VERSION%%/ebin/supervised_lifecycle.beam
 lib/rabbitmq_server-%%VERSION%%/ebin/tcp_listener.beam
 lib/rabbitmq_server-%%VERSION%%/ebin/tcp_listener_sup.beam
 lib/rabbitmq_server-%%VERSION%%/ebin/term_to_binary_compat.beam
+lib/rabbitmq_server-%%VERSION%%/ebin/unconfirmed_messages.beam
+lib/rabbitmq_server-%%VERSION%%/ebin/vhost.beam
+lib/rabbitmq_server-%%VERSION%%/ebin/vhost_v1.beam
 lib/rabbitmq_server-%%VERSION%%/escript/rabbitmq-diagnostics
 lib/rabbitmq_server-%%VERSION%%/escript/rabbitmq-plugins
+lib/rabbitmq_server-%%VERSION%%/escript/rabbitmq-queues
 lib/rabbitmq_server-%%VERSION%%/escript/rabbitmqctl
 lib/rabbitmq_server-%%VERSION%%/include/amqqueue.hrl
 lib/rabbitmq_server-%%VERSION%%/include/amqqueue_v1.hrl
+lib/rabbitmq_server-%%VERSION%%/include/amqqueue_v2.hrl
 lib/rabbitmq_server-%%VERSION%%/include/gm_specs.hrl
 lib/rabbitmq_server-%%VERSION%%/include/rabbit.hrl
 lib/rabbitmq_server-%%VERSION%%/include/rabbit_core_metrics.hrl
@@ -176,21 +192,34 @@ lib/rabbitmq_server-%%VERSION%%/include/rabbit_log.hrl
 lib/rabbitmq_server-%%VERSION%%/include/rabbit_memory.hrl
 lib/rabbitmq_server-%%VERSION%%/include/rabbit_misc.hrl
 lib/rabbitmq_server-%%VERSION%%/include/rabbit_msg_store.hrl
+lib/rabbitmq_server-%%VERSION%%/include/resource.hrl
+lib/rabbitmq_server-%%VERSION%%/include/vhost.hrl
+lib/rabbitmq_server-%%VERSION%%/include/vhost_v1.hrl
+lib/rabbitmq_server-%%VERSION%%/include/vhost_v2.hrl
 lib/rabbitmq_server-%%VERSION%%/plugins/README
+lib/rabbitmq_server-%%VERSION%%/plugins/accept-0.3.5.ez
 lib/rabbitmq_server-%%VERSION%%/plugins/amqp10_client-%%VERSION%%.ez
 lib/rabbitmq_server-%%VERSION%%/plugins/amqp10_common-%%VERSION%%.ez
 lib/rabbitmq_server-%%VERSION%%/plugins/amqp_client-%%VERSION%%.ez
+lib/rabbitmq_server-%%VERSION%%/plugins/aten-0.5.2.ez
+lib/rabbitmq_server-%%VERSION%%/plugins/base64url-1.0.1.ez
 lib/rabbitmq_server-%%VERSION%%/plugins/cowboy-2.6.1.ez
 lib/rabbitmq_server-%%VERSION%%/plugins/cowlib-2.7.0.ez
+lib/rabbitmq_server-%%VERSION%%/plugins/credentials_obfuscation-1.1.0.ez
+lib/rabbitmq_server-%%VERSION%%/plugins/gen_batch_server-0.8.0.ez
 lib/rabbitmq_server-%%VERSION%%/plugins/goldrush-0.1.9.ez
+lib/rabbitmq_server-%%VERSION%%/plugins/jose-1.8.4.ez
 lib/rabbitmq_server-%%VERSION%%/plugins/jsx-2.9.0.ez
-lib/rabbitmq_server-%%VERSION%%/plugins/lager-3.6.10.ez
-lib/rabbitmq_server-%%VERSION%%/plugins/observer_cli-1.5.0.ez
+lib/rabbitmq_server-%%VERSION%%/plugins/lager-3.8.0.ez
+lib/rabbitmq_server-%%VERSION%%/plugins/observer_cli-1.5.2.ez
+lib/rabbitmq_server-%%VERSION%%/plugins/prometheus-4.4.0.ez
+lib/rabbitmq_server-%%VERSION%%/plugins/ra-1.0.4.ez
 lib/rabbitmq_server-%%VERSION%%/plugins/rabbit_common-%%VERSION%%.ez
 lib/rabbitmq_server-%%VERSION%%/plugins/rabbitmq_amqp1_0-%%VERSION%%.ez
 lib/rabbitmq_server-%%VERSION%%/plugins/rabbitmq_auth_backend_cache-%%VERSION%%.ez
 lib/rabbitmq_server-%%VERSION%%/plugins/rabbitmq_auth_backend_http-%%VERSION%%.ez
 lib/rabbitmq_server-%%VERSION%%/plugins/rabbitmq_auth_backend_ldap-%%VERSION%%.ez
+lib/rabbitmq_server-%%VERSION%%/plugins/rabbitmq_auth_backend_oauth2-%%VERSION%%.ez
 lib/rabbitmq_server-%%VERSION%%/plugins/rabbitmq_auth_mechanism_ssl-%%VERSION%%.ez
 lib/rabbitmq_server-%%VERSION%%/plugins/rabbitmq_aws-%%VERSION%%.ez
 lib/rabbitmq_server-%%VERSION%%/plugins/rabbitmq_consistent_hash_exchange-%%VERSION%%.ez
@@ -206,6 +235,7 @@ lib/rabbitmq_server-%%VERSION%%/plugins/rabbitmq_peer_discovery_common-%%VERSION
 lib/rabbitmq_server-%%VERSION%%/plugins/rabbitmq_peer_discovery_consul-%%VERSION%%.ez
 lib/rabbitmq_server-%%VERSION%%/plugins/rabbitmq_peer_discovery_etcd-%%VERSION%%.ez
 lib/rabbitmq_server-%%VERSION%%/plugins/rabbitmq_peer_discovery_k8s-%%VERSION%%.ez
+lib/rabbitmq_server-%%VERSION%%/plugins/rabbitmq_prometheus-%%VERSION%%.ez
 lib/rabbitmq_server-%%VERSION%%/plugins/rabbitmq_random_exchange-%%VERSION%%.ez
 lib/rabbitmq_server-%%VERSION%%/plugins/rabbitmq_recent_history_exchange-%%VERSION%%.ez
 lib/rabbitmq_server-%%VERSION%%/plugins/rabbitmq_sharding-%%VERSION%%.ez
@@ -224,21 +254,24 @@ lib/rabbitmq_server-%%VERSION%%/plugins/ranch-1.7.1.ez
 lib/rabbitmq_server-%%VERSION%%/plugins/recon-2.5.0.ez
 lib/rabbitmq_server-%%VERSION%%/plugins/stdout_formatter-0.2.2.ez
 lib/rabbitmq_server-%%VERSION%%/plugins/syslog-3.4.5.ez
-lib/rabbitmq_server-%%VERSION%%/plugins/sysmon_handler-1.1.0.ez
+lib/rabbitmq_server-%%VERSION%%/plugins/sysmon_handler-1.2.0.ez
 lib/rabbitmq_server-%%VERSION%%/priv/schema/rabbit.schema
 lib/rabbitmq_server-%%VERSION%%/sbin/cuttlefish
 lib/rabbitmq_server-%%VERSION%%/sbin/rabbitmq-defaults
 lib/rabbitmq_server-%%VERSION%%/sbin/rabbitmq-diagnostics
 lib/rabbitmq_server-%%VERSION%%/sbin/rabbitmq-env
 lib/rabbitmq_server-%%VERSION%%/sbin/rabbitmq-plugins
+lib/rabbitmq_server-%%VERSION%%/sbin/rabbitmq-queues
 lib/rabbitmq_server-%%VERSION%%/sbin/rabbitmq-server
 lib/rabbitmq_server-%%VERSION%%/sbin/rabbitmqctl
 man/man5/rabbitmq-env.conf.5.gz
 man/man8/rabbitmq-diagnostics.8.gz
 man/man8/rabbitmq-echopid.8.gz
 man/man8/rabbitmq-plugins.8.gz
+man/man8/rabbitmq-queues.8.gz
 man/man8/rabbitmq-server.8.gz
 man/man8/rabbitmq-service.8.gz
+man/man8/rabbitmq-upgrade.8.gz
 man/man8/rabbitmqctl.8.gz
 sbin/rabbitmq-defaults
 sbin/rabbitmq-diagnostics