| 1 |
commit: 09821ae9942800256678a8b4335e907b5484b0b9 |
| 2 |
Author: Thomas Deutschmann <whissi <AT> gentoo <DOT> org> |
| 3 |
AuthorDate: Sun Nov 4 14:46:32 2018 +0000 |
| 4 |
Commit: Thomas Deutschmann <whissi <AT> gentoo <DOT> org> |
| 5 |
CommitDate: Sun Nov 4 14:53:51 2018 +0000 |
| 6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=09821ae9 |
| 7 |
|
| 8 |
www-client/firefox-bin: disable auto-update using policies.json |
| 9 |
|
| 10 |
Closes: https://bugs.gentoo.org/670196 |
| 11 |
Package-Manager: Portage-2.3.51, Repoman-2.3.11 |
| 12 |
RepoMan-Options: --force |
| 13 |
Signed-off-by: Thomas Deutschmann <whissi <AT> gentoo.org> |
| 14 |
|
| 15 |
www-client/firefox-bin/files/all-gentoo-1.js | 2 +- |
| 16 |
www-client/firefox-bin/files/disable-auto-update.policy.json | 5 +++++ |
| 17 |
.../{firefox-bin-60.3.0.ebuild => firefox-bin-60.3.0-r1.ebuild} | 4 ++++ |
| 18 |
.../{firefox-bin-63.0.1.ebuild => firefox-bin-63.0.1-r1.ebuild} | 4 ++++ |
| 19 |
4 files changed, 14 insertions(+), 1 deletion(-) |
| 20 |
|
| 21 |
diff --git a/www-client/firefox-bin/files/all-gentoo-1.js b/www-client/firefox-bin/files/all-gentoo-1.js |
| 22 |
index 0ac6d6a4988..a5e93b179d0 100644 |
| 23 |
--- a/www-client/firefox-bin/files/all-gentoo-1.js |
| 24 |
+++ b/www-client/firefox-bin/files/all-gentoo-1.js |
| 25 |
@@ -1,4 +1,4 @@ |
| 26 |
-// Ensure preference cann't be changed by users |
| 27 |
+// Ensure preference can't be changed by users |
| 28 |
lockPref("app.update.auto", false); |
| 29 |
lockPref("app.update.enabled", false); |
| 30 |
lockPref("intl.locale.matchOS", true); |
| 31 |
|
| 32 |
diff --git a/www-client/firefox-bin/files/disable-auto-update.policy.json b/www-client/firefox-bin/files/disable-auto-update.policy.json |
| 33 |
new file mode 100644 |
| 34 |
index 00000000000..f36622021fc |
| 35 |
--- /dev/null |
| 36 |
+++ b/www-client/firefox-bin/files/disable-auto-update.policy.json |
| 37 |
@@ -0,0 +1,5 @@ |
| 38 |
+{ |
| 39 |
+ "policies": { |
| 40 |
+ "DisableAppUpdate": true |
| 41 |
+ } |
| 42 |
+} |
| 43 |
|
| 44 |
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 |
| 45 |
similarity index 96% |
| 46 |
rename from www-client/firefox-bin/firefox-bin-60.3.0.ebuild |
| 47 |
rename to www-client/firefox-bin/firefox-bin-60.3.0-r1.ebuild |
| 48 |
index af452de7b79..371ab74243b 100644 |
| 49 |
--- a/www-client/firefox-bin/firefox-bin-60.3.0.ebuild |
| 50 |
+++ b/www-client/firefox-bin/firefox-bin-60.3.0-r1.ebuild |
| 51 |
@@ -115,6 +115,10 @@ src_install() { |
| 52 |
dodir ${MOZILLA_FIVE_HOME%/*} |
| 53 |
mv "${S}" "${ED}"${MOZILLA_FIVE_HOME} || die |
| 54 |
|
| 55 |
+ # Disable built-in auto-update because we update firefox-bin through package manager |
| 56 |
+ insinto ${MOZILLA_FIVE_HOME}/distribution/ |
| 57 |
+ newins "${FILESDIR}"/disable-auto-update.policy.json policies.json |
| 58 |
+ |
| 59 |
# Fix prefs that make no sense for a system-wide install |
| 60 |
insinto ${MOZILLA_FIVE_HOME}/defaults/pref/ |
| 61 |
doins "${FILESDIR}"/local-settings.js |
| 62 |
|
| 63 |
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 |
| 64 |
similarity index 96% |
| 65 |
rename from www-client/firefox-bin/firefox-bin-63.0.1.ebuild |
| 66 |
rename to www-client/firefox-bin/firefox-bin-63.0.1-r1.ebuild |
| 67 |
index 39a6591abfd..af7d272f28a 100644 |
| 68 |
--- a/www-client/firefox-bin/firefox-bin-63.0.1.ebuild |
| 69 |
+++ b/www-client/firefox-bin/firefox-bin-63.0.1-r1.ebuild |
| 70 |
@@ -115,6 +115,10 @@ src_install() { |
| 71 |
dodir ${MOZILLA_FIVE_HOME%/*} |
| 72 |
mv "${S}" "${ED}"${MOZILLA_FIVE_HOME} || die |
| 73 |
|
| 74 |
+ # Disable built-in auto-update because we update firefox-bin through package manager |
| 75 |
+ insinto ${MOZILLA_FIVE_HOME}/distribution/ |
| 76 |
+ newins "${FILESDIR}"/disable-auto-update.policy.json policies.json |
| 77 |
+ |
| 78 |
# Fix prefs that make no sense for a system-wide install |
| 79 |
insinto ${MOZILLA_FIVE_HOME}/defaults/pref/ |
| 80 |
doins "${FILESDIR}"/local-settings.js |
Archives