mail/thunderbird: update to 60.3.0

PR:		232796
Approved by:	gecko (jbeich@)
MFH:		2018Q4
Security:	7c3a02b9-3273-4426-a0ba-f90fad2ff72e

5 files changed, 7 insertions, 77 deletions

diff --git a/mail/thunderbird/Makefile b/mail/thunderbird/Makefile
index 54cfdfe7c1a9..dea9d3179816 100644
--- a/mail/thunderbird/Makefile
+++ b/mail/thunderbird/Makefile
@@ -2,11 +2,10 @@
 # $FreeBSD$
 
 PORTNAME=	thunderbird
-DISTVERSION=	60.2.1
-PORTREVISION=	3
+DISTVERSION=	60.3.0
 CATEGORIES=	mail news net-im ipv6
 MASTER_SITES=	MOZILLA/${PORTNAME}/releases/${DISTVERSION}/source \
-		MOZILLA/${PORTNAME}/candidates/${DISTVERSION}-candidates/build1/source
+		MOZILLA/${PORTNAME}/candidates/${DISTVERSION}-candidates/build2/source
 DISTFILES=	${DISTNAME}.source${EXTRACT_SUFX}
 
 MAINTAINER=	gecko@FreeBSD.org
diff --git a/mail/thunderbird/distinfo b/mail/thunderbird/distinfo
index 0ac01d456ddc..655314481145 100644
--- a/mail/thunderbird/distinfo
+++ b/mail/thunderbird/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1538415530
-SHA256 (thunderbird-60.2.1.source.tar.xz) = d313f25cd7ddc016bf8e4d4115f14b34a66621c0feabbc0dd72f9304cb93d7bf
-SIZE (thunderbird-60.2.1.source.tar.xz) = 284570000
+TIMESTAMP = 1540925327
+SHA256 (thunderbird-60.3.0.source.tar.xz) = 23fc097a5aa62006919029df890e5e2bec38c2c3e6081723040ef702ff6e4a7b
+SIZE (thunderbird-60.3.0.source.tar.xz) = 285211708
diff --git a/mail/thunderbird/files/patch-bug1474265 b/mail/thunderbird/files/patch-bug1474265
deleted file mode 100644
index 6b51d9320131..000000000000
--- a/mail/thunderbird/files/patch-bug1474265
+++ /dev/null
@@ -1,28 +0,0 @@
-commit 1e7aec82f43d
-Author: Martin Stransky <stransky@redhat.com>
-Date:   Mon Jul 9 13:18:59 2018 +0200
-
-    Bug 1474265 - Add missing semicolon at DBusRemoteClient.cpp. r=jhorak, a=jcristau
-    
-    MozReview-Commit-ID: HIz4gZOzfOE
-    
-    --HG--
-    extra : source : f1f6e434d3a86d729a39aabf00e8c057c794bed5
-    extra : intermediate-source : f27de60fff477d7b61b5509fc2c9c9c098f5b953
----
- widget/xremoteclient/DBusRemoteClient.cpp | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git widget/xremoteclient/DBusRemoteClient.cpp widget/xremoteclient/DBusRemoteClient.cpp
-index 1919ad027a14..6b242f075913 100644
---- widget/xremoteclient/DBusRemoteClient.cpp
-+++ widget/xremoteclient/DBusRemoteClient.cpp
-@@ -142,7 +142,7 @@ DBusRemoteClient::GetRemoteDestinationName(const char *aProgram,
-       (bool (*)(const char *, DBusError *))
-       dlsym(RTLD_DEFAULT, "dbus_validate_bus_name");
-     if (!sDBusValidateBusName) {
--      return false
-+      return false;
-     }
- 
-     if (!sDBusValidateBusName(aDestinationName.get(), nullptr)) {
diff --git a/mail/thunderbird/files/patch-bug1479540 b/mail/thunderbird/files/patch-bug1479540
deleted file mode 100644
index e97a94cf8fc0..000000000000
--- a/mail/thunderbird/files/patch-bug1479540
+++ /dev/null
@@ -1,41 +0,0 @@
-# HG changeset patch
-# User Chris Manchester <cmanchester@mozilla.com>
-# Date 1533063488 25200
-# Node ID 36f4ba2fb6f5139b7942e81554190354da1f369a
-# Parent  ff18e94c90460faa9cca8ff39a0ea4876b0c2039
-Bug 1479540 - Accept "triplet" strings with only two parts in moz.configure. r=froydnj
-
-MozReview-Commit-ID: 7pFhoJgBMhQ
-
---- build/moz.configure/init.configure
-+++ build/moz.configure/init.configure
-@@ -587,17 +587,26 @@ option('--target', nargs=1,
- @imports(_from='__builtin__', _import='KeyError')
- @imports(_from='__builtin__', _import='ValueError')
- def split_triplet(triplet, allow_unknown=False):
-     # The standard triplet is defined as
-     #   CPU_TYPE-MANUFACTURER-OPERATING_SYSTEM
-     # There is also a quartet form:
-     #   CPU_TYPE-MANUFACTURER-KERNEL-OPERATING_SYSTEM
-     # But we can consider the "KERNEL-OPERATING_SYSTEM" as one.
--    cpu, manufacturer, os = triplet.split('-', 2)
-+    # Additionally, some may omit "unknown" when the manufacturer
-+    # is not specified and emit
-+    #   CPU_TYPE-OPERATING_SYSTEM
-+    parts = triplet.split('-', 2)
-+    if len(parts) == 3:
-+        cpu, _, os = parts
-+    elif len(parts) == 2:
-+        cpu, os = parts
-+    else:
-+        die("Unexpected triplet string: %s" % triplet)
- 
-     # Autoconf uses config.sub to validate and canonicalize those triplets,
-     # but the granularity of its results has never been satisfying to our
-     # use, so we've had our own, different, canonicalization. We've also
-     # historically not been very consistent with how we use the canonicalized
-     # values. Hopefully, this will help us make things better.
-     # The tests are inherited from our decades-old autoconf-based configure,
-     # which can probably be improved/cleaned up because they are based on a
-
-
diff --git a/mail/thunderbird/files/patch-u2f-hid-rs62 b/mail/thunderbird/files/patch-u2f-hid-rs62
index 6b17b8d6450a..9aa4b1ca26e9 100644
--- a/mail/thunderbird/files/patch-u2f-hid-rs62
+++ b/mail/thunderbird/files/patch-u2f-hid-rs62
@@ -13,7 +13,7 @@ index 4bfba0eb2f52..cd4d80035d81 100644
 +version = "0.2.1"
 +source = "registry+https://github.com/rust-lang/crates.io-index"
 +dependencies = [
-+ "libc 0.2.33 (registry+https://github.com/rust-lang/crates.io-index)",
++ "libc 0.2.43 (registry+https://github.com/rust-lang/crates.io-index)",
 + "nom 3.2.1 (registry+https://github.com/rust-lang/crates.io-index)",
 +]
 +
@@ -40,7 +40,7 @@ index 4bfba0eb2f52..cd4d80035d81 100644
   "boxfnonce 0.0.3 (registry+https://github.com/rust-lang/crates.io-index)",
   "core-foundation-sys 0.5.1 (registry+https://github.com/rust-lang/crates.io-index)",
 + "devd-rs 0.2.1 (registry+https://github.com/rust-lang/crates.io-index)",
-  "libc 0.2.33 (registry+https://github.com/rust-lang/crates.io-index)",
+  "libc 0.2.43 (registry+https://github.com/rust-lang/crates.io-index)",
   "libudev 0.2.0 (registry+https://github.com/rust-lang/crates.io-index)",
   "log 0.3.9 (registry+https://github.com/rust-lang/crates.io-index)",
 @@ -2220,6 +2238,7 @@ dependencies = [