chromium: update to 88.0.4324.96.
- Built for x86_64, x86_64-musl, i686. - Tested on x86_64. - Add API deprecation warning message.
This commit is contained in:
parent
32e31679dc
commit
fcdbc44cf3
8
srcpkgs/chromium/INSTALL.msg
Normal file
8
srcpkgs/chromium/INSTALL.msg
Normal file
@ -0,0 +1,8 @@
|
|||||||
|
On March 15, 2021, Google will be limiting access to their private Chrome APIs:
|
||||||
|
|
||||||
|
https://blog.chromium.org/2021/01/limiting-private-api-availability-in.html
|
||||||
|
|
||||||
|
This means that after this date, chromium users will no longer be able to take
|
||||||
|
advantage of features such as Google account sync (including bookmarks), spell
|
||||||
|
checking, translation, and safe browsing. These features will only be available
|
||||||
|
with the restricted google-chrome package.
|
@ -117,18 +117,18 @@ diff --git a/third_party/ots/include/opentype-sanitiser.h b/third_party/ots/incl
|
|||||||
#include <arpa/inet.h>
|
#include <arpa/inet.h>
|
||||||
#include <stdint.h>
|
#include <stdint.h>
|
||||||
#endif
|
#endif
|
||||||
--- ./base/logging.cc.orig
|
--- ./base/logging.cc.orig 2021-01-20 12:09:54.227038757 -0500
|
||||||
+++ ./base/logging.cc
|
+++ ./base/logging.cc 2021-01-20 12:24:32.600301351 -0500
|
||||||
@@ -545,8 +545,7 @@
|
@@ -557,8 +557,7 @@
|
||||||
|
|
||||||
LogMessage::~LogMessage() {
|
LogMessage::~LogMessage() {
|
||||||
size_t stack_start = stream_.tellp();
|
size_t stack_start = stream_.tellp();
|
||||||
-#if !defined(OFFICIAL_BUILD) && !defined(OS_NACL) && !defined(__UCLIBC__) && \
|
-#if !defined(OFFICIAL_BUILD) && !defined(OS_NACL) && !defined(__UCLIBC__) && \
|
||||||
- !defined(OS_AIX)
|
- !defined(OS_AIX)
|
||||||
+#if !defined(OFFICIAL_BUILD) && !defined(OS_NACL) && defined(__GLIBC__)
|
+#if !defined(OFFICIAL_BUILD) && !defined(OS_NACL) && defined(__GLIBC__)
|
||||||
if (severity_ == LOG_FATAL && !base::debug::BeingDebugged()) {
|
if (severity_ == LOGGING_FATAL && !base::debug::BeingDebugged()) {
|
||||||
// Include a stack trace on a fatal, unless a debugger is attached.
|
// Include a stack trace on a fatal, unless a debugger is attached.
|
||||||
base::debug::StackTrace trace;
|
base::debug::StackTrace stack_trace;
|
||||||
--- ./third_party/blink/renderer/platform/wtf/stack_util.cc.orig
|
--- ./third_party/blink/renderer/platform/wtf/stack_util.cc.orig
|
||||||
+++ ./third_party/blink/renderer/platform/wtf/stack_util.cc
|
+++ ./third_party/blink/renderer/platform/wtf/stack_util.cc
|
||||||
@@ -28,7 +28,7 @@
|
@@ -28,7 +28,7 @@
|
||||||
|
@ -1,36 +0,0 @@
|
|||||||
From c4f6e8cd34a245c3640b86a91c9694d69594d80b Mon Sep 17 00:00:00 2001
|
|
||||||
From: Stephan Hartmann <stha09@googlemail.com>
|
|
||||||
Date: Wed, 16 Sep 2020 15:05:02 +0000
|
|
||||||
Subject: [PATCH] IWYU: ui::CursorFactory is now required independent from
|
|
||||||
Ozone
|
|
||||||
|
|
||||||
---
|
|
||||||
.../ui/views/chrome_browser_main_extra_parts_views_linux.cc | 5 +----
|
|
||||||
1 file changed, 1 insertion(+), 4 deletions(-)
|
|
||||||
|
|
||||||
diff --git a/chrome/browser/ui/views/chrome_browser_main_extra_parts_views_linux.cc b/chrome/browser/ui/views/chrome_browser_main_extra_parts_views_linux.cc
|
|
||||||
index 5a97d61..ccedd2a 100644
|
|
||||||
--- chrome/browser/ui/views/chrome_browser_main_extra_parts_views_linux.cc
|
|
||||||
+++ chrome/browser/ui/views/chrome_browser_main_extra_parts_views_linux.cc
|
|
||||||
@@ -7,6 +7,7 @@
|
|
||||||
#include "chrome/browser/themes/theme_service_aura_linux.h"
|
|
||||||
#include "chrome/browser/ui/browser_list.h"
|
|
||||||
#include "chrome/browser/ui/views/theme_profile_key.h"
|
|
||||||
+#include "ui/base/cursor/cursor_factory.h"
|
|
||||||
#include "ui/display/screen.h"
|
|
||||||
#include "ui/views/linux_ui/linux_ui.h"
|
|
||||||
|
|
||||||
@@ -15,10 +16,6 @@
|
|
||||||
#include "ui/gtk/gtk_ui_delegate.h"
|
|
||||||
#endif
|
|
||||||
|
|
||||||
-#if defined(USE_OZONE)
|
|
||||||
-#include "ui/base/cursor/cursor_factory.h"
|
|
||||||
-#endif
|
|
||||||
-
|
|
||||||
#if defined(USE_X11)
|
|
||||||
#include "ui/gfx/x/connection.h" // nogncheck
|
|
||||||
#if BUILDFLAG(USE_GTK)
|
|
||||||
--
|
|
||||||
2.26.2
|
|
||||||
|
|
@ -1,22 +0,0 @@
|
|||||||
Bug: https://bugs.gentoo.org/750038
|
|
||||||
Upstream bug: https://crbug.com/1135070
|
|
||||||
|
|
||||||
--- content/browser/service_worker/service_worker_container_host.cc
|
|
||||||
+++ content/browser/service_worker/service_worker_container_host.cc
|
|
||||||
@@ -626,6 +626,16 @@
|
|
||||||
int64_t registration_id) {
|
|
||||||
DCHECK_CURRENTLY_ON(ServiceWorkerContext::GetCoreThreadId());
|
|
||||||
DCHECK(base::Contains(registration_object_hosts_, registration_id));
|
|
||||||
+
|
|
||||||
+ // ServiceWorkerRegistrationObjectHost to be deleted may have the last reference to
|
|
||||||
+ // ServiceWorkerRegistration that indirectly owns this ServiceWorkerContainerHost.
|
|
||||||
+ // If we erase the object host directly from the map, |this| could be deleted
|
|
||||||
+ // during the map operation and may crash. To avoid the case, we take the
|
|
||||||
+ // ownership of the object host from the map first, and then erase the entry
|
|
||||||
+ // from the map. See https://crbug.com/1135070 for details.
|
|
||||||
+ std::unique_ptr<ServiceWorkerRegistrationObjectHost> to_be_deleted =
|
|
||||||
+ std::move(registration_object_hosts_[registration_id]);
|
|
||||||
+ DCHECK(to_be_deleted);
|
|
||||||
registration_object_hosts_.erase(registration_id);
|
|
||||||
}
|
|
||||||
|
|
@ -0,0 +1,27 @@
|
|||||||
|
From 6e402d97c2dec5726f37e95f97b7f7e12b1d3b1d Mon Sep 17 00:00:00 2001
|
||||||
|
From: Jose Dapena Paz <jdapena@igalia.com>
|
||||||
|
Date: Wed, 11 Nov 2020 11:02:13 +0100
|
||||||
|
Subject: [PATCH] IWYU: include headers for std::vector and std::unique_ptr in AXTreeFormatter
|
||||||
|
|
||||||
|
Fix these build errors with libstdc++:
|
||||||
|
../../ui/accessibility/platform/inspect/tree_formatter.h:35:12: error: ‘std::vector’ has not been declared
|
||||||
|
../../ui/accessibility/platform/inspect/tree_formatter.h:61:16: error: ‘unique_ptr’ in namespace ‘std’ does not name a template type
|
||||||
|
|
||||||
|
Bug: 957519
|
||||||
|
Change-Id: I402ac0644255b3cd4932ff2fe72d999b125a7895
|
||||||
|
---
|
||||||
|
|
||||||
|
diff --git a/ui/accessibility/platform/inspect/tree_formatter.h b/ui/accessibility/platform/inspect/tree_formatter.h
|
||||||
|
index 4a70a4d..bb23768 100644
|
||||||
|
--- ui/accessibility/platform/inspect/tree_formatter.h
|
||||||
|
+++ ui/accessibility/platform/inspect/tree_formatter.h
|
||||||
|
@@ -5,6 +5,9 @@
|
||||||
|
#ifndef UI_ACCESSIBILITY_PLATFORM_INSPECT_TREE_FORMATTER_H_
|
||||||
|
#define UI_ACCESSIBILITY_PLATFORM_INSPECT_TREE_FORMATTER_H_
|
||||||
|
|
||||||
|
+#include <memory>
|
||||||
|
+#include <vector>
|
||||||
|
+
|
||||||
|
#include "ui/accessibility/platform/inspect/inspect.h"
|
||||||
|
|
||||||
|
#include "ui/gfx/native_widget_types.h"
|
@ -0,0 +1,21 @@
|
|||||||
|
From 127ec3b1bf26ab37f2ae8333f284008868756274 Mon Sep 17 00:00:00 2001
|
||||||
|
From: Stephan Hartmann <stha09@googlemail.com>
|
||||||
|
Date: Sat, 21 Nov 2020 15:59:23 +0000
|
||||||
|
Subject: [PATCH] IWYU: size_t is defined stddef.h
|
||||||
|
|
||||||
|
Change-Id: I4400ac7c6004b49ec6e72c44f2754e2166642f88
|
||||||
|
---
|
||||||
|
|
||||||
|
diff --git a/components/bookmarks/browser/bookmark_model_observer.h b/components/bookmarks/browser/bookmark_model_observer.h
|
||||||
|
index 69c40e7..0e5eb96 100644
|
||||||
|
--- components/bookmarks/browser/bookmark_model_observer.h
|
||||||
|
+++ components/bookmarks/browser/bookmark_model_observer.h
|
||||||
|
@@ -7,6 +7,8 @@
|
||||||
|
|
||||||
|
#include <set>
|
||||||
|
|
||||||
|
+#include <stddef.h>
|
||||||
|
+
|
||||||
|
class GURL;
|
||||||
|
|
||||||
|
namespace bookmarks {
|
@ -0,0 +1,36 @@
|
|||||||
|
From 56c654a91600e3bf254aa9f66c1151b0850b6ee4 Mon Sep 17 00:00:00 2001
|
||||||
|
From: Jose Dapena Paz <jdapena@igalia.com>
|
||||||
|
Date: Wed, 11 Nov 2020 10:24:47 +0100
|
||||||
|
Subject: [PATCH] GCC: do not pass unique_ptr to DCHECK_NE, but the actual pointer, in CompositorFrameReporter
|
||||||
|
|
||||||
|
DCHECK_NE comparison requires CheckOpValueStr to be defined for the
|
||||||
|
type, or providing an output stream operator. A unique_ptr does not
|
||||||
|
provide any.
|
||||||
|
|
||||||
|
Compilation in GCC is failing in CompositorFrameReporter because of
|
||||||
|
this:
|
||||||
|
../../cc/metrics/compositor_frame_reporter.cc: In member function ‘void cc::CompositorFrameReporter::ReportEventLatencyHistograms() const’:
|
||||||
|
../../base/check_op.h:224:59: error: no matching function for call to ‘CheckOpValueStr(const std::unique_ptr<cc::EventMetrics>&)’
|
||||||
|
|
||||||
|
Fixed comparing the result of get() method for unique_ptr instead of
|
||||||
|
the unique_ptr.
|
||||||
|
|
||||||
|
Bug: 819294
|
||||||
|
Change-Id: I11103d1867c7196c1de92e72f9f12dcfd31c29f1
|
||||||
|
|
||||||
|
(updated to use DCHECK as suggested in comments)
|
||||||
|
---
|
||||||
|
|
||||||
|
diff --git a/cc/metrics/compositor_frame_reporter.cc b/cc/metrics/compositor_frame_reporter.cc
|
||||||
|
index 725beb0..fafd0f3 100644
|
||||||
|
--- cc/metrics/compositor_frame_reporter.cc
|
||||||
|
+++ cc/metrics/compositor_frame_reporter.cc
|
||||||
|
@@ -686,7 +686,7 @@
|
||||||
|
|
||||||
|
void CompositorFrameReporter::ReportEventLatencyHistograms() const {
|
||||||
|
for (const auto& event_metrics : events_metrics_) {
|
||||||
|
- DCHECK_NE(event_metrics, nullptr);
|
||||||
|
+ DCHECK(event_metrics);
|
||||||
|
const std::string histogram_base_name =
|
||||||
|
GetEventLatencyHistogramBaseName(*event_metrics);
|
||||||
|
const int event_type_index = static_cast<int>(event_metrics->type());
|
@ -0,0 +1,20 @@
|
|||||||
|
From 372366b4180533f27d3250a50810828370d697b0 Mon Sep 17 00:00:00 2001
|
||||||
|
From: Stephan Hartmann <stha09@googlemail.com>
|
||||||
|
Date: Sat, 21 Nov 2020 16:12:18 +0000
|
||||||
|
Subject: [PATCH] IWYU: include limits for std::numeric_limits
|
||||||
|
|
||||||
|
Change-Id: Ia5226e1432a622f4f4abc8f1b18bcab8638a73c6
|
||||||
|
---
|
||||||
|
|
||||||
|
diff --git a/src/trace_processor/containers/string_pool.h b/src/trace_processor/containers/string_pool.h
|
||||||
|
index 11ae91c..58c6db2 100644
|
||||||
|
--- third_party/perfetto/src/trace_processor/containers/string_pool.h
|
||||||
|
+++ third_party/perfetto/src/trace_processor/containers/string_pool.h
|
||||||
|
@@ -22,6 +22,7 @@
|
||||||
|
|
||||||
|
#include <unordered_map>
|
||||||
|
#include <vector>
|
||||||
|
+#include <limits>
|
||||||
|
|
||||||
|
#include "perfetto/ext/base/optional.h"
|
||||||
|
#include "perfetto/ext/base/paged_memory.h"
|
@ -0,0 +1,21 @@
|
|||||||
|
From bcb20babee602b55fe4bd026e13a41d10b89632f Mon Sep 17 00:00:00 2001
|
||||||
|
From: Stephan Hartmann <stha09@googlemail.com>
|
||||||
|
Date: Sat, 21 Nov 2020 15:55:02 +0000
|
||||||
|
Subject: [PATCH] IWYU: include limits for std::numeric_limits
|
||||||
|
|
||||||
|
Change-Id: I1b6b07ebb397a29c84d3ed51ae41523e3ecab497
|
||||||
|
---
|
||||||
|
|
||||||
|
diff --git a/components/federated_learning/floc_constants.cc b/components/federated_learning/floc_constants.cc
|
||||||
|
index df66e5d..2eb50f1 100644
|
||||||
|
--- components/federated_learning/floc_constants.cc
|
||||||
|
+++ components/federated_learning/floc_constants.cc
|
||||||
|
@@ -4,6 +4,8 @@
|
||||||
|
|
||||||
|
#include "components/federated_learning/floc_constants.h"
|
||||||
|
|
||||||
|
+#include <limits>
|
||||||
|
+
|
||||||
|
namespace federated_learning {
|
||||||
|
|
||||||
|
// This is only for experimentation and won't be served to websites.
|
@ -0,0 +1,27 @@
|
|||||||
|
From 75ff882bb5f2fcd14431e65fa638ae72bdb47086 Mon Sep 17 00:00:00 2001
|
||||||
|
From: Stephan Hartmann <stha09@googlemail.com>
|
||||||
|
Date: Sun, 15 Nov 2020 14:31:23 +0000
|
||||||
|
Subject: [PATCH] fix ideographicSpaceCharacter constant for system icu
|
||||||
|
|
||||||
|
https://chromium-review.googlesource.com/c/chromium/src/+/1687411
|
||||||
|
renamed ideographicSpaceCharacter to kIdeographicSpaceCharacter.
|
||||||
|
---
|
||||||
|
third_party/blink/renderer/platform/wtf/text/text_codec_icu.cc | 2 +-
|
||||||
|
1 file changed, 1 insertion(+), 1 deletion(-)
|
||||||
|
|
||||||
|
diff --git a/third_party/blink/renderer/platform/wtf/text/text_codec_icu.cc b/third_party/blink/renderer/platform/wtf/text/text_codec_icu.cc
|
||||||
|
index fb8ab05..5d4ea13 100644
|
||||||
|
--- third_party/blink/renderer/platform/wtf/text/text_codec_icu.cc
|
||||||
|
+++ third_party/blink/renderer/platform/wtf/text/text_codec_icu.cc
|
||||||
|
@@ -432,7 +432,7 @@ String TextCodecICU::Decode(const char* bytes,
|
||||||
|
// ICU decodes it as U+E5E5.
|
||||||
|
if (!strcmp(encoding_.GetName(), "GBK")) {
|
||||||
|
if (EqualIgnoringASCIICase(encoding_.GetName(), "gb18030"))
|
||||||
|
- resultString.Replace(0xE5E5, ideographicSpaceCharacter);
|
||||||
|
+ resultString.Replace(0xE5E5, kIdeographicSpaceCharacter);
|
||||||
|
// Make GBK compliant to the encoding spec and align with GB18030
|
||||||
|
resultString.Replace(0x01F9, 0xE7C8);
|
||||||
|
// FIXME: Once https://www.w3.org/Bugs/Public/show_bug.cgi?id=28740#c3
|
||||||
|
--
|
||||||
|
2.26.2
|
||||||
|
|
25
srcpkgs/chromium/patches/chromium-88-ityp-include.patch
Normal file
25
srcpkgs/chromium/patches/chromium-88-ityp-include.patch
Normal file
@ -0,0 +1,25 @@
|
|||||||
|
From bc383a5dd7fa8f2b535f28815fd6932fbc0d2a45 Mon Sep 17 00:00:00 2001
|
||||||
|
From: Stephan Hartmann <stha09@googlemail.com>
|
||||||
|
Date: Wed, 28 Oct 2020 16:00:35 +0000
|
||||||
|
Subject: [PATCH] IWYU: include stddef.h for size_t
|
||||||
|
|
||||||
|
---
|
||||||
|
third_party/dawn/src/common/ityp_array.h | 2 ++
|
||||||
|
1 file changed, 2 insertions(+)
|
||||||
|
|
||||||
|
diff --git a/third_party/dawn/src/common/ityp_array.h b/third_party/dawn/src/common/ityp_array.h
|
||||||
|
index 48e080f..c784198 100644
|
||||||
|
--- third_party/dawn/src/common/ityp_array.h
|
||||||
|
+++ third_party/dawn/src/common/ityp_array.h
|
||||||
|
@@ -21,6 +21,8 @@
|
||||||
|
#include <array>
|
||||||
|
#include <type_traits>
|
||||||
|
|
||||||
|
+#include <stddef.h>
|
||||||
|
+
|
||||||
|
namespace ityp {
|
||||||
|
|
||||||
|
// ityp::array is a helper class that wraps std::array with the restriction that
|
||||||
|
--
|
||||||
|
2.26.2
|
||||||
|
|
39
srcpkgs/chromium/patches/chromium-88-vaapi-attribute.patch
Normal file
39
srcpkgs/chromium/patches/chromium-88-vaapi-attribute.patch
Normal file
@ -0,0 +1,39 @@
|
|||||||
|
From 4f4604877f3b666ac7a373ae443e3c3795424569 Mon Sep 17 00:00:00 2001
|
||||||
|
From: Stephan Hartmann <stha09@googlemail.com>
|
||||||
|
Date: Fri, 6 Nov 2020 11:18:42 +0000
|
||||||
|
Subject: [PATCH] GCC: fix attribute on function definition
|
||||||
|
|
||||||
|
GCC does not accept attributes at the end for function definitions.
|
||||||
|
Solution is to move it before function name. Otherwise GCC fails like
|
||||||
|
this:
|
||||||
|
|
||||||
|
../../base/compiler_specific.h:97:28: error: attributes are not allowed
|
||||||
|
on a function-definition
|
||||||
|
97 | #define WARN_UNUSED_RESULT __attribute__((warn_unused_result))
|
||||||
|
| ^~~~~~~~~~~~~
|
||||||
|
../../media/gpu/vaapi/vaapi_wrapper.h:322:36: note: in
|
||||||
|
expansion of macro 'WARN_UNUSED_RESULT'
|
||||||
|
322 | const T* data) WARN_UNUSED_RESULT {
|
||||||
|
| ^~~~~~~~~~~~~~~~~~
|
||||||
|
---
|
||||||
|
media/gpu/vaapi/vaapi_wrapper.h | 4 ++--
|
||||||
|
1 file changed, 2 insertions(+), 2 deletions(-)
|
||||||
|
|
||||||
|
diff --git a/media/gpu/vaapi/vaapi_wrapper.h b/media/gpu/vaapi/vaapi_wrapper.h
|
||||||
|
index fd1fd82..deeda1f 100644
|
||||||
|
--- media/gpu/vaapi/vaapi_wrapper.h
|
||||||
|
+++ media/gpu/vaapi/vaapi_wrapper.h
|
||||||
|
@@ -318,8 +318,8 @@ class MEDIA_GPU_EXPORT VaapiWrapper
|
||||||
|
// Convenient templatized version of SubmitBuffer() where |size| is deduced to
|
||||||
|
// be the size of the type of |*data|.
|
||||||
|
template <typename T>
|
||||||
|
- bool SubmitBuffer(VABufferType va_buffer_type,
|
||||||
|
- const T* data) WARN_UNUSED_RESULT {
|
||||||
|
+ bool WARN_UNUSED_RESULT SubmitBuffer(VABufferType va_buffer_type,
|
||||||
|
+ const T* data) {
|
||||||
|
return SubmitBuffer(va_buffer_type, sizeof(T), data);
|
||||||
|
}
|
||||||
|
// Batch-version of SubmitBuffer(), where the lock for accessing libva is
|
||||||
|
--
|
||||||
|
2.26.2
|
||||||
|
|
@ -1,6 +1,6 @@
|
|||||||
--- build/config/compiler/BUILD.gn.orig 2020-11-17 13:39:13.000000000 -0500
|
--- build/config/compiler/BUILD.gn.orig 2021-01-20 09:01:44.362114311 -0500
|
||||||
+++ build/config/compiler/BUILD.gn 2020-11-18 20:54:58.313154596 -0500
|
+++ build/config/compiler/BUILD.gn 2021-01-20 09:03:41.880232248 -0500
|
||||||
@@ -1536,22 +1530,12 @@
|
@@ -1534,9 +1534,6 @@
|
||||||
|
|
||||||
# TODO(https://crbug.com/1028110): Evaluate and possible enable.
|
# TODO(https://crbug.com/1028110): Evaluate and possible enable.
|
||||||
"-Wno-deprecated-copy",
|
"-Wno-deprecated-copy",
|
||||||
@ -10,9 +10,10 @@
|
|||||||
]
|
]
|
||||||
|
|
||||||
cflags_c += [
|
cflags_c += [
|
||||||
# TODO(https://crbug.com/995993): Clean up and enable.
|
@@ -1548,13 +1545,6 @@
|
||||||
"-Wno-implicit-fallthrough",
|
# TODO(https://crbug.com/1143700): Clean up and re-enable.
|
||||||
]
|
cflags_objc = [ "-Wno-gnu-folding-constant" ]
|
||||||
|
}
|
||||||
-
|
-
|
||||||
- if (enable_wmax_tokens) {
|
- if (enable_wmax_tokens) {
|
||||||
- cflags += [ "-Wmax-tokens" ]
|
- cflags += [ "-Wmax-tokens" ]
|
||||||
|
@ -211,17 +211,17 @@ diff --git sandbox/linux/seccomp-bpf-helpers/syscall_parameters_restrictions.cc
|
|||||||
index f51915edc..ca2f4f106 100644
|
index f51915edc..ca2f4f106 100644
|
||||||
--- sandbox/linux/seccomp-bpf-helpers/syscall_parameters_restrictions.cc
|
--- sandbox/linux/seccomp-bpf-helpers/syscall_parameters_restrictions.cc
|
||||||
+++ sandbox/linux/seccomp-bpf-helpers/syscall_parameters_restrictions.cc
|
+++ sandbox/linux/seccomp-bpf-helpers/syscall_parameters_restrictions.cc
|
||||||
@@ -36,7 +36,8 @@
|
@@ -40,7 +40,8 @@
|
||||||
#include <sys/ioctl.h>
|
|
||||||
#include <sys/ptrace.h>
|
#include <sys/ptrace.h>
|
||||||
#if defined(OS_LINUX) && !defined(OS_CHROMEOS) && !defined(__arm__) && \
|
#if (defined(OS_LINUX) || BUILDFLAG(IS_CHROMEOS_LACROS)) && \
|
||||||
- !defined(__aarch64__) && !defined(PTRACE_GET_THREAD_AREA)
|
!defined(__arm__) && !defined(__aarch64__) && \
|
||||||
+ !defined(__aarch64__) && !defined(PTRACE_GET_THREAD_AREA) && \
|
- !defined(PTRACE_GET_THREAD_AREA)
|
||||||
|
+ !defined(PTRACE_GET_THREAD_AREA) && \
|
||||||
+ !defined(__powerpc64__)
|
+ !defined(__powerpc64__)
|
||||||
// Also include asm/ptrace-abi.h since ptrace.h in older libc (for instance
|
// Also include asm/ptrace-abi.h since ptrace.h in older libc (for instance
|
||||||
// the one in Ubuntu 16.04 LTS) is missing PTRACE_GET_THREAD_AREA.
|
// the one in Ubuntu 16.04 LTS) is missing PTRACE_GET_THREAD_AREA.
|
||||||
// asm/ptrace-abi.h doesn't exist on arm32 and PTRACE_GET_THREAD_AREA isn't
|
// asm/ptrace-abi.h doesn't exist on arm32 and PTRACE_GET_THREAD_AREA isn't
|
||||||
@@ -45,6 +46,11 @@
|
@@ -49,6 +50,11 @@
|
||||||
#endif
|
#endif
|
||||||
#endif // !OS_NACL_NONSFI
|
#endif // !OS_NACL_NONSFI
|
||||||
|
|
||||||
@ -233,7 +233,7 @@ index f51915edc..ca2f4f106 100644
|
|||||||
#if defined(OS_ANDROID)
|
#if defined(OS_ANDROID)
|
||||||
|
|
||||||
#if !defined(F_DUPFD_CLOEXEC)
|
#if !defined(F_DUPFD_CLOEXEC)
|
||||||
@@ -107,6 +113,15 @@ inline bool IsArchitectureMips() {
|
@@ -98,6 +104,15 @@
|
||||||
#endif
|
#endif
|
||||||
}
|
}
|
||||||
|
|
||||||
@ -249,7 +249,7 @@ index f51915edc..ca2f4f106 100644
|
|||||||
// Ubuntu's version of glibc has a race condition in sem_post that can cause
|
// Ubuntu's version of glibc has a race condition in sem_post that can cause
|
||||||
// it to call futex(2) with bogus op arguments. To workaround this, we need
|
// it to call futex(2) with bogus op arguments. To workaround this, we need
|
||||||
// to allow those futex(2) calls to fail with EINVAL, instead of crashing the
|
// to allow those futex(2) calls to fail with EINVAL, instead of crashing the
|
||||||
@@ -248,6 +263,8 @@ ResultExpr RestrictFcntlCommands() {
|
@@ -239,6 +254,8 @@
|
||||||
uint64_t kOLargeFileFlag = O_LARGEFILE;
|
uint64_t kOLargeFileFlag = O_LARGEFILE;
|
||||||
if (IsArchitectureX86_64() || IsArchitectureI386() || IsArchitectureMips())
|
if (IsArchitectureX86_64() || IsArchitectureI386() || IsArchitectureMips())
|
||||||
kOLargeFileFlag = 0100000;
|
kOLargeFileFlag = 0100000;
|
||||||
@ -258,7 +258,7 @@ index f51915edc..ca2f4f106 100644
|
|||||||
|
|
||||||
const Arg<int> cmd(1);
|
const Arg<int> cmd(1);
|
||||||
const Arg<long> long_arg(2);
|
const Arg<long> long_arg(2);
|
||||||
@@ -262,14 +279,23 @@ ResultExpr RestrictFcntlCommands() {
|
@@ -253,14 +270,23 @@
|
||||||
F_SETLKW,
|
F_SETLKW,
|
||||||
F_GETLK,
|
F_GETLK,
|
||||||
F_DUPFD,
|
F_DUPFD,
|
||||||
@ -285,15 +285,16 @@ index f51915edc..ca2f4f106 100644
|
|||||||
ResultExpr RestrictSocketcallCommand() {
|
ResultExpr RestrictSocketcallCommand() {
|
||||||
// Unfortunately, we are unable to restrict the first parameter to
|
// Unfortunately, we are unable to restrict the first parameter to
|
||||||
// socketpair(2). Whilst initially sounding bad, it's noteworthy that very
|
// socketpair(2). Whilst initially sounding bad, it's noteworthy that very
|
||||||
@@ -418,7 +444,7 @@ ResultExpr RestrictPrlimitToGetrlimit(pid_t target_pid) {
|
@@ -413,7 +439,7 @@
|
||||||
ResultExpr RestrictPtrace() {
|
#endif
|
||||||
const Arg<int> request(0);
|
return Switch(request)
|
||||||
return Switch(request).CASES((
|
.CASES((
|
||||||
-#if !defined(__aarch64__)
|
-#if !defined(__aarch64__)
|
||||||
+#if !defined(__aarch64__) && !defined(__powerpc64__)
|
+#if !defined(__aarch64__) && !defined(__powerpc64__)
|
||||||
PTRACE_GETREGS,
|
PTRACE_GETREGS, PTRACE_GETFPREGS, PTRACE_GET_THREAD_AREA,
|
||||||
PTRACE_GETFPREGS,
|
PTRACE_GETREGSET,
|
||||||
PTRACE_GET_THREAD_AREA,
|
#endif
|
||||||
|
|
||||||
diff --git sandbox/linux/seccomp-bpf-helpers/syscall_parameters_restrictions.h sandbox/linux/seccomp-bpf-helpers/syscall_parameters_restrictions.h
|
diff --git sandbox/linux/seccomp-bpf-helpers/syscall_parameters_restrictions.h sandbox/linux/seccomp-bpf-helpers/syscall_parameters_restrictions.h
|
||||||
index ba4289f05..9a4d5ab2d 100644
|
index ba4289f05..9a4d5ab2d 100644
|
||||||
--- sandbox/linux/seccomp-bpf-helpers/syscall_parameters_restrictions.h
|
--- sandbox/linux/seccomp-bpf-helpers/syscall_parameters_restrictions.h
|
||||||
|
@ -1,15 +1,15 @@
|
|||||||
# Template file for 'chromium'
|
# Template file for 'chromium'
|
||||||
pkgname=chromium
|
pkgname=chromium
|
||||||
# See http://www.chromium.org/developers/calendar for the latest version
|
# See http://www.chromium.org/developers/calendar for the latest version
|
||||||
version=87.0.4280.141
|
version=88.0.4324.96
|
||||||
revision=2
|
revision=1
|
||||||
archs="i686* x86_64* aarch64* armv7l* ppc64le*"
|
archs="i686* x86_64* aarch64* armv7l* ppc64le*"
|
||||||
short_desc="Google's attempt at creating a safer, faster, and more stable browser"
|
short_desc="Google's attempt at creating a safer, faster, and more stable browser"
|
||||||
maintainer="Enno Boland <gottox@voidlinux.org>"
|
maintainer="Enno Boland <gottox@voidlinux.org>"
|
||||||
license="BSD-3-Clause"
|
license="BSD-3-Clause"
|
||||||
homepage="https://www.chromium.org/"
|
homepage="https://www.chromium.org/"
|
||||||
distfiles="https://commondatastorage.googleapis.com/chromium-browser-official/${pkgname}-${version}.tar.xz"
|
distfiles="https://commondatastorage.googleapis.com/chromium-browser-official/${pkgname}-${version}.tar.xz"
|
||||||
checksum=147591d7fc21e1a173701d28bbf35baddb91e64dd96ec16d8eee9a5113403375
|
checksum=8995c5bb28559579f3bed51841420253637f912c425908fe5aa389ce40e9c79f
|
||||||
nocross=yes
|
nocross=yes
|
||||||
|
|
||||||
lib32disabled=yes
|
lib32disabled=yes
|
||||||
|
Loading…
x
Reference in New Issue
Block a user