summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMatthias Radestock <matthias@lshift.net>2009-06-10 18:33:06 +0100
committerMatthias Radestock <matthias@lshift.net>2009-06-10 18:33:06 +0100
commit4948fcbb601f4828410eff13e46fac2341a3e488 (patch)
treecc4c0ccb5366a80091f3edd11a9955f442880080
parent932be4e660f438eb35beaaf76c0388b62bd67da5 (diff)
parent11ab8c4ff602be96e6e452a5921118a5d145e539 (diff)
downloadrabbitmq-server-git-4948fcbb601f4828410eff13e46fac2341a3e488.tar.gz
emergency merge of bug20958 into default
We point to the macports files of the default branch from our web site and they got broken with the merge of bug20333. This hopefully fixes that, but further qa is required.
-rw-r--r--packaging/macports/net/rabbitmq-server/Portfile2
-rw-r--r--packaging/macports/net/rabbitmq-server/files/rabbitmq-script-wrapper2
2 files changed, 2 insertions, 2 deletions
diff --git a/packaging/macports/net/rabbitmq-server/Portfile b/packaging/macports/net/rabbitmq-server/Portfile
index 805bc3fd89..7fb31ad69b 100644
--- a/packaging/macports/net/rabbitmq-server/Portfile
+++ b/packaging/macports/net/rabbitmq-server/Portfile
@@ -3,7 +3,7 @@
PortSystem 1.0
name rabbitmq-server
-version 1.5.5
+version 1.5.3
revision 0
categories net
maintainers tonyg@rabbitmq.com
diff --git a/packaging/macports/net/rabbitmq-server/files/rabbitmq-script-wrapper b/packaging/macports/net/rabbitmq-server/files/rabbitmq-script-wrapper
index 296a77d19c..b806049c43 100644
--- a/packaging/macports/net/rabbitmq-server/files/rabbitmq-script-wrapper
+++ b/packaging/macports/net/rabbitmq-server/files/rabbitmq-script-wrapper
@@ -14,7 +14,7 @@ cd /var/lib/rabbitmq
SCRIPT=`basename $0`
if [ `id -u` = 0 ] ; then
- su rabbitmq -s /bin/sh -c "/usr/lib/rabbitmq/bin/${SCRIPT} ${CMDLINE}"
+ sudo -u rabbitmq -H /usr/lib/rabbitmq/bin/${SCRIPT} ${CMDLINE}
else
/usr/lib/rabbitmq/bin/${SCRIPT}
echo -e "\nOnly root should run ${SCRIPT}\n"