icedove-1:31.0.deb3-2{,.nonprism1}: 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

6 files changed, 26 insertions, 78 deletions

diff --git a/libre/icedove/PKGBUILD b/libre/icedove/PKGBUILD
index 8177c5dbb..9fdf683e7 100644
--- a/libre/icedove/PKGBUILD
+++ b/libre/icedove/PKGBUILD
@@ -11,7 +11,7 @@ debfile() { echo $@|sed -r 's@(.).*@\1/&/&@'; }
 pkgname=${_debname}
 epoch=1
 pkgver=${_debver}.${_debrel}
-pkgrel=1
+pkgrel=2
 pkgdesc="A libre version of Debian Icedove, the standalone mail/news reader based on Mozilla Thunderbird."
 arch=('i686' 'x86_64' 'mips64el')
 license=('MPL' 'GPL' 'LGPL')
@@ -26,15 +26,13 @@ install=${pkgname}.install
 source=("${_debrepo}/`debfile ${_debname}`_${_debver}.orig.tar.xz"
         "${_debrepo}/`debfile ${_debname}`_${_debver}-${_debrel#deb}.debian.tar.xz"
         mozconfig
-        libre.patch
         vendor.js
         ${pkgname}.desktop)
 options=(!emptydirs)
 md5sums=('1ea1f4340b1ab29a29aed74f4d6197bd'
          'f97baf462902b155b370f010c112ad82'
          '5f2297712c3dab7b15d7d5c8a6fa22d2'
-         '68764438f2d0a8b5c90cc6d3720df46a'
-         '5a53179d14ae9631b7afe5e4d0fc0b25'
+         'b960d6e999cf49e8875743e35a00ed41'
          'e785e0c267f4435ae1a9aa0b03bcacfb')
 
 prepare() {
@@ -81,8 +79,6 @@ prepare() {
   # Fix branding
   sed -i 's|Icedove Mail/News|Icedove|' mail/branding/icedove/locales/en-US/brand.{dtd,properties}
 
-  # Patch and remove anything that's left
-  patch -Np1 -i "$srcdir/libre.patch"
   # Replace common URLs
   sed -i '\|extensions[.]getAddons[.]get[.]url| s|https://services[.]addons[.]mozilla[.]org.\+["][)][;]|http://directory.fsf.org/wiki/Icedove");|g;
           \|extensions[.]getAddons[.]search[.]browseURL| s|https://addons[.]mozilla[.]org.\+["][)][;]|http://directory.fsf.org/wiki/Icedove");|g;
diff --git a/libre/icedove/libre.patch b/libre/icedove/libre.patch
deleted file mode 100644
index e6dfbd003..000000000
--- a/libre/icedove/libre.patch
+++ /dev/null
@@ -1,33 +0,0 @@
-diff -Nur comm-esr31.orig/mozilla/modules/libpref/src/init/all.js comm-esr31/mozilla/modules/libpref/src/init/all.js
---- comm-esr31.orig/mozilla/modules/libpref/src/init/all.js	2014-09-03 06:47:59.758285255 -0300
-+++ comm-esr31/mozilla/modules/libpref/src/init/all.js	2014-09-10 21:35:52.453954055 -0300
-@@ -4110,9 +4110,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);
- 
-@@ -4268,19 +4265,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/icedove/vendor.js b/libre/icedove/vendor.js
index 170b505a8..05cce3d61 100644
--- a/libre/icedove/vendor.js
+++ b/libre/icedove/vendor.js
@@ -7,3 +7,14 @@ pref("mail.shell.checkDefaultMail", false);
 // Don't disable our bundled extensions in the application directory
 pref("extensions.autoDisableScopes", 11);
 pref("extensions.shownSelectionUI", true);
+
+// 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);
diff --git a/nonprism/icedove/PKGBUILD b/nonprism/icedove/PKGBUILD
index efb60addb..cb32b5466 100644
--- a/nonprism/icedove/PKGBUILD
+++ b/nonprism/icedove/PKGBUILD
@@ -11,7 +11,7 @@ debfile() { echo $@|sed -r 's@(.).*@\1/&/&@'; }
 pkgname=${_debname}
 epoch=1
 pkgver=${_debver}.${_debrel}
-pkgrel=1.nonprism1
+pkgrel=2.nonprism1
 pkgdesc="A libre version of Debian Icedove, the standalone mail/news reader based on Mozilla Thunderbird, without support for unsafe and dangerous for privacy protocols"
 arch=('i686' 'x86_64' 'mips64el')
 license=('MPL' 'GPL' 'LGPL')
@@ -26,15 +26,13 @@ install=${pkgname}.install
 source=("${_debrepo}/`debfile ${_debname}`_${_debver}.orig.tar.xz"
         "${_debrepo}/`debfile ${_debname}`_${_debver}-${_debrel#deb}.debian.tar.xz"
         mozconfig
-        libre.patch
         vendor.js
         ${pkgname}.desktop)
 options=(!emptydirs)
 md5sums=('1ea1f4340b1ab29a29aed74f4d6197bd'
          'f97baf462902b155b370f010c112ad82'
          '5f2297712c3dab7b15d7d5c8a6fa22d2'
-         '68764438f2d0a8b5c90cc6d3720df46a'
-         '5a53179d14ae9631b7afe5e4d0fc0b25'
+         'b960d6e999cf49e8875743e35a00ed41'
          'e785e0c267f4435ae1a9aa0b03bcacfb')
 
 prepare() {
@@ -81,8 +79,6 @@ prepare() {
   # Fix branding
   sed -i 's|Icedove Mail/News|Icedove|' mail/branding/icedove/locales/en-US/brand.{dtd,properties}
 
-  # Patch and remove anything that's left
-  patch -Np1 -i "$srcdir/libre.patch"
   # Replace common URLs
   sed -i '\|extensions[.]getAddons[.]get[.]url| s|https://services[.]addons[.]mozilla[.]org.\+["][)][;]|http://directory.fsf.org/wiki/Icedove");|g;
           \|extensions[.]getAddons[.]search[.]browseURL| s|https://addons[.]mozilla[.]org.\+["][)][;]|http://directory.fsf.org/wiki/Icedove");|g;
diff --git a/nonprism/icedove/libre.patch b/nonprism/icedove/libre.patch
deleted file mode 100644
index e6dfbd003..000000000
--- a/nonprism/icedove/libre.patch
+++ /dev/null
@@ -1,33 +0,0 @@
-diff -Nur comm-esr31.orig/mozilla/modules/libpref/src/init/all.js comm-esr31/mozilla/modules/libpref/src/init/all.js
---- comm-esr31.orig/mozilla/modules/libpref/src/init/all.js	2014-09-03 06:47:59.758285255 -0300
-+++ comm-esr31/mozilla/modules/libpref/src/init/all.js	2014-09-10 21:35:52.453954055 -0300
-@@ -4110,9 +4110,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);
- 
-@@ -4268,19 +4265,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/nonprism/icedove/vendor.js b/nonprism/icedove/vendor.js
index 170b505a8..05cce3d61 100644
--- a/nonprism/icedove/vendor.js
+++ b/nonprism/icedove/vendor.js
@@ -7,3 +7,14 @@ pref("mail.shell.checkDefaultMail", false);
 // Don't disable our bundled extensions in the application directory
 pref("extensions.autoDisableScopes", 11);
 pref("extensions.shownSelectionUI", true);
+
+// 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);