Commit 2bfae5d8 authored by Carsten Schoenert's avatar Carsten Schoenert
Browse files

Merge tag 'debian/1%78.8.0-1' into debian/buster

thunderbird Debian release 1:78.8.0-1
parents 379c8987 4c2bc3fc
......@@ -3,9 +3,9 @@
# Please do not edit.
[source."https://github.com/shravanrn/nix/"]
branch = "r0.13.1"
git = "https://github.com/shravanrn/nix/"
replace-with = "vendored-sources"
rev = "4af6c367603869a30fddb5ffb0aba2b9477ba92e"
[source."https://github.com/mozilla/rkv"]
git = "https://github.com/mozilla/rkv"
......
......@@ -3200,7 +3200,7 @@ dependencies = [
[[package]]
name = "nix"
version = "0.13.1"
source = "git+https://github.com/shravanrn/nix/?branch=r0.13.1#4af6c367603869a30fddb5ffb0aba2b9477ba92e"
source = "git+https://github.com/shravanrn/nix/?rev=4af6c367603869a30fddb5ffb0aba2b9477ba92e#4af6c367603869a30fddb5ffb0aba2b9477ba92e"
dependencies = [
"bitflags",
"cc",
......
......@@ -68,8 +68,8 @@ panic = "abort"
libudev-sys = { path = "dom/webauthn/libudev-sys" }
packed_simd = { git = "https://github.com/hsivonen/packed_simd", rev="3541e3818fdc7c2a24f87e3459151a4ce955a67a" }
rlbox_lucet_sandbox = { git = "https://github.com/PLSysSec/rlbox_lucet_sandbox/", rev="d510da5999a744c563b0acd18056069d1698273f" }
nix = { git = "https://github.com/shravanrn/nix/", branch = "r0.13.1", rev="4af6c367603869a30fddb5ffb0aba2b9477ba92e" }
spirv_cross = { git = "https://github.com/kvark/spirv_cross", branch = "wgpu3", rev = "20191ad2f370afd6d247edcb9ff9da32d3bedb9c" }
nix = { git = "https://github.com/shravanrn/nix/", rev="4af6c367603869a30fddb5ffb0aba2b9477ba92e" }
spirv_cross = { git = "https://github.com/kvark/spirv_cross", branch = "wgpu3" }
# failure's backtrace feature might break our builds, see bug 1608157.
failure = { git = "https://github.com/badboy/failure", rev = "64af847bc5fdcb6d2438bec8a6030812a80519a5" }
failure_derive = { git = "https://github.com/badboy/failure", rev = "64af847bc5fdcb6d2438bec8a6030812a80519a5" }
......
......@@ -1444,6 +1444,7 @@ var Policies = {
onBeforeAddons(manager, param) {
const allowedPrefixes = [
"accessibility.",
"app.update.",
"browser.",
"datareporting.policy.",
"dom.",
......@@ -1472,9 +1473,14 @@ var Policies = {
"security.osclientcerts.autoload",
"security.ssl.errorReporting.enabled",
"security.tls.hello_downgrade_check",
"security.tls.version.enable-deprecated",
"security.warn_submit_secure_to_insecure",
];
const blockedPrefs = [];
const blockedPrefs = [
"app.update.channel",
"app.update.lastUpdateTime",
"app.update.migrated",
];
for (let preference in param) {
if (blockedPrefs.includes(preference)) {
......
......@@ -37,7 +37,7 @@ const SUMO_BASE_URL = Services.urlFormatter.formatURLPref(
"app.support.baseURL"
);
const ADDONS_API_URL =
"https://services.addons.mozilla.org/api/v3/addons/addon";
"https://services.addons.mozilla.org/api/v4/addons/addon";
const DELAY_BEFORE_EXPAND_MS = 1000;
const CATEGORY_ICONS = {
......
......@@ -6,12 +6,12 @@
"message": "eBay - Online auctions"
},
"searchUrl": {
"message": "https://rover.ebay.com/rover/1/5221-53469-19255-0/1"
"message": "https://www.ebay.at/sch/"
},
"searchForm": {
"message": "https://www.ebay.at/"
},
"searchUrlGetParams": {
"message": "ff3=4&toolid=20004&campid=5338192028&customid=&mpre=https://www.ebay.at/sch/{searchTerms}"
"message": "toolid=20004&campid=5338192028&mkevt=1&mkcid=1&mkrid=5221-53469-19255-0&kw={searchTerms}"
}
}
\ No newline at end of file
......@@ -6,12 +6,12 @@
"message": "eBay - Online auctions"
},
"searchUrl": {
"message": "https://rover.ebay.com/rover/1/705-53470-19255-0/1"
"message": "https://www.ebay.com.au/sch/"
},
"searchForm": {
"message": "https://www.ebay.com.au/"
},
"searchUrlGetParams": {
"message": "ff3=4&toolid=20004&campid=5338192028&customid=&mpre=https://www.ebay.com.au/sch/{searchTerms}"
"message": "toolid=20004&campid=5338192028&mkevt=1&mkcid=1&mkrid=705-53470-19255-0&kw={searchTerms}"
}
}
\ No newline at end of file
......@@ -6,12 +6,12 @@
"message": "eBay - Online auctions"
},
"searchUrl": {
"message": "https://rover.ebay.com/rover/1/1553-53471-19255-0/1"
"message": "https://www.befr.ebay.be/sch/"
},
"searchForm": {
"message": "https://www.befr.ebay.be/"
},
"searchUrlGetParams": {
"message": "ff3=4&toolid=20004&campid=5338192028&customid=&mpre=https://www.befr.ebay.be/sch/{searchTerms}"
"message": "toolid=20004&campid=5338192028&mkevt=1&mkcid=1&mkrid=1553-53471-19255-0&kw={searchTerms}"
}
}
......@@ -6,12 +6,12 @@
"message": "eBay - Online auctions"
},
"searchUrl": {
"message": "https://rover.ebay.com/rover/1/706-53473-19255-0/1"
"message": "https://ebay.ca/sch/"
},
"searchForm": {
"message": "https://www.ebay.ca/"
},
"searchUrlGetParams": {
"message": "ff3=4&toolid=20004&campid=5338192028&customid=&mpre=https://www.ebay.ca/sch/{searchTerms}"
"message": "toolid=20004&campid=5338192028&mkevt=1&mkcid=1&mkrid=706-53473-19255-0&kw={searchTerms}"
}
}
\ No newline at end of file
......@@ -6,12 +6,12 @@
"message": "eBay - Online auctions"
},
"searchUrl": {
"message": "https://rover.ebay.com/rover/1/5222-53480-19255-0/1"
"message": "https://www.ebay.ch/sch/"
},
"searchForm": {
"message": "https://www.ebay.ch/"
},
"searchUrlGetParams": {
"message": "ff3=4&toolid=20004&campid=5338192028&customid=&mpre=https://www.ebay.ch/sch/{searchTerms}"
"message": "toolid=20004&campid=5338192028&mkevt=1&mkcid=1&mkrid=5222-53480-19255-0&kw={searchTerms}"
}
}
\ No newline at end of file
......@@ -6,12 +6,12 @@
"message": "eBay - Online auctions"
},
"searchUrl": {
"message": "https://rover.ebay.com/rover/1/707-53477-19255-0/1"
"message": "https://ebay.de/sch/"
},
"searchForm": {
"message": "https://www.ebay.de/"
},
"searchUrlGetParams": {
"message": "ff3=4&toolid=20004&campid=5338192028&customid=&mpre=https://www.ebay.de/sch/{searchTerms}"
"message": "toolid=20004&campid=5338192028&mkevt=1&mkcid=1&mkrid=707-53477-19255-0&kw={searchTerms}"
}
}
\ No newline at end of file
......@@ -6,12 +6,12 @@
"message": "eBay - Online auctions"
},
"searchUrl": {
"message": "https://rover.ebay.com/rover/1/711-53200-19255-0/1"
"message": "https://www.ebay.com/sch/"
},
"searchForm": {
"message": "https://www.ebay.com/"
},
"searchUrlGetParams": {
"message": "ff3=4&toolid=20004&campid=5338192028&customid=&mpre=https://www.ebay.com/sch/{searchTerms}"
"message": "toolid=20004&campid=5338192028&mkevt=1&mkcid=1&mkrid=711-53200-19255-0&kw={searchTerms}"
}
}
\ No newline at end of file
......@@ -6,12 +6,12 @@
"message": "eBay - Online auctions"
},
"searchUrl": {
"message": "https://rover.ebay.com/rover/1/1185-53479-19255-0/1"
"message": "https://www.ebay.es/sch/"
},
"searchForm": {
"message": "https://www.ebay.es/"
},
"searchUrlGetParams": {
"message": "ff3=4&toolid=20004&campid=5338192028&customid=&mpre=https://www.ebay.es/sch/{searchTerms}"
"message": "toolid=20004&campid=5338192028&mkevt=1&mkcid=1&mkrid=1185-53479-19255-0&kw={searchTerms}"
}
}
\ No newline at end of file
......@@ -6,12 +6,12 @@
"message": "eBay - Online auctions"
},
"searchUrl": {
"message": "https://rover.ebay.com/rover/1/709-53476-19255-0/1"
"message": "https://www.ebay.fr/sch/"
},
"searchForm": {
"message": "https://www.ebay.fr/"
},
"searchUrlGetParams": {
"message": "ff3=4&toolid=20004&campid=5338192028&customid=&mpre=https://www.ebay.fr/sch/{searchTerms}"
"message": "toolid=20004&campid=5338192028&mkevt=1&mkcid=1&mkrid=709-53476-19255-0&kw={searchTerms}"
}
}
\ No newline at end of file
......@@ -6,12 +6,12 @@
"message": "eBay - Online auctions"
},
"searchUrl": {
"message": "https://rover.ebay.com/rover/1/5282-53468-19255-0/1"
"message": "https://www.ebay.ie/sch/"
},
"searchForm": {
"message": "https://www.ebay.ie/"
},
"searchUrlGetParams": {
"message": "ff3=4&toolid=20004&campid=5338192028&customid=&mpre=https://www.ebay.ie/sch/{searchTerms}"
"message": "toolid=20004&campid=5338192028&mkevt=1&mkcid=1&mkrid=5282-53468-19255-0&kw={searchTerms}"
}
}
\ No newline at end of file
......@@ -6,12 +6,12 @@
"message": "eBay - Online auctions"
},
"searchUrl": {
"message": "https://rover.ebay.com/rover/1/724-53478-19255-0/1"
"message": "https://www.ebay.it/sch/"
},
"searchForm": {
"message": "https://www.ebay.it/"
},
"searchUrlGetParams": {
"message": "ff3=4&toolid=20004&campid=5338192028&customid=&mpre=https://www.ebay.it/sch/{searchTerms}"
"message": "toolid=20004&campid=5338192028&mkevt=1&mkcid=1&mkrid=724-53478-19255-0&kw={searchTerms}"
}
}
\ No newline at end of file
......@@ -6,12 +6,12 @@
"message": "eBay - Online auctions"
},
"searchUrl": {
"message": "https://rover.ebay.com/rover/1/1346-53482-19255-0/1"
"message": "https://www.ebay.nl/sch/"
},
"searchForm": {
"message": "https://www.ebay.nl/"
},
"searchUrlGetParams": {
"message": "ff3=4&toolid=20004&campid=5338192028&customid=&mpre=https://www.ebay.nl/sch/{searchTerms}"
"message": "toolid=20004&campid=5338192028&mkevt=1&mkcid=1&mkrid=1346-53482-19255-0&kw={searchTerms}"
}
}
\ No newline at end of file
......@@ -6,12 +6,12 @@
"message": "eBay - Online auctions"
},
"searchUrl": {
"message": "https://rover.ebay.com/rover/1/710-53481-19255-0/1"
"message": "https://www.ebay.co.uk/sch/"
},
"searchForm": {
"message": "https://www.ebay.co.uk/"
},
"searchUrlGetParams": {
"message": "ff3=4&toolid=20004&campid=5338192028&customid=&mpre=https://www.ebay.co.uk/sch/{searchTerms}"
"message": "toolid=20004&campid=5338192028&mkevt=1&mkcid=1&mkrid=710-53481-19255-0&kw={searchTerms}"
}
}
\ No newline at end of file
......@@ -2,7 +2,7 @@
"name": "__MSG_extensionName__",
"description": "__MSG_extensionDescription__",
"manifest_version": 2,
"version": "1.0",
"version": "1.1",
"applications": {
"gecko": {
"id": "ebay@search.mozilla.org"
......
......@@ -14,7 +14,7 @@ add_task(async function test() {
ok(engine, "eBay");
let base =
"https://rover.ebay.com/rover/1/711-53200-19255-0/1?ff3=4&toolid=20004&campid=5338192028&customid=&mpre=https://www.ebay.com/sch/foo";
"https://www.ebay.com/sch/?toolid=20004&campid=5338192028&mkevt=1&mkcid=1&mkrid=711-53200-19255-0&kw=foo";
let url;
// Test search URLs (including purposes).
......@@ -33,13 +33,8 @@ add_task(async function test() {
{
type: "text/html",
method: "GET",
template: "https://rover.ebay.com/rover/1/711-53200-19255-0/1",
template: "https://www.ebay.com/sch/",
params: [
{
name: "ff3",
value: "4",
purpose: undefined,
},
{
name: "toolid",
value: "20004",
......@@ -51,13 +46,23 @@ add_task(async function test() {
purpose: undefined,
},
{
name: "customid",
value: "",
name: "mkevt",
value: "1",
purpose: undefined,
},
{
name: "mkcid",
value: "1",
purpose: undefined,
},
{
name: "mkrid",
value: "711-53200-19255-0",
purpose: undefined,
},
{
name: "mpre",
value: "https://www.ebay.com/sch/{searchTerms}",
name: "kw",
value: "{searchTerms}",
purpose: undefined,
},
],
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment