aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJ0WI <J0WI@users.noreply.github.com>2021-02-24 22:02:11 +0100
committerRasmus Thomsen <oss@cogitri.dev>2021-02-25 10:09:57 +0000
commit3602287df783771e39fffd4c836b0147d075f952 (patch)
treec4c377543370f44185fdb2b00ab9057ee6c92b6e
parent0142586df2e4e7dbdd114c8e3c063ccdc4f49d43 (diff)
downloadaports-3602287df783771e39fffd4c836b0147d075f952.tar.gz
aports-3602287df783771e39fffd4c836b0147d075f952.tar.bz2
aports-3602287df783771e39fffd4c836b0147d075f952.tar.xz
community/firefox-esr: security upgrade to 78.8.0
-rw-r--r--community/firefox-esr/APKBUILD15
-rw-r--r--community/firefox-esr/fix-rust-1.50-build.patch85
2 files changed, 9 insertions, 91 deletions
diff --git a/community/firefox-esr/APKBUILD b/community/firefox-esr/APKBUILD
index 57990ed591..3f7433d4c7 100644
--- a/community/firefox-esr/APKBUILD
+++ b/community/firefox-esr/APKBUILD
@@ -2,9 +2,9 @@
# Contributor: Sören Tempel <soeren+alpine@soeren-tempel.net>
# Maintainer: Natanael Copa <ncopa@alpinelinux.org>
pkgname=firefox-esr
-pkgver=78.7.1
+pkgver=78.8.0
# Date of release, YY-MM-DD for metainfo file (see package())
-_releasedate=2021-02-05
+_releasedate=2021-02-23
pkgrel=0
pkgdesc="Firefox web browser - Extended Support Release"
url="https://www.mozilla.org/en-US/firefox/organizations/"
@@ -75,7 +75,6 @@ source="https://ftp.mozilla.org/pub/firefox/releases/${pkgver}esr/source/firefox
disable-neon-in-aom.patch
sandbox-fork.patch
sandbox-sched_setscheduler.patch
- fix-rust-1.50-build.patch
"
subpackages="$pkgname-npapi"
@@ -87,6 +86,11 @@ _mozappdir=/usr/lib/firefox
ldpath="$_mozappdir"
# secfixes:
+# 78.8.0-r0:
+# - CVE-2021-23968
+# - CVE-2021-23969
+# - CVE-2021-23973
+# - CVE-2021-23978
# 78.7.0-r0:
# - CVE-2020-26976
# - CVE-2021-23953
@@ -433,7 +437,7 @@ npapi() {
amove usr/lib/firefox/gtk2
}
-sha512sums="d5828667ab07f5971049092102b7017472a835a3ab8581ba485a528e9b269aafdeeebecb4c882043459c2b901290c5525d795b04c1d4f30f7b74ee6cd7b18646 firefox-78.7.1esr.source.tar.xz
+sha512sums="0160aa6c408c2af66d24b74cf98e1a07ab1604e7b93ffcde79201f9d68e41e896ef965f1904de52d5dd82ffedae33ac96e93b871727bf5dd5983c5af2f1f439f firefox-78.8.0esr.source.tar.xz
0b3f1e4b9fdc868e4738b5c81fd6c6128ce8885b260affcb9a65ff9d164d7232626ce1291aaea70132b3e3124f5e13fef4d39326b8e7173e362a823722a85127 stab.h
2f4f15974d52de4bb273b62a332d13620945d284bbc6fe6bd0a1f58ff7388443bc1d3bf9c82cc31a8527aad92b0cd3a1bc41d0af5e1800e0dcbd7033e58ffd71 fix-fortify-system-wrappers.patch
4510fb92653d0fdcfbc6d30e18087c0d22d4acd5eb53be7d0a333abe087a9e0bf9e58e56bafe96e1e1b28ebd1fd33b8926dbb70c221007e335b33d1468755c66 fix-tools.patch
@@ -448,5 +452,4 @@ f3b7c3e804ce04731012a46cb9e9a6b0769e3772aef9c0a4a8c7520b030fdf6cd703d5e9ff49275f
bb75b2abda86e455d81571052a2cfec5a9d858ffa91c50a7217b4b6c02cbfc0400e9114a27bd54ce78d7d3a44e9b03927cf0317654d98c0f39d26c63c9670117 remove-faulty-libvpx-check.patch
f963fcdba7307a0b1712dfb95ceba4ab49f449f60e550bb69d15d50272e6df9add90862251ee561e4ea5fd171a2703552ffa7aade92996f5f0b3e577f1544a6d disable-neon-in-aom.patch
4911ddb41bef8d9f6d6200159cde465627e940fe1c09099be55769d21a5a52a3f737e1bf803daa96126c035b091aea880fbc5d2e6cf5da96ddd17322461a72d6 sandbox-fork.patch
-db26757b2ebf9f567962e32294b4ae48b3a5d0378a7589dfe650fe3a179ff58befbab5082981c68e1c25fb9e56b2db1e4e510d4bca17c3e3aedbf9a2f21806eb sandbox-sched_setscheduler.patch
-d54c10e710fcb34c627ba5a4de038c8aaf92925a3342a8fb67543ab43c4b117f52837fdec119328359f9259f6b7016d0fe76218d3f3fd4b9625c9ccf4560e8a9 fix-rust-1.50-build.patch"
+db26757b2ebf9f567962e32294b4ae48b3a5d0378a7589dfe650fe3a179ff58befbab5082981c68e1c25fb9e56b2db1e4e510d4bca17c3e3aedbf9a2f21806eb sandbox-sched_setscheduler.patch"
diff --git a/community/firefox-esr/fix-rust-1.50-build.patch b/community/firefox-esr/fix-rust-1.50-build.patch
deleted file mode 100644
index 64260a5c59..0000000000
--- a/community/firefox-esr/fix-rust-1.50-build.patch
+++ /dev/null
@@ -1,85 +0,0 @@
-
-# HG changeset patch
-# User Emilio Cobos Álvarez <emilio@crisal.io>
-# Date 1609006565 0
-# Node ID 0e8f444683cb9c4079d3b2250f32f986043ea582
-# Parent 55097a5cf353f1b2a2228820bdf26bb69a1372a0
-Bug 1684261 - Fix build with rust nightly. r=jrmuizel, a=RyanVM
-
-Fixes errors like:
-
- dependency (nix) specification is ambiguous. Only one of `branch`, `tag` or `rev` is allowed.
-
-I've left the most specific dependency, but for wgpu the rev is not
-right, so I've kept the branch which effectively preserves behavior.
-
-Differential Revision: https://phabricator.services.mozilla.com/D100485
-
-diff --git a/.cargo/config.in b/.cargo/config.in
---- a/.cargo/config.in
-+++ b/.cargo/config.in
-@@ -1,16 +1,16 @@
- # This file contains vendoring instructions for cargo.
- # It was generated by `mach vendor rust`.
- # Please do not edit.
-
- [source."https://github.com/shravanrn/nix/"]
--branch = "r0.13.1"
- git = "https://github.com/shravanrn/nix/"
- replace-with = "vendored-sources"
-+rev = "4af6c367603869a30fddb5ffb0aba2b9477ba92e"
-
- [source."https://github.com/mozilla/rkv"]
- git = "https://github.com/mozilla/rkv"
- replace-with = "vendored-sources"
- rev = "e3c3388e6632cf55e08d773b32e58b1cab9b2731"
-
- [source."https://github.com/mozilla/neqo"]
- git = "https://github.com/mozilla/neqo"
-diff --git a/Cargo.lock b/Cargo.lock
---- a/Cargo.lock
-+++ b/Cargo.lock
-@@ -3195,17 +3195,17 @@ source = "registry+https://github.com/ru
- checksum = "0cdc457076c78ab54d5e0d6fa7c47981757f1e34dc39ff92787f217dede586c4"
- dependencies = [
- "unreachable",
- ]
-
- [[package]]
- name = "nix"
- version = "0.13.1"
--source = "git+https://github.com/shravanrn/nix/?branch=r0.13.1#4af6c367603869a30fddb5ffb0aba2b9477ba92e"
-+source = "git+https://github.com/shravanrn/nix/?rev=4af6c367603869a30fddb5ffb0aba2b9477ba92e#4af6c367603869a30fddb5ffb0aba2b9477ba92e"
- dependencies = [
- "bitflags",
- "cc",
- "cfg-if",
- "libc",
- "void",
- ]
-
-diff --git a/Cargo.toml b/Cargo.toml
---- a/Cargo.toml
-+++ b/Cargo.toml
-@@ -63,18 +63,18 @@ opt-level = 2
- rpath = false
- debug-assertions = false
- panic = "abort"
-
- [patch.crates-io]
- libudev-sys = { path = "dom/webauthn/libudev-sys" }
- packed_simd = { git = "https://github.com/hsivonen/packed_simd", rev="3541e3818fdc7c2a24f87e3459151a4ce955a67a" }
- rlbox_lucet_sandbox = { git = "https://github.com/PLSysSec/rlbox_lucet_sandbox/", rev="d510da5999a744c563b0acd18056069d1698273f" }
--nix = { git = "https://github.com/shravanrn/nix/", branch = "r0.13.1", rev="4af6c367603869a30fddb5ffb0aba2b9477ba92e" }
--spirv_cross = { git = "https://github.com/kvark/spirv_cross", branch = "wgpu3", rev = "20191ad2f370afd6d247edcb9ff9da32d3bedb9c" }
-+nix = { git = "https://github.com/shravanrn/nix/", rev="4af6c367603869a30fddb5ffb0aba2b9477ba92e" }
-+spirv_cross = { git = "https://github.com/kvark/spirv_cross", branch = "wgpu3" }
- # failure's backtrace feature might break our builds, see bug 1608157.
- failure = { git = "https://github.com/badboy/failure", rev = "64af847bc5fdcb6d2438bec8a6030812a80519a5" }
- failure_derive = { git = "https://github.com/badboy/failure", rev = "64af847bc5fdcb6d2438bec8a6030812a80519a5" }
-
- [patch.crates-io.cranelift-codegen]
- git = "https://github.com/bytecodealliance/wasmtime"
- rev = "b7cfd39b531680217537cfcf5294a22077a0a58d"
-
-