diff options
author | Thomas Deutschmann <whissi@gentoo.org> | 2020-03-27 23:43:21 +0100 |
---|---|---|
committer | Thomas Deutschmann <whissi@gentoo.org> | 2020-03-30 13:45:08 +0200 |
commit | 1439e84dcb0864aa6e2f2e7b16e1bce0ec5bb3f9 (patch) | |
tree | c5f42b0d205c9de905d354ac361da6db9d25116d /www-client/firefox-bin | |
parent | www-client/firefox: disable Normandy service by default (diff) | |
download | gentoo-1439e84dcb0864aa6e2f2e7b16e1bce0ec5bb3f9.tar.gz gentoo-1439e84dcb0864aa6e2f2e7b16e1bce0ec5bb3f9.tar.bz2 gentoo-1439e84dcb0864aa6e2f2e7b16e1bce0ec5bb3f9.zip |
www-client/firefox-bin: disable Normandy service by default
Closes: https://bugs.gentoo.org/713782
Package-Manager: Portage-2.3.96, Repoman-2.3.22
Signed-off-by: Thomas Deutschmann <whissi@gentoo.org>
Diffstat (limited to 'www-client/firefox-bin')
-rw-r--r-- | www-client/firefox-bin/files/all-gentoo-3.js | 7 | ||||
-rw-r--r-- | www-client/firefox-bin/firefox-bin-68.6.0-r1.ebuild (renamed from www-client/firefox-bin/firefox-bin-68.6.0.ebuild) | 41 | ||||
-rw-r--r-- | www-client/firefox-bin/firefox-bin-74.0-r1.ebuild (renamed from www-client/firefox-bin/firefox-bin-74.0.ebuild) | 26 |
3 files changed, 68 insertions, 6 deletions
diff --git a/www-client/firefox-bin/files/all-gentoo-3.js b/www-client/firefox-bin/files/all-gentoo-3.js index ddc782fde36c..867bf5e59a46 100644 --- a/www-client/firefox-bin/files/all-gentoo-3.js +++ b/www-client/firefox-bin/files/all-gentoo-3.js @@ -13,3 +13,10 @@ pref("browser.EULA.override", true); // We believe in user choice - disable DNS-over-HTTPS by default defaultPref("network.trr.mode", 5); + +// Normandy web service allows upstream to push changes +// like changed default preferences or even add-ons to users +// without the need to re-release a new version. Because this +// happens without any user prompt we believe this should be +// disabled by default. +defaultPref("app.normandy.enabled", false); diff --git a/www-client/firefox-bin/firefox-bin-68.6.0.ebuild b/www-client/firefox-bin/firefox-bin-68.6.0-r1.ebuild index d95d92d07396..ebcea91ab14e 100644 --- a/www-client/firefox-bin/firefox-bin-68.6.0.ebuild +++ b/www-client/firefox-bin/firefox-bin-68.6.0-r1.ebuild @@ -23,7 +23,7 @@ MOZ_P="${MOZ_PN}-${MOZ_PV}" MOZ_HTTP_URI="https://archive.mozilla.org/pub/mozilla.org/${MOZ_PN}/releases/" -inherit mozlinguas-v2 nsplugins pax-utils xdg-utils +inherit mozlinguas-v2 nsplugins pax-utils xdg-utils eapi7-ver DESCRIPTION="Firefox Web Browser" SRC_URI="${SRC_URI} @@ -169,6 +169,10 @@ src_install() { } pkg_postinst() { + # Update mimedb for the new .desktop file + xdg_desktop_database_update + xdg_icon_cache_update + if ! has_version 'gnome-base/gconf' || ! has_version 'gnome-base/orbit' \ || ! has_version 'net-misc/curl'; then einfo @@ -187,9 +191,38 @@ pkg_postinst() { ewarn "USE=-pulseaudio & USE=-alsa : For audio please either set USE=pulseaudio or USE=alsa!" fi - # Update mimedb for the new .desktop file - xdg_desktop_database_update - xdg_icon_cache_update + local show_normandy_information + + if [[ -z "${REPLACING_VERSIONS}" ]] ; then + # New install + show_normandy_information=yes + else + local replacing_version + for replacing_version in ${REPLACING_VERSIONS} ; do + if ver_test "${replacing_version}" -lt 68.6.0-r1 ; then + # Tell user only once about our Normandy default + show_normandy_information=yes + break + fi + done + fi + + # bug 713782 + if [[ -n "${show_normandy_information}" ]] ; then + elog + elog "Upstream operates a service named Normandy which allows Mozilla to" + elog "push changes for default settings or even install new add-ons remotely." + elog "While this can be useful to address problems like 'Armagadd-on 2.0' or" + elog "revert previous decisions to disable TLS 1.0/1.1, privacy and security" + elog "concerns prevail, which is why we have switched off the use of this" + elog "service by default." + elog + elog "To re-enable this service set" + elog + elog " app.normandy.enabled=true" + elog + elog "in about:config." + fi } pkg_postrm() { diff --git a/www-client/firefox-bin/firefox-bin-74.0.ebuild b/www-client/firefox-bin/firefox-bin-74.0-r1.ebuild index 8ec338ce7b01..cb0124280426 100644 --- a/www-client/firefox-bin/firefox-bin-74.0.ebuild +++ b/www-client/firefox-bin/firefox-bin-74.0-r1.ebuild @@ -192,18 +192,23 @@ pkg_postinst() { ewarn "USE=-pulseaudio & USE=-alsa : For audio please either set USE=pulseaudio or USE=alsa!" fi - local show_doh_information + local show_doh_information show_normandy_information if [[ -z "${REPLACING_VERSIONS}" ]] ; then # New install; Tell user that DoH is disabled by default show_doh_information=yes + show_normandy_information=yes else local replacing_version for replacing_version in ${REPLACING_VERSIONS} ; do if ver_test "${replacing_version}" -lt 70 ; then # Tell user only once about our DoH default show_doh_information=yes - break + fi + + if ver_test "${replacing_version}" -lt 74.0-r1 ; then + # Tell user only once about our Normandy default + show_normandy_information=yes fi done fi @@ -217,6 +222,23 @@ pkg_postinst() { elog "(\"Off by choice\") by default." elog "You can enable DNS-over-HTTPS in ${PN^}'s preferences." fi + + # bug 713782 + if [[ -n "${show_normandy_information}" ]] ; then + elog + elog "Upstream operates a service named Normandy which allows Mozilla to" + elog "push changes for default settings or even install new add-ons remotely." + elog "While this can be useful to address problems like 'Armagadd-on 2.0' or" + elog "revert previous decisions to disable TLS 1.0/1.1, privacy and security" + elog "concerns prevail, which is why we have switched off the use of this" + elog "service by default." + elog + elog "To re-enable this service set" + elog + elog " app.normandy.enabled=true" + elog + elog "in about:config." + fi } pkg_postrm() { |