Release 5.9.0

nowsecure · Mar 31, 2024 · 4311e2e · 4311e2e
1 parent 052c30f
commit 4311e2e
Show file tree

Hide file tree

Showing 8 changed files with 30 additions and 26 deletions.
diff --git 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,18 +33,18 @@ 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
     steps:
     - 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
@@ -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
@@ -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 <pancake@nowsecure.com>" ;
+ 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 <pancake@nowsecure.com>" ;
 }
 
 show_usage() {
 cat <<EOF2
-'configure' configures r2frida-5.8.8 to adapt to many kinds of systems.
+'configure' configures r2frida-5.9.0 to adapt to many kinds of systems.
 
 Usage: ./configure [OPTION]... [VAR=VALUE]...
 
@@ -200,10 +200,10 @@ ocho() {
 
 show_version() {
 if [ "$QUIET" = 1 ]; then
-	echo "5.8.8"
+	echo "5.9.0"
 	exit 0
 fi
-echo "r2frida-5.8.8 configuration script done with acr v2.1.2.
+echo "r2frida-5.9.0 configuration script done with acr v2.1.2.
 The 'Free Software Foundation' message is only for autodetection.
 Originally written by pancake <nopcode.org>."
 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
@@ -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
@@ -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
diff --git 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
@@ -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,