Merge branch 'main' into f34

This commit is contained in:
Martin Stransky 2021-03-12 12:36:59 +01:00
commit 66c538f0f2
4 changed files with 10 additions and 27 deletions

2
.gitignore vendored
View File

@ -449,3 +449,5 @@ firefox-3.6.4.source.tar.bz2
/firefox-langpacks-85.0.1-20210208.tar.xz
/firefox-86.0.source.tar.xz
/firefox-langpacks-86.0-20210222.tar.xz
/firefox-86.0.1.source.tar.xz
/firefox-langpacks-86.0.1-20210312.tar.xz

View File

@ -182,13 +182,13 @@ ExcludeArch: ppc64le
Summary: Mozilla Firefox Web browser
Name: firefox
Version: 86.0
Release: 8%{?pre_tag}%{?dist}
Version: 86.0.1
Release: 1%{?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
%if %{with langpacks}
Source1: firefox-langpacks-%{version}%{?pre_version}-20210222.tar.xz
Source1: firefox-langpacks-%{version}%{?pre_version}-20210312.tar.xz
%endif
Source2: cbindgen-vendor.tar.xz
Source10: firefox-mozconfig
@ -266,7 +266,6 @@ 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
@ -517,7 +516,6 @@ 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}
@ -1093,6 +1091,9 @@ gtk-update-icon-cache %{_datadir}/icons/hicolor &>/dev/null || :
#---------------------------------------------------------------------
%changelog
* Fri Mar 12 2021 Martin Stransky <stransky@redhat.com> - 86.0.1-1
- Update to latest upstream (86.0.1)
* Wed Mar 10 2021 Martin Stransky <stransky@redhat.com> - 86.0-8
- Temporary disable ppc64le/Fedora 35 due to
https://bugzilla.redhat.com/show_bug.cgi?id=1933742

View File

@ -1,22 +0,0 @@
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();

View File

@ -2,3 +2,5 @@ SHA512 (mochitest-python.tar.gz) = 7f357cb8bd93d64be5cb75819a8a813d2f8f217ff25f0
SHA512 (cbindgen-vendor.tar.xz) = f122880b80009e5d5147b40147ba383731922e618d50312067cab0be6a0873adde5d5dbe2e6688b41c1a7e0f0ca2f1cccfa789e7b834b69f8c5445cc46ecccaf
SHA512 (firefox-86.0.source.tar.xz) = f5a7b9aa53e2955e972e30cc62ae64ae955127eab951d7a1102d5ac8a73804982e01b917787c00a6e0a0ed03594567d29a24808271283ef61a9383bc4bb39e3f
SHA512 (firefox-langpacks-86.0-20210222.tar.xz) = 05090d9b4b5ac628b31a5d5d727e8616269c0e92fd97d9d9066c9ff7bc46ae880cfe10c38c48174f4d5dde454200c8efc2e0a02067305821bf3af1f4aae8a766
SHA512 (firefox-86.0.1.source.tar.xz) = e613cdcadfd71a01800a72c08c590032605ca8a8a0ba93326ffba93c2819f629fd620c23d00ca1274b203adc20acfe5d7913fee240ff14819fb1377ed08b1214
SHA512 (firefox-langpacks-86.0.1-20210312.tar.xz) = dc382a3d64b367ecfaad16be2034c958d80f35fbd1d7d33c41ca8a71da19565dbbcef2a5fc7c4cadcb3d7dc80c71e429719903145df67cd8fb3a509e434aeff5