Update to 11.0

* Switch to xulrunner 11 branch
* Fix security bugs
* Improve stability
* Many bug fixes

8 files changed, 69 insertions, 58 deletions

diff --git a/devel/xulrunner/patches/patch-as b/devel/xulrunner/patches/patch-as
index faed00e4790..f60c02c24f3 100644
--- a/devel/xulrunner/patches/patch-as
+++ b/devel/xulrunner/patches/patch-as
@@ -1,10 +1,10 @@
-$NetBSD: patch-as,v 1.4 2011/10/03 12:37:24 tnn Exp $
+$NetBSD: patch-as,v 1.5 2012/03/15 08:30:06 ryoon Exp $
 
 Treat DragonFly like FreeBSD.
 
---- js/src/configure.in.orig	2011-09-22 20:20:26.000000000 +0000
-+++ js/src/configure.in
-@@ -784,7 +784,7 @@ EOF
+--- js/src/configure.in.orig	2012-03-06 13:17:03.000000000 +0100
++++ js/src/configure.in	2012-03-07 10:10:42.000000000 +0100
+@@ -856,7 +856,7 @@
                  AC_LANG_RESTORE
              ])
  
@@ -13,7 +13,7 @@ Treat DragonFly like FreeBSD.
              AC_CACHE_CHECK(for |class __declspec(dllimport) exception| bug,
                             ac_cv_have_dllimport_exception_bug,
                  [
-@@ -1999,7 +1999,7 @@ case "$target" in
+@@ -2259,7 +2259,7 @@
      MOZ_FIX_LINK_PATHS='-Wl,-executable_path,$(LIBXUL_DIST)/bin'
      ;;
  
@@ -22,16 +22,16 @@ Treat DragonFly like FreeBSD.
      if test `test -x /usr/bin/objformat && /usr/bin/objformat || echo elf` != "elf"; then
  	DLL_SUFFIX=".so.1.0"
  	DSO_LDOPTS="-shared"
-@@ -2846,7 +2846,7 @@ case "$target" in
- *-solaris*)
-     AC_DEFINE(AVMPLUS_UNIX)
-     ;;
--*-freebsd*|*-kfreebsd*)
-+*-freebsd*|*-kfreebsd*|*-netbsd*|*-dragonfly*)
-     AC_DEFINE(AVMPLUS_UNIX)
-     ;;
- *-openbsd*)
-@@ -4846,7 +4846,7 @@ if test "$MOZ_MEMORY"; then
+@@ -3368,7 +3368,7 @@
+     fi
+ 
+ 	case "$target" in
+-	    *-*-freebsd*)
++	    *-*-freebsd*|*-dragonfly*)
+ 			AC_DEFINE(_REENTRANT)
+ 			AC_DEFINE(_THREAD_SAFE)
+ 			dnl -pthread links in -lc_r, so don't specify it explicitly.
+@@ -4275,7 +4275,7 @@
    *-darwin*)
      AC_DEFINE(MOZ_MEMORY_DARWIN)
      ;;
diff --git a/devel/xulrunner/patches/patch-ax b/devel/xulrunner/patches/patch-ax
index 65620778d87..19816702648 100644
--- a/devel/xulrunner/patches/patch-ax
+++ b/devel/xulrunner/patches/patch-ax
@@ -1,10 +1,10 @@
-$NetBSD: patch-ax,v 1.3 2011/04/26 14:16:36 tnn Exp $
+$NetBSD: patch-ax,v 1.4 2012/03/15 08:30:06 ryoon Exp $
 
 --- xpcom/base/nsStackWalk.cpp.orig	2010-12-15 01:03:41.000000000 +0000
 +++ xpcom/base/nsStackWalk.cpp
-@@ -1137,7 +1137,7 @@ NS_FormatCodeAddressDetails(void *aPC, c
- #define __USE_GNU
- #endif
+@@ -54,7 +54,7 @@
+ };
+ static CriticalAddress gCriticalAddress;
  
 -#if defined(HAVE_DLOPEN) || defined(XP_MACOSX)
 +#if defined(HAVE_DLOPEN) || defined(XP_MACOSX) || defined(__NetBSD__)
diff --git a/devel/xulrunner/patches/patch-ay b/devel/xulrunner/patches/patch-ay
index 3129de1bfe9..93312e457c3 100644
--- a/devel/xulrunner/patches/patch-ay
+++ b/devel/xulrunner/patches/patch-ay
@@ -1,12 +1,14 @@
-$NetBSD: patch-ay,v 1.2 2011/10/03 12:37:24 tnn Exp $
+$NetBSD: patch-ay,v 1.3 2012/03/15 08:30:06 ryoon Exp $
 
 --- browser/app/nsBrowserApp.cpp.orig	2011-09-22 20:20:17.000000000 +0000
 +++ browser/app/nsBrowserApp.cpp
-@@ -49,6 +49,27 @@
+@@ -53,6 +53,30 @@
  #include <stdio.h>
  #include <stdarg.h>
  #include <string.h>
 +#include <sys/resource.h>
++
++#ifdef __NetBSD__
 +/*
 + * On netbsd-4, ulimit -n is 64 by default; too few for us.
 + */
@@ -27,14 +29,17 @@ $NetBSD: patch-ay,v 1.2 2011/10/03 12:37:24 tnn Exp $
 +	if (setrlimit(RLIMIT_NOFILE, &rlp) == -1)
 +		fprintf(stderr, "warning: setrlimit failed\n");
 +}
++#endif
  
  #include "plstr.h"
  #include "prprf.h"
-@@ -203,6 +224,7 @@ static int do_main(const char *exePath, 
- int main(int argc, char* argv[])
- {
-   char exePath[MAXPATHLEN];
+@@ -215,6 +239,9 @@
+ #ifdef XP_MACOSX
+   TriggerQuirks();
+ #endif
++#ifdef __NetBSD__
 +  netbsd_fixrlimit();
++#endif
  
    nsresult rv = mozilla::BinaryPath::Get(argv[0], exePath);
    if (NS_FAILED(rv)) {
diff --git a/devel/xulrunner/patches/patch-browser_confvars.sh b/devel/xulrunner/patches/patch-browser_confvars.sh
deleted file mode 100644
index b8dc1493484..00000000000
--- a/devel/xulrunner/patches/patch-browser_confvars.sh
+++ /dev/null
@@ -1,11 +0,0 @@
-$NetBSD: patch-browser_confvars.sh,v 1.1 2012/03/10 03:08:25 ryoon Exp $
-
---- browser/confvars.sh.orig	2012-02-16 06:40:24.000000000 +0000
-+++ browser/confvars.sh
-@@ -49,5 +49,5 @@ MOZ_EXTENSIONS_DEFAULT=" gnomevfs"
- # MOZ_APP_DISPLAYNAME will be set by branding/configure.sh
- # Changing either of these values requires a clobber to ensure correct results,
- # because branding dependencies are broken.
--MOZ_BRANDING_DIRECTORY=browser/branding/official
-+MOZ_BRANDING_DIRECTORY=browser/branding/aurora
- MOZ_OFFICIAL_BRANDING_DIRECTORY=browser/branding/official
diff --git a/devel/xulrunner/patches/patch-ipc_chromium_chromium-config.mk b/devel/xulrunner/patches/patch-ipc_chromium_chromium-config.mk
index e0231b1d58a..0d9d878e4ac 100644
--- a/devel/xulrunner/patches/patch-ipc_chromium_chromium-config.mk
+++ b/devel/xulrunner/patches/patch-ipc_chromium_chromium-config.mk
@@ -1,7 +1,7 @@
-$NetBSD: patch-ipc_chromium_chromium-config.mk,v 1.1 2012/03/06 12:34:09 ryoon Exp $
+$NetBSD: patch-ipc_chromium_chromium-config.mk,v 1.2 2012/03/15 08:30:06 ryoon Exp $
 
---- ipc/chromium/chromium-config.mk.orig	2011-12-20 23:28:19.000000000 +0000
-+++ ipc/chromium/chromium-config.mk
+--- ipc/chromium/chromium-config.mk.orig	2012-02-16 07:40:33.000000000 +0100
++++ ipc/chromium/chromium-config.mk	2012-03-11 11:05:40.397182000 +0100
 @@ -56,17 +56,6 @@
    -I$(DEPTH)/ipc/ipdl/_ipdlheaders \
    $(NULL)
@@ -20,7 +20,7 @@ $NetBSD: patch-ipc_chromium_chromium-config.mk,v 1.1 2012/03/06 12:34:09 ryoon E
  ifeq ($(OS_ARCH),WINNT) # {
  OS_LIBS += $(call EXPAND_LIBNAME,psapi shell32 dbghelp)
  
-@@ -93,13 +82,62 @@
+@@ -93,13 +82,64 @@
  endif
  
  else # } {
@@ -41,6 +41,7 @@ $NetBSD: patch-ipc_chromium_chromium-config.mk,v 1.1 2012/03/06 12:34:09 ryoon E
 +
 +OS_DRAGONFLY = 1
 +OS_BSD = 1
++OS_LIBS += $(call EXPAND_LIBNAME,kvm)
 +DEFINES += \
 +  -DOS_DRAGONFLY=1 \
 +  -DOS_BSD=1 \
@@ -51,6 +52,7 @@ $NetBSD: patch-ipc_chromium_chromium-config.mk,v 1.1 2012/03/06 12:34:09 ryoon E
 +
 +OS_FREEBSD = 1
 +OS_BSD = 1
++OS_LIBS += $(call EXPAND_LIBNAME,kvm)
 +DEFINES += \
 +  -DOS_FREEBSD=1 \
 +  -DOS_BSD=1 \
@@ -86,7 +88,7 @@ $NetBSD: patch-ipc_chromium_chromium-config.mk,v 1.1 2012/03/06 12:34:09 ryoon E
    $(NULL)
  
  # NB: to stop gcc warnings about exporting template instantiation
-@@ -107,4 +145,8 @@
+@@ -107,4 +147,8 @@
  
  endif # }
  endif # }
diff --git a/devel/xulrunner/patches/patch-ipc_chromium_src_base_process__util__bsd.cc b/devel/xulrunner/patches/patch-ipc_chromium_src_base_process__util__bsd.cc
index e997f9da5e4..39efaf78190 100644
--- a/devel/xulrunner/patches/patch-ipc_chromium_src_base_process__util__bsd.cc
+++ b/devel/xulrunner/patches/patch-ipc_chromium_src_base_process__util__bsd.cc
@@ -1,8 +1,9 @@
-$NetBSD: patch-ipc_chromium_src_base_process__util__bsd.cc,v 1.2 2012/03/11 16:33:48 marino Exp $
+$NetBSD: patch-ipc_chromium_src_base_process__util__bsd.cc,v 1.3 2012/03/15 08:30:06 ryoon Exp $
 
---- ipc/chromium/src/base/process_util_bsd.cc.orig	2012-03-11 15:20:05.625294000 +0000
-+++ ipc/chromium/src/base/process_util_bsd.cc
-@@ -0,0 +1,297 @@
+
+--- ipc/chromium/src/base/process_util_bsd.cc.orig	2012-03-08 18:52:15.229788000 +0100
++++ ipc/chromium/src/base/process_util_bsd.cc	2012-03-11 10:59:50.559480000 +0100
+@@ -0,0 +1,309 @@
 +// Copyright (c) 2008 The Chromium Authors. All rights reserved.
 +// Use of this source code is governed by a BSD-style license that can be
 +// found in the LICENSE file.
@@ -15,13 +16,23 @@ $NetBSD: patch-ipc_chromium_src_base_process__util__bsd.cc,v 1.2 2012/03/11 16:3
 +#include <fcntl.h>
 +#include <unistd.h>
 +#include <string>
++#if defined(OS_DRAGONFLY)
++/* DragonFly, as of v3.0.1, does not explicitly mark symbols public */
++#define PRE_SYS_INCLUDE		_Pragma("GCC visibility push(default)")
++#define POST_SYS_INCLUDE	_Pragma("GCC visibility pop")
++#else
++#define PRE_SYS_INCLUDE
++#define POST_SYS_INCLUDE
++#endif
++PRE_SYS_INCLUDE
 +#include <kvm.h>
++POST_SYS_INCLUDE
 +#include <sys/sysctl.h>
 +#include <sys/types.h>
 +#include <sys/wait.h>
 +#if defined(OS_DRAGONFLY)
-+#define HAVE_POSIX_SPAWN
 +#include <sys/user.h>
++#define HAVE_POSIX_SPAWN	1
 +#endif
 +
 +#include "base/debug_util.h"
@@ -39,7 +50,9 @@ $NetBSD: patch-ipc_chromium_src_base_process__util__bsd.cc,v 1.2 2012/03/11 16:3
 +#endif
 +
 +#ifdef HAVE_POSIX_SPAWN
++PRE_SYS_INCLUDE
 +#include <spawn.h>
++POST_SYS_INCLUDE
 +extern "C" char **environ __dso_public;
 +#endif
 +
diff --git a/devel/xulrunner/patches/patch-ipc_glue_GeckoChildProcessHost.cpp b/devel/xulrunner/patches/patch-ipc_glue_GeckoChildProcessHost.cpp
index 2386612481c..ee93a1f6af4 100644
--- a/devel/xulrunner/patches/patch-ipc_glue_GeckoChildProcessHost.cpp
+++ b/devel/xulrunner/patches/patch-ipc_glue_GeckoChildProcessHost.cpp
@@ -1,8 +1,8 @@
-$NetBSD: patch-ipc_glue_GeckoChildProcessHost.cpp,v 1.1 2012/03/06 12:34:09 ryoon Exp $
+$NetBSD: patch-ipc_glue_GeckoChildProcessHost.cpp,v 1.2 2012/03/15 08:30:06 ryoon Exp $
 
 --- ipc/glue/GeckoChildProcessHost.cpp.orig	2011-12-20 23:28:19.000000000 +0000
 +++ ipc/glue/GeckoChildProcessHost.cpp
-@@ -430,7 +430,7 @@ GeckoChildProcessHost::PerformAsyncLaunc
+@@ -430,7 +430,7 @@
    // and passing wstrings from one config to the other is unsafe.  So
    // we split the logic here.
  
@@ -11,18 +11,18 @@ $NetBSD: patch-ipc_glue_GeckoChildProcessHost.cpp,v 1.1 2012/03/06 12:34:09 ryoo
    base::environment_map newEnvVars;
    // XPCOM may not be initialized in some subprocesses.  We don't want
    // to initialize XPCOM just for the directory service, especially
-@@ -445,8 +445,8 @@ GeckoChildProcessHost::PerformAsyncLaunc
+@@ -445,8 +445,8 @@
        if (NS_SUCCEEDED(rv)) {
          nsCString path;
          greDir->GetNativePath(path);
 -# ifdef OS_LINUX
--#  ifdef ANDROID
+-#  ifdef MOZ_WIDGET_ANDROID
 +# if defined(OS_LINUX) || defined(OS_BSD)
-+#  if defined(ANDROID) || defined(OS_BSD)
++#  if defined(MOZ_WIDGET_ANDROID) || defined(OS_BSD)
          path += "/lib";
- #  endif  // ANDROID
+ #  endif  // MOZ_WIDGET_ANDROID
          const char *ld_library_path = PR_GetEnv("LD_LIBRARY_PATH");
-@@ -557,7 +557,7 @@ GeckoChildProcessHost::PerformAsyncLaunc
+@@ -557,7 +557,7 @@
    childArgv.push_back(pidstring);
  
  #if defined(MOZ_CRASHREPORTER)
@@ -31,7 +31,7 @@ $NetBSD: patch-ipc_glue_GeckoChildProcessHost.cpp,v 1.1 2012/03/06 12:34:09 ryoo
    int childCrashFd, childCrashRemapFd;
    if (!CrashReporter::CreateNotificationPipeForChild(
          &childCrashFd, &childCrashRemapFd))
-@@ -594,7 +594,7 @@ GeckoChildProcessHost::PerformAsyncLaunc
+@@ -594,7 +594,7 @@
  #endif
  
    base::LaunchApp(childArgv, mFileMap,
@@ -40,3 +40,4 @@ $NetBSD: patch-ipc_glue_GeckoChildProcessHost.cpp,v 1.1 2012/03/06 12:34:09 ryoo
                    newEnvVars,
  #endif
                    false, &process, arch);
+
diff --git a/devel/xulrunner/patches/patch-js_src_jscpucfg.h b/devel/xulrunner/patches/patch-js_src_jscpucfg.h
index 7b58d307ba5..8c7f84b38f3 100644
--- a/devel/xulrunner/patches/patch-js_src_jscpucfg.h
+++ b/devel/xulrunner/patches/patch-js_src_jscpucfg.h
@@ -1,11 +1,11 @@
-$NetBSD: patch-js_src_jscpucfg.h,v 1.1 2012/03/06 12:34:09 ryoon Exp $
+$NetBSD: patch-js_src_jscpucfg.h,v 1.2 2012/03/15 08:30:06 ryoon Exp $
 
 
 --- js/src/jscpucfg.h.orig	2012-01-29 11:24:34.000000000 +0100
 +++ js/src/jscpucfg.h	2012-02-08 12:35:20.000000000 +0100
 @@ -77,6 +77,21 @@
- #define IS_BIG_ENDIAN 1
- #endif
+ #  define IS_BIG_ENDIAN 1
+ # endif
  
 +#elif defined(__NetBSD__) || defined(__FreeBSD__) || defined(__MirBSD__) || defined(__DragonFly__)
 +#include <sys/endian.h>
@@ -23,5 +23,6 @@ $NetBSD: patch-js_src_jscpucfg.h,v 1.1 2012/03/06 12:34:09 ryoon Exp $
 +#endif
 +
  #elif defined(JS_HAVE_ENDIAN_H)
- #include <endian.h>
+ # include <endian.h>
  
+