From 5e0af3574e1098abd2099834d86214d2fc262d07 Mon Sep 17 00:00:00 2001 From: André Fabian Silva Delgado Date: Thu, 11 Sep 2014 10:40:40 -0300 Subject: iceweasel-1:32.0.deb1-2: revert changes related to Social and GeoLocation removal on libre.patch and put them on vendor.js to disable and keep empty the preferences -> https://lists.parabolagnulinux.org/pipermail/dev/2014-September/002352.html --- libre/iceweasel/PKGBUILD | 6 +-- libre/iceweasel/libre.patch | 93 +-------------------------------------------- libre/iceweasel/vendor.js | 14 +++++++ 3 files changed, 19 insertions(+), 94 deletions(-) (limited to 'libre') diff --git a/libre/iceweasel/PKGBUILD b/libre/iceweasel/PKGBUILD index 1153282e1..d0f83e12e 100644 --- a/libre/iceweasel/PKGBUILD +++ b/libre/iceweasel/PKGBUILD @@ -22,7 +22,7 @@ debfile() { echo $@|sed -r 's@(.).*@\1/&/&@'; } pkgname=iceweasel epoch=1 pkgver=$_debver.$_debrel -pkgrel=1 +pkgrel=2 pkgdesc="A libre version of Debian Iceweasel, the standalone web browser based on Mozilla Firefox." arch=(i686 x86_64 mips64el) @@ -58,11 +58,11 @@ md5sums=('cfc55fb35f740f90736381c6060534de' 'bf737a17c17b2ac01742b84921bbc5d0' '2f5cb3df42b09fbfeaee5e72e5433ab9' 'df08eaa1ac3bc6c2356be4fbf8ec8932' - '49dc620c3e6190417138a2709c596ab1' + '70606204cb01e9b9a86e0d45a315fc93' 'b03a979a78484503ba8dddad4f2c96d1' '7b9e5996dd9fe0b186a43a297db1c6b5' '1c42509891cf6843660a5f3c69896e80' - 'd6d1d8fa09082766ba8df2ca4b898cba' + 'fe1b3c1026f0071c9755daea2ab95928' '8c1578232b7a60fa1caa9a0b322d1e2b' '6e335a517c68488941340ee1c23f97b0') diff --git a/libre/iceweasel/libre.patch b/libre/iceweasel/libre.patch index 6b677a604..c75c71ff5 100644 --- a/libre/iceweasel/libre.patch +++ b/libre/iceweasel/libre.patch @@ -1,6 +1,6 @@ diff -Nur mozilla-release.orig/browser/app/profile/firefox.js mozilla-release/browser/app/profile/firefox.js --- mozilla-release.orig/browser/app/profile/firefox.js 2014-09-06 03:49:57.595535603 -0300 -+++ mozilla-release/browser/app/profile/firefox.js 2014-09-06 19:02:37.099979919 -0300 ++++ mozilla-release/browser/app/profile/firefox.js 2014-09-11 09:55:20.763590118 -0300 @@ -282,11 +282,6 @@ pref("browser.slowStartup.timeThreshold", 45000); pref("browser.slowStartup.maxSamples", 5); @@ -13,16 +13,7 @@ diff -Nur mozilla-release.orig/browser/app/profile/firefox.js mozilla-release/br pref("browser.enable_automatic_image_resizing", true); pref("browser.chrome.site_icons", true); pref("browser.chrome.favicons", true); -@@ -1001,8 +996,6 @@ - #endif - #endif - --pref("browser.geolocation.warning.infoURL", "https://www.mozilla.org/%LOCALE%/firefox/geolocation/"); -- - pref("browser.EULA.version", 3); - pref("browser.rights.version", 3); - pref("browser.rights.3.shown", false); -@@ -1540,12 +1533,7 @@ +@@ -1540,12 +1535,7 @@ // (This is intentionally on the high side; see bug 746055.) pref("image.mem.max_decoded_image_kb", 256000); @@ -36,21 +27,6 @@ diff -Nur mozilla-release.orig/browser/app/profile/firefox.js mozilla-release/br // Turn on the CSP 1.0 parser for Content Security Policy headers pref("security.csp.speccompliant", true); -@@ -1563,14 +1551,6 @@ - // before content. - pref("dom.debug.propagate_gesture_events_through_content", false); - --// The request URL of the GeoLocation backend. --pref("geo.wifi.uri", "https://www.googleapis.com/geolocation/v1/geolocate?key=%GOOGLE_API_KEY%"); --#ifdef RELEASE_BUILD --pref("geo.wifi.logging.enabled", false); --#else --pref("geo.wifi.logging.enabled", true); --#endif -- - // Necko IPC security checks only needed for app isolation for cookies/cache/etc: - // currently irrelevant for desktop e10s - pref("network.disable.ipc.security", true); diff -Nur mozilla-release.orig/browser/base/content/abouthome/aboutHome.css mozilla-release/browser/base/content/abouthome/aboutHome.css --- mozilla-release.orig/browser/base/content/abouthome/aboutHome.css 2014-07-16 22:45:05.000000000 -0300 +++ mozilla-release/browser/base/content/abouthome/aboutHome.css 2014-07-23 13:21:52.223313722 -0300 @@ -810,38 +786,6 @@ diff -Nur mozilla-release.orig/browser/locales/generic/profile/bookmarks.html.in +
h-node

-diff -Nur mozilla-release.orig/browser/metro/profile/metro.js mozilla-release/browser/metro/profile/metro.js ---- mozilla-release.orig/browser/metro/profile/metro.js 2014-08-26 00:37:46.000000000 -0300 -+++ mozilla-release/browser/metro/profile/metro.js 2014-09-06 19:04:07.470577250 -0300 -@@ -386,7 +386,6 @@ - pref("privacy.item.downloads", true); - pref("privacy.item.passwords", true); - pref("privacy.item.sessions", true); --pref("privacy.item.geolocation", true); - pref("privacy.item.siteSettings", true); - pref("privacy.item.syncAccount", true); - -@@ -402,10 +401,6 @@ - pref("privacy.sanitize.sanitizeOnShutdown", false); - pref("privacy.sanitize.migrateFx3Prefs", false); - --// enable geo --pref("geo.enabled", true); --pref("geo.wifi.uri", "https://www.googleapis.com/geolocation/v1/geolocate?key=%GOOGLE_API_KEY%"); -- - // snapped view - pref("browser.ui.snapped.maxWidth", 600); - -@@ -614,9 +609,6 @@ - pref("browser.safebrowsing.provider.0.reportMalwareURL", "http://{moz:locale}.malware-report.mozilla.com/?hl={moz:locale}"); - pref("browser.safebrowsing.provider.0.reportMalwareErrorURL", "http://{moz:locale}.malware-error.mozilla.com/?hl={moz:locale}"); - --// FAQ URLs --pref("browser.geolocation.warning.infoURL", "https://www.mozilla.org/%LOCALE%/firefox/geolocation/"); -- - // Name of the about: page contributed by safebrowsing to handle display of error - // pages on phishing/malware hits. (bug 399233) - pref("urlclassifier.alternate_error_page", "blocked"); diff -Nur mozilla-release.orig/browser/modules/AboutHome.jsm mozilla-release/browser/modules/AboutHome.jsm --- mozilla-release.orig/browser/modules/AboutHome.jsm 2014-08-26 00:37:46.000000000 -0300 +++ mozilla-release/browser/modules/AboutHome.jsm 2014-09-05 17:07:48.222390205 -0300 @@ -940,36 +884,3 @@ diff -Nur mozilla-release.orig/browser/modules/AboutHome.jsm mozilla-release/bro if (target) { target.messageManager.sendAsyncMessage("AboutHome:Update", data); } else { -diff -Nur mozilla-release.orig/modules/libpref/src/init/all.js mozilla-release/modules/libpref/src/init/all.js ---- mozilla-release.orig/modules/libpref/src/init/all.js 2014-09-06 03:49:57.585535519 -0300 -+++ mozilla-release/modules/libpref/src/init/all.js 2014-09-06 19:00:54.215970597 -0300 -@@ -3863,9 +3863,6 @@ - // Force all possible layers to be always active layers - pref("layers.force-active", false); - --// Enable/Disable the geolocation API for content --pref("geo.enabled", true); -- - // Enable/Disable the orientation API for content - pref("device.sensors.enabled", true); - -@@ -4024,19 +4021,6 @@ - // Number of stack frames to capture in createObjectURL for about:memory. - pref("memory.blob_report.stack_frames", 0); - --// comma separated list of domain origins (e.g. https://domain.com) for --// providers that can install from their own website without user warnings. --// entries are --pref("social.whitelist", "https://mozsocial.cliqz.com,https://now.msn.com,https://mixi.jp"); --// comma separated list of domain origins (e.g. https://domain.com) for --// directory websites (e.g. AMO) that can install providers for other sites --pref("social.directories", "https://activations.cdn.mozilla.net"); --// remote-install allows any website to activate a provider, with extended UI --// notifying user of installation. we can later pref off remote install if --// necessary. This does not affect whitelisted and directory installs. --pref("social.remote-install.enabled", true); --pref("social.toast-notifications.enabled", true); -- - // Disable idle observer fuzz, because only privileged content can access idle - // observers (bug 780507). - pref("dom.idle-observers-api.fuzz_time.disabled", true); diff --git a/libre/iceweasel/vendor.js b/libre/iceweasel/vendor.js index 78b5eeb45..31f092cd7 100644 --- a/libre/iceweasel/vendor.js +++ b/libre/iceweasel/vendor.js @@ -20,3 +20,17 @@ pref("plugins.notifyMissingFlash", false); // Disable "alt" as a shortcut key to open full menu bar. Conflicts with "alt" as a modifier pref("ui.key.menuAccessKeyFocuses", false); + +// Disable Social API for content +pref("social.remote-install.enabled", false); +pref("social.toast-notifications.enabled", false); + +// Make sure that whitelisted and directory installs are empty +pref("social.whitelist", ""); +pref("social.directories", ""); + +// Disable the GeoLocation API for content +pref("geo.enabled", false); + +// Make sure that the request URL of the GeoLocation backend is empty +pref("geo.wifi.uri", ""); -- cgit v1.2.3