Gentoo Archives: gentoo-commits

From: Sam James <sam@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] repo/gentoo:master commit in: app-forensics/aflplusplus/files/, app-forensics/aflplusplus/
Date: Sun, 19 Sep 2021 07:28:45
Message-Id: 1632036513.7a2b47d0a95d1f26992bca1afd5a26566b9c1eef.sam@gentoo
1 commit: 7a2b47d0a95d1f26992bca1afd5a26566b9c1eef
2 Author: Sam James <sam <AT> gentoo <DOT> org>
3 AuthorDate: Sun Sep 19 07:28:21 2021 +0000
4 Commit: Sam James <sam <AT> gentoo <DOT> org>
5 CommitDate: Sun Sep 19 07:28:33 2021 +0000
6 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=7a2b47d0
7
8 app-forensics/aflplusplus: drop 3.12c-r3, 3.13c-r1
9
10 Signed-off-by: Sam James <sam <AT> gentoo.org>
11
12 app-forensics/aflplusplus/Manifest | 2 -
13 .../aflplusplus/aflplusplus-3.12c-r3.ebuild | 98 ------------------
14 .../aflplusplus/aflplusplus-3.13c-r1.ebuild | 98 ------------------
15 .../files/aflplusplus-3.0c-CFLAGS.patch | 110 ---------------------
16 4 files changed, 308 deletions(-)
17
18 diff --git a/app-forensics/aflplusplus/Manifest b/app-forensics/aflplusplus/Manifest
19 index 765f9130b88..b03d0a63851 100644
20 --- a/app-forensics/aflplusplus/Manifest
21 +++ b/app-forensics/aflplusplus/Manifest
22 @@ -1,3 +1 @@
23 -DIST aflplusplus-3.12c.tar.gz 2065569 BLAKE2B ff7a87eb02f7731b5ce8e1a3016239c6fd1cd1bfeb0b9c0fb69f72bdbf079e7700cdb32abe64f64853e5ff82f1c0ecd86d2cadb892e7c40be6bb2a7b089f7387 SHA512 a814d61298b60d99388289e742dbedf2ed1ab454a5e1ea20d48bb2f18b36c01553ab1f097a06f733439d67e804d48cb823a82ff249c404fb0b83a281564f3040
24 -DIST aflplusplus-3.13c.tar.gz 2128787 BLAKE2B 40fa65654468dc1de7f6e1b63d2266915a40d145b7cb91b8b95488bc975804f70887bc1c3718fbd12c76872a0126f3bcc36134eb55ef729060b5efcf93dad424 SHA512 916a714deaf67969c9ac6e90bd2d8015a1e5188c8a8122f4d5d64ce4b841822de65458e469a47d4244358fab5e31ef4e52b8ec1432dcbd60d29aedf15e4c36fe
25 DIST aflplusplus-3.14c.tar.gz 2162934 BLAKE2B 0830b320cea65b9bdd048a08a388c7145164f6b7f4dc140a2f4268a3aa22dc608a771169c830e2196e7a0d543e6f3da49f39736f3b2514c559b986ce929d43c4 SHA512 318607cff40b5f2fc94938747e2ac6b8f400767138eb39edf4daf320afbdab417d0d97a80a1c9db8bb557ad4b7b62f887ae6e692c376f5d5673a493bd23bb811
26
27 diff --git a/app-forensics/aflplusplus/aflplusplus-3.12c-r3.ebuild b/app-forensics/aflplusplus/aflplusplus-3.12c-r3.ebuild
28 deleted file mode 100644
29 index 2e0c7d30195..00000000000
30 --- a/app-forensics/aflplusplus/aflplusplus-3.12c-r3.ebuild
31 +++ /dev/null
32 @@ -1,98 +0,0 @@
33 -# Copyright 1999-2021 Gentoo Authors
34 -# Distributed under the terms of the GNU General Public License v2
35 -
36 -EAPI=7
37 -
38 -PYTHON_COMPAT=( python3_{7,8,9} )
39 -LLVM_MAX_SLOT=12
40 -inherit toolchain-funcs llvm optfeature python-single-r1
41 -
42 -DESCRIPTION="A fork of AFL, the popular compile-time instrumentation fuzzer"
43 -HOMEPAGE="https://github.com/AFLplusplus/AFLplusplus"
44 -SRC_URI="https://github.com/AFLplusplus/AFLplusplus/archive/${PV}.tar.gz -> ${P}.tar.gz"
45 -S="${WORKDIR}/AFLplusplus-${PV}"
46 -
47 -LICENSE="Apache-2.0"
48 -SLOT="0"
49 -KEYWORDS="~amd64 ~arm64"
50 -IUSE="test"
51 -
52 -REQUIRED_USE="${PYTHON_REQUIRED_USE}"
53 -
54 -# Tests involve heavy use of LD_PRELOAD in some cases
55 -# This isn't compatible with sandbox
56 -RESTRICT="test"
57 -
58 -# It turns out we need Clang too
59 -RDEPEND="
60 - ${PYTHON_DEPS}
61 - >=sys-devel/llvm-10:=
62 - || (
63 - sys-devel/clang:10
64 - sys-devel/clang:11
65 - sys-devel/clang:12
66 - )
67 - !app-forensics/afl
68 -"
69 -DEPEND="
70 - ${RDEPEND}
71 - test? ( dev-util/cmocka )
72 -"
73 -
74 -QA_PREBUILT="/usr/share/afl/testcases/others/elf/small_exec.elf"
75 -
76 -PATCHES=(
77 - "${FILESDIR}/${PN}-3.0c-LDFLAGS.patch"
78 - "${FILESDIR}/${PN}-3.0c-CFLAGS.patch"
79 -)
80 -
81 -llvm_check_deps() {
82 - has_version -b "sys-devel/clang:${LLVM_SLOT}" && \
83 - has_version -b "sys-devel/llvm:${LLVM_SLOT}"
84 -}
85 -
86 -pkg_setup() {
87 - llvm_pkg_setup
88 - python-single-r1_pkg_setup
89 -}
90 -
91 -src_prepare() {
92 - default
93 -
94 - sed -i -e 's/-O3 -fno-unroll-loops//' GNUmakefile || die
95 -}
96 -
97 -src_compile() {
98 - emake \
99 - CC="$(tc-getCC)" \
100 - CXX="$(tc-getCXX)" \
101 - CFLAGS_FLTO="" \
102 - PREFIX="${EPREFIX}/usr" \
103 - HELPER_PATH="${EPREFIX}/usr/$(get_libdir)/afl" \
104 - DOC_PATH="${EPREFIX}/usr/share/doc/${PF}" \
105 - MAN_PATH="${EPREFIX}/usr/share/man/man8"
106 -}
107 -
108 -src_test() {
109 - emake \
110 - CC="$(tc-getCC)" \
111 - CXX="$(tc-getCXX)"
112 -}
113 -
114 -src_install() {
115 - emake \
116 - CC="$(tc-getCC)" \
117 - CXX="$(tc-getCXX)" \
118 - DESTDIR="${D}" \
119 - PREFIX="${EPREFIX}/usr" \
120 - HELPER_PATH="${EPREFIX}/usr/$(get_libdir)/afl" \
121 - DOC_PATH="${EPREFIX}/usr/share/doc/${PF}" \
122 - MAN_PATH="${EPREFIX}/usr/share/man/man8" \
123 - install
124 -}
125 -
126 -pkg_postinst() {
127 - # TODO: Any others?
128 - optfeature "fuzzing with AFL_USE_ASAN" sys-libs/compiler-rt-sanitizers[asan]
129 - optfeature "fuzzing with AFL_USE_MSAN" sys-libs/compiler-rt-sanitizers[msan]
130 -}
131
132 diff --git a/app-forensics/aflplusplus/aflplusplus-3.13c-r1.ebuild b/app-forensics/aflplusplus/aflplusplus-3.13c-r1.ebuild
133 deleted file mode 100644
134 index 3ea62e6bb74..00000000000
135 --- a/app-forensics/aflplusplus/aflplusplus-3.13c-r1.ebuild
136 +++ /dev/null
137 @@ -1,98 +0,0 @@
138 -# Copyright 1999-2021 Gentoo Authors
139 -# Distributed under the terms of the GNU General Public License v2
140 -
141 -EAPI=7
142 -
143 -PYTHON_COMPAT=( python3_{7,8,9} )
144 -LLVM_MAX_SLOT=12
145 -inherit toolchain-funcs llvm optfeature python-single-r1
146 -
147 -DESCRIPTION="A fork of AFL, the popular compile-time instrumentation fuzzer"
148 -HOMEPAGE="https://github.com/AFLplusplus/AFLplusplus"
149 -SRC_URI="https://github.com/AFLplusplus/AFLplusplus/archive/${PV}.tar.gz -> ${P}.tar.gz"
150 -S="${WORKDIR}/AFLplusplus-${PV}"
151 -
152 -LICENSE="Apache-2.0"
153 -SLOT="0"
154 -KEYWORDS="amd64 arm64"
155 -IUSE="test"
156 -
157 -REQUIRED_USE="${PYTHON_REQUIRED_USE}"
158 -
159 -# Tests involve heavy use of LD_PRELOAD in some cases
160 -# This isn't compatible with sandbox
161 -RESTRICT="test"
162 -
163 -# It turns out we need Clang too
164 -RDEPEND="
165 - ${PYTHON_DEPS}
166 - >=sys-devel/llvm-10:=
167 - || (
168 - sys-devel/clang:10
169 - sys-devel/clang:11
170 - sys-devel/clang:12
171 - )
172 - !app-forensics/afl
173 -"
174 -DEPEND="
175 - ${RDEPEND}
176 - test? ( dev-util/cmocka )
177 -"
178 -
179 -QA_PREBUILT="/usr/share/afl/testcases/others/elf/small_exec.elf"
180 -
181 -PATCHES=(
182 - "${FILESDIR}/${PN}-3.0c-LDFLAGS.patch"
183 - "${FILESDIR}/${PN}-3.13c-CFLAGS.patch"
184 -)
185 -
186 -llvm_check_deps() {
187 - has_version -b "sys-devel/clang:${LLVM_SLOT}" && \
188 - has_version -b "sys-devel/llvm:${LLVM_SLOT}"
189 -}
190 -
191 -pkg_setup() {
192 - llvm_pkg_setup
193 - python-single-r1_pkg_setup
194 -}
195 -
196 -src_prepare() {
197 - default
198 -
199 - sed -i -e 's/-O3 -fno-unroll-loops//' GNUmakefile || die
200 -}
201 -
202 -src_compile() {
203 - emake \
204 - CC="$(tc-getCC)" \
205 - CXX="$(tc-getCXX)" \
206 - CFLAGS_FLTO="" \
207 - PREFIX="${EPREFIX}/usr" \
208 - HELPER_PATH="${EPREFIX}/usr/$(get_libdir)/afl" \
209 - DOC_PATH="${EPREFIX}/usr/share/doc/${PF}" \
210 - MAN_PATH="${EPREFIX}/usr/share/man/man8"
211 -}
212 -
213 -src_test() {
214 - emake \
215 - CC="$(tc-getCC)" \
216 - CXX="$(tc-getCXX)"
217 -}
218 -
219 -src_install() {
220 - emake \
221 - CC="$(tc-getCC)" \
222 - CXX="$(tc-getCXX)" \
223 - DESTDIR="${D}" \
224 - PREFIX="${EPREFIX}/usr" \
225 - HELPER_PATH="${EPREFIX}/usr/$(get_libdir)/afl" \
226 - DOC_PATH="${EPREFIX}/usr/share/doc/${PF}" \
227 - MAN_PATH="${EPREFIX}/usr/share/man/man8" \
228 - install
229 -}
230 -
231 -pkg_postinst() {
232 - # TODO: Any others?
233 - optfeature "fuzzing with AFL_USE_ASAN" sys-libs/compiler-rt-sanitizers[asan]
234 - optfeature "fuzzing with AFL_USE_MSAN" sys-libs/compiler-rt-sanitizers[msan]
235 -}
236
237 diff --git a/app-forensics/aflplusplus/files/aflplusplus-3.0c-CFLAGS.patch b/app-forensics/aflplusplus/files/aflplusplus-3.0c-CFLAGS.patch
238 deleted file mode 100644
239 index a3477fd7559..00000000000
240 --- a/app-forensics/aflplusplus/files/aflplusplus-3.0c-CFLAGS.patch
241 +++ /dev/null
242 @@ -1,110 +0,0 @@
243 ---- a/GNUmakefile.gcc_plugin
244 -+++ b/GNUmakefile.gcc_plugin
245 -@@ -28,14 +28,14 @@ MAN_PATH ?= $(PREFIX)/share/man/man8
246 -
247 - VERSION = $(shell grep '^$(HASH)define VERSION ' ./config.h | cut -d '"' -f2)
248 -
249 --CFLAGS ?= -O3 -g -funroll-loops -D_FORTIFY_SOURCE=2
250 -+CFLAGS ?= -D_FORTIFY_SOURCE=2
251 - CFLAGS_SAFE := -Wall -Iinclude -Wno-pointer-sign \
252 - -DAFL_PATH=\"$(HELPER_PATH)\" -DBIN_PATH=\"$(BIN_PATH)\" \
253 - -DGCC_VERSION=\"$(GCCVER)\" -DGCC_BINDIR=\"$(GCCBINDIR)\" \
254 - -Wno-unused-function
255 - override CFLAGS += $(CFLAGS_SAFE)
256 -
257 --CXXFLAGS ?= -O3 -g -funroll-loops -D_FORTIFY_SOURCE=2
258 -+CXXFLAGS ?= -D_FORTIFY_SOURCE=2
259 - CXXEFLAGS := $(CXXFLAGS) -Wall -std=c++11
260 -
261 - CC ?= gcc
262 ---- a/GNUmakefile.llvm
263 -+++ b/GNUmakefile.llvm
264 -@@ -237,7 +237,7 @@ else
265 - AFL_CLANG_DEBUG_PREFIX =
266 - endif
267 -
268 --CFLAGS ?= -O3 -funroll-loops -fPIC -D_FORTIFY_SOURCE=2
269 -+CFLAGS ?= -fPIC -D_FORTIFY_SOURCE=2
270 - CFLAGS_SAFE := -Wall -g -Wno-cast-qual -Wno-variadic-macros -Wno-pointer-sign -I ./include/ -I ./instrumentation/ \
271 - -DAFL_PATH=\"$(HELPER_PATH)\" -DBIN_PATH=\"$(BIN_PATH)\" \
272 - -DLLVM_BINDIR=\"$(LLVM_BINDIR)\" -DVERSION=\"$(VERSION)\" \
273 -@@ -254,7 +254,7 @@ ifdef AFL_TRACE_PC
274 - $(info Compile option AFL_TRACE_PC is deprecated, just set AFL_LLVM_INSTRUMENT=PCGUARD to activate when compiling targets )
275 - endif
276 -
277 --CXXFLAGS ?= -O3 -funroll-loops -fPIC -D_FORTIFY_SOURCE=2
278 -+CXXFLAGS ?= -fPIC -D_FORTIFY_SOURCE=2
279 - override CXXFLAGS += -Wall -g -I ./include/ \
280 - -DVERSION=\"$(VERSION)\" -Wno-variadic-macros \
281 - -DLLVM_MINOR=$(LLVM_MINOR) -DLLVM_MAJOR=$(LLVM_MAJOR)
282 -@@ -434,20 +434,20 @@ afl-llvm-dict2file.so: instrumentation/afl-llvm-dict2file.so.cc instrumentation/
283 -
284 - .PHONY: document
285 - document:
286 -- $(CLANG_BIN) -D_AFL_DOCUMENT_MUTATIONS $(CFLAGS_SAFE) $(CPPFLAGS) $(CLANG_CFL) -O3 -Wno-unused-result -fPIC -c instrumentation/afl-compiler-rt.o.c -o ./afl-compiler-rt.o
287 -- @$(CLANG_BIN) -D_AFL_DOCUMENT_MUTATIONS $(CFLAGS_SAFE) $(CPPFLAGS) $(CLANG_CFL) -O3 -Wno-unused-result -m32 -fPIC -c instrumentation/afl-compiler-rt.o.c -o ./afl-compiler-rt-32.o 2>/dev/null; if [ "$$?" = "0" ]; then echo "success!"; else echo "failed (that's fine)"; fi
288 -- @$(CLANG_BIN) -D_AFL_DOCUMENT_MUTATIONS $(CFLAGS_SAFE) $(CPPFLAGS) $(CLANG_CFL) -O3 -Wno-unused-result -m64 -fPIC -c instrumentation/afl-compiler-rt.o.c -o ./afl-compiler-rt-64.o 2>/dev/null; if [ "$$?" = "0" ]; then echo "success!"; else echo "failed (that's fine)"; fi
289 -+ $(CLANG_BIN) -D_AFL_DOCUMENT_MUTATIONS $(CFLAGS_SAFE) $(CPPFLAGS) $(CLANG_CFL) -Wno-unused-result -fPIC -c instrumentation/afl-compiler-rt.o.c -o ./afl-compiler-rt.o
290 -+ @$(CLANG_BIN) -D_AFL_DOCUMENT_MUTATIONS $(CFLAGS_SAFE) $(CPPFLAGS) $(CLANG_CFL) -Wno-unused-result -m32 -fPIC -c instrumentation/afl-compiler-rt.o.c -o ./afl-compiler-rt-32.o 2>/dev/null; if [ "$$?" = "0" ]; then echo "success!"; else echo "failed (that's fine)"; fi
291 -+ @$(CLANG_BIN) -D_AFL_DOCUMENT_MUTATIONS $(CFLAGS_SAFE) $(CPPFLAGS) $(CLANG_CFL) -Wno-unused-result -m64 -fPIC -c instrumentation/afl-compiler-rt.o.c -o ./afl-compiler-rt-64.o 2>/dev/null; if [ "$$?" = "0" ]; then echo "success!"; else echo "failed (that's fine)"; fi
292 -
293 - ./afl-compiler-rt.o: instrumentation/afl-compiler-rt.o.c
294 -- $(CC) $(CLANG_CFL) $(CFLAGS_SAFE) $(CPPFLAGS) -O3 -Wno-unused-result -fPIC -c $< -o $@
295 -+ $(CC) $(CLANG_CFL) $(CFLAGS_SAFE) $(CPPFLAGS) -Wno-unused-result -fPIC -c $< -o $@
296 -
297 - ./afl-compiler-rt-32.o: instrumentation/afl-compiler-rt.o.c
298 - @printf "[*] Building 32-bit variant of the runtime (-m32)... "
299 -- @$(CC) $(CLANG_CFL) $(CFLAGS_SAFE) $(CPPFLAGS) -O3 -Wno-unused-result -m32 -fPIC -c $< -o $@ 2>/dev/null; if [ "$$?" = "0" ]; then echo "success!"; ln -sf afl-compiler-rt-32.o afl-llvm-rt-32.o; else echo "failed (that's fine)"; fi
300 -+ @$(CC) $(CLANG_CFL) $(CFLAGS_SAFE) $(CPPFLAGS) -Wno-unused-result -m32 -fPIC -c $< -o $@ 2>/dev/null; if [ "$$?" = "0" ]; then echo "success!"; ln -sf afl-compiler-rt-32.o afl-llvm-rt-32.o; else echo "failed (that's fine)"; fi
301 -
302 - ./afl-compiler-rt-64.o: instrumentation/afl-compiler-rt.o.c
303 - @printf "[*] Building 64-bit variant of the runtime (-m64)... "
304 -- @$(CC) $(CLANG_CFL) $(CFLAGS_SAFE) $(CPPFLAGS) -O3 -Wno-unused-result -m64 -fPIC -c $< -o $@ 2>/dev/null; if [ "$$?" = "0" ]; then echo "success!"; ln -sf afl-compiler-rt-64.o afl-llvm-rt-64.o; else echo "failed (that's fine)"; fi
305 -+ @$(CC) $(CLANG_CFL) $(CFLAGS_SAFE) $(CPPFLAGS) -Wno-unused-result -m64 -fPIC -c $< -o $@ 2>/dev/null; if [ "$$?" = "0" ]; then echo "success!"; ln -sf afl-compiler-rt-64.o afl-llvm-rt-64.o; else echo "failed (that's fine)"; fi
306 -
307 - .PHONY: test_build
308 - test_build: $(PROGS)
309 ---- a/unicorn_mode/samples/c/Makefile
310 -+++ b/unicorn_mode/samples/c/Makefile
311 -@@ -35,7 +35,7 @@ clean:
312 - rm -rf *.o harness harness-debug
313 -
314 - harness.o: harness.c ../../unicornafl/include/unicorn/*.h
315 -- ${MYCC} ${CFLAGS} -O3 -c harness.c
316 -+ ${MYCC} ${CFLAGS} -c harness.c
317 -
318 - harness-debug.o: harness.c ../../unicornafl/include/unicorn/*.h
319 - ${MYCC} ${CFLAGS} -g -c harness.c -o $@
320 ---- a/unicorn_mode/samples/persistent/Makefile
321 -+++ b/unicorn_mode/samples/persistent/Makefile
322 -@@ -35,7 +35,7 @@ clean:
323 - rm -rf *.o harness harness-debug
324 -
325 - harness.o: harness.c ../../unicornafl/include/unicorn/*.h
326 -- ${MYCC} ${CFLAGS} -O3 -c harness.c
327 -+ ${MYCC} ${CFLAGS} -c harness.c
328 -
329 - harness-debug.o: harness.c ../../unicornafl/include/unicorn/*.h
330 - ${MYCC} ${CFLAGS} -DAFL_DEBUG=1 -g -c harness.c -o $@
331 ---- a/utils/afl_untracer/Makefile
332 -+++ b/utils/afl_untracer/Makefile
333 -@@ -1,7 +1,7 @@
334 - ifdef DEBUG
335 - OPT=-O0
336 - else
337 -- OPT=-O3
338 -+ OPT?=-O2
339 - endif
340 -
341 - all: afl-untracer libtestinstr.so
342 ---- a/utils/custom_mutators/Makefile
343 -+++ b/utils/custom_mutators/Makefile
344 -@@ -1,7 +1,7 @@
345 - all: libexamplemutator.so
346 -
347 - libexamplemutator.so:
348 -- $(CC) $(CFLAGS) -D_FORTIFY_SOURCE=2 -O3 -fPIC -shared -g -I ../../include example.c -o libexamplemutator.so
349 -+ $(CC) $(CFLAGS) -D_FORTIFY_SOURCE=2 -fPIC -shared -g -I ../../include example.c -o libexamplemutator.so
350 -
351 - clean:
352 - rm -rf libexamplemutator.so