diff options
| -rw-r--r-- | .SRCINFO | 2 | ||||
| -rw-r--r-- | firefox-52-disable-data-sharing-infobar.patch | 12 | ||||
| -rw-r--r-- | firefox-52-disable-location.services.mozilla.com.patch | 24 | ||||
| -rw-r--r-- | firefox-52-disable-pocket-leftovers.patch | 82 | ||||
| -rw-r--r-- | firefox-52-disable-reader.patch | 104 | ||||
| -rw-r--r-- | firefox-52-disable-sponsored-tiles.patch | 150 | ||||
| -rw-r--r-- | firefox-52-disable-telemetry.patch | 13 | ||||
| -rw-r--r-- | firefox-52-prefs.patch | 260 | ||||
| -rw-r--r-- | firefox-fixed-loading-icon.png | bin | 12184 -> 0 bytes | |||
| -rw-r--r-- | firefox-install-dir.patch | 11 |
10 files changed, 1 insertions, 657 deletions
@@ -1,5 +1,5 @@ # Generated by makepkg 5.0.0 -# Mon Jul 30 07:10:08 UTC 2018 +# Mon Jul 30 07:15:41 UTC 2018 pkgbase = firefox-esr-privacy pkgdesc = Standalone web browser from mozilla.org pkgver = 60.1.0 diff --git a/firefox-52-disable-data-sharing-infobar.patch b/firefox-52-disable-data-sharing-infobar.patch deleted file mode 100644 index 7857f81f237d..000000000000 --- a/firefox-52-disable-data-sharing-infobar.patch +++ /dev/null @@ -1,12 +0,0 @@ ---- firefox-45.0esr.bak/browser/base/content/browser.js 2016-03-15 -+++ firefox-45.0esr/browser/base/content/browser.js 2016-03-15 -@@ -1326,9 +1326,6 @@ - gSyncUI.init(); - gFxAccounts.init(); - -- if (AppConstants.MOZ_DATA_REPORTING) -- gDataNotificationInfoBar.init(); -- - gBrowserThumbnails.init(); - - // Add Devtools menuitems and listeners diff --git a/firefox-52-disable-location.services.mozilla.com.patch b/firefox-52-disable-location.services.mozilla.com.patch deleted file mode 100644 index 42f25557ec75..000000000000 --- a/firefox-52-disable-location.services.mozilla.com.patch +++ /dev/null @@ -1,24 +0,0 @@ ---- firefox-45.0esr.bak/toolkit/components/search/nsSearchService.js 2016-03-13 -+++ firefox-45.0esr/toolkit/components/search/nsSearchService.js 2016-03-13 -@@ -436,6 +436,10 @@ - return; - } - -+ // Prevent Firefox from contacting location.services.mozilla.com on a new profile -+ Services.prefs.setCharPref("browser.search.region", "US"); -+ return; -+ - // If we have 'isUS' but no 'countryCode' then we are almost certainly - // a profile from Fx 34/35 that set 'isUS' based purely on a timezone - // check. If this said they were US, we force region to be US. -@@ -522,6 +526,10 @@ - countryCode = Services.prefs.getCharPref("browser.search.countryCode"); - } catch(e) {} - -+ // No countryCode set, use US as default, don't contact location.services.mozilla.com -+ Services.prefs.setCharPref("browser.search.countryCode", "US"); -+ return; -+ - if (!countryCode) { - // We don't have it cached, so fetch it. fetchCountryCode() will call - // storeCountryCode if it gets a result (even if that happens after the diff --git a/firefox-52-disable-pocket-leftovers.patch b/firefox-52-disable-pocket-leftovers.patch deleted file mode 100644 index a6a0172dd6b3..000000000000 --- a/firefox-52-disable-pocket-leftovers.patch +++ /dev/null @@ -1,82 +0,0 @@ ---- firefox-52.0esr.bak/browser/app/profile/firefox.js 2017-03-09 -+++ firefox-52.0esr/browser/app/profile/firefox.js 2017-03-09 -@@ -1525,8 +1525,6 @@ - // Enable browser frames for use on desktop. Only exposed to chrome callers. - pref("dom.mozBrowserFramesEnabled", true); - --pref("extensions.pocket.enabled", true); -- - pref("signon.schemeUpgrades", true); - - // "Simplify Page" feature in Print Preview. This feature is disabled by default ---- firefox-52.0esr.bak/browser/components/uitour/UITour.jsm 2017-03-09 -+++ firefox-52.0esr/browser/components/uitour/UITour.jsm 2017-03-09 -@@ -154,11 +154,6 @@ - query: "#panic-button", - widgetName: "panic-button", - }], -- ["pocket", { -- allowAdd: true, -- query: "#pocket-button", -- widgetName: "pocket-button", -- }], - ["privateWindow", {query: "#privatebrowsing-button"}], - ["quit", {query: "#PanelUI-quit"}], - ["readerMode-urlBar", {query: "#reader-mode-button"}], -@@ -1688,46 +1683,6 @@ - popup.addEventListener("popupshown", onPopupShown); - } - aWindow.document.getElementById("identity-box").click(); -- } else if (aMenuName == "pocket") { -- this.getTarget(aWindow, "pocket").then(Task.async(function* onPocketTarget(target) { -- let widgetGroupWrapper = CustomizableUI.getWidget(target.widgetName); -- if (widgetGroupWrapper.type != "view" || !widgetGroupWrapper.viewId) { -- log.error("Can't open the pocket menu without a view"); -- return; -- } -- let placement = CustomizableUI.getPlacementOfWidget(target.widgetName); -- if (!placement || !placement.area) { -- log.error("Can't open the pocket menu without a placement"); -- return; -- } -- -- if (placement.area == CustomizableUI.AREA_PANEL) { -- // Open the appMenu and wait for it if it's not already opened or showing a subview. -- yield new Promise((resolve, reject) => { -- if (aWindow.PanelUI.panel.state != "closed") { -- if (aWindow.PanelUI.multiView.showingSubView) { -- reject("A subview is already showing"); -- return; -- } -- -- resolve(); -- return; -- } -- -- aWindow.PanelUI.panel.addEventListener("popupshown", function onShown() { -- aWindow.PanelUI.panel.removeEventListener("popupshown", onShown); -- resolve(); -- }); -- -- aWindow.PanelUI.show(); -- }); -- } -- -- let widgetWrapper = widgetGroupWrapper.forWindow(aWindow); -- aWindow.PanelUI.showSubView(widgetGroupWrapper.viewId, -- widgetWrapper.anchor, -- placement.area); -- })).catch(log.error); - } - }, - ---- firefox-52.0esr.bak/browser/extensions/moz.build 2017-03-09 -+++ firefox-52.0esr/browser/extensions/moz.build 2017-03-09 -@@ -8,7 +8,6 @@ - 'aushelper', - 'e10srollout', - 'pdfjs', -- 'pocket', - 'webcompat', - ] - diff --git a/firefox-52-disable-reader.patch b/firefox-52-disable-reader.patch deleted file mode 100644 index 5fb85f37950a..000000000000 --- a/firefox-52-disable-reader.patch +++ /dev/null @@ -1,104 +0,0 @@ ---- firefox-52.0esr.bak/browser/base/content/browser.js 2017-03-09 -+++ firefox-52.0esr/browser/base/content/browser.js 2017-03-09 -@@ -38,7 +38,6 @@ - ["ProcessHangMonitor", "resource:///modules/ProcessHangMonitor.jsm"], - ["PromiseUtils", "resource://gre/modules/PromiseUtils.jsm"], - ["ReaderMode", "resource://gre/modules/ReaderMode.jsm"], -- ["ReaderParent", "resource:///modules/ReaderParent.jsm"], - ["RecentWindow", "resource:///modules/RecentWindow.jsm"], - ["SessionStore", "resource:///modules/sessionstore/SessionStore.jsm"], - ["ShortcutUtils", "resource://gre/modules/ShortcutUtils.jsm"], -@@ -4574,7 +4573,6 @@ - } - } - UpdateBackForwardCommands(gBrowser.webNavigation); -- ReaderParent.updateReaderButton(gBrowser.selectedBrowser); - - gGestureSupport.restoreRotationState(); - ---- firefox-52.0esr.bak/browser/base/content/browser-sets.inc 2017-03-09 -+++ firefox-52.0esr/browser/base/content/browser-sets.inc 2017-03-09 -@@ -43,7 +43,6 @@ - <command id="View:PageSource" oncommand="BrowserViewSource(window.gBrowser.selectedBrowser);" observes="canViewSource"/> - <command id="View:PageInfo" oncommand="BrowserPageInfo();"/> - <command id="View:FullScreen" oncommand="BrowserFullScreen();"/> -- <command id="View:ReaderView" oncommand="ReaderParent.toggleReaderMode(event);"/> - <command id="cmd_find" - oncommand="gFindBar.onFindCommand();" - observes="isImage"/> ---- firefox-52.0esr.bak/browser/base/content/browser.xul 2017-03-09 -+++ firefox-52.0esr/browser/base/content/browser.xul 2017-03-09 -@@ -766,10 +766,6 @@ - hidden="true" - tooltiptext="&pageReportIcon.tooltip;" - onmousedown="gPopupBlockerObserver.onReportButtonMousedown(event);"/> -- <image id="reader-mode-button" -- class="urlbar-icon" -- hidden="true" -- onclick="ReaderParent.buttonClick(event);"/> - <toolbarbutton id="urlbar-zoom-button" - onclick="FullZoom.reset();" - tooltiptext="&urlbar.zoomReset.tooltip;" ---- firefox-52.0esr.bak/browser/components/nsBrowserGlue.js 2017-03-09 -+++ firefox-52.0esr/browser/components/nsBrowserGlue.js 2017-03-09 -@@ -53,7 +53,6 @@ - ["PluralForm", "resource://gre/modules/PluralForm.jsm"], - ["PrivateBrowsingUtils", "resource://gre/modules/PrivateBrowsingUtils.jsm"], - ["ProcessHangMonitor", "resource:///modules/ProcessHangMonitor.jsm"], -- ["ReaderParent", "resource:///modules/ReaderParent.jsm"], - ["RecentWindow", "resource:///modules/RecentWindow.jsm"], - ["RemotePrompt", "resource:///modules/RemotePrompt.jsm"], - ["SelfSupportBackend", "resource:///modules/SelfSupportBackend.jsm"], -@@ -670,7 +669,6 @@ - ContentPrefServiceParent.init(); - - LoginManagerParent.init(); -- ReaderParent.init(); - URLBarZoom.init(); - - SelfSupportBackend.init(); ---- firefox-52.0esr.bak/browser/components/uitour/UITour.jsm 2017-03-09 -+++ firefox-52.0esr/browser/components/uitour/UITour.jsm 2017-03-09 -@@ -34,8 +34,6 @@ - "resource://gre/modules/PrivateBrowsingUtils.jsm"); - XPCOMUtils.defineLazyModuleGetter(this, "ReaderMode", - "resource://gre/modules/ReaderMode.jsm"); --XPCOMUtils.defineLazyModuleGetter(this, "ReaderParent", -- "resource:///modules/ReaderParent.jsm"); - - // See LOG_LEVELS in Console.jsm. Common examples: "All", "Info", "Warn", & "Error". - const PREF_LOG_LEVEL = "browser.uitour.loglevel"; -@@ -661,15 +654,10 @@ - } - - case "forceShowReaderIcon": { -- ReaderParent.forceShowReaderIcon(browser); - break; - } - - case "toggleReaderMode": { -- let targetPromise = this.getTarget(window, "readerMode-urlBar"); -- targetPromise.then(target => { -- ReaderParent.toggleReaderMode({target: target.node}); -- }); - break; - } - -@@ -1948,7 +1896,6 @@ - } - - if (aFeature == "readinglist") { -- ReaderParent.showReaderModeInfoPanel(browser); - } else { - log.error("startSubTour: Unknown feature option specified"); - return; ---- firefox-52.0esr.bak/browser/modules/moz.build 2017-03-09 -+++ firefox-52.0esr/browser/modules/moz.build 2017-03-09 -@@ -35,7 +35,6 @@ - 'PermissionUI.jsm', - 'PluginContent.jsm', - 'ProcessHangMonitor.jsm', -- 'ReaderParent.jsm', - 'RecentWindow.jsm', - 'RemotePrompt.jsm', - 'Sanitizer.jsm', diff --git a/firefox-52-disable-sponsored-tiles.patch b/firefox-52-disable-sponsored-tiles.patch deleted file mode 100644 index 91214c648bd9..000000000000 --- a/firefox-52-disable-sponsored-tiles.patch +++ /dev/null @@ -1,150 +0,0 @@ ---- firefox-52.0esr.bak/browser/modules/DirectoryLinksProvider.jsm 2017-03-09 -+++ firefox-52.0esr/browser/modules/DirectoryLinksProvider.jsm 2017-03-09 -@@ -50,16 +50,16 @@ - const DIRECTORY_LINKS_TYPE = "application/json"; - - // The preference that tells whether to match the OS locale --const PREF_MATCH_OS_LOCALE = "intl.locale.matchOS"; -+const PREF_MATCH_OS_LOCALE = ""; - - // The preference that tells what locale the user selected --const PREF_SELECTED_LOCALE = "general.useragent.locale"; -+const PREF_SELECTED_LOCALE = ""; - - // The preference that tells where to obtain directory links --const PREF_DIRECTORY_SOURCE = "browser.newtabpage.directory.source"; -+const PREF_DIRECTORY_SOURCE = ""; - - // The preference that tells where to send click/view pings --const PREF_DIRECTORY_PING = "browser.newtabpage.directory.ping"; -+const PREF_DIRECTORY_PING = ""; - - // The preference that tells if newtab is enhanced - const PREF_NEWTAB_ENHANCED = "browser.newtabpage.enhanced"; -@@ -189,30 +189,6 @@ - * @return the selected locale or "en-US" if none is selected - */ - get locale() { -- let matchOS; -- try { -- matchOS = Services.prefs.getBoolPref(PREF_MATCH_OS_LOCALE); -- } -- catch (e) {} -- -- if (matchOS) { -- return Services.locale.getLocaleComponentForUserAgent(); -- } -- -- try { -- let locale = Services.prefs.getComplexValue(PREF_SELECTED_LOCALE, -- Ci.nsIPrefLocalizedString); -- if (locale) { -- return locale.data; -- } -- } -- catch (e) {} -- -- try { -- return Services.prefs.getCharPref(PREF_SELECTED_LOCALE); -- } -- catch (e) {} -- - return "en-US"; - }, - -@@ -283,13 +259,6 @@ - }, - - _fetchAndCacheLinks: function DirectoryLinksProvider_fetchAndCacheLinks(uri) { -- // Replace with the same display locale used for selecting links data -- uri = uri.replace("%LOCALE%", this.locale); -- uri = uri.replace("%CHANNEL%", UpdateUtils.UpdateChannel); -- -- return this._downloadJsonData(uri).then(json => { -- return OS.File.writeAtomic(this._directoryFilePath, json, {tmpPath: this._directoryFilePath + ".tmp"}); -- }); - }, - - /** -@@ -298,33 +267,6 @@ - * @return promise resolved to json string, "{}" returned if status != 200 - */ - _downloadJsonData: function DirectoryLinksProvider__downloadJsonData(uri) { -- let deferred = Promise.defer(); -- let xmlHttp = this._newXHR(); -- -- xmlHttp.onload = function(aResponse) { -- let json = this.responseText; -- if (this.status && this.status != 200) { -- json = "{}"; -- } -- deferred.resolve(json); -- }; -- -- xmlHttp.onerror = function(e) { -- deferred.reject("Fetching " + uri + " results in error code: " + e.target.status); -- }; -- -- try { -- xmlHttp.open("GET", uri); -- // Override the type so XHR doesn't complain about not well-formed XML -- xmlHttp.overrideMimeType(DIRECTORY_LINKS_TYPE); -- // Set the appropriate request type for servers that require correct types -- xmlHttp.setRequestHeader("Content-Type", DIRECTORY_LINKS_TYPE); -- xmlHttp.send(); -- } catch (e) { -- deferred.reject("Error fetching " + uri); -- Cu.reportError(e); -- } -- return deferred.promise; - }, - - /** -@@ -332,30 +274,6 @@ - * @return promise resolved immediately if no download needed, or upon completion - */ - _fetchAndCacheLinksIfNecessary: function DirectoryLinksProvider_fetchAndCacheLinksIfNecessary(forceDownload=false) { -- if (this._downloadDeferred) { -- // fetching links already - just return the promise -- return this._downloadDeferred.promise; -- } -- -- if (forceDownload || this._needsDownload) { -- this._downloadDeferred = Promise.defer(); -- this._fetchAndCacheLinks(this._linksURL).then(() => { -- // the new file was successfully downloaded and cached, so update a timestamp -- this._lastDownloadMS = Date.now(); -- this._downloadDeferred.resolve(); -- this._downloadDeferred = null; -- this._callObservers("onManyLinksChanged") -- }, -- error => { -- this._downloadDeferred.resolve(); -- this._downloadDeferred = null; -- this._callObservers("onDownloadFail"); -- }); -- return this._downloadDeferred.promise; -- } -- -- // download is not needed -- return Promise.resolve(); - }, - - /** -@@ -962,16 +880,6 @@ - */ - _loadInadjacentSites: function DirectoryLinksProvider_loadInadjacentSites() { - return this._downloadJsonData(this._inadjacentSitesUrl).then(jsonString => { -- let jsonObject = {}; -- try { -- jsonObject = JSON.parse(jsonString); -- } -- catch (e) { -- Cu.reportError(e); -- } -- -- this._inadjacentSites = new Set(jsonObject.domains); -- }); - }, - - /** diff --git a/firefox-52-disable-telemetry.patch b/firefox-52-disable-telemetry.patch deleted file mode 100644 index bcf27226dc25..000000000000 --- a/firefox-52-disable-telemetry.patch +++ /dev/null @@ -1,13 +0,0 @@ ---- firefox-52.0esr.bak/browser/confvars.sh 2017-03-09 09:11:36.643104656 +0100 -+++ firefox-52.0esr/browser/confvars.sh 2017-03-09 11:13:13.798231732 +0100 -@@ -62,3 +62,10 @@ - - # Include the DevTools client, not just the server (which is the default) - MOZ_DEVTOOLS=all -+ -+# Reduce data sharing with Mozilla -+MOZ_DATA_REPORTING=0 -+MOZ_TELEMETRY_REPORTING=0 -+MOZ_CRASHREPORTER=0 -+MOZ_SERVICES_HEALTHREPORT=0 -+ diff --git a/firefox-52-prefs.patch b/firefox-52-prefs.patch deleted file mode 100644 index e9406e32f1bc..000000000000 --- a/firefox-52-prefs.patch +++ /dev/null @@ -1,260 +0,0 @@ ---- firefox-52.0esr.bak/browser/app/profile/firefox.js 2017-03-09 -+++ firefox-52.0esr/browser/app/profile/firefox.js 2017-03-09 -@@ -206,7 +206,7 @@ - #endif - - // At startup, check if we're the default browser and prompt user if not. --pref("browser.shell.checkDefaultBrowser", true); -+pref("browser.shell.checkDefaultBrowser", false); - pref("browser.shell.shortcutFavicons",true); - pref("browser.shell.mostRecentDateSetAsDefault", ""); - #ifdef RELEASE_OR_BETA -@@ -220,7 +220,7 @@ - - // 0 = blank, 1 = home (browser.startup.homepage), 2 = last visited page, 3 = resume previous browser session - // The behavior of option 3 is detailed at: http://wiki.mozilla.org/Session_Restore --pref("browser.startup.page", 1); -+pref("browser.startup.page", 0); - pref("browser.startup.homepage", "chrome://branding/locale/browserconfig.properties"); - // Whether we should skip the homepage when opening the first-run page - pref("browser.startup.firstrunSkipsHomepage", false); -@@ -294,7 +294,7 @@ - pref("browser.urlbar.suggest.bookmark", true); - pref("browser.urlbar.suggest.openpage", true); - pref("browser.urlbar.suggest.searches", false); --pref("browser.urlbar.userMadeSearchSuggestionsChoice", false); -+pref("browser.urlbar.userMadeSearchSuggestionsChoice", true); - // 4 here means the suggestion notification will be automatically - // hidden the 4th day, so it will actually be shown on 3 different days. - pref("browser.urlbar.daysBeforeHidingSuggestionsPrompt", 4); -@@ -344,7 +344,7 @@ - pref("browser.download.animateNotifications", true); - - // This records whether or not the panel has been shown at least once. --pref("browser.download.panel.shown", false); -+pref("browser.download.panel.shown", true); - - #ifndef XP_MACOSX - pref("browser.helperApps.deleteTempFileOnExit", true); -@@ -419,7 +419,7 @@ - // Tabbed browser - pref("browser.tabs.closeWindowWithLastTab", true); - pref("browser.tabs.insertRelatedAfterCurrent", true); --pref("browser.tabs.warnOnClose", true); -+pref("browser.tabs.warnOnClose", false); - pref("browser.tabs.warnOnCloseOtherTabs", true); - pref("browser.tabs.warnOnOpen", true); - pref("browser.tabs.maxOpenBeforeWarn", 15); -@@ -596,7 +596,7 @@ - pref("browser.xul.error_pages.expert_bad_cert", false); - - // Enable captive portal detection. --pref("network.captive-portal-service.enabled", true); -+pref("network.captive-portal-service.enabled", false); - - // If true, network link events will change the value of navigator.onLine - pref("network.manage-offline-status", true); -@@ -1155,7 +1155,7 @@ - // Remembers if the about:newtab intro has been shown - // NOTE: This preference is unused but was not removed in case - // this information will be valuable in the future. --pref("browser.newtabpage.introShown", false); -+pref("browser.newtabpage.introShown", true); - - // Toggles the content of 'about:newtab'. Shows the grid when enabled. - pref("browser.newtabpage.enabled", true); ---- firefox-52.0esr.bak/browser/branding/official/pref/firefox-branding.js 2017-03-09 -+++ firefox-52.0esr/browser/branding/official/pref/firefox-branding.js 2017-03-09 -@@ -3,8 +3,7 @@ - * file, You can obtain one at http://mozilla.org/MPL/2.0/. */ - - pref("startup.homepage_override_url", ""); --pref("startup.homepage_welcome_url", "https://www.mozilla.org/%LOCALE%/firefox/%VERSION%/firstrun/"); --pref("startup.homepage_welcome_url.additional", ""); -+pref("startup.homepage_welcome_url", "about:blank"); - // Interval: Time between checks for a new version (in seconds) - pref("app.update.interval", 43200); // 12 hours - // The time interval between the downloading of mar file chunks in the ---- firefox-52.0esr.bak/build/application.ini 2017-03-09 -+++ firefox-52.0esr/build/application.ini 2017-03-09 -@@ -43,7 +43,7 @@ - - [XRE] - #ifdef MOZ_PROFILE_MIGRATOR --EnableProfileMigrator=1 -+EnableProfileMigrator=0 - #endif - - #if MOZ_CRASHREPORTER ---- firefox-52.0esr.bak/toolkit/components/telemetry/healthreport-prefs.js 2017-03-09 -+++ firefox-52.0esr/toolkit/components/telemetry/healthreport-prefs.js 2017-03-09 -@@ -5,6 +5,6 @@ - pref("datareporting.healthreport.infoURL", "https://www.mozilla.org/legal/privacy/firefox.html#health-report"); - - // Health Report is enabled by default on all channels. --pref("datareporting.healthreport.uploadEnabled", true); -+pref("datareporting.healthreport.uploadEnabled", false); - - pref("datareporting.healthreport.about.reportUrl", "https://fhr.cdn.mozilla.net/%LOCALE%/v4/"); ---- firefox-52.0esr.bak/modules/libpref/init/all.js 2017-03-09 -+++ firefox-52.0esr/modules/libpref/init/all.js 2017-03-09 -@@ -29,7 +29,7 @@ - - pref("general.config.obscure_value", 13); // for MCD .cfg files - --pref("general.warnOnAboutConfig", true); -+pref("general.warnOnAboutConfig", false); - - // maximum number of dated backups to keep at any time - pref("browser.bookmarks.max_backups", 5); -@@ -1523,7 +1523,7 @@ - - // The maximum number of current global half open sockets allowable - // when starting a new speculative connection. --pref("network.http.speculative-parallel-limit", 6); -+pref("network.http.speculative-parallel-limit", 0); - - // Whether or not to block requests for non head js/css items (e.g. media) - // while those elements load. -@@ -1859,7 +1859,7 @@ - pref("network.dir.format", 2); - - // enables the prefetch service (i.e., prefetching of <link rel="next"> URLs). --pref("network.prefetch-next", true); -+pref("network.prefetch-next", false); - - // enables the predictive service - pref("network.predictor.enabled", true); -@@ -2179,7 +2179,7 @@ - pref("services.settings.server", "https://firefox.settings.services.mozilla.com/v1"); - - // Blocklist preferences --pref("extensions.blocklist.enabled", true); -+pref("extensions.blocklist.enabled", false); - // OneCRL freshness checking depends on this value, so if you change it, - // please also update security.onecrl.maximum_staleness_in_seconds. - pref("extensions.blocklist.interval", 86400); -@@ -3912,7 +3912,7 @@ - - // Middle-mouse handling - pref("middlemouse.paste", true); --pref("middlemouse.contentLoadURL", true); -+pref("middlemouse.contentLoadURL", false); - pref("middlemouse.openNewWindow", true); - pref("middlemouse.scrollbarPosition", true); - -@@ -3975,7 +3975,7 @@ - - // Middle-mouse handling - pref("middlemouse.paste", true); --pref("middlemouse.contentLoadURL", true); -+pref("middlemouse.contentLoadURL", false); - pref("middlemouse.openNewWindow", true); - pref("middlemouse.scrollbarPosition", true); - -@@ -4371,7 +4371,7 @@ - - // Satchel (Form Manager) prefs - pref("browser.formfill.debug", false); --pref("browser.formfill.enable", true); -+pref("browser.formfill.enable", false); - pref("browser.formfill.expire_days", 180); - pref("browser.formfill.saveHttpsForms", true); - pref("browser.formfill.agedWeight", 2); -@@ -5061,18 +5061,18 @@ - pref("dom.mapped_arraybuffer.enabled", true); - - // The tables used for Safebrowsing phishing and malware checks. --pref("urlclassifier.malwareTable", "goog-malware-shavar,goog-unwanted-shavar,test-malware-simple,test-unwanted-simple"); -+pref("urlclassifier.malwareTable", ""); - - #ifdef MOZILLA_OFFICIAL - // In the official build, we are allowed to use google's private - // phishing list "goog-phish-shavar". See Bug 1288840. --pref("urlclassifier.phishTable", "goog-phish-shavar,test-phish-simple"); -+pref("urlclassifier.phishTable", ""); - #else --pref("urlclassifier.phishTable", "googpub-phish-shavar,test-phish-simple"); -+pref("urlclassifier.phishTable", ""); - #endif - - // Tables for application reputation. --pref("urlclassifier.downloadBlockTable", "goog-badbinurl-shavar"); -+pref("urlclassifier.downloadBlockTable", ""); - - #ifdef XP_WIN - // Only download the whitelist on Windows, since the whitelist is -@@ -5106,48 +5106,48 @@ - pref("urlclassifier.alternate_error_page", "blocked"); - - // Enable phishing protection --pref("browser.safebrowsing.phishing.enabled", true); -+pref("browser.safebrowsing.phishing.enabled", false); - - // Enable malware protection --pref("browser.safebrowsing.malware.enabled", true); -+pref("browser.safebrowsing.malware.enabled", false); - --pref("browser.safebrowsing.downloads.enabled", true); --pref("browser.safebrowsing.downloads.remote.enabled", true); -+pref("browser.safebrowsing.downloads.enabled", false); -+pref("browser.safebrowsing.downloads.remote.enabled", false); - pref("browser.safebrowsing.downloads.remote.timeout_ms", 10000); --pref("browser.safebrowsing.downloads.remote.url", "https://sb-ssl.google.com/safebrowsing/clientreport/download?key=%GOOGLE_API_KEY%"); --pref("browser.safebrowsing.downloads.remote.block_dangerous", true); --pref("browser.safebrowsing.downloads.remote.block_dangerous_host", true); --pref("browser.safebrowsing.downloads.remote.block_potentially_unwanted", true); --pref("browser.safebrowsing.downloads.remote.block_uncommon", true); -+pref("browser.safebrowsing.downloads.remote.url", ""); -+pref("browser.safebrowsing.downloads.remote.block_dangerous", false); -+pref("browser.safebrowsing.downloads.remote.block_dangerous_host", false); -+pref("browser.safebrowsing.downloads.remote.block_potentially_unwanted", false); -+pref("browser.safebrowsing.downloads.remote.block_uncommon", false); - pref("browser.safebrowsing.debug", false); - - // The protocol version we communicate with google server. - pref("browser.safebrowsing.provider.google.pver", "2.2"); --pref("browser.safebrowsing.provider.google.lists", "goog-badbinurl-shavar,goog-downloadwhite-digest256,goog-phish-shavar,googpub-phish-shavar,goog-malware-shavar,goog-unwanted-shavar"); --pref("browser.safebrowsing.provider.google.updateURL", "https://safebrowsing.google.com/safebrowsing/downloads?client=SAFEBROWSING_ID&appver=%MAJOR_VERSION%&pver=2.2&key=%GOOGLE_API_KEY%"); --pref("browser.safebrowsing.provider.google.gethashURL", "https://safebrowsing.google.com/safebrowsing/gethash?client=SAFEBROWSING_ID&appver=%MAJOR_VERSION%&pver=2.2"); --pref("browser.safebrowsing.provider.google.reportURL", "https://safebrowsing.google.com/safebrowsing/diagnostic?client=%NAME%&hl=%LOCALE%&site="); -+pref("browser.safebrowsing.provider.google.lists", ""); -+pref("browser.safebrowsing.provider.google.updateURL", ""); -+pref("browser.safebrowsing.provider.google.gethashURL", ""); -+pref("browser.safebrowsing.provider.google.reportURL", ""); - - // Prefs for v4. - pref("browser.safebrowsing.provider.google4.pver", "4"); --pref("browser.safebrowsing.provider.google4.lists", "goog-phish-proto,googpub-phish-proto,goog-malware-proto,goog-unwanted-proto"); --pref("browser.safebrowsing.provider.google4.updateURL", "https://safebrowsing.googleapis.com/v4/threatListUpdates:fetch?$ct=application/x-protobuf&key=%GOOGLE_API_KEY%"); --pref("browser.safebrowsing.provider.google4.gethashURL", "https://safebrowsing.googleapis.com/v4/fullHashes:find?$req=%REQUEST_BASE64%&$ct=application/x-protobuf&key=%GOOGLE_API_KEY%"); --pref("browser.safebrowsing.provider.google4.reportURL", "https://safebrowsing.google.com/safebrowsing/diagnostic?client=%NAME%&hl=%LOCALE%&site="); -- --pref("browser.safebrowsing.reportPhishMistakeURL", "https://%LOCALE%.phish-error.mozilla.com/?hl=%LOCALE%&url="); --pref("browser.safebrowsing.reportPhishURL", "https://%LOCALE%.phish-report.mozilla.com/?hl=%LOCALE%&url="); --pref("browser.safebrowsing.reportMalwareMistakeURL", "https://%LOCALE%.malware-error.mozilla.com/?hl=%LOCALE%&url="); -+pref("browser.safebrowsing.provider.google4.lists", ""); -+pref("browser.safebrowsing.provider.google4.updateURL", ""); -+pref("browser.safebrowsing.provider.google4.gethashURL", ""); -+pref("browser.safebrowsing.provider.google4.reportURL", ""); -+ -+pref("browser.safebrowsing.reportPhishMistakeURL", ""); -+pref("browser.safebrowsing.reportPhishURL", ""); -+pref("browser.safebrowsing.reportMalwareMistakeURL", ""); - - // The table and global pref for blocking plugin content --pref("browser.safebrowsing.blockedURIs.enabled", true); -+pref("browser.safebrowsing.blockedURIs.enabled", false); - pref("urlclassifier.blockedTable", "test-block-simple,mozplugin-block-digest256"); - - // The protocol version we communicate with mozilla server. - pref("browser.safebrowsing.provider.mozilla.pver", "2.2"); --pref("browser.safebrowsing.provider.mozilla.lists", "base-track-digest256,mozstd-trackwhite-digest256,content-track-digest256,mozplugin-block-digest256,mozplugin2-block-digest256"); --pref("browser.safebrowsing.provider.mozilla.updateURL", "https://shavar.services.mozilla.com/downloads?client=SAFEBROWSING_ID&appver=%MAJOR_VERSION%&pver=2.2"); --pref("browser.safebrowsing.provider.mozilla.gethashURL", "https://shavar.services.mozilla.com/gethash?client=SAFEBROWSING_ID&appver=%MAJOR_VERSION%&pver=2.2"); -+pref("browser.safebrowsing.provider.mozilla.lists", ""); -+pref("browser.safebrowsing.provider.mozilla.updateURL", ""); -+pref("browser.safebrowsing.provider.mozilla.gethashURL", ""); - // Set to a date in the past to force immediate download in new profiles. - pref("browser.safebrowsing.provider.mozilla.nextupdatetime", "1"); - // Block lists for tracking protection. The name values will be used as the keys diff --git a/firefox-fixed-loading-icon.png b/firefox-fixed-loading-icon.png Binary files differdeleted file mode 100644 index 55f25e591ff5..000000000000 --- a/firefox-fixed-loading-icon.png +++ /dev/null diff --git a/firefox-install-dir.patch b/firefox-install-dir.patch deleted file mode 100644 index c2dda0013c71..000000000000 --- a/firefox-install-dir.patch +++ /dev/null @@ -1,11 +0,0 @@ ---- firefox-52.0esr.bak/config/baseconfig.mk 2017-03-09 09:11:38.434104687 +0100 -+++ firefox-52.0esr/config/baseconfig.mk 2017-03-09 11:26:48.571245921 +0100 -@@ -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 |
