diff options
| -rw-r--r-- | .SRCINFO | 10 | ||||
| -rw-r--r-- | 0002-Bug-1694670.-Fix-the-OOB-check-in-write_u32-u16.-r-a.patch | 34 | ||||
| -rw-r--r-- | PKGBUILD | 14 |
3 files changed, 6 insertions, 52 deletions
@@ -1,8 +1,8 @@ # Generated by mksrcinfo v8 -# Sat Mar 6 04:43:48 UTC 2021 +# Sat Mar 20 22:52:17 UTC 2021 pkgbase = firefox-kde-opensuse pkgdesc = Standalone web browser from mozilla.org with OpenSUSE patch, integrate better with KDE - pkgver = 86.0 + pkgver = 86.0.1 pkgrel = 1 url = https://build.opensuse.org/package/show/mozilla:Factory/MozillaFirefox arch = i686 @@ -61,10 +61,10 @@ pkgbase = firefox-kde-opensuse optdepends = networkmanager: Location detection via available WiFi networks optdepends = speech-dispatcher: Text-to-Speech optdepends = pulseaudio: Audio support - provides = firefox=86.0 + provides = firefox=86.0.1 conflicts = firefox options = !emptydirs - source = hg+https://hg.mozilla.org/mozilla-unified#tag=FIREFOX_86_0_RELEASE + source = hg+https://hg.mozilla.org/mozilla-unified#tag=FIREFOX_86_0_1_RELEASE source = mozconfig source = firefox.desktop source = vendor.js @@ -87,7 +87,6 @@ pkgbase = firefox-kde-opensuse source = 0024-Fix-building-with-PGO-when-using-GCC.patch source = 0027-LTO-Only-enable-LTO-for-Rust-when-complete-build-use.patch source = 0028-Make-elfhack-use-toolchain.patch - source = 0002-Bug-1694670.-Fix-the-OOB-check-in-write_u32-u16.-r-a.patch md5sums = SKIP md5sums = 1fd86cc439737c90a5854aab7f85080f md5sums = a26a061efb4def6572d5b319d657f1d6 @@ -111,7 +110,6 @@ pkgbase = firefox-kde-opensuse md5sums = c8e251f1fc9050cd12173b540baa96f8 md5sums = 72176c9ee7b2ac4f1bb07ff5ee5fe10b md5sums = 07770d558b8999b5793794e1551a1309 - md5sums = 4fa2b662e08d8270e0968366c6d690e1 pkgname = firefox-kde-opensuse diff --git a/0002-Bug-1694670.-Fix-the-OOB-check-in-write_u32-u16.-r-a.patch b/0002-Bug-1694670.-Fix-the-OOB-check-in-write_u32-u16.-r-a.patch deleted file mode 100644 index 8c44bf7c9549..000000000000 --- a/0002-Bug-1694670.-Fix-the-OOB-check-in-write_u32-u16.-r-a.patch +++ /dev/null @@ -1,34 +0,0 @@ -From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001 -From: Jeff Muizelaar <jmuizelaar@mozilla.com> -Date: Thu, 25 Feb 2021 13:18:47 +0000 -Subject: [PATCH] Bug 1694670. Fix the OOB check in write_u32/u16. r=aosmond, - a=RyanVM - -Differential Revision: https://phabricator.services.mozilla.com/D106362 ---- - gfx/qcms/src/iccread.rs | 4 ++-- - 1 file changed, 2 insertions(+), 2 deletions(-) - -diff --git a/gfx/qcms/src/iccread.rs b/gfx/qcms/src/iccread.rs -index 0113e17aff3e6..f1107d50a86b6 100644 ---- a/gfx/qcms/src/iccread.rs -+++ b/gfx/qcms/src/iccread.rs -@@ -229,16 +229,16 @@ fn read_uInt16Number(mem: &mut MemSource, offset: usize) -> uInt16Number { - 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(); - unsafe { - std::ptr::write_unaligned(mem.add(offset) as *mut u32, cpu_to_be32(value)); - } - } - 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(); @@ -13,7 +13,7 @@ _pgo=true _pkgname=firefox pkgname=$_pkgname-kde-opensuse -pkgver=86.0 +pkgver=86.0.1 pkgrel=1 pkgdesc="Standalone web browser from mozilla.org with OpenSUSE patch, integrate better with KDE" arch=('i686' 'x86_64') @@ -99,11 +99,6 @@ source=("hg+$_repo#tag=FIREFOX_${pkgver//./_}_RELEASE" 0027-LTO-Only-enable-LTO-for-Rust-when-complete-build-use.patch 0028-Make-elfhack-use-toolchain.patch # end - # Fix MOZILLA#1694670 - # "Linux startup crash in [@ qcms_data_create_rgb_with_gamma]" - # https://bugzilla.mozilla.org/show_bug.cgi?id=1694670 - # https://bugs.archlinux.org/task/69821 - 0002-Bug-1694670.-Fix-the-OOB-check-in-write_u32-u16.-r-a.patch ) # Google API keys (see http://www.chromium.org/developers/how-tos/api-keys) @@ -158,10 +153,6 @@ prepare() { # Force disable elfhack to fix build errors patch -Np1 -i "$srcdir"/build-disable-elfhack.patch - # Fix MOZILLA#1694670 - patch -Np1 -i \ - "$srcdir"/0002-Bug-1694670.-Fix-the-OOB-check-in-write_u32-u16.-r-a.patch - if [ $_pgo ] ; then # Fix MOZILLA#1516803 # sandbox needs to be built with --param lto-partitions=1 when @@ -292,5 +283,4 @@ md5sums=('SKIP' '67c0bca3e38404d53e6057e744c7ecee' 'c8e251f1fc9050cd12173b540baa96f8' '72176c9ee7b2ac4f1bb07ff5ee5fe10b' - '07770d558b8999b5793794e1551a1309' - '4fa2b662e08d8270e0968366c6d690e1') + '07770d558b8999b5793794e1551a1309') |