From e54cc6cd134a08bf3dc4cb2ada42e66e8d35fab9 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?J=C3=A9r=C3=B4me=20Duval?= Date: Thu, 26 Aug 2021 10:47:06 +0200 Subject: [PATCH] Revert "radare2: update from 4.5.1 to 5.4.0 (#6149)" (#6156) This reverts commit e80c863beea39e5e2bec255d665856a4ea7e40de. --- .../radare2/patches/radare2-4.5.1.patchset | 22 +++++++++++++++++++ ...are2-5.4.0.recipe => radare2-4.5.1.recipe} | 7 +++--- 2 files changed, 25 insertions(+), 4 deletions(-) create mode 100644 dev-util/radare2/patches/radare2-4.5.1.patchset rename dev-util/radare2/{radare2-5.4.0.recipe => radare2-4.5.1.recipe} (98%) diff --git a/dev-util/radare2/patches/radare2-4.5.1.patchset b/dev-util/radare2/patches/radare2-4.5.1.patchset new file mode 100644 index 000000000..975e2fab1 --- /dev/null +++ b/dev-util/radare2/patches/radare2-4.5.1.patchset @@ -0,0 +1,22 @@ +From 6f963691d4cb1ac0458212160ceebda35944e7c3 Mon Sep 17 00:00:00 2001 +From: devnexen +Date: Mon, 23 Nov 2020 09:28:36 +0000 +Subject: Merge upstream patch for using proper team_id/pid_t + + +diff --git a/libr/util/sys.c b/libr/util/sys.c +index f2dc348..6dbdc67 100644 +--- a/libr/util/sys.c ++++ b/libr/util/sys.c +@@ -1212,7 +1212,7 @@ R_API char *r_sys_pid_to_path(int pid) { + int32_t group = 0; + image_info ii; + +- while (get_next_image_info (0, &group, &ii) == B_OK) { ++ while (get_next_image_info ((team_id)pid, &group, &ii) == B_OK) { + if (ii.type == B_APP_IMAGE) { + break; + } +-- +2.28.0 + diff --git a/dev-util/radare2/radare2-5.4.0.recipe b/dev-util/radare2/radare2-4.5.1.recipe similarity index 98% rename from dev-util/radare2/radare2-5.4.0.recipe rename to dev-util/radare2/radare2-4.5.1.recipe index 56117a099..a2eb3a167 100644 --- a/dev-util/radare2/radare2-5.4.0.recipe +++ b/dev-util/radare2/radare2-4.5.1.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-2021 pancake +COPYRIGHT="2007-2020 pancake 2007-2015 Skia 2012-2015 pof 2008-2015 nibble @@ -96,9 +96,9 @@ COPYRIGHT="2007-2021 pancake 2010-2016 Sebastian Reichel" LICENSE="GNU GPL v3 GNU LGPL v3" -REVISION="1" +REVISION="3" SOURCE_URI="https://github.com/radare/radare2/archive/$portVersion.tar.gz" -CHECKSUM_SHA256="21ddae80a18d5ceef4bcd3a7cae1ba09d14b510d68ac9134681e1e9967123b23" +CHECKSUM_SHA256="4e85b35987bd2ca5881ad9585970b970fe7374814bd383bd1cd62e961a0c228b" PATCHES="radare2-$portVersion.patchset" ARCHITECTURES="!x86_gcc2 x86_64" @@ -232,7 +232,6 @@ defineDebugInfoPackage radare2$secondaryArchSuffix \ "$commandBinDir"/rahash2 \ "$commandBinDir"/rarun2 \ "$commandBinDir"/rasm2 \ - "$commandBinDir"/ravc2\ "$commandBinDir"/rax2 \ "$libDir"/libr_anal.so.$libVersion \ "$libDir"/libr_asm.so.$libVersion \