diff options
6 files changed, 46 insertions, 24 deletions
diff --git a/databases/cassandra3/Makefile b/databases/cassandra3/Makefile index d2d489f2bb71..5edb66d7c762 100644 --- a/databases/cassandra3/Makefile +++ b/databases/cassandra3/Makefile @@ -1,7 +1,7 @@ # $FreeBSD$ PORTNAME= cassandra -DISTVERSION= 3.11.5 +DISTVERSION= 3.11.6 CATEGORIES= databases java MASTER_SITES= APACHE/cassandra/${PORTVERSION}:apache \ LOCAL/yuri:repo diff --git a/databases/cassandra3/distinfo b/databases/cassandra3/distinfo index de2f24801f8c..db14d9f99f46 100644 --- a/databases/cassandra3/distinfo +++ b/databases/cassandra3/distinfo @@ -1,5 +1,5 @@ -TIMESTAMP = 1576515047 -SHA256 (apache-cassandra-3.11.5-src.tar.gz) = d5363386b6ddbee59cf7dbbb2564a5f23ca236e728eebce12daf83b5ccdd50d8 -SIZE (apache-cassandra-3.11.5-src.tar.gz) = 39798994 +TIMESTAMP = 1582025236 +SHA256 (apache-cassandra-3.11.6-src.tar.gz) = 9d2b976c942f8d845a621183c83b15ce06308c76942986aa7216b6e1c2f3480c +SIZE (apache-cassandra-3.11.6-src.tar.gz) = 35097130 SHA256 (apache-cassandra-3.11.4-repo.tar.gz) = e0ae04f002295b7477e1d73b76c8dab2301d015b273bc086ad7482178dfaed44 SIZE (apache-cassandra-3.11.4-repo.tar.gz) = 44524889 diff --git a/databases/cassandra3/files/patch-build.xml b/databases/cassandra3/files/patch-build.xml index d75350d5939c..48899c46ea88 100644 --- a/databases/cassandra3/files/patch-build.xml +++ b/databases/cassandra3/files/patch-build.xml @@ -1,4 +1,4 @@ ---- build.xml.orig 2019-10-24 16:42:10 UTC +--- build.xml.orig 2020-02-10 22:55:14 UTC +++ build.xml @@ -23,6 +23,7 @@ <property file="build.properties" /> @@ -7,8 +7,8 @@ + <property name="pycmd" value="python"/> <!-- default version and SCM information --> - <property name="base.version" value="3.11.5"/> -@@ -78,14 +79,14 @@ + <property name="base.version" value="3.11.6"/> +@@ -80,14 +81,14 @@ <condition property="version" value="${base.version}"> <isset property="release"/> </condition> @@ -25,7 +25,7 @@ <property name="maven-ant-tasks.url" value="https://repo.maven.apache.org/maven2/org/apache/maven/maven-ant-tasks" /> <!-- details of how and which Maven repository we publish to --> -@@ -244,8 +245,7 @@ +@@ -246,8 +247,7 @@ <artifact:dependencies pathId="wikitext.classpath"> <dependency groupId="com.datastax.wikitext" artifactId="wikitext-core-ant" version="1.3"/> <dependency groupId="org.fusesource.wikitext" artifactId="textile-core" version="1.3"/> @@ -35,7 +35,7 @@ </artifact:dependencies> <taskdef classpathref="wikitext.classpath" resource="wikitexttasks.properties" /> <wikitext-to-html markupLanguage="Textile"> -@@ -258,6 +258,7 @@ +@@ -260,6 +260,7 @@ <target name="gen-doc" depends="maven-ant-tasks-init" description="Generate documentation"> <exec executable="make" osfamily="unix" dir="${doc.dir}"> <arg value="html"/> @@ -43,7 +43,7 @@ </exec> <exec executable="cmd" osfamily="dos" dir="${doc.dir}"> <arg value="/c"/> -@@ -300,10 +301,6 @@ +@@ -302,10 +303,6 @@ description="Initialize Maven ANT Tasks"> <typedef uri="antlib:org.apache.maven.artifact.ant" classpathref="maven-ant-tasks.classpath" /> @@ -54,7 +54,7 @@ <macrodef name="install"> <attribute name="pomFile"/> <attribute name="file"/> -@@ -682,16 +679,14 @@ +@@ -695,16 +692,14 @@ filesetId="build-dependency-jars" cacheDependencyRefs="true" dependencyRefsBuildFile="${build.dir}/build-dependencies.xml"> @@ -73,7 +73,7 @@ </artifact:dependencies> <copy todir="${build.dir.lib}/jars"> <fileset refid="build-dependency-jars"/> -@@ -704,7 +699,7 @@ +@@ -717,7 +712,7 @@ <!-- code coverage tools --> <artifact:dependencies pomRefId="coverage-deps-pom" filesetId="coverage-dependency-jars"> @@ -82,7 +82,7 @@ </artifact:dependencies> <copy todir="${build.dir.lib}/jars"> <fileset refid="coverage-dependency-jars"/> -@@ -725,8 +720,7 @@ +@@ -738,8 +733,7 @@ sourcesFilesetId="test-dependency-sources" cacheDependencyRefs="true" dependencyRefsBuildFile="${build.dir}/test-dependencies.xml"> @@ -92,7 +92,7 @@ </artifact:dependencies> <copy todir="${test.lib}/jars"> <fileset refid="test-dependency-jars"/> -@@ -1021,6 +1015,88 @@ +@@ -1034,6 +1028,88 @@ </jar> </target> @@ -181,7 +181,7 @@ <!-- creates release tarballs --> <target name="artifacts" depends="jar,javadoc,gen-doc" description="Create Cassandra release artifacts"> -@@ -1771,8 +1847,8 @@ +@@ -1776,8 +1852,8 @@ <exec executable="nproc" outputproperty="cores.count" os="Linux,SunOS,Solaris" failifexecutionfails="false"> <arg value="--all"/> </exec> @@ -192,7 +192,7 @@ <arg value="-n"/> <arg value="hw.ncpu"/> </exec> -@@ -1792,6 +1868,11 @@ +@@ -1797,6 +1873,11 @@ <exec executable="sysctl" outputproperty="mem.size" os="Mac,Mac OS X,Darwin" failifexecutionfails="false"> <arg value="-n"/> <arg value="hw.memsize"/> diff --git a/databases/cassandra3/files/patch-conf_cassandra-env.sh b/databases/cassandra3/files/patch-conf_cassandra-env.sh index ebf54baebaa8..a9d76e6bae50 100644 --- a/databases/cassandra3/files/patch-conf_cassandra-env.sh +++ b/databases/cassandra3/files/patch-conf_cassandra-env.sh @@ -1,11 +1,11 @@ ---- conf/cassandra-env.sh.orig 2018-09-07 21:30:15 UTC +--- conf/cassandra-env.sh.orig 2020-02-10 22:55:14 UTC +++ conf/cassandra-env.sh -@@ -122,7 +122,7 @@ case "$jvm" in - esac +@@ -123,7 +123,7 @@ esac - #GC log path has to be defined here because it needs to access CASSANDRA_HOME --JVM_OPTS="$JVM_OPTS -Xloggc:${CASSANDRA_HOME}/logs/gc.log" -+JVM_OPTS="$JVM_OPTS -Xloggc:/var/log/cassandra/gc.log" + # Sets the path where logback and GC logs are written. + if [ "x$CASSANDRA_LOG_DIR" = "x" ] ; then +- CASSANDRA_LOG_DIR="$CASSANDRA_HOME/logs" ++ CASSANDRA_LOG_DIR="/var/log/cassandra" + fi - # Here we create the arguments that will get passed to the jvm when - # starting cassandra. + #GC log path has to be defined here because it needs to access CASSANDRA_HOME diff --git a/databases/cassandra3/files/patch-src_java_org_apache_cassandra_db_commitlog_MemoryMappedSegment.java b/databases/cassandra3/files/patch-src_java_org_apache_cassandra_db_commitlog_MemoryMappedSegment.java new file mode 100644 index 000000000000..f70f7674b3ae --- /dev/null +++ b/databases/cassandra3/files/patch-src_java_org_apache_cassandra_db_commitlog_MemoryMappedSegment.java @@ -0,0 +1,11 @@ +--- src/java/org/apache/cassandra/db/commitlog/MemoryMappedSegment.java.orig 2019-10-24 16:42:10 UTC ++++ src/java/org/apache/cassandra/db/commitlog/MemoryMappedSegment.java +@@ -90,7 +90,7 @@ public class MemoryMappedSegment extends CommitLogSegm + { + throw new FSWriteError(e, getPath()); + } +- NativeLibrary.trySkipCache(fd, startMarker, nextMarker, logFile.getAbsolutePath()); ++// NativeLibrary.trySkipCache(fd, startMarker, nextMarker, logFile.getAbsolutePath()); + } + + @Override diff --git a/databases/cassandra3/files/patch-src_java_org_apache_cassandra_tools_nodetool_Status.java b/databases/cassandra3/files/patch-src_java_org_apache_cassandra_tools_nodetool_Status.java new file mode 100644 index 000000000000..c2a3dcd724e4 --- /dev/null +++ b/databases/cassandra3/files/patch-src_java_org_apache_cassandra_tools_nodetool_Status.java @@ -0,0 +1,11 @@ +--- src/java/org/apache/cassandra/tools/nodetool/Status.java.orig 2019-12-18 11:47:59 UTC ++++ src/java/org/apache/cassandra/tools/nodetool/Status.java +@@ -188,7 +188,7 @@ public class Status extends NodeToolCmd + String addressPlaceholder = String.format("%%-%ds ", maxAddressLength); + buf.append("%s%s "); // status + buf.append(addressPlaceholder); // address +- buf.append("%-9s "); // load ++ buf.append("%-11s "); // load (support up to "xxxx.xxx XiB") + if (!isTokenPerNode) + buf.append("%-11s "); // "Tokens" + if (hasEffectiveOwns) |