| 1 |
commit: 38e9deb2dacc988801260f8ded292fe1c2b15f3f |
| 2 |
Author: Michael Mair-Keimberger <mmk <AT> levelnine <DOT> at> |
| 3 |
AuthorDate: Mon Sep 12 17:21:04 2022 +0000 |
| 4 |
Commit: Joonas Niilola <juippis <AT> gentoo <DOT> org> |
| 5 |
CommitDate: Mon Sep 12 17:26:21 2022 +0000 |
| 6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=38e9deb2 |
| 7 |
|
| 8 |
dev-util/radare2: remove unused patches |
| 9 |
|
| 10 |
Signed-off-by: Michael Mair-Keimberger <mmk <AT> levelnine.at> |
| 11 |
Portage 3.0.36 / pkgdev 0.2.1 / pkgcheck 0.10.14 |
| 12 |
Closes: https://github.com/gentoo/gentoo/pull/27227 |
| 13 |
Signed-off-by: Joonas Niilola <juippis <AT> gentoo.org> |
| 14 |
|
| 15 |
dev-util/radare2/files/CVE-2022-1437.patch | 72 ---------------------- |
| 16 |
.../radare2/files/radare2-5.5.0-vector35.patch | 22 ------- |
| 17 |
2 files changed, 94 deletions(-) |
| 18 |
|
| 19 |
diff --git a/dev-util/radare2/files/CVE-2022-1437.patch b/dev-util/radare2/files/CVE-2022-1437.patch |
| 20 |
deleted file mode 100644 |
| 21 |
index 16e67c5d3193..000000000000 |
| 22 |
--- a/dev-util/radare2/files/CVE-2022-1437.patch |
| 23 |
+++ /dev/null |
| 24 |
@@ -1,72 +0,0 @@ |
| 25 |
---- a/libr/bin/format/mach0/coresymbolication.c |
| 26 |
-+++ b/libr/bin/format/mach0/coresymbolication.c |
| 27 |
-@@ -269,6 +269,9 @@ RCoreSymCacheElement *r_coresym_cache_element_new(RBinFile *bf, RBuffer *buf, ut |
| 28 |
- for (i = 0; i < hdr->n_sections && cursor < end; i++) { |
| 29 |
- ut8 *sect_start = cursor; |
| 30 |
- RCoreSymCacheElementSection *sect = &result->sections[i]; |
| 31 |
-+ if (cursor + (word_size * 4) > end) { |
| 32 |
-+ goto beach; |
| 33 |
-+ } |
| 34 |
- sect->vaddr = sect->paddr = r_read_ble (cursor, false, bits); |
| 35 |
- if (sect->vaddr < page_zero_size) { |
| 36 |
- sect->vaddr += page_zero_size; |
| 37 |
-@@ -359,6 +362,10 @@ RCoreSymCacheElement *r_coresym_cache_element_new(RBinFile *bf, RBuffer *buf, ut |
| 38 |
- continue; |
| 39 |
- } |
| 40 |
- string_origin = relative_to_strings? b + start_of_strings : cursor; |
| 41 |
-+ if (!string_origin) { |
| 42 |
-+ cursor += R_CS_EL_SIZE_LSYM; |
| 43 |
-+ continue; |
| 44 |
-+ } |
| 45 |
- lsym->flc.file = str_dup_safe (b, string_origin + file_name_off, end); |
| 46 |
- if (!lsym->flc.file) { |
| 47 |
- cursor += R_CS_EL_SIZE_LSYM; |
| 48 |
---- a/libr/bin/p/bin_symbols.c |
| 49 |
-+++ b/libr/bin/p/bin_symbols.c |
| 50 |
-@@ -353,28 +353,30 @@ static bool check_buffer(RBinFile *bf, RBuffer *b) { |
| 51 |
- } |
| 52 |
- |
| 53 |
- static RList *symbols(RBinFile *bf) { |
| 54 |
-- RList *res = r_list_newf ((RListFree)r_bin_symbol_free); |
| 55 |
-- r_return_val_if_fail (res && bf->o && bf->o->bin_obj, res); |
| 56 |
-+ r_return_val_if_fail (bf && bf->o && bf->o->bin_obj, NULL); |
| 57 |
- RCoreSymCacheElement *element = bf->o->bin_obj; |
| 58 |
- size_t i; |
| 59 |
- HtUU *hash = ht_uu_new0 (); |
| 60 |
- if (!hash) { |
| 61 |
-- return res; |
| 62 |
-+ return NULL; |
| 63 |
- } |
| 64 |
-+ RList *res = r_list_newf ((RListFree)r_bin_symbol_free); |
| 65 |
- bool found = false; |
| 66 |
-- for (i = 0; i < element->hdr->n_lined_symbols; i++) { |
| 67 |
-- RCoreSymCacheElementSymbol *sym = (RCoreSymCacheElementSymbol *)&element->lined_symbols[i]; |
| 68 |
-- if (!sym) { |
| 69 |
-- break; |
| 70 |
-- } |
| 71 |
-- ht_uu_find (hash, sym->paddr, &found); |
| 72 |
-- if (found) { |
| 73 |
-- continue; |
| 74 |
-- } |
| 75 |
-- RBinSymbol *s = bin_symbol_from_symbol (element, sym); |
| 76 |
-- if (s) { |
| 77 |
-- r_list_append (res, s); |
| 78 |
-- ht_uu_insert (hash, sym->paddr, 1); |
| 79 |
-+ if (element->lined_symbols) { |
| 80 |
-+ for (i = 0; i < element->hdr->n_lined_symbols; i++) { |
| 81 |
-+ RCoreSymCacheElementSymbol *sym = (RCoreSymCacheElementSymbol *)&element->lined_symbols[i]; |
| 82 |
-+ if (!sym) { |
| 83 |
-+ break; |
| 84 |
-+ } |
| 85 |
-+ ht_uu_find (hash, sym->paddr, &found); |
| 86 |
-+ if (found) { |
| 87 |
-+ continue; |
| 88 |
-+ } |
| 89 |
-+ RBinSymbol *s = bin_symbol_from_symbol (element, sym); |
| 90 |
-+ if (s) { |
| 91 |
-+ r_list_append (res, s); |
| 92 |
-+ ht_uu_insert (hash, sym->paddr, 1); |
| 93 |
-+ } |
| 94 |
- } |
| 95 |
- } |
| 96 |
- if (element->symbols) { |
| 97 |
|
| 98 |
diff --git a/dev-util/radare2/files/radare2-5.5.0-vector35.patch b/dev-util/radare2/files/radare2-5.5.0-vector35.patch |
| 99 |
deleted file mode 100644 |
| 100 |
index 5ebf58020d4d..000000000000 |
| 101 |
--- a/dev-util/radare2/files/radare2-5.5.0-vector35.patch |
| 102 |
+++ /dev/null |
| 103 |
@@ -1,22 +0,0 @@ |
| 104 |
---- a/libr/asm/arch/arm/v35arm64/Makefile |
| 105 |
-+++ b/libr/asm/arch/arm/v35arm64/Makefile |
| 106 |
-@@ -30,8 +30,7 @@ $(ALIBS): arch-arm64 arch-armv7 |
| 107 |
- |
| 108 |
- ## ARM64 |
| 109 |
- arch-arm64: |
| 110 |
-- git clone -q https://github.com/radareorg/vector35-arch-arm64 arch-arm64 |
| 111 |
-- cd arch-arm64 && git checkout -q radare2 > /dev/null && git reset --hard $(ARCH_ARM64_COMMIT) |
| 112 |
-+ cd arch-arm64 |
| 113 |
- |
| 114 |
- $(V35ARM64_HOME)/arm64dis.a arm64dis.a: $(ALIBS) |
| 115 |
- rm -f arm64dis.$(EXT_AR) |
| 116 |
-@@ -40,8 +39,7 @@ $(V35ARM64_HOME)/arm64dis.a arm64dis.a: $(ALIBS) |
| 117 |
- |
| 118 |
- ## ARMV7 |
| 119 |
- arch-armv7: |
| 120 |
-- git clone -q https://github.com/radareorg/vector35-arch-armv7 arch-armv7 |
| 121 |
-- cd arch-armv7 && git checkout -q radare2 > /dev/null && git reset --hard $(ARCH_ARMV7_COMMIT) |
| 122 |
-+ cd arch-armv7 |
| 123 |
- |
| 124 |
- $(V35ARMV7_HOME)/armv7dis.a armv7dis.a: $(ALIBS) |
| 125 |
- rm -f armv7dis.$(EXT_AR) |
Archives