fix epel7 patch
This commit is contained in:
parent
0f80de2bab
commit
64dae9255e
|
@ -1,55 +0,0 @@
|
||||||
diff -up chromium-86.0.4240.75/sandbox/policy/linux/bpf_cros_amd_gpu_policy_linux.cc.epel7-kcmp chromium-86.0.4240.75/sandbox/policy/linux/bpf_cros_amd_gpu_policy_linux.cc
|
|
||||||
--- chromium-86.0.4240.75/sandbox/policy/linux/bpf_cros_amd_gpu_policy_linux.cc.epel7-kcmp 2020-10-19 19:05:20.249786458 -0400
|
|
||||||
+++ chromium-86.0.4240.75/sandbox/policy/linux/bpf_cros_amd_gpu_policy_linux.cc 2020-10-20 10:50:21.560402023 -0400
|
|
||||||
@@ -6,7 +6,24 @@
|
|
||||||
|
|
||||||
#include <errno.h>
|
|
||||||
#include <fcntl.h>
|
|
||||||
-#include <linux/kcmp.h>
|
|
||||||
+#ifndef KCMP_FILE
|
|
||||||
+#define KCMP_FILE 0
|
|
||||||
+#endif
|
|
||||||
+#ifndef F_LINUX_SPECIFIC_BASE
|
|
||||||
+#define F_LINUX_SPECIFIC_BASE 1024
|
|
||||||
+#endif
|
|
||||||
+#ifndef F_SEAL_SEAL
|
|
||||||
+#define F_SEAL_SEAL 0x0001
|
|
||||||
+#endif
|
|
||||||
+#ifndef F_SEAL_SHRINK
|
|
||||||
+#define F_SEAL_SHRINK 0x0002
|
|
||||||
+#endif
|
|
||||||
+#ifndef F_SEAL_GROW
|
|
||||||
+#define F_SEAL_GROW 0x0004
|
|
||||||
+#endif
|
|
||||||
+#ifndef F_ADD_SEALS
|
|
||||||
+#define F_ADD_SEALS (F_LINUX_SPECIFIC_BASE + 9)
|
|
||||||
+#endif
|
|
||||||
#include <sys/socket.h>
|
|
||||||
|
|
||||||
// Some arch's (arm64 for instance) unistd.h don't pull in symbols used here
|
|
||||||
diff -up chromium-86.0.4240.75/sandbox/policy/linux/bpf_gpu_policy_linux.cc.epel7-kcmp chromium-86.0.4240.75/sandbox/policy/linux/bpf_gpu_policy_linux.cc
|
|
||||||
--- chromium-86.0.4240.75/sandbox/policy/linux/bpf_gpu_policy_linux.cc.epel7-kcmp 2020-10-20 11:58:00.449812627 -0400
|
|
||||||
+++ chromium-86.0.4240.75/sandbox/policy/linux/bpf_gpu_policy_linux.cc 2020-10-20 11:58:32.919071919 -0400
|
|
||||||
@@ -22,6 +22,22 @@
|
|
||||||
#include "sandbox/policy/linux/sandbox_linux.h"
|
|
||||||
#include "sandbox/policy/linux/sandbox_seccomp_bpf_linux.h"
|
|
||||||
|
|
||||||
+#ifndef F_LINUX_SPECIFIC_BASE
|
|
||||||
+#define F_LINUX_SPECIFIC_BASE 1024
|
|
||||||
+#endif
|
|
||||||
+#ifndef F_SEAL_SEAL
|
|
||||||
+#define F_SEAL_SEAL 0x0001
|
|
||||||
+#endif
|
|
||||||
+#ifndef F_SEAL_SHRINK
|
|
||||||
+#define F_SEAL_SHRINK 0x0002
|
|
||||||
+#endif
|
|
||||||
+#ifndef F_SEAL_GROW
|
|
||||||
+#define F_SEAL_GROW 0x0004
|
|
||||||
+#endif
|
|
||||||
+#ifndef F_ADD_SEALS
|
|
||||||
+#define F_ADD_SEALS (F_LINUX_SPECIFIC_BASE + 9)
|
|
||||||
+#endif
|
|
||||||
+
|
|
||||||
using sandbox::bpf_dsl::Allow;
|
|
||||||
using sandbox::bpf_dsl::Arg;
|
|
||||||
using sandbox::bpf_dsl::Error;
|
|
|
@ -0,0 +1,81 @@
|
||||||
|
diff -up chromium-90.0.4430.85/mojo/core/channel_linux.cc.epel7-kcmp chromium-90.0.4430.85/mojo/core/channel_linux.cc
|
||||||
|
--- chromium-90.0.4430.85/mojo/core/channel_linux.cc.epel7-kcmp 2021-04-27 11:42:46.207245608 -0400
|
||||||
|
+++ chromium-90.0.4430.85/mojo/core/channel_linux.cc 2021-04-27 11:43:21.941841419 -0400
|
||||||
|
@@ -37,6 +37,22 @@
|
||||||
|
#include "mojo/core/core.h"
|
||||||
|
#include "mojo/core/embedder/features.h"
|
||||||
|
|
||||||
|
+#ifndef F_LINUX_SPECIFIC_BASE
|
||||||
|
+#define F_LINUX_SPECIFIC_BASE 1024
|
||||||
|
+#endif
|
||||||
|
+#ifndef F_SEAL_SEAL
|
||||||
|
+#define F_SEAL_SEAL 0x0001
|
||||||
|
+#endif
|
||||||
|
+#ifndef F_SEAL_SHRINK
|
||||||
|
+#define F_SEAL_SHRINK 0x0002
|
||||||
|
+#endif
|
||||||
|
+#ifndef F_SEAL_GROW
|
||||||
|
+#define F_SEAL_GROW 0x0004
|
||||||
|
+#endif
|
||||||
|
+#ifndef F_ADD_SEALS
|
||||||
|
+#define F_ADD_SEALS (F_LINUX_SPECIFIC_BASE + 9)
|
||||||
|
+#endif
|
||||||
|
+
|
||||||
|
namespace mojo {
|
||||||
|
namespace core {
|
||||||
|
|
||||||
|
diff -up chromium-90.0.4430.85/sandbox/policy/linux/bpf_cros_amd_gpu_policy_linux.cc.epel7-kcmp chromium-90.0.4430.85/sandbox/policy/linux/bpf_cros_amd_gpu_policy_linux.cc
|
||||||
|
--- chromium-90.0.4430.85/sandbox/policy/linux/bpf_cros_amd_gpu_policy_linux.cc.epel7-kcmp 2021-04-20 14:58:36.000000000 -0400
|
||||||
|
+++ chromium-90.0.4430.85/sandbox/policy/linux/bpf_cros_amd_gpu_policy_linux.cc 2021-04-26 11:13:36.743346891 -0400
|
||||||
|
@@ -6,7 +6,24 @@
|
||||||
|
|
||||||
|
#include <errno.h>
|
||||||
|
#include <fcntl.h>
|
||||||
|
-#include <linux/kcmp.h>
|
||||||
|
+#ifndef KCMP_FILE
|
||||||
|
+#define KCMP_FILE 0
|
||||||
|
+#endif
|
||||||
|
+#ifndef F_LINUX_SPECIFIC_BASE
|
||||||
|
+#define F_LINUX_SPECIFIC_BASE 1024
|
||||||
|
+#endif
|
||||||
|
+#ifndef F_SEAL_SEAL
|
||||||
|
+#define F_SEAL_SEAL 0x0001
|
||||||
|
+#endif
|
||||||
|
+#ifndef F_SEAL_SHRINK
|
||||||
|
+#define F_SEAL_SHRINK 0x0002
|
||||||
|
+#endif
|
||||||
|
+#ifndef F_SEAL_GROW
|
||||||
|
+#define F_SEAL_GROW 0x0004
|
||||||
|
+#endif
|
||||||
|
+#ifndef F_ADD_SEALS
|
||||||
|
+#define F_ADD_SEALS (F_LINUX_SPECIFIC_BASE + 9)
|
||||||
|
+#endif
|
||||||
|
#include <sys/socket.h>
|
||||||
|
|
||||||
|
// Some arch's (arm64 for instance) unistd.h don't pull in symbols used here
|
||||||
|
diff -up chromium-90.0.4430.85/sandbox/policy/linux/bpf_gpu_policy_linux.cc.epel7-kcmp chromium-90.0.4430.85/sandbox/policy/linux/bpf_gpu_policy_linux.cc
|
||||||
|
--- chromium-90.0.4430.85/sandbox/policy/linux/bpf_gpu_policy_linux.cc.epel7-kcmp 2021-04-20 14:58:36.000000000 -0400
|
||||||
|
+++ chromium-90.0.4430.85/sandbox/policy/linux/bpf_gpu_policy_linux.cc 2021-04-26 11:13:36.744346907 -0400
|
||||||
|
@@ -23,6 +23,22 @@
|
||||||
|
#include "sandbox/policy/linux/sandbox_linux.h"
|
||||||
|
#include "sandbox/policy/linux/sandbox_seccomp_bpf_linux.h"
|
||||||
|
|
||||||
|
+#ifndef F_LINUX_SPECIFIC_BASE
|
||||||
|
+#define F_LINUX_SPECIFIC_BASE 1024
|
||||||
|
+#endif
|
||||||
|
+#ifndef F_SEAL_SEAL
|
||||||
|
+#define F_SEAL_SEAL 0x0001
|
||||||
|
+#endif
|
||||||
|
+#ifndef F_SEAL_SHRINK
|
||||||
|
+#define F_SEAL_SHRINK 0x0002
|
||||||
|
+#endif
|
||||||
|
+#ifndef F_SEAL_GROW
|
||||||
|
+#define F_SEAL_GROW 0x0004
|
||||||
|
+#endif
|
||||||
|
+#ifndef F_ADD_SEALS
|
||||||
|
+#define F_ADD_SEALS (F_LINUX_SPECIFIC_BASE + 9)
|
||||||
|
+#endif
|
||||||
|
+
|
||||||
|
using sandbox::bpf_dsl::Allow;
|
||||||
|
using sandbox::bpf_dsl::Arg;
|
||||||
|
using sandbox::bpf_dsl::Error;
|
|
@ -315,7 +315,7 @@ Patch101: chromium-75.0.3770.100-epel7-stdc++.patch
|
||||||
# el7 only patch
|
# el7 only patch
|
||||||
Patch102: chromium-80.0.3987.132-el7-noexcept.patch
|
Patch102: chromium-80.0.3987.132-el7-noexcept.patch
|
||||||
# No linux/kcmp.h on EPEL7
|
# No linux/kcmp.h on EPEL7
|
||||||
Patch103: chromium-86.0.4240.75-epel7-no-kcmp-h.patch
|
Patch103: chromium-90.0.4430.85-epel7-no-kcmp-h.patch
|
||||||
# Use old cups (chromium's code workaround breaks on gcc)
|
# Use old cups (chromium's code workaround breaks on gcc)
|
||||||
# Revert: https://github.com/chromium/chromium/commit/c3213f8779ddc427e89d982514185ed5e4c94e91
|
# Revert: https://github.com/chromium/chromium/commit/c3213f8779ddc427e89d982514185ed5e4c94e91
|
||||||
Patch104: chromium-84.0.4147.89-epel7-old-cups.patch
|
Patch104: chromium-84.0.4147.89-epel7-old-cups.patch
|
||||||
|
|
Loading…
Reference in New Issue