diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 270b2352..ec842475 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -1,7 +1,7 @@ name: ci env: - R2V: 5.8.4 + R2V: 5.9.0 on: push: @@ -20,10 +20,10 @@ jobs: run: make -C dist/docker test - name: Installing radare2 run: | - wget https://github.com/radareorg/radare2/releases/download/5.8.4/radare2_5.8.4_amd64.deb - wget https://github.com/radareorg/radare2/releases/download/5.8.4/radare2-dev_5.8.4_amd64.deb - sudo dpkg -i radare2_5.8.4_amd64.deb - sudo dpkg -i radare2-dev_5.8.4_amd64.deb + wget https://github.com/radareorg/radare2/releases/download/5.9.0/radare2_5.9.0_amd64.deb + wget https://github.com/radareorg/radare2/releases/download/5.9.0/radare2-dev_5.9.0_amd64.deb + sudo dpkg -i radare2_5.9.0_amd64.deb + sudo dpkg -i radare2-dev_5.9.0_amd64.deb - name: Building r2frida run: ./configure && make -j && sudo make install - name: Testing r2frida @@ -33,7 +33,7 @@ jobs: - name: Pub uses: actions/upload-artifact@v3 with: - name: build-linux + name: build-linux20 path: dist/debian/*.deb build-linux20-precompiled: runs-on: ubuntu-20.04 @@ -41,10 +41,10 @@ jobs: - uses: actions/checkout@v4 - name: Installing radare2 run: | - wget https://github.com/radareorg/radare2/releases/download/5.8.4/radare2_5.8.4_amd64.deb - wget https://github.com/radareorg/radare2/releases/download/5.8.4/radare2-dev_5.8.4_amd64.deb - sudo dpkg -i radare2_5.8.4_amd64.deb - sudo dpkg -i radare2-dev_5.8.4_amd64.deb + wget https://github.com/radareorg/radare2/releases/download/5.9.0/radare2_5.9.0_amd64.deb + wget https://github.com/radareorg/radare2/releases/download/5.9.0/radare2-dev_5.9.0_amd64.deb + sudo dpkg -i radare2_5.9.0_amd64.deb + sudo dpkg -i radare2-dev_5.9.0_amd64.deb - name: Building r2frida run: ./configure --with-precompiled-agent && make -j && sudo make install - name: Packaging @@ -64,7 +64,7 @@ jobs: - name: Pub uses: actions/upload-artifact@v3 with: - name: build-linux + name: build-linux22 path: dist/debian/*.deb build-agent: runs-on: ubuntu-22.04 @@ -78,7 +78,7 @@ jobs: uses: actions/upload-artifact@v3 with: name: build-agent - path: src/_agent.js + path: src/_agent.js2 build-macos: runs-on: macos-11 # runs-on: macos-12 @@ -190,7 +190,7 @@ jobs: GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} with: upload_url: ${{ steps.create_release.outputs.upload_url }} - asset_path: dist/artifacts/build-linux/r2frida_${{ steps.r2fv.outputs.branch }}_amd64.deb + asset_path: dist/artifacts/build-linux22/r2frida_${{ steps.r2fv.outputs.branch }}_amd64.deb asset_name: r2frida_${{ steps.r2fv.outputs.branch }}_amd64.deb asset_content_type: application/vnd.debian.binary-package - name: Upload precompiled agent script diff --git a/autogen.sh b/autogen.sh index e89aa6ff..9bb85dbc 100755 --- a/autogen.sh +++ b/autogen.sh @@ -16,3 +16,5 @@ vim src/agent/plugin.ts jq ".version=\"$V\"" package.json > p mv p package.json vim make.bat +mkdir -p node_modules +npm i diff --git a/configure b/configure index 3d1970e8..6d9a063f 100755 --- a/configure +++ b/configure @@ -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.8.8' ; VERSION_MAJOR=5; VERSION_MINOR=8; VERSION_PATCH=8; VERSION_NUMBER=50808; CONTACT_MAIL="pancake@nowsecure.com" ; CONTACT_NAME="pancake" ; CONTACT="pancake " ; + 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 " ; } show_usage() { cat <." exit 0 @@ -232,7 +232,7 @@ case $flag in show_version ; ;; -r|--r|--report) echo "PKGNAME: r2frida" -echo "VERSION: 5.8.8" +echo "VERSION: 5.9.0" echo "AUTHOR: pancake" echo "EMAIL: pancake@nowsecure.com" echo "LANGS: c" diff --git a/configure.acr b/configure.acr index a45d892d..8aa728dc 100644 --- a/configure.acr +++ b/configure.acr @@ -1,5 +1,5 @@ PKGNAME r2frida -VERSION 5.8.9 +VERSION 5.9.0 CONTACT pancake ; pancake@nowsecure.com USE_PKGCONFIG! diff --git a/make.bat b/make.bat index d1768c2a..dcd1d7a0 100644 --- a/make.bat +++ b/make.bat @@ -1,7 +1,7 @@ @echo off setlocal EnableDelayedExpansion set frida_version=16.2.1 -set r2frida_version=5.8.9 +set r2frida_version=5.9.0 if "%PLATFORM%" == "x64" (set frida_os_arch=x86_64) else (set frida_os_arch=x86) set DEBUG=/O2 @@ -88,10 +88,12 @@ echo "powershell -command 'npm i frida-compile; node_modules\.bin\frida-compile. powershell -command "npm i frida-compile; node_modules/.bin/frida-compile.cmd -Sc -o src/_agent.txt src/agent/index.ts" dir %CD%\src +echo Not creatring the header because gets stuck in the ci with r2 5.9.0 cd src echo Creating the header... -%R2_BASE%\bin\radare2 -nfqc "pcq~0x" _agent.txt > _agent.txt.hex -powershell -command "Get-Content .\_agent.txt.hex | Select-String -Exclude Start 0x" > _agent.h +REM %R2_BASE%\bin\radare2 -nfqc "pcq~0x" _agent.txt > _agent.txt.hex +%R2_BASE%\bin\rax2 -i _agent.txt > _agent.txt.hex +powershell -command "Get-Content .\_agent.txt.hex | Select-String -Pattern 0x" > _agent.h DEL _agent.txt.hex cd .. diff --git a/package-lock.json b/package-lock.json index 1ddf286f..03f2006f 100644 --- a/package-lock.json +++ b/package-lock.json @@ -1,12 +1,12 @@ { "name": "r2frida-agent", - "version": "5.8.8", + "version": "5.9.0", "lockfileVersion": 2, "requires": true, "packages": { "": { "name": "r2frida-agent", - "version": "5.8.8", + "version": "5.9.0", "license": "LGPL-3.0", "devDependencies": { "@frida/events": "^4.0.4", diff --git a/package.json b/package.json index 1750e51e..a6a48dab 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "r2frida-agent", - "version": "5.8.8", + "version": "5.9.0", "description": "Agent for frida:// io plugin", "private": true, "type": "module", diff --git a/src/agent/plugin.ts b/src/agent/plugin.ts index 422c6013..a2a31032 100644 --- a/src/agent/plugin.ts +++ b/src/agent/plugin.ts @@ -59,7 +59,7 @@ export interface R2FridaPlugin { } export const r2frida: R2FridaPlugin = { - version: "5.8.9", + version: "5.9.0", commandHandler: commandHandler, pluginRegister: pluginRegister, pluginUnregister: pluginUnregister,