Date: Tue, 11 Mar 2014 21:56:02 +0100 (CET) From: Radim Kolar <hsn@sendmail.cz> To: FreeBSD-gnats-submit@freebsd.org Cc: hsn@sendmail.cz Subject: ports/187455: [MAINT-PATCH] databases/cassandra: update to 1.2.15 Message-ID: <201403112056.s2BKu2xI003867@fbsd9.localdomain> Resent-Message-ID: <201403112100.s2BL01X0010065@freefall.freebsd.org>
next in thread | raw e-mail | index | archive | help
>Number: 187455
>Category: ports
>Synopsis: [MAINT-PATCH] databases/cassandra: update to 1.2.15
>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: Tue Mar 11 21:00:01 UTC 2014
>Closed-Date:
>Last-Modified:
>Originator: Radim Kolar
>Release: FreeBSD 10.0-RELEASE i386
>Organization:
>Environment:
System: FreeBSD fbsd9.localdomain 10.0-RELEASE FreeBSD 10.0-RELEASE #0 r262526: Wed Feb 26 11:00:13 CET
>Description:
- Update to 1.2.15
- stage support
- update to 1.2 cassandra branch
Port maintainer (hsn@sendmail.cz) is cc'd.
Generated with FreeBSD Port Tools 1.00.2014.03.03 (mode: update, diff: ports)
>How-To-Repeat:
>Fix:
--- cassandra-1.2.15.patch begins here ---
diff -ruN /usr/ports/databases/cassandra/Makefile ./Makefile
--- /usr/ports/databases/cassandra/Makefile 2013-12-30 21:55:18.000000000 +0100
+++ ./Makefile 2014-03-11 20:08:28.438680497 +0100
@@ -1,8 +1,8 @@
# Created by: Gea-Suan Lin <gslin@gslin.org>
-# $FreeBSD: head/databases/cassandra/Makefile 338168 2013-12-30 20:55:18Z ohauer $
+# $FreeBSD: databases/cassandra/Makefile 321580 2013-06-22 16:30:34Z bdrewery $
PORTNAME= cassandra
-PORTVERSION= 1.1.12
+PORTVERSION= 1.2.15
CATEGORIES= databases java
MASTER_SITES= APACHE
MASTER_SITE_SUBDIR= cassandra/${PORTVERSION}
@@ -33,7 +33,8 @@
sstable2json \
sstablekeys \
sstableloader \
- sstablescrub
+ sstablescrub \
+ cassandra-shuffle
OPTIONS_DEFINE= MX4J JNA CQL DOCS
MX4J_DESC= Enable HTTP interface for JMX
@@ -43,7 +44,6 @@
SUB_FILES= repaircluster
-NO_STAGE= yes
.include <bsd.port.options.mk>
RUN_DEPENDS+= ${JAVALIBDIR}/snappy-java.jar:${PORTSDIR}/archivers/snappy-java
@@ -74,7 +74,8 @@
post-extract:
@${RM} ${WRKSRC}/bin/*.bat ${WRKSRC}/bin/stop-server \
- ${WRKSRC}/tools/bin/*.bat ${WRKSRC}/lib/snappy-java-*.jar
+ ${WRKSRC}/tools/bin/*.bat ${WRKSRC}/lib/snappy-java-*.jar \
+ ${WRKSRC}/lib/licenses/snappy-java*.txt
.for i in ${CONFIGS}
@${MV} ${WRKSRC}/conf/${i} ${WRKSRC}/conf/${i}.sample
.endfor
@@ -91,8 +92,9 @@
${WRKSRC}/bin/sstableloader \
${WRKSRC}/bin/sstable2json \
${WRKSRC}/bin/json2sstable \
- ${WRKSRC}/bin/sstablekeys
- @${REINPLACE_CMD} -e 's|\`dirname \$$\0\`/..|${DATADIR}|' \
+ ${WRKSRC}/bin/sstablekeys \
+ ${WRKSRC}/bin/cassandra-shuffle
+ @${REINPLACE_CMD} -e 's|\`dirname "\$$\0"\`/..|${DATADIR}|' \
${WRKSRC}/bin/cassandra.in.sh
@${RM} -f ${WRKSRC}/conf/*.orig
.if ${PORT_OPTIONS:MCQL}
@@ -106,39 +108,37 @@
.endif
do-install:
- @${MKDIR} ${DATADIR}
- @cd ${WRKSRC}/ && ${COPYTREE_SHARE} . ${DATADIR}
- @${LN} -s ${JAVAJARDIR}/snappy-java.jar ${DATADIR}/lib/snappy-java.jar
+ @${MKDIR} ${STAGEDIR}${DATADIR}
+ @cd ${WRKSRC}/ && ${COPYTREE_SHARE} . ${STAGEDIR}${DATADIR}
+ @${LN} -s ${JAVAJARDIR}/snappy-java.jar ${STAGEDIR}${DATADIR}/lib/snappy-java.jar
.if ${PORT_OPTIONS:MDOCS}
- @${MKDIR} ${DOCSDIR}
- @${MV} ${DATADIR}/javadoc ${DOCSDIR}
- @${MV} ${DATADIR}/*.txt ${DOCSDIR}
+ @${MKDIR} ${STAGEDIR}${DOCSDIR}
+ @${MV} ${STAGEDIR}${DATADIR}/javadoc ${STAGEDIR}${DOCSDIR}
+ @${MV} ${STAGEDIR}${DATADIR}/*.txt ${STAGEDIR}${DOCSDIR}
.else
- ${RM} -r ${DATADIR}/javadoc ${DATADIR}/*.txt
+ @${RM} -rf ${STAGEDIR}${DATADIR}/javadoc ${STAGEDIR}${DATADIR}/*.txt
.endif
- @cd ${DATADIR}/bin/ && ${CHMOD} ${BINMODE} ${SCRIPTS}
- @${INSTALL_SCRIPT} ${WRKDIR}/repaircluster ${DATADIR}/bin
- @${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
- @${LN} -s ${DATADIR}/bin/json2sstable ${PREFIX}/bin/json2sstable
- @${LN} -s ${DATADIR}/bin/sstable2json ${PREFIX}/bin/sstable2json
- @${LN} -s ${DATADIR}/bin/sstablekeys ${PREFIX}/bin/sstablekeys
- @${LN} -s ${DATADIR}/bin/sstablescrub ${PREFIX}/bin/sstablescrub
+ @cd ${STAGEDIR}${DATADIR}/bin/ && ${CHMOD} ${BINMODE} ${SCRIPTS}
+ @${INSTALL_SCRIPT} ${WRKDIR}/repaircluster ${STAGEDIR}${DATADIR}/bin
+ @${LN} -s ${DATADIR}/bin/cassandra-cli ${STAGEDIR}${PREFIX}/bin/cassandra-cli
+ @${LN} -s ${DATADIR}/bin/nodetool ${STAGEDIR}${PREFIX}/bin/nodetool
+ @${LN} -s ${DATADIR}/bin/sstableloader ${STAGEDIR}${PREFIX}/bin/sstableloader
+ @${LN} -s ${DATADIR}/bin/repaircluster ${STAGEDIR}${PREFIX}/bin/repaircluster
+ @${LN} -s ${DATADIR}/bin/json2sstable ${STAGEDIR}${PREFIX}/bin/json2sstable
+ @${LN} -s ${DATADIR}/bin/sstable2json ${STAGEDIR}${PREFIX}/bin/sstable2json
+ @${LN} -s ${DATADIR}/bin/sstablekeys ${STAGEDIR}${PREFIX}/bin/sstablekeys
+ @${LN} -s ${DATADIR}/bin/sstablescrub ${STAGEDIR}${PREFIX}/bin/sstablescrub
+ @${LN} -s ${DATADIR}/bin/cassandra-shuffle ${STAGEDIR}${PREFIX}/bin/cassandra-shuffle
.if ${PORT_OPTIONS:MCQL}
- @${LN} -s ${DATADIR}/bin/cqlsh ${PREFIX}/bin/cqlsh
+ @${LN} -s ${DATADIR}/bin/cqlsh ${STAGEDIR}${PREFIX}/bin/cqlsh
.endif
.if ${PORT_OPTIONS:MMX4J}
- @${LN} -s ${LOCALBASE}/share/java/classes/mx4j-tools.jar ${DATADIR}/lib/mx4j-tools.jar
+ @${LN} -s ${LOCALBASE}/share/java/classes/mx4j-tools.jar ${STAGEDIR}${DATADIR}/lib/mx4j-tools.jar
.endif
.if ${PORT_OPTIONS:MJNA}
- @${LN} -s ${LOCALBASE}/share/java/classes/jna.jar ${DATADIR}/lib/jna.jar
- @${LN} -s ${LOCALBASE}/share/java/classes/jna-platform.jar ${DATADIR}/lib/jna-platform.jar
+ @${LN} -s ${LOCALBASE}/share/java/classes/jna.jar ${STAGEDIR}${DATADIR}/lib/jna.jar
+ @${LN} -s ${LOCALBASE}/share/java/classes/jna-platform.jar ${STAGEDIR}${DATADIR}/lib/jna-platform.jar
.endif
-post-install:
- @PKG_PREFIX="${PREFIX}" ${SH} ${PKGINSTALL} ${PKGNAME} POST-INSTALL
-
.include <bsd.port.mk>
diff -ruN /usr/ports/databases/cassandra/distinfo ./distinfo
--- /usr/ports/databases/cassandra/distinfo 2013-06-22 18:30:34.000000000 +0200
+++ ./distinfo 2014-03-11 13:53:19.449337857 +0100
@@ -1,2 +1,2 @@
-SHA256 (apache-cassandra-1.1.12-bin.tar.gz) = 3600f6e86e76974b38b2bf90fabff99ab2a443f444d55a93f3c677c8edbe3785
-SIZE (apache-cassandra-1.1.12-bin.tar.gz) = 12974200
+SHA256 (apache-cassandra-1.2.15-bin.tar.gz) = 9b35afb9d0fee7ac52858b4018ecf8bc69d7ad58049303a2ee8d44b8592b258b
+SIZE (apache-cassandra-1.2.15-bin.tar.gz) = 16877671
diff -ruN /usr/ports/databases/cassandra/files/cassandra.in ./files/cassandra.in
--- /usr/ports/databases/cassandra/files/cassandra.in 2013-05-31 03:32:45.000000000 +0200
+++ ./files/cassandra.in 2013-05-31 03:32:45.000000000 +0200
@@ -28,7 +28,7 @@
# REQUIRE: LOGIN
# KEYWORD: shutdown
#
-# $FreeBSD: head/databases/cassandra/files/cassandra.in 319455 2013-05-31 01:32:45Z bdrewery $
+# $FreeBSD: databases/cassandra/files/cassandra.in 319455 2013-05-31 01:32:45Z bdrewery $
. /etc/rc.subr
diff -ruN /usr/ports/databases/cassandra/pkg-plist ./pkg-plist
--- /usr/ports/databases/cassandra/pkg-plist 2013-06-22 18:30:34.000000000 +0200
+++ ./pkg-plist 2014-03-11 19:17:41.668965420 +0100
@@ -6,6 +6,7 @@
bin/sstable2json
bin/sstablekeys
bin/sstablescrub
+bin/cassandra-shuffle
%%CQL%%bin/cqlsh
%%DATADIR%%/bin/cassandra
%%DATADIR%%/bin/cassandra-cli
@@ -17,6 +18,10 @@
%%DATADIR%%/bin/sstablekeys
%%DATADIR%%/bin/sstableloader
%%DATADIR%%/bin/sstablescrub
+%%DATADIR%%/bin/cassandra-shuffle
+%%DATADIR%%/bin/debug-cql
+%%DATADIR%%/bin/sstablesplit
+%%DATADIR%%/bin/sstableupgrade
%%DATADIR%%/conf/README.txt
%%DATADIR%%/conf/cassandra-env.sh
%%DATADIR%%/conf/cassandra-topology.properties.sample
@@ -45,64 +50,68 @@
%%CQL%%%%DATADIR%%/pylib/cqlshlib/cql3handling.pyc
%%CQL%%%%DATADIR%%/pylib/cqlshlib/util.pyc
%%DATADIR%%/lib/antlr-3.2.jar
-%%DATADIR%%/lib/apache-cassandra-1.1.12.jar
-%%DATADIR%%/lib/apache-cassandra-clientutil-1.1.12.jar
-%%DATADIR%%/lib/apache-cassandra-thrift-1.1.12.jar
+%%DATADIR%%/lib/apache-cassandra-1.2.15.jar
+%%DATADIR%%/lib/apache-cassandra-clientutil-1.2.15.jar
+%%DATADIR%%/lib/apache-cassandra-thrift-1.2.15.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
%%DATADIR%%/lib/commons-codec-1.2.jar
-%%DATADIR%%/lib/commons-lang-2.4.jar
+%%DATADIR%%/lib/commons-lang-2.6.jar
%%DATADIR%%/lib/compress-lzf-0.8.4.jar
%%DATADIR%%/lib/concurrentlinkedhashmap-lru-1.3.jar
-%%DATADIR%%/lib/guava-r08.jar
+%%DATADIR%%/lib/guava-13.0.1.jar
%%DATADIR%%/lib/high-scale-lib-1.1.2.jar
%%DATADIR%%/lib/jackson-core-asl-1.9.2.jar
%%DATADIR%%/lib/jackson-mapper-asl-1.9.2.jar
%%DATADIR%%/lib/jamm-0.2.5.jar
-%%DATADIR%%/lib/jline-0.9.94.jar
-%%DATADIR%%/lib/metrics-core-2.0.3.jar
+%%DATADIR%%/lib/jbcrypt-0.3m.jar
+%%DATADIR%%/lib/jline-1.0.jar
+%%DATADIR%%/lib/json-simple-1.1.jar
%%DATADIR%%/lib/snaptree-0.1.jar
%%DATADIR%%/lib/servlet-api-2.5-20081211.jar
-%%DATADIR%%/lib/slf4j-log4j12-1.6.1.jar
-%%DATADIR%%/lib/slf4j-api-1.6.1.jar
+%%DATADIR%%/lib/slf4j-log4j12-1.7.2.jar
+%%DATADIR%%/lib/slf4j-api-1.7.2.jar
%%DATADIR%%/lib/snakeyaml-1.6.jar
%%DATADIR%%/lib/snappy-java.jar
+%%DATADIR%%/lib/log4j-1.2.16.jar
+%%DATADIR%%/lib/libthrift-0.7.0.jar
+%%DATADIR%%/lib/lz4-1.1.0.jar
+%%DATADIR%%/lib/metrics-core-2.2.0.jar
+%%DATADIR%%/lib/netty-3.6.6.Final.jar
%%CQL%%%%DATADIR%%/lib/thrift-python-internal-only-0.7.0.zip
%%CQL%%%%DATADIR%%/lib/cql-internal-only-1.4.0.zip
%%JNA%%%%DATADIR%%/lib/jna.jar
%%JNA%%%%DATADIR%%/lib/jna-platform.jar
-%%DATADIR%%/lib/json-simple-1.1.jar
-%%DATADIR%%/lib/libthrift-0.7.0.jar
-%%DATADIR%%/lib/licenses/antlr-3.1.3.txt
-%%DATADIR%%/lib/licenses/avro-1.3.1-dev.txt
+%%MX4J%%%%DATADIR%%/lib/mx4j-tools.jar
+%%DATADIR%%/lib/licenses/antlr-3.2.txt
+%%DATADIR%%/lib/licenses/avro-1.4.0.txt
%%DATADIR%%/lib/licenses/commons-cli-1.1.txt
%%DATADIR%%/lib/licenses/commons-codec-1.2.txt
-%%DATADIR%%/lib/licenses/commons-collections-3.2.1.txt
-%%DATADIR%%/lib/licenses/commons-lang-2.4.txt
+%%DATADIR%%/lib/licenses/commons-lang-2.6.txt
%%DATADIR%%/lib/licenses/compress-lzf-0.8.4.txt
-%%DATADIR%%/lib/licenses/concurrentlinkedhashmap-lru-1.2.txt
-%%DATADIR%%/lib/licenses/guava-r08.txt
+%%DATADIR%%/lib/licenses/concurrentlinkedhashmap-lru-1.3.txt
+%%DATADIR%%/lib/licenses/cql-1.2.0.txt
+%%DATADIR%%/lib/licenses/guava-13.0.1.txt
%%DATADIR%%/lib/licenses/high-scale-lib-1.1.2.txt
%%DATADIR%%/lib/licenses/jackson-core-asl-1.9.2.txt
%%DATADIR%%/lib/licenses/jackson-mapper-asl-1.9.2.txt
-%%DATADIR%%/lib/licenses/jamm-0.2.2.txt
-%%DATADIR%%/lib/licenses/jetty-6.1.21.txt
-%%DATADIR%%/lib/licenses/jetty-util-6.1.21.txt
-%%DATADIR%%/lib/licenses/jline-0.9.94.txt
+%%DATADIR%%/lib/licenses/jamm-0.2.5.txt
+%%DATADIR%%/lib/licenses/jbcrypt-0.3m.txt
+%%DATADIR%%/lib/licenses/jline-1.0.txt
%%DATADIR%%/lib/licenses/json-simple-1.1.txt
%%DATADIR%%/lib/licenses/libthrift-0.7.txt
%%DATADIR%%/lib/licenses/log4j-1.2.16.txt
+%%DATADIR%%/lib/licenses/lz4-1.1.0.txt
+%%DATADIR%%/lib/licenses/metrics-core-2.2.0.txt
+%%DATADIR%%/lib/licenses/netty-3.5.2.txt
+%%DATADIR%%/lib/licenses/netty-3.6.6.txt
%%DATADIR%%/lib/licenses/servlet-api-2.5-20081211.txt
%%DATADIR%%/lib/licenses/slf4j-api-1.6.1.txt
%%DATADIR%%/lib/licenses/slf4j-log4j12-1.6.1.txt
%%DATADIR%%/lib/licenses/snakeyaml-1.6.txt
-%%DATADIR%%/lib/licenses/snappy-java-1.0.3.txt
%%DATADIR%%/lib/licenses/thrift-python-0.7.0.txt
%%DATADIR%%/lib/licenses/snaptree-0.1.txt
-%%DATADIR%%/lib/licenses/cql-1.0.8.txt
-%%DATADIR%%/lib/log4j-1.2.16.jar
-%%MX4J%%%%DATADIR%%/lib/mx4j-tools.jar
%%DATADIR%%/tools/lib/stress.jar
%%DATADIR%%/tools/bin/cassandra.in.sh
%%DATADIR%%/tools/bin/cassandra-stressd
--- cassandra-1.2.15.patch ends here ---
>Release-Note:
>Audit-Trail:
>Unformatted:
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201403112056.s2BKu2xI003867>