mirror of
https://github.com/void-linux/void-packages.git
synced 2025-08-02 02:42:56 +02:00
ghidra: update to 11.4.
This commit is contained in:
parent
acf112473e
commit
9cea207db0
3 changed files with 66 additions and 44 deletions
|
@ -1,6 +1,6 @@
|
||||||
--- a/ghidra_build/build.gradle 2021-09-28 20:47:24.000000000 +0200
|
--- a/ghidra_build/build.gradle
|
||||||
+++ - 2021-10-21 16:31:33.820391721 +0200
|
+++ b/ghidra_build/build.gradle
|
||||||
@@ -246,7 +246,7 @@
|
@@ -295,7 +295,7 @@
|
||||||
*********************************************************************************/
|
*********************************************************************************/
|
||||||
def getCurrentDate() {
|
def getCurrentDate() {
|
||||||
|
|
||||||
|
@ -9,7 +9,7 @@
|
||||||
def formattedDate = date.format('yyyyMMdd')
|
def formattedDate = date.format('yyyyMMdd')
|
||||||
return formattedDate
|
return formattedDate
|
||||||
}
|
}
|
||||||
@@ -256,7 +256,7 @@
|
@@ -305,7 +305,7 @@
|
||||||
*********************************************************************************/
|
*********************************************************************************/
|
||||||
def getCurrentDateTime() {
|
def getCurrentDateTime() {
|
||||||
|
|
||||||
|
@ -18,7 +18,7 @@
|
||||||
def formattedDate = date.format('yyyyMMdd-HHmm')
|
def formattedDate = date.format('yyyyMMdd-HHmm')
|
||||||
return formattedDate
|
return formattedDate
|
||||||
}
|
}
|
||||||
@@ -266,7 +266,7 @@
|
@@ -315,7 +315,7 @@
|
||||||
*********************************************************************************/
|
*********************************************************************************/
|
||||||
def getCurrentDateTimeLong() {
|
def getCurrentDateTimeLong() {
|
||||||
|
|
||||||
|
|
|
@ -1,21 +1,31 @@
|
||||||
--- ghidra-10.4/ghidra_build/Ghidra/Debug/Framework-AsyncComm/Module.manifest
|
--- a/ghidra_build/Ghidra/Debug/ProposedUtils/Module.manifest
|
||||||
+++ ghidra-10.4/ghidra_build/Ghidra/Debug/Framework-AsyncComm/Module.manifest
|
+++ b/ghidra_build/Ghidra/Debug/ProposedUtils/Module.manifest
|
||||||
@@ -1 +1 @@
|
@@ -1 +1 @@
|
||||||
-MODULE FILE LICENSE: lib/protobuf-java-3.21.8.jar BSD-3-GOOGLE
|
-MODULE FILE LICENSE: lib/protobuf-java-3.21.8.jar BSD-3-GOOGLE
|
||||||
+MODULE FILE LICENSE: lib/protobuf-java-3.24.3.jar BSD-3-GOOGLE
|
+MODULE FILE LICENSE: lib/protobuf-java-3.25.5.jar BSD-3-GOOGLE
|
||||||
--- ghidra-10.4/ghidra_build/Ghidra/Debug/Framework-AsyncComm/build.gradle
|
--- a/ghidra_build/Ghidra/Extensions/MachineLearning/Module.manifest
|
||||||
+++ ghidra-10.4/ghidra_build/Ghidra/Debug/Framework-AsyncComm/build.gradle
|
+++ b/ghidra_build/Ghidra/Extensions/MachineLearning/Module.manifest
|
||||||
@@ -22,7 +22,7 @@
|
@@ -1,6 +1,6 @@
|
||||||
eclipse.project.name = 'Debug Framework-AsyncComm'
|
MODULE FILE LICENSE: lib/olcut-config-protobuf-5.2.0.jar BSD-2-ORACLE
|
||||||
|
MODULE FILE LICENSE: lib/olcut-core-5.2.0.jar BSD-2-ORACLE
|
||||||
dependencies {
|
-MODULE FILE LICENSE: lib/protobuf-java-3.21.8.jar BSD-3-GOOGLE
|
||||||
- api 'com.google.protobuf:protobuf-java:3.21.8'
|
+MODULE FILE LICENSE: lib/protobuf-java-3.25.5.jar BSD-3-GOOGLE
|
||||||
+ api 'com.google.protobuf:protobuf-java:3.24.3'
|
MODULE FILE LICENSE: lib/tribuo-classification-core-4.2.0.jar Apache License 2.0
|
||||||
api project(':Generic')
|
MODULE FILE LICENSE: lib/tribuo-classification-tree-4.2.0.jar Apache License 2.0
|
||||||
api project(':Graph')
|
MODULE FILE LICENSE: lib/tribuo-common-tree-4.2.0.jar Apache License 2.0
|
||||||
api project(':ProposedUtils')
|
--- a/ghidra_build/gradle/hasProtobuf.gradle
|
||||||
--- ghidra-10.4/ghidra_build/gradle/hasProtobuf.gradle
|
+++ b/ghidra_build/gradle/hasProtobuf.gradle
|
||||||
+++ ghidra-10.4/ghidra_build/gradle/hasProtobuf.gradle
|
@@ -67,7 +67,7 @@
|
||||||
|
if (!isCurrentWindows()) {
|
||||||
|
exe.setExecutable(true)
|
||||||
|
}
|
||||||
|
- generateProto.commandLine exe, "--java_out=${generateProto.outdir}", "-I${generateProto.srcdir}"
|
||||||
|
+ generateProto.commandLine "/usr/bin/protoc", "--java_out=${generateProto.outdir}", "-I${generateProto.srcdir}"
|
||||||
|
generateProto.args generateProto.src
|
||||||
|
}
|
||||||
|
}
|
||||||
|
--- a/ghidra_build/gradle/hasProtobuf.gradle
|
||||||
|
+++ b/ghidra_build/gradle/hasProtobuf.gradle
|
||||||
@@ -26,36 +26,36 @@
|
@@ -26,36 +26,36 @@
|
||||||
|
|
||||||
|
|
||||||
|
@ -25,34 +35,34 @@
|
||||||
- allProtocArtifacts 'com.google.protobuf:protoc:3.21.8:linux-aarch_64@exe'
|
- allProtocArtifacts 'com.google.protobuf:protoc:3.21.8:linux-aarch_64@exe'
|
||||||
- allProtocArtifacts 'com.google.protobuf:protoc:3.21.8:osx-x86_64@exe'
|
- allProtocArtifacts 'com.google.protobuf:protoc:3.21.8:osx-x86_64@exe'
|
||||||
- allProtocArtifacts 'com.google.protobuf:protoc:3.21.8:osx-aarch_64@exe'
|
- allProtocArtifacts 'com.google.protobuf:protoc:3.21.8:osx-aarch_64@exe'
|
||||||
+ allProtocArtifacts 'com.google.protobuf:protoc:3.24.3:windows-x86_64@exe'
|
+ allProtocArtifacts 'com.google.protobuf:protoc:3.25.5:windows-x86_64@exe'
|
||||||
+ allProtocArtifacts 'com.google.protobuf:protoc:3.24.3:linux-x86_64@exe'
|
+ allProtocArtifacts 'com.google.protobuf:protoc:3.25.5:linux-x86_64@exe'
|
||||||
+ allProtocArtifacts 'com.google.protobuf:protoc:3.24.3:linux-aarch_64@exe'
|
+ allProtocArtifacts 'com.google.protobuf:protoc:3.25.5:linux-aarch_64@exe'
|
||||||
+ allProtocArtifacts 'com.google.protobuf:protoc:3.24.3:osx-x86_64@exe'
|
+ allProtocArtifacts 'com.google.protobuf:protoc:3.25.5:osx-x86_64@exe'
|
||||||
+ allProtocArtifacts 'com.google.protobuf:protoc:3.24.3:osx-aarch_64@exe'
|
+ allProtocArtifacts 'com.google.protobuf:protoc:3.25.5:osx-aarch_64@exe'
|
||||||
|
|
||||||
if (isCurrentWindows()) {
|
if (isCurrentWindows()) {
|
||||||
- protocArtifact 'com.google.protobuf:protoc:3.21.8:windows-x86_64@exe'
|
- protocArtifact 'com.google.protobuf:protoc:3.21.8:windows-x86_64@exe'
|
||||||
+ protocArtifact 'com.google.protobuf:protoc:3.24.3:windows-x86_64@exe'
|
+ protocArtifact 'com.google.protobuf:protoc:3.25.5:windows-x86_64@exe'
|
||||||
}
|
}
|
||||||
if (isCurrentLinux()) {
|
if (isCurrentLinux()) {
|
||||||
if (platform.endsWith("x86_64")) {
|
if (platform.endsWith("x86_64")) {
|
||||||
- protocArtifact 'com.google.protobuf:protoc:3.21.8:linux-x86_64@exe'
|
- protocArtifact 'com.google.protobuf:protoc:3.21.8:linux-x86_64@exe'
|
||||||
+ protocArtifact 'com.google.protobuf:protoc:3.24.3:linux-x86_64@exe'
|
+ protocArtifact 'com.google.protobuf:protoc:3.25.5:linux-x86_64@exe'
|
||||||
}
|
}
|
||||||
else {
|
else {
|
||||||
- protocArtifact 'com.google.protobuf:protoc:3.21.8:linux-aarch_64@exe'
|
- protocArtifact 'com.google.protobuf:protoc:3.21.8:linux-aarch_64@exe'
|
||||||
+ protocArtifact 'com.google.protobuf:protoc:3.24.3:linux-aarch_64@exe'
|
+ protocArtifact 'com.google.protobuf:protoc:3.25.5:linux-aarch_64@exe'
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
if (isCurrentMac()) {
|
if (isCurrentMac()) {
|
||||||
if (platform.endsWith("x86_64")) {
|
if (platform.endsWith("x86_64")) {
|
||||||
- protocArtifact 'com.google.protobuf:protoc:3.21.8:osx-x86_64@exe'
|
- protocArtifact 'com.google.protobuf:protoc:3.21.8:osx-x86_64@exe'
|
||||||
+ protocArtifact 'com.google.protobuf:protoc:3.24.3:osx-x86_64@exe'
|
+ protocArtifact 'com.google.protobuf:protoc:3.25.5:osx-x86_64@exe'
|
||||||
}
|
}
|
||||||
else {
|
else {
|
||||||
- protocArtifact 'com.google.protobuf:protoc:3.21.8:osx-aarch_64@exe'
|
- protocArtifact 'com.google.protobuf:protoc:3.21.8:osx-aarch_64@exe'
|
||||||
+ protocArtifact 'com.google.protobuf:protoc:3.24.3:osx-aarch_64@exe'
|
+ protocArtifact 'com.google.protobuf:protoc:3.25.5:osx-aarch_64@exe'
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
@ -60,16 +70,29 @@
|
||||||
/*protobuf {
|
/*protobuf {
|
||||||
protoc {
|
protoc {
|
||||||
- artifact = 'com.google.protobuf:protoc:3.21.8'
|
- artifact = 'com.google.protobuf:protoc:3.21.8'
|
||||||
+ artifact = 'com.google.protobuf:protoc:3.24.3'
|
+ artifact = 'com.google.protobuf:protoc:3.25.5'
|
||||||
}
|
}
|
||||||
}*/
|
}*/
|
||||||
|
|
||||||
@@ -74,7 +74,7 @@
|
--- a/ghidra_build/Ghidra/Debug/ProposedUtils/build.gradle
|
||||||
exe.setExecutable(true)
|
+++ b/ghidra_build/Ghidra/Debug/ProposedUtils/build.gradle
|
||||||
}
|
@@ -24,7 +24,7 @@
|
||||||
exec {
|
// val autoServiceVersion = "1.0-rc5"
|
||||||
- commandLine exe, "--java_out=$outdir", "-I$srcdir"
|
|
||||||
+ commandLine '/usr/bin/protoc', "--java_out=$outdir", "-I$srcdir"
|
dependencies {
|
||||||
args src
|
- api 'com.google.protobuf:protobuf-java:3.21.8'
|
||||||
}
|
+ api 'com.google.protobuf:protobuf-java:3.25.5'
|
||||||
}
|
api project(':DB')
|
||||||
|
api project(':Project')
|
||||||
|
api project(':SoftwareModeling')
|
||||||
|
--- a/ghidra_build/Ghidra/Extensions/MachineLearning/build.gradle
|
||||||
|
+++ b/ghidra_build/Ghidra/Extensions/MachineLearning/build.gradle
|
||||||
|
@@ -26,7 +26,7 @@
|
||||||
|
|
||||||
|
api "com.oracle.labs.olcut:olcut-config-protobuf:5.2.0" //{exclude group: "com.google.protobuf", module: "protobuf-java"}
|
||||||
|
api ("com.oracle.labs.olcut:olcut-core:5.2.0") {exclude group: "org.jline"}
|
||||||
|
- api "com.google.protobuf:protobuf-java:3.21.8" //only needed for running junits
|
||||||
|
+ api "com.google.protobuf:protobuf-java:3.25.5" //only needed for running junits
|
||||||
|
api "org.tribuo:tribuo-classification-core:4.2.0"
|
||||||
|
api "org.tribuo:tribuo-classification-tree:4.2.0"
|
||||||
|
api "org.tribuo:tribuo-common-tree:4.2.0"
|
||||||
|
|
|
@ -1,6 +1,6 @@
|
||||||
# Template file for 'ghidra'
|
# Template file for 'ghidra'
|
||||||
pkgname=ghidra
|
pkgname=ghidra
|
||||||
version=11.3.2
|
version=11.4
|
||||||
revision=1
|
revision=1
|
||||||
_dex_ver=2.1
|
_dex_ver=2.1
|
||||||
_yajsw_ver=13.12
|
_yajsw_ver=13.12
|
||||||
|
@ -15,7 +15,6 @@ _psutil_ver=5.9.8
|
||||||
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
|
|
||||||
build_wrksrc="ghidra_build"
|
build_wrksrc="ghidra_build"
|
||||||
hostmakedepends="gradle openjdk21 flex unzip protobuf which python3-wheel python3-pip"
|
hostmakedepends="gradle openjdk21 flex unzip protobuf which python3-wheel python3-pip"
|
||||||
depends="openjdk21"
|
depends="openjdk21"
|
||||||
|
@ -46,7 +45,7 @@ distfiles="https://github.com/NationalSecurityAgency/ghidra/archive/Ghidra_${ver
|
||||||
https://github.com/NationalSecurityAgency/ghidra-data/raw/Ghidra_${version}/FunctionID/vs2019_x86.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_x64.fidb
|
||||||
https://github.com/NationalSecurityAgency/ghidra-data/raw/Ghidra_${version}/FunctionID/vsOlder_x86.fidb"
|
https://github.com/NationalSecurityAgency/ghidra-data/raw/Ghidra_${version}/FunctionID/vsOlder_x86.fidb"
|
||||||
checksum="cb456614e125fc9958bc46104d3e6d688f718a79bbb81da850a1f3719f2fc4b6
|
checksum="20143ebb46b3ce18110f4718d5741586cf1ad31a1e470e32d0f18e3c960c47c0
|
||||||
7a9bdf843d43de4d1e94ec2e7b6f55825017b0c4a7ee39ff82660e2493a46f08
|
7a9bdf843d43de4d1e94ec2e7b6f55825017b0c4a7ee39ff82660e2493a46f08
|
||||||
c6fc59815d3800d14ec977926a8afd3f606a0ebd74d2cfd60601677466edeaa2
|
c6fc59815d3800d14ec977926a8afd3f606a0ebd74d2cfd60601677466edeaa2
|
||||||
7f736566494756d271aa5e4b1af6c89dc50d074ab1c6374a47df822264226b01
|
7f736566494756d271aa5e4b1af6c89dc50d074ab1c6374a47df822264226b01
|
||||||
|
|
Loading…
Add table
Reference in a new issue