From 7b9cb061a9a9d9a7d702f984101976af3e1a1a01 Mon Sep 17 00:00:00 2001 From: ohfp <1813007-ohfp@users.noreply.gitlab.com> Date: Tue, 10 Mar 2020 11:32:35 +0100 Subject: [PATCH] v74.0-1; compress flatpak-repo folders for release --- .gitlab-ci.yml | 4 +- PKGBUILD | 37 +++------- librewolf.cfg.patch | 168 -------------------------------------------- 3 files changed, 11 insertions(+), 198 deletions(-) delete mode 100644 librewolf.cfg.patch diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 1d0d8c0..73c7981 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -90,6 +90,8 @@ Release to Gitlab: image: python:latest script: - pip3 install gitlab-release - - gitlab-release "LibreWolf.*.tar.bz2 librewolf*.pkg.tar.* LibreWolf.*.AppImage librewolf-*-flatpak-repo LibreWolf.*.flatpak" + - tar czf librewolf-aarch64-flatpak-repo.tar.gz librewolf-aarch64-flatpak-repo + - tar czf librewolf-x86_64-flatpak-repo.tar.gz librewolf-x86_64-flatpak-repo + - gitlab-release "LibreWolf.*.tar.bz2 librewolf*.pkg.tar.* LibreWolf.*.AppImage librewolf-*-flatpak-repo.tar.gz LibreWolf.*.flatpak" only: - tags diff --git a/PKGBUILD b/PKGBUILD index 1ceeb28..35656bb 100644 --- a/PKGBUILD +++ b/PKGBUILD @@ -5,7 +5,7 @@ pkgname=librewolf _pkgname=LibreWolf -pkgver=73.0.1 +pkgver=74.0 pkgrel=1 pkgdesc="Community-maintained fork of Librefox: a privacy and security-focused browser" arch=(x86_64 aarch64) @@ -22,15 +22,12 @@ optdepends=('networkmanager: Location detection via available WiFi networks' 'speech-dispatcher: Text-to-Speech' 'hunspell-en_US: Spell checking, American English') options=(!emptydirs !makeflags !strip) -# install='librewolf.install' source=(https://archive.mozilla.org/pub/firefox/releases/$pkgver/source/firefox-$pkgver.source.tar.xz $pkgname.desktop - $pkgname.cfg.patch "git+https://gitlab.com/${pkgname}-community/browser/common.git" "git+https://gitlab.com/${pkgname}-community/settings.git") -sha256sums=('53415180e74da60fc91700ce1ff33bf5b6f51e65353017a98270899a08e0c3d2' +sha256sums=('74589c2836d7c30134636823c3caefbcaed0ea7c3abb2def9e3ddd9f86d9440a' '0471d32366c6f415f7608b438ddeb10e2f998498c389217cdd6cc52e8249996b' - 'e03332f0e865949df5af9c231a364e9e1068fca0439621b98c2d4160d93e674f' 'SKIP' 'SKIP') @@ -42,28 +39,9 @@ if [[ $CARCH == 'aarch64' ]]; then fi prepare() { - _POCKET_SED_STRING="s/'pocket'/#'pocket'/g" - # this one only to remove an annoying error message: - _POCKET_SED_STRING_2='s#SaveToPocket.init();#// SaveToPocket.init();#g' - _POCKET_FILE=./browser/components/moz.build - _POCKET_FILE_2=./browser/components/BrowserGlue.jsm - mkdir mozbuild cd firefox-$pkgver - # NOTE: - # unlock some prefs I deem worthy of keeping unlocked or slightly less restricted - # (with librewolf installed systemwide, you'd otherwise always have to sudo around in /usr/lib) - # it mainly keeps addon update / install settings / urls unlocked - # as well as form fill settings - # uncomment it if you are OK with a slight potential decrease in privacy, - # or even better: check what I'm doing there. - - # cd ${srcdir}/settings - # patch -Np1 -i ${srcdir}/${pkgname}.cfg.patch - # rm -f librewolf.cfg.orig - # cd ${srcdir}/firefox-$pkgver - cat >../mozconfig <>>>>>>>>>>>>>>>>>>> - --lockPref("privacy.resistFingerprinting", true); --lockPref("privacy.resistFingerprinting.block_mozAddonManager", true); -+defaultPref("privacy.resistFingerprinting", true); -+defaultPref("privacy.resistFingerprinting.block_mozAddonManager", true); - - // >>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>> - // Section : Locale/Time/UserAgent -@@ -360,12 +362,12 @@ lockPref("privacy.resistFingerprinting.block_mozAddonManager", true); - lockPref("dom.forms.datetime", false); - lockPref("javascript.use_us_english_locale", true); - lockPref("intl.regional_prefs.use_os_locales", false); --lockPref("intl.locale.requested", "en-US"); --lockPref("general.useragent.override", "Mozilla/5.0 (Windows NT 6.1; rv:45.0) Gecko/20100101 Firefox/45.0, 45"); --lockPref("general.appname.override", "Netscape"); --lockPref("general.appversion.override", "5.0 (Windows)"); --lockPref("general.platform.override", "Win32"); --lockPref("general.oscpu.override", "Windows NT 6.1"); -+defaultPref("intl.locale.requested", "en-US"); -+defaultPref("general.useragent.override", "Mozilla/5.0 (Windows NT 6.1; rv:45.0) Gecko/20100101 Firefox/45.0, 45"); -+defaultPref("general.appname.override", "Netscape"); -+defaultPref("general.appversion.override", "5.0 (Windows)"); -+defaultPref("general.platform.override", "Win32"); -+defaultPref("general.oscpu.override", "Windows NT 6.1"); - - // >>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>> - // Section : Ghacks-user Selection -@@ -469,7 +471,8 @@ lockPref("extensions.webextensions.identity.redirectDomain", ""); - // Pref : CSP Settings For Extensions I/II : Extension Firewall Feature - // Uncomment to disable network for the extensions - // Enable-Firewall-Feature-In-The-Next-Line extensions-firewall >>>>>> --lockPref("extensions.webextensions.base-content-security-policy", "default-src 'self' moz-extension: blob: filesystem: 'unsafe-eval' 'unsafe-inline'; script-src 'self' moz-extension: blob: filesystem: 'unsafe-eval' 'unsafe-inline'; object-src 'self' moz-extension: blob: filesystem:;"); -+defaultPref("extensions.webextensions.base-content-security-policy", "script-src 'self' https://* moz-extension: blob: filesystem: 'unsafe-eval' 'unsafe-inline'; object-src 'self' https://* moz-extension: blob: filesystem:;"); -+// lockPref("extensions.webextensions.base-content-security-policy", "default-src 'self' moz-extension: blob: filesystem: 'unsafe-eval' 'unsafe-inline'; script-src 'self' moz-extension: blob: filesystem: 'unsafe-eval' 'unsafe-inline'; object-src 'self' moz-extension: blob: filesystem:;"); - - // Pref : CSP Settings For Extensions II/II : Extension Firewall Feature - // This value is applied after the first one (just ignore this) -@@ -811,22 +814,22 @@ lockPref("extensions.getAddons.compatOverides.url", ""); - // https://services.addons.mozilla.org/api/v3/addons/compat-override/?guid=%IDS%&lang=%LOCALE% - - // Pref : --lockPref("extensions.getAddons.get.url", ""); -+defaultPref("extensions.getAddons.get.url", "https://services.addons.mozilla.org/api/v3/addons/search/?guid=%IDS%&lang=%LOCALE%"); - // Default Value - // https://services.addons.mozilla.org/api/v3/addons/search/?guid=%IDS%&lang=%LOCALE% - - // Pref : --lockPref("extensions.getAddons.langpacks.url", ""); -+defaultPref("extensions.getAddons.langpacks.url", "https://services.addons.mozilla.org/api/v3/addons/language-tools/?app=firefox&type=language&appversion=%VERSION%"); - // Default Value - // https://services.addons.mozilla.org/api/v3/addons/language-tools/?app=firefox&type=language&appversion=%VERSION% - - // Pref : --lockPref("extensions.getAddons.link.url", ""); -+defaultPref("extensions.getAddons.link.url", "https://addons.mozilla.org/%LOCALE%/firefox/"); - // Default Value - // https://addons.mozilla.org/%LOCALE%/firefox/ - - // Pref : --lockPref("extensions.getAddons.search.browseURL", ""); -+defaultPref("extensions.getAddons.search.browseURL", "https://addons.mozilla.org/%LOCALE%/firefox/search?q=%TERMS%&platform=%OS%&appver=%VERSION%"); - // Default Value - // https://addons.mozilla.org/%LOCALE%/firefox/search?q=%TERMS%&platform=%OS%&appver=%VERSION% - -@@ -861,7 +864,7 @@ lockPref("browser.newtabpage.activity-stream.fxaccounts.endpoint", ""); - // https://accounts.firefox.com/ - - // Pref : --lockPref("extensions.update.url", ""); -+defaultPref("extensions.update.url", "https://versioncheck.addons.mozilla.org/update/VersionCheck.php?reqVersion=REQ_VERSION%&id=%ITEM_ID%&version=%ITEM_VERSION%&maxAppVersion=ITEM_MAXAPPVERSION%&status=%ITEM_STATUS%&appID=%APP_ID%&appVersion=%APP_VERSION%&appOS=APP_OS%&appABI=%APP_ABI%&locale=%APP_LOCALE%¤tAppVersion=CURRENT_APP_VERSION%&updateType=%UPDATE_TYPE%&compatMode=%COMPATIBILITY_MODE%"); - // Default Value - // https://versioncheck.addons.mozilla.org/update/VersionCheck.php?reqVersion= - // %REQ_VERSION%&id=%ITEM_ID%&version=%ITEM_VERSION%&maxAppVersion= -@@ -1457,7 +1460,7 @@ lockPref("app.releaseNotesURL", ""); - - // Pref : - lockPref("app.update.auto", false); --lockPref("extensions.update.autoUpdateDefault", false); -+defaultPref("extensions.update.autoUpdateDefault", false); - lockPref("app.update.staging.enabled", false); - lockPref("app.update.silent", false); - lockPref("app.update.lastUpdateTime.telemetry_modules_ping", 0); -@@ -1570,10 +1573,10 @@ lockPref("extensions.blocklist.itemURL", ""); - lockPref("extensions.blocklist.url", ""); - - // Pref : --lockPref("extensions.update.background.url", ""); -+defaultPref("extensions.update.background.url", "https://versioncheck-bg.addons.mozilla.org/update/VersionCheck.php?reqVersion=%REQ_VERSION%&id=%ITEM_ID%&version=%ITEM_VERSION%&maxAppVersion=%ITEM_MAXAPPVERSION%&status=%ITEM_STATUS%&appID=%APP_ID%&appVersion=%APP_VERSION%&appOS=%APP_OS%&appABI=%APP_ABI%&locale=%APP_LOCALE%¤tAppVersion=%CURRENT_APP_VERSION%&updateType=%UPDATE_TYPE%&compatMode=%COMPATIBILITY_MODE%"); - - // Pref : --lockPref("extensions.getAddons.showPane", false); -+defaultPref("extensions.getAddons.showPane", false); - - // Pref : - lockPref("extensions.webservice.discoverURL", ""); -@@ -1865,7 +1868,7 @@ lockPref("security.dialog_enable_delay", 700); - - // Pref : Opt-out of add-on metadata updates - // https://blog.mozilla.org/addons/how-to-opt-out-of-add-on-metadata-updates/ --lockPref("extensions.getAddons.cache.enabled", false); -+defaultPref("extensions.getAddons.cache.enabled", false); - - // Pref : Opt-out of theme (Persona) updates - // https://support.mozilla.org/t5/Firefox/how-do-I-prevent-autoamtic-updates-in-a-50-user-environment/td-p/144287 -@@ -1898,7 +1901,7 @@ lockPref("plugin.sessionPermissionNow.intervalInMinutes", 0); - - // Pref : Update addons automatically - // https://blog.mozilla.org/addons/how-to-turn-off-add-on-updates/ --lockPref("extensions.update.enabled", false); -+defaultPref("extensions.update.enabled", false); - - // Pref : Enable add-on and certificate blocklists (OneCRL) from Mozilla - // Updated at interval defined in extensions.blocklist.interval (default: 86400) -@@ -2622,4 +2625,7 @@ lockPref("security.tls.unrestricted_rc4_fallback", false); - //lockPref("toolkit.telemetry.unifiedIsOptIn", true); - //lockPref("ui.key.menuAccessKey", 0); - //lockPref("view_source.tab", false); --lockPref("xpinstall.signatures.required", false); -+defaultPref("xpinstall.signatures.required", true); -+ -+// #11/#68, sounds reasonable -+defaultPref("toolkit.legacyUserProfileCustomizations.stylesheets", true);