gentoo auto-resync : 05:10:2024 - 04:27:09

4 files changed, 109 insertions, 2 deletions

diff --git a/app-forensics/Manifest.gz b/app-forensics/Manifest.gz
index 52b9b3cb9fec..b917aa6981d7 100644
--- a/app-forensics/Manifest.gz
+++ b/app-forensics/Manifest.gz
diff --git a/app-forensics/aflplusplus/Manifest b/app-forensics/aflplusplus/Manifest
index 892e21e6cb32..94ed854cf01e 100644
--- a/app-forensics/aflplusplus/Manifest
+++ b/app-forensics/aflplusplus/Manifest
@@ -1,4 +1,7 @@
 DIST aflplusplus-4.07c-patches.tar.xz 4788 BLAKE2B de109198fbabfce2554459fee6a14f66002a952f5584ff265a6ff7d7646f520ed53a6d9c8c125a05eb5a4aa0c1cc675dca82647ad4c0965cdab10d3aa2f09467 SHA512 0ea4279b261d55cf209e32ca4b7fd7dc1181ec902dd7e4c7f36854d84f14037e643a543dcbb849927b41919c527303fc5877c9fab5b09c8988fbfab499b8f8bc
 DIST aflplusplus-4.08c.tar.gz 2894794 BLAKE2B 5576ec54969c7ae10b05fe10320581b348f989c1bc412bd63b2ca7ecb3bd1782a90c2660d971375667f6dd820f9035d7abb2207f59a1aaa5e7640d352eaa5757 SHA512 52c35ed544db8be778b79a64977fcc74092b541c4c07a788b20f4b9e8db95ff9c52c997ebf6f5a1056f962f3551df06a5eca02679bc2b71bb9d8944c1f77984a
-EBUILD aflplusplus-4.08c-r1.ebuild 2256 BLAKE2B d5dfc9802c2bbf2fa74886ecf3a091a07ef2d3fdf6f1e775a20a94053f02dc8efc66edd5101f4dbc44b0ec9e19e3df7ab71d60b7abb4f8fbf016ce50c5240f88 SHA512 f0519730dcefae8ca1a4ece40b2cdce73b25303ce617d59102942b1cd2cdaa296fbb19fcd93872c80b118b5adc52dcc624c0f45221cd0d7bb600be4f1f4dad57
+DIST aflplusplus-4.21c-patches.tar.xz 4932 BLAKE2B 8d53291a6d26ecc3d08fb4ca2711544e16c393def9fcb383d4eeb1d67d6bcd531788907ebeac2413e7fed5af5d56f363c6c4d766453e1d8de482cb6d285164ca SHA512 10322ed8d4549ccd2ee85fee00ffea712195858a004344424c31ebe4e4e8d3caf03f0d81d5cb38365418ee1e96288ba44504cb41a66644076e2cb46527f111fc
+DIST aflplusplus-4.21c.tar.gz 3004235 BLAKE2B c182260ba25a8a7a87b91ece5b3ea6aafba09b3361259361d9be24b7c5dd90430403a3170ed9397edaa714a45f62de26f324aab005a27a44fffce2708bb366e5 SHA512 cb58d58561ac814e07e9b5b735fade42b977fb1b92a63f1d7a66a5809203e83acf805ccfdc8ce29c9a3b374a189690010ca3d8ae20e261680751cea3c4841777
+EBUILD aflplusplus-4.08c-r1.ebuild 2721 BLAKE2B 3fc069d6b9db009d28a2139d67829ea03106abc05e7a418ec523833104f9d6ad002614554c6334eb042c85918523ebac4f36b97988369d2828063037e4ad428f SHA512 39bab582783c38981ff543aab999e23eeff59dcd90b794ecf7a2fa19b307b9b78f879f40aa7d660a127b3285de6cd9ceced735c900e01b9b4cb7c1dd0c79506b
+EBUILD aflplusplus-4.21c.ebuild 2348 BLAKE2B 7bdba02e6986422cf1fe06fbd6a594f35ff59cc212d24de216947097b57f03cd3404f926becf35bd2a83e2387b753b3ff52a3e2595d25b3c2607a901f6270192 SHA512 363ca19edb4a788c4c138ade26b9b114b8ded8bdee056f4eabd80c93d1e1b4b7ef1b7ebd5a2fb2da16cc50cd462134b900f39238194ecbfa40968bd55b9d8965
 MISC metadata.xml 328 BLAKE2B c9ad582740e9c2ad03a30fe0eaafb8ee19f0d9bc2e98cc7bcd14385a3407f84301479d324b92d3aecafdc1e5cfef1d2cfc8a15c2ecb5d8f2fa348d82de920128 SHA512 e56ce158f6764926c2ed4dc486f017ce75fa272ac8e6ad16e4a816f8c734d7313e3dc9cb007bab07efe73e59cab185312a02d6178296bfe25002719ce4975d14
diff --git a/app-forensics/aflplusplus/aflplusplus-4.08c-r1.ebuild b/app-forensics/aflplusplus/aflplusplus-4.08c-r1.ebuild
index 0431fd829024..09e9bd1defec 100644
--- a/app-forensics/aflplusplus/aflplusplus-4.08c-r1.ebuild
+++ b/app-forensics/aflplusplus/aflplusplus-4.08c-r1.ebuild
@@ -67,7 +67,17 @@ pkg_setup() {
 }
 
 mymake() {
-	emake \
+	# afl-fuzz spews garbage to stdout if the environment contains any
+	# variables whose name beginning with USE_ (including the underscore),
+	# regardless of their value (even if empty!).  The ebuild environment
+	# contains several such variables and the garbage that gets printed
+	# ends up in the generated man page.
+	#
+	# We can work around the problem by unsetting all these variables when
+	# running make.
+	local badvars=("${!USE_@}")
+
+	env "${badvars[@]/#/-u}" emake \
 		CC="$(tc-getCC)" \
 		CXX="$(tc-getCXX)" \
 		CFLAGS_FLTO="" \
diff --git a/app-forensics/aflplusplus/aflplusplus-4.21c.ebuild b/app-forensics/aflplusplus/aflplusplus-4.21c.ebuild
new file mode 100644
index 000000000000..f1979de0556c
--- /dev/null
+++ b/app-forensics/aflplusplus/aflplusplus-4.21c.ebuild
@@ -0,0 +1,94 @@
+# Copyright 1999-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+LLVM_COMPAT=( {15..19} )
+PYTHON_COMPAT=( python3_{10..13} )
+inherit toolchain-funcs llvm-r1 optfeature python-single-r1
+
+AFL_PATCHSET="${PN}-4.21c-patches"
+DESCRIPTION="Fork of AFL, the popular compile-time instrumentation fuzzer"
+HOMEPAGE="https://github.com/AFLplusplus/AFLplusplus"
+SRC_URI="https://github.com/AFLplusplus/AFLplusplus/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+SRC_URI+=" https://dev.gentoo.org/~sam/distfiles/${CATEGORY}/${PN}/${AFL_PATCHSET}.tar.xz"
+S="${WORKDIR}"/AFLplusplus-${PV}
+
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="~amd64 ~arm64"
+IUSE="test"
+REQUIRED_USE="${PYTHON_REQUIRED_USE}"
+
+# Tests involve heavy use of LD_PRELOAD in some cases
+# This isn't compatible with sandbox
+RESTRICT="test"
+
+RDEPEND="
+	${PYTHON_DEPS}
+	$(llvm_gen_dep '
+		sys-devel/clang:${LLVM_SLOT}=
+		sys-devel/llvm:${LLVM_SLOT}=
+	')
+	!app-forensics/afl
+"
+DEPEND="
+	${RDEPEND}
+	test? ( dev-util/cmocka )
+"
+
+QA_FLAGS_IGNORED="
+	usr/lib.*/afl/afl-gcc-cmplog-pass.so
+	usr/lib.*/afl/afl-gcc-cmptrs-pass.so
+"
+QA_PREBUILT="usr/share/afl/testcases/others/elf/small_exec.elf"
+
+PATCHES=(
+	"${WORKDIR}"/${AFL_PATCHSET}
+)
+
+pkg_setup() {
+	llvm-r1_pkg_setup
+	python-single-r1_pkg_setup
+}
+
+mymake() {
+	# afl-fuzz spews garbage to stdout if the environment contains any
+	# variables whose name beginning with USE_ (including the underscore),
+	# regardless of their value (even if empty!).  The ebuild environment
+	# contains several such variables and the garbage that gets printed
+	# ends up in the generated man page.
+	#
+	# We can work around the problem by unsetting all these variables when
+	# running make.
+	local badvars=("${!USE_@}")
+
+	env "${badvars[@]/#/-u}" emake \
+		CC="$(tc-getCC)" \
+		CXX="$(tc-getCXX)" \
+		CFLAGS_FLTO="" \
+		PREFIX="${EPREFIX}/usr" \
+		HELPER_PATH="${EPREFIX}/usr/$(get_libdir)/afl" \
+		DOC_PATH="${EPREFIX}/usr/share/doc/${PF}" \
+		MAN_PATH="${EPREFIX}/usr/share/man/man8" \
+		"$@"
+}
+
+src_compile() {
+	mymake
+}
+
+src_test() {
+	mymake test
+}
+
+src_install() {
+	mymake DESTDIR="${D}" install
+	dostrip -x /usr/share/afl/testcases/
+}
+
+pkg_postinst() {
+	# TODO: Any others?
+	optfeature "fuzzing with AFL_USE_ASAN" sys-libs/compiler-rt-sanitizers[asan]
+	optfeature "fuzzing with AFL_USE_MSAN" sys-libs/compiler-rt-sanitizers[msan]
+}