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

Merge remote-tracking branch 'origin/GP-0_Dan_upVersions11.2'

Browse source
This commit is contained in:
Ryan Kurtz 2024-08-27 13:38:14 -04:00
commit 33323f11f2
6 changed files with 25 additions and 25 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,7 +4,7 @@ build-backend = "setuptools.build_meta"
[project] [project]
name = "ghidradbg" name = "ghidradbg"
version = "11.1.2" version = "11.2"
authors = [ authors = [
{ name="Ghidra Development Team" }, { name="Ghidra Development Team" },
] ]
@ -17,8 +17,8 @@ classifiers = [
"Operating System :: OS Independent", "Operating System :: OS Independent",
] ]
dependencies = [ dependencies = [
"ghidratrace==11.1.2", "ghidratrace==11.2",
"pybag>=2.2.10" "pybag>=2.2.12"
] ]
[project.urls] [project.urls]

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

@ -4,7 +4,7 @@ build-backend = "setuptools.build_meta"
[project] [project]
name = "ghidragdb" name = "ghidragdb"
version = "11.1.2" version = "11.2"
authors = [ authors = [
{ name="Ghidra Development Team" }, { name="Ghidra Development Team" },
] ]
@ -17,7 +17,7 @@ classifiers = [
"Operating System :: OS Independent", "Operating System :: OS Independent",
] ]
dependencies = [ dependencies = [
"ghidratrace==11.1.2", "ghidratrace==11.2",
] ]
[project.urls] [project.urls]

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

@ -4,7 +4,7 @@ build-backend = "setuptools.build_meta"
[project] [project]
name = "ghidralldb" name = "ghidralldb"
version = "11.1.2" version = "11.2"
authors = [ authors = [
{ name="Ghidra Development Team" }, { name="Ghidra Development Team" },
] ]
@ -17,7 +17,7 @@ classifiers = [
"Operating System :: OS Independent", "Operating System :: OS Independent",
] ]
dependencies = [ dependencies = [
"ghidratrace==11.1.2", "ghidratrace==11.2",
] ]
[project.urls] [project.urls]

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

@ -4,9 +4,9 @@
* Licensed under the Apache License, Version 2.0 (the "License"); * Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License. * you may not use this file except in compliance with the License.
* You may obtain a copy of the License at * You may obtain a copy of the License at
* *
* http://www.apache.org/licenses/LICENSE-2.0 * http://www.apache.org/licenses/LICENSE-2.0
* *
* Unless required by applicable law or agreed to in writing, software * Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS, * distributed under the License is distributed on an "AS IS" BASIS,
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
@ -69,7 +69,7 @@ import ghidra.util.exception.CancelledException;
import ghidra.util.exception.DuplicateFileException; import ghidra.util.exception.DuplicateFileException;
public class TraceRmiHandler implements TraceRmiConnection { public class TraceRmiHandler implements TraceRmiConnection {
public static final String VERSION = "11.1"; public static final String VERSION = "11.2";
protected static class VersionMismatchError extends TraceRmiError { protected static class VersionMismatchError extends TraceRmiError {
public VersionMismatchError(String remote) { public VersionMismatchError(String remote) {

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

@ -4,7 +4,7 @@ build-backend = "setuptools.build_meta"
[project] [project]
name = "ghidratrace" name = "ghidratrace"
version = "11.1.2" version = "11.2"
authors = [ authors = [
{ name="Ghidra Development Team" }, { name="Ghidra Development Team" },
] ]

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

@ -1,17 +1,17 @@
## ### ## ###
# IP: GHIDRA # IP: GHIDRA
# #
# Licensed under the Apache License, Version 2.0 (the "License"); # Licensed under the Apache License, Version 2.0 (the "License");
# you may not use this file except in compliance with the License. # you may not use this file except in compliance with the License.
# You may obtain a copy of the License at # You may obtain a copy of the License at
# #
# http://www.apache.org/licenses/LICENSE-2.0 # http://www.apache.org/licenses/LICENSE-2.0
# #
# Unless required by applicable law or agreed to in writing, software # Unless required by applicable law or agreed to in writing, software
# distributed under the License is distributed on an "AS IS" BASIS, # distributed under the License is distributed on an "AS IS" BASIS,
# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. # WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
# See the License for the specific language governing permissions and # See the License for the specific language governing permissions and
# limitations under the License. # limitations under the License.
## ##
from collections import deque, namedtuple from collections import deque, namedtuple
from concurrent.futures import Future from concurrent.futures import Future
@ -34,7 +34,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.1' VERSION = '11.2'
class RemoteResult(Future): class RemoteResult(Future):