Ticket #20038: rabbit-1.6.0.patch

diff -crBN rabbitmq-server-1.5.3/files/rabbitmqctl_wrapper rabbitmq-server-1.6.0/files/rabbitmqctl_wrapper
*** rabbitmq-server-1.5.3/files/rabbitmqctl_wrapper     2009-06-22 13:31:24.000000000 +0100
--- rabbitmq-server-1.6.0/files/rabbitmqctl_wrapper     1970-01-01 01:00:00.000000000 +0100
***************
*** 1,2 ****
- #!/bin/bash
- exec sudo -H -u rabbitmq "@PREFIX@/sbin/rabbitmqctl_real" "$@"
--- 0 ----
diff -crBN rabbitmq-server-1.5.3/files/rabbitmq-script-wrapper rabbitmq-server-1.6.0/files/rabbitmq-script-wrapper
*** rabbitmq-server-1.5.3/files/rabbitmq-script-wrapper 1970-01-01 01:00:00.000000000 +0100
--- rabbitmq-server-1.6.0/files/rabbitmq-script-wrapper 2009-06-22 13:32:51.000000000 +0100
***************
*** 0 ****
--- 1,13 ----
+ #!/bin/bash
+ cd /var/lib/rabbitmq
+ 
+ SCRIPT=`basename $0`
+ 
+ if [ `id -u` = 0 ] ; then
+     sudo -u rabbitmq -H /usr/lib/rabbitmq/bin/${SCRIPT} "$@"
+ else
+     /usr/lib/rabbitmq/bin/${SCRIPT}
+     echo -e "\nOnly root should run ${SCRIPT}\n"
+     exit 1
+ fi
+ 
diff -crBN rabbitmq-server-1.5.3/Portfile rabbitmq-server-1.6.0/Portfile
*** rabbitmq-server-1.5.3/Portfile      2009-06-22 13:31:24.000000000 +0100
--- rabbitmq-server-1.6.0/Portfile      2009-06-22 13:32:51.000000000 +0100
***************
*** 1,15 ****
  # -*- coding: utf-8; mode: tcl; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- vim:fenc=utf-8:filetype=tcl:et:sw=4:ts=4:sts=4
! # $Id: Portfile 50984 2009-05-14 21:08:43Z and.damore@macports.org $
  
! PortSystem      1.0
! 
! name            rabbitmq-server
! version         1.5.3
! categories      net
! maintainers     rabbitmq.com:tonyg
! platforms       darwin
! description     The RabbitMQ AMQP Server
! long_description    \
      RabbitMQ is an implementation of AMQP, the emerging standard for \
      high performance enterprise messaging. The RabbitMQ server is a \
      robust and scalable implementation of an AMQP broker.
--- 1,15 ----
  # -*- coding: utf-8; mode: tcl; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- vim:fenc=utf-8:filetype=tcl:et:sw=4:ts=4:sts=4
! # $Id$
  
! PortSystem 1.0
! name          rabbitmq-server
! version               1.6.0
! revision      0
! categories    net 
! maintainers   tonyg@rabbitmq.com
! platforms     darwin
! description   The RabbitMQ AMQP Server
! long_description      \
      RabbitMQ is an implementation of AMQP, the emerging standard for \
      high performance enterprise messaging. The RabbitMQ server is a \
      robust and scalable implementation of an AMQP broker.
***************
*** 19,27 ****
  master_sites    http://www.rabbitmq.com/releases/rabbitmq-server/v${version}/
  
  checksums \
!     md5 3242a67885c2471b5ab62254bf024679 \
!     sha1 f4d6a01eaa2c74fa32f567fe410d21d9be1b43aa \
!     rmd160 1a1c4b97d765548028c161d1617905151ca9e040
  
  depends_build   port:erlang port:py25-simplejson
  depends_run     port:erlang
--- 19,27 ----
  master_sites    http://www.rabbitmq.com/releases/rabbitmq-server/v${version}/
  
  checksums \
!     md5 af3b0d868d58e5aefb4f0837b82ca010 \
!     sha1 1834c670d076fa9878223aacaa35a5a6528f1d86 \
!     rmd160 d6c9de4e1fb48c6ceb1cb5d717ca2afb5e3266fe
  
  depends_build   port:erlang port:py25-simplejson
  depends_run     port:erlang
***************
*** 32,37 ****
--- 32,39 ----
  set logdir ${prefix}/var/log/rabbitmq
  set mnesiadbdir ${prefix}/var/lib/rabbitmq/mnesia
  set plistloc ${prefix}/etc/LaunchDaemons/org.macports.rabbitmq-server
+ set sbindir ${destroot}${prefix}/lib/rabbitmq/bin
+ set wrappersbin ${destroot}${prefix}/sbin
  
  use_configure   no
  
***************
*** 41,47 ****
  
  destroot.destdir \
      TARGET_DIR=${destroot}${prefix}/lib/erlang/lib/rabbitmq_server-${version} \
!     SBIN_DIR=${destroot}${prefix}/sbin \
      MAN_DIR=${destroot}${prefix}/share/man
  
  destroot.keepdirs \
--- 43,49 ----
  
  destroot.destdir \
      TARGET_DIR=${destroot}${prefix}/lib/erlang/lib/rabbitmq_server-${version} \
!     SBIN_DIR=${sbindir} \
      MAN_DIR=${destroot}${prefix}/share/man
  
  destroot.keepdirs \
***************
*** 59,90 ****
      xinstall -d -g [existsgroup ${servergroup}] -m 775 ${destroot}${mnesiadbdir}
  
      reinplace -E "s:(/etc/rabbitmq/rabbitmq.conf):${prefix}\\1:g" \
!         ${destroot}${prefix}/sbin/rabbitmq-multi \
!         ${destroot}${prefix}/sbin/rabbitmq-server \
!         ${destroot}${prefix}/sbin/rabbitmqctl
!     reinplace -E "s:(RABBITMQ_CLUSTER_CONFIG_FILE)=/:\\1=${prefix}/:" \
!         ${destroot}${prefix}/sbin/rabbitmq-multi \
!         ${destroot}${prefix}/sbin/rabbitmq-server \
!         ${destroot}${prefix}/sbin/rabbitmqctl
!     reinplace -E "s:(RABBITMQ_LOG_BASE)=/:\\1=${prefix}/:" \
!         ${destroot}${prefix}/sbin/rabbitmq-multi \
!         ${destroot}${prefix}/sbin/rabbitmq-server \
!         ${destroot}${prefix}/sbin/rabbitmqctl
!     reinplace -E "s:(RABBITMQ_MNESIA_BASE)=/:\\1=${prefix}/:" \
!         ${destroot}${prefix}/sbin/rabbitmq-multi \
!         ${destroot}${prefix}/sbin/rabbitmq-server \
!         ${destroot}${prefix}/sbin/rabbitmqctl
!     reinplace -E "s:(RABBITMQ_PIDS_FILE)=/:\\1=${prefix}/:" \
!         ${destroot}${prefix}/sbin/rabbitmq-multi \
!         ${destroot}${prefix}/sbin/rabbitmq-server \
!         ${destroot}${prefix}/sbin/rabbitmqctl
! 
!     file rename ${destroot}${prefix}/sbin/rabbitmqctl ${destroot}${prefix}/sbin/rabbitmqctl_real
!     xinstall -m 555 ${filespath}/rabbitmqctl_wrapper ${destroot}${prefix}/sbin
!     file rename ${destroot}${prefix}/sbin/rabbitmqctl_wrapper ${destroot}${prefix}/sbin/rabbitmqctl
  
-     reinplace -E "s:@PREFIX@:${prefix}:" \
-         ${destroot}${prefix}/sbin/rabbitmqctl
  }
  
  pre-install {
--- 61,96 ----
      xinstall -d -g [existsgroup ${servergroup}] -m 775 ${destroot}${mnesiadbdir}
  
      reinplace -E "s:(/etc/rabbitmq/rabbitmq.conf):${prefix}\\1:g" \
!         ${sbindir}/rabbitmq-multi \
!         ${sbindir}/rabbitmq-server \
!         ${sbindir}/rabbitmqctl
!     reinplace -E "s:(CLUSTER_CONFIG_FILE)=/:\\1=${prefix}/:" \
!         ${sbindir}/rabbitmq-multi \
!         ${sbindir}/rabbitmq-server \
!         ${sbindir}/rabbitmqctl
!     reinplace -E "s:(LOG_BASE)=/:\\1=${prefix}/:" \
!         ${sbindir}/rabbitmq-multi \
!         ${sbindir}/rabbitmq-server \
!         ${sbindir}/rabbitmqctl
!     reinplace -E "s:(MNESIA_BASE)=/:\\1=${prefix}/:" \
!         ${sbindir}/rabbitmq-multi \
!         ${sbindir}/rabbitmq-server \
!         ${sbindir}/rabbitmqctl
!     reinplace -E "s:(PIDS_FILE)=/:\\1=${prefix}/:" \
!         ${sbindir}/rabbitmq-multi \
!         ${sbindir}/rabbitmq-server \
!         ${sbindir}/rabbitmqctl
! 
!     xinstall -m 555 ${filespath}/rabbitmq-script-wrapper \
!                 ${wrappersbin}/rabbitmq-multi
! 
!     reinplace -E "s:/usr/lib/rabbitmq/bin/:${prefix}/lib/rabbitmq/bin/:" \
!                 ${wrappersbin}/rabbitmq-multi
!     reinplace -E "s:/var/lib/rabbitmq:${prefix}/var/lib/rabbitmq:" \
!                 ${wrappersbin}/rabbitmq-multi
!     file copy ${wrappersbin}/rabbitmq-multi ${wrappersbin}/rabbitmq-server
!     file copy ${wrappersbin}/rabbitmq-multi ${wrappersbin}/rabbitmqctl
  
  }
  
  pre-install {