diff -Nru firefox-62.0+build2/debian/changelog firefox-62.0+build2/debian/changelog --- firefox-62.0+build2/debian/changelog 2018-09-12 00:36:32.000000000 +0000 +++ firefox-62.0+build2/debian/changelog 2018-09-13 16:37:16.000000000 +0000 @@ -1,3 +1,12 @@ +firefox (62.0+build2-0ubuntu0.14.04.5) trusty-security; urgency=medium + + * Final part of the fix for LP: #1791789: Cleanup extra Amazon.com + search engine in locales that have their own Amazon search engine + - add debian/patches/cleanup-old-distribution-search-engines.patch + - update debian/patches/series + + -- Chris Coulson Thu, 13 Sep 2018 17:37:16 +0100 + firefox (62.0+build2-0ubuntu0.14.04.4) trusty-security; urgency=medium * Fix LP: #1791789: Mark distribution search engines as read-only, so that diff -Nru firefox-62.0+build2/debian/patches/cleanup-old-distribution-search-engines.patch firefox-62.0+build2/debian/patches/cleanup-old-distribution-search-engines.patch --- firefox-62.0+build2/debian/patches/cleanup-old-distribution-search-engines.patch 1970-01-01 00:00:00.000000000 +0000 +++ firefox-62.0+build2/debian/patches/cleanup-old-distribution-search-engines.patch 2018-09-13 16:37:16.000000000 +0000 @@ -0,0 +1,28 @@ +Description: Cleanup after LP: #1791789. This bug resulted in some en-US + distribution search engines (specifically Amazon.com) enabled for non en-US + users. This should have normally been cleaned up on upgrade because + SearchService.prototype._loadEnginesFromCache skips read-only engines when + rebuilding the cache, but prior to that bug being fixed, distribution search + engines were not marked as read-only. + . + This is a temporary fix to clean up profiles for users who upgraded to the + initial 60.0 release. It can be dropped at some point in the future. +Author: Chris Coulson +Forwarded: not-needed + +--- a/toolkit/components/search/nsSearchService.js ++++ b/toolkit/components/search/nsSearchService.js +@@ -3236,6 +3236,13 @@ + continue; + } + ++ // Temporary cleanup for https://launchpad.net/bugs/1791789 - distribution ++ // engines prior to this update were not marked as read only ++ if (skipReadOnly && /^(\[distribution\])/.test(engine._loadPath)) { ++ ++skippedEngines; ++ continue; ++ } ++ + this._loadEngineFromCache(engine); + } + diff -Nru firefox-62.0+build2/debian/patches/series firefox-62.0+build2/debian/patches/series --- firefox-62.0+build2/debian/patches/series 2018-09-12 00:36:32.000000000 +0000 +++ firefox-62.0+build2/debian/patches/series 2018-09-13 16:37:16.000000000 +0000 @@ -29,3 +29,4 @@ mark-distribution-search-engines-as-read-only.patch search-service-dont-handle-locale-changes-on-shutdown.patch drop-check-glibc-symbols.patch +cleanup-old-distribution-search-engines.patch