Ticket #23742: rabbitmq-server-1.7.2.patch

File rabbitmq-server-1.7.2.patch, 5.5 KB (added by dpw@…, 14 years ago)

  • rabbitmq-server/files/rabbitmq-asroot-script-wrapper 

    diff -Naur --exclude=.svn macports/rabbitmq-server/files/rabbitmq-asroot-script-wrapper rabbitmq/rabbitmq-server/files/rabbitmq-asroot-script-wrapper
    old new  
    1 #!/bin/bash
     1#!/bin/sh
     2##   The contents of this file are subject to the Mozilla Public License
     3##   Version 1.1 (the "License"); you may not use this file except in
     4##   compliance with the License. You may obtain a copy of the License at
     5##   http://www.mozilla.org/MPL/
     6##
     7##   Software distributed under the License is distributed on an "AS IS"
     8##   basis, WITHOUT WARRANTY OF ANY KIND, either express or implied. See the
     9##   License for the specific language governing rights and limitations
     10##   under the License.
     11##
     12##   The Original Code is RabbitMQ.
     13##
     14##   The Initial Developers of the Original Code are LShift Ltd,
     15##   Cohesive Financial Technologies LLC, and Rabbit Technologies Ltd.
     16##
     17##   Portions created before 22-Nov-2008 00:00:00 GMT by LShift Ltd,
     18##   Cohesive Financial Technologies LLC, or Rabbit Technologies Ltd
     19##   are Copyright (C) 2007-2008 LShift Ltd, Cohesive Financial
     20##   Technologies LLC, and Rabbit Technologies Ltd.
     21##
     22##   Portions created by LShift Ltd are Copyright (C) 2007-2010 LShift
     23##   Ltd. Portions created by Cohesive Financial Technologies LLC are
     24##   Copyright (C) 2007-2010 Cohesive Financial Technologies
     25##   LLC. Portions created by Rabbit Technologies Ltd are Copyright
     26##   (C) 2007-2010 Rabbit Technologies Ltd.
     27##
     28##   All Rights Reserved.
     29##
     30##   Contributor(s): ______________________________________.
     31##
     32
    233cd /var/lib/rabbitmq
    334
    435SCRIPT=`basename $0`
    … …  
    637if [ `id -u` = 0 ] ; then
    738    /usr/lib/rabbitmq/bin/${SCRIPT} "$@"
    839else
    9     echo -e "\nOnly root should run ${SCRIPT}\n"
     40    echo
     41    echo "Only root should run ${SCRIPT}"
     42    echo
    1043    exit 1
    1144fi
    1245

  • rabbitmq-server/files/rabbitmq-script-wrapper 

    diff -Naur --exclude=.svn macports/rabbitmq-server/files/rabbitmq-script-wrapper rabbitmq/rabbitmq-server/files/rabbitmq-script-wrapper
    old new  
    1 #!/bin/bash
     1#!/bin/sh
     2##   The contents of this file are subject to the Mozilla Public License
     3##   Version 1.1 (the "License"); you may not use this file except in
     4##   compliance with the License. You may obtain a copy of the License at
     5##   http://www.mozilla.org/MPL/
     6##
     7##   Software distributed under the License is distributed on an "AS IS"
     8##   basis, WITHOUT WARRANTY OF ANY KIND, either express or implied. See the
     9##   License for the specific language governing rights and limitations
     10##   under the License.
     11##
     12##   The Original Code is RabbitMQ.
     13##
     14##   The Initial Developers of the Original Code are LShift Ltd,
     15##   Cohesive Financial Technologies LLC, and Rabbit Technologies Ltd.
     16##
     17##   Portions created before 22-Nov-2008 00:00:00 GMT by LShift Ltd,
     18##   Cohesive Financial Technologies LLC, or Rabbit Technologies Ltd
     19##   are Copyright (C) 2007-2008 LShift Ltd, Cohesive Financial
     20##   Technologies LLC, and Rabbit Technologies Ltd.
     21##
     22##   Portions created by LShift Ltd are Copyright (C) 2007-2010 LShift
     23##   Ltd. Portions created by Cohesive Financial Technologies LLC are
     24##   Copyright (C) 2007-2010 Cohesive Financial Technologies
     25##   LLC. Portions created by Rabbit Technologies Ltd are Copyright
     26##   (C) 2007-2010 Rabbit Technologies Ltd.
     27##
     28##   All Rights Reserved.
     29##
     30##   Contributor(s): ______________________________________.
     31##
     32
     33# Escape spaces and quotes, because shell is revolting.
     34for arg in "$@" ; do
     35        # Escape quotes in parameters, so that they're passed through cleanly.
     36        arg=$(sed -e 's/"/\\"/g' <<-END
     37                $arg
     38                END
     39        )
     40        CMDLINE="${CMDLINE} \"${arg}\""
     41done
     42
    243cd /var/lib/rabbitmq
    344
    445SCRIPT=`basename $0`
    546
    647if [ `id -u` = 0 ] ; then
    7     sudo -u rabbitmq -H /usr/lib/rabbitmq/bin/${SCRIPT} "$@"
     48    sudo -E -u rabbitmq -H /bin/sh -c "/usr/lib/rabbitmq/bin/${SCRIPT} ${CMDLINE}"
    849elif [ `id -u` = `id -u rabbitmq` ] ; then
    950    /usr/lib/rabbitmq/bin/${SCRIPT} "$@"
    1051else
    1152    /usr/lib/rabbitmq/bin/${SCRIPT}
    12     echo -e "\nOnly root or rabbitmq should run ${SCRIPT}\n"
     53    echo
     54    echo "Only root or rabbitmq should run ${SCRIPT}"
     55    echo
    1356    exit 1
    1457fi
    1558

  • rabbitmq-server/Portfile 

    diff -Naur --exclude=.svn macports/rabbitmq-server/Portfile rabbitmq/rabbitmq-server/Portfile
    old new  
    33
    44PortSystem 1.0
    55name            rabbitmq-server
    6 version         1.7.0
    7 revision        1
     6version         1.7.2
     7revision        0
    88categories      net
    9 maintainers     paperplanes.de:meyer rabbitmq.com:tobyg openmaintainer
     9maintainers     paperplanes.de:meyer rabbitmq.com:tonyg openmaintainer
    1010platforms       darwin
    1111description     The RabbitMQ AMQP Server
    1212long_description        \
    … …  
    1919master_sites    http://www.rabbitmq.com/releases/rabbitmq-server/v${version}/
    2020
    2121checksums \
    22     md5 4505ca0fd8718439bd6f5e2af2379e56 \
    23     sha1 84fb86d403057bb808c1b51deee0c1fca3bf7bef \
    24     rmd160 092f90946825cc3eb277019805e24db637a559f4
     22    md5 fb83be3b1577cdd54459012b85b7631d \
     23    sha1 ecc35617cc14cca7752f67b845bcc97e421254b4 \
     24    rmd160 ba2db97f88a3b51c6246307244e3f5b40112bb36
    2525
    2626depends_build   port:erlang
    2727depends_run     port:erlang