[PR PATCH] ghidra: update to 10.2

Github messages for voidlinux
 help / color / mirror / Atom feed

* [PR PATCH] ghidra: update to 10.2
@ 2022-11-08 13:43 vitezfh
  2022-11-08 23:07 ` classabbyamp
                   ` (22 more replies)
  0 siblings, 23 replies; 24+ messages in thread
From: vitezfh @ 2022-11-08 13:43 UTC (permalink / raw)
  To: ml

[-- Attachment #1: Type: text/plain, Size: 1260 bytes --]

There is a new pull request by vitezfh against master on the void-packages repository

https://github.com/vitezfh/void-packages ghidra_update
https://github.com/void-linux/void-packages/pull/40381

ghidra: update to 10.2
<!-- Uncomment relevant sections and delete options which are not applicable -->

#### Testing the changes
- I tested the changes in this PR: **briefly**

<!--
#### New package
- This new package conforms to the [package requirements](https://github.com/void-linux/void-packages/blob/master/CONTRIBUTING.md#package-requirements): **YES**|**NO**
-->

<!-- Note: If the build is likely to take more than 2 hours, please add ci skip tag as described in
https://github.com/void-linux/void-packages/blob/master/CONTRIBUTING.md#continuous-integration
and test at least one native build and, if supported, at least one cross build.
Ignore this section if this PR is not skipping CI.
-->

#### Local build testing
- I built this PR locally for my native architecture, (x86_64-glibc)

Maybe someone familiar with ghidra can have another look. @abenson ?
It compiles and patches successfully after these changes. Runs seemingly fine too.

A patch file from https://github.com/void-linux/void-packages/pull/40381.patch is attached

[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-ghidra_update-40381.patch --]
[-- Type: text/x-diff, Size: 8385 bytes --]

From ed8164a7864f9e1a6773979910cb82cd7182824f Mon Sep 17 00:00:00 2001
From: sv <stjepan@vitez.xyz>
Date: Tue, 8 Nov 2022 14:30:36 +0100
Subject: [PATCH] ghidra: update to 10.2

---
 srcpkgs/ghidra/patches/protoc.patch | 28 +++++++++---------
 srcpkgs/ghidra/template             | 44 ++++++++---------------------
 2 files changed, 25 insertions(+), 47 deletions(-)

diff --git a/srcpkgs/ghidra/patches/protoc.patch b/srcpkgs/ghidra/patches/protoc.patch
index aa985b86cf6d..ed98035e6372 100644
--- a/srcpkgs/ghidra/patches/protoc.patch
+++ b/srcpkgs/ghidra/patches/protoc.patch
@@ -9,39 +9,39 @@
 -	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.18.1:windows-x86_64@exe'
-+	allProtocArtifacts 'com.google.protobuf:protoc:3.18.1:linux-x86_64@exe'
-+	allProtocArtifacts 'com.google.protobuf:protoc:3.18.1:linux-aarch_64@exe'
-+	allProtocArtifacts 'com.google.protobuf:protoc:3.18.1:osx-x86_64@exe'
-+	allProtocArtifacts 'com.google.protobuf:protoc:3.18.1: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.18.1: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.18.1: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.18.1: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.18.1: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.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.18.1'
++	api 'com.google.protobuf:protobuf-java:3.21.9'
  	api project(':Framework-AsyncComm')
  	api project(':Framework-Debugging')
  	api project(':ProposedUtils')
@@ -50,7 +50,7 @@
  /*protobuf {
  	protoc {
 -		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
 +++ -	2021-12-11 13:02:09.420069640 +0100
 @@ -1 +1 @@
--MODULE FILE LICENSE: lib/protobuf-java-3.17.3.jar BSD
-+MODULE FILE LICENSE: lib/protobuf-java-3.18.1.jar BSD
+-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 32edeb3be08b..055ea7358b2a 100644
--- a/srcpkgs/ghidra/template
+++ b/srcpkgs/ghidra/template
@@ -1,50 +1,29 @@
 # Template file for 'ghidra'
 pkgname=ghidra
-version=10.1.5
+version=10.2
 revision=1
-_commit=939210dab2570714944ac35a4daef9633fd842b3
+_commit=17884b878680e640dd5c30210736a1d062ae5ba2
 archs="x86_64* aarch64*"
 # Other 64bit archs should be easily patchable,
 # grep for linux_arm_64 to find all places in need of patching
 create_wrksrc=yes
 build_wrksrc="ghidra_build"
-hostmakedepends="gradle openjdk11 flex unzip protobuf which"
-depends="openjdk11"
+hostmakedepends="gradle openjdk17 flex unzip protobuf which"
+depends="openjdk17"
 short_desc="Software reverse engineering (SRE) framework"
 maintainer="Andrew Benson <abenson+void@gmail.com>"
 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-beta-13.01/yajsw-beta-13.01.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="935840ba384406a58f9bf70542f29ec33270c2f484365a5b00997d4fa2de5458
+ 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"
+checksum="75988e08d39b3dc57e72e8465e54a46347b66b03a2f6be3c661ced219e6ec063
  7907eb4d6e9280b6e17ddce7ee0507eae2ef161ee29f70a10dbc6944fdca75bc
- 430fb7901bd0fd52a5b90bd0cbd89e9d334077eb72a9b26896f465de1e593a99
- 00ed038eb6abaf6ddec8d202a3ed7a81b521458f4cd459948115cfd02ff59d6d
- 80d1c31c636b1775dd06001747dfb7e2ff60ff716299a8fcc232b8d2faa53a21
- 8fc7ea9451b3a201ac3623b4a0924427cbb6bba410bdf9ebba4f2dfe8e77dfad
- c3c16d23517c233d6950d5d43e34cdfa1b15c1ee2e066c8e9a53b4f75a907a87
- 6fc0a61e935a0060ab33bd6406c9ca5f215ac3dff655f83c18f3d144ad389fe5
- 5b0f8b8dee110d8c54fc27ed808ea28c2c675e95f3809e33eb99f03672741833
- 2a81615d588aa80043f7bc3a35db04580c990c90398e77399fcffc66f053e5ac
- 80413b57ae20fc1850d15a401d1cec87ac61b1809a1dafc2fa4403bf2029ec94
- 68b96a4e13ee2c157517636aa1c7841f750fbfc0026188f6123af017f3fa3117
- 2466595f6e74d9599e16095cc61c6de769461c935c20a442db1d2dfd2d7bde9b
- 5b97f786eaebc785aaa365f17eb7cc9a1dd2b5a15b277a5229157ea76945fdc1"
+ ff7a4c8262f7d24079b16607122bad8f6fb024f051c27b91883d9498568429a9
+ 00ed038eb6abaf6ddec8d202a3ed7a81b521458f4cd459948115cfd02ff59d6d"
 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"
+skip_extraction="AXMLPrinter2.jar"
 nopie=yes
 nostrip_files="animals createStructure dataMutability inline ldiv opaque
  setRegister switch compilerVsDecompiler custom globalRegVars.so
@@ -75,9 +54,8 @@ post_extract() {
 
 do_configure() {
 	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}/*.fidb dependencies/fidb
 	cp -f ${XBPS_SRCDISTDIR}/${pkgname}-${version}/AXMLPrinter2.jar dependencies/flatRepo
+	cp -f ${XBPS_SRCDISTDIR}/${pkgname}-${version}/yajsw-stable-13.05.zip dependencies/GhidraServer
 	cp -f ../dex2jar-2.0/lib/dex-*.jar dependencies/flatRepo
 }
 

^ permalink raw reply	[flat|nested] 24+ messages in thread

* Re: ghidra: update to 10.2
  2022-11-08 13:43 [PR PATCH] ghidra: update to 10.2 vitezfh
@ 2022-11-08 23:07 ` classabbyamp
  2022-11-08 23:39 ` vitezfh
                   ` (21 subsequent siblings)
  22 siblings, 0 replies; 24+ messages in thread
From: classabbyamp @ 2022-11-08 23:07 UTC (permalink / raw)
  To: ml

[-- Attachment #1: Type: text/plain, Size: 209 bytes --]

New comment by classabbyamp on void-packages repository

https://github.com/void-linux/void-packages/pull/40381#issuecomment-1307958002

Comment:
please add the email you used to commit to your github account

^ permalink raw reply	[flat|nested] 24+ messages in thread

* Re: ghidra: update to 10.2
  2022-11-08 13:43 [PR PATCH] ghidra: update to 10.2 vitezfh
  2022-11-08 23:07 ` classabbyamp
@ 2022-11-08 23:39 ` vitezfh
  2022-11-09 11:52 ` unspecd
                   ` (20 subsequent siblings)
  22 siblings, 0 replies; 24+ messages in thread
From: vitezfh @ 2022-11-08 23:39 UTC (permalink / raw)
  To: ml

[-- Attachment #1: Type: text/plain, Size: 171 bytes --]

New comment by vitezfh on void-packages repository

https://github.com/void-linux/void-packages/pull/40381#issuecomment-1307981773

Comment:
Done. Thanks for the heads-up

^ permalink raw reply	[flat|nested] 24+ messages in thread

* Re: ghidra: update to 10.2
  2022-11-08 13:43 [PR PATCH] ghidra: update to 10.2 vitezfh
  2022-11-08 23:07 ` classabbyamp
  2022-11-08 23:39 ` vitezfh
@ 2022-11-09 11:52 ` unspecd
  2022-11-09 12:03 ` unspecd
                   ` (19 subsequent siblings)
  22 siblings, 0 replies; 24+ messages in thread
From: unspecd @ 2022-11-09 11:52 UTC (permalink / raw)
  To: ml

[-- Attachment #1: Type: text/plain, Size: 186 bytes --]

New comment by unspecd on void-packages repository

https://github.com/void-linux/void-packages/pull/40381#issuecomment-1308635977

Comment:
What's the point of deleting `*.fidb` files?

^ permalink raw reply	[flat|nested] 24+ messages in thread

* Re: ghidra: update to 10.2
  2022-11-08 13:43 [PR PATCH] ghidra: update to 10.2 vitezfh
                   ` (2 preceding siblings ...)
  2022-11-09 11:52 ` unspecd
@ 2022-11-09 12:03 ` unspecd
  2022-11-09 12:04 ` unspecd
                   ` (18 subsequent siblings)
  22 siblings, 0 replies; 24+ messages in thread
From: unspecd @ 2022-11-09 12:03 UTC (permalink / raw)
  To: ml

[-- Attachment #1: Type: text/plain, Size: 355 bytes --]

New comment by unspecd on void-packages repository

https://github.com/void-linux/void-packages/pull/40381#issuecomment-1308648193

Comment:
https://github.com/void-linux/void-packages/actions/runs/3419934671/jobs/5703039380#step:7:2738

> SONAME: ld-linux-x86-64.so.2 <-> glibc>=2.32_1

Looks like there are some extraneous files compiled for glibc.

^ permalink raw reply	[flat|nested] 24+ messages in thread

* Re: ghidra: update to 10.2
  2022-11-08 13:43 [PR PATCH] ghidra: update to 10.2 vitezfh
                   ` (3 preceding siblings ...)
  2022-11-09 12:03 ` unspecd
@ 2022-11-09 12:04 ` unspecd
  2022-11-09 12:05 ` vitezfh
                   ` (17 subsequent siblings)
  22 siblings, 0 replies; 24+ messages in thread
From: unspecd @ 2022-11-09 12:04 UTC (permalink / raw)
  To: ml

[-- Attachment #1: Type: text/plain, Size: 358 bytes --]

New comment by unspecd on void-packages repository

https://github.com/void-linux/void-packages/pull/40381#issuecomment-1308648193

Comment:
https://github.com/void-linux/void-packages/actions/runs/3419934671/jobs/5703039380#step:7:2738

> SONAME: ld-linux-x86-64.so.2 <-> glibc>=2.32_1

Looks like there are some extraneous binaries compiled for glibc.

^ permalink raw reply	[flat|nested] 24+ messages in thread

* Re: ghidra: update to 10.2
  2022-11-08 13:43 [PR PATCH] ghidra: update to 10.2 vitezfh
                   ` (4 preceding siblings ...)
  2022-11-09 12:04 ` unspecd
@ 2022-11-09 12:05 ` vitezfh
  2022-11-09 12:06 ` unspecd
                   ` (16 subsequent siblings)
  22 siblings, 0 replies; 24+ messages in thread
From: vitezfh @ 2022-11-09 12:05 UTC (permalink / raw)
  To: ml

[-- Attachment #1: Type: text/plain, Size: 301 bytes --]

New comment by vitezfh on void-packages repository

https://github.com/void-linux/void-packages/pull/40381#issuecomment-1308650868

Comment:
> What's the point of deleting `*.fidb` files?

I'm looking it up right now. I think a source was missing for one or more of them.. I might be misremembering

^ permalink raw reply	[flat|nested] 24+ messages in thread

* Re: ghidra: update to 10.2
  2022-11-08 13:43 [PR PATCH] ghidra: update to 10.2 vitezfh
                   ` (5 preceding siblings ...)
  2022-11-09 12:05 ` vitezfh
@ 2022-11-09 12:06 ` unspecd
  2022-11-09 12:11 ` unspecd
                   ` (15 subsequent siblings)
  22 siblings, 0 replies; 24+ messages in thread
From: unspecd @ 2022-11-09 12:06 UTC (permalink / raw)
  To: ml

[-- Attachment #1: Type: text/plain, Size: 476 bytes --]

New comment by unspecd on void-packages repository

https://github.com/void-linux/void-packages/pull/40381#issuecomment-1308652136

Comment:
> https://github.com/void-linux/void-packages/actions/runs/3419934671/jobs/5703039380#step:7:2738
> 
> > SONAME: ld-linux-x86-64.so.2 <-> glibc>=2.32_1
> 
> Looks like there are some extraneous binaries compiled for glibc.

/usr/libexec/ghidra/Ghidra/Features/FileFormats/data/sevenzipnativelibs/Linux-amd64/lib7-Zip-JBinding.so

^ permalink raw reply	[flat|nested] 24+ messages in thread

* Re: ghidra: update to 10.2
  2022-11-08 13:43 [PR PATCH] ghidra: update to 10.2 vitezfh
                   ` (6 preceding siblings ...)
  2022-11-09 12:06 ` unspecd
@ 2022-11-09 12:11 ` unspecd
  2022-11-09 13:04 ` vitezfh
                   ` (14 subsequent siblings)
  22 siblings, 0 replies; 24+ messages in thread
From: unspecd @ 2022-11-09 12:11 UTC (permalink / raw)
  To: ml

[-- Attachment #1: Type: text/plain, Size: 904 bytes --]

New comment by unspecd on void-packages repository

https://github.com/void-linux/void-packages/pull/40381#issuecomment-1308652136

Comment:
> https://github.com/void-linux/void-packages/actions/runs/3419934671/jobs/5703039380#step:7:2738
> 
> > SONAME: ld-linux-x86-64.so.2 <-> glibc>=2.32_1
> 
> Looks like there are some extraneous binaries compiled for glibc.

/usr/libexec/ghidra/Ghidra/Features/FileFormats/data/sevenzipnativelibs/Linux-amd64/lib7-Zip-JBinding.so

I would just remove this file:
```diff
@@ -95,4 +97,5 @@ 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
 	vmkdir usr/bin
 	ln -srf /usr/libexec/$pkgname/ghidraRun ${DESTDIR}/usr/bin/ghidra
+	rm ${DESTDIR}/usr/libexec/ghidra/Ghidra/Features/FileFormats/data/sevenzipnativelibs/Linux-amd64/lib7-Zip-JBinding.so
```

^ permalink raw reply	[flat|nested] 24+ messages in thread

* Re: ghidra: update to 10.2
  2022-11-08 13:43 [PR PATCH] ghidra: update to 10.2 vitezfh
                   ` (7 preceding siblings ...)
  2022-11-09 12:11 ` unspecd
@ 2022-11-09 13:04 ` vitezfh
  2022-11-09 13:04 ` vitezfh
                   ` (13 subsequent siblings)
  22 siblings, 0 replies; 24+ messages in thread
From: vitezfh @ 2022-11-09 13:04 UTC (permalink / raw)
  To: ml

[-- Attachment #1: Type: text/plain, Size: 450 bytes --]

New comment by vitezfh on void-packages repository

https://github.com/void-linux/void-packages/pull/40381#issuecomment-1308650868

Comment:
> What's the point of deleting `*.fidb` files?

I'm looking it up right now. I think a source was missing for one or more of them.. I might be misremembering
Edit: Resolved. Mistake on my part. I assumed they merged the ghidra-data repo to the main one and didn't double check commit id. It's building atm

^ permalink raw reply	[flat|nested] 24+ messages in thread

* Re: ghidra: update to 10.2
  2022-11-08 13:43 [PR PATCH] ghidra: update to 10.2 vitezfh
                   ` (8 preceding siblings ...)
  2022-11-09 13:04 ` vitezfh
@ 2022-11-09 13:04 ` vitezfh
  2022-11-09 13:13 ` [PR PATCH] [Updated] " vitezfh
                   ` (12 subsequent siblings)
  22 siblings, 0 replies; 24+ messages in thread
From: vitezfh @ 2022-11-09 13:04 UTC (permalink / raw)
  To: ml

[-- Attachment #1: Type: text/plain, Size: 456 bytes --]

New comment by vitezfh on void-packages repository

https://github.com/void-linux/void-packages/pull/40381#issuecomment-1308650868

Comment:
> What's the point of deleting `*.fidb` files?

I'm looking it up right now. I think a source was missing for one or more of them.. I might be misremembering
Edit: **Resolved**. Mistake on my part. I assumed they merged the ghidra-data repo to the main one and I didn't double check commit id. It's building atm

^ permalink raw reply	[flat|nested] 24+ messages in thread

* Re: [PR PATCH] [Updated] ghidra: update to 10.2
  2022-11-08 13:43 [PR PATCH] ghidra: update to 10.2 vitezfh
                   ` (9 preceding siblings ...)
  2022-11-09 13:04 ` vitezfh
@ 2022-11-09 13:13 ` vitezfh
  2022-11-09 14:38 ` vitezfh
                   ` (11 subsequent siblings)
  22 siblings, 0 replies; 24+ messages in thread
From: vitezfh @ 2022-11-09 13:13 UTC (permalink / raw)
  To: ml

[-- Attachment #1: Type: text/plain, Size: 1265 bytes --]

There is an updated pull request by vitezfh against master on the void-packages repository

https://github.com/vitezfh/void-packages ghidra_update
https://github.com/void-linux/void-packages/pull/40381

ghidra: update to 10.2
<!-- Uncomment relevant sections and delete options which are not applicable -->

#### Testing the changes
- I tested the changes in this PR: **briefly**

<!--
#### New package
- This new package conforms to the [package requirements](https://github.com/void-linux/void-packages/blob/master/CONTRIBUTING.md#package-requirements): **YES**|**NO**
-->

<!-- Note: If the build is likely to take more than 2 hours, please add ci skip tag as described in
https://github.com/void-linux/void-packages/blob/master/CONTRIBUTING.md#continuous-integration
and test at least one native build and, if supported, at least one cross build.
Ignore this section if this PR is not skipping CI.
-->

#### Local build testing
- I built this PR locally for my native architecture, (x86_64-glibc)

Maybe someone familiar with ghidra can have another look. @abenson ?
It compiles and patches successfully after these changes. Runs seemingly fine too.

A patch file from https://github.com/void-linux/void-packages/pull/40381.patch is attached

[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-ghidra_update-40381.patch --]
[-- Type: text/x-diff, Size: 12724 bytes --]

From ed8164a7864f9e1a6773979910cb82cd7182824f Mon Sep 17 00:00:00 2001
From: sv <stjepan@vitez.xyz>
Date: Tue, 8 Nov 2022 14:30:36 +0100
Subject: [PATCH 1/2] ghidra: update to 10.2

---
 srcpkgs/ghidra/patches/protoc.patch | 28 +++++++++---------
 srcpkgs/ghidra/template             | 44 ++++++++---------------------
 2 files changed, 25 insertions(+), 47 deletions(-)

diff --git a/srcpkgs/ghidra/patches/protoc.patch b/srcpkgs/ghidra/patches/protoc.patch
index aa985b86cf6d..ed98035e6372 100644
--- a/srcpkgs/ghidra/patches/protoc.patch
+++ b/srcpkgs/ghidra/patches/protoc.patch
@@ -9,39 +9,39 @@
 -	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.18.1:windows-x86_64@exe'
-+	allProtocArtifacts 'com.google.protobuf:protoc:3.18.1:linux-x86_64@exe'
-+	allProtocArtifacts 'com.google.protobuf:protoc:3.18.1:linux-aarch_64@exe'
-+	allProtocArtifacts 'com.google.protobuf:protoc:3.18.1:osx-x86_64@exe'
-+	allProtocArtifacts 'com.google.protobuf:protoc:3.18.1: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.18.1: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.18.1: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.18.1: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.18.1: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.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.18.1'
++	api 'com.google.protobuf:protobuf-java:3.21.9'
  	api project(':Framework-AsyncComm')
  	api project(':Framework-Debugging')
  	api project(':ProposedUtils')
@@ -50,7 +50,7 @@
  /*protobuf {
  	protoc {
 -		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
 +++ -	2021-12-11 13:02:09.420069640 +0100
 @@ -1 +1 @@
--MODULE FILE LICENSE: lib/protobuf-java-3.17.3.jar BSD
-+MODULE FILE LICENSE: lib/protobuf-java-3.18.1.jar BSD
+-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 32edeb3be08b..055ea7358b2a 100644
--- a/srcpkgs/ghidra/template
+++ b/srcpkgs/ghidra/template
@@ -1,50 +1,29 @@
 # Template file for 'ghidra'
 pkgname=ghidra
-version=10.1.5
+version=10.2
 revision=1
-_commit=939210dab2570714944ac35a4daef9633fd842b3
+_commit=17884b878680e640dd5c30210736a1d062ae5ba2
 archs="x86_64* aarch64*"
 # Other 64bit archs should be easily patchable,
 # grep for linux_arm_64 to find all places in need of patching
 create_wrksrc=yes
 build_wrksrc="ghidra_build"
-hostmakedepends="gradle openjdk11 flex unzip protobuf which"
-depends="openjdk11"
+hostmakedepends="gradle openjdk17 flex unzip protobuf which"
+depends="openjdk17"
 short_desc="Software reverse engineering (SRE) framework"
 maintainer="Andrew Benson <abenson+void@gmail.com>"
 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-beta-13.01/yajsw-beta-13.01.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="935840ba384406a58f9bf70542f29ec33270c2f484365a5b00997d4fa2de5458
+ 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"
+checksum="75988e08d39b3dc57e72e8465e54a46347b66b03a2f6be3c661ced219e6ec063
  7907eb4d6e9280b6e17ddce7ee0507eae2ef161ee29f70a10dbc6944fdca75bc
- 430fb7901bd0fd52a5b90bd0cbd89e9d334077eb72a9b26896f465de1e593a99
- 00ed038eb6abaf6ddec8d202a3ed7a81b521458f4cd459948115cfd02ff59d6d
- 80d1c31c636b1775dd06001747dfb7e2ff60ff716299a8fcc232b8d2faa53a21
- 8fc7ea9451b3a201ac3623b4a0924427cbb6bba410bdf9ebba4f2dfe8e77dfad
- c3c16d23517c233d6950d5d43e34cdfa1b15c1ee2e066c8e9a53b4f75a907a87
- 6fc0a61e935a0060ab33bd6406c9ca5f215ac3dff655f83c18f3d144ad389fe5
- 5b0f8b8dee110d8c54fc27ed808ea28c2c675e95f3809e33eb99f03672741833
- 2a81615d588aa80043f7bc3a35db04580c990c90398e77399fcffc66f053e5ac
- 80413b57ae20fc1850d15a401d1cec87ac61b1809a1dafc2fa4403bf2029ec94
- 68b96a4e13ee2c157517636aa1c7841f750fbfc0026188f6123af017f3fa3117
- 2466595f6e74d9599e16095cc61c6de769461c935c20a442db1d2dfd2d7bde9b
- 5b97f786eaebc785aaa365f17eb7cc9a1dd2b5a15b277a5229157ea76945fdc1"
+ ff7a4c8262f7d24079b16607122bad8f6fb024f051c27b91883d9498568429a9
+ 00ed038eb6abaf6ddec8d202a3ed7a81b521458f4cd459948115cfd02ff59d6d"
 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"
+skip_extraction="AXMLPrinter2.jar"
 nopie=yes
 nostrip_files="animals createStructure dataMutability inline ldiv opaque
  setRegister switch compilerVsDecompiler custom globalRegVars.so
@@ -75,9 +54,8 @@ post_extract() {
 
 do_configure() {
 	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}/*.fidb dependencies/fidb
 	cp -f ${XBPS_SRCDISTDIR}/${pkgname}-${version}/AXMLPrinter2.jar dependencies/flatRepo
+	cp -f ${XBPS_SRCDISTDIR}/${pkgname}-${version}/yajsw-stable-13.05.zip dependencies/GhidraServer
 	cp -f ../dex2jar-2.0/lib/dex-*.jar dependencies/flatRepo
 }
 

From d9ad3784cb9f91e0e3ddf82d64e304730094d725 Mon Sep 17 00:00:00 2001
From: vitezfh <stjepan@vitez.xyz>
Date: Wed, 9 Nov 2022 14:10:19 +0100
Subject: [PATCH 2/2] ghidra: 10.2 update, revert/fix *.fidb removal

---
 srcpkgs/ghidra/template | 33 ++++++++++++++++++++++++++++-----
 1 file changed, 28 insertions(+), 5 deletions(-)

diff --git a/srcpkgs/ghidra/template b/srcpkgs/ghidra/template
index 055ea7358b2a..e385b682e874 100644
--- a/srcpkgs/ghidra/template
+++ b/srcpkgs/ghidra/template
@@ -2,7 +2,8 @@
 pkgname=ghidra
 version=10.2
 revision=1
-_commit=17884b878680e640dd5c30210736a1d062ae5ba2
+# commit id of 'ghidra-data' repo:
+_commit=939210dab2570714944ac35a4daef9633fd842b3
 archs="x86_64* aarch64*"
 # Other 64bit archs should be easily patchable,
 # grep for linux_arm_64 to find all places in need of patching
@@ -17,13 +18,34 @@ 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://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_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="75988e08d39b3dc57e72e8465e54a46347b66b03a2f6be3c661ced219e6ec063
  7907eb4d6e9280b6e17ddce7ee0507eae2ef161ee29f70a10dbc6944fdca75bc
  ff7a4c8262f7d24079b16607122bad8f6fb024f051c27b91883d9498568429a9
- 00ed038eb6abaf6ddec8d202a3ed7a81b521458f4cd459948115cfd02ff59d6d"
+ 00ed038eb6abaf6ddec8d202a3ed7a81b521458f4cd459948115cfd02ff59d6d
+ 80d1c31c636b1775dd06001747dfb7e2ff60ff716299a8fcc232b8d2faa53a21
+ 8fc7ea9451b3a201ac3623b4a0924427cbb6bba410bdf9ebba4f2dfe8e77dfad
+ c3c16d23517c233d6950d5d43e34cdfa1b15c1ee2e066c8e9a53b4f75a907a87
+ 6fc0a61e935a0060ab33bd6406c9ca5f215ac3dff655f83c18f3d144ad389fe5
+ 5b0f8b8dee110d8c54fc27ed808ea28c2c675e95f3809e33eb99f03672741833
+ 2a81615d588aa80043f7bc3a35db04580c990c90398e77399fcffc66f053e5ac
+ 80413b57ae20fc1850d15a401d1cec87ac61b1809a1dafc2fa4403bf2029ec94
+ 68b96a4e13ee2c157517636aa1c7841f750fbfc0026188f6123af017f3fa3117
+ 2466595f6e74d9599e16095cc61c6de769461c935c20a442db1d2dfd2d7bde9b
+ 5b97f786eaebc785aaa365f17eb7cc9a1dd2b5a15b277a5229157ea76945fdc1"
 conf_files="/usr/libexec/ghidra/server/server.conf"
-skip_extraction="AXMLPrinter2.jar"
+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"
 nopie=yes
 nostrip_files="animals createStructure dataMutability inline ldiv opaque
  setRegister switch compilerVsDecompiler custom globalRegVars.so
@@ -54,8 +76,9 @@ post_extract() {
 
 do_configure() {
 	mkdir -p dependencies/{GhidraServer,fidb,flatRepo}
-	cp -f ${XBPS_SRCDISTDIR}/${pkgname}-${version}/AXMLPrinter2.jar dependencies/flatRepo
 	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}/AXMLPrinter2.jar dependencies/flatRepo
 	cp -f ../dex2jar-2.0/lib/dex-*.jar dependencies/flatRepo
 }
 

^ permalink raw reply	[flat|nested] 24+ messages in thread

* Re: ghidra: update to 10.2
  2022-11-08 13:43 [PR PATCH] ghidra: update to 10.2 vitezfh
                   ` (10 preceding siblings ...)
  2022-11-09 13:13 ` [PR PATCH] [Updated] " vitezfh
@ 2022-11-09 14:38 ` vitezfh
  2022-11-09 14:38 ` [PR PATCH] [Updated] " vitezfh
                   ` (10 subsequent siblings)
  22 siblings, 0 replies; 24+ messages in thread
From: vitezfh @ 2022-11-09 14:38 UTC (permalink / raw)
  To: ml

[-- Attachment #1: Type: text/plain, Size: 273 bytes --]

New comment by vitezfh on void-packages repository

https://github.com/void-linux/void-packages/pull/40381#issuecomment-1308862336

Comment:
I can't make much sense of it. But I added the change and tested it very shortly on **glibc**. Seems to work. Commiting it as well.

^ permalink raw reply	[flat|nested] 24+ messages in thread

* Re: [PR PATCH] [Updated] ghidra: update to 10.2
  2022-11-08 13:43 [PR PATCH] ghidra: update to 10.2 vitezfh
                   ` (11 preceding siblings ...)
  2022-11-09 14:38 ` vitezfh
@ 2022-11-09 14:38 ` vitezfh
  2022-11-09 14:47 ` unspecd
                   ` (9 subsequent siblings)
  22 siblings, 0 replies; 24+ messages in thread
From: vitezfh @ 2022-11-09 14:38 UTC (permalink / raw)
  To: ml

[-- Attachment #1: Type: text/plain, Size: 1265 bytes --]

There is an updated pull request by vitezfh against master on the void-packages repository

https://github.com/vitezfh/void-packages ghidra_update
https://github.com/void-linux/void-packages/pull/40381

ghidra: update to 10.2
<!-- Uncomment relevant sections and delete options which are not applicable -->

#### Testing the changes
- I tested the changes in this PR: **briefly**

<!--
#### New package
- This new package conforms to the [package requirements](https://github.com/void-linux/void-packages/blob/master/CONTRIBUTING.md#package-requirements): **YES**|**NO**
-->

<!-- Note: If the build is likely to take more than 2 hours, please add ci skip tag as described in
https://github.com/void-linux/void-packages/blob/master/CONTRIBUTING.md#continuous-integration
and test at least one native build and, if supported, at least one cross build.
Ignore this section if this PR is not skipping CI.
-->

#### Local build testing
- I built this PR locally for my native architecture, (x86_64-glibc)

Maybe someone familiar with ghidra can have another look. @abenson ?
It compiles and patches successfully after these changes. Runs seemingly fine too.

A patch file from https://github.com/void-linux/void-packages/pull/40381.patch is attached

[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-ghidra_update-40381.patch --]
[-- Type: text/x-diff, Size: 13550 bytes --]

From ed8164a7864f9e1a6773979910cb82cd7182824f Mon Sep 17 00:00:00 2001
From: sv <stjepan@vitez.xyz>
Date: Tue, 8 Nov 2022 14:30:36 +0100
Subject: [PATCH 1/3] ghidra: update to 10.2

---
 srcpkgs/ghidra/patches/protoc.patch | 28 +++++++++---------
 srcpkgs/ghidra/template             | 44 ++++++++---------------------
 2 files changed, 25 insertions(+), 47 deletions(-)

diff --git a/srcpkgs/ghidra/patches/protoc.patch b/srcpkgs/ghidra/patches/protoc.patch
index aa985b86cf6d..ed98035e6372 100644
--- a/srcpkgs/ghidra/patches/protoc.patch
+++ b/srcpkgs/ghidra/patches/protoc.patch
@@ -9,39 +9,39 @@
 -	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.18.1:windows-x86_64@exe'
-+	allProtocArtifacts 'com.google.protobuf:protoc:3.18.1:linux-x86_64@exe'
-+	allProtocArtifacts 'com.google.protobuf:protoc:3.18.1:linux-aarch_64@exe'
-+	allProtocArtifacts 'com.google.protobuf:protoc:3.18.1:osx-x86_64@exe'
-+	allProtocArtifacts 'com.google.protobuf:protoc:3.18.1: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.18.1: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.18.1: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.18.1: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.18.1: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.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.18.1'
++	api 'com.google.protobuf:protobuf-java:3.21.9'
  	api project(':Framework-AsyncComm')
  	api project(':Framework-Debugging')
  	api project(':ProposedUtils')
@@ -50,7 +50,7 @@
  /*protobuf {
  	protoc {
 -		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
 +++ -	2021-12-11 13:02:09.420069640 +0100
 @@ -1 +1 @@
--MODULE FILE LICENSE: lib/protobuf-java-3.17.3.jar BSD
-+MODULE FILE LICENSE: lib/protobuf-java-3.18.1.jar BSD
+-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 32edeb3be08b..055ea7358b2a 100644
--- a/srcpkgs/ghidra/template
+++ b/srcpkgs/ghidra/template
@@ -1,50 +1,29 @@
 # Template file for 'ghidra'
 pkgname=ghidra
-version=10.1.5
+version=10.2
 revision=1
-_commit=939210dab2570714944ac35a4daef9633fd842b3
+_commit=17884b878680e640dd5c30210736a1d062ae5ba2
 archs="x86_64* aarch64*"
 # Other 64bit archs should be easily patchable,
 # grep for linux_arm_64 to find all places in need of patching
 create_wrksrc=yes
 build_wrksrc="ghidra_build"
-hostmakedepends="gradle openjdk11 flex unzip protobuf which"
-depends="openjdk11"
+hostmakedepends="gradle openjdk17 flex unzip protobuf which"
+depends="openjdk17"
 short_desc="Software reverse engineering (SRE) framework"
 maintainer="Andrew Benson <abenson+void@gmail.com>"
 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-beta-13.01/yajsw-beta-13.01.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="935840ba384406a58f9bf70542f29ec33270c2f484365a5b00997d4fa2de5458
+ 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"
+checksum="75988e08d39b3dc57e72e8465e54a46347b66b03a2f6be3c661ced219e6ec063
  7907eb4d6e9280b6e17ddce7ee0507eae2ef161ee29f70a10dbc6944fdca75bc
- 430fb7901bd0fd52a5b90bd0cbd89e9d334077eb72a9b26896f465de1e593a99
- 00ed038eb6abaf6ddec8d202a3ed7a81b521458f4cd459948115cfd02ff59d6d
- 80d1c31c636b1775dd06001747dfb7e2ff60ff716299a8fcc232b8d2faa53a21
- 8fc7ea9451b3a201ac3623b4a0924427cbb6bba410bdf9ebba4f2dfe8e77dfad
- c3c16d23517c233d6950d5d43e34cdfa1b15c1ee2e066c8e9a53b4f75a907a87
- 6fc0a61e935a0060ab33bd6406c9ca5f215ac3dff655f83c18f3d144ad389fe5
- 5b0f8b8dee110d8c54fc27ed808ea28c2c675e95f3809e33eb99f03672741833
- 2a81615d588aa80043f7bc3a35db04580c990c90398e77399fcffc66f053e5ac
- 80413b57ae20fc1850d15a401d1cec87ac61b1809a1dafc2fa4403bf2029ec94
- 68b96a4e13ee2c157517636aa1c7841f750fbfc0026188f6123af017f3fa3117
- 2466595f6e74d9599e16095cc61c6de769461c935c20a442db1d2dfd2d7bde9b
- 5b97f786eaebc785aaa365f17eb7cc9a1dd2b5a15b277a5229157ea76945fdc1"
+ ff7a4c8262f7d24079b16607122bad8f6fb024f051c27b91883d9498568429a9
+ 00ed038eb6abaf6ddec8d202a3ed7a81b521458f4cd459948115cfd02ff59d6d"
 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"
+skip_extraction="AXMLPrinter2.jar"
 nopie=yes
 nostrip_files="animals createStructure dataMutability inline ldiv opaque
  setRegister switch compilerVsDecompiler custom globalRegVars.so
@@ -75,9 +54,8 @@ post_extract() {
 
 do_configure() {
 	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}/*.fidb dependencies/fidb
 	cp -f ${XBPS_SRCDISTDIR}/${pkgname}-${version}/AXMLPrinter2.jar dependencies/flatRepo
+	cp -f ${XBPS_SRCDISTDIR}/${pkgname}-${version}/yajsw-stable-13.05.zip dependencies/GhidraServer
 	cp -f ../dex2jar-2.0/lib/dex-*.jar dependencies/flatRepo
 }
 

From d9ad3784cb9f91e0e3ddf82d64e304730094d725 Mon Sep 17 00:00:00 2001
From: vitezfh <stjepan@vitez.xyz>
Date: Wed, 9 Nov 2022 14:10:19 +0100
Subject: [PATCH 2/3] ghidra: 10.2 update, revert/fix *.fidb removal

---
 srcpkgs/ghidra/template | 33 ++++++++++++++++++++++++++++-----
 1 file changed, 28 insertions(+), 5 deletions(-)

diff --git a/srcpkgs/ghidra/template b/srcpkgs/ghidra/template
index 055ea7358b2a..e385b682e874 100644
--- a/srcpkgs/ghidra/template
+++ b/srcpkgs/ghidra/template
@@ -2,7 +2,8 @@
 pkgname=ghidra
 version=10.2
 revision=1
-_commit=17884b878680e640dd5c30210736a1d062ae5ba2
+# commit id of 'ghidra-data' repo:
+_commit=939210dab2570714944ac35a4daef9633fd842b3
 archs="x86_64* aarch64*"
 # Other 64bit archs should be easily patchable,
 # grep for linux_arm_64 to find all places in need of patching
@@ -17,13 +18,34 @@ 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://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_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="75988e08d39b3dc57e72e8465e54a46347b66b03a2f6be3c661ced219e6ec063
  7907eb4d6e9280b6e17ddce7ee0507eae2ef161ee29f70a10dbc6944fdca75bc
  ff7a4c8262f7d24079b16607122bad8f6fb024f051c27b91883d9498568429a9
- 00ed038eb6abaf6ddec8d202a3ed7a81b521458f4cd459948115cfd02ff59d6d"
+ 00ed038eb6abaf6ddec8d202a3ed7a81b521458f4cd459948115cfd02ff59d6d
+ 80d1c31c636b1775dd06001747dfb7e2ff60ff716299a8fcc232b8d2faa53a21
+ 8fc7ea9451b3a201ac3623b4a0924427cbb6bba410bdf9ebba4f2dfe8e77dfad
+ c3c16d23517c233d6950d5d43e34cdfa1b15c1ee2e066c8e9a53b4f75a907a87
+ 6fc0a61e935a0060ab33bd6406c9ca5f215ac3dff655f83c18f3d144ad389fe5
+ 5b0f8b8dee110d8c54fc27ed808ea28c2c675e95f3809e33eb99f03672741833
+ 2a81615d588aa80043f7bc3a35db04580c990c90398e77399fcffc66f053e5ac
+ 80413b57ae20fc1850d15a401d1cec87ac61b1809a1dafc2fa4403bf2029ec94
+ 68b96a4e13ee2c157517636aa1c7841f750fbfc0026188f6123af017f3fa3117
+ 2466595f6e74d9599e16095cc61c6de769461c935c20a442db1d2dfd2d7bde9b
+ 5b97f786eaebc785aaa365f17eb7cc9a1dd2b5a15b277a5229157ea76945fdc1"
 conf_files="/usr/libexec/ghidra/server/server.conf"
-skip_extraction="AXMLPrinter2.jar"
+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"
 nopie=yes
 nostrip_files="animals createStructure dataMutability inline ldiv opaque
  setRegister switch compilerVsDecompiler custom globalRegVars.so
@@ -54,8 +76,9 @@ post_extract() {
 
 do_configure() {
 	mkdir -p dependencies/{GhidraServer,fidb,flatRepo}
-	cp -f ${XBPS_SRCDISTDIR}/${pkgname}-${version}/AXMLPrinter2.jar dependencies/flatRepo
 	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}/AXMLPrinter2.jar dependencies/flatRepo
 	cp -f ../dex2jar-2.0/lib/dex-*.jar dependencies/flatRepo
 }
 

From ca897e9e46c4a9d2aa778374c30d05c18cedc16e Mon Sep 17 00:00:00 2001
From: vitezfh <stjepan@vitez.xyz>
Date: Wed, 9 Nov 2022 15:38:24 +0100
Subject: [PATCH 3/3] ghidra: remove extraneous binary compiled for glibc

---
 srcpkgs/ghidra/template | 1 +
 1 file changed, 1 insertion(+)

diff --git a/srcpkgs/ghidra/template b/srcpkgs/ghidra/template
index e385b682e874..27141ba7218c 100644
--- a/srcpkgs/ghidra/template
+++ b/srcpkgs/ghidra/template
@@ -96,4 +96,5 @@ 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
 	vmkdir usr/bin
 	ln -srf /usr/libexec/$pkgname/ghidraRun ${DESTDIR}/usr/bin/ghidra
+	rm ${DESTDIR}/usr/libexec/ghidra/Ghidra/Features/FileFormats/data/sevenzipnativelibs/Linux-amd64/lib7-Zip-JBinding.so
 }

^ permalink raw reply	[flat|nested] 24+ messages in thread

* Re: ghidra: update to 10.2
  2022-11-08 13:43 [PR PATCH] ghidra: update to 10.2 vitezfh
                   ` (12 preceding siblings ...)
  2022-11-09 14:38 ` [PR PATCH] [Updated] " vitezfh
@ 2022-11-09 14:47 ` unspecd
  2022-11-09 14:50 ` unspecd
                   ` (8 subsequent siblings)
  22 siblings, 0 replies; 24+ messages in thread
From: unspecd @ 2022-11-09 14:47 UTC (permalink / raw)
  To: ml

[-- Attachment #1: Type: text/plain, Size: 755 bytes --]

New comment by unspecd on void-packages repository

https://github.com/void-linux/void-packages/pull/40381#issuecomment-1308875458

Comment:
> But I added the change and tested it very shortly on **glibc**

This applies to musl, not glibc. I think it would be better if you add a condition like this:

```diff
@@ -95,4 +97,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
 	vmkdir usr/bin
 	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
 }
```

^ permalink raw reply	[flat|nested] 24+ messages in thread

* Re: ghidra: update to 10.2
  2022-11-08 13:43 [PR PATCH] ghidra: update to 10.2 vitezfh
                   ` (13 preceding siblings ...)
  2022-11-09 14:47 ` unspecd
@ 2022-11-09 14:50 ` unspecd
  2022-11-09 14:52 ` unspecd
                   ` (7 subsequent siblings)
  22 siblings, 0 replies; 24+ messages in thread
From: unspecd @ 2022-11-09 14:50 UTC (permalink / raw)
  To: ml

[-- Attachment #1: Type: text/plain, Size: 735 bytes --]

New comment by unspecd on void-packages repository

https://github.com/void-linux/void-packages/pull/40381#issuecomment-1308875458

Comment:
> But I added the change and tested it very shortly on **glibc**

This applies to musl, not glibc. I think we should a condition like this:

```diff
@@ -95,4 +97,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
 	vmkdir usr/bin
 	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
 }
```

^ permalink raw reply	[flat|nested] 24+ messages in thread

* Re: ghidra: update to 10.2
  2022-11-08 13:43 [PR PATCH] ghidra: update to 10.2 vitezfh
                   ` (14 preceding siblings ...)
  2022-11-09 14:50 ` unspecd
@ 2022-11-09 14:52 ` unspecd
  2022-11-09 14:54 ` unspecd
                   ` (6 subsequent siblings)
  22 siblings, 0 replies; 24+ messages in thread
From: unspecd @ 2022-11-09 14:52 UTC (permalink / raw)
  To: ml

[-- Attachment #1: Type: text/plain, Size: 790 bytes --]

New comment by unspecd on void-packages repository

https://github.com/void-linux/void-packages/pull/40381#issuecomment-1308875458

Comment:
> But I added the change and tested it very shortly on **glibc**

This applies to musl, not glibc. I think we should a condition like this:

```diff
@@ -95,4 +97,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
 	vmkdir usr/bin
 	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
 }
```

Otherwise it will fail when installing the package.

^ permalink raw reply	[flat|nested] 24+ messages in thread

* Re: ghidra: update to 10.2
  2022-11-08 13:43 [PR PATCH] ghidra: update to 10.2 vitezfh
                   ` (15 preceding siblings ...)
  2022-11-09 14:52 ` unspecd
@ 2022-11-09 14:54 ` unspecd
  2022-11-09 14:55 ` unspecd
                   ` (5 subsequent siblings)
  22 siblings, 0 replies; 24+ messages in thread
From: unspecd @ 2022-11-09 14:54 UTC (permalink / raw)
  To: ml

[-- Attachment #1: Type: text/plain, Size: 801 bytes --]

New comment by unspecd on void-packages repository

https://github.com/void-linux/void-packages/pull/40381#issuecomment-1308875458

Comment:
> But I added the change and tested it very shortly on **glibc**

This applies to musl, not glibc. I think we should a condition like this:

```diff
@@ -95,4 +97,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
 	vmkdir usr/bin
 	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
 }
```

Otherwise the package installation will fail on *-musl system.

^ permalink raw reply	[flat|nested] 24+ messages in thread

* Re: ghidra: update to 10.2
  2022-11-08 13:43 [PR PATCH] ghidra: update to 10.2 vitezfh
                   ` (16 preceding siblings ...)
  2022-11-09 14:54 ` unspecd
@ 2022-11-09 14:55 ` unspecd
  2022-11-09 16:51 ` [PR PATCH] [Updated] " vitezfh
                   ` (4 subsequent siblings)
  22 siblings, 0 replies; 24+ messages in thread
From: unspecd @ 2022-11-09 14:55 UTC (permalink / raw)
  To: ml

[-- Attachment #1: Type: text/plain, Size: 792 bytes --]

New comment by unspecd on void-packages repository

https://github.com/void-linux/void-packages/pull/40381#issuecomment-1308875458

Comment:
> But I added the change and tested it very shortly on **glibc**

This applies to musl, not glibc. I think we should a condition like this:

```diff
@@ -95,4 +97,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
 	vmkdir usr/bin
 	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
 }
```

Otherwise the package installation will fail on musl.

^ permalink raw reply	[flat|nested] 24+ messages in thread

* Re: [PR PATCH] [Updated] ghidra: update to 10.2
  2022-11-08 13:43 [PR PATCH] ghidra: update to 10.2 vitezfh
                   ` (17 preceding siblings ...)
  2022-11-09 14:55 ` unspecd
@ 2022-11-09 16:51 ` vitezfh
  2022-11-12  6:01 ` oreo639
                   ` (3 subsequent siblings)
  22 siblings, 0 replies; 24+ messages in thread
From: vitezfh @ 2022-11-09 16:51 UTC (permalink / raw)
  To: ml

[-- Attachment #1: Type: text/plain, Size: 1265 bytes --]

There is an updated pull request by vitezfh against master on the void-packages repository

https://github.com/vitezfh/void-packages ghidra_update
https://github.com/void-linux/void-packages/pull/40381

ghidra: update to 10.2
<!-- Uncomment relevant sections and delete options which are not applicable -->

#### Testing the changes
- I tested the changes in this PR: **briefly**

<!--
#### New package
- This new package conforms to the [package requirements](https://github.com/void-linux/void-packages/blob/master/CONTRIBUTING.md#package-requirements): **YES**|**NO**
-->

<!-- Note: If the build is likely to take more than 2 hours, please add ci skip tag as described in
https://github.com/void-linux/void-packages/blob/master/CONTRIBUTING.md#continuous-integration
and test at least one native build and, if supported, at least one cross build.
Ignore this section if this PR is not skipping CI.
-->

#### Local build testing
- I built this PR locally for my native architecture, (x86_64-glibc)

Maybe someone familiar with ghidra can have another look. @abenson ?
It compiles and patches successfully after these changes. Runs seemingly fine too.

A patch file from https://github.com/void-linux/void-packages/pull/40381.patch is attached

[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-ghidra_update-40381.patch --]
[-- Type: text/x-diff, Size: 14564 bytes --]

From ed8164a7864f9e1a6773979910cb82cd7182824f Mon Sep 17 00:00:00 2001
From: sv <stjepan@vitez.xyz>
Date: Tue, 8 Nov 2022 14:30:36 +0100
Subject: [PATCH 1/4] ghidra: update to 10.2

---
 srcpkgs/ghidra/patches/protoc.patch | 28 +++++++++---------
 srcpkgs/ghidra/template             | 44 ++++++++---------------------
 2 files changed, 25 insertions(+), 47 deletions(-)

diff --git a/srcpkgs/ghidra/patches/protoc.patch b/srcpkgs/ghidra/patches/protoc.patch
index aa985b86cf6d..ed98035e6372 100644
--- a/srcpkgs/ghidra/patches/protoc.patch
+++ b/srcpkgs/ghidra/patches/protoc.patch
@@ -9,39 +9,39 @@
 -	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.18.1:windows-x86_64@exe'
-+	allProtocArtifacts 'com.google.protobuf:protoc:3.18.1:linux-x86_64@exe'
-+	allProtocArtifacts 'com.google.protobuf:protoc:3.18.1:linux-aarch_64@exe'
-+	allProtocArtifacts 'com.google.protobuf:protoc:3.18.1:osx-x86_64@exe'
-+	allProtocArtifacts 'com.google.protobuf:protoc:3.18.1: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.18.1: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.18.1: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.18.1: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.18.1: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.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.18.1'
++	api 'com.google.protobuf:protobuf-java:3.21.9'
  	api project(':Framework-AsyncComm')
  	api project(':Framework-Debugging')
  	api project(':ProposedUtils')
@@ -50,7 +50,7 @@
  /*protobuf {
  	protoc {
 -		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
 +++ -	2021-12-11 13:02:09.420069640 +0100
 @@ -1 +1 @@
--MODULE FILE LICENSE: lib/protobuf-java-3.17.3.jar BSD
-+MODULE FILE LICENSE: lib/protobuf-java-3.18.1.jar BSD
+-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 32edeb3be08b..055ea7358b2a 100644
--- a/srcpkgs/ghidra/template
+++ b/srcpkgs/ghidra/template
@@ -1,50 +1,29 @@
 # Template file for 'ghidra'
 pkgname=ghidra
-version=10.1.5
+version=10.2
 revision=1
-_commit=939210dab2570714944ac35a4daef9633fd842b3
+_commit=17884b878680e640dd5c30210736a1d062ae5ba2
 archs="x86_64* aarch64*"
 # Other 64bit archs should be easily patchable,
 # grep for linux_arm_64 to find all places in need of patching
 create_wrksrc=yes
 build_wrksrc="ghidra_build"
-hostmakedepends="gradle openjdk11 flex unzip protobuf which"
-depends="openjdk11"
+hostmakedepends="gradle openjdk17 flex unzip protobuf which"
+depends="openjdk17"
 short_desc="Software reverse engineering (SRE) framework"
 maintainer="Andrew Benson <abenson+void@gmail.com>"
 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-beta-13.01/yajsw-beta-13.01.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="935840ba384406a58f9bf70542f29ec33270c2f484365a5b00997d4fa2de5458
+ 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"
+checksum="75988e08d39b3dc57e72e8465e54a46347b66b03a2f6be3c661ced219e6ec063
  7907eb4d6e9280b6e17ddce7ee0507eae2ef161ee29f70a10dbc6944fdca75bc
- 430fb7901bd0fd52a5b90bd0cbd89e9d334077eb72a9b26896f465de1e593a99
- 00ed038eb6abaf6ddec8d202a3ed7a81b521458f4cd459948115cfd02ff59d6d
- 80d1c31c636b1775dd06001747dfb7e2ff60ff716299a8fcc232b8d2faa53a21
- 8fc7ea9451b3a201ac3623b4a0924427cbb6bba410bdf9ebba4f2dfe8e77dfad
- c3c16d23517c233d6950d5d43e34cdfa1b15c1ee2e066c8e9a53b4f75a907a87
- 6fc0a61e935a0060ab33bd6406c9ca5f215ac3dff655f83c18f3d144ad389fe5
- 5b0f8b8dee110d8c54fc27ed808ea28c2c675e95f3809e33eb99f03672741833
- 2a81615d588aa80043f7bc3a35db04580c990c90398e77399fcffc66f053e5ac
- 80413b57ae20fc1850d15a401d1cec87ac61b1809a1dafc2fa4403bf2029ec94
- 68b96a4e13ee2c157517636aa1c7841f750fbfc0026188f6123af017f3fa3117
- 2466595f6e74d9599e16095cc61c6de769461c935c20a442db1d2dfd2d7bde9b
- 5b97f786eaebc785aaa365f17eb7cc9a1dd2b5a15b277a5229157ea76945fdc1"
+ ff7a4c8262f7d24079b16607122bad8f6fb024f051c27b91883d9498568429a9
+ 00ed038eb6abaf6ddec8d202a3ed7a81b521458f4cd459948115cfd02ff59d6d"
 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"
+skip_extraction="AXMLPrinter2.jar"
 nopie=yes
 nostrip_files="animals createStructure dataMutability inline ldiv opaque
  setRegister switch compilerVsDecompiler custom globalRegVars.so
@@ -75,9 +54,8 @@ post_extract() {
 
 do_configure() {
 	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}/*.fidb dependencies/fidb
 	cp -f ${XBPS_SRCDISTDIR}/${pkgname}-${version}/AXMLPrinter2.jar dependencies/flatRepo
+	cp -f ${XBPS_SRCDISTDIR}/${pkgname}-${version}/yajsw-stable-13.05.zip dependencies/GhidraServer
 	cp -f ../dex2jar-2.0/lib/dex-*.jar dependencies/flatRepo
 }
 

From d9ad3784cb9f91e0e3ddf82d64e304730094d725 Mon Sep 17 00:00:00 2001
From: vitezfh <stjepan@vitez.xyz>
Date: Wed, 9 Nov 2022 14:10:19 +0100
Subject: [PATCH 2/4] ghidra: 10.2 update, revert/fix *.fidb removal

---
 srcpkgs/ghidra/template | 33 ++++++++++++++++++++++++++++-----
 1 file changed, 28 insertions(+), 5 deletions(-)

diff --git a/srcpkgs/ghidra/template b/srcpkgs/ghidra/template
index 055ea7358b2a..e385b682e874 100644
--- a/srcpkgs/ghidra/template
+++ b/srcpkgs/ghidra/template
@@ -2,7 +2,8 @@
 pkgname=ghidra
 version=10.2
 revision=1
-_commit=17884b878680e640dd5c30210736a1d062ae5ba2
+# commit id of 'ghidra-data' repo:
+_commit=939210dab2570714944ac35a4daef9633fd842b3
 archs="x86_64* aarch64*"
 # Other 64bit archs should be easily patchable,
 # grep for linux_arm_64 to find all places in need of patching
@@ -17,13 +18,34 @@ 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://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_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="75988e08d39b3dc57e72e8465e54a46347b66b03a2f6be3c661ced219e6ec063
  7907eb4d6e9280b6e17ddce7ee0507eae2ef161ee29f70a10dbc6944fdca75bc
  ff7a4c8262f7d24079b16607122bad8f6fb024f051c27b91883d9498568429a9
- 00ed038eb6abaf6ddec8d202a3ed7a81b521458f4cd459948115cfd02ff59d6d"
+ 00ed038eb6abaf6ddec8d202a3ed7a81b521458f4cd459948115cfd02ff59d6d
+ 80d1c31c636b1775dd06001747dfb7e2ff60ff716299a8fcc232b8d2faa53a21
+ 8fc7ea9451b3a201ac3623b4a0924427cbb6bba410bdf9ebba4f2dfe8e77dfad
+ c3c16d23517c233d6950d5d43e34cdfa1b15c1ee2e066c8e9a53b4f75a907a87
+ 6fc0a61e935a0060ab33bd6406c9ca5f215ac3dff655f83c18f3d144ad389fe5
+ 5b0f8b8dee110d8c54fc27ed808ea28c2c675e95f3809e33eb99f03672741833
+ 2a81615d588aa80043f7bc3a35db04580c990c90398e77399fcffc66f053e5ac
+ 80413b57ae20fc1850d15a401d1cec87ac61b1809a1dafc2fa4403bf2029ec94
+ 68b96a4e13ee2c157517636aa1c7841f750fbfc0026188f6123af017f3fa3117
+ 2466595f6e74d9599e16095cc61c6de769461c935c20a442db1d2dfd2d7bde9b
+ 5b97f786eaebc785aaa365f17eb7cc9a1dd2b5a15b277a5229157ea76945fdc1"
 conf_files="/usr/libexec/ghidra/server/server.conf"
-skip_extraction="AXMLPrinter2.jar"
+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"
 nopie=yes
 nostrip_files="animals createStructure dataMutability inline ldiv opaque
  setRegister switch compilerVsDecompiler custom globalRegVars.so
@@ -54,8 +76,9 @@ post_extract() {
 
 do_configure() {
 	mkdir -p dependencies/{GhidraServer,fidb,flatRepo}
-	cp -f ${XBPS_SRCDISTDIR}/${pkgname}-${version}/AXMLPrinter2.jar dependencies/flatRepo
 	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}/AXMLPrinter2.jar dependencies/flatRepo
 	cp -f ../dex2jar-2.0/lib/dex-*.jar dependencies/flatRepo
 }
 

From ca897e9e46c4a9d2aa778374c30d05c18cedc16e Mon Sep 17 00:00:00 2001
From: vitezfh <stjepan@vitez.xyz>
Date: Wed, 9 Nov 2022 15:38:24 +0100
Subject: [PATCH 3/4] ghidra: remove extraneous binary compiled for glibc

---
 srcpkgs/ghidra/template | 1 +
 1 file changed, 1 insertion(+)

diff --git a/srcpkgs/ghidra/template b/srcpkgs/ghidra/template
index e385b682e874..27141ba7218c 100644
--- a/srcpkgs/ghidra/template
+++ b/srcpkgs/ghidra/template
@@ -96,4 +96,5 @@ 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
 	vmkdir usr/bin
 	ln -srf /usr/libexec/$pkgname/ghidraRun ${DESTDIR}/usr/bin/ghidra
+	rm ${DESTDIR}/usr/libexec/ghidra/Ghidra/Features/FileFormats/data/sevenzipnativelibs/Linux-amd64/lib7-Zip-JBinding.so
 }

From 893a71e678b882876fd8ee280098ee292ea25374 Mon Sep 17 00:00:00 2001
From: vitezfh <stjepan@vitez.xyz>
Date: Wed, 9 Nov 2022 17:09:16 +0100
Subject: [PATCH 4/4] ghidra: make extraenous binary removal conditional

---
 srcpkgs/ghidra/template | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/srcpkgs/ghidra/template b/srcpkgs/ghidra/template
index 27141ba7218c..e2021ea29aa1 100644
--- a/srcpkgs/ghidra/template
+++ b/srcpkgs/ghidra/template
@@ -96,5 +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
 	vmkdir usr/bin
 	ln -srf /usr/libexec/$pkgname/ghidraRun ${DESTDIR}/usr/bin/ghidra
-	rm ${DESTDIR}/usr/libexec/ghidra/Ghidra/Features/FileFormats/data/sevenzipnativelibs/Linux-amd64/lib7-Zip-JBinding.so
+	if [ "$XBPS_TARGET_LIBC" = "musl" ]; then
+		rm ${DESTDIR}/usr/libexec/ghidra/Ghidra/Features/FileFormats/data/sevenzipnativelibs/Linux-amd64/lib7-Zip-JBinding.so
+	fi
 }

^ permalink raw reply	[flat|nested] 24+ messages in thread

* Re: ghidra: update to 10.2
  2022-11-08 13:43 [PR PATCH] ghidra: update to 10.2 vitezfh
                   ` (18 preceding siblings ...)
  2022-11-09 16:51 ` [PR PATCH] [Updated] " vitezfh
@ 2022-11-12  6:01 ` oreo639
  2022-11-12  6:02 ` oreo639
                   ` (2 subsequent siblings)
  22 siblings, 0 replies; 24+ messages in thread
From: oreo639 @ 2022-11-12  6:01 UTC (permalink / raw)
  To: ml

[-- Attachment #1: Type: text/plain, Size: 446 bytes --]

New comment by oreo639 on void-packages repository

https://github.com/void-linux/void-packages/pull/40381#issuecomment-1312379427

Comment:
10.2.1 is out.
Also this should all be one commit.
> make one commit per package (including all changes to its sub-packages).

https://github.com/void-linux/void-packages/blob/master/CONTRIBUTING.md#committing-your-changes

(You can do that by doing `git reset --soft HEAD~3 && git commit --amend`)

^ permalink raw reply	[flat|nested] 24+ messages in thread

* Re: ghidra: update to 10.2
  2022-11-08 13:43 [PR PATCH] ghidra: update to 10.2 vitezfh
                   ` (19 preceding siblings ...)
  2022-11-12  6:01 ` oreo639
@ 2022-11-12  6:02 ` oreo639
  2022-11-13 16:33 ` [PR PATCH] [Updated] " vitezfh
  2022-11-29  3:13 ` [PR PATCH] [Closed]: ghidra: update to 10.2.1 abenson
  22 siblings, 0 replies; 24+ messages in thread
From: oreo639 @ 2022-11-12  6:02 UTC (permalink / raw)
  To: ml

[-- Attachment #1: Type: text/plain, Size: 496 bytes --]

New comment by oreo639 on void-packages repository

https://github.com/void-linux/void-packages/pull/40381#issuecomment-1312379427

Comment:
10.2.1 is out.
Also this should all be one commit.
> make one commit per package (including all changes to its sub-packages).

https://github.com/void-linux/void-packages/blob/master/CONTRIBUTING.md#committing-your-changes

(You can do that by doing `git reset --soft HEAD~3 && git commit --amend` and then using `git commit --amend` going forward)

^ permalink raw reply	[flat|nested] 24+ messages in thread

* Re: [PR PATCH] [Updated] ghidra: update to 10.2
  2022-11-08 13:43 [PR PATCH] ghidra: update to 10.2 vitezfh
                   ` (20 preceding siblings ...)
  2022-11-12  6:02 ` oreo639
@ 2022-11-13 16:33 ` vitezfh
  2022-11-29  3:13 ` [PR PATCH] [Closed]: ghidra: update to 10.2.1 abenson
  22 siblings, 0 replies; 24+ messages in thread
From: vitezfh @ 2022-11-13 16:33 UTC (permalink / raw)
  To: ml

[-- Attachment #1: Type: text/plain, Size: 1265 bytes --]

There is an updated pull request by vitezfh against master on the void-packages repository

https://github.com/vitezfh/void-packages ghidra_update
https://github.com/void-linux/void-packages/pull/40381

ghidra: update to 10.2
<!-- Uncomment relevant sections and delete options which are not applicable -->

#### Testing the changes
- I tested the changes in this PR: **briefly**

<!--
#### New package
- This new package conforms to the [package requirements](https://github.com/void-linux/void-packages/blob/master/CONTRIBUTING.md#package-requirements): **YES**|**NO**
-->

<!-- Note: If the build is likely to take more than 2 hours, please add ci skip tag as described in
https://github.com/void-linux/void-packages/blob/master/CONTRIBUTING.md#continuous-integration
and test at least one native build and, if supported, at least one cross build.
Ignore this section if this PR is not skipping CI.
-->

#### Local build testing
- I built this PR locally for my native architecture, (x86_64-glibc)

Maybe someone familiar with ghidra can have another look. @abenson ?
It compiles and patches successfully after these changes. Runs seemingly fine too.

A patch file from https://github.com/void-linux/void-packages/pull/40381.patch is attached

[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-ghidra_update-40381.patch --]
[-- Type: text/x-diff, Size: 7249 bytes --]

From c161b26250b74d5e1bb12177fa45c64d12db0292 Mon Sep 17 00:00:00 2001
From: sv <stjepan@vitez.xyz>
Date: Tue, 8 Nov 2022 14:30:36 +0100
Subject: [PATCH] ghidra: update to 10.2.1

---
 srcpkgs/ghidra/patches/protoc.patch | 28 ++++++++++++++--------------
 srcpkgs/ghidra/template             | 18 +++++++++++-------
 2 files changed, 25 insertions(+), 21 deletions(-)

diff --git a/srcpkgs/ghidra/patches/protoc.patch b/srcpkgs/ghidra/patches/protoc.patch
index aa985b86cf6d..ed98035e6372 100644
--- a/srcpkgs/ghidra/patches/protoc.patch
+++ b/srcpkgs/ghidra/patches/protoc.patch
@@ -9,39 +9,39 @@
 -	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.18.1:windows-x86_64@exe'
-+	allProtocArtifacts 'com.google.protobuf:protoc:3.18.1:linux-x86_64@exe'
-+	allProtocArtifacts 'com.google.protobuf:protoc:3.18.1:linux-aarch_64@exe'
-+	allProtocArtifacts 'com.google.protobuf:protoc:3.18.1:osx-x86_64@exe'
-+	allProtocArtifacts 'com.google.protobuf:protoc:3.18.1: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.18.1: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.18.1: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.18.1: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.18.1: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.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.18.1'
++	api 'com.google.protobuf:protobuf-java:3.21.9'
  	api project(':Framework-AsyncComm')
  	api project(':Framework-Debugging')
  	api project(':ProposedUtils')
@@ -50,7 +50,7 @@
  /*protobuf {
  	protoc {
 -		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
 +++ -	2021-12-11 13:02:09.420069640 +0100
 @@ -1 +1 @@
--MODULE FILE LICENSE: lib/protobuf-java-3.17.3.jar BSD
-+MODULE FILE LICENSE: lib/protobuf-java-3.18.1.jar BSD
+-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 32edeb3be08b..32b0fbbbf595 100644
--- a/srcpkgs/ghidra/template
+++ b/srcpkgs/ghidra/template
@@ -1,22 +1,23 @@
 # Template file for 'ghidra'
 pkgname=ghidra
-version=10.1.5
+version=10.2.1
 revision=1
+# commit id of 'ghidra-data' repo:
 _commit=939210dab2570714944ac35a4daef9633fd842b3
 archs="x86_64* aarch64*"
 # Other 64bit archs should be easily patchable,
 # grep for linux_arm_64 to find all places in need of patching
 create_wrksrc=yes
 build_wrksrc="ghidra_build"
-hostmakedepends="gradle openjdk11 flex unzip protobuf which"
-depends="openjdk11"
+hostmakedepends="gradle openjdk17 flex unzip protobuf which"
+depends="openjdk17"
 short_desc="Software reverse engineering (SRE) framework"
 maintainer="Andrew Benson <abenson+void@gmail.com>"
 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-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://github.com/NationalSecurityAgency/ghidra-data/raw/${_commit}/FunctionID/vs2012_x64.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/vsOlder_x64.fidb
  https://github.com/NationalSecurityAgency/ghidra-data/raw/${_commit}/FunctionID/vsOlder_x86.fidb"
-checksum="935840ba384406a58f9bf70542f29ec33270c2f484365a5b00997d4fa2de5458
+checksum="4cc9c9eaa1e2577766f66462c8528d88ac9dea670a2511afa03f895cf67a4b99
  7907eb4d6e9280b6e17ddce7ee0507eae2ef161ee29f70a10dbc6944fdca75bc
- 430fb7901bd0fd52a5b90bd0cbd89e9d334077eb72a9b26896f465de1e593a99
+ ff7a4c8262f7d24079b16607122bad8f6fb024f051c27b91883d9498568429a9
  00ed038eb6abaf6ddec8d202a3ed7a81b521458f4cd459948115cfd02ff59d6d
  80d1c31c636b1775dd06001747dfb7e2ff60ff716299a8fcc232b8d2faa53a21
  8fc7ea9451b3a201ac3623b4a0924427cbb6bba410bdf9ebba4f2dfe8e77dfad
@@ -75,7 +76,7 @@ post_extract() {
 
 do_configure() {
 	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}/AXMLPrinter2.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
 	vmkdir usr/bin
 	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
 }

^ permalink raw reply	[flat|nested] 24+ messages in thread

* Re: [PR PATCH] [Closed]: ghidra: update to 10.2.1
  2022-11-08 13:43 [PR PATCH] ghidra: update to 10.2 vitezfh
                   ` (21 preceding siblings ...)
  2022-11-13 16:33 ` [PR PATCH] [Updated] " vitezfh
@ 2022-11-29  3:13 ` abenson
  22 siblings, 0 replies; 24+ messages in thread
From: abenson @ 2022-11-29  3:13 UTC (permalink / raw)
  To: ml

[-- Attachment #1: Type: text/plain, Size: 1105 bytes --]

There's a closed pull request on the void-packages repository

ghidra: update to 10.2.1
https://github.com/void-linux/void-packages/pull/40381

Description:
<!-- Uncomment relevant sections and delete options which are not applicable -->

#### Testing the changes
- I tested the changes in this PR: **briefly**

<!--
#### New package
- This new package conforms to the [package requirements](https://github.com/void-linux/void-packages/blob/master/CONTRIBUTING.md#package-requirements): **YES**|**NO**
-->

<!-- Note: If the build is likely to take more than 2 hours, please add ci skip tag as described in
https://github.com/void-linux/void-packages/blob/master/CONTRIBUTING.md#continuous-integration
and test at least one native build and, if supported, at least one cross build.
Ignore this section if this PR is not skipping CI.
-->

#### Local build testing
- I built this PR locally for my native architecture, (x86_64-glibc)

Maybe someone familiar with ghidra can have another look. @abenson ?
It compiles and patches successfully after these changes. Runs seemingly fine too.

^ permalink raw reply	[flat|nested] 24+ messages in thread

end of thread, other threads:[~2022-11-29  3:13 UTC | newest]

Thread overview: 24+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2022-11-08 13:43 [PR PATCH] ghidra: update to 10.2 vitezfh
2022-11-08 23:07 ` classabbyamp
2022-11-08 23:39 ` vitezfh
2022-11-09 11:52 ` unspecd
2022-11-09 12:03 ` unspecd
2022-11-09 12:04 ` unspecd
2022-11-09 12:05 ` vitezfh
2022-11-09 12:06 ` unspecd
2022-11-09 12:11 ` unspecd
2022-11-09 13:04 ` vitezfh
2022-11-09 13:04 ` vitezfh
2022-11-09 13:13 ` [PR PATCH] [Updated] " vitezfh
2022-11-09 14:38 ` vitezfh
2022-11-09 14:38 ` [PR PATCH] [Updated] " vitezfh
2022-11-09 14:47 ` unspecd
2022-11-09 14:50 ` unspecd
2022-11-09 14:52 ` unspecd
2022-11-09 14:54 ` unspecd
2022-11-09 14:55 ` unspecd
2022-11-09 16:51 ` [PR PATCH] [Updated] " vitezfh
2022-11-12  6:01 ` oreo639
2022-11-12  6:02 ` oreo639
2022-11-13 16:33 ` [PR PATCH] [Updated] " vitezfh
2022-11-29  3:13 ` [PR PATCH] [Closed]: ghidra: update to 10.2.1 abenson

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).