Skip to content

Commit

Permalink
Include frida/frida-java-bridge#330, dispose of garbage methods.
Browse files Browse the repository at this point in the history
  • Loading branch information
zer0def committed Aug 22, 2024
1 parent 8628f61 commit 3ebd7b5
Show file tree
Hide file tree
Showing 2 changed files with 27 additions and 1 deletion.
2 changes: 1 addition & 1 deletion .github/workflows/build.yml
Original file line number Diff line number Diff line change
Expand Up @@ -110,7 +110,7 @@ jobs:
git clone --recurse-submodules https://github.com/frida/frida -b "${{ needs.check.outputs.FRIDA_VERSION }}"; pushd frida
FRIDA_PREFIX="$(tr -cd 'a-z0-9' </dev/urandom | head -c32)" SESSION_SERVICE="$(tr -cd 'a-f0-9' </dev/urandom | head -c32)"
for k in strongR-frida florida asenosen fridare; do for i in "../${k}/"*; do pushd "subprojects/${i##*/}"; for j in "../../../${k}/${i##*/}/"*.patch; do FRIDA_PREFIX="${FRIDA_PREFIX}" SESSION_SERVICE="${SESSION_SERVICE}" envsubst <"${j}" | patch -p1; done; popd; done; done
for k in strongR-frida florida zer0def; do for i in "../${k}/"*; do pushd "subprojects/${i##*/}"; for j in "../../../${k}/${i##*/}/"*.patch; do FRIDA_PREFIX="${FRIDA_PREFIX}" SESSION_SERVICE="${SESSION_SERVICE}" envsubst <"${j}" | patch -p1; done; popd; done; done
#for j in core gum; do make "${j}-${{ matrix.os }}-${{ matrix.arch }}"; done # target
#for j in core gum gumjs; do python releng/mkdevkit.py "frida-${j}" "${{ matrix.os }}-${{ matrix.arch }}" "build/devkits/${{ matrix.os }}/${{ matrix.arch }}/${j}"; done # devkit
Expand Down
26 changes: 26 additions & 0 deletions zer0def/frida-gum/0001-fixup-exact-gum-deps.patch
Original file line number Diff line number Diff line change
@@ -0,0 +1,26 @@
diff --git a/bindings/gumjs/generate-runtime.py b/bindings/gumjs/generate-runtime.py
index 679cad56..5ef88c52 100644
--- a/bindings/gumjs/generate-runtime.py
+++ b/bindings/gumjs/generate-runtime.py
@@ -14,9 +14,9 @@ RELAXED_DEPS = {
}

EXACT_DEPS = {
- "frida-java-bridge": "6.3.5",
- "frida-objc-bridge": "7.0.6",
- "frida-swift-bridge": "2.0.8"
+ "git+https://github.com/frida/frida-java-bridge": "0495713823b95acc0ca6bc862f154ef4f5595aba",
+ "git+https://github.com/frida/frida-objc-bridge": "v7.0.6",
+ "git+https://github.com/frida/frida-swift-bridge": "v2.0.8"
}


@@ -52,7 +52,7 @@ def generate_runtime(output_dir, priv_dir, input_dir, gum_dir, capstone_incdir,
capture_output=True,
cwd=priv_dir,
check=True)
- subprocess.run([npm, "install", "-E"] + [f"{name}@{version_spec}" for name, version_spec in EXACT_DEPS.items()],
+ subprocess.run([npm, "install", "-E"] + [f"{name}#{version_spec}" for name, version_spec in EXACT_DEPS.items()],
capture_output=True,
cwd=priv_dir,
check=True)

0 comments on commit 3ebd7b5

Please sign in to comment.