From ca568a61a69eeae3a6019d63a702582d6aab38bd Mon Sep 17 00:00:00 2001 From: "B. Stack" Date: Tue, 14 Dec 2021 14:02:14 -0500 Subject: Revert "95.0 attempt 1" on branch 94.0-1 This reverts commit 054ebfe88fc8dd0f73f303e13991505c61e55639. --- .gitignore | 4 ---- librewolf.cfg | 62 +++++++++++++++++++++++------------------------------ librewolf.spec | 25 ++++++--------------- policies.json | 2 +- remove_addons.patch | 2 +- 5 files changed, 36 insertions(+), 59 deletions(-) diff --git a/.gitignore b/.gitignore index e0f57a2..ae40b64 100644 --- a/.gitignore +++ b/.gitignore @@ -478,9 +478,5 @@ firefox-3.6.4.source.tar.bz2 /firefox-langpacks-93.0-20210929.tar.xz /firefox-94.0.source.tar.xz /firefox-langpacks-94.0-20211031.tar.xz -/firefox-94.0.2.source.tar.xz -/firefox-langpacks-94.0.2-20211125.tar.xz -/firefox-95.0.source.tar.xz -/firefox-langpacks-95.0-20211203.tar.xz *.spec? .*.swp diff --git a/librewolf.cfg b/librewolf.cfg index 56918a7..6afe37a 100755 --- a/librewolf.cfg +++ b/librewolf.cfg @@ -9,7 +9,7 @@ */ -defaultPref("librewolf.cfg.version", "4.0"); +defaultPref("librewolf.cfg.version", "3.0"); // ------------------------------- // # SANITIZING, TP, SESSIONS @@ -26,20 +26,20 @@ defaultPref("librewolf.cfg.version", "4.0"); pref("browser.contentblocking.category", "strict"); defaultPref("network.cookie.cookieBehavior", 5); // dFPI is default for strict mode, but enforce -defaultPref("network.cookie.lifetimePolicy", 2); // keep cookies until end of the session, then clear +defaultPref("network.cookie.lifetimePolicy", 2); // keep cookies until the browser is closed then delete everything minus exceptions // make third party and http cookies session-only defaultPref("network.cookie.thirdparty.sessionOnly", true); defaultPref("network.cookie.thirdparty.nonsecureSessionOnly", true); /** - this way of sanitizing cookies would override the exceptions set by the users and just delete everything, - we disable it but cookies and site data are still cleared per session unless exceptions are set. - all the cleaning prefs true by default except for siteSetting and offlineApps, which is what we want. + this way of sanitizing would override the exceptions set by the users and just delete everything, + therefore we tell it to delete everything but ignore data needed to stay logged into websites set + manually as exceptions. */ defaultPref("privacy.clearOnShutdown.cookies", false); +defaultPref("privacy.clearOnShutdown.offlineApps", false); defaultPref("privacy.sanitize.sanitizeOnShutdown", true); -defaultPref("privacy.sanitize.timeSpan", 0); // disable browsing, search and form history defaultPref("places.history.enabled", false); @@ -128,14 +128,13 @@ defaultPref("browser.pagethumbnails.capturing_disabled", true); // disable page // # MEDIA // ---------------------- -/** - * limit potential private IP leaks for webrtc users. - * mDNS protects the value on linux, osx and win10+. - * these prefs protect the value when allowing mic and camera access, and for win7/8.x. - * */ -defaultPref("media.peerconnection.ice.no_host", true); // don't use any private IPs for ICE candidate -defaultPref("media.peerconnection.ice.default_address_only", true); // use a single interface for ICE candidates, the vpn one when a vpn is used -defaultPref("media.peerconnection.ice.proxy_only_if_behind_proxy", true); // force webrtc inside proxy, when one is used +// disable webrtc +defaultPref("media.peerconnection.enabled", false); // master switch + +// limit potential IP leaks for webrtc users +defaultPref("media.peerconnection.ice.default_address_only", true); // use public IP for ICE candidates +defaultPref("media.peerconnection.ice.no_host", true); // don't use local IP for ICE candidates +defaultPref("media.peerconnection.ice.proxy_only_if_behind_proxy", true); // force webrtc inside proxy for proxy users // autoplay defaultPref("media.autoplay.blocking_policy", 2); // only allow to play when a certain element is clicked @@ -154,12 +153,8 @@ defaultPref("browser.display.use_system_colors", false); // default but enforced defaultPref("privacy.resistFingerprinting.letterboxing", false); // expose hidden letterboxing pref, but do not enable by default -/** - * increase the size of new RFP windows for better usability, while still using a rounded value. - * if the screen resolution is lower it will stretch to the biggest possible rounded value. - * */ -defaultPref("privacy.window.maxInnerWidth", 1600); -defaultPref("privacy.window.maxInnerHeight", 900); +// librewolf specifc pref that prevents rfp from forcing light theme, review +lockPref("privacy.override_rfp_for_color_scheme", false); defaultPref("webgl.disabled", true); // master switch, disable webgl @@ -172,11 +167,11 @@ defaultPref("fission.autostart", true); // enable fission by default // certificates defaultPref("security.cert_pinning.enforcement_level", 2); // enable strict public key pinning defaultPref("security.pki.sha1_enforcement_level", 1); // disable sha-1 certificates -defaultPref("security.OCSP.enabled", 0); // disable ocsp fetching +defaultPref("security.OCSP.enabled", 0); // disable OCSP fetching -// crl with no ocsp fallback -defaultPref("security.remote_settings.crlite_filters.enabled", true); -defaultPref("security.pki.crlite_mode", 2); +// crl with no OCSP fallback. commented for now but review +// defaultPref("security.remote_settings.crlite_filters.enabled", true); +// defaultPref("security.pki.crlite_mode", 2); // safe negotiation defaultPref("security.ssl.require_safe_negotiation", true); // block websites that do not support safe negotiation, occasional breakage @@ -238,6 +233,9 @@ defaultPref("media.gmp-gmpopenh264.enabled", false); // # LOCATION, LANGUAGE AND REGION // --------------------------------------------- +defaultPref("geo.enabled", false); // block geo api, behind a prompt so review +defaultPref("permissions.default.geo", 2); // review as well + // use mozilla geo service as deault defaultPref("geo.provider.network.url", "https://location.services.mozilla.com/v1/geolocate?key=%MOZILLA_API_KEY%"); @@ -262,13 +260,7 @@ lockPref("browser.region.update.enabled", false); // disable search suggestions defaultPref("browser.urlbar.suggest.searches", false); defaultPref("browser.search.suggest.enabled", false); - -// firefox suggest, review to trim -lockPref("browser.urlbar.quicksuggest.scenario", "history"); // prevent opt-in, doesn't work alone -lockPref("browser.urlbar.quicksuggest.enabled", false); // disable suggest and hide its ui -lockPref("browser.urlbar.suggest.quicksuggest.nonsponsored", false); // disable suggestions from firefox -lockPref("browser.urlbar.suggest.quicksuggest.sponsored", false); // disable sponsored suggestions -lockPref("browser.urlbar.quicksuggest.dataCollection.enabled", false); // default +pref("browser.urlbar.quicksuggest.scenario", ""); // disable firefox suggests and hide its UI defaultPref("browser.search.region", "US"); // set a default search region for all users defaultPref("browser.search.update", false); // do not update open search search engines @@ -318,11 +310,11 @@ defaultPref("devtools.selfxss.count", 0); // see https://gitlab.com/librewolf-co // misc defaultPref("browser.shell.checkDefaultBrowser", false); // do not check if default browser +defaultPref("browser.tabs.drawInTitlebar", true); // hide titlebar defaultPref("browser.aboutConfig.showWarning", false); // disable about:config warning defaultPref("browser.download.autohideButton", false); // hide download button automatically defaultPref("browser.download.manager.addToRecentDocs", false); // do not add downloads to recents defaultPref("browser.tabs.loadBookmarksInTabs", true); // always open bookmarks in new tab -defaultPref("webchannel.allowObject.urlWhitelist", ""); // remove webchannel whitelist // -------------------------------------- // # EXTENSIONS @@ -335,7 +327,8 @@ defaultPref("webchannel.allowObject.urlWhitelist", ""); // remove webchannel whi defaultPref("extensions.webextensions.restrictedDomains", ""); // set extensions scopes -defaultPref("extensions.enabledScopes", 5); // hidden +defaultPref("extensions.enabledScopes", 5); +defaultPref("extensions.autoDisableScopes", 11); defaultPref("extensions.postDownloadThirdPartyPrompt", false); // force install prompt for thrid party extensions @@ -454,8 +447,7 @@ lockPref("toolkit.telemetry.reportingpolicy.firstRun", false); // default lockPref("toolkit.telemetry.cachedClientID", ""); lockPref("toolkit.telemetry.previousBuildID", ""); lockPref("toolkit.telemetry.server_owner", ""); -lockPref("toolkit.coverage.opt-out", true); // hidden -lockPref("toolkit.telemetry.coverage.opt-out", true); // hidden +lockPref("toolkit.coverage.opt-out", true); // [HIDDEN PREF] lockPref("toolkit.coverage.enabled", false); lockPref("toolkit.coverage.endpoint.base", ""); lockPref("toolkit.crashreporter.infoURL", ""); diff --git a/librewolf.spec b/librewolf.spec index 8ad0ad1..6560c54 100644 --- a/librewolf.spec +++ b/librewolf.spec @@ -126,7 +126,7 @@ ExcludeArch: aarch64 %if %{?system_nss} %global nspr_version 4.26 %global nspr_build_version %{nspr_version} -%global nss_version 3.73 +%global nss_version 3.70 %global nss_build_version %{nss_version} %endif @@ -163,13 +163,13 @@ ExcludeArch: aarch64 Summary: Mozilla Firefox Web browser Name: librewolf %global enable_mozilla_crashreporter 0 -Version: 95.0 -Release: 2%{?pre_tag}%{?dist} +Version: 94.0 +Release: 1%{?pre_tag}%{?dist} URL: https://www.mozilla.org/firefox/ License: MPLv1.1 or GPLv2+ or LGPLv2+ Source0: https://archive.mozilla.org/pub/firefox/releases/%{version}%{?pre_version}/source/firefox-%{version}%{?pre_version}.source.tar.xz %if %{with langpacks} -Source1: firefox-langpacks-%{version}%{?pre_version}-20211203.tar.xz +Source1: firefox-langpacks-%{version}%{?pre_version}-20211031.tar.xz %endif Source2: cbindgen-vendor.tar.xz Source10: firefox-mozconfig @@ -221,7 +221,6 @@ Patch54: mozilla-1669639.patch Patch55: firefox-testing.patch Patch57: firefox-disable-ffvpx-with-vapi.patch Patch61: firefox-glibc-dynstack.patch -Patch62: build-python.patch # Test patches # Generate without context by @@ -484,10 +483,9 @@ This package contains results of tests executed during build. %patch49 -p1 -b .build-arm-libaom %patch53 -p1 -b .firefox-gcc-build %patch54 -p1 -b .1669639 -#%patch55 -p1 -b .testing +%patch55 -p1 -b .testing %patch57 -p1 -b .ffvpx-with-vapi #%patch61 -p1 -b .glibc-dynstack -%patch62 -p1 -b .build-python # Test patches #%patch100 -p1 -b .firefox-tests-xpcshell @@ -510,7 +508,7 @@ This package contains results of tests executed during build. %patch407 -p1 -b .1667096 %patch408 -p1 -b .1663844 %patch415 -p1 -b .1670333 -#%patch420 -p1 -b .mochitest-wayland-workaround +%patch420 -p1 -b .mochitest-wayland-workaround # PGO patches %if %{build_with_pgo} @@ -1145,18 +1143,9 @@ gtk-update-icon-cache %{_datadir}/icons/hicolor &>/dev/null || : #--------------------------------------------------------------------- %changelog -* Tue Dec 14 2021 B. Stack - 95.0-1 +* Fri Nov 19 2021 B. Stack - 94.0-1 - Fork to librewolf release. -* Thu Dec 9 2021 Martin Stransky - 95.0-2 -- Updated symbolic icon (rhbz#2028939) - -* Fri Dec 3 2021 Martin Stransky - 95.0-1 -- Updated to 95.0 - -* Fri Nov 19 2021 Martin Stransky - 94.0-2 -- Added fix for mozbz#1739924 / rhbz#2020981. - * Mon Nov 1 2021 Martin Stransky - 94.0-1 - Updated to 94.0 diff --git a/policies.json b/policies.json index ee3f556..e31a2f0 100644 --- a/policies.json +++ b/policies.json @@ -30,7 +30,7 @@ }, "Extensions": { "Install": [ - "https://addons.cdn.mozilla.net/user-media/addons/607454/ublock_origin-1.39.2-an+fx.xpi" + "https://addons.cdn.mozilla.net/user-media/addons/607454/ublock_origin-1.38.6-an+fx.xpi" ], "Uninstall": [ "google@search.mozilla.org", diff --git a/remove_addons.patch b/remove_addons.patch index 3487f6d..a6585ed 100644 --- a/remove_addons.patch +++ b/remove_addons.patch @@ -13,7 +13,7 @@ index 269dcb2..ed7c31d 100644 - "report-site-issue", "pictureinpicture", "proxy-failover", - "search-detection", + ] diff --git a/browser/locales/Makefile.in b/browser/locales/Makefile.in index 496379c..dd6f359 100644 --- a/browser/locales/Makefile.in -- cgit