Gentoo Archives: gentoo-commits

From: "Jakov Smolić" <jsmolic@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] repo/gentoo:master commit in: dev-util/bpftrace/files/, dev-util/bpftrace/
Date: Sun, 07 Nov 2021 20:59:47
Message-Id: 1636318720.9af1ceff0ce358bd93f2e54e8f4a7ef496623d45.jsmolic@gentoo
1 commit: 9af1ceff0ce358bd93f2e54e8f4a7ef496623d45
2 Author: Jakov Smolić <jsmolic <AT> gentoo <DOT> org>
3 AuthorDate: Sun Nov 7 20:58:17 2021 +0000
4 Commit: Jakov Smolić <jsmolic <AT> gentoo <DOT> org>
5 CommitDate: Sun Nov 7 20:58:40 2021 +0000
6 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=9af1ceff
7
8 dev-util/bpftrace: Fix includes in fuzz_main.cpp
9
10 Closes: https://bugs.gentoo.org/801385
11 Signed-off-by: Jakov Smolić <jsmolic <AT> gentoo.org>
12
13 dev-util/bpftrace/bpftrace-0.14.0-r3.ebuild | 1 +
14 dev-util/bpftrace/files/bpftrace-0.14.0-fuzzing.patch | 18 ++++++++++++++++++
15 2 files changed, 19 insertions(+)
16
17 diff --git a/dev-util/bpftrace/bpftrace-0.14.0-r3.ebuild b/dev-util/bpftrace/bpftrace-0.14.0-r3.ebuild
18 index 4435e4c8379..9f4a31fdf7b 100644
19 --- a/dev-util/bpftrace/bpftrace-0.14.0-r3.ebuild
20 +++ b/dev-util/bpftrace/bpftrace-0.14.0-r3.ebuild
21 @@ -43,6 +43,7 @@ QA_DT_NEEDED="/usr/lib.*/libbpftraceresources.so"
22 PATCHES=(
23 "${FILESDIR}/bpftrace-0.14.0-install-libs.patch"
24 "${FILESDIR}/bpftrace-0.14.0-dont-compress-man.patch"
25 + "${FILESDIR}/bpftrace-0.14.0-fuzzing.patch"
26 "${FILESDIR}/bpftrace-0.11.4-old-kernels.patch"
27 "${FILESDIR}/bpftrace-0.12.0-fuzzing-build.patch"
28 )
29
30 diff --git a/dev-util/bpftrace/files/bpftrace-0.14.0-fuzzing.patch b/dev-util/bpftrace/files/bpftrace-0.14.0-fuzzing.patch
31 new file mode 100644
32 index 00000000000..6c759a9e1ca
33 --- /dev/null
34 +++ b/dev-util/bpftrace/files/bpftrace-0.14.0-fuzzing.patch
35 @@ -0,0 +1,18 @@
36 +https://github.com/iovisor/bpftrace/pull/2059
37 +--- a/src/fuzz_main.cpp
38 ++++ b/src/fuzz_main.cpp
39 +@@ -17,12 +17,12 @@
40 + #include <unistd.h>
41 +
42 + #include "ast/bpforc/bpforc.h"
43 +-#include "ast/clang_parser.h"
44 ++#include "clang_parser.h"
45 + #include "ast/passes/callback_visitor.h"
46 + #include "ast/passes/field_analyser.h"
47 + #include "ast/passes/semantic_analyser.h"
48 + #include "bpftrace.h"
49 +-#include "codegen_llvm.h"
50 ++#include "ast/passes/codegen_llvm.h"
51 + #include "driver.h"
52 + #include "log.h"
53 + #include "output.h"