New Upstream Release - 3.0.4

Signed-off-by: Peter Lemenkov <lemenkov@gmail.com>

6 files changed, 43 insertions, 15 deletions

diff --git a/.gitignore b/.gitignore
index 4885789..176bac5 100644
--- a/.gitignore
+++ b/.gitignore
@@ -8,3 +8,4 @@ rabbitmq-server-1.8.0.tar.gz
 /rabbitmq-server-2.8.4.tar.gz
 /rabbitmq-server-2.8.5.tar.gz
 /rabbitmq-server-2.8.7.tar.gz
+/rabbitmq-server-3.0.4.tar.gz
diff --git a/rabbitmq-script-wrapper b/rabbitmq-script-wrapper
index 5bb3269..c4f7709 100644
--- a/rabbitmq-script-wrapper
+++ b/rabbitmq-script-wrapper
@@ -12,7 +12,7 @@
 ##  The Original Code is RabbitMQ.
 ##
 ##  The Initial Developer of the Original Code is VMware, Inc.
-##  Copyright (c) 2007-2011 VMware, Inc.  All rights reserved.
+##  Copyright (c) 2007-2013 VMware, Inc.  All rights reserved.
 ##
 
 # Escape spaces and quotes, because shell is revolting.
@@ -29,10 +29,12 @@ cd /var/lib/rabbitmq
 
 SCRIPT=`basename $0`
 
-if [ `id -u` = 0 ] ; then
-    su rabbitmq -s /bin/sh -c "/usr/lib/rabbitmq/bin/${SCRIPT} ${CMDLINE}"
-elif [ `id -u` = `id -u rabbitmq` ] ; then
+if [ `id -u` = `id -u rabbitmq` -a "$SCRIPT" = "rabbitmq-server" ] ; then
+    /usr/lib/rabbitmq/bin/rabbitmq-server "$@" 
+elif [ `id -u` = `id -u rabbitmq` -o "$SCRIPT" = "rabbitmq-plugins" ] ; then
     /usr/lib/rabbitmq/bin/${SCRIPT} "$@"
+elif [ `id -u` = 0 ] ; then
+    su rabbitmq -s /bin/sh -c "/usr/lib/rabbitmq/bin/${SCRIPT} ${CMDLINE}"
 else
     /usr/lib/rabbitmq/bin/${SCRIPT}
     echo
diff --git a/rabbitmq-server.init b/rabbitmq-server.init
index 065e2a4..a7e57e8 100644
--- a/rabbitmq-server.init
+++ b/rabbitmq-server.init
@@ -14,6 +14,9 @@
 # Short-Description: Enable AMQP service provided by RabbitMQ broker
 ### END INIT INFO
 
+# Source function library.
+. /etc/init.d/functions
+
 PATH=/sbin:/usr/sbin:/bin:/usr/bin
 NAME=rabbitmq-server
 DAEMON=/usr/sbin/${NAME}
@@ -24,6 +27,7 @@ ROTATE_SUFFIX=
 INIT_LOG_DIR=/var/log/rabbitmq
 PID_FILE=/var/run/rabbitmq/pid
 
+START_PROG="daemon"
 LOCK_FILE=/var/lock/subsys/$NAME
 
 test -x $DAEMON || exit 0
@@ -32,15 +36,34 @@ test -x $CONTROL || exit 0
 RETVAL=0
 set -e
 
+[ -f /etc/default/${NAME} ] && . /etc/default/${NAME}
+
+ensure_pid_dir () {
+    PID_DIR=`dirname ${PID_FILE}`
+    if [ ! -d ${PID_DIR} ] ; then
+        mkdir -p ${PID_DIR}
+        chown -R ${USER}:${USER} ${PID_DIR}
+        chmod 755 ${PID_DIR}
+    fi
+}
+
+remove_pid () {
+    rm -f ${PID_FILE}
+    rmdir `dirname ${PID_FILE}` || :
+}
+
 start_rabbitmq () {
     status_rabbitmq quiet
     if [ $RETVAL = 0 ] ; then
         echo RabbitMQ is currently running
     else
         RETVAL=0
+        ensure_pid_dir
         set +e
-        setsid sh -c "RABBITMQ_PID_FILE=$PID_FILE $DAEMON > \
-            ${INIT_LOG_DIR}/startup_log 2> ${INIT_LOG_DIR}/startup_err" &
+        RABBITMQ_PID_FILE=$PID_FILE $START_PROG $DAEMON \
+            > "${INIT_LOG_DIR}/startup_log" \
+            2> "${INIT_LOG_DIR}/startup_err" \
+            0<&- &
         $CONTROL wait $PID_FILE >/dev/null 2>&1
         RETVAL=$?
         set -e
@@ -52,7 +75,7 @@ start_rabbitmq () {
                 fi
                 ;;
             *)
-                rm -f $PID_FILE
+                remove_pid
                 echo FAILED - check ${INIT_LOG_DIR}/startup_\{log, _err\}
                 RETVAL=1
                 ;;
@@ -64,11 +87,11 @@ stop_rabbitmq () {
     status_rabbitmq quiet
     if [ $RETVAL = 0 ] ; then
         set +e
-        $CONTROL stop > ${INIT_LOG_DIR}/shutdown_log 2> ${INIT_LOG_DIR}/shutdown_err
+        $CONTROL stop ${PID_FILE} > ${INIT_LOG_DIR}/shutdown_log 2> ${INIT_LOG_DIR}/shutdown_err
         RETVAL=$?
         set -e
         if [ $RETVAL = 0 ] ; then
-            rm -f $PID_FILE
+            remove_pid
             if [ -n "$LOCK_FILE" ] ; then
                 rm -f $LOCK_FILE
             fi
diff --git a/rabbitmq-server.ocf b/rabbitmq-server.ocf
index e6776ef..ba9579b 100755
--- a/rabbitmq-server.ocf
+++ b/rabbitmq-server.ocf
@@ -12,7 +12,7 @@
 ##  The Original Code is RabbitMQ.
 ##
 ##  The Initial Developer of the Original Code is VMware, Inc.
-##  Copyright (c) 2007-2011 VMware, Inc.  All rights reserved.
+##  Copyright (c) 2007-2013 VMware, Inc.  All rights reserved.
 ##
 
 ##
diff --git a/rabbitmq-server.spec b/rabbitmq-server.spec
index a53f739..5e307a4 100644
--- a/rabbitmq-server.spec
+++ b/rabbitmq-server.spec
@@ -1,8 +1,6 @@
-%define debug_package %{nil}
-
 Name: rabbitmq-server
-Version: 2.8.7
-Release: 2%{?dist}
+Version: 3.0.4
+Release: 1%{?dist}
 License: MPLv1.1
 Group: Development/Libraries
 Source: http://www.rabbitmq.com/releases/rabbitmq-server/v%{version}/%{name}-%{version}.tar.gz
@@ -57,6 +55,7 @@ scalable implementation of an AMQP broker.
 %build
 cp %{S:2} %{_rabbit_wrapper}
 cp %{S:4} %{_rabbit_server_ocf}
+#USE_SPECS="true" USE_PROPER_QC="false" make %{?_smp_mflags}
 make %{?_smp_mflags}
 
 %install
@@ -187,6 +186,9 @@ done
 rm -rf %{buildroot}
 
 %changelog
+* Sun Mar 17 2013 Peter Lemenkov <lemenkov@gmail.com> - 3.0.4-1
+- New Upstream Release - 3.0.4
+
 * Thu Feb 14 2013 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 2.8.7-2
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_19_Mass_Rebuild
 
diff --git a/sources b/sources
index 6b10d3c..04d21a7 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-bf750503f467ce879bded0fbc6a3ea9e  rabbitmq-server-2.8.7.tar.gz
+e4db90708fa2e9a687af342bbd2c0dd8  rabbitmq-server-3.0.4.tar.gz