From owner-svn-ports-all@FreeBSD.ORG  Fri Jan 10 09:29:05 2014
Return-Path: <owner-svn-ports-all@FreeBSD.ORG>
Delivered-To: svn-ports-all@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [8.8.178.115])
 (using TLSv1 with cipher ADH-AES256-SHA (256/256 bits))
 (No client certificate requested)
 by hub.freebsd.org (Postfix) with ESMTPS id D9BA175D;
 Fri, 10 Jan 2014 09:29:05 +0000 (UTC)
Received: from svn.freebsd.org (svn.freebsd.org
 [IPv6:2001:1900:2254:2068::e6a:0])
 (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits))
 (No client certificate requested)
 by mx1.freebsd.org (Postfix) with ESMTPS id C5B341810;
 Fri, 10 Jan 2014 09:29:05 +0000 (UTC)
Received: from svn.freebsd.org ([127.0.1.70])
 by svn.freebsd.org (8.14.7/8.14.7) with ESMTP id s0A9T5BG020808;
 Fri, 10 Jan 2014 09:29:05 GMT (envelope-from olgeni@svn.freebsd.org)
Received: (from olgeni@localhost)
 by svn.freebsd.org (8.14.7/8.14.7/Submit) id s0A9T55P020806;
 Fri, 10 Jan 2014 09:29:05 GMT (envelope-from olgeni@svn.freebsd.org)
Message-Id: <201401100929.s0A9T55P020806@svn.freebsd.org>
From: Jimmy Olgeni <olgeni@FreeBSD.org>
Date: Fri, 10 Jan 2014 09:29:05 +0000 (UTC)
To: ports-committers@freebsd.org, svn-ports-all@freebsd.org,
 svn-ports-head@freebsd.org
Subject: svn commit: r339337 - in head/net/rabbitmq: . files
X-SVN-Group: ports-head
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
X-BeenThere: svn-ports-all@freebsd.org
X-Mailman-Version: 2.1.17
Precedence: list
List-Id: SVN commit messages for the ports tree <svn-ports-all.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/options/svn-ports-all>,
 <mailto:svn-ports-all-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-ports-all/>
List-Post: <mailto:svn-ports-all@freebsd.org>
List-Help: <mailto:svn-ports-all-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-ports-all>,
 <mailto:svn-ports-all-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Fri, 10 Jan 2014 09:29:05 -0000

Author: olgeni
Date: Fri Jan 10 09:29:04 2014
New Revision: 339337
URL: http://svnweb.freebsd.org/changeset/ports/339337

Log:
  Reset ERL_LIBS before running RabbitMQ.
  
  ERL_LIBS was inherited from the current environment, and it may
  contain paths to older versions of amqp_client, which may not be
  compatible with the current RabbitMQ management plugin.
  
  As a result, RabbitMQ would not start when the management plugin was
  enabled, with this error:
  
  {could_not_start,amqp_client,
   {{supervisor_data,{invalid_strategy,simple_one_for_one_terminate}},
    {amqp_client,start,[normal,[]]}}}

Modified:
  head/net/rabbitmq/Makefile
  head/net/rabbitmq/files/rabbitmq.in   (contents, props changed)

Modified: head/net/rabbitmq/Makefile
==============================================================================
--- head/net/rabbitmq/Makefile	Fri Jan 10 09:05:46 2014	(r339336)
+++ head/net/rabbitmq/Makefile	Fri Jan 10 09:29:04 2014	(r339337)
@@ -3,6 +3,7 @@
 
 PORTNAME=	rabbitmq
 PORTVERSION=	3.2.2
+PORTREVISION=	1
 CATEGORIES=	net
 MASTER_SITES=	http://www.rabbitmq.com/releases/rabbitmq-server/v${PORTVERSION}/
 DISTNAME=	${PORTNAME}-server-${PORTVERSION}

Modified: head/net/rabbitmq/files/rabbitmq.in
==============================================================================
--- head/net/rabbitmq/files/rabbitmq.in	Fri Jan 10 09:05:46 2014	(r339336)
+++ head/net/rabbitmq/files/rabbitmq.in	Fri Jan 10 09:29:04 2014	(r339337)
@@ -36,6 +36,7 @@ extra_commands="rotate_logs status"
 rabbitmq_start()
 {
 	HOME=/var/db/rabbitmq
+	unset ERL_LIBS
 	su -m ${rabbitmq_user} \
 		-c "sh -c \"${rabbitmq_server} -detached\""
 # Grab pid (it appears that parsing the output of