From owner-freebsd-ports-bugs@FreeBSD.ORG Wed Mar 7 12:50:12 2012 Return-Path: Delivered-To: freebsd-ports-bugs@hub.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [69.147.83.52]) by hub.freebsd.org (Postfix) with ESMTP id 3379A1065672 for ; Wed, 7 Mar 2012 12:50:12 +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 0223A8FC19 for ; Wed, 7 Mar 2012 12:50:12 +0000 (UTC) Received: from freefall.freebsd.org (localhost [127.0.0.1]) by freefall.freebsd.org (8.14.5/8.14.5) with ESMTP id q27CoBdO049991 for ; Wed, 7 Mar 2012 12:50:11 GMT (envelope-from gnats@freefall.freebsd.org) Received: (from gnats@localhost) by freefall.freebsd.org (8.14.5/8.14.5/Submit) id q27CoB2f049990; Wed, 7 Mar 2012 12:50:11 GMT (envelope-from gnats) Resent-Date: Wed, 7 Mar 2012 12:50:11 GMT Resent-Message-Id: <201203071250.q27CoB2f049990@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, Radim Kolar Received: from mx1.freebsd.org (mx1.freebsd.org [69.147.83.52]) by hub.freebsd.org (Postfix) with ESMTP id 4F24C106566B for ; Wed, 7 Mar 2012 12:48:53 +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 238C28FC0C for ; Wed, 7 Mar 2012 12:48:52 +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 q27CmgJD082762 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-SHA bits=256 verify=NO); Wed, 7 Mar 2012 13:48:45 +0100 (CET) (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 q27CmaHF004827; Wed, 7 Mar 2012 13:48:36 +0100 (CET) (envelope-from hsn@fbsd8.localdomain) Received: (from hsn@localhost) by fbsd8.localdomain (8.14.4/8.14.4/Submit) id q27CmZEa004826; Wed, 7 Mar 2012 13:48:35 +0100 (CET) (envelope-from hsn) Message-Id: <201203071248.q27CmZEa004826@fbsd8.localdomain> Date: Wed, 7 Mar 2012 13:48:35 +0100 (CET) From: Radim Kolar To: FreeBSD-gnats-submit@FreeBSD.org X-Send-Pr-Version: 3.113 Cc: hsn@sendmail.cz Subject: ports/165816: [PATCH] databases/cassandra: update to 1.0.8 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: Wed, 07 Mar 2012 12:50:12 -0000 >Number: 165816 >Category: ports >Synopsis: [PATCH] databases/cassandra: update to 1.0.8 >Confidential: no >Severity: non-critical >Priority: low >Responsible: freebsd-ports-bugs >State: open >Quarter: >Keywords: >Date-Required: >Class: update >Submitter-Id: current-users >Arrival-Date: Wed Mar 07 12:50:11 UTC 2012 >Closed-Date: >Last-Modified: >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/164253 - Update to 1.0.8 - extend repaircluster command to take optional keyspace name argument - improve stop procedure in rc.d script Generated with FreeBSD Port Tools 0.99_4 (mode: update, diff: ports) >How-To-Repeat: >Fix: --- cassandra-1.0.8.patch begins here --- diff -ruN --exclude=CVS /usr/ports/databases/cassandra/Makefile ./Makefile --- /usr/ports/databases/cassandra/Makefile 2012-02-25 02:30:11.000000000 +0100 +++ ./Makefile 2012-03-07 13:22:23.712203530 +0100 @@ -6,7 +6,7 @@ # PORTNAME= cassandra -PORTVERSION= 1.0.6 +PORTVERSION= 1.0.8 CATEGORIES= databases java MASTER_SITES= ${MASTER_SITE_APACHE} MASTER_SITE_SUBDIR= cassandra/${PORTVERSION} diff -ruN --exclude=CVS /usr/ports/databases/cassandra/distinfo ./distinfo --- /usr/ports/databases/cassandra/distinfo 2012-01-09 08:02:24.000000000 +0100 +++ ./distinfo 2012-03-07 13:23:39.541090355 +0100 @@ -1,2 +1,2 @@ -SHA256 (apache-cassandra-1.0.6-bin.tar.gz) = a1610344b78164d238415112f523639e8c33b0a3a14b427e8b910017cf060d13 -SIZE (apache-cassandra-1.0.6-bin.tar.gz) = 11243727 +SHA256 (apache-cassandra-1.0.8-bin.tar.gz) = b8cc374752deb34b98797b7fb03b892332ebabfb37f4eae0c115482e19b659c6 +SIZE (apache-cassandra-1.0.8-bin.tar.gz) = 11271510 diff -ruN --exclude=CVS /usr/ports/databases/cassandra/files/cassandra.in ./files/cassandra.in --- /usr/ports/databases/cassandra/files/cassandra.in 2012-01-14 09:55:27.000000000 +0100 +++ ./files/cassandra.in 2012-03-07 13:20:46.399548208 +0100 @@ -61,11 +61,8 @@ cassandra_prestop() { $CASSANDRA_HOME/bin/nodetool -h localhost disablegossip - sleep 13 - $CASSANDRA_HOME/bin/nodetool -h localhost disablethrift - sleep 2 + sleep 15 $CASSANDRA_HOME/bin/nodetool -h localhost drain - sleep 5 return 0 } diff -ruN --exclude=CVS /usr/ports/databases/cassandra/files/repaircluster.in ./files/repaircluster.in --- /usr/ports/databases/cassandra/files/repaircluster.in 2012-01-09 08:02:24.000000000 +0100 +++ ./files/repaircluster.in 2012-02-07 14:44:06.695333886 +0100 @@ -4,9 +4,9 @@ NODETOOL=%%DATADIR%%/bin/nodetool if test $# -eq 0; then - echo "$0 " + echo "$0 [keyspace]" exit 1; -fi +fi for i in `$NODETOOL -h $1 ring | cut -d ' ' -f 1 | grep -e '^[0-9]'`; do - $NODETOOL -h $i repair + $NODETOOL -h $i repair $2 done diff -ruN --exclude=CVS /usr/ports/databases/cassandra/pkg-plist ./pkg-plist --- /usr/ports/databases/cassandra/pkg-plist 2012-01-09 08:02:24.000000000 +0100 +++ ./pkg-plist 2012-03-07 13:39:24.547462693 +0100 @@ -1764,10 +1764,12 @@ %%CQL%%%%DATADIR%%/pylib/cqlshlib/cqlhandling.pyc %%CQL%%%%DATADIR%%/pylib/cqlshlib/pylexotron.pyc %%CQL%%%%DATADIR%%/pylib/cqlshlib/saferscanner.pyc +%%CQL%%%%DATADIR%%/pylib/cqlshlib/wcwidth.pyc +%%CQL%%%%DATADIR%%/pylib/cqlshlib/wcwidth.py %%DATADIR%%/lib/antlr-3.2.jar -%%DATADIR%%/lib/apache-cassandra-1.0.6.jar -%%DATADIR%%/lib/apache-cassandra-clientutil-1.0.6.jar -%%DATADIR%%/lib/apache-cassandra-thrift-1.0.6.jar +%%DATADIR%%/lib/apache-cassandra-1.0.8.jar +%%DATADIR%%/lib/apache-cassandra-clientutil-1.0.8.jar +%%DATADIR%%/lib/apache-cassandra-thrift-1.0.8.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 --- cassandra-1.0.8.patch ends here --- >Release-Note: >Audit-Trail: >Unformatted: