Update net/rabbitmq to version 3.6.1.

From the release notes:

    This release fixes a number of bugs in 3.6.0 and earlier versions,
    as well as one security issue (CVE-2015-8786) in the management
    plugin. It also contains usability improvements.

CVE 2015-8786 has not been publicly announced yet.

Security:	CVE-2015-8786

4 files changed, 57 insertions, 104 deletions

diff --git a/net/rabbitmq/Makefile b/net/rabbitmq/Makefile
index a5a2ff280be3..36690b139c48 100644
--- a/net/rabbitmq/Makefile
+++ b/net/rabbitmq/Makefile
@@ -2,8 +2,7 @@
 # $FreeBSD$
 
 PORTNAME=	rabbitmq
-PORTVERSION=	3.5.7
-PORTREVISION=	3
+PORTVERSION=	3.6.1
 CATEGORIES=	net
 MASTER_SITES=	http://www.rabbitmq.com/releases/rabbitmq-server/v${PORTVERSION}/
 DISTNAME=	${PORTNAME}-server-${PORTVERSION}
@@ -17,18 +16,19 @@ BUILD_DEPENDS=	erl:${PORTSDIR}/lang/erlang \
 		${PYTHON_PKGNAMEPREFIX}simplejson>=2.0:${PORTSDIR}/devel/py-simplejson \
 		xmlto:${PORTSDIR}/textproc/xmlto \
 		unzip:${PORTSDIR}/archivers/unzip \
-		zip:${PORTSDIR}/archivers/zip
+		zip:${PORTSDIR}/archivers/zip \
+		rsync:${PORTSDIR}/net/rsync
 RUN_DEPENDS=	erl:${PORTSDIR}/lang/erlang
 
 OPTIONS_DEFINE=	ADMIN
 OPTIONS_SUB=	yes
 
 ADMIN_DESC=	Install rabbitmqadmin script
+ADMIN_USES=	python:run
 
-USES=		cpe gmake python:build shebangfix
+ALL_TARGET=	all manpages
+USES=		cpe gmake python:build tar:xz
 USE_RC_SUBR=	rabbitmq
-SHEBANG_FILES=	calculate-relative plugins-src/rabbitmq-amqp1.0/codegen.py
-python_OLD_CMD=	.*python
 NO_ARCH=	yes
 
 USERS=		rabbitmq
@@ -38,6 +38,7 @@ PLIST_SUB=	VERSION=${PORTVERSION}
 
 CPE_VENDOR=	pivotal_software
 
+REINPLACE_ARGS=	-i ""
 SCRIPTS_DIR=	${WRKSRC}/scripts/
 MAKE_ARGS+=	PYTHON=${PYTHON_CMD}
 MAKE_ENV+=	TARGET_DIR="${STAGEDIR}${PREFIX}/lib/erlang/lib/rabbitmq_server-${PORTVERSION}" \
@@ -49,24 +50,14 @@ MAKE_JOBS_UNSAFE=	yes
 
 .include <bsd.port.options.mk>
 
-.if ${PORT_OPTIONS:MADMIN}
-USES+=		python:run
-.endif
-
 post-patch:
 	@${REINPLACE_CMD} -e 's|/etc/rabbitmq|${PREFIX}/etc/rabbitmq|g ; s|/var/lib|/var/db|g ; s|$${ERL_DIR}erl|${PREFIX}/bin/erl|g' \
-		${SCRIPTS_DIR}/rabbitmq-server ${SCRIPTS_DIR}/rabbitmqctl \
-		${SCRIPTS_DIR}/rabbitmq-env ${SCRIPTS_DIR}/rabbitmq-plugins \
+		${SCRIPTS_DIR}/rabbitmq-server \
+		${SCRIPTS_DIR}/rabbitmqctl \
+		${SCRIPTS_DIR}/rabbitmq-env \
+		${SCRIPTS_DIR}/rabbitmq-plugins \
 		${SCRIPTS_DIR}/rabbitmq-defaults \
 		${WRKSRC}/docs/rabbitmq-env.conf.5.xml
-	@${REINPLACE_CMD} -e 's|VERSION=0.0.0|VERSION=${PORTVERSION}|g' \
-		${WRKSRC}/plugins-src/rabbitmq-erlang-client/Makefile \
-		${WRKSRC}/plugins-src/release.mk
-	@${REINPLACE_CMD} -e 's|VERSION:=0.0.0|VERSION:=${PORTVERSION}|g' \
-		${WRKSRC}/plugins-src/Makefile
-	@${REINPLACE_CMD} -e 's|VERSION?=0.0.0|VERSION?=${PORTVERSION}|g' \
-		${WRKSRC}/Makefile
-	@${FIND} ${WRKSRC} -name "*.bak" -delete
 
 post-install:
 	@${MKDIR} ${STAGEDIR}${PREFIX}/etc/rabbitmq
@@ -74,8 +65,15 @@ post-install:
 	@${MKDIR} ${STAGEDIR}/var/log/rabbitmq
 	${INSTALL_DATA} ${WRKSRC}/docs/rabbitmq.config.example \
 		${STAGEDIR}${PREFIX}/etc/rabbitmq/rabbitmq.config.sample
-.if ${PORT_OPTIONS:MADMIN}
-	${INSTALL} ${WRKSRC}/plugins-src/rabbitmq-management/bin/rabbitmqadmin ${STAGEDIR}${PREFIX}/bin
-.endif
+.for _file in rabbitmq-defaults rabbitmq-env rabbitmq-plugins rabbitmq-server rabbitmqctl
+	${LN} -s ../lib/erlang/lib/rabbitmq_server-${PORTVERSION}/sbin/${_file} ${STAGEDIR}${PREFIX}/sbin
+.endfor
+.for _file in rabbitmq-plugins.1 rabbitmq-server.1 rabbitmqctl.1
+	${INSTALL_MAN} ${WRKSRC}/docs/${_file} ${STAGEDIR}${MAN1PREFIX}/man/man1
+.endfor
+	${INSTALL_MAN} ${WRKSRC}/docs/rabbitmq-env.conf.5 ${STAGEDIR}${MAN5PREFIX}/man/man5
+
+post-install-ADMIN-on:
+	${INSTALL} ${WRKSRC}/deps/rabbitmq_management/bin/rabbitmqadmin ${STAGEDIR}${PREFIX}/bin
 
 .include <bsd.port.mk>
diff --git a/net/rabbitmq/distinfo b/net/rabbitmq/distinfo
index 89081eb6bdfe..5f62731d0883 100644
--- a/net/rabbitmq/distinfo
+++ b/net/rabbitmq/distinfo
@@ -1,2 +1,2 @@
-SHA256 (rabbitmq-server-3.5.7.tar.gz) = 380c9cab8f24add440a0aead3b70a0830e0f32a531139828003ae18e08b72028
-SIZE (rabbitmq-server-3.5.7.tar.gz) = 3919168
+SHA256 (rabbitmq-server-3.6.1.tar.xz) = c696134e863f99191a301288c12d69ff00b7e648107ee52c8686ae047dde1bee
+SIZE (rabbitmq-server-3.6.1.tar.xz) = 2895888
diff --git a/net/rabbitmq/files/patch-src_rabbit__misc.erl b/net/rabbitmq/files/patch-src_rabbit__misc.erl
deleted file mode 100644
index 8d22f46b7e1d..000000000000
--- a/net/rabbitmq/files/patch-src_rabbit__misc.erl
+++ /dev/null
@@ -1,22 +0,0 @@
---- src/rabbit_misc.erl.orig	2015-12-15 10:23:52 UTC
-+++ src/rabbit_misc.erl
-@@ -652,18 +652,7 @@ format_many(List) ->
-     lists:flatten([io_lib:format(F ++ "~n", A) || {F, A} <- List]).
- 
- format_stderr(Fmt, Args) ->
--    case os:type() of
--        {unix, _} ->
--            Port = open_port({fd, 0, 2}, [out]),
--            port_command(Port, io_lib:format(Fmt, Args)),
--            port_close(Port);
--        {win32, _} ->
--            %% stderr on Windows is buffered and I can't figure out a
--            %% way to trigger a fflush(stderr) in Erlang. So rather
--            %% than risk losing output we write to stdout instead,
--            %% which appears to be unbuffered.
--            io:format(Fmt, Args)
--    end,
-+    io:format(standard_error, Fmt, Args),
-     ok.
- 
- unfold(Fun, Init) ->
diff --git a/net/rabbitmq/pkg-plist b/net/rabbitmq/pkg-plist
index c52864fa7db7..87aae6120da4 100644
--- a/net/rabbitmq/pkg-plist
+++ b/net/rabbitmq/pkg-plist
@@ -1,79 +1,58 @@
-@sample etc/rabbitmq/rabbitmq.config.sample
+@sample %%ETCDIR%%/rabbitmq.config.sample
 %%ADMIN%%bin/rabbitmqadmin
-sbin/rabbitmq-defaults
-sbin/rabbitmq-env
-sbin/rabbitmq-server
-sbin/rabbitmqctl
-sbin/rabbitmq-plugins
 lib/erlang/lib/rabbitmq_server-%%VERSION%%/INSTALL
 lib/erlang/lib/rabbitmq_server-%%VERSION%%/LICENSE
 lib/erlang/lib/rabbitmq_server-%%VERSION%%/LICENSE-APACHE2-ExplorerCanvas
+lib/erlang/lib/rabbitmq_server-%%VERSION%%/LICENSE-APL2-Rebar
 lib/erlang/lib/rabbitmq_server-%%VERSION%%/LICENSE-APL2-Stomp-Websocket
-lib/erlang/lib/rabbitmq_server-%%VERSION%%/LICENSE-Apache-Basho
 lib/erlang/lib/rabbitmq_server-%%VERSION%%/LICENSE-BSD-base64js
 lib/erlang/lib/rabbitmq_server-%%VERSION%%/LICENSE-BSD-glMatrix
+lib/erlang/lib/rabbitmq_server-%%VERSION%%/LICENSE-EPL-OTP
 lib/erlang/lib/rabbitmq_server-%%VERSION%%/LICENSE-MIT-EJS10
 lib/erlang/lib/rabbitmq_server-%%VERSION%%/LICENSE-MIT-Flot
 lib/erlang/lib/rabbitmq_server-%%VERSION%%/LICENSE-MIT-Mochi
+lib/erlang/lib/rabbitmq_server-%%VERSION%%/LICENSE-MIT-Mochiweb
 lib/erlang/lib/rabbitmq_server-%%VERSION%%/LICENSE-MIT-Sammy060
-lib/erlang/lib/rabbitmq_server-%%VERSION%%/LICENSE-MIT-eldap
+lib/erlang/lib/rabbitmq_server-%%VERSION%%/LICENSE-MIT-SockJS
 lib/erlang/lib/rabbitmq_server-%%VERSION%%/LICENSE-MIT-jQuery164
 lib/erlang/lib/rabbitmq_server-%%VERSION%%/LICENSE-MPL-RabbitMQ
-lib/erlang/lib/rabbitmq_server-%%VERSION%%/ebin/app_utils.beam
+lib/erlang/lib/rabbitmq_server-%%VERSION%%/LICENSE-MPL2
 lib/erlang/lib/rabbitmq_server-%%VERSION%%/ebin/background_gc.beam
-lib/erlang/lib/rabbitmq_server-%%VERSION%%/ebin/credit_flow.beam
 lib/erlang/lib/rabbitmq_server-%%VERSION%%/ebin/delegate.beam
 lib/erlang/lib/rabbitmq_server-%%VERSION%%/ebin/delegate_sup.beam
 lib/erlang/lib/rabbitmq_server-%%VERSION%%/ebin/dtree.beam
 lib/erlang/lib/rabbitmq_server-%%VERSION%%/ebin/file_handle_cache.beam
 lib/erlang/lib/rabbitmq_server-%%VERSION%%/ebin/file_handle_cache_stats.beam
 lib/erlang/lib/rabbitmq_server-%%VERSION%%/ebin/gatherer.beam
-lib/erlang/lib/rabbitmq_server-%%VERSION%%/ebin/gen_server2.beam
 lib/erlang/lib/rabbitmq_server-%%VERSION%%/ebin/gm.beam
 lib/erlang/lib/rabbitmq_server-%%VERSION%%/ebin/lqueue.beam
-lib/erlang/lib/rabbitmq_server-%%VERSION%%/ebin/mirrored_supervisor.beam
 lib/erlang/lib/rabbitmq_server-%%VERSION%%/ebin/mirrored_supervisor_sups.beam
 lib/erlang/lib/rabbitmq_server-%%VERSION%%/ebin/mnesia_sync.beam
-lib/erlang/lib/rabbitmq_server-%%VERSION%%/ebin/mochijson2.beam
 lib/erlang/lib/rabbitmq_server-%%VERSION%%/ebin/mochinum.beam
 lib/erlang/lib/rabbitmq_server-%%VERSION%%/ebin/pg2_fixed.beam
 lib/erlang/lib/rabbitmq_server-%%VERSION%%/ebin/pg_local.beam
-lib/erlang/lib/rabbitmq_server-%%VERSION%%/ebin/pmon.beam
-lib/erlang/lib/rabbitmq_server-%%VERSION%%/ebin/priority_queue.beam
 lib/erlang/lib/rabbitmq_server-%%VERSION%%/ebin/rabbit.app
 lib/erlang/lib/rabbitmq_server-%%VERSION%%/ebin/rabbit.beam
 lib/erlang/lib/rabbitmq_server-%%VERSION%%/ebin/rabbit_access_control.beam
 lib/erlang/lib/rabbitmq_server-%%VERSION%%/ebin/rabbit_alarm.beam
-lib/erlang/lib/rabbitmq_server-%%VERSION%%/ebin/rabbit_amqqueue.beam
 lib/erlang/lib/rabbitmq_server-%%VERSION%%/ebin/rabbit_amqqueue_process.beam
 lib/erlang/lib/rabbitmq_server-%%VERSION%%/ebin/rabbit_amqqueue_sup.beam
 lib/erlang/lib/rabbitmq_server-%%VERSION%%/ebin/rabbit_amqqueue_sup_sup.beam
-lib/erlang/lib/rabbitmq_server-%%VERSION%%/ebin/rabbit_app.in
 lib/erlang/lib/rabbitmq_server-%%VERSION%%/ebin/rabbit_auth_backend_dummy.beam
 lib/erlang/lib/rabbitmq_server-%%VERSION%%/ebin/rabbit_auth_backend_internal.beam
-lib/erlang/lib/rabbitmq_server-%%VERSION%%/ebin/rabbit_auth_mechanism.beam
 lib/erlang/lib/rabbitmq_server-%%VERSION%%/ebin/rabbit_auth_mechanism_amqplain.beam
 lib/erlang/lib/rabbitmq_server-%%VERSION%%/ebin/rabbit_auth_mechanism_cr_demo.beam
 lib/erlang/lib/rabbitmq_server-%%VERSION%%/ebin/rabbit_auth_mechanism_plain.beam
-lib/erlang/lib/rabbitmq_server-%%VERSION%%/ebin/rabbit_authn_backend.beam
-lib/erlang/lib/rabbitmq_server-%%VERSION%%/ebin/rabbit_authz_backend.beam
 lib/erlang/lib/rabbitmq_server-%%VERSION%%/ebin/rabbit_autoheal.beam
-lib/erlang/lib/rabbitmq_server-%%VERSION%%/ebin/rabbit_backing_queue.beam
-lib/erlang/lib/rabbitmq_server-%%VERSION%%/ebin/rabbit_basic.beam
-lib/erlang/lib/rabbitmq_server-%%VERSION%%/ebin/rabbit_binary_generator.beam
-lib/erlang/lib/rabbitmq_server-%%VERSION%%/ebin/rabbit_binary_parser.beam
 lib/erlang/lib/rabbitmq_server-%%VERSION%%/ebin/rabbit_binding.beam
-lib/erlang/lib/rabbitmq_server-%%VERSION%%/ebin/rabbit_channel.beam
-lib/erlang/lib/rabbitmq_server-%%VERSION%%/ebin/rabbit_channel_interceptor.beam
+lib/erlang/lib/rabbitmq_server-%%VERSION%%/ebin/rabbit_boot_steps.beam
 lib/erlang/lib/rabbitmq_server-%%VERSION%%/ebin/rabbit_channel_sup.beam
 lib/erlang/lib/rabbitmq_server-%%VERSION%%/ebin/rabbit_channel_sup_sup.beam
 lib/erlang/lib/rabbitmq_server-%%VERSION%%/ebin/rabbit_cli.beam
 lib/erlang/lib/rabbitmq_server-%%VERSION%%/ebin/rabbit_client_sup.beam
-lib/erlang/lib/rabbitmq_server-%%VERSION%%/ebin/rabbit_command_assembler.beam
 lib/erlang/lib/rabbitmq_server-%%VERSION%%/ebin/rabbit_connection_helper_sup.beam
 lib/erlang/lib/rabbitmq_server-%%VERSION%%/ebin/rabbit_connection_sup.beam
 lib/erlang/lib/rabbitmq_server-%%VERSION%%/ebin/rabbit_control_main.beam
-lib/erlang/lib/rabbitmq_server-%%VERSION%%/ebin/rabbit_ctl_misc.beam
 lib/erlang/lib/rabbitmq_server-%%VERSION%%/ebin/rabbit_ctl_usage.beam
 lib/erlang/lib/rabbitmq_server-%%VERSION%%/ebin/rabbit_dead_letter.beam
 lib/erlang/lib/rabbitmq_server-%%VERSION%%/ebin/rabbit_diagnostics.beam
@@ -82,10 +61,8 @@ lib/erlang/lib/rabbitmq_server-%%VERSION%%/ebin/rabbit_disk_monitor.beam
 lib/erlang/lib/rabbitmq_server-%%VERSION%%/ebin/rabbit_epmd_monitor.beam
 lib/erlang/lib/rabbitmq_server-%%VERSION%%/ebin/rabbit_error_logger.beam
 lib/erlang/lib/rabbitmq_server-%%VERSION%%/ebin/rabbit_error_logger_file_h.beam
-lib/erlang/lib/rabbitmq_server-%%VERSION%%/ebin/rabbit_event.beam
 lib/erlang/lib/rabbitmq_server-%%VERSION%%/ebin/rabbit_exchange.beam
-lib/erlang/lib/rabbitmq_server-%%VERSION%%/ebin/rabbit_exchange_decorator.beam
-lib/erlang/lib/rabbitmq_server-%%VERSION%%/ebin/rabbit_exchange_type.beam
+lib/erlang/lib/rabbitmq_server-%%VERSION%%/ebin/rabbit_exchange_parameters.beam
 lib/erlang/lib/rabbitmq_server-%%VERSION%%/ebin/rabbit_exchange_type_direct.beam
 lib/erlang/lib/rabbitmq_server-%%VERSION%%/ebin/rabbit_exchange_type_fanout.beam
 lib/erlang/lib/rabbitmq_server-%%VERSION%%/ebin/rabbit_exchange_type_headers.beam
@@ -93,10 +70,8 @@ lib/erlang/lib/rabbitmq_server-%%VERSION%%/ebin/rabbit_exchange_type_invalid.bea
 lib/erlang/lib/rabbitmq_server-%%VERSION%%/ebin/rabbit_exchange_type_topic.beam
 lib/erlang/lib/rabbitmq_server-%%VERSION%%/ebin/rabbit_file.beam
 lib/erlang/lib/rabbitmq_server-%%VERSION%%/ebin/rabbit_framing.beam
-lib/erlang/lib/rabbitmq_server-%%VERSION%%/ebin/rabbit_framing_amqp_0_8.beam
-lib/erlang/lib/rabbitmq_server-%%VERSION%%/ebin/rabbit_framing_amqp_0_9_1.beam
 lib/erlang/lib/rabbitmq_server-%%VERSION%%/ebin/rabbit_guid.beam
-lib/erlang/lib/rabbitmq_server-%%VERSION%%/ebin/rabbit_heartbeat.beam
+lib/erlang/lib/rabbitmq_server-%%VERSION%%/ebin/rabbit_hipe.beam
 lib/erlang/lib/rabbitmq_server-%%VERSION%%/ebin/rabbit_limiter.beam
 lib/erlang/lib/rabbitmq_server-%%VERSION%%/ebin/rabbit_log.beam
 lib/erlang/lib/rabbitmq_server-%%VERSION%%/ebin/rabbit_memory_monitor.beam
@@ -109,38 +84,38 @@ lib/erlang/lib/rabbitmq_server-%%VERSION%%/ebin/rabbit_mirror_queue_mode_exactly
 lib/erlang/lib/rabbitmq_server-%%VERSION%%/ebin/rabbit_mirror_queue_mode_nodes.beam
 lib/erlang/lib/rabbitmq_server-%%VERSION%%/ebin/rabbit_mirror_queue_slave.beam
 lib/erlang/lib/rabbitmq_server-%%VERSION%%/ebin/rabbit_mirror_queue_sync.beam
-lib/erlang/lib/rabbitmq_server-%%VERSION%%/ebin/rabbit_misc.beam
 lib/erlang/lib/rabbitmq_server-%%VERSION%%/ebin/rabbit_mnesia.beam
 lib/erlang/lib/rabbitmq_server-%%VERSION%%/ebin/rabbit_mnesia_rename.beam
 lib/erlang/lib/rabbitmq_server-%%VERSION%%/ebin/rabbit_msg_file.beam
 lib/erlang/lib/rabbitmq_server-%%VERSION%%/ebin/rabbit_msg_store.beam
 lib/erlang/lib/rabbitmq_server-%%VERSION%%/ebin/rabbit_msg_store_ets_index.beam
 lib/erlang/lib/rabbitmq_server-%%VERSION%%/ebin/rabbit_msg_store_gc.beam
-lib/erlang/lib/rabbitmq_server-%%VERSION%%/ebin/rabbit_msg_store_index.beam
-lib/erlang/lib/rabbitmq_server-%%VERSION%%/ebin/rabbit_net.beam
-lib/erlang/lib/rabbitmq_server-%%VERSION%%/ebin/rabbit_networking.beam
 lib/erlang/lib/rabbitmq_server-%%VERSION%%/ebin/rabbit_node_monitor.beam
-lib/erlang/lib/rabbitmq_server-%%VERSION%%/ebin/rabbit_nodes.beam
 lib/erlang/lib/rabbitmq_server-%%VERSION%%/ebin/rabbit_parameter_validation.beam
+lib/erlang/lib/rabbitmq_server-%%VERSION%%/ebin/rabbit_password.beam
+lib/erlang/lib/rabbitmq_server-%%VERSION%%/ebin/rabbit_password_hashing_md5.beam
+lib/erlang/lib/rabbitmq_server-%%VERSION%%/ebin/rabbit_password_hashing_sha256.beam
+lib/erlang/lib/rabbitmq_server-%%VERSION%%/ebin/rabbit_password_hashing_sha512.beam
 lib/erlang/lib/rabbitmq_server-%%VERSION%%/ebin/rabbit_plugins.beam
 lib/erlang/lib/rabbitmq_server-%%VERSION%%/ebin/rabbit_plugins_main.beam
 lib/erlang/lib/rabbitmq_server-%%VERSION%%/ebin/rabbit_plugins_usage.beam
 lib/erlang/lib/rabbitmq_server-%%VERSION%%/ebin/rabbit_policies.beam
 lib/erlang/lib/rabbitmq_server-%%VERSION%%/ebin/rabbit_policy.beam
-lib/erlang/lib/rabbitmq_server-%%VERSION%%/ebin/rabbit_policy_validator.beam
 lib/erlang/lib/rabbitmq_server-%%VERSION%%/ebin/rabbit_prelaunch.beam
 lib/erlang/lib/rabbitmq_server-%%VERSION%%/ebin/rabbit_prequeue.beam
 lib/erlang/lib/rabbitmq_server-%%VERSION%%/ebin/rabbit_priority_queue.beam
-lib/erlang/lib/rabbitmq_server-%%VERSION%%/ebin/rabbit_queue_collector.beam
 lib/erlang/lib/rabbitmq_server-%%VERSION%%/ebin/rabbit_queue_consumers.beam
-lib/erlang/lib/rabbitmq_server-%%VERSION%%/ebin/rabbit_queue_decorator.beam
 lib/erlang/lib/rabbitmq_server-%%VERSION%%/ebin/rabbit_queue_index.beam
-lib/erlang/lib/rabbitmq_server-%%VERSION%%/ebin/rabbit_reader.beam
+lib/erlang/lib/rabbitmq_server-%%VERSION%%/ebin/rabbit_queue_location_client_local.beam
+lib/erlang/lib/rabbitmq_server-%%VERSION%%/ebin/rabbit_queue_location_min_masters.beam
+lib/erlang/lib/rabbitmq_server-%%VERSION%%/ebin/rabbit_queue_location_random.beam
+lib/erlang/lib/rabbitmq_server-%%VERSION%%/ebin/rabbit_queue_location_validator.beam
+lib/erlang/lib/rabbitmq_server-%%VERSION%%/ebin/rabbit_queue_master_location_misc.beam
 lib/erlang/lib/rabbitmq_server-%%VERSION%%/ebin/rabbit_recovery_terms.beam
 lib/erlang/lib/rabbitmq_server-%%VERSION%%/ebin/rabbit_registry.beam
+lib/erlang/lib/rabbitmq_server-%%VERSION%%/ebin/rabbit_resource_monitor_misc.beam
 lib/erlang/lib/rabbitmq_server-%%VERSION%%/ebin/rabbit_restartable_sup.beam
 lib/erlang/lib/rabbitmq_server-%%VERSION%%/ebin/rabbit_router.beam
-lib/erlang/lib/rabbitmq_server-%%VERSION%%/ebin/rabbit_runtime_parameter.beam
 lib/erlang/lib/rabbitmq_server-%%VERSION%%/ebin/rabbit_runtime_parameters.beam
 lib/erlang/lib/rabbitmq_server-%%VERSION%%/ebin/rabbit_sasl_report_file_h.beam
 lib/erlang/lib/rabbitmq_server-%%VERSION%%/ebin/rabbit_ssl.beam
@@ -154,15 +129,9 @@ lib/erlang/lib/rabbitmq_server-%%VERSION%%/ebin/rabbit_variable_queue.beam
 lib/erlang/lib/rabbitmq_server-%%VERSION%%/ebin/rabbit_version.beam
 lib/erlang/lib/rabbitmq_server-%%VERSION%%/ebin/rabbit_vhost.beam
 lib/erlang/lib/rabbitmq_server-%%VERSION%%/ebin/rabbit_vm.beam
-lib/erlang/lib/rabbitmq_server-%%VERSION%%/ebin/rabbit_writer.beam
-lib/erlang/lib/rabbitmq_server-%%VERSION%%/ebin/ssl_compat.beam
 lib/erlang/lib/rabbitmq_server-%%VERSION%%/ebin/supervised_lifecycle.beam
-lib/erlang/lib/rabbitmq_server-%%VERSION%%/ebin/supervisor2.beam
-lib/erlang/lib/rabbitmq_server-%%VERSION%%/ebin/tcp_acceptor.beam
-lib/erlang/lib/rabbitmq_server-%%VERSION%%/ebin/tcp_acceptor_sup.beam
 lib/erlang/lib/rabbitmq_server-%%VERSION%%/ebin/tcp_listener.beam
 lib/erlang/lib/rabbitmq_server-%%VERSION%%/ebin/tcp_listener_sup.beam
-lib/erlang/lib/rabbitmq_server-%%VERSION%%/ebin/time_compat.beam
 lib/erlang/lib/rabbitmq_server-%%VERSION%%/ebin/truncate.beam
 lib/erlang/lib/rabbitmq_server-%%VERSION%%/ebin/vm_memory_monitor.beam
 lib/erlang/lib/rabbitmq_server-%%VERSION%%/ebin/worker_pool.beam
@@ -175,29 +144,33 @@ lib/erlang/lib/rabbitmq_server-%%VERSION%%/include/rabbit_framing.hrl
 lib/erlang/lib/rabbitmq_server-%%VERSION%%/include/rabbit_msg_store.hrl
 lib/erlang/lib/rabbitmq_server-%%VERSION%%/plugins/README
 lib/erlang/lib/rabbitmq_server-%%VERSION%%/plugins/amqp_client-%%VERSION%%.ez
-lib/erlang/lib/rabbitmq_server-%%VERSION%%/plugins/cowboy-0.5.0-rmq%%VERSION%%-git4b93c2d.ez
-lib/erlang/lib/rabbitmq_server-%%VERSION%%/plugins/eldap-%%VERSION%%-gite309de4.ez
-lib/erlang/lib/rabbitmq_server-%%VERSION%%/plugins/mochiweb-2.7.0-rmq%%VERSION%%-git680dba8.ez
+lib/erlang/lib/rabbitmq_server-%%VERSION%%/plugins/cowboy-1.0.3.ez
+lib/erlang/lib/rabbitmq_server-%%VERSION%%/plugins/cowlib-1.0.1.ez
+lib/erlang/lib/rabbitmq_server-%%VERSION%%/plugins/mochiweb-2.13.0.ez
+lib/erlang/lib/rabbitmq_server-%%VERSION%%/plugins/rabbit_common-%%VERSION%%.ez
 lib/erlang/lib/rabbitmq_server-%%VERSION%%/plugins/rabbitmq_amqp1_0-%%VERSION%%.ez
 lib/erlang/lib/rabbitmq_server-%%VERSION%%/plugins/rabbitmq_auth_backend_ldap-%%VERSION%%.ez
 lib/erlang/lib/rabbitmq_server-%%VERSION%%/plugins/rabbitmq_auth_mechanism_ssl-%%VERSION%%.ez
 lib/erlang/lib/rabbitmq_server-%%VERSION%%/plugins/rabbitmq_consistent_hash_exchange-%%VERSION%%.ez
+lib/erlang/lib/rabbitmq_server-%%VERSION%%/plugins/rabbitmq_event_exchange-%%VERSION%%.ez
 lib/erlang/lib/rabbitmq_server-%%VERSION%%/plugins/rabbitmq_federation-%%VERSION%%.ez
 lib/erlang/lib/rabbitmq_server-%%VERSION%%/plugins/rabbitmq_federation_management-%%VERSION%%.ez
 lib/erlang/lib/rabbitmq_server-%%VERSION%%/plugins/rabbitmq_management-%%VERSION%%.ez
 lib/erlang/lib/rabbitmq_server-%%VERSION%%/plugins/rabbitmq_management_agent-%%VERSION%%.ez
 lib/erlang/lib/rabbitmq_server-%%VERSION%%/plugins/rabbitmq_management_visualiser-%%VERSION%%.ez
 lib/erlang/lib/rabbitmq_server-%%VERSION%%/plugins/rabbitmq_mqtt-%%VERSION%%.ez
+lib/erlang/lib/rabbitmq_server-%%VERSION%%/plugins/rabbitmq_recent_history_exchange-1.2.1.ez
+lib/erlang/lib/rabbitmq_server-%%VERSION%%/plugins/rabbitmq_sharding-0.1.0.ez
 lib/erlang/lib/rabbitmq_server-%%VERSION%%/plugins/rabbitmq_shovel-%%VERSION%%.ez
 lib/erlang/lib/rabbitmq_server-%%VERSION%%/plugins/rabbitmq_shovel_management-%%VERSION%%.ez
 lib/erlang/lib/rabbitmq_server-%%VERSION%%/plugins/rabbitmq_stomp-%%VERSION%%.ez
-lib/erlang/lib/rabbitmq_server-%%VERSION%%/plugins/rabbitmq_test-%%VERSION%%.ez
 lib/erlang/lib/rabbitmq_server-%%VERSION%%/plugins/rabbitmq_tracing-%%VERSION%%.ez
 lib/erlang/lib/rabbitmq_server-%%VERSION%%/plugins/rabbitmq_web_dispatch-%%VERSION%%.ez
 lib/erlang/lib/rabbitmq_server-%%VERSION%%/plugins/rabbitmq_web_stomp-%%VERSION%%.ez
 lib/erlang/lib/rabbitmq_server-%%VERSION%%/plugins/rabbitmq_web_stomp_examples-%%VERSION%%.ez
-lib/erlang/lib/rabbitmq_server-%%VERSION%%/plugins/sockjs-0.3.4-rmq%%VERSION%%-git3132eb9.ez
-lib/erlang/lib/rabbitmq_server-%%VERSION%%/plugins/webmachine-1.10.3-rmq%%VERSION%%-gite9359c7.ez
+lib/erlang/lib/rabbitmq_server-%%VERSION%%/plugins/ranch-1.2.1.ez
+lib/erlang/lib/rabbitmq_server-%%VERSION%%/plugins/sockjs-0.3.4.ez
+lib/erlang/lib/rabbitmq_server-%%VERSION%%/plugins/webmachine-1.10.3.ez
 lib/erlang/lib/rabbitmq_server-%%VERSION%%/sbin/rabbitmq-defaults
 lib/erlang/lib/rabbitmq_server-%%VERSION%%/sbin/rabbitmq-env
 lib/erlang/lib/rabbitmq_server-%%VERSION%%/sbin/rabbitmq-plugins
@@ -207,7 +180,11 @@ man/man1/rabbitmq-plugins.1.gz
 man/man1/rabbitmq-server.1.gz
 man/man1/rabbitmqctl.1.gz
 man/man5/rabbitmq-env.conf.5.gz
-%%PORTEXAMPLES%%%%EXAMPLESDIR%%/rabbitmq.config.example
+sbin/rabbitmq-defaults
+sbin/rabbitmq-env
+sbin/rabbitmq-plugins
+sbin/rabbitmq-server
+sbin/rabbitmqctl
 @dir(rabbitmq,rabbitmq,755) /var/log/rabbitmq
 @dir(rabbitmq,rabbitmq,755) /var/db/rabbitmq/mnesia
 @dir(rabbitmq,rabbitmq,755) /var/db/rabbitmq