[gentoo-commits] repo/gentoo:master commit in: dev-util/radare2/files/

[gentoo-commits] repo/gentoo:master commit in: dev-util/radare2/files/

[Sergei Trofimovich]

commit:     031d47f7b149a86f86e9068b9cf69d006978189f
Author:     Michael Mair-Keimberger <m.mairkeimberger <AT> gmail <DOT> com>
AuthorDate: Sun Sep 22 18:39:53 2019 +0000
Commit:     Sergei Trofimovich <slyfox <AT> gentoo <DOT> org>
CommitDate: Sun Sep 22 22:05:22 2019 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=031d47f7

dev-util/radare2: remove unused patch(es)

Signed-off-by: Michael Mair-Keimberger <m.mairkeimberger <AT> gmail.com>
Closes: https://github.com/gentoo/gentoo/pull/13013
Signed-off-by: Sergei Trofimovich <slyfox <AT> gentoo.org>

 .../radare2/files/radare2-3.5.1-mount-free.patch   | 22 --------------------
 .../files/radare2-3.7.0-with-syscapstone-p1.patch  | 24 ----------------------
 .../files/radare2-3.7.0-with-syscapstone-p2.patch  | 22 --------------------
 3 files changed, 68 deletions(-)

diff --git a/dev-util/radare2/files/radare2-3.5.1-mount-free.patch b/dev-util/radare2/files/radare2-3.5.1-mount-free.patch
deleted file mode 100644
index ad27596fc12..00000000000
--- a/dev-util/radare2/files/radare2-3.5.1-mount-free.patch
+++ /dev/null
@@ -1,22 +0,0 @@
-https://bugs.gentoo.org/688336
-
-From 40453029179d230cf02ffed205f2d63e33981b8f Mon Sep 17 00:00:00 2001
-From: pancake <pancake@nopcode.org>
-Date: Mon, 17 Jun 2019 11:34:49 +0200
-Subject: [PATCH] Fix #14334 - Double-free in ms command
-
----
- libr/core/cmd_mount.c | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
---- a/libr/core/cmd_mount.c
-+++ b/libr/core/cmd_mount.c
-@@ -471,7 +471,7 @@ static int cmd_mount(void *data, const char *_input) {
- 			rli->completion.run_user = rli->user;
- 			r_line_completion_set (&rli->completion, ms_argc, ms_argv);
- 			r_fs_shell_prompt (&shell, core->fs, input);
--			free (cwd);
-+			R_FREE (cwd);
- 			r_pvector_clear (&rli->completion.args);
- 			memcpy (&rli->completion, &c, sizeof (c));
- 		}

diff --git a/dev-util/radare2/files/radare2-3.7.0-with-syscapstone-p1.patch b/dev-util/radare2/files/radare2-3.7.0-with-syscapstone-p1.patch
deleted file mode 100644
index 3f87d606bba..00000000000
--- a/dev-util/radare2/files/radare2-3.7.0-with-syscapstone-p1.patch
+++ /dev/null
@@ -1,24 +0,0 @@
-From 8b37ac49b609cc69b27a6b3b76fa9d8d819bae83 Mon Sep 17 00:00:00 2001
-From: pancake <pancake@nopcode.org>
-Date: Thu, 1 Aug 2019 05:23:56 +0200
-Subject: [PATCH] Add capstone dependency with the mk
-
----
- binr/rabin2/Makefile | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/binr/rabin2/Makefile b/binr/rabin2/Makefile
-index 0ecb48629..33219020b 100644
---- a/binr/rabin2/Makefile
-+++ b/binr/rabin2/Makefile
-@@ -15,6 +15,6 @@ include ../../shlr/grub/deps.mk
- include ../../shlr/bochs/deps.mk
- include ../../shlr/qnx/deps.mk
- include ../../shlr/ar/deps.mk
--LINK+=../../shlr/capstone/libcapstone.a
-+include ../../shlr/capstone.mk
- 
- LDFLAGS+=$(LINK)
--- 
-2.22.0
-

diff --git a/dev-util/radare2/files/radare2-3.7.0-with-syscapstone-p2.patch b/dev-util/radare2/files/radare2-3.7.0-with-syscapstone-p2.patch
deleted file mode 100644
index 1ebb74efb36..00000000000
--- a/dev-util/radare2/files/radare2-3.7.0-with-syscapstone-p2.patch
+++ /dev/null
@@ -1,22 +0,0 @@
-From 38a10d64fb33484f0e50c3d8f40a6c19c0ee37ec Mon Sep 17 00:00:00 2001
-From: Slava <slava@bacher09.org>
-Date: Sun, 4 Aug 2019 04:00:12 +0300
-Subject: [PATCH] Fix build with system capstone (--with-syscapstone) (#14753)
-
----
- shlr/capstone.mk | 4 ++++
- 1 file changed, 4 insertions(+)
-
-diff --git a/shlr/capstone.mk b/shlr/capstone.mk
-index b3cc42d24..f1a2de04d 100644
---- a/shlr/capstone.mk
-+++ b/shlr/capstone.mk
-@@ -1 +1,5 @@
-+ifeq ($(USE_CAPSTONE),1)
-+LINK+=${CAPSTONE_LDFLAGS}
-+else
- LINK+=$(SHLR)/capstone/libcapstone.a
-+endif
--- 
-2.22.0
-

[gentoo-commits] repo/gentoo:master commit in: dev-util/radare2/files/

[Conrad Kostecki]

commit:     abce9280e3a145e6d51cd99e9e804c066b671fcd
Author:     Michael Mair-Keimberger <m.mairkeimberger <AT> gmail <DOT> com>
AuthorDate: Wed Jan 27 12:52:31 2021 +0000
Commit:     Conrad Kostecki <conikost <AT> gentoo <DOT> org>
CommitDate: Wed Jan 27 18:17:12 2021 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=abce9280

dev-util/radare2: remove unused patch(es)

Closes: https://github.com/gentoo/gentoo/pull/19240
Package-Manager: Portage-3.0.14, Repoman-3.0.2
Signed-off-by: Michael Mair-Keimberger <m.mairkeimberger <AT> gmail.com>
Signed-off-by: Conrad Kostecki <conikost <AT> gentoo.org>

 dev-util/radare2/files/radare2-4.5.1-docdir.patch | 12 ------------
 1 file changed, 12 deletions(-)

diff --git a/dev-util/radare2/files/radare2-4.5.1-docdir.patch b/dev-util/radare2/files/radare2-4.5.1-docdir.patch
deleted file mode 100644
index 51dcd7b16e1..00000000000
--- a/dev-util/radare2/files/radare2-4.5.1-docdir.patch
+++ /dev/null
@@ -1,12 +0,0 @@
-Be closer to ${PF} than ${PN}.
---- a/libr/include/r_userconf.h.acr
-+++ b/libr/include/r_userconf.h.acr
-@@ -53,7 +53,7 @@
- #define R2_ZIGNS            R_JOIN_4_PATHS ("share", "radare2", R2_VERSION, "zigns")
- #define R2_THEMES           R_JOIN_4_PATHS ("share", "radare2", R2_VERSION, "cons")
- #define R2_FLAGS            R_JOIN_4_PATHS ("share", "radare2", R2_VERSION, "flag")
--#define R2_FORTUNES         R_JOIN_3_PATHS ("share", "doc", "radare2")
-+#define R2_FORTUNES         R_JOIN_3_PATHS ("share", "doc", "radare2-" R2_VERSION)
- #define R2_HUD              R_JOIN_4_PATHS ("share", "radare2", R2_VERSION, "hud")
- #endif
- 

[gentoo-commits] repo/gentoo:master commit in: dev-util/radare2/files/

[Sergei Trofimovich]

commit:     16affe90b644281efc5b4d2daf15e1c21afdc049
Author:     Michael Mair-Keimberger <mmk <AT> levelnine <DOT> at>
AuthorDate: Sat May 15 15:42:36 2021 +0000
Commit:     Sergei Trofimovich <slyfox <AT> gentoo <DOT> org>
CommitDate: Sat May 15 17:46:47 2021 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=16affe90

dev-util/radare2: remove unused patch(es)

Package-Manager: Portage-3.0.18, Repoman-3.0.3
Signed-off-by: Michael Mair-Keimberger <mmk <AT> levelnine.at>
Closes: https://github.com/gentoo/gentoo/pull/20819
Signed-off-by: Sergei Trofimovich <slyfox <AT> gentoo.org>

 .../radare2/files/radare2-5.2.0-ssl-build.patch    | 54 ----------------------
 1 file changed, 54 deletions(-)

diff --git a/dev-util/radare2/files/radare2-5.2.0-ssl-build.patch b/dev-util/radare2/files/radare2-5.2.0-ssl-build.patch
deleted file mode 100644
index 8701adb6266..00000000000
--- a/dev-util/radare2/files/radare2-5.2.0-ssl-build.patch
+++ /dev/null
@@ -1,54 +0,0 @@
-From 7273429e4ba85318f0da2ae03ecc154834aaa73b Mon Sep 17 00:00:00 2001
-From: Sergei Trofimovich <slyfox@gentoo.org>
-Date: Mon, 12 Apr 2021 23:48:09 +0100
-Subject: [PATCH] state.c: fix --with-openssl build
-
-Build failure happens at:
-
-```
-$ ./configure --with-openssl && make
-....
-state.c: In function 'r_hash_do_hmac_sha256':
-state.c:155:19: error: 'r_SHA256_BLOCK_LENGTH' undeclared (first use in this function); did you mean 'SHA256_BLOCK_LENGTH'?
-  155 |         ut8 bskey[r_SHA256_BLOCK_LENGTH]; // block-sized key
-      |                   ^~~~~~~~~~~~~~~~~~~~~
-      |                   SHA256_BLOCK_LENGTH
-```
-
-The change defines r2_.* aliases for openssl implementation.
----
- libr/hash/state.c | 18 ++++++++++++++++++
- 1 file changed, 18 insertions(+)
-
-diff --git a/libr/hash/state.c b/libr/hash/state.c
-index 6f3ae6b4c..93adafc81 100644
---- a/libr/hash/state.c
-+++ b/libr/hash/state.c
-@@ -7,6 +7,24 @@
- #include <openssl/md4.h>
- #include <openssl/md5.h>
- #include <openssl/sha.h>
-+
-+#  define r_SHA256_BLOCK_LENGTH SHA256_BLOCK_LENGTH
-+
-+#  define r_SHA1_Init           SHA1_Init
-+#  define r_SHA1_Update         SHA1_Update
-+#  define r_SHA1_Final          SHA1_Final
-+
-+#  define r_SHA256_Init         SHA256_Init
-+#  define r_SHA256_Update       SHA256_Update
-+#  define r_SHA256_Final        SHA256_Final
-+
-+#  define r_SHA384_Init         SHA384_Init
-+#  define r_SHA384_Update       SHA384_Update
-+#  define r_SHA384_Final        SHA384_Final
-+
-+#  define r_SHA512_Init         SHA512_Init
-+#  define r_SHA512_Update       SHA512_Update
-+#  define r_SHA512_Final        SHA512_Final
- #else
- #include "md4.h"
- #include "md5.h"
--- 
-2.31.1
-

[gentoo-commits] repo/gentoo:master commit in: dev-util/radare2/files/

[Joonas Niilola]

commit:     38e9deb2dacc988801260f8ded292fe1c2b15f3f
Author:     Michael Mair-Keimberger <mmk <AT> levelnine <DOT> at>
AuthorDate: Mon Sep 12 17:21:04 2022 +0000
Commit:     Joonas Niilola <juippis <AT> gentoo <DOT> org>
CommitDate: Mon Sep 12 17:26:21 2022 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=38e9deb2

dev-util/radare2: remove unused patches

Signed-off-by: Michael Mair-Keimberger <mmk <AT> levelnine.at>
Portage 3.0.36 / pkgdev 0.2.1 / pkgcheck 0.10.14
Closes: https://github.com/gentoo/gentoo/pull/27227
Signed-off-by: Joonas Niilola <juippis <AT> gentoo.org>

 dev-util/radare2/files/CVE-2022-1437.patch         | 72 ----------------------
 .../radare2/files/radare2-5.5.0-vector35.patch     | 22 -------
 2 files changed, 94 deletions(-)

diff --git a/dev-util/radare2/files/CVE-2022-1437.patch b/dev-util/radare2/files/CVE-2022-1437.patch
deleted file mode 100644
index 16e67c5d3193..000000000000
--- a/dev-util/radare2/files/CVE-2022-1437.patch
+++ /dev/null
@@ -1,72 +0,0 @@
---- a/libr/bin/format/mach0/coresymbolication.c
-+++ b/libr/bin/format/mach0/coresymbolication.c
-@@ -269,6 +269,9 @@ RCoreSymCacheElement *r_coresym_cache_element_new(RBinFile *bf, RBuffer *buf, ut
- 		for (i = 0; i < hdr->n_sections && cursor < end; i++) {
- 			ut8 *sect_start = cursor;
- 			RCoreSymCacheElementSection *sect = &result->sections[i];
-+			if (cursor + (word_size * 4) > end) {
-+				goto beach;
-+			}
- 			sect->vaddr = sect->paddr = r_read_ble (cursor, false, bits);
- 			if (sect->vaddr < page_zero_size) {
- 				sect->vaddr += page_zero_size;
-@@ -359,6 +362,10 @@ RCoreSymCacheElement *r_coresym_cache_element_new(RBinFile *bf, RBuffer *buf, ut
- 				continue;
- 			}
- 			string_origin = relative_to_strings? b + start_of_strings : cursor;
-+			if (!string_origin) {
-+				cursor += R_CS_EL_SIZE_LSYM;
-+				continue;
-+			}
- 			lsym->flc.file = str_dup_safe (b, string_origin + file_name_off, end);
- 			if (!lsym->flc.file) {
- 				cursor += R_CS_EL_SIZE_LSYM;
---- a/libr/bin/p/bin_symbols.c
-+++ b/libr/bin/p/bin_symbols.c
-@@ -353,28 +353,30 @@ static bool check_buffer(RBinFile *bf, RBuffer *b) {
- }
- 
- static RList *symbols(RBinFile *bf) {
--	RList *res = r_list_newf ((RListFree)r_bin_symbol_free);
--	r_return_val_if_fail (res && bf->o && bf->o->bin_obj, res);
-+	r_return_val_if_fail (bf && bf->o && bf->o->bin_obj, NULL);
- 	RCoreSymCacheElement *element = bf->o->bin_obj;
- 	size_t i;
- 	HtUU *hash = ht_uu_new0 ();
- 	if (!hash) {
--		return res;
-+		return NULL;
- 	}
-+	RList *res = r_list_newf ((RListFree)r_bin_symbol_free);
- 	bool found = false;
--	for (i = 0; i < element->hdr->n_lined_symbols; i++) {
--		RCoreSymCacheElementSymbol *sym = (RCoreSymCacheElementSymbol *)&element->lined_symbols[i];
--		if (!sym) {
--			break;
--		}
--		ht_uu_find (hash, sym->paddr, &found);
--		if (found) {
--			continue;
--		}
--		RBinSymbol *s = bin_symbol_from_symbol (element, sym);
--		if (s) {
--			r_list_append (res, s);
--			ht_uu_insert (hash, sym->paddr, 1);
-+	if (element->lined_symbols) {
-+		for (i = 0; i < element->hdr->n_lined_symbols; i++) {
-+			RCoreSymCacheElementSymbol *sym = (RCoreSymCacheElementSymbol *)&element->lined_symbols[i];
-+			if (!sym) {
-+				break;
-+			}
-+			ht_uu_find (hash, sym->paddr, &found);
-+			if (found) {
-+				continue;
-+			}
-+			RBinSymbol *s = bin_symbol_from_symbol (element, sym);
-+			if (s) {
-+				r_list_append (res, s);
-+				ht_uu_insert (hash, sym->paddr, 1);
-+			}
- 		}
- 	}
- 	if (element->symbols) {

diff --git a/dev-util/radare2/files/radare2-5.5.0-vector35.patch b/dev-util/radare2/files/radare2-5.5.0-vector35.patch
deleted file mode 100644
index 5ebf58020d4d..000000000000
--- a/dev-util/radare2/files/radare2-5.5.0-vector35.patch
+++ /dev/null
@@ -1,22 +0,0 @@
---- a/libr/asm/arch/arm/v35arm64/Makefile
-+++ b/libr/asm/arch/arm/v35arm64/Makefile
-@@ -30,8 +30,7 @@ $(ALIBS): arch-arm64 arch-armv7
- 
- ## ARM64
- arch-arm64:
--	git clone -q https://github.com/radareorg/vector35-arch-arm64 arch-arm64
--	cd arch-arm64 && git checkout -q radare2 > /dev/null && git reset --hard $(ARCH_ARM64_COMMIT)
-+	cd arch-arm64 
- 
- $(V35ARM64_HOME)/arm64dis.a arm64dis.a: $(ALIBS)
- 	rm -f arm64dis.$(EXT_AR)
-@@ -40,8 +39,7 @@ $(V35ARM64_HOME)/arm64dis.a arm64dis.a: $(ALIBS)
- 
- ## ARMV7
- arch-armv7:
--	git clone -q https://github.com/radareorg/vector35-arch-armv7 arch-armv7
--	cd arch-armv7 && git checkout -q radare2 > /dev/null && git reset --hard $(ARCH_ARMV7_COMMIT)
-+	cd arch-armv7 
- 
- $(V35ARMV7_HOME)/armv7dis.a armv7dis.a: $(ALIBS)
- 	rm -f armv7dis.$(EXT_AR)

[gentoo-commits] repo/gentoo:master commit in: dev-util/radare2/files/

[Conrad Kostecki]

commit:     ef65f14c5b3c6dad7cb9848f20b2bc066cac6923
Author:     Michael Mair-Keimberger <mmk <AT> levelnine <DOT> at>
AuthorDate: Thu Apr 18 18:06:00 2024 +0000
Commit:     Conrad Kostecki <conikost <AT> gentoo <DOT> org>
CommitDate: Thu Apr 18 19:31:45 2024 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=ef65f14c

dev-util/radare2: remove unused patch

Signed-off-by: Michael Mair-Keimberger <mmk <AT> levelnine.at>
Signed-off-by: Conrad Kostecki <conikost <AT> gentoo.org>

 .../files/radare2-5.8.2-bundled-capstone.patch      | 21 ---------------------
 1 file changed, 21 deletions(-)

diff --git a/dev-util/radare2/files/radare2-5.8.2-bundled-capstone.patch b/dev-util/radare2/files/radare2-5.8.2-bundled-capstone.patch
deleted file mode 100644
index 31de9b72bb37..000000000000
--- a/dev-util/radare2/files/radare2-5.8.2-bundled-capstone.patch
+++ /dev/null
@@ -1,21 +0,0 @@
-Need to unbundle capstone due to broken capstone-5 compatibility:
-
-https://github.com/radareorg/radare2/issues/21204
-https://bugs.gentoo.org/891805
-
-diff --git a/shlr/Makefile b/shlr/Makefile
-index 5626a061ff..5e8af3b99b 100644
---- a/shlr/Makefile
-+++ b/shlr/Makefile
-@@ -225,10 +225,7 @@ capstone-sync: capstone
- capstone-clean:
- 	-$(MAKE) -C capstone clean
- 
--capstone: capstone-$(CS_VER).tar.gz
--	tar xzvf capstone-$(CS_VER).tar.gz
--	rm -rf capstone
--	mv capstone-$(CS_VER) capstone
-+capstone:
- 	$(MAKE) patch-capstone
- 
- # already implemented in capstone.sh