2e3fd693c1
* MFSA 2013-63/CVE-2013-1701/CVE-2013-1702 Miscellaneous memory safety hazards * MFSA 2013-64/CVE-2013-1704 (bmo#883313) Use after free mutating DOM during SetBody * MFSA 2013-65/CVE-2013-1705 (bmo#882865) Buffer underflow when generating CRMF requests * MFSA 2013-67/CVE-2013-1708 (bmo#879924) Crash during WAV audio file decoding * MFSA 2013-68/CVE-2013-1709 (bmo#838253) Document URI misrepresentation and masquerading * MFSA 2013-69/CVE-2013-1710 (bmo#871368) CRMF requests allow for code execution and XSS attacks * MFSA 2013-70/CVE-2013-1711 (bmo#843829) Bypass of XrayWrappers using XBL Scopes * MFSA 2013-72/CVE-2013-1713 (bmo#887098) Wrong principal used for validating URI for some Javascript components * MFSA 2013-73/CVE-2013-1714 (bmo#879787) Same-origin bypass with web workers and XMLHttpRequest * MFSA 2013-75/CVE-2013-1717 (bmo#406541, bmo#738397) Local Java applets may read contents of local file system - requires NSPR 4.10 and NSS 3.15 OBS-URL: https://build.opensuse.org/package/show/mozilla:Factory/MozillaFirefox?expand=0&rev=345
79 lines
2.7 KiB
Diff
79 lines
2.7 KiB
Diff
# HG changeset patch
|
|
# Parent a5cc092ab98bc6d4c1b09b5cc86791bae1313c73
|
|
|
|
diff --git a/browser/app/Makefile.in b/browser/app/Makefile.in
|
|
--- a/browser/app/Makefile.in
|
|
+++ b/browser/app/Makefile.in
|
|
@@ -136,16 +136,21 @@ GARBAGE += $(addprefix $(FINAL_TARGET)/d
|
|
endif
|
|
|
|
ifeq ($(MOZ_WIDGET_TOOLKIT),gtk2)
|
|
libs::
|
|
$(INSTALL) $(IFLAGS1) $(DIST)/branding/mozicon128.png $(FINAL_TARGET)/icons
|
|
$(INSTALL) $(IFLAGS1) $(DIST)/branding/default16.png $(FINAL_TARGET)/chrome/icons/default
|
|
$(INSTALL) $(IFLAGS1) $(DIST)/branding/default32.png $(FINAL_TARGET)/chrome/icons/default
|
|
$(INSTALL) $(IFLAGS1) $(DIST)/branding/default48.png $(FINAL_TARGET)/chrome/icons/default
|
|
+ifdef MOZ_OFFICIAL_BRANDING
|
|
+ $(INSTALL) $(IFLAGS1) $(DIST)/branding/default22.png $(FINAL_TARGET)/chrome/icons/default
|
|
+ $(INSTALL) $(IFLAGS1) $(DIST)/branding/default24.png $(FINAL_TARGET)/chrome/icons/default
|
|
+ $(INSTALL) $(IFLAGS1) $(DIST)/branding/default256.png $(FINAL_TARGET)/chrome/icons/default
|
|
+endif
|
|
endif
|
|
|
|
libs:: $(srcdir)/profile/prefs.js
|
|
$(INSTALL) $(IFLAGS1) $^ $(FINAL_TARGET)/defaults/profile
|
|
|
|
ifndef LIBXUL_SDK
|
|
# channel-prefs.js is handled separate from other prefs due to bug 756325
|
|
libs:: $(srcdir)/profile/channel-prefs.js
|
|
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
|
|
@@ -42,18 +42,21 @@ BRANDING_FILES := \
|
|
document.icns \
|
|
dsstore \
|
|
$(NULL)
|
|
endif
|
|
|
|
ifeq ($(MOZ_WIDGET_TOOLKIT),gtk2)
|
|
BRANDING_FILES := \
|
|
default16.png \
|
|
+ default22.png \
|
|
+ default24.png \
|
|
default32.png \
|
|
default48.png \
|
|
+ default256.png \
|
|
mozicon128.png \
|
|
$(NULL)
|
|
endif
|
|
|
|
ifeq ($(OS_ARCH),OS2)
|
|
BRANDING_FILES := \
|
|
firefox-os2.ico \
|
|
document-os2.ico \
|
|
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
|
|
@@ -574,18 +574,21 @@
|
|
@BINPATH@/browser/extensions/{972ce4c6-7e08-4474-a285-3208198ce6fd}/install.rdf
|
|
@BINPATH@/browser/extensions/{972ce4c6-7e08-4474-a285-3208198ce6fd}/icon.png
|
|
@BINPATH@/chrome/toolkit@JAREXT@
|
|
@BINPATH@/chrome/toolkit.manifest
|
|
@BINPATH@/chrome/recording.manifest
|
|
@BINPATH@/chrome/recording/*
|
|
#ifdef MOZ_GTK2
|
|
@BINPATH@/browser/chrome/icons/default/default16.png
|
|
+@BINPATH@/browser/chrome/icons/default/default22.png
|
|
+@BINPATH@/browser/chrome/icons/default/default24.png
|
|
@BINPATH@/browser/chrome/icons/default/default32.png
|
|
@BINPATH@/browser/chrome/icons/default/default48.png
|
|
+@BINPATH@/browser/chrome/icons/default/default256.png
|
|
#endif
|
|
|
|
; shell icons
|
|
#ifdef XP_UNIX
|
|
#ifndef XP_MACOSX
|
|
; shell icons
|
|
@BINPATH@/browser/icons/*.png
|
|
#ifdef MOZ_UPDATER
|