From 9a67e773f39fd8e432a0a2b1cd603216e8171a85 Mon Sep 17 00:00:00 2001 From: CentOS Sources Date: Nov 16 2016 04:52:27 +0000 Subject: import firefox-45.5.0-1.el7_3 --- diff --git a/.firefox.metadata b/.firefox.metadata index 5484b4c..99be91a 100644 --- a/.firefox.metadata +++ b/.firefox.metadata @@ -1,6 +1,6 @@ 511960dd78451a06c9df76509635aeec05b2051a SOURCES/Python-2.7.8.tgz 467bdb846d67c01aed9e521fe0ef280065a50c3c SOURCES/devtoolset-2-binutils-2.23.52.0.1-10.el5.src.rpm -3892aa3ecadfd5fc0533f7847cd959baef3be10e SOURCES/firefox-45.4.0esr.source.tar.xz -82269e4270cda27a7219e178d32a29d61ec7f5fc SOURCES/firefox-langpacks-45.4.0esr-20160907.tar.xz +baec1aaf866c55baa7d2767de9880a32c4b96914 SOURCES/firefox-45.5.0esr.source.tar.xz +a2bb3e59230931d7fb28f9f4e3b37aecb16c72b0 SOURCES/firefox-langpacks-45.5.0esr-20161108.tar.xz e5ba84786af5d0e0e23b1a9112c76821ef23306c SOURCES/gcc48-4.8.2-16.el5.src.rpm 77fd30f7ebc12a629a31c1e252cec06af55a71fe SOURCES/yasm-1.2.0-3.el5.src.rpm diff --git a/.gitignore b/.gitignore index ee32053..2c35856 100644 --- a/.gitignore +++ b/.gitignore @@ -1,6 +1,6 @@ SOURCES/Python-2.7.8.tgz SOURCES/devtoolset-2-binutils-2.23.52.0.1-10.el5.src.rpm -SOURCES/firefox-45.4.0esr.source.tar.xz -SOURCES/firefox-langpacks-45.4.0esr-20160907.tar.xz +SOURCES/firefox-45.5.0esr.source.tar.xz +SOURCES/firefox-langpacks-45.5.0esr-20161108.tar.xz SOURCES/gcc48-4.8.2-16.el5.src.rpm SOURCES/yasm-1.2.0-3.el5.src.rpm diff --git a/SOURCES/build-nss.patch b/SOURCES/build-nss.patch index 36f8f83..7cf5fb6 100644 --- a/SOURCES/build-nss.patch +++ b/SOURCES/build-nss.patch @@ -14,7 +14,7 @@ diff -up firefox-45.0.1esr/configure.in.nss firefox-45.0.1esr/configure.in _USE_SYSTEM_NSS=1 ) if test -n "$_USE_SYSTEM_NSS"; then -- AM_PATH_NSS(3.21.1, [MOZ_NATIVE_NSS=1], [AC_MSG_ERROR([you don't have NSS installed or your version is too old])]) +- AM_PATH_NSS(3.21.3, [MOZ_NATIVE_NSS=1], [AC_MSG_ERROR([you don't have NSS installed or your version is too old])]) + AM_PATH_NSS(3.21.0, [MOZ_NATIVE_NSS=1], [AC_MSG_ERROR([you don't have NSS installed or your version is too old])]) fi diff --git a/SOURCES/firefox-centos-default-bookmarks.html b/SOURCES/firefox-centos-default-bookmarks.html deleted file mode 100644 index 95a34bd..0000000 --- a/SOURCES/firefox-centos-default-bookmarks.html +++ /dev/null @@ -1,21 +0,0 @@ - - - -Bookmarks -

Bookmarks

- -

-

Personal Toolbar Folder

-

-

CentOS -

Support

-

-

CentOS Forums -
CentOS Mailing-Lists -
CentOS Documentation -
CentOS Wiki -

-

-

diff --git a/SOURCES/firefox-centos-default-prefs.js b/SOURCES/firefox-centos-default-prefs.js deleted file mode 100644 index fd3108f..0000000 --- a/SOURCES/firefox-centos-default-prefs.js +++ /dev/null @@ -1,27 +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"); -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%"); -pref("browser.tabs.remote.autostart", false); diff --git a/SOURCES/firefox-redhat-default-prefs.js b/SOURCES/firefox-redhat-default-prefs.js new file mode 100644 index 0000000..02113f4 --- /dev/null +++ b/SOURCES/firefox-redhat-default-prefs.js @@ -0,0 +1,27 @@ +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"); +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%"); +pref("browser.tabs.remote.autostart", false); diff --git a/SPECS/firefox.spec b/SPECS/firefox.spec index 608dd1a..3096364 100644 --- a/SPECS/firefox.spec +++ b/SPECS/firefox.spec @@ -88,7 +88,7 @@ ExcludeArch: ppc ia64 Summary: Mozilla Firefox Web browser Name: firefox -Version: 45.4.0 +Version: 45.5.0 Release: 1%{?dist} URL: http://www.mozilla.org/projects/firefox/ License: MPLv1.1 or GPLv2+ or LGPLv2+ @@ -100,10 +100,10 @@ Group: Applications/Internet # From ftp://archive.mozilla.org/pub/firefox/releases/%{version}%{?ext_version}/source Source0: firefox-%{version}%{?ext_version}.source.tar.xz %if %{build_langpacks} -Source1: firefox-langpacks-%{version}%{?ext_version}-20160907.tar.xz +Source1: firefox-langpacks-%{version}%{?ext_version}-20161108.tar.xz %endif Source10: firefox-mozconfig -Source12: firefox-centos-default-prefs.js +Source12: firefox-redhat-default-prefs.js Source20: firefox.desktop Source500: firefox.sh.in.rhel5 Source600: firefox.sh.in.rhel6 @@ -116,7 +116,7 @@ Source300: gcc48-%{gcc_version}.el5.src.rpm Source301: yasm-1.2.0-3.el5.src.rpm Source302: devtoolset-2-binutils-2.23.52.0.1-10.el5.src.rpm # RHEL5 bookmarks -Source501: firefox-centos-default-bookmarks.html +Source501: firefox-redhat-default-bookmarks.html # Build patches Patch0: firefox-install-dir.patch @@ -141,6 +141,7 @@ Patch201: mozilla-1005535.patch # Kaie's patch, we'll most likely need this one Patch202: mozilla-1152515.patch Patch203: mozilla-1270046.patch +# Laszlo Ersek patch for avoid obscure crashing on aarch64 # RHEL7 patches Patch300: mozilla-975832.patch @@ -951,8 +952,14 @@ gtk-update-icon-cache %{_datadir}/icons/hicolor &>/dev/null || : #--------------------------------------------------------------------- %changelog -* Wed Sep 21 2016 CentOS Sources - 45.4.0-1.el7.centos -- CentOS default prefs +* Tue Nov 8 2016 Jan Horak - 45.5.0-1 +- Update to 45.5.0 ESR + +* Mon Oct 31 2016 Jan Horak - 45.4.0-3 +- Added upcoming upstream patches mozbz#1018486 + +* Mon Sep 26 2016 Jan Horak - 45.4.0-2 +- Added Laszlo Ersek patch for aarch64 crashes * Wed Sep 7 2016 Jan Horak - 45.4.0-1 - Update to 45.4.0 ESR