From 3b0f83c56c899ea65f938bbcd66c0e445036292e Mon Sep 17 00:00:00 2001 From: Dan <46821332+nsadeveloper789@users.noreply.github.com> Date: Thu, 12 Sep 2024 09:43:10 -0400 Subject: [PATCH 1/2] GP-4917: Update to distribute Pybag 2.2.12 --- Ghidra/Debug/Debugger-agent-dbgeng/build.gradle | 6 +++--- gradle/support/fetchDependencies.gradle | 6 +++--- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/Ghidra/Debug/Debugger-agent-dbgeng/build.gradle b/Ghidra/Debug/Debugger-agent-dbgeng/build.gradle index 1c3a47f546..de377e6713 100644 --- a/Ghidra/Debug/Debugger-agent-dbgeng/build.gradle +++ b/Ghidra/Debug/Debugger-agent-dbgeng/build.gradle @@ -4,9 +4,9 @@ * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. * You may obtain a copy of the License at - * + * * http://www.apache.org/licenses/LICENSE-2.0 - * + * * Unless required by applicable law or agreed to in writing, software * distributed under the License is distributed on an "AS IS" BASIS, * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. @@ -93,7 +93,7 @@ else { } } -distributePyDep("Pybag-2.2.10-py3-none-any.whl") +distributePyDep("Pybag-2.2.12-py3-none-any.whl") distributePyDep("capstone-5.0.1-py3-none-win_amd64.whl") distributePyDep("comtypes-1.4.1-py3-none-any.whl") distributePyDep("pywin32-306-cp312-cp312-win_amd64.whl") diff --git a/gradle/support/fetchDependencies.gradle b/gradle/support/fetchDependencies.gradle index f0f7fda81b..9ee0b539ce 100644 --- a/gradle/support/fetchDependencies.gradle +++ b/gradle/support/fetchDependencies.gradle @@ -191,9 +191,9 @@ ext.deps = [ destination: file("${DEPS_DIR}/Debugger-rmi-trace/") ], [ - name: "Pybag-2.2.10-py3-none-any.whl", - url: "https://files.pythonhosted.org/packages/2d/e0/f877c91e036fcaed2a827f80d6cbdf1d26cffc3333c9ebda31c55c45f050/Pybag-2.2.10-py3-none-any.whl", - sha256: "81cf1e33dd667dd217dc56a123326796e6799b8569f2c6efb78c16375caf9b2b", + name: "Pybag-2.2.12-py3-none-any.whl", + url: "https://files.pythonhosted.org/packages/ce/78/91db67e7fe1546dc8b02c38591b7732980373d2d252372f7358054031dd4/Pybag-2.2.12-py3-none-any.whl", + sha256: "eda5ee6c4e873902981b7f525b42a02428b87c7368df2c5bdfe1ded0e6884126", destination: file("${DEPS_DIR}/Debugger-agent-dbgeng/") ], [ From fe2fbeafe251c525b5e0622c674c32ee348fd0fc Mon Sep 17 00:00:00 2001 From: Dan <46821332+nsadeveloper789@users.noreply.github.com> Date: Thu, 12 Sep 2024 13:39:32 -0400 Subject: [PATCH 2/2] GP-4917: Per review: Update Module.manifest, too --- Ghidra/Debug/Debugger-agent-dbgeng/Module.manifest | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Ghidra/Debug/Debugger-agent-dbgeng/Module.manifest b/Ghidra/Debug/Debugger-agent-dbgeng/Module.manifest index d81b91c24e..377d89b725 100644 --- a/Ghidra/Debug/Debugger-agent-dbgeng/Module.manifest +++ b/Ghidra/Debug/Debugger-agent-dbgeng/Module.manifest @@ -1,5 +1,5 @@ MODULE FILE LICENSE: pypkg/dist/capstone-5.0.1-py3-none-win_amd64.whl BSD-3-CAPSTONE MODULE FILE LICENSE: pypkg/dist/comtypes-1.4.1-py3-none-any.whl MIT -MODULE FILE LICENSE: pypkg/dist/Pybag-2.2.10-py3-none-any.whl MIT +MODULE FILE LICENSE: pypkg/dist/Pybag-2.2.12-py3-none-any.whl MIT MODULE FILE LICENSE: pypkg/dist/pywin32-306-cp312-cp312-win_amd64.whl Python Software Foundation License