Gentoo Archives: gentoo-commits

From: Sergei Trofimovich <slyfox@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] repo/gentoo:master commit in: dev-util/radare2/files/
Date: Sun, 22 Sep 2019 22:05:32
Message-Id: 1569189922.031d47f7b149a86f86e9068b9cf69d006978189f.slyfox@gentoo
1 commit: 031d47f7b149a86f86e9068b9cf69d006978189f
2 Author: Michael Mair-Keimberger <m.mairkeimberger <AT> gmail <DOT> com>
3 AuthorDate: Sun Sep 22 18:39:53 2019 +0000
4 Commit: Sergei Trofimovich <slyfox <AT> gentoo <DOT> org>
5 CommitDate: Sun Sep 22 22:05:22 2019 +0000
6 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=031d47f7
7
8 dev-util/radare2: remove unused patch(es)
9
10 Signed-off-by: Michael Mair-Keimberger <m.mairkeimberger <AT> gmail.com>
11 Closes: https://github.com/gentoo/gentoo/pull/13013
12 Signed-off-by: Sergei Trofimovich <slyfox <AT> gentoo.org>
13
14 .../radare2/files/radare2-3.5.1-mount-free.patch | 22 --------------------
15 .../files/radare2-3.7.0-with-syscapstone-p1.patch | 24 ----------------------
16 .../files/radare2-3.7.0-with-syscapstone-p2.patch | 22 --------------------
17 3 files changed, 68 deletions(-)
18
19 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
20 deleted file mode 100644
21 index ad27596fc12..00000000000
22 --- a/dev-util/radare2/files/radare2-3.5.1-mount-free.patch
23 +++ /dev/null
24 @@ -1,22 +0,0 @@
25 -https://bugs.gentoo.org/688336
26 -
27 -From 40453029179d230cf02ffed205f2d63e33981b8f Mon Sep 17 00:00:00 2001
28 -From: pancake <pancake@×××××××.org>
29 -Date: Mon, 17 Jun 2019 11:34:49 +0200
30 -Subject: [PATCH] Fix #14334 - Double-free in ms command
31 -
32 ----
33 - libr/core/cmd_mount.c | 2 +-
34 - 1 file changed, 1 insertion(+), 1 deletion(-)
35 -
36 ---- a/libr/core/cmd_mount.c
37 -+++ b/libr/core/cmd_mount.c
38 -@@ -471,7 +471,7 @@ static int cmd_mount(void *data, const char *_input) {
39 - rli->completion.run_user = rli->user;
40 - r_line_completion_set (&rli->completion, ms_argc, ms_argv);
41 - r_fs_shell_prompt (&shell, core->fs, input);
42 -- free (cwd);
43 -+ R_FREE (cwd);
44 - r_pvector_clear (&rli->completion.args);
45 - memcpy (&rli->completion, &c, sizeof (c));
46 - }
47
48 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
49 deleted file mode 100644
50 index 3f87d606bba..00000000000
51 --- a/dev-util/radare2/files/radare2-3.7.0-with-syscapstone-p1.patch
52 +++ /dev/null
53 @@ -1,24 +0,0 @@
54 -From 8b37ac49b609cc69b27a6b3b76fa9d8d819bae83 Mon Sep 17 00:00:00 2001
55 -From: pancake <pancake@×××××××.org>
56 -Date: Thu, 1 Aug 2019 05:23:56 +0200
57 -Subject: [PATCH] Add capstone dependency with the mk
58 -
59 ----
60 - binr/rabin2/Makefile | 2 +-
61 - 1 file changed, 1 insertion(+), 1 deletion(-)
62 -
63 -diff --git a/binr/rabin2/Makefile b/binr/rabin2/Makefile
64 -index 0ecb48629..33219020b 100644
65 ---- a/binr/rabin2/Makefile
66 -+++ b/binr/rabin2/Makefile
67 -@@ -15,6 +15,6 @@ include ../../shlr/grub/deps.mk
68 - include ../../shlr/bochs/deps.mk
69 - include ../../shlr/qnx/deps.mk
70 - include ../../shlr/ar/deps.mk
71 --LINK+=../../shlr/capstone/libcapstone.a
72 -+include ../../shlr/capstone.mk
73 -
74 - LDFLAGS+=$(LINK)
75 ---
76 -2.22.0
77 -
78
79 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
80 deleted file mode 100644
81 index 1ebb74efb36..00000000000
82 --- a/dev-util/radare2/files/radare2-3.7.0-with-syscapstone-p2.patch
83 +++ /dev/null
84 @@ -1,22 +0,0 @@
85 -From 38a10d64fb33484f0e50c3d8f40a6c19c0ee37ec Mon Sep 17 00:00:00 2001
86 -From: Slava <slava@××××××××.org>
87 -Date: Sun, 4 Aug 2019 04:00:12 +0300
88 -Subject: [PATCH] Fix build with system capstone (--with-syscapstone) (#14753)
89 -
90 ----
91 - shlr/capstone.mk | 4 ++++
92 - 1 file changed, 4 insertions(+)
93 -
94 -diff --git a/shlr/capstone.mk b/shlr/capstone.mk
95 -index b3cc42d24..f1a2de04d 100644
96 ---- a/shlr/capstone.mk
97 -+++ b/shlr/capstone.mk
98 -@@ -1 +1,5 @@
99 -+ifeq ($(USE_CAPSTONE),1)
100 -+LINK+=${CAPSTONE_LDFLAGS}
101 -+else
102 - LINK+=$(SHLR)/capstone/libcapstone.a
103 -+endif
104 ---
105 -2.22.0
106 -