-
-
-
-
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-bookmarks.html b/SOURCES/firefox-redhat-default-bookmarks.html new file mode 100644 index 0000000..042ccdc --- /dev/null +++ b/SOURCES/firefox-redhat-default-bookmarks.html @@ -0,0 +1,17 @@ + + + +
+
+
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/SOURCES/firefox.desktop b/SOURCES/firefox.desktop
index 4d6c778..bac6399 100644
--- a/SOURCES/firefox.desktop
+++ b/SOURCES/firefox.desktop
@@ -3,13 +3,13 @@ Version=1.0
Name=Firefox Web Browser
Name[ca]=Navegador web Firefox
Name[cs]=Firefox Webový prohlížeč
-Name[es]=Navegador web Firefox
+Name[es]=Navegador Firefox
Name[fa]=مرورگر اینترنتی Firefox
Name[fi]=Firefox-selain
-Name[fr]=Navigateur Web Firefox
+Name[fr]=Navigateur web Firefox
Name[hu]=Firefox webböngésző
-Name[it]=Firefox Browser Web
-Name[ja]=Firefox ウェブ・ブラウザ
+Name[it]=Web browser Firefox
+Name[ja]=Firefox Web ブラウザー
Name[ko]=Firefox 웹 브라우저
Name[nb]=Firefox Nettleser
Name[nl]=Firefox webbrowser
@@ -17,9 +17,12 @@ Name[nn]=Firefox Nettlesar
Name[no]=Firefox Nettleser
Name[pl]=Przeglądarka WWW Firefox
Name[pt]=Firefox Navegador Web
-Name[pt_BR]=Navegador Web Firefox
+Name[pt_BR]=Navegador Firefox
+Name[ru]=Веб-браузер Firefox
Name[sk]=Internetový prehliadač Firefox
Name[sv]=Webbläsaren Firefox
+Name[zh_CN]=火狐浏览器
+Name[zh_TW]=Firefox 網頁瀏覽器
GenericName=Web Browser
GenericName[ca]=Navegador web
GenericName[cs]=Webový prohlížeč
diff --git a/SOURCES/mozilla-256180.patch b/SOURCES/mozilla-256180.patch
new file mode 100644
index 0000000..13a1c97
--- /dev/null
+++ b/SOURCES/mozilla-256180.patch
@@ -0,0 +1,11 @@
+--- a/layout/generic/nsIFrame.h.old 2016-07-11 13:41:39.688276559 +0200
++++ b/layout/generic/nsIFrame.h 2016-07-11 13:42:12.791406976 +0200
+@@ -13,7 +13,7 @@
+ #error This header/class should only be used within Mozilla code. It should not be used by extensions.
+ #endif
+
+-#define MAX_REFLOW_DEPTH 200
++#define MAX_REFLOW_DEPTH 1000
+
+ /* nsIFrame is in the process of being deCOMtaminated, i.e., this file is eventually
+ going to be eliminated, and all callers will use nsFrame instead. At the moment
diff --git a/SOURCES/mozilla-975832.patch b/SOURCES/mozilla-975832.patch
new file mode 100644
index 0000000..a98ce03
--- /dev/null
+++ b/SOURCES/mozilla-975832.patch
@@ -0,0 +1,39 @@
+diff -up firefox-45.2.0esr/netwerk/base/security-prefs.js.mozbz-975832 firefox-45.2.0esr/netwerk/base/security-prefs.js
+--- firefox-45.2.0esr/netwerk/base/security-prefs.js.mozbz-975832 2016-06-20 13:09:46.100405009 +0200
++++ firefox-45.2.0esr/netwerk/base/security-prefs.js 2016-06-20 13:12:21.341155529 +0200
+@@ -22,6 +22,8 @@ pref("security.ssl3.ecdhe_rsa_aes_128_sh
+ pref("security.ssl3.ecdhe_ecdsa_aes_128_sha", true);
+ pref("security.ssl3.ecdhe_rsa_aes_256_sha", true);
+ pref("security.ssl3.ecdhe_ecdsa_aes_256_sha", true);
++pref("security.ssl3.ecdhe_ecdsa_aes_256_gcm_sha384", true);
++pref("security.ssl3.ecdhe_rsa_aes_256_gcm_sha384", true);
+ pref("security.ssl3.dhe_rsa_aes_128_sha", true);
+ pref("security.ssl3.dhe_rsa_aes_256_sha", true);
+ pref("security.ssl3.ecdhe_rsa_rc4_128_sha", true);
+diff -up firefox-45.2.0esr/security/manager/ssl/nsNSSCallbacks.cpp.mozbz-975832 firefox-45.2.0esr/security/manager/ssl/nsNSSCallbacks.cpp
+--- firefox-45.2.0esr/security/manager/ssl/nsNSSCallbacks.cpp.mozbz-975832 2016-06-20 13:09:46.101405014 +0200
++++ firefox-45.2.0esr/security/manager/ssl/nsNSSCallbacks.cpp 2016-06-20 13:14:58.491915282 +0200
+@@ -1076,6 +1076,8 @@ AccumulateCipherSuite(Telemetry::ID prob
+ case TLS_ECDHE_RSA_WITH_RC4_128_SHA: value = 8; break;
+ case TLS_ECDHE_ECDSA_WITH_RC4_128_SHA: value = 9; break;
+ case TLS_ECDHE_ECDSA_WITH_3DES_EDE_CBC_SHA: value = 10; break;
++ case TLS_ECDHE_ECDSA_WITH_AES_256_GCM_SHA384: value = 13; break;
++ case TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384: value = 14; break;
+ // DHE key exchange
+ case TLS_DHE_RSA_WITH_AES_128_CBC_SHA: value = 21; break;
+ case TLS_DHE_RSA_WITH_CAMELLIA_128_CBC_SHA: value = 22; break;
+diff -up firefox-45.2.0esr/security/manager/ssl/nsNSSComponent.cpp.mozbz-975832 firefox-45.2.0esr/security/manager/ssl/nsNSSComponent.cpp
+--- firefox-45.2.0esr/security/manager/ssl/nsNSSComponent.cpp.mozbz-975832 2016-06-20 13:09:46.101405014 +0200
++++ firefox-45.2.0esr/security/manager/ssl/nsNSSComponent.cpp 2016-06-20 13:13:19.814438221 +0200
+@@ -629,6 +629,11 @@ static const CipherPref sCipherPrefs[] =
+ { "security.ssl3.ecdhe_ecdsa_aes_256_sha",
+ TLS_ECDHE_ECDSA_WITH_AES_256_CBC_SHA, true },
+
++ { "security.ssl3.ecdhe_ecdsa_aes_256_gcm_sha384",
++ TLS_ECDHE_ECDSA_WITH_AES_256_GCM_SHA384, true },
++ { "security.ssl3.ecdhe_rsa_aes_256_gcm_sha384",
++ TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384, true },
++
+ { "security.ssl3.dhe_rsa_aes_128_sha",
+ TLS_DHE_RSA_WITH_AES_128_CBC_SHA, true },
+
diff --git a/SPECS/firefox.spec b/SPECS/firefox.spec
index f238f90..7f91c08 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.2.0
+Version: 45.3.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}-20160603.tar.xz
+Source1: firefox-langpacks-%{version}%{?ext_version}-20160727.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
@@ -134,6 +134,7 @@ Patch106: firefox-enable-plugins.patch
Patch109: aarch64-fix-skia.patch
Patch110: mozilla-1170092-etc-conf.patch
Patch111: rhbz-1173156.patch
+Patch112: mozilla-256180.patch
# Upstream patches
Patch201: mozilla-1005535.patch
@@ -141,6 +142,9 @@ Patch201: mozilla-1005535.patch
Patch202: mozilla-1152515.patch
Patch203: mozilla-1270046.patch
+# RHEL7 patches
+Patch300: mozilla-975832.patch
+
# RHEL5 patches
Patch500: build-el5-build-id.patch
Patch501: build-el5-sandbox.patch
@@ -403,6 +407,7 @@ cd %{tarballdir}
%patch109 -p1 -b .aarch64
%patch110 -p1 -b .moz-1170092-etc-conf
%patch111 -p2 -b .rhbz-1173156
+%patch112 -p1 -b .mozbz-256180
# Upstream patches
%patch201 -p1 -b .mozbz-1005535
@@ -410,6 +415,11 @@ cd %{tarballdir}
%patch202 -p1 -b .mozbz-1152515
%patch203 -p1 -b .mozbz-1270046
+# RHEL7 only patches
+%if %{?rhel} == 7
+%patch300 -p1 -b .mozbz-975832
+%endif
+
# RHEL5 only patches
%if %{?rhel} == 5
%patch500 -p1 -b .gnu-build-id
@@ -941,8 +951,14 @@ gtk-update-icon-cache %{_datadir}/icons/hicolor &>/dev/null || :
#---------------------------------------------------------------------
%changelog
-* Wed Jun 8 2016 Johnny Hughes