Index | Thread | Search

From:
Kurt Miller <kurt@intricatesoftware.com>
Subject:
[UPDATE] security/ghidra: 12.0.3 and remove PyGhidra
To:
ports@openbsd.org
Date:
Thu, 12 Feb 2026 22:13:30 +0000

Download raw body.

Thread
  • Kurt Miller:

    [UPDATE] security/ghidra: 12.0.3 and remove PyGhidra

Update to 12.0.3 and Remove PyGhidra
* Update to 12.0.3 for moderate security update:
  https://github.com/NationalSecurityAgency/ghidra/security/advisories/GHSA-m94m-fqr3-x442
* Remove PyGhidra because it requires native built jpype which is
  not ported to OpenBSD yet:
  https://github.com/jpype-project/jpype
* Sync protobuf version
* Reduce the number of locations PROTOBUF_VER needs to be patched
* Don't install python whl files or source tarballs for unused
  python packages and source
* Fix ERROR (UnixPtyChild) Could not set terminal window size:
com.sun.jna.LastErrorException: [25] Inappropriate ioctl for device

Tested on amd64 and aarch64. okay?

Index: Makefile
===================================================================
RCS file: /cvs/ports/security/ghidra/Makefile,v
diff -u -p -u -r1.15 Makefile
--- Makefile	10 Feb 2026 15:16:14 -0000	1.15
+++ Makefile	12 Feb 2026 22:08:43 -0000
@@ -2,8 +2,8 @@ ONLY_FOR_ARCHS =	amd64 aarch64
 
 COMMENT =	software reverse engineering (SRE) framework
 
-VERSION = 	12.0.2
-GHIDRA_DATE =	20260129
+VERSION = 	12.0.3
+GHIDRA_DATE =	20260210
 
 GH_ACCOUNT =	NationalSecurityAgency
 GH_PROJECT =	ghidra
@@ -23,8 +23,8 @@ SITES.a =		https://www.intricatesoftware
 
 # Keep these in sync with java/jna and devel/protobuf
 JNA_VER =		5.18.1
-PROTOBUF_VER =		6.33.4
-PROTOBUF_JAVA_VER =	4.33.4
+PROTOBUF_VER =		6.33.5
+PROTOBUF_JAVA_VER =	4.33.5
 
 DISTFILES.a +=		ghidra-Ghidra_${VERSION}_build_dependencies${EXTRACT_SUFX}
 
@@ -65,6 +65,7 @@ EXTENSIONS =		BSimElasticPlugin GnuDisas
 			SymbolicSummaryZ3 bundle_examples sample
 
 post-extract:
+	@rm -rf ${WRKSRC}/Ghidra/Features/PyGhidra
 	@perl -pi -e 's,#!/bin/bash,#!${LOCALBASE}/bin/bash,' \
 		${WRKSRC}/Ghidra/RuntimeScripts/Linux/ghidraRun
 	@perl -pi -e 's,#!/bin/bash,#!${LOCALBASE}/bin/bash,' \
@@ -88,8 +89,6 @@ pre-configure:
 		${WRKSRC}/Ghidra/Framework/Pty/Module.manifest \
 		${WRKSRC}/Ghidra/Framework/Pty/build.gradle \
 		${WRKSRC}/Ghidra/Debug/ProposedUtils/Module.manifest \
-		${WRKSRC}/Ghidra/Debug/Debugger-rmi-trace/Module.manifest \
-		${WRKSRC}/Ghidra/Debug/Debugger-rmi-trace/build.gradle \
 		${WRKSRC}/Ghidra/Test/DebuggerIntegrationTest/src/test.slow/java/agent/dbgeng/rmi/DbgEngConnectorsTest.java \
 		${WRKSRC}/Ghidra/Test/DebuggerIntegrationTest/src/test.slow/java/agent/drgn/rmi/DrgnConnectorsTest.java \
 		${WRKSRC}/Ghidra/Test/DebuggerIntegrationTest/src/test.slow/java/agent/gdb/rmi/GdbConnectorsTest.java \
@@ -121,7 +120,7 @@ build-dependencies: configure
 		gradle --no-daemon --stacktrace \
 		-g ${WRKSRC}/dependencies/gradle \
 		prepDev; \
-	    rm -rf dependencies/downloads; \
+	    rm -rf dependencies/downloads dependencies/PyGhidra; \
 	    find dependencies -path '*/.tmp*' -o -name '*.log' -delete; \
 	    find dependencies -name net.java.dev.jna | xargs rm -rf
 	cd ${WRKDIR} && \
@@ -145,6 +144,9 @@ do-install:
 		${WRKSRC}/build/dist/ghidra_${VERSION}_DEV_*_${GHIDRA_ARCH}.zip \
 		-x *.orig.port
 	mv ${PREFIX}/share/java/ghidra_${VERSION}_DEV ${PREFIX}/share/java/ghidra
+	find ${PREFIX}/share/java/ghidra -name *.whl -a -not -name ghidra* \
+	    -delete
+	find ${PREFIX}/share/java/ghidra -name psutil-*.tar.gz -delete
 .for name in ${EXTENSIONS}
 	cd ${PREFIX}/share/java/ghidra/Extensions/Ghidra/ && \
 		mv ghidra_${VERSION}_DEV_*_${name}.zip \
Index: distinfo
===================================================================
RCS file: /cvs/ports/security/ghidra/distinfo,v
diff -u -p -u -r1.7 distinfo
--- distinfo	10 Feb 2026 03:03:33 -0000	1.7
+++ distinfo	12 Feb 2026 22:08:43 -0000
@@ -1,4 +1,4 @@
-SHA256 (ghidra-12.0.2.tar.gz) = HYA6h966xpCLyKY4uuyx3lPsng5qwf7MemkEksyLE+0=
-SHA256 (ghidra-Ghidra_12.0.2_build_dependencies.tar.gz) = 1HGKiMhldglqosBfBPSkZptD/jaBAbUcgIM1NLqvXyo=
-SIZE (ghidra-12.0.2.tar.gz) = 78581833
-SIZE (ghidra-Ghidra_12.0.2_build_dependencies.tar.gz) = 411701634
+SHA256 (ghidra-12.0.3.tar.gz) = OeXRYPr6VEyLGFji34aXKNGKo8nFSQ9HotDbd287TU0=
+SHA256 (ghidra-Ghidra_12.0.3_build_dependencies.tar.gz) = vMMgpXszYjt2mXCu7UwxYdVly0LfbK49VPk1Utm1LY8=
+SIZE (ghidra-12.0.3.tar.gz) = 78589019
+SIZE (ghidra-Ghidra_12.0.3_build_dependencies.tar.gz) = 400178038
Index: patches/patch-Ghidra_Debug_Debugger-rmi-trace_Module_manifest
===================================================================
RCS file: patches/patch-Ghidra_Debug_Debugger-rmi-trace_Module_manifest
diff -N patches/patch-Ghidra_Debug_Debugger-rmi-trace_Module_manifest
--- patches/patch-Ghidra_Debug_Debugger-rmi-trace_Module_manifest	10 Feb 2026 03:03:33 -0000	1.1
+++ /dev/null	1 Jan 1970 00:00:00 -0000
@@ -1,11 +0,0 @@
-Use protobuf provided by ports
-
-Index: Ghidra/Debug/Debugger-rmi-trace/Module.manifest
---- Ghidra/Debug/Debugger-rmi-trace/Module.manifest.orig
-+++ Ghidra/Debug/Debugger-rmi-trace/Module.manifest
-@@ -1,4 +1,4 @@
--MODULE FILE LICENSE: pypkg/dist/protobuf-6.31.0-py3-none-any.whl BSD-3-GOOGLE
-+MODULE FILE LICENSE: pypkg/dist/protobuf-${PROTOBUF_VER}-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/setuptools-80.9.0-py3-none-any.whl MIT
- MODULE FILE LICENSE: pypkg/dist/wheel-0.45.1-py3-none-any.whl MIT
Index: patches/patch-Ghidra_Debug_Debugger-rmi-trace_build_gradle
===================================================================
RCS file: patches/patch-Ghidra_Debug_Debugger-rmi-trace_build_gradle
diff -N patches/patch-Ghidra_Debug_Debugger-rmi-trace_build_gradle
--- patches/patch-Ghidra_Debug_Debugger-rmi-trace_build_gradle	10 Feb 2026 03:03:33 -0000	1.1
+++ /dev/null	1 Jan 1970 00:00:00 -0000
@@ -1,14 +0,0 @@
-Use protobuf provided by ports
-
-Index: Ghidra/Debug/Debugger-rmi-trace/build.gradle
---- Ghidra/Debug/Debugger-rmi-trace/build.gradle.orig
-+++ Ghidra/Debug/Debugger-rmi-trace/build.gradle
-@@ -73,7 +73,7 @@ tasks.assemblePyPackage {
- 	}
- }
- 
--distributePyDep("protobuf-6.31.0-py3-none-any.whl")
-+distributePyDep("protobuf-${PROTOBUF_VER}-py3-none-any.whl")
- distributePyDep("psutil-5.9.8.tar.gz")
- distributePyDep("setuptools-80.9.0-py3-none-any.whl")
- distributePyDep("wheel-0.45.1-py3-none-any.whl")
Index: patches/patch-Ghidra_Framework_Pty_src_main_java_ghidra_pty_openbsd_OpenBSDIoctls_java
===================================================================
RCS file: /cvs/ports/security/ghidra/patches/patch-Ghidra_Framework_Pty_src_main_java_ghidra_pty_openbsd_OpenBSDIoctls_java,v
diff -u -p -u -r1.1 patch-Ghidra_Framework_Pty_src_main_java_ghidra_pty_openbsd_OpenBSDIoctls_java
--- patches/patch-Ghidra_Framework_Pty_src_main_java_ghidra_pty_openbsd_OpenBSDIoctls_java	10 Feb 2026 03:03:33 -0000	1.1
+++ patches/patch-Ghidra_Framework_Pty_src_main_java_ghidra_pty_openbsd_OpenBSDIoctls_java	12 Feb 2026 22:08:43 -0000
@@ -26,12 +26,12 @@ Index: Ghidra/Framework/Pty/src/main/jav
  	@Override
  	public long TIOCSCTTY() {
 -		return 0x540eL;
-+		return 0x20007461;
++		return 0x20007461L;
  	}
  
  	@Override
  	public long TIOCSWINSZ() {
 -		return 0x5414L;
-+		return 0x80087467;
++		return 0x80087467L;
  	}
  }
Index: patches/patch-gradle_support_fetchDependencies_gradle
===================================================================
RCS file: patches/patch-gradle_support_fetchDependencies_gradle
diff -N patches/patch-gradle_support_fetchDependencies_gradle
--- patches/patch-gradle_support_fetchDependencies_gradle	10 Feb 2026 03:03:33 -0000	1.1
+++ /dev/null	1 Jan 1970 00:00:00 -0000
@@ -1,19 +0,0 @@
-Download py3-protobuf to make the build happy, but we have a run depend on
-this too. Keep the version here in sync with PROTOBUF_VER in makefile.
-
-Index: gradle/support/fetchDependencies.gradle
---- gradle/support/fetchDependencies.gradle.orig
-+++ gradle/support/fetchDependencies.gradle
-@@ -212,9 +212,9 @@ ext.deps = [
- 		}
- 	],
- 	[
--		name: "protobuf-6.31.0-py3-none-any.whl",
--		url: "https://files.pythonhosted.org/packages/ee/01/1ed1d482960a5718fd99c82f6d79120181947cfd4667ec3944d448ed44a3/protobuf-6.31.0-py3-none-any.whl",
--		sha256: "6ac2e82556e822c17a8d23aa1190bbc1d06efb9c261981da95c71c9da09e9e23",
-+		name: "protobuf-6.33.4-py3-none-any.whl",
-+		url: "https://files.pythonhosted.org/packages/75/b1/1dc83c2c661b4c62d56cc081706ee33a4fc2835bd90f965baa2663ef7676/protobuf-6.33.4-py3-none-any.whl",
-+		sha256: "1fe3730068fcf2e595816a6c34fe66eeedd37d51d0400b72fabc848811fdc1bc",
- 		destination: file("${DEPS_DIR}/Debugger-rmi-trace/")
- 	],
- 	[
Index: pkg/PLIST
===================================================================
RCS file: /cvs/ports/security/ghidra/pkg/PLIST,v
diff -u -p -u -r1.8 PLIST
--- pkg/PLIST	10 Feb 2026 03:03:33 -0000	1.8
+++ pkg/PLIST	12 Feb 2026 22:08:43 -0000
@@ -318,11 +318,7 @@ share/java/ghidra/Ghidra/Debug/Debugger-
 share/java/ghidra/Ghidra/Debug/Debugger-agent-dbgeng/pypkg/MANIFEST.in
 share/java/ghidra/Ghidra/Debug/Debugger-agent-dbgeng/pypkg/README.md
 share/java/ghidra/Ghidra/Debug/Debugger-agent-dbgeng/pypkg/dist/
-share/java/ghidra/Ghidra/Debug/Debugger-agent-dbgeng/pypkg/dist/Pybag-2.2.12-${MODPY_PY_PREFIX}none-any.whl
-share/java/ghidra/Ghidra/Debug/Debugger-agent-dbgeng/pypkg/dist/capstone-5.0.1-${MODPY_PY_PREFIX}none-win_amd64.whl
-share/java/ghidra/Ghidra/Debug/Debugger-agent-dbgeng/pypkg/dist/comtypes-1.4.1-${MODPY_PY_PREFIX}none-any.whl
 share/java/ghidra/Ghidra/Debug/Debugger-agent-dbgeng/pypkg/dist/ghidradbg-12.0-${MODPY_PY_PREFIX}none-any.whl
-share/java/ghidra/Ghidra/Debug/Debugger-agent-dbgeng/pypkg/dist/pywin32-306-cp312-cp312-win_amd64.whl
 share/java/ghidra/Ghidra/Debug/Debugger-agent-dbgeng/pypkg/pyproject.toml
 share/java/ghidra/Ghidra/Debug/Debugger-agent-dbgeng/pypkg/src/
 share/java/ghidra/Ghidra/Debug/Debugger-agent-dbgeng/pypkg/src/ghidradbg/
@@ -533,10 +529,6 @@ share/java/ghidra/Ghidra/Debug/Debugger-
 share/java/ghidra/Ghidra/Debug/Debugger-rmi-trace/pypkg/README.md
 share/java/ghidra/Ghidra/Debug/Debugger-rmi-trace/pypkg/dist/
 share/java/ghidra/Ghidra/Debug/Debugger-rmi-trace/pypkg/dist/ghidratrace-12.0-${MODPY_PY_PREFIX}none-any.whl
-share/java/ghidra/Ghidra/Debug/Debugger-rmi-trace/pypkg/dist/protobuf-${PROTOBUF_VER}-${MODPY_PY_PREFIX}none-any.whl
-share/java/ghidra/Ghidra/Debug/Debugger-rmi-trace/pypkg/dist/psutil-5.9.8.tar.gz
-share/java/ghidra/Ghidra/Debug/Debugger-rmi-trace/pypkg/dist/setuptools-80.9.0-${MODPY_PY_PREFIX}none-any.whl
-share/java/ghidra/Ghidra/Debug/Debugger-rmi-trace/pypkg/dist/wheel-0.45.1-${MODPY_PY_PREFIX}none-any.whl
 share/java/ghidra/Ghidra/Debug/Debugger-rmi-trace/pypkg/pyproject.toml
 share/java/ghidra/Ghidra/Debug/Debugger-rmi-trace/pypkg/src/
 share/java/ghidra/Ghidra/Debug/Debugger-rmi-trace/pypkg/src/ghidratrace/
@@ -2604,8 +2596,6 @@ share/java/ghidra/Ghidra/Features/Jython
 share/java/ghidra/Ghidra/Features/Jython/data/jython-2.7.4/Lib/ensurepip/__main__$py.class
 share/java/ghidra/Ghidra/Features/Jython/data/jython-2.7.4/Lib/ensurepip/__main__.py
 share/java/ghidra/Ghidra/Features/Jython/data/jython-2.7.4/Lib/ensurepip/_bundled/
-share/java/ghidra/Ghidra/Features/Jython/data/jython-2.7.4/Lib/ensurepip/_bundled/pip-19.1-py2.${MODPY_PY_PREFIX}none-any.whl
-share/java/ghidra/Ghidra/Features/Jython/data/jython-2.7.4/Lib/ensurepip/_bundled/setuptools-41.0.1-py2.${MODPY_PY_PREFIX}none-any.whl
 share/java/ghidra/Ghidra/Features/Jython/data/jython-2.7.4/Lib/ensurepip/_uninstall$py.class
 share/java/ghidra/Ghidra/Features/Jython/data/jython-2.7.4/Lib/ensurepip/_uninstall.py
 share/java/ghidra/Ghidra/Features/Jython/data/jython-2.7.4/Lib/filecmp$py.class
@@ -3395,88 +3385,6 @@ share/java/ghidra/Ghidra/Features/Progra
 share/java/ghidra/Ghidra/Features/ProgramGraph/lib/
 share/java/ghidra/Ghidra/Features/ProgramGraph/lib/ProgramGraph-src.zip
 share/java/ghidra/Ghidra/Features/ProgramGraph/lib/ProgramGraph.jar
-share/java/ghidra/Ghidra/Features/PyGhidra/
-share/java/ghidra/Ghidra/Features/PyGhidra/LICENSE.txt
-share/java/ghidra/Ghidra/Features/PyGhidra/Module.manifest
-share/java/ghidra/Ghidra/Features/PyGhidra/README.html
-share/java/ghidra/Ghidra/Features/PyGhidra/README.md
-share/java/ghidra/Ghidra/Features/PyGhidra/data/
-share/java/ghidra/Ghidra/Features/PyGhidra/data/python.theme.properties
-share/java/ghidra/Ghidra/Features/PyGhidra/ghidra_scripts/
-share/java/ghidra/Ghidra/Features/PyGhidra/ghidra_scripts/PyGhidraBasics.py
-share/java/ghidra/Ghidra/Features/PyGhidra/lib/
-share/java/ghidra/Ghidra/Features/PyGhidra/lib/PyGhidra-src.zip
-share/java/ghidra/Ghidra/Features/PyGhidra/lib/PyGhidra.jar
-share/java/ghidra/Ghidra/Features/PyGhidra/pypkg/
-share/java/ghidra/Ghidra/Features/PyGhidra/pypkg/LICENSE
-share/java/ghidra/Ghidra/Features/PyGhidra/pypkg/MANIFEST.in
-share/java/ghidra/Ghidra/Features/PyGhidra/pypkg/README.html
-share/java/ghidra/Ghidra/Features/PyGhidra/pypkg/README.md
-share/java/ghidra/Ghidra/Features/PyGhidra/pypkg/dist/
-share/java/ghidra/Ghidra/Features/PyGhidra/pypkg/dist/jpype1-1.5.2-cp310-cp310-macosx_10_9_universal2.whl
-share/java/ghidra/Ghidra/Features/PyGhidra/pypkg/dist/jpype1-1.5.2-cp310-cp310-manylinux_2_17_aarch64.manylinux2014_aarch64.whl
-share/java/ghidra/Ghidra/Features/PyGhidra/pypkg/dist/jpype1-1.5.2-cp310-cp310-manylinux_2_17_x86_64.manylinux2014_x86_64.whl
-share/java/ghidra/Ghidra/Features/PyGhidra/pypkg/dist/jpype1-1.5.2-cp310-cp310-win_amd64.whl
-share/java/ghidra/Ghidra/Features/PyGhidra/pypkg/dist/jpype1-1.5.2-cp311-cp311-macosx_10_9_universal2.whl
-share/java/ghidra/Ghidra/Features/PyGhidra/pypkg/dist/jpype1-1.5.2-cp311-cp311-manylinux_2_17_aarch64.manylinux2014_aarch64.whl
-share/java/ghidra/Ghidra/Features/PyGhidra/pypkg/dist/jpype1-1.5.2-cp311-cp311-manylinux_2_17_x86_64.manylinux2014_x86_64.whl
-share/java/ghidra/Ghidra/Features/PyGhidra/pypkg/dist/jpype1-1.5.2-cp311-cp311-win_amd64.whl
-share/java/ghidra/Ghidra/Features/PyGhidra/pypkg/dist/jpype1-1.5.2-cp312-cp312-macosx_10_9_universal2.whl
-share/java/ghidra/Ghidra/Features/PyGhidra/pypkg/dist/jpype1-1.5.2-cp312-cp312-manylinux_2_17_aarch64.manylinux2014_aarch64.whl
-share/java/ghidra/Ghidra/Features/PyGhidra/pypkg/dist/jpype1-1.5.2-cp312-cp312-manylinux_2_17_x86_64.manylinux2014_x86_64.whl
-share/java/ghidra/Ghidra/Features/PyGhidra/pypkg/dist/jpype1-1.5.2-cp312-cp312-win_amd64.whl
-share/java/ghidra/Ghidra/Features/PyGhidra/pypkg/dist/jpype1-1.5.2-cp313-cp313-macosx_10_13_universal2.whl
-share/java/ghidra/Ghidra/Features/PyGhidra/pypkg/dist/jpype1-1.5.2-cp313-cp313-manylinux_2_17_aarch64.manylinux2014_aarch64.whl
-share/java/ghidra/Ghidra/Features/PyGhidra/pypkg/dist/jpype1-1.5.2-cp313-cp313-manylinux_2_17_x86_64.manylinux2014_x86_64.whl
-share/java/ghidra/Ghidra/Features/PyGhidra/pypkg/dist/jpype1-1.5.2-cp313-cp313-win_amd64.whl
-share/java/ghidra/Ghidra/Features/PyGhidra/pypkg/dist/jpype1-1.5.2-cp39-cp39-macosx_10_9_x86_64.whl
-share/java/ghidra/Ghidra/Features/PyGhidra/pypkg/dist/jpype1-1.5.2-cp39-cp39-manylinux_2_17_aarch64.manylinux2014_aarch64.whl
-share/java/ghidra/Ghidra/Features/PyGhidra/pypkg/dist/jpype1-1.5.2-cp39-cp39-manylinux_2_17_x86_64.manylinux2014_x86_64.whl
-share/java/ghidra/Ghidra/Features/PyGhidra/pypkg/dist/jpype1-1.5.2-cp39-cp39-win_amd64.whl
-share/java/ghidra/Ghidra/Features/PyGhidra/pypkg/dist/jpype1-1.5.2.tar.gz
-share/java/ghidra/Ghidra/Features/PyGhidra/pypkg/dist/packaging-25.0-${MODPY_PY_PREFIX}none-any.whl
-share/java/ghidra/Ghidra/Features/PyGhidra/pypkg/dist/pyghidra-3.0.2-${MODPY_PY_PREFIX}none-any.whl
-share/java/ghidra/Ghidra/Features/PyGhidra/pypkg/dist/pyghidra-3.0.2.tar.gz
-share/java/ghidra/Ghidra/Features/PyGhidra/pypkg/dist/setuptools-80.9.0-${MODPY_PY_PREFIX}none-any.whl
-share/java/ghidra/Ghidra/Features/PyGhidra/pypkg/dist/wheel-0.45.1-${MODPY_PY_PREFIX}none-any.whl
-share/java/ghidra/Ghidra/Features/PyGhidra/pypkg/pyproject.toml
-share/java/ghidra/Ghidra/Features/PyGhidra/pypkg/setup.py
-share/java/ghidra/Ghidra/Features/PyGhidra/pypkg/src/
-share/java/ghidra/Ghidra/Features/PyGhidra/pypkg/src/pyghidra/
-share/java/ghidra/Ghidra/Features/PyGhidra/pypkg/src/pyghidra/__init__.py
-share/java/ghidra/Ghidra/Features/PyGhidra/pypkg/src/pyghidra/__main__.py
-share/java/ghidra/Ghidra/Features/PyGhidra/pypkg/src/pyghidra/api.py
-share/java/ghidra/Ghidra/Features/PyGhidra/pypkg/src/pyghidra/converters.py
-share/java/ghidra/Ghidra/Features/PyGhidra/pypkg/src/pyghidra/core.py
-share/java/ghidra/Ghidra/Features/PyGhidra/pypkg/src/pyghidra/ghidra_launch.py
-share/java/ghidra/Ghidra/Features/PyGhidra/pypkg/src/pyghidra/ghidradoc.py
-share/java/ghidra/Ghidra/Features/PyGhidra/pypkg/src/pyghidra/gui.py
-share/java/ghidra/Ghidra/Features/PyGhidra/pypkg/src/pyghidra/internal/
-share/java/ghidra/Ghidra/Features/PyGhidra/pypkg/src/pyghidra/internal/__init__.py
-share/java/ghidra/Ghidra/Features/PyGhidra/pypkg/src/pyghidra/internal/plugin/
-share/java/ghidra/Ghidra/Features/PyGhidra/pypkg/src/pyghidra/internal/plugin/__init__.py
-share/java/ghidra/Ghidra/Features/PyGhidra/pypkg/src/pyghidra/internal/plugin/completions.py
-share/java/ghidra/Ghidra/Features/PyGhidra/pypkg/src/pyghidra/internal/plugin/plugin.py
-share/java/ghidra/Ghidra/Features/PyGhidra/pypkg/src/pyghidra/javac.py
-share/java/ghidra/Ghidra/Features/PyGhidra/pypkg/src/pyghidra/launcher.py
-share/java/ghidra/Ghidra/Features/PyGhidra/pypkg/src/pyghidra/properties.py
-share/java/ghidra/Ghidra/Features/PyGhidra/pypkg/src/pyghidra/script.py
-share/java/ghidra/Ghidra/Features/PyGhidra/pypkg/src/pyghidra/version.py
-share/java/ghidra/Ghidra/Features/PyGhidra/pypkg/tests/
-share/java/ghidra/Ghidra/Features/PyGhidra/pypkg/tests/data/
-share/java/ghidra/Ghidra/Features/PyGhidra/pypkg/tests/data/bad_plugin/
-share/java/ghidra/Ghidra/Features/PyGhidra/pypkg/tests/data/bad_plugin/BadPluginClass.java
-share/java/ghidra/Ghidra/Features/PyGhidra/pypkg/tests/data/example_script.py
-share/java/ghidra/Ghidra/Features/PyGhidra/pypkg/tests/data/good_plugin/
-share/java/ghidra/Ghidra/Features/PyGhidra/pypkg/tests/data/good_plugin/DummyTestRecognizer.java
-share/java/ghidra/Ghidra/Features/PyGhidra/pypkg/tests/data/import_test_script.py
-share/java/ghidra/Ghidra/Features/PyGhidra/pypkg/tests/data/programless_script.py
-share/java/ghidra/Ghidra/Features/PyGhidra/pypkg/tests/data/projectless_script.py
-share/java/ghidra/Ghidra/Features/PyGhidra/pypkg/tests/test_argparser.py
-share/java/ghidra/Ghidra/Features/PyGhidra/pypkg/tests/test_core.py
-share/java/ghidra/Ghidra/Features/PyGhidra/pypkg/tests/test_plugin.py
-share/java/ghidra/Ghidra/Features/PyGhidra/support/
-share/java/ghidra/Ghidra/Features/PyGhidra/support/pyghidra_launcher.py
 share/java/ghidra/Ghidra/Features/Recognizers/
 share/java/ghidra/Ghidra/Features/Recognizers/LICENSE.txt
 share/java/ghidra/Ghidra/Features/Recognizers/Module.manifest
@@ -6058,9 +5966,6 @@ share/java/ghidra/docs/ghidra_stubs/pypr
 share/java/ghidra/docs/ghidra_stubs/pypredef/ghidra.pty.unix.pypredef
 share/java/ghidra/docs/ghidra_stubs/pypredef/ghidra.pty.windows.jna.pypredef
 share/java/ghidra/docs/ghidra_stubs/pypredef/ghidra.pty.windows.pypredef
-share/java/ghidra/docs/ghidra_stubs/pypredef/ghidra.pyghidra.interpreter.pypredef
-share/java/ghidra/docs/ghidra_stubs/pypredef/ghidra.pyghidra.property.pypredef
-share/java/ghidra/docs/ghidra_stubs/pypredef/ghidra.pyghidra.pypredef
 share/java/ghidra/docs/ghidra_stubs/pypredef/ghidra.pypredef
 share/java/ghidra/docs/ghidra_stubs/pypredef/ghidra.rmi.trace.pypredef
 share/java/ghidra/docs/ghidra_stubs/pypredef/ghidra.security.pypredef
@@ -7570,12 +7475,6 @@ share/java/ghidra/docs/ghidra_stubs/type
 share/java/ghidra/docs/ghidra_stubs/typestubs/ghidra-stubs/pty/windows/__init__.pyi
 share/java/ghidra/docs/ghidra_stubs/typestubs/ghidra-stubs/pty/windows/jna/
 share/java/ghidra/docs/ghidra_stubs/typestubs/ghidra-stubs/pty/windows/jna/__init__.pyi
-share/java/ghidra/docs/ghidra_stubs/typestubs/ghidra-stubs/pyghidra/
-share/java/ghidra/docs/ghidra_stubs/typestubs/ghidra-stubs/pyghidra/__init__.pyi
-share/java/ghidra/docs/ghidra_stubs/typestubs/ghidra-stubs/pyghidra/interpreter/
-share/java/ghidra/docs/ghidra_stubs/typestubs/ghidra-stubs/pyghidra/interpreter/__init__.pyi
-share/java/ghidra/docs/ghidra_stubs/typestubs/ghidra-stubs/pyghidra/property/
-share/java/ghidra/docs/ghidra_stubs/typestubs/ghidra-stubs/pyghidra/property/__init__.pyi
 share/java/ghidra/docs/ghidra_stubs/typestubs/ghidra-stubs/rmi/
 share/java/ghidra/docs/ghidra_stubs/typestubs/ghidra-stubs/rmi/__init__.pyi
 share/java/ghidra/docs/ghidra_stubs/typestubs/ghidra-stubs/rmi/trace/