Update net/rabbitmq to 3.6.1

RabbitMQ 3.6.1 is a maintenance release that includes a fix for
CVE-2015-8786, a vulnerability in RabbitMQ management plugin.

Server
- Purging a lazy queue could result in an exception
- Ensure epmd is running before starting RabbitMQ node on Windows
- Channel error could make broker unreachable
- (Automatic) deletion of an auto-delete queue could lead
  to blocked channels
- During (from scratch) queue sync, queue master node didn't respect
  mirror alarm state. With large data sets this could drive mirror
  node out of memory.
- Changing password for users with non-standard (think broker
  configuration) password hashing function, for example, those migrated
  from 3.5.x releases, didn't update effective hashing function.
- Heavy and/or prolonged rabbitmqctl use could exhaust Erlang VM atom table
- "Min masters" queue master location strategy could result in an error.
- Fixed a race condition in pause_minority handling mode.
- Significantly reduce possibility of a race condition when an exchange
  is deleted and immediately re-declared, e.g. by a federation link.
- amq.rabbitmq.log messages now have information about originating
  node in message headers
- scripts/rabbitmq-env now works with GNU sed 4.2.2
- Exceptions in VM memory use calculator no longer affect broker startup
- Direct Reply-to capability is now advertised to clients
- Paths with non-ASCII characters on Windows are now handled
- Configurable number of TCP connection acceptors
- rabbitmqctl cluster_status now includes cluster-wide resource alarm status
- Windows installer no longer jumps over installation log
- Improved rabbitmqctl reset error messages
- More unsigned field data types are supported.

Federation Plugin
- Significantly reduce possibility of a race condition when an exchange
  is deleted and immediately re-declared, e.g. by a federation link

Management plugin
- CVE-2015-8786: user-provided query parameters lengths_age and
  lengths_incr had no validation and could be used to exhaust server
  resources.
- Password hashing function is now included in exported definitions
- Internet Explorer (9+) compatibility restored
- Internet Explorer 11 compatibility fixes
- When policy fails to be created with invalid paramaters a sensible
  error message will be displayed.

Federation Management plugin
- Federation link form now includes more settings (that are exchange-
  and queue-federation specific)

3 files changed, 10 insertions, 9 deletions

diff --git a/net/rabbitmq/Makefile b/net/rabbitmq/Makefile
index f47c36450c7..d3733ff40bb 100644
--- a/net/rabbitmq/Makefile
+++ b/net/rabbitmq/Makefile
@@ -1,6 +1,6 @@
-# $NetBSD: Makefile,v 1.24 2016/01/08 15:14:33 fhajny Exp $
+# $NetBSD: Makefile,v 1.25 2016/03/07 13:14:23 fhajny Exp $
 
-DISTNAME=		rabbitmq-server-3.6.0
+DISTNAME=		rabbitmq-server-3.6.1
 PKGNAME=		${DISTNAME:S/-server//}
 CATEGORIES=		net
 MASTER_SITES=		http://www.rabbitmq.com/releases/rabbitmq-server/v${PKGVERSION_NOREV}/
diff --git a/net/rabbitmq/PLIST b/net/rabbitmq/PLIST
index dd79ea8a508..7073186abf9 100644
--- a/net/rabbitmq/PLIST
+++ b/net/rabbitmq/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.20 2015/12/31 22:16:33 fhajny Exp $
+@comment $NetBSD: PLIST,v 1.21 2016/03/07 13:14:23 fhajny Exp $
 lib/erlang/lib/rabbitmq_server-${PKGVERSION}/INSTALL
 lib/erlang/lib/rabbitmq_server-${PKGVERSION}/LICENSE
 lib/erlang/lib/rabbitmq_server-${PKGVERSION}/LICENSE-APACHE2-ExplorerCanvas
@@ -61,6 +61,7 @@ lib/erlang/lib/rabbitmq_server-${PKGVERSION}/ebin/rabbit_epmd_monitor.beam
 lib/erlang/lib/rabbitmq_server-${PKGVERSION}/ebin/rabbit_error_logger.beam
 lib/erlang/lib/rabbitmq_server-${PKGVERSION}/ebin/rabbit_error_logger_file_h.beam
 lib/erlang/lib/rabbitmq_server-${PKGVERSION}/ebin/rabbit_exchange.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
@@ -168,7 +169,7 @@ 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.2.1.ez
 lib/erlang/lib/rabbitmq_server-${PKGVERSION}/plugins/sockjs-0.3.4.ez
-lib/erlang/lib/rabbitmq_server-${PKGVERSION}/plugins/webmachine-git.ez
+lib/erlang/lib/rabbitmq_server-${PKGVERSION}/plugins/webmachine-1.10.3.ez
 lib/erlang/lib/rabbitmq_server-${PKGVERSION}/sbin/rabbitmq-defaults
 lib/erlang/lib/rabbitmq_server-${PKGVERSION}/sbin/rabbitmq-env
 lib/erlang/lib/rabbitmq_server-${PKGVERSION}/sbin/rabbitmq-plugins
diff --git a/net/rabbitmq/distinfo b/net/rabbitmq/distinfo
index 77f7a4e8269..a2b5287490b 100644
--- a/net/rabbitmq/distinfo
+++ b/net/rabbitmq/distinfo
@@ -1,8 +1,8 @@
-$NetBSD: distinfo,v 1.28 2015/12/31 22:16:33 fhajny Exp $
+$NetBSD: distinfo,v 1.29 2016/03/07 13:14:23 fhajny Exp $
 
-SHA1 (rabbitmq-server-3.6.0.tar.xz) = 5f9993fba1f0b95ffd22c3ed639fa423e2255103
-RMD160 (rabbitmq-server-3.6.0.tar.xz) = 6bf6ddd3838d7105319bc63ada48e3e9bfed01eb
-SHA512 (rabbitmq-server-3.6.0.tar.xz) = 5ed5cd9fc0092e4cfc8187f38143ce9b43c12fa48595ca84e650dd696fae120e405593a15e5832f05fc80bd15525841f6e60dfdc5e9fc8f42397ae66d78d6bf9
-Size (rabbitmq-server-3.6.0.tar.xz) = 2928768 bytes
+SHA1 (rabbitmq-server-3.6.1.tar.xz) = eab64e053b32b741b2a45aa9c7ab22f8128ca145
+RMD160 (rabbitmq-server-3.6.1.tar.xz) = da6c03e676cff7eae7d9efec5893d59fc357557a
+SHA512 (rabbitmq-server-3.6.1.tar.xz) = dbcb6b6bef117c1d79afd909257b7b744dbcaf7dfa8d064a6bcf4599ec9c882cf3712c8726e79529af016ec1dc090a43eb332d48e40b90398186e08ef3be46aa
+Size (rabbitmq-server-3.6.1.tar.xz) = 2895888 bytes
 SHA1 (patch-Makefile) = 088a3ed04dc72215f1ca3b34b49bb4047a531e89
 SHA1 (patch-scripts_rabbitmq-env) = 0b94c8b3987408b7a6291e3797f9d0e31fca64d6