a7f369b4c2
* 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)
OBS-URL: https://build.opensuse.org/package/show/mozilla:Factory/MozillaFirefox?expand=0&rev=280
79 lines
2.4 KiB
Diff
79 lines
2.4 KiB
Diff
# HG changeset patch
|
|
# Parent 4a29f791f190ebb5de41590d70d52c7510d9477c
|
|
|
|
diff --git a/browser/app/Makefile.in b/browser/app/Makefile.in
|
|
--- a/browser/app/Makefile.in
|
|
+++ b/browser/app/Makefile.in
|
|
@@ -160,16 +160,21 @@ endif
|
|
endif # LIBXUL_SDK
|
|
|
|
ifeq ($(MOZ_WIDGET_TOOLKIT),gtk2)
|
|
libs::
|
|
$(INSTALL) $(IFLAGS1) $(DIST)/branding/mozicon128.png $(DIST)/bin/icons
|
|
$(INSTALL) $(IFLAGS1) $(DIST)/branding/default16.png $(DIST)/bin/chrome/icons/default
|
|
$(INSTALL) $(IFLAGS1) $(DIST)/branding/default32.png $(DIST)/bin/chrome/icons/default
|
|
$(INSTALL) $(IFLAGS1) $(DIST)/branding/default48.png $(DIST)/bin/chrome/icons/default
|
|
+ifdef MOZ_OFFICIAL_BRANDING
|
|
+ $(INSTALL) $(IFLAGS1) $(DIST)/branding/default22.png $(DIST)/bin/chrome/icons/default
|
|
+ $(INSTALL) $(IFLAGS1) $(DIST)/branding/default24.png $(DIST)/bin/chrome/icons/default
|
|
+ $(INSTALL) $(IFLAGS1) $(DIST)/branding/default256.png $(DIST)/bin/chrome/icons/default
|
|
+endif
|
|
endif
|
|
|
|
libs:: $(srcdir)/profile/prefs.js
|
|
$(INSTALL) $(IFLAGS1) $^ $(DIST)/bin/defaults/profile
|
|
|
|
libs:: $(srcdir)/blocklist.xml
|
|
$(INSTALL) $(IFLAGS1) $^ $(DIST)/bin
|
|
|
|
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
|
|
@@ -65,18 +65,21 @@ OSX_BRANDING_FILES = \
|
|
firefox.icns \
|
|
disk.icns \
|
|
document.icns \
|
|
dsstore \
|
|
$(NULL)
|
|
|
|
LINUX_BRANDING_FILES = \
|
|
default16.png \
|
|
+ default22.png \
|
|
+ default24.png \
|
|
default32.png \
|
|
default48.png \
|
|
+ default256.png \
|
|
mozicon128.png \
|
|
$(NULL)
|
|
|
|
OS2_BRANDING_FILES = \
|
|
firefox-os2.ico \
|
|
document-os2.ico \
|
|
$(NULL)
|
|
|
|
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
|
|
@@ -450,18 +450,21 @@
|
|
@BINPATH@/extensions/{972ce4c6-7e08-4474-a285-3208198ce6fd}/preview.png
|
|
#ifdef SHIP_FEEDBACK
|
|
@BINPATH@/distribution/extensions/testpilot@labs.mozilla.com.xpi
|
|
#endif
|
|
@BINPATH@/chrome/toolkit@JAREXT@
|
|
@BINPATH@/chrome/toolkit.manifest
|
|
#ifdef MOZ_GTK2
|
|
@BINPATH@/chrome/icons/default/default16.png
|
|
+@BINPATH@/chrome/icons/default/default22.png
|
|
+@BINPATH@/chrome/icons/default/default24.png
|
|
@BINPATH@/chrome/icons/default/default32.png
|
|
@BINPATH@/chrome/icons/default/default48.png
|
|
+@BINPATH@/chrome/icons/default/default256.png
|
|
#endif
|
|
|
|
; shell icons
|
|
#ifdef XP_UNIX
|
|
#ifndef XP_MACOSX
|
|
@BINPATH@/icons/*.xpm
|
|
@BINPATH@/icons/*.png
|
|
#endif
|