From owner-freebsd-ports-bugs@FreeBSD.ORG Fri Dec 19 05:00:11 2008 Return-Path: Delivered-To: freebsd-ports-bugs@hub.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id B13AF106567D for ; Fri, 19 Dec 2008 05:00:11 +0000 (UTC) (envelope-from gnats@FreeBSD.org) Received: from freefall.freebsd.org (freefall.freebsd.org [IPv6:2001:4f8:fff6::28]) by mx1.freebsd.org (Postfix) with ESMTP id 297D88FC1B for ; Fri, 19 Dec 2008 05:00:11 +0000 (UTC) (envelope-from gnats@FreeBSD.org) Received: from freefall.freebsd.org (gnats@localhost [127.0.0.1]) by freefall.freebsd.org (8.14.3/8.14.3) with ESMTP id mBJ50BuF098738 for ; Fri, 19 Dec 2008 05:00:11 GMT (envelope-from gnats@freefall.freebsd.org) Received: (from gnats@localhost) by freefall.freebsd.org (8.14.3/8.14.3/Submit) id mBJ50AxJ098737; Fri, 19 Dec 2008 05:00:10 GMT (envelope-from gnats) Resent-Date: Fri, 19 Dec 2008 05:00:10 GMT Resent-Message-Id: <200812190500.mBJ50AxJ098737@freefall.freebsd.org> Resent-From: FreeBSD-gnats-submit@FreeBSD.org (GNATS Filer) Resent-To: freebsd-ports-bugs@FreeBSD.org Resent-Reply-To: FreeBSD-gnats-submit@FreeBSD.org, "Phillip N." Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 366C51065674 for ; Fri, 19 Dec 2008 04:50:49 +0000 (UTC) (envelope-from pneumann@gmail.com) Received: from mail-qy0-f18.google.com (mail-qy0-f18.google.com [209.85.221.18]) by mx1.freebsd.org (Postfix) with ESMTP id BFAD58FC17 for ; Fri, 19 Dec 2008 04:50:48 +0000 (UTC) (envelope-from pneumann@gmail.com) Received: by qyk11 with SMTP id 11so974058qyk.19 for ; Thu, 18 Dec 2008 20:50:48 -0800 (PST) Received: by 10.214.113.16 with SMTP id l16mr3461873qac.340.1229662247409; Thu, 18 Dec 2008 20:50:47 -0800 (PST) Received: from negro.transtel.cl ([190.196.40.138]) by mx.google.com with ESMTPS id 5sm5943066qwg.55.2008.12.18.20.50.44 (version=TLSv1/SSLv3 cipher=RC4-MD5); Thu, 18 Dec 2008 20:50:45 -0800 (PST) Message-Id: <1229662245.34443@negro.transtel.cl> Date: Fri, 19 Dec 2008 01:50:45 -0300 From: "Phillip N." To: "FreeBSD gnats submit" X-Send-Pr-Version: gtk-send-pr 0.4.9 Cc: Subject: ports/129751: [Maintainer] Update net/rabbitmq to 1.5.0 X-BeenThere: freebsd-ports-bugs@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: Ports bug reports List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Fri, 19 Dec 2008 05:00:11 -0000 >Number: 129751 >Category: ports >Synopsis: [Maintainer] Update net/rabbitmq to 1.5.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: Fri Dec 19 05:00:10 UTC 2008 >Closed-Date: >Last-Modified: >Originator: Phillip N. >Release: FreeBSD 7.1-PRERELEASE i386 >Organization: BSD# >Environment: System: FreeBSD 7.1-PRERELEASE #0: Sun Oct 12 20:08:35 CLST 2008 root@negro.transtel.cl:/usr/obj/usr/src/sys/NEGRO >Description: Update to version 1.5.0: * removal of tickets and realms * implementation of 'queue.unbind' * producer throttling when running low on memory * improved scalability of queue and binding creation and deletion * disabled Nagle for more consistent latency * added several management/info commands to rabbitmqctl * bug fixes in the area of connection and channel closure * support the latest Erlang/OTP release (R12B-5) * improved configurability via environment variables More details on http://lists.rabbitmq.com/pipermail/rabbitmq-discuss/attachments/20081218/35c6c574/attachment.txt Thanks! >How-To-Repeat: >Fix: --- UPDATEING.diff begins here --- --- UPDATING.orig 2008-12-18 20:55:42.000000000 -0300 +++ UPDATING 2008-12-18 20:57:43.000000000 -0300 @@ -6,6 +6,15 @@ time you update your ports collection, before attempting any port upgrades. +20081218: + AFFECTS: users of net/rabbitmq + AUTHOR: pneumann@gmail.com + + The database schema has changed between RabbitMQ-1.4.0 and this + release. When the RabbitMQ server detects the presence of an old + database, it moves it to a backup location, creates a fresh, empty + database, and logs a warning. + 20081217: AFFECTS: users of mail/policyd2 AUTHOR: wxs@FreeBSD.org --- UPDATEING.diff ends here --- --- rabbitmq-1.5.0.diff begins here --- diff -ruN rabbitmq.orig/Makefile rabbitmq/Makefile --- rabbitmq.orig/Makefile 2008-10-28 22:01:34.000000000 -0300 +++ rabbitmq/Makefile 2008-12-19 01:47:52.000000000 -0300 @@ -6,8 +6,7 @@ # PORTNAME= rabbitmq -PORTVERSION= 1.4.0 -PORTREVISION= 2 +PORTVERSION= 1.5.0 CATEGORIES= net MASTER_SITES= http://www.rabbitmq.com/releases/rabbitmq-server/v${PORTVERSION}/ DISTNAME= ${PORTNAME}-server-${PORTVERSION} @@ -15,12 +14,14 @@ MAINTAINER= pneumann@gmail.com COMMENT= RabbitMQ is an implementation of AMQP -BUILD_DEPENDS= erlc:${PORTSDIR}/lang/erlang-lite +BUILD_DEPENDS= erlc:${PORTSDIR}/lang/erlang-lite \ + ${LOCALBASE}/share/doc/simplejson:${PORTSDIR}/devel/py-simplejson RUN_DEPENDS= erlc:${PORTSDIR}/lang/erlang-lite USE_GMAKE= yes USE_PYTHON= yes -MAKE_ENV+= TARGET_DIR="${PREFIX}/lib/erlang/lib/rabbitmq_server-${PORTVERSION}" SBIN_DIR="${PREFIX}/sbin/" +MAKE_ENV+= TARGET_DIR="${PREFIX}/lib/erlang/lib/rabbitmq_server-${PORTVERSION}" SBIN_DIR="${PREFIX}/sbin/" \ + MAN_DIR="${PREFIX}/man" SCRIPTS_DIR= ${WRKSRC}/scripts/ USE_RC_SUBR= rabbitmq PLIST_SUB= "VERSION=${PORTVERSION}" @@ -28,6 +29,9 @@ RABBITMQ_USER= rabbitmq RABBITMQ_GROUP= ${RABBITMQ_USER} +MAN1= rabbitmq-multi.1 rabbitmq-server.1 rabbitmqctl.1 +MAN5= rabbitmq.5 + post-patch: @${REINPLACE_CMD} -e 's|/etc/default|${PREFIX}/etc/rabbitmq|g ; s|/var/lib|/var/db|g ; s|erl|${PREFIX}/bin/erl|g' \ ${SCRIPTS_DIR}/rabbitmq-multi ${SCRIPTS_DIR}/rabbitmq-server ${SCRIPTS_DIR}/rabbitmqctl diff -ruN rabbitmq.orig/distinfo rabbitmq/distinfo --- rabbitmq.orig/distinfo 2008-08-19 22:46:19.000000000 -0400 +++ rabbitmq/distinfo 2008-12-19 01:47:52.000000000 -0300 @@ -1,3 +1,3 @@ -MD5 (rabbitmq-server-1.4.0.tar.gz) = ac43cb6178d992eae192ebe19557ccd5 -SHA256 (rabbitmq-server-1.4.0.tar.gz) = d00b3022a71a4eb3b028e1eb3c1a0881c2a93bf6d705a9351fc42c87c55aeca1 -SIZE (rabbitmq-server-1.4.0.tar.gz) = 108625 +MD5 (rabbitmq-server-1.5.0.tar.gz) = f5f7d02bae83fcf028cdbcb737028932 +SHA256 (rabbitmq-server-1.5.0.tar.gz) = 0531d8a62dbeb018a69672fc638ff324b8a92e4c9674520c046b4dae117fa72a +SIZE (rabbitmq-server-1.5.0.tar.gz) = 111389 diff -ruN rabbitmq.orig/files/patch-Makefile rabbitmq/files/patch-Makefile --- rabbitmq.orig/files/patch-Makefile 2008-08-19 22:46:19.000000000 -0400 +++ rabbitmq/files/patch-Makefile 1969-12-31 21:00:00.000000000 -0300 @@ -1,11 +0,0 @@ ---- Makefile.orig 2008-08-15 20:56:25.000000000 -0400 -+++ Makefile 2008-08-15 20:57:14.000000000 -0400 -@@ -113,7 +113,7 @@ - cp BUILD $(GENERIC_STAGE_DIR); \ - fi - -- sed -i 's/%%VERSION%%/$(VERSION)/' $(GENERIC_STAGE_DIR)/ebin/rabbit.app -+ #sed -i 's/%%VERSION%%/$(VERSION)/' $(GENERIC_STAGE_DIR)/ebin/rabbit.app - - srcdist: distclean - $(MAKE) VERSION=$(VERSION) GENERIC_STAGE_DIR=dist/$(TARBALL_NAME) generic_stage diff -ruN rabbitmq.orig/files/rabbitmq.in rabbitmq/files/rabbitmq.in --- rabbitmq.orig/files/rabbitmq.in 2008-10-28 22:01:34.000000000 -0300 +++ rabbitmq/files/rabbitmq.in 2008-12-19 01:47:52.000000000 -0300 @@ -20,11 +20,26 @@ # Set some defaults rabbitmq_enable=${rabbitmq_enable:-"NO"} rabbitmq_user=${rabbitmq_user:-"rabbitmq"} +rabbitmq_nodes=${rabbitmq_nodes:-"1"} -prefix=%%PREFIX%% -start_cmd="env HOME=/var/db/rabbitmq su -m ${rabbitmq_user} -c 'sh -c \"${prefix}/sbin/rabbitmq-server -detached\"'" -stop_cmd="env HOME=/var/db/rabbitmq su -m ${rabbitmq_user} -c 'sh -c \"${prefix}/sbin/rabbitmqctl stop\"'" +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\"'" -load_rc_config $name +extra_commands="rotate_logs status" + +rotate_logs_cmd="${name}_rotate_logs" +status_cmd="${name}_status" + +rabbitmq_rotate_logs() +{ + env HOME=/var/db/rabbitmq su -m ${rabbitmq_user} -c 'sh -c \"${rabbitmq_multi} rotate_logs\"'" +} +rabbitmq_status() +{ + env HOME=/var/db/rabbitmq su -m ${rabbitmq_user} -c 'sh -c \"${rabbitmq_multi} status\"'" +} + +load_rc_config $name run_rc_command "$1" diff -ruN rabbitmq.orig/pkg-plist rabbitmq/pkg-plist --- rabbitmq.orig/pkg-plist 2008-09-03 11:51:10.000000000 -0400 +++ rabbitmq/pkg-plist 2008-12-19 01:47:52.000000000 -0300 @@ -9,6 +9,7 @@ lib/erlang/lib/rabbitmq_server-%%VERSION%%/ebin/rabbit.beam lib/erlang/lib/rabbitmq_server-%%VERSION%%/ebin/rabbit.rel 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 @@ -17,12 +18,14 @@ 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_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_framing.beam lib/erlang/lib/rabbitmq_server-%%VERSION%%/ebin/rabbit_framing_channel.beam lib/erlang/lib/rabbitmq_server-%%VERSION%%/ebin/rabbit_heartbeat.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_memsup_linux.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 @@ -30,11 +33,10 @@ 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_reader.beam -lib/erlang/lib/rabbitmq_server-%%VERSION%%/ebin/rabbit_realm.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_ticket.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/tcp_acceptor.beam @@ -45,43 +47,6 @@ lib/erlang/lib/rabbitmq_server-%%VERSION%%/include/rabbit.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%%/src/buffering_proxy.erl -lib/erlang/lib/rabbitmq_server-%%VERSION%%/src/rabbit.erl -lib/erlang/lib/rabbitmq_server-%%VERSION%%/src/rabbit_access_control.erl -lib/erlang/lib/rabbitmq_server-%%VERSION%%/src/rabbit_amqqueue.erl -lib/erlang/lib/rabbitmq_server-%%VERSION%%/src/rabbit_amqqueue_process.erl -lib/erlang/lib/rabbitmq_server-%%VERSION%%/src/rabbit_amqqueue_sup.erl -lib/erlang/lib/rabbitmq_server-%%VERSION%%/src/rabbit_binary_generator.erl -lib/erlang/lib/rabbitmq_server-%%VERSION%%/src/rabbit_binary_parser.erl -lib/erlang/lib/rabbitmq_server-%%VERSION%%/src/rabbit_channel.erl -lib/erlang/lib/rabbitmq_server-%%VERSION%%/src/rabbit_control.erl -lib/erlang/lib/rabbitmq_server-%%VERSION%%/src/rabbit_error_logger.erl -lib/erlang/lib/rabbitmq_server-%%VERSION%%/src/rabbit_exchange.erl -lib/erlang/lib/rabbitmq_server-%%VERSION%%/src/rabbit_framing.erl -lib/erlang/lib/rabbitmq_server-%%VERSION%%/src/rabbit_framing_channel.erl -lib/erlang/lib/rabbitmq_server-%%VERSION%%/src/rabbit_heartbeat.erl -lib/erlang/lib/rabbitmq_server-%%VERSION%%/src/rabbit_load.erl -lib/erlang/lib/rabbitmq_server-%%VERSION%%/src/rabbit_log.erl -lib/erlang/lib/rabbitmq_server-%%VERSION%%/src/rabbit_misc.erl -lib/erlang/lib/rabbitmq_server-%%VERSION%%/src/rabbit_mnesia.erl -lib/erlang/lib/rabbitmq_server-%%VERSION%%/src/rabbit_multi.erl -lib/erlang/lib/rabbitmq_server-%%VERSION%%/src/rabbit_networking.erl -lib/erlang/lib/rabbitmq_server-%%VERSION%%/src/rabbit_node_monitor.erl -lib/erlang/lib/rabbitmq_server-%%VERSION%%/src/rabbit_persister.erl -lib/erlang/lib/rabbitmq_server-%%VERSION%%/src/rabbit_reader.erl -lib/erlang/lib/rabbitmq_server-%%VERSION%%/src/rabbit_realm.erl -lib/erlang/lib/rabbitmq_server-%%VERSION%%/src/rabbit_router.erl -lib/erlang/lib/rabbitmq_server-%%VERSION%%/src/rabbit_sup.erl -lib/erlang/lib/rabbitmq_server-%%VERSION%%/src/rabbit_tests.erl -lib/erlang/lib/rabbitmq_server-%%VERSION%%/src/rabbit_ticket.erl -lib/erlang/lib/rabbitmq_server-%%VERSION%%/src/rabbit_tracer.erl -lib/erlang/lib/rabbitmq_server-%%VERSION%%/src/rabbit_writer.erl -lib/erlang/lib/rabbitmq_server-%%VERSION%%/src/tcp_acceptor.erl -lib/erlang/lib/rabbitmq_server-%%VERSION%%/src/tcp_acceptor_sup.erl -lib/erlang/lib/rabbitmq_server-%%VERSION%%/src/tcp_client_sup.erl -lib/erlang/lib/rabbitmq_server-%%VERSION%%/src/tcp_listener.erl -lib/erlang/lib/rabbitmq_server-%%VERSION%%/src/tcp_listener_sup.erl -@dirrm lib/erlang/lib/rabbitmq_server-%%VERSION%%/src @dirrm lib/erlang/lib/rabbitmq_server-%%VERSION%%/include @dirrm lib/erlang/lib/rabbitmq_server-%%VERSION%%/ebin @dirrm lib/erlang/lib/rabbitmq_server-%%VERSION%% --- rabbitmq-1.5.0.diff ends here --- >Release-Note: >Audit-Trail: >Unformatted: