libre/iceweasel: updated to 59.0

5 files changed, 203 insertions, 233 deletions

diff --git a/libre/iceweasel/0001-Bug-1430274-Define-MOZ_ALSA-for-more-source-files.-r.patch b/libre/iceweasel/0001-Bug-1430274-Define-MOZ_ALSA-for-more-source-files.-r.patch
deleted file mode 100644
index 7c33f7a70..000000000
--- a/libre/iceweasel/0001-Bug-1430274-Define-MOZ_ALSA-for-more-source-files.-r.patch
+++ /dev/null
@@ -1,27 +0,0 @@
-From 2877a352715ce7e30ef364722757c6ec380236b1 Mon Sep 17 00:00:00 2001
-Message-Id: <2877a352715ce7e30ef364722757c6ec380236b1.1518037075.git.jan.steffens@gmail.com>
-From: Harald van Dijk <harald@gigawatt.nl>
-Date: Thu, 18 Jan 2018 15:18:37 -0700
-Subject: [PATCH] Bug 1430274 - Define MOZ_ALSA for more source files. r=jld
-
----
- security/sandbox/linux/moz.build | 3 +++
- 1 file changed, 3 insertions(+)
-
-diff --git a/security/sandbox/linux/moz.build b/security/sandbox/linux/moz.build
-index 681d658bfeb7..1a49b548af2d 100644
---- a/security/sandbox/linux/moz.build
-+++ b/security/sandbox/linux/moz.build
-@@ -78,6 +78,9 @@ if CONFIG['MOZ_GMP_SANDBOX']:
-         'SandboxOpenedFiles.cpp',
-     ]
- 
-+if CONFIG['MOZ_ALSA']:
-+    DEFINES['MOZ_ALSA'] = True
-+
- # This copy of SafeSPrintf doesn't need to avoid the Chromium logging
- # dependency like the one in libxul does, but this way the behavior is
- # consistent.  See also the comment in SandboxLogging.h.
--- 
-2.16.1
-
diff --git a/libre/iceweasel/PKGBUILD b/libre/iceweasel/PKGBUILD
index e26a8d986..fbf8b4e18 100644
--- a/libre/iceweasel/PKGBUILD
+++ b/libre/iceweasel/PKGBUILD
@@ -20,28 +20,28 @@
 
 # parabola changes and rationale:
 #  - rebranded to iceweasel
-#  - changed to release tarball from repo checkout
 #  - removed google api keys and usage
 #  - removed use of firefox-symbolic.svg
-#  - using tarball instead of repository
 #  - added makedepends: mozilla-searchplugins, quilt, libxslt, imagemagick
-#  - added replaces, conflicts and provides: firefox
+#  - added replaces, conflicts: firefox
 
 _pkgname=firefox
 pkgname=iceweasel
 epoch=1
-pkgver=58.0.2
-pkgrel=1
-_bver=58.0
+pkgver=59.0
+pkgrel=2
+_bver=59.0
 _brel=1
 pkgdesc="Libre standalone web browser based on Mozilla Firefox"
-arch=(x86_64 i686 armv7h)
+arch=(x86_64)
+arch+=(i686 armv7h)
 license=(MPL GPL LGPL)
 url="https://wiki.parabola.nu/$pkgname"
-depends=(gtk3 gtk2 mozilla-common libxt startup-notification mime-types dbus-glib ffmpeg
+depends=(gtk3 mozilla-common libxt startup-notification mime-types dbus-glib ffmpeg
          nss hunspell sqlite ttf-font libpulse libvpx icu)
 makedepends=(unzip zip diffutils python2 yasm mesa imake gconf inetutils xorg-server-xvfb
-             autoconf2.13 rust mercurial clang llvm jack mozilla-searchplugins quilt libxslt imagemagick)
+             autoconf2.13 rust mercurial clang llvm jack gtk2)
+makedepends+=(mozilla-searchplugins quilt libxslt imagemagick)
 optdepends=('networkmanager: Location detection via available WiFi networks'
             'libnotify: Notification integration'
             'pulseaudio: Audio support'
@@ -49,31 +49,26 @@ optdepends=('networkmanager: Location detection via available WiFi networks'
 options=(!emptydirs !makeflags !strip)
 replaces=("$_pkgname")
 conflicts=("$_pkgname")
-source=(https://ftp.mozilla.org/pub/mozilla.org/firefox/releases/$pkgver/source/firefox-$pkgver.source.tar.xz
+# https://archive.mozilla.org/pub/firefox/releases/$pkgver/SOURCE
+_commit=c61f5f5ead48c78a80c80db5c489bdc7cfaf8175
+source=(firefox-$pkgver.tar.bz::https://hg.mozilla.org/releases/mozilla-release/archive/$_commit.tar.bz2
         $pkgname.desktop
-        0001-Bug-1430274-Define-MOZ_ALSA-for-more-source-files.-r.patch
-        $pkgname-install-dir.patch no-crmf.diff
-        https://repo.parabola.nu/other/iceweasel/${pkgname}_$_bver-$_brel.branding.tar.xz{,.sig}
-        libre.patch)
-sha256sums=('2b7794e4c2a24fa388f3acb2956c96bb2c3eae455467f0e386788ebaea7240c3'
+        no-crmf.diff)
+source+=(https://repo.parabola.nu/other/iceweasel/${pkgname}_$_bver-$_brel.branding.tar.xz{,.sig}
+         libre.patch)
+sha256sums=('fb5ff29e2bc68fa5ebb8bd8c800b597fcb2dd5820899aef3372380c99a0acec6'
             'ed350ef2f528b999a621f7080fa80948be6b351e67ce32529fb32bcf47bb21fa'
-            'e8a695bd6a007525390c502739c0f00d5d753a1bde7053c21c712075f2c2994d'
-            'a94f80abe65608cd49054a30acc31e4d0885fe5b2a38cf08ded5e5b51b87c99d'
-            'fb85a538044c15471c12cf561d6aa74570f8de7b054a7063ef88ee1bdfc1ccbb'
-            '482cfe2d92f0b9638061eaf1b457abe0a8c8a0521bd67767e5c5010868612d25'
+            '02000d185e647aa20ca336e595b4004bb29cdae9d8f317f90078bdcc7a36e873'
+            '7ee098251254cbfbcdf78463d3af95089e38d7942a5c7936dacbcf0c5fb1c5b8'
             'SKIP'
-            '12170e0539997396f83c511317377cf4cc5af74177c6c1db14275ebf0b932bb9')
+            'ec074da734d847dbd1b93e980304d0a26a2c07232b388322c81235a0e5856887')
 validpgpkeys=('BFA8008A8265677063B11BF47171986E4B745536') # Andreas Grapentin
 
 prepare() {
   mkdir path
   ln -s /usr/bin/python2 path/python
 
-  cd "$srcdir/$_pkgname-$pkgver"
-  patch -Np1 -i ../$pkgname-install-dir.patch
-
-  # https://bugs.archlinux.org/task/57285
-  patch -Np1 -i ../0001-Bug-1430274-Define-MOZ_ALSA-for-more-source-files.-r.patch
+  cd mozilla-release-$_commit
 
   # https://bugzilla.mozilla.org/show_bug.cgi?id=1371991
   patch -Np1 -i ../no-crmf.diff
@@ -147,6 +142,12 @@ END
   install -m644 "$brandingdir/branding/watermark.svg"       \
     browser/extensions/onboarding/content/img
 
+  # produce icons
+  for i in 128; do
+    rsvg-convert -w $i -h $i "$srcdir/$pkgname-$_bver/branding/${pkgname}_icon.svg" \
+      -o "browser/branding/iceweasel/default$i.png"
+  done
+
   # Patch and remove anything that's left
   patch -Np1 -i "$srcdir/libre.patch"
   sed -i 's|Adobe Flash|SWF Player|g;
@@ -173,12 +174,13 @@ END
 }
 
 build() {
-  cd "$srcdir/$_pkgname-$pkgver"
+  cd mozilla-release-$_commit
 
   # _FORTIFY_SOURCE causes configure failures
   CPPFLAGS+=" -O2"
 
   export PATH="$srcdir/path:$PATH"
+  export MOZ_SOURCE_REPO="$_repo"
 
   # Do PGO
   #xvfb-run -a -n 95 -s "-extension GLX -screen 0 1280x1024x24" \
@@ -188,7 +190,7 @@ build() {
 }
 
 package() {
-  cd "$srcdir/$_pkgname-$pkgver"
+  cd mozilla-release-$_commit
   DESTDIR="$pkgdir" ./mach install
   find . -name '*crashreporter-symbols-full.zip' -exec cp -fvt "$startdir" {} +
 
@@ -196,7 +198,7 @@ package() {
   _vendorjs="$pkgdir/usr/lib/$pkgname/browser/defaults/preferences/vendor.js"
   install -Dm644 /dev/stdin "$_vendorjs" <<END
 // Use LANG environment variable to choose locale
-pref("intl.locale.matchOS", true);
+pref("intl.locale.requested", "");
 
 // Disable default browser checking.
 pref("browser.shell.checkDefaultBrowser", false);
@@ -368,8 +370,18 @@ pref("dom.event.clipboardevents.enabled",false);
 pref("network.prefetch-next", false);
 pref("network.dns.disablePrefetch", true);
 pref("network.http.sendSecureXSiteReferrer", false);
+pref("toolkit.telemetry.archive.enabled", false);
+pref("toolkit.telemetry.bhrPing.enabled", false);
 pref("toolkit.telemetry.enabled", false);
 pref("toolkit.telemetry.unified", false);
+pref("toolkit.telemetry.newProfilePing.enabled", false);
+pref("toolkit.telemetry.firstShutdownPing.enabled", false);
+pref("toolkit.telemetry.server", "127.0.0.1");
+pref("app.shield.optoutstudies.enabled", false);
+pref("experiments.enabled", false);
+pref("experiments.manifest.uri", "127.0.0.1");
+pref("extensions.pocket.enabled" : false);
+pref("extensions.pocket.api", "127.0.0.1");
 // Do not tell what plugins do we have enabled: https://mail.mozilla.org/pipermail/firefox-dev/2013-November/001186.html
 pref("plugins.enumerable_names", "");
 pref("plugin.state.flash", 0);
@@ -511,8 +523,8 @@ END
 
   for i in 16 22 24 32 48 64 128 192 256 384; do
     rsvg-convert -w $i -h $i "$srcdir/$pkgname-$_bver/branding/${pkgname}_icon.svg" \
-      -o "$srcdir/$pkgname-$_bver/default$i.png"
-    install -Dm644 "$srcdir/$pkgname-$_bver/default$i.png" \
+      -o "browser/branding/iceweasel/default$i.png"
+    install -Dm644 "browser/branding/iceweasel/default$i.png" \
       "$pkgdir/usr/share/icons/hicolor/${i}x${i}/apps/$pkgname.png"
   done
 
@@ -523,7 +535,7 @@ END
     "$pkgdir/usr/share/applications/$pkgname.desktop"
 
   # Use system-provided dictionaries
-  rm -r "$pkgdir"/usr/lib/$pkgname/dictionaries
+  rm -r "$pkgdir/usr/lib/$pkgname/dictionaries"
   ln -Ts /usr/share/hunspell "$pkgdir/usr/lib/$pkgname/dictionaries"
   ln -Ts /usr/share/hyphen "$pkgdir/usr/lib/$pkgname/hyphenation"
 
diff --git a/libre/iceweasel/iceweasel-install-dir.patch b/libre/iceweasel/iceweasel-install-dir.patch
deleted file mode 100644
index d6aaafa99..000000000
--- a/libre/iceweasel/iceweasel-install-dir.patch
+++ /dev/null
@@ -1,13 +0,0 @@
-diff --git i/config/baseconfig.mk w/config/baseconfig.mk
-index e204533ac9b66b88..27ae154ce265ca2b 100644
---- i/config/baseconfig.mk
-+++ w/config/baseconfig.mk
-@@ -4,7 +4,7 @@
- # whether a normal build is happening or whether the check is running.
- includedir := $(includedir)/$(MOZ_APP_NAME)-$(MOZ_APP_VERSION)
- idldir = $(datadir)/idl/$(MOZ_APP_NAME)-$(MOZ_APP_VERSION)
--installdir = $(libdir)/$(MOZ_APP_NAME)-$(MOZ_APP_VERSION)
-+installdir = $(libdir)/$(MOZ_APP_NAME)
- sdkdir = $(libdir)/$(MOZ_APP_NAME)-devel-$(MOZ_APP_VERSION)
- ifeq (.,$(DEPTH))
- DIST = dist
diff --git a/libre/iceweasel/libre.patch b/libre/iceweasel/libre.patch
index f9cb11c5e..861720a57 100644
--- a/libre/iceweasel/libre.patch
+++ b/libre/iceweasel/libre.patch
@@ -175,7 +175,7 @@ diff --git a/browser/locales/en-US/chrome/browser-region/region.properties b/bro
 index e078ed528..ce2c5ed4d 100644
 --- a/browser/locales/en-US/chrome/browser-region/region.properties
 +++ b/browser/locales/en-US/chrome/browser-region/region.properties
-@@ -3,17 +3,12 @@
+@@ -3,16 +3,12 @@
  # file, You can obtain one at http://mozilla.org/MPL/2.0/.
  
  # Default search engine
@@ -184,8 +184,7 @@ index e078ed528..ce2c5ed4d 100644
  
  # Search engine order (order displayed in the search bar dropdown)s
 -browser.search.order.1=Google
--browser.search.order.2=Yahoo
--browser.search.order.3=Bing
+-browser.search.order.2=Bing
 -
 -# This is the default set of web based feed handlers shown in the reader
 -# selection UI
@@ -197,7 +196,7 @@ index e078ed528..ce2c5ed4d 100644
  
  # increment this number when anything gets changed in the list below.  This will
  # cause Firefox to re-read these prefs and inject any new handlers into the 
-@@ -22,20 +17,10 @@ browser.contentHandlers.types.0.uri=https://add.my.yahoo.com/rss?url=%s
+@@ -21,20 +17,10 @@ browser.contentHandlers.types.0.uri=https://add.my.yahoo.com/rss?url=%s
  # don't make any spelling errors here.
  gecko.handlerService.defaultHandlersVersion=4
  
@@ -295,19 +294,94 @@ diff --git a/browser/locales/jar.mn b/browser/locales/jar.mn
 index eff09189b..6d76d20f0 100644
 --- a/browser/locales/jar.mn
 +++ b/browser/locales/jar.mn
-@@ -99,12 +99,6 @@
+@@ -99,11 +99,6 @@
      locale/browser/searchplugins/               (.deps/generated_@AB_CD@/*.xml)
      locale/browser/searchplugins/list.json      (.deps/generated_@AB_CD@/list.json)
  #endif
 -    locale/browser/searchplugins/images/amazon.ico     (searchplugins/images/amazon.ico)
 -    locale/browser/searchplugins/images/ebay.ico       (searchplugins/images/ebay.ico)
 -    locale/browser/searchplugins/images/wikipedia.ico  (searchplugins/images/wikipedia.ico)
--    locale/browser/searchplugins/images/yahoo.ico      (searchplugins/images/yahoo.ico)
 -    locale/browser/searchplugins/images/yandex-en.ico  (searchplugins/images/yandex-en.ico)
 -    locale/browser/searchplugins/images/yandex-ru.ico  (searchplugins/images/yandex-ru.ico)
  % locale browser-region @AB_CD@ %locale/browser-region/
      locale/browser-region/region.properties        (%chrome/browser-region/region.properties)
  # the following files are browser-specific overrides
+diff --git a/devtools/client/locales/en-US/connection-screen.dtd b/devtools/client/locales/en-US/connection-screen.dtd
+index 674a408d5..d27e97fd5 100644
+--- a/devtools/client/locales/en-US/connection-screen.dtd
++++ b/devtools/client/locales/en-US/connection-screen.dtd
+@@ -24,7 +24,7 @@
+ <!-- LOCALIZATION NOTE (remoteHelp, remoteDocumentation, remoteHelpSuffix):
+ these strings will be concatenated in a single label, remoteDocumentation will
+ be used as text for a link to MDN. -->
+-<!ENTITY remoteHelp "Firefox Developer Tools can debug remote devices (Firefox for Android and Firefox OS, for example). Make sure that you have turned on the ‘Remote debugging’ option in the remote device. For more, see the ">
++<!ENTITY remoteHelp "Iceweasel Developer Tools can debug remote devices. Make sure that you have turned on the ‘Remote debugging’ option in the remote device. For more, see the ">
+ <!ENTITY remoteDocumentation "documentation">
+ <!ENTITY remoteHelpSuffix ".">
+ 
+diff --git a/devtools/client/locales/en-US/sourceeditor.properties b/devtools/client/locales/en-US/sourceeditor.properties
+index 842d549f0..31dcb82e5 100644
+--- a/devtools/client/locales/en-US/sourceeditor.properties
++++ b/devtools/client/locales/en-US/sourceeditor.properties
+@@ -4,7 +4,7 @@
+ 
+ # LOCALIZATION NOTE These strings are used inside the Source Editor component.
+ # This component is used whenever source code is displayed for the purpose of
+-# being edited, inside the Firefox developer tools - current examples are the
++# being edited, inside the Iceweasel developer tools - current examples are the
+ # Scratchpad and the Style Editor tools.
+ 
+ # LOCALIZATION NOTE The correct localization of this file might be to keep it
+diff --git a/devtools/client/locales/en-US/toolbox.dtd b/devtools/client/locales/en-US/toolbox.dtd
+index 6097fa82a..3dfe372db 100644
+--- a/devtools/client/locales/en-US/toolbox.dtd
++++ b/devtools/client/locales/en-US/toolbox.dtd
+@@ -80,7 +80,7 @@
+   -  checkbox that toggles remote debugging, i.e. devtools.debugger.remote-enabled
+   -  boolean preference in about:config, in the options panel. -->
+ <!ENTITY options.enableRemote.label3    "Enable remote debugging">
+-<!ENTITY options.enableRemote.tooltip2  "Turning this option on will allow the developer tools to debug a remote instance like Firefox OS">
++<!ENTITY options.enableRemote.tooltip2  "Turning this option on will allow the developer tools to debug a remote instance like Iceweasel OS">
+ 
+ <!-- LOCALIZATION NOTE (options.disableJavaScript.label,
+   -  options.disableJavaScript.tooltip): This is the options panel label and
+diff --git a/devtools/client/locales/en-US/webide.dtd b/devtools/client/locales/en-US/webide.dtd
+index 5e1a80ccd..8f375da2e 100644
+--- a/devtools/client/locales/en-US/webide.dtd
++++ b/devtools/client/locales/en-US/webide.dtd
+@@ -2,7 +2,7 @@
+    - License, v. 2.0. If a copy of the MPL was not distributed with this
+    - file, You can obtain one at http://mozilla.org/MPL/2.0/. -->
+ 
+-<!ENTITY windowTitle "Firefox WebIDE">
++<!ENTITY windowTitle "Iceweasel WebIDE">
+ 
+ <!ENTITY projectMenu_label "Project">
+ <!ENTITY projectMenu_accesskey "P">
+@@ -55,7 +55,7 @@
+ <!ENTITY projectButton_label "Open App">
+ <!ENTITY runtimeButton_label "Select Runtime">
+ 
+-<!-- We try to repicate Firefox' bindings: -->
++<!-- We try to repicate Iceweasel' bindings: -->
+ <!-- quit app -->
+ <!ENTITY key_quit "W">
+ <!-- open menu -->
+diff --git a/devtools/client/locales/en-US/webide.properties b/devtools/client/locales/en-US/webide.properties
+index 2368ad7f1..05e39c74f 100644
+--- a/devtools/client/locales/en-US/webide.properties
++++ b/devtools/client/locales/en-US/webide.properties
+@@ -2,8 +2,8 @@
+ # License, v. 2.0. If a copy of the MPL was not distributed with this
+ # file, You can obtain one at http://mozilla.org/MPL/2.0/.
+ 
+-title_noApp=Firefox WebIDE
+-title_app=Firefox WebIDE: %S
++title_noApp=Iceweasel WebIDE
++title_app=Iceweasel WebIDE: %S
+ 
+ runtimeButton_label=Select Runtime
+ projectButton_label=Open App
 diff --git a/browser/locales/search/list.json b/browser/locales/search/list.json
 index 544740a43..4961e5437 100644
 --- a/browser/locales/search/list.json
@@ -316,7 +390,7 @@ index 544740a43..4961e5437 100644
  {
    "default": {
      "visibleDefaultEngines": [
--      "google", "yahoo", "amazondotcom", "bing", "ddg", "ebay", "twitter", "wikipedia"
+-      "google", "amazondotcom", "bing", "ddg", "ebay", "twitter", "wikipedia"
 +      "duckduckgo-html", "duckduckgo-lite", "internet-archive", "parabola-packages", "parabola-wiki-en", "searx", "seeks", "wikipedia-en", "yacy"
      ]
    },
@@ -375,12 +449,12 @@ index 544740a43..4961e5437 100644
      "en-US": {
        "default": {
          "visibleDefaultEngines": [
--          "google", "yahoo", "amazondotcom", "bing", "ddg", "ebay", "twitter", "wikipedia"
+-          "google", "amazondotcom", "bing", "ddg", "ebay", "twitter", "wikipedia"
 -        ]
 -      },
 -      "experimental-hidden": {
 -        "visibleDefaultEngines": [
--          "amazon-ca", "amazon-au", "google-2018", "yahoo-en-CA", "yandex-en"
+-          "amazon-ca", "amazon-au", "google-2018", "yandex-en"
 +          "duckduckgo-html", "duckduckgo-lite", "internet-archive", "parabola-packages", "parabola-wiki-en", "searx", "seeks", "wikipedia-en", "yacy"
          ]
        }
@@ -388,7 +462,7 @@ index 544740a43..4961e5437 100644
      "ach": {
        "default": {
          "visibleDefaultEngines": [
--          "google", "yahoo", "bing", "amazondotcom", "ddg", "twitter", "wikipedia"
+-          "google", "bing", "amazondotcom", "ddg", "twitter", "wikipedia"
 +          "duckduckgo-html", "duckduckgo-lite", "internet-archive", "parabola-packages", "parabola-wiki-en", "searx", "seeks", "wikipedia-en", "yacy"
          ]
        }
@@ -396,7 +470,7 @@ index 544740a43..4961e5437 100644
      "af": {
        "default": {
          "visibleDefaultEngines": [
--          "google", "yahoo", "bing", "amazondotcom", "ddg", "wikipedia-af"
+-          "google", "bing", "amazondotcom", "ddg", "wikipedia-af"
 +          "duckduckgo-html", "duckduckgo-lite", "internet-archive", "parabola-packages", "parabola-wiki-en", "searx", "seeks", "wikipedia-en", "yacy"
          ]
        }
@@ -404,7 +478,7 @@ index 544740a43..4961e5437 100644
      "an": {
        "default": {
          "visibleDefaultEngines": [
--          "google", "yahoo-es", "bing", "ebay-es", "wikipedia-an", "ddg", "twitter"
+-          "google", "bing", "ebay-es", "wikipedia-an", "ddg", "twitter"
 +          "duckduckgo-html", "duckduckgo-lite", "internet-archive", "parabola-packages", "parabola-wiki-en", "searx", "seeks", "wikipedia-en", "yacy"
          ]
        }
@@ -412,7 +486,7 @@ index 544740a43..4961e5437 100644
      "ar": {
        "default": {
          "visibleDefaultEngines": [
--          "google", "yahoo", "bing", "amazondotcom", "ddg", "wikipedia-ar"
+-          "google", "bing", "amazondotcom", "ddg", "wikipedia-ar"
 +          "duckduckgo-html", "duckduckgo-lite", "internet-archive", "parabola-packages", "parabola-wiki-en", "searx", "seeks", "wikipedia-en", "yacy"
          ]
        }
@@ -420,7 +494,7 @@ index 544740a43..4961e5437 100644
      "as": {
        "default": {
          "visibleDefaultEngines": [
--          "google", "yahoo-in", "amazondotcom", "ddg", "wikipedia-as"
+-          "google", "amazondotcom", "ddg", "wikipedia-as"
 +          "duckduckgo-html", "duckduckgo-lite", "internet-archive", "parabola-packages", "parabola-wiki-en", "searx", "seeks", "wikipedia-en", "yacy"
          ]
        }
@@ -428,7 +502,7 @@ index 544740a43..4961e5437 100644
      "ast": {
        "default": {
          "visibleDefaultEngines": [
--          "google", "yahoo-es", "bing", "diccionariu-alla", "ddg", "ebay-es", "wikipedia-ast"
+-          "google", "bing", "diccionariu-alla", "ddg", "ebay-es", "wikipedia-ast"
 +          "duckduckgo-html", "duckduckgo-lite", "internet-archive", "parabola-packages", "parabola-wiki-en", "searx", "seeks", "wikipedia-en", "yacy"
          ]
        }
@@ -460,7 +534,7 @@ index 544740a43..4961e5437 100644
      "bn-BD": {
        "default": {
          "visibleDefaultEngines": [
--          "google", "yahoo", "bing", "ddg", "wikipedia-bn"
+-          "google", "bing", "ddg", "wikipedia-bn"
 +          "duckduckgo-html", "duckduckgo-lite", "internet-archive", "parabola-packages", "parabola-wiki-en", "searx", "seeks", "wikipedia-en", "yacy"
          ]
        }
@@ -468,7 +542,7 @@ index 544740a43..4961e5437 100644
      "bn-IN": {
        "default": {
          "visibleDefaultEngines": [
--          "google", "yahoo-in", "amazondotcom", "bing", "ddg", "rediff", "wikipedia-bn"
+-          "google", "amazondotcom", "bing", "ddg", "rediff", "wikipedia-bn"
 +          "duckduckgo-html", "duckduckgo-lite", "internet-archive", "parabola-packages", "parabola-wiki-en", "searx", "seeks", "wikipedia-en", "yacy"
          ]
        }
@@ -476,7 +550,7 @@ index 544740a43..4961e5437 100644
      "br": {
        "default": {
          "visibleDefaultEngines": [
--          "google", "yahoo-france", "amazon-france", "ddg", "ebay-fr", "freelang", "klask", "wikipedia-br"
+-          "google", "amazon-france", "ddg", "ebay-fr", "freelang", "klask", "wikipedia-br"
 +          "duckduckgo-html", "duckduckgo-lite", "internet-archive", "parabola-packages", "parabola-wiki-en", "searx", "seeks", "wikipedia-en", "yacy"
          ]
        }
@@ -484,7 +558,7 @@ index 544740a43..4961e5437 100644
      "bs": {
        "default": {
          "visibleDefaultEngines": [
--          "google", "yahoo", "ddg", "olx", "twitter", "wikipedia-bs"
+-          "google", "ddg", "olx", "twitter", "wikipedia-bs"
 +          "duckduckgo-html", "duckduckgo-lite", "internet-archive", "parabola-packages", "parabola-wiki-en", "searx", "seeks", "wikipedia-en", "yacy"
          ]
        }
@@ -500,7 +574,7 @@ index 544740a43..4961e5437 100644
      "cak": {
        "default": {
          "visibleDefaultEngines": [
--          "google", "yahoo-espanol", "bing", "amazondotcom", "ddg", "wikipedia-es"
+-          "google", "bing", "amazondotcom", "ddg", "wikipedia-es"
 +          "duckduckgo-html", "duckduckgo-lite", "internet-archive", "parabola-packages", "parabola-wiki-en", "searx", "seeks", "wikipedia-en", "yacy"
          ]
        }
@@ -516,7 +590,7 @@ index 544740a43..4961e5437 100644
      "cy": {
        "default": {
          "visibleDefaultEngines": [
--          "google", "yahoo-en-GB", "amazon-en-GB", "ddg", "ebay-uk", "palasprint", "termau", "wikipedia-cy"
+-          "google", "amazon-en-GB", "ddg", "ebay-uk", "palasprint", "termau", "wikipedia-cy"
 +          "duckduckgo-html", "duckduckgo-lite", "internet-archive", "parabola-packages", "parabola-wiki-en", "searx", "seeks", "wikipedia-en", "yacy"
          ]
        }
@@ -532,7 +606,7 @@ index 544740a43..4961e5437 100644
      "de": {
        "default": {
          "visibleDefaultEngines": [
--          "google", "yahoo-de", "amazondotcom-de", "bing", "ddg", "ebay-de", "leo_ende_de", "wikipedia-de"
+-          "google", "amazondotcom-de", "bing", "ddg", "ebay-de", "ecosia", "leo_ende_de", "wikipedia-de"
 +          "duckduckgo-html", "duckduckgo-lite", "internet-archive", "parabola-packages", "parabola-wiki-en", "searx", "seeks", "wikipedia-en", "yacy"
          ]
        }
@@ -540,7 +614,7 @@ index 544740a43..4961e5437 100644
      "dsb": {
        "default": {
          "visibleDefaultEngines": [
--          "google", "yahoo-de", "bing", "amazondotcom-de", "ddg", "ebay-de", "leo_ende_de", "wikipedia-dsb"
+-          "google", "bing", "amazondotcom-de", "ddg", "ebay-de", "leo_ende_de", "wikipedia-dsb"
 +          "duckduckgo-html", "duckduckgo-lite", "internet-archive", "parabola-packages", "parabola-wiki-en", "searx", "seeks", "wikipedia-en", "yacy"
          ]
        }
@@ -548,7 +622,7 @@ index 544740a43..4961e5437 100644
      "el": {
        "default": {
          "visibleDefaultEngines": [
--          "google", "yahoo", "amazon-en-GB", "bing", "ddg", "wikipedia-el"
+-          "google", "amazon-en-GB", "bing", "ddg", "wikipedia-el"
 +          "duckduckgo-html", "duckduckgo-lite", "internet-archive", "parabola-packages", "parabola-wiki-en", "searx", "seeks", "wikipedia-en", "yacy"
          ]
        }
@@ -556,7 +630,7 @@ index 544740a43..4961e5437 100644
      "en-GB": {
        "default": {
          "visibleDefaultEngines": [
--          "google", "yahoo-en-GB", "bing", "amazon-en-GB", "chambers-en-GB", "ddg", "ebay-uk", "twitter", "wikipedia"
+-          "google", "bing", "amazon-en-GB", "chambers-en-GB", "ddg", "ebay-uk", "twitter", "wikipedia"
 -        ]
 -      },
 -      "experimental-hidden": {
@@ -577,7 +651,7 @@ index 544740a43..4961e5437 100644
      "eo": {
        "default": {
          "visibleDefaultEngines": [
--          "google", "yahoo", "bing", "amazondotcom", "ddg", "reta-vortaro", "wikipedia-eo"
+-          "google", "bing", "amazondotcom", "ddg", "reta-vortaro", "wikipedia-eo"
 +          "duckduckgo-html", "duckduckgo-lite", "internet-archive", "parabola-packages", "parabola-wiki-en", "searx", "seeks", "wikipedia-en", "yacy"
          ]
        }
@@ -585,7 +659,7 @@ index 544740a43..4961e5437 100644
      "es-AR": {
        "default": {
          "visibleDefaultEngines": [
--          "google", "yahoo-ar", "amazondotcom", "drae", "ddg", "mercadolibre-ar", "wikipedia-es"
+-          "google", "amazondotcom", "drae", "ddg", "mercadolibre-ar", "wikipedia-es"
 +          "duckduckgo-html", "duckduckgo-lite", "internet-archive", "parabola-packages", "parabola-wiki-en", "searx", "seeks", "wikipedia-en", "yacy"
          ]
        }
@@ -593,7 +667,7 @@ index 544740a43..4961e5437 100644
      "es-CL": {
        "default": {
          "visibleDefaultEngines": [
--          "google", "yahoo-cl", "bing", "drae", "ddg", "mercadolibre-cl", "wikipedia-es"
+-          "google", "bing", "drae", "ddg", "mercadolibre-cl", "wikipedia-es"
 +          "duckduckgo-html", "duckduckgo-lite", "internet-archive", "parabola-packages", "parabola-wiki-en", "searx", "seeks", "wikipedia-en", "yacy"
          ]
        }
@@ -601,7 +675,7 @@ index 544740a43..4961e5437 100644
      "es-ES": {
        "default": {
          "visibleDefaultEngines": [
--          "google", "yahoo-es", "bing", "drae", "ddg", "ebay-es", "twitter", "wikipedia-es"
+-          "google", "bing", "drae", "ddg", "ebay-es", "twitter", "wikipedia-es"
 +          "duckduckgo-html", "duckduckgo-lite", "internet-archive", "parabola-packages", "parabola-wiki-en", "searx", "seeks", "wikipedia-en", "yacy"
          ]
        }
@@ -609,7 +683,7 @@ index 544740a43..4961e5437 100644
      "es-MX": {
        "default": {
          "visibleDefaultEngines": [
--          "google", "yahoo-mx", "bing", "ddg", "mercadolibre-mx", "wikipedia-es"
+-          "google", "bing", "ddg", "mercadolibre-mx", "wikipedia-es"
 -        ]
 -      },
 -      "experimental-hidden": {
@@ -630,7 +704,7 @@ index 544740a43..4961e5437 100644
      "eu": {
        "default": {
          "visibleDefaultEngines": [
--          "google", "yahoo", "bing", "amazon-en-GB", "ddg", "ebay-es", "elebila", "wikipedia-eu"
+-          "google", "bing", "amazon-en-GB", "ddg", "ebay-es", "elebila", "wikipedia-eu"
 +          "duckduckgo-html", "duckduckgo-lite", "internet-archive", "parabola-packages", "parabola-wiki-en", "searx", "seeks", "wikipedia-en", "yacy"
          ]
        }
@@ -638,7 +712,7 @@ index 544740a43..4961e5437 100644
      "fa": {
        "default": {
          "visibleDefaultEngines": [
--          "google", "yahoo", "amazondotcom", "bing", "ddg", "wikipedia-fa"
+-          "google", "amazondotcom", "bing", "ddg", "wikipedia-fa"
 +          "duckduckgo-html", "duckduckgo-lite", "internet-archive", "parabola-packages", "parabola-wiki-en", "searx", "seeks", "wikipedia-en", "yacy"
          ]
        }
@@ -646,7 +720,7 @@ index 544740a43..4961e5437 100644
      "ff": {
        "default": {
          "visibleDefaultEngines": [
--          "google", "yahoo-france", "bing", "amazon-france", "ddg", "cnrtl-tlfi-fr", "wikipedia-fr"
+-          "google", "bing", "amazon-france", "ddg", "cnrtl-tlfi-fr", "wikipedia-fr"
 +          "duckduckgo-html", "duckduckgo-lite", "internet-archive", "parabola-packages", "parabola-wiki-en", "searx", "seeks", "wikipedia-en", "yacy"
          ]
        }
@@ -654,7 +728,7 @@ index 544740a43..4961e5437 100644
      "fi": {
        "default": {
          "visibleDefaultEngines": [
--          "google", "yahoo-fi", "bing", "bookplus-fi", "ddg", "wikipedia-fi"
+-          "google", "bing", "bookplus-fi", "ddg", "wikipedia-fi"
 +          "duckduckgo-html", "duckduckgo-lite", "internet-archive", "parabola-packages", "parabola-wiki-en", "searx", "seeks", "wikipedia-en", "yacy"
          ]
        }
@@ -662,7 +736,7 @@ index 544740a43..4961e5437 100644
      "fr": {
        "default": {
          "visibleDefaultEngines": [
--          "google", "yahoo-france", "bing", "amazon-france", "ddg", "ebay-fr", "cnrtl-tlfi-fr", "wikipedia-fr"
+-          "google", "bing", "amazon-france", "ddg", "ebay-fr", "cnrtl-tlfi-fr", "qwant", "wikipedia-fr"
 +          "duckduckgo-html", "duckduckgo-lite", "internet-archive", "parabola-packages", "parabola-wiki-en", "searx", "seeks", "wikipedia-en", "yacy"
          ]
        }
@@ -670,7 +744,7 @@ index 544740a43..4961e5437 100644
      "fy-NL": {
        "default": {
          "visibleDefaultEngines": [
--          "google", "yahoo-fy-NL", "bing", "bolcom-fy-NL", "ddg", "ebay-nl", "marktplaats-fy-NL", "wikipedia-fy-NL"
+-          "google", "bing", "bolcom-fy-NL", "ddg", "ebay-nl", "marktplaats-fy-NL", "wikipedia-fy-NL"
 -        ]
 -      },
 -      "experimental-hidden": {
@@ -683,7 +757,7 @@ index 544740a43..4961e5437 100644
      "ga-IE": {
        "default": {
          "visibleDefaultEngines": [
--          "google", "yahoo-en-GB", "amazon-en-GB", "ddg", "ebay-ie", "tearma", "twitter", "wikipedia-ga-IE"
+-          "google", "amazon-en-GB", "ddg", "ebay-ie", "tearma", "twitter", "wikipedia-ga-IE"
 +          "duckduckgo-html", "duckduckgo-lite", "internet-archive", "parabola-packages", "parabola-wiki-en", "searx", "seeks", "wikipedia-en", "yacy"
          ]
        }
@@ -691,7 +765,7 @@ index 544740a43..4961e5437 100644
      "gd": {
        "default": {
          "visibleDefaultEngines": [
--          "google", "yahoo-en-GB", "amazon-en-GB", "bbc-alba", "ddg", "ebay-uk", "faclair-beag", "wikipedia-gd"
+-          "google", "amazon-en-GB", "bbc-alba", "ddg", "ebay-uk", "faclair-beag", "wikipedia-gd"
 +          "duckduckgo-html", "duckduckgo-lite", "internet-archive", "parabola-packages", "parabola-wiki-en", "searx", "seeks", "wikipedia-en", "yacy"
          ]
        }
@@ -699,7 +773,7 @@ index 544740a43..4961e5437 100644
      "gl": {
        "default": {
          "visibleDefaultEngines": [
--          "google", "yahoo-es", "amazon-en-GB", "ddg", "ebay-es", "wikipedia-gl"
+-          "google", "amazon-en-GB", "ddg", "ebay-es", "wikipedia-gl"
 +          "duckduckgo-html", "duckduckgo-lite", "internet-archive", "parabola-packages", "parabola-wiki-en", "searx", "seeks", "wikipedia-en", "yacy"
          ]
        }
@@ -707,7 +781,7 @@ index 544740a43..4961e5437 100644
      "gn": {
        "default": {
          "visibleDefaultEngines": [
--          "google", "yahoo-es", "bing", "amazondotcom", "ddg", "twitter", "wikipedia-gn"
+-          "google", "bing", "amazondotcom", "ddg", "twitter", "wikipedia-gn"
 +          "duckduckgo-html", "duckduckgo-lite", "internet-archive", "parabola-packages", "parabola-wiki-en", "searx", "seeks", "wikipedia-en", "yacy"
          ]
        }
@@ -715,7 +789,7 @@ index 544740a43..4961e5437 100644
      "gu-IN": {
        "default": {
          "visibleDefaultEngines": [
--          "google", "yahoo-in", "bing", "ddg", "gujaratilexicon", "wikipedia-gu"
+-          "google", "bing", "ddg", "gujaratilexicon", "wikipedia-gu"
 +          "duckduckgo-html", "duckduckgo-lite", "internet-archive", "parabola-packages", "parabola-wiki-en", "searx", "seeks", "wikipedia-en", "yacy"
          ]
        }
@@ -723,7 +797,7 @@ index 544740a43..4961e5437 100644
      "he": {
        "default": {
          "visibleDefaultEngines": [
--          "google", "yahoo", "ddg", "wikipedia-he", "morfix-dic"
+-          "google", "ddg", "wikipedia-he", "morfix-dic"
 +          "duckduckgo-html", "duckduckgo-lite", "internet-archive", "parabola-packages", "parabola-wiki-en", "searx", "seeks", "wikipedia-en", "yacy"
          ]
        }
@@ -731,7 +805,7 @@ index 544740a43..4961e5437 100644
      "hi-IN": {
        "default": {
          "visibleDefaultEngines": [
--          "google", "yahoo-in", "bing", "ddg", "wikipedia-hi"
+-          "google", "bing", "ddg", "wikipedia-hi"
 +          "duckduckgo-html", "duckduckgo-lite", "internet-archive", "parabola-packages", "parabola-wiki-en", "searx", "seeks", "wikipedia-en", "yacy"
          ]
        }
@@ -739,7 +813,7 @@ index 544740a43..4961e5437 100644
      "hr": {
        "default": {
          "visibleDefaultEngines": [
--          "google", "yahoo", "amazon-en-GB", "bing", "ddg", "eudict", "twitter", "wikipedia-hr"
+-          "google", "amazon-en-GB", "bing", "ddg", "eudict", "twitter", "wikipedia-hr"
 +          "duckduckgo-html", "duckduckgo-lite", "internet-archive", "parabola-packages", "parabola-wiki-en", "searx", "seeks", "wikipedia-en", "yacy"
          ]
        }
@@ -747,7 +821,7 @@ index 544740a43..4961e5437 100644
      "hsb": {
        "default": {
          "visibleDefaultEngines": [
--          "google", "yahoo-de", "bing", "amazondotcom-de", "ddg", "ebay-de", "leo_ende_de", "wikipedia-hsb"
+-          "google", "bing", "amazondotcom-de", "ddg", "ebay-de", "leo_ende_de", "wikipedia-hsb"
 +          "duckduckgo-html", "duckduckgo-lite", "internet-archive", "parabola-packages", "parabola-wiki-en", "searx", "seeks", "wikipedia-en", "yacy"
          ]
        }
@@ -763,7 +837,7 @@ index 544740a43..4961e5437 100644
      "hy-AM": {
        "default": {
          "visibleDefaultEngines": [
--          "google", "yahoo", "amazondotcom", "ddg", "list-am", "wikipedia-hy"
+-          "google", "amazondotcom", "ddg", "list-am", "wikipedia-hy"
 +          "duckduckgo-html", "duckduckgo-lite", "internet-archive", "parabola-packages", "parabola-wiki-en", "searx", "seeks", "wikipedia-en", "yacy"
          ]
        }
@@ -771,7 +845,7 @@ index 544740a43..4961e5437 100644
      "ia": {
        "default": {
          "visibleDefaultEngines": [
--          "google", "yahoo", "bing", "amazondotcom", "ddg", "twitter", "wikipedia-ia"
+-          "google", "bing", "amazondotcom", "ddg", "twitter", "wikipedia-ia"
 +          "duckduckgo-html", "duckduckgo-lite", "internet-archive", "parabola-packages", "parabola-wiki-en", "searx", "seeks", "wikipedia-en", "yacy"
          ]
        }
@@ -779,7 +853,7 @@ index 544740a43..4961e5437 100644
      "id": {
        "default": {
          "visibleDefaultEngines": [
--          "google", "yahoo-id", "ddg", "wikipedia-id"
+-          "google", "ddg", "wikipedia-id"
 +          "duckduckgo-html", "duckduckgo-lite", "internet-archive", "parabola-packages", "parabola-wiki-en", "searx", "seeks", "wikipedia-en", "yacy"
          ]
        }
@@ -787,7 +861,7 @@ index 544740a43..4961e5437 100644
      "is": {
        "default": {
          "visibleDefaultEngines": [
--          "google", "yahoo", "bing", "amazondotcom", "ddg", "leit-is", "wikipedia-is"
+-          "google", "bing", "amazondotcom", "ddg", "leit-is", "wikipedia-is"
 +          "duckduckgo-html", "duckduckgo-lite", "internet-archive", "parabola-packages", "parabola-wiki-en", "searx", "seeks", "wikipedia-en", "yacy"
          ]
        }
@@ -795,7 +869,7 @@ index 544740a43..4961e5437 100644
      "it": {
        "default": {
          "visibleDefaultEngines": [
--          "google", "yahoo-it", "bing", "amazon-it", "ddg", "ebay-it", "hoepli", "wikipedia-it"
+-          "google", "bing", "amazon-it", "ddg", "ebay-it", "hoepli", "wikipedia-it"
 +          "duckduckgo-html", "duckduckgo-lite", "internet-archive", "parabola-packages", "parabola-wiki-en", "searx", "seeks", "wikipedia-en", "yacy"
          ]
        }
@@ -819,7 +893,7 @@ index 544740a43..4961e5437 100644
      "ka": {
        "default": {
          "visibleDefaultEngines": [
--          "google", "yahoo", "bing", "amazondotcom", "ddg", "twitter", "wikipedia-ka"
+-          "google", "bing", "amazondotcom", "ddg", "twitter", "wikipedia-ka"
 +          "duckduckgo-html", "duckduckgo-lite", "internet-archive", "parabola-packages", "parabola-wiki-en", "searx", "seeks", "wikipedia-en", "yacy"
          ]
        }
@@ -827,7 +901,7 @@ index 544740a43..4961e5437 100644
      "kab": {
        "default": {
          "visibleDefaultEngines": [
--          "google", "yahoo-france", "bing", "ddg", "wikipedia-kab"
+-          "google", "bing", "ddg", "wikipedia-kab"
 +          "duckduckgo-html", "duckduckgo-lite", "internet-archive", "parabola-packages", "parabola-wiki-en", "searx", "seeks", "wikipedia-en", "yacy"
          ]
        }
@@ -843,7 +917,7 @@ index 544740a43..4961e5437 100644
      "km": {
        "default": {
          "visibleDefaultEngines": [
--          "google", "yahoo", "bing", "amazondotcom", "ddg", "twitter", "wikipedia-km"
+-          "google", "bing", "amazondotcom", "ddg", "twitter", "wikipedia-km"
 +          "duckduckgo-html", "duckduckgo-lite", "internet-archive", "parabola-packages", "parabola-wiki-en", "searx", "seeks", "wikipedia-en", "yacy"
          ]
        }
@@ -851,7 +925,7 @@ index 544740a43..4961e5437 100644
      "kn": {
        "default": {
          "visibleDefaultEngines": [
--          "google", "yahoo-in", "bing", "amazondotcom", "ddg", "kannadastore", "wikipedia-kn"
+-          "google", "bing", "amazondotcom", "ddg", "kannadastore", "wikipedia-kn"
 +          "duckduckgo-html", "duckduckgo-lite", "internet-archive", "parabola-packages", "parabola-wiki-en", "searx", "seeks", "wikipedia-en", "yacy"
          ]
        }
@@ -867,7 +941,7 @@ index 544740a43..4961e5437 100644
      "lij": {
        "default": {
          "visibleDefaultEngines": [
--          "google", "yahoo-it", "bing", "amazon-it", "ddg", "ebay-it", "paroledigenova-lij", "wikipedia-lij"
+-          "google", "bing", "amazon-it", "ddg", "ebay-it", "paroledigenova-lij", "wikipedia-lij"
 +          "duckduckgo-html", "duckduckgo-lite", "internet-archive", "parabola-packages", "parabola-wiki-en", "searx", "seeks", "wikipedia-en", "yacy"
          ]
        }
@@ -875,7 +949,7 @@ index 544740a43..4961e5437 100644
      "lo": {
        "default": {
          "visibleDefaultEngines": [
--          "google", "yahoo", "bing", "ddg", "wikipedia-lo", "twitter"
+-          "google", "bing", "ddg", "wikipedia-lo", "twitter"
 +          "duckduckgo-html", "duckduckgo-lite", "internet-archive", "parabola-packages", "parabola-wiki-en", "searx", "seeks", "wikipedia-en", "yacy"
          ]
        }
@@ -891,7 +965,7 @@ index 544740a43..4961e5437 100644
      "ltg": {
        "default": {
          "visibleDefaultEngines": [
--          "google", "yahoo", "dict-enlv", "ddg", "salidzinilv", "sslv", "wikipedia-ltg"
+-          "google", "dict-enlv", "ddg", "salidzinilv", "sslv", "wikipedia-ltg"
 +          "duckduckgo-html", "duckduckgo-lite", "internet-archive", "parabola-packages", "parabola-wiki-en", "searx", "seeks", "wikipedia-en", "yacy"
          ]
        }
@@ -899,7 +973,7 @@ index 544740a43..4961e5437 100644
      "lv": {
        "default": {
          "visibleDefaultEngines": [
--          "google", "yahoo", "dict-enlv", "ddg", "salidzinilv", "sslv", "wikipedia-lv"
+-          "google", "dict-enlv", "ddg", "salidzinilv", "sslv", "wikipedia-lv"
 +          "duckduckgo-html", "duckduckgo-lite", "internet-archive", "parabola-packages", "parabola-wiki-en", "searx", "seeks", "wikipedia-en", "yacy"
          ]
        }
@@ -907,7 +981,7 @@ index 544740a43..4961e5437 100644
      "mai": {
        "default": {
          "visibleDefaultEngines": [
--          "google", "yahoo-in", "bing", "ddg", "twitter", "wikipedia-hi"
+-          "google", "bing", "ddg", "twitter", "wikipedia-hi"
 +          "duckduckgo-html", "duckduckgo-lite", "internet-archive", "parabola-packages", "parabola-wiki-en", "searx", "seeks", "wikipedia-en", "yacy"
          ]
        }
@@ -915,7 +989,7 @@ index 544740a43..4961e5437 100644
      "mk": {
        "default": {
          "visibleDefaultEngines": [
--          "google", "yahoo", "bing", "amazondotcom", "ddg", "wikipedia-mk"
+-          "google", "bing", "amazondotcom", "ddg", "wikipedia-mk"
 +          "duckduckgo-html", "duckduckgo-lite", "internet-archive", "parabola-packages", "parabola-wiki-en", "searx", "seeks", "wikipedia-en", "yacy"
          ]
        }
@@ -931,7 +1005,7 @@ index 544740a43..4961e5437 100644
      "mr": {
        "default": {
          "visibleDefaultEngines": [
--          "google", "yahoo-in", "amazondotcom", "ddg", "rediff", "wikipedia-mr"
+-          "google", "amazondotcom", "ddg", "rediff", "wikipedia-mr"
 +          "duckduckgo-html", "duckduckgo-lite", "internet-archive", "parabola-packages", "parabola-wiki-en", "searx", "seeks", "wikipedia-en", "yacy"
          ]
        }
@@ -939,7 +1013,7 @@ index 544740a43..4961e5437 100644
      "ms": {
        "default": {
          "visibleDefaultEngines": [
--          "google", "yahoo", "bing", "amazondotcom", "ddg", "twitter", "wikipedia-ms"
+-          "google", "bing", "amazondotcom", "ddg", "twitter", "wikipedia-ms"
 +          "duckduckgo-html", "duckduckgo-lite", "internet-archive", "parabola-packages", "parabola-wiki-en", "searx", "seeks", "wikipedia-en", "yacy"
          ]
        }
@@ -947,7 +1021,7 @@ index 544740a43..4961e5437 100644
      "my": {
        "default": {
          "visibleDefaultEngines": [
--          "google", "yahoo", "bing", "amazondotcom", "ddg", "twitter", "wikipedia-my"
+-          "google", "bing", "amazondotcom", "ddg", "twitter", "wikipedia-my"
 +          "duckduckgo-html", "duckduckgo-lite", "internet-archive", "parabola-packages", "parabola-wiki-en", "searx", "seeks", "wikipedia-en", "yacy"
          ]
        }
@@ -955,7 +1029,7 @@ index 544740a43..4961e5437 100644
      "nb-NO": {
        "default": {
          "visibleDefaultEngines": [
--          "google", "yahoo-NO", "amazon-en-GB", "bing", "ddg", "gulesider-NO", "bok-NO", "qxl-NO", "wikipedia-NO"
+-          "google", "amazon-en-GB", "bing", "ddg", "gulesider-NO", "bok-NO", "qxl-NO", "wikipedia-NO"
 +          "duckduckgo-html", "duckduckgo-lite", "internet-archive", "parabola-packages", "parabola-wiki-en", "searx", "seeks", "wikipedia-en", "yacy"
          ]
        }
@@ -963,7 +1037,7 @@ index 544740a43..4961e5437 100644
      "ne-NP": {
        "default": {
          "visibleDefaultEngines": [
--          "google", "yahoo", "bing", "ddg", "twitter", "wikipedia-ne"
+-          "google", "bing", "ddg", "twitter", "wikipedia-ne"
 +          "duckduckgo-html", "duckduckgo-lite", "internet-archive", "parabola-packages", "parabola-wiki-en", "searx", "seeks", "wikipedia-en", "yacy"
          ]
        }
@@ -992,7 +1066,7 @@ index 544740a43..4961e5437 100644
      "oc": {
        "default": {
          "visibleDefaultEngines": [
--          "google", "yahoo-france", "bing", "ddg", "twitter", "wikipedia-oc", "wiktionary-oc"
+-          "google", "bing", "ddg", "twitter", "wikipedia-oc", "wiktionary-oc"
 +          "duckduckgo-html", "duckduckgo-lite", "internet-archive", "parabola-packages", "parabola-wiki-en", "searx", "seeks", "wikipedia-en", "yacy"
          ]
        }
@@ -1000,7 +1074,7 @@ index 544740a43..4961e5437 100644
      "or": {
        "default": {
          "visibleDefaultEngines": [
--          "google", "yahoo-in", "bing", "amazondotcom", "ddg", "wikipedia-or"
+-          "google", "bing", "amazondotcom", "ddg", "wikipedia-or"
 +          "duckduckgo-html", "duckduckgo-lite", "internet-archive", "parabola-packages", "parabola-wiki-en", "searx", "seeks", "wikipedia-en", "yacy"
          ]
        }
@@ -1008,7 +1082,7 @@ index 544740a43..4961e5437 100644
      "pa-IN": {
        "default": {
          "visibleDefaultEngines": [
--          "google", "yahoo-in", "bing", "ddg", "wikipedia-pa"
+-          "google", "bing", "ddg", "wikipedia-pa"
 +          "duckduckgo-html", "duckduckgo-lite", "internet-archive", "parabola-packages", "parabola-wiki-en", "searx", "seeks", "wikipedia-en", "yacy"
          ]
        }
@@ -1024,7 +1098,7 @@ index 544740a43..4961e5437 100644
      "pt-BR": {
        "default": {
          "visibleDefaultEngines": [
--          "google", "yahoo-br", "bing", "buscape", "ddg", "mercadolivre", "twitter", "wikipedia-pt"
+-          "google", "bing", "buscape", "ddg", "mercadolivre", "twitter", "wikipedia-pt"
 -        ]
 -      },
 -      "experimental-hidden": {
@@ -1045,7 +1119,7 @@ index 544740a43..4961e5437 100644
      "rm": {
        "default": {
          "visibleDefaultEngines": [
--          "google", "yahoo-ch", "bing", "ddg", "ebay-ch", "leo_ende_de-rm", "pledarigrond", "wikipedia-rm"
+-          "google", "bing", "ddg", "ebay-ch", "leo_ende_de-rm", "pledarigrond", "wikipedia-rm"
 +          "duckduckgo-html", "duckduckgo-lite", "internet-archive", "parabola-packages", "parabola-wiki-en", "searx", "seeks", "wikipedia-en", "yacy"
          ]
        }
@@ -1053,7 +1127,7 @@ index 544740a43..4961e5437 100644
      "ro": {
        "default": {
          "visibleDefaultEngines": [
--          "google", "yahoo", "bing", "amazondotcom", "ddg", "wikipedia-ro"
+-          "google", "bing", "amazondotcom", "ddg", "wikipedia-ro"
 +          "duckduckgo-html", "duckduckgo-lite", "internet-archive", "parabola-packages", "parabola-wiki-en", "searx", "seeks", "wikipedia-en", "yacy"
          ]
        }
@@ -1069,7 +1143,7 @@ index 544740a43..4961e5437 100644
      "si": {
        "default": {
          "visibleDefaultEngines": [
--          "google", "yahoo", "amazondotcom", "ddg", "wikipedia-si"
+-          "google", "amazondotcom", "ddg", "wikipedia-si"
 +          "duckduckgo-html", "duckduckgo-lite", "internet-archive", "parabola-packages", "parabola-wiki-en", "searx", "seeks", "wikipedia-en", "yacy"
          ]
        }
@@ -1093,7 +1167,7 @@ index 544740a43..4961e5437 100644
      "son": {
        "default": {
          "visibleDefaultEngines": [
--          "google", "yahoo-france", "bing", "amazon-france", "ddg", "cnrtl-tlfi-fr", "wikipedia-fr"
+-          "google", "bing", "amazon-france", "ddg", "cnrtl-tlfi-fr", "wikipedia-fr"
 +          "duckduckgo-html", "duckduckgo-lite", "internet-archive", "parabola-packages", "parabola-wiki-en", "searx", "seeks", "wikipedia-en", "yacy"
          ]
        }
@@ -1101,7 +1175,7 @@ index 544740a43..4961e5437 100644
      "sq": {
        "default": {
          "visibleDefaultEngines": [
--          "google", "yahoo", "bing", "amazon-en-GB", "ddg", "wikipedia-sq"
+-          "google", "bing", "amazon-en-GB", "ddg", "wikipedia-sq"
 +          "duckduckgo-html", "duckduckgo-lite", "internet-archive", "parabola-packages", "parabola-wiki-en", "searx", "seeks", "wikipedia-en", "yacy"
          ]
        }
@@ -1117,7 +1191,7 @@ index 544740a43..4961e5437 100644
      "sv-SE": {
        "default": {
          "visibleDefaultEngines": [
--          "google", "yahoo-sv-SE", "bing", "allaannonser-sv-SE", "ddg", "prisjakt-sv-SE", "tyda-sv-SE", "wikipedia-sv-SE"
+-          "google", "bing", "allaannonser-sv-SE", "ddg", "prisjakt-sv-SE", "tyda-sv-SE", "wikipedia-sv-SE"
 +          "duckduckgo-html", "duckduckgo-lite", "internet-archive", "parabola-packages", "parabola-wiki-en", "searx", "seeks", "wikipedia-en", "yacy"
          ]
        }
@@ -1125,7 +1199,7 @@ index 544740a43..4961e5437 100644
      "ta": {
        "default": {
          "visibleDefaultEngines": [
--          "google", "yahoo-in", "ddg", "wikipedia-ta"
+-          "google", "ddg", "wikipedia-ta"
 +          "duckduckgo-html", "duckduckgo-lite", "internet-archive", "parabola-packages", "parabola-wiki-en", "searx", "seeks", "wikipedia-en", "yacy"
          ]
        }
@@ -1133,7 +1207,7 @@ index 544740a43..4961e5437 100644
      "te": {
        "default": {
          "visibleDefaultEngines": [
--          "google", "yahoo-in", "amazondotcom", "ddg", "wikipedia-te", "wiktionary-te"
+-          "google", "amazondotcom", "ddg", "wikipedia-te", "wiktionary-te"
 +          "duckduckgo-html", "duckduckgo-lite", "internet-archive", "parabola-packages", "parabola-wiki-en", "searx", "seeks", "wikipedia-en", "yacy"
          ]
        }
@@ -1141,7 +1215,7 @@ index 544740a43..4961e5437 100644
      "th": {
        "default": {
          "visibleDefaultEngines": [
--          "google", "yahoo", "amazondotcom", "bing", "ddg", "longdo", "wikipedia-th"
+-          "google", "amazondotcom", "bing", "ddg", "longdo", "wikipedia-th"
 +          "duckduckgo-html", "duckduckgo-lite", "internet-archive", "parabola-packages", "parabola-wiki-en", "searx", "seeks", "wikipedia-en", "yacy"
          ]
        }
@@ -1149,7 +1223,7 @@ index 544740a43..4961e5437 100644
      "tl": {
        "default": {
          "visibleDefaultEngines": [
--          "google", "yahoo-tl", "bing", "amazondotcom", "ddg", "twitter", "wikipedia-tl"
+-          "google", "bing", "amazondotcom", "ddg", "twitter", "wikipedia-tl"
 +          "duckduckgo-html", "duckduckgo-lite", "internet-archive", "parabola-packages", "parabola-wiki-en", "searx", "seeks", "wikipedia-en", "yacy"
          ]
        }
@@ -1173,7 +1247,7 @@ index 544740a43..4961e5437 100644
      "ur": {
        "default": {
          "visibleDefaultEngines": [
--          "google", "yahoo-in", "bing", "amazon-in", "ddg", "twitter", "wikipedia-ur"
+-          "google", "bing", "amazon-in", "ddg", "twitter", "wikipedia-ur"
 +          "duckduckgo-html", "duckduckgo-lite", "internet-archive", "parabola-packages", "parabola-wiki-en", "searx", "seeks", "wikipedia-en", "yacy"
          ]
        }
@@ -1181,7 +1255,7 @@ index 544740a43..4961e5437 100644
      "uz": {
        "default": {
          "visibleDefaultEngines": [
--          "google", "yahoo", "bing", "amazondotcom", "ddg", "twitter", "wikipedia-uz"
+-          "google", "bing", "amazondotcom", "ddg", "twitter", "wikipedia-uz"
 +          "duckduckgo-html", "duckduckgo-lite", "internet-archive", "parabola-packages", "parabola-wiki-en", "searx", "seeks", "wikipedia-en", "yacy"
          ]
        }
@@ -1197,7 +1271,7 @@ index 544740a43..4961e5437 100644
      "wo": {
        "default": {
          "visibleDefaultEngines": [
--          "google", "yahoo", "bing", "amazondotcom", "ddg", "wikipedia-wo"
+-          "google", "bing", "amazon-france", "ddg", "ebay-fr", "twitter", "wikipedia-wo"
 +          "duckduckgo-html", "duckduckgo-lite", "internet-archive", "parabola-packages", "parabola-wiki-en", "searx", "seeks", "wikipedia-en", "yacy"
          ]
        }
@@ -1221,84 +1295,8 @@ index 544740a43..4961e5437 100644
      "zh-TW": {
        "default": {
          "visibleDefaultEngines": [
--          "yahoo-zh-TW", "google", "ddg", "wikipedia-zh-TW", "yahoo-zh-TW-HK", "yahoo-bid-zh-TW", "yahoo-answer-zh-TW"
+-          "google", "ddg", "wikipedia-zh-TW"
 +          "duckduckgo-html", "duckduckgo-lite", "internet-archive", "parabola-packages", "parabola-wiki-en", "searx", "seeks", "wikipedia-en", "yacy"
          ]
        }
      }
-diff --git a/devtools/client/locales/en-US/connection-screen.dtd b/devtools/client/locales/en-US/connection-screen.dtd
-index 674a408d5..d27e97fd5 100644
---- a/devtools/client/locales/en-US/connection-screen.dtd
-+++ b/devtools/client/locales/en-US/connection-screen.dtd
-@@ -24,7 +24,7 @@
- <!-- LOCALIZATION NOTE (remoteHelp, remoteDocumentation, remoteHelpSuffix):
- these strings will be concatenated in a single label, remoteDocumentation will
- be used as text for a link to MDN. -->
--<!ENTITY remoteHelp "Firefox Developer Tools can debug remote devices (Firefox for Android and Firefox OS, for example). Make sure that you have turned on the ‘Remote debugging’ option in the remote device. For more, see the ">
-+<!ENTITY remoteHelp "Iceweasel Developer Tools can debug remote devices. Make sure that you have turned on the ‘Remote debugging’ option in the remote device. For more, see the ">
- <!ENTITY remoteDocumentation "documentation">
- <!ENTITY remoteHelpSuffix ".">
- 
-diff --git a/devtools/client/locales/en-US/sourceeditor.properties b/devtools/client/locales/en-US/sourceeditor.properties
-index 842d549f0..31dcb82e5 100644
---- a/devtools/client/locales/en-US/sourceeditor.properties
-+++ b/devtools/client/locales/en-US/sourceeditor.properties
-@@ -4,7 +4,7 @@
- 
- # LOCALIZATION NOTE These strings are used inside the Source Editor component.
- # This component is used whenever source code is displayed for the purpose of
--# being edited, inside the Firefox developer tools - current examples are the
-+# being edited, inside the Iceweasel developer tools - current examples are the
- # Scratchpad and the Style Editor tools.
- 
- # LOCALIZATION NOTE The correct localization of this file might be to keep it
-diff --git a/devtools/client/locales/en-US/toolbox.dtd b/devtools/client/locales/en-US/toolbox.dtd
-index 6097fa82a..3dfe372db 100644
---- a/devtools/client/locales/en-US/toolbox.dtd
-+++ b/devtools/client/locales/en-US/toolbox.dtd
-@@ -80,7 +80,7 @@
-   -  checkbox that toggles remote debugging, i.e. devtools.debugger.remote-enabled
-   -  boolean preference in about:config, in the options panel. -->
- <!ENTITY options.enableRemote.label3    "Enable remote debugging">
--<!ENTITY options.enableRemote.tooltip2  "Turning this option on will allow the developer tools to debug a remote instance like Firefox OS">
-+<!ENTITY options.enableRemote.tooltip2  "Turning this option on will allow the developer tools to debug a remote instance like Iceweasel OS">
- 
- <!-- LOCALIZATION NOTE (options.disableJavaScript.label,
-   -  options.disableJavaScript.tooltip): This is the options panel label and
-diff --git a/devtools/client/locales/en-US/webide.dtd b/devtools/client/locales/en-US/webide.dtd
-index 5e1a80ccd..8f375da2e 100644
---- a/devtools/client/locales/en-US/webide.dtd
-+++ b/devtools/client/locales/en-US/webide.dtd
-@@ -2,7 +2,7 @@
-    - License, v. 2.0. If a copy of the MPL was not distributed with this
-    - file, You can obtain one at http://mozilla.org/MPL/2.0/. -->
- 
--<!ENTITY windowTitle "Firefox WebIDE">
-+<!ENTITY windowTitle "Iceweasel WebIDE">
- 
- <!ENTITY projectMenu_label "Project">
- <!ENTITY projectMenu_accesskey "P">
-@@ -55,7 +55,7 @@
- <!ENTITY projectButton_label "Open App">
- <!ENTITY runtimeButton_label "Select Runtime">
- 
--<!-- We try to repicate Firefox' bindings: -->
-+<!-- We try to repicate Iceweasel' bindings: -->
- <!-- quit app -->
- <!ENTITY key_quit "W">
- <!-- open menu -->
-diff --git a/devtools/client/locales/en-US/webide.properties b/devtools/client/locales/en-US/webide.properties
-index 2368ad7f1..05e39c74f 100644
---- a/devtools/client/locales/en-US/webide.properties
-+++ b/devtools/client/locales/en-US/webide.properties
-@@ -2,8 +2,8 @@
- # License, v. 2.0. If a copy of the MPL was not distributed with this
- # file, You can obtain one at http://mozilla.org/MPL/2.0/.
- 
--title_noApp=Firefox WebIDE
--title_app=Firefox WebIDE: %S
-+title_noApp=Iceweasel WebIDE
-+title_app=Iceweasel WebIDE: %S
- 
- runtimeButton_label=Select Runtime
- projectButton_label=Open App
diff --git a/libre/iceweasel/no-crmf.diff b/libre/iceweasel/no-crmf.diff
index 242304eb4..682ba3fc0 100644
--- a/libre/iceweasel/no-crmf.diff
+++ b/libre/iceweasel/no-crmf.diff
@@ -1,9 +1,9 @@
 diff --git i/old-configure.in w/old-configure.in
-index 0a06e470d2085922..d41c8e9d5dd2dbfb 100644
+index 12170a47568f..dbbaa0bc9194 100644
 --- i/old-configure.in
 +++ w/old-configure.in
-@@ -2020,9 +2020,7 @@ if test -n "$_USE_SYSTEM_NSS"; then
-     AM_PATH_NSS(3.31, [MOZ_SYSTEM_NSS=1], [AC_MSG_ERROR([you don't have NSS installed or your version is too old])])
+@@ -1808,9 +1808,7 @@ if test -n "$_USE_SYSTEM_NSS"; then
+     AM_PATH_NSS(3.35, [MOZ_SYSTEM_NSS=1], [AC_MSG_ERROR([you don't have NSS installed or your version is too old])])
  fi
  
 -if test -n "$MOZ_SYSTEM_NSS"; then