From hsn@sendmail.cz  Tue Oct 18 09:54:08 2011
Return-Path: <hsn@sendmail.cz>
Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34])
	by hub.freebsd.org (Postfix) with ESMTP id E6C40106564A
	for <FreeBSD-gnats-submit@freebsd.org>; Tue, 18 Oct 2011 09:54:08 +0000 (UTC)
	(envelope-from hsn@sendmail.cz)
Received: from ponto.amerinoc.com (ponto.amerinoc.com [64.6.108.239])
	by mx1.freebsd.org (Postfix) with ESMTP id C8FF68FC16
	for <FreeBSD-gnats-submit@freebsd.org>; Tue, 18 Oct 2011 09:54:08 +0000 (UTC)
Received: from fbsd8.localdomain (205.83.broadband7.iol.cz [88.102.83.205])
	(authenticated bits=128)
	by ponto.amerinoc.com (8.14.5/8.14.5) with ESMTP id p9I9rvbs009474
	(version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-SHA bits=256 verify=NO);
	Tue, 18 Oct 2011 11:54:01 +0200 (CEST)
	(envelope-from hsn@sendmail.cz)
Received: from fbsd8.localdomain (localhost [127.0.0.1])
	by fbsd8.localdomain (8.14.4/8.14.4) with ESMTP id p9I9roWW080851;
	Tue, 18 Oct 2011 11:53:50 +0200 (CEST)
	(envelope-from hsn@fbsd8.localdomain)
Received: (from hsn@localhost)
	by fbsd8.localdomain (8.14.4/8.14.4/Submit) id p9I9rm0g080850;
	Tue, 18 Oct 2011 11:53:48 +0200 (CEST)
	(envelope-from hsn)
Message-Id: <201110180953.p9I9rm0g080850@fbsd8.localdomain>
Date: Tue, 18 Oct 2011 11:53:48 +0200 (CEST)
From: Radim Kolar <hsn@sendmail.cz>
To: FreeBSD-gnats-submit@freebsd.org
Cc: gslin@gslin.org, hsn@sendmail.cz
Subject: [PATCH] databases/cassandra: update to 0.8.7
X-Send-Pr-Version: 3.113
X-GNATS-Notify: gslin@gslin.org

>Number:         161766
>Category:       ports
>Synopsis:       [PATCH] databases/cassandra: update to 0.8.7
>Confidential:   no
>Severity:       non-critical
>Priority:       low
>Responsible:    pawel
>State:          closed
>Quarter:        
>Keywords:       
>Date-Required:  
>Class:          update
>Submitter-Id:   current-users
>Arrival-Date:   Tue Oct 18 10:00:23 UTC 2011
>Closed-Date:    Sat Oct 29 11:04:24 UTC 2011
>Last-Modified:  Sat Oct 29 11:10:09 UTC 2011
>Originator:     Radim Kolar
>Release:        FreeBSD 8.2-RELEASE i386
>Organization:
>Environment:
System: FreeBSD fbsd8.localdomain 8.2-RELEASE FreeBSD 8.2-RELEASE #8: Tue Mar  1 14:49:07 CET
>Description:
REPLACES: ports/160654
          ports/161301

- Update to 0.8.7
- Added script repaircluster for running cluster wide 
- Added support for MX4J Web API

Added file(s):
- scripts/repaircluster

Port maintainer (gslin@gslin.org) is cc'd.

Generated with FreeBSD Port Tools 0.99
>How-To-Repeat:
>Fix:

--- cassandra-0.8.7.patch begins here ---
diff -ruN --exclude=CVS /usr/ports/databases/cassandra/Makefile /home/hsn/ports/cassandra/Makefile
--- /usr/ports/databases/cassandra/Makefile	2011-09-10 22:44:29.000000000 +0200
+++ /home/hsn/ports/cassandra/Makefile	2011-10-18 11:37:53.982133576 +0200
@@ -6,7 +6,8 @@
 #
 
 PORTNAME=	cassandra
-PORTVERSION=	0.8.5
+PORTVERSION=	0.8.7
+PORTREVISION=	0
 CATEGORIES=	databases java
 MASTER_SITES=	${MASTER_SITE_APACHE}
 MASTER_SITE_SUBDIR=	cassandra/${PORTVERSION}
@@ -27,24 +28,41 @@
 CONFIGS=	access.properties cassandra-topology.properties cassandra.yaml \
 		log4j-server.properties log4j-tools.properties passwd.properties
 SCRIPTS=	cassandra cassandra-cli json2sstable nodetool sstable2json \
-		sstablekeys sstableloader
+		sstablekeys sstableloader repaircluster
+
+OPTIONS=	MX4J "Enable HTTP interface for JMX" Off
+
+.include <bsd.port.options.mk>
+
+.if defined(WITH_MX4J)
+RUN_DEPENDS+=	${JAVAJARDIR}/mx4j-tools.jar:${PORTSDIR}/java/mx4j
+PLIST_SUB+=	MX4J=""
+.else
+PLIST_SUB+=	MX4J="@comment "
+.endif
 
 post-extract:
 	@${RM} ${WRKSRC}/bin/*.bat ${WRKSRC}/bin/stop-server
+	@${CP} ${SCRIPTDIR}/repaircluster ${WRKSRC}/bin
 .for i in ${CONFIGS}
 	@${MV} ${WRKSRC}/conf/${i} ${WRKSRC}/conf/${i}.sample
 .endfor
 
 do-patch:
-	@${REINPLACE_CMD} -e 's|/usr/share/cassandra|${DATADIR}/bin|' ${WRKSRC}/bin/cassandra-cli ${WRKSRC}/bin/nodetool
+	@${REINPLACE_CMD} -e 's|/usr/share/cassandra|${DATADIR}/bin|' ${WRKSRC}/bin/cassandra-cli ${WRKSRC}/bin/nodetool ${WRKSRC}/bin/sstableloader
 	@${REINPLACE_CMD} -e 's|\`dirname \$$\0\`/..|${DATADIR}|' ${WRKSRC}/bin/cassandra.in.sh
 
 do-install:
 	@${MKDIR} ${DATADIR}
 	@cd ${WRKSRC}/ && ${COPYTREE_SHARE} . ${DATADIR}
-	@cd ${DATADIR}/bin/ && ${CHMOD} u+x ${SCRIPTS}
+	@cd ${DATADIR}/bin/ && ${CHMOD} ${BINMODE} ${SCRIPTS}
 	@${LN} -s ${DATADIR}/bin/cassandra-cli ${PREFIX}/bin/cassandra-cli
 	@${LN} -s ${DATADIR}/bin/nodetool ${PREFIX}/bin/nodetool
+	@${LN} -s ${DATADIR}/bin/sstableloader ${PREFIX}/bin/sstableloader
+	@${LN} -s ${DATADIR}/bin/repaircluster ${PREFIX}/bin/repaircluster
+.ifdef (WITH_MX4J)
+	@${LN} -s ${LOCALBASE}/share/java/classes/mx4j-tools.jar ${DATADIR}/lib/mx4j-tools.jar
+.endif
 
 post-install:
 	@PKG_PREFIX=${PREFIX} ${SH} ${PKGINSTALL} ${PKGNAME} POST-INSTALL
diff -ruN --exclude=CVS /usr/ports/databases/cassandra/distinfo /home/hsn/ports/cassandra/distinfo
--- /usr/ports/databases/cassandra/distinfo	2011-09-10 22:44:29.000000000 +0200
+++ /home/hsn/ports/cassandra/distinfo	2011-10-18 07:56:06.031234612 +0200
@@ -1,2 +1,2 @@
-SHA256 (apache-cassandra-0.8.5-bin.tar.gz) = 12a433e51f8e49d70da761ceed9a912633480854e7ef7f49899865f28331883a
-SIZE (apache-cassandra-0.8.5-bin.tar.gz) = 10236276
+SHA256 (apache-cassandra-0.8.7-bin.tar.gz) = 5b1f442e8f9e80bcebe7c46083659365c4d7edd0fe01ed610c4a07a9d1cfdc16
+SIZE (apache-cassandra-0.8.7-bin.tar.gz) = 10274121
diff -ruN --exclude=CVS /usr/ports/databases/cassandra/files/cassandra.in /home/hsn/ports/cassandra/files/cassandra.in
--- /usr/ports/databases/cassandra/files/cassandra.in	2011-09-07 19:25:06.000000000 +0200
+++ /home/hsn/ports/cassandra/files/cassandra.in	2011-09-26 00:38:14.275142122 +0200
@@ -37,7 +37,7 @@
 load_rc_config $name
 
 cassandra_enable=${cassandra_enable:-"NO"}
-cassandra_vmargs=${cassandra_vmargs:-"-XX:+UseConcMarkSweepGC -XX:+CMSIncrementalMode -XX:+CMSIncrementalPacing -XX:CMSIncrementalDutyCycleMin=0 -XX:+CMSIncrementalDutyCycle=10"}
+cassandra_vmargs=${cassandra_vmargs:-"-ea -javaagent:%%DATADIR%%/lib/jamm-0.2.2.jar -XX:+UseConcMarkSweepGC -XX:+CMSIncrementalMode -XX:+CMSIncrementalPacing -XX:CMSIncrementalDutyCycleMin=0 -XX:+CMSIncrementalDutyCycle=10"}
 cassandra_memory=${cassandra_memory:-"1000m"}
 cassandra_newgen=${cassandra_newgen:-"300m"}
 command=%%DATADIR%%/bin/cassandra
diff -ruN --exclude=CVS /usr/ports/databases/cassandra/pkg-plist /home/hsn/ports/cassandra/pkg-plist
--- /usr/ports/databases/cassandra/pkg-plist	2011-09-10 22:44:29.000000000 +0200
+++ /home/hsn/ports/cassandra/pkg-plist	2011-10-18 11:36:14.569360397 +0200
@@ -1,6 +1,8 @@
 @comment $FreeBSD: ports/databases/cassandra/pkg-plist,v 1.13 2011/09/10 20:44:29 sunpoet Exp $
 bin/cassandra-cli
 bin/nodetool
+bin/sstableloader
+bin/repaircluster
 %%DATADIR%%/CHANGES.txt
 %%DATADIR%%/LICENSE.txt
 %%DATADIR%%/NEWS.txt
@@ -14,6 +16,7 @@
 %%DATADIR%%/bin/sstable2json
 %%DATADIR%%/bin/sstablekeys
 %%DATADIR%%/bin/sstableloader
+%%DATADIR%%/bin/repaircluster
 %%DATADIR%%/conf/README.txt
 %%DATADIR%%/conf/access.properties.sample
 %%DATADIR%%/conf/cassandra-env.sh
@@ -1554,9 +1557,10 @@
 %%DATADIR%%/javadoc/resources/inherit.gif
 %%DATADIR%%/javadoc/serialized-form.html
 %%DATADIR%%/javadoc/stylesheet.css
+%%MX4J%%%%DATADIR%%/lib/mx4j-tools.jar
 %%DATADIR%%/lib/antlr-3.2.jar
-%%DATADIR%%/lib/apache-cassandra-0.8.5.jar
-%%DATADIR%%/lib/apache-cassandra-thrift-0.8.5.jar
+%%DATADIR%%/lib/apache-cassandra-0.8.7.jar
+%%DATADIR%%/lib/apache-cassandra-thrift-0.8.7.jar
 %%DATADIR%%/lib/avro-1.4.0-fixes.jar
 %%DATADIR%%/lib/avro-1.4.0-sources-fixes.jar
 %%DATADIR%%/lib/commons-cli-1.1.jar
diff -ruN --exclude=CVS /usr/ports/databases/cassandra/scripts/repaircluster /home/hsn/ports/cassandra/scripts/repaircluster
--- /usr/ports/databases/cassandra/scripts/repaircluster	1970-01-01 01:00:00.000000000 +0100
+++ /home/hsn/ports/cassandra/scripts/repaircluster	2011-10-05 12:50:35.662809744 +0200
@@ -0,0 +1,9 @@
+#! /bin/sh
+set -e
+if test $# -eq 0; then
+	echo "$0 <any node in cluster>"
+	exit 1;
+fi	 
+for i in `nodetool -h $1 ring | cut -d ' ' -f 1 | grep -e '^[0-9]'`; do
+	nodetool -h $i repair
+done	
--- cassandra-0.8.7.patch ends here ---

>Release-Note:
>Audit-Trail:
State-Changed-From-To: open->feedback 
State-Changed-By: edwin 
State-Changed-When: Tue Oct 18 10:00:35 UTC 2011 
State-Changed-Why:  
Awaiting maintainers feedback (via the GNATS Auto Assign Tool) 

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

From: Edwin Groothuis <edwin@FreeBSD.org>
To: gslin@gslin.org
Cc: bug-followup@FreeBSD.org
Subject: Re: ports/161766: [PATCH] databases/cassandra: update to 0.8.7
Date: Tue, 18 Oct 2011 10:00:33 UT

 Maintainer of databases/cassandra,
 
 Please note that PR ports/161766 has just been submitted.
 
 If it contains a patch for an upgrade, an enhancement or a bug fix
 you agree on, reply to this email stating that you approve the patch
 and a committer will take care of it.
 
 The full text of the PR can be found at:
     http://www.freebsd.org/cgi/query-pr.cgi?pr=ports/161766
 
 -- 
 Edwin Groothuis via the GNATS Auto Assign Tool
 edwin@FreeBSD.org

From: Gea-Suan Lin <gslin@gslin.org>
To: bug-followup@FreeBSD.org
Cc: gslin@gslin.org
Subject: Re: ports/161766: [PATCH] databases/cassandra: update to 0.8.7
Date: Tue, 18 Oct 2011 21:43:06 +0800

 Thanks, please commit it.
 
 On Tue, Oct 18, 2011 at 10:00:33AM +0000, Edwin Groothuis wrote:
 > Maintainer of databases/cassandra,
 > 
 > Please note that PR ports/161766 has just been submitted.
 > 
 > If it contains a patch for an upgrade, an enhancement or a bug fix
 > you agree on, reply to this email stating that you approve the patch
 > and a committer will take care of it.
 > 
 > The full text of the PR can be found at:
 >     http://www.freebsd.org/cgi/query-pr.cgi?pr=ports/161766
 > 
 > -- 
 > Edwin Groothuis via the GNATS Auto Assign Tool
 > edwin@FreeBSD.org
 
 -- 
 * Gea-Suan Lin  (public key: Using https://keyserver.pgp.com/ to search)
 * If you cannot convince them, confuse them.           -- Harry S Truman
State-Changed-From-To: feedback->open 
State-Changed-By: linimon 
State-Changed-When: Tue Oct 18 14:43:31 UTC 2011 
State-Changed-Why:  
Maintainer approved. 

http://www.freebsd.org/cgi/query-pr.cgi?pr=161766 
Responsible-Changed-From-To: freebsd-ports-bugs->pawel 
Responsible-Changed-By: pawel 
Responsible-Changed-When: Fri Oct 21 15:45:01 UTC 2011 
Responsible-Changed-Why:  
I'll take it. 

http://www.freebsd.org/cgi/query-pr.cgi?pr=161766 
State-Changed-From-To: open->feedback 
State-Changed-By: pawel 
State-Changed-When: Fri Oct 21 15:48:07 UTC 2011 
State-Changed-Why:  
While committing ports/161671 I've missed this, sorry Can you provide 
patch against newest version in ports ? - only with other improvements 
you've provided of course. Thanks 

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

From: Radim Kolar <hsn@sendmail.cz>
To: bug-followup@FreeBSD.org, hsn@sendmail.cz
Cc:  
Subject: Re: ports/161766: [PATCH] databases/cassandra: update to 0.8.7
Date: Thu, 27 Oct 2011 23:27:13 +0200

 begin 644 port.patch.gz
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
 I.^`?OQ&I^?NKSZ_Q#H>",_P.Q)8+XM3W:"[^P:N#C\+?>78Z$!$3````
 `
 end
 
State-Changed-From-To: feedback->closed 
State-Changed-By: pawel 
State-Changed-When: Sat Oct 29 11:04:21 UTC 2011 
State-Changed-Why:  
Committed, with minor changes. Thanks! 

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

From: dfilter@FreeBSD.ORG (dfilter service)
To: bug-followup@FreeBSD.org
Cc:  
Subject: Re: ports/161766: commit references a PR
Date: Sat, 29 Oct 2011 11:04:07 +0000 (UTC)

 pawel       2011-10-29 11:03:58 UTC
 
   FreeBSD ports repository
 
   Modified files:
     databases/cassandra  Makefile pkg-plist 
     databases/cassandra/files cassandra.in 
   Added files:
     databases/cassandra/scripts repaircluster 
   Log:
   - Add WITH_MX4J option
   - Add repaircluster script
   
   PR:             ports/161766
   Submitted by:   Radim Kolar <hsn@sendmail.cz>
   Approved by:    maintainer
   
   Revision  Changes    Path
   1.16      +22 -2     ports/databases/cassandra/Makefile
   1.3       +2 -2      ports/databases/cassandra/files/cassandra.in
   1.15      +5 -1      ports/databases/cassandra/pkg-plist
   1.1       +9 -0      ports/databases/cassandra/scripts/repaircluster (new)
 _______________________________________________
 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:
