testing/thunderbird: upgrade to 78.3.2

12 files changed, 767 insertions, 286 deletions

diff --git a/testing/thunderbird/APKBUILD b/testing/thunderbird/APKBUILD
index c44cd6136b..77e18984b4 100644
--- a/testing/thunderbird/APKBUILD
+++ b/testing/thunderbird/APKBUILD
@@ -1,18 +1,21 @@
 # Contributor: Joseph Benden <joe@benden.us>
 # Maintainer: Joseph Benden <joe@benden.us>
-
 pkgname=thunderbird
-pkgver=68.12.0
+pkgver=78.3.2
 pkgrel=0
 pkgdesc="Thunderbird email client"
 url="https://www.thunderbird.net/"
-arch="all !s390x !armhf !mips !mips64" # limited by rust and cargo. Fails on armhf due to bad assembly
+# Limited on:
+# s390x, mips, mips64: limited by rust and cargo
+# armhf: build failure on armhf due to wasm
+arch="all !s390x !armhf !mips !mips64"
 license="GPL-3.0-or-later AND LGPL-2.1-or-later AND MPL-2.0"
 options="!check !strip"
 depends="
         alsa-lib
         dbus-glib
         ffmpeg
+        gnupg
         gtk+3.0
         hunspell
         icu
@@ -26,25 +29,24 @@ depends="
         libxt
         nspr
         nss
-        sqlite
-        startup-notification
         "
 makedepends="
         alsa-lib-dev
         autoconf2.13
         automake
         bsd-compat-headers
-        bzip2-dev
         cargo
         cbindgen
         clang-dev
         dbus-glib-dev
         ffmpeg-dev
+        gettext
         gtk+2.0-dev
         gtk+3.0-dev
         hunspell-dev
         icu-dev
         libevent-dev
+        libffi-dev
         libidl-dev
         libjpeg-turbo-dev
         libnotify-dev
@@ -52,6 +54,8 @@ makedepends="
         libtheora-dev
         libtool
         libvorbis-dev
+        libvpx-dev
+        libwebp-dev
         libxcomposite-dev
         libxt-dev
         llvm-dev
@@ -61,11 +65,10 @@ makedepends="
         nspr-dev
         nss-dev
         nss-static
-        python2
-        python3-dev
+        pipewire-dev
+        pulseaudio-dev
+        python3
         sed
-        sqlite-dev
-        startup-notification-dev
         wireless-tools-dev
         yasm
         zip
@@ -73,19 +76,20 @@ makedepends="
 source="https://ftp.mozilla.org/pub/thunderbird/releases/$pkgver/source/thunderbird-$pkgver.source.tar.xz
         stab.h
 
-        disable-ccache-stats.patch
         fix-fortify-system-wrappers.patch
-        fix-seccomp-bpf.patch
-        fix-toolkit.patch
         fix-tools.patch
         mallinfo.patch
 
         disable-moz-stackwalk.patch
-        fix-musl.patch
         fix-rust-target.patch
         fix-webrtc-glibcisms.patch
-        fix-sandbox-membarrier.patch
         fd6847c9416f9eebde636e21d794d25d1be8791d.patch
+        allow-custom-rust-vendor.patch
+
+        remove-faulty-libvpx-check.patch
+        disable-neon-in-aom.patch
+        sandbox-fork.patch
+        sandbox-sched_setscheduler.patch
 
         thunderbird.desktop
         "
@@ -147,40 +151,25 @@ _clear_vendor_checksums() {
 
 prepare() {
         default_prepare
-
         cp "$srcdir"/stab.h toolkit/crashreporter/google-breakpad/src/
 
-        # https://bugzilla.mozilla.org/show_bug.cgi?id=1341234
-        mkdir -p "$builddir"/objdir
-        echo "ac_add_options BINDGEN_CFLAGS='-I/usr/include/nspr -I/usr/include/pixman-1'" >>objdir/.mozconfig
-
-        _clear_vendor_checksums cssparser
+        _clear_vendor_checksums audio_thread_priority
+        _clear_vendor_checksums target-lexicon-0.9.0
 }
 
 build() {
         mkdir -p "$builddir"/objdir
         cd "$builddir"/objdir
 
-        sed -e 's/checkImpl/checkFFImpl/g' -i ../js/src/vm/JSContext*.h
-
         export SHELL=/bin/sh
         export BUILD_OFFICIAL=1
         export MOZILLA_OFFICIAL=1
         export USE_SHORT_LIBNAME=1
-        export MACH_NO_TERMINAL_FOOTER=1
         # Find our triplet JSON
         export RUST_TARGET="$CTARGET"
-        export TERM=ansi-generic
-
-        # gcc 6
-        export CXXFLAGS="-fno-delete-null-pointer-checks -fno-schedule-insns2"
 
         # set rpath so linker finds the libs
-        export LDFLAGS="$LDFLAGS -Wl,-rpath,$_mozappdir -Wl,--gc-sections"
-
-        # ignore compiler warnings
-        export CXXFLAGS="$CXXFLAGS -Wno-class-memaccess -Wno-multistatement-macros -Wno-ignored-qualifiers"
-        export LDFLAGS="$LDFLAGS -Wno-subobject-linkage"
+        export LDFLAGS="$LDFLAGS -Wl,-rpath,$_mozappdir"
 
         case "$CARCH" in
                 arm*|x86*)
@@ -207,6 +196,8 @@ build() {
                 --prefix=/usr \
                 --libdir=/usr/lib \
                 $_arch_config \
+                $_low_mem_flags \
+                $_rust_simd \
                 \
                 --disable-crashreporter \
                 --disable-gold \
@@ -217,115 +208,124 @@ build() {
                 --disable-strip \
                 --disable-tests \
                 --disable-updater \
-                --disable-debug \
-                --disable-debug-symbols \
                 \
-                --with-distribution-id=org.alpinelinux \
                 --enable-alsa \
                 --enable-application=comm/mail \
-                --enable-default-toolkit=cairo-gtk3 \
+                --enable-cdp \
+                --enable-dbus \
+                --enable-default-toolkit=cairo-gtk3-wayland \
+                --enable-ffmpeg \
+                --enable-hardening \
+                --enable-necko-wifi \
                 --enable-official-branding \
+                --enable-openpgp \
+                --enable-optimize="$CFLAGS -O2" \
                 --enable-release \
-                --enable-startup-notification \
+                --enable-smoosh \
                 --enable-system-ffi \
-                --enable-system-sqlite \
-                --enable-ffmpeg \
-                $_rust_simd \
-                $_low_mem_flags \
-                --enable-hardening \
+                --enable-system-pixman \
                 \
-                --with-system-bz2 \
+                --with-system-ffi \
                 --with-system-icu \
+                --with-system-jpeg \
                 --with-system-libevent \
+                --with-system-libvpx \
                 --with-system-nspr \
                 --with-system-nss \
                 --with-system-pixman \
                 --with-system-png \
+                --with-system-webp \
                 --with-system-zlib \
-                --without-ccache \
+                --with-distribution-id=org.alpinelinux \
                 --with-clang-path=/usr/bin/clang \
                 --with-libclang-path=/usr/lib
-                # FIXME: fix build with --with-system-libvpx and libvpx 1.8.0
-                # https://bugzilla.mozilla.org/show_bug.cgi?id=1525393
         make
 }
 
 package() {
         cd "$builddir"/objdir
 
-        DESTDIR="$pkgdir" \
-        MOZ_MAKE_FLAGS="$MAKEOPTS" \
-                ../mach install
+        make install \
+                DESTDIR="$pkgdir" \
+                MOZ_MAKE_FLAGS="$MAKEOPTS"
 
-        install -m755 -d $pkgdir/usr/share/applications
-        install -m755 -d $pkgdir/usr/share/pixmaps
-        install -m755 -d $pkgdir/usr/share/icons
-        install -m755 -d $pkgdir/usr/share/icons/hicolor
+        install -m755 -d "$pkgdir"/usr/share/applications
+        install -m755 -d "$pkgdir"/usr/share/pixmaps
 
-        for i in 16 22 24 32 48 64 128 256; do
-                install -Dm644 "$builddir"/comm/mail/branding/thunderbird/default$i.png \
-                        "$pkgdir/usr/share/icons/hicolor/${i}x$i/apps/$pkgname.png"
+        local _png
+        for _png in ../browser/branding/official/default*.png; do
+                local i=${_png%.png}
+                i=${i##*/default}
+                install -D -m644 "$_png" "$pkgdir"/usr/share/icons/hicolor/"$i"x"$i"/apps/thunderbird.png
         done
+
         install -Dm644 "$builddir"/comm/mail/branding/thunderbird/TB-symbolic.svg \
                 "$pkgdir/usr/share/icons/hicolor/symbolic/apps/thunderbird-symbolic.svg"
         install -Dm644 "$builddir"/comm/mail/branding/thunderbird/default48.png \
                 $pkgdir/usr/share/pixmaps/$pkgname.png
 
-        install -m644 $srcdir/$pkgname.desktop $pkgdir/usr/share/applications/$pkgname.desktop
+        install -m644 "$srcdir"/thunderbird.desktop "$pkgdir"/usr/share/applications/thunderbird.desktop
+
+        # Add StartupWMClass=firefox on the .desktop files so Desktop Environments
+        # correctly associate the window with their icon, the correct fix is to have
+        # thunderbird sets its own AppID but this will work for the meantime
+        # See: https://bugzilla.mozilla.org/show_bug.cgi?id=1607399
+        echo "StartupWMClass=thunderbird" >> "$pkgdir"/usr/share/applications/thunderbird.desktop
+
+        # install our vendor prefs
+        install -d "$pkgdir"/$_mozappdir/browser/defaults/preferences
 
-        _vendorjs="$pkgdir/usr/lib/$pkgname/defaults/preferences/vendor.js"
-        install -Dm644 /dev/stdin "$_vendorjs" <<END
-// Use LANG environment variable to choose locale
-pref("intl.locale.requested", "");
+        cat >> "$pkgdir"/$_mozappdir/defaults/preferences/vendor.js <<- EOF
+        // Use LANG environment variable to choose locale
+        pref("intl.locale.requested", "");
 
-// Use system-provided dictionaries
-pref("spellchecker.dictionary_path", "/usr/share/hunspell");
+        // Use system-provided dictionaries
+        pref("spellchecker.dictionary_path", "/usr/share/hunspell");
 
-// Disable default mailer checking.
-pref("mail.shell.checkDefaultMail", false);
+        // Disable default mailer checking.
+        pref("mail.shell.checkDefaultMail", false);
 
-// Don't disable our bundled extensions in the application directory
-pref("extensions.autoDisableScopes", 11);
-pref("extensions.shownSelectionUI", true);
-END
+        // Don't disable our bundled extensions in the application directory
+        pref("extensions.autoDisableScopes", 11);
+        pref("extensions.shownSelectionUI", true);
+        EOF
 
-        _distini="$pkgdir/usr/lib/$pkgname/distribution/distribution.ini"
-        install -Dm644 /dev/stdin "$_distini" <<END
-[Global]
-id=alpinelinux
-version=1.0
-about=Mozilla Thunderbird for Alpine Linux
+        cat >> "$pkgdir"/$_mozappdir/distribution/distribution.ini <<- EOF
+        [Global]
+        id=alpinelinux
+        version=1.0
+        about=Mozilla Thunderbird for Alpine Linux
 
-[Preferences]
-app.distributor=alpinelinux
-app.distributor.channel=$pkgname
-app.partner.alpinelinux=alpinelinux
-END
+        [Preferences]
+        app.distributor=alpinelinux
+        app.distributor.channel=$pkgname
+        app.partner.alpinelinux=alpinelinux
+        EOF
 
         # Install a wrapper to avoid confusion about binary path
-        install -Dm755 /dev/stdin "$pkgdir/usr/bin/$pkgname" <<END
-#!/bin/sh
-exec /usr/lib/$pkgname/thunderbird "\$@"
-END
+        cat >> "$pkgdir/usr/bin/$pkgname" <<- EOF
+        #!/bin/sh
+        exec $_mozappdir/thunderbird "\$@"
+        EOF
 
         # Replace duplicate binary with wrapper
         # https://bugzilla.mozilla.org/show_bug.cgi?id=658850
         ln -snf "$pkgdir/usr/bin/$pkgname" \
-                "$pkgdir/usr/lib/$pkgname/thunderbird-bin"
+                "$pkgdir/$_mozappdir/thunderbird-bin"
 }
 
-sha512sums="e7559536a9e024747e3ac7c20e4ffde5adf57657d02109ea32c39bf736ad03707fc7a14a0d3f1c91fa6fd69ead3c38d6c32ce78bd468834d9ba7f77f728332c6  thunderbird-68.12.0.source.tar.xz
+sha512sums="8c0beb2a54f34f9b06605ddc54443c8dbb4e376911bcfa2d5c4b235d4e6f484f1862afba977d0cfcac1222c1b738f967c9b74397ba99c84bd16cc70480a455d8  thunderbird-78.3.2.source.tar.xz
 0b3f1e4b9fdc868e4738b5c81fd6c6128ce8885b260affcb9a65ff9d164d7232626ce1291aaea70132b3e3124f5e13fef4d39326b8e7173e362a823722a85127  stab.h
-3e57b2541f3889a1cf701860c8bf299f294cb077b0e8cfffda271cf02d1f59b25a697485d0df66e847e47f795b1ace54488a84a42851f2f8587717335537b44d  disable-ccache-stats.patch
 2f4f15974d52de4bb273b62a332d13620945d284bbc6fe6bd0a1f58ff7388443bc1d3bf9c82cc31a8527aad92b0cd3a1bc41d0af5e1800e0dcbd7033e58ffd71  fix-fortify-system-wrappers.patch
-84b84d2d7dbc16002510bf856796ad345ac38ef6d3254670230189bba7c2d4781714d231236d5a3d70129a4597b430c3171644b01ad0f5a5bb13b55d407337a4  fix-seccomp-bpf.patch
-2c65ea7280e6e89826ebad563ee25203a99ff0b4ba8fc60ec261ada6c69874d649c6ac92fcecc6307a6e5a00de27d7956acf944d556ddfadec0411be16f4e0b8  fix-toolkit.patch
 4d55f41d15be7457ad630f8f07e4fc0314c2f75720010b4bbe6a2a7f3228210a1e069949e11795efbe2e784b0762e79fdfe5b8ec38e8a64cb8d9cf3b57dd5af1  fix-tools.patch
 a4a3e062661bda64d502d426c480ac9645345860118de9df9ffe6e0597738c70c11e5cdef2d4fd12c5e2ee30a09310159230524655a419a4f7e4eeeb0f3c06b0  mallinfo.patch
 454ea3263cabce099accbdc47aaf83be26a19f8b5a4568c01a7ef0384601cf8315efd86cd917f9c8bf419c2c845db89a905f3ff9a8eb0c8e41042e93aa96a85c  disable-moz-stackwalk.patch
-e0df4fc649012f023443ce9165da29d36459dbca5df64a31008b28d96264fba909858de36d0cf1b1cb1aab898342413f0cd77c90ebe21d1f9a0504631d6d1d0e  fix-musl.patch
-c397bd594428b009d1533922a3728a0ec74403714417f4b90c38c1b7751749b0585d48e77c79efa05c6c22a0d9a8ac04d535eb5bb8deb51684852c03c05d94cd  fix-rust-target.patch
+089c97e6011e86a9b9d9e7b0c8ba3af0519d1ce4e2b1e9ab7719762d6968388bfa47dad3bf23a6d41c3d66fdcc6c15e2c926e3ff9500bfd4fbf1b53e6d19dc57  fix-rust-target.patch
 d35cacb9ede80e6bfbef0709823e536dddfb1c02d776275b0b7adb5969e9927d8c6117df96873569c3f3db0a18ee5db24f8086a9311a05077892be43a3dd8d79  fix-webrtc-glibcisms.patch
-f85f2c19c3dafab915bcb40e580fc442fd9eab5916696849edf0b105c758dd807dfe23a6479935613c81496711eb377c73227c03eb8582204c3442a4d0e397a2  fix-sandbox-membarrier.patch
 60845dcb034b2c4459c30f7d5f25c8176cf42df794e2cc0e86c3e2abb6541c24b962f3a16ca70a288d4d6f377b68d00b2904b22463108559612053d835d9bff1  fd6847c9416f9eebde636e21d794d25d1be8791d.patch
+4e584621145cf8add069c6dac18e805b3274a1ee402d84e924df2341f7d3c5be261a93ef51283bacbd606f47fbdc628c4323ecc31efc5b403b8d224b18dc278f  allow-custom-rust-vendor.patch
+bb75b2abda86e455d81571052a2cfec5a9d858ffa91c50a7217b4b6c02cbfc0400e9114a27bd54ce78d7d3a44e9b03927cf0317654d98c0f39d26c63c9670117  remove-faulty-libvpx-check.patch
+f963fcdba7307a0b1712dfb95ceba4ab49f449f60e550bb69d15d50272e6df9add90862251ee561e4ea5fd171a2703552ffa7aade92996f5f0b3e577f1544a6d  disable-neon-in-aom.patch
+4911ddb41bef8d9f6d6200159cde465627e940fe1c09099be55769d21a5a52a3f737e1bf803daa96126c035b091aea880fbc5d2e6cf5da96ddd17322461a72d6  sandbox-fork.patch
+db26757b2ebf9f567962e32294b4ae48b3a5d0378a7589dfe650fe3a179ff58befbab5082981c68e1c25fb9e56b2db1e4e510d4bca17c3e3aedbf9a2f21806eb  sandbox-sched_setscheduler.patch
 95a2b1deb4f6c90750fdd2bfe8ca0a7879a5b267965091705a6beb0a0a4b1ccad75d11df7b9885543ca4232ff704e975c6946f4c11804cb71c471e06f9576001  thunderbird.desktop"
diff --git a/testing/thunderbird/allow-custom-rust-vendor.patch b/testing/thunderbird/allow-custom-rust-vendor.patch
new file mode 100644
index 0000000000..218650f411
--- /dev/null
+++ b/testing/thunderbird/allow-custom-rust-vendor.patch
@@ -0,0 +1,564 @@
+From a5a3db2d32ff1d359aef5ec586b91164570c1685 Mon Sep 17 00:00:00 2001
+From: Dan Gohman <sunfish@mozilla.com>
+Date: Tue, 5 Nov 2019 09:56:15 -0800
+Subject: [PATCH 1/7] Support custom vendor strings.
+
+Add support for custom vendors, as in "x86_64-gentoo-linux-musl".
+
+Fixes #33.
+---
+ src/targets.rs | 108 ++++++++++++++++++++++++++++++++++++++++++++++++-
+ src/triple.rs  |   4 --
+ 2 files changed, 106 insertions(+), 6 deletions(-)
+
+diff --git a/src/targets.rs b/src/targets.rs
+index 6ae570e..90b2736 100644
+--- a/third_party/rust/target-lexicon-0.9.0/src/targets.rs
++++ b/third_party/rust/target-lexicon-0.9.0/src/targets.rs
+@@ -1,6 +1,8 @@
+ // This file defines all the identifier enums and target-aware logic.
+ 
+ use crate::triple::{Endianness, PointerWidth, Triple};
++use alloc::boxed::Box;
++use alloc::string::String;
+ use core::fmt;
+ use core::str::FromStr;
+ 
+@@ -292,7 +294,7 @@ impl Aarch64Architecture {
+ 
+ /// The "vendor" field, which in practice is little more than an arbitrary
+ /// modifier.
+-#[derive(Copy, Clone, Debug, PartialEq, Eq, Hash)]
++#[derive(Clone, Debug, PartialEq, Eq, Hash)]
+ #[allow(missing_docs)]
+ pub enum Vendor {
+     Unknown,
+@@ -306,6 +308,15 @@ pub enum Vendor {
+     Sun,
+     Uwp,
+     Wrs,
++
++    /// A custom vendor. "Custom" in this context means that the vendor is
++    /// not specifically recognized by upstream Autotools, LLVM, Rust, or other
++    /// relevant authorities on triple naming. It's useful for people building
++    /// and using locally patched toolchains.
++    ///
++    /// Outside of such patched environments, users of `target-lexicon` should
++    /// treat `Custom` the same as `Unknown` and ignore the string.
++    Custom(Box<String>),
+ }
+ 
+ /// The "operating system" field, which sometimes implies an environment, and
+@@ -717,6 +728,7 @@ impl fmt::Display for Vendor {
+             Vendor::Sun => "sun",
+             Vendor::Uwp => "uwp",
+             Vendor::Wrs => "wrs",
++            Vendor::Custom(ref name) => name,
+         };
+         f.write_str(s)
+     }
+@@ -738,7 +750,46 @@ impl FromStr for Vendor {
+             "sun" => Vendor::Sun,
+             "uwp" => Vendor::Uwp,
+             "wrs" => Vendor::Wrs,
+-            _ => return Err(()),
++            custom => {
++                use alloc::borrow::ToOwned;
++
++                // A custom vendor. Since triple syntax is so loosely defined,
++                // be as conservative as we can to avoid potential ambiguities.
++                // We err on the side of being too strict here, as we can
++                // always relax it if needed.
++
++                // Don't allow empty string names.
++                if custom.is_empty() {
++                    return Err(());
++                }
++
++                // Don't allow any other recognized name as a custom vendor,
++                // since vendors can be omitted in some contexts.
++                if Architecture::from_str(custom).is_ok()
++                    || OperatingSystem::from_str(custom).is_ok()
++                    || Environment::from_str(custom).is_ok()
++                    || BinaryFormat::from_str(custom).is_ok()
++                {
++                    return Err(());
++                }
++
++                // Require the first character to be an ascii lowercase.
++                if !custom.chars().nth(0).unwrap().is_ascii_lowercase() {
++                    return Err(());
++                }
++
++                // Restrict the set of characters permitted in a custom vendor.
++                if custom
++                    .find(|c: char| {
++                        !(c.is_ascii_lowercase() || c.is_ascii_digit() || c == '_' || c == '.')
++                    })
++                    .is_some()
++                {
++                    return Err(());
++                }
++
++                Vendor::Custom(Box::new(custom.to_owned()))
++            }
+         })
+     }
+ }
+@@ -1120,4 +1171,57 @@ mod tests {
+         assert_eq!(t.environment, Environment::Eabihf);
+         assert_eq!(t.binary_format, BinaryFormat::Elf);
+     }
++
++    #[test]
++    fn custom_vendors() {
++        assert!(Triple::from_str("x86_64--linux").is_err());
++        assert!(Triple::from_str("x86_64-42-linux").is_err());
++        assert!(Triple::from_str("x86_64-__customvendor__-linux").is_err());
++        assert!(Triple::from_str("x86_64-^-linux").is_err());
++        assert!(Triple::from_str("x86_64- -linux").is_err());
++        assert!(Triple::from_str("x86_64-CustomVendor-linux").is_err());
++        assert!(Triple::from_str("x86_64-linux-linux").is_err());
++        assert!(Triple::from_str("x86_64-x86_64-linux").is_err());
++        assert!(Triple::from_str("x86_64-elf-linux").is_err());
++        assert!(Triple::from_str("x86_64-gnu-linux").is_err());
++        assert!(Triple::from_str("x86_64-linux-customvendor").is_err());
++        assert!(Triple::from_str("customvendor").is_err());
++        assert!(Triple::from_str("customvendor-x86_64").is_err());
++        assert!(Triple::from_str("x86_64-").is_err());
++        assert!(Triple::from_str("x86_64--").is_err());
++
++        let t = Triple::from_str("x86_64-customvendor-linux")
++            .expect("can't parse target with custom vendor");
++        assert_eq!(t.architecture, Architecture::X86_64);
++        assert_eq!(
++            t.vendor,
++            Vendor::Custom(Box::new(String::from_str("customvendor").unwrap()))
++        );
++        assert_eq!(t.operating_system, OperatingSystem::Linux);
++        assert_eq!(t.environment, Environment::Unknown);
++        assert_eq!(t.binary_format, BinaryFormat::Elf);
++        assert_eq!(t.to_string(), "x86_64-customvendor-linux");
++
++        let t = Triple::from_str("x86_64-customvendor")
++            .expect("can't parse target with custom vendor");
++        assert_eq!(t.architecture, Architecture::X86_64);
++        assert_eq!(
++            t.vendor,
++            Vendor::Custom(Box::new(String::from_str("customvendor").unwrap()))
++        );
++        assert_eq!(t.operating_system, OperatingSystem::Unknown);
++        assert_eq!(t.environment, Environment::Unknown);
++        assert_eq!(t.binary_format, BinaryFormat::Unknown);
++
++        assert_eq!(
++            Triple::from_str("unknown-foo"),
++            Ok(Triple {
++                architecture: Architecture::Unknown,
++                vendor: Vendor::Custom(Box::new(String::from_str("foo").unwrap())),
++                operating_system: OperatingSystem::Unknown,
++                environment: Environment::Unknown,
++                binary_format: BinaryFormat::Unknown,
++            })
++        );
++    }
+ }
+diff --git a/src/triple.rs b/src/triple.rs
+index 36dcd9a..1abda26 100644
+--- a/third_party/rust/target-lexicon.0.9.0/src/triple.rs
++++ b/third_party/rust/target-lexicon-0.9.0/src/triple.rs
+@@ -322,10 +322,6 @@ mod tests {
+             Triple::from_str("foo"),
+             Err(ParseError::UnrecognizedArchitecture("foo".to_owned()))
+         );
+-        assert_eq!(
+-            Triple::from_str("unknown-foo"),
+-            Err(ParseError::UnrecognizedVendor("foo".to_owned()))
+-        );
+         assert_eq!(
+             Triple::from_str("unknown-unknown-foo"),
+             Err(ParseError::UnrecognizedOperatingSystem("foo".to_owned()))
+
+From 6f90d7274dce4e7f9bb120f6b36cf26881bde9a7 Mon Sep 17 00:00:00 2001
+From: Dan Gohman <sunfish@mozilla.com>
+Date: Tue, 5 Nov 2019 10:33:56 -0800
+Subject: [PATCH 2/7] Add more tests.
+
+---
+ src/targets.rs | 30 ++++++++++++++++++++++++++++--
+ 1 file changed, 28 insertions(+), 2 deletions(-)
+
+diff --git a/src/targets.rs b/src/targets.rs
+index 90b2736..7d1f069 100644
+--- a/third_party/rust/target-lexicon-0.9.0/src/targets.rs
++++ b/third_party/rust/target-lexicon-0.9.0/src/targets.rs
+@@ -1174,6 +1174,7 @@ mod tests {
+ 
+     #[test]
+     fn custom_vendors() {
++        // Test various invalid cases.
+         assert!(Triple::from_str("x86_64--linux").is_err());
+         assert!(Triple::from_str("x86_64-42-linux").is_err());
+         assert!(Triple::from_str("x86_64-__customvendor__-linux").is_err());
+@@ -1190,6 +1191,31 @@ mod tests {
+         assert!(Triple::from_str("x86_64-").is_err());
+         assert!(Triple::from_str("x86_64--").is_err());
+ 
++        // Test various Unicode things.
++        assert!(
++            Triple::from_str("x86_64-𝓬𝓾𝓼𝓽𝓸𝓶𝓿𝓮𝓷𝓭𝓸𝓻-linux").is_err(),
++            "unicode font hazard"
++        );
++        assert!(
++            Triple::from_str("x86_64-ćúśtőḿvéńdőŕ-linux").is_err(),
++            "diacritical mark stripping hazard"
++        );
++        assert!(
++            Triple::from_str("x86_64-customvendοr-linux").is_err(),
++            "homoglyph hazard"
++        );
++        assert!(Triple::from_str("x86_64-customvendor-linux").is_ok());
++        assert!(
++            Triple::from_str("x86_64-ffi-linux").is_err(),
++            "normalization hazard"
++        );
++        assert!(Triple::from_str("x86_64-ffi-linux").is_ok());
++        assert!(
++            Triple::from_str("x86_64-custom‍vendor-linux").is_err(),
++            "zero-width character hazard"
++        );
++
++        // Test some valid cases.
+         let t = Triple::from_str("x86_64-customvendor-linux")
+             .expect("can't parse target with custom vendor");
+         assert_eq!(t.architecture, Architecture::X86_64);
+@@ -1202,8 +1228,8 @@ mod tests {
+         assert_eq!(t.binary_format, BinaryFormat::Elf);
+         assert_eq!(t.to_string(), "x86_64-customvendor-linux");
+ 
+-        let t = Triple::from_str("x86_64-customvendor")
+-            .expect("can't parse target with custom vendor");
++        let t =
++            Triple::from_str("x86_64-customvendor").expect("can't parse target with custom vendor");
+         assert_eq!(t.architecture, Architecture::X86_64);
+         assert_eq!(
+             t.vendor,
+
+From c0e318b3c1be2d1965579f07dd563fb9cc0c4eb1 Mon Sep 17 00:00:00 2001
+From: Dan Gohman <sunfish@mozilla.com>
+Date: Tue, 5 Nov 2019 12:56:31 -0800
+Subject: [PATCH 3/7] Use `.chars().any(...)` instead of
+ `.find(...).is_some()`.
+
+---
+ src/targets.rs | 9 +++------
+ 1 file changed, 3 insertions(+), 6 deletions(-)
+
+diff --git a/src/targets.rs b/src/targets.rs
+index 7d1f069..1078dd3 100644
+--- a/third_party/rust/target-lexicon-0.9.0/src/targets.rs
++++ b/third_party/rust/target-lexicon/src-0.9.0/targets.rs
+@@ -779,12 +779,9 @@ impl FromStr for Vendor {
+                 }
+ 
+                 // Restrict the set of characters permitted in a custom vendor.
+-                if custom
+-                    .find(|c: char| {
+-                        !(c.is_ascii_lowercase() || c.is_ascii_digit() || c == '_' || c == '.')
+-                    })
+-                    .is_some()
+-                {
++                if custom.chars().any(|c: char| {
++                    !(c.is_ascii_lowercase() || c.is_ascii_digit() || c == '_' || c == '.')
++                }) {
+                     return Err(());
+                 }
+ 
+
+From f319950528654c772193d9eb3bf40bc8df35fcae Mon Sep 17 00:00:00 2001
+From: Dan Gohman <sunfish@mozilla.com>
+Date: Thu, 7 Nov 2019 15:15:48 -0800
+Subject: [PATCH 4/7] Fix build.rs to generate the correct code to build
+ Vendors.
+
+---
+ build.rs | 14 ++++++++++++--
+ 1 file changed, 12 insertions(+), 2 deletions(-)
+
+diff --git a/build.rs b/build.rs
+index a0ba3b7..446f9e7 100644
+--- a/third_party/rust/target-lexicon-0.9.0/build.rs
++++ b/third_party/rust/target-lexicon-0.9.0/build.rs
+@@ -32,6 +32,7 @@ mod parse_error {
+     }
+ }
+ 
++use self::targets::Vendor;
+ use self::triple::Triple;
+ 
+ fn main() {
+@@ -60,7 +61,7 @@ fn write_host_rs(mut out: File, triple: Triple) -> io::Result<()> {
+         "    architecture: Architecture::{:?},",
+         triple.architecture
+     )?;
+-    writeln!(out, "    vendor: Vendor::{:?},", triple.vendor)?;
++    writeln!(out, "    vendor: {},", vendor_display(&triple.vendor))?;
+     writeln!(
+         out,
+         "    operating_system: OperatingSystem::{:?},",
+@@ -90,7 +91,7 @@ fn write_host_rs(mut out: File, triple: Triple) -> io::Result<()> {
+     writeln!(out, "impl Vendor {{")?;
+     writeln!(out, "    /// Return the vendor for the current host.")?;
+     writeln!(out, "    pub const fn host() -> Self {{")?;
+-    writeln!(out, "        Vendor::{:?}", triple.vendor)?;
++    writeln!(out, "        {}", vendor_display(&triple.vendor))?;
+     writeln!(out, "    }}")?;
+     writeln!(out, "}}")?;
+     writeln!(out)?;
+@@ -160,3 +161,12 @@ fn write_host_rs(mut out: File, triple: Triple) -> io::Result<()> {
+ 
+     Ok(())
+ }
++
++fn vendor_display(vendor: &Vendor) -> String {
++    match vendor {
++        Vendor::Custom(custom) => {
++            format!("Vendor::Custom(Box::new(String::from_str({:?})))", custom)
++        }
++        known => format!("Vendor::{:?}", known),
++    }
++}
+
+From e558f6934535be3b8ccc9a99a33e861cb7431dfe Mon Sep 17 00:00:00 2001
+From: Dan Gohman <sunfish@mozilla.com>
+Date: Fri, 8 Nov 2019 12:10:34 -0800
+Subject: [PATCH 5/7] Fix custom vendors in `const fn` contexts.
+
+---
+ build.rs       | 15 +++++++++++----
+ src/lib.rs     |  4 ++--
+ src/targets.rs | 51 ++++++++++++++++++++++++++++++++++++++++++--------
+ 3 files changed, 56 insertions(+), 14 deletions(-)
+
+diff --git a/build.rs b/build.rs
+index 446f9e7..e88206e 100644
+--- a/third_party/rust/target-lexicon-0.9.0/build.rs
++++ b/third_party/rust/target-lexicon-0.9.0/build.rs
+@@ -53,6 +53,8 @@ fn write_host_rs(mut out: File, triple: Triple) -> io::Result<()> {
+     writeln!(out, "use crate::Aarch64Architecture::*;")?;
+     writeln!(out, "#[allow(unused_imports)]")?;
+     writeln!(out, "use crate::ArmArchitecture::*;")?;
++    writeln!(out, "#[allow(unused_imports)]")?;
++    writeln!(out, "use crate::CustomVendor;")?;
+     writeln!(out)?;
+     writeln!(out, "/// The `Triple` of the current host.")?;
+     writeln!(out, "pub const HOST: Triple = Triple {{")?;
+@@ -139,7 +141,11 @@ fn write_host_rs(mut out: File, triple: Triple) -> io::Result<()> {
+         "            architecture: Architecture::{:?},",
+         triple.architecture
+     )?;
+-    writeln!(out, "            vendor: Vendor::{:?},", triple.vendor)?;
++    writeln!(
++        out,
++        "            vendor: {},",
++        vendor_display(&triple.vendor)
++    )?;
+     writeln!(
+         out,
+         "            operating_system: OperatingSystem::{:?},",
+@@ -164,9 +170,10 @@ fn write_host_rs(mut out: File, triple: Triple) -> io::Result<()> {
+ 
+ fn vendor_display(vendor: &Vendor) -> String {
+     match vendor {
+-        Vendor::Custom(custom) => {
+-            format!("Vendor::Custom(Box::new(String::from_str({:?})))", custom)
+-        }
++        Vendor::Custom(custom) => format!(
++            "Vendor::Custom(CustomVendor::Static({:?}))",
++            custom.as_str()
++        ),
+         known => format!("Vendor::{:?}", known),
+     }
+ }
+diff --git a/src/lib.rs b/src/lib.rs
+index 8d6da8d..70f6488 100644
+--- a/third_party/rust/target-lexicon-0.9.0/src/lib.rs
++++ b/third_party/rust/target-lexicon-0.9.0/src/lib.rs
+@@ -28,7 +28,7 @@ mod triple;
+ pub use self::host::HOST;
+ pub use self::parse_error::ParseError;
+ pub use self::targets::{
+-    Aarch64Architecture, Architecture, ArmArchitecture, BinaryFormat, Environment, OperatingSystem,
+-    Vendor,
++    Aarch64Architecture, Architecture, ArmArchitecture, BinaryFormat, CustomVendor, Environment,
++    OperatingSystem, Vendor,
+ };
+ pub use self::triple::{CallingConvention, Endianness, PointerWidth, Triple};
+diff --git a/src/targets.rs b/src/targets.rs
+index 1078dd3..7152020 100644
+--- a/third_party/rust/target-lexicon-0.9.0/src/targets.rs
++++ b/third_party/rust/target-lexicon-0.9.0/src/targets.rs
+@@ -4,6 +4,7 @@ use crate::triple::{Endianness, PointerWidth, Triple};
+ use alloc::boxed::Box;
+ use alloc::string::String;
+ use core::fmt;
++use core::hash::{Hash, Hasher};
+ use core::str::FromStr;
+ 
+ /// The "architecture" field, which in some cases also specifies a specific
+@@ -292,6 +293,39 @@ impl Aarch64Architecture {
+     }
+ }
+ 
++/// A string for a `Vendor::Custom` that can either be used in `const`
++/// contexts or hold dynamic strings.
++#[derive(Clone, Debug, Eq)]
++pub enum CustomVendor {
++    /// An owned `String`. This supports the general case.
++    Owned(Box<String>),
++    /// A static `str`, so that `CustomVendor` can be constructed in `const`
++    /// contexts.
++    Static(&'static str),
++}
++
++impl CustomVendor {
++    /// Extracts a string slice.
++    pub fn as_str(&self) -> &str {
++        match self {
++            CustomVendor::Owned(s) => s,
++            CustomVendor::Static(s) => s,
++        }
++    }
++}
++
++impl PartialEq for CustomVendor {
++    fn eq(&self, other: &Self) -> bool {
++        self.as_str() == other.as_str()
++    }
++}
++
++impl Hash for CustomVendor {
++    fn hash<H: Hasher>(&self, state: &mut H) {
++        self.as_str().hash(state)
++    }
++}
++
+ /// The "vendor" field, which in practice is little more than an arbitrary
+ /// modifier.
+ #[derive(Clone, Debug, PartialEq, Eq, Hash)]
+@@ -316,7 +350,7 @@ pub enum Vendor {
+     ///
+     /// Outside of such patched environments, users of `target-lexicon` should
+     /// treat `Custom` the same as `Unknown` and ignore the string.
+-    Custom(Box<String>),
++    Custom(CustomVendor),
+ }
+ 
+ /// The "operating system" field, which sometimes implies an environment, and
+@@ -728,7 +762,7 @@ impl fmt::Display for Vendor {
+             Vendor::Sun => "sun",
+             Vendor::Uwp => "uwp",
+             Vendor::Wrs => "wrs",
+-            Vendor::Custom(ref name) => name,
++            Vendor::Custom(ref name) => name.as_str(),
+         };
+         f.write_str(s)
+     }
+@@ -779,13 +813,14 @@ impl FromStr for Vendor {
+                 }
+ 
+                 // Restrict the set of characters permitted in a custom vendor.
+-                if custom.chars().any(|c: char| {
++                fn is_prohibited_char(c: char) -> bool {
+                     !(c.is_ascii_lowercase() || c.is_ascii_digit() || c == '_' || c == '.')
+-                }) {
++                }
++                if custom.chars().any(is_prohibited_char) {
+                     return Err(());
+                 }
+ 
+-                Vendor::Custom(Box::new(custom.to_owned()))
++                Vendor::Custom(CustomVendor::Owned(Box::new(custom.to_owned())))
+             }
+         })
+     }
+@@ -1218,7 +1253,7 @@ mod tests {
+         assert_eq!(t.architecture, Architecture::X86_64);
+         assert_eq!(
+             t.vendor,
+-            Vendor::Custom(Box::new(String::from_str("customvendor").unwrap()))
++            Vendor::Custom(CustomVendor::Static("customvendor"))
+         );
+         assert_eq!(t.operating_system, OperatingSystem::Linux);
+         assert_eq!(t.environment, Environment::Unknown);
+@@ -1230,7 +1265,7 @@ mod tests {
+         assert_eq!(t.architecture, Architecture::X86_64);
+         assert_eq!(
+             t.vendor,
+-            Vendor::Custom(Box::new(String::from_str("customvendor").unwrap()))
++            Vendor::Custom(CustomVendor::Static("customvendor"))
+         );
+         assert_eq!(t.operating_system, OperatingSystem::Unknown);
+         assert_eq!(t.environment, Environment::Unknown);
+@@ -1240,7 +1275,7 @@ mod tests {
+             Triple::from_str("unknown-foo"),
+             Ok(Triple {
+                 architecture: Architecture::Unknown,
+-                vendor: Vendor::Custom(Box::new(String::from_str("foo").unwrap())),
++                vendor: Vendor::Custom(CustomVendor::Static("foo")),
+                 operating_system: OperatingSystem::Unknown,
+                 environment: Environment::Unknown,
+                 binary_format: BinaryFormat::Unknown,
+
+From bc4b444133b8a5e56602f7c77c10ef3f1e7a7c78 Mon Sep 17 00:00:00 2001
+From: Dan Gohman <sunfish@mozilla.com>
+Date: Mon, 18 Nov 2019 13:45:58 -0800
+Subject: [PATCH 6/7] Add a testcase with a BOM too, just in case.
+
+---
+ src/targets.rs | 4 ++++
+ 1 file changed, 4 insertions(+)
+
+diff --git a/src/targets.rs b/src/targets.rs
+index 7152020..9a4d990 100644
+--- a/third_party/rust/target-lexicon-0.9.0/src/targets.rs
++++ b/third_party/rust/target-lexicon-0.9.0/src/targets.rs
+@@ -1246,6 +1246,10 @@ mod tests {
+             Triple::from_str("x86_64-custom‍vendor-linux").is_err(),
+             "zero-width character hazard"
+         );
++        assert!(
++            Triple::from_str("x86_64-customvendor-linux").is_err(),
++            "BOM hazard"
++        );
+ 
+         // Test some valid cases.
+         let t = Triple::from_str("x86_64-customvendor-linux")
+
+From 721fbbe1c9cfd3adc9aaf011c62d6a36078f4133 Mon Sep 17 00:00:00 2001
+From: Dan Gohman <sunfish@mozilla.com>
+Date: Mon, 18 Nov 2019 20:56:40 -0800
+Subject: [PATCH 7/7] Use an anonymous function instead of just a local
+ function.
+
+---
+ src/targets.rs | 5 ++---
+ 1 file changed, 2 insertions(+), 3 deletions(-)
+
+diff --git a/src/targets.rs b/src/targets.rs
+index 9a4d990..eb5a088 100644
+--- a/third_party/rust/target-lexicon-0.9.0/src/targets.rs
++++ b/third_party/rust/target-lexicon-0.9.0/src/targets.rs
+@@ -813,10 +813,9 @@ impl FromStr for Vendor {
+                 }
+ 
+                 // Restrict the set of characters permitted in a custom vendor.
+-                fn is_prohibited_char(c: char) -> bool {
++                if custom.chars().any(|c: char| {
+                     !(c.is_ascii_lowercase() || c.is_ascii_digit() || c == '_' || c == '.')
+-                }
+-                if custom.chars().any(is_prohibited_char) {
++                }) {
+                     return Err(());
+                 }
+ 
diff --git a/testing/thunderbird/disable-ccache-stats.patch b/testing/thunderbird/disable-ccache-stats.patch
deleted file mode 100644
index 82ca2aa1cb..0000000000
--- a/testing/thunderbird/disable-ccache-stats.patch
+++ /dev/null
@@ -1,20 +0,0 @@
---- a/python/mozbuild/mozbuild/controller/building.py   2019-07-03 15:25:28.000000000 +0000
-+++ b/python/mozbuild/mozbuild/controller/building.py   2019-07-17 02:49:12.693079588 +0000
-@@ -940,7 +940,7 @@ class BuildDriver(MozbuildObject):
-         warnings_path = self._get_state_filename('warnings.json')
-         monitor = self._spawn(BuildMonitor)
-         monitor.init(warnings_path)
--        ccache_start = monitor.ccache_stats()
-+        ccache_start = None # monitor.ccache_stats()
-         footer = BuildProgressFooter(self.log_manager.terminal, monitor)
- 
-         # Disable indexing in objdir because it is not necessary and can slow
-@@ -1158,7 +1158,7 @@ class BuildDriver(MozbuildObject):
-         if high_finder:
-             print(FINDER_SLOW_MESSAGE % finder_percent)
- 
--        ccache_end = monitor.ccache_stats()
-+        ccache_end = None # monitor.ccache_stats()
- 
-         ccache_diff = None
-         if ccache_start and ccache_end:
diff --git a/testing/thunderbird/disable-neon-in-aom.patch b/testing/thunderbird/disable-neon-in-aom.patch
new file mode 100644
index 0000000000..01be79c047
--- /dev/null
+++ b/testing/thunderbird/disable-neon-in-aom.patch
@@ -0,0 +1,41 @@
+Firefox (75) and AOM itself fail to build with NEON enabled. As such
+we should disable it for now.
+
+In file included from /home/buildozer/aports/community/firefox/src/firefox-75.0/third_party/aom/aom_dsp/arm/blend_a64_mask_neon.c:12:
+/home/buildozer/aports/community/firefox/src/firefox-75.0/third_party/aom/av1/common/arm/mem_neon.h: In function 'load_u8_8x8':
+/usr/lib/gcc/armv7-alpine-linux-musleabihf/9.3.0/include/arm_neon.h:10303:1: error: inlining failed in call to always_inline 'vld1_u8': target specific option mismatch
+10303 | vld1_u8 (const uint8_t * __a)
+      | ^~~~~~~
+--- a/media/libaom/moz.build    2020-04-09 08:20:14.608439591 +0200
++++ b/media/libaom/moz.build    2020-04-09 08:20:21.801745246 +0200
+@@ -42,30 +42,6 @@
+         ASFLAGS += [ '-I%s/media/libaom/config/linux/ia32/' % TOPSRCDIR ]
+         LOCAL_INCLUDES += [ '/media/libaom/config/linux/ia32/' ]
+         EXPORTS.aom += [ 'config/linux/ia32/config/aom_config.h' ]
+-elif CONFIG['CPU_ARCH'] == 'arm':
+-    EXPORTS.aom += files['ARM_EXPORTS']
+-    ASFLAGS += [
+-        '-I%s/media/libaom/config/linux/arm/' % TOPSRCDIR,
+-        '-I%s/libaom' % OBJDIR,
+-    ]
+-    LOCAL_INCLUDES += [ '/media/libaom/config/linux/arm/' ]
+-    EXPORTS.aom += [ 'config/linux/arm/config/aom_config.h' ]
+-
+-    SOURCES += files['ARM_SOURCES']
+-
+-    for f in SOURCES:
+-        if f.endswith('neon.c'):
+-            SOURCES[f].flags += CONFIG['VPX_ASFLAGS']
+-
+-    if CONFIG['OS_TARGET'] == 'Android':
+-        # For cpu-features.h
+-        LOCAL_INCLUDES += [
+-            '%%%s/sources/android/cpufeatures' % CONFIG['ANDROID_NDK'],
+-        ]
+-    if CONFIG['CC_TYPE'] == 'clang':
+-        ASFLAGS += [
+-            '-no-integrated-as',
+-        ]
+ else:
+     # Generic C-only configuration
+     EXPORTS.aom += files['GENERIC_EXPORTS']
diff --git a/testing/thunderbird/fix-musl.patch b/testing/thunderbird/fix-musl.patch
deleted file mode 100644
index 996a45f130..0000000000
--- a/testing/thunderbird/fix-musl.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- a/tools/profiler/core/platform-linux-android.cpp    2019-07-09 22:58:30.039475686 +0200
-+++ b/tools/profiler/core/platform-linux-android.cpp    2019-07-09 22:58:39.331437677 +0200
-@@ -73,7 +73,7 @@
- 
- int profiler_current_thread_id() {
-   // glibc doesn't provide a wrapper for gettid().
--#if defined(__GLIBC__)
-+#if defined(__linux__)
-   return static_cast<int>(static_cast<pid_t>(syscall(SYS_gettid)));
- #else
-   return static_cast<int>(gettid());
diff --git a/testing/thunderbird/fix-rust-target.patch b/testing/thunderbird/fix-rust-target.patch
index f1a98dfd53..14f39691cf 100644
--- a/testing/thunderbird/fix-rust-target.patch
+++ b/testing/thunderbird/fix-rust-target.patch
@@ -1,10 +1,18 @@
 Allow us to just set RUST_TARGEt ourselves instead of hacking around in mozilla's
 weird custom build system...
 
-diff -upr firefox-68.9.0.orig/build/moz.configure/rust.configure firefox-68.9.0/build/moz.configure/rust.configure
---- firefox-68.9.0.orig/build/moz.configure/rust.configure      2020-06-02 22:54:39.982616128 +0200
-+++ firefox-68.9.0/build/moz.configure/rust.configure   2020-06-02 23:08:37.656332899 +0200
-@@ -345,7 +345,7 @@ def rust_triple_alias(host_or_target):
+--- a/build/moz.configure/rust.configure
++++ b/build/moz.configure/rust.configure
+@@ -224,6 +224,8 @@
+              rust_supported_targets, arm_target, when=rust_compiler)
+     @checking('for rust %s triplet' % host_or_target_str)
+     @imports('os')
++    @imports(_from='mozbuild.util', _import='ensure_unicode')
++    @imports(_from='mozbuild.util', _import='system_encoding')
+     @imports(_from='mozbuild.configure.util', _import='LineIO')
+     @imports(_from='mozbuild.shellutil', _import='quote')
+     @imports(_from='tempfile', _import='mkstemp')
+@@ -328,7 +330,7 @@
  
              return None
  
@@ -13,3 +21,11 @@ diff -upr firefox-68.9.0.orig/build/moz.configure/rust.configure firefox-68.9.0/
  
          if rustc_target is None:
              die("Don't know how to translate {} for rustc".format(
+@@ -373,7 +375,7 @@
+             os.remove(out_path)
+ 
+         # This target is usable.
+-        return rustc_target
++        return ensure_unicode(rustc_target, system_encoding)
+ 
+     return rust_target
diff --git a/testing/thunderbird/fix-sandbox-membarrier.patch b/testing/thunderbird/fix-sandbox-membarrier.patch
deleted file mode 100644
index 4bd3b80d2a..0000000000
--- a/testing/thunderbird/fix-sandbox-membarrier.patch
+++ /dev/null
@@ -1,54 +0,0 @@
-allow usage of SYS_membarrier, needed since musl-1.1.22
-
-Taken from voidlinux: https://github.com/void-linux/void-packages/commit/4198411ac3b9e2620e171c662df82008da0faebb
-
---- a/security/sandbox/linux/SandboxFilter.cpp
-+++ b/security/sandbox/linux/SandboxFilter.cpp
-@@ -572,6 +572,8 @@
-       case __NR_set_tid_address:
-         return Allow();
- #endif
-+      case __NR_membarrier:
-+        return Allow();
- 
-         // prctl
-       case __NR_prctl: {
-
---- a/security/sandbox/chromium/sandbox/linux/system_headers/arm_linux_syscalls.h
-+++ b/security/sandbox/chromium/sandbox/linux/system_headers/arm_linux_syscalls.h
-@@ -1385,6 +1385,10 @@
- #define __NR_memfd_create (__NR_SYSCALL_BASE+385)
- #endif
- 
-+#if !defined(__NR_membarrier)
-+#define __NR_membarrier (__NR_SYSCALL_BASE+389)
-+#endif
-+
- // ARM private syscalls.
- #if !defined(__ARM_NR_BASE)
- #define __ARM_NR_BASE (__NR_SYSCALL_BASE + 0xF0000)
-
---- a/security/sandbox/chromium/sandbox/linux/system_headers/x86_64_linux_syscalls.h
-+++ b/security/sandbox/chromium/sandbox/linux/system_headers/x86_64_linux_syscalls.h
-@@ -1290,5 +1290,9 @@
- #define __NR_memfd_create 319
- #endif
- 
-+#if !defined(__NR_membarrier)
-+#define __NR_membarrier 324
-+#endif
-+
- #endif  // SANDBOX_LINUX_SYSTEM_HEADERS_X86_64_LINUX_SYSCALLS_H_
- 
---- a/security/sandbox/chromium/sandbox/linux/system_headers/x86_32_linux_syscalls.h
-+++ b/security/sandbox/chromium/sandbox/linux/system_headers/x86_32_linux_syscalls.h
-@@ -1490,5 +1490,9 @@
- #define __NR_shutdown 373
- #endif
- 
-+#if !defined(__NR_membarrier)
-+#define __NR_membarrier 375
-+#endif
-+
- #endif  // SANDBOX_LINUX_SYSTEM_HEADERS_X86_32_LINUX_SYSCALLS_H_
- 
diff --git a/testing/thunderbird/fix-seccomp-bpf.patch b/testing/thunderbird/fix-seccomp-bpf.patch
deleted file mode 100644
index de7bd175ee..0000000000
--- a/testing/thunderbird/fix-seccomp-bpf.patch
+++ /dev/null
@@ -1,14 +0,0 @@
---- a/security/sandbox/chromium/sandbox/linux/seccomp-bpf/trap.cc    2018-12-14 08:53:46.083976137 +0000
-+++ b/security/sandbox/chromium/sandbox/linux/seccomp-bpf/trap.cc    2018-12-14 08:51:22.084596411 +0000
-@@ -25,6 +25,11 @@
- #include "sandbox/linux/system_headers/linux_seccomp.h"
- #include "sandbox/linux/system_headers/linux_signal.h"
- 
-+// musl libc defines siginfo_t __si_fields instead of _sifields
-+#if defined(OS_LINUX) && !defined(__GLIBC__)
-+#define _sifields __si_fields
-+#endif
-+
- namespace {
- 
- struct arch_sigsys {
diff --git a/testing/thunderbird/fix-toolkit.patch b/testing/thunderbird/fix-toolkit.patch
deleted file mode 100644
index 414734dfec..0000000000
--- a/testing/thunderbird/fix-toolkit.patch
+++ /dev/null
@@ -1,90 +0,0 @@
-diff --git a/toolkit/crashreporter/google-breakpad/src/common/linux/dump_symbols.cc b/toolkit/crashreporter/google-breakpad/src/common/linux/dump_symbols.cc
-index 4222ce3..4d40c6a 100644
---- a/toolkit/crashreporter/google-breakpad/src/common/linux/dump_symbols.cc
-+++ b/toolkit/crashreporter/google-breakpad/src/common/linux/dump_symbols.cc
-@@ -46,6 +46,7 @@
- #include <sys/mman.h>
- #include <sys/stat.h>
- #include <unistd.h>
-+#include <libgen.h>
- 
- #include <iostream>
- #include <set>
-diff --git a/toolkit/crashreporter/google-breakpad/src/common/stabs_reader.cc b/toolkit/crashreporter/google-breakpad/src/common/stabs_reader.cc
-index 6019fc7..5953e32 100644
---- a/toolkit/crashreporter/google-breakpad/src/common/stabs_reader.cc
-+++ b/toolkit/crashreporter/google-breakpad/src/common/stabs_reader.cc
-@@ -41,6 +41,10 @@
- 
- #include "common/using_std_string.h"
- 
-+#ifndef N_UNDF
-+#define N_UNDF 0
-+#endif
-+
- using std::vector;
- 
- namespace google_breakpad {
-diff --git a/toolkit/crashreporter/google-breakpad/src/common/stabs_reader.h b/toolkit/crashreporter/google-breakpad/src/common/stabs_reader.h
-index 98ee2dd..d57aa68 100644
---- a/toolkit/crashreporter/google-breakpad/src/common/stabs_reader.h
-+++ b/toolkit/crashreporter/google-breakpad/src/common/stabs_reader.h
-@@ -55,7 +55,7 @@
- 
- #ifdef HAVE_MACH_O_NLIST_H
- #include <mach-o/nlist.h>
--#elif defined(HAVE_A_OUT_H)
-+#elif 0
- #include <a.out.h>
- #endif
- 
-diff --git a/toolkit/crashreporter/google-breakpad/src/third_party/lss/linux_syscall_support.h b/toolkit/crashreporter/google-breakpad/src/third_party/lss/linux_syscall_support.h
-index 93fdad7..f34e5e0 100644
---- a/toolkit/crashreporter/google-breakpad/src/third_party/lss/linux_syscall_support.h
-+++ b/toolkit/crashreporter/google-breakpad/src/third_party/lss/linux_syscall_support.h
-@@ -1239,6 +1239,12 @@ struct kernel_statfs {
- #ifndef __NR_fallocate
- #define __NR_fallocate          285
- #endif
-+
-+#undef __NR_pread
-+#define __NR_pread __NR_pread64
-+#undef __NR_pwrite
-+#define __NR_pwrite __NR_pwrite64
-+
- /* End of x86-64 definitions                                                 */
- #elif defined(__mips__)
- #if _MIPS_SIM == _MIPS_SIM_ABI32
-diff --git a/toolkit/mozapps/update/common/updatedefines.h b/toolkit/mozapps/update/common/updatedefines.h
-index 79276f7..4c67976 100644
---- a/toolkit/mozapps/update/common/updatedefines.h
-+++ b/toolkit/mozapps/update/common/updatedefines.h
-@@ -87,7 +87,7 @@ static inline int mywcsprintf(WCHAR* dest, size_t count, const WCHAR* fmt,
-
- #  ifdef SOLARIS
- #    include <sys/stat.h>
--#  else
-+#  elif !defined(__linux__) || defined(__GLIBC__)
- #    include <fts.h>
- #  endif
- #  include <dirent.h>
-diff --git a/toolkit/mozapps/update/updater/updater.cpp b/toolkit/mozapps/update/updater/updater.cpp
-index 257ccb4..01314e4 100644
---- a/toolkit/mozapps/update/updater/updater.cpp
-+++ b/toolkit/mozapps/update/updater/updater.cpp
-@@ -3978,6 +3978,7 @@
- 
- int add_dir_entries(const NS_tchar* dirpath, ActionList* list) {
-   int rv = OK;
-+#if !defined(__linux__) || defined(__GLIBC__)
-   FTS* ftsdir;
-   FTSENT* ftsdirEntry;
-   mozilla::UniquePtr<NS_tchar[]> searchpath(get_full_path(dirpath));
-@@ -4085,6 +4086,7 @@
-   }
- 
-   fts_close(ftsdir);
-+#endif
- 
-   return rv;
- }
diff --git a/testing/thunderbird/remove-faulty-libvpx-check.patch b/testing/thunderbird/remove-faulty-libvpx-check.patch
new file mode 100644
index 0000000000..3fc5fb4c0f
--- /dev/null
+++ b/testing/thunderbird/remove-faulty-libvpx-check.patch
@@ -0,0 +1,13 @@
+--- a/toolkit/moz.configure.orig        2020-04-07 18:04:13.886159258 +0200
++++ b/toolkit/moz.configure     2020-04-07 18:04:37.905834036 +0200
+@@ -1422,11 +1422,6 @@
+             "with system libvpx. Use --without-system-libvpx to build "
+             "with in-tree libvpx."))
+ 
+-        check_symbol('vpx_codec_dec_init_ver', flags=vpx.libs, onerror=lambda: die(
+-            "--with-system-libvpx requested but symbol vpx_codec_dec_init_ver "
+-            "not found"
+-        ))
+-
+         set_config('MOZ_SYSTEM_LIBVPX', True)
+ 
diff --git a/testing/thunderbird/sandbox-fork.patch b/testing/thunderbird/sandbox-fork.patch
new file mode 100644
index 0000000000..328943cb00
--- /dev/null
+++ b/testing/thunderbird/sandbox-fork.patch
@@ -0,0 +1,13 @@
+make SYS_fork non-fatal, musl uses it for fork(2)
+
+--- a/security/sandbox/linux/SandboxFilter.cpp
++++ b/security/sandbox/linux/SandboxFilter.cpp
+@@ -1253,6 +1253,8 @@
+         // usually do something reasonable on error.
+       case __NR_clone:
+         return ClonePolicy(Error(EPERM));
++      case __NR_fork:
++        return Error(ENOSYS);
+ 
+ #  ifdef __NR_fadvise64
+       case __NR_fadvise64:
diff --git a/testing/thunderbird/sandbox-sched_setscheduler.patch b/testing/thunderbird/sandbox-sched_setscheduler.patch
new file mode 100644
index 0000000000..1db645aebb
--- /dev/null
+++ b/testing/thunderbird/sandbox-sched_setscheduler.patch
@@ -0,0 +1,23 @@
+upstream bug: https://bugzilla.mozilla.org/show_bug.cgi?id=1657849
+diff --git a/security/sandbox/linux/SandboxFilter.cpp b/security/sandbox/linux/SandboxFilter.cpp
+index 27da4e7..5a607a4 100644
+--- a/security/sandbox/linux/SandboxFilter.cpp
++++ b/security/sandbox/linux/SandboxFilter.cpp
+@@ -1455,6 +1455,7 @@ class GMPSandboxPolicy : public SandboxPolicyCommon {
+         return Trap(OpenTrap, mFiles);
+ 
+       case __NR_brk:
++      case __NR_sched_setscheduler:
+       // Because Firefox on glibc resorts to the fallback implementation
+       // mentioned in bug 1576006, we must explicitly allow the get*id()
+       // functions in order to use NSS in the clearkey CDM.
+@@ -1467,8 +1468,7 @@ class GMPSandboxPolicy : public SandboxPolicyCommon {
+       case __NR_sched_get_priority_max:
+         return Allow();
+       case __NR_sched_getparam:
+-      case __NR_sched_getscheduler:
+-      case __NR_sched_setscheduler: {
++      case __NR_sched_getscheduler: {
+         Arg<pid_t> pid(0);
+         return If(pid == 0, Allow()).Else(Trap(SchedTrap, nullptr));
+       }