From 872e1501efa763bfd8ba82531cc5a766daf02b65 Mon Sep 17 00:00:00 2001 From: CentOS Sources Date: Sep 22 2015 17:08:16 +0000 Subject: import firefox-38.3.0-2.el7_1 --- diff --git a/.firefox.metadata b/.firefox.metadata index d7735c3..f7c870b 100644 --- a/.firefox.metadata +++ b/.firefox.metadata @@ -1,2 +1,2 @@ -c596174e7273be5079bf55aecde33ec191d99538 SOURCES/firefox-38.2.1esr.source.tar.bz2 -b6858991feb6d03de1400f2e08f97c48b4dfb52b SOURCES/firefox-langpacks-38.2.1esr-20150826.tar.bz2 +57d2c255348ac13b6ffbb952c5e0d57757aa0290 SOURCES/firefox-38.3.0esr.source.tar.bz2 +9c94dd8d46ec76943a803297dad031000f36007a SOURCES/firefox-langpacks-38.3.0esr-20150917.tar.bz2 diff --git a/.gitignore b/.gitignore index 3cabf28..4da29b7 100644 --- a/.gitignore +++ b/.gitignore @@ -1,2 +1,2 @@ -SOURCES/firefox-38.2.1esr.source.tar.bz2 -SOURCES/firefox-langpacks-38.2.1esr-20150826.tar.bz2 +SOURCES/firefox-38.3.0esr.source.tar.bz2 +SOURCES/firefox-langpacks-38.3.0esr-20150917.tar.bz2 diff --git a/SOURCES/firefox-centos-default-prefs.js b/SOURCES/firefox-centos-default-prefs.js deleted file mode 100644 index 93bd939..0000000 --- a/SOURCES/firefox-centos-default-prefs.js +++ /dev/null @@ -1,28 +0,0 @@ -pref("app.update.auto", false); -pref("app.update.enabled", false); -pref("app.update.autoInstallEnabled", false); -pref("browser.backspace_action", 2); -pref("browser.display.use_system_colors", true); -pref("browser.download.folderList", 1); -pref("browser.link.open_external", 3); -pref("browser.shell.checkDefaultBrowser", false); -pref("general.smoothScroll", true); -pref("general.useragent.vendor", "CentOS"); -pref("general.useragent.vendorSub", "FIREFOX_RPM_VR"); -pref("intl.locale.matchOS", true); -pref("storage.nfs_filesystem", false); -pref("dom.ipc.plugins.enabled.nswrapper*", false); -pref("network.manage-offline-status", true); -pref("toolkit.networkmanager.disable", false); -pref("browser.startup.homepage", "data:text/plain,browser.startup.homepage=file:///usr/share/doc/HTML/index.html"); -pref("toolkit.storage.synchronous", 0); -pref("startup.homepage_override_url", "http://www.centos.org"); -pref("startup.homepage_welcome_url", "http://www.centos.org"); -/* Workaround for rhbz#1134876 */ -pref("javascript.options.baselinejit", true); -pref("extensions.shownSelectionUI", true); -/* Workaround for rhbz#1110291 */ -pref("network.negotiate-auth.allow-insecure-ntlm-v1", true); -/* Workaround for mozbz#1063315 */ -pref("security.use_mozillapkix_verification", false); -pref("geo.wifi.uri", "https://location.services.mozilla.com/v1/geolocate?key=%MOZILLA_API_KEY%"); diff --git a/SOURCES/firefox-redhat-default-prefs.js b/SOURCES/firefox-redhat-default-prefs.js new file mode 100644 index 0000000..2706b38 --- /dev/null +++ b/SOURCES/firefox-redhat-default-prefs.js @@ -0,0 +1,28 @@ +pref("app.update.auto", false); +pref("app.update.enabled", false); +pref("app.update.autoInstallEnabled", false); +pref("browser.backspace_action", 2); +pref("browser.display.use_system_colors", true); +pref("browser.download.folderList", 1); +pref("browser.link.open_external", 3); +pref("browser.shell.checkDefaultBrowser", false); +pref("general.smoothScroll", true); +pref("general.useragent.vendor", "Red Hat"); +pref("general.useragent.vendorSub", "FIREFOX_RPM_VR"); +pref("intl.locale.matchOS", true); +pref("storage.nfs_filesystem", false); +pref("dom.ipc.plugins.enabled.nswrapper*", false); +pref("network.manage-offline-status", true); +pref("toolkit.networkmanager.disable", false); +pref("browser.startup.homepage", "data:text/plain,browser.startup.homepage=file:///usr/share/doc/HTML/index.html"); +pref("toolkit.storage.synchronous", 0); +pref("startup.homepage_override_url", "http://www.redhat.com"); +pref("startup.homepage_welcome_url", "http://www.redhat.com"); +/* Workaround for rhbz#1134876 */ +pref("javascript.options.baselinejit", true); +pref("extensions.shownSelectionUI", true); +/* Workaround for rhbz#1110291 */ +pref("network.negotiate-auth.allow-insecure-ntlm-v1", true); +/* Workaround for mozbz#1063315 */ +pref("security.use_mozillapkix_verification", false); +pref("geo.wifi.uri", "https://location.services.mozilla.com/v1/geolocate?key=%MOZILLA_API_KEY%"); diff --git a/SOURCES/mozilla-1204147.patch b/SOURCES/mozilla-1204147.patch new file mode 100644 index 0000000..63876c0 --- /dev/null +++ b/SOURCES/mozilla-1204147.patch @@ -0,0 +1,28 @@ +# HG changeset patch +# Parent c0abc2a6e11f52761366e029eb1bae4c9864a8a3 +# User Jorg K +Bug 1204147 - Prevent content preferences being written when they shouldn't. r=roc + +diff --git a/editor/composer/nsEditorSpellCheck.cpp b/editor/composer/nsEditorSpellCheck.cpp +--- a/editor/composer/nsEditorSpellCheck.cpp ++++ b/editor/composer/nsEditorSpellCheck.cpp +@@ -648,16 +648,19 @@ nsEditorSpellCheck::CheckCurrentDictiona + } + + // If our preferred current dictionary has gone, pick another one. + nsTArray dictList; + rv = mSpellChecker->GetDictionaryList(&dictList); + NS_ENSURE_SUCCESS(rv, rv); + + if (dictList.Length() > 0) { ++ // Use RAII object to prevent content preferences being written during ++ // this call. ++ UpdateDictionaryHolder holder(this); + rv = SetCurrentDictionary(dictList[0]); + NS_ENSURE_SUCCESS(rv, rv); + } + + return NS_OK; + } + + NS_IMETHODIMP diff --git a/SPECS/firefox.spec b/SPECS/firefox.spec index be7a323..516fba6 100644 --- a/SPECS/firefox.spec +++ b/SPECS/firefox.spec @@ -53,19 +53,19 @@ Summary: Mozilla Firefox Web browser Name: firefox -Version: 38.2.1 -Release: 1%{?prever}%{?dist} +Version: 38.3.0 +Release: 2%{?prever}%{?dist} URL: http://www.mozilla.org/projects/firefox/ License: MPLv1.1 or GPLv2+ or LGPLv2+ Group: Applications/Internet # From ftp://ftp.mozilla.org/pub/firefox/releases/%{version}%{?pretag}/source Source0: firefox-%{version}%{?prever}%{?ext_version}.source.tar.bz2 %if %{build_langpacks} -Source1: firefox-langpacks-%{version}%{?ext_version}-20150826.tar.bz2 +Source1: firefox-langpacks-%{version}%{?ext_version}-20150917.tar.bz2 %endif Source10: firefox-mozconfig Source11: firefox-mozconfig-branded -Source12: firefox-centos-default-prefs.js +Source12: firefox-redhat-default-prefs.js Source20: firefox.desktop Source21: firefox.sh.in Source23: firefox.1 @@ -96,6 +96,7 @@ Patch109: aarch64-fix-skia.patch Patch200: firefox-duckduckgo.patch Patch201: mozilla-1005535.patch Patch202: mozilla-1152515.patch +Patch203: mozilla-1204147.patch %if %{official_branding} # Required by Mozilla Corporation @@ -214,6 +215,7 @@ cd %{tarballdir} %patch200 -p1 -b .duckduckgo %patch201 -p1 -b .mozbz-1005535 %patch202 -p1 -b .mozbz-1152515 +%patch203 -p1 -b .mozilla-1204147 # Upstream patches @@ -531,8 +533,8 @@ gtk-update-icon-cache %{_datadir}/icons/hicolor &>/dev/null || : #--------------------------------------------------------------------- %changelog -* Thu Aug 27 2015 CentOS Sources - 38.2.1-1.el7.centos -- CentOS default prefs +* Tue Sep 15 2015 Jan Horak - 38.3.0-2 +- Update to 38.3.0 ESR * Wed Aug 26 2015 Martin Stransky - 38.2.1-1 - Update to 38.2.1 ESR