Rebump JNA with LIBFFI_TMPDIR (#443)

* Revert "Revert "Bump JNA to enable aarch64 support (#410)" (#442)" This reverts commit 5816ffc. * Set LIBFFI_TMPDIR * Also add TMPDIR Co-authored-by: David Schlosnagle <davids@palantir.com> * Fail with exception rather than segfault on noexec Co-authored-by: David Schlosnagle <davids@palantir.com> * jna 5.13 lib --------- Co-authored-by: David Schlosnagle <davids@palantir.com>
palantir · Sep 26, 2023 · c504dc3 · c504dc3
1 parent 5257a15
commit c504dc3
Show file tree

Hide file tree

Showing 5 changed files with 5 additions and 1 deletion.
diff --git a/bin/cassandra.in.sh b/bin/cassandra.in.sh
@@ -99,6 +99,10 @@ JAVA_OPTS="$JAVA_OPTS:-Djava.library.path=$CASSANDRA_HOME/lib/sigar-bin"
 CASSANDRA_TEMP_DIR=$SERVICE_HOME/var/data/tmp
 JVM_OPTS="${JVM_OPTS} -Djava.io.tmpdir=$CASSANDRA_TEMP_DIR"
 JVM_OPTS="${JVM_OPTS} -Djna.tmpdir=$CASSANDRA_TEMP_DIR"
+# See https://access.redhat.com/solutions/6991416
+# https://davecturner.github.io/2021/08/30/seven-year-old-segfault.html
+export LIBFFI_TMPDIR="$CASSANDRA_TEMP_DIR"
+export TMPDIR="$CASSANDRA_TEMP_DIR"
 
 # parse the jvm options files and add them to JVM_OPTS
 JVM_OPTS_FILE=$CASSANDRA_CONF/jvm${jvmoptions_variant:--clients}.options

diff --git a/build.xml b/build.xml
@@ -416,7 +416,7 @@
             <exclusion groupId="hsqldb" artifactId="hsqldb"/> <!-- outdated version -->
             <exclusion groupId="antlr" artifactId="antlr"/> <!-- outdated version -->
           </dependency>
-          <dependency groupId="net.java.dev.jna" artifactId="jna" version="4.0.0"/>
+          <dependency groupId="net.java.dev.jna" artifactId="jna" version="5.13.0"/>
 
           <dependency groupId="net.sourceforge.cobertura" artifactId="cobertura" version="${cobertura.version}">
             <exclusion groupId="xerces" artifactId="xercesImpl"/>

diff --git a/lib/jna-4.0.0.jar b/lib/jna-4.0.0.jar
diff --git a/lib/jna-5.13.0.jar b/lib/jna-5.13.0.jar
diff --git a/lib/licenses/jna-4.0.0.txt → lib/licenses/jna-5.13.0.txt b/lib/licenses/jna-4.0.0.txt → lib/licenses/jna-5.13.0.txt