From 3336e65a7f6335cf97c04da6d59fefbd796d5ac4 Mon Sep 17 00:00:00 2001 From: Andrew Benson Date: Fri, 12 May 2023 12:14:10 -0500 Subject: [PATCH] ghidra: update to 10.3. --- srcpkgs/ghidra/patches/protoc.patch | 77 ----------------------------- srcpkgs/ghidra/template | 62 ++++++++++++----------- 2 files changed, 32 insertions(+), 107 deletions(-) delete mode 100644 srcpkgs/ghidra/patches/protoc.patch diff --git a/srcpkgs/ghidra/patches/protoc.patch b/srcpkgs/ghidra/patches/protoc.patch deleted file mode 100644 index ed98035e637..00000000000 --- a/srcpkgs/ghidra/patches/protoc.patch +++ /dev/null @@ -1,77 +0,0 @@ ---- ghidra-10.1/ghidra_build/Ghidra/Debug/Debugger-gadp/build.gradle 2021-12-10 19:03:38.000000000 +0100 -+++ - 2021-12-11 13:01:51.089861724 +0100 -@@ -33,33 +33,33 @@ - def platform = getCurrentPlatformName() - - dependencies { -- allProtocArtifacts 'com.google.protobuf:protoc:3.17.3:windows-x86_64@exe' -- allProtocArtifacts 'com.google.protobuf:protoc:3.17.3:linux-x86_64@exe' -- allProtocArtifacts 'com.google.protobuf:protoc:3.17.3:linux-aarch_64@exe' -- allProtocArtifacts 'com.google.protobuf:protoc:3.17.3:osx-x86_64@exe' -- allProtocArtifacts 'com.google.protobuf:protoc:3.17.3:osx-aarch_64@exe' -+ allProtocArtifacts 'com.google.protobuf:protoc:3.21.9:windows-x86_64@exe' -+ allProtocArtifacts 'com.google.protobuf:protoc:3.21.9:linux-x86_64@exe' -+ allProtocArtifacts 'com.google.protobuf:protoc:3.21.9:linux-aarch_64@exe' -+ allProtocArtifacts 'com.google.protobuf:protoc:3.21.9:osx-x86_64@exe' -+ allProtocArtifacts 'com.google.protobuf:protoc:3.21.9:osx-aarch_64@exe' - - if (isCurrentWindows()) { -- protocArtifact 'com.google.protobuf:protoc:3.17.3:windows-x86_64@exe' -+ protocArtifact 'com.google.protobuf:protoc:3.21.9:windows-x86_64@exe' - } - if (isCurrentLinux()) { - if (platform.endsWith("x86_64")) { -- protocArtifact 'com.google.protobuf:protoc:3.17.3:linux-x86_64@exe' -+ protocArtifact 'com.google.protobuf:protoc:3.21.9:linux-x86_64@exe' - } - else { -- protocArtifact 'com.google.protobuf:protoc:3.17.3:linux-aarch_64@exe' -+ protocArtifact 'com.google.protobuf:protoc:3.21.9:linux-aarch_64@exe' - } - } - if (isCurrentMac()) { - if (platform.endsWith("x86_64")) { -- protocArtifact 'com.google.protobuf:protoc:3.17.3:osx-x86_64@exe' -+ protocArtifact 'com.google.protobuf:protoc:3.21.9:osx-x86_64@exe' - } - else { -- protocArtifact 'com.google.protobuf:protoc:3.17.3:osx-aarch_64@exe' -+ protocArtifact 'com.google.protobuf:protoc:3.21.9:osx-aarch_64@exe' - } - } - -- api 'com.google.protobuf:protobuf-java:3.17.3' -+ api 'com.google.protobuf:protobuf-java:3.21.9' - api project(':Framework-AsyncComm') - api project(':Framework-Debugging') - api project(':ProposedUtils') -@@ -70,7 +70,7 @@ - - /*protobuf { - protoc { -- artifact = 'com.google.protobuf:protoc:3.17.3' -+ artifact = 'com.google.protobuf:protoc:3.21.9' - } - }*/ - -@@ -82,14 +82,9 @@ - ext.outdir = file("build/generated/source/proto/main/java") - outputs.dir(outdir) - inputs.files(src) -- dependsOn(configurations.protocArtifact) - doLast { -- def exe = configurations.protocArtifact.first() -- if (!isCurrentWindows()) { -- exe.setExecutable(true) -- } - exec { -- commandLine exe, "--java_out=$outdir", "-I$srcdir" -+ commandLine '/usr/bin/protoc', "--java_out=$outdir", "-I$srcdir" - args src - } - } ---- ghidra-10.1/ghidra_build/Ghidra/Debug/Debugger-gadp/Module.manifest 2021-12-10 19:03:38.000000000 +0100 -+++ - 2021-12-11 13:02:09.420069640 +0100 -@@ -1 +1 @@ --MODULE FILE LICENSE: lib/protobuf-java-3.17.3.jar BSD-3-GOOGLE -+MODULE FILE LICENSE: lib/protobuf-java-3.21.9.jar BSD-3-GOOGLE diff --git a/srcpkgs/ghidra/template b/srcpkgs/ghidra/template index aa59daf783a..1ad665e83dc 100644 --- a/srcpkgs/ghidra/template +++ b/srcpkgs/ghidra/template @@ -1,9 +1,9 @@ # Template file for 'ghidra' pkgname=ghidra -version=10.2.3 +version=10.3 revision=1 -# commit id of 'ghidra-data' repo: -_commit=939210dab2570714944ac35a4daef9633fd842b3 +_dex_ver=2.1 +_yajsw_ver=13.09 archs="x86_64* aarch64*" # Other 64bit archs should be easily patchable, # grep for linux_arm_64 to find all places in need of patching @@ -16,33 +16,33 @@ maintainer="Andrew Benson " license="Apache-2.0" homepage="https://ghidra-sre.org/" distfiles="https://github.com/NationalSecurityAgency/ghidra/archive/Ghidra_${version}_build.tar.gz - https://github.com/pxb1988/dex2jar/releases/download/2.0/dex-tools-2.0.zip - https://sourceforge.net/projects/yajsw/files/yajsw/yajsw-stable-13.05/yajsw-stable-13.05.zip + https://github.com/pxb1988/dex2jar/releases/download/v${_dex_ver}/dex2jar-${_dex_ver}.zip + https://sourceforge.net/projects/yajsw/files/yajsw/yajsw-stable-${_yajsw_ver}/yajsw-stable-${_yajsw_ver}.zip https://storage.googleapis.com/google-code-archive-downloads/v2/code.google.com/android4me/AXMLPrinter2.jar - https://github.com/NationalSecurityAgency/ghidra-data/raw/${_commit}/FunctionID/vs2012_x64.fidb - https://github.com/NationalSecurityAgency/ghidra-data/raw/${_commit}/FunctionID/vs2012_x86.fidb - https://github.com/NationalSecurityAgency/ghidra-data/raw/${_commit}/FunctionID/vs2015_x64.fidb - https://github.com/NationalSecurityAgency/ghidra-data/raw/${_commit}/FunctionID/vs2015_x86.fidb - https://github.com/NationalSecurityAgency/ghidra-data/raw/${_commit}/FunctionID/vs2017_x64.fidb - https://github.com/NationalSecurityAgency/ghidra-data/raw/${_commit}/FunctionID/vs2017_x86.fidb - https://github.com/NationalSecurityAgency/ghidra-data/raw/${_commit}/FunctionID/vs2019_x64.fidb - https://github.com/NationalSecurityAgency/ghidra-data/raw/${_commit}/FunctionID/vs2019_x86.fidb - https://github.com/NationalSecurityAgency/ghidra-data/raw/${_commit}/FunctionID/vsOlder_x64.fidb - https://github.com/NationalSecurityAgency/ghidra-data/raw/${_commit}/FunctionID/vsOlder_x86.fidb" -checksum="b200db34e7dae42914fafc45075e84cebf2c635ea47d4422a10b399913f0312e - 7907eb4d6e9280b6e17ddce7ee0507eae2ef161ee29f70a10dbc6944fdca75bc - ff7a4c8262f7d24079b16607122bad8f6fb024f051c27b91883d9498568429a9 + https://github.com/NationalSecurityAgency/ghidra-data/raw/Ghidra_${version}/FunctionID/vs2012_x64.fidb + https://github.com/NationalSecurityAgency/ghidra-data/raw/Ghidra_${version}/FunctionID/vs2012_x86.fidb + https://github.com/NationalSecurityAgency/ghidra-data/raw/Ghidra_${version}/FunctionID/vs2015_x64.fidb + https://github.com/NationalSecurityAgency/ghidra-data/raw/Ghidra_${version}/FunctionID/vs2015_x86.fidb + https://github.com/NationalSecurityAgency/ghidra-data/raw/Ghidra_${version}/FunctionID/vs2017_x64.fidb + https://github.com/NationalSecurityAgency/ghidra-data/raw/Ghidra_${version}/FunctionID/vs2017_x86.fidb + https://github.com/NationalSecurityAgency/ghidra-data/raw/Ghidra_${version}/FunctionID/vs2019_x64.fidb + https://github.com/NationalSecurityAgency/ghidra-data/raw/Ghidra_${version}/FunctionID/vs2019_x86.fidb + https://github.com/NationalSecurityAgency/ghidra-data/raw/Ghidra_${version}/FunctionID/vsOlder_x64.fidb + https://github.com/NationalSecurityAgency/ghidra-data/raw/Ghidra_${version}/FunctionID/vsOlder_x86.fidb" +checksum="28efb03692d67292711e559541545118182e58051064edaf48ba77a37eaf9796 + 7a9bdf843d43de4d1e94ec2e7b6f55825017b0c4a7ee39ff82660e2493a46f08 + 4dae732a535846ae5dfab753e82a4d5f93ad9a05a065e2172bb9774a1b15453a 00ed038eb6abaf6ddec8d202a3ed7a81b521458f4cd459948115cfd02ff59d6d - 80d1c31c636b1775dd06001747dfb7e2ff60ff716299a8fcc232b8d2faa53a21 - 8fc7ea9451b3a201ac3623b4a0924427cbb6bba410bdf9ebba4f2dfe8e77dfad - c3c16d23517c233d6950d5d43e34cdfa1b15c1ee2e066c8e9a53b4f75a907a87 - 6fc0a61e935a0060ab33bd6406c9ca5f215ac3dff655f83c18f3d144ad389fe5 - 5b0f8b8dee110d8c54fc27ed808ea28c2c675e95f3809e33eb99f03672741833 - 2a81615d588aa80043f7bc3a35db04580c990c90398e77399fcffc66f053e5ac - 80413b57ae20fc1850d15a401d1cec87ac61b1809a1dafc2fa4403bf2029ec94 - 68b96a4e13ee2c157517636aa1c7841f750fbfc0026188f6123af017f3fa3117 - 2466595f6e74d9599e16095cc61c6de769461c935c20a442db1d2dfd2d7bde9b - 5b97f786eaebc785aaa365f17eb7cc9a1dd2b5a15b277a5229157ea76945fdc1" + d4e98ab3f790b831793218430bba0d8b24a5fbf4da65b0c1ffa8cb0cfbeb0cdc + a490ed7e2ed21e587459feaeace7036b7ede4ce84e72e10dfd8c57434a6918b6 + e04e9e40f9ecb601c85f4d84ed9bf66b45363be1d1e82c162e4c9902b8cb508f + b66ee696653e2ed365919deaaef885103120c792e22e79af70d1209d7e1d8644 + d5fa5f697298174fa53d247d3599e6a12884605ad181c7b954e2380ec1f0bd89 + d389cb8d76ff4a59ca35f891b8521c72ad5f0df96e253973a2d21a8614a4cc81 + 150007796fc36a4069660ad62449aadaaf3dd11b3864a5ef21e79831c9ce9118 + eb630a36faa586a371eb734dc0bbd8d13ccaef697f3db5872596358f3dd2432a + 8c3b51f4660cd27e1a0d610a9f3f2d5fbc833a66ac9ee4393ee2f2481e855866 + 98605c6b6b9214a945d844e41c85860d54649a45bca7873ef6991c0e93720787" conf_files="/usr/libexec/ghidra/server/server.conf" skip_extraction="AXMLPrinter2.jar vs2012_x64.fidb vs2015_x64.fidb vs2017_x64.fidb vs2019_x64.fidb vsOlder_x64.fidb vsOlder_x86.fidb vs2012_x86.fidb vs2015_x86.fidb vs2017_x86.fidb vs2019_x86.fidb" @@ -76,10 +76,12 @@ post_extract() { do_configure() { mkdir -p dependencies/{GhidraServer,fidb,flatRepo} - cp -f ${XBPS_SRCDISTDIR}/${pkgname}-${version}/yajsw-stable-13.05.zip dependencies/GhidraServer + cp -f ${XBPS_SRCDISTDIR}/${pkgname}-${version}/yajsw-stable-${_yajsw_ver}.zip dependencies/GhidraServer cp -f ${XBPS_SRCDISTDIR}/${pkgname}-${version}/*.fidb dependencies/fidb cp -f ${XBPS_SRCDISTDIR}/${pkgname}-${version}/AXMLPrinter2.jar dependencies/flatRepo - cp -f ../dex2jar-2.0/lib/dex-*.jar dependencies/flatRepo + for _fn in ir reader reader-api translator; do + cp -f ../dex-tools-${_dex_ver}/lib/dex-${_fn}-${_dex_ver}.jar dependencies/flatRepo + done } do_build() {