9 files changed, 262 insertions, 53 deletions
diff --git a/app-forensics/Manifest.gz b/app-forensics/Manifest.gz
index 84cddb3cd9ed..f59af208e004 100644
--- a/app-forensics/Manifest.gz
+++ b/app-forensics/Manifest.gz
diff --git a/app-forensics/aflplusplus/Manifest b/app-forensics/aflplusplus/Manifest
index b4096d96ae0e..bd10691cf3ef 100644
--- a/app-forensics/aflplusplus/Manifest
+++ b/app-forensics/aflplusplus/Manifest
@@ -1,5 +1,8 @@
 AUX aflplusplus-3.0c-CFLAGS.patch 6130 BLAKE2B 24e7d6e04a258dab3353cc82fe7263f99c176fef6abb556678534dc2b92996b5a212a8cc0516a79a73615759b88bd62f137ebb10df0eb6d0a7efddf10d15e2fa SHA512 bdf6786c1ce5613ef598a1c6f7a2371b200409431677a8c4673ccde40c7780df46865b45472cae31659c793e4ff5ebd49805b922c8c6964d2c868c3353498e75
 AUX aflplusplus-3.0c-LDFLAGS.patch 445 BLAKE2B cfb1282dcba575ed96f355bf6695896f69625b1ace2c6b5d02a0c507fc2a09d4ee6cba97d27f7ac08516a525e5a09c5d3cfab75f3c3f4421357c8aa2cc5aee8c SHA512 d3f43709debf92a0a51077c33c85cf16d9e74324999267c66765f4eeda46d0091ee5c08a6e94bdb635ee6f970445c06e0ac1fdceba561c9345670ef7e365dfb0
+AUX aflplusplus-3.13c-CFLAGS.patch 5732 BLAKE2B 95e4a581fa9e0e9cf8c321968c8f4774c5012f4d5fe0f1d940b0bab3aa15803758c343af0969a5f7fd05b3454845ff306325cd29821f04d630c4bb42f4bfa2c9 SHA512 3e35b5068d64429a435f58e03fc557056ee9b0f73d4c407e34abef083b7c4f47b072f84d1e2abe99bf49449a5f6f46217b158893b84d635bed025979edb8c5e0
 DIST aflplusplus-3.12c.tar.gz 2065569 BLAKE2B ff7a87eb02f7731b5ce8e1a3016239c6fd1cd1bfeb0b9c0fb69f72bdbf079e7700cdb32abe64f64853e5ff82f1c0ecd86d2cadb892e7c40be6bb2a7b089f7387 SHA512 a814d61298b60d99388289e742dbedf2ed1ab454a5e1ea20d48bb2f18b36c01553ab1f097a06f733439d67e804d48cb823a82ff249c404fb0b83a281564f3040
+DIST aflplusplus-3.13c.tar.gz 2128787 BLAKE2B 40fa65654468dc1de7f6e1b63d2266915a40d145b7cb91b8b95488bc975804f70887bc1c3718fbd12c76872a0126f3bcc36134eb55ef729060b5efcf93dad424 SHA512 916a714deaf67969c9ac6e90bd2d8015a1e5188c8a8122f4d5d64ce4b841822de65458e469a47d4244358fab5e31ef4e52b8ec1432dcbd60d29aedf15e4c36fe
 EBUILD aflplusplus-3.12c-r2.ebuild 2119 BLAKE2B d082ef6d5c1fc9a90a087458b3a4d1dedfb0e6adb92573049168b771c112aad6b24e23aaf6554d7bb0aa6d9880e6bd8612afb760f6dbe36a4f0ca79481f084de SHA512 1571af2293395df0da008472f0dfb7a7c798f5a8d544e2d2e7c47cf5070485f3e7624e035dde22cf697b65a3acfeee5e56c0010686eadef497590ae64d6126c5
+EBUILD aflplusplus-3.13c.ebuild 2120 BLAKE2B 8a7c62a34b0e09cb7ec704abef80668cf393746db886fe5c7ba6ec4b4cc6f1845b084c51542cb8abba07502f4e54ab37432210fda1df548fcf0f03b7a518e949 SHA512 e0a71a9f29e73fc2cba2340052f0f19ecd55dda3297576dec203b6e65d693f4226d2dc495e4f092fe9325fba1f3a36cd0b939c9e7ac5aa7961b1f550d83f111d
 MISC metadata.xml 327 BLAKE2B 25fff77dada492976b7c412879dadd7df2a78a05cfa2be3ef00557f84c3f6679dd2977c8ea11573ffda864b0c88da327ea912a358a2b44b4186c71c6ed7086e8 SHA512 b2c58af252bae6ba27785f059c67edbd7c05469965e67c5e6f053bd385463b5f02b2ee65df3174fda85dfcf741add66bbc33836b3d8edb76acec91727f008746
diff --git a/app-forensics/aflplusplus/aflplusplus-3.13c.ebuild b/app-forensics/aflplusplus/aflplusplus-3.13c.ebuild
new file mode 100644
index 000000000000..c665a60d41ba
--- /dev/null
+++ b/app-forensics/aflplusplus/aflplusplus-3.13c.ebuild
@@ -0,0 +1,97 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=( python3_{7,8,9} )
+LLVM_MAX_SLOT=12
+inherit toolchain-funcs llvm optfeature python-single-r1
+
+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"
+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"
+
+# It turns out we need Clang too
+RDEPEND="
+	${PYTHON_DEPS}
+	>=sys-devel/llvm-10:=
+	|| (
+		sys-devel/clang:10
+		sys-devel/clang:11
+		sys-devel/clang:12
+	)
+"
+DEPEND="
+	${RDEPEND}
+	test? ( dev-util/cmocka )
+"
+
+QA_PREBUILT="/usr/share/afl/testcases/others/elf/small_exec.elf"
+
+PATCHES=(
+	"${FILESDIR}/${PN}-3.0c-LDFLAGS.patch"
+	"${FILESDIR}/${PN}-3.13c-CFLAGS.patch"
+)
+
+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
+}
+
+src_prepare() {
+	default
+
+	sed -i -e 's/-O3 -fno-unroll-loops//' GNUmakefile || die
+}
+
+src_compile() {
+	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_test() {
+	emake \
+		CC="$(tc-getCC)" \
+		CXX="$(tc-getCXX)"
+}
+
+src_install() {
+	emake \
+		CC="$(tc-getCC)" \
+		CXX="$(tc-getCXX)" \
+		DESTDIR="${D}" \
+		PREFIX="${EPREFIX}/usr" \
+		HELPER_PATH="${EPREFIX}/usr/$(get_libdir)/afl" \
+		DOC_PATH="${EPREFIX}/usr/share/doc/${PF}" \
+		MAN_PATH="${EPREFIX}/usr/share/man/man8" \
+		install
+}
+
+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]
+}
diff --git a/app-forensics/aflplusplus/files/aflplusplus-3.13c-CFLAGS.patch b/app-forensics/aflplusplus/files/aflplusplus-3.13c-CFLAGS.patch
new file mode 100644
index 000000000000..a3f54b437b83
--- /dev/null
+++ b/app-forensics/aflplusplus/files/aflplusplus-3.13c-CFLAGS.patch
@@ -0,0 +1,99 @@
+--- a/GNUmakefile.gcc_plugin
++++ b/GNUmakefile.gcc_plugin
+@@ -28,14 +28,14 @@ MAN_PATH    ?= $(PREFIX)/share/man/man8
+ 
+ VERSION     = $(shell grep '^$(HASH)define VERSION ' ./config.h | cut -d '"' -f2)
+ 
+-CFLAGS          ?= -O3 -g -funroll-loops -D_FORTIFY_SOURCE=2
++CFLAGS          ?= -D_FORTIFY_SOURCE=2
+ CFLAGS_SAFE     := -Wall -Iinclude -Wno-pointer-sign \
+                    -DAFL_PATH=\"$(HELPER_PATH)\" -DBIN_PATH=\"$(BIN_PATH)\" \
+                    -DGCC_VERSION=\"$(GCCVER)\" -DGCC_BINDIR=\"$(GCCBINDIR)\" \
+                    -Wno-unused-function
+ override CFLAGS += $(CFLAGS_SAFE)
+ 
+-CXXFLAGS    ?= -O3 -g -funroll-loops -D_FORTIFY_SOURCE=2
++CXXFLAGS    ?= -D_FORTIFY_SOURCE=2
+ CXXEFLAGS   := $(CXXFLAGS) -Wall -std=c++11
+ 
+ CC          ?= gcc
+--- a/GNUmakefile.llvm
++++ b/GNUmakefile.llvm
+@@ -237,7 +237,7 @@ else
+         AFL_CLANG_DEBUG_PREFIX =
+ endif
+ 
+-CFLAGS          ?= -O3 -funroll-loops -fPIC -D_FORTIFY_SOURCE=2
++CFLAGS          ?= -fPIC -D_FORTIFY_SOURCE=2
+ CFLAGS_SAFE     := -Wall -g -Wno-cast-qual -Wno-variadic-macros -Wno-pointer-sign -I ./include/ -I ./instrumentation/ \
+                    -DAFL_PATH=\"$(HELPER_PATH)\" -DBIN_PATH=\"$(BIN_PATH)\" \
+                    -DLLVM_BINDIR=\"$(LLVM_BINDIR)\" -DVERSION=\"$(VERSION)\" \
+@@ -254,7 +254,7 @@ ifdef AFL_TRACE_PC
+   $(info Compile option AFL_TRACE_PC is deprecated, just set AFL_LLVM_INSTRUMENT=PCGUARD to activate when compiling targets )
+ endif
+ 
+-CXXFLAGS          ?= -O3 -funroll-loops -fPIC -D_FORTIFY_SOURCE=2
++CXXFLAGS          ?= -fPIC -D_FORTIFY_SOURCE=2
+ override CXXFLAGS += -Wall -g -I ./include/ \
+                      -DVERSION=\"$(VERSION)\" -Wno-variadic-macros \
+                      -DLLVM_MINOR=$(LLVM_MINOR) -DLLVM_MAJOR=$(LLVM_MAJOR)
+@@ -434,20 +434,20 @@ afl-llvm-dict2file.so:	instrumentation/afl-llvm-dict2file.so.cc instrumentation/
+ 
+ .PHONY: document
+ document:
+-	$(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
+-	@$(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
+-	@$(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
++	$(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
++	@$(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
++	@$(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
+ 
+ ./afl-compiler-rt.o: instrumentation/afl-compiler-rt.o.c
+-	$(CC) $(CLANG_CFL) $(CFLAGS_SAFE) $(CPPFLAGS) -O3 -Wno-unused-result -fPIC -c $< -o $@
++	$(CC) $(CLANG_CFL) $(CFLAGS_SAFE) $(CPPFLAGS) -Wno-unused-result -fPIC -c $< -o $@
+ 
+ ./afl-compiler-rt-32.o: instrumentation/afl-compiler-rt.o.c
+ 	@printf "[*] Building 32-bit variant of the runtime (-m32)... "
+-	@$(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
++	@$(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
+ 
+ ./afl-compiler-rt-64.o: instrumentation/afl-compiler-rt.o.c
+ 	@printf "[*] Building 64-bit variant of the runtime (-m64)... "
+-	@$(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
++	@$(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
+ 
+ .PHONY: test_build
+ test_build: $(PROGS)
+--- a/unicorn_mode/samples/c/Makefile
++++ b/unicorn_mode/samples/c/Makefile
+@@ -35,7 +35,7 @@ clean:
+ 	rm -rf *.o harness harness-debug
+ 
+ harness.o: harness.c ../../unicornafl/include/unicorn/*.h
+-	${MYCC} ${CFLAGS} -O3 -c harness.c
++	${MYCC} ${CFLAGS} -c harness.c
+ 
+ harness-debug.o: harness.c ../../unicornafl/include/unicorn/*.h
+ 	${MYCC} ${CFLAGS} -g -c harness.c -o $@
+--- a/unicorn_mode/samples/persistent/Makefile
++++ b/unicorn_mode/samples/persistent/Makefile
+@@ -35,7 +35,7 @@ clean:
+ 	rm -rf *.o harness harness-debug
+ 
+ harness.o: harness.c ../../unicornafl/include/unicorn/*.h
+-	${MYCC} ${CFLAGS} -O3 -c harness.c
++	${MYCC} ${CFLAGS} -c harness.c
+ 
+ harness-debug.o: harness.c ../../unicornafl/include/unicorn/*.h
+ 	${MYCC} ${CFLAGS} -DAFL_DEBUG=1 -g -c harness.c -o $@
+--- a/utils/afl_untracer/Makefile
++++ b/utils/afl_untracer/Makefile
+@@ -1,7 +1,7 @@
+ ifdef DEBUG
+   OPT=-O0
+ else
+-  OPT=-O3
++  OPT?=-O2
+ endif
+ 
+ all:	afl-untracer libtestinstr.so
diff --git a/app-forensics/chkrootkit/Manifest b/app-forensics/chkrootkit/Manifest
index e76f2085d205..aaddc38757c7 100644
--- a/app-forensics/chkrootkit/Manifest
+++ b/app-forensics/chkrootkit/Manifest
@@ -1,5 +1,8 @@
 AUX chkrootkit.cron 78 BLAKE2B f43e9a4a0864c3914658298622aaf0e97374e4f8518c085f0c6c1b439583b36567652376a601eb039ca9d6a8bdda0cb18d9c58b36ab61839113048d32ce9fb54 SHA512 6839f3372d28673ee436349a107dc33b77cfd676fd16cda1ccfc5211514e840593d0f106e4e0a9331c4b658860992a9169f3a7cdd75c835a780a41097e7bd758
 DIST chkrootkit-0.54-gentoo.diff.xz 4848 BLAKE2B 25d1736bb839533fae36550518b311e52bb38f8a562a63d40629789dc9497b6e71dbc306d1f845b6a5cd586468afa6a7ac4ce8b6f1bfb40d7ac9b0331a55def9 SHA512 6c972b081794681b61b7c67f9a5762ba5d2c0c731c9a2bf9f75e715984edf7022ddcd44d34803eacb58a59e8b21932ffb586cc9fb7998a43393367c2530e353e
 DIST chkrootkit-0.54.tar.gz 41461 BLAKE2B 61384fda7db08ca2a52ab060ee4ea3edb7311cb9908599a511459dac22340f28e75d732b10d827aaeed89a1ecb6fc7f69ab8fef970aae5a73bae8c7949944831 SHA512 fe8955ac33abaabf304f5580b6f12929f8bf02329ab442380eaa6298440cf1cb0eee2db8e5667ea7d78b89ee2bceb82c10ebb732a71d6bcdda9400569cd587fd
+DIST chkrootkit-0.55-gentoo.patch.bz2 5028 BLAKE2B f8f809252d89b9195601953c6741c9a653b658d86669f149380dc94da91085921f58fef7e6f232cc421cf62f7321630120a85ec4dfdf369d6e92c0a7ae81e0f1 SHA512 bdae4fed6f8c61337e855235bf84b20faa363a3dfad9b2f22a017bd232aaf7f4bc0680f2b5567d6545ef3cb6ce7d41cc2287f4f0a2baf68ce3c56c68df8c77b8
+DIST chkrootkit-0.55.tar.gz 42630 BLAKE2B 0e6bc4d411a7836cd8ab72782027e5bd80b5c8845d8de1f48ff57bc0617a368cff2471835a66c30d007f4cfc243639110e0c39e02eecc3ec9c5c0a66a4b7891b SHA512 742dca90a761ecff149d8704cb3a252adfe8f9d5e15dd060e9db4d5f6dcd3820933ae13cbee99ea5a8c6144932cf97c0616a177af3ba5a1726b51bb304e7d63e
 EBUILD chkrootkit-0.54.ebuild 1283 BLAKE2B b86b5b2cfe78135e5d9caa6323b2e2ccdc0584c503d84354276c4d1843234e39a598a4e352af6925738595859a8a74ea0700fba44765d7c587c7c03c3d8bdec5 SHA512 beedbb3345b227c9273b4a33de22bca4edd768b1b317a967d27b3da99aa8b45003bfb0f63d65275ba13e0aa9b0988771a5b3cb265da87935b4aa62c46e75368b
+EBUILD chkrootkit-0.55.ebuild 1321 BLAKE2B 6148f473ee67bb07b925b01d05069749ff521b246caa231c01e685125661ab0653fc12732799518a1175a65dc7963ae3944613524651c4fb3331a91810bd475d SHA512 a4aa7fa821ff774fe3d1f79c2af29f68b7d0bd4ecb4c73a6988ba446d51e7a4ae57c97d5ae2436b42dc0b95a5761612a02b0101f62ed2dd7245953a06d69dfeb
 MISC metadata.xml 254 BLAKE2B 82f42628c121ed27ad00d04687d2f6b52148571b49f1c8f4a81cf47ccf2e857b16c9d0c6a3da2f8bebd6a8803d433a874e8066f48bd18ff960923f53bd15da7b SHA512 f0b5ba232a76e933dd34a7e3e7fa04e627de0201610166f4758c5ccf888f509815b5cc39f5373b87a413496318f507bf28599ec0995d32bde98a7c65287d39bb
diff --git a/app-forensics/chkrootkit/chkrootkit-0.55.ebuild b/app-forensics/chkrootkit/chkrootkit-0.55.ebuild
new file mode 100644
index 000000000000..bb1c05505fc0
--- /dev/null
+++ b/app-forensics/chkrootkit/chkrootkit-0.55.ebuild
@@ -0,0 +1,58 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit toolchain-funcs
+
+GENTOO_PATCH="${PN}-0.55-gentoo.patch"
+
+DESCRIPTION="Tool to locally check for signs of a rootkit"
+HOMEPAGE="http://www.chkrootkit.org/"
+SRC_URI="ftp://ftp.pangeia.com.br/pub/seg/pac/${P}.tar.gz"
+SRC_URI+=" https://dev.gentoo.org/~sam/distfiles/${CATEGORY}/${PN}/${GENTOO_PATCH}.bz2"
+
+LICENSE="BSD-2"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86"
+IUSE="+cron"
+
+RDEPEND="cron? ( virtual/cron )"
+
+PATCHES=(
+	"${WORKDIR}/${GENTOO_PATCH}"
+)
+
+src_prepare() {
+	default
+	sed -e 's:/var/adm/:/var/log/:g' \
+		-i chklastlog.c || die
+}
+
+src_compile() {
+	emake CC="$(tc-getCC)" STRIP=true sense
+}
+
+src_install() {
+	dosbin chkdirs chklastlog chkproc chkrootkit chkwtmp chkutmp ifpromisc strings-static
+	dodoc ACKNOWLEDGMENTS README*
+
+	if use cron ; then
+		exeinto /etc/cron.weekly
+		newexe "${FILESDIR}"/${PN}.cron ${PN}
+	fi
+}
+
+pkg_postinst() {
+	if use cron ; then
+		elog
+		elog "Edit /etc/cron.weekly/chkrootkit to activate chkrootkit!"
+		elog
+	fi
+
+	elog
+	elog "Some applications, such as portsentry, will cause chkrootkit"
+	elog "to produce false positives.  Read the chkrootkit FAQ at"
+	elog "http://www.chkrootkit.org/ for more information."
+	elog
+}
diff --git a/app-forensics/lynis/Manifest b/app-forensics/lynis/Manifest
index adea6cecd30e..e9a57683cbfc 100644
--- a/app-forensics/lynis/Manifest
+++ b/app-forensics/lynis/Manifest
@@ -1,5 +1,4 @@
 AUX lynis.cron-new 72 BLAKE2B 1f2d683c74e9e85f142c23277f24e8c81b33e4d1691a6f171694194bd5d81a5e1473532afe2c6fca23c995d9c7bd08d18d6eed78a07661618c12e22b35e9ff81 SHA512 1cdaaee433912c2ccdec8ad7c9b88be55fe3f1d68e2fca79cc6e0e10112d465a70cfbe0a049623437f604bfc9793e0d29b709e035cbf710d4d38ba48acc5355f
-DIST lynis-3.0.3.tar.gz 331182 BLAKE2B 7b424da8726e474992bcf6b13b6b82b48568b2d1f4268d0cb57f11560c4edbcd60d009c67fd333445392a184f1dbe38a55fde7cb7456498f89c451bc51ba3e8f SHA512 850f832fd45a2e440973c414f2c98caf3add1666573f60ea70bf36f57dbf3ac1b354632f09271b34f85eba25079e564d758e237dcded743a132da771c5bce151
-EBUILD lynis-3.0.3-r2.ebuild 1157 BLAKE2B 4325283944043df8436d178c0a492df13ac37f25d3bebb57e1829da12483a9b29f31ea957f799ef6f45e3fe593feea87714c0fe7eab8d75b4f9b45e956760b93 SHA512 8b044e319f313239101100a5b11c1d1cec81d097f265123cb72163f94ce97f59a8b7fe97ef027b65bef64abc032aca2186e466f96313c0becdd82a84d2db14b6
-EBUILD lynis-3.0.3.ebuild 939 BLAKE2B b05ec4bfab3c2c599299e3e32cb7f9427a4cd35a0a6bbc514923c3405bd67f8123c0be7e091414bd316919853cfd7a28519babd65d4973eebccb9b8f58a3760b SHA512 abe4e09470231a9f8c892050673549ed25eadcef588fb088b33604f9a4b248b108e3bc2ce425ee6197d8b55cba01c1775ae66a2e32ca8d71c31208652566861e
+DIST lynis-3.0.4.tar.gz 332004 BLAKE2B a68d85d679aae19304edc2ea7a982686d03897d806a7b44ca4c5318d8aa753a8b41b5ec2d80fbcda4bf69d35b5a6a0497b42d9b68c869763b09bfcb4922f5f83 SHA512 0e31cab00302678019d4a3d617e376fa1e8ca981b5eeb5dd22ce6f821f33957db351a4cd81a06f44eb0a8ca5094b1a5c062021c637b37e848ed0451de0f6c7c4
+EBUILD lynis-3.0.4.ebuild 1157 BLAKE2B 4325283944043df8436d178c0a492df13ac37f25d3bebb57e1829da12483a9b29f31ea957f799ef6f45e3fe593feea87714c0fe7eab8d75b4f9b45e956760b93 SHA512 8b044e319f313239101100a5b11c1d1cec81d097f265123cb72163f94ce97f59a8b7fe97ef027b65bef64abc032aca2186e466f96313c0becdd82a84d2db14b6
 MISC metadata.xml 251 BLAKE2B 7bfd5f1051cbe4343bd02cc5e869988eb1013ab464ae4ea70e15faff085b7bdc2437feaa34d5db2a90b4999014c146b4d1b9b0a4fd5c99e5bf550577923f49fb SHA512 5031be5fdf8e7fd7c6863c4a56016d80530a7363104272c82b99e2bb46cb7b22247fc5eda3814096701466fa73642994303ce4e666fb314ab843c18dcfa1845c
diff --git a/app-forensics/lynis/lynis-3.0.3.ebuild b/app-forensics/lynis/lynis-3.0.3.ebuild
deleted file mode 100644
index f8eca98da98e..000000000000
--- a/app-forensics/lynis/lynis-3.0.3.ebuild
+++ /dev/null
@@ -1,50 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="7"
-
-inherit bash-completion-r1
-
-DESCRIPTION="Security and system auditing tool"
-HOMEPAGE="https://cisofy.com/lynis/"
-SRC_URI="https://cisofy.com/files/${P}.tar.gz"
-
-LICENSE="GPL-3"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-DEPEND=""
-RDEPEND="app-shells/bash"
-
-S="${WORKDIR}/${PN}"
-
-src_install() {
-	doman lynis.8
-	dodoc FAQ README
-	newdoc CHANGELOG.md CHANGELOG
-
-	# Remove the old one during the next stabilize progress
-	exeinto /etc/cron.daily
-	newexe "${FILESDIR}"/lynis.cron-new lynis
-
-	dobashcomp extras/bash_completion.d/lynis
-
-	# stricter default perms - bug 507436
-	diropts -m0700
-	insopts -m0600
-
-	insinto /usr/share/${PN}
-	doins -r db/ include/ plugins/
-
-	dosbin lynis
-
-	insinto /etc/${PN}
-	doins default.prf
-}
-
-pkg_postinst() {
-	einfo
-	einfo "A cron script has been installed to ${ROOT}/etc/cron.daily/lynis."
-	einfo
-}
diff --git a/app-forensics/lynis/lynis-3.0.3-r2.ebuild b/app-forensics/lynis/lynis-3.0.4.ebuild
index 0de67b2421e8..0de67b2421e8 100644
--- a/app-forensics/lynis/lynis-3.0.3-r2.ebuild
+++ b/app-forensics/lynis/lynis-3.0.4.ebuild