Date: Tue, 31 Aug 2010 22:41:41 GMT From: Phillip Neumann <pneumann@gmail.com> To: freebsd-gnats-submit@FreeBSD.org Subject: ports/150168: [UPDATE] net/rabbitmq to 2.0.0 Message-ID: <201008312241.o7VMffFQ088804@www.freebsd.org> Resent-Message-ID: <201008312250.o7VMo1Ex096816@freefall.freebsd.org>
next in thread | raw e-mail | index | archive | help
>Number: 150168 >Category: ports >Synopsis: [UPDATE] net/rabbitmq to 2.0.0 >Confidential: no >Severity: non-critical >Priority: low >Responsible: freebsd-ports-bugs >State: open >Quarter: >Keywords: >Date-Required: >Class: maintainer-update >Submitter-Id: current-users >Arrival-Date: Tue Aug 31 22:50:01 UTC 2010 >Closed-Date: >Last-Modified: >Originator: Phillip Neumann >Release: 8.0 >Organization: >Environment: FreeBSD ocho.sofsis.cl 8.0-STABLE FreeBSD 8.0-STABLE #1: Fri Jan 1 09:03:23 CLST 2010 root@ocho.sofsis.cl:/usr/obj/usr/src/sys/GENERIC i386 >Description: This is an update for RabbitMQ to version 2.0.0. It has big upgrade, more info in here http://lists.rabbitmq.com/pipermail/rabbitmq-announce/attachments/20100825/2c672695/attachment.txt The update will backup the old database and create a new one, so i think its not necesary to put this in UPDATING. On the other hand this fixes a bug in the patch of rabbitmqctl wich did not let the user execute some things. I could only fix this by entroducing security/sudo as a runtime dependency. Also, a new patch for a bug that did not let /usr/local/etc/rc.d/rabbitmq stop finishes.. It has been reported upstream. I noticed Pav added this "MANUAL_PACKAGE_BUILD= erlang beam.smp hangs on pointyhat". If the problem was the above bug, please delete that. Thanks!! >How-To-Repeat: >Fix: Patch attached with submission follows: diff -ruN rabbitmq.orig/Makefile rabbitmq/Makefile --- rabbitmq.orig/Makefile 2010-08-25 15:26:48.000000000 -0400 +++ rabbitmq/Makefile 2010-08-31 16:29:21.000000000 -0400 @@ -6,7 +6,7 @@ # PORTNAME= rabbitmq -PORTVERSION= 1.8.0 +PORTVERSION= 2.0.0 CATEGORIES= net MASTER_SITES= http://www.rabbitmq.com/releases/rabbitmq-server/v${PORTVERSION}/ DISTNAME= ${PORTNAME}-server-${PORTVERSION} @@ -17,7 +17,8 @@ BUILD_DEPENDS= erlc:${PORTSDIR}/lang/erlang-lite \ ${PYTHON_PKGNAMEPREFIX}simplejson>=2.0:${PORTSDIR}/devel/py-simplejson \ xmlto:${PORTSDIR}/textproc/xmlto -RUN_DEPENDS= erlc:${PORTSDIR}/lang/erlang-lite +RUN_DEPENDS= erlc:${PORTSDIR}/lang/erlang-lite \ + sudo:${PORTSDIR}/security/sudo USE_GMAKE= yes USE_PYTHON= yes @@ -38,8 +39,7 @@ RABBITMQ_UID=${RABBITMQ_UID} \ RABBITMQ_USER=${RABBITMQ_USER} -MAN1= rabbitmq-multi.1 rabbitmq-server.1 rabbitmqctl.1 \ - rabbitmq-activate-plugins.1 rabbitmq-deactivate-plugins.1 +MAN1= rabbitmq-multi.1 rabbitmq-server.1 rabbitmqctl.1 MAN5= rabbitmq.conf.5 MANCOMPRESSED= yes diff -ruN rabbitmq.orig/distinfo rabbitmq/distinfo --- rabbitmq.orig/distinfo 2010-07-22 09:33:08.000000000 -0400 +++ rabbitmq/distinfo 2010-08-27 09:57:49.000000000 -0400 @@ -1,3 +1,3 @@ -MD5 (rabbitmq-server-1.8.0.tar.gz) = e00bea375e81d51600b5b14220c64d89 -SHA256 (rabbitmq-server-1.8.0.tar.gz) = ccb64d1ea0823a0e143444b8888f86b625bd6907f0625c9f7cd28da1d029d8d8 -SIZE (rabbitmq-server-1.8.0.tar.gz) = 202386 +MD5 (rabbitmq-server-2.0.0.tar.gz) = 04b99018085d4156b404d56377fc1c62 +SHA256 (rabbitmq-server-2.0.0.tar.gz) = 68ec7d210e3a379696538f09322d1c8161066dbcb2a8822ffbfed068b7c9bc7f +SIZE (rabbitmq-server-2.0.0.tar.gz) = 272752 diff -ruN rabbitmq.orig/files/patch-rabbitmqctl rabbitmq/files/patch-rabbitmqctl --- rabbitmq.orig/files/patch-rabbitmqctl 2010-07-22 09:33:09.000000000 -0400 +++ rabbitmq/files/patch-rabbitmqctl 2010-08-31 18:11:05.000000000 -0400 @@ -1,20 +1,16 @@ ---- scripts/rabbitmqctl.orig 2010-07-08 17:14:15.000000000 -0400 -+++ scripts/rabbitmqctl 2010-07-08 17:15:01.000000000 -0400 -@@ -38,13 +38,13 @@ +--- scripts/rabbitmqctl.orig 2010-08-24 11:19:27.000000000 -0400 ++++ scripts/rabbitmqctl 2010-08-31 17:58:01.000000000 -0400 +@@ -38,7 +38,7 @@ [ "x" = "x$RABBITMQ_NODENAME" ] && RABBITMQ_NODENAME=${NODENAME} [ "x" = "x$RABBITMQ_CTL_ERL_ARGS" ] && RABBITMQ_CTL_ERL_ARGS=${CTL_ERL_ARGS} -exec erl \ -- -pa "${RABBITMQ_HOME}/ebin" \ -+cmd="exec erl \ -+ -pa '${RABBITMQ_HOME}/ebin' \ ++sudo -u rabbitmq HOME=/var/db/rabbitmq erl \ + -pa "${RABBITMQ_HOME}/ebin" \ -noinput \ -hidden \ - ${RABBITMQ_CTL_ERL_ARGS} \ - -sname rabbitmqctl$$ \ +@@ -47,4 +47,3 @@ -s rabbit_control \ -nodename $RABBITMQ_NODENAME \ -- -extra "$@" + -extra "$@" - -+ -extra '$@' " -+env HOME=/var/db/rabbitmq su -m rabbitmq -c "${cmd}" diff -ruN rabbitmq.orig/files/patch-src-rabbitmulti.erl rabbitmq/files/patch-src-rabbitmulti.erl --- rabbitmq.orig/files/patch-src-rabbitmulti.erl 1969-12-31 21:00:00.000000000 -0300 +++ rabbitmq/files/patch-src-rabbitmulti.erl 2010-08-31 18:07:45.000000000 -0400 @@ -0,0 +1,11 @@ +--- src/rabbit_multi.erl.orig 2010-08-31 18:06:58.000000000 -0400 ++++ src/rabbit_multi.erl 2010-08-31 18:07:09.000000000 -0400 +@@ -303,7 +303,7 @@ + is_dead(Pid) -> + PidS = integer_to_list(Pid), + with_os([{unix, fun () -> +- Res = os:cmd("ps --no-headers --pid " ++ PidS), ++ Res = os:cmd("ps " ++ PidS ++ " |grep -v PID"), + Res == "" + end}, + {win32, fun () -> diff -ruN rabbitmq.orig/pkg-plist rabbitmq/pkg-plist --- rabbitmq.orig/pkg-plist 2010-07-22 09:33:08.000000000 -0400 +++ rabbitmq/pkg-plist 2010-08-27 11:07:02.000000000 -0400 @@ -1,5 +1,3 @@ -sbin/rabbitmq-activate-plugins -sbin/rabbitmq-deactivate-plugins sbin/rabbitmq-env sbin/rabbitmq-multi sbin/rabbitmq-server @@ -7,9 +5,11 @@ lib/erlang/lib/rabbitmq_server-%%VERSION%%/INSTALL lib/erlang/lib/rabbitmq_server-%%VERSION%%/LICENSE lib/erlang/lib/rabbitmq_server-%%VERSION%%/LICENSE-MPL-RabbitMQ +lib/erlang/lib/rabbitmq_server-%%VERSION%%/ebin/bpqueue.beam lib/erlang/lib/rabbitmq_server-%%VERSION%%/ebin/delegate.beam lib/erlang/lib/rabbitmq_server-%%VERSION%%/ebin/delegate_sup.beam lib/erlang/lib/rabbitmq_server-%%VERSION%%/ebin/file_handle_cache.beam +lib/erlang/lib/rabbitmq_server-%%VERSION%%/ebin/gatherer.beam lib/erlang/lib/rabbitmq_server-%%VERSION%%/ebin/gen_server2.beam lib/erlang/lib/rabbitmq_server-%%VERSION%%/ebin/pg_local.beam lib/erlang/lib/rabbitmq_server-%%VERSION%%/ebin/priority_queue.beam @@ -38,7 +38,9 @@ lib/erlang/lib/rabbitmq_server-%%VERSION%%/ebin/rabbit_exchange_type_headers.beam lib/erlang/lib/rabbitmq_server-%%VERSION%%/ebin/rabbit_exchange_type_registry.beam lib/erlang/lib/rabbitmq_server-%%VERSION%%/ebin/rabbit_exchange_type_topic.beam -lib/erlang/lib/rabbitmq_server-%%VERSION%%/ebin/rabbit_framing.beam +lib/erlang/lib/rabbitmq_server-%%VERSION%%/ebin/rabbit_event.beam +lib/erlang/lib/rabbitmq_server-%%VERSION%%/ebin/rabbit_framing_amqp_0_8.beam +lib/erlang/lib/rabbitmq_server-%%VERSION%%/ebin/rabbit_framing_amqp_0_9_1.beam lib/erlang/lib/rabbitmq_server-%%VERSION%%/ebin/rabbit_framing_channel.beam lib/erlang/lib/rabbitmq_server-%%VERSION%%/ebin/rabbit_guid.beam lib/erlang/lib/rabbitmq_server-%%VERSION%%/ebin/rabbit_heartbeat.beam @@ -52,19 +54,28 @@ lib/erlang/lib/rabbitmq_server-%%VERSION%%/ebin/rabbit_mnesia.beam lib/erlang/lib/rabbitmq_server-%%VERSION%%/ebin/rabbit_multi.beam lib/erlang/lib/rabbitmq_server-%%VERSION%%/ebin/rabbit_multi_usage.beam +lib/erlang/lib/rabbitmq_server-%%VERSION%%/ebin/rabbit_msg_file.beam +lib/erlang/lib/rabbitmq_server-%%VERSION%%/ebin/rabbit_msg_store.beam +lib/erlang/lib/rabbitmq_server-%%VERSION%%/ebin/rabbit_msg_store_ets_index.beam +lib/erlang/lib/rabbitmq_server-%%VERSION%%/ebin/rabbit_msg_store_gc.beam +lib/erlang/lib/rabbitmq_server-%%VERSION%%/ebin/rabbit_msg_store_index.beam lib/erlang/lib/rabbitmq_server-%%VERSION%%/ebin/rabbit_net.beam lib/erlang/lib/rabbitmq_server-%%VERSION%%/ebin/rabbit_networking.beam lib/erlang/lib/rabbitmq_server-%%VERSION%%/ebin/rabbit_node_monitor.beam lib/erlang/lib/rabbitmq_server-%%VERSION%%/ebin/rabbit_persister.beam lib/erlang/lib/rabbitmq_server-%%VERSION%%/ebin/rabbit_plugin_activator.beam +lib/erlang/lib/rabbitmq_server-%%VERSION%%/ebin/rabbit_queue_collector.beam +lib/erlang/lib/rabbitmq_server-%%VERSION%%/ebin/rabbit_queue_index.beam lib/erlang/lib/rabbitmq_server-%%VERSION%%/ebin/rabbit_reader.beam -lib/erlang/lib/rabbitmq_server-%%VERSION%%/ebin/rabbit_reader_queue_collector.beam lib/erlang/lib/rabbitmq_server-%%VERSION%%/ebin/rabbit_restartable_sup.beam lib/erlang/lib/rabbitmq_server-%%VERSION%%/ebin/rabbit_router.beam lib/erlang/lib/rabbitmq_server-%%VERSION%%/ebin/rabbit_sasl_report_file_h.beam lib/erlang/lib/rabbitmq_server-%%VERSION%%/ebin/rabbit_sup.beam lib/erlang/lib/rabbitmq_server-%%VERSION%%/ebin/rabbit_tests.beam +lib/erlang/lib/rabbitmq_server-%%VERSION%%/ebin/rabbit_tests_event_receiver.beam lib/erlang/lib/rabbitmq_server-%%VERSION%%/ebin/rabbit_tracer.beam +lib/erlang/lib/rabbitmq_server-%%VERSION%%/ebin/rabbit_types.beam +lib/erlang/lib/rabbitmq_server-%%VERSION%%/ebin/rabbit_variable_queue.beam lib/erlang/lib/rabbitmq_server-%%VERSION%%/ebin/rabbit_writer.beam lib/erlang/lib/rabbitmq_server-%%VERSION%%/ebin/supervisor2.beam lib/erlang/lib/rabbitmq_server-%%VERSION%%/ebin/tcp_acceptor.beam @@ -72,6 +83,7 @@ lib/erlang/lib/rabbitmq_server-%%VERSION%%/ebin/tcp_client_sup.beam lib/erlang/lib/rabbitmq_server-%%VERSION%%/ebin/tcp_listener.beam lib/erlang/lib/rabbitmq_server-%%VERSION%%/ebin/tcp_listener_sup.beam +lib/erlang/lib/rabbitmq_server-%%VERSION%%/ebin/test_sup.beam lib/erlang/lib/rabbitmq_server-%%VERSION%%/ebin/vm_memory_monitor.beam lib/erlang/lib/rabbitmq_server-%%VERSION%%/ebin/worker_pool.beam lib/erlang/lib/rabbitmq_server-%%VERSION%%/ebin/worker_pool_sup.beam @@ -80,13 +92,14 @@ lib/erlang/lib/rabbitmq_server-%%VERSION%%/include/rabbit_backing_queue_spec.hrl lib/erlang/lib/rabbitmq_server-%%VERSION%%/include/rabbit_exchange_type_spec.hrl lib/erlang/lib/rabbitmq_server-%%VERSION%%/include/rabbit_framing.hrl -lib/erlang/lib/rabbitmq_server-%%VERSION%%/include/rabbit_framing_spec.hrl -lib/erlang/lib/rabbitmq_server-%%VERSION%%/sbin/rabbitmq-activate-plugins -lib/erlang/lib/rabbitmq_server-%%VERSION%%/sbin/rabbitmq-deactivate-plugins +lib/erlang/lib/rabbitmq_server-%%VERSION%%/include/rabbit_msg_store.hrl +lib/erlang/lib/rabbitmq_server-%%VERSION%%/include/rabbit_msg_store_index.hrl +lib/erlang/lib/rabbitmq_server-%%VERSION%%/plugins/README lib/erlang/lib/rabbitmq_server-%%VERSION%%/sbin/rabbitmq-env lib/erlang/lib/rabbitmq_server-%%VERSION%%/sbin/rabbitmq-multi lib/erlang/lib/rabbitmq_server-%%VERSION%%/sbin/rabbitmq-server lib/erlang/lib/rabbitmq_server-%%VERSION%%/sbin/rabbitmqctl +@dirrm lib/erlang/lib/rabbitmq_server-%%VERSION%%/plugins @dirrm lib/erlang/lib/rabbitmq_server-%%VERSION%%/include @dirrm lib/erlang/lib/rabbitmq_server-%%VERSION%%/sbin @dirrm lib/erlang/lib/rabbitmq_server-%%VERSION%%/ebin diff -ruN rabbitmq.orig/rabbitmq/Makefile rabbitmq/rabbitmq/Makefile --- rabbitmq.orig/rabbitmq/Makefile 2010-08-25 15:26:48.000000000 -0400 +++ rabbitmq/rabbitmq/Makefile 1969-12-31 21:00:00.000000000 -0300 @@ -1,65 +0,0 @@ -# New ports collection makefile for: rabbitmq -# Date Created: 2008-07-11 -# Whom: Phillip Neumann <pneumann@gmail.com> -# -# $FreeBSD: ports/net/rabbitmq/Makefile,v 1.14 2010/08/25 19:26:48 pav Exp $ -# - -PORTNAME= rabbitmq -PORTVERSION= 1.8.0 -CATEGORIES= net -MASTER_SITES= http://www.rabbitmq.com/releases/rabbitmq-server/v${PORTVERSION}/ -DISTNAME= ${PORTNAME}-server-${PORTVERSION} - -MAINTAINER= pneumann@gmail.com -COMMENT= RabbitMQ is an implementation of AMQP - -BUILD_DEPENDS= erlc:${PORTSDIR}/lang/erlang-lite \ - ${PYTHON_PKGNAMEPREFIX}simplejson>=2.0:${PORTSDIR}/devel/py-simplejson \ - xmlto:${PORTSDIR}/textproc/xmlto -RUN_DEPENDS= erlc:${PORTSDIR}/lang/erlang-lite - -USE_GMAKE= yes -USE_PYTHON= yes -USE_RC_SUBR= rabbitmq - -MANUAL_PACKAGE_BUILD= erlang beam.smp hangs on pointyhat - -RABBITMQ_GID= 135 -RABBITMQ_GROUP= rabbitmq -RABBITMQ_UID= 135 -RABBITMQ_USER= rabbitmq - -PLIST_SUB= "VERSION=${PORTVERSION}" - -SUB_FILES= pkg-install -SUB_LIST= RABBITMQ_GID=${RABBITMQ_GID} \ - RABBITMQ_GROUP=${RABBITMQ_GROUP} \ - RABBITMQ_UID=${RABBITMQ_UID} \ - RABBITMQ_USER=${RABBITMQ_USER} - -MAN1= rabbitmq-multi.1 rabbitmq-server.1 rabbitmqctl.1 \ - rabbitmq-activate-plugins.1 rabbitmq-deactivate-plugins.1 -MAN5= rabbitmq.conf.5 -MANCOMPRESSED= yes - -SCRIPTS_DIR= ${WRKSRC}/scripts/ -MAKE_ENV+= TARGET_DIR="${PREFIX}/lib/erlang/lib/rabbitmq_server-${PORTVERSION}" SBIN_DIR="${PREFIX}/sbin/" \ - MAN_DIR="${PREFIX}/man" - -post-patch: - @${REINPLACE_CMD} -e 's|/etc/rabbitmq|${PREFIX}/etc/rabbitmq|g ; s|/var/lib|/var/db|g ; s|erl|${LOCALBASE}/bin/erl|g' \ - ${SCRIPTS_DIR}/rabbitmq-multi ${SCRIPTS_DIR}/rabbitmq-server ${SCRIPTS_DIR}/rabbitmqctl - @${FIND} ${WRKSRC} -name "*.bak" | ${XARGS} ${RM} - -pre-install: - @${SH} ${PKGINSTALL} ${PKGNAME} PRE-INSTALL - @${FIND} ${WRKSRC}/ebin ${WRKSRC}/include -type d | \ - ${XARGS} ${CHMOD} 0755 - @${FIND} ${WRKSRC}/ebin ${WRKSRC}/include -type f | \ - ${XARGS} ${CHMOD} 0644 - -post-install: - @${SH} ${PKGINSTALL} ${PKGNAME} POST-INSTALL - -.include <bsd.port.mk> diff -ruN rabbitmq.orig/rabbitmq/distinfo rabbitmq/rabbitmq/distinfo --- rabbitmq.orig/rabbitmq/distinfo 2010-07-22 09:33:08.000000000 -0400 +++ rabbitmq/rabbitmq/distinfo 1969-12-31 21:00:00.000000000 -0300 @@ -1,3 +0,0 @@ -MD5 (rabbitmq-server-1.8.0.tar.gz) = e00bea375e81d51600b5b14220c64d89 -SHA256 (rabbitmq-server-1.8.0.tar.gz) = ccb64d1ea0823a0e143444b8888f86b625bd6907f0625c9f7cd28da1d029d8d8 -SIZE (rabbitmq-server-1.8.0.tar.gz) = 202386 diff -ruN rabbitmq.orig/rabbitmq/files/patch-rabbitmqctl rabbitmq/rabbitmq/files/patch-rabbitmqctl --- rabbitmq.orig/rabbitmq/files/patch-rabbitmqctl 2010-07-22 09:33:09.000000000 -0400 +++ rabbitmq/rabbitmq/files/patch-rabbitmqctl 1969-12-31 21:00:00.000000000 -0300 @@ -1,20 +0,0 @@ ---- scripts/rabbitmqctl.orig 2010-07-08 17:14:15.000000000 -0400 -+++ scripts/rabbitmqctl 2010-07-08 17:15:01.000000000 -0400 -@@ -38,13 +38,13 @@ - [ "x" = "x$RABBITMQ_NODENAME" ] && RABBITMQ_NODENAME=${NODENAME} - [ "x" = "x$RABBITMQ_CTL_ERL_ARGS" ] && RABBITMQ_CTL_ERL_ARGS=${CTL_ERL_ARGS} - --exec erl \ -- -pa "${RABBITMQ_HOME}/ebin" \ -+cmd="exec erl \ -+ -pa '${RABBITMQ_HOME}/ebin' \ - -noinput \ - -hidden \ - ${RABBITMQ_CTL_ERL_ARGS} \ - -sname rabbitmqctl$$ \ - -s rabbit_control \ - -nodename $RABBITMQ_NODENAME \ -- -extra "$@" -- -+ -extra '$@' " -+env HOME=/var/db/rabbitmq su -m rabbitmq -c "${cmd}" diff -ruN rabbitmq.orig/rabbitmq/files/pkg-install.in rabbitmq/rabbitmq/files/pkg-install.in --- rabbitmq.orig/rabbitmq/files/pkg-install.in 2009-07-04 13:59:45.000000000 -0400 +++ rabbitmq/rabbitmq/files/pkg-install.in 1969-12-31 21:00:00.000000000 -0300 @@ -1,41 +0,0 @@ -#!/bin/sh - -RABBITMQ_GID=%%RABBITMQ_GID%% -RABBITMQ_GROUP=%%RABBITMQ_GROUP%% -RABBITMQ_UID=%%RABBITMQ_UID%% -RABBITMQ_USER=%%RABBITMQ_USER%% - -case $2 in -PRE-INSTALL) - - if ! pw group show "${RABBITMQ_GROUP}" > /dev/null; then - if pw groupadd ${RABBITMQ_GROUP} -g ${RABBITMQ_GID}; then - echo "Added group \"${RABBITMQ_GROUP}\"." - else - echo "Adding group \"${RABBITMQ_GROUP}\" failed..." - exit 1 - fi - fi - - if ! pw user show "${RABBITMQ_USER}" > /dev/null; then - if pw useradd ${RABBITMQ_USER} -u ${RABBITMQ_UID} \ - -g ${RABBITMQ_GROUP} -h - -d /var/db/rabbitmq \ - -s /usr/sbin/nologin -c "RabbitMQ" - then - echo "Added user \"${RABBITMQ_USER}\"." - else - echo "Adding user \"${RABBITMQ_USER}\" failed..." - exit 1 - fi - fi -;; - -POST-INSTALL) - mkdir -p %%PREFIX%%/etc/rabbitmq - mkdir -p /var/db/rabbitmq/mnesia - mkdir -p /var/log/rabbitmq - chown -R ${RABBITMQ_USER}:${RABBITMQ_GROUP} /var/db/rabbitmq - chown -R ${RABBITMQ_USER}:${RABBITMQ_GROUP} /var/log/rabbitmq -;; - -esac diff -ruN rabbitmq.orig/rabbitmq/files/rabbitmq.in rabbitmq/rabbitmq/files/rabbitmq.in --- rabbitmq.orig/rabbitmq/files/rabbitmq.in 2010-03-26 21:13:55.000000000 -0300 +++ rabbitmq/rabbitmq/files/rabbitmq.in 1969-12-31 21:00:00.000000000 -0300 @@ -1,33 +0,0 @@ -#!/bin/sh -# -# rabbitmq for rc.d usage -# $Id$ - -# PROVIDE: rabbitmq -# REQUIRE: DAEMON -# BEFORE: LOGIN -# KEYWORD: shutdown -# -# Add the following line to /etc/rc.conf to enable RabitMQ -# -# rabbitmq_enable="YES" - -. /etc/rc.subr - -name=rabbitmq -rcvar=`set_rcvar` - -# Set some defaults -rabbitmq_enable=${rabbitmq_enable:-"NO"} -rabbitmq_user=${rabbitmq_user:-"rabbitmq"} -rabbitmq_nodes=${rabbitmq_nodes:-"1"} -rabbitmq_multi="%%PREFIX%%/sbin/rabbitmq-multi" - -start_cmd="env HOME=/var/db/rabbitmq su -m ${rabbitmq_user} -c 'sh -c \"${rabbitmq_multi} start_all ${rabbitmq_nodes}\"'" -stop_cmd="env HOME=/var/db/rabbitmq su -m ${rabbitmq_user} -c 'sh -c \"${rabbitmq_multi} stop_all\"'" -rotate_logs_cmd="env HOME=/var/db/rabbitmq su -m ${rabbitmq_user} -c 'sh -c \"${rabbitmq_multi} rotate_logs\"'" -status_cmd="env HOME=/var/db/rabbitmq su -m ${rabbitmq_user} -c 'sh -c \"${rabbitmq_multi} status\"'" -extra_commands="rotate_logs status" - -load_rc_config $name -run_rc_command "$1" diff -ruN rabbitmq.orig/rabbitmq/pkg-descr rabbitmq/rabbitmq/pkg-descr --- rabbitmq.orig/rabbitmq/pkg-descr 2008-07-13 21:51:37.000000000 -0400 +++ rabbitmq/rabbitmq/pkg-descr 1969-12-31 21:00:00.000000000 -0300 @@ -1,6 +0,0 @@ -RabbitMQ is a complete and highly reliable Enterprise Messaging -system. The RabbitMQ client libraries and broker daemon can be used -together to create an AMQP network, or used individually to bring -the benefits of RabbitMQ to established networks. - -WWW: http://www.rabbitmq.com/ diff -ruN rabbitmq.orig/rabbitmq/pkg-plist rabbitmq/rabbitmq/pkg-plist --- rabbitmq.orig/rabbitmq/pkg-plist 2010-07-22 09:33:08.000000000 -0400 +++ rabbitmq/rabbitmq/pkg-plist 1969-12-31 21:00:00.000000000 -0300 @@ -1,100 +0,0 @@ -sbin/rabbitmq-activate-plugins -sbin/rabbitmq-deactivate-plugins -sbin/rabbitmq-env -sbin/rabbitmq-multi -sbin/rabbitmq-server -sbin/rabbitmqctl -lib/erlang/lib/rabbitmq_server-%%VERSION%%/INSTALL -lib/erlang/lib/rabbitmq_server-%%VERSION%%/LICENSE -lib/erlang/lib/rabbitmq_server-%%VERSION%%/LICENSE-MPL-RabbitMQ -lib/erlang/lib/rabbitmq_server-%%VERSION%%/ebin/delegate.beam -lib/erlang/lib/rabbitmq_server-%%VERSION%%/ebin/delegate_sup.beam -lib/erlang/lib/rabbitmq_server-%%VERSION%%/ebin/file_handle_cache.beam -lib/erlang/lib/rabbitmq_server-%%VERSION%%/ebin/gen_server2.beam -lib/erlang/lib/rabbitmq_server-%%VERSION%%/ebin/pg_local.beam -lib/erlang/lib/rabbitmq_server-%%VERSION%%/ebin/priority_queue.beam -lib/erlang/lib/rabbitmq_server-%%VERSION%%/ebin/rabbit.app -lib/erlang/lib/rabbitmq_server-%%VERSION%%/ebin/rabbit.beam -lib/erlang/lib/rabbitmq_server-%%VERSION%%/ebin/rabbit_access_control.beam -lib/erlang/lib/rabbitmq_server-%%VERSION%%/ebin/rabbit_alarm.beam -lib/erlang/lib/rabbitmq_server-%%VERSION%%/ebin/rabbit_amqqueue.beam -lib/erlang/lib/rabbitmq_server-%%VERSION%%/ebin/rabbit_amqqueue_process.beam -lib/erlang/lib/rabbitmq_server-%%VERSION%%/ebin/rabbit_amqqueue_sup.beam -lib/erlang/lib/rabbitmq_server-%%VERSION%%/ebin/rabbit_app.in -lib/erlang/lib/rabbitmq_server-%%VERSION%%/ebin/rabbit_backing_queue.beam -lib/erlang/lib/rabbitmq_server-%%VERSION%%/ebin/rabbit_basic.beam -lib/erlang/lib/rabbitmq_server-%%VERSION%%/ebin/rabbit_binary_generator.beam -lib/erlang/lib/rabbitmq_server-%%VERSION%%/ebin/rabbit_binary_parser.beam -lib/erlang/lib/rabbitmq_server-%%VERSION%%/ebin/rabbit_channel.beam -lib/erlang/lib/rabbitmq_server-%%VERSION%%/ebin/rabbit_control.beam -lib/erlang/lib/rabbitmq_server-%%VERSION%%/ebin/rabbit_ctl_usage.beam -lib/erlang/lib/rabbitmq_server-%%VERSION%%/ebin/rabbit_dialyzer.beam -lib/erlang/lib/rabbitmq_server-%%VERSION%%/ebin/rabbit_error_logger.beam -lib/erlang/lib/rabbitmq_server-%%VERSION%%/ebin/rabbit_error_logger_file_h.beam -lib/erlang/lib/rabbitmq_server-%%VERSION%%/ebin/rabbit_exchange.beam -lib/erlang/lib/rabbitmq_server-%%VERSION%%/ebin/rabbit_exchange_type.beam -lib/erlang/lib/rabbitmq_server-%%VERSION%%/ebin/rabbit_exchange_type_direct.beam -lib/erlang/lib/rabbitmq_server-%%VERSION%%/ebin/rabbit_exchange_type_fanout.beam -lib/erlang/lib/rabbitmq_server-%%VERSION%%/ebin/rabbit_exchange_type_headers.beam -lib/erlang/lib/rabbitmq_server-%%VERSION%%/ebin/rabbit_exchange_type_registry.beam -lib/erlang/lib/rabbitmq_server-%%VERSION%%/ebin/rabbit_exchange_type_topic.beam -lib/erlang/lib/rabbitmq_server-%%VERSION%%/ebin/rabbit_framing.beam -lib/erlang/lib/rabbitmq_server-%%VERSION%%/ebin/rabbit_framing_channel.beam -lib/erlang/lib/rabbitmq_server-%%VERSION%%/ebin/rabbit_guid.beam -lib/erlang/lib/rabbitmq_server-%%VERSION%%/ebin/rabbit_heartbeat.beam -lib/erlang/lib/rabbitmq_server-%%VERSION%%/ebin/rabbit_hooks.beam -lib/erlang/lib/rabbitmq_server-%%VERSION%%/ebin/rabbit_invariable_queue.beam -lib/erlang/lib/rabbitmq_server-%%VERSION%%/ebin/rabbit_limiter.beam -lib/erlang/lib/rabbitmq_server-%%VERSION%%/ebin/rabbit_load.beam -lib/erlang/lib/rabbitmq_server-%%VERSION%%/ebin/rabbit_log.beam -lib/erlang/lib/rabbitmq_server-%%VERSION%%/ebin/rabbit_memory_monitor.beam -lib/erlang/lib/rabbitmq_server-%%VERSION%%/ebin/rabbit_misc.beam -lib/erlang/lib/rabbitmq_server-%%VERSION%%/ebin/rabbit_mnesia.beam -lib/erlang/lib/rabbitmq_server-%%VERSION%%/ebin/rabbit_multi.beam -lib/erlang/lib/rabbitmq_server-%%VERSION%%/ebin/rabbit_multi_usage.beam -lib/erlang/lib/rabbitmq_server-%%VERSION%%/ebin/rabbit_net.beam -lib/erlang/lib/rabbitmq_server-%%VERSION%%/ebin/rabbit_networking.beam -lib/erlang/lib/rabbitmq_server-%%VERSION%%/ebin/rabbit_node_monitor.beam -lib/erlang/lib/rabbitmq_server-%%VERSION%%/ebin/rabbit_persister.beam -lib/erlang/lib/rabbitmq_server-%%VERSION%%/ebin/rabbit_plugin_activator.beam -lib/erlang/lib/rabbitmq_server-%%VERSION%%/ebin/rabbit_reader.beam -lib/erlang/lib/rabbitmq_server-%%VERSION%%/ebin/rabbit_reader_queue_collector.beam -lib/erlang/lib/rabbitmq_server-%%VERSION%%/ebin/rabbit_restartable_sup.beam -lib/erlang/lib/rabbitmq_server-%%VERSION%%/ebin/rabbit_router.beam -lib/erlang/lib/rabbitmq_server-%%VERSION%%/ebin/rabbit_sasl_report_file_h.beam -lib/erlang/lib/rabbitmq_server-%%VERSION%%/ebin/rabbit_sup.beam -lib/erlang/lib/rabbitmq_server-%%VERSION%%/ebin/rabbit_tests.beam -lib/erlang/lib/rabbitmq_server-%%VERSION%%/ebin/rabbit_tracer.beam -lib/erlang/lib/rabbitmq_server-%%VERSION%%/ebin/rabbit_writer.beam -lib/erlang/lib/rabbitmq_server-%%VERSION%%/ebin/supervisor2.beam -lib/erlang/lib/rabbitmq_server-%%VERSION%%/ebin/tcp_acceptor.beam -lib/erlang/lib/rabbitmq_server-%%VERSION%%/ebin/tcp_acceptor_sup.beam -lib/erlang/lib/rabbitmq_server-%%VERSION%%/ebin/tcp_client_sup.beam -lib/erlang/lib/rabbitmq_server-%%VERSION%%/ebin/tcp_listener.beam -lib/erlang/lib/rabbitmq_server-%%VERSION%%/ebin/tcp_listener_sup.beam -lib/erlang/lib/rabbitmq_server-%%VERSION%%/ebin/vm_memory_monitor.beam -lib/erlang/lib/rabbitmq_server-%%VERSION%%/ebin/worker_pool.beam -lib/erlang/lib/rabbitmq_server-%%VERSION%%/ebin/worker_pool_sup.beam -lib/erlang/lib/rabbitmq_server-%%VERSION%%/ebin/worker_pool_worker.beam -lib/erlang/lib/rabbitmq_server-%%VERSION%%/include/rabbit.hrl -lib/erlang/lib/rabbitmq_server-%%VERSION%%/include/rabbit_backing_queue_spec.hrl -lib/erlang/lib/rabbitmq_server-%%VERSION%%/include/rabbit_exchange_type_spec.hrl -lib/erlang/lib/rabbitmq_server-%%VERSION%%/include/rabbit_framing.hrl -lib/erlang/lib/rabbitmq_server-%%VERSION%%/include/rabbit_framing_spec.hrl -lib/erlang/lib/rabbitmq_server-%%VERSION%%/sbin/rabbitmq-activate-plugins -lib/erlang/lib/rabbitmq_server-%%VERSION%%/sbin/rabbitmq-deactivate-plugins -lib/erlang/lib/rabbitmq_server-%%VERSION%%/sbin/rabbitmq-env -lib/erlang/lib/rabbitmq_server-%%VERSION%%/sbin/rabbitmq-multi -lib/erlang/lib/rabbitmq_server-%%VERSION%%/sbin/rabbitmq-server -lib/erlang/lib/rabbitmq_server-%%VERSION%%/sbin/rabbitmqctl -@dirrm lib/erlang/lib/rabbitmq_server-%%VERSION%%/include -@dirrm lib/erlang/lib/rabbitmq_server-%%VERSION%%/sbin -@dirrm lib/erlang/lib/rabbitmq_server-%%VERSION%%/ebin -@dirrm lib/erlang/lib/rabbitmq_server-%%VERSION%% -@dirrmtry etc/rabbitmq -@unexec rmdir /var/log/rabbitmq 2>/dev/null || true -@unexec rmdir /var/db/rabbitmq/mnesia 2>/dev/null || true -@unexec rmdir /var/db/rabbitmq 2>/dev/null || true -@exec mkdir -p /var/log/rabbitmq -@exec mkdir -p /var/db/rabbitmq/mnesia -@exec mkdir -p %D/etc/rabbitmq >Release-Note: >Audit-Trail: >Unformatted:
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201008312241.o7VMffFQ088804>