ghidra: update to 10.2.2

Closes #40381.
This commit is contained in:
sv 2022-11-08 14:30:36 +01:00 committed by Andrew Benson
parent bac07a9754
commit 1740a52acb
2 changed files with 25 additions and 21 deletions

View file

@ -9,39 +9,39 @@
- allProtocArtifacts 'com.google.protobuf:protoc:3.17.3:linux-aarch_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-x86_64@exe'
- allProtocArtifacts 'com.google.protobuf:protoc:3.17.3:osx-aarch_64@exe' - allProtocArtifacts 'com.google.protobuf:protoc:3.17.3:osx-aarch_64@exe'
+ allProtocArtifacts 'com.google.protobuf:protoc:3.18.1:windows-x86_64@exe' + allProtocArtifacts 'com.google.protobuf:protoc:3.21.9:windows-x86_64@exe'
+ allProtocArtifacts 'com.google.protobuf:protoc:3.18.1:linux-x86_64@exe' + allProtocArtifacts 'com.google.protobuf:protoc:3.21.9:linux-x86_64@exe'
+ allProtocArtifacts 'com.google.protobuf:protoc:3.18.1:linux-aarch_64@exe' + allProtocArtifacts 'com.google.protobuf:protoc:3.21.9:linux-aarch_64@exe'
+ allProtocArtifacts 'com.google.protobuf:protoc:3.18.1:osx-x86_64@exe' + allProtocArtifacts 'com.google.protobuf:protoc:3.21.9:osx-x86_64@exe'
+ allProtocArtifacts 'com.google.protobuf:protoc:3.18.1:osx-aarch_64@exe' + allProtocArtifacts 'com.google.protobuf:protoc:3.21.9:osx-aarch_64@exe'
if (isCurrentWindows()) { if (isCurrentWindows()) {
- protocArtifact 'com.google.protobuf:protoc:3.17.3:windows-x86_64@exe' - protocArtifact 'com.google.protobuf:protoc:3.17.3:windows-x86_64@exe'
+ protocArtifact 'com.google.protobuf:protoc:3.18.1:windows-x86_64@exe' + protocArtifact 'com.google.protobuf:protoc:3.21.9:windows-x86_64@exe'
} }
if (isCurrentLinux()) { if (isCurrentLinux()) {
if (platform.endsWith("x86_64")) { if (platform.endsWith("x86_64")) {
- protocArtifact 'com.google.protobuf:protoc:3.17.3:linux-x86_64@exe' - protocArtifact 'com.google.protobuf:protoc:3.17.3:linux-x86_64@exe'
+ protocArtifact 'com.google.protobuf:protoc:3.18.1:linux-x86_64@exe' + protocArtifact 'com.google.protobuf:protoc:3.21.9:linux-x86_64@exe'
} }
else { else {
- protocArtifact 'com.google.protobuf:protoc:3.17.3:linux-aarch_64@exe' - protocArtifact 'com.google.protobuf:protoc:3.17.3:linux-aarch_64@exe'
+ protocArtifact 'com.google.protobuf:protoc:3.18.1:linux-aarch_64@exe' + protocArtifact 'com.google.protobuf:protoc:3.21.9:linux-aarch_64@exe'
} }
} }
if (isCurrentMac()) { if (isCurrentMac()) {
if (platform.endsWith("x86_64")) { if (platform.endsWith("x86_64")) {
- protocArtifact 'com.google.protobuf:protoc:3.17.3:osx-x86_64@exe' - protocArtifact 'com.google.protobuf:protoc:3.17.3:osx-x86_64@exe'
+ protocArtifact 'com.google.protobuf:protoc:3.18.1:osx-x86_64@exe' + protocArtifact 'com.google.protobuf:protoc:3.21.9:osx-x86_64@exe'
} }
else { else {
- protocArtifact 'com.google.protobuf:protoc:3.17.3:osx-aarch_64@exe' - protocArtifact 'com.google.protobuf:protoc:3.17.3:osx-aarch_64@exe'
+ protocArtifact 'com.google.protobuf:protoc:3.18.1: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.17.3'
+ api 'com.google.protobuf:protobuf-java:3.18.1' + api 'com.google.protobuf:protobuf-java:3.21.9'
api project(':Framework-AsyncComm') api project(':Framework-AsyncComm')
api project(':Framework-Debugging') api project(':Framework-Debugging')
api project(':ProposedUtils') api project(':ProposedUtils')
@ -50,7 +50,7 @@
/*protobuf { /*protobuf {
protoc { protoc {
- artifact = 'com.google.protobuf:protoc:3.17.3' - artifact = 'com.google.protobuf:protoc:3.17.3'
+ artifact = 'com.google.protobuf:protoc:3.18.1' + artifact = 'com.google.protobuf:protoc:3.21.9'
} }
}*/ }*/
@ -73,5 +73,5 @@
--- ghidra-10.1/ghidra_build/Ghidra/Debug/Debugger-gadp/Module.manifest 2021-12-10 19:03:38.000000000 +0100 --- 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 +++ - 2021-12-11 13:02:09.420069640 +0100
@@ -1 +1 @@ @@ -1 +1 @@
-MODULE FILE LICENSE: lib/protobuf-java-3.17.3.jar BSD -MODULE FILE LICENSE: lib/protobuf-java-3.17.3.jar BSD-3-GOOGLE
+MODULE FILE LICENSE: lib/protobuf-java-3.18.1.jar BSD +MODULE FILE LICENSE: lib/protobuf-java-3.21.9.jar BSD-3-GOOGLE

View file

@ -1,22 +1,23 @@
# Template file for 'ghidra' # Template file for 'ghidra'
pkgname=ghidra pkgname=ghidra
version=10.1.5 version=10.2.2
revision=1 revision=1
# commit id of 'ghidra-data' repo:
_commit=939210dab2570714944ac35a4daef9633fd842b3 _commit=939210dab2570714944ac35a4daef9633fd842b3
archs="x86_64* aarch64*" archs="x86_64* aarch64*"
# Other 64bit archs should be easily patchable, # Other 64bit archs should be easily patchable,
# grep for linux_arm_64 to find all places in need of patching # grep for linux_arm_64 to find all places in need of patching
create_wrksrc=yes create_wrksrc=yes
build_wrksrc="ghidra_build" build_wrksrc="ghidra_build"
hostmakedepends="gradle openjdk11 flex unzip protobuf which" hostmakedepends="gradle openjdk17 flex unzip protobuf which"
depends="openjdk11" depends="openjdk17"
short_desc="Software reverse engineering (SRE) framework" short_desc="Software reverse engineering (SRE) framework"
maintainer="Andrew Benson <abenson+void@gmail.com>" maintainer="Andrew Benson <abenson+void@gmail.com>"
license="Apache-2.0" license="Apache-2.0"
homepage="https://ghidra-sre.org/" homepage="https://ghidra-sre.org/"
distfiles="https://github.com/NationalSecurityAgency/ghidra/archive/Ghidra_${version}_build.tar.gz 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://github.com/pxb1988/dex2jar/releases/download/2.0/dex-tools-2.0.zip
https://sourceforge.net/projects/yajsw/files/yajsw/yajsw-beta-13.01/yajsw-beta-13.01.zip https://sourceforge.net/projects/yajsw/files/yajsw/yajsw-stable-13.05/yajsw-stable-13.05.zip
https://storage.googleapis.com/google-code-archive-downloads/v2/code.google.com/android4me/AXMLPrinter2.jar 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_x64.fidb
https://github.com/NationalSecurityAgency/ghidra-data/raw/${_commit}/FunctionID/vs2012_x86.fidb https://github.com/NationalSecurityAgency/ghidra-data/raw/${_commit}/FunctionID/vs2012_x86.fidb
@ -28,9 +29,9 @@ distfiles="https://github.com/NationalSecurityAgency/ghidra/archive/Ghidra_${ver
https://github.com/NationalSecurityAgency/ghidra-data/raw/${_commit}/FunctionID/vs2019_x86.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_x64.fidb
https://github.com/NationalSecurityAgency/ghidra-data/raw/${_commit}/FunctionID/vsOlder_x86.fidb" https://github.com/NationalSecurityAgency/ghidra-data/raw/${_commit}/FunctionID/vsOlder_x86.fidb"
checksum="935840ba384406a58f9bf70542f29ec33270c2f484365a5b00997d4fa2de5458 checksum="63645c44039b87b65c20bd64b9bd1d2fe4749704220da0b0756a18061cf0f543
7907eb4d6e9280b6e17ddce7ee0507eae2ef161ee29f70a10dbc6944fdca75bc 7907eb4d6e9280b6e17ddce7ee0507eae2ef161ee29f70a10dbc6944fdca75bc
430fb7901bd0fd52a5b90bd0cbd89e9d334077eb72a9b26896f465de1e593a99 ff7a4c8262f7d24079b16607122bad8f6fb024f051c27b91883d9498568429a9
00ed038eb6abaf6ddec8d202a3ed7a81b521458f4cd459948115cfd02ff59d6d 00ed038eb6abaf6ddec8d202a3ed7a81b521458f4cd459948115cfd02ff59d6d
80d1c31c636b1775dd06001747dfb7e2ff60ff716299a8fcc232b8d2faa53a21 80d1c31c636b1775dd06001747dfb7e2ff60ff716299a8fcc232b8d2faa53a21
8fc7ea9451b3a201ac3623b4a0924427cbb6bba410bdf9ebba4f2dfe8e77dfad 8fc7ea9451b3a201ac3623b4a0924427cbb6bba410bdf9ebba4f2dfe8e77dfad
@ -75,7 +76,7 @@ post_extract() {
do_configure() { do_configure() {
mkdir -p dependencies/{GhidraServer,fidb,flatRepo} mkdir -p dependencies/{GhidraServer,fidb,flatRepo}
cp -f ${XBPS_SRCDISTDIR}/${pkgname}-${version}/yajsw-beta-13.01.zip dependencies/GhidraServer cp -f ${XBPS_SRCDISTDIR}/${pkgname}-${version}/yajsw-stable-13.05.zip dependencies/GhidraServer
cp -f ${XBPS_SRCDISTDIR}/${pkgname}-${version}/*.fidb dependencies/fidb cp -f ${XBPS_SRCDISTDIR}/${pkgname}-${version}/*.fidb dependencies/fidb
cp -f ${XBPS_SRCDISTDIR}/${pkgname}-${version}/AXMLPrinter2.jar dependencies/flatRepo cp -f ${XBPS_SRCDISTDIR}/${pkgname}-${version}/AXMLPrinter2.jar dependencies/flatRepo
cp -f ../dex2jar-2.0/lib/dex-*.jar dependencies/flatRepo cp -f ../dex2jar-2.0/lib/dex-*.jar dependencies/flatRepo
@ -95,4 +96,7 @@ do_install() {
bsdtar --strip-components 1 -C ${DESTDIR}/usr/libexec/ghidra -xf build/dist/ghidra_${version}_DEV_$(date -u +%Y%m%d)_linux_${arch}.zip bsdtar --strip-components 1 -C ${DESTDIR}/usr/libexec/ghidra -xf build/dist/ghidra_${version}_DEV_$(date -u +%Y%m%d)_linux_${arch}.zip
vmkdir usr/bin vmkdir usr/bin
ln -srf /usr/libexec/$pkgname/ghidraRun ${DESTDIR}/usr/bin/ghidra ln -srf /usr/libexec/$pkgname/ghidraRun ${DESTDIR}/usr/bin/ghidra
if [ "$XBPS_TARGET_LIBC" = "musl" ]; then
rm ${DESTDIR}/usr/libexec/ghidra/Ghidra/Features/FileFormats/data/sevenzipnativelibs/Linux-amd64/lib7-Zip-JBinding.so
fi
} }