--- a/MozillaFirefox/MozillaFirefox.changes Thu Mar 15 10:33:22 2012 +0100
+++ b/MozillaFirefox/MozillaFirefox.changes Fri Mar 16 07:48:35 2012 +0100
@@ -2,6 +2,21 @@
Fri Mar 9 21:47:07 UTC 2012 - wr@rosenauer.org
- update to Firefox 11.0 (bnc#750044)
+ * MFSA 2012-13/CVE-2012-0455 (bmo#704354)
+ XSS with Drag and Drop and Javascript: URL
+ * MFSA 2012-14/CVE-2012-0456/CVE-2012-0457 (bmo#711653, #720103)
+ SVG issues found with Address Sanitizer
+ * MFSA 2012-15/CVE-2012-0451 (bmo#717511)
+ XSS with multiple Content Security Policy headers
+ * MFSA 2012-16/CVE-2012-0458
+ Escalation of privilege with Javascript: URL as home page
+ * MFSA 2012-17/CVE-2012-0459 (bmo#723446)
+ Crash when accessing keyframe cssText after dynamic modification
+ * MFSA 2012-18/CVE-2012-0460 (bmo#727303)
+ window.fullScreen writeable by untrusted content
+ * MFSA 2012-19/CVE-2012-0461/CVE-2012-0462/CVE-2012-0464/
+ CVE-2012-0463
+ Miscellaneous memory safety hazards
- ported and reenabled KDE integration (bnc#746591)
- explicitely build-require X libs
--- a/MozillaFirefox/MozillaFirefox.spec Thu Mar 15 10:33:22 2012 +0100
+++ b/MozillaFirefox/MozillaFirefox.spec Fri Mar 16 07:48:35 2012 +0100
@@ -91,7 +91,6 @@
Patch12: mozilla-linux3.patch
Patch14: mozilla-disable-neon-option.patch
Patch15: mozilla-yarr-pcre.patch
-Patch16: mozilla-sle11-gcc.patch
# Firefox/browser
Patch31: firefox-browser-css.patch
Patch32: firefox-cross-desktop.patch
@@ -220,7 +219,6 @@
%patch12 -p1
%patch14 -p1
#%patch15 -p1
-%patch16 -p1
#
%patch31 -p1
%patch32 -p1
@@ -425,6 +423,7 @@
rm -f $RPM_BUILD_ROOT%{progdir}/precomplete
rm -f $RPM_BUILD_ROOT%{progdir}/dictionaries/en-US*
rm -f $RPM_BUILD_ROOT%{progdir}/firefox
+rm -f $RPM_BUILD_ROOT%{progdir}/update-settings.ini
# devel
mkdir -p %{buildroot}%{_bindir}
install -m 755 %SOURCE12 %{buildroot}%{_bindir}
--- a/MozillaFirefox/mozilla-sle11-gcc.patch Thu Mar 15 10:33:22 2012 +0100
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,1 +0,0 @@
-../mozilla-sle11-gcc.patch
\ No newline at end of file
--- a/firefox-kde.patch Thu Mar 15 10:33:22 2012 +0100
+++ b/firefox-kde.patch Fri Mar 16 07:48:35 2012 +0100
@@ -2,7 +2,7 @@
new file mode 100644
--- /dev/null
+++ b/browser/base/content/browser-kde.xul
-@@ -0,0 +1,1125 @@
+@@ -0,0 +1,1118 @@
+#filter substitution
+<?xml version="1.0"?>
+# -*- Mode: HTML -*-
@@ -396,27 +396,27 @@
+ <panel id="customizeToolbarSheetPopup"
+ noautohide="true">
+ <iframe id="customizeToolbarSheetIFrame"
-+ style="&dialog.style;"
++ style="&dialog.dimensions;"
+ hidden="true"/>
+ </panel>
+
+ <tooltip id="tabbrowser-tab-tooltip" onpopupshowing="gBrowser.createTooltip(event);"/>
+
+ <tooltip id="back-button-tooltip">
-+ <label value="&backButton.tooltip;"/>
++ <label class="tooltip-label" value="&backButton.tooltip;"/>
+#ifdef XP_MACOSX
-+ <label value="&backForwardButtonMenuMac.tooltip;"/>
++ <label class="tooltip-label" value="&backForwardButtonMenuMac.tooltip;"/>
+#else
-+ <label value="&backForwardButtonMenu.tooltip;"/>
++ <label class="tooltip-label" value="&backForwardButtonMenu.tooltip;"/>
+#endif
+ </tooltip>
+
+ <tooltip id="forward-button-tooltip">
-+ <label value="&forwardButton.tooltip;"/>
++ <label class="tooltip-label" value="&forwardButton.tooltip;"/>
+#ifdef XP_MACOSX
-+ <label value="&backForwardButtonMenuMac.tooltip;"/>
++ <label class="tooltip-label" value="&backForwardButtonMenuMac.tooltip;"/>
+#else
-+ <label value="&backForwardButtonMenu.tooltip;"/>
++ <label class="tooltip-label" value="&backForwardButtonMenu.tooltip;"/>
+#endif
+ </tooltip>
+ </popupset>
@@ -449,9 +449,7 @@
+
+ <toolbox id="navigator-toolbox"
+ defaultmode="icons" mode="icons"
-+ iconsize="large"
-+ tabsontop="true"
-+ persist="tabsontop">
++ iconsize="large">
+ <!-- Menu -->
+ <toolbar type="menubar" id="toolbar-menubar" class="chromeclass-menubar" customizable="true"
+ defaultset="menubar-items"
@@ -509,7 +507,7 @@
+ <textbox id="urlbar" flex="1"
+ placeholder="&urlbar.placeholder;"
+ type="autocomplete"
-+ autocompletesearch="history"
++ autocompletesearch="urlinline history"
+ autocompletesearchparam="enable-actions"
+ autocompletepopup="PopupAutoCompleteRichResult"
+ completeselectedindex="true"
@@ -541,12 +539,12 @@
+ onkeypress="gIdentityHandler.handleIdentityButtonEvent(event);"
+ ondragstart="gIdentityHandler.onDragStart(event);">
+ <hbox id="identity-box-inner" align="center">
-+ <stack id="page-proxy-stack"
-+ onclick="PageProxyClickHandler(event);">
++ <hbox id="page-proxy-stack"
++ onclick="PageProxyClickHandler(event);">
+ <image id="page-proxy-favicon" validate="never"
+ pageproxystate="invalid"
+ onerror="this.removeAttribute('src');"/>
-+ </stack>
++ </hbox>
+ <hbox id="identity-icon-labels">
+ <label id="identity-icon-label" class="plain" flex="1"/>
+ <label id="identity-icon-country-label" class="plain"/>
@@ -1000,7 +998,6 @@
+ hidden="true">
+ <vbox flex="1">
+ <resizer id="inspector-top-resizer" flex="1"
-+ class="inspector-resizer"
+ dir="top" disabled="true"
+ element="inspector-tree-box"/>
+ <hbox>
@@ -1021,8 +1018,8 @@
+ <toolbarbutton id="inspector-3D-button"
+ class="devtools-toolbarbutton"
+ hidden="true"
-+ label="&inspect3DButton.label;"
-+ accesskey="&inspect3DButton.accesskey;"
++ label="&inspect3DViewButton.label;"
++ accesskey="&inspect3DViewButton.accesskey;"
+ command="Inspector:Tilt"/>
+ <toolbarbutton id="inspector-style-button"
+ class="devtools-toolbarbutton"
@@ -1036,10 +1033,6 @@
+ oncommand="InspectorUI.closeInspectorUI(false);"
+ tooltiptext="&inspectCloseButton.tooltiptext;"/>
+#endif
-+ <resizer id="inspector-end-resizer"
-+ class="inspector-resizer"
-+ dir="top" disabled="true"
-+ element="inspector-tree-box"/>
+ </hbox>
+ </vbox>
+ </toolbar>
@@ -1716,7 +1709,7 @@
diff --git a/browser/installer/package-manifest.in b/browser/installer/package-manifest.in
--- a/browser/installer/package-manifest.in
+++ b/browser/installer/package-manifest.in
-@@ -449,16 +449,17 @@
+@@ -450,16 +450,17 @@
#endif
#endif
--- a/firefox-multilocale-chrome.patch Thu Mar 15 10:33:22 2012 +0100
+++ b/firefox-multilocale-chrome.patch Fri Mar 16 07:48:35 2012 +0100
@@ -1,6 +1,6 @@
# HG changeset patch
# User Wolfgang Rosenauer <wr@rosenauer.org>
-# Parent cc2dd10c3b24c5fceeaf318e00cc1264f99edba2
+# Parent de9c23d6bfd0b0a30aa3dfc55377658756ec6f70
Add searchplugins to chrome packaging for proper localization
diff --git a/browser/app/profile/firefox.js b/browser/app/profile/firefox.js
@@ -30,7 +30,7 @@
diff --git a/browser/locales/Makefile.in b/browser/locales/Makefile.in
--- a/browser/locales/Makefile.in
+++ b/browser/locales/Makefile.in
-@@ -153,17 +153,41 @@ libs:: $(call MERGE_FILES,$(addprefix pr
+@@ -153,39 +153,48 @@ libs:: $(call MERGE_FILES,$(addprefix pr
install:: $(DESTDIR)$(mozappdir)/defaults/profile/bookmarks.html ;
install:: $(addprefix generic/profile/,$(PROFILE_FILES))
@@ -43,7 +43,11 @@
+SEARCH_PLUGINS = $(shell cat \
+ $(firstword $(wildcard $(LOCALE_SRCDIR)/searchplugins/list.txt) \
+ @srcdir@/en-US/searchplugins/list.txt ) )
-+
+
+-libs:: $(addsuffix .xml,$(SEARCH_PLUGINS))
+- $(NSINSTALL) -D $(FINAL_TARGET)/searchplugins
+- for SEARCH_PLUGIN in $^; do\
+- SEARCH_PLUGIN_BASE=`basename $$SEARCH_PLUGIN`;\
+tmp-search.jar.mn::
+ printf "$(AB_CD).jar:" > $@
+ printf "$(foreach plugin,$(SEARCH_PLUGINS),$(subst __PLUGIN_SUBST__,$(plugin), \n locale/browser/searchplugins/__PLUGIN_SUBST__.xml (__PLUGIN_SUBST__.xml)))" >> $@
@@ -51,33 +55,30 @@
+
+searchplugins:: $(addsuffix .xml,$(SEARCH_PLUGINS))
+ for SEARCH_PLUGIN in $^; do \
-+ $(PYTHON) $(topsrcdir)/config/Preprocessor.py $(DEFINES) $(ACDEFINES) \
-+ $$SEARCH_PLUGIN > $$SEARCH_PLUGIN ; \
-+ done
-+
+ $(PYTHON) $(topsrcdir)/config/Preprocessor.py $(DEFINES) $(ACDEFINES) \
+- $$SEARCH_PLUGIN > $(FINAL_TARGET)/searchplugins/$$SEARCH_PLUGIN_BASE; \
++ $$SEARCH_PLUGIN > $$SEARCH_PLUGIN-new ; \
++ mv $$SEARCH_PLUGIN-new $$SEARCH_PLUGIN ; \
+ done
+
+-install:: $(addsuffix .xml,$(SEARCH_PLUGINS))
+- $(NSINSTALL) -D $(DESTDIR)$(mozappdir)/searchplugins
+- for i in $^; do \
+- SEARCH_PLUGIN_BASE=`basename $$SEARCH_PLUGIN`;\
+- $(PYTHON) $(topsrcdir)/config/Preprocessor.py $(DEFINES) $(ACDEFINES) \
+- $$SEARCH_PLUGIN > $(DESTDIR)$(mozappdir)/searchplugins/$$SEARCH_PLUGIN_BASE; \
+- done
+searchplugins:: tmp-search.jar.mn
+ $(PYTHON) $(MOZILLA_DIR)/config/JarMaker.py \
+ $(QUIET) -j $(FINAL_TARGET)/chrome \
+ -s $(topsrcdir)/$(relativesrcdir)/en-US/searchplugins \
+ -s $(LOCALE_SRCDIR)/searchplugins \
+ $(MAKE_JARS_FLAGS) tmp-search.jar.mn
-+
+
+export:: searchplugins
+
+GARBAGE += tmp-search.jar.mn
- libs:: $(addsuffix .xml,$(SEARCH_PLUGINS))
- $(NSINSTALL) -D $(FINAL_TARGET)/searchplugins
- for SEARCH_PLUGIN in $^; do\
- SEARCH_PLUGIN_BASE=`basename $$SEARCH_PLUGIN`;\
- $(PYTHON) $(topsrcdir)/config/Preprocessor.py $(DEFINES) $(ACDEFINES) \
- $$SEARCH_PLUGIN > $(FINAL_TARGET)/searchplugins/$$SEARCH_PLUGIN_BASE; \
- done
-@@ -176,16 +200,17 @@ install:: $(addsuffix .xml,$(SEARCH_PLUG
- $$SEARCH_PLUGIN > $(DESTDIR)$(mozappdir)/searchplugins/$$SEARCH_PLUGIN_BASE; \
- done
-
-
libs-%:
$(NSINSTALL) -D $(DIST)/install
@$(MAKE) -C ../../toolkit/locales libs-$* BOTH_MANIFESTS=1
--- a/firefox-no-default-ualocale.patch Thu Mar 15 10:33:22 2012 +0100
+++ b/firefox-no-default-ualocale.patch Fri Mar 16 07:48:35 2012 +0100
@@ -1,6 +1,6 @@
# HG changeset patch
# User Wolfgang Rosenauer <wr@rosenauer.org>
-# Parent 4de3b724d8c78c38713aee20a01c702e132c2c4c
+# Parent d372da4f99f10c6e76fd483abc145cfbc485c168
Do not overwrite the locale dynamic pref from xulrunner's all.js with a wrong default value
diff --git a/browser/app/profile/firefox.js b/browser/app/profile/firefox.js
@@ -19,7 +19,7 @@
+pref("general.useragent.locale", "chrome://global/locale/intl.properties");
pref("general.skins.selectedSkin", "classic/1.0");
- pref("general.smoothScroll", true);
+ pref("general.smoothScroll", false);
#ifdef UNIX_BUT_NOT_MAC
pref("general.autoScroll", false);
#else
--- a/mozilla-pkgconfig.patch Thu Mar 15 10:33:22 2012 +0100
+++ b/mozilla-pkgconfig.patch Fri Mar 16 07:48:35 2012 +0100
@@ -4,17 +4,17 @@
diff --git a/xulrunner/installer/Makefile.in b/xulrunner/installer/Makefile.in
--- a/xulrunner/installer/Makefile.in
+++ b/xulrunner/installer/Makefile.in
-@@ -68,16 +68,19 @@ INSTALL_SDK = 1
- ifndef MOZ_PLATFORM_MAEMO
+@@ -69,16 +69,19 @@ ifndef MOZ_PLATFORM_MAEMO
GENERATE_CACHE = 1
endif
+ include $(topsrcdir)/toolkit/mozapps/installer/signing.mk
include $(topsrcdir)/toolkit/mozapps/installer/packager.mk
# Add pkg-config files to the install:: target
+# the apilibdir always ends with 1.9 as every patch update will provide a link
-+apilibdir = $(dir $(installdir))xulrunner-11
++apilibdir = $(dir $(installdir))xulrunner-12
+
pkg_config_files = \
libxul.pc \
@@ -24,7 +24,7 @@
$(NULL)
ifdef MOZ_NATIVE_NSPR
-@@ -105,16 +108,17 @@ pkg_config_files += mozilla-nss.pc
+@@ -106,16 +109,17 @@ pkg_config_files += mozilla-nss.pc
endif
%.pc: $(srcdir)/%.pc.in $(GLOBAL_DEPS)
--- a/mozilla-repo.patch Thu Mar 15 10:33:22 2012 +0100
+++ b/mozilla-repo.patch Fri Mar 16 07:48:35 2012 +0100
@@ -1,10 +1,10 @@
# HG changeset patch
-# Parent e315e5900fa90c2183edccd211fbe1e81cdb4c5f
+# Parent 8ea0f829916d7d9dc54567813367bcdfe6cee179
diff --git a/build/Makefile.in b/build/Makefile.in
--- a/build/Makefile.in
+++ b/build/Makefile.in
-@@ -86,17 +86,17 @@ DEFINES += -DMOZ_APP_VERSION="$(MOZ_APP_
+@@ -91,17 +91,17 @@ DEFINES += -DMOZ_APP_VERSION="$(MOZ_APP_
APP_INI_DEPS += $(DEPTH)/config/autoconf.mk
MOZ_SOURCE_STAMP ?= $(firstword $(shell hg -R $(topsrcdir) parent --template="{node|short}\n" 2>/dev/null))
@@ -48,7 +48,7 @@
diff --git a/toolkit/mozapps/installer/package-name.mk b/toolkit/mozapps/installer/package-name.mk
--- a/toolkit/mozapps/installer/package-name.mk
+++ b/toolkit/mozapps/installer/package-name.mk
-@@ -156,20 +156,20 @@ SYMBOL_ARCHIVE_BASENAME = $(PKG_BASENAME
+@@ -161,20 +161,20 @@ SYMBOL_ARCHIVE_BASENAME = $(PKG_BASENAME
TEST_PACKAGE = $(PKG_BASENAME).tests.zip
ifneq (,$(wildcard $(DIST)/bin/application.ini))
@@ -67,14 +67,14 @@
-MOZ_SOURCE_REPO = $(shell cd $(MOZILLA_DIR) && hg showconfig paths.default 2>/dev/null | head -n1 | sed -e "s/^ssh:/http:/" -e "s/\/$(_dollar)//" )
+#MOZ_SOURCE_REPO = $(shell cd $(MOZILLA_DIR) && hg showconfig paths.default 2>/dev/null | head -n1 | sed -e "s/^ssh:/http:/" -e "s/\/$(_dollar)//" )
- MOZ_SOURCESTAMP_FILE = $(DIST)/$(PKG_PATH)/$(PKG_BASENAME).txt
+ MOZ_SOURCESTAMP_FILE = $(DIST)/$(PKG_PATH)/$(MOZ_SOURCESTAMP_FILE_BASENAME).txt
# JavaScript Shell
PKG_JSSHELL = $(DIST)/jsshell-$(MOZ_PKG_PLATFORM).zip
diff --git a/toolkit/xre/Makefile.in b/toolkit/xre/Makefile.in
--- a/toolkit/xre/Makefile.in
+++ b/toolkit/xre/Makefile.in
-@@ -235,17 +235,17 @@ DEFINES += -DHAVE_USR_LIB64_DIR
+@@ -236,17 +236,17 @@ DEFINES += -DHAVE_USR_LIB64_DIR
endif
endif
--- a/mozilla-sle11-gcc.patch Thu Mar 15 10:33:22 2012 +0100
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,24 +0,0 @@
-# HG changeset patch
-# Parent 39e596b823926b5add22bb263734c6c872ee2aad
-diff --git a/layout/xul/base/src/nsXULTooltipListener.h b/layout/xul/base/src/nsXULTooltipListener.h
---- a/layout/xul/base/src/nsXULTooltipListener.h
-+++ b/layout/xul/base/src/nsXULTooltipListener.h
-@@ -107,17 +107,17 @@ protected:
- static void sTooltipCallback (nsITimer* aTimer, void* aListener);
-
- // screen coordinates of the last mousemove event, stored so that the
- // tooltip can be opened at this location.
- PRInt32 mMouseScreenX, mMouseScreenY;
-
- // various constants for tooltips
- enum {
-- kTooltipMouseMoveTolerance = 7, // 7 pixel tolerance for mousemove event
-+ kTooltipMouseMoveTolerance = 7 // 7 pixel tolerance for mousemove event
- };
-
- // flag specifying if the tooltip has already been displayed by a MouseMove
- // event. The flag is reset on MouseOut so that the tooltip will display
- // the next time the mouse enters the node (bug #395668).
- bool mTooltipShownOnce;
-
- #ifdef MOZ_XUL
--- a/series Thu Mar 15 10:33:22 2012 +0100
+++ b/series Fri Mar 16 07:48:35 2012 +0100
@@ -18,7 +18,6 @@
mozilla-linux3.patch
mozilla-arm-cpu-detection.patch
mozilla-disable-neon-option.patch
-mozilla-sle11-gcc.patch
#mozilla-yarr-pcre.patch
# Firefox patches
--- a/xulrunner/mozilla-sle11-gcc.patch Thu Mar 15 10:33:22 2012 +0100
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,1 +0,0 @@
-../mozilla-sle11-gcc.patch
\ No newline at end of file
--- a/xulrunner/xulrunner.changes Thu Mar 15 10:33:22 2012 +0100
+++ b/xulrunner/xulrunner.changes Fri Mar 16 07:48:35 2012 +0100
@@ -2,6 +2,21 @@
Fri Mar 9 21:49:05 UTC 2012 - wr@rosenauer.org
- update to version 11.0 (bnc#750044)
+ * MFSA 2012-13/CVE-2012-0455 (bmo#704354)
+ XSS with Drag and Drop and Javascript: URL
+ * MFSA 2012-14/CVE-2012-0456/CVE-2012-0457 (bmo#711653, #720103)
+ SVG issues found with Address Sanitizer
+ * MFSA 2012-15/CVE-2012-0451 (bmo#717511)
+ XSS with multiple Content Security Policy headers
+ * MFSA 2012-16/CVE-2012-0458
+ Escalation of privilege with Javascript: URL as home page
+ * MFSA 2012-17/CVE-2012-0459 (bmo#723446)
+ Crash when accessing keyframe cssText after dynamic modification
+ * MFSA 2012-18/CVE-2012-0460 (bmo#727303)
+ window.fullScreen writeable by untrusted content
+ * MFSA 2012-19/CVE-2012-0461/CVE-2012-0462/CVE-2012-0464/
+ CVE-2012-0463
+ Miscellaneous memory safety hazards
- fix build on ARM
- disable jemalloc on s390(x)
--- a/xulrunner/xulrunner.spec Thu Mar 15 10:33:22 2012 +0100
+++ b/xulrunner/xulrunner.spec Fri Mar 16 07:48:35 2012 +0100
@@ -44,12 +44,12 @@
%endif
BuildRequires: mozilla-nspr-devel >= 4.9.0
BuildRequires: mozilla-nss-devel >= 3.13.3
-Version: 11.0
+Version: 11.99
Release: 0
-%define releasedate 2012031200
-%define version_internal 11.0
-%define apiversion 11
-%define uaweight 1100000
+%define releasedate 2012031400
+%define version_internal 12.0
+%define apiversion 12
+%define uaweight 1200000
Summary: Mozilla Runtime Environment
License: MPL-1.1 or GPL-2.0+ or LGPL-2.1+
Group: Productivity/Other
@@ -80,7 +80,6 @@
Patch14: mozilla-linux3.patch
Patch15: mozilla-arm-cpu-detection.patch
Patch17: mozilla-yarr-pcre.patch
-Patch18: mozilla-sle11-gcc.patch
BuildRoot: %{_tmppath}/%{name}-%{version}-build
Requires: mozilla-js = %{version}
Requires(post): update-alternatives coreutils
@@ -200,7 +199,6 @@
%patch14 -p1
%patch15 -p1
#%patch17 -p1
-%patch18 -p1
%build
# no need to add build time to binaries