From nobody@FreeBSD.org  Tue Jan 31 19:29:50 2012
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 855CF1065674
	for <freebsd-gnats-submit@FreeBSD.org>; Tue, 31 Jan 2012 19:29:50 +0000 (UTC)
	(envelope-from nobody@FreeBSD.org)
Received: from red.freebsd.org (red.freebsd.org [IPv6:2001:4f8:fff6::22])
	by mx1.freebsd.org (Postfix) with ESMTP id 748DD8FC13
	for <freebsd-gnats-submit@FreeBSD.org>; Tue, 31 Jan 2012 19:29:50 +0000 (UTC)
Received: from red.freebsd.org (localhost [127.0.0.1])
	by red.freebsd.org (8.14.4/8.14.4) with ESMTP id q0VJToDq097763
	for <freebsd-gnats-submit@FreeBSD.org>; Tue, 31 Jan 2012 19:29:50 GMT
	(envelope-from nobody@red.freebsd.org)
Received: (from nobody@localhost)
	by red.freebsd.org (8.14.4/8.14.4/Submit) id q0VJTo8G097762;
	Tue, 31 Jan 2012 19:29:50 GMT
	(envelope-from nobody)
Message-Id: <201201311929.q0VJTo8G097762@red.freebsd.org>
Date: Tue, 31 Jan 2012 19:29:50 GMT
From: Phillip <pneumann@gmail.com>
To: freebsd-gnats-submit@FreeBSD.org
Subject: net/rabbitmq: Fix reference to /etc
X-Send-Pr-Version: www-3.1
X-GNATS-Notify:

>Number:         164671
>Category:       ports
>Synopsis:       net/rabbitmq: Fix reference to /etc
>Confidential:   no
>Severity:       non-critical
>Priority:       low
>Responsible:    jgh
>State:          closed
>Quarter:        
>Keywords:       
>Date-Required:  
>Class:          maintainer-update
>Submitter-Id:   current-users
>Arrival-Date:   Tue Jan 31 19:30:10 UTC 2012
>Closed-Date:    Thu Feb 02 17:41:41 UTC 2012
>Last-Modified:  Thu Feb  2 17:50:08 UTC 2012
>Originator:     Phillip
>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:
Hi.

This is a fix that makes the rabbitmq-plugins use $PREFIX/etc instead of /etc

Thanks!!

Reference: http://lists.rabbitmq.com/pipermail/rabbitmq-discuss/2012-January/017784.html
>How-To-Repeat:

>Fix:


Patch attached with submission follows:

diff -ruN rabbitmq.orig/Makefile rabbitmq/Makefile
--- rabbitmq.orig/Makefile	2012-01-29 08:04:36.000000000 -0300
+++ rabbitmq/Makefile	2012-01-31 16:22:35.000000000 -0300
@@ -7,6 +7,7 @@
 
 PORTNAME=	rabbitmq
 PORTVERSION=	2.7.1
+PORTREVISION=	1
 CATEGORIES=	net
 MASTER_SITES=	http://www.rabbitmq.com/releases/rabbitmq-server/v${PORTVERSION}/
 DISTNAME=	${PORTNAME}-server-${PORTVERSION}
@@ -48,7 +49,8 @@
 
 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-server ${SCRIPTS_DIR}/rabbitmqctl ${SCRIPTS_DIR}/rabbitmq-env
+		${SCRIPTS_DIR}/rabbitmq-server ${SCRIPTS_DIR}/rabbitmqctl \
+		${SCRIPTS_DIR}/rabbitmq-env ${SCRIPTS_DIR}/rabbitmq-plugins
 	@${FIND} ${WRKSRC} -name "*.bak" -delete
 
 pre-install:
@@ -57,6 +59,7 @@
 		${XARGS} ${CHMOD} 0755
 	@${FIND} ${WRKSRC}/ebin ${WRKSRC}/include -type f | \
 		${XARGS} ${CHMOD} 0644
+	@${MKDIR} ${PREFIX}/etc/rabbitmq
 
 post-install:
 	@${SH} ${PKGINSTALL} ${PKGNAME} POST-INSTALL


>Release-Note:
>Audit-Trail:
Responsible-Changed-From-To: freebsd-ports-bugs->jgh 
Responsible-Changed-By: jgh 
Responsible-Changed-When: Tue Jan 31 21:04:16 UTC 2012 
Responsible-Changed-Why:  
I'll take it. 

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

From: Jason Helfman <jgh@FreeBSD.org>
To: Phillip <pneumann@gmail.com>
Cc: bug-followup@freebsd.org
Subject: Re: ports/164671: net/rabbitmq: Fix reference to /etc
Date: Tue, 31 Jan 2012 15:06:11 -0800

 --EeQfGwPcQSOJBaQU
 Content-Type: text/plain; charset=us-ascii; format=flowed
 Content-Disposition: inline
 
 Please consider the following patch that works in your changes.
 This removes the custom user creation, and uses the USERS framework.
 Additionally, I've move the post-install functions of the pkg-install.in
 file into the Makefile/pkg-plist.
 
 Here is a buildlog of the port with this patch:
 http://people.freebsd.org/~jgh/files/rabbitmq-2.7.1_1.log
 
 Thanks for your consideration.
 -jgh
 
 -- 
 Jason Helfman         | FreeBSD Committer
 jgh@FreeBSD.org       | http://people.freebsd.org/~jgh
 
 --EeQfGwPcQSOJBaQU
 Content-Type: text/plain; charset=us-ascii
 Content-Disposition: attachment; filename="patch.txt"
 
 Index: Makefile
 ===================================================================
 RCS file: /home/pcvs/ports/net/rabbitmq/Makefile,v
 retrieving revision 1.28
 diff -u -r1.28 Makefile
 --- Makefile	29 Jan 2012 11:04:36 -0000	1.28
 +++ Makefile	31 Jan 2012 23:03:25 -0000
 @@ -7,6 +7,7 @@
  
  PORTNAME=	rabbitmq
  PORTVERSION=	2.7.1
 +PORTREVISION=	1
  CATEGORIES=	net
  MASTER_SITES=	http://www.rabbitmq.com/releases/rabbitmq-server/v${PORTVERSION}/
  DISTNAME=	${PORTNAME}-server-${PORTVERSION}
 @@ -25,19 +26,11 @@
  USE_PYTHON=	yes
  USE_RC_SUBR=	rabbitmq
  
 -RABBITMQ_GID=	135
 -RABBITMQ_GROUP=	rabbitmq
 -RABBITMQ_UID=	135
 -RABBITMQ_USER=	rabbitmq
 +USERS=	rabbitmq
 +GROUPS=	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-server.1 rabbitmqctl.1 rabbitmq-plugins.1
  MAN5=		rabbitmq-env.conf.5
  MANCOMPRESSED=	yes
 @@ -48,17 +41,21 @@
  
  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-server ${SCRIPTS_DIR}/rabbitmqctl ${SCRIPTS_DIR}/rabbitmq-env
 +		${SCRIPTS_DIR}/rabbitmq-server ${SCRIPTS_DIR}/rabbitmqctl \
 +		${SCRIPTS_DIR}/rabbitmq-env ${SCRIPTS_DIR}/rabbitmq-plugins
  	@${FIND} ${WRKSRC} -name "*.bak" -delete
  
  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
 +	@${MKDIR} ${PREFIX}/etc/rabbitmq
  
  post-install:
 -	@${SH} ${PKGINSTALL} ${PKGNAME} POST-INSTALL
 +	@${MKDIR} /var/db/rabbitmq/mnesia
 +	@${MKDIR} /var/log/rabbitmq
 +	@${CHOWN} -R rabbitmq:rabbitmq /var/db/rabbitmq
 +	@${CHOWN} -R rabbitmq:rabbitmq /var/log/rabbitmq
  
  .include <bsd.port.mk>
 Index: pkg-plist
 ===================================================================
 RCS file: /home/pcvs/ports/net/rabbitmq/pkg-plist,v
 retrieving revision 1.15
 diff -u -r1.15 pkg-plist
 --- pkg-plist	10 Nov 2011 03:42:09 -0000	1.15
 +++ pkg-plist	31 Jan 2012 23:03:25 -0000
 @@ -166,5 +166,7 @@
  @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 chown -R rabbitmq:rabbitmq /var/log/rabbitmq
  @exec mkdir -p /var/db/rabbitmq/mnesia
 +@exec chown -R rabbitmq:rabbitmq /var/db/rabbitmq
  @exec mkdir -p %D/etc/rabbitmq
 Index: files/pkg-install.in
 ===================================================================
 RCS file: files/pkg-install.in
 diff -N files/pkg-install.in
 --- files/pkg-install.in	4 Jul 2009 17:59:45 -0000	1.2
 +++ /dev/null	1 Jan 1970 00:00:00 -0000
 @@ -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
 
 --EeQfGwPcQSOJBaQU--

From: Phillip Neumann <pneumann@gmail.com>
To: Jason Helfman <jgh@freebsd.org>
Cc: bug-followup@freebsd.org
Subject: Re: ports/164671: net/rabbitmq: Fix reference to /etc
Date: Wed, 1 Feb 2012 21:12:31 -0300

 --0016e6d58944662b9504b7f00ded
 Content-Type: text/plain; charset=ISO-8859-1
 
 Hi Jason,
 
 Didnt knew about the users framework.
 Greate!
 
 Thanks!
 
 On Tue, Jan 31, 2012 at 8:06 PM, Jason Helfman <jgh@freebsd.org> wrote:
 
 > Please consider the following patch that works in your changes.
 > This removes the custom user creation, and uses the USERS framework.
 > Additionally, I've move the post-install functions of the pkg-install.in
 > file into the Makefile/pkg-plist.
 >
 > Here is a buildlog of the port with this patch:
 > http://people.freebsd.org/~**jgh/files/rabbitmq-2.7.1_1.log<http://people.freebsd.org/~jgh/files/rabbitmq-2.7.1_1.log>
 >
 > Thanks for your consideration.
 > -jgh
 >
 > --
 > Jason Helfman         | FreeBSD Committer
 > jgh@FreeBSD.org       | http://people.freebsd.org/~jgh
 >
 
 
 
 -- 
 
 
 __________________
 pneumann@gmail.com
 @killfil
 
 --0016e6d58944662b9504b7f00ded
 Content-Type: text/html; charset=ISO-8859-1
 Content-Transfer-Encoding: quoted-printable
 
 Hi Jason,<div><br></div><div>Didnt knew about the users framework.=A0</div>=
 <div>Greate!</div><div><br></div><div>Thanks!<br><div><br><div class=3D"gma=
 il_quote">On Tue, Jan 31, 2012 at 8:06 PM, Jason Helfman <span dir=3D"ltr">=
 &lt;<a href=3D"mailto:jgh@freebsd.org">jgh@freebsd.org</a>&gt;</span> wrote=
 :<br>
 <blockquote class=3D"gmail_quote" style=3D"margin:0 0 0 .8ex;border-left:1p=
 x #ccc solid;padding-left:1ex">Please consider the following patch that wor=
 ks in your changes.<br>
 This removes the custom user creation, and uses the USERS framework.<br>
 Additionally, I&#39;ve move the post-install functions of the <a href=3D"ht=
 tp://pkg-install.in" target=3D"_blank">pkg-install.in</a><br>
 file into the Makefile/pkg-plist.<br>
 <br>
 Here is a buildlog of the port with this patch:<br>
 <a href=3D"http://people.freebsd.org/~jgh/files/rabbitmq-2.7.1_1.log" targe=
 t=3D"_blank">http://people.freebsd.org/~<u></u>jgh/files/rabbitmq-2.7.1_1.l=
 og</a><br>
 <br>
 Thanks for your consideration.<br>
 -jgh<span class=3D"HOEnZb"><font color=3D"#888888"><br>
 <br>
 -- <br>
 Jason Helfman =A0 =A0 =A0 =A0 | FreeBSD Committer<br>
 jgh@FreeBSD.org =A0 =A0 =A0 | <a href=3D"http://people.freebsd.org/~jgh" ta=
 rget=3D"_blank">http://people.freebsd.org/~jgh</a><br>
 </font></span></blockquote></div><br><br clear=3D"all"><div><br></div>-- <b=
 r><br><br>__________________<br><a href=3D"mailto:pneumann@gmail.com" targe=
 t=3D"_blank">pneumann@gmail.com</a><div>@killfil</div><br>
 </div></div>
 
 --0016e6d58944662b9504b7f00ded--
State-Changed-From-To: open->closed 
State-Changed-By: jgh 
State-Changed-When: Thu Feb 2 17:41:40 UTC 2012 
State-Changed-Why:  
Committed, with minor changes. Thanks! 

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

From: dfilter@FreeBSD.ORG (dfilter service)
To: bug-followup@FreeBSD.org
Cc:  
Subject: Re: ports/164671: commit references a PR
Date: Thu,  2 Feb 2012 17:41:23 +0000 (UTC)

 jgh         2012-02-02 17:41:14 UTC
 
   FreeBSD ports repository
 
   Modified files:
     net/rabbitmq         Makefile pkg-plist 
   Removed files:
     net/rabbitmq/files   pkg-install.in 
   Log:
   - adjust rabbitmq-plugins to use ${PREFIX}/etc in favor of /etc
   - while here drop custom user installation in favor of portstree USERS framework
   
   PR:     ports/164671
   Submitted by:   maintainer, pneumann at gmail.com
   Approved by:    maintainer, crees (mentor)
   
   Revision  Changes    Path
   1.29      +10 -13    ports/net/rabbitmq/Makefile
   1.3       +0 -41     ports/net/rabbitmq/files/pkg-install.in (dead)
   1.16      +2 -0      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:
