From owner-svn-ports-all@FreeBSD.ORG Thu Nov 8 00:10:17 2012 Return-Path: Delivered-To: svn-ports-all@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [69.147.83.52]) by hub.freebsd.org (Postfix) with ESMTP id 4CE73B3A; Thu, 8 Nov 2012 00:10:17 +0000 (UTC) (envelope-from rene@FreeBSD.org) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:1900:2254:2068::e6a:0]) by mx1.freebsd.org (Postfix) with ESMTP id 304768FC15; Thu, 8 Nov 2012 00:10:17 +0000 (UTC) Received: from svn.freebsd.org (localhost [127.0.0.1]) by svn.freebsd.org (8.14.5/8.14.5) with ESMTP id qA80AGfb036341; Thu, 8 Nov 2012 00:10:16 GMT (envelope-from rene@svn.freebsd.org) Received: (from rene@localhost) by svn.freebsd.org (8.14.5/8.14.5/Submit) id qA80AG0m036322; Thu, 8 Nov 2012 00:10:16 GMT (envelope-from rene@svn.freebsd.org) Message-Id: <201211080010.qA80AG0m036322@svn.freebsd.org> From: Rene Ladan Date: Thu, 8 Nov 2012 00:10:16 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r307153 - in head/www/chromium: . files X-SVN-Group: ports-head MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-ports-all@freebsd.org X-Mailman-Version: 2.1.14 Precedence: list List-Id: SVN commit messages for the ports tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Thu, 08 Nov 2012 00:10:17 -0000 Author: rene Date: Thu Nov 8 00:10:16 2012 New Revision: 307153 URL: http://svnweb.freebsd.org/changeset/ports/307153 Log: Update to 23.0.1271.64 Submitted by: George Liaskos Security: http://www.vuxml.org/freebsd/209c068d-28be-11e2-9160-00262d5ed8ee.html Feature safe: yes Added: head/www/chromium/files/patch-chrome__browser__memory_details.cc (contents, props changed) head/www/chromium/files/patch-content__browser__child_process_launcher.cc (contents, props changed) head/www/chromium/files/patch-content__browser__gpu__gpu_blacklist.cc (contents, props changed) head/www/chromium/files/patch-content__browser__gpu__gpu_blacklist_unittest.cc (contents, props changed) head/www/chromium/files/patch-content__content_common.gypi (contents, props changed) head/www/chromium/files/patch-content__public__test__mock_render_process_host.cc (contents, props changed) head/www/chromium/files/patch-content__renderer__renderer_main_platform_delegate_linux.cc (contents, props changed) head/www/chromium/files/patch-net__dns__address_sorter_posix.cc (contents, props changed) Deleted: head/www/chromium/files/patch-chrome__browser__gpu_blacklist.cc head/www/chromium/files/patch-chrome__browser__gpu_blacklist_unittest.cc head/www/chromium/files/patch-content__browser__zygote_host__zygote_host_impl_linux.cc head/www/chromium/files/patch-content__common__sandbox_seccomp_bpf_linux.cc head/www/chromium/files/patch-content__common__seccomp_sandbox.h head/www/chromium/files/patch-content__public__common__sandbox_init.h head/www/chromium/files/patch-content__test__mock_render_process_host.cc head/www/chromium/files/patch-content__zygote__zygote_linux.cc head/www/chromium/files/patch-content__zygote__zygote_main_linux.cc head/www/chromium/files/patch-sandbox__sandbox.gyp head/www/chromium/files/patch-tools__gyp__pylib__gyp__common.py Modified: head/www/chromium/Makefile head/www/chromium/distinfo head/www/chromium/files/patch-base__sys_info_freebsd.cc (contents, props changed) head/www/chromium/files/patch-chrome__browser__ui__webui__about_ui.cc (contents, props changed) head/www/chromium/files/patch-chrome__chrome_browser.gypi (contents, props changed) head/www/chromium/files/patch-content__app__content_main_runner.cc (contents, props changed) head/www/chromium/files/patch-content__browser__browser_main_loop.cc (contents, props changed) head/www/chromium/files/patch-content__content_browser.gypi head/www/chromium/files/patch-ppapi__shared_impl__private__net_address_private_impl.cc head/www/chromium/files/patch-tools__gyp__pylib__gyp__generator__make.py (contents, props changed) head/www/chromium/pkg-plist (contents, props changed) Modified: head/www/chromium/Makefile ============================================================================== --- head/www/chromium/Makefile Thu Nov 8 00:02:06 2012 (r307152) +++ head/www/chromium/Makefile Thu Nov 8 00:10:16 2012 (r307153) @@ -3,7 +3,7 @@ PORTNAME= chromium DISTVERSIONPREFIX= courgette-redacted- -DISTVERSION= 22.0.1229.94 +DISTVERSION= 23.0.1271.64 CATEGORIES= www MASTER_SITES= http://download.goodking.org/downloads/ \ ftp://rene-ladan.nl/pub/distfiles/ \ @@ -140,6 +140,7 @@ BUILDTYPE= Release MAKE_ENV+= BUILDTYPE=${BUILDTYPE} \ GPERF=${LOCALBASE}/bin/gperf +CONFIGURE_ENV+= LD=${CC} MAKE_JOBS_SAFE= yes .include @@ -150,7 +151,7 @@ pre-everything:: .if ${PORT_OPTIONS:MDEBUG} @${ECHO_MSG} "and lots of free diskspace (~ 8.5GB)." .else - @${ECHO_MSG} "and a fair amount of free diskspace (~ 2.2GB)." + @${ECHO_MSG} "and a fair amount of free diskspace (~ 1.8GB)." .endif @${ECHO_MSG} @@ -174,14 +175,12 @@ do-configure: do-install: @${MKDIR} ${DATADIR} ${INSTALL_MAN} ${WRKSRC}/out/${BUILDTYPE}/chrome.1 ${MANPREFIX}/man/man1 - ${INSTALL_DATA} ${WRKSRC}/out/${BUILDTYPE}/chrome.pak \ - ${WRKSRC}/out/${BUILDTYPE}/product_logo_48.png \ - ${WRKSRC}/out/${BUILDTYPE}/resources.pak \ - ${WRKSRC}/out/${BUILDTYPE}/content_resources.pak \ - ${WRKSRC}/out/${BUILDTYPE}/ui_resources_100_percent.pak \ - ${WRKSRC}/out/${BUILDTYPE}/theme_resources_100_percent.pak ${DATADIR} + ${INSTALL_DATA} ${WRKSRC}/out/${BUILDTYPE}/product_logo_48.png ${DATADIR} ${INSTALL_SCRIPT} ${WRKSRC}/out/${BUILDTYPE}/chrome-wrapper \ ${WRKSRC}/out/${BUILDTYPE}/xdg-settings ${DATADIR} +.for p in chrome chrome_100_percent content_resources resources + ${INSTALL_DATA} ${WRKSRC}/out/${BUILDTYPE}/${p}.pak ${DATADIR} +.endfor .for f in chrome libffmpegsumo.so mksnapshot protoc ${INSTALL_PROGRAM} ${WRKSRC}/out/${BUILDTYPE}/${f} ${DATADIR} .endfor Modified: head/www/chromium/distinfo ============================================================================== --- head/www/chromium/distinfo Thu Nov 8 00:02:06 2012 (r307152) +++ head/www/chromium/distinfo Thu Nov 8 00:10:16 2012 (r307153) @@ -1,2 +1,2 @@ -SHA256 (chromium-courgette-redacted-22.0.1229.94.tar.xz) = 6cd955abb85b283003919f780a744d1ac3a2d5ff972bc542dc52674c2403380a -SIZE (chromium-courgette-redacted-22.0.1229.94.tar.xz) = 173082428 +SHA256 (chromium-courgette-redacted-23.0.1271.64.tar.xz) = da86614142ea34d27b0e566fe2c7823cb07ef45a9161d77cfdf715d6c018ca39 +SIZE (chromium-courgette-redacted-23.0.1271.64.tar.xz) = 179486396 Modified: head/www/chromium/files/patch-base__sys_info_freebsd.cc ============================================================================== --- head/www/chromium/files/patch-base__sys_info_freebsd.cc Thu Nov 8 00:02:06 2012 (r307152) +++ head/www/chromium/files/patch-base__sys_info_freebsd.cc Thu Nov 8 00:10:16 2012 (r307153) @@ -1,23 +1,27 @@ ---- base/sys_info_freebsd.cc.orig 2011-01-29 10:49:10.000000000 +0100 -+++ base/sys_info_freebsd.cc 2011-02-07 22:02:40.000000000 +0100 -@@ -30,4 +30,21 @@ +--- base/sys_info_freebsd.cc.orig 2012-10-31 21:02:04.000000000 +0200 ++++ base/sys_info_freebsd.cc 2012-11-07 17:49:20.000000000 +0200 +@@ -33,4 +33,25 @@ return limit; } -+int SysInfo::NumberOfProcessors() { -+ int mib[2]; -+ -+ mib[0] = CTL_HW; -+ mib[1] = HW_NCPU; ++// static ++std::string SysInfo::CPUModelName() { ++ int mib[] = { CTL_HW, HW_MODEL }; ++ char name[256]; ++ size_t size = arraysize(name); ++ if (sysctl(mib, arraysize(mib), &name, &size, NULL, 0) == 0) ++ return name; ++ return std::string(); ++} + ++int SysInfo::NumberOfProcessors() { ++ int mib[] = { CTL_HW, HW_NCPU }; + int ncpu; -+ size_t len = sizeof(ncpu); -+ -+ if (sysctl(mib, 2, &ncpu, &len, NULL, 0) == -1) { ++ size_t size = sizeof(ncpu); ++ if (sysctl(mib, arraysize(mib), &ncpu, &size, NULL, 0) == -1) { + NOTREACHED(); + return 1; + } -+ + return ncpu; +} + Added: head/www/chromium/files/patch-chrome__browser__memory_details.cc ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/www/chromium/files/patch-chrome__browser__memory_details.cc Thu Nov 8 00:10:16 2012 (r307153) @@ -0,0 +1,29 @@ +--- chrome/browser/memory_details.cc.orig 2012-10-31 21:02:26.000000000 +0200 ++++ chrome/browser/memory_details.cc 2012-11-07 17:28:28.000000000 +0200 +@@ -31,7 +31,7 @@ + #include "grit/generated_resources.h" + #include "ui/base/l10n/l10n_util.h" + +-#if defined(OS_POSIX) && !defined(OS_MACOSX) && !defined(OS_ANDROID) ++#if defined(OS_POSIX) && !defined(OS_MACOSX) && !defined(OS_ANDROID) && !defined(OS_BSD) + #include "content/public/browser/zygote_host_linux.h" + #endif + +@@ -195,7 +195,7 @@ + void MemoryDetails::CollectChildInfoOnUIThread() { + DCHECK(BrowserThread::CurrentlyOn(BrowserThread::UI)); + +-#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(); +@@ -335,7 +335,7 @@ + } + } + +-#if defined(OS_POSIX) && !defined(OS_MACOSX) && !defined(OS_ANDROID) ++#if defined(OS_POSIX) && !defined(OS_MACOSX) && !defined(OS_ANDROID) && !defined(OS_BSD) + if (process.pid == zygote_pid) { + process.type = content::PROCESS_TYPE_ZYGOTE; + } else if (process.pid == sandbox_helper_pid) { Modified: head/www/chromium/files/patch-chrome__browser__ui__webui__about_ui.cc ============================================================================== --- head/www/chromium/files/patch-chrome__browser__ui__webui__about_ui.cc Thu Nov 8 00:02:06 2012 (r307152) +++ head/www/chromium/files/patch-chrome__browser__ui__webui__about_ui.cc Thu Nov 8 00:10:16 2012 (r307153) @@ -1,15 +1,6 @@ ---- chrome/ui/webui/about_ui.cc.orig 2012-09-25 16:02:14.000000000 +0300 -+++ chrome/browser/ui/webui/about_ui.cc 2012-09-29 15:09:43.000000000 +0300 -@@ -74,7 +74,7 @@ - #include "chrome/browser/ui/webui/theme_source.h" - #endif - --#if defined(OS_LINUX) || defined(OS_OPENBSD) -+#if defined(OS_LINUX) || defined(OS_BSD) - #include "content/public/browser/zygote_host_linux.h" - #include "content/public/common/sandbox_linux.h" - #endif -@@ -924,7 +924,7 @@ +--- chrome/browser/ui/webui/about_ui.cc.orig 2012-10-31 21:02:22.000000000 +0200 ++++ chrome/browser/ui/webui/about_ui.cc 2012-11-07 15:58:46.000000000 +0200 +@@ -928,7 +928,7 @@ return data; } @@ -18,7 +9,23 @@ std::string AboutLinuxProxyConfig() { std::string data; AppendHeader(&data, 0, -@@ -1325,7 +1325,7 @@ +@@ -944,6 +944,7 @@ + return data; + } + ++#if !defined(OS_BSD) + void AboutSandboxRow(std::string* data, const std::string& prefix, int name_id, + bool good) { + data->append(""); +@@ -1005,6 +1006,7 @@ + return data; + } + #endif ++#endif + + std::string AboutVersionStaticContent(const std::string& query) { + return ResourceBundle::GetSharedInstance().GetRawDataResource( +@@ -1396,7 +1398,7 @@ } else if (host == chrome::kChromeUIDNSHost) { AboutDnsHandler::Start(this, request_id); return; @@ -27,12 +34,3 @@ } else if (host == chrome::kChromeUILinuxProxyConfigHost) { response = AboutLinuxProxyConfig(); #endif -@@ -1341,7 +1341,7 @@ - response = ResourceBundle::GetSharedInstance().GetRawDataResource( - IDR_OS_CREDITS_HTML, ui::SCALE_FACTOR_NONE).as_string(); - #endif --#if defined(OS_LINUX) || defined(OS_OPENBSD) -+#if defined(OS_LINUX) || defined(OS_BSD) - } else if (host == chrome::kChromeUISandboxHost) { - response = AboutSandbox(); - #endif Modified: head/www/chromium/files/patch-chrome__chrome_browser.gypi ============================================================================== --- head/www/chromium/files/patch-chrome__chrome_browser.gypi Thu Nov 8 00:02:06 2012 (r307152) +++ head/www/chromium/files/patch-chrome__chrome_browser.gypi Thu Nov 8 00:10:16 2012 (r307153) @@ -1,6 +1,6 @@ ---- chrome/chrome_browser.gypi.orig 2012-07-25 22:44:49.000000000 +0300 -+++ chrome/chrome_browser.gypi 2012-07-25 22:45:48.000000000 +0300 -@@ -4769,6 +4769,12 @@ +--- chrome/chrome_browser.gypi.orig 2012-10-31 21:02:48.000000000 +0200 ++++ chrome/chrome_browser.gypi 2012-11-07 16:06:11.000000000 +0200 +@@ -2531,6 +2531,14 @@ ['exclude', '^browser/usb/'], ], }], @@ -8,6 +8,8 @@ + 'sources!': [ + 'browser/media_gallery/media_device_notifications_linux.cc', + 'browser/media_gallery/media_device_notifications_linux.h', ++ 'browser/system_monitor/removable_device_notifications_linux.cc', ++ 'browser/system_monitor/removable_device_notifications_linux.h' + ], + }], ['OS=="mac"', { Modified: head/www/chromium/files/patch-content__app__content_main_runner.cc ============================================================================== --- head/www/chromium/files/patch-content__app__content_main_runner.cc Thu Nov 8 00:02:06 2012 (r307152) +++ head/www/chromium/files/patch-content__app__content_main_runner.cc Thu Nov 8 00:10:16 2012 (r307153) @@ -1,8 +1,35 @@ ---- content/app/content_main_runner.cc.orig 2012-07-18 10:01:24.000000000 +0300 -+++ content/app/content_main_runner.cc 2012-07-25 21:01:19.000000000 +0300 -@@ -462,7 +462,7 @@ +--- content/app/content_main_runner.cc.orig 2012-10-31 21:01:34.000000000 +0200 ++++ content/app/content_main_runner.cc 2012-11-07 17:25:10.000000000 +0200 +@@ -91,7 +91,7 @@ + extern int RendererMain(const content::MainFunctionParams&); + extern int WorkerMain(const content::MainFunctionParams&); + extern int UtilityMain(const content::MainFunctionParams&); +-#if defined(OS_POSIX) && !defined(OS_MACOSX) && !defined(OS_ANDROID) ++#if defined(OS_POSIX) && !defined(OS_MACOSX) && !defined(OS_ANDROID) && !defined(OS_BSD) + namespace content { + extern int ZygoteMain(const MainFunctionParams&, + ZygoteForkDelegate* forkdelegate); +@@ -333,7 +333,7 @@ + int (*function)(const MainFunctionParams&); + }; + +-#if defined(OS_POSIX) && !defined(OS_MACOSX) && !defined(OS_ANDROID) ++#if defined(OS_POSIX) && !defined(OS_MACOSX) && !defined(OS_ANDROID) && !defined(OS_BSD) + // On platforms that use the zygote, we have a special subset of + // subprocesses that are launched via the zygote. This function + // fills in some process-launching bits around ZygoteMain(). +@@ -438,7 +438,7 @@ + } + } + +-#if defined(OS_POSIX) && !defined(OS_MACOSX) && !defined(OS_ANDROID) ++#if defined(OS_POSIX) && !defined(OS_MACOSX) && !defined(OS_ANDROID) && !defined(OS_BSD) + // Zygote startup is special -- see RunZygote comments above + // for why we don't use ZygoteMain directly. + if (process_type == switches::kZygoteProcess) +@@ -548,7 +548,7 @@ kPrimaryIPCChannel + base::GlobalDescriptors::kBaseDescriptor); - #endif + #endif // !OS_ANDROID && !OS_IOS -#if defined(OS_LINUX) || defined(OS_OPENBSD) +#if defined(OS_LINUX) || defined(OS_BSD) Modified: head/www/chromium/files/patch-content__browser__browser_main_loop.cc ============================================================================== --- head/www/chromium/files/patch-content__browser__browser_main_loop.cc Thu Nov 8 00:02:06 2012 (r307152) +++ head/www/chromium/files/patch-content__browser__browser_main_loop.cc Thu Nov 8 00:10:16 2012 (r307153) @@ -1,6 +1,6 @@ ---- content/browser/browser_main_loop.cc.orig 2012-01-30 22:18:23.000000000 +0200 -+++ content/browser/browser_main_loop.cc 2012-01-30 22:19:06.000000000 +0200 -@@ -39,7 +39,7 @@ +--- content/browser/browser_main_loop.cc.orig 2012-10-31 21:01:35.000000000 +0200 ++++ content/browser/browser_main_loop.cc 2012-11-07 15:40:53.000000000 +0200 +@@ -61,7 +61,7 @@ #include "net/base/winsock_init.h" #endif @@ -9,7 +9,25 @@ #include #endif -@@ -89,7 +89,7 @@ +@@ -79,7 +79,7 @@ + #include "ui/gfx/gtk_util.h" + #endif + +-#if defined(OS_POSIX) && !defined(OS_MACOSX) ++#if defined(OS_POSIX) && !defined(OS_MACOSX) && !defined(OS_BSD) + #include + + #include "base/process_util.h" +@@ -100,7 +100,7 @@ + + namespace { + +-#if defined(OS_POSIX) && !defined(OS_MACOSX) && !defined(OS_ANDROID) ++#if defined(OS_POSIX) && !defined(OS_MACOSX) && !defined(OS_ANDROID) && !defined(OS_BSD) + void SetupSandbox(const CommandLine& parsed_command_line) { + // TODO(evanm): move this into SandboxWrapper; I'm just trying to move this + // code en masse out of chrome_main for now. +@@ -128,7 +128,7 @@ } #endif @@ -18,7 +36,16 @@ static void GLibLogHandler(const gchar* log_domain, GLogLevelFlags log_level, const gchar* message, -@@ -518,7 +518,7 @@ +@@ -286,7 +286,7 @@ + } + #endif // !defined(USE_OPENSSL) + +-#if defined(OS_POSIX) && !defined(OS_MACOSX) && !defined(OS_ANDROID) ++#if defined(OS_POSIX) && !defined(OS_MACOSX) && !defined(OS_ANDROID) && !defined(OS_BSD) + SetupSandbox(parsed_command_line_); + #endif + +@@ -681,7 +681,7 @@ // are no #else branches on any #ifs. // TODO(stevenjb): Move platform specific code into platform specific Parts // (Need to add InitializeToolkit stage to BrowserParts). Added: head/www/chromium/files/patch-content__browser__child_process_launcher.cc ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/www/chromium/files/patch-content__browser__child_process_launcher.cc Thu Nov 8 00:10:16 2012 (r307153) @@ -0,0 +1,92 @@ +--- content/browser/child_process_launcher.cc.orig 2012-10-31 21:01:35.000000000 +0200 ++++ content/browser/child_process_launcher.cc 2012-11-07 13:39:44.000000000 +0200 +@@ -52,7 +52,7 @@ + termination_status_(base::TERMINATION_STATUS_NORMAL_TERMINATION), + exit_code_(content::RESULT_CODE_NORMAL_EXIT), + starting_(true) +-#if defined(OS_POSIX) && !defined(OS_MACOSX) && !defined(OS_ANDROID) ++#if defined(OS_POSIX) && !defined(OS_MACOSX) && !defined(OS_ANDROID) && !defined(OS_BSD) + , zygote_(false) + #endif + { +@@ -188,7 +188,7 @@ + base::GlobalDescriptors::Mapping files_to_register; + files_to_register.push_back(std::pair( + kPrimaryIPCChannel, ipcfd)); +-#if !defined(OS_MACOSX) ++#if !defined(OS_MACOSX) && !defined(OS_BSD) + content::GetContentClient()->browser()-> + GetAdditionalMappedFilesForChildProcess(*cmd_line, &files_to_register); + if (use_zygote) { +@@ -261,7 +261,7 @@ + base::Bind( + &Context::Notify, + this_object.get(), +-#if defined(OS_POSIX) && !defined(OS_MACOSX) ++#if defined(OS_POSIX) && !defined(OS_MACOSX) && !defined(OS_BSD) + use_zygote, + #endif + handle)); +@@ -269,7 +269,7 @@ + } + + void Notify( +-#if defined(OS_POSIX) && !defined(OS_MACOSX) && !defined(OS_ANDROID) ++#if defined(OS_POSIX) && !defined(OS_MACOSX) && !defined(OS_ANDROID) && !defined(OS_BSD) + bool zygote, + #endif + base::ProcessHandle handle) { +@@ -282,7 +282,7 @@ + if (!handle) + LOG(ERROR) << "Failed to launch child process"; + +-#if defined(OS_POSIX) && !defined(OS_MACOSX) && !defined(OS_ANDROID) ++#if defined(OS_POSIX) && !defined(OS_MACOSX) && !defined(OS_ANDROID) && !defined(OS_BSD) + zygote_ = zygote; + #endif + if (client_) { +@@ -305,7 +305,7 @@ + BrowserThread::PROCESS_LAUNCHER, FROM_HERE, + base::Bind( + &Context::TerminateInternal, +-#if defined(OS_POSIX) && !defined(OS_MACOSX) && !defined(OS_ANDROID) ++#if defined(OS_POSIX) && !defined(OS_MACOSX) && !defined(OS_ANDROID) && !defined(OS_BSD) + zygote_, + #endif + process_.handle())); +@@ -319,7 +319,7 @@ + } + + static void TerminateInternal( +-#if defined(OS_POSIX) && !defined(OS_MACOSX) && !defined(OS_ANDROID) ++#if defined(OS_POSIX) && !defined(OS_MACOSX) && !defined(OS_ANDROID) && !defined(OS_BSD) + bool zygote, + #endif + base::ProcessHandle handle) { +@@ -333,7 +333,7 @@ + process.Terminate(content::RESULT_CODE_NORMAL_EXIT); + // On POSIX, we must additionally reap the child. + #if defined(OS_POSIX) +-#if !defined(OS_MACOSX) ++#if !defined(OS_MACOSX) && !defined(OS_BSD) + if (zygote) { + // If the renderer was created via a zygote, we have to proxy the reaping + // through the zygote process. +@@ -360,7 +360,7 @@ + #if defined(OS_ANDROID) + // The fd to close after creating the process. + int ipcfd_; +-#elif defined(OS_POSIX) && !defined(OS_MACOSX) ++#elif defined(OS_POSIX) && !defined(OS_MACOSX) && !defined(OS_BSD) + bool zygote_; + #endif + }; +@@ -413,7 +413,7 @@ + *exit_code = context_->exit_code_; + return context_->termination_status_; + } +-#if defined(OS_POSIX) && !defined(OS_MACOSX) && !defined(OS_ANDROID) ++#if defined(OS_POSIX) && !defined(OS_MACOSX) && !defined(OS_ANDROID) && !defined(OS_BSD) + if (context_->zygote_) { + context_->termination_status_ = ZygoteHostImpl::GetInstance()-> + GetTerminationStatus(handle, &context_->exit_code_); Added: head/www/chromium/files/patch-content__browser__gpu__gpu_blacklist.cc ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/www/chromium/files/patch-content__browser__gpu__gpu_blacklist.cc Thu Nov 8 00:10:16 2012 (r307153) @@ -0,0 +1,11 @@ +--- content/browser/gpu/gpu_blacklist.cc.orig 2012-04-29 20:49:40.000000000 +0300 ++++ content/browser/gpu/gpu_blacklist.cc 2012-04-29 20:49:54.000000000 +0300 +@@ -940,7 +940,7 @@ + return kOsChromeOS; + #elif defined(OS_WIN) + return kOsWin; +-#elif defined(OS_LINUX) || defined(OS_OPENBSD) ++#elif defined(OS_LINUX) || defined(OS_BSD) + return kOsLinux; + #elif defined(OS_MACOSX) + return kOsMacosx; Added: head/www/chromium/files/patch-content__browser__gpu__gpu_blacklist_unittest.cc ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/www/chromium/files/patch-content__browser__gpu__gpu_blacklist_unittest.cc Thu Nov 8 00:10:16 2012 (r307153) @@ -0,0 +1,11 @@ +--- content/browser/gpu/gpu_blacklist_unittest.cc.orig 2012-02-01 21:51:33.000000000 +0200 ++++ content/browser/gpu/gpu_blacklist_unittest.cc 2012-02-01 21:52:45.000000000 +0200 +@@ -191,7 +191,7 @@ + EXPECT_EQ(flags.flags(), + static_cast(GpuFeatureFlags::kGpuFeatureWebgl)); + #if defined(OS_WIN) || defined(OS_LINUX) || defined(OS_MACOSX) || \ +- defined(OS_OPENBSD) ++ defined(OS_BSD) + // Blacklist entries will be filtered to the current OS only upon loading. + EXPECT_TRUE( + blacklist.LoadGpuBlacklist(vendor_json, GpuBlacklist::kCurrentOsOnly)); Modified: head/www/chromium/files/patch-content__content_browser.gypi ============================================================================== --- head/www/chromium/files/patch-content__content_browser.gypi Thu Nov 8 00:02:06 2012 (r307152) +++ head/www/chromium/files/patch-content__content_browser.gypi Thu Nov 8 00:10:16 2012 (r307153) @@ -1,14 +1,18 @@ ---- content/content_browser.gypi.orig 2012-10-01 20:09:41.000000000 +0300 -+++ content/content_browser.gypi 2012-10-01 20:20:01.000000000 +0300 -@@ -950,9 +950,12 @@ - ], +--- content/content_browser.gypi.orig 2012-10-31 21:01:37.000000000 +0200 ++++ content/content_browser.gypi 2012-11-07 13:18:40.000000000 +0200 +@@ -995,8 +995,17 @@ }], ['os_bsd==1', { -- 'sources/': [ -+ 'sources/': [ + 'sources/': [ ++ ['exclude', 'public/browser/zygote_host_linux\\.h$'], ++ ['exclude', 'browser/zygote_host/zygote_host_impl_linux\\.cc$'], ++ ['exclude', 'browser/zygote_host/zygote_host_impl_linux\\.h$'], ++ ['exclude', 'zygote/zygote_linux\\.cc$'], ++ ['exclude', 'zygote/zygote_linux\\.h$'], ++ ['exclude', 'zygote/zygote_main_linux\\.cc$'], + ['exclude', '^browser/device_monitor_linux\\.cc$'], + ['exclude', '^browser/download/file_metadata_linux\\.cc$'], - ['exclude', '^browser/gamepad/platform_data_fetcher_linux\\.cc$'], + ['exclude', '^browser/gamepad/gamepad_platform_data_fetcher_linux\\.cc$'], ['exclude', '^browser/geolocation/wifi_data_provider_linux\\.cc$'], + ['exclude', '^browser/udev_linux\\.cc$'], ], Added: head/www/chromium/files/patch-content__content_common.gypi ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/www/chromium/files/patch-content__content_common.gypi Thu Nov 8 00:10:16 2012 (r307153) @@ -0,0 +1,11 @@ +--- content/content_common.gypi.orig 2012-11-07 15:08:50.000000000 +0200 ++++ content/content_common.gypi 2012-11-07 15:09:05.000000000 +0200 +@@ -330,8 +330,6 @@ + 'common/sandbox_linux.cc', + 'common/sandbox_policy.cc', + 'common/sandbox_policy.h', +- 'common/sandbox_seccomp_bpf_linux.cc', +- 'common/sandbox_seccomp_bpf_linux.h', + 'common/savable_url_schemes.cc', + 'common/savable_url_schemes.h', + 'common/set_process_title.cc', Added: head/www/chromium/files/patch-content__public__test__mock_render_process_host.cc ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/www/chromium/files/patch-content__public__test__mock_render_process_host.cc Thu Nov 8 00:10:16 2012 (r307153) @@ -0,0 +1,11 @@ +--- content/public/test/mock_render_process_host.cc.orig 2010-12-16 02:11:57.000000000 +0100 ++++ content/public/test/mock_render_process_host.cc 2010-12-20 20:15:08.000000000 +0100 +@@ -106,7 +106,7 @@ + DuplicateHandle(GetCurrentProcess(), dib_id.handle, GetCurrentProcess(), + &duped, 0, TRUE, DUPLICATE_SAME_ACCESS); + transport_dib_ = TransportDIB::Map(duped); +-#elif defined(OS_MACOSX) ++#elif defined(OS_MACOSX) || defined(OS_FREEBSD) + // On Mac, TransportDIBs are always created in the browser, so we cannot map + // one from a dib_id. + transport_dib_ = TransportDIB::Create(100 * 100 * 4, 0); Added: head/www/chromium/files/patch-content__renderer__renderer_main_platform_delegate_linux.cc ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/www/chromium/files/patch-content__renderer__renderer_main_platform_delegate_linux.cc Thu Nov 8 00:10:16 2012 (r307153) @@ -0,0 +1,12 @@ +--- content/renderer/renderer_main_platform_delegate_linux.cc.orig 2012-10-31 21:01:36.000000000 +0200 ++++ content/renderer/renderer_main_platform_delegate_linux.cc 2012-11-07 17:38:32.000000000 +0200 +@@ -34,7 +34,9 @@ + // + // The seccomp sandbox mode 1 (sandbox/linux/seccomp-legacy) and mode 2 + // (sandbox/linux/seccomp-bpf) are started in InitializeSandbox(). ++#if !defined(OS_BSD) + content::InitializeSandbox(); ++#endif + return true; + } + Added: head/www/chromium/files/patch-net__dns__address_sorter_posix.cc ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/www/chromium/files/patch-net__dns__address_sorter_posix.cc Thu Nov 8 00:10:16 2012 (r307153) @@ -0,0 +1,10 @@ +--- net/dns/address_sorter_posix.cc.orig 2012-11-07 16:21:02.000000000 +0200 ++++ net/dns/address_sorter_posix.cc 2012-11-07 16:21:39.000000000 +0200 +@@ -10,6 +10,7 @@ + #include // Must be included before ifaddrs.h. + #include + #include ++#include + #include + #include + #include Modified: head/www/chromium/files/patch-ppapi__shared_impl__private__net_address_private_impl.cc ============================================================================== --- head/www/chromium/files/patch-ppapi__shared_impl__private__net_address_private_impl.cc Thu Nov 8 00:02:06 2012 (r307152) +++ head/www/chromium/files/patch-ppapi__shared_impl__private__net_address_private_impl.cc Thu Nov 8 00:10:16 2012 (r307153) @@ -1,13 +1,22 @@ ---- ppapi/shared_impl/private/net_address_private_impl.cc.orig 2012-07-25 22:05:38.000000000 +0300 -+++ ppapi/shared_impl/private/net_address_private_impl.cc 2012-07-25 22:24:11.000000000 +0300 -@@ -4,6 +4,10 @@ +--- ppapi/shared_impl/private/net_address_private_impl.cc.orig 2012-10-31 21:01:33.000000000 +0200 ++++ ppapi/shared_impl/private/net_address_private_impl.cc 2012-11-07 14:41:26.000000000 +0200 +@@ -12,6 +12,10 @@ + #include + #endif - #include "ppapi/shared_impl/private/net_address_private_impl.h" - -+#if defined(OS_FREEBSD) ++#if defined(OS_BSD) +#include +#endif + #include #include +@@ -26,7 +30,7 @@ + #include "ppapi/shared_impl/var.h" + #include "ppapi/thunk/thunk.h" + +-#if defined(OS_MACOSX) ++#if defined(OS_MACOSX) || defined(OS_BSD) + // This is a bit evil, but it's standard operating procedure for |s6_addr|.... + #define s6_addr16 __u6_addr.__u6_addr16 + #endif Modified: head/www/chromium/files/patch-tools__gyp__pylib__gyp__generator__make.py ============================================================================== --- head/www/chromium/files/patch-tools__gyp__pylib__gyp__generator__make.py Thu Nov 8 00:02:06 2012 (r307152) +++ head/www/chromium/files/patch-tools__gyp__pylib__gyp__generator__make.py Thu Nov 8 00:10:16 2012 (r307153) @@ -1,19 +1,28 @@ ---- tools/gyp/pylib/gyp/generator/make.py.orig 2011-10-07 11:51:41.000000000 +0300 -+++ tools/gyp/pylib/gyp/generator/make.py 2011-10-08 22:49:05.683824673 +0300 -@@ -249,13 +249,13 @@ +--- tools/gyp/pylib/gyp/generator/make.py.orig 2012-10-31 21:04:03.000000000 +0200 ++++ tools/gyp/pylib/gyp/generator/make.py 2012-11-07 15:22:38.000000000 +0200 +@@ -87,7 +87,7 @@ + else: + operating_system = flavor + if flavor == 'android': +- operating_system = 'linux' # Keep this legacy behavior for now. ++ operating_system = 'freebsd' # Keep this legacy behavior for now. + default_variables.setdefault('OS', operating_system) + default_variables.setdefault('SHARED_LIB_SUFFIX', '.so') + default_variables.setdefault('SHARED_LIB_DIR','$(builddir)/lib.$(TOOLSET)') +@@ -269,13 +269,13 @@ # in gyp's make.py where ARFLAGS.host etc. is computed. # TODO(evan): move all cross-compilation logic to gyp-time so we don't need # to replicate this environment fallback in make as well. --CC.host ?= gcc +-CC.host ?= %(CC.host)s -CFLAGS.host ?= --CXX.host ?= g++ +-CXX.host ?= %(CXX.host)s -CXXFLAGS.host ?= --LINK.host ?= g++ +-LINK.host ?= %(LINK.host)s -LDFLAGS.host ?= --AR.host ?= ar +-AR.host ?= %(AR.host)s +CC.host ?= $(CC) +CFLAGS.host ?= $(CFLAGS) -+CXX.host ?= $(CXX) ++CXX.host ?= $(CXX) +CXXFLAGS.host ?= $(CXXFLAGS) +LINK.host ?= $(LINK) +LDFLAGS.host ?= $(LDFLAGS) @@ -21,3 +30,12 @@ ARFLAGS.host := %(ARFLAGS.host)s # Define a dir function that can handle spaces. +@@ -1770,7 +1770,7 @@ + return modules + + # Retrieve the default value of 'SHARED_LIB_SUFFIX' +- params = {'flavor': 'linux'} ++ params = {'flavor': 'freebsd'} + default_variables = {} + CalculateVariables(default_variables, params) + Modified: head/www/chromium/pkg-plist ============================================================================== --- head/www/chromium/pkg-plist Thu Nov 8 00:02:06 2012 (r307152) +++ head/www/chromium/pkg-plist Thu Nov 8 00:10:16 2012 (r307153) @@ -2,6 +2,7 @@ bin/chrome %%DATADIR%%/chrome %%DATADIR%%/chrome-wrapper %%DATADIR%%/chrome.pak +%%DATADIR%%/chrome_100_percent.pak %%DATADIR%%/content_resources.pak %%DATADIR%%/libffmpegsumo.so %%DATADIR%%/locales/am.pak @@ -63,12 +64,19 @@ bin/chrome %%DATADIR%%/resources.pak %%DATADIR%%/resources/extension/demo/library.js %%DATADIR%%/resources/inspector/auditsPanel.css +%%DATADIR%%/resources/inspector/AuditsPanel.js +%%DATADIR%%/resources/inspector/breadcrumbList.css +%%DATADIR%%/resources/inspector/cmdevtools.css +%%DATADIR%%/resources/inspector/codemirror.css +%%DATADIR%%/resources/inspector/CodeMirrorTextEditor.js +%%DATADIR%%/resources/inspector/cssNamedFlows.css %%DATADIR%%/resources/inspector/dataGrid.css %%DATADIR%%/resources/inspector/devTools.css %%DATADIR%%/resources/inspector/devtools.html %%DATADIR%%/resources/inspector/DevTools.js %%DATADIR%%/resources/inspector/devtools_extension_api.js %%DATADIR%%/resources/inspector/elementsPanel.css +%%DATADIR%%/resources/inspector/ElementsPanel.js %%DATADIR%%/resources/inspector/filteredItemSelectionDialog.css %%DATADIR%%/resources/inspector/heapProfiler.css %%DATADIR%%/resources/inspector/HeapSnapshotWorker.js @@ -117,6 +125,7 @@ bin/chrome %%DATADIR%%/resources/inspector/Images/indexedDBIndex.png %%DATADIR%%/resources/inspector/Images/indexedDBObjectStore.png %%DATADIR%%/resources/inspector/Images/localStorage.png +%%DATADIR%%/resources/inspector/Images/namedFlowOverflow.png %%DATADIR%%/resources/inspector/Images/navigatorShowHideButton.png %%DATADIR%%/resources/inspector/Images/paneAddButtons.png %%DATADIR%%/resources/inspector/Images/paneBottomGrow.png @@ -134,6 +143,9 @@ bin/chrome %%DATADIR%%/resources/inspector/Images/profilesSilhouette.png %%DATADIR%%/resources/inspector/Images/programCounterBorder.png %%DATADIR%%/resources/inspector/Images/radioDot.png +%%DATADIR%%/resources/inspector/Images/regionEmpty.png +%%DATADIR%%/resources/inspector/Images/regionFit.png +%%DATADIR%%/resources/inspector/Images/regionOverset.png %%DATADIR%%/resources/inspector/Images/resourceCSSIcon.png %%DATADIR%%/resources/inspector/Images/resourceDocumentIcon.png %%DATADIR%%/resources/inspector/Images/resourceDocumentIconSmall.png @@ -169,6 +181,7 @@ bin/chrome %%DATADIR%%/resources/inspector/Images/splitviewDimple.png %%DATADIR%%/resources/inspector/Images/splitviewDividerBackground.png %%DATADIR%%/resources/inspector/Images/statusbarButtonGlyphs.png +%%DATADIR%%/resources/inspector/Images/statusbarButtonGlyphs2x.png %%DATADIR%%/resources/inspector/Images/statusbarResizerHorizontal.png %%DATADIR%%/resources/inspector/Images/statusbarResizerVertical.png %%DATADIR%%/resources/inspector/Images/successGreenDot.png @@ -217,20 +230,24 @@ bin/chrome %%DATADIR%%/resources/inspector/navigatorView.css %%DATADIR%%/resources/inspector/networkLogView.css %%DATADIR%%/resources/inspector/networkPanel.css +%%DATADIR%%/resources/inspector/NetworkPanel.js %%DATADIR%%/resources/inspector/panelEnablerView.css %%DATADIR%%/resources/inspector/profilesPanel.css +%%DATADIR%%/resources/inspector/ProfilesPanel.js %%DATADIR%%/resources/inspector/resourcesPanel.css +%%DATADIR%%/resources/inspector/ResourcesPanel.js %%DATADIR%%/resources/inspector/resourceView.css %%DATADIR%%/resources/inspector/revisionHistory.css %%DATADIR%%/resources/inspector/ScriptFormatterWorker.js %%DATADIR%%/resources/inspector/scriptsPanel.css +%%DATADIR%%/resources/inspector/ScriptsPanel.js %%DATADIR%%/resources/inspector/splitView.css %%DATADIR%%/resources/inspector/tabbedPane.css -%%DATADIR%%/resources/inspector/textPrompt.css %%DATADIR%%/resources/inspector/textEditor.css +%%DATADIR%%/resources/inspector/textPrompt.css %%DATADIR%%/resources/inspector/timelinePanel.css -%%DATADIR%%/theme_resources_100_percent.pak -%%DATADIR%%/ui_resources_100_percent.pak +%%DATADIR%%/resources/inspector/TimelinePanel.js +%%DATADIR%%/resources/inspector/webGLProfiler.css %%DATADIR%%/xdg-settings @dirrm %%DATADIR%%/locales @dirrm %%DATADIR%%/resources/inspector/Images