| 1 |
commit: 01c322d14b9adaafc8711b73010f0a2f9a9b9916 |
| 2 |
Author: Thomas Deutschmann <whissi <AT> gentoo <DOT> org> |
| 3 |
AuthorDate: Mon Mar 30 13:47:01 2020 +0000 |
| 4 |
Commit: Thomas Deutschmann <whissi <AT> gentoo <DOT> org> |
| 5 |
CommitDate: Mon Mar 30 13:47:27 2020 +0000 |
| 6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=01c322d1 |
| 7 |
|
| 8 |
www-client/firefox: really disable Normandy service |
| 9 |
|
| 10 |
...while there, also disable DoH which we already disabled |
| 11 |
in normal Firefox. |
| 12 |
|
| 13 |
Fixes 23e30a18c ("www-client/firefox: disable Normandy service by default") |
| 14 |
Bug: https://bugs.gentoo.org/713782 |
| 15 |
Package-Manager: Portage-2.3.96, Repoman-2.3.22 |
| 16 |
Signed-off-by: Thomas Deutschmann <whissi <AT> gentoo.org> |
| 17 |
|
| 18 |
www-client/firefox/files/gentoo-default-prefs.js-2 | 17 --------------- |
| 19 |
...x-68.6.0-r2.ebuild => firefox-68.6.0-r3.ebuild} | 25 +++++++++++++++++----- |
| 20 |
2 files changed, 20 insertions(+), 22 deletions(-) |
| 21 |
|
| 22 |
diff --git a/www-client/firefox/files/gentoo-default-prefs.js-2 b/www-client/firefox/files/gentoo-default-prefs.js-2 |
| 23 |
deleted file mode 100644 |
| 24 |
index ffd0d7dc8ee..00000000000 |
| 25 |
--- a/www-client/firefox/files/gentoo-default-prefs.js-2 |
| 26 |
+++ /dev/null |
| 27 |
@@ -1,17 +0,0 @@ |
| 28 |
-pref("app.update.enabled", false); |
| 29 |
-pref("app.update.autoInstallEnabled", false); |
| 30 |
-pref("browser.display.use_system_colors", true); |
| 31 |
-pref("browser.link.open_external", 3); |
| 32 |
-pref("general.smoothScroll", true); |
| 33 |
-pref("general.autoScroll", false); |
| 34 |
-pref("browser.tabs.tabMinWidth", 15); |
| 35 |
-pref("browser.backspace_action", 0); |
| 36 |
-pref("browser.urlbar.hideGoButton", true); |
| 37 |
-pref("accessibility.typeaheadfind", true); |
| 38 |
-pref("browser.shell.checkDefaultBrowser", false); |
| 39 |
-pref("browser.EULA.override", true); |
| 40 |
-pref("general.useragent.vendor", "Gentoo"); |
| 41 |
-pref("general.useragent.locale", "chrome://global/locale/intl.properties"); |
| 42 |
-pref("intl.locale.requested", ""); |
| 43 |
-pref("extensions.autoDisableScopes", 0); |
| 44 |
-pref("layout.css.dpi", 0); |
| 45 |
|
| 46 |
diff --git a/www-client/firefox/firefox-68.6.0-r2.ebuild b/www-client/firefox/firefox-68.6.0-r3.ebuild |
| 47 |
similarity index 96% |
| 48 |
rename from www-client/firefox/firefox-68.6.0-r2.ebuild |
| 49 |
rename to www-client/firefox/firefox-68.6.0-r3.ebuild |
| 50 |
index a10f2faf8a7..24ceeba5ece 100644 |
| 51 |
--- a/www-client/firefox/firefox-68.6.0-r2.ebuild |
| 52 |
+++ b/www-client/firefox/firefox-68.6.0-r3.ebuild |
| 53 |
@@ -641,7 +641,7 @@ src_install() { |
| 54 |
pax-mark m "${BUILD_OBJ_DIR}"/dist/bin/xpcshell |
| 55 |
|
| 56 |
# Add our default prefs for firefox |
| 57 |
- cp "${FILESDIR}"/gentoo-default-prefs.js-2 \ |
| 58 |
+ cp "${FILESDIR}"/gentoo-default-prefs.js-3 \ |
| 59 |
"${BUILD_OBJ_DIR}/dist/bin/browser/defaults/preferences/all-gentoo.js" \ |
| 60 |
|| die |
| 61 |
|
| 62 |
@@ -852,22 +852,37 @@ pkg_postinst() { |
| 63 |
elog |
| 64 |
fi |
| 65 |
|
| 66 |
- local show_normandy_information |
| 67 |
+ local show_doh_information show_normandy_information |
| 68 |
|
| 69 |
if [[ -z "${REPLACING_VERSIONS}" ]] ; then |
| 70 |
- # New install |
| 71 |
+ # New install; Tell user that DoH is disabled by default |
| 72 |
+ show_doh_information=yes |
| 73 |
show_normandy_information=yes |
| 74 |
else |
| 75 |
local replacing_version |
| 76 |
for replacing_version in ${REPLACING_VERSIONS} ; do |
| 77 |
- if ver_test "${replacing_version}" -lt 68.6.0-r2 ; then |
| 78 |
+ if ver_test "${replacing_version}" -lt 68.6.0-r3 ; then |
| 79 |
+ # Tell user only once about our DoH default |
| 80 |
+ show_doh_information=yes |
| 81 |
+ fi |
| 82 |
+ |
| 83 |
+ if ver_test "${replacing_version}" -lt 68.6.0-r3 ; then |
| 84 |
# Tell user only once about our Normandy default |
| 85 |
show_normandy_information=yes |
| 86 |
- break |
| 87 |
fi |
| 88 |
done |
| 89 |
fi |
| 90 |
|
| 91 |
+ if [[ -n "${show_doh_information}" ]] ; then |
| 92 |
+ elog |
| 93 |
+ elog "Note regarding Trusted Recursive Resolver aka DNS-over-HTTPS (DoH):" |
| 94 |
+ elog "Due to privacy concerns (encrypting DNS might be a good thing, sending all" |
| 95 |
+ elog "DNS traffic to Cloudflare by default is not a good idea and applications" |
| 96 |
+ elog "should respect OS configured settings), \"network.trr.mode\" was set to 5" |
| 97 |
+ elog "(\"Off by choice\") by default." |
| 98 |
+ elog "You can enable DNS-over-HTTPS in ${PN^}'s preferences." |
| 99 |
+ fi |
| 100 |
+ |
| 101 |
# bug 713782 |
| 102 |
if [[ -n "${show_normandy_information}" ]] ; then |
| 103 |
elog |
Archives