diff options
Diffstat (limited to 'databases/cassandra4/files')
7 files changed, 46 insertions, 39 deletions
diff --git a/databases/cassandra4/files/patch-build.xml b/databases/cassandra4/files/patch-build.xml index d93b8fb720c1..762fffca3ec4 100644 --- a/databases/cassandra4/files/patch-build.xml +++ b/databases/cassandra4/files/patch-build.xml @@ -1,4 +1,4 @@ ---- build.xml.orig 2020-07-17 21:24:30 UTC +--- build.xml.orig 2020-08-28 13:55:55 UTC +++ build.xml @@ -23,6 +23,7 @@ <property file="build.properties" /> @@ -7,7 +7,7 @@ + <property name="pycmd" value="python"/> <!-- default version and SCM information --> - <property name="base.version" value="4.0-beta1"/> + <property name="base.version" value="4.0-beta2"/> @@ -74,14 +75,14 @@ <condition property="version" value="${base.version}"> <isset property="release"/> @@ -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 --> -@@ -246,7 +247,7 @@ +@@ -271,7 +272,7 @@ </path> <path id="cassandra.classpath.test"> <file file="${build.dir}/${final.name}.jar"/> <!-- we need the jar for tests and benchmarks (multi-version jar) --> @@ -34,7 +34,7 @@ <include name="**/*.jar" /> <exclude name="**/*-sources.jar"/> <exclude name="**/ant-*.jar"/> -@@ -391,8 +392,7 @@ +@@ -416,8 +417,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"/> @@ -44,7 +44,7 @@ </artifact:dependencies> <taskdef classpathref="wikitext.classpath" resource="wikitexttasks.properties" /> <wikitext-to-html markupLanguage="Textile"> -@@ -405,6 +405,8 @@ +@@ -430,6 +430,8 @@ <target name="gen-doc" depends="maven-ant-tasks-init" description="Generate documentation" unless="ant.gen-doc.skip"> <exec executable="make" osfamily="unix" dir="${doc.dir}"> <arg value="html"/> @@ -53,7 +53,7 @@ </exec> <exec executable="cmd" osfamily="dos" dir="${doc.dir}"> <arg value="/c"/> -@@ -447,10 +449,6 @@ +@@ -472,10 +474,6 @@ description="Initialize Maven ANT Tasks"> <typedef uri="antlib:org.apache.maven.artifact.ant" classpathref="maven-ant-tasks.classpath" /> @@ -64,7 +64,7 @@ <macrodef name="install"> <attribute name="pomFile"/> <attribute name="file"/> -@@ -865,16 +863,14 @@ +@@ -889,16 +887,14 @@ filesetId="build-dependency-jars" cacheDependencyRefs="true" dependencyRefsBuildFile="${build.dir}/build-dependencies.xml"> @@ -83,7 +83,7 @@ </artifact:dependencies> <copy todir="${build.dir.lib}/jars"> <fileset refid="build-dependency-jars"/> -@@ -887,7 +883,7 @@ +@@ -911,7 +907,7 @@ <!-- code coverage tools --> <artifact:dependencies pomRefId="coverage-deps-pom" filesetId="coverage-dependency-jars"> @@ -92,7 +92,7 @@ </artifact:dependencies> <copy todir="${build.dir.lib}/jars"> <fileset refid="coverage-dependency-jars"/> -@@ -916,8 +912,7 @@ +@@ -940,8 +936,7 @@ sourcesFilesetId="test-dependency-sources" cacheDependencyRefs="true" dependencyRefsBuildFile="${build.dir}/test-dependencies.xml"> @@ -102,7 +102,7 @@ </artifact:dependencies> <copy todir="${test.lib}/jars"> <fileset refid="test-dependency-jars"/> -@@ -1227,6 +1222,87 @@ +@@ -1251,6 +1246,87 @@ </copy> </target> @@ -190,7 +190,7 @@ <!-- creates release tarballs --> <target name="artifacts" depends="_artifacts-init" description="Create Cassandra release artifacts"> -@@ -1347,6 +1423,7 @@ +@@ -1371,6 +1447,7 @@ <target name="_build-test"> <javac fork="true" @@ -198,7 +198,7 @@ compiler="modern" debug="true" debuglevel="${debuglevel}" -@@ -1938,8 +2015,8 @@ +@@ -1960,8 +2037,8 @@ <exec executable="nproc" outputproperty="cores.count" os="Linux,SunOS,Solaris" failifexecutionfails="false"> <arg value="--all"/> </exec> @@ -209,7 +209,7 @@ <arg value="-n"/> <arg value="hw.ncpu"/> </exec> -@@ -1959,6 +2036,11 @@ +@@ -1981,6 +2058,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/cassandra4/files/patch-doc_gen-nodetool-docs.py b/databases/cassandra4/files/patch-doc_gen-nodetool-docs.py deleted file mode 100644 index 4a07e5d17672..000000000000 --- a/databases/cassandra4/files/patch-doc_gen-nodetool-docs.py +++ /dev/null @@ -1,20 +0,0 @@ ---- doc/gen-nodetool-docs.py.orig 2020-04-10 22:29:25 UTC -+++ doc/gen-nodetool-docs.py -@@ -57,7 +57,7 @@ def create_rst(command): - cmdName = command.group(0).strip() - cmdFilename = outdir + "/" + cmdName + ".txt" - rstFilename = outdir + "/" + cmdName + ".rst" -- with open(cmdFilename, "w+") as cmdFile: -+ with open(cmdFilename, "w+b") as cmdFile: - proc = Popen([nodetool, "help", cmdName], stdin=PIPE, stdout=PIPE) - (out, err) = proc.communicate() - cmdFile.write(out) -@@ -76,7 +76,7 @@ with open(outdir + "/nodetool.rst", "w+") as output: - output.write(command) - - # create the command usage pages --with open(helpfilename, "rw+") as helpfile: -+with open(helpfilename, "r+") as helpfile: - for commandLine in helpfile: - command = command_re.match(commandLine) - create_rst(command) diff --git a/databases/cassandra4/files/patch-doc_source___templates_indexcontent.html b/databases/cassandra4/files/patch-doc_source___templates_indexcontent.html new file mode 100644 index 000000000000..98f93b30a521 --- /dev/null +++ b/databases/cassandra4/files/patch-doc_source___templates_indexcontent.html @@ -0,0 +1,17 @@ +--- doc/source/_templates/indexcontent.html.orig 2020-08-28 13:55:55 UTC ++++ doc/source/_templates/indexcontent.html +@@ -1,5 +1,12 @@ +-{% extends "defindex.html" %} +-{% block tables %} ++{% extends "layout.html" %} ++{%- block htmltitle -%} ++<title>{{ html_title }}</title> ++{%- endblock -%} ++{% block body %} ++ <h1>{{ docstitle|e }}</h1> ++ <p> ++ {% trans %}Welcome! This is the documentation for Apache Cassandra {{ version }}.{% endtrans %} ++ </p> + <div id="wipwarning">This documentation is a work-in-progress. + <a href="{{ pathto("bugs") }}">Contributions</a> are welcome.</div> + diff --git a/databases/cassandra4/files/patch-doc_source___util_cql.py b/databases/cassandra4/files/patch-doc_source___util_cql.py new file mode 100644 index 000000000000..33bb6108a90a --- /dev/null +++ b/databases/cassandra4/files/patch-doc_source___util_cql.py @@ -0,0 +1,10 @@ +--- doc/source/_util/cql.py.orig 2020-10-03 15:05:17 UTC ++++ doc/source/_util/cql.py +@@ -26,7 +26,6 @@ from pygments.lexer import Lexer, RegexLexer, do_inser + from pygments.token import Punctuation, Whitespace, Error, \ + Text, Comment, Operator, Keyword, Name, String, Number, Generic, Literal + from pygments.lexers import get_lexer_by_name, ClassNotFound +-from pygments.util import iteritems + + __all__ = [ 'CQLLexer' ] + diff --git a/databases/cassandra4/files/patch-src_java_org_apache_cassandra_config_Config.java b/databases/cassandra4/files/patch-src_java_org_apache_cassandra_config_Config.java index 371b489d73ad..7983231aeb11 100644 --- a/databases/cassandra4/files/patch-src_java_org_apache_cassandra_config_Config.java +++ b/databases/cassandra4/files/patch-src_java_org_apache_cassandra_config_Config.java @@ -1,6 +1,6 @@ ---- src/java/org/apache/cassandra/config/Config.java.orig 2020-01-30 17:34:32 UTC +--- src/java/org/apache/cassandra/config/Config.java.orig 2020-08-28 13:55:55 UTC +++ src/java/org/apache/cassandra/config/Config.java -@@ -289,7 +289,7 @@ public class Config +@@ -290,7 +290,7 @@ public class Config public volatile int key_cache_save_period = 14400; public volatile int key_cache_keys_to_save = Integer.MAX_VALUE; diff --git a/databases/cassandra4/files/patch-src_java_org_apache_cassandra_service_StartupChecks.java b/databases/cassandra4/files/patch-src_java_org_apache_cassandra_service_StartupChecks.java index d0913d5eaac1..c562d9011acd 100644 --- a/databases/cassandra4/files/patch-src_java_org_apache_cassandra_service_StartupChecks.java +++ b/databases/cassandra4/files/patch-src_java_org_apache_cassandra_service_StartupChecks.java @@ -1,6 +1,6 @@ ---- src/java/org/apache/cassandra/service/StartupChecks.java.orig 2020-07-17 21:24:30 UTC +--- src/java/org/apache/cassandra/service/StartupChecks.java.orig 2020-08-28 13:55:56 UTC +++ src/java/org/apache/cassandra/service/StartupChecks.java -@@ -276,7 +276,14 @@ public class StartupChecks +@@ -281,7 +281,14 @@ public class StartupChecks { public void execute() { diff --git a/databases/cassandra4/files/patch-src_java_org_apache_cassandra_utils_NativeLibrary.java b/databases/cassandra4/files/patch-src_java_org_apache_cassandra_utils_NativeLibrary.java index ae94061399e2..c9ff8e59e786 100644 --- a/databases/cassandra4/files/patch-src_java_org_apache_cassandra_utils_NativeLibrary.java +++ b/databases/cassandra4/files/patch-src_java_org_apache_cassandra_utils_NativeLibrary.java @@ -1,6 +1,6 @@ ---- src/java/org/apache/cassandra/utils/NativeLibrary.java.orig 2020-01-30 17:34:32 UTC +--- src/java/org/apache/cassandra/utils/NativeLibrary.java.orig 2020-08-28 13:55:56 UTC +++ src/java/org/apache/cassandra/utils/NativeLibrary.java -@@ -141,7 +141,10 @@ public final class NativeLibrary +@@ -143,7 +143,10 @@ public final class NativeLibrary else if (osName.contains("windows")) return WINDOWS; |