diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 7de60404..15435d62 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -1,7 +1,7 @@ name: ci env: - R2V: 6.2.0 + R2V: 6.2.2 on: push: diff --git a/configure b/configure index ed154944..d960d6ec 100755 --- a/configure +++ b/configure @@ -126,12 +126,12 @@ done : ${INSTALL_PROGRAM_STRIP:=${INSTALL} -m 755 -s} : ${INSTALL_MAN:=${INSTALL} -m 444} : ${INSTALL_LIB:=${INSTALL} -m 755 -c} - PKGNAME='r2ghidra' ; VERSION='6.2.0' ; VERSION_MAJOR=6; VERSION_MINOR=2; VERSION_PATCH=0; VERSION_NUMBER=60200; CONTACT_MAIL="pancake@nopcode.org" ; CONTACT_NAME="pancake" ; CONTACT="pancake " ; + PKGNAME='r2ghidra' ; VERSION='6.2.2' ; VERSION_MAJOR=6; VERSION_MINOR=2; VERSION_PATCH=2; VERSION_NUMBER=60202; CONTACT_MAIL="pancake@nopcode.org" ; CONTACT_NAME="pancake" ; CONTACT="pancake " ; } show_usage() { cat <." exit 0 @@ -235,12 +235,11 @@ case $flag in show_version ; ;; -r|--r|--report) echo "PKGNAME: r2ghidra" -echo "VERSION: 6.2.0" +echo "VERSION: 6.2.2" echo "AUTHOR: pancake" echo "EMAIL: pancake@nopcode.org" echo "LANGS: c++" echo "PKGCONFIG: r_core r_asm r_anal" -echo "FLAGS: " exit 0 ;; --cache-file) @@ -424,14 +423,6 @@ tmp=`${PKGCONFIG} --libs r_core 2>/dev/null` if [ $? = 0 ]; then echo yes; HAVE_PKGCFG_R_CORE=1; R2_LDFLAGS=$tmp; fi; fi -printf 'checking radare2 >= 6.1.4 for the rxml API... ' -if ${PKGCONFIG} --atleast-version=6.1.4 r_core 2>/dev/null; then -echo yes -else -echo no -echo 'ERROR: r2ghidra requires radare2 >= 6.1.4' >&2 -exit 1 -fi if [ -z "${PKGCONFIG}" ]; then pkg-config --version >/dev/null 2>&1 ; if [ 0 = 0 ]; then PKGCONFIG=pkg-config ; else PKGCONFIG=pkgconf ; fi; fi printf 'checking pkg-config flags for r_asm... ' tmp=`${PKGCONFIG} --cflags r_asm 2>/dev/null` diff --git a/configure.acr b/configure.acr index dce2f7c8..7536b9a2 100644 --- a/configure.acr +++ b/configure.acr @@ -1,5 +1,5 @@ PKGNAME r2ghidra -VERSION 6.2.0 +VERSION 6.2.2 CONTACT pancake ; pancake@nopcode.org LANG_CXX! diff --git a/dist/windows/r2pm/r2pm-i.ps1 b/dist/windows/r2pm/r2pm-i.ps1 index 4b880364..8d92adec 100755 --- a/dist/windows/r2pm/r2pm-i.ps1 +++ b/dist/windows/r2pm/r2pm-i.ps1 @@ -1,6 +1,6 @@ # powershell -executionpolicy unrestricted -command r2pm.ps1 $R2_USER_PLUGINS=(radare2 -H R2_USER_PLUGINS) -$V="6.2.0" +$V="6.2.2" Remove-Item r2ghidra-${V}-w64.zip Remove-Item r2ghidra_sleigh-${V}.zip echo "Downloading blobs" diff --git a/meson.build b/meson.build index 8cc41fae..0cf29870 100644 --- a/meson.build +++ b/meson.build @@ -3,7 +3,7 @@ project( ['c', 'cpp'], license : 'LGPL3', meson_version : '>=0.50.1', - version : '6.2.0', + version : '6.2.2', default_options : ['c_std=c11', 'cpp_std=c++20', 'b_vscrt=md'] ) diff --git a/test/db/extras/ghidra_types b/test/db/extras/ghidra_types index 764de955..b6ca36a5 100644 --- a/test/db/extras/ghidra_types +++ b/test/db/extras/ghidra_types @@ -1196,7 +1196,7 @@ void sym.Aeropause(Bright *bright,int32_t argc,char **argv) Morning *pMVar3; int64_t var_18h; int32_t var_ch; - void **var_8h; + char *s1; pMVar3 = sym.imp.malloc(0x10); bright->morning = pMVar3; diff --git a/test/db/extras/r2ghidra_arch b/test/db/extras/r2ghidra_arch index 2f4ef67e..df7a5e24 100644 --- a/test/db/extras/r2ghidra_arch +++ b/test/db/extras/r2ghidra_arch @@ -305,7 +305,7 @@ CMDS=<morning = pMVar3;