diff --git a/dev-util/radare2/radare2-5.9.8.recipe b/dev-util/radare2/radare2-6.0.4.recipe similarity index 84% rename from dev-util/radare2/radare2-5.9.8.recipe rename to dev-util/radare2/radare2-6.0.4.recipe index eab03397d..813a38b86 100644 --- a/dev-util/radare2/radare2-5.9.8.recipe +++ b/dev-util/radare2/radare2-6.0.4.recipe @@ -4,7 +4,7 @@ able to open disk files, analyzing binaries in several common and less common \ formats, disassemble code for several CPU architectures, debug programs, \ attach to remote GDB servers, and much more." HOMEPAGE="https://radare.org/" -COPYRIGHT="2007-2023 pancake +COPYRIGHT="2007-2025 pancake 2007-2015 Skia 2012-2015 pof 2008-2015 nibble @@ -96,14 +96,24 @@ COPYRIGHT="2007-2023 pancake 2010-2016 Sebastian Reichel" LICENSE="GNU GPL v3 GNU LGPL v3" -REVISION="2" +REVISION="1" SOURCE_URI="https://github.com/radare/radare2/archive/$portVersion.tar.gz" -CHECKSUM_SHA256="e45e4fd342f04b2e00363bc1b68cc375c1cf36041085d3d59caa7a3b7be43836" +CHECKSUM_SHA256="2aadf26066c396961949656f304cb5d99b76c88adbe30ad923db4e98b10f3bbc" SOURCE_FILENAME="radare2-$portVersion.tar.gz" -#srcGitRev_2="87ab82cc96e83e02f044c0c4111ade2a65576c60" +#srcGitRev_2="0f71a681275fa49e333c7ad82a4d596008d5b3d0" #SOURCE_URI_2="https://github.com/radareorg/radare2-testbins/archive/$srcGitRev_2.tar.gz" -#CHECKSUM_SHA256_2="f32a2607b52b838030c22946d7a0c61cb56ac67d32496f0524fa5aa889d39152" +#CHECKSUM_SHA256_2="318d199396da1cc123355a54e1f124fb8bd04164561124dc17f521110913118e" #SOURCE_DIR_2="radare2-testbins-$srcGitRev_2" +sdbVer="2.2.0" +SOURCE_URI_3="https://github.com/radareorg/sdb/archive/refs/tags/$sdbVer.tar.gz" +CHECKSUM_SHA256_3="05b6fda41727e2d634bc0cdea0bccdc186b48cc9136b2367ab2a7358145fa8b4" +SOURCE_FILENAME_3="sdb-$sdbVer.tar.gz" +SOURCE_DIR_3="sdb-$sdbVer" +srcGitRev_4="7238ee64dbc2fbdea044555cda8cda78785a93ed" +SOURCE_URI_4="https://github.com/quickjs-ng/quickjs/archive/$srcGitRev_4.tar.gz" +CHECKSUM_SHA256_4="7c1adc7aa7b1ab0a7f0b0a9aaa24fd3c7a0691d8a6ba8cae886f29834f1bee02" +SOURCE_FILENAME_4="quickjs-$srcGitRev_4.tar.gz" +SOURCE_DIR_4="quickjs-$srcGitRev_4" ARCHITECTURES="all !x86_gcc2" SECONDARY_ARCHITECTURES="x86" @@ -138,6 +148,8 @@ PROVIDES=" cmd:rasm2$commandSuffix = $portVersion cmd:ravc2$commandSuffix = $portVersion cmd:rax2$commandSuffix = $portVersion + cmd:r2sdb$commandSuffix = $sdbVer + cmd:rapatch2$commandSuffix = $sdbVer lib:libr_anal$secondaryArchSuffix = $libVersionCompat lib:libr_arch$secondaryArchSuffix = $libVersionCompat lib:libr_asm$secondaryArchSuffix = $libVersionCompat @@ -146,7 +158,6 @@ PROVIDES=" lib:libr_config$secondaryArchSuffix = $libVersionCompat lib:libr_cons$secondaryArchSuffix = $libVersionCompat lib:libr_core$secondaryArchSuffix = $libVersionCompat - lib:libr_crypto$secondaryArchSuffix = $libVersionCompat lib:libr_debug$secondaryArchSuffix = $libVersionCompat lib:libr_egg$secondaryArchSuffix = $libVersionCompat lib:libr_esil$secondaryArchSuffix = $libVersionCompat @@ -156,11 +167,13 @@ PROVIDES=" lib:libr_lang$secondaryArchSuffix = $libVersionCompat lib:libr_magic$secondaryArchSuffix = $libVersionCompat lib:libr_main$secondaryArchSuffix = $libVersionCompat + lib:libr_muta$secondaryArchSuffix = $libVersionCompat lib:libr_reg$secondaryArchSuffix = $libVersionCompat lib:libr_search$secondaryArchSuffix = $libVersionCompat lib:libr_socket$secondaryArchSuffix = $libVersionCompat lib:libr_syscall$secondaryArchSuffix = $libVersionCompat lib:libr_util$secondaryArchSuffix = $libVersionCompat + lib:libsdb$secondaryArchSuffix = $sdbVer " REQUIRES=" haiku$secondaryArchSuffix @@ -184,7 +197,6 @@ PROVIDES_devel=" devel:libr_config$secondaryArchSuffix = $libVersionCompat devel:libr_cons$secondaryArchSuffix = $libVersionCompat devel:libr_core$secondaryArchSuffix = $libVersionCompat - devel:libr_crypto$secondaryArchSuffix = $libVersionCompat devel:libr_debug$secondaryArchSuffix = $libVersionCompat devel:libr_egg$secondaryArchSuffix = $libVersionCompat devel:libr_esil$secondaryArchSuffix = $libVersionCompat @@ -194,11 +206,13 @@ PROVIDES_devel=" devel:libr_lang$secondaryArchSuffix = $libVersionCompat devel:libr_magic$secondaryArchSuffix = $libVersionCompat devel:libr_main$secondaryArchSuffix = $libVersionCompat + devel:libr_muta$secondaryArchSuffix = $libVersionCompat devel:libr_reg$secondaryArchSuffix = $libVersionCompat devel:libr_search$secondaryArchSuffix = $libVersionCompat devel:libr_socket$secondaryArchSuffix = $libVersionCompat devel:libr_syscall$secondaryArchSuffix = $libVersionCompat devel:libr_util$secondaryArchSuffix = $libVersionCompat + devel:libsdb$secondaryArchSuffix = $sdbVer " REQUIRES_devel=" radare2${secondaryArchSuffix} == $portVersion base @@ -251,7 +265,6 @@ defineDebugInfoPackage radare2$secondaryArchSuffix \ "$libDir"/libr_config.so.$libVersion \ "$libDir"/libr_cons.so.$libVersion \ "$libDir"/libr_core.so.$libVersion \ - "$libDir"/libr_crypto.so.$libVersion \ "$libDir"/libr_debug.so.$libVersion \ "$libDir"/libr_egg.so.$libVersion \ "$libDir"/libr_esil.so.$libVersion \ @@ -261,23 +274,30 @@ defineDebugInfoPackage radare2$secondaryArchSuffix \ "$libDir"/libr_lang.so.$libVersion \ "$libDir"/libr_magic.so.$libVersion \ "$libDir"/libr_main.so.$libVersion \ + "$libDir"/libr_muta.so.$libVersion \ "$libDir"/libr_reg.so.$libVersion \ "$libDir"/libr_search.so.$libVersion \ "$libDir"/libr_socket.so.$libVersion \ "$libDir"/libr_syscall.so.$libVersion \ - "$libDir"/libr_util.so.$libVersion + "$libDir"/libr_util.so.$libVersion \ + "$libDir"/libsdb.so.$sdbVer BUILD() { # mkdir -p test/bins # cp -r $sourceDir2/* test/bins + mkdir -p $sourceDir/subprojects/{qjs,sdb} + cp -r $sourceDir3/* subprojects/sdb + cp -R $sourceDir4/* subprojects/qjs + cp subprojects/packagefiles/qjs/meson.build subprojects/qjs # no need for these here, using system packages rm -rf shlr/zip/{zip,zlib,include} rm -rf shlr/lz4/{deps.mk,LICENSE,lz4.*,Makefile,README.md} rm -f libr/hash/xxhash.c libr/hash/xxhash.h - meson build --buildtype=debugoptimized \ + export LDFLAGS="-lnetwork" + meson setup --buildtype=debugoptimized \ --prefix=$prefix \ --bindir=$commandBinDir \ --libdir=$libDir \ @@ -289,14 +309,14 @@ BUILD() -Duse_sys_openssl=true \ -Duse_sys_zip=true \ -Duse_sys_zlib=true \ - -Denable_tests=true \ - -Duse_webui=false --reconfigure - ninja -C build $jobArgs + -Denable_tests=false \ + -Duse_webui=false \ + build + ninja -C build } TEST_REQUIRES=" cmd:radare2 -# cmd:pip3 " INSTALL() @@ -304,9 +324,9 @@ INSTALL() ninja -C build install prepareInstalledDevelLibs libr_anal libr_arch libr_asm libr_bin \ - libr_bp libr_config libr_cons libr_core libr_crypto libr_debug libr_egg \ - libr_esil libr_flag libr_fs libr_io libr_lang libr_magic libr_main \ - libr_reg libr_search libr_socket libr_syscall libr_util + libr_bp libr_config libr_cons libr_core libr_debug libr_egg libr_esil \ + libr_flag libr_fs libr_io libr_lang libr_magic libr_main libr_muta \ + libr_reg libr_search libr_socket libr_syscall libr_util libsdb fixPkgconfig packageEntries devel \ @@ -315,10 +335,5 @@ INSTALL() TEST() { -# pip3 install --user r2pipe -# all tests passed - unset meson meson test --no-rebuild --print-errorlogs -C build - -# pip3 uninstall r2pipe -y }