libre/mozilla-searchplugins: updated for new format used in icecat-78 and probably iceweasel

22 files changed, 207 insertions, 123 deletions

diff --git a/libre/mozilla-searchplugins/PKGBUILD b/libre/mozilla-searchplugins/PKGBUILD
index d23637e33..ae4a50b12 100644
--- a/libre/mozilla-searchplugins/PKGBUILD
+++ b/libre/mozilla-searchplugins/PKGBUILD
@@ -6,41 +6,43 @@
 # Contributor: vando <facundo@esdebian.org>
 # Thank you very much to the older contributors:
 # Contributor: evr <evanroman at gmail>
-# Contributor: Muhammad 'MJ' Jassim <UnbreakableMJ@gmail.com> 
+# Contributor: Muhammad 'MJ' Jassim <UnbreakableMJ@gmail.com>
 
 pkgname=mozilla-searchplugins
-pkgver=1.10
-pkgrel=1.1
+pkgver=2
+pkgrel=3
 pkgdesc="System-wide OpenSearch plugins common for Mozilla based browsers."
 arch=('any')
 license=('MPL' 'GPL' 'LGPL')
 url="https://www.parabola.nu/"
 source=(
-  list.txt
-  searx.xml
-  duckduckgo-html.xml
-  duckduckgo-lite.xml
-  seeks.xml::https://seeks.ru/opensearch.xml
-  internet-archive.xml
-  parabola-packages.xml::https://www.parabola.nu/opensearch/packages/
-  parabola-wiki-en.xml
-  yacy.xml
-  wikipedia-en.xml::https://en.wikipedia.org/w/opensearch_desc.php
-)
+  searx.json searx.ico
+  duckduckgo-html.json duckduckgo-html.ico
+  duckduckgo-lite.json duckduckgo-lite.ico
+  internet-archive.json internet-archive.ico
+  parabola-packages.json parabola-packages.ico
+  parabola-wiki.json parabola-wiki.ico
+  yacy.json yacy.ico)
 
 package() {
-  install -m755 -d                   "${pkgdir}/usr/lib/mozilla/searchplugins"
-  install -m644 "${srcdir}"/*.xml    "${pkgdir}/usr/lib/mozilla/searchplugins"
-  install -m644 "${srcdir}"/list.txt "${pkgdir}/usr/lib/mozilla/searchplugins"
+  for d in searx duckduckgo-{html,lite} internet-archive parabola-{packages,wiki} yacy; do
+    install -m755 -d                 "$pkgdir/usr/share/mozilla/searchplugins/$d"
+    install -m644 "$srcdir/$d.json"  "$pkgdir/usr/share/mozilla/searchplugins/$d/manifest.json"
+    install -m644 "$srcdir/$d.ico"   "$pkgdir/usr/share/mozilla/searchplugins/$d/favicon.ico"
+  done
 }
 
-sha256sums=('f05c7f1505a2511ccb5a58174ed52605238431ae880e526176393fe72b73ffb9'
-            '3e95dff7d062889c86531aa80962b80e3c0d6c87244ec838963b313193c3f367'
-            'cd8e9eb45567cb362acf607e65fcabfaf682f0051a251aa6a616ca25cd77106e'
-            '1cd8dc8d1275a4e1fa10187997a0558f578c21a91e97c48222448e485de35d6a'
-            'c97928bf25bff6c11d3cdb8f0df68b04c743a8fb3c8c51511e9179754d7fb231'
-            'ec4a1054f4b9cca9cf410b3302fa86e2322a8dfdfe560b5dbbabba7d0bdd3197'
-            '2480ca917a10d0955b818498171ecff6b86faf2eeae25684dd617ec4da40d585'
-            '5e249e946193da91c95ade7f60fe227c28b99ecf40aba717b77d004ac9080905'
-            '11aefd859c970b1bfce755b32177e5f608d39a0cad0b3d3b0b47f49437f35225'
-            '44d8d849806e21a8e32489ade3e8191c4b4b23b416632beb258dea2484ed4ea3')
+sha256sums=('2c1323676dd6633a3a813e3d29f899a234df385990e8e31a224c184f0171caad'
+            '57940b86f10b3c2e341fbaf5ddd7707e2b5ae418ccd17f9976f02f321895a1cd'
+            'b8078c5c61df0851aad5ae9e418a1ff2cf8e359bf86e648078d39413b09ce46c'
+            '3ec69a44bd0df1b1e6da6a2a7ec8a5aa53cfc6a3149841c52aeefeb61f5ba923'
+            '94cb076c272e34b5772e6df4f5df1ff8f4cc5f13d556b5d9cf73d0d981b66782'
+            '3ec69a44bd0df1b1e6da6a2a7ec8a5aa53cfc6a3149841c52aeefeb61f5ba923'
+            '0d42fbe6dc41ed00b7b7295539f530412954633ad3d50b3744d0e91fd684b1c1'
+            'abac83a6e6813515818512cbe6b8714820e43471ac10dd997023dab93cd6aeca'
+            'd549273e31e51399e32b4f39b46e7c019384c9cab214c49c1f290f51c5d1e56b'
+            '96a64ce3e91e88a6b890edf752df08246a51284e6250d53276fa3e0bbab2f667'
+            '5b4e493fb0a80e7e414bda1b37b7d3a1d14cf59b72ce1aa4984812f39184dc2d'
+            '735b8ef017b33b8017af0ee3253fe78f523ccf3144b1f1deaee17a4f6cb0bde4'
+            '519864cf9e828e97400ab4ccc165c1115f12c567865dc1b008d857af73a1cfa4'
+            '6236c83242b32ff1f9ad38eaab32617216228474818419413d3535b4dfaa4729')
diff --git a/libre/mozilla-searchplugins/duckduckgo-html.ico b/libre/mozilla-searchplugins/duckduckgo-html.ico
new file mode 100644
index 000000000..560000b03
--- /dev/null
+++ b/libre/mozilla-searchplugins/duckduckgo-html.ico
diff --git a/libre/mozilla-searchplugins/duckduckgo-html.json b/libre/mozilla-searchplugins/duckduckgo-html.json
new file mode 100644
index 000000000..b08efc778
--- /dev/null
+++ b/libre/mozilla-searchplugins/duckduckgo-html.json
@@ -0,0 +1,26 @@
+{
+  "name": "DuckDuckGo HTML",
+  "description": "Search DuckDuckGo HTML",
+  "manifest_version": 2,
+  "version": "1.0",
+  "applications": {
+    "gecko": {
+      "id": "duckduckgo-html@search.mozilla.org"
+    }
+  },
+  "hidden": true,
+  "icons": {
+    "16": "favicon.ico"
+  },
+  "web_accessible_resources": [
+    "favicon.ico"
+  ],
+  "chrome_settings_overrides": {
+    "search_provider": {
+      "name": "DuckDuckGo HTML",
+      "search_url": "https://html.duckduckgo.com/html/",
+      "search_url_post_params": "q={searchTerms}&kae=b&kp=-1&kaj=m",
+      "suggest_url": "https://ac.duckduckgo.com/ac/?q={searchTerms}&type=list"
+    }
+  }
+}
diff --git a/libre/mozilla-searchplugins/duckduckgo-html.xml b/libre/mozilla-searchplugins/duckduckgo-html.xml
deleted file mode 100644
index b58eca813..000000000
--- a/libre/mozilla-searchplugins/duckduckgo-html.xml
+++ /dev/null
@@ -1,10 +0,0 @@
-<SearchPlugin xmlns="http://www.mozilla.org/2006/browser/search/" xmlns:os="http://a9.com/-/spec/opensearch/1.1/">
-<os:ShortName>DuckDuckGo HTML</os:ShortName>
-<os:Description>Search DuckDuckGo HTML</os:Description>
-<os:InputEncoding>UTF-8</os:InputEncoding>
-<os:Image width="16" height="16">data:image/x-icon;base64,iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAMAAAAoLQ9TAAAABGdBTUEAALGPC/xhBQAAACBjSFJNAAB6JgAAgIQAAPoAAACA6AAAdTAAAOpgAAA6mAAAF3CculE8AAAB8lBMVEUAAADkRQzjPwPjQQXkRQ3iPwTiQQXgPQPeQgrcOwPVNgDVNQDWOgbTMwDRMgDQMwDSMwDRNwTQLgDRJgDSJwDSLgDSNwTjOgDiOADjOQDkPADhQAXzs5v+/fv////0vKbiRQvgPQHpdUr85NzuknPdKgDcIwDnZzj2w7HqeU/gPQLsimb/+PftjWn97Obpb0LdJQDeLQDtjmvsi2jgSBDnbULgOQD/39HgLQDeMgDpeFLgSBH0v670uqbaJQD2qImWvP/G1Ob5+/3u//+fvvXyp47dMwDaLwD0u6v0v6/aNQDiXi/aKQD3qozU7/8gSY2vvtg0ZK/OqLDaKQHYKgLgWTfaNADZMgDZMADZLADzqpD7//+xwdz//9H/5Bn/7Bn//ADofADYMADYMQDZOgPXLgDiZDj//97/0AD3tQDvlgHZOgbXLATXMADWMgDfXjLVLQD///z+0AD/3Rn/yRnwnQDcVjbVMQDyv67wuKTSJwDRHQD+8O/tg3/iQQDwhAHnawHWMADvtKfyva7XQxHga0bQGQD2vbH/u8LXIQCmPQzja07XQxLliGn99fPkcVHvhnGZ5VguvUU5wktBwCcAgxzydVv/8/XmiGngdlL+ysi3+I8LtCE80V6P3YmX4sDleljSNQLzr6D7sKPXNQTSIwAEAbMrAAAAF3RSTlMARqSkRvPz80PTpKRG3fPe3hio9/eoGP50jNsAAAABYktHRB5yCiArAAAAyElEQVQYGQXBvUqCYRiA4fu2V9Tn+UQddI3aCpxaOoU6iU4gcqqpoYbALXBuCuoYmttamqJDiEoh4YP+MOi6BNCh+uYKEGiOVNCXXxA2XDVV/UyfKbRCXTLQWAxbP2vt8Ue/uYDvfim91615sb2um6rqtrr/NFb1cUf1Ybd06areU6lSlYpK79jzK1SyJOkfhOl8JGEcqV5zoKrTRqO6yUzIzNu46ijdM1VV9bhuUJ/nZURExLRzUiPQm3kKXHi4BAEGOmOi78A/L1QoU/VHoTsAAAAldEVYdGRhdGU6Y3JlYXRlADIwMTQtMDEtMTlUMjA6MDE6MTEtMDU6MDAuET6cAAAAJXRFWHRkYXRlOm1vZGlmeQAyMDE0LTAxLTE5VDIwOjAxOjExLTA1OjAwX0yGIAAAAABJRU5ErkJggg==</os:Image>
-<os:Url type="text/html" method="POST" template="https://duckduckgo.com/html/">
-  <os:Param name="q" value="{searchTerms}"/>
-</os:Url><os:Url type="application/x-suggestions+json" method="GET" template="https://duckduckgo.com/ac/?q={searchTerms}&amp;type=list">
-</os:Url>
-</SearchPlugin>
diff --git a/libre/mozilla-searchplugins/duckduckgo-lite.ico b/libre/mozilla-searchplugins/duckduckgo-lite.ico
new file mode 100644
index 000000000..560000b03
--- /dev/null
+++ b/libre/mozilla-searchplugins/duckduckgo-lite.ico
diff --git a/libre/mozilla-searchplugins/duckduckgo-lite.json b/libre/mozilla-searchplugins/duckduckgo-lite.json
new file mode 100644
index 000000000..376e5ec71
--- /dev/null
+++ b/libre/mozilla-searchplugins/duckduckgo-lite.json
@@ -0,0 +1,26 @@
+{
+  "name": "DuckDuckGo Lite",
+  "description": "Search DuckDuckGo Lite",
+  "manifest_version": 2,
+  "version": "1.0",
+  "applications": {
+    "gecko": {
+      "id": "duckduckgo-lite@search.mozilla.org"
+    }
+  },
+  "hidden": true,
+  "icons": {
+    "16": "favicon.ico"
+  },
+  "web_accessible_resources": [
+    "favicon.ico"
+  ],
+  "chrome_settings_overrides": {
+    "search_provider": {
+      "name": "DuckDuckGo Lite",
+      "search_url": "https://lite.duckduckgo.com/lite/",
+      "search_url_post_params": "q={searchTerms}&kae=b&kp=-1&kaj=m",
+      "suggest_url": "https://ac.duckduckgo.com/ac/?q={searchTerms}&type=list"
+    }
+  }
+}
diff --git a/libre/mozilla-searchplugins/duckduckgo-lite.xml b/libre/mozilla-searchplugins/duckduckgo-lite.xml
deleted file mode 100644
index 70cb71f2b..000000000
--- a/libre/mozilla-searchplugins/duckduckgo-lite.xml
+++ /dev/null
@@ -1,10 +0,0 @@
-<SearchPlugin xmlns="http://www.mozilla.org/2006/browser/search/" xmlns:os="http://a9.com/-/spec/opensearch/1.1/">
-<os:ShortName>DuckDuckGo Lite</os:ShortName>
-<os:Description>Search DuckDuckGo Lite</os:Description>
-<os:InputEncoding>UTF-8</os:InputEncoding>
-<os:Image width="16" height="16">data:image/x-icon;base64,iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAMAAAAoLQ9TAAAABGdBTUEAALGPC/xhBQAAACBjSFJNAAB6JgAAgIQAAPoAAACA6AAAdTAAAOpgAAA6mAAAF3CculE8AAAB8lBMVEUAAADkRQzjPwPjQQXkRQ3iPwTiQQXgPQPeQgrcOwPVNgDVNQDWOgbTMwDRMgDQMwDSMwDRNwTQLgDRJgDSJwDSLgDSNwTjOgDiOADjOQDkPADhQAXzs5v+/fv////0vKbiRQvgPQHpdUr85NzuknPdKgDcIwDnZzj2w7HqeU/gPQLsimb/+PftjWn97Obpb0LdJQDeLQDtjmvsi2jgSBDnbULgOQD/39HgLQDeMgDpeFLgSBH0v670uqbaJQD2qImWvP/G1Ob5+/3u//+fvvXyp47dMwDaLwD0u6v0v6/aNQDiXi/aKQD3qozU7/8gSY2vvtg0ZK/OqLDaKQHYKgLgWTfaNADZMgDZMADZLADzqpD7//+xwdz//9H/5Bn/7Bn//ADofADYMADYMQDZOgPXLgDiZDj//97/0AD3tQDvlgHZOgbXLATXMADWMgDfXjLVLQD///z+0AD/3Rn/yRnwnQDcVjbVMQDyv67wuKTSJwDRHQD+8O/tg3/iQQDwhAHnawHWMADvtKfyva7XQxHga0bQGQD2vbH/u8LXIQCmPQzja07XQxLliGn99fPkcVHvhnGZ5VguvUU5wktBwCcAgxzydVv/8/XmiGngdlL+ysi3+I8LtCE80V6P3YmX4sDleljSNQLzr6D7sKPXNQTSIwAEAbMrAAAAF3RSTlMARqSkRvPz80PTpKRG3fPe3hio9/eoGP50jNsAAAABYktHRB5yCiArAAAAyElEQVQYGQXBvUqCYRiA4fu2V9Tn+UQddI3aCpxaOoU6iU4gcqqpoYbALXBuCuoYmttamqJDiEoh4YP+MOi6BNCh+uYKEGiOVNCXXxA2XDVV/UyfKbRCXTLQWAxbP2vt8Ue/uYDvfim91615sb2um6rqtrr/NFb1cUf1Ybd06areU6lSlYpK79jzK1SyJOkfhOl8JGEcqV5zoKrTRqO6yUzIzNu46ijdM1VV9bhuUJ/nZURExLRzUiPQm3kKXHi4BAEGOmOi78A/L1QoU/VHoTsAAAAldEVYdGRhdGU6Y3JlYXRlADIwMTQtMDEtMTlUMjA6MDE6MTEtMDU6MDAuET6cAAAAJXRFWHRkYXRlOm1vZGlmeQAyMDE0LTAxLTE5VDIwOjAxOjExLTA1OjAwX0yGIAAAAABJRU5ErkJggg==</os:Image>
-<os:Url type="text/html" method="POST" template="https://duckduckgo.com/lite/">
-  <os:Param name="q" value="{searchTerms}"/>
-</os:Url><os:Url type="application/x-suggestions+json" method="GET" template="https://duckduckgo.com/ac/?q={searchTerms}&amp;type=list">
-</os:Url>
-</SearchPlugin>
diff --git a/libre/mozilla-searchplugins/internet-archive.ico b/libre/mozilla-searchplugins/internet-archive.ico
new file mode 100644
index 000000000..363e30d65
--- /dev/null
+++ b/libre/mozilla-searchplugins/internet-archive.ico
diff --git a/libre/mozilla-searchplugins/internet-archive.json b/libre/mozilla-searchplugins/internet-archive.json
new file mode 100644
index 000000000..cbcfe076e
--- /dev/null
+++ b/libre/mozilla-searchplugins/internet-archive.json
@@ -0,0 +1,24 @@
+{
+  "name": "Internet Archive",
+  "description": "Search archive.org",
+  "manifest_version": 2,
+  "version": "1.0",
+  "applications": {
+    "gecko": {
+      "id": "internet-archive@search.mozilla.org"
+    }
+  },
+  "hidden": true,
+  "icons": {
+    "16": "favicon.ico"
+  },
+  "web_accessible_resources": [
+    "favicon.ico"
+  ],
+  "chrome_settings_overrides": {
+    "search_provider": {
+      "name": "Internet Archive",
+      "search_url": "https://www.archive.org/search.php?sourceid=Mozilla-search&query={searchTerms}&sort=-/additional/item/downloads"
+    }
+  }
+}
diff --git a/libre/mozilla-searchplugins/internet-archive.xml b/libre/mozilla-searchplugins/internet-archive.xml
deleted file mode 100644
index 1556a2d8c..000000000
--- a/libre/mozilla-searchplugins/internet-archive.xml
+++ /dev/null
@@ -1,12 +0,0 @@
-<SearchPlugin xmlns="http://www.mozilla.org/2006/browser/search/" xmlns:os="http://a9.com/-/spec/opensearch/1.1/">
-<os:ShortName>Internet Archive</os:ShortName>
-<os:Description>Search www.archive.org</os:Description>
-<os:InputEncoding>ISO-8859-1</os:InputEncoding>
-<os:Image width="16" height="16">data:image/x-icon;base64,R0lGODlhEAAQAPf0ABQAABMTERQTEhcXFxUYFRscGCwWEzYQDSAkHiAhICEiISQkIiUmJScnJSkpKSsrKi8vLDcvKjM0LzE1Mjc3NjU6Nj44NTw9OT0+Pj4/PD9CQUYdF00lJEE0KkQ9N0Y9NFItLFUvL1wzLFc/PV01MGE8PWU/OWk5NGo7OkBAP0RFREVJRURJRkVLR0ZIRkdJSUZLSEhMS0pPTFZOSllDQlZXVWFJRWVKQWRLRGtPRG9KSWxQRWxRRmhQTHJCQnFDRHVEQHZFQHpLS3hKTHlNSn5PSn5PTXxOUHRWTXBeU29jXXtgWHxjXn1mZIBQS4BQUIJZUoBZWIVeXYhfW4ZsX41jXYlrXoxuX4RuYoppYotza5NlZ5Zua5J4bpt5ZpaDeaKBb42MiY6MiY6NiY+QjJGIhZGKhZiLgp+IgJGRjJOSjZKSj5SWjpSTkJWVkJWUkpaUkZaVkquLgKmMgayPgK6Sh6mWj6ycj7GQgbKSgLWSgrqXi7maj7Sck7Smn72ilK+so6ytqbanobKppLysoLytor6uprqxqr2wqr+zrL23tMOklsCroMKvpcWqoMSsocStocSupcS1qce2rMa6r8m1rsO8ssa4sM65sty5q9C6sc3DttbEvdbKv9nFt9rHvODAsuDIuuHLvufKvurNvNDLwtDPy9nLwN3Oxt3Xz+TMwODQxuPTxuXRxefRxuHWzO3Ux+/WxunXy+vWyO3XzujYyuzYy+7bz+HZ0eHZ1eLc0uXc0+bc2Ore0u7c0O/f0vHf1eTg2+/h1O/h1u/j2u/m2vDh0/Hg1vDi1fHi1fPh1fPh1/bg1vLq3fXr3/ng1vjl2fnk2fTr5fTs4vHu6Pfw5vb07vnz5vvy5/zy5vry6Pv06vj17/7y6v/17fz47/757v/57v/38Pr58/358f358//68P778v/68/z89v/99f/+9f//9P7+9///9/z8+f//+P//+/7+/v///v///wAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAACH5BAAAAAAALAAAAAAQABAAAAj+ALeUoDHjAosYKlKsaAHjhYsMgYaAAGABggwNDgbUqMAAgwIKa47oMBChwIQHAQRIQEAgQYMFYX6EGFEmDZk2ceCoYePmjZgxpnxEaSKPntGjR+fRi/dESo9y3MYFy8ULl65Sit6loyaEgw14qQANQuTn0pkPHsxYa2eEC5Nu0ywlMmSn0Z0OSg6RW4fiAA512nahqoQGkqckgqShO+ekypJw2F6titTlTywsnLxtY3diww135k59cjRnESkqmMR9YwdEBI9imwoxqiMHTx4rmohVAxdExI5Wkgg94rNHj5crWr5QulYESo5bxmqJGgUqExg6fSZ1akaEBBJXvlgfybI1C1YoVbSA9XI2xUSWZ9B+IROWTFk0ZsuODcsWEAA7</os:Image>
-<UpdateInterval>7</UpdateInterval>
-<UpdateUrl>http://mycroft.mozdev.org/update.php/id0/archive.src</UpdateUrl>
-<IconUpdateUrl>http://mycroft.mozdev.org/update.php/id0/archive.gif</IconUpdateUrl>
-<SearchForm>http://www.archive.org/</SearchForm>
-<os:Url type="text/html" method="GET" template="http://www.archive.org/search.php?sourceid=Mozilla-search&amp;query={searchTerms}&amp;sort=-%2Fadditional%2Fitem%2Fdownloads">
-</os:Url>
-</SearchPlugin>
\ No newline at end of file
diff --git a/libre/mozilla-searchplugins/list.txt b/libre/mozilla-searchplugins/list.txt
deleted file mode 100644
index 030fb86a9..000000000
--- a/libre/mozilla-searchplugins/list.txt
+++ /dev/null
@@ -1,9 +0,0 @@
-duckduckgo-html
-duckduckgo-lite
-internet-archive
-parabola-packages
-parabola-wiki-en
-searx
-seeks
-wikipedia-en
-yacy
diff --git a/libre/mozilla-searchplugins/parabola-packages.ico b/libre/mozilla-searchplugins/parabola-packages.ico
new file mode 100644
index 000000000..422bc35b3
--- /dev/null
+++ b/libre/mozilla-searchplugins/parabola-packages.ico
diff --git a/libre/mozilla-searchplugins/parabola-packages.json b/libre/mozilla-searchplugins/parabola-packages.json
new file mode 100644
index 000000000..0b1409114
--- /dev/null
+++ b/libre/mozilla-searchplugins/parabola-packages.json
@@ -0,0 +1,25 @@
+{
+  "name": "Parabola Packages",
+  "description": "Parabola GNU/Linux-libre Package Repository Search",
+  "manifest_version": 2,
+  "version": "1.0",
+  "applications": {
+    "gecko": {
+      "id": "parabola-packages@search.mozilla.org"
+    }
+  },
+  "hidden": true,
+  "icons": {
+    "16": "favicon.ico"
+  },
+  "web_accessible_resources": [
+    "favicon.ico"
+  ],
+  "chrome_settings_overrides": {
+    "search_provider": {
+      "name": "Parabola Packages",
+      "search_url": "https://parabola.nu/packages/?q={searchTerms}",
+      "suggest_url": "https://www.parabola.nu/opensearch/packages/suggest?q={searchTerms}"
+    }
+  }
+}
diff --git a/libre/mozilla-searchplugins/parabola-wiki-en.xml b/libre/mozilla-searchplugins/parabola-wiki-en.xml
deleted file mode 100644
index a62cc5f85..000000000
--- a/libre/mozilla-searchplugins/parabola-wiki-en.xml
+++ /dev/null
@@ -1,10 +0,0 @@
-<SearchPlugin xmlns="http://www.mozilla.org/2006/browser/search/" xmlns:os="http://a9.com/-/spec/opensearch/1.1/">
-<os:ShortName>ParabolaWiki (en)</os:ShortName>
-<os:Description>ParabolaWiki (en)</os:Description>
-<os:InputEncoding>UTF-8</os:InputEncoding>
-<os:Image width="16" height="16">data:image/x-icon;base64,AAABAAEAEBAAAAEAIABoBAAAFgAAACgAAAAQAAAAIAAAAAEAIAAAAAAAAAQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAqnt7GwAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAKx8eVCsgHkoAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAACidHQLq314xp+AgAgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAKt9eKOsfXiZAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAACrfHhGq314/6p+eFcAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAqlVVA6t9eOarfXjxqHx1IwAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAACrfXetq314/6t9eMyqgIAGAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAq3x4pKt9eP+rfXj/qn55YwAAAACqcXEJAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAKt+ecurfXj/q314/6t9eNQAAAAAqoCADKt+ekOsfnllqn13LQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAKp3dw+rfXjxq314/6t9eP+rfXj/rH53RwAAAAAAAAAAqnFxCap8d2+rfXjCrX56Qax9eGKsfHUlrXp6Gap9d3j/AAABq3t3Oqt9ePOrfXj/q314/6t9eLkAAAAAAAAAAAAAAAAAAAAAqoCABqp9d1qqfHhCq314zqqAeCSrfHh9q314lwAAAACte3c+q3149at9eP+rfXjoAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAKh8dimrfniIqnl5Fat+eIKsfniQAAAAAKp8eEKrfXj2qn14ygAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAqn14bKp8eEIAAAAAqnx4Qq2AeCIAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA//8AAP//AAD//wAA/98AAP/PAAD/7wAA/+cAAP/jAAD/4wAA/+EAAP/hAAD38AAA/tgAAP9MAAD//wAA//8AAA==</os:Image>
-<SearchForm>https://wiki.parabola.nu/Special:Search</SearchForm>
-<os:Url type="text/html" method="GET" template="https://wiki.parabola.nu/index.php?title=Special:Search&amp;search={searchTerms}" resultDomain="wiki.parabola.nu">
-</os:Url><os:Url type="application/x-suggestions+json" method="GET" template="https://wiki.parabola.nu/api.php?action=opensearch&amp;search={searchTerms}&amp;namespace=0" resultDomain="wiki.parabola.nu">
-</os:Url>
-</SearchPlugin>
diff --git a/libre/mozilla-searchplugins/parabola-wiki.ico b/libre/mozilla-searchplugins/parabola-wiki.ico
new file mode 100644
index 000000000..c67bbd61e
--- /dev/null
+++ b/libre/mozilla-searchplugins/parabola-wiki.ico
diff --git a/libre/mozilla-searchplugins/parabola-wiki.json b/libre/mozilla-searchplugins/parabola-wiki.json
new file mode 100644
index 000000000..0a6230d32
--- /dev/null
+++ b/libre/mozilla-searchplugins/parabola-wiki.json
@@ -0,0 +1,26 @@
+{
+  "name": "Parabola Wiki",
+  "description": "Search Parabola Wiki",
+  "manifest_version": 2,
+  "version": "1.0",
+  "applications": {
+    "gecko": {
+      "id": "parabola-wiki@search.mozilla.org"
+    }
+  },
+  "hidden": true,
+  "icons": {
+    "16": "favicon.ico"
+  },
+  "web_accessible_resources": [
+    "favicon.ico"
+  ],
+  "chrome_settings_overrides": {
+    "search_provider": {
+      "name": "Parabola Wiki",
+      "search_url": "https://wiki.parabola.nu/index.php",
+      "search_url_post_params": "title=Special:Search&search={searchTerms}",
+      "suggest_url": "https://wiki.parabola.nu/api.php?action=opensearch&search={searchTerms}&namespace=0"
+    }
+  }
+}
diff --git a/libre/mozilla-searchplugins/searx.ico b/libre/mozilla-searchplugins/searx.ico
new file mode 100644
index 000000000..6b76958ff
--- /dev/null
+++ b/libre/mozilla-searchplugins/searx.ico
diff --git a/libre/mozilla-searchplugins/searx.json b/libre/mozilla-searchplugins/searx.json
new file mode 100644
index 000000000..e6542aeff
--- /dev/null
+++ b/libre/mozilla-searchplugins/searx.json
@@ -0,0 +1,25 @@
+{
+  "name": "searx",
+  "description": "Search searx",
+  "manifest_version": 2,
+  "version": "1.0",
+  "applications": {
+    "gecko": {
+      "id": "searx@search.mozilla.org"
+    }
+  },
+  "hidden": true,
+  "icons": {
+    "16": "favicon.ico"
+  },
+  "web_accessible_resources": [
+    "favicon.ico"
+  ],
+  "chrome_settings_overrides": {
+    "search_provider": {
+      "name": "searx",
+      "search_url": "https://searx.laquadrature.net",
+      "search_url_post_params": "q={searchTerms}"
+    }
+  }
+}
diff --git a/libre/mozilla-searchplugins/searx.xml b/libre/mozilla-searchplugins/searx.xml
deleted file mode 100644
index e5eaed548..000000000
--- a/libre/mozilla-searchplugins/searx.xml
+++ /dev/null
@@ -1,14 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<OpenSearchDescription xmlns="http://a9.com/-/spec/opensearch/1.1/">
-  <ShortName>searx</ShortName>
-  <Description>Search searx</Description>
-  <Image width="16" height="16">data:image/x-icon;base64,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</Image>
-  <InputEncoding>UTF-8</InputEncoding>
-  <LongName>searx metasearch</LongName>
-  
-    <Url type="text/html" method="post" template="https://searx.laquadrature.net/">
-        <Param name="q" value="{searchTerms}" />
-    </Url>
-    
-  
-</OpenSearchDescription>
diff --git a/libre/mozilla-searchplugins/yacy.ico b/libre/mozilla-searchplugins/yacy.ico
new file mode 100644
index 000000000..54d416073
--- /dev/null
+++ b/libre/mozilla-searchplugins/yacy.ico
diff --git a/libre/mozilla-searchplugins/yacy.json b/libre/mozilla-searchplugins/yacy.json
new file mode 100644
index 000000000..f833b5658
--- /dev/null
+++ b/libre/mozilla-searchplugins/yacy.json
@@ -0,0 +1,26 @@
+{
+  "name": "YaCy",
+  "description": "YaCy.net - Web Search by the People, for the People",
+  "manifest_version": 2,
+  "version": "1.0",
+  "applications": {
+    "gecko": {
+      "id": "yacy@search.mozilla.org"
+    }
+  },
+  "hidden": true,
+  "icons": {
+    "16": "favicon.ico"
+  },
+  "web_accessible_resources": [
+    "favicon.ico"
+  ],
+  "chrome_settings_overrides": {
+    "search_provider": {
+      "name": "YaCy",
+      "search_url": "https://yacy.searchlab.eu/yacysearch.html",
+      "search_url_post_params": "query={searchTerms}&nav=all&resource=global",
+      "suggest_url": "https://yacy.searchlab.eu/suggest.json?query={searchTerms}"
+    }
+  }
+}
diff --git a/libre/mozilla-searchplugins/yacy.xml b/libre/mozilla-searchplugins/yacy.xml
deleted file mode 100644
index 52d9f66c3..000000000
--- a/libre/mozilla-searchplugins/yacy.xml
+++ /dev/null
@@ -1,31 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<OpenSearchDescription
-    xmlns="http://a9.com/-/spec/opensearch/1.1/"
-    xmlns:suggestions="http://www.opensearch.org/specifications/opensearch/extensions/suggestions/1.1">
-  <ShortName>YaCy</ShortName>
-  <LongName>YaCy.net - Web Search by the People, for the People</LongName>
-  <Image type="image/gif">http://yacy.searchlab.eu/env/grafics/yacy.png</Image>
-  <Image width="16" height="16">data:image/x-icon;base64,AAABAAEAEBAAAAAAGABoAwAAFgAAACgAAAAQAAAAIAAAAAEAGAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAD////////Chiu+fBm+fRq+fRq+fRq+fRq+fRq8ehXMmk////////////////////////////++exjUqGfZsnjYsXbYsXbYsXbZsnjTp2W+fBr///////////////////////////+9exfs2r/69/L58+z58+z58+z59e/z59bChSn///////////////////////////+9fBnnz638+fX69O369e748un38Ob59O3Ll0fVrGz////////////////////////Jk0HJlUjXuYrWt4jVtYPr28T58+r59OzPn1fPnlX////////////////////////Rolu8eRXCiTPEjTvCijbNnlj169359e7Zs3vLlkf////////////////////////UqmrAgSLt3MP27eH1693169327+T59Ozo0rG/gB////////////////////////////+/gCDv4Mn48+v38Of59Oz58+v48+vr2b2+fRv///////////////////////////+9ehXr17n58+z48ejo0bDp07T48+zx49DBhCj///////////////////////////+/fhzjyJ/59Oz59OzQoVvNmU759Oz58+vKlUbXrnH////////////////////////LlkfUqmn59Oz48+vZtHzNm1D48+v59OzPoFjOnlX////////////////////////OnVPOnFL59e348+vq1rnEiC7u38j69vDXsHTIkT3////////////////////////UqWjIkD327+T58+3s2bzAgSLp07T79/Pmzqq+fBn///////////////////////////+/fx7v4Mr7+PTx5NDHkD3kyqP8+vjs2r+9exf///////////////////////////++fBjQoFnVq2zTp2bGjTjJk0LWrW7SpWC+exf////////////////////////////Nm1C6dQy7eBG8eBK9exe8ehS7dxC6dQzLlkj////////////AH///wB8x+sAf///AD/+PwA///8AP///AD///4A9PU+APoz/gB///4AdxvOAHoz/gB3368AfjU/AHT1PwB/+P
-</Image>
-  <Language>en-us</Language>
-  <OutputEncoding>UTF-8</OutputEncoding>
-  <InputEncoding>UTF-8</InputEncoding>
-  <AdultContent>true</AdultContent>
-  <Description>YaCy is a free GPL-licensed software that can be used for stand-alone search engine installations or as a client for a multi-user P2P-based web indexing cluster. This is the access to peer.</Description>
-  
-  <Url type="text/html" method="GET" template="http://yacy.searchlab.eu/yacysearch.html?query={searchTerms}&amp;startRecord={startIndex?}&amp;maximumRecords={count?}&amp;nav=all&amp;resource=global" />
-  <Url type="application/rss+xml" method="GET" template="http://yacy.searchlab.eu/yacysearch.rss?nav=&amp;query={searchTerms}&amp;startRecord={startIndex?}&amp;maximumRecords={count?}&amp;nav=all&amp;resource=global" />
-  <Url type="application/atom+xml" method="GET" template="http://yacy.searchlab.eu/yacysearch.atom?query={searchTerms}&amp;startRecord={startIndex?}&amp;maximumRecords={count?}&amp;resource=global" />
-
-  <Url type="text/html" method="GET" template="http://yacy.searchlab.eu/compare_yacy.html?query={searchTerms}&amp;left=#[search_left]#&amp;right=#[search_right]#&amp;display=2" />
-  
-  <Url type="application/x-suggestions+json" template="http://yacy.searchlab.eu/suggest.json?query={searchTerms}"/>
-  <Url type="application/x-suggestions+xml" template="http://yacy.searchlab.eu/suggest.xml?query={searchTerms}"/>
-  <!-- syntax according to http://www.loc.gov/standards/sru/. Set verify=true to get snippets in the search results -->
-  <Developer>See https://github.com/orgs/yacy/teams/yacy_developers</Developer>
-  <Query role="example" searchTerms="yacy+free+software" />
-  <Tags>YaCy Free Software P2P Peer-to-Peer Uncensored Distributed Web Search Engine</Tags>
-  <Contact>See http://yacy.searchlab.eu/ViewProfile.html?hash=localhash</Contact>
-  <Attribution>http://yacy.net YaCy Software &amp;copy; 2004-2014 by Michael Christen et al., YaCy.net; Content: ask peer owner</Attribution>
-  <SyndicationRight>open</SyndicationRight>
-</OpenSearchDescription>