Upgrade to version 3.4.0.

3 files changed, 32 insertions, 7 deletions

diff --git a/net/rabbitmq/files/patch-rabbitmqctl b/net/rabbitmq/files/patch-rabbitmqctl
index e4af26fab6c8..092192b29556 100644
--- a/net/rabbitmq/files/patch-rabbitmqctl
+++ b/net/rabbitmq/files/patch-rabbitmqctl
@@ -3,12 +3,11 @@ $FreeBSD$
 
 --- scripts/rabbitmqctl.orig
 +++ scripts/rabbitmqctl
-@@ -26,7 +26,7 @@
- 
- ##--- End of overridden <var_name> variables
- 
--exec ${ERL_DIR}erl \
-+HOME=/var/db/rabbitmq exec ${ERL_DIR}erl \
+@@ -27,6 +27,7 @@
+ # (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 \
-     -hidden \
diff --git a/net/rabbitmq/files/patch-scripts_rabbitmq-plugins b/net/rabbitmq/files/patch-scripts_rabbitmq-plugins
new file mode 100644
index 000000000000..1d67286329dd
--- /dev/null
+++ b/net/rabbitmq/files/patch-scripts_rabbitmq-plugins
@@ -0,0 +1,13 @@
+
+$FreeBSD$
+
+--- scripts/rabbitmq-plugins.orig
++++ scripts/rabbitmq-plugins
+@@ -19,6 +19,7 @@
+ # Non-empty defaults should be set in rabbitmq-env
+ . `dirname $0`/rabbitmq-env
+ 
++HOME=/var/db/rabbitmq \
+ exec ${ERL_DIR}erl \
+     -pa "${RABBITMQ_HOME}/ebin" \
+     -noinput \
diff --git a/net/rabbitmq/files/patch-scripts_rabbitmq-server b/net/rabbitmq/files/patch-scripts_rabbitmq-server
new file mode 100644
index 000000000000..00c8910f4b85
--- /dev/null
+++ b/net/rabbitmq/files/patch-scripts_rabbitmq-server
@@ -0,0 +1,13 @@
+
+$FreeBSD$
+
+--- scripts/rabbitmq-server.orig
++++ scripts/rabbitmq-server
+@@ -82,6 +82,7 @@
+ set -f
+ 
+ RABBITMQ_CONFIG_FILE=$RABBITMQ_CONFIG_FILE \
++HOME=/var/db/rabbitmq \
+ exec ${ERL_DIR}erl \
+     -pa ${RABBITMQ_EBIN_ROOT} \
+     ${RABBITMQ_START_RABBIT} \