gentoo resync : 31.05.2021

3 files changed, 56 insertions, 1 deletions

diff --git a/app-emulation/vendor-reset/Manifest b/app-emulation/vendor-reset/Manifest
index 1c9f429a1f86..fd65e8cc6755 100644
--- a/app-emulation/vendor-reset/Manifest
+++ b/app-emulation/vendor-reset/Manifest
@@ -1,5 +1,6 @@
+AUX Fix-5.11-build.patch 1687 BLAKE2B 04ec945f071a3eca4d4a257340c82e635a1421696dbe538bf4864829ff0e8a7878989fceb63617ffa5b472bfce66ff06b20e57186c79b5477312a2b5c71f6fbb SHA512 5768890607d321a6b23cc13e79f54733d518fc319e1a2953b986113bd79bfeb4076053c8b87bcd9415b889e686945007e30fbd3ce4cc421c9ed30fddc7f4791f
 AUX modload.conf 13 BLAKE2B 1e774873c1bf09ca1f3ec2c006b1938e3aa07187dd5a7f926369d6d1bc2c21bfe52f2cbb632f64174485896c8691ac4cbd10e988b7db7a2a9ada7fdccda1a22d SHA512 7a4bf9c95af41bf11e5a720f6258d62822f553c6f349dbe93cf23743b851d830340d268954252d6f058ea2fa823006a63afd45875e7b9108d5d2a6a1a316ff6d
 DIST vendor-reset-0.1.0.tar.gz 12718324 BLAKE2B 762ec8bc289b572ab8f8ecc3fa233e3c78c48c48a261c58ce1be9c10356a55957e0bd8fd01e3143443be74236bf9ed540b84d332788c67aa949599ccc5a564d3 SHA512 ed4dcb1a71fa8901732e729d37b501ac105cc2c93d0666e44c08e311d99a244027339d5709a9305ff992ca2acb2f337793cdb1f9369197911985cd20d6f3139f
-EBUILD vendor-reset-0.1.0.ebuild 938 BLAKE2B b813812d660f5d8a8e3bf338df26b19c11e7a2c8f107a96ed2711a165309a9476c04b74fb196a620e77907e6bed52bedb02a40cbfbf1e01dc0e17556316ba270 SHA512 b87a8e5c4ff7ec4a6fb0629d898b51e82f55bf748c3fc6bb4897c20add7d0e6024195404b9973d601a7c8d6b45425367e0ffe0d5084377f968f0941f5751e0d3
+EBUILD vendor-reset-0.1.0.ebuild 986 BLAKE2B e50771efbbd910627b44206c3c41bf334da12110eb2ebf3649744ec0d0cb427a475b75e816392a5a578026b106e25cd299ac5cb574fac550a1ca22ae798e7a9a SHA512 93ee4bc3e1f435f5a1816180163fcf7c3a2e69534d1130621bb0fc6f418e73bb7440ac51d2fef3d97cc523cef04e339c87682a2d126116ea608f25c97f877fbb
 EBUILD vendor-reset-9999.ebuild 938 BLAKE2B b813812d660f5d8a8e3bf338df26b19c11e7a2c8f107a96ed2711a165309a9476c04b74fb196a620e77907e6bed52bedb02a40cbfbf1e01dc0e17556316ba270 SHA512 b87a8e5c4ff7ec4a6fb0629d898b51e82f55bf748c3fc6bb4897c20add7d0e6024195404b9973d601a7c8d6b45425367e0ffe0d5084377f968f0941f5751e0d3
 MISC metadata.xml 326 BLAKE2B eb99500232f3d17e81b626f037ab585c48b49eab4d14616296af7b2c35507265e7aad497b28c25f5e89b4fdb56d9ab3242e51641f87b6580e85944af25a0bc9c SHA512 bcb6dbff6d69f20509d440a3c1b9aa2d4d9d0206fc2daca744acf29e9fceb8458a4d58b70ad77654bfcaf1094cbc20da5b43318059a3dee30913cacde1918a69
diff --git a/app-emulation/vendor-reset/files/Fix-5.11-build.patch b/app-emulation/vendor-reset/files/Fix-5.11-build.patch
new file mode 100644
index 000000000000..845ea08afc54
--- /dev/null
+++ b/app-emulation/vendor-reset/files/Fix-5.11-build.patch
@@ -0,0 +1,52 @@
+From 225a49a40941e350899e456366265cf82b87ad25 Mon Sep 17 00:00:00 2001
+From: =?UTF-8?q?T=C3=A9rence=20Clastres?= <t.clastres@gmail.com>
+Date: Sun, 31 Jan 2021 20:22:00 +0100
+Subject: [PATCH] [core] add support for linux 5.11
+
+This approach maintains compatibility with previous kernel versions.
+
+Thanks to @justinkb for finding the commit that broke it (torvalds/linux@d19ad07).
+---
+ dkms.conf    | 2 +-
+ src/ftrace.c | 8 ++++++++
+ 2 files changed, 9 insertions(+), 1 deletion(-)
+
+diff --git a/dkms.conf b/dkms.conf
+index 396abd3..09fbcf0 100644
+--- a/dkms.conf
++++ b/dkms.conf
+@@ -1,5 +1,5 @@
+ PACKAGE_NAME="vendor-reset"
+-PACKAGE_VERSION="0.1.0"
++PACKAGE_VERSION="0.1.1"
+ BUILT_MODULE_NAME[0]="${PACKAGE_NAME}"
+ MAKE[0]="make KDIR=${kernel_source_dir}"
+ CLEAN="make KDIR=${kernel_source_dir} clean"
+diff --git a/src/ftrace.c b/src/ftrace.c
+index 80bb4aa..7eed223 100644
+--- a/src/ftrace.c
++++ b/src/ftrace.c
+@@ -22,6 +22,7 @@ Place, Suite 330, Boston, MA 02111-1307 USA
+ #include <linux/ftrace.h>
+ #include <linux/kprobes.h>
+ #include <linux/pci.h>
++#include <linux/version.h>
+ 
+ #include "ftrace.h"
+ 
+@@ -48,8 +49,15 @@ static int resolve_hook_address(struct ftrace_hook *hook)
+   return 0;
+ }
+ 
++#if (LINUX_VERSION_CODE < KERNEL_VERSION(5, 11, 0))
+ static void notrace fh_trace_thunk(unsigned long ip, unsigned long parent_ip, struct ftrace_ops *ops, struct pt_regs *regs)
+ {
++#else
++static void notrace fh_trace_thunk(unsigned long ip, unsigned long parent_ip, struct ftrace_ops *ops, struct ftrace_regs *fregs)
++{
++  struct pt_regs *regs;
++  regs = ftrace_get_regs(fregs);
++#endif
+   struct ftrace_hook *hook = to_ftrace_hook(ops);
+ 
+   if (!within_module(parent_ip, THIS_MODULE))
diff --git a/app-emulation/vendor-reset/vendor-reset-0.1.0.ebuild b/app-emulation/vendor-reset/vendor-reset-0.1.0.ebuild
index c772c4558764..192727933e8a 100644
--- a/app-emulation/vendor-reset/vendor-reset-0.1.0.ebuild
+++ b/app-emulation/vendor-reset/vendor-reset-0.1.0.ebuild
@@ -22,6 +22,8 @@ SLOT="0"
 DEPEND=""
 RDEPEND="${DEPEND}"
 
+PATCHES=( "${FILESDIR}/Fix-5.11-build.patch" )
+
 pkg_setup() {
 	local CONFIG_CHECK="FTRACE KPROBES PCI_QUIRKS KALLSYMS FUNCTION_TRACER"
 	linux-mod_pkg_setup