www-client/firefox-bin: disable auto-update using policies.json

Closes: https://bugs.gentoo.org/670196
Package-Manager: Portage-2.3.51, Repoman-2.3.11
RepoMan-Options: --force
Signed-off-by: Thomas Deutschmann <whissi@gentoo.org>

diff --git a/www-client/firefox-bin/files/all-gentoo-1.js b/www-client/firefox-bin/files/all-gentoo-1.js
index 0ac6d6a4988696c814299ef98307b8c2d850a2c0..a5e93b179d063c92e421e2056cc5fc4099fcf035 100644 (file)
--- a/www-client/firefox-bin/files/all-gentoo-1.js
+++ b/www-client/firefox-bin/files/all-gentoo-1.js
@@ -1,4 +1,4 @@
-// Ensure preference cann't be changed by users
+// Ensure preference can't be changed by users
 lockPref("app.update.auto", false);
 lockPref("app.update.enabled", false);
 lockPref("intl.locale.matchOS",                true);

diff --git a/www-client/firefox-bin/files/disable-auto-update.policy.json b/www-client/firefox-bin/files/disable-auto-update.policy.json
new file mode 100644 (file)
index 0000000..f366220
--- /dev/null
+++ b/www-client/firefox-bin/files/disable-auto-update.policy.json
@@ -0,0 +1,5 @@
+{
+  "policies": {
+    "DisableAppUpdate": true
+  }
+}

diff --git a/www-client/firefox-bin/firefox-bin-60.3.0.ebuild b/www-client/firefox-bin/firefox-bin-60.3.0-r1.ebuild
similarity index 96%
rename from www-client/firefox-bin/firefox-bin-60.3.0.ebuild
rename to www-client/firefox-bin/firefox-bin-60.3.0-r1.ebuild
index af452de7b79de2d2680362a63d6a5724be38adfc..371ab74243bdd6c14dbf7f42ee5a3e954b5704c1 100644 (file)
--- a/www-client/firefox-bin/firefox-bin-60.3.0.ebuild
+++ b/www-client/firefox-bin/firefox-bin-60.3.0-r1.ebuild
@@ -115,6 +115,10 @@ src_install() {
        dodir ${MOZILLA_FIVE_HOME%/*}
        mv "${S}" "${ED}"${MOZILLA_FIVE_HOME} || die
 
+       # Disable built-in auto-update because we update firefox-bin through package manager
+       insinto ${MOZILLA_FIVE_HOME}/distribution/
+       newins "${FILESDIR}"/disable-auto-update.policy.json policies.json
+
        # Fix prefs that make no sense for a system-wide install
        insinto ${MOZILLA_FIVE_HOME}/defaults/pref/
        doins "${FILESDIR}"/local-settings.js

diff --git a/www-client/firefox-bin/firefox-bin-63.0.1.ebuild b/www-client/firefox-bin/firefox-bin-63.0.1-r1.ebuild
similarity index 96%
rename from www-client/firefox-bin/firefox-bin-63.0.1.ebuild
rename to www-client/firefox-bin/firefox-bin-63.0.1-r1.ebuild
index 39a6591abfd68afdea00af400b33bc5ed637ac35..af7d272f28a59c605afcb9ddeffb3d3821b2ee02 100644 (file)
--- a/www-client/firefox-bin/firefox-bin-63.0.1.ebuild
+++ b/www-client/firefox-bin/firefox-bin-63.0.1-r1.ebuild
@@ -115,6 +115,10 @@ src_install() {
        dodir ${MOZILLA_FIVE_HOME%/*}
        mv "${S}" "${ED}"${MOZILLA_FIVE_HOME} || die
 
+       # Disable built-in auto-update because we update firefox-bin through package manager
+       insinto ${MOZILLA_FIVE_HOME}/distribution/
+       newins "${FILESDIR}"/disable-auto-update.policy.json policies.json
+
        # Fix prefs that make no sense for a system-wide install
        insinto ${MOZILLA_FIVE_HOME}/defaults/pref/
        doins "${FILESDIR}"/local-settings.js