1 files changed, 28 insertions, 16 deletions
diff --git a/net-im/ejabberd/files/patch-ejabberdctl.template b/net-im/ejabberd/files/patch-ejabberdctl.template
index ceca246e0678..d7b42a194616 100644
--- a/net-im/ejabberd/files/patch-ejabberdctl.template
+++ b/net-im/ejabberd/files/patch-ejabberdctl.template
@@ -1,6 +1,31 @@
---- ejabberdctl.template.orig
+--- ejabberdctl.template.orig	2016-03-09 03:31:00 UTC
 +++ ejabberdctl.template
-@@ -71,10 +71,10 @@
+@@ -16,6 +16,7 @@ IEX={{bindir}}/iex
+ EPMD={{bindir}}/epmd
+ INSTALLUSER={{installuser}}
+ ERL_LIBS={{libdir}}
++ERL_LIBS=$ERL_LIBS:{{libdir}}/ejabberd/lib
+ 
+ # check the proper system user is used if defined
+ if [ "$INSTALLUSER" != "" ] ; then
+@@ -31,14 +32,14 @@ if [ "$INSTALLUSER" != "" ] ; then
+         fi
+     done
+     if [ `id -g` -eq `id -g $INSTALLUSER` ] ; then
+-        EXEC_CMD="bash -c"
++        EXEC_CMD="/usr/local/bin/bash -c"
+     fi
+     if [ "$EXEC_CMD" = "false" ] ; then
+         echo "This command can only be run by root or the user $INSTALLUSER" >&2
+         exit 4
+     fi
+ else
+-    EXEC_CMD="bash -c"
++    EXEC_CMD="/usr/local/bin/bash -c"
+ fi
+ 
+ # parse command line parameters
+@@ -73,10 +74,10 @@ if [ "$EJABBERD_CONFIG_PATH" = "" ] ; th
      EJABBERD_CONFIG_PATH=$ETC_DIR/ejabberd.yml
  fi
  if [ "$LOGS_DIR" = "" ] ; then
@@ -13,20 +38,7 @@
  fi
  if [ "$EJABBERD_DOC_PATH" = "" ] ; then
      EJABBERD_DOC_PATH={{docdir}}
-@@ -88,10 +88,10 @@
-         EJABBERDDIR={{libdir}}/ejabberd
-     fi
-     if [ "$EJABBERD_EBIN_PATH" = "" ] ; then
--        EJABBERD_EBIN_PATH=$EJABBERDDIR/ebin
-+     EJABBERD_EBIN_PATH={{rootdir}}/lib/erlang/lib/ejabberd/ebin
-     fi
-     if [ "$EJABBERD_PRIV_PATH" = "" ] ; then
--        EJABBERD_PRIV_PATH=$EJABBERDDIR/priv
-+     EJABBERD_PRIV_PATH={{rootdir}}/lib/erlang/lib/ejabberd/priv
-     fi
-     if [ "$EJABBERD_BIN_PATH" = "" ] ; then
-         EJABBERD_BIN_PATH=$EJABBERD_PRIV_PATH/bin
-@@ -335,7 +335,7 @@
+@@ -354,7 +355,7 @@ ctl()
      # using flock if available. Expects a linux-style
      # flock that can lock a file descriptor.
      MAXCONNID=100