commit 197955041f7593e93720f10fcc164f0392348d5d Author: Tom Callaway <spot(a)fedoraproject.org&gt; Date: Fri Sep 9 09:09:13 2016 -0400 53.0.2785.101 .gitignore | 1 + chromium-53.0.2785.101-crrev-415028.patch | 142 ++++++++++++++++++++++++++++++ chromium.spec | 16 +++- sources | 2 +- 4 files changed, 156 insertions(+), 5 deletions(-) --- diff --git a/.gitignore b/.gitignore index 68c0030..e5acd24 100644 --- a/.gitignore +++ b/.gitignore @@ -4,3 +4,4 @@ /chromium-52.0.2743.82-clean.tar.xz /chromium-52.0.2743.116-clean.tar.xz /chromium-53.0.2785.92-clean.tar.xz +/chromium-53.0.2785.101-clean.tar.xz diff --git a/chromium-53.0.2785.101-crrev-415028.patch b/chromium-53.0.2785.101-crrev-415028.patch new file mode 100644 index 0000000..11b60f4 --- /dev/null +++ b/chromium-53.0.2785.101-crrev-415028.patch @@ -0,0 +1,142 @@ +diff -up chromium-53.0.2785.101/sandbox/linux/BUILD.gn.415208 chromium-53.0.2785.101/sandbox/linux/BUILD.gn +--- chromium-53.0.2785.101/sandbox/linux/BUILD.gn.415208 2016-09-08 10:22:07.702555383 -0400 ++++ chromium-53.0.2785.101/sandbox/linux/BUILD.gn 2016-09-08 10:23:26.190044992 -0400 +@@ -41,10 +41,7 @@ group("sandbox") { + public_deps += [ ":suid_sandbox_client" ] + } + if (use_seccomp_bpf || is_nacl_nonsfi) { +- public_deps += [ +- ":seccomp_bpf", +- ":seccomp_bpf_helpers", +- ] ++ public_deps += [ ":seccomp_bpf" ] + } + } + +@@ -221,6 +218,14 @@ component("seccomp_bpf") { + "bpf_dsl/syscall_set.cc", + "bpf_dsl/syscall_set.h", + "bpf_dsl/trap_registry.h", ++ "seccomp-bpf-helpers/baseline_policy.cc", ++ "seccomp-bpf-helpers/baseline_policy.h", ++ "seccomp-bpf-helpers/sigsys_handlers.cc", ++ "seccomp-bpf-helpers/sigsys_handlers.h", ++ "seccomp-bpf-helpers/syscall_parameters_restrictions.cc", ++ "seccomp-bpf-helpers/syscall_parameters_restrictions.h", ++ "seccomp-bpf-helpers/syscall_sets.cc", ++ "seccomp-bpf-helpers/syscall_sets.h", + "seccomp-bpf/die.cc", + "seccomp-bpf/die.h", + "seccomp-bpf/sandbox_bpf.cc", +@@ -250,31 +255,6 @@ component("seccomp_bpf") { + "bpf_dsl/linux_syscall_ranges.h", + "bpf_dsl/seccomp_macros.h", + "bpf_dsl/trap_registry.h", +- ] +- } +-} +- +-component("seccomp_bpf_helpers") { +- sources = [ +- "seccomp-bpf-helpers/baseline_policy.cc", +- "seccomp-bpf-helpers/baseline_policy.h", +- "seccomp-bpf-helpers/sigsys_handlers.cc", +- "seccomp-bpf-helpers/sigsys_handlers.h", +- "seccomp-bpf-helpers/syscall_parameters_restrictions.cc", +- "seccomp-bpf-helpers/syscall_parameters_restrictions.h", +- "seccomp-bpf-helpers/syscall_sets.cc", +- "seccomp-bpf-helpers/syscall_sets.h", +- ] +- defines = [ "SANDBOX_IMPLEMENTATION" ] +- +- deps = [ +- ":sandbox_services", +- ":seccomp_bpf", +- "//base", +- ] +- +- if (is_nacl_nonsfi) { +- sources -= [ + "seccomp-bpf-helpers/baseline_policy.cc", + "seccomp-bpf-helpers/baseline_policy.h", + "seccomp-bpf-helpers/syscall_sets.cc", +diff -up chromium-53.0.2785.101/sandbox/linux/sandbox_linux.gypi.415208 chromium-53.0.2785.101/sandbox/linux/sandbox_linux.gypi +--- chromium-53.0.2785.101/sandbox/linux/sandbox_linux.gypi.415208 2016-09-08 10:20:50.263045995 -0400 ++++ chromium-53.0.2785.101/sandbox/linux/sandbox_linux.gypi 2016-09-08 10:21:51.341870321 -0400 +@@ -54,7 +54,6 @@ + [ 'use_seccomp_bpf==1', { + 'dependencies': [ + 'seccomp_bpf', +- 'seccomp_bpf_helpers', + ], + }], + ], +@@ -141,6 +140,14 @@ + 'bpf_dsl/syscall_set.cc', + 'bpf_dsl/syscall_set.h', + 'bpf_dsl/trap_registry.h', ++ 'seccomp-bpf-helpers/baseline_policy.cc', ++ 'seccomp-bpf-helpers/baseline_policy.h', ++ 'seccomp-bpf-helpers/sigsys_handlers.cc', ++ 'seccomp-bpf-helpers/sigsys_handlers.h', ++ 'seccomp-bpf-helpers/syscall_parameters_restrictions.cc', ++ 'seccomp-bpf-helpers/syscall_parameters_restrictions.h', ++ 'seccomp-bpf-helpers/syscall_sets.cc', ++ 'seccomp-bpf-helpers/syscall_sets.h', + 'seccomp-bpf/die.cc', + 'seccomp-bpf/die.h', + 'seccomp-bpf/sandbox_bpf.cc', +@@ -165,31 +172,6 @@ + ], + 'include_dirs': [ + '../..', +- ], +- }, +- { +- 'target_name': 'seccomp_bpf_helpers', +- 'type': '<(component)', +- 'sources': [ +- 'seccomp-bpf-helpers/baseline_policy.cc', +- 'seccomp-bpf-helpers/baseline_policy.h', +- 'seccomp-bpf-helpers/sigsys_handlers.cc', +- 'seccomp-bpf-helpers/sigsys_handlers.h', +- 'seccomp-bpf-helpers/syscall_parameters_restrictions.cc', +- 'seccomp-bpf-helpers/syscall_parameters_restrictions.h', +- 'seccomp-bpf-helpers/syscall_sets.cc', +- 'seccomp-bpf-helpers/syscall_sets.h', +- ], +- 'dependencies': [ +- '../base/base.gyp:base', +- 'sandbox_services', +- 'seccomp_bpf', +- ], +- 'defines': [ +- 'SANDBOX_IMPLEMENTATION', +- ], +- 'include_dirs': [ +- '../..', + ], + }, + { +diff -up chromium-53.0.2785.101/services/shell/runner/host/BUILD.gn.415208 chromium-53.0.2785.101/services/shell/runner/host/BUILD.gn +--- chromium-53.0.2785.101/services/shell/runner/host/BUILD.gn.415208 2016-09-08 10:20:17.591674773 -0400 ++++ chromium-53.0.2785.101/services/shell/runner/host/BUILD.gn 2016-09-08 10:20:27.742478927 -0400 +@@ -61,7 +61,6 @@ source_set("child_process_base") { + "//sandbox/linux:sandbox", + "//sandbox/linux:sandbox_services", + "//sandbox/linux:seccomp_bpf", +- "//sandbox/linux:seccomp_bpf_helpers", + ] + } + +diff -up chromium-53.0.2785.101/services/shell/shell.gyp.415208 chromium-53.0.2785.101/services/shell/shell.gyp +--- chromium-53.0.2785.101/services/shell/shell.gyp.415208 2016-09-08 10:19:52.543156283 -0400 ++++ chromium-53.0.2785.101/services/shell/shell.gyp 2016-09-08 10:20:03.894938333 -0400 +@@ -145,7 +145,6 @@ + '<(DEPTH)/sandbox/sandbox.gyp:sandbox', + '<(DEPTH)/sandbox/sandbox.gyp:sandbox_services', + '<(DEPTH)/sandbox/sandbox.gyp:seccomp_bpf', +- '<(DEPTH)/sandbox/sandbox.gyp:seccomp_bpf_helpers', + ], + }], + ['OS=="mac"', { diff --git a/chromium.spec b/chromium.spec index ae9d12b..e1e8e61 100644 --- a/chromium.spec +++ b/chromium.spec @@ -18,7 +18,7 @@ # We don't want any libs in these directories to generate Provides # Requires is trickier. %global __provides_exclude_from %{chromium_path}/.*\\.so|%{chromium_path}/lib/.*\\.so -%global privlibs libaccessibility|libaura_extra|libaura|libbase_i18n|libbase|libblink_common|libblink_platform|libblink_web|libboringssl|libbrowser_ui_views|libcaptive_portal|libcc_blink|libcc_ipc|libcc_proto|libcc|libcc_surfaces|libchromium_sqlite3|libcloud_policy_proto_generated_compile|libcloud_policy_proto|libcompositor|libcontent|libcrcrypto|libdbus|libdevice_battery|libdevice_bluetooth|libdevice_core|libdevice_event_log_component|libdevice_vibration|libdisplay_compositor|libdisplay|libdisplay_types|libdisplay_util|libdomain_reliability|libEGL|libevents_base|libevents_devices|libevents_devices_x11|libevents_ipc|libevents_ozone_layout|libevents_platform|libevents|libevents_x|libffmpeg|libgcm_driver_common|libgcm|libgesture_detection|libgfx_geometry|libgfx_ipc_geometry|libgfx_ipc_skia|libgfx_ipc|libgfx_range|libgfx|libgfx_vector_icons|libgfx_x11|libgin|libgles2_c_lib|libgles2_implementation|libgles2_utils|libGLESv2|libgl_init|libgl_wrapper|libgpu|libgtk2ui|libicui18n|libicuuc|lib ipc_mojo|libipc|libkeyboard|libkeyboard_with_content|libkeycodes_x11|libkeyed_service_content|libkeyed_service_core|libmedia_blink|libmedia_gpu|libmedia|libmessage_center|libmidi|libmodules|libmojo_common_lib|libmojo_geometry_lib|libmojo_system_impl|libnative_theme|libnet|libnet_with_v8|libonc_component|libplatform_handle|libpolicy_component|libppapi_host|libppapi_proxy|libppapi_shared|libprefs|libprinting|libprotobuf_lite|libproxy_config|libsandbox_services|libscheduler|libseccomp_bpf_helpers|libseccomp_bpf|libsessions_content|libshared_memory_support|libshell_dialogs|libskia|libsnapshot|libsql|libstorage_common|libstorage|libsuid_sandbox_client|libsurface|libsync_core|libsync_proto|libtracing|libtranslator|libui_base_ime|libui_base|libui_base_x|libui_data_pack|libui_touch_selection|liburl_ipc|liburl_lib|liburl_matcher|libuser_prefs|libv8|libviews|libwallpaper|libwebcore_shared|libwebdata_common|libweb_dialogs|libwebview|libwm|libwtf|libx11_events_platform +%global privlibs libaccessibility|libaura_extra|libaura|libbase_i18n|libbase|libblink_common|libblink_platform|libblink_web|libboringssl|libbrowser_ui_views|libcaptive_portal|libcapture|libcc_blink|libcc_ipc|libcc_proto|libcc|libcc_surfaces|libchromium_sqlite3|libcloud_policy_proto_generated_compile|libcloud_policy_proto|libcompositor|libcontent|libcrcrypto|libdbus|libdevice_battery|libdevice_bluetooth|libdevice_core|libdevice_event_log_component|libdevice_gamepad|libdevice_power_save_blocker|libdevice_vibration|libdisplay_compositor|libdisplay|libdisplay_types|libdisplay_util|libdomain_reliability|libEGL|libevents_base|libevents_devices|libevents_devices_x11|libevents_ipc|libevents_ozone_layout|libevents_platform|libevents|libevents_x|libffmpeg|libgcm_driver_common|libgcm|libgesture_detection|libgfx_geometry|libgfx_ipc_geometry|libgfx_ipc_skia|libgfx_ipc|libgfx_range|libgfx|libgfx_vector_icons|libgfx_x11|libgin|libgles2_c_lib|libgles2_implementation|libgles2_utils|libGLESv2|libgl_i nit|libgl_wrapper|libgpu|libgtk2ui|libicui18n|libicuuc|libipc_mojo|libipc|libkeyboard|libkeyboard_with_content|libkeycodes_x11|libkeyed_service_content|libkeyed_service_core|libmedia_blink|libmedia_gpu|libmedia|libmessage_center|libmidi|libmodules|libmojo_common_lib|libmojo_geometry_lib|libmojo_public_system|libmojo_system_impl|libnative_theme|libnet|libnet_with_v8|libonc_component|libplatform_handle|libpolicy_component|libppapi_host|libppapi_proxy|libppapi_shared|libprefs|libprinting|libprotobuf_lite|libproxy_config|libsandbox_services|libscheduler|libseccomp_bpf_helpers|libseccomp_bpf|libsessions_content|libshared_memory_support|libshell_dialogs|libskia|libsnapshot|libsql|libstorage_common|libstorage|libsuid_sandbox_client|libsurface|libsync_core|libsync_proto|libtracing|libtranslator|libui_base_ime|libui_base|libui_base_x|libui_data_pack|libui_touch_selection|liburl_ipc|liburl_lib|liburl_matcher|libuser_prefs|libv8|libviews|libwallpaper|libwebcore_shared|libwebdata_common|libweb_ dialogs|libwebview|libwm|libwtf|libx11_events_platform %global __requires_exclude ^(%{privlibs})\\.so # Try to not use the Xvfb as it is slow.. @@ -92,7 +92,7 @@ BuildRequires: libicu-devel >= 5.4 %global chromoting_client_id 449907151817-8vnlfih032ni8c4jjps9int9t86k546t.apps.googleusercontent.com Name: chromium%{chromium_channel} -Version: 53.0.2785.92 +Version: 53.0.2785.101 Release: 1%{?dist} Summary: A WebKit (Blink) powered web browser Url: http://www.chromium.org/Home @@ -142,6 +142,9 @@ Patch20: chromium-53.0.2785.92-gn-system.patch Patch21: chromium-53.0.2785.92-last-commit-position.patch # Fix issue where timespec is not defined when sys/stat.h is included. Patch22: chromium-53.0.2785.92-boringssl-time-fix.patch +# Fix gn build on Linux +# https://crrev.com/415208 +Patch23: chromium-53.0.2785.101-crrev-415028.patch ### Chromium Tests Patches ### Patch100: chromium-46.0.2490.86-use_system_opus.patch @@ -257,7 +260,7 @@ BuildRequires: libffi-devel BuildRequires: libicu-devel = 54.1 %endif BuildRequires: libjpeg-devel -BuildRequires: libpng-devel +# BuildRequires: libpng-devel %if 0 # see https://code.google.com/p/chromium/issues/detail?id=501318 BuildRequires: libsrtp-devel >= 1.4.4 @@ -379,6 +382,7 @@ Provides: bundled(leveldb) = r80 Provides: bundled(libaddressinput) = 0 Provides: bundled(libjingle) = 9564 Provides: bundled(libphonenumber) = svn584 +Provides: bundled(libpng) = 1.6.22 Provides: bundled(libsrtp) = 1.5.2 %if %{bundlelibusbx} Provides: bundled(libusbx) = 1.0.17 @@ -515,6 +519,7 @@ members of the Chromium and WebDriver teams. %patch20 -p1 -b .gnsystem %patch21 -p1 -b .lastcommit %patch22 -p1 -b .timefix +%patch23 -p1 -b .415208 ### Chromium Tests Patches ### %patch100 -p1 -b .use_system_opus @@ -941,7 +946,6 @@ build/linux/unbundle/replace_gn_files.py --system-libraries \ %endif libevent \ libjpeg \ - libpng \ %if %{bundlelibusbx} %else libusb \ @@ -1673,6 +1677,10 @@ getent group chrome-remote-desktop >/dev/null || groupadd -r chrome-remote-deskt %{chromium_path}/chromedriver %changelog +* Thu Sep 8 2016 Tom Callaway <spot(a)fedoraproject.org&gt; 53.0.2785.101-1 +- 53.0.2785.101 +- happy star trek day. live long and prosper. + * Wed Sep 7 2016 Tom Callaway <spot(a)fedoraproject.org&gt; 53.0.2785.92-1 - add basic framework for gn tooling (disabled because it doesn't work yet) - update to 53.0.2785.92 diff --git a/sources b/sources index 16ae8c6..a807ef3 100644 --- a/sources +++ b/sources @@ -1,3 +1,3 @@ 49a7f897775cce21d2b69968b8af1cea depot_tools.git-master.tar.gz 8280c0644492bac9f59f4e25ed11d309 policy_templates.zip -40aa0cc4407dc8a198aedc29532abeee chromium-53.0.2785.92-clean.tar.xz +c0dc01cf6a7feb933e4798b39f35b012 chromium-53.0.2785.101-clean.tar.xz