Manual merge of version 68.8.0esr-1~deb10u1+rpi1 and 68.9.0esr-1~deb10u1 to produce...

diff --cc build/moz.configure/rust.configure
index 0645c1e53a1a17f6470b18504796e1ae370b9767,dc2335525303a01c8f8177e1f8b48affb34c8630..e58ccb6c15052128a2fb349bbb8aa7d66f57ca87
--- 1/build/moz.configure/rust.configure
--- 2/build/moz.configure/rust.configure
+++ b/build/moz.configure/rust.configure
@@@ -185,43 -185,30 +185,35 @@@ def rust_compiler(rustc_info, cargo_inf
  
  
  @depends(rustc, when=rust_compiler)
 +@imports('sys')
 +@imports(_from='__builtin__', _import='repr')
+ @imports(_from='__builtin__', _import='ValueError')
  def rust_supported_targets(rustc):
      out = check_cmd_output(rustc, '--print', 'target-list').splitlines()
-     # The os in the triplets used by rust may match the same OSes, in which
-     # case we need to check the raw_os instead.
-     per_os = {}
-     ambiguous = set()
-     per_raw_os = {}
 +    #HACK: if there are multiple matches the algorithm uses the last one
 +    #put arm-unknown-linux-gnuebihf on the end of the list so it gets preffered
 +    out.append('arm-unknown-linux-gnueabihf')
+     data = {}
      for t in out:
-         traw = t
-         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:
-             previous = per_os[key]
-             per_raw_os[(previous.cpu, previous.endianness,
-                         previous.raw_os)] = previous
-             del per_os[key]
-             ambiguous.add(key)
-         if key in ambiguous:
-             raw_os = t.raw_os
-             # split_triplet will return a raw_os of 'androideabi' for
-             # rust targets in the form cpu-linux-androideabi, but what
-             # we get from the build system is linux-androideabi, so
-             # normalize.
-             if raw_os == 'androideabi':
-                 raw_os = 'linux-androideabi'
-             per_raw_os[(t.cpu, endianness, raw_os)] = t
-         else:
-             per_os[key] = t
-     return namespace(per_os=per_os, per_raw_os=per_raw_os)
+         try:
+             info = split_triplet(t)
+         except ValueError:
+             if t.startswith('thumb'):
+                 cpu, rest = t.split('-', 1)
+                 retry = '-'.join(('arm', rest))
+             elif t.endswith('-windows-msvc'):
+                 retry = t[:-len('windows-msvc')] + 'mingw32'
+             elif t.endswith('-windows-gnu'):
+                 retry = t[:-len('windows-gnu')] + 'mingw32'
+             else:
+                 continue
+             try:
+                 info = split_triplet(retry)
+             except ValueError:
+                 continue
+         key = (info.cpu, info.endianness, info.os)
+         data.setdefault(key, []).append(namespace(rust_target=t, target=info))
+     return data
  
  
  @template

diff --cc debian/changelog
index 9e91fe1a985b1630e753ce2766baf2eed664f7e6,4c08bc875432840b3b687562fc31ca9d449cadd9..d7c74aa62e1c40df31a2f10e33a35994a53600c7
--- 1/debian/changelog
--- 2/debian/changelog
+++ b/debian/changelog
@@@ -1,18 -1,14 +1,30 @@@
- firefox-esr (68.8.0esr-1~deb10u1+rpi1) buster-staging; urgency=medium
++firefox-esr (68.9.0esr-1~deb10u1+rpi1) buster-staging; urgency=medium
 +
 +  [changes brought forward from 60.3.0esr-1+rpi1 by Peter Michael Green <plugwash@raspbian.org> at Wed, 05 Dec 2018 06:56:52 +0000]
 +  * Hack broken rust target selection so it produces the right target
 +    on raspbian.
 +  * Fix clean target.
 +
 +  [changes introduce in 60.8.0esr-1+rpi1 by Peter Michael Green]
 +  * Use a fake homedir for build (Closes: 933757).
 +
 +  [changes introduced in 68.2.0esr-1+rpi1 by Peter Michael Green]
 +  * Disable webrtc, it seems to fail to build on raspbian.
 +  * Try to disable Neon
 +
-  -- Raspbian forward porter <root@raspbian.org>  Thu, 07 May 2020 17:03:28 +0000
++ -- Raspbian forward porter <root@raspbian.org>  Fri, 05 Jun 2020 22:56:34 +0000
++
+ firefox-esr (68.9.0esr-1~deb10u1) buster-security; urgency=medium
+ 
+   * New upstream release
+   * Fixes for mfsa2020-21, also known as:
+     CVE-2020-12399, CVE-2020-12405, CVE-2020-12406, CVE-2020-12410.
+ 
+   * debian/rules: Force using old PKCS11 API when building against newer NSS
+     releases. Closes: #961762.
+   * debian/control*: Bump nss build dependencies.
+ 
+  -- Mike Hommey <glandium@debian.org>  Wed, 03 Jun 2020 06:11:28 +0900
  
  firefox-esr (68.8.0esr-1~deb10u1) buster-security; urgency=medium
  

diff --cc debian/rules
Simple merge

diff --cc old-configure
Simple merge