Security bump (bug #342847).

(Portage version: 2.2.0_alpha2/cvs/Linux x86_64)

9 files changed, 23 insertions, 251 deletions

diff --git a/www-client/firefox/files/000_flex-configure-LANG.patch b/www-client/firefox/files/000_flex-configure-LANG.patch
deleted file mode 100644
index 6d32a8537508..000000000000
--- a/www-client/firefox/files/000_flex-configure-LANG.patch
+++ /dev/null
@@ -1,41 +0,0 @@
-The LANG vars aren't reset early enough so when sed tries to use [a-zA-Z] in 
-option parsing, it may break.
-
-http://bugs.gentoo.org/103483
-
---- configure~	2009-07-31 20:07:25.087663220 -0500
-+++ configure	2009-07-31 20:07:37.987684452 -0500
-@@ -468,6 +468,16 @@
- infodir='${prefix}/info'
- mandir='${prefix}/man'
- 
-+# NLS nuisances.
-+# Only set these to C if already set.  These must not be set unconditionally
-+# because not all systems understand e.g. LANG=C (notably SCO).
-+# Fixing LC_MESSAGES prevents Solaris sh from translating var values in `set'!
-+# Non-C LC_CTYPE values break the ctype check.
-+if test "${LANG+set}"   = set; then LANG=C;   export LANG;   fi
-+if test "${LC_ALL+set}" = set; then LC_ALL=C; export LC_ALL; fi
-+if test "${LC_MESSAGES+set}" = set; then LC_MESSAGES=C; export LC_MESSAGES; fi
-+if test "${LC_CTYPE+set}"    = set; then LC_CTYPE=C;    export LC_CTYPE;    fi
-+
- # Initialize some other variables.
- subdirs=
- MFLAGS= MAKEFLAGS=
-@@ -856,16 +866,6 @@
-   esac
- done
- 
--# NLS nuisances.
--# Only set these to C if already set.  These must not be set unconditionally
--# because not all systems understand e.g. LANG=C (notably SCO).
--# Fixing LC_MESSAGES prevents Solaris sh from translating var values in `set'!
--# Non-C LC_CTYPE values break the ctype check.
--if test "${LANG+set}"   = set; then LANG=C;   export LANG;   fi
--if test "${LC_ALL+set}" = set; then LC_ALL=C; export LC_ALL; fi
--if test "${LC_MESSAGES+set}" = set; then LC_MESSAGES=C; export LC_MESSAGES; fi
--if test "${LC_CTYPE+set}"    = set; then LC_CTYPE=C;    export LC_CTYPE;    fi
--
- # confdefs.h avoids OS command line length limits that DEFS can exceed.
- rm -rf conftest* confdefs.h
- # AIX cpp loses on an empty file, so make sure it contains at least a newline.
diff --git a/www-client/firefox/files/1000_fix_alignment.patch b/www-client/firefox/files/1000_fix_alignment.patch
deleted file mode 100644
index 2ef47c3d4787..000000000000
--- a/www-client/firefox/files/1000_fix_alignment.patch
+++ /dev/null
@@ -1,33 +0,0 @@
-From: David Mandelin <dmandelin@mozilla.com>
-
-diff --git a/memory/jemalloc/jemalloc.c b/memory/jemalloc/jemalloc.c
---- a/memory/jemalloc/jemalloc.c
-+++ b/memory/jemalloc/jemalloc.c
-@@ -5792,24 +5792,24 @@ __attribute__((noinline))
- #else
- inline
- #endif
- void *
- memalign(size_t alignment, size_t size)
- {
- 	void *ret;
- 
--	assert(((alignment - 1) & alignment) == 0 && alignment >=
--	    sizeof(void *));
-+	assert(((alignment - 1) & alignment) == 0);
- 
- 	if (malloc_init()) {
- 		ret = NULL;
- 		goto RETURN;
- 	}
- 
-+	alignment = alignment < sizeof(void*) ? sizeof(void*) : alignment;
- 	ret = ipalloc(alignment, size);
- 
- RETURN:
- #ifdef MALLOC_XMALLOC
- 	if (opt_xmalloc && ret == NULL) {
- 		_malloc_message(_getprogname(),
- 		": (malloc) Error in memalign(): out of memory\n", "", "");
- 		abort();
-
diff --git a/www-client/firefox/files/137-bz460917_reload_new_plugins-gentoo-update-3.6.4.patch b/www-client/firefox/files/137-bz460917_reload_new_plugins-gentoo-update-3.6.4.patch
deleted file mode 100644
index 5d0c93c3dea0..000000000000
--- a/www-client/firefox/files/137-bz460917_reload_new_plugins-gentoo-update-3.6.4.patch
+++ /dev/null
@@ -1,60 +0,0 @@
-This patch has been ported to 3.6.4, may not be entirely correct.
-
-Original patch was from bmo 460917, att 350845
-
----
---- browser/base/content/browser.js
-+++ browser/base/content/browser.js
-@@ -6009,9 +6009,18 @@
-     var pluginInfo = getPluginInfo(aEvent.target);
-     missingPluginsArray[pluginInfo.mimetype] = pluginInfo;
- 
-+ 
-+    gBrowser.selectedBrowser.addEventListener("NewPluginInstalled",
-+                                              gMissingPluginInstaller.refreshBrowser,
-+                                              false);
-+ 
-     openDialog("chrome://mozapps/content/plugins/pluginInstallerWizard.xul",
-                "PFSWindow", "chrome,centerscreen,resizable=yes",
-                {plugins: missingPluginsArray, browser: gBrowser.selectedBrowser});
-+
-+    gBrowser.selectedBrowser.removeEventListener("NewPluginInstalled",
-+                                                 gMissingPluginInstaller.refreshBrowser,
-+                                                 false);
-   },
- 
-   // Callback for user clicking on a disabled plugin
-@@ -6107,11 +6116,19 @@
-     function showPluginsMissing() {
-       // get the urls of missing plugins
-       var missingPluginsArray = gBrowser.selectedBrowser.missingPlugins;
-+ 
-+    gBrowser.selectedBrowser.addEventListener("NewPluginInstalled",
-+                                              gMissingPluginInstaller.refreshBrowser,
-+                                              false);
-+ 
-       if (missingPluginsArray) {
-         window.openDialog("chrome://mozapps/content/plugins/pluginInstallerWizard.xul",
-                           "PFSWindow", "chrome,centerscreen,resizable=yes",
-                           {plugins: missingPluginsArray, browser: gBrowser.selectedBrowser});
-       }
-+    gBrowser.selectedBrowser.removeEventListener("NewPluginInstalled",
-+                                                 gMissingPluginInstaller.refreshBrowser,
-+                                                 false);
-     }
- 
-     if (aEvent.type == "PluginBlocklisted") {
-@@ -6442,6 +6459,13 @@
-       notificationBox.removeNotification(notification);
-     }
-     // reload the browser to make the new plugin show.
-+  
-+    // reload plugins
-+    var pm = Components.classes["@mozilla.org/plugin/manager;1"]
-+                 .getService(Components.interfaces.nsIPluginManager);
-+    pm.reloadPlugins(false);
-+  
-+    // ... and reload the browser to activate new plugins available
-     browser.reload();
-   }
- };
diff --git a/www-client/firefox/files/801-enable-x86_64-tracemonkey.patch b/www-client/firefox/files/801-enable-x86_64-tracemonkey.patch
deleted file mode 100644
index b72ad76b450e..000000000000
--- a/www-client/firefox/files/801-enable-x86_64-tracemonkey.patch
+++ /dev/null
@@ -1,25 +0,0 @@
---- js/src/configure.in.old	2009-11-08 19:50:54.299642792 -0500
-+++ js/src/configure.in	2009-11-08 19:57:49.235621814 -0500
-@@ -2465,6 +2465,10 @@
-     ENABLE_JIT=1
-     NANOJIT_ARCH=i386
-     ;;
-+x86_64*-*)
-+    ENABLE_JIT=1
-+    NANOJIT_ARCH=X64
-+    ;;
- arm*-*)
-     ENABLE_JIT=1
-     NANOJIT_ARCH=ARM
-@@ -2488,7 +2492,10 @@
- i?86-*)
-     AC_DEFINE(AVMPLUS_IA32)
-     ;;
--
-+x86_64*-*)
-+    AC_DEFINE(AVMPLUS_AMD64)
-+    AC_DEFINE(AVMPLUS_64BIT)
-+    ;;
- arm*-*)
-     AC_DEFINE(AVMPLUS_ARM)
-     ;;
diff --git a/www-client/firefox/files/firefox-3.0-solaris64.patch b/www-client/firefox/files/firefox-3.0-solaris64.patch
deleted file mode 100644
index 988b280f67ca..000000000000
--- a/www-client/firefox/files/firefox-3.0-solaris64.patch
+++ /dev/null
@@ -1,14 +0,0 @@
-Don't use -G, it results in a relocation error against _DYNAMIC on
-amd64, use -shared instead per the manpage, and as it works as well.
-
---- configure.in
-+++ configure.in
-@@ -2481,7 +2481,7 @@
-         AC_LANG_RESTORE
-     else
-        ASFLAGS="$ASFLAGS -fPIC"
--       DSO_LDOPTS='-G'
-+       DSO_LDOPTS='-shared'
-        _WARNINGS_CFLAGS=''
-        _WARNINGS_CXXFLAGS=''
-        if test "$OS_RELEASE" = "5.3"; then
diff --git a/www-client/firefox/files/mozilla-filepicker.patch b/www-client/firefox/files/mozilla-filepicker.patch
deleted file mode 100644
index b20b23b8f37a..000000000000
--- a/www-client/firefox/files/mozilla-filepicker.patch
+++ /dev/null
@@ -1,17 +0,0 @@
-diff -Naur a/xpfe/components/filepicker/src/nsFilePicker.js.in b/xpfe/components/filepicker/src/nsFilePicker.js.in
---- a/xpfe/components/filepicker/src/nsFilePicker.js.in	2005-01-25 12:57:29.000000000 +0100
-+++ b/xpfe/components/filepicker/src/nsFilePicker.js.in	2006-06-05 17:40:44.000000000 +0200
-@@ -272,11 +272,9 @@
- 
-     compMgr.registerFactoryLocation(FILEPICKER_CID,
-                                     "FilePicker JS Component",
--#ifndef MOZ_WIDGET_GTK2
-+
-                                     FILEPICKER_CONTRACTID,
--#else
--                                    "",
--#endif
-+
-                                     fileSpec,
-                                     location,
-                                     type);
diff --git a/www-client/firefox/files/xulrunner-1.9.2-arm-fixes.patch b/www-client/firefox/files/xulrunner-1.9.2-arm-fixes.patch
deleted file mode 100644
index a726209e6373..000000000000
--- a/www-client/firefox/files/xulrunner-1.9.2-arm-fixes.patch
+++ /dev/null
@@ -1,35 +0,0 @@
-Fix arm OS detection
-
-https://bugs.gentoo.org/327783
-https://bugzilla.mozilla.org/show_bug.cgi?id=577319
----
---- configure.in
-+++ configure.in
-@@ -1424,9 +1424,11 @@
-     CPU_ARCH="$OS_TEST"
-     ;;
- 
--arm)
-+arm*)
-     if test "$OS_TARGET" = "WINCE"; then
-         CPU_ARCH="$OS_TEST"
-+    else
-+        CPU_ARCH="arm"
-     fi
-     ;;
- esac
---- js/src/configure.in
-+++ js/src/configure.in
-@@ -1162,9 +1162,11 @@
-     CPU_ARCH="$OS_TEST"
-     ;;
- 
--arm)
-+arm*)
-     if test "$OS_TARGET" = "WINCE"; then
-         CPU_ARCH="$OS_TEST"
-+    else
-+        CPU_ARCH="arm"
-     fi
-     ;;
- esac
diff --git a/www-client/firefox/files/xulrunner-1.9.2-gtk+-2.21.patch b/www-client/firefox/files/xulrunner-1.9.2-gtk+-2.21.patch
new file mode 100644
index 000000000000..8a1e83134bb0
--- /dev/null
+++ b/www-client/firefox/files/xulrunner-1.9.2-gtk+-2.21.patch
@@ -0,0 +1,23 @@
+# HG changeset patch
+# User Jonathan Callen <abcd@gentoo.org>
+# Parent 2599ed882191d88a8e8f0cb68492a156163c5ca7
+pass MOZ_GTK_CFLAGS to ensure proper includes are avaliable.
+
+diff --git a/toolkit/system/gnome/Makefile.in b/toolkit/system/gnome/Makefile.in
+--- a/toolkit/system/gnome/Makefile.in
++++ b/toolkit/system/gnome/Makefile.in
+@@ -84,13 +84,14 @@ EXTRA_DSO_LDOPTS += \
+ 		$(MOZ_LIBNOTIFY_LIBS) \
+ 		$(NULL)
+ 
+ LOCAL_INCLUDES += -I$(topsrcdir)/toolkit/components/build/
+ 
+ include $(topsrcdir)/config/rules.mk
+ 
+ CXXFLAGS += \
++	$(MOZ_GTK2_CFLAGS) \
+ 	$(MOZ_GCONF_CFLAGS) \
+ 	$(MOZ_GNOMEVFS_CFLAGS) \
+ 	$(GLIB_CFLAGS) \
+ 	$(MOZ_LIBNOTIFY_CFLAGS) \
+ 	$(NULL)
diff --git a/www-client/firefox/files/xulrunner-1.9.2-noalsa-fixup.patch b/www-client/firefox/files/xulrunner-1.9.2-noalsa-fixup.patch
deleted file mode 100644
index 1fc7b6f87e65..000000000000
--- a/www-client/firefox/files/xulrunner-1.9.2-noalsa-fixup.patch
+++ /dev/null
@@ -1,26 +0,0 @@
-diff -urN mozilla-1.9.2-orig/content/base/src/nsDocument.cpp mozilla-1.9.2/content/base/src/nsDocument.cpp
---- mozilla-1.9.2-orig/content/base/src/nsDocument.cpp	2010-01-28 22:16:08.683135912 -0600
-+++ mozilla-1.9.2/content/base/src/nsDocument.cpp	2010-01-28 22:17:57.605126833 -0600
-@@ -169,7 +169,9 @@
- #include "nsIPropertyBag2.h"
- #include "nsIDOMPageTransitionEvent.h"
- #include "nsFrameLoader.h"
-+#ifdef MOZ_MEDIA
- #include "nsHTMLMediaElement.h"
-+#endif
- 
- #include "mozAutoDocUpdate.h"
- 
-diff -urN mozilla-1.9.2-orig/content/base/src/nsNodeUtils.cpp mozilla-1.9.2/content/base/src/nsNodeUtils.cpp
---- mozilla-1.9.2-orig/content/base/src/nsNodeUtils.cpp	2010-01-28 22:16:08.686138846 -0600
-+++ mozilla-1.9.2/content/base/src/nsNodeUtils.cpp	2010-01-28 22:17:14.618150370 -0600
-@@ -55,7 +55,9 @@
- #endif
- #include "nsBindingManager.h"
- #include "nsGenericHTMLElement.h"
-+#ifdef MOZ_MEDIA
- #include "nsHTMLMediaElement.h"
-+#endif
- 
- // This macro expects the ownerDocument of content_ to be in scope as
- // |nsIDocument* doc|