merge latest 14.0 changes to Aurora 15.0
authorWolfgang Rosenauer <wr@rosenauer.org>
Fri, 08 Jun 2012 07:09:00 +0200
changeset 463 916711b0f1d6
parent 457 0c2249d015b6 (current diff)
parent 462 2d86bdb4277f (diff)
child 466 c0ae7c025b78
merge latest 14.0 changes to Aurora 15.0
MozillaFirefox/MozillaFirefox.changes
MozillaFirefox/MozillaFirefox.spec
MozillaFirefox/create-tar.sh
xulrunner/create-tar.sh
xulrunner/xulrunner.spec
--- a/MozillaFirefox/MozillaFirefox.changes	Fri May 25 09:12:54 2012 +0200
+++ b/MozillaFirefox/MozillaFirefox.changes	Fri Jun 08 07:09:00 2012 +0200
@@ -1,10 +1,28 @@
 -------------------------------------------------------------------
-Wed May 30 15:42:48 UTC 2012 - wr@rosenauer.org
-
-- update to Aurora 14 (20120530)
-- enable crashreporter for Factory/12.2
-  (fixed in mozilla-gcc47.patch)
-- license change from tri license to MPL-2.0
+Fri Jun  8 05:06:31 UTC 2012 - wr@rosenauer.org
+
+- update to Aurora 15 (20120608)
+
+-------------------------------------------------------------------
+Sat Jun  2 08:22:51 UTC 2012 - wr@rosenauer.org
+
+- update to Firefox 13.0 (bnc#765204)
+  * MFSA 2012-34/CVE-2012-1938/CVE-2012-1937/CVE-2011-3101
+    Miscellaneous memory safety hazards
+  * MFSA 2012-36/CVE-2012-1944 (bmo#751422)
+    Content Security Policy inline-script bypass
+  * MFSA 2012-37/CVE-2012-1945 (bmo#670514)
+    Information disclosure though Windows file shares and shortcut
+    files
+  * MFSA 2012-38/CVE-2012-1946 (bmo#750109)
+    Use-after-free while replacing/inserting a node in a document
+  * MFSA 2012-40/CVE-2012-1947/CVE-2012-1940/CVE-2012-1941
+    Buffer overflow and use-after-free issues found using Address
+    Sanitizer
+- require NSS 3.13.4
+  * MFSA 2012-39/CVE-2012-0441 (bmo#715073)
+- fix sound notifications when filename/path contains a whitespace
+  (bmo#749739)
 
 -------------------------------------------------------------------
 Wed May 23 14:40:16 UTC 2012 - adrian@suse.de
@@ -12,6 +30,12 @@
 - fix build on arm
 
 -------------------------------------------------------------------
+Wed May 16 05:34:01 UTC 2012 - wr@rosenauer.org
+
+- reenabled crashreporter for Factory/12.2
+  (fix in mozilla-gcc47.patch)
+
+-------------------------------------------------------------------
 Sat Apr 21 10:02:37 UTC 2012 - wr@rosenauer.org
 
 - update to Firefox 12.0 (bnc#758408)
--- a/MozillaFirefox/MozillaFirefox.spec	Fri May 25 09:12:54 2012 +0200
+++ b/MozillaFirefox/MozillaFirefox.spec	Fri Jun 08 07:09:00 2012 +0200
@@ -17,7 +17,7 @@
 #
 
 
-%define major 13
+%define major 14
 %define mainver %major.98
 %define update_channel aurora
 
@@ -44,8 +44,8 @@
 %else
 BuildRequires:  wireless-tools
 %endif
-BuildRequires:  mozilla-nspr-devel >= 4.9.0
-BuildRequires:  mozilla-nss-devel >= 3.13.4
+BuildRequires:  mozilla-nspr-devel >= 4.9.1
+BuildRequires:  mozilla-nss-devel >= 3.13.5
 BuildRequires:  nss-shared-helper-devel
 %if %suse_version > 1140
 BuildRequires:  pkgconfig(gstreamer-0.10)
@@ -54,7 +54,7 @@
 %endif
 Version:        %{mainver}
 Release:        0
-%define         releasedate 2012053000
+%define         releasedate 2012060500
 Provides:       firefox = %{mainver}
 Provides:       firefox = %{version}-%{release}
 Provides:       web_browser
@@ -338,10 +338,10 @@
 mkdir -p $RPM_BUILD_ROOT%{progdir}/searchplugins
 # install kde.js
 %if %suse_version >= 1110
-install -m 644 %{SOURCE6} $RPM_BUILD_ROOT%{progdir}/defaults/preferences/kde.js
+install -m 644 %{SOURCE6} $RPM_BUILD_ROOT%{progdir}/defaults/pref/kde.js
 # make sure that instantApply is true by default
 # (TODO: mozilla-kde.patch needs to be improved to really not load kde.js in non-KDE envs)
-echo 'pref("browser.preferences.instantApply", true);' > $RPM_BUILD_ROOT%{progdir}/defaults/preferences/firefox.js
+echo 'pref("browser.preferences.instantApply", true);' > $RPM_BUILD_ROOT%{progdir}/defaults/pref/firefox.js
 %endif
 # install add-plugins.sh
 sed "s:%%PROGDIR:%{progdir}:g" \
--- a/MozillaFirefox/create-tar.sh	Fri May 25 09:12:54 2012 +0200
+++ b/MozillaFirefox/create-tar.sh	Fri Jun 08 07:09:00 2012 +0200
@@ -3,7 +3,7 @@
 CHANNEL="aurora"
 BRANCH="releases/mozilla-$CHANNEL"
 RELEASE_TAG="default"
-VERSION="13.98"
+VERSION="14.98"
 
 # mozilla
 echo "cloning $BRANCH..."
--- a/firefox-branded-icons.patch	Fri May 25 09:12:54 2012 +0200
+++ b/firefox-branded-icons.patch	Fri Jun 08 07:09:00 2012 +0200
@@ -1,10 +1,10 @@
 # HG changeset patch
-# Parent cb004c79ce12bac3db93e34909cc979f2eecab4b
+# Parent 9e165dc62d6ba0c3b2a82387a238fe5811acdc92
 
 diff --git a/browser/app/Makefile.in b/browser/app/Makefile.in
 --- a/browser/app/Makefile.in
 +++ b/browser/app/Makefile.in
-@@ -161,16 +161,21 @@ endif
+@@ -160,16 +160,21 @@ endif
  endif #} LIBXUL_SDK
  
  ifeq ($(MOZ_WIDGET_TOOLKIT),gtk2)
@@ -23,9 +23,9 @@
  libs:: $(srcdir)/profile/prefs.js
  	$(INSTALL) $(IFLAGS1) $^ $(DIST)/bin/defaults/profile
  
- libs:: $(srcdir)/blocklist.xml
- 	$(INSTALL) $(IFLAGS1) $^ $(DIST)/bin
- 
+ # channel-prefs.js is handled separate from other prefs due to bug 756325
+ libs:: $(srcdir)/profile/channel-prefs.js
+ 	$(NSINSTALL) -D $(DIST)/bin/defaults/pref
 diff --git a/browser/branding/official/Makefile.in b/browser/branding/official/Makefile.in
 --- a/browser/branding/official/Makefile.in
 +++ b/browser/branding/official/Makefile.in
@@ -54,7 +54,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
-@@ -478,18 +478,21 @@
+@@ -476,18 +476,21 @@
  @BINPATH@/extensions/{972ce4c6-7e08-4474-a285-3208198ce6fd}/preview.png
  #ifdef SHIP_FEEDBACK
  @BINPATH@/distribution/extensions/testpilot@labs.mozilla.com.xpi
--- a/firefox-kde.patch	Fri May 25 09:12:54 2012 +0200
+++ b/firefox-kde.patch	Fri Jun 08 07:09:00 2012 +0200
@@ -1714,21 +1714,21 @@
 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
-@@ -495,16 +495,17 @@
- #endif
- #endif
- 
- ; [Default Preferences]
- ; All the pref files must be part of base to prevent migration bugs
- @BINPATH@/@PREF_DIR@/firefox.js
- @BINPATH@/@PREF_DIR@/firefox-branding.js
- @BINPATH@/@PREF_DIR@/channel-prefs.js
-+@BINPATH@/@PREF_DIR@/kde.js
+@@ -500,16 +500,17 @@
  #ifdef MOZ_SERVICES_SYNC
  @BINPATH@/@PREF_DIR@/services-sync.js
  #endif
  @BINPATH@/greprefs.js
  @BINPATH@/defaults/autoconfig/platform.js
  @BINPATH@/defaults/autoconfig/prefcalls.js
+ ; Warning: changing the path to channel-prefs.js can cause bugs (Bug 756325)
+ @BINPATH@/defaults/pref/channel-prefs.js
++@BINPATH@/defaults/pref/kde.js
  @BINPATH@/defaults/profile/prefs.js
  
+ ; [Layout Engine Resources]
+ ; Style Sheets, Graphics and other Resources used by the layout engine. 
+ @BINPATH@/res/EditorOverride.css
+ @BINPATH@/res/contenteditable.css
+ @BINPATH@/res/designmode.css
+ @BINPATH@/res/TopLevelImageDocument.css
--- a/firefox-multilocale-chrome.patch	Fri May 25 09:12:54 2012 +0200
+++ b/firefox-multilocale-chrome.patch	Fri Jun 08 07:09:00 2012 +0200
@@ -1,6 +1,6 @@
 # HG changeset patch
 # User Wolfgang Rosenauer <wr@rosenauer.org>
-# Parent 1428abd68ddc03822b43154c98d0a95e43cfb0d1
+# Parent dd43958a61127a39cb7e59ba6118a57b685255e2
 Add searchplugins to chrome packaging for proper localization
 
 diff --git a/browser/app/profile/firefox.js b/browser/app/profile/firefox.js
@@ -95,7 +95,7 @@
 diff --git a/browser/locales/jar.mn b/browser/locales/jar.mn
 --- a/browser/locales/jar.mn
 +++ b/browser/locales/jar.mn
-@@ -103,14 +103,15 @@
+@@ -103,16 +103,17 @@
      locale/browser-region/region.properties        (%chrome/browser-region/region.properties)
  # the following files are browser-specific overrides
  *   locale/browser/netError.dtd                (%chrome/overrides/netError.dtd)
@@ -108,6 +108,8 @@
  % locale testpilot @AB_CD@ %locale/feedback/
      locale/feedback/main.dtd                       (%feedback/main.dtd)
      locale/feedback/main.properties                (%feedback/main.properties)
+ #ifdef MOZ_WEBAPP_RUNTIME
  % locale webapprt @AB_CD@ %locale/webapprt/
      locale/webapprt/webapp.dtd                     (%webapprt/webapp.dtd)
      locale/webapprt/webapp.properties              (%webapprt/webapp.properties)
+ #endif
--- a/xulrunner/create-tar.sh	Fri May 25 09:12:54 2012 +0200
+++ b/xulrunner/create-tar.sh	Fri Jun 08 07:09:00 2012 +0200
@@ -3,7 +3,7 @@
 CHANNEL="aurora"
 BRANCH="releases/mozilla-$CHANNEL"
 RELEASE_TAG="default"
-VERSION="13.98"
+VERSION="14.98"
 
 # mozilla
 hg clone http://hg.mozilla.org/$BRANCH mozilla
--- a/xulrunner/xulrunner.changes	Fri May 25 09:12:54 2012 +0200
+++ b/xulrunner/xulrunner.changes	Fri Jun 08 07:09:00 2012 +0200
@@ -1,8 +1,29 @@
 -------------------------------------------------------------------
-Wed May 30 15:44:20 UTC 2012 - wr@rosenauer.org
+Fri Jun  8 04:53:17 UTC 2012 - wr@rosenauer.org
+
+- update to 14.0 (20120605)
+- license change from tri license to MPL-2.0
+
+-------------------------------------------------------------------
+Sat Jun  2 09:16:34 UTC 2012 - wr@rosenauer.org
 
-- update to Aurora 14.0 (20120530)
-- license change from tri license to MPL-2.0
+- update to 13.0 (bnc#765204)
+  * MFSA 2012-34/CVE-2012-1938/CVE-2012-1937/CVE-2011-3101
+    Miscellaneous memory safety hazards
+  * MFSA 2012-36/CVE-2012-1944 (bmo#751422)
+    Content Security Policy inline-script bypass
+  * MFSA 2012-37/CVE-2012-1945 (bmo#670514)
+    Information disclosure though Windows file shares and shortcut
+    files
+  * MFSA 2012-38/CVE-2012-1946 (bmo#750109)
+    Use-after-free while replacing/inserting a node in a document
+  * MFSA 2012-40/CVE-2012-1947/CVE-2012-1940/CVE-2012-1941
+    Buffer overflow and use-after-free issues found using Address
+    Sanitizer
+- require NSS 3.13.4
+  * MFSA 2012-39/CVE-2012-0441 (bmo#715073)
+- reenabled crashreporter for Factory/12.2
+  (fixed in mozilla-gcc47.patch)
 
 -------------------------------------------------------------------
 Sat Apr 21 10:03:42 UTC 2012 - wr@rosenauer.org
--- a/xulrunner/xulrunner.spec	Fri May 25 09:12:54 2012 +0200
+++ b/xulrunner/xulrunner.spec	Fri Jun 08 07:09:00 2012 +0200
@@ -42,14 +42,14 @@
 %else
 BuildRequires:  wireless-tools
 %endif
-BuildRequires:  mozilla-nspr-devel >= 4.9.0
-BuildRequires:  mozilla-nss-devel >= 3.13.4
-Version:        13.98
+BuildRequires:  mozilla-nspr-devel >= 4.9.1
+BuildRequires:  mozilla-nss-devel >= 3.13.5
+Version:        14.98
 Release:        0
-%define         releasedate 2012053000
-%define         version_internal 14.0
-%define         apiversion 14
-%define         uaweight 1400000
+%define         releasedate 2012060800
+%define         version_internal 15.0
+%define         apiversion 15
+%define         uaweight 1500000
 Summary:        Mozilla Runtime Environment
 License:        MPL-2.0
 Group:          Productivity/Other