community/firefox-esr: upgrade to 68.8.0

2 files changed, 11 insertions, 197 deletions

diff --git a/community/firefox-esr/APKBUILD b/community/firefox-esr/APKBUILD
index cc70c6d428..c8de439765 100644
--- a/community/firefox-esr/APKBUILD
+++ b/community/firefox-esr/APKBUILD
@@ -1,8 +1,8 @@
 # Contributor: Sören Tempel <soeren+alpine@soeren-tempel.net>
 # Maintainer: Natanael Copa <ncopa@alpinelinux.org>
 pkgname=firefox-esr
-pkgver=68.7.0
-pkgrel=2
+pkgver=68.8.0
+pkgrel=0
 pkgdesc="Firefox web browser - Extended Support Release"
 url="https://www.mozilla.org/en-US/firefox/organizations/"
 # limited by rust and cargo on mips s390x, fails to build on armhf
@@ -65,7 +65,6 @@ source="https://ftp.mozilla.org/pub/firefox/releases/${pkgver}esr/source/firefox
 	fix-webrtc-glibcisms.patch
 	fix-sandbox-membarrier.patch
 	fd6847c9416f9eebde636e21d794d25d1be8791d.patch
-	fix-casts.patch
 
 	firefox.desktop
 	firefox-safe.desktop"
@@ -77,6 +76,14 @@ _mozappdir=/usr/lib/firefox
 ldpath="$_mozappdir"
 
 # secfixes:
+#   68.8.0-r0:
+#     - CVE-2020-12387
+#     - CVE-2020-12388
+#     - CVE-2020-12389
+#     - CVE-2020-12392
+#     - CVE-2020-12393
+#     - CVE-2020-12395
+#     - CVE-2020-6831
 #   68.7.0-r0:
 #     - CVE-2020-6821
 #     - CVE-2020-6822
@@ -320,7 +327,7 @@ package() {
 	EOF
 }
 
-sha512sums="a3ddcf8ffe5f568b30b1fc9ddcaa5cebe600bf11ce353c09507d5466f999022d45a0dee9a08f53f37b10202a2e2ce4c180743cd6a2ca38dfea1c3e4487b18593  firefox-68.7.0esr.source.tar.xz
+sha512sums="139a63dc85ae76a50da6be9a31425f97144e6c7e4a65b0f3009a84eb5c8c9566f6bb331e26590f8aecd5045c4d730ab4e848cf7220f3444a31147b5533c742b3  firefox-68.8.0esr.source.tar.xz
 0b3f1e4b9fdc868e4738b5c81fd6c6128ce8885b260affcb9a65ff9d164d7232626ce1291aaea70132b3e3124f5e13fef4d39326b8e7173e362a823722a85127  stab.h
 2f4f15974d52de4bb273b62a332d13620945d284bbc6fe6bd0a1f58ff7388443bc1d3bf9c82cc31a8527aad92b0cd3a1bc41d0af5e1800e0dcbd7033e58ffd71  fix-fortify-system-wrappers.patch
 84b84d2d7dbc16002510bf856796ad345ac38ef6d3254670230189bba7c2d4781714d231236d5a3d70129a4597b430c3171644b01ad0f5a5bb13b55d407337a4  fix-seccomp-bpf.patch
@@ -333,6 +340,5 @@ e0df4fc649012f023443ce9165da29d36459dbca5df64a31008b28d96264fba909858de36d0cf1b1
 d35cacb9ede80e6bfbef0709823e536dddfb1c02d776275b0b7adb5969e9927d8c6117df96873569c3f3db0a18ee5db24f8086a9311a05077892be43a3dd8d79  fix-webrtc-glibcisms.patch
 f85f2c19c3dafab915bcb40e580fc442fd9eab5916696849edf0b105c758dd807dfe23a6479935613c81496711eb377c73227c03eb8582204c3442a4d0e397a2  fix-sandbox-membarrier.patch
 60845dcb034b2c4459c30f7d5f25c8176cf42df794e2cc0e86c3e2abb6541c24b962f3a16ca70a288d4d6f377b68d00b2904b22463108559612053d835d9bff1  fd6847c9416f9eebde636e21d794d25d1be8791d.patch
-f1cc25e69d7f10c4fbf24e12c5f47c7a849c2a745d6c55760d8e516364f55761cc8f082fd688bd79ade6c1d5756617b2d294d17a51b3a94ff2ea8763705e22bb  fix-casts.patch
 f3b7c3e804ce04731012a46cb9e9a6b0769e3772aef9c0a4a8c7520b030fdf6cd703d5e9ff49275f14b7d738fe82a0a4fde3bc3219dff7225d5db0e274987454  firefox.desktop
 5dcb6288d0444a8a471d669bbaf61cdb1433663eff38b72ee5e980843f5fc07d0d60c91627a2c1159215d0ad77ae3f115dcc5fdfe87e64ca704b641aceaa44ed  firefox-safe.desktop"
diff --git a/community/firefox-esr/fix-casts.patch b/community/firefox-esr/fix-casts.patch
deleted file mode 100644
index 91a80a0f49..0000000000
--- a/community/firefox-esr/fix-casts.patch
+++ /dev/null
@@ -1,192 +0,0 @@
-Based on upstream commit - https://github.com/servo/servo/commit/98e4a53b7241d562d127e0f7005ffb38f21d1380.patch
-
----
---- a/Cargo.lock
-+++ b/Cargo.lock
-@@ -235,7 +235,7 @@
- version = "0.49.4"
- source = "registry+https://github.com/rust-lang/crates.io-index"
- dependencies = [
-- "bitflags 1.0.4 (registry+https://github.com/rust-lang/crates.io-index)",
-+ "bitflags 1.1.0 (registry+https://github.com/rust-lang/crates.io-index)",
-  "cexpr 0.3.3 (registry+https://github.com/rust-lang/crates.io-index)",
-  "cfg-if 0.1.6 (registry+https://github.com/rust-lang/crates.io-index)",
-  "clang-sys 0.28.0 (registry+https://github.com/rust-lang/crates.io-index)",
-@@ -497,7 +497,7 @@
- dependencies = [
-  "ansi_term 0.11.0 (registry+https://github.com/rust-lang/crates.io-index)",
-  "atty 0.2.11 (registry+https://github.com/rust-lang/crates.io-index)",
-- "bitflags 1.0.4 (registry+https://github.com/rust-lang/crates.io-index)",
-+ "bitflags 1.1.0 (registry+https://github.com/rust-lang/crates.io-index)",
-  "strsim 0.7.0 (registry+https://github.com/rust-lang/crates.io-index)",
-  "term_size 0.3.0 (registry+https://github.com/rust-lang/crates.io-index)",
-  "textwrap 0.9.0 (registry+https://github.com/rust-lang/crates.io-index)",
-@@ -510,7 +510,7 @@
- version = "0.0.3"
- source = "registry+https://github.com/rust-lang/crates.io-index"
- dependencies = [
-- "bitflags 1.0.4 (registry+https://github.com/rust-lang/crates.io-index)",
-+ "bitflags 1.1.0 (registry+https://github.com/rust-lang/crates.io-index)",
- ]
- 
- [[package]]
-@@ -563,7 +563,7 @@
- version = "0.17.1"
- source = "registry+https://github.com/rust-lang/crates.io-index"
- dependencies = [
-- "bitflags 1.0.4 (registry+https://github.com/rust-lang/crates.io-index)",
-+ "bitflags 1.1.0 (registry+https://github.com/rust-lang/crates.io-index)",
-  "core-foundation 0.6.3 (registry+https://github.com/rust-lang/crates.io-index)",
-  "foreign-types 0.3.0 (registry+https://github.com/rust-lang/crates.io-index)",
-  "libc 0.2.51 (registry+https://github.com/rust-lang/crates.io-index)",
-@@ -801,7 +801,7 @@
- version = "0.5.4"
- source = "registry+https://github.com/rust-lang/crates.io-index"
- dependencies = [
-- "bitflags 1.0.4 (registry+https://github.com/rust-lang/crates.io-index)",
-+ "bitflags 1.1.0 (registry+https://github.com/rust-lang/crates.io-index)",
-  "cubeb-sys 0.5.4 (registry+https://github.com/rust-lang/crates.io-index)",
- ]
- 
-@@ -1140,7 +1140,7 @@
- version = "0.3.3"
- source = "registry+https://github.com/rust-lang/crates.io-index"
- dependencies = [
-- "bitflags 1.0.4 (registry+https://github.com/rust-lang/crates.io-index)",
-+ "bitflags 1.1.0 (registry+https://github.com/rust-lang/crates.io-index)",
-  "fuchsia-zircon-sys 0.3.3 (registry+https://github.com/rust-lang/crates.io-index)",
- ]
- 
-@@ -1630,7 +1630,7 @@
- version = "0.11.2"
- source = "registry+https://github.com/rust-lang/crates.io-index"
- dependencies = [
-- "bitflags 1.0.4 (registry+https://github.com/rust-lang/crates.io-index)",
-+ "bitflags 1.1.0 (registry+https://github.com/rust-lang/crates.io-index)",
-  "libc 0.2.51 (registry+https://github.com/rust-lang/crates.io-index)",
-  "lmdb-rkv-sys 0.8.4 (registry+https://github.com/rust-lang/crates.io-index)",
- ]
-@@ -2004,7 +2004,7 @@
- name = "nsstring"
- version = "0.1.0"
- dependencies = [
-- "bitflags 1.0.4 (registry+https://github.com/rust-lang/crates.io-index)",
-+ "bitflags 1.1.0 (registry+https://github.com/rust-lang/crates.io-index)",
-  "encoding_rs 0.8.16 (registry+https://github.com/rust-lang/crates.io-index)",
- ]
- 
-@@ -2228,7 +2228,7 @@
- version = "0.14.0"
- source = "registry+https://github.com/rust-lang/crates.io-index"
- dependencies = [
-- "bitflags 1.0.4 (registry+https://github.com/rust-lang/crates.io-index)",
-+ "bitflags 1.1.0 (registry+https://github.com/rust-lang/crates.io-index)",
-  "deflate 0.7.19 (registry+https://github.com/rust-lang/crates.io-index)",
-  "inflate 0.4.5 (registry+https://github.com/rust-lang/crates.io-index)",
-  "num-iter 0.1.37 (registry+https://github.com/rust-lang/crates.io-index)",
-@@ -2283,7 +2283,7 @@
- name = "pulse"
- version = "0.2.0"
- dependencies = [
-- "bitflags 1.0.4 (registry+https://github.com/rust-lang/crates.io-index)",
-+ "bitflags 1.1.0 (registry+https://github.com/rust-lang/crates.io-index)",
-  "pulse-ffi 0.1.0",
- ]
- 
-@@ -2665,7 +2665,7 @@
- name = "selectors"
- version = "0.21.0"
- dependencies = [
-- "bitflags 1.0.4 (registry+https://github.com/rust-lang/crates.io-index)",
-+ "bitflags 1.1.0 (registry+https://github.com/rust-lang/crates.io-index)",
-  "cssparser 0.25.7 (registry+https://github.com/rust-lang/crates.io-index)",
-  "derive_more 0.13.0 (registry+https://github.com/rust-lang/crates.io-index)",
-  "fxhash 0.2.1 (registry+https://github.com/rust-lang/crates.io-index)",
-@@ -2881,7 +2881,7 @@
-  "arrayvec 0.4.6 (registry+https://github.com/rust-lang/crates.io-index)",
-  "atomic_refcell 0.1.0 (registry+https://github.com/rust-lang/crates.io-index)",
-  "bindgen 0.49.4 (registry+https://github.com/rust-lang/crates.io-index)",
-- "bitflags 1.0.4 (registry+https://github.com/rust-lang/crates.io-index)",
-+ "bitflags 1.1.0 (registry+https://github.com/rust-lang/crates.io-index)",
-  "byteorder 1.3.1 (registry+https://github.com/rust-lang/crates.io-index)",
-  "cssparser 0.25.7 (registry+https://github.com/rust-lang/crates.io-index)",
-  "derive_more 0.13.0 (registry+https://github.com/rust-lang/crates.io-index)",
-@@ -2944,7 +2944,7 @@
- version = "0.0.1"
- dependencies = [
-  "app_units 0.7.0 (registry+https://github.com/rust-lang/crates.io-index)",
-- "bitflags 1.0.4 (registry+https://github.com/rust-lang/crates.io-index)",
-+ "bitflags 1.1.0 (registry+https://github.com/rust-lang/crates.io-index)",
-  "cssparser 0.25.7 (registry+https://github.com/rust-lang/crates.io-index)",
-  "euclid 0.19.5 (registry+https://github.com/rust-lang/crates.io-index)",
-  "lazy_static 1.2.0 (registry+https://github.com/rust-lang/crates.io-index)",
-@@ -3328,7 +3328,7 @@
- name = "u2fhid"
- version = "0.2.3"
- dependencies = [
-- "bitflags 1.0.4 (registry+https://github.com/rust-lang/crates.io-index)",
-+ "bitflags 1.1.0 (registry+https://github.com/rust-lang/crates.io-index)",
-  "boxfnonce 0.0.3 (registry+https://github.com/rust-lang/crates.io-index)",
-  "core-foundation 0.6.3 (registry+https://github.com/rust-lang/crates.io-index)",
-  "devd-rs 0.2.1 (registry+https://github.com/rust-lang/crates.io-index)",
-@@ -3493,7 +3493,7 @@
- dependencies = [
-  "base64 0.10.0 (registry+https://github.com/rust-lang/crates.io-index)",
-  "bincode 1.0.0 (registry+https://github.com/rust-lang/crates.io-index)",
-- "bitflags 1.0.4 (registry+https://github.com/rust-lang/crates.io-index)",
-+ "bitflags 1.1.0 (registry+https://github.com/rust-lang/crates.io-index)",
-  "byteorder 1.3.1 (registry+https://github.com/rust-lang/crates.io-index)",
-  "cfg-if 0.1.6 (registry+https://github.com/rust-lang/crates.io-index)",
-  "core-foundation 0.6.3 (registry+https://github.com/rust-lang/crates.io-index)",
-@@ -3533,7 +3533,7 @@
- dependencies = [
-  "app_units 0.7.0 (registry+https://github.com/rust-lang/crates.io-index)",
-  "bincode 1.0.0 (registry+https://github.com/rust-lang/crates.io-index)",
-- "bitflags 1.0.4 (registry+https://github.com/rust-lang/crates.io-index)",
-+ "bitflags 1.1.0 (registry+https://github.com/rust-lang/crates.io-index)",
-  "byteorder 1.3.1 (registry+https://github.com/rust-lang/crates.io-index)",
-  "core-foundation 0.6.3 (registry+https://github.com/rust-lang/crates.io-index)",
-  "core-graphics 0.17.1 (registry+https://github.com/rust-lang/crates.io-index)",
---- a/servo/components/style/stylesheets/viewport_rule.rs
-+++ b/servo/components/style/stylesheets/viewport_rule.rs
-@@ -291,15 +291,18 @@ impl<'a, 'b, 'i> DeclarationParser<'i> for ViewportRuleParser<'a, 'b> {
-     ) -> Result<Vec<ViewportDescriptorDeclaration>, ParseError<'i>> {
-         macro_rules! declaration {
-             ($declaration:ident($parse:expr)) => {
--                declaration!($declaration(value: try!($parse(input)),
--                                          important: input.try(parse_important).is_ok()))
-+                declaration!($declaration {
-+                    value: $parse(input)?,
-+                    important: input.try(parse_important).is_ok(),
-+                })
-             };
--            ($declaration:ident(value: $value:expr, important: $important:expr)) => {
-+            ($declaration:ident { value: $value:expr, important: $important:expr, }) => {
-                 ViewportDescriptorDeclaration::new(
-                     self.context.stylesheet_origin,
-                     ViewportDescriptor::$declaration($value),
--                    $important)
--            }
-+                    $important,
-+                )
-+            };
-         }
- 
-         macro_rules! ok {
-@@ -311,8 +314,14 @@ impl<'a, 'b, 'i> DeclarationParser<'i> for ViewportRuleParser<'a, 'b> {
-                 let important = input.try(parse_important).is_ok();
- 
-                 Ok(vec![
--                    declaration!($min(value: shorthand.0, important: important)),
--                    declaration!($max(value: shorthand.1, important: important)),
-+                    declaration!($min {
-+                        value: shorthand.0,
-+                        important: important,
-+                    }),
-+                    declaration!($max {
-+                        value: shorthand.1,
-+                        important: important,
-+                    }),
-                 ])
-             }};
-         }