gentoo auto-resync : 02:08:2022 - 03:17:18

5 files changed, 18 insertions, 73 deletions

diff --git a/app-antivirus/Manifest.gz b/app-antivirus/Manifest.gz
index 1689fc4e4dfe..aedbce80aabb 100644
--- a/app-antivirus/Manifest.gz
+++ b/app-antivirus/Manifest.gz
diff --git a/app-antivirus/lkrg/Manifest b/app-antivirus/lkrg/Manifest
index 42ccaf13e012..b28b5d1b6fd3 100644
--- a/app-antivirus/lkrg/Manifest
+++ b/app-antivirus/lkrg/Manifest
@@ -1,12 +1,8 @@
-AUX lkrg-0.9.2-systemd-coredump-umh-whitelist.patch 1052 BLAKE2B 6cf0af6b59026b1526f85f6db4a6c6b936add6b0f612a38a06eefb1de9363e57417c03c69e770be1c5e3da0fdb1f0382e862154e84c9828526dbca7c813bdadb SHA512 daba60c48e68ea8c0102424fd20c1eca360ffb1ce8eec25bd52935b5f2b5c0b6936fb3476fc941a27cef7fe4dc3be3446a8424f48e3bedf856e70fb56bd267c8
 AUX lkrg-0.9.4-gentoo-paths.patch 717 BLAKE2B cd30d1390ee9df058b93b8c7cfb4f5620084ddcbd7d3bb7c0f8db4b66e16e476314f55dd80ebe1084ea408d516e4857fb1ba5c9767b47255a3b76c756bc35bfa SHA512 5b510e93c676d9ff5c8b0176856dc319302e58e8a45729af0767faffd0189e6fccddbecb656d08926281b35da810e10d8f2c4434b1032e99a31375041374acaa
-DIST lkrg-0.9.2.tar.gz 125976 BLAKE2B c3da2d4599c9dd5b7d6fbec426fd93d802715f6c8566471f82c8f1c7d31621ebb4a2cc4c285d076aad6a6ee6b1bb790debbb365cfc6220192df049ac1d3c67a9 SHA512 5fec807618817bcb516e1a6779def6979badbdac6fe9b38fcce8425a0c7ebe3fb55c05d3080d8cac2d67cac6e8b7d2d77b3a1be450227299e2a02a311e223331
-DIST lkrg-0.9.2.tar.gz.sign 801 BLAKE2B 0cd8b18c8a0fbcca61ffa868b406d048461ddf9189fb08f15faa45e01b8731906a6b14105dfcf92bb5124373860f6695594063ee8d138c94c70adf471bc15e0a SHA512 18b547ca84a7fd2957484857e17983408e92fd005d58b77b399c5156ecb09fc5e9e6c910337654a2655883d103098c1769b1993017eec753bd21e63d6491ad04
-DIST lkrg-0.9.3.tar.gz 127986 BLAKE2B 5d059247c9a8a5abe4795d22b3806544dbb4c332947012ec33ceace27747663375acf68a4e859fae293eead5f7d9540b4261d3fef149d1e5c6ee8714a2df28d6 SHA512 9b441b93ff28b733afc513643a5d843c1707ac5a05adb359a3142b9ca7cba6a4790ebca4f9e6ca88a6ddf61f2b06aa242e02f288e9295e74999ed534794fb45d
-DIST lkrg-0.9.3.tar.gz.sign 801 BLAKE2B c054522f281d09a008821f92c7b43b5384241100c68ef0b0ea7171b8c492772a5d668b425089e1aac990bf6a675215dd5861f3f2598995e31a8db82a8b2ec7e9 SHA512 87c2bfe8d342b85f3c6c8226be5b698527a507369603a03eefead89ea8635b5ba95f3cbbe1d84cd77ac42bb8a773a7133917e0c87132b4851ff4017f77bc683a
 DIST lkrg-0.9.4.tar.gz 127462 BLAKE2B 4085d517e0a6360739a031e8afe4540354d35a8a59d33c96900c2def0c80bf81bef76b84322bb4beca649917693fd6a121ce81ba8caf652adbe406757729083d SHA512 7dd88a3071bbc7a1e6ca725a339f8a93544bf97f1b73e6a4b424895810a4f094d056b644120ad6df14650cd7e5678a356063b1e40113d770e059a7ca4d3e461c
 DIST lkrg-0.9.4.tar.gz.sign 801 BLAKE2B eb7c6f1aa925f73bbec7cad5da9f6676b3b6b2691151455ff240f8c6af844f61478df7050b73d3144877b2ad64bf9a25e13e8ea9fcbaf85988c02438b82893ab SHA512 6bec0699b15ba42dc7a7afc18a91d77668b3404b9e069db69634ff1e1af33b96eb4ffa5e25ce46cd012acdfdce7535d3cd2eb05ac55ae3bb4134f27f45712ce8
-EBUILD lkrg-0.9.2.ebuild 1028 BLAKE2B c1a49d95862433aa5defcf44feaa5357c983ca4edb49bc0b539a0ab604191f19b9b67115672c6f0b01e5572a47ac2b2d6f3f19d662b7d503e753f29ab02b5137 SHA512 6f9d9bd00296f8a6cd122c57b1e738a70c031c59888c8017a79cc7e3e4b3097e0592f9aa1a42baa9c181308bed6c141e337b6dbe97a62c2b4833ff53119b05f5
-EBUILD lkrg-0.9.3.ebuild 952 BLAKE2B d28b8a8b1cb5040250afbd0f8d33911b6ad07112759ee00cc9c8e06c885d8631f136a130c399246daa5cc673501864e326fa708f724f4b967329315864aef15e SHA512 9744b5e47787760ae12604d2da1b627a5e908061b0b845279ad5e610b5a9a2b6f18ef5c1523397cc87ca721a3715f6999b00ca1ff703fbfc507e0c95de88ef22
+DIST lkrg-0.9.5.tar.gz 128061 BLAKE2B 2b8a462033123e310761f84e1ab9e6c914c34a437957566f9a054a625aca2e90aea8c00673b67e178b98b27078f71870f16a7308b38a8e5506cc421af3065648 SHA512 ae735f14bcb92e964a2a1d4cf11f44d8589ebf7b09634799ce38f2b27e9df9eb53e6dc00818df743a20de947ea402dcdcd8bee274b0954addf742547333d939a
+DIST lkrg-0.9.5.tar.gz.sign 801 BLAKE2B 126796abbfe30914910634a31699bc1a2f3889c3569e79610a802a6a6312fda0e388552932bcdc58f9366f790a14c139bafe4443de4ad3dfd66003c3d75f4c71 SHA512 b1ef470962ce45f01d8f26d057ba8fff794c72cbf93cd1559af138a4fa82ebd80c127536c1d50a96365c433246c832f18f2924584bf533f8dcd247d1d38090a8
 EBUILD lkrg-0.9.4.ebuild 1222 BLAKE2B 9a7e8ece6aad6d4071304ec04b70b3b58cf9f9f402340b83fc5ec9a075d39ee4bae3f795c10075faab558078f998c18aec5362c522be0043ad623fbc794fe8a2 SHA512 2e276a86ff311ae88f474959b14feca0a005daeab5623c871042cf20c8cdb65e849e218204041bd2b322a5ac0eaad743c37d7d8381eb8088fd5b3277e6eec646
+EBUILD lkrg-0.9.5.ebuild 1229 BLAKE2B 5f4e9d01eb643abf6a66a7365317cff9ff0d125408e0eaefa504e53cf2421534851859a685eae19408955074a4eb27f6c52114046411f2af3306f47373962ec1 SHA512 65ba0f718f1eb096564a0338126b157f61737d2354d2831de40b29a94e32bbd869597e270d4aed405f95419a82df635e805011a8472773f3a0d0b8acdade29d4
 MISC metadata.xml 326 BLAKE2B 01848278e317c44c65d36ffb73d68b87981796f69301447a32ea47f93bc1fda9ca82e7b8036310e733bf1f0ab67a4e31868e48e0c720023a016ae9f743b72f59 SHA512 afa115a36eeb4290c82de2be302f5432294beb26e3d4709de0c67df693694bcdd73573ca24b404493af492e958698c257f4b48395c29d4ab46a9796e871bcc3a
diff --git a/app-antivirus/lkrg/files/lkrg-0.9.2-systemd-coredump-umh-whitelist.patch b/app-antivirus/lkrg/files/lkrg-0.9.2-systemd-coredump-umh-whitelist.patch
deleted file mode 100644
index 438784aff16e..000000000000
--- a/app-antivirus/lkrg/files/lkrg-0.9.2-systemd-coredump-umh-whitelist.patch
+++ /dev/null
@@ -1,23 +0,0 @@
-commit 7939aa03e00e7e48781d405743e2f2d31fca113b
-Author: John Helmert III <ajak@gentoo.org>
-Date:   Fri Jan 7 01:46:35 2022 -0600
-
-    Add non-usr-merged systemd-coredump to UMH whitelist
-    
-    Some distributions haven't merged /usr yet, so add the alternative
-    path for systemd-coredump.
-    
-    Signed-off-by: John Helmert III <ajak@gentoo.org>
-
-diff --git a/src/modules/exploit_detection/syscalls/p_call_usermodehelper/p_call_usermodehelper.c b/src/modules/exploit_detection/syscalls/p_call_usermodehelper/p_call_usermodehelper.c
-index ac2a737..7387135 100644
---- a/src/modules/exploit_detection/syscalls/p_call_usermodehelper/p_call_usermodehelper.c
-+++ b/src/modules/exploit_detection/syscalls/p_call_usermodehelper/p_call_usermodehelper.c
-@@ -45,6 +45,7 @@ static const char * const p_umh_global[] = {
-    "/etc/acpi/events/RadioPower.sh",
-    "/etc/acpi/wireless-rtl-ac-dc-power.sh",
-    "/lib/systemd/systemd-cgroups-agent",
-+   "/lib/systemd/systemd-coredump",
-    "/sbin/bridge-stp",
-    "/sbin/critical_overtemp",
-    "/sbin/drbdadm",
diff --git a/app-antivirus/lkrg/lkrg-0.9.3.ebuild b/app-antivirus/lkrg/lkrg-0.9.3.ebuild
deleted file mode 100644
index 465af99f681d..000000000000
--- a/app-antivirus/lkrg/lkrg-0.9.3.ebuild
+++ /dev/null
@@ -1,38 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit linux-mod linux-info verify-sig
-
-DESCRIPTION="Linux Kernel Runtime Guard"
-HOMEPAGE="https://lkrg.org"
-SRC_URI="https://lkrg.org/download/${P}.tar.gz
-	verify-sig? ( https://lkrg.org/download/${P}.tar.gz.sign )"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64"
-
-BDEPEND="verify-sig? ( sec-keys/openpgp-keys-openwall )"
-
-MODULE_NAMES="p_lkrg(misc:${S}:${S})"
-VERIFY_SIG_OPENPGP_KEY_PATH="${BROOT}/usr/share/openpgp-keys/openwall.asc"
-
-pkg_setup() {
-	CONFIG_CHECK="HAVE_KRETPROBES KALLSYMS_ALL KPROBES JUMP_LABEL"
-	CONFIG_CHECK+=" MODULE_UNLOAD !PREEMPT_RT ~STACKTRACE"
-	linux-mod_pkg_setup
-
-	# compile against selected (not running) target
-	BUILD_PARAMS="P_KVER=${KV_FULL} P_KERNEL=${KERNEL_DIR}"
-	BUILD_TARGETS="all"
-}
-
-src_unpack() {
-	if use verify-sig; then
-		verify-sig_verify_detached "${DISTDIR}"/${P}.tar.gz{,.sign}
-	fi
-
-	default
-}
diff --git a/app-antivirus/lkrg/lkrg-0.9.2.ebuild b/app-antivirus/lkrg/lkrg-0.9.5.ebuild
index 17e26904008f..121872fefc44 100644
--- a/app-antivirus/lkrg/lkrg-0.9.2.ebuild
+++ b/app-antivirus/lkrg/lkrg-0.9.5.ebuild
@@ -1,9 +1,9 @@
 # Copyright 1999-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=7
+EAPI=8
 
-inherit linux-mod linux-info verify-sig
+inherit linux-mod linux-info systemd verify-sig
 
 DESCRIPTION="Linux Kernel Runtime Guard"
 HOMEPAGE="https://lkrg.org"
@@ -16,11 +16,11 @@ KEYWORDS="~amd64"
 
 BDEPEND="verify-sig? ( sec-keys/openpgp-keys-openwall )"
 
-PATCHES=( "${FILESDIR}/${PN}-${PV}-systemd-coredump-umh-whitelist.patch" )
-
-MODULE_NAMES="p_lkrg(misc:${S}:${S})"
+MODULE_NAMES="lkrg(misc:${S}:${S})"
 VERIFY_SIG_OPENPGP_KEY_PATH="${BROOT}/usr/share/openpgp-keys/openwall.asc"
 
+PATCHES=( "${FILESDIR}/${PN}-0.9.4-gentoo-paths.patch" )
+
 pkg_setup() {
 	CONFIG_CHECK="HAVE_KRETPROBES KALLSYMS_ALL KPROBES JUMP_LABEL"
 	CONFIG_CHECK+=" MODULE_UNLOAD !PREEMPT_RT ~STACKTRACE"
@@ -38,3 +38,13 @@ src_unpack() {
 
 	default
 }
+
+src_install() {
+	linux-mod_src_install
+
+	systemd_dounit scripts/bootup/systemd/lkrg.service
+	newinitd scripts/bootup/openrc/lkrg lkrg.initd
+
+	insinto /lib/sysctl.d
+	newins scripts/bootup/lkrg.conf 01-lkrg.conf
+}