ports/163295: [PATCH] databases/cassandra: update to 1.0.6
Radim Kolar
hsn at sendmail.cz
Wed Dec 14 19:40:08 UTC 2011
>Number: 163295
>Category: ports
>Synopsis: [PATCH] databases/cassandra: update to 1.0.6
>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 Dec 14 19:40:06 UTC 2011
>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:
- Update to 1.0.6
- stop using kill-9
- support for cqlsh
- depends on pr/163292
Port maintainer (gslin at gslin.org) is cc'd.
Generated with FreeBSD Port Tools 0.99
>How-To-Repeat:
>Fix:
--- cassandra-1.0.6.patch begins here ---
diff -ruN --exclude=CVS /usr/ports/databases/cassandra/Makefile /home/hsn/ports/cassandra/Makefile
--- /usr/ports/databases/cassandra/Makefile 2011-11-14 03:17:46.000000000 +0100
+++ /home/hsn/ports/cassandra/Makefile 2011-12-14 19:58:55.019530217 +0100
@@ -2,12 +2,12 @@
# Date created: 2009-08-06
# Whom: Gea-Suan Lin <gslin at gslin.org>
#
-# $FreeBSD: ports/databases/cassandra/Makefile,v 1.17 2011/11/14 02:17:46 clsung Exp $
+# $FreeBSD: ports/databases/cassandra/Makefile,v 1.15 2011/10/18 21:07:35 pawel Exp $
#
PORTNAME= cassandra
-PORTVERSION= 1.0.2
-PORTREVISION= 1
+PORTVERSION= 1.0.6
+PORTREVISION= 0
CATEGORIES= databases java
MASTER_SITES= ${MASTER_SITE_APACHE}
MASTER_SITE_SUBDIR= cassandra/${PORTVERSION}
@@ -21,7 +21,6 @@
JAVA_VERSION= 1.6
JAVA_VENDOR= openjdk
-NO_BUILD= yes
REINPLACE_ARGS= -i ''
USE_JAVA= yes
USE_RC_SUBR= cassandra
@@ -39,7 +38,9 @@
sstableloader
OPTIONS= MX4J "Enable HTTP interface for JMX" Off \
- JNA "Use JNA native access" Off
+ JNA "Use JNA native access" Off \
+ CQL "Install cqlsh" Off
+
SUB_FILES= repaircluster
.include <bsd.port.options.mk>
@@ -56,12 +57,25 @@
.else
PLIST_SUB+= JNA="@comment "
.endif
+.if defined(WITH_CQL)
+USE_PYTHON=yes
+RUN_DEPENDS+= ${PYTHON_SITELIBDIR}/cql/__init__.py:${PORTSDIR}/databases/py-cql
+PLIST_SUB+= CQL=""
+SCRIPTS+= cqlsh
+.else
+PLIST_SUB+= CQL="@comment "
+.endif
post-extract:
@${RM} ${WRKSRC}/bin/*.bat ${WRKSRC}/bin/stop-server
.for i in ${CONFIGS}
@${MV} ${WRKSRC}/conf/${i} ${WRKSRC}/conf/${i}.sample
.endfor
+ @${MV} ${WRKSRC}/bin/cqlshrc.sample ${WRKSRC}/conf
+.ifndef (WITH_CQL)
+ @${RM} -r ${WRKSRC}/pylib
+ @${RM} ${WRKSRC}/bin/cqlsh
+.endif
post-patch:
@${REINPLACE_CMD} -e 's|/usr/share/cassandra|${DATADIR}/bin|' \
@@ -71,6 +85,15 @@
@${REINPLACE_CMD} -e 's|\`dirname \$$\0\`/..|${DATADIR}|' \
${WRKSRC}/bin/cassandra.in.sh
@${RM} -f ${WRKSRC}/conf/*.orig
+.ifdef (WITH_CQL)
+ @${REINPLACE_CMD} -e 's|os.path.dirname(__file__)|"${DATADIR}/bin"|' \
+ ${WRKSRC}/bin/cqlsh
+.endif
+
+do-build:
+.if defined(WITH_CQL)
+ @${PYTHON_CMD} -m compileall ${WRKSRC}/pylib
+.endif
do-install:
@${MKDIR} ${DATADIR}
@@ -81,6 +104,9 @@
@${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_CQL)
+ @${LN} -s ${DATADIR}/bin/cqlsh ${PREFIX}/bin/cqlsh
+.endif
.ifdef (WITH_MX4J)
@${LN} -s ${LOCALBASE}/share/java/classes/mx4j-tools.jar ${DATADIR}/lib/mx4j-tools.jar
.endif
diff -ruN --exclude=CVS /usr/ports/databases/cassandra/distinfo /home/hsn/ports/cassandra/distinfo
--- /usr/ports/databases/cassandra/distinfo 2011-11-14 03:17:46.000000000 +0100
+++ /home/hsn/ports/cassandra/distinfo 2011-12-14 11:19:08.096057362 +0100
@@ -1,2 +1,2 @@
-SHA256 (apache-cassandra-1.0.2-bin.tar.gz) = 1b35c0daaa84f38c67f80c29f37222746f6f1c82900421301d88634f06f0ac79
-SIZE (apache-cassandra-1.0.2-bin.tar.gz) = 11192372
+SHA256 (apache-cassandra-1.0.6-bin.tar.gz) = a1610344b78164d238415112f523639e8c33b0a3a14b427e8b910017cf060d13
+SIZE (apache-cassandra-1.0.6-bin.tar.gz) = 11243727
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-11-14 03:17:46.000000000 +0100
+++ /home/hsn/ports/cassandra/files/cassandra.in 2011-12-14 11:18:37.935699409 +0100
@@ -1,4 +1,4 @@
-#!/bin/sh
+#! /bin/sh
#
# Copyright (c) 2011, Radim Kolar
# All rights reserved.
@@ -28,7 +28,7 @@
# REQUIRE: LOGIN
# KEYWORD: shutdown
#
-# $FreeBSD: ports/databases/cassandra/files/cassandra.in,v 1.4 2011/11/14 02:17:46 clsung Exp $
+# $FreeBSD: ports/databases/cassandra/files/cassandra.in,v 1.2 2011/09/07 17:25:06 sunpoet Exp $
. /etc/rc.subr
@@ -44,6 +44,7 @@
command=%%DATADIR%%/bin/cassandra
command_args="-p /var/run/cassandra.pid >/dev/null"
stop_precmd="${name}_prestop"
+sig_stop="KILL"
procname="%%LOCALBASE%%/openjdk6/bin/java"
pidfile=/var/run/cassandra.pid
@@ -60,9 +61,12 @@
cassandra_prestop() {
$CASSANDRA_HOME/bin/nodetool -h localhost disablegossip
- sleep 8
+ sleep 13
$CASSANDRA_HOME/bin/nodetool -h localhost disablethrift
+ sleep 2
$CASSANDRA_HOME/bin/nodetool -h localhost drain
+ sleep 5
+ return 0
}
run_rc_command "$1"
diff -ruN --exclude=CVS /usr/ports/databases/cassandra/pkg-plist /home/hsn/ports/cassandra/pkg-plist
--- /usr/ports/databases/cassandra/pkg-plist 2011-11-14 03:17:46.000000000 +0100
+++ /home/hsn/ports/cassandra/pkg-plist 2011-12-14 15:54:19.644941675 +0100
@@ -2,6 +2,7 @@
bin/nodetool
bin/repaircluster
bin/sstableloader
+%%CQL%%bin/cqlsh
%%DATADIR%%/CHANGES.txt
%%DATADIR%%/LICENSE.txt
%%DATADIR%%/NEWS.txt
@@ -741,7 +742,6 @@
%%DATADIR%%/javadoc/org/apache/cassandra/io/sstable/AbstractSSTableSimpleWriter.html
%%DATADIR%%/javadoc/org/apache/cassandra/io/sstable/BloomFilterTracker.html
%%DATADIR%%/javadoc/org/apache/cassandra/io/sstable/Component.html
-%%DATADIR%%/javadoc/org/apache/cassandra/io/sstable/Descriptor.TempState.html
%%DATADIR%%/javadoc/org/apache/cassandra/io/sstable/Descriptor.html
%%DATADIR%%/javadoc/org/apache/cassandra/io/sstable/IndexHelper.IndexInfo.html
%%DATADIR%%/javadoc/org/apache/cassandra/io/sstable/IndexHelper.html
@@ -771,7 +771,6 @@
%%DATADIR%%/javadoc/org/apache/cassandra/io/sstable/class-use/AbstractSSTableSimpleWriter.html
%%DATADIR%%/javadoc/org/apache/cassandra/io/sstable/class-use/BloomFilterTracker.html
%%DATADIR%%/javadoc/org/apache/cassandra/io/sstable/class-use/Component.html
-%%DATADIR%%/javadoc/org/apache/cassandra/io/sstable/class-use/Descriptor.TempState.html
%%DATADIR%%/javadoc/org/apache/cassandra/io/sstable/class-use/Descriptor.html
%%DATADIR%%/javadoc/org/apache/cassandra/io/sstable/class-use/IndexHelper.IndexInfo.html
%%DATADIR%%/javadoc/org/apache/cassandra/io/sstable/class-use/IndexHelper.html
@@ -1608,14 +1607,12 @@
%%DATADIR%%/javadoc/org/apache/cassandra/thrift/package-use.html
%%DATADIR%%/javadoc/org/apache/cassandra/tools/BulkLoader.html
%%DATADIR%%/javadoc/org/apache/cassandra/tools/GetVersion.html
-%%DATADIR%%/javadoc/org/apache/cassandra/tools/NodeCmd.NodeCommand.html
%%DATADIR%%/javadoc/org/apache/cassandra/tools/NodeCmd.html
%%DATADIR%%/javadoc/org/apache/cassandra/tools/NodeProbe.html
%%DATADIR%%/javadoc/org/apache/cassandra/tools/SSTableExport.html
%%DATADIR%%/javadoc/org/apache/cassandra/tools/SSTableImport.html
%%DATADIR%%/javadoc/org/apache/cassandra/tools/class-use/BulkLoader.html
%%DATADIR%%/javadoc/org/apache/cassandra/tools/class-use/GetVersion.html
-%%DATADIR%%/javadoc/org/apache/cassandra/tools/class-use/NodeCmd.NodeCommand.html
%%DATADIR%%/javadoc/org/apache/cassandra/tools/class-use/NodeCmd.html
%%DATADIR%%/javadoc/org/apache/cassandra/tools/class-use/NodeProbe.html
%%DATADIR%%/javadoc/org/apache/cassandra/tools/class-use/SSTableExport.html
@@ -1753,10 +1750,24 @@
%%DATADIR%%/javadoc/org/apache/cassandra/utils/BigLongArray.html
%%DATADIR%%/javadoc/org/apache/cassandra/db/RetriedSliceFromReadCommand.html
%%DATADIR%%/javadoc/org/apache/cassandra/db/class-use/RetriedSliceFromReadCommand.html
+%%DATADIR%%/javadoc/org/apache/cassandra/service/StorageProxy.WritePerformer.html
+%%DATADIR%%/javadoc/org/apache/cassandra/service/class-use/StorageProxy.WritePerformer.html
+%%DATADIR%%/javadoc/org/apache/cassandra/io/IColumnSerializer.Flag.html
+%%DATADIR%%/javadoc/org/apache/cassandra/io/class-use/IColumnSerializer.Flag.html
+%%DATADIR%%/conf/cqlshrc.sample
+%%CQL%%%%DATADIR%%/bin/cqlsh
+%%CQL%%%%DATADIR%%/pylib/cqlshlib/__init__.py
+%%CQL%%%%DATADIR%%/pylib/cqlshlib/cqlhandling.py
+%%CQL%%%%DATADIR%%/pylib/cqlshlib/pylexotron.py
+%%CQL%%%%DATADIR%%/pylib/cqlshlib/saferscanner.py
+%%CQL%%%%DATADIR%%/pylib/cqlshlib/__init__.pyc
+%%CQL%%%%DATADIR%%/pylib/cqlshlib/cqlhandling.pyc
+%%CQL%%%%DATADIR%%/pylib/cqlshlib/pylexotron.pyc
+%%CQL%%%%DATADIR%%/pylib/cqlshlib/saferscanner.pyc
%%DATADIR%%/lib/antlr-3.2.jar
-%%DATADIR%%/lib/apache-cassandra-1.0.2.jar
-%%DATADIR%%/lib/apache-cassandra-clientutil-1.0.2.jar
-%%DATADIR%%/lib/apache-cassandra-thrift-1.0.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/avro-1.4.0-fixes.jar
%%DATADIR%%/lib/avro-1.4.0-sources-fixes.jar
%%DATADIR%%/lib/commons-cli-1.1.jar
@@ -1891,6 +1902,8 @@
@dirrm %%DATADIR%%/javadoc/org
@dirrm %%DATADIR%%/javadoc
@dirrm %%DATADIR%%/interface
+ at dirrmtry %%DATADIR%%/pylib/cqlshlib
+ at dirrmtry %%DATADIR%%/pylib
@dirrmtry %%DATADIR%%/conf
@dirrm %%DATADIR%%/bin
@dirrmtry %%DATADIR%%
--- cassandra-1.0.6.patch ends here ---
>Release-Note:
>Audit-Trail:
>Unformatted:
More information about the freebsd-ports-bugs
mailing list