September 2019 - rpmfusion-commits

[chromium-libs-media-freeworld: 245/259] Another export and alignas gcc compilation fix

by Nicolas Chauvet

commit 8ed36c4625d4090e87a85bf5368f82289664d77f Author: Tomas Popela <tpopela(a)redhat.com> Date: Fri Sep 13 22:05:31 2019 +0200 Another export and alignas gcc compilation fix chromium-77.0.3865.75-base-gcc-no-alignas.patch | 12 ++++++++++++ chromium.spec | 3 +++ 2 files changed, 15 insertions(+) --- diff --git a/chromium-77.0.3865.75-base-gcc-no-alignas.patch b/chromium-77.0.3865.75-base-gcc-no-alignas.patch new file mode 100644 index 0000000..86a2271 --- /dev/null +++ b/chromium-77.0.3865.75-base-gcc-no-alignas.patch @@ -0,0 +1,12 @@ +diff -up chromium-77.0.3865.75/base/task/promise/dependent_list.h.base-gcc-no-alignas chromium-77.0.3865.75/base/task/promise/dependent_list.h +--- chromium-77.0.3865.75/base/task/promise/dependent_list.h.base-gcc-no-alignas 2019-09-13 21:45:51.873172347 +0200 ++++ chromium-77.0.3865.75/base/task/promise/dependent_list.h 2019-09-13 21:46:21.661522514 +0200 +@@ -59,7 +59,7 @@ class BASE_EXPORT DependentList { + + // Align Node on an 8-byte boundary to ensure the first 3 bits are 0 and can + // be used to store additional state (see static_asserts below). +- class BASE_EXPORT alignas(8) Node { ++ class BASE_EXPORT ALIGNAS(8) Node { + public: + Node(); + explicit Node(Node&& other) noexcept; diff --git a/chromium.spec b/chromium.spec index 008873e..636aaab 100644 --- a/chromium.spec +++ b/chromium.spec @@ -279,6 +279,8 @@ Patch64: chromium-77.0.3865.75-certificate-transparency.patch Patch65: chromium-77.0.3865.75-unbundle-zlib.patch # Needs to be submitted.. Patch66: chromium-77.0.3865.75-gcc-include-memory.patch +# Needs to be submitted.. +Patch67: chromium-77.0.3865.75-base-gcc-no-alignas.patch # Apply these changes to work around EPEL7 compiler issues Patch100: chromium-62.0.3202.62-kmaxskip-constexpr.patch @@ -846,6 +848,7 @@ udev. %patch64 -p1 -b .certificate-transparency %patch65 -p1 -b .unbundle-zlib %patch66 -p1 -b .gcc-include-memory +%patch67 -p1 -b .base-gcc-no-alignas # EPEL specific patches %if 0%{?rhel} == 7

5 years, 5 months

1
0
0 / 0

[chromium-libs-media-freeworld: 244/259] Remove an unneeded patch that's breaking the build

by Nicolas Chauvet

commit 63945f4efd038b18f3556b766e01ce17012d8ece Author: Tomas Popela <tpopela(a)redhat.com> Date: Fri Sep 13 21:48:17 2019 +0200 Remove an unneeded patch that's breaking the build chromium-77.0.3865.75-fix-v8-gcc.patch | 14 -------------- chromium.spec | 4 ---- 2 files changed, 18 deletions(-) --- diff --git a/chromium.spec b/chromium.spec index 102f14d..008873e 100644 --- a/chromium.spec +++ b/chromium.spec @@ -266,9 +266,6 @@ Patch41: chromium-75.0.3770.80-SIOCGSTAMP.patch Patch43: chromium-75.0.3770.80-revert-daff6b.patch # rename function to avoid conflict with rawhide glibc "gettid()" Patch45: chromium-75.0.3770.80-grpc-gettid-fix.patch -# fix v8 compile with gcc -# https://chromium.googlesource.com/v8/v8/+/3b8c624bda58d05aea80dd9626cd550... -Patch46: chromium-77.0.3865.75-fix-v8-gcc.patch # In GCC one can't use alignas() for exported classes # https://chromium.googlesource.com/chromium/src.git/+/8148fd96ae04a1150a9c... Patch61: chromium-76.0.3809.100-gcc-no-alignas-and-export.patch @@ -843,7 +840,6 @@ udev. %patch41 -p1 -b .SIOCGSTAMP %patch43 -p1 -b .revert-daff6b %patch45 -p1 -b .gettid-fix -%patch46 -p1 -b .fix-v8-gcc %patch61 -p1 -b .gcc-no-alignas-and-export %patch62 -p1 -b .gcc-remoting-constexpr %patch63 -p1 -b .vtable-symbol-undefined

5 years, 5 months

1
0
0 / 0

[chromium-libs-media-freeworld: 243/259] Use the bundled harfbuzz-ng for < F31

by Nicolas Chauvet

commit 1a11ef1abaf843579269cb7f1a60aceb6b50b023 Author: Tomas Popela <tpopela(a)redhat.com> Date: Fri Sep 13 15:00:03 2019 +0200 Use the bundled harfbuzz-ng for < F31 Needed because of the hb_subset_input_set_retain_gids(), that's only available in harbuzz 2.4 that's only in F31+ chromium.spec | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) --- diff --git a/chromium.spec b/chromium.spec index f8a9800..102f14d 100644 --- a/chromium.spec +++ b/chromium.spec @@ -137,9 +137,9 @@ BuildRequires: libicu-devel >= 5.4 %global bundlefontconfig 0 %endif -# Needs at least harfbuzz 2.3.0 now. -# 2019-03-13 -%if 0%{?fedora} < 30 +# Needs at least harfbuzz 2.4.0 now. +# 2019-09-13 +%if 0%{?fedora} < 31 %global bundleharfbuzz 1 %else %global bundleharfbuzz 0

5 years, 5 months

1
0
0 / 0

[chromium-libs-media-freeworld: 242/259] Include <memory> to fix the headless build

by Nicolas Chauvet

commit d08e680fa760fa174b8940428aafbf62cef21c50 Author: Tomas Popela <tpopela(a)redhat.com> Date: Fri Sep 13 15:24:09 2019 +0200 Include <memory> to fix the headless build chromium-77.0.3865.75-gcc-include-memory.patch | 12 ++++++++++++ chromium.spec | 3 +++ 2 files changed, 15 insertions(+) --- diff --git a/chromium-77.0.3865.75-gcc-include-memory.patch b/chromium-77.0.3865.75-gcc-include-memory.patch new file mode 100644 index 0000000..93b4399 --- /dev/null +++ b/chromium-77.0.3865.75-gcc-include-memory.patch @@ -0,0 +1,12 @@ +diff -up chromium-77.0.3865.75/third_party/one_euro_filter/src/one_euro_filter.h.gcc-include-memory chromium-77.0.3865.75/third_party/one_euro_filter/src/one_euro_filter.h +--- chromium-77.0.3865.75/third_party/one_euro_filter/src/one_euro_filter.h.gcc-include-memory 2019-09-13 14:44:24.962770079 +0200 ++++ chromium-77.0.3865.75/third_party/one_euro_filter/src/one_euro_filter.h 2019-09-13 14:44:45.347073612 +0200 +@@ -3,6 +3,8 @@ + + #include "low_pass_filter.h" + ++#include <memory> ++ + namespace one_euro_filter { + namespace test { + class OneEuroFilterTest; diff --git a/chromium.spec b/chromium.spec index 4b20549..f8a9800 100644 --- a/chromium.spec +++ b/chromium.spec @@ -280,6 +280,8 @@ Patch63: chromium-76.0.3809.100-vtable-symbol-undefined.patch Patch64: chromium-77.0.3865.75-certificate-transparency.patch # https://gitweb.gentoo.org/repo/gentoo.git/tree/www-client/chromium/files/... Patch65: chromium-77.0.3865.75-unbundle-zlib.patch +# Needs to be submitted.. +Patch66: chromium-77.0.3865.75-gcc-include-memory.patch # Apply these changes to work around EPEL7 compiler issues Patch100: chromium-62.0.3202.62-kmaxskip-constexpr.patch @@ -847,6 +849,7 @@ udev. %patch63 -p1 -b .vtable-symbol-undefined %patch64 -p1 -b .certificate-transparency %patch65 -p1 -b .unbundle-zlib +%patch66 -p1 -b .gcc-include-memory # EPEL specific patches %if 0%{?rhel} == 7

5 years, 5 months

1
0
0 / 0

[chromium-libs-media-freeworld: 241/259] Update the clean-ffmpeg.sh script

by Nicolas Chauvet

commit 5e3b7f3e899c48fbabcf95b19bc275a629a0e871 Author: Tomas Popela <tpopela(a)redhat.com> Date: Fri Sep 13 15:18:54 2019 +0200 Update the clean-ffmpeg.sh script clean_ffmpeg.sh | 1 + sources | 2 +- 2 files changed, 2 insertions(+), 1 deletion(-) --- diff --git a/clean_ffmpeg.sh b/clean_ffmpeg.sh index 2f27435..fd226e8 100755 --- a/clean_ffmpeg.sh +++ b/clean_ffmpeg.sh @@ -138,6 +138,7 @@ header_files=" libavcodec/x86/inline_asm.h \ libavcodec/vlc.h \ libavcodec/vorbisdsp.h \ libavcodec/vp3data.h \ + libavcodec/vp4data.h \ libavcodec/vp3dsp.h \ libavcodec/vp56.h \ libavcodec/vp56dsp.h \ diff --git a/sources b/sources index a1d28bf..b9b0498 100644 --- a/sources +++ b/sources @@ -17,4 +17,4 @@ SHA512 (Tinos-Italic.ttf) = d4f4f096110ef98a781a2a0e0d319317e5f84e650fe6f4d4f6b0 SHA512 (Tinos-Regular.ttf) = 58085c5dac6d067d60ba2ab3220c4a0cc1efcf279cadfcfb8746a5e5fa1a6f6daa62750dc2051b3b2d8a51b4d2e9bb0f66594caf2253c0870ed9c7286fa45e8f SHA512 (Ahem.ttf) = aeb64b10ab9c87860714cb60b4900254b13dc52c51319256a1a3722c882026ab7c616bf628fbc2fe14e38a6003f3a481af60b52a7ed62071d28ddaf428e4e3fd SHA512 (node-v8.9.1-linux-x64.tar.gz) = a707fd4567041c56e7f9d415e505e3fa650627f31def7fefdd7ec50f9e7066bb33332b67f479e1159d85e1105a7e6d034aad7429f4f3d034c9161170d7e0b844 -SHA512 (chromium-77.0.3865.75-clean.tar.xz) = 9531e5d533bf305bd82ae2dbc7bf1a9e081377b61a5611f4bfa14ed389f94d106e26a9981771ed11697ca9c2490eb24c69e992fd907de241698c89a6131db0b6 +SHA512 (chromium-77.0.3865.75-clean.tar.xz) = ca7a71586a60abeacb70b9d08ba9a28455d875bfa5232070fdff079e52395924b80f05d7627e3a5d5c7a3df606a39a31e05634683a052c9efb634ed536afc092

5 years, 5 months

1
0
0 / 0

[chromium-libs-media-freeworld: 240/259] Fix the previously rebased patched

by Nicolas Chauvet

commit 2cfc18c994143ce77664104024315e6056e4371e Author: Tomas Popela <tpopela(a)redhat.com> Date: Fri Sep 13 15:21:43 2019 +0200 Fix the previously rebased patched chromium-77.0.3865.75-gcc-no-opt-safe-math.patch | 12 +++++++----- 1 file changed, 7 insertions(+), 5 deletions(-) --- diff --git a/chromium-77.0.3865.75-gcc-no-opt-safe-math.patch b/chromium-77.0.3865.75-gcc-no-opt-safe-math.patch index d342e2d..920a53e 100644 --- a/chromium-77.0.3865.75-gcc-no-opt-safe-math.patch +++ b/chromium-77.0.3865.75-gcc-no-opt-safe-math.patch @@ -1,13 +1,15 @@ diff -up chromium-77.0.3865.75/base/numerics/safe_math_shared_impl.h.nogccoptmath chromium-77.0.3865.75/base/numerics/safe_math_shared_impl.h ---- chromium-77.0.3865.75/base/numerics/safe_math_shared_impl.h.nogccoptmath 2019-09-12 09:55:13.041038765 +0200 -+++ chromium-77.0.3865.75/base/numerics/safe_math_shared_impl.h 2019-09-12 10:11:14.088101504 +0200 -@@ -24,8 +24,7 @@ +--- chromium-77.0.3865.75/base/numerics/safe_math_shared_impl.h.nogccoptmath 2019-09-13 14:17:22.726738088 +0200 ++++ chromium-77.0.3865.75/base/numerics/safe_math_shared_impl.h 2019-09-13 14:31:37.686898493 +0200 +@@ -23,9 +23,8 @@ + // Where available use builtin math overflow support on Clang and GCC. #elif !defined(__native_client__) && \ ((defined(__clang__) && \ - ((__clang_major__ > 3) || \ +- ((__clang_major__ > 3) || \ - (__clang_major__ == 3 && __clang_minor__ >= 4))) || \ - (defined(__GNUC__) && __GNUC__ >= 5)) -+ (__clang_major__ == 3 && __clang_minor__ >= 4))) ++ (__clang_major__ > 3) || \ ++ (__clang_major__ == 3 && __clang_minor__ >= 4))) #include "base/numerics/safe_math_clang_gcc_impl.h" #define BASE_HAS_OPTIMIZED_SAFE_MATH (1) #else

5 years, 5 months

1
0
0 / 0

[chromium-libs-media-freeworld: 239/259] Missing bundled dependency for headless

by Nicolas Chauvet

commit 1b0a93bc239d9ee125a0356f974176ef82bafeb3 Author: Tomas Popela <tpopela(a)redhat.com> Date: Fri Sep 13 15:23:46 2019 +0200 Missing bundled dependency for headless chromium.spec | 1 + 1 file changed, 1 insertion(+) --- diff --git a/chromium.spec b/chromium.spec index cc79386..4b20549 100644 --- a/chromium.spec +++ b/chromium.spec @@ -1239,6 +1239,7 @@ build/linux/unbundle/remove_bundled_libraries.py \ %endif 'third_party/openscreen' \ 'third_party/opus' \ + 'third_party/one_euro_filter' \ 'third_party/ots' \ 'third_party/pdfium' \ 'third_party/pdfium/third_party/agg23' \

5 years, 5 months

1
0
0 / 0

[chromium-libs-media-freeworld: 238/259] Unbundle the zlib

by Nicolas Chauvet

commit 8458f58818dc3548cdaec285bd680ff9c84f9f46 Author: Tomas Popela <tpopela(a)redhat.com> Date: Fri Sep 13 15:18:03 2019 +0200 Unbundle the zlib Use the gentoo patch. chromium-77.0.3865.75-unbundle-zlib.patch | 25 +++++++++++++++++++++++++ chromium.spec | 3 +++ 2 files changed, 28 insertions(+) --- diff --git a/chromium-77.0.3865.75-unbundle-zlib.patch b/chromium-77.0.3865.75-unbundle-zlib.patch new file mode 100644 index 0000000..d6c45ad --- /dev/null +++ b/chromium-77.0.3865.75-unbundle-zlib.patch @@ -0,0 +1,25 @@ +From e1bbdec720a333937bd1b990ae0f7ee97db0d3b0 Mon Sep 17 00:00:00 2001 +From: Your Name <you(a)example.com> +Date: Fri, 28 Jun 2019 15:56:23 +0000 +Subject: [PATCH] update zlib + +--- + third_party/perfetto/gn/BUILD.gn | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/third_party/perfetto/gn/BUILD.gn b/third_party/perfetto/gn/BUILD.gn +index c951f5f..297eee3 100644 +--- a/third_party/perfetto/gn/BUILD.gn ++++ b/third_party/perfetto/gn/BUILD.gn +@@ -200,7 +200,7 @@ group("zlib") { + "//buildtools:zlib", + ] + } else if (build_with_chromium) { +- public_configs = [ "//third_party/zlib:zlib_config" ] ++ public_configs = [ "//third_party/zlib:system_zlib" ] + public_deps = [ + "//third_party/zlib", + ] +-- +2.21.0 + diff --git a/chromium.spec b/chromium.spec index a2d54e4..cc79386 100644 --- a/chromium.spec +++ b/chromium.spec @@ -278,6 +278,8 @@ Patch62: chromium-76.0.3809.100-gcc-remoting-constexpr.patch Patch63: chromium-76.0.3809.100-vtable-symbol-undefined.patch # https://chromium.googlesource.com/chromium/src.git/+/3c9720245e440c4b7222... Patch64: chromium-77.0.3865.75-certificate-transparency.patch +# https://gitweb.gentoo.org/repo/gentoo.git/tree/www-client/chromium/files/... +Patch65: chromium-77.0.3865.75-unbundle-zlib.patch # Apply these changes to work around EPEL7 compiler issues Patch100: chromium-62.0.3202.62-kmaxskip-constexpr.patch @@ -844,6 +846,7 @@ udev. %patch62 -p1 -b .gcc-remoting-constexpr %patch63 -p1 -b .vtable-symbol-undefined %patch64 -p1 -b .certificate-transparency +%patch65 -p1 -b .unbundle-zlib # EPEL specific patches %if 0%{?rhel} == 7

5 years, 5 months

1
0
0 / 0

[chromium-libs-media-freeworld: 237/259] Update to 77.0.3865.75

by Nicolas Chauvet

commit 892e596886b085085ee7b974404746d408db7cda Author: Tomas Popela <tpopela(a)redhat.com> Date: Thu Sep 12 17:28:51 2019 +0200 Update to 77.0.3865.75 Rebase and clean the patches. chromium-61.0.3163.79-gcc-no-opt-safe-math.patch | 13 -- chromium-68.0.3440.106-boolfix.patch | 36 ---- chromium-72.0.3626.121-fedora-user-agent.patch | 12 -- chromium-72.0.3626.121-gcc5-r3.patch | 36 ---- chromium-75.0.3770.100-fix-v8-gcc.patch | 14 -- chromium-75.0.3770.80-no-zlib-mangle.patch | 14 -- chromium-75.0.3770.80-pure-virtual-crash-fix.patch | 24 --- ....0.3809.100-gcc-accountinfo-move-noexcept.patch | 53 ----- chromium-76.0.3809.100-gcc-cc-no-except.patch | 105 ---------- ...m-76.0.3809.100-gcc-feature-policy-parser.patch | 76 ------- ...m-76.0.3809.100-gcc-hasfraction-constexpr.patch | 32 --- ...m-76.0.3809.100-gcc-history-move-noexcept.patch | 42 ---- ...um-76.0.3809.100-gcc-initialization-order.patch | 33 --- ...3809.100-gcc-move-explicit-initialization.patch | 97 --------- chromium-76.0.3809.100-gcc-net-fetcher.patch | 63 ------ ...m-76.0.3809.100-gcc-themeservice-includes.patch | 36 ---- chromium-76.0.3809.100-gcc-vulkan.patch | 115 ----------- chromium-76.0.3809.100-quiche-compile-fix.patch | 225 --------------------- chromium-76.0.3809.100-throttling-dead-beef.patch | 30 --- chromium-76.0.3809.100-weak-ptr-no-except.patch | 66 ------ ...-76.0.3809.132-gcc-ambigous-instantiation.patch | 21 -- chromium-77.0.3865.75-boolfix.patch | 24 +++ ...ium-77.0.3865.75-certificate-transparency.patch | 132 ++++++------ chromium-77.0.3865.75-fedora-user-agent.patch | 12 ++ chromium-77.0.3865.75-fix-v8-gcc.patch | 14 ++ chromium-77.0.3865.75-gcc-no-opt-safe-math.patch | 13 ++ chromium-77.0.3865.75-gcc5-r3.patch | 36 ++++ chromium-77.0.3865.75-no-zlib-mangle.patch | 22 ++ chromium.spec | 68 +------ sources | 2 +- 30 files changed, 199 insertions(+), 1267 deletions(-) --- diff --git a/chromium-77.0.3865.75-boolfix.patch b/chromium-77.0.3865.75-boolfix.patch new file mode 100644 index 0000000..c836214 --- /dev/null +++ b/chromium-77.0.3865.75-boolfix.patch @@ -0,0 +1,24 @@ +diff -up chromium-77.0.3865.75/mojo/public/cpp/bindings/associated_interface_ptr_info.h.boolfix chromium-77.0.3865.75/mojo/public/cpp/bindings/associated_interface_ptr_info.h +--- chromium-77.0.3865.75/mojo/public/cpp/bindings/associated_interface_ptr_info.h.boolfix 2019-09-09 23:55:20.000000000 +0200 ++++ chromium-77.0.3865.75/mojo/public/cpp/bindings/associated_interface_ptr_info.h 2019-09-12 15:43:30.025360946 +0200 +@@ -45,7 +45,7 @@ class AssociatedInterfacePtrInfo { + + bool is_valid() const { return handle_.is_valid(); } + +- explicit operator bool() const { return handle_.is_valid(); } ++ explicit operator bool() const { return (bool) handle_.is_valid(); } + + ScopedInterfaceEndpointHandle PassHandle() { + return std::move(handle_); +diff -up chromium-77.0.3865.75/mojo/public/cpp/bindings/associated_interface_request.h.boolfix chromium-77.0.3865.75/mojo/public/cpp/bindings/associated_interface_request.h +--- chromium-77.0.3865.75/mojo/public/cpp/bindings/associated_interface_request.h.boolfix 2019-09-09 23:55:20.000000000 +0200 ++++ chromium-77.0.3865.75/mojo/public/cpp/bindings/associated_interface_request.h 2019-09-12 15:43:30.025360946 +0200 +@@ -51,7 +51,7 @@ class AssociatedInterfaceRequest { + // handle. + bool is_pending() const { return handle_.is_valid(); } + +- explicit operator bool() const { return handle_.is_valid(); } ++ explicit operator bool() const { return (bool) handle_.is_valid(); } + + ScopedInterfaceEndpointHandle PassHandle() { return std::move(handle_); } + diff --git a/chromium-76.0.3809.132-certificate-transparency.patch b/chromium-77.0.3865.75-certificate-transparency.patch similarity index 73% rename from chromium-76.0.3809.132-certificate-transparency.patch rename to chromium-77.0.3865.75-certificate-transparency.patch index 8bfbced..82e2958 100644 --- a/chromium-76.0.3809.132-certificate-transparency.patch +++ b/chromium-77.0.3865.75-certificate-transparency.patch @@ -1,18 +1,18 @@ -diff -up chromium-76.0.3809.132/chrome/browser/net/system_network_context_manager_browsertest.cc.certificate-transparency chromium-76.0.3809.132/chrome/browser/net/system_network_context_manager_browsertest.cc ---- chromium-76.0.3809.132/chrome/browser/net/system_network_context_manager_browsertest.cc.certificate-transparency 2019-09-03 22:08:28.931786496 +0200 -+++ chromium-76.0.3809.132/chrome/browser/net/system_network_context_manager_browsertest.cc 2019-09-03 22:15:24.743555759 +0200 -@@ -17,6 +17,7 @@ - #include "chrome/common/pref_names.h" - #include "chrome/test/base/in_process_browser_test.h" - #include "components/prefs/pref_service.h" +diff -up chromium-77.0.3865.75/chrome/browser/net/system_network_context_manager_browsertest.cc.certificate-transparency chromium-77.0.3865.75/chrome/browser/net/system_network_context_manager_browsertest.cc +--- chromium-77.0.3865.75/chrome/browser/net/system_network_context_manager_browsertest.cc.certificate-transparency 2019-09-12 16:09:52.818635106 +0200 ++++ chromium-77.0.3865.75/chrome/browser/net/system_network_context_manager_browsertest.cc 2019-09-12 16:11:07.662562005 +0200 +@@ -21,6 +21,7 @@ + #include "components/version_info/version_info.h" + #include "content/public/common/content_switches.h" + #include "content/public/common/user_agent.h" +#include "services/network/public/cpp/network_service_buildflags.h" #include "services/network/public/mojom/network_context.mojom.h" #include "services/network/public/mojom/network_service.mojom.h" #include "testing/gmock/include/gmock/gmock.h" -@@ -297,3 +298,55 @@ IN_PROC_BROWSER_TEST_P(SystemNetworkCont +@@ -356,3 +357,55 @@ IN_PROC_BROWSER_TEST_P(SystemNetworkCont INSTANTIATE_TEST_SUITE_P(, - SystemNetworkContextManagerStubResolverBrowsertest, - ::testing::Values(false, true)); + SystemNetworkContextManagerFreezeQUICUaBrowsertest, + ::testing::Values(true, false)); + +class SystemNetworkContextManagerCertificateTransparencyBrowsertest + : public SystemNetworkContextManagerBrowsertest, @@ -65,9 +65,9 @@ diff -up chromium-76.0.3809.132/chrome/browser/net/system_network_context_manage + , + SystemNetworkContextManagerCertificateTransparencyBrowsertest, + ::testing::Values(base::nullopt, true, false)); -diff -up chromium-76.0.3809.132/chrome/browser/net/system_network_context_manager.cc.certificate-transparency chromium-76.0.3809.132/chrome/browser/net/system_network_context_manager.cc ---- chromium-76.0.3809.132/chrome/browser/net/system_network_context_manager.cc.certificate-transparency 2019-08-26 21:02:05.000000000 +0200 -+++ chromium-76.0.3809.132/chrome/browser/net/system_network_context_manager.cc 2019-09-03 22:13:26.451198970 +0200 +diff -up chromium-77.0.3865.75/chrome/browser/net/system_network_context_manager.cc.certificate-transparency chromium-77.0.3865.75/chrome/browser/net/system_network_context_manager.cc +--- chromium-77.0.3865.75/chrome/browser/net/system_network_context_manager.cc.certificate-transparency 2019-09-09 23:55:09.000000000 +0200 ++++ chromium-77.0.3865.75/chrome/browser/net/system_network_context_manager.cc 2019-09-12 16:09:52.819635118 +0200 @@ -4,11 +4,13 @@ #include "chrome/browser/net/system_network_context_manager.h" @@ -82,7 +82,7 @@ diff -up chromium-76.0.3809.132/chrome/browser/net/system_network_context_manage #include "base/command_line.h" #include "base/feature_list.h" #include "base/logging.h" -@@ -51,6 +53,7 @@ +@@ -50,6 +52,7 @@ #include "content/public/common/mime_handler_view_mode.h" #include "content/public/common/service_names.mojom.h" #include "content/public/common/user_agent.h" @@ -90,7 +90,7 @@ diff -up chromium-76.0.3809.132/chrome/browser/net/system_network_context_manage #include "mojo/public/cpp/bindings/associated_interface_ptr.h" #include "net/dns/public/util.h" #include "net/net_buildflags.h" -@@ -81,6 +84,20 @@ +@@ -79,6 +82,20 @@ namespace { @@ -111,7 +111,7 @@ diff -up chromium-76.0.3809.132/chrome/browser/net/system_network_context_manage // The global instance of the SystemNetworkContextmanager. SystemNetworkContextManager* g_system_network_context_manager = nullptr; -@@ -686,14 +703,35 @@ SystemNetworkContextManager::CreateDefau +@@ -658,14 +675,35 @@ SystemNetworkContextManager::CreateDefau bool http_09_on_non_default_ports_enabled = false; #if !defined(OS_ANDROID) @@ -155,7 +155,7 @@ diff -up chromium-76.0.3809.132/chrome/browser/net/system_network_context_manage } const base::Value* value = -@@ -756,6 +794,12 @@ SystemNetworkContextManager::GetHttpAuth +@@ -723,6 +761,12 @@ SystemNetworkContextManager::GetHttpAuth return CreateHttpAuthDynamicParams(g_browser_process->local_state()); } @@ -168,10 +168,10 @@ diff -up chromium-76.0.3809.132/chrome/browser/net/system_network_context_manage network::mojom::NetworkContextParamsPtr SystemNetworkContextManager::CreateNetworkContextParams() { // TODO(mmenke): Set up parameters here (in memory cookie store, etc). -diff -up chromium-76.0.3809.132/chrome/browser/net/system_network_context_manager.h.certificate-transparency chromium-76.0.3809.132/chrome/browser/net/system_network_context_manager.h ---- chromium-76.0.3809.132/chrome/browser/net/system_network_context_manager.h.certificate-transparency 2019-08-26 21:02:05.000000000 +0200 -+++ chromium-76.0.3809.132/chrome/browser/net/system_network_context_manager.h 2019-09-03 22:08:28.931786496 +0200 -@@ -158,6 +158,12 @@ class SystemNetworkContextManager { +diff -up chromium-77.0.3865.75/chrome/browser/net/system_network_context_manager.h.certificate-transparency chromium-77.0.3865.75/chrome/browser/net/system_network_context_manager.h +--- chromium-77.0.3865.75/chrome/browser/net/system_network_context_manager.h.certificate-transparency 2019-09-09 23:55:09.000000000 +0200 ++++ chromium-77.0.3865.75/chrome/browser/net/system_network_context_manager.h 2019-09-12 16:09:52.819635118 +0200 +@@ -139,6 +139,12 @@ class SystemNetworkContextManager { static network::mojom::HttpAuthDynamicParamsPtr GetHttpAuthDynamicParamsForTesting(); @@ -184,10 +184,10 @@ diff -up chromium-76.0.3809.132/chrome/browser/net/system_network_context_manage private: class URLLoaderFactoryForSystem; -diff -up chromium-76.0.3809.132/chrome/browser/policy/policy_browsertest.cc.certificate-transparency chromium-76.0.3809.132/chrome/browser/policy/policy_browsertest.cc ---- chromium-76.0.3809.132/chrome/browser/policy/policy_browsertest.cc.certificate-transparency 2019-08-26 21:02:05.000000000 +0200 -+++ chromium-76.0.3809.132/chrome/browser/policy/policy_browsertest.cc 2019-09-03 22:08:28.932786508 +0200 -@@ -4834,7 +4834,7 @@ IN_PROC_BROWSER_TEST_P(SSLPolicyTestComm +diff -up chromium-77.0.3865.75/chrome/browser/policy/policy_browsertest.cc.certificate-transparency chromium-77.0.3865.75/chrome/browser/policy/policy_browsertest.cc +--- chromium-77.0.3865.75/chrome/browser/policy/policy_browsertest.cc.certificate-transparency 2019-09-09 23:55:10.000000000 +0200 ++++ chromium-77.0.3865.75/chrome/browser/policy/policy_browsertest.cc 2019-09-12 16:09:52.820635131 +0200 +@@ -4836,7 +4836,7 @@ IN_PROC_BROWSER_TEST_F(PolicyTest, browser()->tab_strip_model()->GetActiveWebContents()->GetTitle()); } @@ -196,9 +196,9 @@ diff -up chromium-76.0.3809.132/chrome/browser/policy/policy_browsertest.cc.cert CertificateTransparencyEnforcementDisabledForCas) { net::EmbeddedTestServer https_server_ok(net::EmbeddedTestServer::TYPE_HTTPS); https_server_ok.SetSSLConfig(net::EmbeddedTestServer::CERT_OK); -diff -up chromium-76.0.3809.132/chrome/browser/ssl/chrome_expect_ct_reporter_browsertest.cc.certificate-transparency chromium-76.0.3809.132/chrome/browser/ssl/chrome_expect_ct_reporter_browsertest.cc ---- chromium-76.0.3809.132/chrome/browser/ssl/chrome_expect_ct_reporter_browsertest.cc.certificate-transparency 2019-08-26 21:02:07.000000000 +0200 -+++ chromium-76.0.3809.132/chrome/browser/ssl/chrome_expect_ct_reporter_browsertest.cc 2019-09-03 22:08:28.932786508 +0200 +diff -up chromium-77.0.3865.75/chrome/browser/ssl/chrome_expect_ct_reporter_browsertest.cc.certificate-transparency chromium-77.0.3865.75/chrome/browser/ssl/chrome_expect_ct_reporter_browsertest.cc +--- chromium-77.0.3865.75/chrome/browser/ssl/chrome_expect_ct_reporter_browsertest.cc.certificate-transparency 2019-09-09 23:55:10.000000000 +0200 ++++ chromium-77.0.3865.75/chrome/browser/ssl/chrome_expect_ct_reporter_browsertest.cc 2019-09-12 16:09:52.821635143 +0200 @@ -8,6 +8,7 @@ #include "base/callback.h" #include "base/run_loop.h" @@ -226,10 +226,10 @@ diff -up chromium-76.0.3809.132/chrome/browser/ssl/chrome_expect_ct_reporter_bro void SetUpOnMainThread() override { run_loop_ = std::make_unique<base::RunLoop>(); -diff -up chromium-76.0.3809.132/chrome/browser/ssl/security_state_tab_helper_browsertest.cc.certificate-transparency chromium-76.0.3809.132/chrome/browser/ssl/security_state_tab_helper_browsertest.cc ---- chromium-76.0.3809.132/chrome/browser/ssl/security_state_tab_helper_browsertest.cc.certificate-transparency 2019-08-26 21:02:07.000000000 +0200 -+++ chromium-76.0.3809.132/chrome/browser/ssl/security_state_tab_helper_browsertest.cc 2019-09-03 22:08:28.932786508 +0200 -@@ -457,6 +457,13 @@ class SecurityStateTabHelperTest : publi +diff -up chromium-77.0.3865.75/chrome/browser/ssl/security_state_tab_helper_browsertest.cc.certificate-transparency chromium-77.0.3865.75/chrome/browser/ssl/security_state_tab_helper_browsertest.cc +--- chromium-77.0.3865.75/chrome/browser/ssl/security_state_tab_helper_browsertest.cc.certificate-transparency 2019-09-09 23:55:10.000000000 +0200 ++++ chromium-77.0.3865.75/chrome/browser/ssl/security_state_tab_helper_browsertest.cc 2019-09-12 16:09:52.821635143 +0200 +@@ -433,6 +433,13 @@ class SecurityStateTabHelperTest : publi SecurityStateTabHelperTest() : https_server_(net::EmbeddedTestServer::TYPE_HTTPS) { https_server_.ServeFilesFromSourceDirectory(GetChromeTestDataDir()); @@ -243,10 +243,10 @@ diff -up chromium-76.0.3809.132/chrome/browser/ssl/security_state_tab_helper_bro } void SetUpOnMainThread() override { -diff -up chromium-76.0.3809.132/chrome/browser/ssl/ssl_browsertest.cc.certificate-transparency chromium-76.0.3809.132/chrome/browser/ssl/ssl_browsertest.cc ---- chromium-76.0.3809.132/chrome/browser/ssl/ssl_browsertest.cc.certificate-transparency 2019-08-26 21:02:07.000000000 +0200 -+++ chromium-76.0.3809.132/chrome/browser/ssl/ssl_browsertest.cc 2019-09-03 22:08:28.934786531 +0200 -@@ -2008,8 +2008,14 @@ class CertificateTransparencySSLUITest : +diff -up chromium-77.0.3865.75/chrome/browser/ssl/ssl_browsertest.cc.certificate-transparency chromium-77.0.3865.75/chrome/browser/ssl/ssl_browsertest.cc +--- chromium-77.0.3865.75/chrome/browser/ssl/ssl_browsertest.cc.certificate-transparency 2019-09-09 23:55:10.000000000 +0200 ++++ chromium-77.0.3865.75/chrome/browser/ssl/ssl_browsertest.cc 2019-09-12 16:09:52.822635155 +0200 +@@ -1853,8 +1853,14 @@ class CertificateTransparencySSLUITest : public: CertificateTransparencySSLUITest() : CertVerifierBrowserTest(), @@ -263,9 +263,9 @@ diff -up chromium-76.0.3809.132/chrome/browser/ssl/ssl_browsertest.cc.certificat void SetUpOnMainThread() override { CertVerifierBrowserTest::SetUpOnMainThread(); -diff -up chromium-76.0.3809.132/components/certificate_transparency/chrome_ct_policy_enforcer.h.certificate-transparency chromium-76.0.3809.132/components/certificate_transparency/chrome_ct_policy_enforcer.h ---- chromium-76.0.3809.132/components/certificate_transparency/chrome_ct_policy_enforcer.h.certificate-transparency 2019-08-26 21:02:14.000000000 +0200 -+++ chromium-76.0.3809.132/components/certificate_transparency/chrome_ct_policy_enforcer.h 2019-09-03 22:08:28.934786531 +0200 +diff -up chromium-77.0.3865.75/components/certificate_transparency/chrome_ct_policy_enforcer.h.certificate-transparency chromium-77.0.3865.75/components/certificate_transparency/chrome_ct_policy_enforcer.h +--- chromium-77.0.3865.75/components/certificate_transparency/chrome_ct_policy_enforcer.h.certificate-transparency 2019-09-09 23:55:14.000000000 +0200 ++++ chromium-77.0.3865.75/components/certificate_transparency/chrome_ct_policy_enforcer.h 2019-09-12 16:09:52.823635168 +0200 @@ -45,6 +45,19 @@ class ChromeCTPolicyEnforcer : public ne void SetClockForTesting(const base::Clock* clock) { clock_ = clock; } @@ -286,10 +286,10 @@ diff -up chromium-76.0.3809.132/components/certificate_transparency/chrome_ct_po private: // Returns true if the log identified by |log_id| (the SHA-256 hash of the // log's DER-encoded SPKI) has been disqualified, and sets -diff -up chromium-76.0.3809.132/services/network/network_context.cc.certificate-transparency chromium-76.0.3809.132/services/network/network_context.cc ---- chromium-76.0.3809.132/services/network/network_context.cc.certificate-transparency 2019-08-26 21:02:33.000000000 +0200 -+++ chromium-76.0.3809.132/services/network/network_context.cc 2019-09-03 22:17:27.977834857 +0200 -@@ -35,6 +35,7 @@ +diff -up chromium-77.0.3865.75/services/network/network_context.cc.certificate-transparency chromium-77.0.3865.75/services/network/network_context.cc +--- chromium-77.0.3865.75/services/network/network_context.cc.certificate-transparency 2019-09-09 23:55:22.000000000 +0200 ++++ chromium-77.0.3865.75/services/network/network_context.cc 2019-09-12 16:09:52.823635168 +0200 +@@ -36,6 +36,7 @@ #include "components/prefs/pref_registry_simple.h" #include "components/prefs/pref_service.h" #include "components/prefs/pref_service_factory.h" @@ -297,7 +297,7 @@ diff -up chromium-76.0.3809.132/services/network/network_context.cc.certificate- #include "mojo/public/cpp/bindings/strong_binding.h" #include "net/base/layered_network_delegate.h" #include "net/base/load_flags.h" -@@ -1851,16 +1852,6 @@ URLRequestContextOwner NetworkContext::A +@@ -1877,16 +1878,6 @@ URLRequestContextOwner NetworkContext::A base::FeatureList::IsEnabled(features::kNetworkErrorLogging)); #endif // BUILDFLAG(ENABLE_REPORTING) @@ -314,7 +314,7 @@ diff -up chromium-76.0.3809.132/services/network/network_context.cc.certificate- net::HttpNetworkSession::Params session_params; bool is_quic_force_disabled = false; if (network_service_ && network_service_->quic_disabled()) -@@ -1910,8 +1901,20 @@ URLRequestContextOwner NetworkContext::A +@@ -1936,8 +1927,20 @@ URLRequestContextOwner NetworkContext::A #if BUILDFLAG(IS_CT_SUPPORTED) std::vector<scoped_refptr<const net::CTLogVerifier>> ct_logs; @@ -335,7 +335,7 @@ diff -up chromium-76.0.3809.132/services/network/network_context.cc.certificate- scoped_refptr<const net::CTLogVerifier> log_verifier = net::CTLogVerifier::Create(log->public_key, log->name); if (!log_verifier) { -@@ -1924,6 +1927,17 @@ URLRequestContextOwner NetworkContext::A +@@ -1950,6 +1953,17 @@ URLRequestContextOwner NetworkContext::A ct_verifier->AddLogs(ct_logs); builder->set_ct_verifier(std::move(ct_verifier)); } @@ -353,9 +353,9 @@ diff -up chromium-76.0.3809.132/services/network/network_context.cc.certificate- #endif // BUILDFLAG(IS_CT_SUPPORTED) const base::CommandLine* command_line = -diff -up chromium-76.0.3809.132/services/network/network_context_unittest.cc.certificate-transparency chromium-76.0.3809.132/services/network/network_context_unittest.cc ---- chromium-76.0.3809.132/services/network/network_context_unittest.cc.certificate-transparency 2019-08-26 21:02:33.000000000 +0200 -+++ chromium-76.0.3809.132/services/network/network_context_unittest.cc 2019-09-03 22:20:22.382888089 +0200 +diff -up chromium-77.0.3865.75/services/network/network_context_unittest.cc.certificate-transparency chromium-77.0.3865.75/services/network/network_context_unittest.cc +--- chromium-77.0.3865.75/services/network/network_context_unittest.cc.certificate-transparency 2019-09-09 23:55:22.000000000 +0200 ++++ chromium-77.0.3865.75/services/network/network_context_unittest.cc 2019-09-12 16:13:10.479056669 +0200 @@ -2,6 +2,7 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. @@ -374,10 +374,10 @@ diff -up chromium-76.0.3809.132/services/network/network_context_unittest.cc.cer #include "components/network_session_configurator/common/network_switches.h" #include "components/prefs/testing_pref_service.h" +#include "crypto/sha2.h" - #include "mojo/public/cpp/bindings/interface_request.h" - #include "mojo/public/cpp/bindings/strong_binding.h" + #include "mojo/public/cpp/bindings/remote.h" + #include "mojo/public/cpp/bindings/self_owned_receiver.h" #include "mojo/public/cpp/system/data_pipe_utils.h" -@@ -113,6 +116,11 @@ +@@ -115,6 +118,11 @@ #include "url/scheme_host_port.h" #include "url/url_constants.h" @@ -386,11 +386,11 @@ diff -up chromium-76.0.3809.132/services/network/network_context_unittest.cc.cer +#include "services/network/public/mojom/ct_log_info.mojom.h" +#endif + - #if BUILDFLAG(ENABLE_REPORTING) - #include "net/network_error_logging/network_error_logging_service.h" - #include "net/reporting/reporting_cache.h" -@@ -5566,6 +5574,72 @@ TEST_F(NetworkContextTest, BlockAllCooki - EXPECT_EQ("None", response_body); + #if !BUILDFLAG(DISABLE_FTP_SUPPORT) + #include "net/ftp/ftp_auth_cache.h" + #endif // !BUILDFLAG(DISABLE_FTP_SUPPORT) +@@ -5958,6 +5966,72 @@ TEST_F(NetworkContextSplitCacheTest, + true /* was_cached */, true /* is_navigation */); } +#if BUILDFLAG(IS_CT_SUPPORTED) @@ -462,9 +462,9 @@ diff -up chromium-76.0.3809.132/services/network/network_context_unittest.cc.cer } // namespace } // namespace network -diff -up chromium-76.0.3809.132/services/network/public/mojom/ct_log_info.mojom.certificate-transparency chromium-76.0.3809.132/services/network/public/mojom/ct_log_info.mojom ---- chromium-76.0.3809.132/services/network/public/mojom/ct_log_info.mojom.certificate-transparency 2019-08-26 21:02:33.000000000 +0200 -+++ chromium-76.0.3809.132/services/network/public/mojom/ct_log_info.mojom 2019-09-03 22:08:28.936786554 +0200 +diff -up chromium-77.0.3865.75/services/network/public/mojom/ct_log_info.mojom.certificate-transparency chromium-77.0.3865.75/services/network/public/mojom/ct_log_info.mojom +--- chromium-77.0.3865.75/services/network/public/mojom/ct_log_info.mojom.certificate-transparency 2019-09-09 23:55:22.000000000 +0200 ++++ chromium-77.0.3865.75/services/network/public/mojom/ct_log_info.mojom 2019-09-12 16:09:52.824635180 +0200 @@ -4,6 +4,8 @@ module network.mojom; @@ -488,10 +488,10 @@ diff -up chromium-76.0.3809.132/services/network/public/mojom/ct_log_info.mojom. + // If the log is currently qualified, this will not be set. + mojo_base.mojom.TimeDelta? disqualified_at; }; -diff -up chromium-76.0.3809.132/services/network/public/mojom/network_context.mojom.certificate-transparency chromium-76.0.3809.132/services/network/public/mojom/network_context.mojom ---- chromium-76.0.3809.132/services/network/public/mojom/network_context.mojom.certificate-transparency 2019-08-26 21:02:33.000000000 +0200 -+++ chromium-76.0.3809.132/services/network/public/mojom/network_context.mojom 2019-09-03 22:08:28.936786554 +0200 -@@ -238,15 +238,6 @@ struct NetworkContextParams { +diff -up chromium-77.0.3865.75/services/network/public/mojom/network_context.mojom.certificate-transparency chromium-77.0.3865.75/services/network/public/mojom/network_context.mojom +--- chromium-77.0.3865.75/services/network/public/mojom/network_context.mojom.certificate-transparency 2019-09-09 23:55:22.000000000 +0200 ++++ chromium-77.0.3865.75/services/network/public/mojom/network_context.mojom 2019-09-12 16:09:52.825635192 +0200 +@@ -239,15 +239,6 @@ struct NetworkContextParams { [EnableIf=is_android] bool check_clear_text_permitted = false; @@ -507,7 +507,7 @@ diff -up chromium-76.0.3809.132/services/network/public/mojom/network_context.mo // Enables HTTP/0.9 on ports other than 80 for HTTP and 443 for HTTPS. bool http_09_on_non_default_ports_enabled = false; -@@ -299,6 +290,15 @@ struct NetworkContextParams { +@@ -300,6 +291,15 @@ struct NetworkContextParams { // servers, so they can discover misconfigurations. bool enable_certificate_reporting = false; @@ -523,7 +523,7 @@ diff -up chromium-76.0.3809.132/services/network/public/mojom/network_context.mo // Enables Expect CT reporting, which sends reports for opted-in sites that // don't serve sufficient Certificate Transparency information. [EnableIf=is_ct_supported] -@@ -310,6 +310,13 @@ struct NetworkContextParams { +@@ -311,6 +311,13 @@ struct NetworkContextParams { [EnableIf=is_ct_supported] array<CTLogInfo> ct_logs; diff --git a/chromium-77.0.3865.75-fedora-user-agent.patch b/chromium-77.0.3865.75-fedora-user-agent.patch new file mode 100644 index 0000000..8f6de51 --- /dev/null +++ b/chromium-77.0.3865.75-fedora-user-agent.patch @@ -0,0 +1,12 @@ +diff -up chromium-77.0.3865.75/content/common/user_agent.cc.fedora-user-agent chromium-77.0.3865.75/content/common/user_agent.cc +--- chromium-77.0.3865.75/content/common/user_agent.cc.fedora-user-agent 2019-09-12 15:49:11.902270729 +0200 ++++ chromium-77.0.3865.75/content/common/user_agent.cc 2019-09-12 15:50:11.555732044 +0200 +@@ -35,7 +35,7 @@ std::string GetUserAgentPlatform() { + #elif defined(OS_MACOSX) + return "Macintosh; "; + #elif defined(USE_X11) || defined(USE_OZONE) +- return "X11; "; // strange, but that's what Firefox uses ++ return "X11; Fedora; "; // strange, but that's what Firefox uses + #elif defined(OS_ANDROID) + return "Linux; "; + #elif defined(OS_POSIX) diff --git a/chromium-77.0.3865.75-fix-v8-gcc.patch b/chromium-77.0.3865.75-fix-v8-gcc.patch new file mode 100644 index 0000000..385778c --- /dev/null +++ b/chromium-77.0.3865.75-fix-v8-gcc.patch @@ -0,0 +1,14 @@ +diff -up chromium-77.0.3865.75/v8/src/objects/js-objects.cc.fix-v8-gcc chromium-77.0.3865.75/v8/src/objects/js-objects.cc +--- chromium-77.0.3865.75/v8/src/objects/js-objects.cc.fix-v8-gcc 2019-09-12 15:55:18.936238980 +0200 ++++ chromium-77.0.3865.75/v8/src/objects/js-objects.cc 2019-09-12 15:56:06.796645726 +0200 +@@ -3773,6 +3773,10 @@ Handle<NumberDictionary> CreateElementDi + return new_element_dictionary; + } + ++template void JSObject::ApplyAttributesToDictionary( ++ Isolate* isolate, ReadOnlyRoots roots, Handle<NumberDictionary> dictionary, ++ const PropertyAttributes attributes); ++ + template <PropertyAttributes attrs> + Maybe<bool> JSObject::PreventExtensionsWithTransition( + Handle<JSObject> object, ShouldThrow should_throw) { diff --git a/chromium-77.0.3865.75-gcc-no-opt-safe-math.patch b/chromium-77.0.3865.75-gcc-no-opt-safe-math.patch new file mode 100644 index 0000000..d342e2d --- /dev/null +++ b/chromium-77.0.3865.75-gcc-no-opt-safe-math.patch @@ -0,0 +1,13 @@ +diff -up chromium-77.0.3865.75/base/numerics/safe_math_shared_impl.h.nogccoptmath chromium-77.0.3865.75/base/numerics/safe_math_shared_impl.h +--- chromium-77.0.3865.75/base/numerics/safe_math_shared_impl.h.nogccoptmath 2019-09-12 09:55:13.041038765 +0200 ++++ chromium-77.0.3865.75/base/numerics/safe_math_shared_impl.h 2019-09-12 10:11:14.088101504 +0200 +@@ -24,8 +24,7 @@ + #elif !defined(__native_client__) && \ + ((defined(__clang__) && \ + ((__clang_major__ > 3) || \ +- (__clang_major__ == 3 && __clang_minor__ >= 4))) || \ +- (defined(__GNUC__) && __GNUC__ >= 5)) ++ (__clang_major__ == 3 && __clang_minor__ >= 4))) + #include "base/numerics/safe_math_clang_gcc_impl.h" + #define BASE_HAS_OPTIMIZED_SAFE_MATH (1) + #else diff --git a/chromium-77.0.3865.75-gcc5-r3.patch b/chromium-77.0.3865.75-gcc5-r3.patch new file mode 100644 index 0000000..34b858a --- /dev/null +++ b/chromium-77.0.3865.75-gcc5-r3.patch @@ -0,0 +1,36 @@ +diff -up chromium-77.0.3865.75/gpu/ipc/common/mailbox_struct_traits.h.gcc5-r3 chromium-77.0.3865.75/gpu/ipc/common/mailbox_struct_traits.h +--- chromium-77.0.3865.75/gpu/ipc/common/mailbox_struct_traits.h.gcc5-r3 2019-09-09 23:55:18.000000000 +0200 ++++ chromium-77.0.3865.75/gpu/ipc/common/mailbox_struct_traits.h 2019-09-12 10:13:16.710206500 +0200 +@@ -15,7 +15,7 @@ namespace mojo { + template <> + struct StructTraits<gpu::mojom::MailboxDataView, gpu::Mailbox> { + static base::span<const int8_t> name(const gpu::Mailbox& mailbox) { +- return mailbox.name; ++ return base::make_span(mailbox.name); + } + static bool Read(gpu::mojom::MailboxDataView data, gpu::Mailbox* out); + }; +diff -up chromium-77.0.3865.75/services/viz/public/cpp/compositing/quads_struct_traits.h.gcc5-r3 chromium-77.0.3865.75/services/viz/public/cpp/compositing/quads_struct_traits.h +--- chromium-77.0.3865.75/services/viz/public/cpp/compositing/quads_struct_traits.h.gcc5-r3 2019-09-09 23:55:23.000000000 +0200 ++++ chromium-77.0.3865.75/services/viz/public/cpp/compositing/quads_struct_traits.h 2019-09-12 10:13:16.710206500 +0200 +@@ -391,7 +391,7 @@ struct StructTraits<viz::mojom::TextureQ + static base::span<const float> vertex_opacity(const viz::DrawQuad& input) { + const viz::TextureDrawQuad* quad = + viz::TextureDrawQuad::MaterialCast(&input); +- return quad->vertex_opacity; ++ return base::make_span(quad->vertex_opacity); + } + + static bool y_flipped(const viz::DrawQuad& input) { +diff -up chromium-77.0.3865.75/third_party/webrtc/modules/audio_processing/aec3/aec_state.cc.gcc5-r3 chromium-77.0.3865.75/third_party/webrtc/modules/audio_processing/aec3/aec_state.cc +--- chromium-77.0.3865.75/third_party/webrtc/modules/audio_processing/aec3/aec_state.cc.gcc5-r3 2019-09-12 10:13:16.711206509 +0200 ++++ chromium-77.0.3865.75/third_party/webrtc/modules/audio_processing/aec3/aec_state.cc 2019-09-12 15:41:15.300158849 +0200 +@@ -10,7 +10,7 @@ + + #include "modules/audio_processing/aec3/aec_state.h" + +-#include <math.h> ++#include <cmath> + + #include <algorithm> + #include <numeric> diff --git a/chromium-77.0.3865.75-no-zlib-mangle.patch b/chromium-77.0.3865.75-no-zlib-mangle.patch new file mode 100644 index 0000000..c32d226 --- /dev/null +++ b/chromium-77.0.3865.75-no-zlib-mangle.patch @@ -0,0 +1,22 @@ +diff -up chromium-77.0.3865.75/third_party/zlib/zconf.h.nozmangle chromium-77.0.3865.75/third_party/zlib/zconf.h +--- chromium-77.0.3865.75/third_party/zlib/zconf.h.nozmangle 2019-09-12 09:36:37.924086850 +0200 ++++ chromium-77.0.3865.75/third_party/zlib/zconf.h 2019-09-12 09:53:01.623958551 +0200 +@@ -9,18 +9,6 @@ + #define ZCONF_H + + /* +- * This library is also built as a part of AOSP, which does not need to include +- * chromeconf.h. This config does not want chromeconf.h, so it can set this +- * macro to opt out. While this works today, there's no guarantee that building +- * zlib outside of Chromium keeps working in the future. +- */ +-#if !defined(CHROMIUM_ZLIB_NO_CHROMECONF) +-/* This include does prefixing as below, but with an updated set of names. Also +- * sets up export macros in component builds. */ +-#include "chromeconf.h" +-#endif +- +-/* + * If you *really* need a unique prefix for all types and library functions, + * compile with -DZ_PREFIX. The "standard" zlib should be compiled without it. + * Even better than compiling with -DZ_PREFIX would be to use configure to set diff --git a/chromium.spec b/chromium.spec index 1471b94..a2d54e4 100644 --- a/chromium.spec +++ b/chromium.spec @@ -168,14 +168,14 @@ BuildRequires: libicu-devel >= 5.4 %global chromoting_client_id %nil %endif -%global majorversion 76 +%global majorversion 77 %if %{freeworld} Name: chromium%{chromium_channel}%{?freeworld:-freeworld} %else Name: chromium%{chromium_channel} %endif -Version: %{majorversion}.0.3809.132 +Version: %{majorversion}.0.3865.75 Release: 2%{?dist} Summary: A WebKit (Blink) powered web browser Url: http://www.chromium.org/Home @@ -215,20 +215,20 @@ Patch16: chromium-60.0.3112.78-no-libpng-prefix.patch # Do not mangle libjpeg Patch17: chromium-60.0.3112.78-jpeg-nomangle.patch # Do not mangle zlib -Patch18: chromium-75.0.3770.80-no-zlib-mangle.patch +Patch18: chromium-77.0.3865.75-no-zlib-mangle.patch # Fix libavutil include pathing to find arch specific timer.h # For some reason, this only fails on aarch64. No idea why. Patch19: chromium-60.0.3112.113-libavutil-timer-include-path-fix.patch # from gentoo -Patch20: chromium-61.0.3163.79-gcc-no-opt-safe-math.patch +Patch20: chromium-77.0.3865.75-gcc-no-opt-safe-math.patch # From gentoo -Patch21: chromium-72.0.3626.121-gcc5-r3.patch +Patch21: chromium-77.0.3865.75-gcc5-r3.patch # To use round with gcc, you need to #include <cmath> Patch22: chromium-65.0.3325.146-gcc-round-fix.patch # Include proper headers to invoke memcpy() Patch23: chromium-65.0.3325.146-memcpy-fix.patch # ../../mojo/public/cpp/bindings/associated_interface_ptr_info.h:48:43: error: cannot convert 'const mojo::ScopedInterfaceEndpointHandle' to 'bool' in return -Patch24: chromium-68.0.3440.106-boolfix.patch +Patch24: chromium-77.0.3865.75-boolfix.patch # From Debian Patch25: chromium-71.0.3578.98-skia-aarch64-buildfix.patch # Do not use unrar code, it is non-free @@ -236,7 +236,7 @@ Patch27: chromium-73.0.3683.75-norar.patch # Upstream GCC fixes Patch28: chromium-66.0.3359.117-GCC-fully-declare-ConfigurationPolicyProvider.patch # Add "Fedora" to the user agent string -Patch29: chromium-72.0.3626.121-fedora-user-agent.patch +Patch29: chromium-77.0.3865.75-fedora-user-agent.patch # Try to fix version.py for Rawhide Patch30: chromium-71.0.3578.98-py2-bootstrap.patch # Fix default on redeclaration error @@ -264,43 +264,11 @@ Patch41: chromium-75.0.3770.80-SIOCGSTAMP.patch # Revert https://chromium.googlesource.com/chromium/src/+/daff6b66faae53a0cefb8898... # It might make clang happy but it breaks gcc. F*** clang. Patch43: chromium-75.0.3770.80-revert-daff6b.patch -# Avoid pure virtual crash destroying RenderProcessUserData -# https://chromium.googlesource.com/chromium/src/+/cdf306db81efaaaa95448758... -Patch44: chromium-75.0.3770.80-pure-virtual-crash-fix.patch # rename function to avoid conflict with rawhide glibc "gettid()" Patch45: chromium-75.0.3770.80-grpc-gettid-fix.patch # fix v8 compile with gcc # https://chromium.googlesource.com/v8/v8/+/3b8c624bda58d05aea80dd9626cd550... -Patch46: chromium-75.0.3770.100-fix-v8-gcc.patch -# Fix Vulkan compilation with gcc -# https://chromium.googlesource.com/chromium/src/+/fdb3bb1f8c41d044a5b0cb80... -Patch47: chromium-76.0.3809.100-gcc-vulkan.patch -# https://chromium-review.googlesource.com/c/chromium/src/+/1645297 -Patch48: chromium-76.0.3809.100-gcc-cc-no-except.patch -# https://chromium.googlesource.com/chromium/src.git/+/502e6e42633d2571c823... -Patch49: chromium-76.0.3809.100-gcc-net-fetcher.patch -# https://quiche.googlesource.com/quiche.git/+/9424add9d73432a794b794479025... -Patch50: chromium-76.0.3809.100-quiche-compile-fix.patch -# https://chromium.googlesource.com/chromium/src/+/53bb5a463ee956c70230eaa5... -Patch51: chromium-76.0.3809.100-throttling-dead-beef.patch -# https://chromium.googlesource.com/chromium/src/+/52b5ceac95b67491b1c71f0e... -Patch52: chromium-76.0.3809.132-gcc-ambigous-instantiation.patch -# https://chromium.googlesource.com/chromium/src.git/+/715cb38eac889625de0c... -Patch53: chromium-76.0.3809.100-weak-ptr-no-except.patch -# https://chromium.googlesource.com/chromium/src.git/+/c6afbd59c997c2b64f11... -Patch54: chromium-76.0.3809.100-gcc-feature-policy-parser.patch -# https://chromium.googlesource.com/chromium/src.git/+/cf6d6b40d711fce93a24... -Patch55: chromium-76.0.3809.100-gcc-hasfraction-constexpr.patch -# https://chromium.googlesource.com/chromium/src.git/+/dcb55fb8f18abe5f43d2... -Patch56: chromium-76.0.3809.100-gcc-move-explicit-initialization.patch -# https://chromium.googlesource.com/chromium/src.git/+/7dc76c8d9f4cfbce7cf1... -Patch57: chromium-76.0.3809.100-gcc-initialization-order.patch -# https://chromium.googlesource.com/chromium/src.git/+/138904af5d6a4158ef42... -Patch58: chromium-76.0.3809.100-gcc-history-move-noexcept.patch -# https://chromium.googlesource.com/chromium/src.git/+/bdc24128b75008743d81... -Patch59: chromium-76.0.3809.100-gcc-accountinfo-move-noexcept.patch -# https://chromium.googlesource.com/chromium/src.git/+/5d7f227fa844e79568df... -Patch60: chromium-76.0.3809.100-gcc-themeservice-includes.patch +Patch46: chromium-77.0.3865.75-fix-v8-gcc.patch # In GCC one can't use alignas() for exported classes # https://chromium.googlesource.com/chromium/src.git/+/8148fd96ae04a1150a9c... Patch61: chromium-76.0.3809.100-gcc-no-alignas-and-export.patch @@ -309,7 +277,7 @@ Patch62: chromium-76.0.3809.100-gcc-remoting-constexpr.patch # Needs to be submitted.. (ugly hack, needs to be added properly to GN files) Patch63: chromium-76.0.3809.100-vtable-symbol-undefined.patch # https://chromium.googlesource.com/chromium/src.git/+/3c9720245e440c4b7222... -Patch64: chromium-76.0.3809.132-certificate-transparency.patch +Patch64: chromium-77.0.3865.75-certificate-transparency.patch # Apply these changes to work around EPEL7 compiler issues Patch100: chromium-62.0.3202.62-kmaxskip-constexpr.patch @@ -855,7 +823,7 @@ udev. %patch22 -p1 -b .gcc-round-fix %patch23 -p1 -b .memcpyfix %patch24 -p1 -b .boolfix -%patch25 -p1 -b .aarch64fix +#%patch25 -p1 -b .aarch64fix %patch27 -p1 -b .nounrar %patch28 -p1 -b .gcc-cpolicyprovider %patch29 -p1 -b .fedora-user-agent @@ -870,23 +838,8 @@ udev. %patch38 -p1 -b .disable-ndnpc %patch41 -p1 -b .SIOCGSTAMP %patch43 -p1 -b .revert-daff6b -%patch44 -p1 -b .pure-virtual-fix %patch45 -p1 -b .gettid-fix %patch46 -p1 -b .fix-v8-gcc -%patch47 -p1 -b .gcc-vulkan -%patch48 -p1 -b .gcc-cc-no-except -%patch49 -p1 -b .gcc-net-fetcher -%patch50 -p1 -b .quiche-compile-fix -%patch51 -p1 -b .throttling-dead-beef -%patch52 -p1 -b .gcc-ambigous-instantiation -%patch53 -p1 -b .weak-ptr-no-except -%patch54 -p1 -b .gcc-feature-policy-parser -%patch55 -p1 -b .gcc-hasfraction-constexpr -%patch56 -p1 -b .gcc-move-explicit-initialization -%patch57 -p1 -b .gcc-initialization-order -%patch58 -p1 -b .gcc-history-move-noexcept -%patch59 -p1 -b .gcc-accountinfo-move-noexcept -%patch60 -p1 -b .gcc-themeservice-includes %patch61 -p1 -b .gcc-no-alignas-and-export %patch62 -p1 -b .gcc-remoting-constexpr %patch63 -p1 -b .vtable-symbol-undefined @@ -1477,6 +1430,7 @@ sed -i.orig -e 's/getenv("CHROME_VERSION_EXTRA")/"Fedora Project"/' $FILE . /opt/rh/devtoolset-%{dts_version}/enable %endif +echo # Now do the full browser %if 0%{freeworld} ../depot_tools/ninja -C %{target} -vvv media diff --git a/sources b/sources index 2d38a7c..a1d28bf 100644 --- a/sources +++ b/sources @@ -17,4 +17,4 @@ SHA512 (Tinos-Italic.ttf) = d4f4f096110ef98a781a2a0e0d319317e5f84e650fe6f4d4f6b0 SHA512 (Tinos-Regular.ttf) = 58085c5dac6d067d60ba2ab3220c4a0cc1efcf279cadfcfb8746a5e5fa1a6f6daa62750dc2051b3b2d8a51b4d2e9bb0f66594caf2253c0870ed9c7286fa45e8f SHA512 (Ahem.ttf) = aeb64b10ab9c87860714cb60b4900254b13dc52c51319256a1a3722c882026ab7c616bf628fbc2fe14e38a6003f3a481af60b52a7ed62071d28ddaf428e4e3fd SHA512 (node-v8.9.1-linux-x64.tar.gz) = a707fd4567041c56e7f9d415e505e3fa650627f31def7fefdd7ec50f9e7066bb33332b67f479e1159d85e1105a7e6d034aad7429f4f3d034c9161170d7e0b844 -SHA512 (chromium-76.0.3809.132-clean.tar.xz) = fbc5f989945adfaffb9fb5199ccb988accdc53f41a03bba9c4ab3df8585b9267b1f34cd7a6ac487eff34ebb6e65865e32ceea4ad945eec30f871d8eed41f3e6f +SHA512 (chromium-77.0.3865.75-clean.tar.xz) = 9531e5d533bf305bd82ae2dbc7bf1a9e081377b61a5611f4bfa14ed389f94d106e26a9981771ed11697ca9c2490eb24c69e992fd907de241698c89a6131db0b6

5 years, 5 months

1
0
0 / 0

[chromium-libs-media-freeworld: 236/259] More fixes to a backported patch for certificate transparency

by Nicolas Chauvet

commit f341b670a040a236cc836e45e0de0e9e3361cb50 Author: Tomas Popela <tpopela(a)redhat.com> Date: Wed Sep 4 10:48:30 2019 +0200 More fixes to a backported patch for certificate transparency ...um-76.0.3809.132-certificate-transparency.patch | 413 +++++++++++++++++++-- 1 file changed, 373 insertions(+), 40 deletions(-) --- diff --git a/chromium-76.0.3809.132-certificate-transparency.patch b/chromium-76.0.3809.132-certificate-transparency.patch index 51937e0..8bfbced 100644 --- a/chromium-76.0.3809.132-certificate-transparency.patch +++ b/chromium-76.0.3809.132-certificate-transparency.patch @@ -1,6 +1,73 @@ +diff -up chromium-76.0.3809.132/chrome/browser/net/system_network_context_manager_browsertest.cc.certificate-transparency chromium-76.0.3809.132/chrome/browser/net/system_network_context_manager_browsertest.cc +--- chromium-76.0.3809.132/chrome/browser/net/system_network_context_manager_browsertest.cc.certificate-transparency 2019-09-03 22:08:28.931786496 +0200 ++++ chromium-76.0.3809.132/chrome/browser/net/system_network_context_manager_browsertest.cc 2019-09-03 22:15:24.743555759 +0200 +@@ -17,6 +17,7 @@ + #include "chrome/common/pref_names.h" + #include "chrome/test/base/in_process_browser_test.h" + #include "components/prefs/pref_service.h" ++#include "services/network/public/cpp/network_service_buildflags.h" + #include "services/network/public/mojom/network_context.mojom.h" + #include "services/network/public/mojom/network_service.mojom.h" + #include "testing/gmock/include/gmock/gmock.h" +@@ -297,3 +298,55 @@ IN_PROC_BROWSER_TEST_P(SystemNetworkCont + INSTANTIATE_TEST_SUITE_P(, + SystemNetworkContextManagerStubResolverBrowsertest, + ::testing::Values(false, true)); ++ ++class SystemNetworkContextManagerCertificateTransparencyBrowsertest ++ : public SystemNetworkContextManagerBrowsertest, ++ public testing::WithParamInterface<base::Optional<bool>> { ++ public: ++ SystemNetworkContextManagerCertificateTransparencyBrowsertest() { ++ SystemNetworkContextManager::SetEnableCertificateTransparencyForTesting( ++ GetParam()); ++ } ++ ~SystemNetworkContextManagerCertificateTransparencyBrowsertest() override { ++ SystemNetworkContextManager::SetEnableCertificateTransparencyForTesting( ++ base::nullopt); ++ } ++}; ++ ++#if BUILDFLAG(IS_CT_SUPPORTED) ++IN_PROC_BROWSER_TEST_P( ++ SystemNetworkContextManagerCertificateTransparencyBrowsertest, ++ CertificateTransparencyConfig) { ++ network::mojom::NetworkContextParamsPtr context_params = ++ g_browser_process->system_network_context_manager() ++ ->CreateDefaultNetworkContextParams(); ++ ++ const bool kDefault = ++#if defined(GOOGLE_CHROME_BUILD) && defined(OFFICIAL_BUILD) && \ ++ !defined(OS_ANDROID) ++ true; ++#else ++ false; ++#endif ++ ++ EXPECT_EQ(GetParam().value_or(kDefault), ++ context_params->enforce_chrome_ct_policy); ++ EXPECT_NE(GetParam().value_or(kDefault), context_params->ct_logs.empty()); ++ ++ if (GetParam().value_or(kDefault)) { ++ bool has_google_log = false; ++ bool has_disqualified_log = false; ++ for (const auto& ct_log : context_params->ct_logs) { ++ has_google_log |= ct_log->operated_by_google; ++ has_disqualified_log |= ct_log->disqualified_at.has_value(); ++ } ++ EXPECT_TRUE(has_google_log); ++ EXPECT_TRUE(has_disqualified_log); ++ } ++} ++#endif ++ ++INSTANTIATE_TEST_SUITE_P( ++ , ++ SystemNetworkContextManagerCertificateTransparencyBrowsertest, ++ ::testing::Values(base::nullopt, true, false)); diff -up chromium-76.0.3809.132/chrome/browser/net/system_network_context_manager.cc.certificate-transparency chromium-76.0.3809.132/chrome/browser/net/system_network_context_manager.cc --- chromium-76.0.3809.132/chrome/browser/net/system_network_context_manager.cc.certificate-transparency 2019-08-26 21:02:05.000000000 +0200 -+++ chromium-76.0.3809.132/chrome/browser/net/system_network_context_manager.cc 2019-09-03 12:01:33.004949320 +0200 ++++ chromium-76.0.3809.132/chrome/browser/net/system_network_context_manager.cc 2019-09-03 22:13:26.451198970 +0200 @@ -4,11 +4,13 @@ #include "chrome/browser/net/system_network_context_manager.h" @@ -23,52 +90,205 @@ diff -up chromium-76.0.3809.132/chrome/browser/net/system_network_context_manage #include "mojo/public/cpp/bindings/associated_interface_ptr.h" #include "net/dns/public/util.h" #include "net/net_buildflags.h" -@@ -686,15 +689,41 @@ SystemNetworkContextManager::CreateDefau +@@ -81,6 +84,20 @@ + + namespace { + ++constexpr bool kCertificateTransparencyEnabled = ++#if defined(GOOGLE_CHROME_BUILD) && defined(OFFICIAL_BUILD) && \ ++ !defined(OS_ANDROID) ++ // Certificate Transparency is only enabled if: ++ // - Desktop (!OS_ANDROID); OS_IOS does not use this file ++ // - base::GetBuildTime() is deterministic to the source (OFFICIAL_BUILD) ++ // - The build in reliably updatable (GOOGLE_CHROME_BUILD) ++ true; ++#else ++ false; ++#endif ++ ++bool g_enable_certificate_transparency = kCertificateTransparencyEnabled; ++ + // The global instance of the SystemNetworkContextmanager. + SystemNetworkContextManager* g_system_network_context_manager = nullptr; + +@@ -686,14 +703,35 @@ SystemNetworkContextManager::CreateDefau bool http_09_on_non_default_ports_enabled = false; #if !defined(OS_ANDROID) - // CT is only enabled on Desktop platforms for now. +- network_context_params->enforce_chrome_ct_policy = true; +- for (const auto& ct_log : certificate_transparency::GetKnownLogs()) { +- // TODO(rsleevi): https://crbug.com/702062 - Remove this duplication. +- network::mojom::CTLogInfoPtr log_info = network::mojom::CTLogInfo::New(); +- log_info->public_key = std::string(ct_log.log_key, ct_log.log_key_length); +- log_info->name = ct_log.log_name; +- network_context_params->ct_logs.push_back(std::move(log_info)); ++ ++ if (g_enable_certificate_transparency) { ++ network_context_params->enforce_chrome_ct_policy = true; ++ network_context_params->ct_log_update_time = base::GetBuildTime(); + -+#if BUILDFLAG(GOOGLE_CHROME_BRANDING) && defined(OFFICIAL_BUILD) && \ -+ !defined(OS_IOS) -+ // Certificate Transparency is only enabled if: -+ // - Desktop (!OS_ANDROID, !OS_IOS) -+ // - base::GetBuildTime() is deterministic to the source (OFFICIAL_BUILD) -+ // - The build in reliably updatable (GOOGLE_CHROME_BRANDING) - network_context_params->enforce_chrome_ct_policy = true; -+ network_context_params->ct_log_update_time = base::GetBuildTime(); -+ -+ std::vector<std::string> operated_by_google_logs = -+ certificate_transparency::GetLogsOperatedByGoogle(); -+ std::vector<std::pair<std::string, base::TimeDelta>> disqualified_logs = -+ certificate_transparency::GetDisqualifiedLogs(); - for (const auto& ct_log : certificate_transparency::GetKnownLogs()) { - // TODO(rsleevi): https://crbug.com/702062 - Remove this duplication. - network::mojom::CTLogInfoPtr log_info = network::mojom::CTLogInfo::New(); - log_info->public_key = std::string(ct_log.log_key, ct_log.log_key_length); - log_info->name = ct_log.log_name; -+ -+ std::string log_id = crypto::SHA256HashString(log_info->public_key); -+ log_info->operated_by_google = -+ std::binary_search(std::begin(operated_by_google_logs), -+ std::end(operated_by_google_logs), log_id); -+ auto it = std::lower_bound( -+ std::begin(disqualified_logs), std::end(disqualified_logs), log_id, -+ [](const auto& disqualified_log, const std::string& log_id) { -+ return disqualified_log.first < log_id; -+ }); -+ if (it != std::end(disqualified_logs) && it->first == log_id) { -+ log_info->disqualified_at = it->second; ++ std::vector<std::string> operated_by_google_logs = ++ certificate_transparency::GetLogsOperatedByGoogle(); ++ std::vector<std::pair<std::string, base::TimeDelta>> disqualified_logs = ++ certificate_transparency::GetDisqualifiedLogs(); ++ for (const auto& ct_log : certificate_transparency::GetKnownLogs()) { ++ // TODO(rsleevi): https://crbug.com/702062 - Remove this duplication. ++ network::mojom::CTLogInfoPtr log_info = network::mojom::CTLogInfo::New(); ++ log_info->public_key = std::string(ct_log.log_key, ct_log.log_key_length); ++ log_info->name = ct_log.log_name; ++ ++ std::string log_id = crypto::SHA256HashString(log_info->public_key); ++ log_info->operated_by_google = ++ std::binary_search(std::begin(operated_by_google_logs), ++ std::end(operated_by_google_logs), log_id); ++ auto it = std::lower_bound( ++ std::begin(disqualified_logs), std::end(disqualified_logs), log_id, ++ [](const auto& disqualified_log, const std::string& log_id) { ++ return disqualified_log.first < log_id; ++ }); ++ if (it != std::end(disqualified_logs) && it->first == log_id) { ++ log_info->disqualified_at = it->second; ++ } ++ network_context_params->ct_logs.push_back(std::move(log_info)); + } - network_context_params->ct_logs.push_back(std::move(log_info)); } -+#endif const base::Value* value = - g_browser_process->policy_service() +@@ -756,6 +794,12 @@ SystemNetworkContextManager::GetHttpAuth + return CreateHttpAuthDynamicParams(g_browser_process->local_state()); + } + ++void SystemNetworkContextManager::SetEnableCertificateTransparencyForTesting( ++ base::Optional<bool> enabled) { ++ g_enable_certificate_transparency = ++ enabled.value_or(kCertificateTransparencyEnabled); ++} ++ + network::mojom::NetworkContextParamsPtr + SystemNetworkContextManager::CreateNetworkContextParams() { + // TODO(mmenke): Set up parameters here (in memory cookie store, etc). +diff -up chromium-76.0.3809.132/chrome/browser/net/system_network_context_manager.h.certificate-transparency chromium-76.0.3809.132/chrome/browser/net/system_network_context_manager.h +--- chromium-76.0.3809.132/chrome/browser/net/system_network_context_manager.h.certificate-transparency 2019-08-26 21:02:05.000000000 +0200 ++++ chromium-76.0.3809.132/chrome/browser/net/system_network_context_manager.h 2019-09-03 22:08:28.931786496 +0200 +@@ -158,6 +158,12 @@ class SystemNetworkContextManager { + static network::mojom::HttpAuthDynamicParamsPtr + GetHttpAuthDynamicParamsForTesting(); + ++ // Enables Certificate Transparency and enforcing the Chrome Certificate ++ // Transparency Policy. For test use only. Use base::nullopt_t to reset to ++ // the default state. ++ static void SetEnableCertificateTransparencyForTesting( ++ base::Optional<bool> enabled); ++ + private: + class URLLoaderFactoryForSystem; + +diff -up chromium-76.0.3809.132/chrome/browser/policy/policy_browsertest.cc.certificate-transparency chromium-76.0.3809.132/chrome/browser/policy/policy_browsertest.cc +--- chromium-76.0.3809.132/chrome/browser/policy/policy_browsertest.cc.certificate-transparency 2019-08-26 21:02:05.000000000 +0200 ++++ chromium-76.0.3809.132/chrome/browser/policy/policy_browsertest.cc 2019-09-03 22:08:28.932786508 +0200 +@@ -4834,7 +4834,7 @@ IN_PROC_BROWSER_TEST_P(SSLPolicyTestComm + browser()->tab_strip_model()->GetActiveWebContents()->GetTitle()); + } + +-IN_PROC_BROWSER_TEST_F(PolicyTest, ++IN_PROC_BROWSER_TEST_F(CertificateTransparencyPolicyTest, + CertificateTransparencyEnforcementDisabledForCas) { + net::EmbeddedTestServer https_server_ok(net::EmbeddedTestServer::TYPE_HTTPS); + https_server_ok.SetSSLConfig(net::EmbeddedTestServer::CERT_OK); +diff -up chromium-76.0.3809.132/chrome/browser/ssl/chrome_expect_ct_reporter_browsertest.cc.certificate-transparency chromium-76.0.3809.132/chrome/browser/ssl/chrome_expect_ct_reporter_browsertest.cc +--- chromium-76.0.3809.132/chrome/browser/ssl/chrome_expect_ct_reporter_browsertest.cc.certificate-transparency 2019-08-26 21:02:07.000000000 +0200 ++++ chromium-76.0.3809.132/chrome/browser/ssl/chrome_expect_ct_reporter_browsertest.cc 2019-09-03 22:08:28.932786508 +0200 +@@ -8,6 +8,7 @@ + #include "base/callback.h" + #include "base/run_loop.h" + #include "base/test/scoped_feature_list.h" ++#include "chrome/browser/net/system_network_context_manager.h" + #include "chrome/browser/profiles/profile.h" + #include "chrome/browser/ssl/cert_verifier_browser_test.h" + #include "chrome/browser/ui/browser.h" +@@ -27,7 +28,17 @@ namespace { + // received by a server. + class ExpectCTBrowserTest : public CertVerifierBrowserTest { + public: +- ExpectCTBrowserTest() : CertVerifierBrowserTest() {} ++ ExpectCTBrowserTest() : CertVerifierBrowserTest() { ++ // Expect-CT reporting depends on actually enforcing Certificate ++ // Transparency. ++ SystemNetworkContextManager::SetEnableCertificateTransparencyForTesting( ++ true); ++ } ++ ++ ~ExpectCTBrowserTest() override { ++ SystemNetworkContextManager::SetEnableCertificateTransparencyForTesting( ++ base::nullopt); ++ } + + void SetUpOnMainThread() override { + run_loop_ = std::make_unique<base::RunLoop>(); +diff -up chromium-76.0.3809.132/chrome/browser/ssl/security_state_tab_helper_browsertest.cc.certificate-transparency chromium-76.0.3809.132/chrome/browser/ssl/security_state_tab_helper_browsertest.cc +--- chromium-76.0.3809.132/chrome/browser/ssl/security_state_tab_helper_browsertest.cc.certificate-transparency 2019-08-26 21:02:07.000000000 +0200 ++++ chromium-76.0.3809.132/chrome/browser/ssl/security_state_tab_helper_browsertest.cc 2019-09-03 22:08:28.932786508 +0200 +@@ -457,6 +457,13 @@ class SecurityStateTabHelperTest : publi + SecurityStateTabHelperTest() + : https_server_(net::EmbeddedTestServer::TYPE_HTTPS) { + https_server_.ServeFilesFromSourceDirectory(GetChromeTestDataDir()); ++ SystemNetworkContextManager::SetEnableCertificateTransparencyForTesting( ++ true); ++ } ++ ++ ~SecurityStateTabHelperTest() override { ++ SystemNetworkContextManager::SetEnableCertificateTransparencyForTesting( ++ base::nullopt); + } + + void SetUpOnMainThread() override { +diff -up chromium-76.0.3809.132/chrome/browser/ssl/ssl_browsertest.cc.certificate-transparency chromium-76.0.3809.132/chrome/browser/ssl/ssl_browsertest.cc +--- chromium-76.0.3809.132/chrome/browser/ssl/ssl_browsertest.cc.certificate-transparency 2019-08-26 21:02:07.000000000 +0200 ++++ chromium-76.0.3809.132/chrome/browser/ssl/ssl_browsertest.cc 2019-09-03 22:08:28.934786531 +0200 +@@ -2008,8 +2008,14 @@ class CertificateTransparencySSLUITest : + public: + CertificateTransparencySSLUITest() + : CertVerifierBrowserTest(), +- https_server_(net::EmbeddedTestServer::TYPE_HTTPS) {} +- ~CertificateTransparencySSLUITest() override {} ++ https_server_(net::EmbeddedTestServer::TYPE_HTTPS) { ++ SystemNetworkContextManager::SetEnableCertificateTransparencyForTesting( ++ true); ++ } ++ ~CertificateTransparencySSLUITest() override { ++ SystemNetworkContextManager::SetEnableCertificateTransparencyForTesting( ++ base::nullopt); ++ } + + void SetUpOnMainThread() override { + CertVerifierBrowserTest::SetUpOnMainThread(); +diff -up chromium-76.0.3809.132/components/certificate_transparency/chrome_ct_policy_enforcer.h.certificate-transparency chromium-76.0.3809.132/components/certificate_transparency/chrome_ct_policy_enforcer.h +--- chromium-76.0.3809.132/components/certificate_transparency/chrome_ct_policy_enforcer.h.certificate-transparency 2019-08-26 21:02:14.000000000 +0200 ++++ chromium-76.0.3809.132/components/certificate_transparency/chrome_ct_policy_enforcer.h 2019-09-03 22:08:28.934786531 +0200 +@@ -45,6 +45,19 @@ class ChromeCTPolicyEnforcer : public ne + + void SetClockForTesting(const base::Clock* clock) { clock_ = clock; } + ++ // TODO(https://crbug.com/999240): These are exposed to allow end-to-end ++ // testing by higher layers (i.e. that the ChromeCTPolicyEnforcer is ++ // correctly constructed). When either this issue or https://crbug.com/848277 ++ // are fixed, the configuration can be tested independently, and these can ++ // be removed. ++ const std::vector<std::string>& operated_by_google_logs_for_testing() { ++ return operated_by_google_logs_; ++ } ++ const std::vector<std::pair<std::string, base::TimeDelta>>& ++ disqualified_logs_for_testing() { ++ return disqualified_logs_; ++ } ++ + private: + // Returns true if the log identified by |log_id| (the SHA-256 hash of the + // log's DER-encoded SPKI) has been disqualified, and sets diff -up chromium-76.0.3809.132/services/network/network_context.cc.certificate-transparency chromium-76.0.3809.132/services/network/network_context.cc --- chromium-76.0.3809.132/services/network/network_context.cc.certificate-transparency 2019-08-26 21:02:33.000000000 +0200 -+++ chromium-76.0.3809.132/services/network/network_context.cc 2019-09-03 12:04:01.983890928 +0200 ++++ chromium-76.0.3809.132/services/network/network_context.cc 2019-09-03 22:17:27.977834857 +0200 @@ -35,6 +35,7 @@ #include "components/prefs/pref_registry_simple.h" #include "components/prefs/pref_service.h" @@ -115,12 +335,16 @@ diff -up chromium-76.0.3809.132/services/network/network_context.cc.certificate- scoped_refptr<const net::CTLogVerifier> log_verifier = net::CTLogVerifier::Create(log->public_key, log->name); if (!log_verifier) { -@@ -1924,6 +1927,13 @@ URLRequestContextOwner NetworkContext::A +@@ -1924,6 +1927,17 @@ URLRequestContextOwner NetworkContext::A ct_verifier->AddLogs(ct_logs); builder->set_ct_verifier(std::move(ct_verifier)); } + + if (params_->enforce_chrome_ct_policy) { ++ std::sort(std::begin(operated_by_google_logs), ++ std::end(operated_by_google_logs)); ++ std::sort(std::begin(disqualified_logs), std::end(disqualified_logs)); ++ + builder->set_ct_policy_enforcer( + std::make_unique<certificate_transparency::ChromeCTPolicyEnforcer>( + params_->ct_log_update_time, disqualified_logs, @@ -129,9 +353,118 @@ diff -up chromium-76.0.3809.132/services/network/network_context.cc.certificate- #endif // BUILDFLAG(IS_CT_SUPPORTED) const base::CommandLine* command_line = +diff -up chromium-76.0.3809.132/services/network/network_context_unittest.cc.certificate-transparency chromium-76.0.3809.132/services/network/network_context_unittest.cc +--- chromium-76.0.3809.132/services/network/network_context_unittest.cc.certificate-transparency 2019-08-26 21:02:33.000000000 +0200 ++++ chromium-76.0.3809.132/services/network/network_context_unittest.cc 2019-09-03 22:20:22.382888089 +0200 +@@ -2,6 +2,7 @@ + // Use of this source code is governed by a BSD-style license that can be + // found in the LICENSE file. + ++#include <algorithm> + #include <map> + #include <memory> + #include <string> +@@ -38,10 +39,12 @@ + #include "base/threading/thread_task_runner_handle.h" + #include "base/time/default_clock.h" + #include "base/time/default_tick_clock.h" ++#include "base/time/time.h" + #include "build/build_config.h" + #include "components/network_session_configurator/browser/network_session_configurator.h" + #include "components/network_session_configurator/common/network_switches.h" + #include "components/prefs/testing_pref_service.h" ++#include "crypto/sha2.h" + #include "mojo/public/cpp/bindings/interface_request.h" + #include "mojo/public/cpp/bindings/strong_binding.h" + #include "mojo/public/cpp/system/data_pipe_utils.h" +@@ -113,6 +116,11 @@ + #include "url/scheme_host_port.h" + #include "url/url_constants.h" + ++#if BUILDFLAG(IS_CT_SUPPORTED) ++#include "components/certificate_transparency/chrome_ct_policy_enforcer.h" ++#include "services/network/public/mojom/ct_log_info.mojom.h" ++#endif ++ + #if BUILDFLAG(ENABLE_REPORTING) + #include "net/network_error_logging/network_error_logging_service.h" + #include "net/reporting/reporting_cache.h" +@@ -5566,6 +5574,72 @@ TEST_F(NetworkContextTest, BlockAllCooki + EXPECT_EQ("None", response_body); + } + ++#if BUILDFLAG(IS_CT_SUPPORTED) ++TEST_F(NetworkContextTest, CertificateTransparencyConfig) { ++ mojom::NetworkContextParamsPtr params = CreateContextParams(); ++ params->enforce_chrome_ct_policy = true; ++ params->ct_log_update_time = base::Time::Now(); ++ ++ // The log public keys do not matter for the test, so invalid keys are used. ++ // However, because the log IDs are derived from the SHA-256 hash of the log ++ // key, the log keys are generated such that qualified logs are in the form ++ // of four digits (e.g. "0000", "1111"), while disqualified logs are in the ++ // form of four letters (e.g. "AAAA", "BBBB"). ++ ++ for (int i = 0; i < 6; ++i) { ++ network::mojom::CTLogInfoPtr log_info = network::mojom::CTLogInfo::New(); ++ // Shift to ASCII '0' (0x30) ++ log_info->public_key = std::string(4, 0x30 + static_cast<char>(i)); ++ log_info->name = std::string(4, 0x30 + static_cast<char>(i)); ++ log_info->operated_by_google = i % 2; ++ ++ params->ct_logs.push_back(std::move(log_info)); ++ } ++ for (int i = 0; i < 3; ++i) { ++ network::mojom::CTLogInfoPtr log_info = network::mojom::CTLogInfo::New(); ++ // Shift to ASCII 'A' (0x41) ++ log_info->public_key = std::string(4, 0x41 + static_cast<char>(i)); ++ log_info->name = std::string(4, 0x41 + static_cast<char>(i)); ++ log_info->operated_by_google = false; ++ log_info->disqualified_at = base::TimeDelta::FromSeconds(i); ++ ++ params->ct_logs.push_back(std::move(log_info)); ++ } ++ std::unique_ptr<NetworkContext> network_context = ++ CreateContextWithParams(std::move(params)); ++ ++ net::CTPolicyEnforcer* request_enforcer = ++ network_context->url_request_context()->ct_policy_enforcer(); ++ ASSERT_TRUE(request_enforcer); ++ ++ // Completely unsafe if |enforce_chrome_ct_policy| is false. ++ certificate_transparency::ChromeCTPolicyEnforcer* policy_enforcer = ++ reinterpret_cast<certificate_transparency::ChromeCTPolicyEnforcer*>( ++ request_enforcer); ++ ++ EXPECT_TRUE(std::is_sorted( ++ policy_enforcer->operated_by_google_logs_for_testing().begin(), ++ policy_enforcer->operated_by_google_logs_for_testing().end())); ++ EXPECT_TRUE( ++ std::is_sorted(policy_enforcer->disqualified_logs_for_testing().begin(), ++ policy_enforcer->disqualified_logs_for_testing().end())); ++ ++ EXPECT_THAT( ++ policy_enforcer->operated_by_google_logs_for_testing(), ++ ::testing::UnorderedElementsAreArray({crypto::SHA256HashString("1111"), ++ crypto::SHA256HashString("3333"), ++ crypto::SHA256HashString("5555")})); ++ EXPECT_THAT(policy_enforcer->disqualified_logs_for_testing(), ++ ::testing::UnorderedElementsAre( ++ ::testing::Pair(crypto::SHA256HashString("AAAA"), ++ base::TimeDelta::FromSeconds(0)), ++ ::testing::Pair(crypto::SHA256HashString("BBBB"), ++ base::TimeDelta::FromSeconds(1)), ++ ::testing::Pair(crypto::SHA256HashString("CCCC"), ++ base::TimeDelta::FromSeconds(2)))); ++} ++#endif ++ + } // namespace + + } // namespace network diff -up chromium-76.0.3809.132/services/network/public/mojom/ct_log_info.mojom.certificate-transparency chromium-76.0.3809.132/services/network/public/mojom/ct_log_info.mojom --- chromium-76.0.3809.132/services/network/public/mojom/ct_log_info.mojom.certificate-transparency 2019-08-26 21:02:33.000000000 +0200 -+++ chromium-76.0.3809.132/services/network/public/mojom/ct_log_info.mojom 2019-09-03 11:59:48.423862022 +0200 ++++ chromium-76.0.3809.132/services/network/public/mojom/ct_log_info.mojom 2019-09-03 22:08:28.936786554 +0200 @@ -4,6 +4,8 @@ module network.mojom; @@ -148,7 +481,7 @@ diff -up chromium-76.0.3809.132/services/network/public/mojom/ct_log_info.mojom. + + // Whether or not the log should should be considered a Google Log for the + // purposes of enforcing the "Certificate Transparency in Chrome" policy. -+ bool operated_by_google; ++ bool operated_by_google = false; + + // If set, the time since the Unix Epoch when the log was disqualified. This + // is used to determine the "once or currently qualified" status of the log. @@ -157,7 +490,7 @@ diff -up chromium-76.0.3809.132/services/network/public/mojom/ct_log_info.mojom. }; diff -up chromium-76.0.3809.132/services/network/public/mojom/network_context.mojom.certificate-transparency chromium-76.0.3809.132/services/network/public/mojom/network_context.mojom --- chromium-76.0.3809.132/services/network/public/mojom/network_context.mojom.certificate-transparency 2019-08-26 21:02:33.000000000 +0200 -+++ chromium-76.0.3809.132/services/network/public/mojom/network_context.mojom 2019-09-03 11:59:48.424862032 +0200 ++++ chromium-76.0.3809.132/services/network/public/mojom/network_context.mojom 2019-09-03 22:08:28.936786554 +0200 @@ -238,15 +238,6 @@ struct NetworkContextParams { [EnableIf=is_android] bool check_clear_text_permitted = false;

5 years, 5 months

1
0
0 / 0

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

rpmfusion-commits September 2019