From 84d32f5310f688d62502948fec8e816d8261f7d7 Mon Sep 17 00:00:00 2001 From: John Date: Sun, 16 Jul 2023 19:54:48 +0200 Subject: [PATCH] ghidra: bump protobuf-java to 3.23.4 --- srcpkgs/ghidra/patches/protobuf-3.23.4.patch | 113 +++++++++++++++++++ srcpkgs/ghidra/template | 2 +- 2 files changed, 114 insertions(+), 1 deletion(-) create mode 100644 srcpkgs/ghidra/patches/protobuf-3.23.4.patch diff --git a/srcpkgs/ghidra/patches/protobuf-3.23.4.patch b/srcpkgs/ghidra/patches/protobuf-3.23.4.patch new file mode 100644 index 00000000000..e4fb6333779 --- /dev/null +++ b/srcpkgs/ghidra/patches/protobuf-3.23.4.patch @@ -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') diff --git a/srcpkgs/ghidra/template b/srcpkgs/ghidra/template index 250fe70d38e..881922c1f29 100644 --- a/srcpkgs/ghidra/template +++ b/srcpkgs/ghidra/template @@ -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*"