ghidra: bump protobuf-java to 3.23.4

This commit is contained in:
John 2023-07-16 19:54:48 +02:00 committed by John Zimmermann
parent 663ff02471
commit 84d32f5310
2 changed files with 114 additions and 1 deletions

View file

@ -0,0 +1,113 @@
diff '--color=auto' -ur ghidra-10.3.2.orig/ghidra_build/Ghidra/Debug/Debugger-gadp/build.gradle ghidra-10.3.2/ghidra_build/Ghidra/Debug/Debugger-gadp/build.gradle
--- ghidra-10.3.2.orig/ghidra_build/Ghidra/Debug/Debugger-gadp/build.gradle 2023-07-11 22:09:00.000000000 +0200
+++ ghidra-10.3.2/ghidra_build/Ghidra/Debug/Debugger-gadp/build.gradle 2023-07-16 19:53:06.304326118 +0200
@@ -33,29 +33,29 @@
def platform = getCurrentPlatformName()
dependencies {
- allProtocArtifacts 'com.google.protobuf:protoc:3.21.8:windows-x86_64@exe'
- allProtocArtifacts 'com.google.protobuf:protoc:3.21.8:linux-x86_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-aarch_64@exe'
+ allProtocArtifacts 'com.google.protobuf:protoc:3.23.4:windows-x86_64@exe'
+ allProtocArtifacts 'com.google.protobuf:protoc:3.23.4:linux-x86_64@exe'
+ allProtocArtifacts 'com.google.protobuf:protoc:3.23.4:linux-aarch_64@exe'
+ allProtocArtifacts 'com.google.protobuf:protoc:3.23.4:osx-x86_64@exe'
+ allProtocArtifacts 'com.google.protobuf:protoc:3.23.4:osx-aarch_64@exe'
if (isCurrentWindows()) {
- protocArtifact 'com.google.protobuf:protoc:3.21.8:windows-x86_64@exe'
+ protocArtifact 'com.google.protobuf:protoc:3.23.4:windows-x86_64@exe'
}
if (isCurrentLinux()) {
if (platform.endsWith("x86_64")) {
- protocArtifact 'com.google.protobuf:protoc:3.21.8:linux-x86_64@exe'
+ protocArtifact 'com.google.protobuf:protoc:3.23.4:linux-x86_64@exe'
}
else {
- protocArtifact 'com.google.protobuf:protoc:3.21.8:linux-aarch_64@exe'
+ protocArtifact 'com.google.protobuf:protoc:3.23.4:linux-aarch_64@exe'
}
}
if (isCurrentMac()) {
if (platform.endsWith("x86_64")) {
- protocArtifact 'com.google.protobuf:protoc:3.21.8:osx-x86_64@exe'
+ protocArtifact 'com.google.protobuf:protoc:3.23.4:osx-x86_64@exe'
}
else {
- protocArtifact 'com.google.protobuf:protoc:3.21.8:osx-aarch_64@exe'
+ protocArtifact 'com.google.protobuf:protoc:3.23.4:osx-aarch_64@exe'
}
}
@@ -69,7 +69,7 @@
/*protobuf {
protoc {
- artifact = 'com.google.protobuf:protoc:3.21.8'
+ artifact = 'com.google.protobuf:protoc:3.23.4'
}
}*/
diff '--color=auto' -ur ghidra-10.3.2.orig/ghidra_build/Ghidra/Debug/Debugger-isf/build.gradle ghidra-10.3.2/ghidra_build/Ghidra/Debug/Debugger-isf/build.gradle
--- ghidra-10.3.2.orig/ghidra_build/Ghidra/Debug/Debugger-isf/build.gradle 2023-07-11 22:09:00.000000000 +0200
+++ ghidra-10.3.2/ghidra_build/Ghidra/Debug/Debugger-isf/build.gradle 2023-07-16 19:53:06.304326118 +0200
@@ -30,29 +30,29 @@
def platform = getCurrentPlatformName()
dependencies {
- allProtocArtifacts 'com.google.protobuf:protoc:3.21.8:windows-x86_64@exe'
- allProtocArtifacts 'com.google.protobuf:protoc:3.21.8:linux-x86_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-aarch_64@exe'
+ allProtocArtifacts 'com.google.protobuf:protoc:3.23.4:windows-x86_64@exe'
+ allProtocArtifacts 'com.google.protobuf:protoc:3.23.4:linux-x86_64@exe'
+ allProtocArtifacts 'com.google.protobuf:protoc:3.23.4:linux-aarch_64@exe'
+ allProtocArtifacts 'com.google.protobuf:protoc:3.23.4:osx-x86_64@exe'
+ allProtocArtifacts 'com.google.protobuf:protoc:3.23.4:osx-aarch_64@exe'
if (isCurrentWindows()) {
- protocArtifact 'com.google.protobuf:protoc:3.21.8:windows-x86_64@exe'
+ protocArtifact 'com.google.protobuf:protoc:3.23.4:windows-x86_64@exe'
}
if (isCurrentLinux()) {
if (platform.endsWith("x86_64")) {
- protocArtifact 'com.google.protobuf:protoc:3.21.8:linux-x86_64@exe'
+ protocArtifact 'com.google.protobuf:protoc:3.23.4:linux-x86_64@exe'
}
else {
- protocArtifact 'com.google.protobuf:protoc:3.21.8:linux-aarch_64@exe'
+ protocArtifact 'com.google.protobuf:protoc:3.23.4:linux-aarch_64@exe'
}
}
if (isCurrentMac()) {
if (platform.endsWith("x86_64")) {
- protocArtifact 'com.google.protobuf:protoc:3.21.8:osx-x86_64@exe'
+ protocArtifact 'com.google.protobuf:protoc:3.23.4:osx-x86_64@exe'
}
else {
- protocArtifact 'com.google.protobuf:protoc:3.21.8:osx-aarch_64@exe'
+ protocArtifact 'com.google.protobuf:protoc:3.23.4:osx-aarch_64@exe'
}
}
diff '--color=auto' -ur ghidra-10.3.2.orig/ghidra_build/Ghidra/Debug/Framework-AsyncComm/Module.manifest ghidra-10.3.2/ghidra_build/Ghidra/Debug/Framework-AsyncComm/Module.manifest
--- ghidra-10.3.2.orig/ghidra_build/Ghidra/Debug/Framework-AsyncComm/Module.manifest 2023-07-11 22:09:00.000000000 +0200
+++ ghidra-10.3.2/ghidra_build/Ghidra/Debug/Framework-AsyncComm/Module.manifest 2023-07-16 19:53:06.304326118 +0200
@@ -1 +1 @@
-MODULE FILE LICENSE: lib/protobuf-java-3.21.8.jar BSD-3-GOOGLE
+MODULE FILE LICENSE: lib/protobuf-java-3.23.4.jar BSD-3-GOOGLE
diff '--color=auto' -ur ghidra-10.3.2.orig/ghidra_build/Ghidra/Debug/Framework-AsyncComm/build.gradle ghidra-10.3.2/ghidra_build/Ghidra/Debug/Framework-AsyncComm/build.gradle
--- ghidra-10.3.2.orig/ghidra_build/Ghidra/Debug/Framework-AsyncComm/build.gradle 2023-07-11 22:09:00.000000000 +0200
+++ ghidra-10.3.2/ghidra_build/Ghidra/Debug/Framework-AsyncComm/build.gradle 2023-07-16 19:53:06.305326125 +0200
@@ -22,7 +22,7 @@
eclipse.project.name = 'Debug Framework-AsyncComm'
dependencies {
- api 'com.google.protobuf:protobuf-java:3.21.8'
+ api 'com.google.protobuf:protobuf-java:3.23.4'
api project(':Generic')
api project(':Graph')
api project(':ProposedUtils')

View file

@ -1,7 +1,7 @@
# Template file for 'ghidra'
pkgname=ghidra
version=10.3.2
revision=1
revision=2
_dex_ver=2.1
_yajsw_ver=13.09
archs="x86_64* aarch64*"