diff -Nru thunderbird-60.5.1+build2/browser/app/blocklist.xml thunderbird-60.6.1+build2/browser/app/blocklist.xml --- thunderbird-60.5.1+build2/browser/app/blocklist.xml 2019-02-19 13:45:34.000000000 +0000 +++ thunderbird-60.6.1+build2/browser/app/blocklist.xml 2019-03-25 09:16:44.000000000 +0000 @@ -1,5 +1,5 @@ - + @@ -2492,6 +2492,150 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + @@ -2527,12 +2671,12 @@ https://get.adobe.com/flashplayer/ - + https://get.adobe.com/flashplayer/ - + diff -Nru thunderbird-60.5.1+build2/browser/app/profile/firefox.js thunderbird-60.6.1+build2/browser/app/profile/firefox.js --- thunderbird-60.5.1+build2/browser/app/profile/firefox.js 2019-02-19 13:45:34.000000000 +0000 +++ thunderbird-60.6.1+build2/browser/app/profile/firefox.js 2019-03-25 09:16:44.000000000 +0000 @@ -1342,37 +1342,19 @@ // All the Geolocation preferences are here. // - -// Geolocation preferences for the RELEASE and "later" Beta channels. -// Some of these prefs are specified even though they are redundant; they are -// here for clarity and end-user experiments. #ifndef EARLY_BETA_OR_EARLIER -pref("geo.wifi.uri", "https://www.googleapis.com/geolocation/v1/geolocate?key=%GOOGLE_API_KEY%"); - -#ifdef XP_MACOSX -pref("geo.provider.use_corelocation", false); -#endif - -#ifdef XP_WIN -pref("geo.provider.ms-windows-location", false); -#endif - -#ifdef MOZ_WIDGET_GTK -pref("geo.provider.use_gpsd", false); -#endif - +pref("geo.wifi.uri", "https://www.googleapis.com/geolocation/v1/geolocate?key=%GOOGLE_LOCATION_SERVICE_API_KEY%"); #else - -// Geolocation preferences for Nightly/Aurora/Beta. +// Use MLS on Nightly and early Beta. pref("geo.wifi.uri", "https://location.services.mozilla.com/v1/geolocate?key=%MOZILLA_API_KEY%"); +#endif #ifdef XP_MACOSX pref("geo.provider.use_corelocation", true); #endif -// The native Windows location provider is only enabled in Nightly and likely to -// be unstable. Set to false if things are really broken. -#if defined(XP_WIN) && defined(NIGHTLY_BUILD) +// Set to false if things are really broken. +#ifdef XP_WIN pref("geo.provider.ms-windows-location", true); #endif @@ -1380,8 +1362,6 @@ pref("geo.provider.use_gpsd", true); #endif -#endif - // Necko IPC security checks only needed for app isolation for cookies/cache/etc: // currently irrelevant for desktop e10s pref("network.disable.ipc.security", true); diff -Nru thunderbird-60.5.1+build2/browser/base/content/test/about/browser_aboutSupport.js thunderbird-60.6.1+build2/browser/base/content/test/about/browser_aboutSupport.js --- thunderbird-60.5.1+build2/browser/base/content/test/about/browser_aboutSupport.js 2019-02-19 13:45:34.000000000 +0000 +++ thunderbird-60.6.1+build2/browser/base/content/test/about/browser_aboutSupport.js 2019-03-25 09:16:44.000000000 +0000 @@ -13,13 +13,21 @@ let allowedStates = [strings.GetStringFromName("found"), strings.GetStringFromName("missing")]; - let keyGoogleStatus = await ContentTask.spawn(browser, null, async function() { - let textBox = content.document.getElementById("key-google-box"); + let keyLocationServiceGoogleStatus = await ContentTask.spawn(browser, null, async function() { + let textBox = content.document.getElementById("key-location-service-google-box"); await ContentTaskUtils.waitForCondition(() => textBox.textContent.trim(), - "Google API key status loaded"); + "Google location service API key status loaded"); return textBox.textContent; }); - ok(allowedStates.includes(keyGoogleStatus), "Google API key status shown"); + ok(allowedStates.includes(keyLocationServiceGoogleStatus), "Google location service API key status shown"); + + let keySafebrowsingGoogleStatus = await ContentTask.spawn(browser, null, async function() { + let textBox = content.document.getElementById("key-safebrowsing-google-box"); + await ContentTaskUtils.waitForCondition(() => textBox.textContent.trim(), + "Google Safebrowsing API key status loaded"); + return textBox.textContent; + }); + ok(allowedStates.includes(keySafebrowsingGoogleStatus), "Google Safebrowsing API key status shown"); let keyMozillaStatus = await ContentTask.spawn(browser, null, async function() { let textBox = content.document.getElementById("key-mozilla-box"); diff -Nru thunderbird-60.5.1+build2/browser/base/content/test/siteIdentity/browser_insecureLoginForms.js thunderbird-60.6.1+build2/browser/base/content/test/siteIdentity/browser_insecureLoginForms.js --- thunderbird-60.5.1+build2/browser/base/content/test/siteIdentity/browser_insecureLoginForms.js 2019-02-19 13:45:34.000000000 +0000 +++ thunderbird-60.6.1+build2/browser/base/content/test/siteIdentity/browser_insecureLoginForms.js 2019-03-25 09:16:44.000000000 +0000 @@ -18,7 +18,11 @@ */ add_task(async function test_simple() { await SpecialPowers.pushPrefEnv({ - "set": [["security.insecure_password.ui.enabled", true]], + "set": [ + ["security.insecure_password.ui.enabled", true], + // By default, proxies don't apply to 127.0.0.1. We need them to for this test, though: + ["network.proxy.no_proxies_on", ""], + ], }); for (let [origin, expectWarning] of [ diff -Nru thunderbird-60.5.1+build2/browser/base/content/test/tabs/browser_contextmenu_openlink_after_tabnavigated.js thunderbird-60.6.1+build2/browser/base/content/test/tabs/browser_contextmenu_openlink_after_tabnavigated.js --- thunderbird-60.5.1+build2/browser/base/content/test/tabs/browser_contextmenu_openlink_after_tabnavigated.js 2019-02-19 13:45:34.000000000 +0000 +++ thunderbird-60.6.1+build2/browser/base/content/test/tabs/browser_contextmenu_openlink_after_tabnavigated.js 2019-03-25 09:16:44.000000000 +0000 @@ -20,7 +20,7 @@ gBrowser.selectedBrowser.loadURI("about:blank"); await BrowserTestUtils.browserLoaded(gBrowser.selectedBrowser); - let awaitNewTabOpen = BrowserTestUtils.waitForNewTab(gBrowser, "http://example.com/"); + let awaitNewTabOpen = BrowserTestUtils.waitForNewTab(gBrowser, "http://example.com/", true); info("Click the 'open link in new tab' menu item"); let openLinkMenuItem = contextMenu.querySelector("#context-openlinkintab"); @@ -32,11 +32,8 @@ // Close the contextMenu popup if it has not been closed yet. contextMenu.hidePopup(); - await BrowserTestUtils.browserLoaded(newTab.linkedBrowser); - const newTabURL = await ContentTask.spawn(newTab.linkedBrowser, null, async function() { - return content.location.href; - }); - is(newTabURL, "http://example.com/", "Got the expected URL loaded in the new tab"); + is(newTab.linkedBrowser.currentURI.spec, "http://example.com/", + "Got the expected URL loaded in the new tab"); await BrowserTestUtils.removeTab(newTab); await BrowserTestUtils.removeTab(tab); diff -Nru thunderbird-60.5.1+build2/browser/components/enterprisepolicies/Policies.jsm thunderbird-60.6.1+build2/browser/components/enterprisepolicies/Policies.jsm --- thunderbird-60.5.1+build2/browser/components/enterprisepolicies/Policies.jsm 2019-02-19 13:45:34.000000000 +0000 +++ thunderbird-60.6.1+build2/browser/components/enterprisepolicies/Policies.jsm 2019-03-25 09:16:44.000000000 +0000 @@ -454,7 +454,7 @@ "DontCheckDefaultBrowser": { onBeforeUIStartup(manager, param) { - setAndLockPref("browser.shell.checkDefaultBrowser", false); + setAndLockPref("browser.shell.checkDefaultBrowser", !param); } }, @@ -540,6 +540,7 @@ }, onInstallEnded: () => { install.removeListener(listener); + install.addon.userDisabled = false; log.debug(`Installation succeeded - ${location}`); } }; @@ -646,6 +647,7 @@ setAndLockPref("xpinstall.enabled", param.Default); if (!param.Default) { blockAboutPage(manager, "about:debugging"); + manager.disallowFeature("xpinstall"); } } } @@ -875,6 +877,48 @@ }, }, + "SSLVersionMax": { + onBeforeAddons(manager, param) { + let tlsVersion; + switch (param) { + case "tls1": + tlsVersion = 1; + break; + case "tls1.1": + tlsVersion = 2; + break; + case "tls1.2": + tlsVersion = 3; + break; + case "tls1.3": + tlsVersion = 4; + break; + } + setAndLockPref("security.tls.version.max", tlsVersion); + }, + }, + + "SSLVersionMin": { + onBeforeAddons(manager, param) { + let tlsVersion; + switch (param) { + case "tls1": + tlsVersion = 1; + break; + case "tls1.1": + tlsVersion = 2; + break; + case "tls1.2": + tlsVersion = 3; + break; + case "tls1.3": + tlsVersion = 4; + break; + } + setAndLockPref("security.tls.version.min", tlsVersion); + }, + }, + "WebsiteFilter": { onBeforeUIStartup(manager, param) { this.filter = new WebsiteFilter(param.Block || [], param.Exceptions || []); diff -Nru thunderbird-60.5.1+build2/browser/components/enterprisepolicies/schemas/policies-schema.json thunderbird-60.6.1+build2/browser/components/enterprisepolicies/schemas/policies-schema.json --- thunderbird-60.5.1+build2/browser/components/enterprisepolicies/schemas/policies-schema.json 2019-02-19 13:45:34.000000000 +0000 +++ thunderbird-60.6.1+build2/browser/components/enterprisepolicies/schemas/policies-schema.json 2019-03-25 09:16:45.000000000 +0000 @@ -768,6 +768,16 @@ } }, + "SSLVersionMax": { + "type": "string", + "enum": ["tls1", "tls1.1", "tls1.2", "tls1.3"] + }, + + "SSLVersionMin": { + "type": "string", + "enum": ["tls1", "tls1.1", "tls1.2", "tls1.3"] + }, + "WebsiteFilter": { "description": "Blocks websites from being visited. The parameters take an array of Match Patterns, as documented in https://developer.mozilla.org/en-US/Add-ons/WebExtensions/Match_patterns. Only http/https accesses are supported at the moment. The arrays are limited to 1000 entries each.", "first_available": "60.0", diff -Nru thunderbird-60.5.1+build2/browser/components/enterprisepolicies/tests/browser/browser_policies_simple_pref_policies.js thunderbird-60.6.1+build2/browser/components/enterprisepolicies/tests/browser/browser_policies_simple_pref_policies.js --- thunderbird-60.5.1+build2/browser/components/enterprisepolicies/tests/browser/browser_policies_simple_pref_policies.js 2019-02-19 13:45:34.000000000 +0000 +++ thunderbird-60.6.1+build2/browser/components/enterprisepolicies/tests/browser/browser_policies_simple_pref_policies.js 2019-03-25 09:16:44.000000000 +0000 @@ -154,6 +154,30 @@ "privacy.clearOnShutdown.offlineApps": true, } }, + + // POLICY: SSLVersionMin/SSLVersionMax (1) + { + policies: { + "SSLVersionMin": "tls1", + "SSLVersionMax": "tls1.1", + }, + lockedPrefs: { + "security.tls.version.min": 1, + "security.tls.version.max": 2, + }, + }, + + // POLICY: SSLVersionMin/SSLVersionMax (2) + { + policies: { + "SSLVersionMin": "tls1.2", + "SSLVersionMax": "tls1.3", + }, + lockedPrefs: { + "security.tls.version.min": 3, + "security.tls.version.max": 4, + }, + }, ]; add_task(async function test_policy_remember_passwords() { diff -Nru thunderbird-60.5.1+build2/browser/components/enterprisepolicies/tests/browser/browser_policies_sorted_alphabetically.js thunderbird-60.6.1+build2/browser/components/enterprisepolicies/tests/browser/browser_policies_sorted_alphabetically.js --- thunderbird-60.5.1+build2/browser/components/enterprisepolicies/tests/browser/browser_policies_sorted_alphabetically.js 2019-02-19 13:45:34.000000000 +0000 +++ thunderbird-60.6.1+build2/browser/components/enterprisepolicies/tests/browser/browser_policies_sorted_alphabetically.js 2019-03-25 09:16:44.000000000 +0000 @@ -5,7 +5,7 @@ function checkArrayIsSorted(array, msg) { let sorted = true; - let sortedArray = array.slice().sort(); + let sortedArray = array.slice().sort(function(a, b) { return a.localeCompare(b); }); for (let i = 0; i < array.length; i++) { if (array[i] != sortedArray[i]) { diff -Nru thunderbird-60.5.1+build2/browser/components/enterprisepolicies/tests/browser/browser_policy_default_browser_check.js thunderbird-60.6.1+build2/browser/components/enterprisepolicies/tests/browser/browser_policy_default_browser_check.js --- thunderbird-60.5.1+build2/browser/components/enterprisepolicies/tests/browser/browser_policy_default_browser_check.js 2019-02-19 13:45:34.000000000 +0000 +++ thunderbird-60.6.1+build2/browser/components/enterprisepolicies/tests/browser/browser_policy_default_browser_check.js 2019-03-25 09:16:45.000000000 +0000 @@ -25,3 +25,18 @@ is(ShellService.shouldCheckDefaultBrowser, false, "Policy is enforced"); }); + +add_task(async function test_default_browser_check() { + await setupPolicyEngineWithJson({ + "policies": { + "DontCheckDefaultBrowser": false, + }, + }); + + is(ShellService.shouldCheckDefaultBrowser, true, "Policy changed it to check"); + + // Try to change it to false and check that it doesn't take effect + ShellService.shouldCheckDefaultBrowser = false; + + is(ShellService.shouldCheckDefaultBrowser, true, "Policy is enforced"); +}); diff -Nru thunderbird-60.5.1+build2/browser/components/originattributes/test/browser/browser_firstPartyIsolation.js thunderbird-60.6.1+build2/browser/components/originattributes/test/browser/browser_firstPartyIsolation.js --- thunderbird-60.5.1+build2/browser/components/originattributes/test/browser/browser_firstPartyIsolation.js 2019-02-19 13:45:34.000000000 +0000 +++ thunderbird-60.6.1+build2/browser/components/originattributes/test/browser/browser_firstPartyIsolation.js 2019-03-25 09:16:45.000000000 +0000 @@ -14,6 +14,11 @@ * firstPartyDomain attribute. */ add_task(async function principal_test() { + Services.prefs.setCharPref("network.proxy.no_proxies_on", ""); + registerCleanupFunction(function() { + Services.prefs.clearUserPref("network.proxy.no_proxies_on"); + }); + let tab = BrowserTestUtils.addTab(gBrowser, BASE_URL + "test_firstParty.html"); await BrowserTestUtils.browserLoaded(tab.linkedBrowser, true, function(url) { return url == BASE_URL + "test_firstParty.html"; diff -Nru thunderbird-60.5.1+build2/browser/components/preferences/connection.js thunderbird-60.6.1+build2/browser/components/preferences/connection.js --- thunderbird-60.5.1+build2/browser/components/preferences/connection.js 2019-02-19 13:45:34.000000000 +0000 +++ thunderbird-60.6.1+build2/browser/components/preferences/connection.js 2019-03-25 09:16:45.000000000 +0000 @@ -120,7 +120,7 @@ var autologinProxyPref = Preferences.get("signon.autologin.proxy"); autologinProxyPref.disabled = proxyTypePref.value == 0; var noProxiesPref = Preferences.get("network.proxy.no_proxies_on"); - noProxiesPref.disabled = proxyTypePref.value != 1; + noProxiesPref.disabled = proxyTypePref.value == 0; var autoconfigURLPref = Preferences.get("network.proxy.autoconfig_url"); autoconfigURLPref.disabled = proxyTypePref.value != 2; diff -Nru thunderbird-60.5.1+build2/browser/components/preferences/connection.xul thunderbird-60.6.1+build2/browser/components/preferences/connection.xul --- thunderbird-60.5.1+build2/browser/components/preferences/connection.xul 2019-02-19 13:45:34.000000000 +0000 +++ thunderbird-60.6.1+build2/browser/components/preferences/connection.xul 2019-03-25 09:16:45.000000000 +0000 @@ -137,9 +137,6 @@ - - - @@ -154,6 +151,9 @@ + + + radio")], pacControls: [doc.getElementById("networkProxyAutoconfigURL")], otherControls: [ + doc.querySelector("label[control=networkProxyNone]"), + doc.getElementById("networkProxyNone"), ...controlGroup.querySelectorAll(":scope > radio"), ...doc.querySelectorAll("#ConnectionsDialogPane > checkbox")], }; @@ -690,14 +692,14 @@ let controls = getProxyControls(); for (let element of controls.manualControls) { let disabled = isControlled || proxyType !== proxySvc.PROXYCONFIG_MANUAL; - is(element.disabled, disabled, `Proxy controls are ${controlState}.`); + is(element.disabled, disabled, `Manual proxy controls should be ${controlState} - control: ${element.outerHTML}.`); } for (let element of controls.pacControls) { let disabled = isControlled || proxyType !== proxySvc.PROXYCONFIG_PAC; - is(element.disabled, disabled, `Proxy controls are ${controlState}.`); + is(element.disabled, disabled, `PAC proxy controls should be ${controlState} - control: ${element.outerHTML}.`); } for (let element of controls.otherControls) { - is(element.disabled, isControlled, `Proxy controls are ${controlState}.`); + is(element.disabled, isControlled, `Other proxy controls should be ${controlState} - control: ${element.outerHTML}.`); } } else { is(doc.getElementById(CONNECTION_SETTINGS_DESC_ID).textContent, diff -Nru thunderbird-60.5.1+build2/browser/components/preferences/in-content/tests/browser.ini thunderbird-60.6.1+build2/browser/components/preferences/in-content/tests/browser.ini --- thunderbird-60.5.1+build2/browser/components/preferences/in-content/tests/browser.ini 2019-02-19 13:46:22.000000000 +0000 +++ thunderbird-60.6.1+build2/browser/components/preferences/in-content/tests/browser.ini 2019-03-25 09:16:45.000000000 +0000 @@ -22,7 +22,7 @@ [browser_bug705422.js] [browser_bug731866.js] [browser_search_within_preferences_1.js] -skip-if = (os == 'win' && processor == "x86_64") # Bug 1480314 +skip-if = os == 'win' # Bug 1480314 [browser_search_within_preferences_2.js] [browser_search_within_preferences_command.js] [browser_search_subdialogs_within_preferences_1.js] diff -Nru thunderbird-60.5.1+build2/browser/components/resistfingerprinting/test/browser/browser.ini thunderbird-60.6.1+build2/browser/components/resistfingerprinting/test/browser/browser.ini --- thunderbird-60.5.1+build2/browser/components/resistfingerprinting/test/browser/browser.ini 2019-02-19 13:45:34.000000000 +0000 +++ thunderbird-60.6.1+build2/browser/components/resistfingerprinting/test/browser/browser.ini 2019-03-25 09:16:45.000000000 +0000 @@ -1,6 +1,7 @@ [DEFAULT] tags = resistfingerprinting support-files = + browser_navigator_header.sjs file_dummy.html file_keyBoardEvent.sjs file_navigator.html diff -Nru thunderbird-60.5.1+build2/browser/components/resistfingerprinting/test/browser/browser_navigator_header.sjs thunderbird-60.6.1+build2/browser/components/resistfingerprinting/test/browser/browser_navigator_header.sjs --- thunderbird-60.5.1+build2/browser/components/resistfingerprinting/test/browser/browser_navigator_header.sjs 1970-01-01 00:00:00.000000000 +0000 +++ thunderbird-60.6.1+build2/browser/components/resistfingerprinting/test/browser/browser_navigator_header.sjs 2019-03-25 09:16:45.000000000 +0000 @@ -0,0 +1,11 @@ +"use strict"; + +function handleRequest(request, response) { + response.setHeader("Content-Type", "text/plain; charset=UTF-8", false); + + if (request.hasHeader("user-agent")) { + response.write(request.getHeader("user-agent")); + } else { + response.write("no user agent header"); + } +} \ No newline at end of file diff -Nru thunderbird-60.5.1+build2/browser/components/resistfingerprinting/test/browser/browser_navigator.js thunderbird-60.6.1+build2/browser/components/resistfingerprinting/test/browser/browser_navigator.js --- thunderbird-60.5.1+build2/browser/components/resistfingerprinting/test/browser/browser_navigator.js 2019-02-19 13:45:34.000000000 +0000 +++ thunderbird-60.6.1+build2/browser/components/resistfingerprinting/test/browser/browser_navigator.js 2019-03-25 09:16:45.000000000 +0000 @@ -11,7 +11,8 @@ const TEST_PATH = "http://example.net/browser/browser/" + "components/resistfingerprinting/test/browser/"; -var spoofedUserAgent; +var spoofedUserAgentNavigator; +var spoofedUserAgentHeader; const SPOOFED_APPNAME = "Netscape"; @@ -36,13 +37,20 @@ android: "Linux armv7l", other: "Linux x86_64", }; -const SPOOFED_UA_OS = { +const SPOOFED_UA_NAVIGATOR_OS = { linux: "X11; Linux x86_64", win: "Windows NT 6.1; Win64; x64", macosx: "Macintosh; Intel Mac OS X 10.13", android: "Android 6.0; Mobile", other: "X11; Linux x86_64", }; +const SPOOFED_UA_HTTPHEADER_OS = { + linux: "Windows NT 6.1", + win: "Windows NT 6.1", + macosx: "Windows NT 6.1", + android: "Android 6.0; Mobile", + other: "Windows NT 6.1", +}; const SPOOFED_BUILDID = "20100101"; const SPOOFED_HW_CONCURRENCY = 2; @@ -52,6 +60,20 @@ const CONST_VENDOR = ""; const CONST_VENDORSUB = ""; +async function testUserAgentHeader() { + const BASE = "http://mochi.test:8888/browser/browser/components/resistfingerprinting/test/browser/"; + const TEST_TARGET_URL = `${BASE}browser_navigator_header.sjs?`; + let tab = await BrowserTestUtils.openNewForegroundTab(gBrowser, TEST_TARGET_URL); + + let result = await ContentTask.spawn(tab.linkedBrowser, null, function() { + return content.document.body.textContent; + }); + + is(result, spoofedUserAgentHeader, "User Agent HTTP Header is correctly spoofed."); + + BrowserTestUtils.removeTab(tab); +} + async function testNavigator() { // Open a tab to collect result. let tab = await BrowserTestUtils.openNewForegroundTab( @@ -66,7 +88,7 @@ is(result.appName, SPOOFED_APPNAME, "Navigator.appName is correctly spoofed."); is(result.appVersion, SPOOFED_APPVERSION[AppConstants.platform], "Navigator.appVersion is correctly spoofed."); is(result.platform, SPOOFED_PLATFORM[AppConstants.platform], "Navigator.platform is correctly spoofed."); - is(result.userAgent, spoofedUserAgent, "Navigator.userAgent is correctly spoofed."); + is(result.userAgent, spoofedUserAgentNavigator, "Navigator.userAgent is correctly spoofed."); is(result.mimeTypesLength, 0, "Navigator.mimeTypes has a length of 0."); is(result.pluginsLength, 0, "Navigator.plugins has a length of 0."); is(result.oscpu, SPOOFED_OSCPU[AppConstants.platform], "Navigator.oscpu is correctly spoofed."); @@ -104,7 +126,7 @@ is(result.appName, SPOOFED_APPNAME, "Navigator.appName is correctly spoofed."); is(result.appVersion, SPOOFED_APPVERSION[AppConstants.platform], "Navigator.appVersion is correctly spoofed."); is(result.platform, SPOOFED_PLATFORM[AppConstants.platform], "Navigator.platform is correctly spoofed."); - is(result.userAgent, spoofedUserAgent, "Navigator.userAgent is correctly spoofed."); + is(result.userAgent, spoofedUserAgentNavigator, "Navigator.userAgent is correctly spoofed."); is(result.hardwareConcurrency, SPOOFED_HW_CONCURRENCY, "Navigator.hardwareConcurrency is correctly spoofed."); is(result.appCodeName, CONST_APPCODENAME, "Navigator.appCodeName reports correct constant value."); @@ -120,13 +142,18 @@ let appVersion = parseInt(Services.appinfo.version); let spoofedVersion = appVersion - ((appVersion - 4) % 7); - spoofedUserAgent = `Mozilla/5.0 (${SPOOFED_UA_OS[AppConstants.platform]}; rv:${spoofedVersion}.0) Gecko/20100101 Firefox/${spoofedVersion}.0`; + spoofedUserAgentNavigator = `Mozilla/5.0 (${SPOOFED_UA_NAVIGATOR_OS[AppConstants.platform]}; rv:${spoofedVersion}.0) Gecko/20100101 Firefox/${spoofedVersion}.0`; + spoofedUserAgentHeader = `Mozilla/5.0 (${SPOOFED_UA_HTTPHEADER_OS[AppConstants.platform]}; rv:${spoofedVersion}.0) Gecko/20100101 Firefox/${spoofedVersion}.0`; }); add_task(async function runNavigatorTest() { await testNavigator(); }); +add_task(async function runHTTPHeaderTest() { + await testUserAgentHeader(); +}); + add_task(async function runWorkerNavigatorTest() { await testWorkerNavigator(); }); @@ -147,4 +174,6 @@ await testNavigator(); await testWorkerNavigator(); + + await testUserAgentHeader(); }); diff -Nru thunderbird-60.5.1+build2/browser/components/search/test/browser_google_behavior.js thunderbird-60.6.1+build2/browser/components/search/test/browser_google_behavior.js --- thunderbird-60.5.1+build2/browser/components/search/test/browser_google_behavior.js 2019-02-19 13:45:34.000000000 +0000 +++ thunderbird-60.6.1+build2/browser/components/search/test/browser_google_behavior.js 2019-03-25 09:16:45.000000000 +0000 @@ -25,13 +25,25 @@ let code = ""; switch (countryCode) { case "US": - code = "firefox-b-1"; + if (AppConstants.MOZ_APP_VERSION_DISPLAY.endsWith("esr")) { + code = "firefox-b-1-e"; + } else { + code = "firefox-b-1-d"; + } break; case "DE": - code = "firefox-b"; + if (AppConstants.MOZ_APP_VERSION_DISPLAY.endsWith("esr")) { + code = "firefox-b-e"; + } else { + code = "firefox-b-d"; + } break; case "RU": - // Covered by test but doesn't use a code + if (AppConstants.MOZ_APP_VERSION_DISPLAY.endsWith("esr")) { + code = "firefox-b-e"; + } else { + code = "firefox-b-d"; + } break; } @@ -41,7 +53,7 @@ codes.context = suffix; codes.newTab = suffix; codes.submission = suffix; - codes.keyword = `${suffix}-ab`; + codes.keyword = suffix; } function promiseContentSearchReady(browser) { diff -Nru thunderbird-60.5.1+build2/browser/components/search/test/browser_google.js thunderbird-60.6.1+build2/browser/components/search/test/browser_google.js --- thunderbird-60.5.1+build2/browser/components/search/test/browser_google.js 2019-02-19 13:45:34.000000000 +0000 +++ thunderbird-60.6.1+build2/browser/components/search/test/browser_google.js 2019-03-25 09:16:45.000000000 +0000 @@ -59,47 +59,49 @@ let code = ""; switch (countryCode) { case "US": - code = "firefox-b-1"; + if (AppConstants.MOZ_APP_VERSION_DISPLAY.endsWith("esr")) { + code = "firefox-b-1-e"; + } else { + code = "firefox-b-1-d"; + } break; case "DE": - code = "firefox-b"; + if (AppConstants.MOZ_APP_VERSION_DISPLAY.endsWith("esr")) { + code = "firefox-b-e"; + } else { + code = "firefox-b-d"; + } break; case "RU": - // Covered by test but doesn't use a code + if (AppConstants.MOZ_APP_VERSION_DISPLAY.endsWith("esr")) { + code = "firefox-b-e"; + } else { + code = "firefox-b-d"; + } break; } let base = "https://www.google.com/search?q=foo&ie=utf-8&oe=utf-8"; // Keyword uses a slightly different code - let keywordBase = base; if (code) { let suffix = `&client=${code}`; base += suffix; - keywordBase += `${suffix}-ab`; expectedEngine.searchForm += suffix; let urlParams = expectedEngine.wrappedJSObject._urls[1].params; urlParams.push({ name: "client", - value: `${code}-ab`, - purpose: "keyword", - }); - urlParams.push({ - name: "client", value: code, - purpose: "searchbar", }); } let url; // Test search URLs (including purposes). - let purposes = ["", "contextmenu", "searchbar", "homepage", "newtab"]; + let purposes = ["", "contextmenu", "searchbar", "homepage", "newtab", "keyword"]; for (let purpose of purposes) { url = engine.getSubmission("foo", null, purpose).uri.spec; is(url, base, `Check ${purpose} search URL for 'foo'`); } - url = engine.getSubmission("foo", null, "keyword").uri.spec; - is(url, keywordBase, "Check keyword search URL for 'foo'"); // Check search suggestion URL. url = engine.getSubmission("foo", "application/x-suggestions+json").uri.spec; diff -Nru thunderbird-60.5.1+build2/browser/config/mozconfigs/linux32/common-opt thunderbird-60.6.1+build2/browser/config/mozconfigs/linux32/common-opt --- thunderbird-60.5.1+build2/browser/config/mozconfigs/linux32/common-opt 2019-02-19 13:45:34.000000000 +0000 +++ thunderbird-60.6.1+build2/browser/config/mozconfigs/linux32/common-opt 2019-03-25 09:16:45.000000000 +0000 @@ -3,7 +3,8 @@ . $topsrcdir/build/mozconfig.stylo ac_add_options --enable-update-channel=${MOZ_UPDATE_CHANNEL} -ac_add_options --with-google-api-keyfile=/builds/gapi.data +ac_add_options --with-google-location-service-api-keyfile=/builds/gls-gapi.data +ac_add_options --with-google-safebrowsing-api-keyfile=/builds/sb-gapi.data ac_add_options --with-mozilla-api-keyfile=/builds/mozilla-desktop-geoloc-api.key . $topsrcdir/build/unix/mozconfig.linux32 diff -Nru thunderbird-60.5.1+build2/browser/config/mozconfigs/linux64/common-opt thunderbird-60.6.1+build2/browser/config/mozconfigs/linux64/common-opt --- thunderbird-60.5.1+build2/browser/config/mozconfigs/linux64/common-opt 2019-02-19 13:45:34.000000000 +0000 +++ thunderbird-60.6.1+build2/browser/config/mozconfigs/linux64/common-opt 2019-03-25 09:16:45.000000000 +0000 @@ -3,7 +3,8 @@ . $topsrcdir/build/mozconfig.stylo ac_add_options --enable-update-channel=${MOZ_UPDATE_CHANNEL} -ac_add_options --with-google-api-keyfile=/builds/gapi.data +ac_add_options --with-google-location-service-api-keyfile=/builds/gls-gapi.data +ac_add_options --with-google-safebrowsing-api-keyfile=/builds/sb-gapi.data ac_add_options --with-mozilla-api-keyfile=/builds/mozilla-desktop-geoloc-api.key . $topsrcdir/build/unix/mozconfig.linux diff -Nru thunderbird-60.5.1+build2/browser/config/mozconfigs/macosx64/common-opt thunderbird-60.6.1+build2/browser/config/mozconfigs/macosx64/common-opt --- thunderbird-60.5.1+build2/browser/config/mozconfigs/macosx64/common-opt 2019-02-19 13:45:34.000000000 +0000 +++ thunderbird-60.6.1+build2/browser/config/mozconfigs/macosx64/common-opt 2019-03-25 09:16:45.000000000 +0000 @@ -3,7 +3,8 @@ . $topsrcdir/build/macosx/mozconfig.common ac_add_options --enable-update-channel=${MOZ_UPDATE_CHANNEL} -ac_add_options --with-google-api-keyfile=/builds/gapi.data +ac_add_options --with-google-location-service-api-keyfile=/builds/gls-gapi.data +ac_add_options --with-google-safebrowsing-api-keyfile=/builds/sb-gapi.data ac_add_options --with-mozilla-api-keyfile=/builds/mozilla-desktop-geoloc-api.key # Needed to enable breakpad in application.ini diff -Nru thunderbird-60.5.1+build2/browser/config/mozconfigs/win32/common-opt thunderbird-60.6.1+build2/browser/config/mozconfigs/win32/common-opt --- thunderbird-60.5.1+build2/browser/config/mozconfigs/win32/common-opt 2019-02-19 13:45:34.000000000 +0000 +++ thunderbird-60.6.1+build2/browser/config/mozconfigs/win32/common-opt 2019-03-25 09:16:45.000000000 +0000 @@ -7,14 +7,10 @@ ac_add_options --enable-update-channel=${MOZ_UPDATE_CHANNEL} ac_add_options --enable-jemalloc -if [ -f /c/builds/gapi.data ]; then - _gapi_keyfile=c:/builds/gapi.data -else - _gapi_keyfile=e:/builds/gapi.data -fi -ac_add_options --with-google-api-keyfile=${_gapi_keyfile} +ac_add_options --with-google-location-service-api-keyfile=${WORKSPACE}/gls-gapi.data +ac_add_options --with-google-safebrowsing-api-keyfile=${WORKSPACE}/sb-gapi.data -ac_add_options --with-mozilla-api-keyfile=c:/builds/mozilla-desktop-geoloc-api.key +ac_add_options --with-mozilla-api-keyfile=${WORKSPACE}/mozilla-desktop-geoloc-api.key # Needed to enable breakpad in application.ini export MOZILLA_OFFICIAL=1 diff -Nru thunderbird-60.5.1+build2/browser/config/mozconfigs/win64/common-opt thunderbird-60.6.1+build2/browser/config/mozconfigs/win64/common-opt --- thunderbird-60.5.1+build2/browser/config/mozconfigs/win64/common-opt 2019-02-19 13:45:34.000000000 +0000 +++ thunderbird-60.6.1+build2/browser/config/mozconfigs/win64/common-opt 2019-03-25 09:16:45.000000000 +0000 @@ -6,14 +6,10 @@ ac_add_options --enable-update-channel=${MOZ_UPDATE_CHANNEL} ac_add_options --enable-jemalloc -if [ -f /c/builds/gapi.data ]; then - _gapi_keyfile=c:/builds/gapi.data -else - _gapi_keyfile=e:/builds/gapi.data -fi -ac_add_options --with-google-api-keyfile=${_gapi_keyfile} +ac_add_options --with-google-location-service-api-keyfile=${WORKSPACE}/gls-gapi.data +ac_add_options --with-google-safebrowsing-api-keyfile=${WORKSPACE}/sb-gapi.data -ac_add_options --with-mozilla-api-keyfile=c:/builds/mozilla-desktop-geoloc-api.key +ac_add_options --with-mozilla-api-keyfile=${WORKSPACE}/mozilla-desktop-geoloc-api.key # Needed to enable breakpad in application.ini export MOZILLA_OFFICIAL=1 diff -Nru thunderbird-60.5.1+build2/browser/config/version_display.txt thunderbird-60.6.1+build2/browser/config/version_display.txt --- thunderbird-60.5.1+build2/browser/config/version_display.txt 2019-02-19 13:46:22.000000000 +0000 +++ thunderbird-60.6.1+build2/browser/config/version_display.txt 2019-03-25 09:17:51.000000000 +0000 @@ -1 +1 @@ -60.5.1esr +60.6.1esr diff -Nru thunderbird-60.5.1+build2/browser/config/version.txt thunderbird-60.6.1+build2/browser/config/version.txt --- thunderbird-60.5.1+build2/browser/config/version.txt 2019-02-19 13:46:22.000000000 +0000 +++ thunderbird-60.6.1+build2/browser/config/version.txt 2019-03-25 09:17:51.000000000 +0000 @@ -1 +1 @@ -60.5.1 +60.6.1 diff -Nru thunderbird-60.5.1+build2/browser/locales/en-US/chrome/browser/preferences/connection.dtd thunderbird-60.6.1+build2/browser/locales/en-US/chrome/browser/preferences/connection.dtd --- thunderbird-60.5.1+build2/browser/locales/en-US/chrome/browser/preferences/connection.dtd 2019-02-19 13:45:35.000000000 +0000 +++ thunderbird-60.6.1+build2/browser/locales/en-US/chrome/browser/preferences/connection.dtd 2019-03-25 09:16:46.000000000 +0000 @@ -39,7 +39,7 @@ - + diff -Nru thunderbird-60.5.1+build2/browser/locales/search/list.json thunderbird-60.6.1+build2/browser/locales/search/list.json --- thunderbird-60.5.1+build2/browser/locales/search/list.json 2019-02-19 13:45:35.000000000 +0000 +++ thunderbird-60.6.1+build2/browser/locales/search/list.json 2019-03-25 09:16:46.000000000 +0000 @@ -1,32 +1,17 @@ { "default": { "visibleDefaultEngines": [ - "google", "amazondotcom", "bing", "ddg", "ebay", "twitter", "wikipedia" + "google-b-d", "amazondotcom", "bing", "ddg", "ebay", "twitter", "wikipedia" ] }, "regionOverrides": { "US": { - "google": "google-2018" + "google-b-d": "google-b-1-d" }, "CA": { "ebay": "ebay-ca", "ebay-fr": "ebay-ca" }, - "KZ": { - "google": "google-nocodes" - }, - "BY": { - "google": "google-nocodes" - }, - "RU": { - "google": "google-nocodes" - }, - "TR": { - "google": "google-nocodes" - }, - "CN": { - "google": "google-nocodes" - }, "AT": { "ebay-de": "ebay-at" }, @@ -53,172 +38,184 @@ }, "GB": { "ebay": "ebay-uk" + }, + "esronly-1": { + "google-b-d": "google-b-e" + }, + "esronly-2": { + "google-b-d": "google-b-1-e" + }, + "esronly-3": { + "google-b-d": "google" + }, + "esronly-4": { + "google-b-d": "google-2018" } }, "locales": { "en-US": { "default": { "visibleDefaultEngines": [ - "google", "amazondotcom", "bing", "ddg", "ebay", "twitter", "wikipedia" + "google-b-d", "amazondotcom", "bing", "ddg", "ebay", "twitter", "wikipedia" ] }, "experimental-hidden": { "visibleDefaultEngines": [ - "amazon-ca", "amazon-au", "google-2018", "yandex-en" + "amazon-ca", "amazon-au", "yandex-en" ] } }, "ach": { "default": { "visibleDefaultEngines": [ - "google", "bing", "amazondotcom", "ddg", "twitter", "wikipedia" + "google-b-d", "bing", "amazondotcom", "ddg", "twitter", "wikipedia" ] } }, "af": { "default": { "visibleDefaultEngines": [ - "google", "bing", "amazondotcom", "ddg", "wikipedia-af" + "google-b-d", "bing", "amazondotcom", "ddg", "wikipedia-af" ] } }, "an": { "default": { "visibleDefaultEngines": [ - "google", "bing", "ebay-es", "wikipedia-an", "ddg", "twitter" + "google-b-d", "bing", "ebay-es", "wikipedia-an", "ddg", "twitter" ] } }, "ar": { "default": { "visibleDefaultEngines": [ - "google", "bing", "amazondotcom", "ddg", "wikipedia-ar" + "google-b-d", "bing", "amazondotcom", "ddg", "wikipedia-ar" ] } }, "as": { "default": { "visibleDefaultEngines": [ - "google", "amazondotcom", "ddg", "wikipedia-as" + "google-b-d", "amazondotcom", "ddg", "wikipedia-as" ] } }, "ast": { "default": { "visibleDefaultEngines": [ - "google", "bing", "diccionariu-alla", "ddg", "ebay-es", "wikipedia-ast" + "google-b-d", "bing", "diccionariu-alla", "ddg", "ebay-es", "wikipedia-ast" ] } }, "az": { "default": { "visibleDefaultEngines": [ - "google", "amazondotcom", "azerdict", "bing", "ddg", "wikipedia-az", "yandex-az" + "google-b-d", "amazondotcom", "azerdict", "bing", "ddg", "wikipedia-az", "yandex-az" ] } }, "be": { "default": { "visibleDefaultEngines": [ - "yandex-by", "google", "ddg", "wikipedia-be", "wikipedia-be-tarask" + "yandex-by", "google-b-d", "ddg", "wikipedia-be", "wikipedia-be-tarask" ] } }, "bg": { "default": { "visibleDefaultEngines": [ - "google", "amazondotcom", "ddg", "portalbgdict", "wikipedia-bg" + "google-b-d", "amazondotcom", "ddg", "portalbgdict", "wikipedia-bg" ] } }, "bn-BD": { "default": { "visibleDefaultEngines": [ - "google", "bing", "ddg", "wikipedia-bn" + "google-b-d", "bing", "ddg", "wikipedia-bn" ] } }, "bn-IN": { "default": { "visibleDefaultEngines": [ - "google", "amazondotcom", "bing", "ddg", "rediff", "wikipedia-bn" + "google-b-d", "amazondotcom", "bing", "ddg", "rediff", "wikipedia-bn" ] } }, "br": { "default": { "visibleDefaultEngines": [ - "google", "amazon-france", "ddg", "ebay-fr", "freelang", "klask", "wikipedia-br" + "google-b-d", "amazon-france", "ddg", "ebay-fr", "freelang", "klask", "wikipedia-br" ] } }, "bs": { "default": { "visibleDefaultEngines": [ - "google", "ddg", "olx", "twitter", "wikipedia-bs" + "google-b-d", "ddg", "olx", "twitter", "wikipedia-bs" ] } }, "ca": { "default": { "visibleDefaultEngines": [ - "google", "bing", "diec2", "ddg", "ebay-es", "twitter", "wikipedia-ca" + "google-b-d", "bing", "diec2", "ddg", "ebay-es", "twitter", "wikipedia-ca" ] } }, "cak": { "default": { "visibleDefaultEngines": [ - "google", "bing", "amazondotcom", "ddg", "wikipedia-es" + "google-b-d", "bing", "amazondotcom", "ddg", "wikipedia-es" ] } }, "cs": { "default": { "visibleDefaultEngines": [ - "google", "seznam-cz", "ddg", "heureka-cz", "mapy-cz", "wikipedia-cz" + "google-b-d", "seznam-cz", "ddg", "heureka-cz", "mapy-cz", "wikipedia-cz" ] } }, "cy": { "default": { "visibleDefaultEngines": [ - "google", "amazon-en-GB", "ddg", "ebay-uk", "palasprint", "termau", "wikipedia-cy" + "google-b-d", "amazon-en-GB", "ddg", "ebay-uk", "palasprint", "termau", "wikipedia-cy" ] } }, "da": { "default": { "visibleDefaultEngines": [ - "google", "bing", "amazon-en-GB", "ddg", "wikipedia-da" + "google-b-d", "bing", "amazon-en-GB", "ddg", "wikipedia-da" ] } }, "de": { "default": { "visibleDefaultEngines": [ - "google", "amazondotcom-de", "bing", "ddg", "ebay-de", "ecosia", "leo_ende_de", "wikipedia-de" + "google-b-d", "amazondotcom-de", "bing", "ddg", "ebay-de", "ecosia", "leo_ende_de", "wikipedia-de" ] } }, "dsb": { "default": { "visibleDefaultEngines": [ - "google", "bing", "amazondotcom-de", "ddg", "ebay-de", "leo_ende_de", "wikipedia-dsb" + "google-b-d", "bing", "amazondotcom-de", "ddg", "ebay-de", "leo_ende_de", "wikipedia-dsb" ] } }, "el": { "default": { "visibleDefaultEngines": [ - "google", "amazon-en-GB", "bing", "ddg", "wikipedia-el" + "google-b-d", "amazon-en-GB", "bing", "ddg", "wikipedia-el" ] } }, "en-GB": { "default": { "visibleDefaultEngines": [ - "google", "bing", "amazon-en-GB", "chambers-en-GB", "ddg", "ebay-uk", "twitter", "wikipedia" + "google-b-d", "bing", "amazon-en-GB", "chambers-en-GB", "ddg", "ebay-uk", "twitter", "wikipedia" ] }, "experimental-hidden": { @@ -230,42 +227,42 @@ "en-ZA": { "default": { "visibleDefaultEngines": [ - "google", "bing", "amazondotcom", "ddg", "twitter", "wikipedia" + "google-b-d", "bing", "amazondotcom", "ddg", "twitter", "wikipedia" ] } }, "eo": { "default": { "visibleDefaultEngines": [ - "google", "bing", "amazondotcom", "ddg", "reta-vortaro", "wikipedia-eo" + "google-b-d", "bing", "amazondotcom", "ddg", "reta-vortaro", "wikipedia-eo" ] } }, "es-AR": { "default": { "visibleDefaultEngines": [ - "google", "amazondotcom", "drae", "ddg", "mercadolibre-ar", "wikipedia-es" + "google-b-d", "amazondotcom", "drae", "ddg", "mercadolibre-ar", "wikipedia-es" ] } }, "es-CL": { "default": { "visibleDefaultEngines": [ - "google", "bing", "drae", "ddg", "mercadolibre-cl", "wikipedia-es" + "google-b-d", "bing", "drae", "ddg", "mercadolibre-cl", "wikipedia-es" ] } }, "es-ES": { "default": { "visibleDefaultEngines": [ - "google", "bing", "drae", "ddg", "ebay-es", "twitter", "wikipedia-es" + "google-b-d", "bing", "drae", "ddg", "ebay-es", "twitter", "wikipedia-es" ] } }, "es-MX": { "default": { "visibleDefaultEngines": [ - "google", "bing", "ddg", "mercadolibre-mx", "wikipedia-es" + "google-b-d", "bing", "ddg", "mercadolibre-mx", "wikipedia-es" ] }, "experimental-hidden": { @@ -277,49 +274,49 @@ "et": { "default": { "visibleDefaultEngines": [ - "google", "neti-ee", "ddg", "osta-ee", "wikipedia-et", "eki-ee" + "google-b-d", "neti-ee", "ddg", "osta-ee", "wikipedia-et", "eki-ee" ] } }, "eu": { "default": { "visibleDefaultEngines": [ - "google", "bing", "amazon-en-GB", "ddg", "ebay-es", "elebila", "wikipedia-eu" + "google-b-d", "bing", "amazon-en-GB", "ddg", "ebay-es", "elebila", "wikipedia-eu" ] } }, "fa": { "default": { "visibleDefaultEngines": [ - "google", "amazondotcom", "bing", "ddg", "wikipedia-fa" + "google-b-d", "amazondotcom", "bing", "ddg", "wikipedia-fa" ] } }, "ff": { "default": { "visibleDefaultEngines": [ - "google", "bing", "amazon-france", "ddg", "cnrtl-tlfi-fr", "wikipedia-fr" + "google-b-d", "bing", "amazon-france", "ddg", "cnrtl-tlfi-fr", "wikipedia-fr" ] } }, "fi": { "default": { "visibleDefaultEngines": [ - "google", "bing", "bookplus-fi", "ddg", "wikipedia-fi" + "google-b-d", "bing", "bookplus-fi", "ddg", "wikipedia-fi" ] } }, "fr": { "default": { "visibleDefaultEngines": [ - "google", "bing", "amazon-france", "ddg", "ebay-fr", "cnrtl-tlfi-fr", "qwant", "wikipedia-fr" + "google-b-d", "bing", "amazon-france", "ddg", "ebay-fr", "cnrtl-tlfi-fr", "qwant", "wikipedia-fr" ] } }, "fy-NL": { "default": { "visibleDefaultEngines": [ - "google", "bing", "bolcom-fy-NL", "ddg", "ebay-nl", "marktplaats-fy-NL", "wikipedia-fy-NL" + "google-b-d", "bing", "bolcom-fy-NL", "ddg", "ebay-nl", "marktplaats-fy-NL", "wikipedia-fy-NL" ] }, "experimental-hidden": { @@ -331,259 +328,259 @@ "ga-IE": { "default": { "visibleDefaultEngines": [ - "google", "amazon-en-GB", "ddg", "ebay-ie", "tearma", "twitter", "wikipedia-ga-IE" + "google-b-d", "amazon-en-GB", "ddg", "ebay-ie", "tearma", "twitter", "wikipedia-ga-IE" ] } }, "gd": { "default": { "visibleDefaultEngines": [ - "google", "amazon-en-GB", "bbc-alba", "ddg", "ebay-uk", "faclair-beag", "wikipedia-gd" + "google-b-d", "amazon-en-GB", "bbc-alba", "ddg", "ebay-uk", "faclair-beag", "wikipedia-gd" ] } }, "gl": { "default": { "visibleDefaultEngines": [ - "google", "amazon-en-GB", "ddg", "ebay-es", "wikipedia-gl" + "google-b-d", "amazon-en-GB", "ddg", "ebay-es", "wikipedia-gl" ] } }, "gn": { "default": { "visibleDefaultEngines": [ - "google", "bing", "amazondotcom", "ddg", "twitter", "wikipedia-gn" + "google-b-d", "bing", "amazondotcom", "ddg", "twitter", "wikipedia-gn" ] } }, "gu-IN": { "default": { "visibleDefaultEngines": [ - "google", "bing", "ddg", "gujaratilexicon", "wikipedia-gu" + "google-b-d", "bing", "ddg", "gujaratilexicon", "wikipedia-gu" ] } }, "he": { "default": { "visibleDefaultEngines": [ - "google", "ddg", "wikipedia-he", "morfix-dic" + "google-b-d", "ddg", "wikipedia-he", "morfix-dic" ] } }, "hi-IN": { "default": { "visibleDefaultEngines": [ - "google", "bing", "ddg", "wikipedia-hi" + "google-b-d", "bing", "ddg", "wikipedia-hi" ] } }, "hr": { "default": { "visibleDefaultEngines": [ - "google", "amazon-en-GB", "bing", "ddg", "eudict", "twitter", "wikipedia-hr" + "google-b-d", "amazon-en-GB", "bing", "ddg", "eudict", "twitter", "wikipedia-hr" ] } }, "hsb": { "default": { "visibleDefaultEngines": [ - "google", "bing", "amazondotcom-de", "ddg", "ebay-de", "leo_ende_de", "wikipedia-hsb" + "google-b-d", "bing", "amazondotcom-de", "ddg", "ebay-de", "leo_ende_de", "wikipedia-hsb" ] } }, "hu": { "default": { "visibleDefaultEngines": [ - "google", "ddg", "sztaki-en-hu", "vatera", "wikipedia-hu" + "google-b-d", "ddg", "sztaki-en-hu", "vatera", "wikipedia-hu" ] } }, "hy-AM": { "default": { "visibleDefaultEngines": [ - "google", "amazondotcom", "ddg", "list-am", "wikipedia-hy" + "google-b-d", "amazondotcom", "ddg", "list-am", "wikipedia-hy" ] } }, "ia": { "default": { "visibleDefaultEngines": [ - "google", "bing", "amazondotcom", "ddg", "twitter", "wikipedia-ia" + "google-b-d", "bing", "amazondotcom", "ddg", "twitter", "wikipedia-ia" ] } }, "id": { "default": { "visibleDefaultEngines": [ - "google", "ddg", "wikipedia-id" + "google-b-d", "ddg", "wikipedia-id" ] } }, "is": { "default": { "visibleDefaultEngines": [ - "google", "bing", "amazondotcom", "ddg", "leit-is", "wikipedia-is" + "google-b-d", "bing", "amazondotcom", "ddg", "leit-is", "wikipedia-is" ] } }, "it": { "default": { "visibleDefaultEngines": [ - "google", "bing", "amazon-it", "ddg", "ebay-it", "hoepli", "wikipedia-it" + "google-b-d", "bing", "amazon-it", "ddg", "ebay-it", "hoepli", "wikipedia-it" ] } }, "ja-JP-mac": { "default": { "visibleDefaultEngines": [ - "google", "yahoo-jp", "bing", "amazon-jp", "rakuten", "yahoo-jp-auctions", "oshiete-goo", "twitter-ja", "wikipedia-ja", "ddg" + "google-b-d", "yahoo-jp", "bing", "amazon-jp", "rakuten", "yahoo-jp-auctions", "oshiete-goo", "twitter-ja", "wikipedia-ja", "ddg" ] } }, "ja": { "default": { "visibleDefaultEngines": [ - "google", "yahoo-jp", "bing", "amazon-jp", "rakuten", "yahoo-jp-auctions", "oshiete-goo", "twitter-ja", "wikipedia-ja", "ddg" + "google-b-d", "yahoo-jp", "bing", "amazon-jp", "rakuten", "yahoo-jp-auctions", "oshiete-goo", "twitter-ja", "wikipedia-ja", "ddg" ] } }, "ka": { "default": { "visibleDefaultEngines": [ - "google", "bing", "amazondotcom", "ddg", "twitter", "wikipedia-ka" + "google-b-d", "bing", "amazondotcom", "ddg", "twitter", "wikipedia-ka" ] } }, "kab": { "default": { "visibleDefaultEngines": [ - "google", "bing", "ddg", "wikipedia-kab" + "google-b-d", "bing", "ddg", "wikipedia-kab" ] } }, "kk": { "default": { "visibleDefaultEngines": [ - "yandex-kk", "google", "ddg", "flip", "kaz-kk", "twitter", "wikipedia-kk" + "yandex-kk", "google-b-d", "ddg", "flip", "kaz-kk", "twitter", "wikipedia-kk" ] } }, "km": { "default": { "visibleDefaultEngines": [ - "google", "bing", "amazondotcom", "ddg", "twitter", "wikipedia-km" + "google-b-d", "bing", "amazondotcom", "ddg", "twitter", "wikipedia-km" ] } }, "kn": { "default": { "visibleDefaultEngines": [ - "google", "bing", "amazondotcom", "ddg", "kannadastore", "wikipedia-kn" + "google-b-d", "bing", "amazondotcom", "ddg", "kannadastore", "wikipedia-kn" ] } }, "ko": { "default": { "visibleDefaultEngines": [ - "google", "ddg", "naver-kr", "danawa-kr", "daum-kr", "wikipedia-kr" + "google-b-d", "ddg", "naver-kr", "danawa-kr", "daum-kr", "wikipedia-kr" ] } }, "lij": { "default": { "visibleDefaultEngines": [ - "google", "bing", "amazon-it", "ddg", "ebay-it", "paroledigenova-lij", "wikipedia-lij" + "google-b-d", "bing", "amazon-it", "ddg", "ebay-it", "paroledigenova-lij", "wikipedia-lij" ] } }, "lo": { "default": { "visibleDefaultEngines": [ - "google", "bing", "ddg", "wikipedia-lo", "twitter" + "google-b-d", "bing", "ddg", "wikipedia-lo", "twitter" ] } }, "lt": { "default": { "visibleDefaultEngines": [ - "google", "wikipedia-lt", "bing", "amazondotcom", "ddg", "twitter" + "google-b-d", "wikipedia-lt", "bing", "amazondotcom", "ddg", "twitter" ] } }, "ltg": { "default": { "visibleDefaultEngines": [ - "google", "dict-enlv", "ddg", "salidzinilv", "sslv", "wikipedia-ltg" + "google-b-d", "dict-enlv", "ddg", "salidzinilv", "sslv", "wikipedia-ltg" ] } }, "lv": { "default": { "visibleDefaultEngines": [ - "google", "dict-enlv", "ddg", "salidzinilv", "sslv", "wikipedia-lv" + "google-b-d", "dict-enlv", "ddg", "salidzinilv", "sslv", "wikipedia-lv" ] } }, "mai": { "default": { "visibleDefaultEngines": [ - "google", "bing", "ddg", "twitter", "wikipedia-hi" + "google-b-d", "bing", "ddg", "twitter", "wikipedia-hi" ] } }, "mk": { "default": { "visibleDefaultEngines": [ - "google", "bing", "amazondotcom", "ddg", "wikipedia-mk" + "google-b-d", "bing", "amazondotcom", "ddg", "wikipedia-mk" ] } }, "ml": { "default": { "visibleDefaultEngines": [ - "google", "webdunia", "bing", "ddg", "rediff", "wikipedia", "wikipedia-ml" + "google-b-d", "webdunia", "bing", "ddg", "rediff", "wikipedia", "wikipedia-ml" ] } }, "mr": { "default": { "visibleDefaultEngines": [ - "google", "amazondotcom", "ddg", "rediff", "wikipedia-mr" + "google-b-d", "amazondotcom", "ddg", "rediff", "wikipedia-mr" ] } }, "ms": { "default": { "visibleDefaultEngines": [ - "google", "bing", "amazondotcom", "ddg", "twitter", "wikipedia-ms" + "google-b-d", "bing", "amazondotcom", "ddg", "twitter", "wikipedia-ms" ] } }, "my": { "default": { "visibleDefaultEngines": [ - "google", "bing", "amazondotcom", "ddg", "twitter", "wikipedia-my" + "google-b-d", "bing", "amazondotcom", "ddg", "twitter", "wikipedia-my" ] } }, "nb-NO": { "default": { "visibleDefaultEngines": [ - "google", "amazon-en-GB", "bing", "ddg", "gulesider-NO", "bok-NO", "qxl-NO", "wikipedia-NO" + "google-b-d", "amazon-en-GB", "bing", "ddg", "gulesider-NO", "bok-NO", "qxl-NO", "wikipedia-NO" ] } }, "ne-NP": { "default": { "visibleDefaultEngines": [ - "google", "bing", "ddg", "twitter", "wikipedia-ne" + "google-b-d", "bing", "ddg", "twitter", "wikipedia-ne" ] } }, "nl": { "default": { "visibleDefaultEngines": [ - "google", "bing", "bolcom-nl", "ddg", "ebay-nl", "marktplaats-nl", "wikipedia-nl" + "google-b-d", "bing", "bolcom-nl", "ddg", "ebay-nl", "marktplaats-nl", "wikipedia-nl" ] }, "experimental-hidden": { @@ -595,42 +592,42 @@ "nn-NO": { "default": { "visibleDefaultEngines": [ - "google", "bing", "amazon-en-GB", "ddg", "gulesider-NO", "bok-NO", "qxl-NO", "wikipedia-NN" + "google-b-d", "bing", "amazon-en-GB", "ddg", "gulesider-NO", "bok-NO", "qxl-NO", "wikipedia-NN" ] } }, "oc": { "default": { "visibleDefaultEngines": [ - "google", "bing", "ddg", "twitter", "wikipedia-oc", "wiktionary-oc" + "google-b-d", "bing", "ddg", "twitter", "wikipedia-oc", "wiktionary-oc" ] } }, "or": { "default": { "visibleDefaultEngines": [ - "google", "bing", "amazondotcom", "ddg", "wikipedia-or" + "google-b-d", "bing", "amazondotcom", "ddg", "wikipedia-or" ] } }, "pa-IN": { "default": { "visibleDefaultEngines": [ - "google", "bing", "ddg", "wikipedia-pa" + "google-b-d", "bing", "ddg", "wikipedia-pa" ] } }, "pl": { "default": { "visibleDefaultEngines": [ - "google", "allegro-pl", "ddg", "pwn-pl", "wikipedia-pl", "wolnelektury-pl" + "google-b-d", "allegro-pl", "ddg", "pwn-pl", "wikipedia-pl", "wolnelektury-pl" ] } }, "pt-BR": { "default": { "visibleDefaultEngines": [ - "google", "bing", "buscape", "ddg", "mercadolivre", "twitter", "wikipedia-pt" + "google-b-d", "bing", "buscape", "ddg", "mercadolivre", "twitter", "wikipedia-pt" ] }, "experimental-hidden": { @@ -642,168 +639,168 @@ "pt-PT": { "default": { "visibleDefaultEngines": [ - "google", "amazon-en-GB", "ddg", "priberam", "sapo", "wikipedia-pt" + "google-b-d", "amazon-en-GB", "ddg", "priberam", "sapo", "wikipedia-pt" ] } }, "rm": { "default": { "visibleDefaultEngines": [ - "google", "bing", "ddg", "ebay-ch", "leo_ende_de-rm", "pledarigrond", "wikipedia-rm" + "google-b-d", "bing", "ddg", "ebay-ch", "leo_ende_de-rm", "pledarigrond", "wikipedia-rm" ] } }, "ro": { "default": { "visibleDefaultEngines": [ - "google", "bing", "amazondotcom", "ddg", "wikipedia-ro" + "google-b-d", "bing", "amazondotcom", "ddg", "wikipedia-ro" ] } }, "ru": { "default": { "visibleDefaultEngines": [ - "yandex-ru", "google", "ddg", "ozonru", "priceru", "wikipedia-ru", "mailru" + "yandex-ru", "google-b-d", "ddg", "ozonru", "priceru", "wikipedia-ru", "mailru" ] } }, "si": { "default": { "visibleDefaultEngines": [ - "google", "amazondotcom", "ddg", "wikipedia-si" + "google-b-d", "amazondotcom", "ddg", "wikipedia-si" ] } }, "sk": { "default": { "visibleDefaultEngines": [ - "google", "azet-sk", "atlas-sk", "ddg", "slovnik-sk", "wikipedia-sk", "zoznam-sk" + "google-b-d", "azet-sk", "atlas-sk", "ddg", "slovnik-sk", "wikipedia-sk", "zoznam-sk" ] } }, "sl": { "default": { "visibleDefaultEngines": [ - "google", "ceneji", "ddg", "najdi-si", "odpiralni", "twitter", "wikipedia-sl" + "google-b-d", "ceneji", "ddg", "najdi-si", "odpiralni", "twitter", "wikipedia-sl" ] } }, "son": { "default": { "visibleDefaultEngines": [ - "google", "bing", "amazon-france", "ddg", "cnrtl-tlfi-fr", "wikipedia-fr" + "google-b-d", "bing", "amazon-france", "ddg", "cnrtl-tlfi-fr", "wikipedia-fr" ] } }, "sq": { "default": { "visibleDefaultEngines": [ - "google", "bing", "amazon-en-GB", "ddg", "wikipedia-sq" + "google-b-d", "bing", "amazon-en-GB", "ddg", "wikipedia-sq" ] } }, "sr": { "default": { "visibleDefaultEngines": [ - "google", "amazon-en-GB", "bing", "ddg", "wikipedia-sr", "pogodak" + "google-b-d", "amazon-en-GB", "bing", "ddg", "wikipedia-sr", "pogodak" ] } }, "sv-SE": { "default": { "visibleDefaultEngines": [ - "google", "bing", "allaannonser-sv-SE", "ddg", "prisjakt-sv-SE", "tyda-sv-SE", "wikipedia-sv-SE" + "google-b-d", "bing", "allaannonser-sv-SE", "ddg", "prisjakt-sv-SE", "tyda-sv-SE", "wikipedia-sv-SE" ] } }, "ta": { "default": { "visibleDefaultEngines": [ - "google", "ddg", "wikipedia-ta" + "google-b-d", "ddg", "wikipedia-ta" ] } }, "te": { "default": { "visibleDefaultEngines": [ - "google", "amazondotcom", "ddg", "wikipedia-te", "wiktionary-te" + "google-b-d", "amazondotcom", "ddg", "wikipedia-te", "wiktionary-te" ] } }, "th": { "default": { "visibleDefaultEngines": [ - "google", "amazondotcom", "bing", "ddg", "longdo", "wikipedia-th" + "google-b-d", "amazondotcom", "bing", "ddg", "longdo", "wikipedia-th" ] } }, "tl": { "default": { "visibleDefaultEngines": [ - "google", "bing", "amazondotcom", "ddg", "twitter", "wikipedia-tl" + "google-b-d", "bing", "amazondotcom", "ddg", "twitter", "wikipedia-tl" ] } }, "tr": { "default": { "visibleDefaultEngines": [ - "yandex-tr", "google", "ddg", "twitter", "wikipedia-tr" + "yandex-tr", "google-b-d", "ddg", "twitter", "wikipedia-tr" ] } }, "uk": { "default": { "visibleDefaultEngines": [ - "google", "yandex-uk", "meta-ua", "ddg", "wikipedia-uk", "metamarket" + "google-b-d", "yandex-uk", "meta-ua", "ddg", "wikipedia-uk", "metamarket" ] } }, "ur": { "default": { "visibleDefaultEngines": [ - "google", "bing", "amazon-in", "ddg", "twitter", "wikipedia-ur" + "google-b-d", "bing", "amazon-in", "ddg", "twitter", "wikipedia-ur" ] } }, "uz": { "default": { "visibleDefaultEngines": [ - "google", "bing", "amazondotcom", "ddg", "twitter", "wikipedia-uz" + "google-b-d", "bing", "amazondotcom", "ddg", "twitter", "wikipedia-uz" ] } }, "vi": { "default": { "visibleDefaultEngines": [ - "google", "coccoc", "ddg", "wikipedia-vi" + "google-b-d", "coccoc", "ddg", "wikipedia-vi" ] } }, "wo": { "default": { "visibleDefaultEngines": [ - "google", "bing", "amazon-france", "ddg", "ebay-fr", "twitter", "wikipedia-wo" + "google-b-d", "bing", "amazon-france", "ddg", "ebay-fr", "twitter", "wikipedia-wo" ] } }, "xh": { "default": { "visibleDefaultEngines": [ - "google", "bing", "ddg", "wikipedia" + "google-b-d", "bing", "ddg", "wikipedia" ] } }, "zh-CN": { "default": { "visibleDefaultEngines": [ - "baidu", "google", "bing", "ddg", "wikipedia-zh-CN", "amazondotcn" + "baidu", "google-b-d", "bing", "ddg", "wikipedia-zh-CN", "amazondotcn" ] } }, "zh-TW": { "default": { "visibleDefaultEngines": [ - "google", "ddg", "readmoo", "wikipedia-zh-TW" + "google-b-d", "ddg", "readmoo", "wikipedia-zh-TW" ] } } diff -Nru thunderbird-60.5.1+build2/browser/locales/searchplugins/google-b-1-d.xml thunderbird-60.6.1+build2/browser/locales/searchplugins/google-b-1-d.xml --- thunderbird-60.5.1+build2/browser/locales/searchplugins/google-b-1-d.xml 1970-01-01 00:00:00.000000000 +0000 +++ thunderbird-60.6.1+build2/browser/locales/searchplugins/google-b-1-d.xml 2019-03-25 09:16:46.000000000 +0000 @@ -0,0 +1,15 @@ + + + +Google +Google Search +UTF-8 +resource://search-plugins/images/google.ico + + + + + + diff -Nru thunderbird-60.5.1+build2/browser/locales/searchplugins/google-b-1-e.xml thunderbird-60.6.1+build2/browser/locales/searchplugins/google-b-1-e.xml --- thunderbird-60.5.1+build2/browser/locales/searchplugins/google-b-1-e.xml 1970-01-01 00:00:00.000000000 +0000 +++ thunderbird-60.6.1+build2/browser/locales/searchplugins/google-b-1-e.xml 2019-03-25 09:16:46.000000000 +0000 @@ -0,0 +1,17 @@ + + + +Google +Google Search +UTF-8 +data:image/x-icon;base64,AAABAAIAEBAAAAEAIABoBAAAJgAAACAgAAABACAAqBAAAI4EAAAoAAAAEAAAACAAAAABACAAAAAAAAAEAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAP///zD9/f2W/f392P39/fn9/f35/f391/39/ZT+/v4uAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA/v7+Cf39/Zn///////////////////////////////////////////39/ZX///8IAAAAAAAAAAAAAAAA/v7+Cf39/cH/////+v35/7TZp/92ul3/WKs6/1iqOv9yuFn/rNWd//j79v///////f39v////wgAAAAAAAAAAP39/Zn/////7PXp/3G3WP9TqDT/U6g0/1OoNP9TqDT/U6g0/1OoNP+Or1j//vDo///////9/f2VAAAAAP///zD/////+vz5/3G3V/9TqDT/WKo6/6LQkf/U6cz/1urO/6rUm/+Zo0r/8IZB//adZ////v7///////7+/i79/f2Y/////4nWzf9Lqkj/Vqo4/9Xqzv///////////////////////ebY//SHRv/0hUL//NjD///////9/f2U/f392v////8sxPH/Ebzt/43RsP/////////////////////////////////4roL/9IVC//i1jf///////f391/39/fr/////Cr37/wW8+/+16/7/////////////////9IVC//SFQv/0hUL/9IVC//SFQv/3pnX///////39/fn9/f36/////wu++/8FvPv/tuz+//////////////////SFQv/0hUL/9IVC//SFQv/0hUL/96p7///////9/f35/f392/////81yfz/CrL5/2uk9v///////////////////////////////////////////////////////f392P39/Zn/////ks/7/zdS7P84Rur/0NT6///////////////////////9/f////////////////////////39/Zb+/v4y//////n5/v9WYu3/NUPq/ztJ6/+VnPT/z9L6/9HU+v+WnfT/Ul7t/+Hj/P////////////////////8wAAAAAP39/Z3/////6Or9/1hj7v81Q+r/NUPq/zVD6v81Q+r/NUPq/zVD6v9sdvD////////////9/f2YAAAAAAAAAAD///8K/f39w//////5+f7/paz2/11p7v88Suv/Okfq/1pm7v+iqfX/+fn+///////9/f3B/v7+CQAAAAAAAAAAAAAAAP///wr9/f2d///////////////////////////////////////////9/f2Z/v7+CQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAP7+/jL9/f2Z/f392/39/fr9/f36/f392v39/Zj///8wAAAAAAAAAAAAAAAAAAAAAPAPAADAAwAAgAEAAIABAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAIABAACAAQAAwAMAAPAPAAAoAAAAIAAAAEAAAAABACAAAAAAAAAQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAP7+/g3+/v5X/f39mf39/cj9/f3q/f39+f39/fn9/f3q/f39yP39/Zn+/v5W////DAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAP7+/iT9/f2c/f399f/////////////////////////////////////////////////////9/f31/f39mv7+/iMAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAP7+/gn9/f2K/f39+////////////////////////////////////////////////////////////////////////////f39+v39/Yf///8IAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAD+/v4k/f390v////////////////////////////////////////////////////////////////////////////////////////////////39/dD///8iAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA////MP39/er//////////////////////////+r05v+v16H/gsBs/2WxSf9Wqjj/Vqk3/2OwRv99vWX/pdKV/97u2P////////////////////////////39/ej+/v4vAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAP7+/iT9/f3q/////////////////////+v15/+Pxnv/VKk2/1OoNP9TqDT/U6g0/1OoNP9TqDT/U6g0/1OoNP9TqDT/U6g0/36+Z//d7tf///////////////////////39/ej///8iAAAAAAAAAAAAAAAAAAAAAAAAAAD///8K/f390//////////////////////E4bn/XKw+/1OoNP9TqDT/U6g0/1OoNP9TqDT/U6g0/1OoNP9TqDT/U6g0/1OoNP9TqDT/U6g0/1apN/+x0pv///////////////////////39/dD///8IAAAAAAAAAAAAAAAAAAAAAP39/Yv/////////////////////sdij/1OoNP9TqDT/U6g0/1OoNP9TqDT/U6g0/1OoNP9TqDT/U6g0/1OoNP9TqDT/U6g0/1OoNP9TqDT/YKU1/8qOPv/5wZ////////////////////////39/YcAAAAAAAAAAAAAAAD+/v4l/f39+////////////////8Lgt/9TqDT/U6g0/1OoNP9TqDT/U6g0/1OoNP9utlT/n86N/7faqv+426v/pdKV/3u8ZP9UqDX/U6g0/3egN//jiUH/9IVC//SFQv/82MP//////////////////f39+v7+/iMAAAAAAAAAAP39/Z3////////////////q9Ob/W6w+/1OoNP9TqDT/U6g0/1OoNP9nskz/zOXC/////////////////////////////////+Dv2v+osWP/8YVC//SFQv/0hUL/9IVC//WQVP/++fb//////////////////f39mgAAAAD+/v4O/f399v///////////////4LHj/9TqDT/U6g0/1OoNP9TqDT/dblc//L58P/////////////////////////////////////////////8+v/3p3f/9IVC//SFQv/0hUL/9IVC//rIqf/////////////////9/f31////DP7+/ln////////////////f9v7/Cbz2/zOwhv9TqDT/U6g0/2KwRv/v9+z///////////////////////////////////////////////////////738//1kFT/9IVC//SFQv/0hUL/9plg///////////////////////+/v5W/f39nP///////////////4jf/f8FvPv/Bbz7/yG1s/9QqDz/vN2w//////////////////////////////////////////////////////////////////rHqP/0hUL/9IVC//SFQv/0hUL//vDn//////////////////39/Zn9/f3L////////////////R878/wW8+/8FvPv/Bbz7/y7C5P/7/fr//////////////////////////////////////////////////////////////////ere//SFQv/0hUL/9IVC//SFQv/718H//////////////////f39yP39/ez///////////////8cwvv/Bbz7/wW8+/8FvPv/WNL8///////////////////////////////////////0hUL/9IVC//SFQv/0hUL/9IVC//SFQv/0hUL/9IVC//SFQv/0hUL/9IVC//rIqv/////////////////9/f3q/f39+v///////////////we9+/8FvPv/Bbz7/wW8+/993P3///////////////////////////////////////SFQv/0hUL/9IVC//SFQv/0hUL/9IVC//SFQv/0hUL/9IVC//SFQv/0hUL/+cGf//////////////////39/fn9/f36////////////////B737/wW8+/8FvPv/Bbz7/33c/f//////////////////////////////////////9IVC//SFQv/0hUL/9IVC//SFQv/0hUL/9IVC//SFQv/0hUL/9IVC//SFQv/6xaX//////////////////f39+f39/e3///////////////8cwvv/Bbz7/wW8+/8FvPv/WdP8///////////////////////////////////////0hUL/9IVC//SFQv/0hUL/9IVC//SFQv/0hUL/9IVC//SFQv/0hUL/9IVC//vVv//////////////////9/f3q/f39y////////////////0bN/P8FvPv/Bbz7/wW8+/8hrvn/+/v///////////////////////////////////////////////////////////////////////////////////////////////////////////////////39/cj9/f2c////////////////ht/9/wW8+/8FvPv/FZP1/zRJ6/+zuPf//////////////////////////////////////////////////////////////////////////////////////////////////////////////////f39mf7+/lr////////////////d9v7/B7n7/yB38f81Q+r/NUPq/0hV7P/u8P3////////////////////////////////////////////////////////////////////////////////////////////////////////////+/v5X////D/39/ff///////////////9tkPT/NUPq/zVD6v81Q+r/NUPq/2Fs7//y8v7////////////////////////////////////////////09f7//////////////////////////////////////////////////f399f7+/g0AAAAA/f39n////////////////+Tm/P89Suv/NUPq/zVD6v81Q+r/NUPq/1Bc7f/IzPn/////////////////////////////////x8v5/0xY7P+MlPP////////////////////////////////////////////9/f2cAAAAAAAAAAD+/v4n/f39/P///////////////7W69/81Q+r/NUPq/zVD6v81Q+r/NUPq/zVD6v9ZZe7/k5v0/6609/+vtff/lJv0/1pm7v81Q+r/NUPq/zVD6v+GjvL//v7//////////////////////////////f39+/7+/iQAAAAAAAAAAAAAAAD9/f2N/////////////////////6Cn9f81Q+r/NUPq/zVD6v81Q+r/NUPq/zVD6v81Q+r/NUPq/zVD6v81Q+r/NUPq/zVD6v81Q+r/NUPq/zVD6v+BivL////////////////////////////9/f2KAAAAAAAAAAAAAAAAAAAAAP7+/gv9/f3V/////////////////////7W69/8+S+v/NUPq/zVD6v81Q+r/NUPq/zVD6v81Q+r/NUPq/zVD6v81Q+r/NUPq/zVD6v81Q+r/P0zr/7q/+P///////////////////////f390v7+/gkAAAAAAAAAAAAAAAAAAAAAAAAAAP7+/ib9/f3r/////////////////////+Xn/P94gfH/NkTq/zVD6v81Q+r/NUPq/zVD6v81Q+r/NUPq/zVD6v81Q+r/NkTq/3Z/8f/l5/z///////////////////////39/er+/v4kAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAP7+/jL9/f3r///////////////////////////k5vz/nqX1/2p08P9IVez/OEbq/zdF6v9GU+z/aHLv/5qh9f/i5Pz////////////////////////////9/f3q////MAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAP7+/ib9/f3V/////////////////////////////////////////////////////////////////////////////////////////////////f390v7+/iQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAP///wr9/f2N/f39/P///////////////////////////////////////////////////////////////////////////f39+/39/Yv+/v4JAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAD+/v4n/f39n/39/ff//////////////////////////////////////////////////////f399v39/Z3+/v4lAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA/v7+Dv7+/lr9/f2c/f39y/39/e39/f36/f39+v39/ez9/f3L/f39nP7+/ln+/v4OAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAP/AA///AAD//AAAP/gAAB/wAAAP4AAAB8AAAAPAAAADgAAAAYAAAAEAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAACAAAABgAAAAcAAAAPAAAAD4AAAB/AAAA/4AAAf/AAAP/8AAP//wAP/ + + + + + + + + diff -Nru thunderbird-60.5.1+build2/browser/locales/searchplugins/google-b-d.xml thunderbird-60.6.1+build2/browser/locales/searchplugins/google-b-d.xml --- thunderbird-60.5.1+build2/browser/locales/searchplugins/google-b-d.xml 1970-01-01 00:00:00.000000000 +0000 +++ thunderbird-60.6.1+build2/browser/locales/searchplugins/google-b-d.xml 2019-03-25 09:16:46.000000000 +0000 @@ -0,0 +1,15 @@ + + + +Google +Google Search +UTF-8 +resource://search-plugins/images/google.ico + + + + + + diff -Nru thunderbird-60.5.1+build2/browser/locales/searchplugins/google-b-e.xml thunderbird-60.6.1+build2/browser/locales/searchplugins/google-b-e.xml --- thunderbird-60.5.1+build2/browser/locales/searchplugins/google-b-e.xml 1970-01-01 00:00:00.000000000 +0000 +++ thunderbird-60.6.1+build2/browser/locales/searchplugins/google-b-e.xml 2019-03-25 09:16:46.000000000 +0000 @@ -0,0 +1,17 @@ + + + +Google +Google Search +UTF-8 +data:image/x-icon;base64,AAABAAIAEBAAAAEAIABoBAAAJgAAACAgAAABACAAqBAAAI4EAAAoAAAAEAAAACAAAAABACAAAAAAAAAEAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAP///zD9/f2W/f392P39/fn9/f35/f391/39/ZT+/v4uAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA/v7+Cf39/Zn///////////////////////////////////////////39/ZX///8IAAAAAAAAAAAAAAAA/v7+Cf39/cH/////+v35/7TZp/92ul3/WKs6/1iqOv9yuFn/rNWd//j79v///////f39v////wgAAAAAAAAAAP39/Zn/////7PXp/3G3WP9TqDT/U6g0/1OoNP9TqDT/U6g0/1OoNP+Or1j//vDo///////9/f2VAAAAAP///zD/////+vz5/3G3V/9TqDT/WKo6/6LQkf/U6cz/1urO/6rUm/+Zo0r/8IZB//adZ////v7///////7+/i79/f2Y/////4nWzf9Lqkj/Vqo4/9Xqzv///////////////////////ebY//SHRv/0hUL//NjD///////9/f2U/f392v////8sxPH/Ebzt/43RsP/////////////////////////////////4roL/9IVC//i1jf///////f391/39/fr/////Cr37/wW8+/+16/7/////////////////9IVC//SFQv/0hUL/9IVC//SFQv/3pnX///////39/fn9/f36/////wu++/8FvPv/tuz+//////////////////SFQv/0hUL/9IVC//SFQv/0hUL/96p7///////9/f35/f392/////81yfz/CrL5/2uk9v///////////////////////////////////////////////////////f392P39/Zn/////ks/7/zdS7P84Rur/0NT6///////////////////////9/f////////////////////////39/Zb+/v4y//////n5/v9WYu3/NUPq/ztJ6/+VnPT/z9L6/9HU+v+WnfT/Ul7t/+Hj/P////////////////////8wAAAAAP39/Z3/////6Or9/1hj7v81Q+r/NUPq/zVD6v81Q+r/NUPq/zVD6v9sdvD////////////9/f2YAAAAAAAAAAD///8K/f39w//////5+f7/paz2/11p7v88Suv/Okfq/1pm7v+iqfX/+fn+///////9/f3B/v7+CQAAAAAAAAAAAAAAAP///wr9/f2d///////////////////////////////////////////9/f2Z/v7+CQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAP7+/jL9/f2Z/f392/39/fr9/f36/f392v39/Zj///8wAAAAAAAAAAAAAAAAAAAAAPAPAADAAwAAgAEAAIABAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAIABAACAAQAAwAMAAPAPAAAoAAAAIAAAAEAAAAABACAAAAAAAAAQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAP7+/g3+/v5X/f39mf39/cj9/f3q/f39+f39/fn9/f3q/f39yP39/Zn+/v5W////DAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAP7+/iT9/f2c/f399f/////////////////////////////////////////////////////9/f31/f39mv7+/iMAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAP7+/gn9/f2K/f39+////////////////////////////////////////////////////////////////////////////f39+v39/Yf///8IAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAD+/v4k/f390v////////////////////////////////////////////////////////////////////////////////////////////////39/dD///8iAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA////MP39/er//////////////////////////+r05v+v16H/gsBs/2WxSf9Wqjj/Vqk3/2OwRv99vWX/pdKV/97u2P////////////////////////////39/ej+/v4vAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAP7+/iT9/f3q/////////////////////+v15/+Pxnv/VKk2/1OoNP9TqDT/U6g0/1OoNP9TqDT/U6g0/1OoNP9TqDT/U6g0/36+Z//d7tf///////////////////////39/ej///8iAAAAAAAAAAAAAAAAAAAAAAAAAAD///8K/f390//////////////////////E4bn/XKw+/1OoNP9TqDT/U6g0/1OoNP9TqDT/U6g0/1OoNP9TqDT/U6g0/1OoNP9TqDT/U6g0/1apN/+x0pv///////////////////////39/dD///8IAAAAAAAAAAAAAAAAAAAAAP39/Yv/////////////////////sdij/1OoNP9TqDT/U6g0/1OoNP9TqDT/U6g0/1OoNP9TqDT/U6g0/1OoNP9TqDT/U6g0/1OoNP9TqDT/YKU1/8qOPv/5wZ////////////////////////39/YcAAAAAAAAAAAAAAAD+/v4l/f39+////////////////8Lgt/9TqDT/U6g0/1OoNP9TqDT/U6g0/1OoNP9utlT/n86N/7faqv+426v/pdKV/3u8ZP9UqDX/U6g0/3egN//jiUH/9IVC//SFQv/82MP//////////////////f39+v7+/iMAAAAAAAAAAP39/Z3////////////////q9Ob/W6w+/1OoNP9TqDT/U6g0/1OoNP9nskz/zOXC/////////////////////////////////+Dv2v+osWP/8YVC//SFQv/0hUL/9IVC//WQVP/++fb//////////////////f39mgAAAAD+/v4O/f399v///////////////4LHj/9TqDT/U6g0/1OoNP9TqDT/dblc//L58P/////////////////////////////////////////////8+v/3p3f/9IVC//SFQv/0hUL/9IVC//rIqf/////////////////9/f31////DP7+/ln////////////////f9v7/Cbz2/zOwhv9TqDT/U6g0/2KwRv/v9+z///////////////////////////////////////////////////////738//1kFT/9IVC//SFQv/0hUL/9plg///////////////////////+/v5W/f39nP///////////////4jf/f8FvPv/Bbz7/yG1s/9QqDz/vN2w//////////////////////////////////////////////////////////////////rHqP/0hUL/9IVC//SFQv/0hUL//vDn//////////////////39/Zn9/f3L////////////////R878/wW8+/8FvPv/Bbz7/y7C5P/7/fr//////////////////////////////////////////////////////////////////ere//SFQv/0hUL/9IVC//SFQv/718H//////////////////f39yP39/ez///////////////8cwvv/Bbz7/wW8+/8FvPv/WNL8///////////////////////////////////////0hUL/9IVC//SFQv/0hUL/9IVC//SFQv/0hUL/9IVC//SFQv/0hUL/9IVC//rIqv/////////////////9/f3q/f39+v///////////////we9+/8FvPv/Bbz7/wW8+/993P3///////////////////////////////////////SFQv/0hUL/9IVC//SFQv/0hUL/9IVC//SFQv/0hUL/9IVC//SFQv/0hUL/+cGf//////////////////39/fn9/f36////////////////B737/wW8+/8FvPv/Bbz7/33c/f//////////////////////////////////////9IVC//SFQv/0hUL/9IVC//SFQv/0hUL/9IVC//SFQv/0hUL/9IVC//SFQv/6xaX//////////////////f39+f39/e3///////////////8cwvv/Bbz7/wW8+/8FvPv/WdP8///////////////////////////////////////0hUL/9IVC//SFQv/0hUL/9IVC//SFQv/0hUL/9IVC//SFQv/0hUL/9IVC//vVv//////////////////9/f3q/f39y////////////////0bN/P8FvPv/Bbz7/wW8+/8hrvn/+/v///////////////////////////////////////////////////////////////////////////////////////////////////////////////////39/cj9/f2c////////////////ht/9/wW8+/8FvPv/FZP1/zRJ6/+zuPf//////////////////////////////////////////////////////////////////////////////////////////////////////////////////f39mf7+/lr////////////////d9v7/B7n7/yB38f81Q+r/NUPq/0hV7P/u8P3////////////////////////////////////////////////////////////////////////////////////////////////////////////+/v5X////D/39/ff///////////////9tkPT/NUPq/zVD6v81Q+r/NUPq/2Fs7//y8v7////////////////////////////////////////////09f7//////////////////////////////////////////////////f399f7+/g0AAAAA/f39n////////////////+Tm/P89Suv/NUPq/zVD6v81Q+r/NUPq/1Bc7f/IzPn/////////////////////////////////x8v5/0xY7P+MlPP////////////////////////////////////////////9/f2cAAAAAAAAAAD+/v4n/f39/P///////////////7W69/81Q+r/NUPq/zVD6v81Q+r/NUPq/zVD6v9ZZe7/k5v0/6609/+vtff/lJv0/1pm7v81Q+r/NUPq/zVD6v+GjvL//v7//////////////////////////////f39+/7+/iQAAAAAAAAAAAAAAAD9/f2N/////////////////////6Cn9f81Q+r/NUPq/zVD6v81Q+r/NUPq/zVD6v81Q+r/NUPq/zVD6v81Q+r/NUPq/zVD6v81Q+r/NUPq/zVD6v+BivL////////////////////////////9/f2KAAAAAAAAAAAAAAAAAAAAAP7+/gv9/f3V/////////////////////7W69/8+S+v/NUPq/zVD6v81Q+r/NUPq/zVD6v81Q+r/NUPq/zVD6v81Q+r/NUPq/zVD6v81Q+r/P0zr/7q/+P///////////////////////f390v7+/gkAAAAAAAAAAAAAAAAAAAAAAAAAAP7+/ib9/f3r/////////////////////+Xn/P94gfH/NkTq/zVD6v81Q+r/NUPq/zVD6v81Q+r/NUPq/zVD6v81Q+r/NkTq/3Z/8f/l5/z///////////////////////39/er+/v4kAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAP7+/jL9/f3r///////////////////////////k5vz/nqX1/2p08P9IVez/OEbq/zdF6v9GU+z/aHLv/5qh9f/i5Pz////////////////////////////9/f3q////MAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAP7+/ib9/f3V/////////////////////////////////////////////////////////////////////////////////////////////////f390v7+/iQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAP///wr9/f2N/f39/P///////////////////////////////////////////////////////////////////////////f39+/39/Yv+/v4JAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAD+/v4n/f39n/39/ff//////////////////////////////////////////////////////f399v39/Z3+/v4lAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA/v7+Dv7+/lr9/f2c/f39y/39/e39/f36/f39+v39/ez9/f3L/f39nP7+/ln+/v4OAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAP/AA///AAD//AAAP/gAAB/wAAAP4AAAB8AAAAPAAAADgAAAAYAAAAEAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAACAAAABgAAAAcAAAAPAAAAD4AAAB/AAAA/4AAAf/AAAP/8AAP//wAP/ + + + + + + + + diff -Nru thunderbird-60.5.1+build2/browser/locales/searchplugins/mapy-cz.xml thunderbird-60.6.1+build2/browser/locales/searchplugins/mapy-cz.xml --- thunderbird-60.5.1+build2/browser/locales/searchplugins/mapy-cz.xml 2019-02-19 13:45:35.000000000 +0000 +++ thunderbird-60.6.1+build2/browser/locales/searchplugins/mapy-cz.xml 2019-03-25 09:16:46.000000000 +0000 @@ -8,7 +8,7 @@ UTF-8 data:image/x-icon;base64,AAABAAIAICAAAAEAIACvBAAAJgAAABAQAAABACAAPwIAANUEAACJUE5HDQoaCgAAAA1JSERSAAAAIAAAACAIBgAAAHN6evQAAAR2SURBVFiFrZdbbFRVFIa/OZ1pO+20ldILLa3FtJpgSbmJLQRiFE3KRZMqidYHfTEYCMTwYo0PxCcDvkCMEmM0UR/EBy9EoEGUEIlGIKXBYqPSYrlVpJUO08tM22nn92HOnOlczplBWMlK9tn73/9aZ52191nLtftUK1mKD9gEPA4sAx4ASsy1ADAAnAdOAkeB8WxI3VlgGoAOoB0otMFUmNoMvApMAAeBvUC/E7khCRvNl7RHUq+kVyQVOmCTtdDc0ytpr8mVFmvYOFYP/GK+eW4WUbKTXOB1k6shHcAtKXluBdAJVN6F4WRZBvwEbAS65y4kR6ABOHaPjcek0uROiMTcCHiBL4HydLu3LO5gaeUT+EM3+OaPfQwEfv0/TpQDXwEtQAjAAGHqW6Clc54TdEn5Oly4KPVW075kNwXukrS4LLTJtAUIQwKJeold5jitTs4Erdco8BTx2KIXbbESNFe30Vq/DeRKt75LokGKR+ANkMfJ84hmE2K5qmqDbRQWz1/D5ge3sbb2WVbXtKXDeEybGJKKJLVnOtu5OfkJDuTm5LO6ti0FV+17iOcb38TlcgHwaPVmO84XJBUZkjZmc8l4jLyUjGpZ+DRuI8/ClOYv5OWlb+PJiWPLCmucLquNBmh9psTxeUrJMVJv7QJPMY9UbQDEfO9Ctq7chy/3vgSMC5cT93pDoskpmSQo89ZYhJLoGTplPa+7fwsV3kVsXbmf4rz5KU5GFHHibjIk1WcKf1Vx/O4YDl7l29/fJTw7DcA8bxU7Wz60jE9MBzh68QMLPzUTdOKuN0DFmT5Bbclii3BwrI+x6WF+vva1Nec2PAD4Q//w/tntDI7+aa1Nzow7cRcbUoRM2jBvuUV4xf8bUoQfBz5nenbSmr8a6OW9M9v5N3gVFzlzHJhw5DYkjTqFf0FhA0V5pRbhZf8FJDE+PcIPlz4D4Mz1Ixw4u4PRqaGUIxt1wJZ/1A26BJSlZI8pjZVrrXEoPMaN8Ytm+ODkwKecvnaI0EwgaVf8Dxv/BGnlkltSD9FKJq0sX/CkNb4wdIrZSOKNGAzfTtkzYyYoQMiMgI30GBIn7I5JTdHDVPjqLHTX9e8cj2tMQ+F4OTgZDjphT7hBnURruJR6b01dmzW+OX6Zv0a6cAinJbeCg3EH7D9BEOg0JI1J+iI5QbzuElZUP2Whv+//xLxUMteEgakh/h7tA+CKv9cOd1DSWKwg2QO8BHhiBptrn8FtRMvBvlvn6B48hrJ4+5gcOL2TCl8dA/7z6ZbDRCtm3GZ4+oF9RAvIqAM1m+i/1c25weN0DR5GRLI2DjARHmHAP2K3vB/oA3C9dnhVbNILnAaa7sjSnUsPsJpoDiSUZCHQc6DhTFfzXeiwaSMYm3NLCaHtB1q592U5wE2iZXlCp5SuMekG1hIN1b2SHpOzO3nBrjXrl9Qs6R1J4WyOno2GTY5mkzMFY9eaAUwSbc0agY8wkyZLCQEfm3s7TK604tpxaFm2pD5gM4nteaz+uk1ie36ELNvz/wAQuz6qTTbcEAAAAABJRU5ErkJggolQTkcNChoKAAAADUlIRFIAAAAQAAAAEAgGAAAAH/P/YQAAAgZJREFUOI2Nk01I1FEUxX/z/I9OVJKKEZmCFX0YmGSUSFARYxa4Mlq06gukUISE3ERtA1sVJrUQqm3UQhd9uDIiCowIlQgiZiwKRXIxmc0097T5P/s7zKILB+5977z7zuHdF7s63k5B7ADOAEeBWiAGpIHnwD1gMkoOJPm8DLgOdANBQdMKYDdwCRgE+oBctEEpMAIkC+UUhAN6gO1AB5B1kpA0ICkZ5lzcM0jf/gesDirxawVok3RDEk5Sg6TuKGFVvJx1ifUkN59ecfBA7UlaN3X6+oKkBidZl2ROMjx8NG04wtp4FZLRWH2Y9i3nOb61y/MCyc4Gkh2KmowRY01pBaY8JbGA1rpOUj/ec2LX5WVO5JI2Z6Z6M+FRWVZD4OK8/TYGQEtNB6carzG/+JXZTAqACL/OSfmslMejvrIJgPTCFPffXaG0JEF6YZqhNz1kcguhgn/8QLIZoMpr2lndAsCn+QnmFlMMT/Tzcf41eeWKWUg7M417SQlXzraqfQB8z3wmb8bU7Aty+Sxm4lcuU2jhmZPsrmQmGc01xwhcnIeTA0RfxWPu58yyAsn+SDbsJJuSbFAymjcmeZl+zKv0o6INRj/cov/JQV/fkWw61juy14/y6H+Mso+xcJSX/ABlJeuQ7GYoraiC0OrtkLsk2Yrf+BvoBYaAc6GaunDvC/CUIt/5L8Hdoep4zHF5AAAAAElFTkSuQmCC - + https://www.mapy.cz/ diff -Nru thunderbird-60.5.1+build2/build/debian-packages/sqlite3-wheezy.diff thunderbird-60.6.1+build2/build/debian-packages/sqlite3-wheezy.diff --- thunderbird-60.5.1+build2/build/debian-packages/sqlite3-wheezy.diff 1970-01-01 00:00:00.000000000 +0000 +++ thunderbird-60.6.1+build2/build/debian-packages/sqlite3-wheezy.diff 2019-03-25 09:16:46.000000000 +0000 @@ -0,0 +1,58 @@ +diff --git a/debian/changelog b/debian/changelog +index ba3d92c..8a122c3 100644 +--- a/debian/changelog ++++ b/debian/changelog +@@ -1,3 +1,12 @@ ++sqlite3 (3.16.2-5.deb7moz1) wheezy; urgency=medium ++ ++ * Mozilla backport for wheezy. ++ * debian/control, debian/rules: ++ - Downgrade tcl version from 8.6 to 8.5. ++ - Update tcl library path to reflect lack of multiarch. ++ ++ -- Gregory Szorc Tue, 11 Dec 2018 12:13:00 -0700 ++ + sqlite3 (3.16.2-5) unstable; urgency=medium + + * Backport fix for corruption due to REPLACE in an auto-vacuumed database. +diff --git a/debian/control b/debian/control +index af12a8d..e150d02 100644 +--- a/debian/control ++++ b/debian/control +@@ -2,8 +2,8 @@ Source: sqlite3 + Section: devel + Priority: optional + Maintainer: Laszlo Boszormenyi (GCS) +-Build-Depends: dpkg-dev (>= 1.16.1~), debhelper (>= 9), autoconf (>= 2.59), libtool (>= 1.5.2), automake, autotools-dev, chrpath, libreadline-dev, tcl8.6-dev, dh-autoreconf +-Build-Conflicts: tcl8.4, tcl8.4-dev, tcl8.5, tcl8.5-dev ++Build-Depends: dpkg-dev (>= 1.16.1~), debhelper (>= 9), autoconf (>= 2.59), libtool (>= 1.5.2), automake, autotools-dev, chrpath, libreadline-dev, tcl8.5-dev, dh-autoreconf ++Build-Conflicts: tcl8.4, tcl8.4-dev + Homepage: http://www.sqlite.org/ + Standards-Version: 3.9.8 + +diff --git a/debian/rules b/debian/rules +index 72333f7..198f716 100755 +--- a/debian/rules ++++ b/debian/rules +@@ -22,10 +22,10 @@ export DEB_BUILD_GNU_TYPE ?= $(shell dpkg-architecture -qDEB_BUILD_GNU_TYPE) + + export LDFLAGS += -Wl,--as-needed + ifeq ($(DEB_BUILD_GNU_TYPE), $(DEB_HOST_GNU_TYPE)) +- confflags += --build $(DEB_HOST_GNU_TYPE) --with-tcl=/usr/lib/$(DEB_HOST_MULTIARCH)/tcl8.6 ++ confflags += --build $(DEB_HOST_GNU_TYPE) --with-tcl=/usr/lib/tcl8.5 + export CROSS_BUILDING=no + else +- confflags += --build $(DEB_BUILD_GNU_TYPE) --host $(DEB_HOST_GNU_TYPE) --with-tcl=/usr/lib/$(DEB_HOST_MULTIARCH)/tcl8.6 ++ confflags += --build $(DEB_BUILD_GNU_TYPE) --host $(DEB_HOST_GNU_TYPE) --with-tcl=/usr/lib/tcl8.5 + LDFLAGS += -L/usr/lib/$(DEB_HOST_MULTIARCH) + export CROSS_BUILDING=yes + endif +@@ -115,7 +115,7 @@ install: build + ifeq ($(DEB_BUILD_GNU_TYPE), $(DEB_HOST_GNU_TYPE)) + echo "pkg_mkIndex -verbose $(DESTDIR)/usr/lib/tcltk/sqlite3" | \ + LD_LIBRARY_PATH=$(DESTDIR)/usr/lib/$(DEB_HOST_MULTIARCH) \ +- tclsh8.6 ++ tclsh8.5 + grep -q 'package ifneeded sqlite3' \ + $(DESTDIR)/usr/lib/tcltk/sqlite3/pkgIndex.tcl || \ + (echo "pkgIndex.tcl seems to be wrong" && exit 1) diff -Nru thunderbird-60.5.1+build2/build/virtualenv_packages.txt thunderbird-60.6.1+build2/build/virtualenv_packages.txt --- thunderbird-60.5.1+build2/build/virtualenv_packages.txt 2019-02-19 13:45:35.000000000 +0000 +++ thunderbird-60.6.1+build2/build/virtualenv_packages.txt 2019-03-25 09:16:46.000000000 +0000 @@ -37,6 +37,7 @@ mozilla.pth:third_party/python/pytoml mozilla.pth:third_party/python/redo mozilla.pth:third_party/python/six +mozilla.pth:third_party/python/taskcluster-urls mozilla.pth:third_party/python/voluptuous mozilla.pth:third_party/python/json-e mozilla.pth:build diff -Nru thunderbird-60.5.1+build2/comm/calendar/resources/content/datetimepickers/datetimepickers.xml thunderbird-60.6.1+build2/comm/calendar/resources/content/datetimepickers/datetimepickers.xml --- thunderbird-60.5.1+build2/comm/calendar/resources/content/datetimepickers/datetimepickers.xml 2019-02-19 13:46:56.000000000 +0000 +++ thunderbird-60.6.1+build2/comm/calendar/resources/content/datetimepickers/datetimepickers.xml 2019-03-25 09:18:29.000000000 +0000 @@ -1692,8 +1692,11 @@ // Made of digits & nonDigits. (Nondigits may be unicode letters // which do not match \w, esp. in CJK locales.) this.parseShortDateRegex = /^\D*(\d+)\D+(\d+)\D+(\d+)\D?$/; - let probeDate = new Date(2002, 2, 4); // month is 0-based - let probeString = this.formatDate(probeDate); + // Make sure to use UTC date and timezone here to avoid the pattern + // detection to fail if the probe date output would have an timezone + // offset due to our lack of support of historic timezone definitions. + let probeDate = new Date(Date.UTC(2002, 3, 6)); // month is 0-based + let probeString = this.formatDate(probeDate, cal.dtz.UTC); let probeArray = this.parseShortDateRegex.exec(probeString); if (probeArray) { // Numeric month format @@ -1701,8 +1704,9 @@ switch (Number(probeArray[i])) { case 2: this.twoDigitYear = true; // falls through case 2002: this.yearIndex = i; break; - case 3: this.monthIndex = i; break; - case 4: this.dayIndex = i; break; + case 4: this.monthIndex = i; break; + case 5: // falls through for OS timezones western to GMT + case 6: this.dayIndex = i; break; } } // All three indexes are set (not -1) at this point. @@ -1723,7 +1727,8 @@ switch (Number(probeArray[j])) { case 2: this.twoDigitYear = true; // falls through case 2002: this.yearIndex = j; break; - case 4: this.dayIndex = j; break; + case 5: // falls through for OS timezones western to GMT + case 6: this.dayIndex = j; break; default: this.monthIndex = j; break; } } @@ -1862,8 +1867,14 @@ + diff -Nru thunderbird-60.5.1+build2/comm/calendar/test/unit/data/previous.json thunderbird-60.6.1+build2/comm/calendar/test/unit/data/previous.json --- thunderbird-60.5.1+build2/comm/calendar/test/unit/data/previous.json 2019-02-19 13:46:56.000000000 +0000 +++ thunderbird-60.6.1+build2/comm/calendar/test/unit/data/previous.json 2019-03-25 09:18:29.000000000 +0000 @@ -1,5 +1,5 @@ { - "version": "2.2018d", + "version": "2.2018e", "aliases": [ "AUS Central Standard Time", "AUS Eastern Standard Time", diff -Nru thunderbird-60.5.1+build2/comm/calendar/timezones/update-zones.py thunderbird-60.6.1+build2/comm/calendar/timezones/update-zones.py --- thunderbird-60.5.1+build2/comm/calendar/timezones/update-zones.py 2019-02-19 13:46:56.000000000 +0000 +++ thunderbird-60.6.1+build2/comm/calendar/timezones/update-zones.py 2019-03-25 09:18:29.000000000 +0000 @@ -317,5 +317,11 @@ shutil.rmtree(zoneinfo_path) shutil.rmtree(zoneinfo_pure_path) + print """ +When updating timezone definitions, please check the zones America/Campo_Grande, +America/Cuiaba, and America/Sao_Paulo are not reset to their previous buggy state. +See bug 1515937 for more information. +""" + if __name__ == "__main__": main() diff -Nru thunderbird-60.5.1+build2/comm/calendar/timezones/zones.json thunderbird-60.6.1+build2/comm/calendar/timezones/zones.json --- thunderbird-60.5.1+build2/comm/calendar/timezones/zones.json 2019-02-19 13:46:56.000000000 +0000 +++ thunderbird-60.6.1+build2/comm/calendar/timezones/zones.json 2019-03-25 09:18:29.000000000 +0000 @@ -1,5 +1,5 @@ { - "version": "2.2018e", + "version": "2.2018i", "aliases": { "AUS Central Standard Time": { "aliasTo": "Australia/Darwin" @@ -471,7 +471,7 @@ "longitude": "+0311500" }, "Africa/Casablanca": { - "ics": "BEGIN:VTIMEZONE\r\nTZID:Africa/Casablanca\r\nBEGIN:STANDARD\r\nTZOFFSETFROM:+0100\r\nTZOFFSETTO:+0000\r\nTZNAME:WET\r\nDTSTART:19701025T030000\r\nRRULE:FREQ=YEARLY;BYMONTH=10;BYDAY=-1SU\r\nEND:STANDARD\r\nBEGIN:DAYLIGHT\r\nTZOFFSETFROM:+0100\r\nTZOFFSETTO:+0100\r\nTZNAME:WEST\r\nDTSTART:19700329T020000\r\nRRULE:FREQ=YEARLY;BYMONTH=3;BYDAY=-1SU\r\nEND:DAYLIGHT\r\nEND:VTIMEZONE", + "ics": "BEGIN:VTIMEZONE\r\nTZID:Africa/Casablanca\r\nBEGIN:STANDARD\r\nTZOFFSETFROM:+0100\r\nTZOFFSETTO:+0100\r\nTZNAME:+01\r\nDTSTART:19700101T000000\r\nEND:STANDARD\r\nEND:VTIMEZONE", "latitude": "+0333900", "longitude": "-0073500" }, @@ -506,7 +506,7 @@ "longitude": "+0094200" }, "Africa/El_Aaiun": { - "ics": "BEGIN:VTIMEZONE\r\nTZID:Africa/El_Aaiun\r\nBEGIN:STANDARD\r\nTZOFFSETFROM:+0100\r\nTZOFFSETTO:+0000\r\nTZNAME:WET\r\nDTSTART:19701025T030000\r\nRRULE:FREQ=YEARLY;BYMONTH=10;BYDAY=-1SU\r\nEND:STANDARD\r\nBEGIN:DAYLIGHT\r\nTZOFFSETFROM:+0100\r\nTZOFFSETTO:+0100\r\nTZNAME:WEST\r\nDTSTART:19700329T020000\r\nRRULE:FREQ=YEARLY;BYMONTH=3;BYDAY=-1SU\r\nEND:DAYLIGHT\r\nEND:VTIMEZONE", + "ics": "BEGIN:VTIMEZONE\r\nTZID:Africa/El_Aaiun\r\nBEGIN:STANDARD\r\nTZOFFSETFROM:+0100\r\nTZOFFSETTO:+0100\r\nTZNAME:+01\r\nDTSTART:19700101T000000\r\nEND:STANDARD\r\nEND:VTIMEZONE", "latitude": "+0270900", "longitude": "-0131200" }, @@ -646,7 +646,7 @@ "longitude": "+0023700" }, "Africa/Sao_Tome": { - "ics": "BEGIN:VTIMEZONE\r\nTZID:Africa/Sao_Tome\r\nBEGIN:STANDARD\r\nTZOFFSETFROM:+0100\r\nTZOFFSETTO:+0100\r\nTZNAME:WAT\r\nDTSTART:19700101T000000\r\nEND:STANDARD\r\nEND:VTIMEZONE", + "ics": "BEGIN:VTIMEZONE\r\nTZID:Africa/Sao_Tome\r\nBEGIN:STANDARD\r\nTZOFFSETFROM:+0000\r\nTZOFFSETTO:+0000\r\nTZNAME:GMT\r\nDTSTART:19700101T000000\r\nEND:STANDARD\r\nEND:VTIMEZONE", "latitude": "+0002000", "longitude": "+0064400" }, @@ -816,7 +816,7 @@ "longitude": "-1050310" }, "America/Campo_Grande": { - "ics": "BEGIN:VTIMEZONE\r\nTZID:America/Campo_Grande\r\nBEGIN:DAYLIGHT\r\nTZOFFSETFROM:-0400\r\nTZOFFSETTO:-0300\r\nTZNAME:-03\r\nDTSTART:19701101T000000\r\nRRULE:FREQ=YEARLY;BYMONTH=11;BYDAY=1SU\r\nEND:DAYLIGHT\r\nBEGIN:STANDARD\r\nTZOFFSETFROM:-0400\r\nTZOFFSETTO:-0400\r\nTZNAME:-04\r\nDTSTART:19700215T000000\r\nRRULE:FREQ=YEARLY;BYMONTH=2;BYDAY=3SU\r\nEND:STANDARD\r\nEND:VTIMEZONE", + "ics": "BEGIN:VTIMEZONE\r\nTZID:America/Campo_Grande\r\nBEGIN:DAYLIGHT\r\nTZOFFSETFROM:-0400\r\nTZOFFSETTO:-0300\r\nTZNAME:-03\r\nDTSTART:19701101T000000\r\nRRULE:FREQ=YEARLY;BYMONTH=11;BYDAY=1SU\r\nEND:DAYLIGHT\r\nBEGIN:STANDARD\r\nTZOFFSETFROM:-0300\r\nTZOFFSETTO:-0400\r\nTZNAME:-04\r\nDTSTART:19700215T000000\r\nRRULE:FREQ=YEARLY;BYMONTH=2;BYDAY=3SU\r\nEND:STANDARD\r\nEND:VTIMEZONE", "latitude": "-0202700", "longitude": "-0543700" }, @@ -861,7 +861,7 @@ "longitude": "-1163100" }, "America/Cuiaba": { - "ics": "BEGIN:VTIMEZONE\r\nTZID:America/Cuiaba\r\nBEGIN:DAYLIGHT\r\nTZOFFSETFROM:-0400\r\nTZOFFSETTO:-0300\r\nTZNAME:-03\r\nDTSTART:19701101T000000\r\nRRULE:FREQ=YEARLY;BYMONTH=11;BYDAY=1SU\r\nEND:DAYLIGHT\r\nBEGIN:STANDARD\r\nTZOFFSETFROM:-0400\r\nTZOFFSETTO:-0400\r\nTZNAME:-04\r\nDTSTART:19700215T000000\r\nRRULE:FREQ=YEARLY;BYMONTH=2;BYDAY=3SU\r\nEND:STANDARD\r\nEND:VTIMEZONE", + "ics": "BEGIN:VTIMEZONE\r\nTZID:America/Cuiaba\r\nBEGIN:DAYLIGHT\r\nTZOFFSETFROM:-0400\r\nTZOFFSETTO:-0300\r\nTZNAME:-03\r\nDTSTART:19701101T000000\r\nRRULE:FREQ=YEARLY;BYMONTH=11;BYDAY=1SU\r\nEND:DAYLIGHT\r\nBEGIN:STANDARD\r\nTZOFFSETFROM:-0300\r\nTZOFFSETTO:-0400\r\nTZNAME:-04\r\nDTSTART:19700215T000000\r\nRRULE:FREQ=YEARLY;BYMONTH=2;BYDAY=3SU\r\nEND:STANDARD\r\nEND:VTIMEZONE", "latitude": "-0153500", "longitude": "-0560500" }, @@ -1286,7 +1286,7 @@ "longitude": "-0545200" }, "America/Santiago": { - "ics": "BEGIN:VTIMEZONE\r\nTZID:America/Santiago\r\nBEGIN:STANDARD\r\nTZOFFSETFROM:-0300\r\nTZOFFSETTO:-0400\r\nTZNAME:-04\r\nDTSTART:19700510T000000\r\nRRULE:FREQ=YEARLY;BYMONTH=5;BYMONTHDAY=9,10,11,12,13,14,15;BYDAY=SU\r\nEND:STANDARD\r\nBEGIN:DAYLIGHT\r\nTZOFFSETFROM:-0400\r\nTZOFFSETTO:-0300\r\nTZNAME:-03\r\nDTSTART:19700809T000000\r\nRRULE:FREQ=YEARLY;BYMONTH=8;BYMONTHDAY=9,10,11,12,13,14,15;BYDAY=SU\r\nEND:DAYLIGHT\r\nEND:VTIMEZONE", + "ics": "BEGIN:VTIMEZONE\r\nTZID:America/Santiago\r\nBEGIN:STANDARD\r\nTZOFFSETFROM:-0300\r\nTZOFFSETTO:-0400\r\nTZNAME:-04\r\nDTSTART:19700405T000000\r\nRRULE:FREQ=YEARLY;BYMONTH=4;BYMONTHDAY=2,3,4,5,6,7,8;BYDAY=SU\r\nEND:STANDARD\r\nBEGIN:DAYLIGHT\r\nTZOFFSETFROM:-0400\r\nTZOFFSETTO:-0300\r\nTZNAME:-03\r\nDTSTART:19700906T000000\r\nRRULE:FREQ=YEARLY;BYMONTH=9;BYMONTHDAY=2,3,4,5,6,7,8;BYDAY=SU\r\nEND:DAYLIGHT\r\nEND:VTIMEZONE", "latitude": "-0332700", "longitude": "-0704000" }, @@ -1296,7 +1296,7 @@ "longitude": "-0695400" }, "America/Sao_Paulo": { - "ics": "BEGIN:VTIMEZONE\r\nTZID:America/Sao_Paulo\r\nBEGIN:DAYLIGHT\r\nTZOFFSETFROM:-0300\r\nTZOFFSETTO:-0200\r\nTZNAME:-02\r\nDTSTART:19701101T000000\r\nRRULE:FREQ=YEARLY;BYMONTH=11;BYDAY=1SU\r\nEND:DAYLIGHT\r\nBEGIN:STANDARD\r\nTZOFFSETFROM:-0300\r\nTZOFFSETTO:-0300\r\nTZNAME:-03\r\nDTSTART:19700215T000000\r\nRRULE:FREQ=YEARLY;BYMONTH=2;BYDAY=3SU\r\nEND:STANDARD\r\nEND:VTIMEZONE", + "ics": "BEGIN:VTIMEZONE\r\nTZID:America/Sao_Paulo\r\nBEGIN:DAYLIGHT\r\nTZOFFSETFROM:-0300\r\nTZOFFSETTO:-0200\r\nTZNAME:-02\r\nDTSTART:19701101T000000\r\nRRULE:FREQ=YEARLY;BYMONTH=11;BYDAY=1SU\r\nEND:DAYLIGHT\r\nBEGIN:STANDARD\r\nTZOFFSETFROM:-0200\r\nTZOFFSETTO:-0300\r\nTZNAME:-03\r\nDTSTART:19700215T000000\r\nRRULE:FREQ=YEARLY;BYMONTH=2;BYDAY=3SU\r\nEND:STANDARD\r\nEND:VTIMEZONE", "latitude": "-0233200", "longitude": "-0463700" }, @@ -1687,8 +1687,8 @@ }, "Asia/Macau": { "ics": "BEGIN:VTIMEZONE\r\nTZID:Asia/Macau\r\nBEGIN:STANDARD\r\nTZOFFSETFROM:+0800\r\nTZOFFSETTO:+0800\r\nTZNAME:CST\r\nDTSTART:19700101T000000\r\nEND:STANDARD\r\nEND:VTIMEZONE", - "latitude": "+0221400", - "longitude": "+1133500" + "latitude": "+0221150", + "longitude": "+1133230" }, "Asia/Magadan": { "ics": "BEGIN:VTIMEZONE\r\nTZID:Asia/Magadan\r\nBEGIN:STANDARD\r\nTZOFFSETFROM:+1100\r\nTZOFFSETTO:+1100\r\nTZNAME:+11\r\nDTSTART:19700101T000000\r\nEND:STANDARD\r\nEND:VTIMEZONE", @@ -1701,7 +1701,7 @@ "longitude": "+1192400" }, "Asia/Manila": { - "ics": "BEGIN:VTIMEZONE\r\nTZID:Asia/Manila\r\nBEGIN:STANDARD\r\nTZOFFSETFROM:+0800\r\nTZOFFSETTO:+0800\r\nTZNAME:+08\r\nDTSTART:19700101T000000\r\nEND:STANDARD\r\nEND:VTIMEZONE", + "ics": "BEGIN:VTIMEZONE\r\nTZID:Asia/Manila\r\nBEGIN:STANDARD\r\nTZOFFSETFROM:+0800\r\nTZOFFSETTO:+0800\r\nTZNAME:PST\r\nDTSTART:19700101T000000\r\nEND:STANDARD\r\nEND:VTIMEZONE", "latitude": "+0143500", "longitude": "+1210000" }, @@ -1755,8 +1755,13 @@ "latitude": "+0251700", "longitude": "+0513200" }, + "Asia/Qostanay": { + "ics": "BEGIN:VTIMEZONE\r\nTZID:Asia/Qostanay\r\nBEGIN:STANDARD\r\nTZOFFSETFROM:+0600\r\nTZOFFSETTO:+0600\r\nTZNAME:+06\r\nDTSTART:19700101T000000\r\nEND:STANDARD\r\nEND:VTIMEZONE", + "latitude": "+0531200", + "longitude": "+0633700" + }, "Asia/Qyzylorda": { - "ics": "BEGIN:VTIMEZONE\r\nTZID:Asia/Qyzylorda\r\nBEGIN:STANDARD\r\nTZOFFSETFROM:+0600\r\nTZOFFSETTO:+0600\r\nTZNAME:+06\r\nDTSTART:19700101T000000\r\nEND:STANDARD\r\nEND:VTIMEZONE", + "ics": "BEGIN:VTIMEZONE\r\nTZID:Asia/Qyzylorda\r\nBEGIN:STANDARD\r\nTZOFFSETFROM:+0500\r\nTZOFFSETTO:+0500\r\nTZNAME:+05\r\nDTSTART:19700101T000000\r\nEND:STANDARD\r\nEND:VTIMEZONE", "latitude": "+0444800", "longitude": "+0652800" }, @@ -1811,7 +1816,7 @@ "longitude": "+0444900" }, "Asia/Tehran": { - "ics": "BEGIN:VTIMEZONE\r\nTZID:Asia/Tehran\r\nBEGIN:DAYLIGHT\r\nTZOFFSETFROM:+0330\r\nTZOFFSETTO:+0430\r\nTZNAME:+0430\r\nDTSTART:19700321T000000\r\nRRULE:FREQ=YEARLY\r\nEND:DAYLIGHT\r\nBEGIN:STANDARD\r\nTZOFFSETFROM:+0430\r\nTZOFFSETTO:+0330\r\nTZNAME:+0330\r\nDTSTART:19700921T000000\r\nRRULE:FREQ=YEARLY\r\nEND:STANDARD\r\nEND:VTIMEZONE", + "ics": "BEGIN:VTIMEZONE\r\nTZID:Asia/Tehran\r\nBEGIN:STANDARD\r\nTZOFFSETFROM:+0330\r\nTZOFFSETTO:+0330\r\nTZNAME:+0330\r\nDTSTART:19700101T000000\r\nEND:STANDARD\r\nEND:VTIMEZONE", "latitude": "+0354000", "longitude": "+0512600" }, @@ -2266,7 +2271,7 @@ "longitude": "+0251900" }, "Europe/Volgograd": { - "ics": "BEGIN:VTIMEZONE\r\nTZID:Europe/Volgograd\r\nBEGIN:STANDARD\r\nTZOFFSETFROM:+0300\r\nTZOFFSETTO:+0300\r\nTZNAME:+03\r\nDTSTART:19700101T000000\r\nEND:STANDARD\r\nEND:VTIMEZONE", + "ics": "BEGIN:VTIMEZONE\r\nTZID:Europe/Volgograd\r\nBEGIN:STANDARD\r\nTZOFFSETFROM:+0400\r\nTZOFFSETTO:+0400\r\nTZNAME:+04\r\nDTSTART:19700101T000000\r\nEND:STANDARD\r\nEND:VTIMEZONE", "latitude": "+0484400", "longitude": "+0442500" }, @@ -2371,7 +2376,7 @@ "longitude": "+1514700" }, "Pacific/Easter": { - "ics": "BEGIN:VTIMEZONE\r\nTZID:Pacific/Easter\r\nBEGIN:STANDARD\r\nTZOFFSETFROM:-0500\r\nTZOFFSETTO:-0600\r\nTZNAME:-06\r\nDTSTART:19700509T220000\r\nRRULE:FREQ=YEARLY;BYMONTH=5;BYDAY=2SA\r\nEND:STANDARD\r\nBEGIN:DAYLIGHT\r\nTZOFFSETFROM:-0600\r\nTZOFFSETTO:-0500\r\nTZNAME:-05\r\nDTSTART:19700808T220000\r\nRRULE:FREQ=YEARLY;BYMONTH=8;BYDAY=2SA\r\nEND:DAYLIGHT\r\nEND:VTIMEZONE", + "ics": "BEGIN:VTIMEZONE\r\nTZID:Pacific/Easter\r\nBEGIN:STANDARD\r\nTZOFFSETFROM:-0500\r\nTZOFFSETTO:-0600\r\nTZNAME:-06\r\nDTSTART:19700404T220000\r\nRRULE:FREQ=YEARLY;BYMONTH=4;BYDAY=1SA\r\nEND:STANDARD\r\nBEGIN:DAYLIGHT\r\nTZOFFSETFROM:-0600\r\nTZOFFSETTO:-0500\r\nTZNAME:-05\r\nDTSTART:19700905T220000\r\nRRULE:FREQ=YEARLY;BYMONTH=9;BYDAY=1SA\r\nEND:DAYLIGHT\r\nEND:VTIMEZONE", "latitude": "-0270900", "longitude": "-1092600" }, @@ -2391,7 +2396,7 @@ "longitude": "-1711400" }, "Pacific/Fiji": { - "ics": "BEGIN:VTIMEZONE\r\nTZID:Pacific/Fiji\r\nBEGIN:DAYLIGHT\r\nTZOFFSETFROM:+1200\r\nTZOFFSETTO:+1300\r\nTZNAME:+13\r\nDTSTART:19701101T020000\r\nRRULE:FREQ=YEARLY;BYMONTH=11;BYDAY=1SU\r\nEND:DAYLIGHT\r\nBEGIN:STANDARD\r\nTZOFFSETFROM:+1300\r\nTZOFFSETTO:+1200\r\nTZNAME:+12\r\nDTSTART:19700118T030000\r\nRRULE:FREQ=YEARLY;BYMONTH=1;BYMONTHDAY=14,15,16,17,18,19,20;BYDAY=SU\r\nEND:STANDARD\r\nEND:VTIMEZONE", + "ics": "BEGIN:VTIMEZONE\r\nTZID:Pacific/Fiji\r\nBEGIN:DAYLIGHT\r\nTZOFFSETFROM:+1200\r\nTZOFFSETTO:+1300\r\nTZNAME:+13\r\nDTSTART:19701101T020000\r\nRRULE:FREQ=YEARLY;BYMONTH=11;BYDAY=1SU\r\nEND:DAYLIGHT\r\nBEGIN:STANDARD\r\nTZOFFSETFROM:+1300\r\nTZOFFSETTO:+1200\r\nTZNAME:+12\r\nDTSTART:19700118T030000\r\nRRULE:FREQ=YEARLY;BYMONTH=1;BYMONTHDAY=13,14,15,16,17,18,19;BYDAY=SU\r\nEND:STANDARD\r\nEND:VTIMEZONE", "latitude": "-0180800", "longitude": "+1782500" }, diff -Nru thunderbird-60.5.1+build2/comm/mail/base/content/msgHdrViewOverlay.js thunderbird-60.6.1+build2/comm/mail/base/content/msgHdrViewOverlay.js --- thunderbird-60.5.1+build2/comm/mail/base/content/msgHdrViewOverlay.js 2019-02-19 13:46:56.000000000 +0000 +++ thunderbird-60.6.1+build2/comm/mail/base/content/msgHdrViewOverlay.js 2019-03-25 09:18:30.000000000 +0000 @@ -1230,18 +1230,13 @@ if (!emailAddresses) return; - var addresses = {}; - var fullNames = {}; - var names = {}; - var numAddresses = 0; + // The email addresses are still RFC2047 encoded but libmime has already converted from + // "raw UTF-8" to "wide" (UTF-16) characters. + var addresses = MailServices.headerParser.parseEncodedHeaderW(emailAddresses); - numAddresses = MailServices.headerParser - .parseHeadersWithArray(emailAddresses, addresses, - names, fullNames); - var index = 0; if (headerEntry.useToggle) headerEntry.enclosingBox.resetAddressView(); // make sure we start clean - if (numAddresses == 0 && emailAddresses.includes(":")) { + if (addresses.length == 0 && emailAddresses.includes(":")) { // No addresses and a colon, so an empty group like "undisclosed-recipients: ;". // Add group name so at least something displays. let address = { displayName: emailAddresses }; @@ -1250,21 +1245,19 @@ else updateEmailAddressNode(headerEntry.enclosingBox.emailAddressNode, address); } - while (index < numAddresses) { + for (let addr of addresses) { // If we want to include short/long toggle views and we have a long view, // always add it. If we aren't including a short/long view OR if we are and // we haven't parsed enough addresses to reach the cutoff valve yet then add // it to the default (short) div. let address = {}; - address.emailAddress = addresses.value[index]; - address.fullAddress = fullNames.value[index]; - address.displayName = names.value[index]; + address.emailAddress = addr.email; + address.fullAddress = addr.toString(); + address.displayName = addr.name; if (headerEntry.useToggle) headerEntry.enclosingBox.addAddressView(address); else updateEmailAddressNode(headerEntry.enclosingBox.emailAddressNode, address); - - index++; } if (headerEntry.useToggle) diff -Nru thunderbird-60.5.1+build2/comm/mail/components/about-support/content/aboutSupport.js thunderbird-60.6.1+build2/comm/mail/components/about-support/content/aboutSupport.js --- thunderbird-60.5.1+build2/comm/mail/components/about-support/content/aboutSupport.js 2019-02-19 13:46:56.000000000 +0000 +++ thunderbird-60.6.1+build2/comm/mail/components/about-support/content/aboutSupport.js 2019-03-25 09:18:30.000000000 +0000 @@ -142,8 +142,11 @@ $("policies-status-row").hidden = true; } - let keyGoogleFound = data.keyGoogleFound ? "found" : "missing"; - $("key-google-box").textContent = strings.GetStringFromName(keyGoogleFound); + let keyLocationServiceGoogleFound = data.keyLocationServiceGoogleFound ? "found" : "missing"; + $("key-location-service-google-box").textContent = strings.GetStringFromName(keyLocationServiceGoogleFound); + + let keySafebrowsingGoogleFound = data.keySafebrowsingGoogleFound ? "found" : "missing"; + $("key-safebrowsing-google-box").textContent = strings.GetStringFromName(keySafebrowsingGoogleFound); let keyMozillaFound = data.keyMozillaFound ? "found" : "missing"; $("key-mozilla-box").textContent = strings.GetStringFromName(keyMozillaFound); diff -Nru thunderbird-60.5.1+build2/comm/mail/components/about-support/content/aboutSupport.xhtml thunderbird-60.6.1+build2/comm/mail/components/about-support/content/aboutSupport.xhtml --- thunderbird-60.5.1+build2/comm/mail/components/about-support/content/aboutSupport.xhtml 2019-02-19 13:46:56.000000000 +0000 +++ thunderbird-60.6.1+build2/comm/mail/components/about-support/content/aboutSupport.xhtml 2019-03-25 09:18:30.000000000 +0000 @@ -284,10 +284,19 @@ - &aboutSupport.appBasicsKeyGoogle; + Google Location Service Key - + + + + + + + Google SafeBrowsing Key + + + diff -Nru thunderbird-60.5.1+build2/comm/mail/components/accountcreation/content/util.js thunderbird-60.6.1+build2/comm/mail/components/accountcreation/content/util.js --- thunderbird-60.5.1+build2/comm/mail/components/accountcreation/content/util.js 2019-02-19 13:46:56.000000000 +0000 +++ thunderbird-60.6.1+build2/comm/mail/components/accountcreation/content/util.js 2019-03-25 09:18:30.000000000 +0000 @@ -404,7 +404,6 @@ ParallelAbortable.call(this); // call super constructor this.addOneFinishedObserver(finishedCall => { - let haveHigherPending = false; let haveHigherSuccess = false; for (let call of this._calls) { if (!call.finished) { @@ -415,9 +414,8 @@ } continue; } - // it's pending. ignore it for now and wait. - haveHigherPending = true; - continue; + // It's pending. do nothing and wait for it. + return; } if (!call.succeeded) { // it failed. ignore it. @@ -427,21 +425,18 @@ // another successful call was higher. ignore it. continue; } - haveHigherSuccess = true; - if (!haveHigherPending) { - // this is the winner - try { - successCallback(call.result, call); - } catch (e) { - console.error(e); - // if the handler failed with this data, treat this call as failed - call.e = e; - call.succeeded = false; - haveHigherSuccess = false; - } + // This is the winner. + try { + successCallback(call.result, call); + haveHigherSuccess = true; + } catch (e) { + console.error(e); + // If the handler failed with this data, treat this call as failed. + call.e = e; + call.succeeded = false; } } - if (!haveHigherPending && !haveHigherSuccess) { + if (!haveHigherSuccess) { // all failed errorCallback(this._calls[0].e, this._calls.map(call => call.e)); // see docs above } diff -Nru thunderbird-60.5.1+build2/comm/mail/components/addrbook/content/abCard.inc thunderbird-60.6.1+build2/comm/mail/components/addrbook/content/abCard.inc --- thunderbird-60.5.1+build2/comm/mail/components/addrbook/content/abCard.inc 2019-02-19 13:46:56.000000000 +0000 +++ thunderbird-60.6.1+build2/comm/mail/components/addrbook/content/abCard.inc 2019-03-25 09:18:30.000000000 +0000 @@ -40,7 +40,7 @@