Merge branch 'main' into f34

3 files changed, 42 insertions, 12 deletions

diff --git a/firefox-tests-xpcshell.patch b/firefox-tests-xpcshell.patch
index 26089d7..f3f419f 100644
--- a/firefox-tests-xpcshell.patch
+++ b/firefox-tests-xpcshell.patch
@@ -1,23 +1,23 @@
 diff -U0 firefox-86.0/browser/components/enterprisepolicies/tests/xpcshell/xpcshell.ini.firefox-tests-xpcshell firefox-86.0/browser/components/enterprisepolicies/tests/xpcshell/xpcshell.ini
 --- firefox-86.0/browser/components/enterprisepolicies/tests/xpcshell/xpcshell.ini.firefox-tests-xpcshell	2021-02-22 14:43:35.000000000 +0100
-+++ firefox-86.0/browser/components/enterprisepolicies/tests/xpcshell/xpcshell.ini	2021-03-02 08:58:37.587763298 +0100
++++ firefox-86.0/browser/components/enterprisepolicies/tests/xpcshell/xpcshell.ini	2021-03-02 15:21:43.002449859 +0100
 @@ -9 +8,0 @@
 -[test_appupdateurl.js]
 @@ -27 +25,0 @@
 -[test_sorted_alphabetically.js]
 diff -U0 firefox-86.0/devtools/client/shared/remote-debugging/adb/xpcshell/xpcshell.ini.firefox-tests-xpcshell firefox-86.0/devtools/client/shared/remote-debugging/adb/xpcshell/xpcshell.ini
 --- firefox-86.0/devtools/client/shared/remote-debugging/adb/xpcshell/xpcshell.ini.firefox-tests-xpcshell	2021-02-22 14:43:36.000000000 +0100
-+++ firefox-86.0/devtools/client/shared/remote-debugging/adb/xpcshell/xpcshell.ini	2021-03-02 08:55:53.081679862 +0100
++++ firefox-86.0/devtools/client/shared/remote-debugging/adb/xpcshell/xpcshell.ini	2021-03-02 15:21:43.002449859 +0100
 @@ -9 +8,0 @@
 -[test_adb.js]
 diff -U0 firefox-86.0/netwerk/test/unit_ipc/xpcshell.ini.firefox-tests-xpcshell firefox-86.0/netwerk/test/unit_ipc/xpcshell.ini
 --- firefox-86.0/netwerk/test/unit_ipc/xpcshell.ini.firefox-tests-xpcshell	2021-02-22 15:19:41.000000000 +0100
-+++ firefox-86.0/netwerk/test/unit_ipc/xpcshell.ini	2021-03-02 08:55:53.081679862 +0100
++++ firefox-86.0/netwerk/test/unit_ipc/xpcshell.ini	2021-03-02 15:21:43.002449859 +0100
 @@ -73 +72,0 @@
 -[test_dns_service_wrap.js]
 diff -U0 firefox-86.0/netwerk/test/unit/xpcshell.ini.firefox-tests-xpcshell firefox-86.0/netwerk/test/unit/xpcshell.ini
 --- firefox-86.0/netwerk/test/unit/xpcshell.ini.firefox-tests-xpcshell	2021-02-22 15:47:05.000000000 +0100
-+++ firefox-86.0/netwerk/test/unit/xpcshell.ini	2021-03-02 09:00:04.738928807 +0100
++++ firefox-86.0/netwerk/test/unit/xpcshell.ini	2021-03-02 15:21:43.002449859 +0100
 @@ -203 +202,0 @@
 -[test_dns_service.js]
 @@ -227 +225,0 @@
@@ -35,22 +35,25 @@ diff -U0 firefox-86.0/netwerk/test/unit/xpcshell.ini.firefox-tests-xpcshell fire
 -[test_httpssvc_retry_with_ech.js]
 diff -U0 firefox-86.0/security/manager/ssl/tests/unit/xpcshell.ini.firefox-tests-xpcshell firefox-86.0/security/manager/ssl/tests/unit/xpcshell.ini
 --- firefox-86.0/security/manager/ssl/tests/unit/xpcshell.ini.firefox-tests-xpcshell	2021-02-22 15:47:05.000000000 +0100
-+++ firefox-86.0/security/manager/ssl/tests/unit/xpcshell.ini	2021-03-02 08:55:53.082679887 +0100
-@@ -182 +181,0 @@
++++ firefox-86.0/security/manager/ssl/tests/unit/xpcshell.ini	2021-03-02 19:20:41.609012711 +0100
+@@ -115,2 +114,0 @@
+-[test_encrypted_client_hello.js]
+-run-sequentially = hardcoded ports
+@@ -182 +179,0 @@
 -[test_oskeystore.js]
 diff -U0 firefox-86.0/security/manager/ssl/tests/unit/xpcshell-smartcards.ini.firefox-tests-xpcshell firefox-86.0/security/manager/ssl/tests/unit/xpcshell-smartcards.ini
 --- firefox-86.0/security/manager/ssl/tests/unit/xpcshell-smartcards.ini.firefox-tests-xpcshell	2021-02-22 14:43:46.000000000 +0100
-+++ firefox-86.0/security/manager/ssl/tests/unit/xpcshell-smartcards.ini	2021-03-02 08:55:53.082679887 +0100
++++ firefox-86.0/security/manager/ssl/tests/unit/xpcshell-smartcards.ini	2021-03-02 15:21:43.003449884 +0100
 @@ -10 +9,0 @@
 -[test_pkcs11_module.js]
 diff -U0 firefox-86.0/toolkit/components/commandlines/test/unit/xpcshell.ini.firefox-tests-xpcshell firefox-86.0/toolkit/components/commandlines/test/unit/xpcshell.ini
 --- firefox-86.0/toolkit/components/commandlines/test/unit/xpcshell.ini.firefox-tests-xpcshell	2021-02-22 14:43:53.000000000 +0100
-+++ firefox-86.0/toolkit/components/commandlines/test/unit/xpcshell.ini	2021-03-02 08:55:53.082679887 +0100
++++ firefox-86.0/toolkit/components/commandlines/test/unit/xpcshell.ini	2021-03-02 15:21:43.003449884 +0100
 @@ -10 +9,0 @@
 -[test_resolvefile.js]
 diff -U0 firefox-86.0/toolkit/components/extensions/test/xpcshell/xpcshell-common.ini.firefox-tests-xpcshell firefox-86.0/toolkit/components/extensions/test/xpcshell/xpcshell-common.ini
 --- firefox-86.0/toolkit/components/extensions/test/xpcshell/xpcshell-common.ini.firefox-tests-xpcshell	2021-02-22 15:47:05.000000000 +0100
-+++ firefox-86.0/toolkit/components/extensions/test/xpcshell/xpcshell-common.ini	2021-03-02 08:55:53.082679887 +0100
++++ firefox-86.0/toolkit/components/extensions/test/xpcshell/xpcshell-common.ini	2021-03-02 15:21:43.003449884 +0100
 @@ -79,2 +78,0 @@
 -[test_ext_downloads_misc.js]
 -skip-if = os == "android" || (os=='linux' && bits==32) || tsan # linux32: bug 1324870, tsan: bug 1612707
@@ -59,11 +62,11 @@ diff -U0 firefox-86.0/toolkit/components/extensions/test/xpcshell/xpcshell-commo
 -skip-if = appname == "thunderbird"
 diff -U0 firefox-86.0/toolkit/modules/subprocess/test/xpcshell/xpcshell.ini.firefox-tests-xpcshell firefox-86.0/toolkit/modules/subprocess/test/xpcshell/xpcshell.ini
 --- firefox-86.0/toolkit/modules/subprocess/test/xpcshell/xpcshell.ini.firefox-tests-xpcshell	2021-02-22 14:43:54.000000000 +0100
-+++ firefox-86.0/toolkit/modules/subprocess/test/xpcshell/xpcshell.ini	2021-03-02 08:55:53.082679887 +0100
++++ firefox-86.0/toolkit/modules/subprocess/test/xpcshell/xpcshell.ini	2021-03-02 15:21:43.003449884 +0100
 @@ -10 +9,0 @@
 -[test_subprocess.js]
 diff -U0 firefox-86.0/toolkit/mozapps/extensions/test/xpcshell/xpcshell.ini.firefox-tests-xpcshell firefox-86.0/toolkit/mozapps/extensions/test/xpcshell/xpcshell.ini
 --- firefox-86.0/toolkit/mozapps/extensions/test/xpcshell/xpcshell.ini.firefox-tests-xpcshell	2021-02-22 14:43:54.000000000 +0100
-+++ firefox-86.0/toolkit/mozapps/extensions/test/xpcshell/xpcshell.ini	2021-03-02 08:55:53.082679887 +0100
++++ firefox-86.0/toolkit/mozapps/extensions/test/xpcshell/xpcshell.ini	2021-03-02 15:21:43.003449884 +0100
 @@ -97 +96,0 @@
 -[test_sideloads_after_rebuild.js]
diff --git a/firefox.spec b/firefox.spec
index 0c9b53a..f2adb85 100644
--- a/firefox.spec
+++ b/firefox.spec
@@ -177,7 +177,7 @@ ExcludeArch: armv7hl
 Summary:        Mozilla Firefox Web browser
 Name:           firefox
 Version:        86.0
-Release:        6%{?pre_tag}%{?dist}
+Release:        7%{?pre_tag}%{?dist}
 URL:            https://www.mozilla.org/firefox/
 License:        MPLv1.1 or GPLv2+ or LGPLv2+
 Source0:        https://archive.mozilla.org/pub/firefox/releases/%{version}%{?pre_version}/source/firefox-%{version}%{?pre_version}.source.tar.xz
@@ -260,6 +260,7 @@ Patch418:        mozilla-1556931-s390x-hidden-syms.patch
 Patch429:        mozilla-1631061-1.patch
 Patch430:        mozilla-1631061-2.patch
 Patch431:        mozilla-1683578.patch
+Patch432:        mozilla-1694670.patch
 
 # PGO/LTO patches
 Patch600:        pgo.patch
@@ -510,6 +511,7 @@ This package contains results of tests executed during build.
 %patch429 -p1 -b .1631061
 %patch430 -p1 -b .1631061
 %patch431 -p1 -b .1683578
+%patch432 -p1 -b .1694670
 
 # PGO patches
 %if %{build_with_pgo}
@@ -1085,6 +1087,9 @@ gtk-update-icon-cache %{_datadir}/icons/hicolor &>/dev/null || :
 #---------------------------------------------------------------------
 
 %changelog
+* Wed Mar 3 2021 Martin Stransky <stransky@redhat.com> - 86.0-7
+- Added fix for mozbz#1694670
+
 * Mon Mar 1 2021 Martin Stransky <stransky@redhat.com> - 86.0-6
 - Run xpcshell tests sequential
 - Test fixes
diff --git a/mozilla-1694670.patch b/mozilla-1694670.patch
new file mode 100644
index 0000000..7c5eb79
--- /dev/null
+++ b/mozilla-1694670.patch
@@ -0,0 +1,22 @@
+diff --git a/gfx/qcms/src/iccread.rs b/gfx/qcms/src/iccread.rs
+--- a/gfx/qcms/src/iccread.rs
++++ b/gfx/qcms/src/iccread.rs
+@@ -229,7 +229,7 @@
+     read_u16(mem, offset)
+ }
+ pub fn write_u32(mem: &mut [u8], offset: usize, value: u32) {
+-    if offset <= mem.len() - std::mem::size_of_val(&value) {
++    if offset > mem.len() - std::mem::size_of_val(&value) {
+         panic!("OOB");
+     }
+     let mem = mem.as_mut_ptr();
+@@ -238,7 +238,7 @@
+     }
+ }
+ pub fn write_u16(mem: &mut [u8], offset: usize, value: u16) {
+-    if offset <= mem.len() - std::mem::size_of_val(&value) {
++    if offset > mem.len() - std::mem::size_of_val(&value) {
+         panic!("OOB");
+     }
+     let mem = mem.as_mut_ptr();
+