yetangitu/ghidra
1
0
Fork 0
mirror of https://github.com/NationalSecurityAgency/ghidra.git synced 2025-10-03 09:49:23 +02:00
Code Issues Releases Wiki Activity

GP-5456: Upgrade protobuf to 4.31.0 (java) and 6.31.0 (python)

Browse source
This commit is contained in:
Dan 2025-06-02 14:49:12 +00:00
parent b22ccaa260
commit f1607b5cfd
16 changed files with 47 additions and 43 deletions
Download patch file Download diff file Expand all files Collapse all files

6
Ghidra/Debug/Debugger-agent-dbgeng/src/main/py/pyproject.toml
View file

@ -4,20 +4,20 @@ build-backend = "setuptools.build_meta"
[project] [project]
name = "ghidradbg" name = "ghidradbg"
version = "11.4" version = "11.5"
authors = [ authors = [
{ name="Ghidra Development Team" }, { name="Ghidra Development Team" },
] ]
description = "Ghidra's Plugin for dbgeng" description = "Ghidra's Plugin for dbgeng"
readme = "README.md" readme = "README.md"
requires-python = ">=3.7" requires-python = ">=3.9"
classifiers = [ classifiers = [
"Programming Language :: Python :: 3", "Programming Language :: Python :: 3",
"License :: OSI Approved :: Apache Software License", "License :: OSI Approved :: Apache Software License",
"Operating System :: OS Independent", "Operating System :: OS Independent",
] ]
dependencies = [ dependencies = [
"ghidratrace==11.4", "ghidratrace==11.5",
"pybag>=2.2.12" "pybag>=2.2.12"
] ]

6
Ghidra/Debug/Debugger-agent-drgn/src/main/py/pyproject.toml
View file

@ -4,20 +4,20 @@ build-backend = "setuptools.build_meta"
[project] [project]
name = "ghidradrgn" name = "ghidradrgn"
version = "11.4" version = "11.5"
authors = [ authors = [
{ name="Ghidra Development Team" }, { name="Ghidra Development Team" },
] ]
description = "Ghidra's Plugin for drgn" description = "Ghidra's Plugin for drgn"
readme = "README.md" readme = "README.md"
requires-python = ">=3.7" requires-python = ">=3.9"
classifiers = [ classifiers = [
"Programming Language :: Python :: 3", "Programming Language :: Python :: 3",
"License :: OSI Approved :: Apache Software License", "License :: OSI Approved :: Apache Software License",
"Operating System :: OS Independent", "Operating System :: OS Independent",
] ]
dependencies = [ dependencies = [
"ghidratrace==11.4", "ghidratrace==11.5",
] ]
[project.urls] [project.urls]

6
Ghidra/Debug/Debugger-agent-gdb/src/main/py/pyproject.toml
View file

@ -4,20 +4,20 @@ build-backend = "setuptools.build_meta"
[project] [project]
name = "ghidragdb" name = "ghidragdb"
version = "11.4" version = "11.5"
authors = [ authors = [
{ name="Ghidra Development Team" }, { name="Ghidra Development Team" },
] ]
description = "Ghidra's Plugin for gdb" description = "Ghidra's Plugin for gdb"
readme = "README.md" readme = "README.md"
requires-python = ">=3.7" requires-python = ">=3.9"
classifiers = [ classifiers = [
"Programming Language :: Python :: 3", "Programming Language :: Python :: 3",
"License :: OSI Approved :: Apache Software License", "License :: OSI Approved :: Apache Software License",
"Operating System :: OS Independent", "Operating System :: OS Independent",
] ]
dependencies = [ dependencies = [
"ghidratrace==11.4", "ghidratrace==11.5",
] ]
[project.urls] [project.urls]

6
Ghidra/Debug/Debugger-agent-lldb/src/main/py/pyproject.toml
View file

@ -4,20 +4,20 @@ build-backend = "setuptools.build_meta"
[project] [project]
name = "ghidralldb" name = "ghidralldb"
version = "11.4" version = "11.5"
authors = [ authors = [
{ name="Ghidra Development Team" }, { name="Ghidra Development Team" },
] ]
description = "Ghidra's Plugin for lldb" description = "Ghidra's Plugin for lldb"
readme = "README.md" readme = "README.md"
requires-python = ">=3.7" requires-python = ">=3.9"
classifiers = [ classifiers = [
"Programming Language :: Python :: 3", "Programming Language :: Python :: 3",
"License :: OSI Approved :: Apache Software License", "License :: OSI Approved :: Apache Software License",
"Operating System :: OS Independent", "Operating System :: OS Independent",
] ]
dependencies = [ dependencies = [
"ghidratrace==11.4", "ghidratrace==11.5",
] ]
[project.urls] [project.urls]

2
Ghidra/Debug/Debugger-rmi-trace/Module.manifest
View file

@ -1,4 +1,4 @@
MODULE FILE LICENSE: pypkg/dist/protobuf-3.20.3-py2.py3-none-any.whl BSD-3-GOOGLE MODULE FILE LICENSE: pypkg/dist/protobuf-6.31.0-py3-none-any.whl BSD-3-GOOGLE
MODULE FILE LICENSE: pypkg/dist/psutil-5.9.8.tar.gz BSD-3-PSUTIL MODULE FILE LICENSE: pypkg/dist/psutil-5.9.8.tar.gz BSD-3-PSUTIL
MODULE FILE LICENSE: pypkg/dist/setuptools-68.0.0-py3-none-any.whl MIT MODULE FILE LICENSE: pypkg/dist/setuptools-68.0.0-py3-none-any.whl MIT
MODULE FILE LICENSE: pypkg/dist/wheel-0.37.1-py2.py3-none-any.whl MIT MODULE FILE LICENSE: pypkg/dist/wheel-0.37.1-py2.py3-none-any.whl MIT

2
Ghidra/Debug/Debugger-rmi-trace/build.gradle
View file

@ -72,7 +72,7 @@ tasks.assemblePyPackage {
} }
} }
distributePyDep("protobuf-3.20.3-py2.py3-none-any.whl") distributePyDep("protobuf-6.31.0-py3-none-any.whl")
distributePyDep("psutil-5.9.8.tar.gz") distributePyDep("psutil-5.9.8.tar.gz")
distributePyDep("setuptools-68.0.0-py3-none-any.whl") distributePyDep("setuptools-68.0.0-py3-none-any.whl")
distributePyDep("wheel-0.37.1-py2.py3-none-any.whl") distributePyDep("wheel-0.37.1-py2.py3-none-any.whl")

6
Ghidra/Debug/Debugger-rmi-trace/src/main/java/ghidra/app/plugin/core/debug/service/tracermi/TraceRmiHandler.java
View file

@ -69,7 +69,11 @@ import ghidra.util.exception.CancelledException;
import ghidra.util.exception.DuplicateFileException; import ghidra.util.exception.DuplicateFileException;
public class TraceRmiHandler extends AbstractTraceRmiConnection { public class TraceRmiHandler extends AbstractTraceRmiConnection {
public static final String VERSION = "11.4"; /**
* NOTE: This can't just be Application.getApplicationVersion(), because the Python client only
* specifies up to the minor, not patch, release.
*/
public static final String VERSION = "11.5";
protected static class VersionMismatchError extends TraceRmiError { protected static class VersionMismatchError extends TraceRmiError {
public VersionMismatchError(String remote) { public VersionMismatchError(String remote) {

6
Ghidra/Debug/Debugger-rmi-trace/src/main/py/pyproject.toml
View file

@ -4,20 +4,20 @@ build-backend = "setuptools.build_meta"
[project] [project]
name = "ghidratrace" name = "ghidratrace"
version = "11.4" version = "11.5"
authors = [ authors = [
{ name="Ghidra Development Team" }, { name="Ghidra Development Team" },
] ]
description = "Ghidra's TraceRmi for Python3" description = "Ghidra's TraceRmi for Python3"
readme = "README.md" readme = "README.md"
requires-python = ">=3.7" requires-python = ">=3.9"
classifiers = [ classifiers = [
"Programming Language :: Python :: 3", "Programming Language :: Python :: 3",
"License :: OSI Approved :: Apache Software License", "License :: OSI Approved :: Apache Software License",
"Operating System :: OS Independent", "Operating System :: OS Independent",
] ]
dependencies = [ dependencies = [
"protobuf >= 3.20.0", "protobuf >= 6.31.0",
] ]
[project.urls] [project.urls]

2
Ghidra/Debug/Debugger-rmi-trace/src/main/py/src/ghidratrace/client.py
View file

@ -48,7 +48,7 @@ from .util import send_delimited, recv_delimited
# Other places to change: # Other places to change:
# * every pyproject.toml file (incl. deps) # * every pyproject.toml file (incl. deps)
# * TraceRmiHandler.VERSION # * TraceRmiHandler.VERSION
VERSION = '11.4' VERSION = '11.5'
E = TypeVar('E') E = TypeVar('E')

2
Ghidra/Debug/ProposedUtils/Module.manifest
View file

@ -1 +1 @@
MODULE FILE LICENSE: lib/protobuf-java-3.21.8.jar BSD-3-GOOGLE MODULE FILE LICENSE: lib/protobuf-java-4.31.0.jar BSD-3-GOOGLE

4
Ghidra/Debug/ProposedUtils/build.gradle
View file

@ -23,8 +23,10 @@ eclipse.project.name = 'Debug ProposedUtils'
// val autoServiceVersion = "1.0-rc5" // val autoServiceVersion = "1.0-rc5"
def version = getProperty("ghidra.protobuf.java.version")
dependencies { dependencies {
api 'com.google.protobuf:protobuf-java:3.21.8' api "com.google.protobuf:protobuf-java:${version}"
api project(':DB') api project(':DB')
api project(':Project') api project(':Project')
api project(':SoftwareModeling') api project(':SoftwareModeling')

1
Ghidra/Extensions/MachineLearning/Module.manifest
View file

@ -1,6 +1,5 @@
MODULE FILE LICENSE: lib/olcut-config-protobuf-5.2.0.jar BSD-2-ORACLE MODULE FILE LICENSE: lib/olcut-config-protobuf-5.2.0.jar BSD-2-ORACLE
MODULE FILE LICENSE: lib/olcut-core-5.2.0.jar BSD-2-ORACLE MODULE FILE LICENSE: lib/olcut-core-5.2.0.jar BSD-2-ORACLE
MODULE FILE LICENSE: lib/protobuf-java-3.21.8.jar BSD-3-GOOGLE
MODULE FILE LICENSE: lib/tribuo-classification-core-4.2.0.jar Apache License 2.0 MODULE FILE LICENSE: lib/tribuo-classification-core-4.2.0.jar Apache License 2.0
MODULE FILE LICENSE: lib/tribuo-classification-tree-4.2.0.jar Apache License 2.0 MODULE FILE LICENSE: lib/tribuo-classification-tree-4.2.0.jar Apache License 2.0
MODULE FILE LICENSE: lib/tribuo-common-tree-4.2.0.jar Apache License 2.0 MODULE FILE LICENSE: lib/tribuo-common-tree-4.2.0.jar Apache License 2.0

10
Ghidra/Extensions/MachineLearning/build.gradle
View file

@ -21,12 +21,13 @@ apply from: "$rootProject.projectDir/gradle/helpProject.gradle"
apply plugin: 'eclipse' apply plugin: 'eclipse'
eclipse.project.name = 'Xtra MachineLearning' eclipse.project.name = 'Xtra MachineLearning'
def protobufVersion = getProperty("ghidra.protobuf.java.version")
dependencies { dependencies {
api project(':Base') api project(':Base')
api "com.oracle.labs.olcut:olcut-config-protobuf:5.2.0" //{exclude group: "com.google.protobuf", module: "protobuf-java"} api "com.oracle.labs.olcut:olcut-config-protobuf:5.2.0" //{exclude group: "com.google.protobuf", module: "protobuf-java"}
api ("com.oracle.labs.olcut:olcut-core:5.2.0") {exclude group: "org.jline"} api ("com.oracle.labs.olcut:olcut-core:5.2.0") {exclude group: "org.jline"}
api "com.google.protobuf:protobuf-java:3.21.8" //only needed for running junits
api "org.tribuo:tribuo-classification-core:4.2.0" api "org.tribuo:tribuo-classification-core:4.2.0"
api "org.tribuo:tribuo-classification-tree:4.2.0" api "org.tribuo:tribuo-classification-tree:4.2.0"
api "org.tribuo:tribuo-common-tree:4.2.0" api "org.tribuo:tribuo-common-tree:4.2.0"
@ -36,10 +37,5 @@ dependencies {
api ("org.tribuo:tribuo-util-onnx:4.2.0") //{exclude group: "com.google.protobuf", module: "protobuf-java"} api ("org.tribuo:tribuo-util-onnx:4.2.0") //{exclude group: "com.google.protobuf", module: "protobuf-java"}
testImplementation project(path: ':SoftwareModeling', configuration: 'testArtifacts') testImplementation project(path: ':SoftwareModeling', configuration: 'testArtifacts')
testImplementation "com.google.protobuf:protobuf-java:${protobufVersion}"
} }

1
gradle.properties
View file

@ -1,3 +1,4 @@
# Increase maximum Gradle heap size (default is 1G) # Increase maximum Gradle heap size (default is 1G)
# And fix build in locales with non-default capitalizations (e.g. tr_TR) # And fix build in locales with non-default capitalizations (e.g. tr_TR)
org.gradle.jvmargs=-Xmx2G -Duser.language=en -Duser.country=US org.gradle.jvmargs=-Xmx2G -Duser.language=en -Duser.country=US
ghidra.protobuf.java.version=4.31.0

24
gradle/hasProtobuf.gradle
View file

@ -24,38 +24,40 @@ configurations {
def platform = getCurrentPlatformName() def platform = getCurrentPlatformName()
def version = getProperty('ghidra.protobuf.java.version')
dependencies { dependencies {
allProtocArtifacts 'com.google.protobuf:protoc:3.21.8:windows-x86_64@exe' allProtocArtifacts "com.google.protobuf:protoc:${version}:windows-x86_64@exe"
allProtocArtifacts 'com.google.protobuf:protoc:3.21.8:linux-x86_64@exe' allProtocArtifacts "com.google.protobuf:protoc:${version}:linux-x86_64@exe"
allProtocArtifacts 'com.google.protobuf:protoc:3.21.8:linux-aarch_64@exe' allProtocArtifacts "com.google.protobuf:protoc:${version}:linux-aarch_64@exe"
allProtocArtifacts 'com.google.protobuf:protoc:3.21.8:osx-x86_64@exe' allProtocArtifacts "com.google.protobuf:protoc:${version}:osx-x86_64@exe"
allProtocArtifacts 'com.google.protobuf:protoc:3.21.8:osx-aarch_64@exe' allProtocArtifacts "com.google.protobuf:protoc:${version}:osx-aarch_64@exe"
if (isCurrentWindows()) { if (isCurrentWindows()) {
protocArtifact 'com.google.protobuf:protoc:3.21.8:windows-x86_64@exe' protocArtifact "com.google.protobuf:protoc:${version}:windows-x86_64@exe"
} }
if (isCurrentLinux()) { if (isCurrentLinux()) {
if (platform.endsWith("x86_64")) { if (platform.endsWith("x86_64")) {
protocArtifact 'com.google.protobuf:protoc:3.21.8:linux-x86_64@exe' protocArtifact "com.google.protobuf:protoc:${version}:linux-x86_64@exe"
} }
else { else {
protocArtifact 'com.google.protobuf:protoc:3.21.8:linux-aarch_64@exe' protocArtifact "com.google.protobuf:protoc:${version}:linux-aarch_64@exe"
} }
} }
if (isCurrentMac()) { if (isCurrentMac()) {
if (platform.endsWith("x86_64")) { if (platform.endsWith("x86_64")) {
protocArtifact 'com.google.protobuf:protoc:3.21.8:osx-x86_64@exe' protocArtifact "com.google.protobuf:protoc:${version}:osx-x86_64@exe"
} }
else { else {
protocArtifact 'com.google.protobuf:protoc:3.21.8:osx-aarch_64@exe' protocArtifact "com.google.protobuf:protoc:${version}:osx-aarch_64@exe"
} }
} }
} }
/*protobuf { /*protobuf {
protoc { protoc {
artifact = 'com.google.protobuf:protoc:3.21.8' artifact = 'com.google.protobuf:protoc:${version}'
} }
}*/ }*/

6
gradle/support/fetchDependencies.gradle
View file

@ -164,9 +164,9 @@ ext.deps = [
destination: FID_DIR destination: FID_DIR
], ],
[ [
name: "protobuf-3.20.3-py2.py3-none-any.whl", name: "protobuf-6.31.0-py3-none-any.whl",
url: "https://files.pythonhosted.org/packages/8d/14/619e24a4c70df2901e1f4dbc50a6291eb63a759172558df326347dce1f0d/protobuf-3.20.3-py2.py3-none-any.whl", url: "https://files.pythonhosted.org/packages/ee/01/1ed1d482960a5718fd99c82f6d79120181947cfd4667ec3944d448ed44a3/protobuf-6.31.0-py3-none-any.whl",
sha256: "a7ca6d488aa8ff7f329d4c545b2dbad8ac31464f1d8b1c87ad1346717731e4db", sha256: "6ac2e82556e822c17a8d23aa1190bbc1d06efb9c261981da95c71c9da09e9e23",
destination: file("${DEPS_DIR}/Debugger-rmi-trace/") destination: file("${DEPS_DIR}/Debugger-rmi-trace/")
], ],
[ [