gentoo auto-resync : 17:06:2023 - 07:43:56

4 files changed, 98 insertions, 3 deletions

diff --git a/app-forensics/Manifest.gz b/app-forensics/Manifest.gz
index ded548e2cefa..b87d5d6c6578 100644
--- a/app-forensics/Manifest.gz
+++ b/app-forensics/Manifest.gz
diff --git a/app-forensics/aflplusplus/Manifest b/app-forensics/aflplusplus/Manifest
index a5512aa9f6b1..89f4d1531846 100644
--- a/app-forensics/aflplusplus/Manifest
+++ b/app-forensics/aflplusplus/Manifest
@@ -1,4 +1,7 @@
 DIST aflplusplus-4.06c-patches.tar.xz 4360 BLAKE2B fb59065ef610e87d8bc822513822c150b592e0cdcf4f8f2d861b5dc4a5ded49a03b4ccc46636e24d69bdcee58f6882511f25a04cbc02565f9435c47be1b0829f SHA512 251db964ce6c7e1f59c6c1a8383c1fe4d362c7d336df4d13f0bc1f3c8583494e2b9c9f160fdd544174cc784afc1ae100310109d0d6a30c361b82f3ab50350afa
 DIST aflplusplus-4.06c.tar.gz 2859398 BLAKE2B bf26d6be364d01f91a5b60e2bca1ab48e2fed04571bbaee2fd74c31af1c3d53295808c5372bda8dc941232349e9113e09f2d0e8cadc5917fc4fc52e24bad9d60 SHA512 b585b244218e70e1120a81a5fbb7401d277174be13c5d5d507130ff7a7b25723ff29c2b3c820466ba847ff53ef016b23781edaccdfcdce904f6b93ec4d860140
-EBUILD aflplusplus-4.06c.ebuild 2052 BLAKE2B f779548b9fb4ab8ffcc36f83e6d06c8a7f786ced57f8aa36abc8a8416dde9f122a1eec7e99b705ae0c16e306a7f149f1922d93ffb51a82244d427333f39841af SHA512 961f9092fd3b0c058ce3d21b43e29b7e2b33aa2f708995c7af3247f9709776bcc06fe4ea1cf12f588e953a16888d58f7987353e16e53157b024181c014e00951
+DIST aflplusplus-4.07c-patches.tar.xz 4788 BLAKE2B de109198fbabfce2554459fee6a14f66002a952f5584ff265a6ff7d7646f520ed53a6d9c8c125a05eb5a4aa0c1cc675dca82647ad4c0965cdab10d3aa2f09467 SHA512 0ea4279b261d55cf209e32ca4b7fd7dc1181ec902dd7e4c7f36854d84f14037e643a543dcbb849927b41919c527303fc5877c9fab5b09c8988fbfab499b8f8bc
+DIST aflplusplus-4.07c.tar.gz 2878659 BLAKE2B c3c4c5507e29ed8015784378a13a55cb6b389dec915979749b1869496c16366ce876f1eecc91eb09d51cc58266a92296218cd5eda2a201f5cf4faaa2ea61942f SHA512 c62fce112d59ef5ffb847adab9a7ff8486d44e6316a391392979da19a8160b55f9af7f75fd39cdc98997b3e166f4f6a33ddf31b827c9414a1392657701ecb5e8
+EBUILD aflplusplus-4.06c-r1.ebuild 2052 BLAKE2B 1704ccdafac548a426c167aedfb0374e57afd170f89f2a2da354ae3c2cf5eedca6848e016bdb394e7b3607fd7b6bddd87d3b7334ffeb1d647b66f601feea6060 SHA512 091e082736086528360a9f2f048232cb5291cc5953b7dfd0ead4c8593f68e0fbb7ca2badd847f81b49b0c0b4795730247006d76f9f36513db3e8d0ccf1587e9b
+EBUILD aflplusplus-4.07c.ebuild 2086 BLAKE2B 1c7b2065d91a42d80b04610066846e2f260c59be78ef47556dec63c43af3b9d8eb71037c64a35ad687bdd6c2a84979d0e8108ec70d8ff05e0fad647ed6c64335 SHA512 62566719b60baff76019cad37e5cc1bb58d86b4fe92c2e7b11693d98d32607d7ea985a7d06b38a1bd451cebbab9eec0191ec2eadab2f8c1f6072127c281cc124
 MISC metadata.xml 328 BLAKE2B c9ad582740e9c2ad03a30fe0eaafb8ee19f0d9bc2e98cc7bcd14385a3407f84301479d324b92d3aecafdc1e5cfef1d2cfc8a15c2ecb5d8f2fa348d82de920128 SHA512 e56ce158f6764926c2ed4dc486f017ce75fa272ac8e6ad16e4a816f8c734d7313e3dc9cb007bab07efe73e59cab185312a02d6178296bfe25002719ce4975d14
diff --git a/app-forensics/aflplusplus/aflplusplus-4.06c.ebuild b/app-forensics/aflplusplus/aflplusplus-4.06c-r1.ebuild
index f86e69395a77..e7be31befa79 100644
--- a/app-forensics/aflplusplus/aflplusplus-4.06c.ebuild
+++ b/app-forensics/aflplusplus/aflplusplus-4.06c-r1.ebuild
@@ -27,10 +27,10 @@ RESTRICT="test"
 
 RDEPEND="
 	${PYTHON_DEPS}
-	>=sys-devel/llvm-13:=
+	>=sys-devel/llvm-14:=
 	|| (
-		sys-devel/clang:13
 		sys-devel/clang:14
+		sys-devel/clang:15
 		sys-devel/clang:${LLVM_MAX_SLOT}
 	)
 	!app-forensics/afl"
diff --git a/app-forensics/aflplusplus/aflplusplus-4.07c.ebuild b/app-forensics/aflplusplus/aflplusplus-4.07c.ebuild
new file mode 100644
index 000000000000..0cc23849eada
--- /dev/null
+++ b/app-forensics/aflplusplus/aflplusplus-4.07c.ebuild
@@ -0,0 +1,92 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+PYTHON_COMPAT=( python3_{10..11} )
+LLVM_MAX_SLOT=16
+inherit toolchain-funcs llvm optfeature python-single-r1
+
+AFL_PATCHSET="${PN}-4.07c-patches"
+DESCRIPTION="A fork of AFL, the popular compile-time instrumentation fuzzer"
+HOMEPAGE="https://github.com/AFLplusplus/AFLplusplus"
+SRC_URI="https://github.com/AFLplusplus/AFLplusplus/archive/${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}
+	>=sys-devel/llvm-14:=
+	|| (
+		sys-devel/clang:14
+		sys-devel/clang:15
+		sys-devel/clang:${LLVM_MAX_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}
+)
+
+llvm_check_deps() {
+	has_version -b "sys-devel/clang:${LLVM_SLOT}" && \
+		has_version -b "sys-devel/llvm:${LLVM_SLOT}"
+}
+
+pkg_setup() {
+	llvm_pkg_setup
+	python-single-r1_pkg_setup
+}
+
+mymake() {
+	emake \
+		CC="$(tc-getCC)" \
+		CXX="$(tc-getCXX)" \
+		CFLAGS_FLTO="" \
+		LLVM_CONFIG="$(get_llvm_prefix ${LLVM_MAX_SLOT})"/bin/llvm-config \
+		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]
+}