summaryrefslogtreecommitdiff
path: root/scripts
diff options
context:
space:
mode:
Diffstat (limited to 'scripts')
-rw-r--r--scripts/prep-librewolf-dpkg.conf6
-rwxr-xr-xscripts/prep-librewolf-dpkg.sh61
2 files changed, 36 insertions, 31 deletions
diff --git a/scripts/prep-librewolf-dpkg.conf b/scripts/prep-librewolf-dpkg.conf
index 250e61c..d533e67 100644
--- a/scripts/prep-librewolf-dpkg.conf
+++ b/scripts/prep-librewolf-dpkg.conf
@@ -4,11 +4,11 @@
# Available options for DISTRO: debian
DISTRO=${DISTRO:-'debian'}
# current version of Firefox package in target distro
-distro_firefox_version=${distro_firefox_version:-'121.0.1-1'}
+distro_firefox_version=${distro_firefox_version:-'123.0.1-1'}
# current version of Firefox, as defined by name of the orig tarball.
-firefox_version=${firefox_version:-'121.0.1'}
+firefox_version=${firefox_version:-'123.0.1'}
# input git tag of source repo
-source_version=${source_version:-'121.0.1-1'}
+source_version=${source_version:-'123.0.1-1'}
settings_commit=${settings_commit:-'master'}
CI_PROJECT_DIR=${CI_PROJECT_DIR:-$(realpath $(dirname $0)/../)}
output_dir=${CI_PROJECT_DIR}/out
diff --git a/scripts/prep-librewolf-dpkg.sh b/scripts/prep-librewolf-dpkg.sh
index 9759ba4..a0873dd 100755
--- a/scripts/prep-librewolf-dpkg.sh
+++ b/scripts/prep-librewolf-dpkg.sh
@@ -1,7 +1,7 @@
#!/bin/sh
# File: prep-librewolf-dpkg.sh
# Location: https://gitlab.com/bgstack15/librewolf-linux.git
-# Latest supported version: librewolf-121.0.1-1
+# Latest supported version: librewolf-123.0.1-1
# Author: bgstack15
# SPDX-License-Identifier: CC-BY-SA-4.0
# Startdate: 2020-11-29
@@ -329,7 +329,7 @@ EOF
+ targeting: "true",
EOF
# added 115.0.2, updated 117.0; just defuzzing this patch
- test -n "1" && patch -p1 "${debian_dir}/patches/librewolf/stop-undesired-requests.patch" <<EOF
+ test -n "" && patch -p1 "${debian_dir}/patches/librewolf/stop-undesired-requests.patch" <<EOF
--- a/patches/librewolf/stop-undesired-requests.patch 2023-07-13 15:01:06.444375138 -0400
+++ b/patches/librewolf/stop-undesired-requests.patch 2023-07-13 15:35:17.271195985 -0400
@@ -1,8 +1,6 @@
@@ -376,32 +376,37 @@ EOF
+ "https://firefox.settings.services.allizom.org/v1/buckets/main/collections/search-config/records",
"stage-preview":
EOF
- # added 114.0
- test -n "1" && patch -p1 "${debian_dir}/patches/librewolf/hide-passwordmgr.patch" <<'EOF'
-diff -aur a/patches/librewolf/hide-passwordmgr.patch b/patches/librewolf/hide-passwordmgr.patch
---- a/patches/librewolf/hide-passwordmgr.patch 2022-05-22 11:05:00.568328784 -0400
-+++ b/patches/librewolf/hide-passwordmgr.patch 2023-06-13 15:40:36.745607178 -0400
-@@ -1,6 +1,6 @@
- --- a/browser/base/content/browser.js
- +++ b/browser/base/content/browser.js
--@@ -1847,6 +1847,13 @@ var gBrowserInit = {
-+@@ -1780,6 +1780,13 @@ var gBrowserInit = {
- )?.removeAttribute("key");
- }
-
-@@ -16,9 +16,9 @@
-
- --- a/browser/components/preferences/privacy.js
- +++ b/browser/components/preferences/privacy.js
--@@ -810,6 +810,10 @@ var gPrivacyPane = {
-- /* init HTTPS-Only mode */
-- this.initHttpsOnly();
-+@@ -1136,6 +1136,10 @@ var gPrivacyPane = {
-+
-+ this.initDoH();
-
- + if (Services.prefs.getBoolPref("librewolf.hidePasswdmgr", false)) {
- + document.getElementById("passwordsGroup")?.remove();
+ # added 114.0, updated 123.0.1
+ test -n "1" && cat <<'EOF' > "${debian_dir}/patches/librewolf/hide-passwordmgr.patch"
+--- a/browser/base/content/browser.js
++++ b/browser/base/content/browser.js
+@@ -1807,6 +1807,13 @@ var gBrowserInit = {
+ )?.removeAttribute("key");
+ }
+
++ if (Services.prefs.getBoolPref("librewolf.hidePasswdmgr", false)) {
++ PanelMultiView.getViewNode(
++ document,
++ "appMenu-passwords-button"
++ )?.remove();
++ }
++
+ this._loadHandled = true;
+ },
+
+--- a/browser/components/preferences/privacy.js
++++ b/browser/components/preferences/privacy.js
+@@ -1203,6 +1203,10 @@ var gPrivacyPane = {
+
+ this.initWebAuthn();
+
++ if (Services.prefs.getBoolPref("librewolf.hidePasswdmgr", false)) {
++ document.getElementById("passwordsGroup")?.remove();
++ }
++
+ // Notify observers that the UI is now ready
+ Services.obs.notifyObservers(window, "privacy-pane-loaded");
+ },
EOF
# added 112.0.1, updated 117.0. Just for de-fuzzing librewolf patches
bgstack15