Ghidra is a software reverse engineering (SRE) framework
GP-6012: Some server related JDK 25 fixes
Ryan Kurtze3cdfcce5b23
diff --git a/Ghidra/RuntimeScripts/server/ghidraSvr b/Ghidra/RuntimeScripts/server/ghidraSvrindex cf19b58f48..3404a731ec 100755--- a/Ghidra/RuntimeScripts/server/ghidraSvr+++ b/Ghidra/RuntimeScripts/server/ghidraSvr@@ -5,7 +5,7 @@# Usage: ghidraSvr [ console | status | install | uninstall | start | stop | restart ]#----------------------------------------------------------------------------------------# The Java 21 (or later) runtime installation must either be on the system path, specified by the+# The Java 25 (or later) runtime installation must either be on the system path, specified by the# JAVA_HOME environment variable or preferably set explicitly with the GHIDRA_JAVA_HOME variable# below. Since this script may be used during service initialization, reliance on environmental# settings such as JAVA_HOME may be problematic. It is also important to note that once installed@@ -18,11 +18,11 @@# installed as a systemd service the Java path will be locked-in to the generated ghidra.service# script.#-# Example: The symbolic link "/usr/lib/jvm/java-21-openjdk" should be specified in favor of a-# version-specific path such as "/usr/lib/jvm/java-21-openjdk-21.0.5.0.10-3.el8.x86_64".+# Example: The symbolic link "/usr/lib/jvm/java-25-openjdk" should be specified in favor of a+# version-specific path such as "/usr/lib/jvm/java-25-openjdk-25.0.5.0.10-3.el8.x86_64".# Uncomment the following line and set JAVA_HOME before installing as a service-# GHIDRA_JAVA_HOME=/usr/lib/jvm/java-21-openjdk+# GHIDRA_JAVA_HOME=/usr/lib/jvm/java-25-openjdkOPTION=$1diff --git a/Ghidra/RuntimeScripts/server/ghidraSvr.bat b/Ghidra/RuntimeScripts/server/ghidraSvr.batindex 6ebf51f8ce..ac9615188a 100644--- a/Ghidra/RuntimeScripts/server/ghidraSvr.bat+++ b/Ghidra/RuntimeScripts/server/ghidraSvr.bat@@ -20,7 +20,7 @@:: Usage: ghidraSvr [ console | status | install | uninstall | start | stop | restart ]:: ----------------------------------------------------------------------------------------:: The Java 21 (or later) runtime installation must either be on the system path, specified by the+:: The Java 25 (or later) runtime installation must either be on the system path, specified by the:: JAVA_HOME environment variable or preferably set explicitly with the GHIDRA_JAVA_HOME variable:: below. Since this script may be used during service initialization, reliance on environmental:: settings such as JAVA_HOME may be problematic. It is also important to note that once installeddiff --git a/Ghidra/RuntimeScripts/server/server.conf b/Ghidra/RuntimeScripts/server/server.confindex 392cee1e3c..89c8f71ec2 100644--- a/Ghidra/RuntimeScripts/server/server.conf+++ b/Ghidra/RuntimeScripts/server/server.conf@@ -97,6 +97,10 @@ wrapper.java.additional.11=-Ddb.buffers.DataBuffer.compressedOutput=true#wrapper.java.additional.18=-Dcom.sun.management.jmxremote.authenticate=false#wrapper.java.additional.19=-Dcom.sun.management.jmxremote.ssl=false+# The wrapper calls java.lang.System::load in com.sun.jna.Native.+# The below line will prevent a warning from being displayed.+wrapper.java.additional.20=--enable-native-access=ALL-UNNAMED+# YAJSW will by default assume a POSIX spawn for Linux and Mac OS X systems, unfortunately it has# not yet been implemented for Mac OS X. The default process support within YAJSW for Mac OS X is# broken so we must force the use of BSD process support which appears to work properly. To enable