Github messages for voidlinux
 help / color / mirror / Atom feed
* [PR PATCH] Ghidrathon: update to 4.0.0.
@ 2024-02-17 21:12 abenson
  2024-02-24  4:42 ` [PR PATCH] [Merged]: " abenson
  0 siblings, 1 reply; 2+ messages in thread
From: abenson @ 2024-02-17 21:12 UTC (permalink / raw)
  To: ml

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

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

https://github.com/abenson/void-packages Ghidrathon_4.0.0
https://github.com/void-linux/void-packages/pull/48805

Ghidrathon: update to 4.0.0.
#### Testing the changes
- I tested the changes in this PR: **YES**

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

Ghidrathon now needs a copy of `jep` in lib. Easy enough, we can take it from our built version and it works well, but copying is less than ideal, symbolic links don't work, and a hard link is likely the wrong approach anyway.

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

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

From 270f3ad1d71c1114fc01380b777a72f8b613149d Mon Sep 17 00:00:00 2001
From: Andrew Benson <abenson+void@gmail.com>
Date: Sat, 17 Feb 2024 14:34:07 -0600
Subject: [PATCH] Ghidrathon: update to 4.0.0.

---
 srcpkgs/Ghidrathon/patches/dont-use-pip.patch | 10 ----------
 srcpkgs/Ghidrathon/template                   |  9 +++++++--
 2 files changed, 7 insertions(+), 12 deletions(-)
 delete mode 100644 srcpkgs/Ghidrathon/patches/dont-use-pip.patch

diff --git a/srcpkgs/Ghidrathon/patches/dont-use-pip.patch b/srcpkgs/Ghidrathon/patches/dont-use-pip.patch
deleted file mode 100644
index 88fe8faa9d3ba..0000000000000
--- a/srcpkgs/Ghidrathon/patches/dont-use-pip.patch
+++ /dev/null
@@ -1,10 +0,0 @@
---- a/build.gradle
-+++ b/build.gradle
-@@ -42,7 +42,6 @@
- // we need to copy the Jep native binaries built in installJep to our extension directory; we use a small
- // utility script written in Python
- task copyJepNativeBinaries(type: Exec) {
--    dependsOn installJep
-     workingDir "${projectDir}"
-     commandLine pythonBin, "util${File.separator}configure_jep_native_binaries.py"
- }
diff --git a/srcpkgs/Ghidrathon/template b/srcpkgs/Ghidrathon/template
index 848d3ea90a359..42fd2f4ba9baa 100644
--- a/srcpkgs/Ghidrathon/template
+++ b/srcpkgs/Ghidrathon/template
@@ -1,6 +1,6 @@
 # Template file for 'Ghidrathon'
 pkgname=Ghidrathon
-version=3.0.2
+version=4.0.0
 revision=1
 hostmakedepends="gradle openjdk17 unzip jep"
 makedepends="ghidra python3-devel"
@@ -11,9 +11,13 @@ license="Apache-2.0"
 homepage="https://github.com/mandiant/Ghidrathon"
 changelog="https://github.com/mandiant/Ghidrathon/releases"
 distfiles="https://github.com/mandiant/Ghidrathon/archive/v${version}.tar.gz"
-checksum=116352ff1a0ab387fb1b9166557aeacff36f8a98d46ebb3a51ccaf8110aba977
+checksum=6157811acc0bd833b4071b5dea25b2d45aa4040f286d2afc0ac4ec8c2063cca3
 nocross=yes # ghidra cannot be cross-compiled
 
+post_extract() {
+	cp /${py3_sitelib}/jep/jep-*.jar ${wrksrc}/lib
+}
+
 do_build() {
 	gradle -PGHIDRA_INSTALL_DIR=${XBPS_CROSS_BASE}/usr/libexec/ghidra
 }
@@ -21,4 +25,5 @@ do_build() {
 do_install() {
 	vmkdir usr/libexec/ghidra/Ghidra/Extensions
 	unzip dist/*Ghidrathon*.zip -d ${DESTDIR}/usr/libexec/ghidra/Ghidra/Extensions
+	python3 util/ghidrathon_configure.py ${DESTDIR}/usr/libexec/ghidra
 }

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

* Re: [PR PATCH] [Merged]: Ghidrathon: update to 4.0.0.
  2024-02-17 21:12 [PR PATCH] Ghidrathon: update to 4.0.0 abenson
@ 2024-02-24  4:42 ` abenson
  0 siblings, 0 replies; 2+ messages in thread
From: abenson @ 2024-02-24  4:42 UTC (permalink / raw)
  To: ml

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

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

Ghidrathon: update to 4.0.0.
https://github.com/void-linux/void-packages/pull/48805

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

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

Ghidrathon now needs a copy of `jep` in lib. Easy enough, we can take it from our built version and it works well, but copying is less than ideal, symbolic links don't work, and a hard link is likely the wrong approach anyway.

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

end of thread, other threads:[~2024-02-24  4:42 UTC | newest]

Thread overview: 2+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2024-02-17 21:12 [PR PATCH] Ghidrathon: update to 4.0.0 abenson
2024-02-24  4:42 ` [PR PATCH] [Merged]: " 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).