Update net/rabbitmq to version 3.7.4.

PR:		226603
Submitted by:	David King

4 files changed, 29 insertions, 28 deletions

diff --git a/net/rabbitmq/files/patch-deps_rabbit_scripts_rabbitmq-plugins b/net/rabbitmq/files/patch-deps_rabbit_scripts_rabbitmq-plugins
index f6e451630572..8eda290456f6 100644
--- a/net/rabbitmq/files/patch-deps_rabbit_scripts_rabbitmq-plugins
+++ b/net/rabbitmq/files/patch-deps_rabbit_scripts_rabbitmq-plugins
@@ -1,10 +1,8 @@
---- deps/rabbit/scripts/rabbitmq-plugins.orig	2017-03-16 21:19:29 UTC
+--- deps/rabbit/scripts/rabbitmq-plugins.orig	2018-03-14 11:00:24 UTC
 +++ deps/rabbit/scripts/rabbitmq-plugins
-@@ -25,6 +25,7 @@ if [ -z "$ERL_CRASH_DUMP_SECONDS" ]; the
- fi
- 
- RABBITMQ_USE_LONGNAME=${RABBITMQ_USE_LONGNAME} \
-+HOME=/var/db/rabbitmq \
- exec ${ERL_DIR}erl \
-     -pa "${RABBITMQ_HOME}/ebin" \
-     -noinput \
+@@ -29,4 +29,5 @@ set -a
+ # shellcheck source=./rabbitmq-env
+ . "${0%/*}"/rabbitmq-env
+
++HOME=/var/db/rabbitmq
+ run_escript rabbitmqctl_escript "${ESCRIPT_DIR:?must be defined}"/rabbitmq-plugins --formatter=plugins -q "$@"
diff --git a/net/rabbitmq/files/patch-deps_rabbit_scripts_rabbitmq-server b/net/rabbitmq/files/patch-deps_rabbit_scripts_rabbitmq-server
index 52d4c0cbb78b..a9e3f3d2ed0e 100644
--- a/net/rabbitmq/files/patch-deps_rabbit_scripts_rabbitmq-server
+++ b/net/rabbitmq/files/patch-deps_rabbit_scripts_rabbitmq-server
@@ -1,10 +1,10 @@
---- deps/rabbit/scripts/rabbitmq-server.orig	2017-03-16 21:19:29 UTC
+--- deps/rabbit/scripts/rabbitmq-server.orig	2018-03-14 10:58:29 UTC
 +++ deps/rabbit/scripts/rabbitmq-server
-@@ -157,6 +157,7 @@ start_rabbitmq_server() {
+@@ -203,6 +203,7 @@ start_rabbitmq_server() {
+     ensure_thread_pool_size
      check_start_params &&
      RABBITMQ_CONFIG_FILE=$RABBITMQ_CONFIG_FILE \
-     ERL_MAX_ETS_TABLES=$ERL_MAX_ETS_TABLES \
 +    HOME=/var/db/rabbitmq \
+     ERL_MAX_ETS_TABLES=$ERL_MAX_ETS_TABLES \
+     ERL_CRASH_DUMP=$ERL_CRASH_DUMP \
      exec ${ERL_DIR}erl \
-         -pa ${RABBITMQ_SERVER_CODE_PATH} ${RABBITMQ_EBIN_ROOT} \
-         ${RABBITMQ_START_RABBIT} \
diff --git a/net/rabbitmq/files/patch-deps_rabbit_scripts_rabbitmqctl b/net/rabbitmq/files/patch-deps_rabbit_scripts_rabbitmqctl
index 87cce150b131..736cb5e16681 100644
--- a/net/rabbitmq/files/patch-deps_rabbit_scripts_rabbitmqctl
+++ b/net/rabbitmq/files/patch-deps_rabbit_scripts_rabbitmqctl
@@ -1,10 +1,8 @@
---- deps/rabbit/scripts/rabbitmqctl.orig	2017-05-22 09:52:24 UTC
+--- deps/rabbit/scripts/rabbitmqctl.orig	2018-03-14 10:59:24 UTC
 +++ deps/rabbit/scripts/rabbitmqctl
-@@ -28,6 +28,7 @@ fi
- # (e.g. forget_cluster_node --offline) require us to impersonate the
- # real node.
- RABBITMQ_USE_LONGNAME=${RABBITMQ_USE_LONGNAME} \
-+HOME=/var/db/rabbitmq \
- exec ${ERL_DIR}erl \
-     -pa "${RABBITMQ_HOME}/ebin" \
-     -noinput +B \
+@@ -29,4 +29,5 @@ set -a
+ # shellcheck source=./rabbitmq-env
+ . "${0%/*}"/rabbitmq-env
+
++HOME=/var/db/rabbitmq
+ run_escript rabbitmqctl_escript "${ESCRIPT_DIR:?must be defined}"/rabbitmqctl "$@"
diff --git a/net/rabbitmq/files/rabbitmq.in b/net/rabbitmq/files/rabbitmq.in
index e02c8339cdb9..3aafcb1d9fb9 100644
--- a/net/rabbitmq/files/rabbitmq.in
+++ b/net/rabbitmq/files/rabbitmq.in
@@ -55,7 +55,7 @@ rabbitmq_start()
 	fi
 
 	mkdir -p ${RABBITMQ_LOG_BASE}
- 
+
 	chown -R ${rabbitmq_user}:${rabbitmq_user} ${RABBITMQ_LOG_BASE}
 
 	if [ -f ${RABBITMQ_HOME}/.erlang.cookie ]; then
@@ -70,10 +70,15 @@ rabbitmq_start()
 rabbitmq_stop()
 {
 	echo "Stopping ${name}."
-	[ -f ${daemon_pidfile} ] && read daemon_pid < ${daemon_pidfile}
-	debug "Running: ${rabbitmq_ctl} stop ${pidfile}"
-	su -m ${rabbitmq_user} -c "sh -c \"${rabbitmq_ctl} stop ${pidfile}\"" >/dev/null 2>&1
-	[ -n "${daemon_pid}" ] && wait_for_pids ${daemon_pid}
+	if [ -f ${daemon_pidfile} ]; then
+		read daemon_pid < ${daemon_pidfile}
+		debug "Running: ${rabbitmq_ctl} stop ${pidfile}"
+		su -m ${rabbitmq_user} -c "sh -c \"${rabbitmq_ctl} stop ${pidfile}\"" >/dev/null 2>&1
+		[ -n "${daemon_pid}" ] && wait_for_pids ${daemon_pid}
+	else
+		debug "Running: ${rabbitmq_ctl} stop"
+		su -m ${rabbitmq_user} -c "sh -c \"${rabbitmq_ctl} stop\"" >/dev/null 2>&1
+	fi
 }
 
 run_rc_command "$1"