Ticket #28254: rabbitmq-2.3.0.patch

File rabbitmq-2.3.0.patch, 7.3 KB (added by simon@…, 14 years ago)

Patch to update portfile and wrapper scripts

  • 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/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 cd /var/lib/rabbitmq
    34 
    35 SCRIPT=`basename $0`
    36 
    37 if [ `id -u` = 0 ] ; then
    38     /usr/lib/rabbitmq/bin/${SCRIPT} "$@"
    39 else
    40     echo
    41     echo "Only root should run ${SCRIPT}"
    42     echo
    43     exit 1
    44 fi
    45 

  • 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  
    11#!/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/
     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
     5##  at 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
     9##  the License for the specific language governing rights and
     10##  limitations under the License.
    611##
    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.
     12##  The Original Code is RabbitMQ.
    1113##
    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): ______________________________________.
     14##  The Initial Developer of the Original Code is VMware, Inc.
     15##  Copyright (c) 2007-2011 VMware, Inc.  All rights reserved.
    3116##
    3217
    3318# Escape spaces and quotes, because shell is revolting.
    … …  
    5540    echo
    5641    exit 1
    5742fi
    58 

  • 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         2.1.1
     6version         2.3.0
    77categories      net
    88maintainers     paperplanes.de:meyer rabbitmq.com:tonyg openmaintainer
    99platforms       darwin
    … …  
    1919homepage        http://www.rabbitmq.com/
    2020master_sites    http://www.rabbitmq.com/releases/rabbitmq-server/v${version}/
    2121
    22 checksums       sha1 d60bc55f819a56bef00b0bfafd12f707fc985301 \
    23                 rmd160 41d312dd934d017d492f2d1ccecdc9bd428e8a8a
     22distfiles      ${name}-${version}${extract.suffix} \
     23               ${name}-generic-unix-${version}${extract.suffix}
     24
     25checksums \
     26    ${name}-${version}${extract.suffix} md5 71cc70b07f879cbd130b7a0a6cf35beb \
     27    ${name}-${version}${extract.suffix} sha1 684572f71f44cbc464a05cd270c601cced6e37ea \
     28    ${name}-${version}${extract.suffix} rmd160 dc29dc7f9d09321fb2b98129519c1423eaeac294 \
     29    ${name}-generic-unix-${version}${extract.suffix} md5 5c60c747f545e32505f8796011a9a079 \
     30    ${name}-generic-unix-${version}${extract.suffix} sha1 e2f5be9ab4e03b1bd64cf35f2392802db39ee946 \
     31    ${name}-generic-unix-${version}${extract.suffix} rmd160 8ff36b70071f1bb54b380a781150a7c3aa86a9a8
    2432
    2533depends_lib     port:erlang
    26 depends_build   port:xmlto port:libxslt
     34depends_build   port:libxslt
    2735
    2836platform darwin 8 {
    2937    depends_build-append port:py26-simplejson
    … …  
    4553set sbindir ${destroot}${prefix}/lib/rabbitmq/bin
    4654set wrappersbin ${destroot}${prefix}/sbin
    4755set realsbin ${destroot}${prefix}/lib/rabbitmq/lib/rabbitmq_server-${version}/sbin
     56set mansrc ${workpath}/rabbitmq_server-${version}/share/man
     57set mandest ${destroot}${prefix}/share/man
    4858
    4959use_configure   no
    5060
    5161use_parallel_build yes
    5262
     63destroot.target install_bin
     64
    5365destroot.destdir \
    5466    TARGET_DIR=${destroot}${prefix}/lib/rabbitmq/lib/rabbitmq_server-${version} \
    5567    SBIN_DIR=${sbindir} \
    … …  
    7183
    7284    reinplace -E "s:(/etc/rabbitmq/rabbitmq.conf):${prefix}\\1:g" \
    7385        ${realsbin}/rabbitmq-env
    74     foreach var {CONFIG_FILE CLUSTER_CONFIG_FILE LOG_BASE MNESIA_BASE PIDS_FILE} {
     86    foreach var {CONFIG_FILE LOG_BASE MNESIA_BASE PIDS_FILE} {
    7587        reinplace -E "s:^($var)=/:\\1=${prefix}/:" \
    7688            ${realsbin}/rabbitmq-multi \
    7789            ${realsbin}/rabbitmq-server \
    … …  
    89101                ${wrappersbin}/rabbitmq-multi
    90102    file copy ${wrappersbin}/rabbitmq-multi ${wrappersbin}/rabbitmq-server
    91103    file copy ${wrappersbin}/rabbitmq-multi ${wrappersbin}/rabbitmqctl
     104
     105    file copy ${mansrc}/man1/rabbitmq-multi.1.gz  ${mandest}/man1/
     106    file copy ${mansrc}/man1/rabbitmq-server.1.gz ${mandest}/man1/
     107    file copy ${mansrc}/man1/rabbitmqctl.1.gz     ${mandest}/man1/
     108    file copy ${mansrc}/man5/rabbitmq.conf.5.gz   ${mandest}/man5/
    92109}
    93110
    94111pre-install {