- Update to 2.5.1

PR:		ports/159364
Submitted by:	Andrew <andrew@flarn.com>
Approved by:	Phillip Neumann <pneumann@gmail.com> (maintainer) (with changes)

6 files changed, 25 insertions, 36 deletions

diff --git a/net/rabbitmq/Makefile b/net/rabbitmq/Makefile
index 9e9c843a509d..dc23c38f96d0 100644
--- a/net/rabbitmq/Makefile
+++ b/net/rabbitmq/Makefile
@@ -6,8 +6,7 @@
 #
 
 PORTNAME=	rabbitmq
-PORTVERSION=	2.3.1
-PORTREVISION=	2
+PORTVERSION=	2.5.1
 CATEGORIES=	net
 MASTER_SITES=	http://www.rabbitmq.com/releases/rabbitmq-server/v${PORTVERSION}/
 DISTNAME=	${PORTNAME}-server-${PORTVERSION}
@@ -38,8 +37,8 @@ SUB_LIST=	RABBITMQ_GID=${RABBITMQ_GID} \
 		RABBITMQ_UID=${RABBITMQ_UID} \
 		RABBITMQ_USER=${RABBITMQ_USER}
 
-MAN1=		rabbitmq-multi.1 rabbitmq-server.1 rabbitmqctl.1
-MAN5=		rabbitmq.conf.5
+MAN1=		rabbitmq-server.1 rabbitmqctl.1
+MAN5=		rabbitmq-env.conf.5
 MANCOMPRESSED=	yes
 
 SCRIPTS_DIR=	${WRKSRC}/scripts/
@@ -48,7 +47,7 @@ MAKE_ENV+=	TARGET_DIR="${PREFIX}/lib/erlang/lib/rabbitmq_server-${PORTVERSION}"
 
 post-patch:
 	@${REINPLACE_CMD} -e 's|/etc/rabbitmq|${PREFIX}/etc/rabbitmq|g ; s|/var/lib|/var/db|g ; s|erl|${LOCALBASE}/bin/erl|g' \
-		${SCRIPTS_DIR}/rabbitmq-multi ${SCRIPTS_DIR}/rabbitmq-server ${SCRIPTS_DIR}/rabbitmqctl ${SCRIPTS_DIR}/rabbitmq-env
+		${SCRIPTS_DIR}/rabbitmq-server ${SCRIPTS_DIR}/rabbitmqctl ${SCRIPTS_DIR}/rabbitmq-env
 	@${FIND} ${WRKSRC} -name "*.bak" | ${XARGS} ${RM}
 
 pre-install:
diff --git a/net/rabbitmq/distinfo b/net/rabbitmq/distinfo
index 4418ea53867d..cdd8ee4ffe58 100644
--- a/net/rabbitmq/distinfo
+++ b/net/rabbitmq/distinfo
@@ -1,2 +1,2 @@
-SHA256 (rabbitmq-server-2.3.1.tar.gz) = 3bb6c4004031fc3e57c886452e03dd10e2c23cd64f1cca180f34aba5b30d9f24
-SIZE (rabbitmq-server-2.3.1.tar.gz) = 301044
+SHA256 (rabbitmq-server-2.5.1.tar.gz) = f5afeb8429508644738b68a158ed1f4a4dfc4bcbe1ebdab5ba818a75545e942f
+SIZE (rabbitmq-server-2.5.1.tar.gz) = 332560
diff --git a/net/rabbitmq/files/patch-rabbitmqctl b/net/rabbitmq/files/patch-rabbitmqctl
index 29b9d4089314..be97f57bb23f 100644
--- a/net/rabbitmq/files/patch-rabbitmqctl
+++ b/net/rabbitmq/files/patch-rabbitmqctl
@@ -1,11 +1,11 @@
---- scripts/rabbitmqctl.orig	2011-01-12 09:22:10.000000000 -0300
-+++ scripts/rabbitmqctl	2011-01-12 09:23:31.000000000 -0300
-@@ -38,7 +38,7 @@
+--- scripts/rabbitmqctl.orig	2011-08-01 15:59:26.057347310 +0100
++++ scripts/rabbitmqctl	2011-08-01 16:00:07.303513263 +0100
+@@ -20,7 +20,7 @@
  [ "x" = "x$RABBITMQ_NODENAME" ] && RABBITMQ_NODENAME=${NODENAME}
  [ "x" = "x$RABBITMQ_CTL_ERL_ARGS" ] && RABBITMQ_CTL_ERL_ARGS=${CTL_ERL_ARGS}
  
 -exec erl \
-+sudo -u rabbitmq HOME=/var/db/rabbitmq erl \
++HOME=/var/db/rabbitmq exec erl \
      -pa "${RABBITMQ_HOME}/ebin" \
      -noinput \
      -hidden \
diff --git a/net/rabbitmq/files/patch-src-rabbit_networking-erl b/net/rabbitmq/files/patch-src-rabbit_networking-erl
deleted file mode 100644
index 12040aec5f4c..000000000000
--- a/net/rabbitmq/files/patch-src-rabbit_networking-erl
+++ /dev/null
@@ -1,13 +0,0 @@
---- src/rabbit_networking.erl.orig	2011-02-03 14:47:35.000000000 +0200
-+++ src/rabbit_networking.erl	2011-05-30 13:51:28.000000000 +0200
-@@ -52,6 +52,9 @@
- 
- -export_type([ip_port/0, hostname/0]).
- 
-+-type(hostname() :: inet:hostname()).
-+-type(ip_port() :: inet:ip_port()).
-+
- -type(family() :: atom()).
- -type(listener_config() :: ip_port() |
-                            {hostname(), ip_port()} |
-
diff --git a/net/rabbitmq/files/rabbitmq.in b/net/rabbitmq/files/rabbitmq.in
index b13d9d4ebb7b..7b69526427f8 100644
--- a/net/rabbitmq/files/rabbitmq.in
+++ b/net/rabbitmq/files/rabbitmq.in
@@ -8,7 +8,7 @@
 # BEFORE: LOGIN
 # KEYWORD: shutdown
 #
-# Add the following line to /etc/rc.conf to enable RabitMQ
+# Add the following line to /etc/rc.conf to enable RabbitMQ
 #
 #  rabbitmq_enable="YES"
 
@@ -20,13 +20,13 @@ rcvar=`set_rcvar`
 # Set some defaults
 rabbitmq_enable=${rabbitmq_enable:-"NO"}
 rabbitmq_user=${rabbitmq_user:-"rabbitmq"}
-rabbitmq_nodes=${rabbitmq_nodes:-"1"}
-rabbitmq_multi="%%PREFIX%%/sbin/rabbitmq-multi"
+rabbitmq_server="%%PREFIX%%/sbin/rabbitmq-server"
+rabbitmq_ctl="%%PREFIX%%/sbin/rabbitmqctl"
 
-start_cmd="env HOME=/var/db/rabbitmq su -m ${rabbitmq_user} -c 'sh -c \"${rabbitmq_multi} start_all ${rabbitmq_nodes}\"'"
-stop_cmd="env HOME=/var/db/rabbitmq su -m ${rabbitmq_user} -c 'sh -c \"${rabbitmq_multi} stop_all\"'"
-rotate_logs_cmd="env HOME=/var/db/rabbitmq su -m ${rabbitmq_user} -c 'sh -c \"${rabbitmq_multi} rotate_logs\"'"
-status_cmd="env HOME=/var/db/rabbitmq su -m ${rabbitmq_user} -c 'sh -c \"${rabbitmq_multi} status\"'"
+start_cmd="env HOME=/var/db/rabbitmq su -m ${rabbitmq_user} -c 'sh -c \"${rabbitmq_server} -detached\"'"
+stop_cmd="env HOME=/var/db/rabbitmq su -m ${rabbitmq_user} -c 'sh -c \"${rabbitmq_ctl} stop\"'"
+rotate_logs_cmd="env HOME=/var/db/rabbitmq su -m ${rabbitmq_user} -c 'sh -c \"${rabbitmq_ctl} rotate_logs\"'"
+status_cmd="env HOME=/var/db/rabbitmq su -m ${rabbitmq_user} -c 'sh -c \"${rabbitmq_ctl} status\"'"
 extra_commands="rotate_logs status"
 
 load_rc_config $name
diff --git a/net/rabbitmq/pkg-plist b/net/rabbitmq/pkg-plist
index f65c8e43a9c6..e52021017f4c 100644
--- a/net/rabbitmq/pkg-plist
+++ b/net/rabbitmq/pkg-plist
@@ -1,5 +1,4 @@
 sbin/rabbitmq-env
-sbin/rabbitmq-multi
 sbin/rabbitmq-server
 sbin/rabbitmqctl
 lib/erlang/lib/rabbitmq_server-%%VERSION%%/INSTALL
@@ -11,6 +10,10 @@ lib/erlang/lib/rabbitmq_server-%%VERSION%%/ebin/delegate_sup.beam
 lib/erlang/lib/rabbitmq_server-%%VERSION%%/ebin/file_handle_cache.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/gm_soak_test.beam
+lib/erlang/lib/rabbitmq_server-%%VERSION%%/ebin/gm_speed_test.beam
+lib/erlang/lib/rabbitmq_server-%%VERSION%%/ebin/gm_tests.beam
 lib/erlang/lib/rabbitmq_server-%%VERSION%%/ebin/pg_local.beam
 lib/erlang/lib/rabbitmq_server-%%VERSION%%/ebin/priority_queue.beam
 lib/erlang/lib/rabbitmq_server-%%VERSION%%/ebin/rabbit.app
@@ -43,13 +46,13 @@ lib/erlang/lib/rabbitmq_server-%%VERSION%%/ebin/rabbit_ctl_usage.beam
 lib/erlang/lib/rabbitmq_server-%%VERSION%%/ebin/rabbit_direct.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_type.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
 lib/erlang/lib/rabbitmq_server-%%VERSION%%/ebin/rabbit_exchange_type_topic.beam
-lib/erlang/lib/rabbitmq_server-%%VERSION%%/ebin/rabbit_event.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
@@ -60,8 +63,6 @@ lib/erlang/lib/rabbitmq_server-%%VERSION%%/ebin/rabbit_log.beam
 lib/erlang/lib/rabbitmq_server-%%VERSION%%/ebin/rabbit_memory_monitor.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_multi.beam
-lib/erlang/lib/rabbitmq_server-%%VERSION%%/ebin/rabbit_multi_usage.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
@@ -82,10 +83,12 @@ lib/erlang/lib/rabbitmq_server-%%VERSION%%/ebin/rabbit_ssl.beam
 lib/erlang/lib/rabbitmq_server-%%VERSION%%/ebin/rabbit_sup.beam
 lib/erlang/lib/rabbitmq_server-%%VERSION%%/ebin/rabbit_tests.beam
 lib/erlang/lib/rabbitmq_server-%%VERSION%%/ebin/rabbit_tests_event_receiver.beam
+lib/erlang/lib/rabbitmq_server-%%VERSION%%/ebin/rabbit_trace.beam
 lib/erlang/lib/rabbitmq_server-%%VERSION%%/ebin/rabbit_types.beam
 lib/erlang/lib/rabbitmq_server-%%VERSION%%/ebin/rabbit_upgrade.beam
 lib/erlang/lib/rabbitmq_server-%%VERSION%%/ebin/rabbit_upgrade_functions.beam
 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_writer.beam
 lib/erlang/lib/rabbitmq_server-%%VERSION%%/ebin/supervisor2.beam
@@ -98,6 +101,7 @@ lib/erlang/lib/rabbitmq_server-%%VERSION%%/ebin/vm_memory_monitor.beam
 lib/erlang/lib/rabbitmq_server-%%VERSION%%/ebin/worker_pool.beam
 lib/erlang/lib/rabbitmq_server-%%VERSION%%/ebin/worker_pool_sup.beam
 lib/erlang/lib/rabbitmq_server-%%VERSION%%/ebin/worker_pool_worker.beam
+lib/erlang/lib/rabbitmq_server-%%VERSION%%/include/gm_specs.hrl
 lib/erlang/lib/rabbitmq_server-%%VERSION%%/include/rabbit.hrl
 lib/erlang/lib/rabbitmq_server-%%VERSION%%/include/rabbit_auth_backend_spec.hrl
 lib/erlang/lib/rabbitmq_server-%%VERSION%%/include/rabbit_auth_mechanism_spec.hrl
@@ -108,7 +112,6 @@ lib/erlang/lib/rabbitmq_server-%%VERSION%%/include/rabbit_msg_store.hrl
 lib/erlang/lib/rabbitmq_server-%%VERSION%%/include/rabbit_msg_store_index.hrl
 lib/erlang/lib/rabbitmq_server-%%VERSION%%/plugins/README
 lib/erlang/lib/rabbitmq_server-%%VERSION%%/sbin/rabbitmq-env
-lib/erlang/lib/rabbitmq_server-%%VERSION%%/sbin/rabbitmq-multi
 lib/erlang/lib/rabbitmq_server-%%VERSION%%/sbin/rabbitmq-server
 lib/erlang/lib/rabbitmq_server-%%VERSION%%/sbin/rabbitmqctl
 @dirrm lib/erlang/lib/rabbitmq_server-%%VERSION%%/plugins