From owner-svn-ports-branches@FreeBSD.ORG Tue Sep 9 21:44:38 2014 Return-Path: Delivered-To: svn-ports-branches@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [8.8.178.115]) (using TLSv1 with cipher ADH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTPS id 10C36B0A; Tue, 9 Sep 2014 21:44:38 +0000 (UTC) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:1900:2254:2068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id D6A08CF8; Tue, 9 Sep 2014 21:44:37 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.9/8.14.9) with ESMTP id s89Libeu010258; Tue, 9 Sep 2014 21:44:37 GMT (envelope-from rene@FreeBSD.org) Received: (from rene@localhost) by svn.freebsd.org (8.14.9/8.14.9/Submit) id s89LibWr010257; Tue, 9 Sep 2014 21:44:37 GMT (envelope-from rene@FreeBSD.org) Message-Id: <201409092144.s89LibWr010257@svn.freebsd.org> X-Authentication-Warning: svn.freebsd.org: rene set sender to rene@FreeBSD.org using -f From: Rene Ladan Date: Tue, 9 Sep 2014 21:44:37 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-branches@freebsd.org Subject: svn commit: r367785 - branches/2014Q3/security/vuxml X-SVN-Group: ports-branches MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-ports-branches@freebsd.org X-Mailman-Version: 2.1.18-1 Precedence: list List-Id: SVN commit messages for all the branches of the ports tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 09 Sep 2014 21:44:38 -0000 Author: rene Date: Tue Sep 9 21:44:36 2014 New Revision: 367785 URL: http://svnweb.freebsd.org/changeset/ports/367785 QAT: https://qat.redports.org/buildarchive/r367785/ Log: MFH: r367784 Document new vulnerabilities in www/chromium < 37.0.2062.120 Obtained from: http://googlechromereleases.blogspot.nl/ Approved by: portmgr (erwin) Modified: branches/2014Q3/security/vuxml/vuln.xml Directory Properties: branches/2014Q3/ (props changed) Modified: branches/2014Q3/security/vuxml/vuln.xml ============================================================================== --- branches/2014Q3/security/vuxml/vuln.xml Tue Sep 9 21:27:24 2014 (r367784) +++ branches/2014Q3/security/vuxml/vuln.xml Tue Sep 9 21:44:36 2014 (r367785) @@ -57,6 +57,39 @@ Notes: --> + + www/chromium -- multiple vulnerabilities + + + chromium + 37.0.2062.120 + + + + +

Google Chrome Releases reports:

+
4 security fixes in this release, including:
+
+
[401362] High CVE-2014-3178: Use-after-free in rendering. + Credit to miaubiz.
+
[411014] CVE-2014-3179: Various fixes from internal audits, + fuzzing and other initiatives.
+
+

+ + + + CVE-2014-3178 + CVE-2014-3179 + http://googlechromereleases.blogspot.nl/ + + + 2014-09-09 + 2014-09-09 + + + trafficserver -- unspecified vulnerability From owner-svn-ports-branches@FreeBSD.ORG Wed Sep 10 14:29:28 2014 Return-Path: Delivered-To: svn-ports-branches@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) (using TLSv1 with cipher ADH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTPS id 4F4B572; Wed, 10 Sep 2014 14:29:28 +0000 (UTC) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:1900:2254:2068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id 3720C1A9D; Wed, 10 Sep 2014 14:29:28 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.9/8.14.9) with ESMTP id s8AETSsJ093172; Wed, 10 Sep 2014 14:29:28 GMT (envelope-from rene@FreeBSD.org) Received: (from rene@localhost) by svn.freebsd.org (8.14.9/8.14.9/Submit) id s8AETFdC093062; Wed, 10 Sep 2014 14:29:15 GMT (envelope-from rene@FreeBSD.org) Message-Id: <201409101429.s8AETFdC093062@svn.freebsd.org> X-Authentication-Warning: svn.freebsd.org: rene set sender to rene@FreeBSD.org using -f From: Rene Ladan Date: Wed, 10 Sep 2014 14:29:15 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-branches@freebsd.org Subject: svn commit: r367852 - in branches/2014Q3/www/chromium: . files X-SVN-Group: ports-branches MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-ports-branches@freebsd.org X-Mailman-Version: 2.1.18-1 Precedence: list List-Id: SVN commit messages for all the branches of the ports tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 10 Sep 2014 14:29:28 -0000 Author: rene Date: Wed Sep 10 14:29:15 2014 New Revision: 367852 URL: http://svnweb.freebsd.org/changeset/ports/367852 QAT: https://qat.redports.org/buildarchive/r367852/ Log: MFH: r366226 Update www/chromium to 37.0.2062.94 Obtained from: freebsd-chromium@ (especially Carlos Medina) Security: http://www.vuxml.org/freebsd/fd5f305d-2d3d-11e4-aa3d-00262d5ed8ee.html Approved by: portmgr (erwin, on 2014-08-27) Added: branches/2014Q3/www/chromium/files/patch-base__files__file_path_watcher_kqueue.h - copied unchanged from r366226, head/www/chromium/files/patch-base__files__file_path_watcher_kqueue.h branches/2014Q3/www/chromium/files/patch-chrome__app__resources__locale_settings.grd - copied unchanged from r366226, head/www/chromium/files/patch-chrome__app__resources__locale_settings.grd branches/2014Q3/www/chromium/files/patch-components__usb_service__usb_device_handle_impl.cc - copied unchanged from r366226, head/www/chromium/files/patch-components__usb_service__usb_device_handle_impl.cc branches/2014Q3/www/chromium/files/patch-components__usb_service__usb_error.cc - copied unchanged from r366226, head/www/chromium/files/patch-components__usb_service__usb_error.cc branches/2014Q3/www/chromium/files/patch-components__usb_service__usb_interface_impl.cc - copied unchanged from r366226, head/www/chromium/files/patch-components__usb_service__usb_interface_impl.cc branches/2014Q3/www/chromium/files/patch-content__browser__indexed_db__indexed_db_backing_store.cc - copied unchanged from r366226, head/www/chromium/files/patch-content__browser__indexed_db__indexed_db_backing_store.cc branches/2014Q3/www/chromium/files/patch-manual-build - copied unchanged from r366226, head/www/chromium/files/patch-manual-build branches/2014Q3/www/chromium/files/patch-media__video__capture__video_capture_device_factory.cc - copied unchanged from r366226, head/www/chromium/files/patch-media__video__capture__video_capture_device_factory.cc branches/2014Q3/www/chromium/files/patch-third_party__pdfium__build__standalone.gypi - copied unchanged from r366226, head/www/chromium/files/patch-third_party__pdfium__build__standalone.gypi branches/2014Q3/www/chromium/files/patch-third_party__pdfium__core__include__fxcrt__fx_system.h - copied unchanged from r366226, head/www/chromium/files/patch-third_party__pdfium__core__include__fxcrt__fx_system.h branches/2014Q3/www/chromium/files/patch-third_party__pdfium__fpdfsdk__src__javascript__PublicMethods.cpp - copied unchanged from r366226, head/www/chromium/files/patch-third_party__pdfium__fpdfsdk__src__javascript__PublicMethods.cpp branches/2014Q3/www/chromium/files/patch-third_party__pdfium__fpdfsdk__src__jsapi__fxjs_v8.cpp - copied unchanged from r366226, head/www/chromium/files/patch-third_party__pdfium__fpdfsdk__src__jsapi__fxjs_v8.cpp branches/2014Q3/www/chromium/files/patch-third_party__pdfium__pdfium.gyp - copied unchanged from r366226, head/www/chromium/files/patch-third_party__pdfium__pdfium.gyp branches/2014Q3/www/chromium/files/patch-third_party__webrtc__base__httpcommon.cc - copied unchanged from r366226, head/www/chromium/files/patch-third_party__webrtc__base__httpcommon.cc branches/2014Q3/www/chromium/files/patch-third_party__webrtc__base__network.cc - copied unchanged from r366226, head/www/chromium/files/patch-third_party__webrtc__base__network.cc branches/2014Q3/www/chromium/files/patch-third_party__webrtc__base__physicalsocketserver.cc - copied unchanged from r366226, head/www/chromium/files/patch-third_party__webrtc__base__physicalsocketserver.cc branches/2014Q3/www/chromium/files/patch-third_party__webrtc__base__stringutils.h - copied unchanged from r366226, head/www/chromium/files/patch-third_party__webrtc__base__stringutils.h branches/2014Q3/www/chromium/files/patch-v8__src__platform-freebsd.cc - copied unchanged from r366226, head/www/chromium/files/patch-v8__src__platform-freebsd.cc Deleted: branches/2014Q3/www/chromium/files/patch-chrome__chrome_tests.gypi branches/2014Q3/www/chromium/files/patch-components__usb_service__usb_device_handle.cc branches/2014Q3/www/chromium/files/patch-components__usb_service__usb_interface.cc branches/2014Q3/www/chromium/files/patch-media__cast__rtcp__rtcp.cc branches/2014Q3/www/chromium/files/patch-native_client__src__trusted__debug_stub__debug_stub.gyp branches/2014Q3/www/chromium/files/patch-native_client__src__trusted__service_runtime__service_runtime.gyp Modified: branches/2014Q3/www/chromium/Makefile branches/2014Q3/www/chromium/distinfo branches/2014Q3/www/chromium/files/extra-patch-clang branches/2014Q3/www/chromium/files/patch-base__base.gyp branches/2014Q3/www/chromium/files/patch-base__base.gypi branches/2014Q3/www/chromium/files/patch-base__debug__stack_trace_posix.cc branches/2014Q3/www/chromium/files/patch-base__posix__unix_domain_socket_linux.cc branches/2014Q3/www/chromium/files/patch-base__posix__unix_domain_socket_linux_unittest.cc branches/2014Q3/www/chromium/files/patch-base__process__internal_linux.h branches/2014Q3/www/chromium/files/patch-base__process__launch.cc branches/2014Q3/www/chromium/files/patch-base__process__launch.h branches/2014Q3/www/chromium/files/patch-base__process__memory_unittest.cc branches/2014Q3/www/chromium/files/patch-base__process__process_iterator_freebsd.cc branches/2014Q3/www/chromium/files/patch-base__process__process_metrics.h branches/2014Q3/www/chromium/files/patch-base__process__process_metrics_freebsd.cc branches/2014Q3/www/chromium/files/patch-base__security_unittest.cc branches/2014Q3/www/chromium/files/patch-base__strings__safe_sprintf.cc branches/2014Q3/www/chromium/files/patch-base__sys_info_freebsd.cc branches/2014Q3/www/chromium/files/patch-base__sys_info_posix.cc branches/2014Q3/www/chromium/files/patch-base__test__expectations__expectation.cc branches/2014Q3/www/chromium/files/patch-base__test__launcher__test_launcher.cc branches/2014Q3/www/chromium/files/patch-base__threading__platform_thread_linux.cc branches/2014Q3/www/chromium/files/patch-breakpad__breakpad.gyp branches/2014Q3/www/chromium/files/patch-build__common.gypi branches/2014Q3/www/chromium/files/patch-build__filename_rules.gypi branches/2014Q3/www/chromium/files/patch-build__linux__system.gyp branches/2014Q3/www/chromium/files/patch-build__linux__unbundle__libwebp.gyp branches/2014Q3/www/chromium/files/patch-build__linux__unbundle__openssl.gyp branches/2014Q3/www/chromium/files/patch-cc__layers__layer_impl.cc branches/2014Q3/www/chromium/files/patch-chrome__app__chrome_main_delegate.cc branches/2014Q3/www/chromium/files/patch-chrome__app__chrome_main_delegate.h branches/2014Q3/www/chromium/files/patch-chrome__app__chromium_strings.grd branches/2014Q3/www/chromium/files/patch-chrome__browser__about_flags.cc branches/2014Q3/www/chromium/files/patch-chrome__browser__browser_process_impl.cc branches/2014Q3/www/chromium/files/patch-chrome__browser__chrome_browser_main.cc branches/2014Q3/www/chromium/files/patch-chrome__browser__chrome_browser_main_posix.cc branches/2014Q3/www/chromium/files/patch-chrome__browser__chrome_content_browser_client.cc branches/2014Q3/www/chromium/files/patch-chrome__browser__chrome_content_browser_client.h branches/2014Q3/www/chromium/files/patch-chrome__browser__diagnostics__diagnostics_writer.cc branches/2014Q3/www/chromium/files/patch-chrome__browser__diagnostics__diagnostics_writer.h branches/2014Q3/www/chromium/files/patch-chrome__browser__extensions__api__image_writer_private__image_writer_private_api.cc branches/2014Q3/www/chromium/files/patch-chrome__browser__extensions__api__music_manager_private__device_id_linux.cc branches/2014Q3/www/chromium/files/patch-chrome__browser__extensions__api__serial__serial_api.cc branches/2014Q3/www/chromium/files/patch-chrome__browser__extensions__api__serial__serial_connection_posix.cc branches/2014Q3/www/chromium/files/patch-chrome__browser__gpu__gl_string_manager.cc branches/2014Q3/www/chromium/files/patch-chrome__browser__gpu__gpu_feature_checker.cc branches/2014Q3/www/chromium/files/patch-chrome__browser__media__webrtc_log_uploader.cc branches/2014Q3/www/chromium/files/patch-chrome__browser__media_galleries__fileapi__mtp_device_map_service.cc branches/2014Q3/www/chromium/files/patch-chrome__browser__media_galleries__media_file_system_registry.cc branches/2014Q3/www/chromium/files/patch-chrome__browser__media_galleries__media_folder_finder.cc branches/2014Q3/www/chromium/files/patch-chrome__browser__memory_details.cc branches/2014Q3/www/chromium/files/patch-chrome__browser__net__connection_tester.cc branches/2014Q3/www/chromium/files/patch-chrome__browser__omaha_query_params__omaha_query_params.cc branches/2014Q3/www/chromium/files/patch-chrome__browser__plugins__plugins_resource_service.cc branches/2014Q3/www/chromium/files/patch-chrome__browser__policy__policy_prefs_browsertest.cc branches/2014Q3/www/chromium/files/patch-chrome__browser__ui__startup__startup_browser_creator.cc branches/2014Q3/www/chromium/files/patch-chrome__browser__ui__views__first_run_dialog.cc branches/2014Q3/www/chromium/files/patch-chrome__browser__ui__webui__about_ui.cc branches/2014Q3/www/chromium/files/patch-chrome__browser__ui__webui__chrome_web_ui_controller_factory.cc branches/2014Q3/www/chromium/files/patch-chrome__browser__ui__webui__options__browser_options_handler.cc branches/2014Q3/www/chromium/files/patch-chrome__browser__ui__webui__options__browser_options_handler.h branches/2014Q3/www/chromium/files/patch-chrome__browser__web_applications__web_app.cc branches/2014Q3/www/chromium/files/patch-chrome__browser__web_applications__web_app.h branches/2014Q3/www/chromium/files/patch-chrome__chrome_browser.gypi branches/2014Q3/www/chromium/files/patch-chrome__chrome_browser_extensions.gypi branches/2014Q3/www/chromium/files/patch-chrome__chrome_browser_ui.gypi branches/2014Q3/www/chromium/files/patch-chrome__common__chrome_paths.cc branches/2014Q3/www/chromium/files/patch-chrome__common__chrome_paths.h branches/2014Q3/www/chromium/files/patch-chrome__common__chrome_switches.cc branches/2014Q3/www/chromium/files/patch-chrome__common__chrome_switches.h branches/2014Q3/www/chromium/files/patch-chrome__common__pref_names.cc branches/2014Q3/www/chromium/files/patch-chrome__common__pref_names.h branches/2014Q3/www/chromium/files/patch-chrome__renderer__pepper__pepper_flash_font_file_host.cc branches/2014Q3/www/chromium/files/patch-chrome__renderer__printing__print_web_view_helper.h branches/2014Q3/www/chromium/files/patch-chrome__test__base__in_process_browser_test.cc branches/2014Q3/www/chromium/files/patch-chrome__test__base__testing_browser_process.h branches/2014Q3/www/chromium/files/patch-chrome__test__chromedriver__chrome__chrome_finder.cc branches/2014Q3/www/chromium/files/patch-chrome__test__perf__perf_test.cc branches/2014Q3/www/chromium/files/patch-chrome__tools__build__linux__sed.sh branches/2014Q3/www/chromium/files/patch-components__policy__resources__policy_templates.json branches/2014Q3/www/chromium/files/patch-components__policy__tools__generate_policy_source.py branches/2014Q3/www/chromium/files/patch-components__storage_monitor.gypi branches/2014Q3/www/chromium/files/patch-components__storage_monitor__storage_monitor.cc branches/2014Q3/www/chromium/files/patch-components__storage_monitor__storage_monitor_freebsd.cc branches/2014Q3/www/chromium/files/patch-components__storage_monitor__storage_monitor_freebsd.h branches/2014Q3/www/chromium/files/patch-components__usb_service.gypi branches/2014Q3/www/chromium/files/patch-components__usb_service__usb_context.cc branches/2014Q3/www/chromium/files/patch-components__usb_service__usb_context_unittest.cc branches/2014Q3/www/chromium/files/patch-components__usb_service__usb_device_impl.cc branches/2014Q3/www/chromium/files/patch-components__usb_service__usb_service_impl.cc branches/2014Q3/www/chromium/files/patch-content__app__content_main_runner.cc branches/2014Q3/www/chromium/files/patch-content__browser__browser_main_loop.cc branches/2014Q3/www/chromium/files/patch-content__browser__child_process_launcher.cc branches/2014Q3/www/chromium/files/patch-content__browser__download__base_file.cc branches/2014Q3/www/chromium/files/patch-content__browser__download__base_file_linux.cc branches/2014Q3/www/chromium/files/patch-content__browser__geolocation__location_arbitrator_impl.cc branches/2014Q3/www/chromium/files/patch-content__browser__geolocation__wifi_data_provider_freebsd.cc branches/2014Q3/www/chromium/files/patch-content__browser__geolocation__wifi_data_provider_freebsd.h branches/2014Q3/www/chromium/files/patch-content__browser__renderer_host__render_widget_host_view_aura.cc branches/2014Q3/www/chromium/files/patch-content__common__set_process_title_linux.cc branches/2014Q3/www/chromium/files/patch-content__common__set_process_title_linux.h branches/2014Q3/www/chromium/files/patch-content__content_browser.gypi branches/2014Q3/www/chromium/files/patch-content__content_common.gypi branches/2014Q3/www/chromium/files/patch-content__content_tests.gypi branches/2014Q3/www/chromium/files/patch-content__public__test__browser_test_base.cc branches/2014Q3/www/chromium/files/patch-content__renderer__accessibility__blink_ax_tree_source.cc branches/2014Q3/www/chromium/files/patch-content__renderer__media__webrtc_audio_capturer.cc branches/2014Q3/www/chromium/files/patch-content__renderer__media__webrtc_audio_renderer.cc branches/2014Q3/www/chromium/files/patch-content__renderer__pepper__usb_key_code_conversion.cc branches/2014Q3/www/chromium/files/patch-content__renderer__renderer_main_platform_delegate_linux.cc branches/2014Q3/www/chromium/files/patch-content__renderer__renderer_webkitplatformsupport_impl.cc branches/2014Q3/www/chromium/files/patch-crypto__nss_util.cc branches/2014Q3/www/chromium/files/patch-device__hid__hid.gyp branches/2014Q3/www/chromium/files/patch-device__serial__serial.gyp branches/2014Q3/www/chromium/files/patch-gpu__config__gpu_control_list.cc branches/2014Q3/www/chromium/files/patch-gpu__config__gpu_control_list_unittest.cc branches/2014Q3/www/chromium/files/patch-gpu__config__gpu_test_config.cc branches/2014Q3/www/chromium/files/patch-gpu__gpu_config.gypi branches/2014Q3/www/chromium/files/patch-media__audio__audio_input_volume_unittest.cc branches/2014Q3/www/chromium/files/patch-media__base__audio_splicer.cc branches/2014Q3/www/chromium/files/patch-media__filters__decrypting_audio_decoder.cc branches/2014Q3/www/chromium/files/patch-media__media.gyp branches/2014Q3/www/chromium/files/patch-native_client__build__common.gypi branches/2014Q3/www/chromium/files/patch-native_client__src__shared__platform__platform.gyp branches/2014Q3/www/chromium/files/patch-net__base__address_tracker_linux.h branches/2014Q3/www/chromium/files/patch-net__base__address_tracker_linux_unittest.cc branches/2014Q3/www/chromium/files/patch-net__base__dns_reloader.cc branches/2014Q3/www/chromium/files/patch-net__base__mime_util_unittest.cc branches/2014Q3/www/chromium/files/patch-net__base__net_util.h branches/2014Q3/www/chromium/files/patch-net__base__network_change_notifier.cc branches/2014Q3/www/chromium/files/patch-net__dns__address_sorter_posix.cc branches/2014Q3/www/chromium/files/patch-net__dns__dns_config_service_posix_unittest.cc branches/2014Q3/www/chromium/files/patch-net__dns__dns_session.cc branches/2014Q3/www/chromium/files/patch-net__http__http_auth_gssapi_posix.cc branches/2014Q3/www/chromium/files/patch-net__net.gyp branches/2014Q3/www/chromium/files/patch-net__net.gypi branches/2014Q3/www/chromium/files/patch-net__proxy__proxy_config_service_linux.cc branches/2014Q3/www/chromium/files/patch-net__proxy__proxy_service.cc branches/2014Q3/www/chromium/files/patch-net__quic__congestion_control__rtt_stats.cc branches/2014Q3/www/chromium/files/patch-net__socket__socks5_client_socket.cc branches/2014Q3/www/chromium/files/patch-net__socket__tcp_listen_socket_unittest.h branches/2014Q3/www/chromium/files/patch-net__udp__udp_socket_unittest.cc branches/2014Q3/www/chromium/files/patch-ppapi__proxy__file_io_resource.cc branches/2014Q3/www/chromium/files/patch-ppapi__shared_impl__private__net_address_private_impl.cc branches/2014Q3/www/chromium/files/patch-printing__printing.gyp branches/2014Q3/www/chromium/files/patch-remoting__remoting_host.gypi branches/2014Q3/www/chromium/files/patch-skia__skia_chrome.gypi branches/2014Q3/www/chromium/files/patch-skia__skia_common.gypi branches/2014Q3/www/chromium/files/patch-sync__util__get_session_name.cc branches/2014Q3/www/chromium/files/patch-sync__util__get_session_name_linux.cc branches/2014Q3/www/chromium/files/patch-testing__gtest__include__gtest__internal__gtest-port.h branches/2014Q3/www/chromium/files/patch-testing__gtest__src__gtest.cc branches/2014Q3/www/chromium/files/patch-third_party__WebKit__Source__config.h branches/2014Q3/www/chromium/files/patch-third_party__WebKit__Source__core__core.gyp branches/2014Q3/www/chromium/files/patch-third_party__WebKit__Source__platform__blink_platform.gyp branches/2014Q3/www/chromium/files/patch-third_party__WebKit__Source__platform__heap__ThreadState.cpp branches/2014Q3/www/chromium/files/patch-third_party__WebKit__Source__web__linux__WebFontRendering.cpp branches/2014Q3/www/chromium/files/patch-third_party__WebKit__Source__web__web.gyp branches/2014Q3/www/chromium/files/patch-third_party__WebKit__Source__wtf__Assertions.cpp branches/2014Q3/www/chromium/files/patch-third_party__WebKit__Source__wtf__ByteSwap.h branches/2014Q3/www/chromium/files/patch-third_party__WebKit__Source__wtf__DateMath.cpp branches/2014Q3/www/chromium/files/patch-third_party__WebKit__Source__wtf__wtf.gyp branches/2014Q3/www/chromium/files/patch-third_party__ffmpeg__chromium__config__Chromium__linux__ia32__config.h branches/2014Q3/www/chromium/files/patch-third_party__ffmpeg__libavutil__mem.c branches/2014Q3/www/chromium/files/patch-third_party__khronos__khronos.gyp branches/2014Q3/www/chromium/files/patch-third_party__libXNVCtrl__libXNVCtrl.gyp branches/2014Q3/www/chromium/files/patch-third_party__libexif__libexif.gyp branches/2014Q3/www/chromium/files/patch-third_party__libjingle__libjingle.gyp branches/2014Q3/www/chromium/files/patch-third_party__libjingle__source__talk__base__cpumonitor.cc branches/2014Q3/www/chromium/files/patch-third_party__libjingle__source__talk__base__ipaddress.h branches/2014Q3/www/chromium/files/patch-third_party__libjingle__source__talk__base__linux.cc branches/2014Q3/www/chromium/files/patch-third_party__libjingle__source__talk__base__linux.h branches/2014Q3/www/chromium/files/patch-third_party__libjingle__source__talk__base__network.h branches/2014Q3/www/chromium/files/patch-third_party__libjingle__source__talk__base__systeminfo.cc branches/2014Q3/www/chromium/files/patch-third_party__libjpeg_turbo__libjpeg.gyp branches/2014Q3/www/chromium/files/patch-third_party__libphonenumber__libphonenumber.gyp branches/2014Q3/www/chromium/files/patch-third_party__libvpx__unpack_lib_posix.sh branches/2014Q3/www/chromium/files/patch-third_party__ots__include__opentype-sanitiser.h branches/2014Q3/www/chromium/files/patch-third_party__sfntly__sfntly.gyp branches/2014Q3/www/chromium/files/patch-third_party__sqlite__sqlite.gyp branches/2014Q3/www/chromium/files/patch-third_party__webrtc__build__common.gypi branches/2014Q3/www/chromium/files/patch-third_party__webrtc__modules__audio_device__audio_device.gypi branches/2014Q3/www/chromium/files/patch-third_party__webrtc__modules__desktop_capture__desktop_capture.gypi branches/2014Q3/www/chromium/files/patch-third_party__webrtc__modules__rtp_rtcp__source__forward_error_correction.cc branches/2014Q3/www/chromium/files/patch-third_party__webrtc__modules__video_coding__main__source__receiver.cc branches/2014Q3/www/chromium/files/patch-third_party__webrtc__system_wrappers__source__atomic32_posix.cc branches/2014Q3/www/chromium/files/patch-third_party__webrtc__system_wrappers__source__cpu_info.cc branches/2014Q3/www/chromium/files/patch-third_party__webrtc__system_wrappers__source__thread_posix.cc branches/2014Q3/www/chromium/files/patch-third_party__webrtc__voice_engine__voice_engine_defines.h branches/2014Q3/www/chromium/files/patch-tools__gyp__pylib__gyp__generator__make.py branches/2014Q3/www/chromium/files/patch-tools__gyp__test__additional-targets__src__dir1__actions.gyp branches/2014Q3/www/chromium/files/patch-tools__gyp__test__library__src__library.gyp branches/2014Q3/www/chromium/files/patch-ui__app_list__app_list_constants.cc branches/2014Q3/www/chromium/files/patch-ui__app_list__app_list_constants.h branches/2014Q3/www/chromium/files/patch-ui__base__ui_base.gyp branches/2014Q3/www/chromium/files/patch-ui__events__event_switches.cc branches/2014Q3/www/chromium/files/patch-ui__events__event_switches.h branches/2014Q3/www/chromium/files/patch-ui__gl__gl.gyp branches/2014Q3/www/chromium/files/patch-ui__shell_dialogs__select_file_dialog.cc branches/2014Q3/www/chromium/files/patch-ui__views__views.gyp branches/2014Q3/www/chromium/files/patch-ui__views__views_delegate.cc branches/2014Q3/www/chromium/files/patch-ui__views__views_delegate.h branches/2014Q3/www/chromium/pkg-plist Directory Properties: branches/2014Q3/ (props changed) Modified: branches/2014Q3/www/chromium/Makefile ============================================================================== --- branches/2014Q3/www/chromium/Makefile Wed Sep 10 14:23:43 2014 (r367851) +++ branches/2014Q3/www/chromium/Makefile Wed Sep 10 14:29:15 2014 (r367852) @@ -2,8 +2,7 @@ # $FreeBSD$ PORTNAME= chromium -PORTVERSION= 36.0.1985.143 -PORTREVISION= 1 +PORTVERSION= 37.0.2062.94 CATEGORIES= www MASTER_SITES= http://commondatastorage.googleapis.com/chromium-browser-official/ DISTFILES= ${DISTNAME}${EXTRACT_SUFX} @@ -247,8 +246,10 @@ post-patch: pre-configure: # phajdan-jr: list of things *not* to remove, so maybe the script # should be called "keep_bundled_libraries.py" + # keep third_party/protobuf to ease debugging cd ${WRKSRC} && ${PYTHON_CMD} \ ./build/linux/unbundle/remove_bundled_libraries.py \ + 'third_party/protobuf' \ 'base/third_party/dmg_fp' \ 'base/third_party/dynamic_annotations' \ 'base/third_party/icu' \ @@ -272,6 +273,7 @@ pre-configure: 'third_party/cros_system_api' \ 'third_party/dom_distiller_js' \ 'third_party/ffmpeg' \ + 'third_party/fips181' \ 'third_party/flot' \ 'third_party/hunspell' \ 'third_party/iccjpeg' \ @@ -298,8 +300,9 @@ pre-configure: 'third_party/npapi' \ 'third_party/opus' \ 'third_party/ots' \ - 'third_party/polymer' \ + 'third_party/pdfium' \ 'third_party/ply' \ + 'third_party/polymer' \ 'third_party/pywebsocket' \ 'third_party/qcms' \ 'third_party/readability' \ @@ -347,16 +350,20 @@ do-install: ${INSTALL_SCRIPT} ${WRKSRC}/chrome/tools/build/linux/chrome-wrapper \ ${STAGEDIR}${DATADIR} .for p in chrome_100_percent content_resources keyboard_resources resources - ${INSTALL_DATA} ${WRKSRC}/out/${BUILDTYPE}/${p}.pak ${STAGEDIR}${DATADIR} + ${INSTALL_DATA} ${WRKSRC}/out/${BUILDTYPE}/${p}.pak \ + ${STAGEDIR}${DATADIR} .endfor - ${INSTALL_PROGRAM} ${WRKSRC}/out/${BUILDTYPE}/chrome ${STAGEDIR}${DATADIR} - ${INSTALL_LIB} ${WRKSRC}/out/${BUILDTYPE}/libffmpegsumo.so ${STAGEDIR}${DATADIR} + ${INSTALL_PROGRAM} ${WRKSRC}/out/${BUILDTYPE}/chrome \ + ${STAGEDIR}${DATADIR} + ${INSTALL_LIB} ${WRKSRC}/out/${BUILDTYPE}/libffmpegsumo.so \ + ${STAGEDIR}${DATADIR} cd ${WRKSRC}/out/${BUILDTYPE} && \ ${COPYTREE_SHARE} "locales resources" ${STAGEDIR}${DATADIR} @${MKDIR} ${STAGEDIR}${DESKTOPDIR} - ${INSTALL_DATA} ${WRKDIR}/chromium-browser.desktop ${STAGEDIR}${DESKTOPDIR} + ${INSTALL_DATA} ${WRKDIR}/chromium-browser.desktop \ + ${STAGEDIR}${DESKTOPDIR} ${INSTALL_SCRIPT} ${WRKDIR}/chrome ${STAGEDIR}${PREFIX}/bin - ${INSTALL_PROGRAM} ${WRKSRC}/out/${BUILDTYPE}/mksnapshot.${ARCH:S/i386/ia32/:S/amd64/x64/} \ + ${INSTALL_PROGRAM} ${WRKSRC}/out/${BUILDTYPE}/mksnapshot \ ${STAGEDIR}${DATADIR}/mksnapshot .include Modified: branches/2014Q3/www/chromium/distinfo ============================================================================== --- branches/2014Q3/www/chromium/distinfo Wed Sep 10 14:23:43 2014 (r367851) +++ branches/2014Q3/www/chromium/distinfo Wed Sep 10 14:29:15 2014 (r367852) @@ -1,4 +1,4 @@ -SHA256 (chromium-36.0.1985.143.tar.xz) = 0631d7442991f0b4b942477c58a9294e9e3eb21ffd3c8626e4ab663b8345c316 -SIZE (chromium-36.0.1985.143.tar.xz) = 205456928 -SHA256 (chromium-36.0.1985.143-testdata.tar.xz) = 7af27696a1d30a2acd29ffa331c956f58d82080905b73ad9259f7d6ad2784277 -SIZE (chromium-36.0.1985.143-testdata.tar.xz) = 111519392 +SHA256 (chromium-37.0.2062.94.tar.xz) = d27c19580b74cbe143131f0bc097557b3b2fb3d2be966e688d8af51a779ce533 +SIZE (chromium-37.0.2062.94.tar.xz) = 220064328 +SHA256 (chromium-37.0.2062.94-testdata.tar.xz) = 055ff2df325a20b03e12eae3b553e126eb5c63144fe9184a07d8d2f4db3fb9b4 +SIZE (chromium-37.0.2062.94-testdata.tar.xz) = 114484240 Modified: branches/2014Q3/www/chromium/files/extra-patch-clang ============================================================================== --- branches/2014Q3/www/chromium/files/extra-patch-clang Wed Sep 10 14:23:43 2014 (r367851) +++ branches/2014Q3/www/chromium/files/extra-patch-clang Wed Sep 10 14:29:15 2014 (r367852) @@ -133,17 +133,6 @@ Stop(); } ---- net/url_request/view_cache_helper_unittest.cc.orig 2013-09-01 00:33:32.000000000 +0300 -+++ net/url_request/view_cache_helper_unittest.cc 2013-09-01 00:34:02.000000000 +0300 -@@ -29,7 +29,7 @@ - }; - - TestURLRequestContext::TestURLRequestContext() -- : cache_(reinterpret_cast(NULL), NULL, -+ : cache_(static_cast(NULL), NULL, - HttpCache::DefaultBackend::InMemory(0)) { - set_http_transaction_factory(&cache_); - } --- third_party/hunspell/src/hunspell/affentry.hxx 2013-07-03 23:52:32.000000000 -0400 +++ third_party/hunspell/src/hunspell/affentry.hxx 2013-07-19 01:31:57.000000000 -0400 @@ -27,7 +27,7 @@ @@ -278,3 +267,14 @@ } - +--- ./third_party/webrtc/base/taskrunner.cc.orig 2014-08-20 21:04:28.000000000 +0200 ++++ ./third_party/webrtc/base/taskrunner.cc 2014-08-22 18:55:46.000000000 +0200 +@@ -102,7 +102,7 @@ + std::vector::iterator it; + it = std::remove(tasks_.begin(), + tasks_.end(), +- reinterpret_cast(NULL)); ++ static_cast(NULL)); + + tasks_.erase(it, tasks_.end()); + Modified: branches/2014Q3/www/chromium/files/patch-base__base.gyp ============================================================================== --- branches/2014Q3/www/chromium/files/patch-base__base.gyp Wed Sep 10 14:23:43 2014 (r367851) +++ branches/2014Q3/www/chromium/files/patch-base__base.gyp Wed Sep 10 14:29:15 2014 (r367852) @@ -1,5 +1,5 @@ ---- ./base/base.gyp.orig 2014-08-12 21:01:28.000000000 +0200 -+++ ./base/base.gyp 2014-08-13 09:57:00.000000000 +0200 +--- ./base/base.gyp.orig 2014-08-20 21:02:42.000000000 +0200 ++++ ./base/base.gyp 2014-08-22 15:06:27.000000000 +0200 @@ -129,7 +129,7 @@ ], 'link_settings': { Modified: branches/2014Q3/www/chromium/files/patch-base__base.gypi ============================================================================== --- branches/2014Q3/www/chromium/files/patch-base__base.gypi Wed Sep 10 14:23:43 2014 (r367851) +++ branches/2014Q3/www/chromium/files/patch-base__base.gypi Wed Sep 10 14:29:15 2014 (r367852) @@ -1,6 +1,6 @@ ---- ./base/base.gypi.orig 2014-08-12 21:01:28.000000000 +0200 -+++ ./base/base.gypi 2014-08-13 09:56:56.000000000 +0200 -@@ -912,11 +912,14 @@ +--- ./base/base.gypi.orig 2014-08-20 21:02:42.000000000 +0200 ++++ ./base/base.gypi 2014-08-22 18:33:25.000000000 +0200 +@@ -942,11 +942,16 @@ 'process/memory_stubs.cc', ], 'sources/': [ @@ -13,6 +13,8 @@ ['exclude', '^sys_info_linux\\.cc$'], + ['exclude', '^process/process_iterator_linux\\.cc$'], + ['exclude', '^process/process_metrics_linux\\.cc$'], ++ ['exclude', '^files/file_path_watcher_fsevents\\.cc$'], ++ ['exclude', '^files/file_path_watcher_fsevents\\.h$'], ], }], # Remove all unnecessary files for build_nexe.py to avoid exceeding Modified: branches/2014Q3/www/chromium/files/patch-base__debug__stack_trace_posix.cc ============================================================================== --- branches/2014Q3/www/chromium/files/patch-base__debug__stack_trace_posix.cc Wed Sep 10 14:23:43 2014 (r367851) +++ branches/2014Q3/www/chromium/files/patch-base__debug__stack_trace_posix.cc Wed Sep 10 14:29:15 2014 (r367852) @@ -1,5 +1,5 @@ ---- ./base/debug/stack_trace_posix.cc.orig 2014-08-12 21:01:27.000000000 +0200 -+++ ./base/debug/stack_trace_posix.cc 2014-08-13 09:56:56.000000000 +0200 +--- ./base/debug/stack_trace_posix.cc.orig 2014-08-20 21:02:42.000000000 +0200 ++++ ./base/debug/stack_trace_posix.cc 2014-08-22 15:06:24.000000000 +0200 @@ -590,6 +590,10 @@ // for the modules that are loaded in the current process. // Returns true on success. Copied: branches/2014Q3/www/chromium/files/patch-base__files__file_path_watcher_kqueue.h (from r366226, head/www/chromium/files/patch-base__files__file_path_watcher_kqueue.h) ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ branches/2014Q3/www/chromium/files/patch-base__files__file_path_watcher_kqueue.h Wed Sep 10 14:29:15 2014 (r367852, copy of r366226, head/www/chromium/files/patch-base__files__file_path_watcher_kqueue.h) @@ -0,0 +1,13 @@ +--- ./base/files/file_path_watcher_kqueue.h.orig 2014-08-20 21:02:41.000000000 +0200 ++++ ./base/files/file_path_watcher_kqueue.h 2014-08-23 19:32:36.000000000 +0200 +@@ -5,6 +5,10 @@ + #ifndef BASE_FILES_FILE_PATH_WATCHER_KQUEUE_H_ + #define BASE_FILES_FILE_PATH_WATCHER_KQUEUE_H_ + ++#ifdef __FreeBSD__ ++#include ++#include ++#endif + #include + #include + Modified: branches/2014Q3/www/chromium/files/patch-base__posix__unix_domain_socket_linux.cc ============================================================================== --- branches/2014Q3/www/chromium/files/patch-base__posix__unix_domain_socket_linux.cc Wed Sep 10 14:23:43 2014 (r367851) +++ branches/2014Q3/www/chromium/files/patch-base__posix__unix_domain_socket_linux.cc Wed Sep 10 14:29:15 2014 (r367852) @@ -1,5 +1,5 @@ ---- ./base/posix/unix_domain_socket_linux.cc.orig 2014-08-12 21:01:28.000000000 +0200 -+++ ./base/posix/unix_domain_socket_linux.cc 2014-08-13 09:56:56.000000000 +0200 +--- ./base/posix/unix_domain_socket_linux.cc.orig 2014-08-20 21:02:41.000000000 +0200 ++++ ./base/posix/unix_domain_socket_linux.cc 2014-08-22 15:06:24.000000000 +0200 @@ -18,6 +18,15 @@ #include "base/posix/eintr_wrapper.h" #include "base/stl_util.h" Modified: branches/2014Q3/www/chromium/files/patch-base__posix__unix_domain_socket_linux_unittest.cc ============================================================================== --- branches/2014Q3/www/chromium/files/patch-base__posix__unix_domain_socket_linux_unittest.cc Wed Sep 10 14:23:43 2014 (r367851) +++ branches/2014Q3/www/chromium/files/patch-base__posix__unix_domain_socket_linux_unittest.cc Wed Sep 10 14:29:15 2014 (r367852) @@ -1,5 +1,5 @@ ---- ./base/posix/unix_domain_socket_linux_unittest.cc.orig 2014-08-12 21:01:28.000000000 +0200 -+++ ./base/posix/unix_domain_socket_linux_unittest.cc 2014-08-13 09:56:56.000000000 +0200 +--- ./base/posix/unix_domain_socket_linux_unittest.cc.orig 2014-08-20 21:02:41.000000000 +0200 ++++ ./base/posix/unix_domain_socket_linux_unittest.cc 2014-08-22 15:06:24.000000000 +0200 @@ -2,8 +2,13 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. Modified: branches/2014Q3/www/chromium/files/patch-base__process__internal_linux.h ============================================================================== --- branches/2014Q3/www/chromium/files/patch-base__process__internal_linux.h Wed Sep 10 14:23:43 2014 (r367851) +++ branches/2014Q3/www/chromium/files/patch-base__process__internal_linux.h Wed Sep 10 14:29:15 2014 (r367852) @@ -1,5 +1,5 @@ ---- ./base/process/internal_linux.h.orig 2014-08-12 21:01:27.000000000 +0200 -+++ ./base/process/internal_linux.h 2014-08-13 09:56:56.000000000 +0200 +--- ./base/process/internal_linux.h.orig 2014-08-20 21:02:41.000000000 +0200 ++++ ./base/process/internal_linux.h 2014-08-22 15:06:24.000000000 +0200 @@ -12,6 +12,8 @@ #include "base/files/file_path.h" Modified: branches/2014Q3/www/chromium/files/patch-base__process__launch.cc ============================================================================== --- branches/2014Q3/www/chromium/files/patch-base__process__launch.cc Wed Sep 10 14:23:43 2014 (r367851) +++ branches/2014Q3/www/chromium/files/patch-base__process__launch.cc Wed Sep 10 14:29:15 2014 (r367852) @@ -1,6 +1,6 @@ ---- ./base/process/launch.cc.orig 2014-08-12 21:01:27.000000000 +0200 -+++ ./base/process/launch.cc 2014-08-13 09:56:56.000000000 +0200 -@@ -23,10 +23,10 @@ +--- ./base/process/launch.cc.orig 2014-08-20 21:02:41.000000000 +0200 ++++ ./base/process/launch.cc 2014-08-22 15:06:24.000000000 +0200 +@@ -24,10 +24,10 @@ fds_to_remap(NULL), maximize_rlimits(NULL), new_process_group(false) Modified: branches/2014Q3/www/chromium/files/patch-base__process__launch.h ============================================================================== --- branches/2014Q3/www/chromium/files/patch-base__process__launch.h Wed Sep 10 14:23:43 2014 (r367851) +++ branches/2014Q3/www/chromium/files/patch-base__process__launch.h Wed Sep 10 14:29:15 2014 (r367852) @@ -1,6 +1,6 @@ ---- ./base/process/launch.h.orig 2014-08-12 21:01:27.000000000 +0200 -+++ ./base/process/launch.h 2014-08-13 09:56:56.000000000 +0200 -@@ -108,14 +108,14 @@ +--- ./base/process/launch.h.orig 2014-08-20 21:02:41.000000000 +0200 ++++ ./base/process/launch.h 2014-08-22 15:06:24.000000000 +0200 +@@ -113,14 +113,14 @@ // will be the same as its pid. bool new_process_group; Modified: branches/2014Q3/www/chromium/files/patch-base__process__memory_unittest.cc ============================================================================== --- branches/2014Q3/www/chromium/files/patch-base__process__memory_unittest.cc Wed Sep 10 14:23:43 2014 (r367851) +++ branches/2014Q3/www/chromium/files/patch-base__process__memory_unittest.cc Wed Sep 10 14:29:15 2014 (r367852) @@ -1,5 +1,5 @@ ---- ./base/process/memory_unittest.cc.orig 2014-08-12 21:01:27.000000000 +0200 -+++ ./base/process/memory_unittest.cc 2014-08-13 09:56:56.000000000 +0200 +--- ./base/process/memory_unittest.cc.orig 2014-08-20 21:02:41.000000000 +0200 ++++ ./base/process/memory_unittest.cc 2014-08-22 15:06:24.000000000 +0200 @@ -151,9 +151,9 @@ // Android doesn't implement set_new_handler, so we can't use the Modified: branches/2014Q3/www/chromium/files/patch-base__process__process_iterator_freebsd.cc ============================================================================== --- branches/2014Q3/www/chromium/files/patch-base__process__process_iterator_freebsd.cc Wed Sep 10 14:23:43 2014 (r367851) +++ branches/2014Q3/www/chromium/files/patch-base__process__process_iterator_freebsd.cc Wed Sep 10 14:29:15 2014 (r367852) @@ -1,5 +1,5 @@ ---- ./base/process/process_iterator_freebsd.cc.orig 2014-08-12 21:01:27.000000000 +0200 -+++ ./base/process/process_iterator_freebsd.cc 2014-08-13 09:56:56.000000000 +0200 +--- ./base/process/process_iterator_freebsd.cc.orig 2014-08-20 21:02:41.000000000 +0200 ++++ ./base/process/process_iterator_freebsd.cc 2014-08-22 15:06:24.000000000 +0200 @@ -8,6 +8,10 @@ #include #include Modified: branches/2014Q3/www/chromium/files/patch-base__process__process_metrics.h ============================================================================== --- branches/2014Q3/www/chromium/files/patch-base__process__process_metrics.h Wed Sep 10 14:23:43 2014 (r367851) +++ branches/2014Q3/www/chromium/files/patch-base__process__process_metrics.h Wed Sep 10 14:29:15 2014 (r367852) @@ -1,5 +1,5 @@ ---- ./base/process/process_metrics.h.orig 2014-08-12 21:01:27.000000000 +0200 -+++ ./base/process/process_metrics.h 2014-08-13 09:56:56.000000000 +0200 +--- ./base/process/process_metrics.h.orig 2014-08-20 21:02:41.000000000 +0200 ++++ ./base/process/process_metrics.h 2014-08-22 15:06:24.000000000 +0200 @@ -17,6 +17,13 @@ #include "base/time/time.h" #include "base/values.h" @@ -14,7 +14,7 @@ #if defined(OS_MACOSX) #include #endif -@@ -242,13 +249,17 @@ +@@ -246,13 +253,17 @@ // CPU-related ticks. Returns -1 on parse error. // Exposed for testing. BASE_EXPORT int ParseProcStatCPU(const std::string& input); Modified: branches/2014Q3/www/chromium/files/patch-base__process__process_metrics_freebsd.cc ============================================================================== --- branches/2014Q3/www/chromium/files/patch-base__process__process_metrics_freebsd.cc Wed Sep 10 14:23:43 2014 (r367851) +++ branches/2014Q3/www/chromium/files/patch-base__process__process_metrics_freebsd.cc Wed Sep 10 14:29:15 2014 (r367852) @@ -1,5 +1,5 @@ ---- ./base/process/process_metrics_freebsd.cc.orig 2014-08-12 21:01:27.000000000 +0200 -+++ ./base/process/process_metrics_freebsd.cc 2014-08-13 09:56:56.000000000 +0200 +--- ./base/process/process_metrics_freebsd.cc.orig 2014-08-20 21:02:41.000000000 +0200 ++++ ./base/process/process_metrics_freebsd.cc 2014-08-22 15:06:24.000000000 +0200 @@ -10,6 +10,9 @@ #include "base/sys_info.h" Modified: branches/2014Q3/www/chromium/files/patch-base__security_unittest.cc ============================================================================== --- branches/2014Q3/www/chromium/files/patch-base__security_unittest.cc Wed Sep 10 14:23:43 2014 (r367851) +++ branches/2014Q3/www/chromium/files/patch-base__security_unittest.cc Wed Sep 10 14:29:15 2014 (r367852) @@ -1,5 +1,5 @@ ---- ./base/security_unittest.cc.orig 2014-08-12 21:01:28.000000000 +0200 -+++ ./base/security_unittest.cc 2014-08-13 09:56:56.000000000 +0200 +--- ./base/security_unittest.cc.orig 2014-08-20 21:02:42.000000000 +0200 ++++ ./base/security_unittest.cc 2014-08-22 15:06:24.000000000 +0200 @@ -160,7 +160,7 @@ // FAILS_ is too clunky. void OverflowTestsSoftExpectTrue(bool overflow_detected) { Modified: branches/2014Q3/www/chromium/files/patch-base__strings__safe_sprintf.cc ============================================================================== --- branches/2014Q3/www/chromium/files/patch-base__strings__safe_sprintf.cc Wed Sep 10 14:23:43 2014 (r367851) +++ branches/2014Q3/www/chromium/files/patch-base__strings__safe_sprintf.cc Wed Sep 10 14:29:15 2014 (r367852) @@ -1,5 +1,5 @@ ---- ./base/strings/safe_sprintf.cc.orig 2014-08-12 21:01:27.000000000 +0200 -+++ ./base/strings/safe_sprintf.cc 2014-08-13 09:56:56.000000000 +0200 +--- ./base/strings/safe_sprintf.cc.orig 2014-08-20 21:02:42.000000000 +0200 ++++ ./base/strings/safe_sprintf.cc 2014-08-22 15:06:24.000000000 +0200 @@ -107,11 +107,11 @@ : buffer_(buffer), size_(size - 1), // Account for trailing NUL byte Modified: branches/2014Q3/www/chromium/files/patch-base__sys_info_freebsd.cc ============================================================================== --- branches/2014Q3/www/chromium/files/patch-base__sys_info_freebsd.cc Wed Sep 10 14:23:43 2014 (r367851) +++ branches/2014Q3/www/chromium/files/patch-base__sys_info_freebsd.cc Wed Sep 10 14:29:15 2014 (r367852) @@ -1,5 +1,5 @@ ---- ./base/sys_info_freebsd.cc.orig 2014-08-12 21:01:28.000000000 +0200 -+++ ./base/sys_info_freebsd.cc 2014-08-13 09:56:56.000000000 +0200 +--- ./base/sys_info_freebsd.cc.orig 2014-08-20 21:02:42.000000000 +0200 ++++ ./base/sys_info_freebsd.cc 2014-08-22 15:06:24.000000000 +0200 @@ -4,6 +4,7 @@ #include "base/sys_info.h" Modified: branches/2014Q3/www/chromium/files/patch-base__sys_info_posix.cc ============================================================================== --- branches/2014Q3/www/chromium/files/patch-base__sys_info_posix.cc Wed Sep 10 14:23:43 2014 (r367851) +++ branches/2014Q3/www/chromium/files/patch-base__sys_info_posix.cc Wed Sep 10 14:29:15 2014 (r367852) @@ -1,5 +1,5 @@ ---- ./base/sys_info_posix.cc.orig 2014-08-12 21:01:28.000000000 +0200 -+++ ./base/sys_info_posix.cc 2014-08-13 09:56:56.000000000 +0200 +--- ./base/sys_info_posix.cc.orig 2014-08-20 21:02:42.000000000 +0200 ++++ ./base/sys_info_posix.cc 2014-08-22 15:06:24.000000000 +0200 @@ -64,7 +64,7 @@ namespace base { Modified: branches/2014Q3/www/chromium/files/patch-base__test__expectations__expectation.cc ============================================================================== --- branches/2014Q3/www/chromium/files/patch-base__test__expectations__expectation.cc Wed Sep 10 14:23:43 2014 (r367851) +++ branches/2014Q3/www/chromium/files/patch-base__test__expectations__expectation.cc Wed Sep 10 14:29:15 2014 (r367852) @@ -1,5 +1,5 @@ ---- ./base/test/expectations/expectation.cc.orig 2014-08-12 21:01:28.000000000 +0200 -+++ ./base/test/expectations/expectation.cc 2014-08-13 09:56:56.000000000 +0200 +--- ./base/test/expectations/expectation.cc.orig 2014-08-20 21:02:41.000000000 +0200 ++++ ./base/test/expectations/expectation.cc 2014-08-22 15:06:24.000000000 +0200 @@ -60,6 +60,7 @@ variant != "64") { return false; Modified: branches/2014Q3/www/chromium/files/patch-base__test__launcher__test_launcher.cc ============================================================================== --- branches/2014Q3/www/chromium/files/patch-base__test__launcher__test_launcher.cc Wed Sep 10 14:23:43 2014 (r367851) +++ branches/2014Q3/www/chromium/files/patch-base__test__launcher__test_launcher.cc Wed Sep 10 14:29:15 2014 (r367852) @@ -1,6 +1,6 @@ ---- ./base/test/launcher/test_launcher.cc.orig 2014-08-12 21:01:28.000000000 +0200 -+++ ./base/test/launcher/test_launcher.cc 2014-08-13 09:56:56.000000000 +0200 -@@ -40,6 +40,10 @@ +--- ./base/test/launcher/test_launcher.cc.orig 2014-08-20 21:02:41.000000000 +0200 ++++ ./base/test/launcher/test_launcher.cc 2014-08-22 15:06:24.000000000 +0200 +@@ -41,6 +41,10 @@ #include "base/mac/scoped_nsautorelease_pool.h" #endif @@ -10,4 +10,4 @@ + namespace base { - // See https://groups.google.com/a/chromium.org/d/msg/chromium-dev/nkdTP7sstSc/uT3FaE_sgkAJ . + // Launches a child process using |command_line|. If the child process is still Modified: branches/2014Q3/www/chromium/files/patch-base__threading__platform_thread_linux.cc ============================================================================== --- branches/2014Q3/www/chromium/files/patch-base__threading__platform_thread_linux.cc Wed Sep 10 14:23:43 2014 (r367851) +++ branches/2014Q3/www/chromium/files/patch-base__threading__platform_thread_linux.cc Wed Sep 10 14:29:15 2014 (r367852) @@ -1,5 +1,5 @@ ---- ./base/threading/platform_thread_linux.cc.orig 2014-08-12 21:01:27.000000000 +0200 -+++ ./base/threading/platform_thread_linux.cc 2014-08-13 09:56:56.000000000 +0200 +--- ./base/threading/platform_thread_linux.cc.orig 2014-08-20 21:02:41.000000000 +0200 ++++ ./base/threading/platform_thread_linux.cc 2014-08-22 15:06:24.000000000 +0200 @@ -16,7 +16,9 @@ #include "base/tracked_objects.h" Modified: branches/2014Q3/www/chromium/files/patch-breakpad__breakpad.gyp ============================================================================== --- branches/2014Q3/www/chromium/files/patch-breakpad__breakpad.gyp Wed Sep 10 14:23:43 2014 (r367851) +++ branches/2014Q3/www/chromium/files/patch-breakpad__breakpad.gyp Wed Sep 10 14:29:15 2014 (r367852) @@ -1,5 +1,5 @@ ---- ./breakpad/breakpad.gyp.orig 2014-08-12 21:02:55.000000000 +0200 -+++ ./breakpad/breakpad.gyp 2014-08-13 09:56:56.000000000 +0200 +--- ./breakpad/breakpad.gyp.orig 2014-08-20 21:02:30.000000000 +0200 ++++ ./breakpad/breakpad.gyp 2014-08-22 15:06:24.000000000 +0200 @@ -340,7 +340,7 @@ }, ], Modified: branches/2014Q3/www/chromium/files/patch-build__common.gypi ============================================================================== --- branches/2014Q3/www/chromium/files/patch-build__common.gypi Wed Sep 10 14:23:43 2014 (r367851) +++ branches/2014Q3/www/chromium/files/patch-build__common.gypi Wed Sep 10 14:29:15 2014 (r367852) @@ -1,15 +1,15 @@ ---- ./build/common.gypi.orig 2014-08-12 21:02:52.000000000 +0200 -+++ ./build/common.gypi 2014-08-13 09:56:56.000000000 +0200 -@@ -101,7 +101,7 @@ - # - # TODO(erg): Merge this into the previous block once compiling with - # aura safely implies including ash capabilities. -- ['OS=="linux"', { -+ ['OS=="linux" or OS=="freebsd"', { +--- ./build/common.gypi.orig 2014-08-20 21:02:29.000000000 +0200 ++++ ./build/common.gypi 2014-08-22 15:06:24.000000000 +0200 +@@ -87,7 +87,7 @@ + + 'conditions': [ + # ChromeOS and Windows use Aura and Ash. +- ['chromeos==1 or OS=="win" or OS=="linux"', { ++ ['chromeos==1 or OS=="win" or OS=="linux" or OS=="freebsd"', { + 'use_ash%': 1, 'use_aura%': 1, }], - -@@ -622,7 +622,7 @@ +@@ -645,7 +645,7 @@ }], # DBus usage. @@ -18,7 +18,7 @@ 'use_dbus%': 1, }, { 'use_dbus%': 0, -@@ -896,7 +896,7 @@ +@@ -926,7 +926,7 @@ # except when building Android WebView. # TODO(jshin): Handle 'use_system_icu' on Linux (Chromium). # Set the data reduction proxy origin for Android Webview. @@ -27,17 +27,18 @@ 'icu_use_data_file_flag%' : 1, 'spdy_proxy_auth_origin%': '', 'data_reduction_proxy_probe_url%': '', -@@ -1106,6 +1106,9 @@ +@@ -1153,6 +1153,10 @@ # able to turn it off for various reasons. 'linux_disable_pie%': 0, ++ # XXX(rene) More options, keep them? + 'os_ver%': 0, + 'use_system_libjpeg%': 0, + # The release channel that this build targets. This is used to restrict # channel-specific build options, like which installer packages to create. # The default is 'all', which does no channel-specific filtering. -@@ -3960,6 +3963,13 @@ +@@ -4150,6 +4154,13 @@ 'ldflags': [ '-Wl,--no-keep-memory', ], Modified: branches/2014Q3/www/chromium/files/patch-build__filename_rules.gypi ============================================================================== --- branches/2014Q3/www/chromium/files/patch-build__filename_rules.gypi Wed Sep 10 14:23:43 2014 (r367851) +++ branches/2014Q3/www/chromium/files/patch-build__filename_rules.gypi Wed Sep 10 14:29:15 2014 (r367852) @@ -1,5 +1,5 @@ ---- ./build/filename_rules.gypi.orig 2014-08-12 21:02:52.000000000 +0200 -+++ ./build/filename_rules.gypi 2014-08-13 09:56:56.000000000 +0200 +--- ./build/filename_rules.gypi.orig 2014-08-20 21:02:29.000000000 +0200 ++++ ./build/filename_rules.gypi 2014-08-22 15:06:24.000000000 +0200 @@ -85,7 +85,7 @@ ['<(use_aura)==0 or OS!="win" or >(nacl_untrusted_build)==1', { 'sources/': [ ['exclude', '_aurawin\\.(h|cc)$'] ] Modified: branches/2014Q3/www/chromium/files/patch-build__linux__system.gyp ============================================================================== --- branches/2014Q3/www/chromium/files/patch-build__linux__system.gyp Wed Sep 10 14:23:43 2014 (r367851) +++ branches/2014Q3/www/chromium/files/patch-build__linux__system.gyp Wed Sep 10 14:29:15 2014 (r367852) @@ -1,6 +1,6 @@ ---- ./build/linux/system.gyp.orig 2014-08-12 21:02:52.000000000 +0200 -+++ ./build/linux/system.gyp 2014-08-13 09:56:56.000000000 +0200 -@@ -885,6 +885,13 @@ +--- ./build/linux/system.gyp.orig 2014-08-20 21:02:29.000000000 +0200 ++++ ./build/linux/system.gyp 2014-08-22 15:06:24.000000000 +0200 +@@ -881,6 +881,13 @@ 'include_dirs': [ '../..', ], Modified: branches/2014Q3/www/chromium/files/patch-build__linux__unbundle__libwebp.gyp ============================================================================== --- branches/2014Q3/www/chromium/files/patch-build__linux__unbundle__libwebp.gyp Wed Sep 10 14:23:43 2014 (r367851) +++ branches/2014Q3/www/chromium/files/patch-build__linux__unbundle__libwebp.gyp Wed Sep 10 14:29:15 2014 (r367852) @@ -1,5 +1,5 @@ ---- ./build/linux/unbundle/libwebp.gyp.orig 2014-08-12 21:02:52.000000000 +0200 -+++ ./build/linux/unbundle/libwebp.gyp 2014-08-13 09:56:56.000000000 +0200 +--- ./build/linux/unbundle/libwebp.gyp.orig 2014-08-20 21:02:29.000000000 +0200 ++++ ./build/linux/unbundle/libwebp.gyp 2014-08-22 15:06:24.000000000 +0200 @@ -14,13 +14,7 @@ }, 'link_settings': { Modified: branches/2014Q3/www/chromium/files/patch-build__linux__unbundle__openssl.gyp ============================================================================== --- branches/2014Q3/www/chromium/files/patch-build__linux__unbundle__openssl.gyp Wed Sep 10 14:23:43 2014 (r367851) +++ branches/2014Q3/www/chromium/files/patch-build__linux__unbundle__openssl.gyp Wed Sep 10 14:29:15 2014 (r367852) @@ -1,5 +1,5 @@ ---- build/linux/unbundle/openssl.gyp.orig 2014-08-12 21:02:52.000000000 +0200 -+++ build/linux/unbundle/openssl.gyp 2014-08-18 17:16:23.000000000 +0200 +--- ./build/linux/unbundle/openssl.gyp.orig 2014-08-20 21:02:29.000000000 +0200 ++++ ./build/linux/unbundle/openssl.gyp 2014-08-22 15:06:24.000000000 +0200 @@ -9,15 +9,15 @@ 'type': 'none', 'direct_dependent_settings': { Modified: branches/2014Q3/www/chromium/files/patch-cc__layers__layer_impl.cc ============================================================================== --- branches/2014Q3/www/chromium/files/patch-cc__layers__layer_impl.cc Wed Sep 10 14:23:43 2014 (r367851) +++ branches/2014Q3/www/chromium/files/patch-cc__layers__layer_impl.cc Wed Sep 10 14:29:15 2014 (r367852) @@ -1,6 +1,6 @@ ---- ./cc/layers/layer_impl.cc.orig 2014-08-12 21:03:00.000000000 +0200 -+++ ./cc/layers/layer_impl.cc 2014-08-13 09:56:56.000000000 +0200 -@@ -1215,21 +1215,23 @@ +--- ./cc/layers/layer_impl.cc.orig 2014-08-20 21:02:36.000000000 +0200 ++++ ./cc/layers/layer_impl.cc 2014-08-22 15:06:24.000000000 +0200 +@@ -1190,21 +1190,23 @@ scale_factor * scaled_scroll_bounds.height()); scaled_scroll_bounds = gfx::ToFlooredSize(scaled_scroll_bounds); Modified: branches/2014Q3/www/chromium/files/patch-chrome__app__chrome_main_delegate.cc ============================================================================== --- branches/2014Q3/www/chromium/files/patch-chrome__app__chrome_main_delegate.cc Wed Sep 10 14:23:43 2014 (r367851) +++ branches/2014Q3/www/chromium/files/patch-chrome__app__chrome_main_delegate.cc Wed Sep 10 14:29:15 2014 (r367852) @@ -1,5 +1,5 @@ ---- ./chrome/app/chrome_main_delegate.cc.orig 2014-08-12 21:02:25.000000000 +0200 -+++ ./chrome/app/chrome_main_delegate.cc 2014-08-13 09:56:56.000000000 +0200 +--- ./chrome/app/chrome_main_delegate.cc.orig 2014-08-20 21:01:26.000000000 +0200 ++++ ./chrome/app/chrome_main_delegate.cc 2014-08-22 15:06:24.000000000 +0200 @@ -96,7 +96,7 @@ #include "ui/base/x/x11_util.h" #endif @@ -18,7 +18,7 @@ base::LazyInstance::Leaky g_chrome_breakpad_client = LAZY_INSTANCE_INITIALIZER; #endif -@@ -245,7 +245,7 @@ +@@ -226,7 +226,7 @@ // Needed for scrollbar related images. process_type == switches::kWorkerProcess || #endif @@ -27,7 +27,7 @@ // The zygote process opens the resources for the renderers. process_type == switches::kZygoteProcess || #endif -@@ -459,7 +459,7 @@ +@@ -440,7 +440,7 @@ std::string format_str = command_line.GetSwitchValueASCII(switches::kDiagnosticsFormat); if (format_str == "machine") { @@ -36,7 +36,7 @@ } else if (format_str == "log") { format = diagnostics::DiagnosticsWriter::LOG; } else { -@@ -500,7 +500,7 @@ +@@ -491,7 +491,7 @@ std::string format_str = command_line.GetSwitchValueASCII(switches::kDiagnosticsFormat); if (format_str == "machine") { @@ -45,7 +45,7 @@ } else if (format_str == "human") { format = diagnostics::DiagnosticsWriter::HUMAN; } else { -@@ -632,7 +632,7 @@ +@@ -621,7 +621,7 @@ std::string process_type = command_line.GetSwitchValueASCII(switches::kProcessType); @@ -54,30 +54,30 @@ breakpad::SetBreakpadClient(g_chrome_breakpad_client.Pointer()); #endif -@@ -757,7 +757,7 @@ +@@ -743,7 +743,7 @@ #endif } -#if defined(OS_POSIX) && !defined(OS_MACOSX) -+#if defined(OS_POSIX) && !defined(OS_MACOSX) && !defined(OS_FREEBSD) ++#if defined(OS_POSIX) && !defined(OS_MACOSX) && !defined(OS_BSD) // Zygote needs to call InitCrashReporter() in RunZygote(). if (process_type != switches::kZygoteProcess) { #if defined(OS_ANDROID) -@@ -769,7 +769,7 @@ +@@ -755,7 +755,7 @@ breakpad::InitCrashReporter(process_type); #endif // defined(OS_ANDROID) } -#endif // defined(OS_POSIX) && !defined(OS_MACOSX) -+#endif // defined(OS_POSIX) && !defined(OS_MACOSX) && !defined(OS_FREEBSD) ++#endif // defined(OS_POSIX) && !defined(OS_MACOSX) && !defined(OS_BSD) // After all the platform Breakpads have been initialized, store the command // line for crash reporting. -@@ -854,7 +854,7 @@ +@@ -840,7 +840,7 @@ return process_type == switches::kNaClLoaderProcess || process_type == switches::kRelauncherProcess; } -#elif defined(OS_POSIX) && !defined(OS_ANDROID) +#elif defined(OS_POSIX) && !defined(OS_ANDROID) && !defined(OS_BSD) - content::ZygoteForkDelegate* ChromeMainDelegate::ZygoteStarting() { - #if defined(DISABLE_NACL) - return NULL; + void ChromeMainDelegate::ZygoteStarting( + ScopedVector* delegates) { + #if !defined(DISABLE_NACL) Modified: branches/2014Q3/www/chromium/files/patch-chrome__app__chrome_main_delegate.h ============================================================================== --- branches/2014Q3/www/chromium/files/patch-chrome__app__chrome_main_delegate.h Wed Sep 10 14:23:43 2014 (r367851) +++ branches/2014Q3/www/chromium/files/patch-chrome__app__chrome_main_delegate.h Wed Sep 10 14:29:15 2014 (r367852) @@ -1,11 +1,11 @@ ---- ./chrome/app/chrome_main_delegate.h.orig 2014-08-12 21:02:25.000000000 +0200 -+++ ./chrome/app/chrome_main_delegate.h 2014-08-13 09:56:56.000000000 +0200 -@@ -35,7 +35,7 @@ +--- ./chrome/app/chrome_main_delegate.h.orig 2014-08-20 21:01:26.000000000 +0200 ++++ ./chrome/app/chrome_main_delegate.h 2014-08-22 15:06:24.000000000 +0200 +@@ -38,7 +38,7 @@ virtual bool ShouldSendMachPort(const std::string& process_type) OVERRIDE; virtual bool DelaySandboxInitialization( const std::string& process_type) OVERRIDE; -#elif defined(OS_POSIX) && !defined(OS_ANDROID) +#elif defined(OS_POSIX) && !defined(OS_ANDROID) && !defined(OS_BSD) - virtual content::ZygoteForkDelegate* ZygoteStarting() OVERRIDE; + virtual void ZygoteStarting( + ScopedVector* delegates) OVERRIDE; virtual void ZygoteForked() OVERRIDE; - #endif Modified: branches/2014Q3/www/chromium/files/patch-chrome__app__chromium_strings.grd ============================================================================== --- branches/2014Q3/www/chromium/files/patch-chrome__app__chromium_strings.grd Wed Sep 10 14:23:43 2014 (r367851) +++ branches/2014Q3/www/chromium/files/patch-chrome__app__chromium_strings.grd Wed Sep 10 14:29:15 2014 (r367852) @@ -1,6 +1,6 @@ ---- ./chrome/app/chromium_strings.grd.orig 2014-08-12 21:02:25.000000000 +0200 -+++ ./chrome/app/chromium_strings.grd 2014-08-13 09:56:56.000000000 +0200 -@@ -1099,7 +1099,7 @@ +--- ./chrome/app/chromium_strings.grd.orig 2014-08-20 21:01:26.000000000 +0200 ++++ ./chrome/app/chromium_strings.grd 2014-08-22 15:06:24.000000000 +0200 +@@ -1102,7 +1102,7 @@ Copied: branches/2014Q3/www/chromium/files/patch-chrome__app__resources__locale_settings.grd (from r366226, head/www/chromium/files/patch-chrome__app__resources__locale_settings.grd) ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ branches/2014Q3/www/chromium/files/patch-chrome__app__resources__locale_settings.grd Wed Sep 10 14:29:15 2014 (r367852, copy of r366226, head/www/chromium/files/patch-chrome__app__resources__locale_settings.grd) @@ -0,0 +1,11 @@ +--- ./chrome/app/resources/locale_settings.grd.orig 2014-08-20 21:01:26.000000000 +0200 ++++ ./chrome/app/resources/locale_settings.grd 2014-08-23 15:49:37.000000000 +0200 +@@ -264,7 +264,7 @@ + 55 + + +- ++ + + + 300 Modified: branches/2014Q3/www/chromium/files/patch-chrome__browser__about_flags.cc ============================================================================== --- branches/2014Q3/www/chromium/files/patch-chrome__browser__about_flags.cc Wed Sep 10 14:23:43 2014 (r367851) +++ branches/2014Q3/www/chromium/files/patch-chrome__browser__about_flags.cc Wed Sep 10 14:29:15 2014 (r367852) @@ -1,6 +1,6 @@ ---- ./chrome/browser/about_flags.cc.orig 2014-08-12 21:01:48.000000000 +0200 -+++ ./chrome/browser/about_flags.cc 2014-08-13 09:56:56.000000000 +0200 -@@ -2183,7 +2183,7 @@ +--- ./chrome/browser/about_flags.cc.orig 2014-08-20 21:02:13.000000000 +0200 ++++ ./chrome/browser/about_flags.cc 2014-08-22 15:06:24.000000000 +0200 +@@ -2263,7 +2263,7 @@ return kOsWin; #elif defined(OS_CHROMEOS) // Needs to be before the OS_LINUX check. return kOsCrOS; Modified: branches/2014Q3/www/chromium/files/patch-chrome__browser__browser_process_impl.cc ============================================================================== --- branches/2014Q3/www/chromium/files/patch-chrome__browser__browser_process_impl.cc Wed Sep 10 14:23:43 2014 (r367851) +++ branches/2014Q3/www/chromium/files/patch-chrome__browser__browser_process_impl.cc Wed Sep 10 14:29:15 2014 (r367852) @@ -1,6 +1,6 @@ ---- ./chrome/browser/browser_process_impl.cc.orig 2014-08-12 21:01:48.000000000 +0200 -+++ ./chrome/browser/browser_process_impl.cc 2014-08-13 09:56:56.000000000 +0200 -@@ -239,7 +239,7 @@ +--- ./chrome/browser/browser_process_impl.cc.orig 2014-08-20 21:02:13.000000000 +0200 ++++ ./chrome/browser/browser_process_impl.cc 2014-08-22 15:06:24.000000000 +0200 +@@ -248,7 +248,7 @@ ExtensionRendererState::GetInstance()->Shutdown(); Modified: branches/2014Q3/www/chromium/files/patch-chrome__browser__chrome_browser_main.cc ============================================================================== --- branches/2014Q3/www/chromium/files/patch-chrome__browser__chrome_browser_main.cc Wed Sep 10 14:23:43 2014 (r367851) +++ branches/2014Q3/www/chromium/files/patch-chrome__browser__chrome_browser_main.cc Wed Sep 10 14:29:15 2014 (r367852) @@ -1,6 +1,6 @@ ---- ./chrome/browser/chrome_browser_main.cc.orig 2014-08-12 21:01:47.000000000 +0200 -+++ ./chrome/browser/chrome_browser_main.cc 2014-08-13 09:56:56.000000000 +0200 -@@ -926,7 +926,7 @@ +--- ./chrome/browser/chrome_browser_main.cc.orig 2014-08-20 21:02:13.000000000 +0200 ++++ ./chrome/browser/chrome_browser_main.cc 2014-08-22 15:06:24.000000000 +0200 +@@ -925,7 +925,7 @@ } #endif Modified: branches/2014Q3/www/chromium/files/patch-chrome__browser__chrome_browser_main_posix.cc ============================================================================== --- branches/2014Q3/www/chromium/files/patch-chrome__browser__chrome_browser_main_posix.cc Wed Sep 10 14:23:43 2014 (r367851) +++ branches/2014Q3/www/chromium/files/patch-chrome__browser__chrome_browser_main_posix.cc Wed Sep 10 14:29:15 2014 (r367852) @@ -1,6 +1,6 @@ ---- ./chrome/browser/chrome_browser_main_posix.cc.orig 2014-08-12 21:01:48.000000000 +0200 -+++ ./chrome/browser/chrome_browser_main_posix.cc 2014-08-13 09:56:56.000000000 +0200 -@@ -305,6 +305,11 @@ +--- ./chrome/browser/chrome_browser_main_posix.cc.orig 2014-08-20 21:02:13.000000000 +0200 ++++ ./chrome/browser/chrome_browser_main_posix.cc 2014-08-22 15:06:24.000000000 +0200 +@@ -270,6 +270,11 @@ g_pipe_pid = getpid(); g_shutdown_pipe_read_fd = pipefd[0]; g_shutdown_pipe_write_fd = pipefd[1]; @@ -12,7 +12,7 @@ #if !defined(ADDRESS_SANITIZER) && !defined(KEEP_SHADOW_STACKS) const size_t kShutdownDetectorThreadStackSize = PTHREAD_STACK_MIN * 2; #else -@@ -313,6 +318,7 @@ +@@ -278,6 +283,7 @@ // size to avoid hitting the guard page. const size_t kShutdownDetectorThreadStackSize = PTHREAD_STACK_MIN * 4; #endif Modified: branches/2014Q3/www/chromium/files/patch-chrome__browser__chrome_content_browser_client.cc ============================================================================== --- branches/2014Q3/www/chromium/files/patch-chrome__browser__chrome_content_browser_client.cc Wed Sep 10 14:23:43 2014 (r367851) +++ branches/2014Q3/www/chromium/files/patch-chrome__browser__chrome_content_browser_client.cc Wed Sep 10 14:29:15 2014 (r367852) @@ -1,6 +1,6 @@ ---- ./chrome/browser/chrome_content_browser_client.cc.orig 2014-08-12 21:01:48.000000000 +0200 -+++ ./chrome/browser/chrome_content_browser_client.cc 2014-08-13 09:56:56.000000000 +0200 -@@ -492,7 +492,7 @@ +--- ./chrome/browser/chrome_content_browser_client.cc.orig 2014-08-20 21:02:13.000000000 +0200 ++++ ./chrome/browser/chrome_content_browser_client.cc 2014-08-22 15:06:24.000000000 +0200 +@@ -509,7 +509,7 @@ } } @@ -9,7 +9,7 @@ breakpad::CrashHandlerHostLinux* CreateCrashHandlerHost( const std::string& process_type) { base::FilePath dumps_path; -@@ -548,7 +548,7 @@ +@@ -566,7 +566,7 @@ return -1; } @@ -18,7 +18,7 @@ #endif // !defined(OS_ANDROID) #if !defined(OS_CHROMEOS) -@@ -1459,7 +1459,7 @@ +@@ -1533,7 +1533,7 @@ void ChromeContentBrowserClient::AppendExtraCommandLineSwitches( CommandLine* command_line, int child_process_id) { @@ -27,7 +27,7 @@ if (breakpad::IsCrashReporterEnabled()) { std::string enable_crash_reporter; GoogleUpdateSettings::GetMetricsId(&enable_crash_reporter); -@@ -2563,7 +2563,7 @@ +@@ -2683,7 +2683,7 @@ #endif } @@ -36,7 +36,7 @@ void ChromeContentBrowserClient::GetAdditionalMappedFilesForChildProcess( const CommandLine& command_line, int child_process_id, -@@ -2617,7 +2617,7 @@ +@@ -2749,7 +2749,7 @@ } #endif // defined(OS_ANDROID) } Modified: branches/2014Q3/www/chromium/files/patch-chrome__browser__chrome_content_browser_client.h ============================================================================== --- branches/2014Q3/www/chromium/files/patch-chrome__browser__chrome_content_browser_client.h Wed Sep 10 14:23:43 2014 (r367851) +++ branches/2014Q3/www/chromium/files/patch-chrome__browser__chrome_content_browser_client.h Wed Sep 10 14:29:15 2014 (r367852) @@ -1,8 +1,8 @@ ---- ./chrome/browser/chrome_content_browser_client.h.orig 2014-08-12 21:01:48.000000000 +0200 -+++ ./chrome/browser/chrome_content_browser_client.h 2014-08-13 09:56:56.000000000 +0200 -@@ -260,7 +260,7 @@ - const base::FilePath& storage_partition_path, - ScopedVector* additional_backends) OVERRIDE; +--- ./chrome/browser/chrome_content_browser_client.h.orig 2014-08-20 21:02:13.000000000 +0200 ++++ ./chrome/browser/chrome_content_browser_client.h 2014-08-22 15:06:24.000000000 +0200 +@@ -288,7 +288,7 @@ + virtual net::CookieStore* OverrideCookieStoreForRenderProcess( + int render_process_id) OVERRIDE; -#if defined(OS_POSIX) && !defined(OS_MACOSX) +#if defined(OS_POSIX) && !defined(OS_MACOSX) && !defined(OS_BSD) Modified: branches/2014Q3/www/chromium/files/patch-chrome__browser__diagnostics__diagnostics_writer.cc ============================================================================== --- branches/2014Q3/www/chromium/files/patch-chrome__browser__diagnostics__diagnostics_writer.cc Wed Sep 10 14:23:43 2014 (r367851) +++ branches/2014Q3/www/chromium/files/patch-chrome__browser__diagnostics__diagnostics_writer.cc Wed Sep 10 14:29:15 2014 (r367852) @@ -1,5 +1,5 @@ ---- ./chrome/browser/diagnostics/diagnostics_writer.cc.orig 2014-08-12 21:01:46.000000000 +0200 -+++ ./chrome/browser/diagnostics/diagnostics_writer.cc 2014-08-13 09:56:56.000000000 +0200 +--- ./chrome/browser/diagnostics/diagnostics_writer.cc.orig 2014-08-20 21:02:00.000000000 +0200 ++++ ./chrome/browser/diagnostics/diagnostics_writer.cc 2014-08-22 15:06:24.000000000 +0200 @@ -268,7 +268,7 @@ console_->SetColor(color); console_->Write(base::ASCIIToUTF16(result)); Modified: branches/2014Q3/www/chromium/files/patch-chrome__browser__diagnostics__diagnostics_writer.h ============================================================================== --- branches/2014Q3/www/chromium/files/patch-chrome__browser__diagnostics__diagnostics_writer.h Wed Sep 10 14:23:43 2014 (r367851) +++ branches/2014Q3/www/chromium/files/patch-chrome__browser__diagnostics__diagnostics_writer.h Wed Sep 10 14:29:15 2014 (r367852) @@ -1,5 +1,5 @@ ---- ./chrome/browser/diagnostics/diagnostics_writer.h.orig 2014-08-12 21:01:46.000000000 +0200 -+++ ./chrome/browser/diagnostics/diagnostics_writer.h 2014-08-13 09:56:56.000000000 +0200 +--- ./chrome/browser/diagnostics/diagnostics_writer.h.orig 2014-08-20 21:02:00.000000000 +0200 ++++ ./chrome/browser/diagnostics/diagnostics_writer.h 2014-08-22 15:06:24.000000000 +0200 @@ -18,7 +18,7 @@ public: // The type of formatting done by this writer. Modified: branches/2014Q3/www/chromium/files/patch-chrome__browser__extensions__api__image_writer_private__image_writer_private_api.cc ============================================================================== --- branches/2014Q3/www/chromium/files/patch-chrome__browser__extensions__api__image_writer_private__image_writer_private_api.cc Wed Sep 10 14:23:43 2014 (r367851) +++ branches/2014Q3/www/chromium/files/patch-chrome__browser__extensions__api__image_writer_private__image_writer_private_api.cc Wed Sep 10 14:29:15 2014 (r367852) @@ -1,5 +1,5 @@ ---- ./chrome/browser/extensions/api/image_writer_private/image_writer_private_api.cc.orig 2014-08-12 21:01:44.000000000 +0200 -+++ ./chrome/browser/extensions/api/image_writer_private/image_writer_private_api.cc 2014-08-13 09:56:56.000000000 +0200 +--- ./chrome/browser/extensions/api/image_writer_private/image_writer_private_api.cc.orig 2014-08-20 21:01:58.000000000 +0200 ++++ ./chrome/browser/extensions/api/image_writer_private/image_writer_private_api.cc 2014-08-22 15:06:24.000000000 +0200 @@ -167,10 +167,12 @@ } Modified: branches/2014Q3/www/chromium/files/patch-chrome__browser__extensions__api__music_manager_private__device_id_linux.cc ============================================================================== --- branches/2014Q3/www/chromium/files/patch-chrome__browser__extensions__api__music_manager_private__device_id_linux.cc Wed Sep 10 14:23:43 2014 (r367851) +++ branches/2014Q3/www/chromium/files/patch-chrome__browser__extensions__api__music_manager_private__device_id_linux.cc Wed Sep 10 14:29:15 2014 (r367852) @@ -1,5 +1,5 @@ ---- ./chrome/browser/extensions/api/music_manager_private/device_id_linux.cc.orig 2014-08-12 21:01:44.000000000 +0200 -+++ ./chrome/browser/extensions/api/music_manager_private/device_id_linux.cc 2014-08-13 09:56:56.000000000 +0200 +--- ./chrome/browser/extensions/api/music_manager_private/device_id_linux.cc.orig 2014-08-20 21:01:57.000000000 +0200 ++++ ./chrome/browser/extensions/api/music_manager_private/device_id_linux.cc 2014-08-22 15:06:24.000000000 +0200 @@ -4,6 +4,10 @@ #include "chrome/browser/extensions/api/music_manager_private/device_id.h" Modified: branches/2014Q3/www/chromium/files/patch-chrome__browser__extensions__api__serial__serial_api.cc ============================================================================== --- branches/2014Q3/www/chromium/files/patch-chrome__browser__extensions__api__serial__serial_api.cc Wed Sep 10 14:23:43 2014 (r367851) +++ branches/2014Q3/www/chromium/files/patch-chrome__browser__extensions__api__serial__serial_api.cc Wed Sep 10 14:29:15 2014 (r367852) @@ -1,18 +1,15 @@ ---- ./chrome/browser/extensions/api/serial/serial_api.cc.orig 2014-08-12 21:01:44.000000000 +0200 -+++ ./chrome/browser/extensions/api/serial/serial_api.cc 2014-08-13 09:56:56.000000000 +0200 -@@ -84,7 +84,7 @@ - +--- ./chrome/browser/extensions/api/serial/serial_api.cc.orig 2014-08-20 21:01:58.000000000 +0200 ++++ ./chrome/browser/extensions/api/serial/serial_api.cc 2014-08-22 15:06:24.000000000 +0200 +@@ -85,11 +85,13 @@ void SerialGetDevicesFunction::Work() { DCHECK_CURRENTLY_ON(BrowserThread::FILE); -- + +#if !defined(OS_FREEBSD) //XXX(rene) quick hack - device::SerialDeviceInfoList devices; scoped_ptr enumerator = device::SerialDeviceEnumerator::Create(); -@@ -106,6 +106,7 @@ - } - - results_ = serial::GetDevices::Results::Create(out_devices); + mojo::Array devices = enumerator->GetDevices(); + results_ = serial::GetDevices::Results::Create( + devices.To > >()); +#endif } Modified: branches/2014Q3/www/chromium/files/patch-chrome__browser__extensions__api__serial__serial_connection_posix.cc ============================================================================== --- branches/2014Q3/www/chromium/files/patch-chrome__browser__extensions__api__serial__serial_connection_posix.cc Wed Sep 10 14:23:43 2014 (r367851) +++ branches/2014Q3/www/chromium/files/patch-chrome__browser__extensions__api__serial__serial_connection_posix.cc Wed Sep 10 14:29:15 2014 (r367852) @@ -1,5 +1,5 @@ ---- ./chrome/browser/extensions/api/serial/serial_connection_posix.cc.orig 2014-08-12 21:01:44.000000000 +0200 -+++ ./chrome/browser/extensions/api/serial/serial_connection_posix.cc 2014-08-13 09:56:56.000000000 +0200 +--- ./chrome/browser/extensions/api/serial/serial_connection_posix.cc.orig 2014-08-20 21:01:58.000000000 +0200 ++++ ./chrome/browser/extensions/api/serial/serial_connection_posix.cc 2014-08-22 15:06:24.000000000 +0200 @@ -36,7 +36,7 @@ BITRATE_TO_SPEED_CASE(9600) BITRATE_TO_SPEED_CASE(19200) Modified: branches/2014Q3/www/chromium/files/patch-chrome__browser__gpu__gl_string_manager.cc ============================================================================== --- branches/2014Q3/www/chromium/files/patch-chrome__browser__gpu__gl_string_manager.cc Wed Sep 10 14:23:43 2014 (r367851) +++ branches/2014Q3/www/chromium/files/patch-chrome__browser__gpu__gl_string_manager.cc Wed Sep 10 14:29:15 2014 (r367852) @@ -1,5 +1,5 @@ ---- ./chrome/browser/gpu/gl_string_manager.cc.orig 2014-08-12 21:01:33.000000000 +0200 -+++ ./chrome/browser/gpu/gl_string_manager.cc 2014-08-13 09:56:56.000000000 +0200 +--- ./chrome/browser/gpu/gl_string_manager.cc.orig 2014-08-20 21:02:06.000000000 +0200 ++++ ./chrome/browser/gpu/gl_string_manager.cc 2014-08-22 15:06:24.000000000 +0200 @@ -25,7 +25,7 @@ void GLStringManager::Initialize() { Modified: branches/2014Q3/www/chromium/files/patch-chrome__browser__gpu__gpu_feature_checker.cc ============================================================================== --- branches/2014Q3/www/chromium/files/patch-chrome__browser__gpu__gpu_feature_checker.cc Wed Sep 10 14:23:43 2014 (r367851) +++ branches/2014Q3/www/chromium/files/patch-chrome__browser__gpu__gpu_feature_checker.cc Wed Sep 10 14:29:15 2014 (r367852) @@ -1,5 +1,5 @@ ---- ./chrome/browser/gpu/gpu_feature_checker.cc.orig 2014-08-12 21:01:33.000000000 +0200 -+++ ./chrome/browser/gpu/gpu_feature_checker.cc 2014-08-13 09:56:56.000000000 +0200 +--- ./chrome/browser/gpu/gpu_feature_checker.cc.orig 2014-08-20 21:02:06.000000000 +0200 ++++ ./chrome/browser/gpu/gpu_feature_checker.cc 2014-08-22 15:06:24.000000000 +0200 @@ -33,7 +33,7 @@ CHECK(content::BrowserThread::CurrentlyOn(content::BrowserThread::UI)); Modified: branches/2014Q3/www/chromium/files/patch-chrome__browser__media__webrtc_log_uploader.cc ============================================================================== --- branches/2014Q3/www/chromium/files/patch-chrome__browser__media__webrtc_log_uploader.cc Wed Sep 10 14:23:43 2014 (r367851) +++ branches/2014Q3/www/chromium/files/patch-chrome__browser__media__webrtc_log_uploader.cc Wed Sep 10 14:29:15 2014 (r367852) @@ -1,6 +1,6 @@ ---- ./chrome/browser/media/webrtc_log_uploader.cc.orig 2014-08-12 21:01:33.000000000 +0200 -+++ ./chrome/browser/media/webrtc_log_uploader.cc 2014-08-13 09:56:56.000000000 +0200 -@@ -196,6 +196,8 @@ +--- ./chrome/browser/media/webrtc_log_uploader.cc.orig 2014-08-20 21:02:12.000000000 +0200 ++++ ./chrome/browser/media/webrtc_log_uploader.cc 2014-08-22 15:06:24.000000000 +0200 +@@ -233,6 +233,8 @@ const char product[] = "Chrome_Android"; #elif defined(OS_CHROMEOS) const char product[] = "Chrome_ChromeOS"; Modified: branches/2014Q3/www/chromium/files/patch-chrome__browser__media_galleries__fileapi__mtp_device_map_service.cc ============================================================================== --- branches/2014Q3/www/chromium/files/patch-chrome__browser__media_galleries__fileapi__mtp_device_map_service.cc Wed Sep 10 14:23:43 2014 (r367851) +++ branches/2014Q3/www/chromium/files/patch-chrome__browser__media_galleries__fileapi__mtp_device_map_service.cc Wed Sep 10 14:29:15 2014 (r367852) @@ -1,5 +1,5 @@ ---- ./chrome/browser/media_galleries/fileapi/mtp_device_map_service.cc.orig 2014-08-12 21:01:32.000000000 +0200 -+++ ./chrome/browser/media_galleries/fileapi/mtp_device_map_service.cc 2014-08-13 09:56:56.000000000 +0200 +--- ./chrome/browser/media_galleries/fileapi/mtp_device_map_service.cc.orig 2014-08-20 21:01:59.000000000 +0200 ++++ ./chrome/browser/media_galleries/fileapi/mtp_device_map_service.cc 2014-08-22 15:06:24.000000000 +0200 @@ -33,9 +33,11 @@ // Note that this initializes the delegate asynchronously, but since // the delegate will only be used from the IO thread, it is guaranteed Modified: branches/2014Q3/www/chromium/files/patch-chrome__browser__media_galleries__media_file_system_registry.cc ============================================================================== --- branches/2014Q3/www/chromium/files/patch-chrome__browser__media_galleries__media_file_system_registry.cc Wed Sep 10 14:23:43 2014 (r367851) +++ branches/2014Q3/www/chromium/files/patch-chrome__browser__media_galleries__media_file_system_registry.cc Wed Sep 10 14:29:15 2014 (r367852) @@ -1,5 +1,5 @@ ---- ./chrome/browser/media_galleries/media_file_system_registry.cc.orig 2014-08-12 21:01:33.000000000 +0200 -+++ ./chrome/browser/media_galleries/media_file_system_registry.cc 2014-08-13 09:56:56.000000000 +0200 +--- ./chrome/browser/media_galleries/media_file_system_registry.cc.orig 2014-08-20 21:01:59.000000000 +0200 ++++ ./chrome/browser/media_galleries/media_file_system_registry.cc 2014-08-22 15:06:24.000000000 +0200 @@ -724,7 +724,10 @@ // Constructor in 'private' section because depends on private class definition. MediaFileSystemRegistry::MediaFileSystemRegistry() Modified: branches/2014Q3/www/chromium/files/patch-chrome__browser__media_galleries__media_folder_finder.cc ============================================================================== --- branches/2014Q3/www/chromium/files/patch-chrome__browser__media_galleries__media_folder_finder.cc Wed Sep 10 14:23:43 2014 (r367851) +++ branches/2014Q3/www/chromium/files/patch-chrome__browser__media_galleries__media_folder_finder.cc Wed Sep 10 14:29:15 2014 (r367852) @@ -1,5 +1,5 @@ ---- ./chrome/browser/media_galleries/media_folder_finder.cc.orig 2014-08-12 21:01:33.000000000 +0200 -+++ ./chrome/browser/media_galleries/media_folder_finder.cc 2014-08-13 09:56:56.000000000 +0200 +--- ./chrome/browser/media_galleries/media_folder_finder.cc.orig 2014-08-20 21:01:59.000000000 +0200 ++++ ./chrome/browser/media_galleries/media_folder_finder.cc 2014-08-22 15:06:24.000000000 +0200 @@ -50,10 +50,10 @@ chrome::DIR_USER_APPLICATIONS, chrome::DIR_USER_LIBRARY, Modified: branches/2014Q3/www/chromium/files/patch-chrome__browser__memory_details.cc ============================================================================== --- branches/2014Q3/www/chromium/files/patch-chrome__browser__memory_details.cc Wed Sep 10 14:23:43 2014 (r367851) +++ branches/2014Q3/www/chromium/files/patch-chrome__browser__memory_details.cc Wed Sep 10 14:29:15 2014 (r367852) @@ -1,5 +1,5 @@ ---- ./chrome/browser/memory_details.cc.orig 2014-08-12 21:01:47.000000000 +0200 -+++ ./chrome/browser/memory_details.cc 2014-08-13 09:56:56.000000000 +0200 +--- ./chrome/browser/memory_details.cc.orig 2014-08-20 21:02:13.000000000 +0200 ++++ ./chrome/browser/memory_details.cc 2014-08-22 15:06:25.000000000 +0200 @@ -32,7 +32,7 @@ #include "grit/generated_resources.h" #include "ui/base/l10n/l10n_util.h" @@ -16,9 +16,9 @@ -#if defined(OS_POSIX) && !defined(OS_MACOSX) && !defined(OS_ANDROID) +#if defined(OS_POSIX) && !defined(OS_MACOSX) && !defined(OS_ANDROID) && !defined(OS_BSD) const pid_t zygote_pid = content::ZygoteHost::GetInstance()->GetPid(); - const pid_t sandbox_helper_pid = - content::ZygoteHost::GetInstance()->GetSandboxHelperPid(); -@@ -336,7 +336,7 @@ + #endif + +@@ -334,7 +334,7 @@ } } @@ -26,4 +26,4 @@ +#if defined(OS_POSIX) && !defined(OS_MACOSX) && !defined(OS_ANDROID) && !defined(OS_BSD) if (process.pid == zygote_pid) { process.process_type = content::PROCESS_TYPE_ZYGOTE; - } else if (process.pid == sandbox_helper_pid) { + } Modified: branches/2014Q3/www/chromium/files/patch-chrome__browser__net__connection_tester.cc ============================================================================== --- branches/2014Q3/www/chromium/files/patch-chrome__browser__net__connection_tester.cc Wed Sep 10 14:23:43 2014 (r367851) +++ branches/2014Q3/www/chromium/files/patch-chrome__browser__net__connection_tester.cc Wed Sep 10 14:29:15 2014 (r367852) @@ -1,6 +1,6 @@ ---- ./chrome/browser/net/connection_tester.cc.orig 2014-08-12 21:01:39.000000000 +0200 -+++ ./chrome/browser/net/connection_tester.cc 2014-08-13 09:56:56.000000000 +0200 -@@ -213,7 +213,7 @@ +--- ./chrome/browser/net/connection_tester.cc.orig 2014-08-20 21:02:09.000000000 +0200 ++++ ./chrome/browser/net/connection_tester.cc 2014-08-22 15:06:25.000000000 +0200 +@@ -217,7 +217,7 @@ // Otherwise returns a network error code. int CreateSystemProxyConfigService( scoped_ptr* config_service) { Modified: branches/2014Q3/www/chromium/files/patch-chrome__browser__omaha_query_params__omaha_query_params.cc ============================================================================== --- branches/2014Q3/www/chromium/files/patch-chrome__browser__omaha_query_params__omaha_query_params.cc Wed Sep 10 14:23:43 2014 (r367851) +++ branches/2014Q3/www/chromium/files/patch-chrome__browser__omaha_query_params__omaha_query_params.cc Wed Sep 10 14:29:15 2014 (r367852) @@ -1,5 +1,5 @@ ---- ./chrome/browser/omaha_query_params/omaha_query_params.cc.orig 2014-08-12 21:01:47.000000000 +0200 -+++ ./chrome/browser/omaha_query_params/omaha_query_params.cc 2014-08-13 09:56:56.000000000 +0200 +--- ./chrome/browser/omaha_query_params/omaha_query_params.cc.orig 2014-08-20 21:02:00.000000000 +0200 ++++ ./chrome/browser/omaha_query_params/omaha_query_params.cc 2014-08-22 15:06:25.000000000 +0200 @@ -29,6 +29,8 @@ "linux"; #elif defined(OS_OPENBSD) Modified: branches/2014Q3/www/chromium/files/patch-chrome__browser__plugins__plugins_resource_service.cc ============================================================================== --- branches/2014Q3/www/chromium/files/patch-chrome__browser__plugins__plugins_resource_service.cc Wed Sep 10 14:23:43 2014 (r367851) +++ branches/2014Q3/www/chromium/files/patch-chrome__browser__plugins__plugins_resource_service.cc Wed Sep 10 14:29:15 2014 (r367852) @@ -1,5 +1,5 @@ ---- ./chrome/browser/plugins/plugins_resource_service.cc.orig 2014-08-12 21:01:47.000000000 +0200 -+++ ./chrome/browser/plugins/plugins_resource_service.cc 2014-08-13 09:56:56.000000000 +0200 +--- ./chrome/browser/plugins/plugins_resource_service.cc.orig 2014-08-20 21:02:13.000000000 +0200 ++++ ./chrome/browser/plugins/plugins_resource_service.cc 2014-08-22 15:06:25.000000000 +0200 @@ -33,7 +33,7 @@ std::string filename; #if defined(OS_WIN) Modified: branches/2014Q3/www/chromium/files/patch-chrome__browser__policy__policy_prefs_browsertest.cc ============================================================================== --- branches/2014Q3/www/chromium/files/patch-chrome__browser__policy__policy_prefs_browsertest.cc Wed Sep 10 14:23:43 2014 (r367851) +++ branches/2014Q3/www/chromium/files/patch-chrome__browser__policy__policy_prefs_browsertest.cc Wed Sep 10 14:29:15 2014 (r367852) @@ -1,5 +1,5 @@ ---- ./chrome/browser/policy/policy_prefs_browsertest.cc.orig 2014-08-12 21:01:40.000000000 +0200 -+++ ./chrome/browser/policy/policy_prefs_browsertest.cc 2014-08-13 09:56:56.000000000 +0200 +--- ./chrome/browser/policy/policy_prefs_browsertest.cc.orig 2014-08-20 21:02:01.000000000 +0200 ++++ ./chrome/browser/policy/policy_prefs_browsertest.cc 2014-08-22 15:06:25.000000000 +0200 @@ -169,6 +169,8 @@ const std::string os("chromeos"); #elif defined(OS_LINUX) Modified: branches/2014Q3/www/chromium/files/patch-chrome__browser__ui__startup__startup_browser_creator.cc ============================================================================== --- branches/2014Q3/www/chromium/files/patch-chrome__browser__ui__startup__startup_browser_creator.cc Wed Sep 10 14:23:43 2014 (r367851) +++ branches/2014Q3/www/chromium/files/patch-chrome__browser__ui__startup__startup_browser_creator.cc Wed Sep 10 14:29:15 2014 (r367852) @@ -1,5 +1,5 @@ ---- ./chrome/browser/ui/startup/startup_browser_creator.cc.orig 2014-08-12 21:01:35.000000000 +0200 -+++ ./chrome/browser/ui/startup/startup_browser_creator.cc 2014-08-13 09:56:56.000000000 +0200 +--- ./chrome/browser/ui/startup/startup_browser_creator.cc.orig 2014-08-20 21:02:04.000000000 +0200 ++++ ./chrome/browser/ui/startup/startup_browser_creator.cc 2014-08-22 15:06:25.000000000 +0200 @@ -81,7 +81,7 @@ #include "chromeos/chromeos_switches.h" #endif Modified: branches/2014Q3/www/chromium/files/patch-chrome__browser__ui__views__first_run_dialog.cc ============================================================================== --- branches/2014Q3/www/chromium/files/patch-chrome__browser__ui__views__first_run_dialog.cc Wed Sep 10 14:23:43 2014 (r367851) +++ branches/2014Q3/www/chromium/files/patch-chrome__browser__ui__views__first_run_dialog.cc Wed Sep 10 14:29:15 2014 (r367852) @@ -1,5 +1,5 @@ ---- ./chrome/browser/ui/views/first_run_dialog.cc.orig 2014-08-12 21:01:38.000000000 +0200 -+++ ./chrome/browser/ui/views/first_run_dialog.cc 2014-08-13 09:56:56.000000000 +0200 +--- ./chrome/browser/ui/views/first_run_dialog.cc.orig 2014-08-20 21:02:04.000000000 +0200 ++++ ./chrome/browser/ui/views/first_run_dialog.cc 2014-08-22 15:06:25.000000000 +0200 @@ -124,12 +124,16 @@ bool FirstRunDialog::Accept() { GetWidget()->Hide(); Modified: branches/2014Q3/www/chromium/files/patch-chrome__browser__ui__webui__about_ui.cc ============================================================================== --- branches/2014Q3/www/chromium/files/patch-chrome__browser__ui__webui__about_ui.cc Wed Sep 10 14:23:43 2014 (r367851) +++ branches/2014Q3/www/chromium/files/patch-chrome__browser__ui__webui__about_ui.cc Wed Sep 10 14:29:15 2014 (r367852) @@ -1,6 +1,6 @@ ---- ./chrome/browser/ui/webui/about_ui.cc.orig 2014-08-12 21:01:37.000000000 +0200 -+++ ./chrome/browser/ui/webui/about_ui.cc 2014-08-13 09:56:57.000000000 +0200 -@@ -763,7 +763,7 @@ +--- ./chrome/browser/ui/webui/about_ui.cc.orig 2014-08-20 21:02:03.000000000 +0200 ++++ ./chrome/browser/ui/webui/about_ui.cc 2014-08-22 15:06:25.000000000 +0200 +@@ -761,7 +761,7 @@ return data; } @@ -9,7 +9,7 @@ std::string AboutLinuxProxyConfig() { std::string data; AppendHeader(&data, 0, -@@ -779,6 +779,7 @@ +@@ -777,6 +777,7 @@ return data; } @@ -17,7 +17,7 @@ void AboutSandboxRow(std::string* data, const std::string& prefix, int name_id, bool good) { data->append(""); -@@ -849,6 +850,7 @@ +@@ -847,6 +848,7 @@ return data; } #endif @@ -25,7 +25,7 @@ // AboutMemoryHandler ---------------------------------------------------------- -@@ -1019,7 +1021,7 @@ +@@ -1017,7 +1019,7 @@ } else if (source_name_ == chrome::kChromeUIDNSHost) { AboutDnsHandler::Start(profile(), callback); return; Modified: branches/2014Q3/www/chromium/files/patch-chrome__browser__ui__webui__chrome_web_ui_controller_factory.cc ============================================================================== --- branches/2014Q3/www/chromium/files/patch-chrome__browser__ui__webui__chrome_web_ui_controller_factory.cc Wed Sep 10 14:23:43 2014 (r367851) +++ branches/2014Q3/www/chromium/files/patch-chrome__browser__ui__webui__chrome_web_ui_controller_factory.cc Wed Sep 10 14:29:15 2014 (r367852) @@ -1,6 +1,6 @@ ---- ./chrome/browser/ui/webui/chrome_web_ui_controller_factory.cc.orig 2014-08-12 21:01:37.000000000 +0200 -+++ ./chrome/browser/ui/webui/chrome_web_ui_controller_factory.cc 2014-08-13 09:56:57.000000000 +0200 *** DIFF OUTPUT TRUNCATED AT 1000 LINES *** From owner-svn-ports-branches@FreeBSD.ORG Wed Sep 10 14:31:27 2014 Return-Path: Delivered-To: svn-ports-branches@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [8.8.178.115]) (using TLSv1 with cipher ADH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTPS id C7EDE29B; Wed, 10 Sep 2014 14:31:27 +0000 (UTC) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:1900:2254:2068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id 993011B6C; Wed, 10 Sep 2014 14:31:27 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.9/8.14.9) with ESMTP id s8AEVRjo096464; Wed, 10 Sep 2014 14:31:27 GMT (envelope-from rene@FreeBSD.org) Received: (from rene@localhost) by svn.freebsd.org (8.14.9/8.14.9/Submit) id s8AEVRpw096460; Wed, 10 Sep 2014 14:31:27 GMT (envelope-from rene@FreeBSD.org) Message-Id: <201409101431.s8AEVRpw096460@svn.freebsd.org> X-Authentication-Warning: svn.freebsd.org: rene set sender to rene@FreeBSD.org using -f From: Rene Ladan Date: Wed, 10 Sep 2014 14:31:27 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-branches@freebsd.org Subject: svn commit: r367854 - branches/2014Q3/www/chromium X-SVN-Group: ports-branches MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-ports-branches@freebsd.org X-Mailman-Version: 2.1.18-1 Precedence: list List-Id: SVN commit messages for all the branches of the ports tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 10 Sep 2014 14:31:27 -0000 Author: rene Date: Wed Sep 10 14:31:26 2014 New Revision: 367854 URL: http://svnweb.freebsd.org/changeset/ports/367854 QAT: https://qat.redports.org/buildarchive/r367854/ Log: MFH: r367846 www/chromium: update to 37.0.2062.120 Obtained from: FreeBSD Chromium Project Security: http://vuxml.freebsd.org/freebsd/36a415c8-3867-11e4-b522-00262d5ed8ee.html Approved by: ports-secteam (zi) Modified: branches/2014Q3/www/chromium/Makefile branches/2014Q3/www/chromium/distinfo Directory Properties: branches/2014Q3/ (props changed) Modified: branches/2014Q3/www/chromium/Makefile ============================================================================== --- branches/2014Q3/www/chromium/Makefile Wed Sep 10 14:30:02 2014 (r367853) +++ branches/2014Q3/www/chromium/Makefile Wed Sep 10 14:31:26 2014 (r367854) @@ -2,7 +2,7 @@ # $FreeBSD$ PORTNAME= chromium -PORTVERSION= 37.0.2062.94 +PORTVERSION= 37.0.2062.120 CATEGORIES= www MASTER_SITES= http://commondatastorage.googleapis.com/chromium-browser-official/ DISTFILES= ${DISTNAME}${EXTRACT_SUFX} Modified: branches/2014Q3/www/chromium/distinfo ============================================================================== --- branches/2014Q3/www/chromium/distinfo Wed Sep 10 14:30:02 2014 (r367853) +++ branches/2014Q3/www/chromium/distinfo Wed Sep 10 14:31:26 2014 (r367854) @@ -1,4 +1,4 @@ -SHA256 (chromium-37.0.2062.94.tar.xz) = d27c19580b74cbe143131f0bc097557b3b2fb3d2be966e688d8af51a779ce533 -SIZE (chromium-37.0.2062.94.tar.xz) = 220064328 -SHA256 (chromium-37.0.2062.94-testdata.tar.xz) = 055ff2df325a20b03e12eae3b553e126eb5c63144fe9184a07d8d2f4db3fb9b4 -SIZE (chromium-37.0.2062.94-testdata.tar.xz) = 114484240 +SHA256 (chromium-37.0.2062.120.tar.xz) = b3073758b6caf384d30de20ba7514ee52cce5c1460bc768cd28d15f53f0c6efb +SIZE (chromium-37.0.2062.120.tar.xz) = 223332628 +SHA256 (chromium-37.0.2062.120-testdata.tar.xz) = 4d0fcc08caff9f12581695ca1d6c4bc87dfb9cd0428802408cc30809ea414e0d +SIZE (chromium-37.0.2062.120-testdata.tar.xz) = 114482628 From owner-svn-ports-branches@FreeBSD.ORG Fri Sep 12 14:59:24 2014 Return-Path: Delivered-To: svn-ports-branches@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) (using TLSv1 with cipher ADH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTPS id 9E4AC4D8; Fri, 12 Sep 2014 14:59:24 +0000 (UTC) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:1900:2254:2068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id 6EC17B6F; Fri, 12 Sep 2014 14:59:24 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.9/8.14.9) with ESMTP id s8CExOPr083976; Fri, 12 Sep 2014 14:59:24 GMT (envelope-from sunpoet@FreeBSD.org) Received: (from sunpoet@localhost) by svn.freebsd.org (8.14.9/8.14.9/Submit) id s8CExOOD083973; Fri, 12 Sep 2014 14:59:24 GMT (envelope-from sunpoet@FreeBSD.org) Message-Id: <201409121459.s8CExOOD083973@svn.freebsd.org> X-Authentication-Warning: svn.freebsd.org: sunpoet set sender to sunpoet@FreeBSD.org using -f From: Sunpoet Po-Chuan Hsieh Date: Fri, 12 Sep 2014 14:59:24 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-branches@freebsd.org Subject: svn commit: r368028 - in branches/2014Q3/mail/procmail: . files X-SVN-Group: ports-branches MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-ports-branches@freebsd.org X-Mailman-Version: 2.1.18-1 Precedence: list List-Id: SVN commit messages for all the branches of the ports tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Fri, 12 Sep 2014 14:59:24 -0000 Author: sunpoet Date: Fri Sep 12 14:59:23 2014 New Revision: 368028 URL: http://svnweb.freebsd.org/changeset/ports/368028 QAT: https://qat.redports.org/buildarchive/r368028/ Log: MFH: r368009 - Fix heap-based buffer overflow in formisc.c - Bump PORTREVISION for package change Security: CVE-2014-3618 Approved by: portmgr (erwin) Added: branches/2014Q3/mail/procmail/files/patch-src-formisc.c - copied unchanged from r368009, head/mail/procmail/files/patch-src-formisc.c Modified: branches/2014Q3/mail/procmail/Makefile Directory Properties: branches/2014Q3/ (props changed) Modified: branches/2014Q3/mail/procmail/Makefile ============================================================================== --- branches/2014Q3/mail/procmail/Makefile Fri Sep 12 14:16:50 2014 (r368027) +++ branches/2014Q3/mail/procmail/Makefile Fri Sep 12 14:59:23 2014 (r368028) @@ -3,7 +3,7 @@ PORTNAME= procmail PORTVERSION= 3.22 -PORTREVISION= 7 +PORTREVISION= 8 CATEGORIES= mail MASTER_SITES= ftp://ftp.ucsb.edu/pub/mirrors/procmail/ \ ftp://ftp.informatik.rwth-aachen.de/pub/packages/procmail/ \ Copied: branches/2014Q3/mail/procmail/files/patch-src-formisc.c (from r368009, head/mail/procmail/files/patch-src-formisc.c) ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ branches/2014Q3/mail/procmail/files/patch-src-formisc.c Fri Sep 12 14:59:23 2014 (r368028, copy of r368009, head/mail/procmail/files/patch-src-formisc.c) @@ -0,0 +1,16 @@ +--- src/formisc.c.orig 2001-06-29 10:20:45.000000000 +0800 ++++ src/formisc.c 2014-09-12 00:58:12.989105253 +0800 +@@ -84,12 +84,11 @@ + case '"':*target++=delim='"';start++; + } + ;{ int i; +- do ++ while(*start) + if((i= *target++= *start++)==delim) /* corresponding delimiter? */ + break; + else if(i=='\\'&&*start) /* skip quoted character */ + *target++= *start++; +- while(*start); /* anything? */ + } + hitspc=2; + } From owner-svn-ports-branches@FreeBSD.ORG Sat Sep 13 21:54:25 2014 Return-Path: Delivered-To: svn-ports-branches@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) (using TLSv1 with cipher ADH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTPS id 905A7880; Sat, 13 Sep 2014 21:54:25 +0000 (UTC) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:1900:2254:2068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id 7B3D1E28; Sat, 13 Sep 2014 21:54:25 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.9/8.14.9) with ESMTP id s8DLsPpG075044; Sat, 13 Sep 2014 21:54:25 GMT (envelope-from matthew@FreeBSD.org) Received: (from matthew@localhost) by svn.freebsd.org (8.14.9/8.14.9/Submit) id s8DLsPJf075042; Sat, 13 Sep 2014 21:54:25 GMT (envelope-from matthew@FreeBSD.org) Message-Id: <201409132154.s8DLsPJf075042@svn.freebsd.org> X-Authentication-Warning: svn.freebsd.org: matthew set sender to matthew@FreeBSD.org using -f From: Matthew Seaman Date: Sat, 13 Sep 2014 21:54:25 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-branches@freebsd.org Subject: svn commit: r368150 - branches/2014Q3/databases/phpmyadmin X-SVN-Group: ports-branches MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-ports-branches@freebsd.org X-Mailman-Version: 2.1.18-1 Precedence: list List-Id: SVN commit messages for all the branches of the ports tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sat, 13 Sep 2014 21:54:25 -0000 Author: matthew Date: Sat Sep 13 21:54:24 2014 New Revision: 368150 URL: http://svnweb.freebsd.org/changeset/ports/368150 QAT: https://qat.redports.org/buildarchive/r368150/ Log: MFH: r368145 Security update to 4.2.8.1 Advisory: http://www.phpmyadmin.net/home_page/security/PMASA-2014-10.php Security: cc627e6c-3b89-11e4-b629-6805ca0b3d42 Approved by: portmgr (zi) Modified: branches/2014Q3/databases/phpmyadmin/Makefile branches/2014Q3/databases/phpmyadmin/distinfo Directory Properties: branches/2014Q3/ (props changed) Modified: branches/2014Q3/databases/phpmyadmin/Makefile ============================================================================== --- branches/2014Q3/databases/phpmyadmin/Makefile Sat Sep 13 21:49:25 2014 (r368149) +++ branches/2014Q3/databases/phpmyadmin/Makefile Sat Sep 13 21:54:24 2014 (r368150) @@ -2,7 +2,7 @@ # $FreeBSD$ PORTNAME= phpMyAdmin -DISTVERSION= 4.2.7.1 +DISTVERSION= 4.2.8.1 CATEGORIES= databases www MASTER_SITES= SF/${PORTNAME:tl}/${PORTNAME}/${DISTVERSION} DISTNAME= ${PORTNAME}-${DISTVERSION}-all-languages Modified: branches/2014Q3/databases/phpmyadmin/distinfo ============================================================================== --- branches/2014Q3/databases/phpmyadmin/distinfo Sat Sep 13 21:49:25 2014 (r368149) +++ branches/2014Q3/databases/phpmyadmin/distinfo Sat Sep 13 21:54:24 2014 (r368150) @@ -1,2 +1,2 @@ -SHA256 (phpMyAdmin-4.2.7.1-all-languages.tar.xz) = 99682eb43d3104f08e4c0a9b26bf5bc24bb93da6eeb59f9087ade156c837c708 -SIZE (phpMyAdmin-4.2.7.1-all-languages.tar.xz) = 5138420 +SHA256 (phpMyAdmin-4.2.8.1-all-languages.tar.xz) = 4358b9d98beabcb7609cf9943f9d340ea09958897f0da20318a6f1cebb981704 +SIZE (phpMyAdmin-4.2.8.1-all-languages.tar.xz) = 5145812