diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index ea03944c..5e25df6e 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -78,7 +78,7 @@ jobs: uses: actions/upload-artifact@v4 with: name: build-agent - path: src/_agent.js2 + path: src/_agent.js build-macos: runs-on: macos-11 # runs-on: macos-12 diff --git a/configure b/configure index 6d9a063f..2b6a8b33 100755 --- a/configure +++ b/configure @@ -1,5 +1,5 @@ #!/bin/sh -# This script was automatically generated by ACR v2.1.2 +# This script was automatically generated by ACR v2.1.4 # @author: pancake # @url: http://www.nopcode.org # @repo: git clone https://github.com/radare/acr @@ -113,12 +113,12 @@ done : ${INSTALL_PROGRAM_STRIP:=${INSTALL} -m 755 -s} : ${INSTALL_MAN:=${INSTALL} -m 444} : ${INSTALL_LIB:=${INSTALL} -m 755 -c} - PKGNAME='r2frida' ; VERSION='5.9.0' ; VERSION_MAJOR=5; VERSION_MINOR=9; VERSION_PATCH=0; VERSION_NUMBER=50900; CONTACT_MAIL="pancake@nowsecure.com" ; CONTACT_NAME="pancake" ; CONTACT="pancake " ; + PKGNAME='r2frida' ; VERSION='5.9.2' ; VERSION_MAJOR=5; VERSION_MINOR=9; VERSION_PATCH=2; VERSION_NUMBER=50902; CONTACT_MAIL="pancake@nowsecure.com" ; CONTACT_NAME="pancake" ; CONTACT="pancake " ; } show_usage() { cat <." exit 0 @@ -232,7 +232,7 @@ case $flag in show_version ; ;; -r|--r|--report) echo "PKGNAME: r2frida" -echo "VERSION: 5.9.0" +echo "VERSION: 5.9.2" echo "AUTHOR: pancake" echo "EMAIL: pancake@nowsecure.com" echo "LANGS: c" @@ -323,6 +323,7 @@ ocho "using prefix '${PREFIX}'" ACR_RMFILES=" test.c a.out a.exe" ochof "checking for pkg-config... " +ENVWORDS="${ENVWORDS} HAVE_PKGCONFIG" if [ -n "$PKGCONFIG" ]; then if [ -x "$PKGCONFIG" ]; then _HAVE_PKGCONFIG="${PKGCONFIG}" @@ -346,7 +347,9 @@ else fi if [ -n "${PKGCONFIG}" ]; then ocho ${PKGCONFIG} + HAVE_PKGCONFIG=1 else + HAVE_PKGCONFIG=0 echo "Cannot find pkg-config or pkgconf in PATH" >&2 exit 1 ocho no; fi diff --git a/configure.acr b/configure.acr index 8aa728dc..b628af0f 100644 --- a/configure.acr +++ b/configure.acr @@ -1,5 +1,5 @@ PKGNAME r2frida -VERSION 5.9.0 +VERSION 5.9.2 CONTACT pancake ; pancake@nowsecure.com USE_PKGCONFIG! diff --git a/make.bat b/make.bat index 6d8ab4c9..8568ff4e 100644 --- a/make.bat +++ b/make.bat @@ -1,7 +1,7 @@ @echo off REM setlocal EnableDelayedExpansion set frida_version=16.2.5 -set r2frida_version=5.9.0 +set r2frida_version=5.9.2 if "%PLATFORM%" == "x64" (set frida_os_arch=x86_64) else (set frida_os_arch=x86) set DEBUG=/O2 diff --git a/package-lock.json b/package-lock.json index 03f2006f..94ee20aa 100644 --- a/package-lock.json +++ b/package-lock.json @@ -1,12 +1,12 @@ { "name": "r2frida-agent", - "version": "5.9.0", + "version": "5.9.2", "lockfileVersion": 2, "requires": true, "packages": { "": { "name": "r2frida-agent", - "version": "5.9.0", + "version": "5.9.2", "license": "LGPL-3.0", "devDependencies": { "@frida/events": "^4.0.4", @@ -1571,18 +1571,6 @@ "integrity": "sha512-0KpjqXRVvrYyCsX1swR/XTK0va6VQkQM6MNo7PqW77ByjAhoARA8EfrP1N4+KlKj8YS0ZUCtRT/YUuhyYDujIQ==", "dev": true }, - "node_modules/lru-cache": { - "version": "6.0.0", - "resolved": "https://registry.npmjs.org/lru-cache/-/lru-cache-6.0.0.tgz", - "integrity": "sha512-Jo6dJ04CmSjuznwJSS3pUeWmd/H0ffTlkXXgwZi+eq1UCmqQwCh+eLsYOYCwY991i2Fah4h1BEMCx4qThGbsiA==", - "dev": true, - "dependencies": { - "yallist": "^4.0.0" - }, - "engines": { - "node": ">=10" - } - }, "node_modules/merge2": { "version": "1.4.1", "resolved": "https://registry.npmjs.org/merge2/-/merge2-1.4.1.tgz", @@ -1848,13 +1836,10 @@ } }, "node_modules/semver": { - "version": "7.3.8", - "resolved": "https://registry.npmjs.org/semver/-/semver-7.3.8.tgz", - "integrity": "sha512-NB1ctGL5rlHrPJtFDVIVzTyQylMLu9N9VICA6HSFJo8MCGVTMW6gfpicwKmmK/dAjTOrqu5l63JJOpDSrAis3A==", + "version": "7.6.2", + "resolved": "https://registry.npmjs.org/semver/-/semver-7.6.2.tgz", + "integrity": "sha512-FNAIBWCx9qcRhoHcgcJ0gvU7SN1lYU2ZXuSfl04bSC5OpvDHFyJCjdNHomPXxjQlCBU67YW64PzY7/VIEH7F2w==", "dev": true, - "dependencies": { - "lru-cache": "^6.0.0" - }, "bin": { "semver": "bin/semver.js" }, @@ -2075,12 +2060,6 @@ "integrity": "sha1-tSQ9jz7BqjXxNkYFvA0QNuMKtp8=", "dev": true }, - "node_modules/yallist": { - "version": "4.0.0", - "resolved": "https://registry.npmjs.org/yallist/-/yallist-4.0.0.tgz", - "integrity": "sha512-3wdGidZyq5PB084XLES5TpOSRA3wjXAlIWMhum2kRcv/41Sn2emQ0dycQW4uZXLejwKvg6EsvbdlVL+FYEct7A==", - "dev": true - }, "node_modules/yocto-queue": { "version": "0.1.0", "resolved": "https://registry.npmjs.org/yocto-queue/-/yocto-queue-0.1.0.tgz", @@ -3235,15 +3214,6 @@ "integrity": "sha512-0KpjqXRVvrYyCsX1swR/XTK0va6VQkQM6MNo7PqW77ByjAhoARA8EfrP1N4+KlKj8YS0ZUCtRT/YUuhyYDujIQ==", "dev": true }, - "lru-cache": { - "version": "6.0.0", - "resolved": "https://registry.npmjs.org/lru-cache/-/lru-cache-6.0.0.tgz", - "integrity": "sha512-Jo6dJ04CmSjuznwJSS3pUeWmd/H0ffTlkXXgwZi+eq1UCmqQwCh+eLsYOYCwY991i2Fah4h1BEMCx4qThGbsiA==", - "dev": true, - "requires": { - "yallist": "^4.0.0" - } - }, "merge2": { "version": "1.4.1", "resolved": "https://registry.npmjs.org/merge2/-/merge2-1.4.1.tgz", @@ -3420,13 +3390,10 @@ } }, "semver": { - "version": "7.3.8", - "resolved": "https://registry.npmjs.org/semver/-/semver-7.3.8.tgz", - "integrity": "sha512-NB1ctGL5rlHrPJtFDVIVzTyQylMLu9N9VICA6HSFJo8MCGVTMW6gfpicwKmmK/dAjTOrqu5l63JJOpDSrAis3A==", - "dev": true, - "requires": { - "lru-cache": "^6.0.0" - } + "version": "7.6.2", + "resolved": "https://registry.npmjs.org/semver/-/semver-7.6.2.tgz", + "integrity": "sha512-FNAIBWCx9qcRhoHcgcJ0gvU7SN1lYU2ZXuSfl04bSC5OpvDHFyJCjdNHomPXxjQlCBU67YW64PzY7/VIEH7F2w==", + "dev": true }, "shebang-command": { "version": "2.0.0", @@ -3588,12 +3555,6 @@ "integrity": "sha1-tSQ9jz7BqjXxNkYFvA0QNuMKtp8=", "dev": true }, - "yallist": { - "version": "4.0.0", - "resolved": "https://registry.npmjs.org/yallist/-/yallist-4.0.0.tgz", - "integrity": "sha512-3wdGidZyq5PB084XLES5TpOSRA3wjXAlIWMhum2kRcv/41Sn2emQ0dycQW4uZXLejwKvg6EsvbdlVL+FYEct7A==", - "dev": true - }, "yocto-queue": { "version": "0.1.0", "resolved": "https://registry.npmjs.org/yocto-queue/-/yocto-queue-0.1.0.tgz", diff --git a/package.json b/package.json index a6a48dab..cf2e69ac 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "r2frida-agent", - "version": "5.9.0", + "version": "5.9.2", "description": "Agent for frida:// io plugin", "private": true, "type": "module", diff --git a/src/agent/plugin.ts b/src/agent/plugin.ts index a2a31032..56237469 100644 --- a/src/agent/plugin.ts +++ b/src/agent/plugin.ts @@ -59,7 +59,7 @@ export interface R2FridaPlugin { } export const r2frida: R2FridaPlugin = { - version: "5.9.0", + version: "5.9.2", commandHandler: commandHandler, pluginRegister: pluginRegister, pluginUnregister: pluginUnregister,