git: 70cc8bbf89e0 - main - databases/cassandra3: Update to 3.11.11

Go to: [ bottom of page ] [ top of archives ] [ this month ]
From: Neel Chauhan <nc_at_FreeBSD.org>
Date: Tue, 18 Jan 2022 20:00:47 UTC
The branch main has been updated by nc:

URL: https://cgit.FreeBSD.org/ports/commit/?id=70cc8bbf89e0cd3b4f025ce4a631836aefc73d43

commit 70cc8bbf89e0cd3b4f025ce4a631836aefc73d43
Author:     Angelo Polo <language.devel@gmail.com>
AuthorDate: 2022-01-18 19:59:29 +0000
Commit:     Neel Chauhan <nc@FreeBSD.org>
CommitDate: 2022-01-18 20:01:00 +0000

    databases/cassandra3: Update to 3.11.11
    
    PR:     261220
---
 databases/cassandra3/Makefile                      |  11 ++-
 databases/cassandra3/distinfo                      |  10 +-
 .../files/patch-.build_build-resolver.xml          |  54 ++++++++++
 databases/cassandra3/files/patch-build.xml         | 109 ++-------------------
 .../cassandra3/files/patch-conf_cassandra.yaml     |  12 +--
 .../patch-doc_source___templates_indexcontent.html |  17 ----
 .../files/patch-doc_source___util_cql.py           |  10 --
 .../files/patch-pylib_cassandra-cqlsh-tests.sh     |  37 ++++---
 .../cassandra3/files/patch-pylib_requirements.txt  |  32 ++++++
 ...org_apache_cassandra_tools_nodetool_Status.java |   4 +-
 databases/cassandra3/pkg-plist                     |  64 ++----------
 11 files changed, 149 insertions(+), 211 deletions(-)

diff --git a/databases/cassandra3/Makefile b/databases/cassandra3/Makefile
index 83ba6013e473..b5f49d0d0350 100644
--- a/databases/cassandra3/Makefile
+++ b/databases/cassandra3/Makefile
@@ -1,5 +1,5 @@
 PORTNAME=	cassandra
-DISTVERSION=	3.11.10
+DISTVERSION=	3.11.11
 CATEGORIES=	databases java
 MASTER_SITES=	LOCAL/nc:repo
 PKGNAMESUFFIX=	3
@@ -27,7 +27,7 @@ USE_RC_SUBR=	cassandra
 
 USE_GITHUB=	yes
 GH_ACCOUNT=	polo-language
-GH_TAGNAME=	62fe1f7
+GH_TAGNAME=	84496b0
 
 TEST_TARGET=	test
 
@@ -76,14 +76,17 @@ SCRIPT_FILES=	cassandra \
 		sstableutil \
 		sstableverify
 
+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} -Xmx512m" ${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} -Dlocalm2=${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
@@ -134,7 +137,7 @@ do-test:
 	# A bare 'python' must be on PATH for test to succeed.
 	@cd ${WRKSRC} && ${MV} bin/cassandra.in.sh bin/cassandra.in.sh.patched
 	@cd ${WRKSRC} && ${MV} bin/cassandra.in.sh.orig bin/cassandra.in.sh
-	@cd ${WRKSRC} && pylib/cassandra-cqlsh-tests.sh ${WRKSRC} python3 ${JAVA_HOME} ${REPO_DIR} ${PYTHON_CMD}
+	@cd ${WRKSRC} && ANT_OPTS="${ANT_OPTS_LOCAL}" ANT_CMD="${ANT}" pylib/cassandra-cqlsh-tests.sh ${WRKSRC} ${JAVA_HOME} ${REPO_DIR} ${PYTHON_CMD} ${REPO_DIR}
 	@cd ${WRKSRC} && ${MV} bin/cassandra.in.sh bin/cassandra.in.sh.orig
 	@cd ${WRKSRC} && ${MV} bin/cassandra.in.sh.patched bin/cassandra.in.sh
 
diff --git a/databases/cassandra3/distinfo b/databases/cassandra3/distinfo
index 7d3826881e73..265e1313bc61 100644
--- a/databases/cassandra3/distinfo
+++ b/databases/cassandra3/distinfo
@@ -1,5 +1,5 @@
-TIMESTAMP = 1612608662
-SHA256 (apache-cassandra-3.11.10-repo.tar.gz) = 09e154d4db06007c58193be4869346263e16c4eeb5bc42d9fb5f5165ce5ad4dc
-SIZE (apache-cassandra-3.11.10-repo.tar.gz) = 52449193
-SHA256 (polo-language-cassandra-3.11.10-62fe1f7_GH0.tar.gz) = 7c9624aa1287007cc858cb95e96d2e8a88ba7997332a8093ed90688aff4789f6
-SIZE (polo-language-cassandra-3.11.10-62fe1f7_GH0.tar.gz) = 35636492
+TIMESTAMP = 1642239227
+SHA256 (apache-cassandra-3.11.11-repo.tar.gz) = 585ae7ce7bc1e2edc534c5c36f982c6e712d5e9716e1c6376638a16306f30d7d
+SIZE (apache-cassandra-3.11.11-repo.tar.gz) = 55148770
+SHA256 (polo-language-cassandra-3.11.11-84496b0_GH0.tar.gz) = 4271a3336cfd745674f8bf3ca7ebd4b5cf9be2570aa1e69821d2cb370e018f07
+SIZE (polo-language-cassandra-3.11.11-84496b0_GH0.tar.gz) = 12786216
diff --git a/databases/cassandra3/files/patch-.build_build-resolver.xml b/databases/cassandra3/files/patch-.build_build-resolver.xml
new file mode 100644
index 000000000000..e037610af9e9
--- /dev/null
+++ b/databases/cassandra3/files/patch-.build_build-resolver.xml
@@ -0,0 +1,54 @@
+--- .build/build-resolver.xml.orig	2022-01-03 17:11:14 UTC
++++ .build/build-resolver.xml
+@@ -182,7 +182,7 @@
+ 
+         <!-- files.pythonhosted.org -->
+         <get src="https://files.pythonhosted.org/packages/59/a0/cf4cd997e1750f0c2d91c6ea5abea218251c43c3581bcc2f118b00baf5cf/futures-2.1.6-py2.py3-none-any.whl" dest="${user.home}/.m2/repository/org/apache/cassandra/deps/futures-2.1.6-py2.py3-none-any.zip" usetimestamp="true" quiet="true" skipexisting="true"/>
+-        <get src="https://files.pythonhosted.org/packages/2e/a4/6dcb84af409b7bc0c258a0d6bd7e14231724d9a46b750c048f09d74d870c/six-1.7.3-py2.py3-none-any.whl" dest="${user.home}/.m2/repository/org/apache/cassandra/deps/six-1.7.3-py2.py3-none-any.zip" usetimestamp="true" quiet="true" skipexisting="true"/>
++        <get src="https://files.pythonhosted.org/packages/d9/5a/e7c31adbe875f2abbb91bd84cf2dc52d792b5a01506781dbcf25c91daf11/six-1.16.0-py2.py3-none-any.whl" dest="${localm2}/org/apache/cassandra/deps/six-1.16.0-py2.py3-none-any.zip" usetimestamp="true" quiet="true" skipexisting="true"/>
+ 
+         <!-- python-driver -->
+         <get src="https://raw.githubusercontent.com/apache/cassandra/${lib.download.sha}/lib/cassandra-driver-internal-only-3.11.0-bb96859b.zip" dest="${user.home}/.m2/repository/org/apache/cassandra/deps/cassandra-driver-internal-only-3.11.0-bb96859b.zip" usetimestamp="true" quiet="true" skipexisting="true"/>
+@@ -216,7 +216,7 @@
+         <copy todir="${build.lib}" quiet="true">
+             <file file="${user.home}/.m2/repository/org/apache/cassandra/deps/futures-2.1.6-py2.py3-none-any.zip"/>
+             <file file="${user.home}/.m2/repository/org/apache/cassandra/deps/cassandra-driver-internal-only-3.11.0-bb96859b.zip"/>
+-            <file file="${user.home}/.m2/repository/org/apache/cassandra/deps/six-1.7.3-py2.py3-none-any.zip"/>
++            <file file="${user.home}/.m2/repository/org/apache/cassandra/deps/six-1.16.0-py2.py3-none-any.zip"/>
+         </copy>
+         <copy todir="${build.lib}/sigar-bin/" quiet="true">
+             <file file="${user.home}/.m2/repository/org/apache/cassandra/deps/sigar-bin/libsigar-amd64-freebsd-6.so"/>
+@@ -243,4 +243,4 @@
+             <file file="${user.home}/.m2/repository/org/apache/cassandra/deps/sigar-bin/sigar-x86-winnt.lib"/>
+         </copy>
+     </target>
+-</project>
+\ No newline at end of file
++</project>
+--- .build/build-resolver.xml.orig	2022-01-03 17:11:14 UTC
++++ .build/build-resolver.xml
+@@ -182,7 +182,7 @@
+ 
+         <!-- files.pythonhosted.org -->
+         <get src="https://files.pythonhosted.org/packages/59/a0/cf4cd997e1750f0c2d91c6ea5abea218251c43c3581bcc2f118b00baf5cf/futures-2.1.6-py2.py3-none-any.whl" dest="${user.home}/.m2/repository/org/apache/cassandra/deps/futures-2.1.6-py2.py3-none-any.zip" usetimestamp="true" quiet="true" skipexisting="true"/>
+-        <get src="https://files.pythonhosted.org/packages/2e/a4/6dcb84af409b7bc0c258a0d6bd7e14231724d9a46b750c048f09d74d870c/six-1.7.3-py2.py3-none-any.whl" dest="${user.home}/.m2/repository/org/apache/cassandra/deps/six-1.7.3-py2.py3-none-any.zip" usetimestamp="true" quiet="true" skipexisting="true"/>
++        <get src="https://files.pythonhosted.org/packages/d9/5a/e7c31adbe875f2abbb91bd84cf2dc52d792b5a01506781dbcf25c91daf11/six-1.16.0-py2.py3-none-any.whl" dest="${localm2}/org/apache/cassandra/deps/six-1.16.0-py2.py3-none-any.zip" usetimestamp="true" quiet="true" skipexisting="true"/>
+ 
+         <!-- python-driver -->
+         <get src="https://raw.githubusercontent.com/apache/cassandra/${lib.download.sha}/lib/cassandra-driver-internal-only-3.11.0-bb96859b.zip" dest="${user.home}/.m2/repository/org/apache/cassandra/deps/cassandra-driver-internal-only-3.11.0-bb96859b.zip" usetimestamp="true" quiet="true" skipexisting="true"/>
+@@ -216,7 +216,7 @@
+         <copy todir="${build.lib}" quiet="true">
+             <file file="${user.home}/.m2/repository/org/apache/cassandra/deps/futures-2.1.6-py2.py3-none-any.zip"/>
+             <file file="${user.home}/.m2/repository/org/apache/cassandra/deps/cassandra-driver-internal-only-3.11.0-bb96859b.zip"/>
+-            <file file="${user.home}/.m2/repository/org/apache/cassandra/deps/six-1.7.3-py2.py3-none-any.zip"/>
++            <file file="${user.home}/.m2/repository/org/apache/cassandra/deps/six-1.16.0-py2.py3-none-any.zip"/>
+         </copy>
+         <copy todir="${build.lib}/sigar-bin/" quiet="true">
+             <file file="${user.home}/.m2/repository/org/apache/cassandra/deps/sigar-bin/libsigar-amd64-freebsd-6.so"/>
+@@ -243,4 +243,4 @@
+             <file file="${user.home}/.m2/repository/org/apache/cassandra/deps/sigar-bin/sigar-x86-winnt.lib"/>
+         </copy>
+     </target>
+-</project>
+\ No newline at end of file
++</project>
diff --git a/databases/cassandra3/files/patch-build.xml b/databases/cassandra3/files/patch-build.xml
index c6bb818a1c09..9fa2d9fe1c6a 100644
--- a/databases/cassandra3/files/patch-build.xml
+++ b/databases/cassandra3/files/patch-build.xml
@@ -1,14 +1,15 @@
---- build.xml.orig	2020-10-20 17:07:48 UTC
+--- build.xml.orig	2021-07-25 16:37:33 UTC
 +++ build.xml
-@@ -23,6 +23,7 @@
+@@ -20,6 +20,8 @@
      <property file="build.properties" />
      <property file="build.properties.default" />
      <property name="debuglevel" value="source,lines,vars"/>
 +    <property name="pycmd" value="python"/>
++    <property name="rat.skip" value="true"/>
  
      <!-- default version and SCM information -->
-     <property name="base.version" value="3.11.9"/>
-@@ -80,14 +81,14 @@
+     <property name="base.version" value="3.11.11"/>
+@@ -74,14 +76,14 @@
      <condition property="version" value="${base.version}">
        <isset property="release"/>
      </condition>
@@ -25,74 +26,15 @@
      <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 -->
-@@ -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"/>
--            <remoteRepository refid="central"/>
--            <remoteRepository refid="apache"/>
-+            <localRepository path="${localm2}"/>
-         </artifact:dependencies>
-         <taskdef classpathref="wikitext.classpath" resource="wikitexttasks.properties" />
-         <wikitext-to-html markupLanguage="Textile">
-@@ -261,6 +261,7 @@
-     <target name="gen-doc" depends="maven-ant-tasks-init" description="Generate documentation">
+@@ -253,6 +255,7 @@
+     <target name="gen-doc" description="Generate documentation" depends="jar" 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"/>
-@@ -303,10 +304,6 @@
-             description="Initialize Maven ANT Tasks">
-       <typedef uri="antlib:org.apache.maven.artifact.ant" classpathref="maven-ant-tasks.classpath" />
- 
--      <!-- define the remote repositories we use -->
--      <artifact:remoteRepository id="central"   url="${artifact.remoteRepository.central}"/>
--      <artifact:remoteRepository id="apache"    url="${artifact.remoteRepository.apache}"/>
--
-       <macrodef name="install">
-         <attribute name="pomFile"/>
-         <attribute name="file"/>
-@@ -706,16 +703,14 @@
-                              filesetId="build-dependency-jars"
-                              cacheDependencyRefs="true"
-                              dependencyRefsBuildFile="${build.dir}/build-dependencies.xml">
--          <remoteRepository refid="central"/>
--          <remoteRepository refid="apache"/>
-+          <localRepository path="${localm2}"/>
-       </artifact:dependencies>
-       <!-- retrieve -source.jar artifacts using the reference-pom with the artifacts that have these -->
-       <artifact:dependencies pomRefId="build-deps-pom-sources"
-                              sourcesFilesetId="build-dependency-sources"
-                              cacheDependencyRefs="true"
-                              dependencyRefsBuildFile="${build.dir}/build-dependencies-sources.xml">
--          <remoteRepository refid="central"/>
--          <remoteRepository refid="apache"/>
-+          <localRepository path="${localm2}"/>
-       </artifact:dependencies>
-       <copy todir="${build.dir.lib}/jars">
-           <fileset refid="build-dependency-jars"/>
-@@ -728,7 +723,7 @@
-       <!-- code coverage tools -->
-       <artifact:dependencies pomRefId="coverage-deps-pom"
-                              filesetId="coverage-dependency-jars">
--          <remoteRepository refid="central"/>
-+          <localRepository path="${localm2}"/>
-       </artifact:dependencies>
-       <copy todir="${build.dir.lib}/jars">
-           <fileset refid="coverage-dependency-jars"/>
-@@ -749,8 +744,7 @@
-                              sourcesFilesetId="test-dependency-sources"
-                              cacheDependencyRefs="true"
-                              dependencyRefsBuildFile="${build.dir}/test-dependencies.xml">
--        <remoteRepository refid="apache"/>
--        <remoteRepository refid="central"/>
-+        <localRepository path="${localm2}"/>
-       </artifact:dependencies>
-       <copy todir="${test.lib}/jars">
-         <fileset refid="test-dependency-jars"/>
-@@ -1045,6 +1039,88 @@
+@@ -894,6 +897,88 @@
        </jar>
      </target>
  
@@ -179,38 +121,5 @@
 +    </target>
 +    
      <!-- creates release tarballs -->
-     <target name="artifacts" depends="jar,javadoc,gen-doc"
+     <target name="artifacts" depends="jar,gen-doc,build-test,stress-build-test,sources-jar,javadoc-jar"
              description="Create Cassandra release artifacts">
-@@ -1644,8 +1720,7 @@
-   <target name="rat-init" depends="maven-ant-tasks-init">
-     <artifact:dependencies pathId="rat.classpath">
-       <dependency groupId="org.apache.rat" artifactId="apache-rat-tasks" version="0.6" />
--      <remoteRepository refid="central"/>
--      <remoteRepository refid="apache"/>
-+      <localRepository path="${localm2}"/>
-     </artifact:dependencies>
-     <typedef uri="antlib:org.apache.rat.anttasks" classpathref="rat.classpath"/>
-   </target>
-@@ -1794,8 +1869,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>
-@@ -1815,6 +1890,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>
diff --git a/databases/cassandra3/files/patch-conf_cassandra.yaml b/databases/cassandra3/files/patch-conf_cassandra.yaml
index 6d878e8ab4c2..15f8aac7edee 100644
--- a/databases/cassandra3/files/patch-conf_cassandra.yaml
+++ b/databases/cassandra3/files/patch-conf_cassandra.yaml
@@ -1,6 +1,6 @@
---- conf/cassandra.yaml.orig	2019-02-02 22:09:01 UTC
+--- conf/cassandra.yaml.orig	2021-07-01 14:37:50 UTC
 +++ conf/cassandra.yaml
-@@ -70,7 +70,7 @@ max_hints_delivery_threads: 2
+@@ -71,7 +71,7 @@ max_hints_delivery_threads: 2
  
  # Directory where Cassandra should store hints.
  # If not set, the default directory is $CASSANDRA_HOME/data/hints.
@@ -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.Murmur3Partition
+@@ -188,13 +188,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.
@@ -26,7 +26,7 @@
  
  # Enable / disable CDC functionality on a per-node basis. This modifies the logic used
  # for write path allocation rejection (standard: never reject. cdc: reject Mutation
-@@ -204,7 +204,7 @@ cdc_enabled: false
+@@ -205,7 +205,7 @@ cdc_enabled: false
  # segment contains mutations for a CDC-enabled table. This should be placed on a
  # separate spindle than the data directories. If not set, the default directory is
  # $CASSANDRA_HOME/data/cdc_raw.
@@ -35,7 +35,7 @@
  
  # Policy for data disk failures:
  #
-@@ -305,20 +305,12 @@ key_cache_save_period: 14400
+@@ -306,20 +306,12 @@ key_cache_save_period: 14400
  
  # Row cache implementation class name. Available implementations:
  #
@@ -57,7 +57,7 @@
  #
  # Default value is 0, to disable row caching.
  row_cache_size_in_mb: 0
-@@ -365,7 +357,7 @@ counter_cache_save_period: 7200
+@@ -366,7 +358,7 @@ counter_cache_save_period: 7200
  
  # saved caches
  # If not set, the default directory is $CASSANDRA_HOME/data/saved_caches.
diff --git a/databases/cassandra3/files/patch-doc_source___templates_indexcontent.html b/databases/cassandra3/files/patch-doc_source___templates_indexcontent.html
deleted file mode 100644
index 7d8a637c9653..000000000000
--- a/databases/cassandra3/files/patch-doc_source___templates_indexcontent.html
+++ /dev/null
@@ -1,17 +0,0 @@
---- doc/source/_templates/indexcontent.html.orig	2020-10-28 18:46:34 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 currently a work-in-progress and contains a number of TODO sections.
-     <a href="{{ pathto("bugs") }}">Contributions</a> are welcome.</div>
- 
diff --git a/databases/cassandra3/files/patch-doc_source___util_cql.py b/databases/cassandra3/files/patch-doc_source___util_cql.py
deleted file mode 100644
index b3898552dfcd..000000000000
--- a/databases/cassandra3/files/patch-doc_source___util_cql.py
+++ /dev/null
@@ -1,10 +0,0 @@
---- doc/source/_util/cql.py.orig	2020-10-28 18:48:05 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/cassandra3/files/patch-pylib_cassandra-cqlsh-tests.sh b/databases/cassandra3/files/patch-pylib_cassandra-cqlsh-tests.sh
index 137c6014c092..b27df106f467 100644
--- a/databases/cassandra3/files/patch-pylib_cassandra-cqlsh-tests.sh
+++ b/databases/cassandra3/files/patch-pylib_cassandra-cqlsh-tests.sh
@@ -1,39 +1,54 @@
---- pylib/cassandra-cqlsh-tests.sh.orig	2020-10-20 17:07:48 UTC
+--- pylib/cassandra-cqlsh-tests.sh.orig	2022-01-03 17:11:14 UTC
 +++ pylib/cassandra-cqlsh-tests.sh
 @@ -1,4 +1,4 @@
 -#!/bin/bash -x
 +#!/usr/local/bin/bash -x
+ #
+ # Licensed to the Apache Software Foundation (ASF) under one
+ # or more contributor license agreements.  See the NOTICE file
+@@ -15,7 +15,6 @@
+ # WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ # See the License for the specific language governing permissions and
+ # limitations under the License.
+-#
  
  ################################
  #
-@@ -9,6 +9,8 @@
+@@ -24,9 +23,13 @@
+ ################################
+ 
  WORKSPACE=$1
- PYTHON_VERSION=$2
- JAVA_HOME=$3
-+REPO_DIR=$4
-+PYTHON_CMD=$5
+-PYTHON_VERSION=$2
+-JAVA_HOME=$3
++JAVA_HOME=$2
++REPO_DIR=$3
++PYTHON_CMD=$4
++REPO_DIR=$5
  
++PYTHON_VERSION=python3
++
  if [ "${WORKSPACE}" = "" ]; then
      echo "Specify Cassandra source directory"
-@@ -48,7 +50,7 @@ fi
+     exit
+@@ -65,7 +68,7 @@ fi
  
  # Loop to prevent failure due to maven-ant-tasks not downloading a jar..
  for x in $(seq 1 3); do
 -    ant -buildfile ${CASSANDRA_DIR}/build.xml realclean jar
-+    ant -buildfile ${CASSANDRA_DIR}/build.xml -Dmaven.repo.local=${REPO_DIR} -Dlocalm2=${REPO_DIR} -Dpycmd=${PYTHON_CMD} realclean jar
++    ${ANT_CMD} -buildfile ${CASSANDRA_DIR}/build.xml realclean jar -Dmaven.repo.local=${REPO_DIR} -Dlocalm2=${REPO_DIR}
      RETURN="$?"
      if [ "${RETURN}" -eq "0" ]; then
          break
-@@ -62,7 +64,7 @@ fi
+@@ -79,7 +82,7 @@ fi
  
  # Set up venv with dtest dependencies
  set -e # enable immediate exit if venv setup fails
 -virtualenv --python=$PYTHON_VERSION venv
-+virtualenv --python=${PYTHON_CMD} venv
++virtualenv --python=$PYTHON_CMD venv
  source venv/bin/activate
  pip install -r ${CASSANDRA_DIR}/pylib/requirements.txt
  pip freeze
-@@ -103,7 +105,7 @@ case "${pre_or_post_cdc}" in
+@@ -120,7 +123,7 @@ case "${pre_or_post_cdc}" in
          ;;
  esac
  
diff --git a/databases/cassandra3/files/patch-pylib_requirements.txt b/databases/cassandra3/files/patch-pylib_requirements.txt
new file mode 100644
index 000000000000..4468f4611060
--- /dev/null
+++ b/databases/cassandra3/files/patch-pylib_requirements.txt
@@ -0,0 +1,32 @@
+--- pylib/requirements.txt.orig	2022-01-04 12:21:36 UTC
++++ pylib/requirements.txt
+@@ -1,7 +1,6 @@
+ # See python driver docs: futures and six have to be installed before
+ # cythonizing the driver, perhaps only on old pips.
+ # http://datastax.github.io/python-driver/installation.html#cython-based-extensions
+-futures
+ six>=0.12.0
+ -e git+https://github.com/datastax/python-driver.git@cassandra-test#egg=cassandra-driver
+ # Used ccm version is tracked by cassandra-test branch in ccm repo. Please create a PR there for fixes or upgrades to new releases.
+@@ -17,4 +16,4 @@ nose-test-select
+ parse
+ pycodestyle
+ psutil
+-thrift==0.9.3
++thrift==0.10.0
+--- pylib/requirements.txt.orig	2022-01-04 12:21:36 UTC
++++ pylib/requirements.txt
+@@ -1,7 +1,6 @@
+ # See python driver docs: futures and six have to be installed before
+ # cythonizing the driver, perhaps only on old pips.
+ # http://datastax.github.io/python-driver/installation.html#cython-based-extensions
+-futures
+ six>=0.12.0
+ -e git+https://github.com/datastax/python-driver.git@cassandra-test#egg=cassandra-driver
+ # Used ccm version is tracked by cassandra-test branch in ccm repo. Please create a PR there for fixes or upgrades to new releases.
+@@ -17,4 +16,4 @@ nose-test-select
+ parse
+ pycodestyle
+ psutil
+-thrift==0.9.3
++thrift==0.10.0
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
index c2a3dcd724e4..5390ab1f59cd 100644
--- 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
@@ -1,6 +1,6 @@
---- 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.orig	2021-07-01 14:37:50 UTC
 +++ src/java/org/apache/cassandra/tools/nodetool/Status.java
-@@ -188,7 +188,7 @@ public class Status extends NodeToolCmd
+@@ -190,7 +190,7 @@ public class Status extends NodeToolCmd
              String addressPlaceholder = String.format("%%-%ds  ", maxAddressLength);
              buf.append("%s%s  ");                         // status
              buf.append(addressPlaceholder);               // address
diff --git a/databases/cassandra3/pkg-plist b/databases/cassandra3/pkg-plist
index 715f931dabf0..c59b00644bde 100644
--- a/databases/cassandra3/pkg-plist
+++ b/databases/cassandra3/pkg-plist
@@ -19,7 +19,7 @@
 %%DATADIR%%/lib/asm-5.0.4.jar
 %%DATADIR%%/lib/caffeine-2.2.6.jar
 %%DATADIR%%/lib/cassandra-driver-core-3.0.1-shaded.jar
-%%DATADIR%%/lib/cassandra-driver-internal-only-3.23.0.post0-1a184b99.zip
+%%DATADIR%%/lib/cassandra-driver-internal-only-3.11.0-bb96859b.zip
 %%DATADIR%%/lib/commons-cli-1.1.jar
 %%DATADIR%%/lib/commons-codec-1.9.jar
 %%DATADIR%%/lib/commons-lang3-3.1.jar
@@ -30,16 +30,15 @@
 %%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.4.jar
+%%DATADIR%%/lib/jackson-databind-2.9.10.8.jar
 %%DATADIR%%/lib/jamm-0.3.0.jar
-%%DATADIR%%/lib/javax.inject.jar
+%%DATADIR%%/lib/javax.inject-1.jar
 %%DATADIR%%/lib/jbcrypt-0.3m.jar
 %%DATADIR%%/lib/jcl-over-slf4j-1.7.7.jar
 %%DATADIR%%/lib/jctools-core-1.2.1.jar
@@ -47,58 +46,7 @@
 %%DATADIR%%/lib/jna-4.2.2.jar
 %%DATADIR%%/lib/joda-time-2.4.jar
 %%DATADIR%%/lib/json-simple-1.1.jar
-%%DATADIR%%/lib/jstackjunit-0.0.1.jar
 %%DATADIR%%/lib/libthrift-0.9.2.jar
-%%DATADIR%%/lib/licenses/airline-0.6.txt
-%%DATADIR%%/lib/licenses/antlr-runtime-3.5.2.txt
-%%DATADIR%%/lib/licenses/asm-5.0.4.txt
-%%DATADIR%%/lib/licenses/caffeine-2.2.6.txt
-%%DATADIR%%/lib/licenses/cassandra-driver-3.0.1.txt
-%%DATADIR%%/lib/licenses/commons-cli-1.1.txt
-%%DATADIR%%/lib/licenses/commons-codec-1.9.txt
-%%DATADIR%%/lib/licenses/commons-lang3-3.1.txt
-%%DATADIR%%/lib/licenses/commons-math3-3.2.txt
-%%DATADIR%%/lib/licenses/compress-lzf-0.8.4.txt
-%%DATADIR%%/lib/licenses/concurrent-trees-2.4.0.txt
-%%DATADIR%%/lib/licenses/concurrentlinkedhashmap-lru-1.4.txt
-%%DATADIR%%/lib/licenses/disruptor-3.0.1.txt
-%%DATADIR%%/lib/licenses/ecj-4.4.2.txt
-%%DATADIR%%/lib/licenses/futures-2.1.6.txt
-%%DATADIR%%/lib/licenses/guava-18.0.txt
-%%DATADIR%%/lib/licenses/hdrhistogram-2.1.9.txt
-%%DATADIR%%/lib/licenses/high-scale-lib-1.0.6.txt
-%%DATADIR%%/lib/licenses/hppc-0.5.4.txt
-%%DATADIR%%/lib/licenses/jackson-core-asl-1.9.13.txt
-%%DATADIR%%/lib/licenses/jackson-mapper-asl-1.9.13.txt
-%%DATADIR%%/lib/licenses/jamm-0.3.0.txt
-%%DATADIR%%/lib/licenses/javax.inject.txt
-%%DATADIR%%/lib/licenses/jbcrypt-0.3m.txt
-%%DATADIR%%/lib/licenses/jcl-over-slf4j-1.7.7.txt
-%%DATADIR%%/lib/licenses/jctools-core-1.2.1.txt
-%%DATADIR%%/lib/licenses/jflex-1.6.0.txt
-%%DATADIR%%/lib/licenses/jna-4.2.2.txt
-%%DATADIR%%/lib/licenses/joda-time-2.4.txt
-%%DATADIR%%/lib/licenses/json-simple-1.1.txt
-%%DATADIR%%/lib/licenses/jstackjunit-0.0.1.txt
-%%DATADIR%%/lib/licenses/libthrift-0.9.2.txt
-%%DATADIR%%/lib/licenses/log4j-over-slf4j-1.7.7.txt
-%%DATADIR%%/lib/licenses/logback-classic-1.1.3.txt
-%%DATADIR%%/lib/licenses/logback-core-1.1.3.txt
-%%DATADIR%%/lib/licenses/lz4-1.3.0.txt
-%%DATADIR%%/lib/licenses/metrics-core-3.1.5.txt
-%%DATADIR%%/lib/licenses/metrics-jvm-3.1.5.txt
-%%DATADIR%%/lib/licenses/metrics-logback-3.1.5.txt
-%%DATADIR%%/lib/licenses/netty-all-4.0.44.Final.txt
-%%DATADIR%%/lib/licenses/ohc-0.4.4.txt
-%%DATADIR%%/lib/licenses/reporter-config-base-3.0.3.txt
-%%DATADIR%%/lib/licenses/reporter-config3-3.0.3.txt
-%%DATADIR%%/lib/licenses/six-1.7.3.txt
-%%DATADIR%%/lib/licenses/slf4j-api-1.7.7.txt
-%%DATADIR%%/lib/licenses/snakeyaml-1.11.txt
-%%DATADIR%%/lib/licenses/snowball-stemmer-1.3.0.581.1.txt
-%%DATADIR%%/lib/licenses/ST4-4.0.8.txt
-%%DATADIR%%/lib/licenses/stream-2.5.2.txt
-%%DATADIR%%/lib/licenses/thrift-server-0.3.7.txt
 %%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
@@ -111,7 +59,7 @@
 %%DATADIR%%/lib/ohc-core-j8-0.4.4.jar
 %%DATADIR%%/lib/reporter-config-base-3.0.3.jar
 %%DATADIR%%/lib/reporter-config3-3.0.3.jar
-%%DATADIR%%/lib/six-1.12.0-py2.py3-none-any.zip
+%%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/snappy-java.jar
@@ -139,7 +87,10 @@
 %%DATADIR%%/pylib/cqlshlib/test/ansi_colors.py
 %%DATADIR%%/pylib/cqlshlib/test/basecase.py
 %%DATADIR%%/pylib/cqlshlib/test/cassconnect.py
+%%DATADIR%%/pylib/cqlshlib/test/config/sslhandling.config
+%%DATADIR%%/pylib/cqlshlib/test/config/sslhandling_invalid.config
 %%DATADIR%%/pylib/cqlshlib/test/run_cqlsh.py
+%%DATADIR%%/pylib/cqlshlib/test/test_constants.py
 %%DATADIR%%/pylib/cqlshlib/test/test_cql_parsing.py
 %%DATADIR%%/pylib/cqlshlib/test/test_cqlsh_commands.py
 %%DATADIR%%/pylib/cqlshlib/test/test_cqlsh_completion.py
@@ -147,6 +98,7 @@
 %%DATADIR%%/pylib/cqlshlib/test/test_cqlsh_output.py
 %%DATADIR%%/pylib/cqlshlib/test/test_cqlsh_parsing.py
 %%DATADIR%%/pylib/cqlshlib/test/test_keyspace_init.cql
+%%DATADIR%%/pylib/cqlshlib/test/test_sslhandling.py
 %%DATADIR%%/pylib/cqlshlib/test/winpty.py
 %%DATADIR%%/pylib/cqlshlib/tracing.py
 %%DATADIR%%/pylib/cqlshlib/util.py