Skip site navigation (1)Skip section navigation (2)
Date:      Fri, 12 May 2017 15:23:21 +0000 (UTC)
From:      Mark Felder <feld@FreeBSD.org>
To:        ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-branches@freebsd.org
Subject:   svn commit: r440684 - in branches/2017Q2/www/chromium: . files
Message-ID:  <201705121523.v4CFNL59089991@repo.freebsd.org>

next in thread | raw e-mail | index | archive | help
Author: feld
Date: Fri May 12 15:23:21 2017
New Revision: 440684
URL: https://svnweb.freebsd.org/changeset/ports/440684

Log:
  MFH: r440680 r440682
  
  www/chromium: update to 58.0.3029.110
  
  "This build contains a number of bug fixes, security updates and feature enhancements." [1]
  
  Changelog:	https://chromereleases.googleblog.com/2017/05/stable-channel-update-for-chrome-os_11.html [1]
  Approved by:	ports-secteam (with hat)

Added:
  branches/2017Q2/www/chromium/files/patch-chrome_app_chrome__main.cc
     - copied unchanged from r440680, head/www/chromium/files/patch-chrome_app_chrome__main.cc
  branches/2017Q2/www/chromium/files/patch-chrome_chrome__paks.gni
     - copied unchanged from r440680, head/www/chromium/files/patch-chrome_chrome__paks.gni
  branches/2017Q2/www/chromium/files/patch-headless_lib_browser_headless__content__browser__client.cc
     - copied unchanged from r440680, head/www/chromium/files/patch-headless_lib_browser_headless__content__browser__client.cc
  branches/2017Q2/www/chromium/files/patch-headless_lib_browser_headless__content__browser__client.h
     - copied unchanged from r440680, head/www/chromium/files/patch-headless_lib_browser_headless__content__browser__client.h
  branches/2017Q2/www/chromium/files/patch-headless_lib_headless__content__main__delegate.cc
     - copied unchanged from r440680, head/www/chromium/files/patch-headless_lib_headless__content__main__delegate.cc
  branches/2017Q2/www/chromium/files/patch-headless_lib_headless__content__main__delegate.h
     - copied unchanged from r440680, head/www/chromium/files/patch-headless_lib_headless__content__main__delegate.h
  branches/2017Q2/www/chromium/files/patch-headless_lib_headless__macros.h
     - copied unchanged from r440680, head/www/chromium/files/patch-headless_lib_headless__macros.h
  branches/2017Q2/www/chromium/files/patch-remoting_host_host__details.cc
     - copied unchanged from r440680, head/www/chromium/files/patch-remoting_host_host__details.cc
Modified:
  branches/2017Q2/www/chromium/Makefile
  branches/2017Q2/www/chromium/distinfo
Directory Properties:
  branches/2017Q2/   (props changed)

Modified: branches/2017Q2/www/chromium/Makefile
==============================================================================
--- branches/2017Q2/www/chromium/Makefile	Fri May 12 15:04:48 2017	(r440683)
+++ branches/2017Q2/www/chromium/Makefile	Fri May 12 15:23:21 2017	(r440684)
@@ -2,7 +2,7 @@
 # $FreeBSD$
 
 PORTNAME=	chromium
-PORTVERSION=	58.0.3029.96
+PORTVERSION=	58.0.3029.110
 CATEGORIES=	www
 MASTER_SITES=	http://commondatastorage.googleapis.com/chromium-browser-official/
 DISTFILES=	${DISTNAME}${EXTRACT_SUFX} # default, but needed to get distinfo correct if TEST is on

Modified: branches/2017Q2/www/chromium/distinfo
==============================================================================
--- branches/2017Q2/www/chromium/distinfo	Fri May 12 15:04:48 2017	(r440683)
+++ branches/2017Q2/www/chromium/distinfo	Fri May 12 15:23:21 2017	(r440684)
@@ -1,5 +1,5 @@
-TIMESTAMP = 1493784258
-SHA256 (chromium-58.0.3029.96.tar.xz) = 5d38fd7ad3b58bd09da8ff05f12354e94c2ad1bb203527a632b72cc3ff4a5181
-SIZE (chromium-58.0.3029.96.tar.xz) = 518160320
-SHA256 (chromium-58.0.3029.96-testdata.tar.xz) = 2451cfe8f25f578dbce3b85a00589e4609958db969ad4421f89e780751bf067b
-SIZE (chromium-58.0.3029.96-testdata.tar.xz) = 124156492
+TIMESTAMP = 1494416961
+SHA256 (chromium-58.0.3029.110.tar.xz) = f24cef3dd2acf9dd5ccdeeca47fea42d1c1ddff32b7375dc9e0cd35a4e8d78ff
+SIZE (chromium-58.0.3029.110.tar.xz) = 518167664
+SHA256 (chromium-58.0.3029.110-testdata.tar.xz) = 53ace1eaee38bc3bb11aef932851131d563a2deefb2fd9c9f1fa524b7098e472
+SIZE (chromium-58.0.3029.110-testdata.tar.xz) = 124161428

Copied: branches/2017Q2/www/chromium/files/patch-chrome_app_chrome__main.cc (from r440680, head/www/chromium/files/patch-chrome_app_chrome__main.cc)
==============================================================================
--- /dev/null	00:00:00 1970	(empty, because file is newly added)
+++ branches/2017Q2/www/chromium/files/patch-chrome_app_chrome__main.cc	Fri May 12 15:23:21 2017	(r440684, copy of r440680, head/www/chromium/files/patch-chrome_app_chrome__main.cc)
@@ -0,0 +1,19 @@
+--- chrome/app/chrome_main.cc.orig	2017-05-09 19:02:41 UTC
++++ chrome/app/chrome_main.cc
+@@ -97,14 +97,14 @@ int ChromeMain(int argc, const char** ar
+   ALLOW_UNUSED_LOCAL(command_line);
+ #endif
+ 
+-#if defined(OS_LINUX) || defined(OS_MACOSX)
++#if defined(OS_LINUX) || defined(OS_MACOSX) || defined(OS_BSD)
+   if (command_line->HasSwitch(switches::kHeadless)) {
+ #if defined(OS_MACOSX)
+     SetUpBundleOverrides();
+ #endif
+     return headless::HeadlessShellMain(argc, argv);
+   }
+-#endif  // defined(OS_LINUX) || defined(OS_MACOSX)
++#endif  // defined(OS_LINUX) || defined(OS_MACOSX) || defined(OS_BSD)
+ 
+ #if BUILDFLAG(ENABLE_PACKAGE_MASH_SERVICES)
+   version_info::Channel channel = chrome::GetChannel();

Copied: branches/2017Q2/www/chromium/files/patch-chrome_chrome__paks.gni (from r440680, head/www/chromium/files/patch-chrome_chrome__paks.gni)
==============================================================================
--- /dev/null	00:00:00 1970	(empty, because file is newly added)
+++ branches/2017Q2/www/chromium/files/patch-chrome_chrome__paks.gni	Fri May 12 15:23:21 2017	(r440684, copy of r440680, head/www/chromium/files/patch-chrome_chrome__paks.gni)
@@ -0,0 +1,11 @@
+--- chrome/chrome_paks.gni.orig	2017-05-09 19:02:43 UTC
++++ chrome/chrome_paks.gni
+@@ -157,7 +157,7 @@ template("chrome_extra_paks") {
+         "//ui/file_manager:resources",
+       ]
+     }
+-    if (is_linux) {
++    if (is_linux || is_bsd) {
+       sources += [ "$root_gen_dir/headless/headless_lib_resources.pak" ]
+       deps += [ "//headless:resources" ]
+     }

Copied: branches/2017Q2/www/chromium/files/patch-headless_lib_browser_headless__content__browser__client.cc (from r440680, head/www/chromium/files/patch-headless_lib_browser_headless__content__browser__client.cc)
==============================================================================
--- /dev/null	00:00:00 1970	(empty, because file is newly added)
+++ branches/2017Q2/www/chromium/files/patch-headless_lib_browser_headless__content__browser__client.cc	Fri May 12 15:23:21 2017	(r440684, copy of r440680, head/www/chromium/files/patch-headless_lib_browser_headless__content__browser__client.cc)
@@ -0,0 +1,20 @@
+--- headless/lib/browser/headless_content_browser_client.cc.orig	2017-05-09 19:02:47 UTC
++++ headless/lib/browser/headless_content_browser_client.cc
+@@ -171,7 +171,7 @@ void HeadlessContentBrowserClient::GetQu
+       callback);
+ }
+ 
+-#if defined(OS_POSIX) && !defined(OS_MACOSX)
++#if defined(OS_POSIX) && !defined(OS_MACOSX) && !defined(OS_BSD)
+ void HeadlessContentBrowserClient::GetAdditionalMappedFilesForChildProcess(
+     const base::CommandLine& command_line,
+     int child_process_id,
+@@ -182,7 +182,7 @@ void HeadlessContentBrowserClient::GetAd
+     mappings->Share(kCrashDumpSignal, crash_signal_fd);
+ #endif  // defined(HEADLESS_USE_BREAKPAD)
+ }
+-#endif  // defined(OS_POSIX) && !defined(OS_MACOSX)
++#endif  // defined(OS_POSIX) && !defined(OS_MACOSX) && !defined(OS_BSD)
+ 
+ void HeadlessContentBrowserClient::AppendExtraCommandLineSwitches(
+     base::CommandLine* command_line,

Copied: branches/2017Q2/www/chromium/files/patch-headless_lib_browser_headless__content__browser__client.h (from r440680, head/www/chromium/files/patch-headless_lib_browser_headless__content__browser__client.h)
==============================================================================
--- /dev/null	00:00:00 1970	(empty, because file is newly added)
+++ branches/2017Q2/www/chromium/files/patch-headless_lib_browser_headless__content__browser__client.h	Fri May 12 15:23:21 2017	(r440684, copy of r440680, head/www/chromium/files/patch-headless_lib_browser_headless__content__browser__client.h)
@@ -0,0 +1,11 @@
+--- headless/lib/browser/headless_content_browser_client.h.orig	2017-05-09 19:02:47 UTC
++++ headless/lib/browser/headless_content_browser_client.h
+@@ -28,7 +28,7 @@ class HeadlessContentBrowserClient : pub
+       content::BrowserContext* context,
+       content::StoragePartition* partition,
+       const storage::OptionalQuotaSettingsCallback& callback) override;
+-#if defined(OS_POSIX) && !defined(OS_MACOSX)
++#if defined(OS_POSIX) && !defined(OS_MACOSX) && !defined(OS_BSD)
+   void GetAdditionalMappedFilesForChildProcess(
+       const base::CommandLine& command_line,
+       int child_process_id,

Copied: branches/2017Q2/www/chromium/files/patch-headless_lib_headless__content__main__delegate.cc (from r440680, head/www/chromium/files/patch-headless_lib_headless__content__main__delegate.cc)
==============================================================================
--- /dev/null	00:00:00 1970	(empty, because file is newly added)
+++ branches/2017Q2/www/chromium/files/patch-headless_lib_headless__content__main__delegate.cc	Fri May 12 15:23:21 2017	(r440684, copy of r440680, head/www/chromium/files/patch-headless_lib_headless__content__main__delegate.cc)
@@ -0,0 +1,38 @@
+--- headless/lib/headless_content_main_delegate.cc.orig	2017-05-09 19:02:47 UTC
++++ headless/lib/headless_content_main_delegate.cc
+@@ -147,7 +147,7 @@ void HeadlessContentMainDelegate::InitCr
+   g_headless_crash_client.Pointer()->set_crash_dumps_dir(
+       browser_->options()->crash_dumps_dir);
+ 
+-#if !defined(OS_MACOSX)
++#if !defined(OS_MACOSX) && !defined(OS_BSD)
+   if (!browser_->options()->enable_crash_reporter) {
+     DCHECK(!breakpad::IsCrashReporterEnabled());
+     return;
+@@ -156,7 +156,7 @@ void HeadlessContentMainDelegate::InitCr
+   if (process_type != switches::kZygoteProcess)
+     breakpad::InitCrashReporter(process_type);
+ #endif  // defined(HEADLESS_USE_BREAKPAD)
+-#endif  // !defined(OS_MACOSX)
++#endif  // !defined(OS_MACOSX) && !defined(OS_BSD)
+ }
+ 
+ void HeadlessContentMainDelegate::PreSandboxStartup() {
+@@ -170,7 +170,7 @@ void HeadlessContentMainDelegate::PreSan
+   if (command_line.HasSwitch(switches::kEnableLogging))
+     InitLogging(command_line);
+ #endif
+-#if !defined(OS_MACOSX)
++#if !defined(OS_MACOSX) && !defined(OS_BSD)
+   InitCrashReporter(command_line);
+ #endif
+   InitializeResourceBundle();
+@@ -202,7 +202,7 @@ int HeadlessContentMainDelegate::RunProc
+   return 0;
+ }
+ 
+-#if !defined(OS_MACOSX) && defined(OS_POSIX) && !defined(OS_ANDROID)
++#if !defined(OS_MACOSX) && defined(OS_POSIX) && !defined(OS_ANDROID) && !defined(OS_BSD)
+ void HeadlessContentMainDelegate::ZygoteForked() {
+   const base::CommandLine& command_line(
+       *base::CommandLine::ForCurrentProcess());

Copied: branches/2017Q2/www/chromium/files/patch-headless_lib_headless__content__main__delegate.h (from r440680, head/www/chromium/files/patch-headless_lib_headless__content__main__delegate.h)
==============================================================================
--- /dev/null	00:00:00 1970	(empty, because file is newly added)
+++ branches/2017Q2/www/chromium/files/patch-headless_lib_headless__content__main__delegate.h	Fri May 12 15:23:21 2017	(r440684, copy of r440680, head/www/chromium/files/patch-headless_lib_headless__content__main__delegate.h)
@@ -0,0 +1,11 @@
+--- headless/lib/headless_content_main_delegate.h.orig	2017-05-09 19:02:47 UTC
++++ headless/lib/headless_content_main_delegate.h
+@@ -39,7 +39,7 @@ class HeadlessContentMainDelegate : publ
+ 
+   HeadlessBrowserImpl* browser() const { return browser_.get(); }
+ 
+-#if !defined(OS_MACOSX) && defined(OS_POSIX) && !defined(OS_ANDROID)
++#if !defined(OS_MACOSX) && defined(OS_POSIX) && !defined(OS_ANDROID) && !defined(OS_BSD)
+   void ZygoteForked() override;
+ #endif
+ 

Copied: branches/2017Q2/www/chromium/files/patch-headless_lib_headless__macros.h (from r440680, head/www/chromium/files/patch-headless_lib_headless__macros.h)
==============================================================================
--- /dev/null	00:00:00 1970	(empty, because file is newly added)
+++ branches/2017Q2/www/chromium/files/patch-headless_lib_headless__macros.h	Fri May 12 15:23:21 2017	(r440684, copy of r440680, head/www/chromium/files/patch-headless_lib_headless__macros.h)
@@ -0,0 +1,13 @@
+--- headless/lib/headless_macros.h.orig	2017-05-09 19:02:47 UTC
++++ headless/lib/headless_macros.h
+@@ -5,8 +5,8 @@
+ #ifndef HEADLESS_LIB_HEADLESS_MACROS_H_
+ #define HEADLESS_LIB_HEADLESS_MACROS_H_
+ 
+-#if defined(OS_POSIX) && !defined(OS_MACOSX)
++#if defined(OS_POSIX) && !defined(OS_MACOSX) && !defined(OS_BSD)
+ #define HEADLESS_USE_BREAKPAD
+-#endif  // defined(OS_POSIX) && !defined(OS_MACOSX)
++#endif  // defined(OS_POSIX) && !defined(OS_MACOSX) && !defined(OS_BSD)
+ 
+ #endif  // HEADLESS_LIB_HEADLESS_MACROS_H_

Copied: branches/2017Q2/www/chromium/files/patch-remoting_host_host__details.cc (from r440680, head/www/chromium/files/patch-remoting_host_host__details.cc)
==============================================================================
--- /dev/null	00:00:00 1970	(empty, because file is newly added)
+++ branches/2017Q2/www/chromium/files/patch-remoting_host_host__details.cc	Fri May 12 15:23:21 2017	(r440684, copy of r440680, head/www/chromium/files/patch-remoting_host_host__details.cc)
@@ -0,0 +1,11 @@
+--- remoting/host/host_details.cc.orig	2017-05-09 19:02:49 UTC
++++ remoting/host/host_details.cc
+@@ -26,6 +26,8 @@ std::string GetHostOperatingSystemName()
+   return "Linux";
+ #elif defined(OS_ANDROID)
+   return "Android";
++#elif defined(OS_BSD)
++  return "BSD";
+ #else
+ #error "Unsupported host OS"
+ #endif



Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201705121523.v4CFNL59089991>