git: 0c267ac14349 - main - databases/cassandra3: Update to 3.11.14

Go to: [ bottom of page ] [ top of archives ] [ this month ]
From: Fernando Apesteguía <fernape_at_FreeBSD.org>
Date: Wed, 11 Jan 2023 17:40:14 UTC
The branch main has been updated by fernape:

URL: https://cgit.FreeBSD.org/ports/commit/?id=0c267ac14349fb0250f5a2fd8fd79e093b3626f6

commit 0c267ac14349fb0250f5a2fd8fd79e093b3626f6
Author:     Angelo Polo <language.devel@gmail.com>
AuthorDate: 2023-01-10 07:10:09 +0000
Commit:     Fernando Apesteguía <fernape@FreeBSD.org>
CommitDate: 2023-01-11 17:36:02 +0000

    databases/cassandra3: Update to 3.11.14
    
    ChangeLog:
    https://gitbox.apache.org/repos/asf?p=cassandra.git;a=blob_plain;f=CHANGES.txt;hb=refs/tags/cassandra-3.11.14
    
    PR:             267624
    Reported by:    language.devel@gmail.com
    MFH:            2023Q1 (security fixes)
    Relnotes:
    Security:       CVE-2022-42003
                    CVE-2022-4200
                    CVE-2022-25857
                    CVE-2019-2684
                    CVE-2020-7238
                    CVE-2022-2482
                    CVE-2021-44521
                    CVE-2015-0886
---
 databases/cassandra3/Makefile                      | 12 ++++----
 databases/cassandra3/distinfo                      | 10 +++----
 databases/cassandra3/files/patch-build.xml         | 35 ++++++----------------
 .../cassandra3/files/patch-conf_cassandra.yaml     |  6 ++--
 databases/cassandra3/files/patch-doc_Makefile      | 11 -------
 databases/cassandra3/pkg-plist                     | 21 +++++++------
 6 files changed, 32 insertions(+), 63 deletions(-)

diff --git a/databases/cassandra3/Makefile b/databases/cassandra3/Makefile
index cac243c551d4..66de34975586 100644
--- a/databases/cassandra3/Makefile
+++ b/databases/cassandra3/Makefile
@@ -1,8 +1,7 @@
 PORTNAME=	cassandra
-DISTVERSION=	3.11.11
-PORTREVISION=	1
+DISTVERSION=	3.11.14
 CATEGORIES=	databases java
-MASTER_SITES=	LOCAL/nc:repo
+MASTER_SITES=	LOCAL/fernape:repo
 PKGNAMESUFFIX=	3
 DISTFILES=	apache-${PORTNAME}-${DISTVERSION}-repo.tar.gz:repo
 
@@ -29,7 +28,7 @@ USE_RC_SUBR=	cassandra
 
 USE_GITHUB=	yes
 GH_ACCOUNT=	polo-language
-GH_TAGNAME=	0150ddc
+GH_TAGNAME=	c29ba30
 
 TEST_TARGET=	test
 
@@ -82,16 +81,15 @@ ANT_OPTS_LOCAL=	${ANT_OPTS} -Xmx512m
 
 post-patch:
 	@${CHMOD} ug+x ${WRKSRC}/pylib/cassandra-cqlsh-tests.sh
-	@${REINPLACE_CMD} -e 's|$${user.home}/.m2/repository/|$${localm2}/|g' ${WRKSRC}/.build/build-resolver.xml
 
 do-build:
 	@${DO_NADA} # Do nothing: Prevent USE_ANT from running a default build target.
 
 do-build-DOCS-on:
-	@cd ${WRKSRC} && ANT_OPTS="${ANT_OPTS_LOCAL}" ${ANT} -Dmaven.repo.local=${REPO_DIR} -Dlocalm2=${REPO_DIR} -Dpycmd=${PYTHON_CMD} freebsd-stage-doc
+	@cd ${WRKSRC} && ANT_OPTS="${ANT_OPTS_LOCAL}" ${ANT} -Dmaven.repo.local=${REPO_DIR} -Dlocal.repository=${REPO_DIR} -Dpycmd=${PYTHON_CMD} freebsd-stage-doc
 
 do-build-DOCS-off:
-	@cd ${WRKSRC} && ANT_OPTS="${ANT_OPTS} -Xmx512m" ${ANT} -Dmaven.repo.local=${REPO_DIR} -Dlocalm2=${REPO_DIR} freebsd-stage
+	@cd ${WRKSRC} && ANT_OPTS="${ANT_OPTS} -Xmx512m" ${ANT} -Dmaven.repo.local=${REPO_DIR} -Dlocal.repository=${REPO_DIR} freebsd-stage
 
 post-build:
 .for f in ${SCRIPT_FILES}
diff --git a/databases/cassandra3/distinfo b/databases/cassandra3/distinfo
index bb1acd7b188a..ab256d0ea2bd 100644
--- a/databases/cassandra3/distinfo
+++ b/databases/cassandra3/distinfo
@@ -1,5 +1,5 @@
-TIMESTAMP = 1650466481
-SHA256 (apache-cassandra-3.11.11-repo.tar.gz) = 0501ab9fa4d5baecaa29153a78044ef2341feda5ab748b8adb72a6efda2a240b
-SIZE (apache-cassandra-3.11.11-repo.tar.gz) = 57546653
-SHA256 (polo-language-cassandra-3.11.11-0150ddc_GH0.tar.gz) = ff3e305bbe317af11674862487753875bb9f26e7550cb796cb995e640a2a9511
-SIZE (polo-language-cassandra-3.11.11-0150ddc_GH0.tar.gz) = 12427444
+TIMESTAMP = 1667648919
+SHA256 (apache-cassandra-3.11.14-repo.tar.gz) = 6390ad0eb91156c37d738f5fe96695c5b3d5c3603ab24c8e65e443cbd916b1d2
+SIZE (apache-cassandra-3.11.14-repo.tar.gz) = 59360725
+SHA256 (polo-language-cassandra-3.11.14-c29ba30_GH0.tar.gz) = 03c501b62952256e28ef19c85c73fe371cd1a6c40cc7f84dae076152ab3130ef
+SIZE (polo-language-cassandra-3.11.14-c29ba30_GH0.tar.gz) = 16297535
diff --git a/databases/cassandra3/files/patch-build.xml b/databases/cassandra3/files/patch-build.xml
index 2d8db414ee5c..6b406a5d7b31 100644
--- a/databases/cassandra3/files/patch-build.xml
+++ b/databases/cassandra3/files/patch-build.xml
@@ -1,6 +1,6 @@
---- build.xml.orig	2022-01-15 09:03:19 UTC
+--- build.xml.orig	2022-10-28 19:54:09 UTC
 +++ build.xml
-@@ -20,6 +20,8 @@
+@@ -31,6 +31,8 @@
      <property file="build.properties" />
      <property file="build.properties.default" />
      <property name="debuglevel" value="source,lines,vars"/>
@@ -8,8 +8,8 @@
 +    <property name="rat.skip" value="true"/>
  
      <!-- default version and SCM information -->
-     <property name="base.version" value="3.11.11"/>
-@@ -74,14 +76,14 @@
+     <property name="base.version" value="3.11.14"/>
+@@ -85,7 +87,7 @@
      <condition property="version" value="${base.version}">
        <isset property="release"/>
      </condition>
@@ -18,32 +18,15 @@
      <property name="version.properties.dir"
                value="${build.src.resources}/org/apache/cassandra/config/" />
      <property name="final.name" value="${ant.project.name}-${version}"/>
- 
-     <!-- details of what version of Maven ANT Tasks to fetch -->
-     <property name="maven-ant-tasks.version" value="2.1.3" />
--    <property name="maven-ant-tasks.local" value="${user.home}/.m2/repository/org/apache/maven/maven-ant-tasks"/>
-+    <property name="maven-ant-tasks.local" value="${localm2}/org/apache/maven/maven-ant-tasks"/>
-     <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 -->
-@@ -253,6 +255,7 @@
-     <target name="gen-doc" description="Generate documentation" depends="jar" unless="ant.gen-doc.skip">
+@@ -272,6 +274,7 @@
+     <target name="gen-doc" description="Generate documentation" depends="gen-asciidoc,generate-cql-html" unless="ant.gen-doc.skip">
          <exec executable="make" osfamily="unix" dir="${doc.dir}">
              <arg value="html"/>
 +            <arg value="PYTHON_CMD=${pycmd}"/>
          </exec>
-         <exec executable="cmd" osfamily="dos" dir="${doc.dir}">
-             <arg value="/c"/>
-@@ -704,7 +707,7 @@
-     <target name="build" depends="resolver-retrieve-build,build-project" description="Compile Cassandra classes"/>
-     <target name="codecoverage" depends="jacoco-run,jacoco-report" description="Create code coverage report"/>
+     </target>
  
--    <target depends="init,gen-cql3-grammar,generate-cql-html,generate-jflex-java,rat-check"
-+    <target depends="init,gen-cql3-grammar,generate-cql-html,generate-jflex-java"
-             name="build-project">
-         <echo message="${ant.project.name}: ${ant.file}"/>
-         <!-- Order matters! -->
-@@ -894,6 +897,88 @@
+@@ -924,6 +927,88 @@
        </jar>
      </target>
  
@@ -130,5 +113,5 @@
 +    </target>
 +    
      <!-- creates release tarballs -->
-     <target name="artifacts" depends="jar,gen-doc,build-test,stress-build-test,sources-jar,javadoc-jar"
+     <target name="artifacts" depends="jar,gen-doc,build-test,stress-build-test,sources-jar"
              description="Create Cassandra release artifacts">
diff --git a/databases/cassandra3/files/patch-conf_cassandra.yaml b/databases/cassandra3/files/patch-conf_cassandra.yaml
index 15f8aac7edee..a38a0d3fbf95 100644
--- a/databases/cassandra3/files/patch-conf_cassandra.yaml
+++ b/databases/cassandra3/files/patch-conf_cassandra.yaml
@@ -1,4 +1,4 @@
---- conf/cassandra.yaml.orig	2021-07-01 14:37:50 UTC
+--- conf/cassandra.yaml.orig	2022-10-28 19:54:09 UTC
 +++ conf/cassandra.yaml
 @@ -71,7 +71,7 @@ max_hints_delivery_threads: 2
  
@@ -64,5 +64,5 @@
 -# saved_caches_directory: /var/lib/cassandra/saved_caches
 +saved_caches_directory: /var/db/cassandra/saved_caches
  
- # commitlog_sync may be either "periodic" or "batch." 
- # 
+ # Number of seconds the server will wait for each cache (row, key, etc ...) to load while starting
+ # the Cassandra process. Setting this to a negative value is equivalent to disabling all cache loading on startup
diff --git a/databases/cassandra3/files/patch-doc_Makefile b/databases/cassandra3/files/patch-doc_Makefile
deleted file mode 100644
index 7f83c34a50e4..000000000000
--- a/databases/cassandra3/files/patch-doc_Makefile
+++ /dev/null
@@ -1,11 +0,0 @@
---- doc/Makefile.orig	2020-10-27 14:38:56 UTC
-+++ doc/Makefile
-@@ -17,7 +17,7 @@ I18NSPHINXOPTS  = $(PAPEROPT_$(PAPER)) $(SPHINXOPTS) s
- YAML_DOC_INPUT=../conf/cassandra.yaml
- YAML_DOC_OUTPUT=source/configuration/cassandra_config_file.rst
- 
--MAKE_CASSANDRA_YAML = python convert_yaml_to_rst.py $(YAML_DOC_INPUT) $(YAML_DOC_OUTPUT)
-+MAKE_CASSANDRA_YAML = ${PYTHON_CMD} convert_yaml_to_rst.py $(YAML_DOC_INPUT) $(YAML_DOC_OUTPUT)
- 
- WEB_SITE_PRESENCE_FILE='source/.build_for_website'
- 
diff --git a/databases/cassandra3/pkg-plist b/databases/cassandra3/pkg-plist
index d7df43679c4a..580b15fa5b78 100644
--- a/databases/cassandra3/pkg-plist
+++ b/databases/cassandra3/pkg-plist
@@ -30,27 +30,26 @@
 %%DATADIR%%/lib/disruptor-3.0.1.jar
 %%DATADIR%%/lib/ecj-4.4.2.jar
 %%DATADIR%%/lib/futures-2.1.6-py2.py3-none-any.zip
-%%DATADIR%%/lib/geomet-0.1.0.zip
 %%DATADIR%%/lib/guava-18.0.jar
 %%DATADIR%%/lib/HdrHistogram-2.1.9.jar
 %%DATADIR%%/lib/high-scale-lib-1.0.6.jar
 %%DATADIR%%/lib/hppc-0.5.4.jar
-%%DATADIR%%/lib/jackson-annotations-2.9.10.jar
-%%DATADIR%%/lib/jackson-core-2.9.10.jar
-%%DATADIR%%/lib/jackson-databind-2.9.10.8.jar
+%%DATADIR%%/lib/jackson-annotations-2.13.2.jar
+%%DATADIR%%/lib/jackson-core-2.13.2.jar
+%%DATADIR%%/lib/jackson-databind-2.13.2.2.jar
 %%DATADIR%%/lib/jamm-0.3.0.jar
 %%DATADIR%%/lib/javax.inject-1.jar
-%%DATADIR%%/lib/jbcrypt-0.3m.jar
-%%DATADIR%%/lib/jcl-over-slf4j-1.7.7.jar
+%%DATADIR%%/lib/jbcrypt-0.4.jar
+%%DATADIR%%/lib/jcl-over-slf4j-1.7.25.jar
 %%DATADIR%%/lib/jctools-core-1.2.1.jar
 %%DATADIR%%/lib/jflex-1.6.0.jar
 %%DATADIR%%/lib/jna-4.2.2.jar
 %%DATADIR%%/lib/joda-time-2.4.jar
 %%DATADIR%%/lib/json-simple-1.1.jar
 %%DATADIR%%/lib/libthrift-0.9.2.jar
-%%DATADIR%%/lib/log4j-over-slf4j-1.7.7.jar
-%%DATADIR%%/lib/logback-classic-1.1.3.jar
-%%DATADIR%%/lib/logback-core-1.1.3.jar
+%%DATADIR%%/lib/log4j-over-slf4j-1.7.25.jar
+%%DATADIR%%/lib/logback-classic-1.2.9.jar
+%%DATADIR%%/lib/logback-core-1.2.9.jar
 %%DATADIR%%/lib/lz4-1.3.0.jar
 %%DATADIR%%/lib/metrics-core-3.1.5.jar
 %%DATADIR%%/lib/metrics-jvm-3.1.5.jar
@@ -61,8 +60,8 @@
 %%DATADIR%%/lib/reporter-config-base-3.0.3.jar
 %%DATADIR%%/lib/reporter-config3-3.0.3.jar
 %%DATADIR%%/lib/six-1.16.0-py2.py3-none-any.zip
-%%DATADIR%%/lib/slf4j-api-1.7.7.jar
-%%DATADIR%%/lib/snakeyaml-1.11.jar
+%%DATADIR%%/lib/slf4j-api-1.7.25.jar
+%%DATADIR%%/lib/snakeyaml-1.26.jar
 %%DATADIR%%/lib/snappy-java.jar
 %%DATADIR%%/lib/snowball-stemmer-1.3.0.581.1.jar
 %%DATADIR%%/lib/ST4-4.0.8.jar