From nobody@FreeBSD.org  Tue Aug 31 22:41:41 2010
Return-Path: <nobody@FreeBSD.org>
Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34])
	by hub.freebsd.org (Postfix) with ESMTP id A06361065672
	for <freebsd-gnats-submit@FreeBSD.org>; Tue, 31 Aug 2010 22:41:41 +0000 (UTC)
	(envelope-from nobody@FreeBSD.org)
Received: from www.freebsd.org (www.freebsd.org [IPv6:2001:4f8:fff6::21])
	by mx1.freebsd.org (Postfix) with ESMTP id 8E5A68FC1D
	for <freebsd-gnats-submit@FreeBSD.org>; Tue, 31 Aug 2010 22:41:41 +0000 (UTC)
Received: from www.freebsd.org (localhost [127.0.0.1])
	by www.freebsd.org (8.14.3/8.14.3) with ESMTP id o7VMffdO088805
	for <freebsd-gnats-submit@FreeBSD.org>; Tue, 31 Aug 2010 22:41:41 GMT
	(envelope-from nobody@www.freebsd.org)
Received: (from nobody@localhost)
	by www.freebsd.org (8.14.3/8.14.3/Submit) id o7VMffFQ088804;
	Tue, 31 Aug 2010 22:41:41 GMT
	(envelope-from nobody)
Message-Id: <201008312241.o7VMffFQ088804@www.freebsd.org>
Date: Tue, 31 Aug 2010 22:41:41 GMT
From: Phillip Neumann <pneumann@gmail.com>
To: freebsd-gnats-submit@FreeBSD.org
Subject: [UPDATE] net/rabbitmq to 2.0.0
X-Send-Pr-Version: www-3.1
X-GNATS-Notify:

>Number:         150168
>Category:       ports
>Synopsis:       [UPDATE] net/rabbitmq to 2.0.0
>Confidential:   no
>Severity:       non-critical
>Priority:       low
>Responsible:    freebsd-ports-bugs
>State:          closed
>Quarter:        
>Keywords:       
>Date-Required:  
>Class:          maintainer-update
>Submitter-Id:   current-users
>Arrival-Date:   Tue Aug 31 22:50:01 UTC 2010
>Closed-Date:    Thu Sep 09 12:39:04 UTC 2010
>Last-Modified:  Thu Sep  9 12:40:01 UTC 2010
>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


>Release-Note:
>Audit-Trail:
State-Changed-From-To: open->closed 
State-Changed-By: pav 
State-Changed-When: Thu Sep 9 12:38:32 UTC 2010 
State-Changed-Why:  
Committed, thanks! 

http://www.freebsd.org/cgi/query-pr.cgi?pr=150168 

From: dfilter@FreeBSD.ORG (dfilter service)
To: bug-followup@FreeBSD.org
Cc:  
Subject: Re: ports/150168: commit references a PR
Date: Thu,  9 Sep 2010 12:39:07 +0000 (UTC)

 pav         2010-09-09 12:38:54 UTC
 
   FreeBSD ports repository
 
   Modified files:
     net/rabbitmq         Makefile distinfo pkg-plist 
     net/rabbitmq/files   patch-rabbitmqctl 
   Added files:
     net/rabbitmq/files   patch-src-rabbitmulti.erl 
   Log:
   - Update to 2.0.0
   
   PR:             ports/150168
   Submitted by:   Phillip Neumann <pneumann@gmail.com> (maintainer)
   
   Revision  Changes    Path
   1.15      +4 -6      ports/net/rabbitmq/Makefile
   1.8       +3 -3      ports/net/rabbitmq/distinfo
   1.2       +7 -11     ports/net/rabbitmq/files/patch-rabbitmqctl
   1.1       +11 -0     ports/net/rabbitmq/files/patch-src-rabbitmulti.erl (new)
   1.9       +20 -7     ports/net/rabbitmq/pkg-plist
 _______________________________________________
 cvs-all@freebsd.org mailing list
 http://lists.freebsd.org/mailman/listinfo/cvs-all
 To unsubscribe, send any mail to "cvs-all-unsubscribe@freebsd.org"
 
>Unformatted:
