Date: Wed, 20 Mar 2019 16:13:05 +0000 (UTC) From: Yuri Victorovich <yuri@FreeBSD.org> To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r496349 - in head/databases/cassandra3: . files Message-ID: <201903201613.x2KGD5DX079347@repo.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: yuri Date: Wed Mar 20 16:13:04 2019 New Revision: 496349 URL: https://svnweb.freebsd.org/changeset/ports/496349 Log: databases/cassandra3: Update 3.11.3 -> 3.11.4 PR: 236128 Submitted by: Angelo Polo <language.devel@gmail.com> (maintainer) Modified: head/databases/cassandra3/Makefile head/databases/cassandra3/distinfo head/databases/cassandra3/files/cassandra.in head/databases/cassandra3/files/patch-bin_cassandra.in.sh head/databases/cassandra3/files/patch-build.xml head/databases/cassandra3/files/patch-conf_cassandra.yaml head/databases/cassandra3/files/patch-doc_Makefile head/databases/cassandra3/files/patch-tools_bin_cassandra.in.sh head/databases/cassandra3/pkg-plist Modified: head/databases/cassandra3/Makefile ============================================================================== --- head/databases/cassandra3/Makefile Wed Mar 20 16:05:42 2019 (r496348) +++ head/databases/cassandra3/Makefile Wed Mar 20 16:13:04 2019 (r496349) @@ -1,7 +1,7 @@ # $FreeBSD$ PORTNAME= cassandra -DISTVERSION= 3.11.3 +DISTVERSION= 3.11.4 CATEGORIES= databases java MASTER_SITES= APACHE/cassandra/${PORTVERSION}:apache \ LOCAL/yuri:repo Modified: head/databases/cassandra3/distinfo ============================================================================== --- head/databases/cassandra3/distinfo Wed Mar 20 16:05:42 2019 (r496348) +++ head/databases/cassandra3/distinfo Wed Mar 20 16:13:04 2019 (r496349) @@ -1,5 +1,5 @@ -TIMESTAMP = 1538922434 -SHA256 (apache-cassandra-3.11.3-src.tar.gz) = f4c7a3627e04ff9505a626334eb113ef6dbe310e8b69b747cc4c488eac8b558f -SIZE (apache-cassandra-3.11.3-src.tar.gz) = 34885851 -SHA256 (apache-cassandra-3.11.3-repo.tar.gz) = da696b7bdc5c36e131bf480e11cae092e88dc65bc3098aa5aa7f01202b6ce584 -SIZE (apache-cassandra-3.11.3-repo.tar.gz) = 44530570 +TIMESTAMP = 1551608918 +SHA256 (apache-cassandra-3.11.4-src.tar.gz) = b01fea1b0a987adcc6078eef1f7e7fc43aacc3b4b0bfa3f29bc8a1cc9ba02cc6 +SIZE (apache-cassandra-3.11.4-src.tar.gz) = 39719274 +SHA256 (apache-cassandra-3.11.4-repo.tar.gz) = e0ae04f002295b7477e1d73b76c8dab2301d015b273bc086ad7482178dfaed44 +SIZE (apache-cassandra-3.11.4-repo.tar.gz) = 44524889 Modified: head/databases/cassandra3/files/cassandra.in ============================================================================== --- head/databases/cassandra3/files/cassandra.in Wed Mar 20 16:05:42 2019 (r496348) +++ head/databases/cassandra3/files/cassandra.in Wed Mar 20 16:13:04 2019 (r496349) @@ -36,6 +36,7 @@ cassandra_prestart() { export JAVA_HOME=%%JAVA_HOME%% install -d -o ${cassandra_user} /var/run/cassandra + install -d -o ${cassandra_user} /var/log/cassandra } run_rc_command "$1" Modified: head/databases/cassandra3/files/patch-bin_cassandra.in.sh ============================================================================== --- head/databases/cassandra3/files/patch-bin_cassandra.in.sh Wed Mar 20 16:05:42 2019 (r496348) +++ head/databases/cassandra3/files/patch-bin_cassandra.in.sh Wed Mar 20 16:13:04 2019 (r496349) @@ -1,4 +1,4 @@ ---- bin/cassandra.in.sh.orig 2018-03-01 13:35:20 UTC +--- bin/cassandra.in.sh.orig 2019-02-02 22:06:43 UTC +++ bin/cassandra.in.sh @@ -26,8 +26,8 @@ fi # This can be the path to a jar file, or a directory containing the @@ -11,7 +11,7 @@ #cassandra_bin="$CASSANDRA_HOME/build/cassandra.jar" # the default location for commitlogs, sstables, and saved caches -@@ -38,7 +38,7 @@ cassandra_storagedir="$CASSANDRA_HOME/da +@@ -38,7 +38,7 @@ cassandra_storagedir="$CASSANDRA_HOME/data" #JAVA_HOME=/usr/local/jdk6 # The java classpath (required) Modified: head/databases/cassandra3/files/patch-build.xml ============================================================================== --- head/databases/cassandra3/files/patch-build.xml Wed Mar 20 16:05:42 2019 (r496348) +++ head/databases/cassandra3/files/patch-build.xml Wed Mar 20 16:13:04 2019 (r496349) @@ -1,4 +1,4 @@ ---- build.xml.orig 2018-10-07 14:44:46 UTC +--- build.xml.orig 2019-02-02 22:06:43 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.3"/> -@@ -75,14 +76,14 @@ + <property name="base.version" value="3.11.4"/> +@@ -77,14 +78,14 @@ <condition property="version" value="${base.version}"> <isset property="release"/> </condition> @@ -25,7 +25,7 @@ <property name="maven-ant-tasks.url" value="http://repo2.maven.org/maven2/org/apache/maven/maven-ant-tasks" /> <!-- details of how and which Maven repository we publish to --> -@@ -244,8 +245,7 @@ +@@ -247,8 +248,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 @@ +@@ -261,6 +261,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 @@ +@@ -303,10 +304,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 @@ +@@ -685,16 +682,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 @@ +@@ -707,7 +702,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 @@ +@@ -728,8 +723,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 @@ +@@ -1024,6 +1018,88 @@ </jar> </target> @@ -181,3 +181,26 @@ <!-- creates release tarballs --> <target name="artifacts" depends="jar,javadoc,gen-doc" description="Create Cassandra release artifacts"> +@@ -1767,8 +1843,8 @@ + <exec executable="nproc" outputproperty="cores.count" os="Linux,SunOS,Solaris" failifexecutionfails="false"> + <arg value="--all"/> + </exec> +- <!-- support for Mac OS X --> +- <exec executable="sysctl" outputproperty="cores.count" os="Mac,Mac OS X,Darwin" failifexecutionfails="false"> ++ <!-- support for Mac OS X and FreeBSD --> ++ <exec executable="sysctl" outputproperty="cores.count" os="Mac,Mac OS X,Darwin,FreeBSD" failifexecutionfails="false"> + <arg value="-n"/> + <arg value="hw.ncpu"/> + </exec> +@@ -1788,6 +1864,11 @@ + <exec executable="sysctl" outputproperty="mem.size" os="Mac,Mac OS X,Darwin" failifexecutionfails="false"> + <arg value="-n"/> + <arg value="hw.memsize"/> ++ </exec> ++ <!-- support for FreeBSD --> ++ <exec executable="sysctl" outputproperty="mem.size" os="FreeBSD" failifexecutionfails="false"> ++ <arg value="-n"/> ++ <arg value="hw.physmem"/> + </exec> + <echo message="Mem size : ${mem.size}"/> + </target> Modified: head/databases/cassandra3/files/patch-conf_cassandra.yaml ============================================================================== --- head/databases/cassandra3/files/patch-conf_cassandra.yaml Wed Mar 20 16:05:42 2019 (r496348) +++ head/databases/cassandra3/files/patch-conf_cassandra.yaml Wed Mar 20 16:13:04 2019 (r496349) @@ -1,4 +1,4 @@ ---- conf/cassandra.yaml.orig 2018-02-14 20:43:59 UTC +--- conf/cassandra.yaml.orig 2019-02-02 22:09:01 UTC +++ conf/cassandra.yaml @@ -70,7 +70,7 @@ max_hints_delivery_threads: 2 @@ -9,7 +9,7 @@ # How often hints should be flushed from the internal buffers to disk. # Will *not* trigger fsync. -@@ -187,13 +187,13 @@ partitioner: org.apache.cassandra.dht.Mu +@@ -187,13 +187,13 @@ partitioner: org.apache.cassandra.dht.Murmur3Partition # will spread data evenly across them, subject to the granularity of # the configured compaction strategy. # If not set, the default directory is $CASSANDRA_HOME/data/data. Modified: head/databases/cassandra3/files/patch-doc_Makefile ============================================================================== --- head/databases/cassandra3/files/patch-doc_Makefile Wed Mar 20 16:05:42 2019 (r496348) +++ head/databases/cassandra3/files/patch-doc_Makefile Wed Mar 20 16:13:04 2019 (r496349) @@ -1,4 +1,4 @@ ---- doc/Makefile.orig 2018-02-22 15:43:58 UTC +--- doc/Makefile.orig 2019-02-02 22:06:43 UTC +++ doc/Makefile @@ -3,7 +3,7 @@ @@ -9,7 +9,7 @@ PAPER = BUILDDIR = build -@@ -17,7 +17,7 @@ I18NSPHINXOPTS = $(PAPEROPT_$(PAPER)) $ +@@ -17,7 +17,7 @@ I18NSPHINXOPTS = $(PAPEROPT_$(PAPER)) $(SPHINXOPTS) s YAML_DOC_INPUT=../conf/cassandra.yaml YAML_DOC_OUTPUT=source/configuration/cassandra_config_file.rst Modified: head/databases/cassandra3/files/patch-tools_bin_cassandra.in.sh ============================================================================== --- head/databases/cassandra3/files/patch-tools_bin_cassandra.in.sh Wed Mar 20 16:05:42 2019 (r496348) +++ head/databases/cassandra3/files/patch-tools_bin_cassandra.in.sh Wed Mar 20 16:13:04 2019 (r496349) @@ -1,4 +1,4 @@ ---- tools/bin/cassandra.in.sh.orig 2018-03-01 14:02:52 UTC +--- tools/bin/cassandra.in.sh.orig 2019-02-02 22:06:43 UTC +++ tools/bin/cassandra.in.sh @@ -26,9 +26,9 @@ fi # This can be the path to a jar file, or a directory containing the @@ -13,7 +13,7 @@ #cassandra_bin="$cassandra_home/build/cassandra.jar" # the default location for commitlogs, sstables, and saved caches -@@ -39,7 +39,7 @@ cassandra_storagedir="$CASSANDRA_HOME/da +@@ -39,7 +39,7 @@ cassandra_storagedir="$CASSANDRA_HOME/data" #JAVA_HOME=/usr/local/jdk6 # The java classpath (required) Modified: head/databases/cassandra3/pkg-plist ============================================================================== --- head/databases/cassandra3/pkg-plist Wed Mar 20 16:05:42 2019 (r496348) +++ head/databases/cassandra3/pkg-plist Wed Mar 20 16:13:04 2019 (r496349) @@ -121,6 +121,7 @@ %%DATADIR%%/LICENSE.txt %%DATADIR%%/NEWS.txt %%DATADIR%%/NOTICE.txt +%%DATADIR%%/pylib/cassandra-cqlsh-tests.sh %%DATADIR%%/pylib/cqlshlib/__init__.py %%DATADIR%%/pylib/cqlshlib/copyutil.py %%DATADIR%%/pylib/cqlshlib/cql3handling.py @@ -131,6 +132,7 @@ %%DATADIR%%/pylib/cqlshlib/helptopics.py %%DATADIR%%/pylib/cqlshlib/pylexotron.py %%DATADIR%%/pylib/cqlshlib/saferscanner.py +%%DATADIR%%/pylib/cqlshlib/setup.cfg %%DATADIR%%/pylib/cqlshlib/sslhandling.py %%DATADIR%%/pylib/cqlshlib/test/__init__.py %%DATADIR%%/pylib/cqlshlib/test/ansi_colors.py @@ -148,6 +150,7 @@ %%DATADIR%%/pylib/cqlshlib/tracing.py %%DATADIR%%/pylib/cqlshlib/util.py %%DATADIR%%/pylib/cqlshlib/wcwidth.py +%%DATADIR%%/pylib/requirements.txt %%DATADIR%%/pylib/setup.py %%DATADIR%%/tools/bin/cassandra-stress %%DATADIR%%/tools/bin/cassandra-stressd
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201903201613.x2KGD5DX079347>