forked from pool/MozillaFirefox
83b187e5a4
* MFSA 2014-48/CVE-2014-1533/CVE-2014-1534 (bmo#921622, bmo#967354, bmo#969517, bmo#969549, bmo#973874, bmo#978652, bmo#978811, bmo#988719, bmo#990868, bmo#991981, bmo#992274, bmo#994907, bmo#995679, bmo#995816, bmo#995817, bmo#996536, bmo#996715, bmo#999651, bmo#1000598, bmo#1000960, bmo#1002340, bmo#1005578, bmo#1007223, bmo#1009952, bmo#1011007) Miscellaneous memory safety hazards (rv:30.0) * MFSA 2014-49/CVE-2014-1536/CVE-2014-1537/CVE-2014-1538 (bmo#989994, bmo#999274, bmo#1005584) Use-after-free and out of bounds issues found using Address Sanitizer * MFSA 2014-50/CVE-2014-1539 (bmo#995603) Clickjacking through cursor invisability after Flash interaction * MFSA 2014-51/CVE-2014-1540 (bmo#978862) Use-after-free in Event Listener Manager * MFSA 2014-52/CVE-2014-1541 (bmo#1000185) Use-after-free with SMIL Animation Controller * MFSA 2014-53/CVE-2014-1542 (bmo#991533) Buffer overflow in Web Audio Speex resampler * MFSA 2014-54/CVE-2014-1543 (bmo#1011859) Buffer overflow in Gamepad API - rebased patches - removed obsolete patches * firefox-browser-css.patch * mozilla-aarch64-bmo-962488.patch * mozilla-aarch64-bmo-963023.patch * mozilla-aarch64-bmo-963024.patch * mozilla-aarch64-bmo-963027.patch OBS-URL: https://build.opensuse.org/package/show/mozilla:Factory/MozillaFirefox?expand=0&rev=384
79 lines
2.7 KiB
Diff
79 lines
2.7 KiB
Diff
# HG changeset patch
|
|
# Parent ab6659ccbfbbfed31bce1bcd696a820069b9d7c0
|
|
|
|
diff --git a/browser/app/Makefile.in b/browser/app/Makefile.in
|
|
--- a/browser/app/Makefile.in
|
|
+++ b/browser/app/Makefile.in
|
|
@@ -76,16 +76,21 @@ GARBAGE += $(addprefix $(FINAL_TARGET)/d
|
|
endif
|
|
|
|
ifdef MOZ_WIDGET_GTK
|
|
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
|
|
@@ -36,18 +36,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
|
|
|
|
BRANDING_DEST := $(DIST)/branding
|
|
BRANDING_TARGET := export
|
|
INSTALL_TARGETS += BRANDING
|
|
|
|
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
|
|
@@ -611,18 +611,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_GTK
|
|
@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
|