From owner-svn-ports-head@FreeBSD.ORG Tue Aug 28 20:25:57 2012 Return-Path: Delivered-To: svn-ports-head@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [69.147.83.52]) by hub.freebsd.org (Postfix) with ESMTP id 75E02106564A; Tue, 28 Aug 2012 20:25:57 +0000 (UTC) (envelope-from rene@FreeBSD.org) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c]) by mx1.freebsd.org (Postfix) with ESMTP id 5E8598FC08; Tue, 28 Aug 2012 20:25:57 +0000 (UTC) Received: from svn.freebsd.org (localhost [127.0.0.1]) by svn.freebsd.org (8.14.4/8.14.4) with ESMTP id q7SKPvXG024768; Tue, 28 Aug 2012 20:25:57 GMT (envelope-from rene@svn.freebsd.org) Received: (from rene@localhost) by svn.freebsd.org (8.14.4/8.14.4/Submit) id q7SKPvCA024749; Tue, 28 Aug 2012 20:25:57 GMT (envelope-from rene@svn.freebsd.org) Message-Id: <201208282025.q7SKPvCA024749@svn.freebsd.org> From: Rene Ladan Date: Tue, 28 Aug 2012 20:25:57 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org X-SVN-Group: ports-head MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Cc: Subject: svn commit: r303296 - in head/www/chromium: . files X-BeenThere: svn-ports-head@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: SVN commit messages for the ports tree for head List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 28 Aug 2012 20:25:57 -0000 Author: rene Date: Tue Aug 28 20:25:56 2012 New Revision: 303296 URL: http://svn.freebsd.org/changeset/ports/303296 Log: - Update to 21.0.1180.81 - Drop build dependency on devel/subversion Submitted by: George Liaskos Security: CVE-2012-[2846-2860], CVE-2012-[2862-2863] Added: head/www/chromium/files/patch-chrome__common__chrome_notification_types.h (contents, props changed) head/www/chromium/files/patch-content__zygote__zygote_linux.cc (contents, props changed) head/www/chromium/files/patch-content__zygote__zygote_main_linux.cc (contents, props changed) head/www/chromium/files/patch-net__socket__socks5_client_socket.cc (contents, props changed) head/www/chromium/files/patch-ppapi__shared_impl__private__net_address_private_impl.cc (contents, props changed) head/www/chromium/files/patch-skia__ext__SkThread_chrome.cc (contents, props changed) head/www/chromium/files/patch-third_party__libusb__libusb.gyp (contents, props changed) Deleted: head/www/chromium/files/patch-chrome__browser__extensions__api__api_resource_controller.cc head/www/chromium/files/patch-chrome__chrome_browser_extensions.gypi head/www/chromium/files/patch-chrome__common__extensions__api__api.gyp head/www/chromium/files/patch-content__browser__zygote_main_linux.cc head/www/chromium/files/patch-third_party__libjingle__source__talk__base__nethelpers.cc Modified: head/www/chromium/Makefile head/www/chromium/distinfo head/www/chromium/files/patch-chrome__browser__ui__webui__about_ui.cc head/www/chromium/files/patch-chrome__chrome_browser.gypi head/www/chromium/files/patch-content__app__content_main_runner.cc head/www/chromium/files/patch-content__browser__geolocation__location_provider.cc head/www/chromium/files/patch-content__common__seccomp_sandbox.h head/www/chromium/files/patch-content__renderer__pepper__pepper_platform_image_2d_impl.cc head/www/chromium/files/patch-content__renderer__render_view_impl.h head/www/chromium/files/patch-media__audio__pulse__pulse_output.cc head/www/chromium/files/patch-third_party__libjpeg_turbo__libjpeg.gyp head/www/chromium/pkg-plist Modified: head/www/chromium/Makefile ============================================================================== --- head/www/chromium/Makefile Tue Aug 28 19:00:31 2012 (r303295) +++ head/www/chromium/Makefile Tue Aug 28 20:25:56 2012 (r303296) @@ -7,7 +7,7 @@ PORTNAME= chromium DISTVERSIONPREFIX= courgette-redacted- -DISTVERSION= 20.0.1132.57 +DISTVERSION= 21.0.1180.81 CATEGORIES= www MASTER_SITES= http://download.goodking.org/downloads/ \ ftp://rene-ladan.nl/pub/distfiles/ \ @@ -22,12 +22,10 @@ LICENSE_COMB= multi CFLAGS+= -Wno-error -BUILD_DEPENDS= ${LOCALBASE}/bin/flex:${PORTSDIR}/textproc/flex \ - ${LOCALBASE}/bin/gperf:${PORTSDIR}/devel/gperf \ +BUILD_DEPENDS= ${LOCALBASE}/bin/gperf:${PORTSDIR}/devel/gperf \ bash:${PORTSDIR}/shells/bash \ yasm:${PORTSDIR}/devel/yasm \ flock:${PORTSDIR}/sysutils/flock \ - svnversion:${PORTSDIR}/devel/subversion \ v4l_compat>=1.0.20110603:${PORTSDIR}/multimedia/v4l_compat LIB_DEPENDS= execinfo:${PORTSDIR}/devel/libexecinfo \ @@ -65,6 +63,7 @@ GYP_DEFINES+= use_cups=1 \ use_system_yasm=1 \ use_system_libxml=1 \ use_system_ffmpeg=0 \ + use_system_libusb=1 \ use_system_libevent=1 \ linux_strip_binary=1 \ linux_use_tcmalloc=0 \ @@ -73,6 +72,7 @@ GYP_DEFINES+= use_cups=1 \ disable_nacl=1 \ enable_webrtc=0 \ enable_openmax=1 \ + enable_one_click_signin=1 \ os_ver=${OSVERSION} \ prefix_dir=${LOCALBASE} \ python_ver=${PYTHON_VER} @@ -137,7 +137,8 @@ BUILDTYPE= Debug BUILDTYPE= Release .endif -MAKE_ENV+= BUILDTYPE=${BUILDTYPE} +MAKE_ENV+= BUILDTYPE=${BUILDTYPE} \ + GPERF=${LOCALBASE}/bin/gperf MAKE_JOBS_SAFE= yes .include @@ -157,22 +158,12 @@ post-patch: ${WRKSRC}/base/base.gypi \ ${WRKSRC}/build/common.gypi \ ${WRKSRC}/third_party/libvpx/libvpx.gyp \ - ${WRKSRC}/third_party/WebKit/Source/WebCore/gyp/WebCore.gyp \ ${WRKSRC}/third_party/WebKit/Source/WebCore/plugins/PluginDatabase.cpp \ ${WRKSRC}/crypto/crypto.gyp \ ${WRKSRC}/v8/tools/gyp/v8.gyp \ ${WRKSRC}/v8/build/common.gypi @${REINPLACE_CMD} -e "s|linux|freebsd|" \ ${WRKSRC}/tools/gyp/pylib/gyp/generator/make.py - @${REINPLACE_CMD} -e 's|/usr/bin/gcc|${CC}|' \ - ${WRKSRC}/third_party/WebKit/Source/WebCore/bindings/scripts/IDLParser.pm \ - ${WRKSRC}/third_party/WebKit/Source/WebCore/dom/make_names.pl - @${REINPLACE_CMD} -e "s|'flex'|'${LOCALBASE}/bin/flex'|" \ - ${WRKSRC}/third_party/angle/src/build_angle.gyp - @${REINPLACE_CMD} -e 's|gperf --key-positions|${LOCALBASE}/bin/gperf --key-positions|' \ - ${WRKSRC}/third_party/WebKit/Source/WebCore/css/makeprop.pl \ - ${WRKSRC}/third_party/WebKit/Source/WebCore/css/makevalues.pl \ - ${WRKSRC}/third_party/WebKit/Source/WebCore/make-hash-tools.pl pre-configure: @${CP} -R ${WRKSRC}/third_party/libvpx/source/config/linux \ Modified: head/www/chromium/distinfo ============================================================================== --- head/www/chromium/distinfo Tue Aug 28 19:00:31 2012 (r303295) +++ head/www/chromium/distinfo Tue Aug 28 20:25:56 2012 (r303296) @@ -1,2 +1,2 @@ -SHA256 (chromium-courgette-redacted-20.0.1132.57.tar.xz) = b43f74adef19f7950c4002bb1412d08aa8309bf1a2c5d24540ef7da353b3a413 -SIZE (chromium-courgette-redacted-20.0.1132.57.tar.xz) = 149716388 +SHA256 (chromium-courgette-redacted-21.0.1180.81.tar.xz) = 1d0fca31f1a6ee1fd1a8a4d42f29a9c3e678a78cf322be275d278eba59eab753 +SIZE (chromium-courgette-redacted-21.0.1180.81.tar.xz) = 156172516 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 Tue Aug 28 19:00:31 2012 (r303295) +++ head/www/chromium/files/patch-chrome__browser__ui__webui__about_ui.cc Tue Aug 28 20:25:56 2012 (r303296) @@ -1,15 +1,15 @@ ---- chrome/browser/ui/webui/about_ui.cc.orig 2012-04-25 10:02:26.000000000 +0300 -+++ chrome/browser/ui/webui/about_ui.cc 2012-04-29 20:28:24.000000000 +0300 -@@ -82,7 +82,7 @@ - #include "chrome/browser/chromeos/version_loader.h" - #include "chrome/browser/oom_priority_manager.h" - #include "content/public/browser/zygote_host_linux.h" --#elif defined(OS_LINUX) || defined(OS_OPENBSD) -+#elif defined(OS_LINUX) || defined(OS_BSD) +--- chrome/browser/ui/webui/about_ui.cc.orig 2012-07-18 10:02:02.000000000 +0300 ++++ chrome/browser/ui/webui/about_ui.cc 2012-07-25 20:41:53.000000000 +0300 +@@ -72,7 +72,7 @@ + #include "webkit/glue/webkit_glue.h" + #include "webkit/plugins/webplugininfo.h" + +-#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 - -@@ -1044,7 +1044,7 @@ +@@ -1011,7 +1011,7 @@ return data; } @@ -18,7 +18,7 @@ std::string AboutLinuxProxyConfig() { std::string data; AppendHeader(&data, 0, -@@ -1439,7 +1439,7 @@ +@@ -1406,7 +1406,7 @@ return; } else if (host == chrome::kChromeUIHistogramsHost) { response = AboutHistograms(path); @@ -27,9 +27,9 @@ } else if (host == chrome::kChromeUILinuxProxyConfigHost) { response = AboutLinuxProxyConfig(); #endif -@@ -1455,7 +1455,7 @@ +@@ -1422,7 +1422,7 @@ response = ResourceBundle::GetSharedInstance().GetRawDataResource( - IDR_OS_CREDITS_HTML).as_string(); + 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) Modified: head/www/chromium/files/patch-chrome__chrome_browser.gypi ============================================================================== --- head/www/chromium/files/patch-chrome__chrome_browser.gypi Tue Aug 28 19:00:31 2012 (r303295) +++ head/www/chromium/files/patch-chrome__chrome_browser.gypi Tue Aug 28 20:25:56 2012 (r303296) @@ -1,15 +1,9 @@ ---- chrome/chrome_browser.gypi.orig 2012-06-13 10:02:23.000000000 +0300 -+++ chrome/chrome_browser.gypi 2012-06-14 22:36:41.000000000 +0300 -@@ -4541,11 +4541,17 @@ +--- 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 @@ ['exclude', '^browser/usb/'], ], }], -- ['OS!="android"', { -+ ['OS!="android" and OS!="freebsd"', { - 'dependencies': [ - '../third_party/libusb/libusb.gyp:libusb', - ], - }], + ['os_bsd==1', { + 'sources!': [ + 'browser/media_gallery/media_device_notifications_linux.cc', Added: head/www/chromium/files/patch-chrome__common__chrome_notification_types.h ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/www/chromium/files/patch-chrome__common__chrome_notification_types.h Tue Aug 28 20:25:56 2012 (r303296) @@ -0,0 +1,18 @@ +--- chrome/common/chrome_notification_types.h.orig 2012-07-25 23:17:58.000000000 +0300 ++++ chrome/common/chrome_notification_types.h 2012-07-25 23:18:37.000000000 +0300 +@@ -54,13 +54,13 @@ + // that was closed, no details are expected. + NOTIFICATION_WINDOW_CLOSED, + +-#if defined(OS_LINUX) ++#if defined(OS_LINUX) || defined(OS_BSD) + // On Linux maximize can be an asynchronous operation. This notification + // indicates that the window has been maximized. The source is + // a Source containing the BrowserWindow that was maximized. + // No details are expected. + NOTIFICATION_BROWSER_WINDOW_MAXIMIZED, +-#endif // defined(OS_LINUX) ++#endif // defined(OS_LINUX) || defined(OS_BSD) + + // Sent when the language (English, French...) for a page has been detected. + // The details Details contain the ISO 639-1 language code and Modified: head/www/chromium/files/patch-content__app__content_main_runner.cc ============================================================================== --- head/www/chromium/files/patch-content__app__content_main_runner.cc Tue Aug 28 19:00:31 2012 (r303295) +++ head/www/chromium/files/patch-content__app__content_main_runner.cc Tue Aug 28 20:25:56 2012 (r303296) @@ -1,9 +1,9 @@ ---- content/app/content_main_runner.cc.orig 2012-04-29 20:37:46.000000000 +0300 -+++ content/app/content_main_runner.cc 2012-04-29 20:37:58.000000000 +0300 -@@ -353,7 +353,7 @@ - base::GlobalDescriptors* g_fds = base::GlobalDescriptors::GetInstance(); - g_fds->Set(kPrimaryIPCChannel, +--- 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 @@ kPrimaryIPCChannel + base::GlobalDescriptors::kBaseDescriptor); + #endif + -#if defined(OS_LINUX) || defined(OS_OPENBSD) +#if defined(OS_LINUX) || defined(OS_BSD) g_fds->Set(kCrashDumpSignal, Modified: head/www/chromium/files/patch-content__browser__geolocation__location_provider.cc ============================================================================== --- head/www/chromium/files/patch-content__browser__geolocation__location_provider.cc Tue Aug 28 19:00:31 2012 (r303295) +++ head/www/chromium/files/patch-content__browser__geolocation__location_provider.cc Tue Aug 28 20:25:56 2012 (r303296) @@ -1,11 +1,11 @@ ---- content/browser/geolocation/location_provider.cc.orig 2011-09-15 01:38:39.000000000 +0300 -+++ content/browser/geolocation/location_provider.cc 2011-09-15 01:39:07.000000000 +0300 +--- content/browser/geolocation/location_provider.cc.orig 2012-07-18 10:01:25.000000000 +0300 ++++ content/browser/geolocation/location_provider.cc 2012-07-25 21:04:42.000000000 +0300 @@ -56,7 +56,7 @@ } } --#if !defined(OS_LINUX) && !defined(OS_MACOSX) && !defined(OS_WIN) -+#if !defined(OS_LINUX) && !defined(OS_FREEBSD) && !defined(OS_MACOSX) && !defined(OS_WIN) +-#if !defined(OS_LINUX) && !defined(OS_MACOSX) && !defined(OS_WIN) && !defined OS_ANDROID ++#if !defined(OS_LINUX) && !defined(OS_MACOSX) && !defined(OS_WIN) && !defined OS_ANDROID && !defined(OS_FREEBSD) LocationProviderBase* NewSystemLocationProvider() { return NULL; } Modified: head/www/chromium/files/patch-content__common__seccomp_sandbox.h ============================================================================== --- head/www/chromium/files/patch-content__common__seccomp_sandbox.h Tue Aug 28 19:00:31 2012 (r303295) +++ head/www/chromium/files/patch-content__common__seccomp_sandbox.h Tue Aug 28 20:25:56 2012 (r303296) @@ -1,11 +1,11 @@ ---- content/common/seccomp_sandbox.h.orig 2012-01-18 11:11:41.000000000 +0200 -+++ content/common/seccomp_sandbox.h 2012-01-29 17:00:42.000000000 +0200 -@@ -19,7 +19,7 @@ +--- content/common/seccomp_sandbox.h.orig 2012-07-18 10:01:27.000000000 +0300 ++++ content/common/seccomp_sandbox.h 2012-07-25 21:10:12.000000000 +0300 +@@ -18,7 +18,7 @@ + #include "content/public/common/content_switches.h" #if defined(ARCH_CPU_X86_FAMILY) && !defined(CHROMIUM_SELINUX) && \ - !defined(__clang__) && !defined(OS_CHROMEOS) && !defined(TOOLKIT_VIEWS) && \ -- !defined(OS_OPENBSD) -+ !defined(OS_BSD) +- !defined(OS_CHROMEOS) && !defined(TOOLKIT_VIEWS) && !defined(OS_OPENBSD) ++ !defined(OS_CHROMEOS) && !defined(TOOLKIT_VIEWS) && !defined(OS_BSD) #define SECCOMP_SANDBOX #include "seccompsandbox/sandbox.h" #endif Modified: head/www/chromium/files/patch-content__renderer__pepper__pepper_platform_image_2d_impl.cc ============================================================================== --- head/www/chromium/files/patch-content__renderer__pepper__pepper_platform_image_2d_impl.cc Tue Aug 28 19:00:31 2012 (r303295) +++ head/www/chromium/files/patch-content__renderer__pepper__pepper_platform_image_2d_impl.cc Tue Aug 28 20:25:56 2012 (r303296) @@ -1,16 +1,7 @@ ---- content/renderer/pepper/pepper_platform_image_2d_impl.cc.orig 2012-04-25 10:01:32.000000000 +0300 -+++ content/renderer/pepper/pepper_platform_image_2d_impl.cc 2012-04-29 21:32:59.000000000 +0300 -@@ -19,7 +19,7 @@ - - // On Mac, we have to tell the browser to free the transport DIB. - PepperPlatformImage2DImpl::~PepperPlatformImage2DImpl() { --#if defined(OS_MACOSX) -+#if defined(OS_MACOSX) || defined(OS_FREEBSD) - if (dib_.get()) { - RenderThreadImpl::current()->Send( - new ViewHostMsg_FreeTransportDIB(dib_->id())); -@@ -33,7 +33,7 @@ - uint32 buffer_size = width * height * 4; +--- content/renderer/pepper/pepper_platform_image_2d_impl.cc.orig 2012-07-18 10:01:27.000000000 +0300 ++++ content/renderer/pepper/pepper_platform_image_2d_impl.cc 2012-07-25 21:15:02.000000000 +0300 +@@ -31,7 +31,7 @@ + UMA_HISTOGRAM_COUNTS("Plugin.PepperImage2DSize", buffer_size); // Allocate the transport DIB and the PlatformCanvas pointing to it. -#if defined(OS_MACOSX) @@ -18,7 +9,7 @@ // On the Mac, shared memory has to be created in the browser in order to // work in the sandbox. Do this by sending a message to the browser // requesting a TransportDIB (see also -@@ -70,7 +70,7 @@ +@@ -66,7 +66,7 @@ *byte_count = dib_->size(); #if defined(OS_WIN) return reinterpret_cast(dib_->handle()); Modified: head/www/chromium/files/patch-content__renderer__render_view_impl.h ============================================================================== --- head/www/chromium/files/patch-content__renderer__render_view_impl.h Tue Aug 28 19:00:31 2012 (r303295) +++ head/www/chromium/files/patch-content__renderer__render_view_impl.h Tue Aug 28 20:25:56 2012 (r303296) @@ -1,8 +1,8 @@ ---- content/renderer/render_view_impl.h.orig 2011-11-01 10:42:35.000000000 +0200 -+++ content/renderer/render_view_impl.h 2011-11-22 00:49:03.000000000 +0200 -@@ -260,12 +260,12 @@ - // Request updated policy regarding firewall NAT traversal being enabled. - void RequestRemoteAccessClientFirewallTraversal(); +--- content/renderer/render_view_impl.h.orig 2012-07-18 10:01:27.000000000 +0300 ++++ content/renderer/render_view_impl.h 2012-07-25 21:21:32.000000000 +0300 +@@ -341,12 +341,12 @@ + void SimulateImeConfirmComposition(const string16& text, + const ui::Range& replacement_range); -#if defined(OS_MACOSX) || defined(OS_WIN) +#if defined(OS_MACOSX) || defined(OS_WIN) || defined(OS_FREEBSD) @@ -15,16 +15,16 @@ // Starts plugin IME. void StartPluginIme(); -@@ -670,7 +670,7 @@ - FRIEND_TEST_ALL_PREFIXES(RenderViewImplTest, OnUpdateWebPreferences); - FRIEND_TEST_ALL_PREFIXES(RenderViewImplTest, StaleNavigationsIgnored); +@@ -788,7 +788,7 @@ FRIEND_TEST_ALL_PREFIXES(RenderViewImplTest, UpdateTargetURLWithInvalidURL); + FRIEND_TEST_ALL_PREFIXES(RenderViewImplTest, + GetCompositionCharacterBoundsTest); -#if defined(OS_MACOSX) +#if defined(OS_MACOSX) || defined(OS_FREEBSD) FRIEND_TEST_ALL_PREFIXES(RenderViewTest, MacTestCmdUp); #endif FRIEND_TEST_ALL_PREFIXES(RenderViewImplTest, SetHistoryLengthAndPrune); -@@ -1097,7 +1097,7 @@ +@@ -1258,7 +1258,7 @@ bool cached_has_main_frame_horizontal_scrollbar_; bool cached_has_main_frame_vertical_scrollbar_; Added: head/www/chromium/files/patch-content__zygote__zygote_linux.cc ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/www/chromium/files/patch-content__zygote__zygote_linux.cc Tue Aug 28 20:25:56 2012 (r303296) @@ -0,0 +1,12 @@ +--- content/zygote/zygote_linux.cc.orig 2012-07-26 22:17:55.696652102 +0300 ++++ content/zygote/zygote_linux.cc 2012-07-26 22:19:42.568652054 +0300 +@@ -9,6 +9,9 @@ + #include + #include + #include ++#if defined(OS_BSD) ++#include ++#endif + + #include "base/command_line.h" + #include "ipc/ipc_switches.h" Added: head/www/chromium/files/patch-content__zygote__zygote_main_linux.cc ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/www/chromium/files/patch-content__zygote__zygote_main_linux.cc Tue Aug 28 20:25:56 2012 (r303296) @@ -0,0 +1,71 @@ +--- content/zygote/zygote_main_linux.cc.orig 2012-08-28 07:17:58.000000000 +0300 ++++ content/zygote/zygote_main_linux.cc 2012-08-28 07:57:49.000000000 +0300 +@@ -45,6 +45,9 @@ + #include + #else + #include ++#if defined(OS_FREEBSD) ++#include ++#endif + #endif + + namespace content { +@@ -153,7 +156,7 @@ + static LocaltimeRFunction g_libc_localtime64_r; + + // http://crbug.com/123263, see below. +-#if !defined(ADDRESS_SANITIZER) ++#if !defined(ADDRESS_SANITIZER) && !defined(OS_BSD) + static pthread_once_t g_libc_file_io_funcs_guard = PTHREAD_ONCE_INIT; + static FopenFunction g_libc_fopen; + static FopenFunction g_libc_fopen64; +@@ -269,7 +272,7 @@ + // TODO(sergeyu): Currently this code doesn't work properly under ASAN + // - it crashes content_unittests. Make sure it works properly and + // enable it here. http://crbug.com/123263 +-#if !defined(ADDRESS_SANITIZER) ++#if !defined(ADDRESS_SANITIZER) && !defined(OS_BSD) + + static void InitLibcFileIOFunctions() { + g_libc_fopen = reinterpret_cast( +@@ -280,9 +283,9 @@ + if (!g_libc_fopen) { + LOG(FATAL) << "Failed to get fopen() from libc."; + } else if (!g_libc_fopen64) { +-#if !defined(OS_OPENBSD) && !defined(OS_FREEBSD) ++#if !defined(OS_BSD) + LOG(WARNING) << "Failed to get fopen64() from libc. Using fopen() instead."; +-#endif // !defined(OS_OPENBSD) && !defined(OS_FREEBSD) ++#endif // !defined(OS_BSD) + g_libc_fopen64 = g_libc_fopen; + } + +@@ -462,6 +465,11 @@ + CHECK(HANDLE_EINTR(send(sync_fds[1], "C", 1, MSG_NOSIGNAL)) == 1); + (void) HANDLE_EINTR(close(sync_fds[1])); + ++#if defined(OS_FREEBSD) ++ int exit_code = ++ HANDLE_EINTR(waitpid(child_pid, NULL, WNOHANG)) == -1 ? 1 : 0; ++ _exit(exit_code); ++#else + for (;;) { + // Loop until we have reaped our one natural child + siginfo_t reaped_child_info; +@@ -480,6 +488,7 @@ + _exit(exit_code); + } + } ++#endif + } else { + // The child needs to wait for the parent to close kZygoteIdFd to avoid a + // race condition +@@ -573,7 +582,7 @@ + *has_started_new_init = true; + } + +-#if !defined(OS_OPENBSD) ++#if !defined(OS_BSD) + // Previously, we required that the binary be non-readable. This causes the + // kernel to mark the process as non-dumpable at startup. The thinking was + // that, although we were putting the renderers into a PID namespace (with Modified: head/www/chromium/files/patch-media__audio__pulse__pulse_output.cc ============================================================================== --- head/www/chromium/files/patch-media__audio__pulse__pulse_output.cc Tue Aug 28 19:00:31 2012 (r303295) +++ head/www/chromium/files/patch-media__audio__pulse__pulse_output.cc Tue Aug 28 20:25:56 2012 (r303296) @@ -1,5 +1,5 @@ ---- media/audio/pulse/pulse_output.cc.orig 2012-05-09 09:01:10.000000000 +0200 -+++ media/audio/pulse/pulse_output.cc 2012-05-20 11:49:26.000000000 +0200 +--- media/audio/pulse/pulse_output.cc.orig 2012-07-18 10:01:11.000000000 +0300 ++++ media/audio/pulse/pulse_output.cc 2012-07-25 21:23:04.000000000 +0300 @@ -8,7 +8,7 @@ #include "base/message_loop.h" #include "media/audio/audio_parameters.h" @@ -9,75 +9,8 @@ #include "media/audio/linux/audio_manager_linux.h" #elif defined(OS_OPENBSD) #include "media/audio/openbsd/audio_manager_openbsd.h" -@@ -126,7 +126,7 @@ - PulseAudioOutputStream* stream = - reinterpret_cast(stream_addr); - -- DCHECK_EQ(stream->manager_->GetMessageLoop(), MessageLoop::current()); -+ DCHECK(stream->manager_->GetMessageLoop()->BelongsToCurrentThread()); - - stream->write_callback_handled_ = true; - -@@ -136,16 +136,16 @@ - - PulseAudioOutputStream::PulseAudioOutputStream(const AudioParameters& params, - AudioManagerPulse* manager) -- : channel_layout_(params.channel_layout), -+ : channel_layout_(params.channel_layout()), - channel_count_(ChannelLayoutToChannelCount(channel_layout_)), -- sample_format_(BitsToPASampleFormat(params.bits_per_sample)), -- sample_rate_(params.sample_rate), -- bytes_per_frame_(params.channels * params.bits_per_sample / 8), -+ sample_format_(BitsToPASampleFormat(params.bits_per_sample())), -+ sample_rate_(params.sample_rate()), -+ bytes_per_frame_(params.channels() * params.bits_per_sample() / 8), - manager_(manager), - pa_context_(NULL), - pa_mainloop_(NULL), - playback_handle_(NULL), -- packet_size_(params.GetPacketSize()), -+ packet_size_(params.GetBytesPerBuffer()), - frames_per_packet_(packet_size_ / bytes_per_frame_), - client_buffer_(NULL), - volume_(1.0f), -@@ -153,7 +153,7 @@ - write_callback_handled_(false), - ALLOW_THIS_IN_INITIALIZER_LIST(weak_factory_(this)), - source_callback_(NULL) { -- DCHECK_EQ(manager_->GetMessageLoop(), MessageLoop::current()); -+ DCHECK(manager_->GetMessageLoop()->BelongsToCurrentThread()); - - // TODO(slock): Sanity check input values. - } -@@ -167,7 +167,7 @@ - } - - bool PulseAudioOutputStream::Open() { -- DCHECK_EQ(manager_->GetMessageLoop(), MessageLoop::current()); -+ DCHECK(manager_->GetMessageLoop()->BelongsToCurrentThread()); - - // TODO(slock): Possibly move most of this to an OpenPlaybackDevice function - // in a new class 'pulse_util', like alsa_util. -@@ -270,7 +270,7 @@ - } - - void PulseAudioOutputStream::Close() { -- DCHECK_EQ(manager_->GetMessageLoop(), MessageLoop::current()); -+ DCHECK(manager_->GetMessageLoop()->BelongsToCurrentThread()); - - Reset(); - -@@ -280,7 +280,7 @@ - } - - void PulseAudioOutputStream::WaitForWriteRequest() { -- DCHECK_EQ(manager_->GetMessageLoop(), MessageLoop::current()); -+ DCHECK(manager_->GetMessageLoop()->BelongsToCurrentThread()); - - if (stream_stopped_) - return; -@@ -370,7 +370,7 @@ - size_t chunk_size; +@@ -372,7 +372,7 @@ + int chunk_size; // Stop writing if there is no more data available. - if (!client_buffer_->GetCurrentChunk(&chunk, &chunk_size)) @@ -85,35 +18,3 @@ break; // Write data to stream. -@@ -382,7 +382,7 @@ - } - - void PulseAudioOutputStream::Start(AudioSourceCallback* callback) { -- DCHECK_EQ(manager_->GetMessageLoop(), MessageLoop::current()); -+ DCHECK(manager_->GetMessageLoop()->BelongsToCurrentThread()); - CHECK(callback); - DLOG_IF(ERROR, !playback_handle_) - << "Open() has not been called successfully"; -@@ -402,19 +402,19 @@ - } - - void PulseAudioOutputStream::Stop() { -- DCHECK_EQ(manager_->GetMessageLoop(), MessageLoop::current()); -+ DCHECK(manager_->GetMessageLoop()->BelongsToCurrentThread()); - - stream_stopped_ = true; - } - - void PulseAudioOutputStream::SetVolume(double volume) { -- DCHECK_EQ(manager_->GetMessageLoop(), MessageLoop::current()); -+ DCHECK(manager_->GetMessageLoop()->BelongsToCurrentThread()); - - volume_ = static_cast(volume); - } - - void PulseAudioOutputStream::GetVolume(double* volume) { -- DCHECK_EQ(manager_->GetMessageLoop(), MessageLoop::current()); -+ DCHECK(manager_->GetMessageLoop()->BelongsToCurrentThread()); - - *volume = volume_; - } Added: head/www/chromium/files/patch-net__socket__socks5_client_socket.cc ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/www/chromium/files/patch-net__socket__socks5_client_socket.cc Tue Aug 28 20:25:56 2012 (r303296) @@ -0,0 +1,13 @@ +--- net/socket/socks5_client_socket.cc.orig 2012-07-26 22:30:09.628651909 +0300 ++++ net/socket/socks5_client_socket.cc 2012-07-26 22:30:41.781651802 +0300 +@@ -4,6 +4,10 @@ + + #include "net/socket/socks5_client_socket.h" + ++#if defined(OS_BSD) ++#include ++#endif ++ + #include "base/basictypes.h" + #include "base/compiler_specific.h" + #include "base/debug/trace_event.h" Added: head/www/chromium/files/patch-ppapi__shared_impl__private__net_address_private_impl.cc ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/www/chromium/files/patch-ppapi__shared_impl__private__net_address_private_impl.cc Tue Aug 28 20:25:56 2012 (r303296) @@ -0,0 +1,13 @@ +--- 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 @@ + + #include "ppapi/shared_impl/private/net_address_private_impl.h" + ++#if defined(OS_FREEBSD) ++#include ++#endif ++ + #include + + #include Added: head/www/chromium/files/patch-skia__ext__SkThread_chrome.cc ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/www/chromium/files/patch-skia__ext__SkThread_chrome.cc Tue Aug 28 20:25:56 2012 (r303296) @@ -0,0 +1,11 @@ +--- skia/ext/SkThread_chrome.cc.orig 2012-08-12 21:13:49.131615957 +0300 ++++ skia/ext/SkThread_chrome.cc 2012-08-12 21:14:44.603258675 +0300 +@@ -51,7 +51,7 @@ + } + + int32_t before; +- before = base::subtle::Aquire_CompareAndSwap(addr, value, value + 1); ++ before = base::subtle::Acquire_CompareAndSwap(addr, value, value + 1); + + if (before == value) { + return value; Modified: head/www/chromium/files/patch-third_party__libjpeg_turbo__libjpeg.gyp ============================================================================== --- head/www/chromium/files/patch-third_party__libjpeg_turbo__libjpeg.gyp Tue Aug 28 19:00:31 2012 (r303295) +++ head/www/chromium/files/patch-third_party__libjpeg_turbo__libjpeg.gyp Tue Aug 28 20:25:56 2012 (r303296) @@ -1,6 +1,15 @@ ---- third_party/libjpeg_turbo/libjpeg.gyp.orig 2011-09-10 20:12:17.000000000 +0300 -+++ third_party/libjpeg_turbo/libjpeg.gyp 2011-09-10 20:11:50.000000000 +0300 -@@ -255,6 +255,9 @@ +--- third_party/libjpeg_turbo/libjpeg.gyp.orig 2012-07-18 10:03:15.000000000 +0300 ++++ third_party/libjpeg_turbo/libjpeg.gyp 2012-07-25 21:54:51.000000000 +0300 +@@ -225,7 +225,7 @@ + ], + }, + }], +- [ 'OS=="linux" or (OS=="android" and target_arch!="arm")', { ++ [ 'OS=="linux" or OS=="freebsd" or (OS=="android" and target_arch!="arm")', { + 'conditions': [ + [ 'use_system_yasm==0', { + 'dependencies': [ +@@ -296,6 +296,9 @@ 'defines': [ 'USE_SYSTEM_LIBJPEG', ], Added: head/www/chromium/files/patch-third_party__libusb__libusb.gyp ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/www/chromium/files/patch-third_party__libusb__libusb.gyp Tue Aug 28 20:25:56 2012 (r303296) @@ -0,0 +1,48 @@ +--- third_party/libusb/libusb.gyp.orig 2012-08-27 06:35:03.000000000 +0300 ++++ third_party/libusb/libusb.gyp 2012-08-28 06:46:24.000000000 +0300 +@@ -10,23 +10,33 @@ + { + 'target_name': 'libusb', + 'conditions': [ +- ['OS == "linux" and use_system_libusb', { ++ ['(OS == "linux" or os_bsd == 1) and use_system_libusb', { + 'type': 'none', + 'direct_dependent_settings': { + 'defines': [ + 'USE_SYSTEM_LIBUSB', + ], +- 'cflags': [ +- '