From c5a534f9ee178783839f4014d166bdeed1585a0c Mon Sep 17 00:00:00 2001
From: Max Rees <maxcrees@me.com>
Date: Sun, 10 May 2020 10:22:22 -0500
Subject: user/thunderbird: [CVE] bump to 68.9.0

---
 user/thunderbird/APKBUILD          | 12 ++++++++----
 user/thunderbird/rust-config.patch | 20 --------------------
 2 files changed, 8 insertions(+), 24 deletions(-)
 delete mode 100644 user/thunderbird/rust-config.patch

(limited to 'user')

diff --git a/user/thunderbird/APKBUILD b/user/thunderbird/APKBUILD
index 1270dcbc3..fc2887d63 100644
--- a/user/thunderbird/APKBUILD
+++ b/user/thunderbird/APKBUILD
@@ -1,6 +1,6 @@
 # Maintainer: A. Wilcox <awilfox@adelielinux.org>
 pkgname=thunderbird
-pkgver=68.7.0
+pkgver=68.9.0
 pkgrel=0
 pkgdesc="Email client from Mozilla"
 url="https://www.thunderbird.net/"
@@ -36,7 +36,6 @@ source="https://archive.mozilla.org/pub/thunderbird/releases/$pkgver/source/thun
 	fix-mutex-build.patch
 	fix-seccomp-bpf.patch
 	mozilla-build-arm.patch
-	rust-config.patch
 	shut-up-warning.patch
 	skia-sucks1.patch
 	skia-sucks2.patch
@@ -70,6 +69,12 @@ ldpath="$_mozappdir"
 #     - CVE-2020-6821
 #     - CVE-2020-6822
 #     - CVE-2020-6825
+#   68.9.0-r0:
+#     - CVE-2020-6831
+#     - CVE-2020-12387
+#     - CVE-2020-12392
+#     - CVE-2020-12395
+#     - CVE-2020-12397
 
 unpack() {
 	default_unpack
@@ -164,7 +169,7 @@ package() {
 		${pkgdir}/usr/share/applications/thunderbird.desktop
 }
 
-sha512sums="fae763030b7a54930291a10f298b7fa4ffc400849082f576556b9040d095f1007ae686daf1241dff8b73bac35c14acf21c156a18a3e16d62a7719c6cc34e4d1f  thunderbird-68.7.0.source.tar.xz
+sha512sums="891472c95ba6ff46061131504e89010da512a84b0e1dea0482e603fd4c87f11e099280a245c7dd9fc9320c48229c26602565c089d86f1a1f4271b29b6fc606f0  thunderbird-68.9.0.source.tar.xz
 16e814e8dcffc707b595ca2919bd2fa3db0d15794c63d977364652c4a5b92e90e72b8c9e1cc83b5020398bd90a1b397dbdd7cb931c49f1aa4af6ef95414b43e0  Python-2.7.16.tar.xz
 5519234df2934ac2f3d76c8cad7e4f0fe15cf83ea4beb32c6489d8b7839b3ebea88bdb342e0d2a9c1c7c95e9455d234b0a5aa0e73446fd8027b520f080a2bb5b  mozconfig
 ace7492f4fb0523c7340fdc09c831906f74fddad93822aff367135538dacd3f56288b907f5a04f53f94c76e722ba0bab73e28d83ec12d3e672554712e6b08613  bad-google-code.patch
@@ -172,7 +177,6 @@ ace7492f4fb0523c7340fdc09c831906f74fddad93822aff367135538dacd3f56288b907f5a04f53
 c0b2bf43206c2a5154e560ef30189a1062ae856861b39f52ce69002390ff9972d43e387bfd2bf8d2ab3cac621987bc042c8c0a8b4cf90ae05717ca7705271880  fix-mutex-build.patch
 70863b985427b9653ce5e28d6064f078fb6d4ccf43dd1b68e72f97f44868fc0ce063161c39a4e77a0a1a207b7365d5dc7a7ca5e68c726825eba814f2b93e2f5d  fix-seccomp-bpf.patch
 e61664bc93eadce5016a06a4d0684b34a05074f1815e88ef2613380d7b369c6fd305fb34f83b5eb18b9e3138273ea8ddcfdcb1084fdcaa922a1e5b30146a3b18  mozilla-build-arm.patch
-45613d476e85fe333ef8091acce4806803953c1a99de4f03ff577cf20c5a1a3d635d0589e1490da104ef80721f4f1b1d35045af3c6892c1a468fa84095f27ad8  rust-config.patch
 39ddb15d1453a8412275c36fc8db3befc69dffd4a362e932d280fb7fd1190db595a2af9b468ee49e0714f5e9df6e48eb5794122a64fa9f30d689de8693acbb15  shut-up-warning.patch
 e751ffab263f03d4c74feebc617e3af115b1b53cf54fe16c3acc585eec67773f37aa8de4c19599fa6478179b01439025112ef2b759aa9923c9900e7081cb65a9  skia-sucks1.patch
 9152bd3e6dc446337e6a2ed602279c620aedecc796ba28e777854c4f41fcf3067f9ebd086a4b63a6b76c2e69ec599ac6435b8eeda4f7488b1c45f69113facba4  skia-sucks2.patch
diff --git a/user/thunderbird/rust-config.patch b/user/thunderbird/rust-config.patch
deleted file mode 100644
index eab72a0e4..000000000
--- a/user/thunderbird/rust-config.patch
+++ /dev/null
@@ -1,20 +0,0 @@
-diff -urw firefox-68.0-old/build/moz.configure/rust.configure firefox-68.0/build/moz.configure/rust.configure
---- firefox-68.0-old/build/moz.configure/rust.configure	2019-07-07 15:56:29.345963800 +0000
-+++ firefox-68.0/build/moz.configure/rust.configure	2019-07-07 16:19:25.990645334 +0000
-@@ -193,12 +193,16 @@
-     ambiguous = set()
-     per_raw_os = {}
-     for t in out:
-+        if 'fuchsia' in t: continue
-         t = split_triplet(t, allow_unknown=True)
-         endianness = t.endianness
-         if t.cpu.startswith('thumb') and endianness not in ('big', 'little'):
-             endianness = 'little'
-         key = (t.cpu, endianness, t.os)
-         if key in per_os:
-+            # hax to allow Adélie toolchains to work
-+            if 'foxkit' in per_os[key].alias:
-+                continue
-             previous = per_os[key]
-             per_raw_os[(previous.cpu, previous.endianness,
-                         previous.raw_os)] = previous
-- 
cgit v1.2.3-60-g2f50