helpers/DATA/debian-installer/di_focal/2273_2272.diff

+=== modified file 'build/Makefile'
+--- build/Makefile	2018-02-15 11:44:41 +0000
++++ build/Makefile	2018-07-22 10:55:51 +0000
+@@ -782,6 +782,8 @@
+ 	update-manifest $@ $(MANIFEST-BOOT) $(UDEB_LISTS)
+ 
+ $(TEMP_KERNEL): $(STAMPS)tree-unpack-$(targetstring)-stamp
++	# The kernel is shipped 600 in some cases, so fix it:
++	chmod 644 $(TEMP_KERNEL)
+ 
+ $(TEMP_BOOT): $(TEMP_INITRD) $(TEMP_KERNEL) $(TEMP_BOOT_SCREENS) arch_boot
+ 
+
+#=== modified file 'debian/changelog'
+#--- debian/changelog	2018-06-14 10:36:23 +0000
+#+++ debian/changelog	2018-07-22 10:55:51 +0000
+#@@ -1,3 +1,9 @@
+#+debian-installer (20101020ubuntu547) UNRELEASED; urgency=medium
+#+
+#+  * Fix permissions on the netboot.tar kernel (LP: #1781036)
+#+
+#+ -- Adam Conrad <adconrad@ubuntu.com>  Sun, 22 Jul 2018 04:55:01 -0600
+#+
+# debian-installer (20101020ubuntu546) cosmic; urgency=medium
+# 
+#   * Move master kernels to 4.15.0-23.
+#

helpers/DATA/debian-installer/medium_supported.patch

+diff -Nru debian-installer-20210731+deb11u8+11.0trisquel13/build/config/amd64.cfg debian-installer-20210731+deb11u8+11.0trisquel13_/build/config/amd64.cfg
+--- debian-installer-20210731+deb11u8+11.0trisquel13/build/config/amd64.cfg	2023-05-12 13:48:56.045639664 -0600
++++ debian-installer-20210731+deb11u8+11.0trisquel13_/build/config/amd64.cfg	2023-05-12 14:00:23.091630526 -0600
+@@ -1,4 +1,4 @@
+-MEDIUM_SUPPORTED = cdrom cdrom-xen netboot netboot-gtk netboot-xen hd-media
++MEDIUM_SUPPORTED = cdrom netboot
+ MEDIUM_SUPPORTED_EXTRA = monolithic
+ 
+ # The version of the kernel to use.
+diff -Nru debian-installer-20210731+deb11u8+11.0trisquel13/build/config/arm64.cfg debian-installer-20210731+deb11u8+11.0trisquel13_/build/config/arm64.cfg
+--- debian-installer-20210731+deb11u8+11.0trisquel13/build/config/arm64.cfg	2023-05-12 13:48:56.073639701 -0600
++++ debian-installer-20210731+deb11u8+11.0trisquel13_/build/config/arm64.cfg	2023-05-12 14:00:45.351718688 -0600
+@@ -1,4 +1,4 @@
+-MEDIUM_SUPPORTED = cdrom netboot netboot-gtk device-tree u-boot
++MEDIUM_SUPPORTED = cdrom netboot device-tree u-boot
+ 
+ KERNELMAJOR = 2.6
+ # The version of the kernel to use.
+diff -Nru debian-installer-20210731+deb11u8+11.0trisquel13/build/config/armhf.cfg debian-installer-20210731+deb11u8+11.0trisquel13_/build/config/armhf.cfg
+--- debian-installer-20210731+deb11u8+11.0trisquel13/build/config/armhf.cfg	2023-05-12 13:48:59.157643670 -0600
++++ debian-installer-20210731+deb11u8+11.0trisquel13_/build/config/armhf.cfg	2023-05-12 14:01:10.243818298 -0600
+@@ -1,4 +1,4 @@
+-MEDIUM_SUPPORTED = hd-media netboot network-console netboot-gtk device-tree u-boot cdrom
++MEDIUM_SUPPORTED = netboot device-tree u-boot cdrom
+ 
+ MKLIBS = mklibs-copy --ldlib=/lib/ld-linux-armhf.so.3
+ 
+diff -Nru debian-installer-20210731+deb11u8+11.0trisquel13/build/config/i386.cfg debian-installer-20210731+deb11u8+11.0trisquel13_/build/config/i386.cfg
+--- debian-installer-20210731+deb11u8+11.0trisquel13/build/config/i386.cfg	2023-01-08 16:22:52.000000000 -0600
++++ debian-installer-20210731+deb11u8+11.0trisquel13_/build/config/i386.cfg	2023-05-12 13:59:51.799508139 -0600
+@@ -1,4 +1,4 @@
+-MEDIUM_SUPPORTED = cdrom cdrom-xen netboot netboot-gtk netboot-xen hd-media
++MEDIUM_SUPPORTED = cdrom netboot 
+ MEDIUM_SUPPORTED_EXTRA = monolithic
+ 
+ # The version of the kernel to use.

helpers/DATA/debootstrap/ecne

+trisquel
\ No newline at end of file

helpers/DATA/dino-im/cve/01_ef8fb0e94ce79d5fde2943e433ad0422eb7f70ec.patch

+From ef8fb0e94ce79d5fde2943e433ad0422eb7f70ec Mon Sep 17 00:00:00 2001
+From: Marvin W <git@larma.de>
+Date: Thu, 23 Mar 2023 10:13:30 -0600
+Subject: [PATCH] Check sender of bookmark:1 updates
+
+---
+ xmpp-vala/src/module/xep/0402_bookmarks2.vala | 10 ++++++++++
+ 1 file changed, 10 insertions(+)
+
+diff --git a/xmpp-vala/src/module/xep/0402_bookmarks2.vala b/xmpp-vala/src/module/xep/0402_bookmarks2.vala
+index 406f37f43..d1e53e6e3 100644
+--- a/xmpp-vala/src/module/xep/0402_bookmarks2.vala
++++ b/xmpp-vala/src/module/xep/0402_bookmarks2.vala
+@@ -68,6 +68,11 @@ public class Module : BookmarksProvider, XmppStreamModule {
+     }
+ 
+     private void on_pupsub_item(XmppStream stream, Jid jid, string id, StanzaNode? node) {
++        if (!jid.equals(stream.get_flag(Bind.Flag.IDENTITY).my_jid.bare_jid)) {
++            warning("Received alleged bookmarks:1 item from %s, ignoring", jid.to_string());
++            return;
++        }
++
+         Conference conference = parse_item_node(node, id);
+         Flag? flag = stream.get_flag(Flag.IDENTITY);
+         if (flag != null) {
+@@ -77,6 +82,11 @@ public class Module : BookmarksProvider, XmppStreamModule {
+     }
+ 
+     private void on_pupsub_retract(XmppStream stream, Jid jid, string id) {
++        if (!jid.equals(stream.get_flag(Bind.Flag.IDENTITY).my_jid.bare_jid)) {
++            warning("Received alleged bookmarks:1 retract from %s, ignoring", jid.to_string());
++            return;
++        }
++
+         try {
+             Jid jid_parsed = new Jid(id);
+             Flag? flag = stream.get_flag(Flag.IDENTITY);

helpers/DATA/distro-info-data/README.Debian.patch

---- debian/README.Debian	2019-10-17 15:10:30.000000000 -0500
-+++ debian/README.Debian_trisquel	2021-11-26 13:26:20.362971709 -0600
+--- a/debian/README.Debian	2019-10-17 15:10:30.000000000 -0500
++++ b/debian/README.Debian	2021-11-26 13:26:20.362971709 -0600
 @@ -2,7 +2,7 @@
  ===========
  

helpers/DATA/distro-info-data/add_trisquel_tools_py.patch

---- lib/tools.py	2021-10-15 08:01:00.000000000 -0500
-+++ lib/tools.py	2022-04-06 12:27:07.672427372 -0500
+--- a/lib/tools.py	2021-10-15 08:01:00.000000000 -0500
++++ a/lib/tools.py	2022-04-06 12:27:07.672427372 -0500
 @@ -37,7 +37,7 @@
  def main(validation_function):
      """Main function with command line parameter parsing."""

helpers/DATA/distro-info-data/add_trisquel_validate.patch

---- validate-csv-data	2021-10-15 08:01:00.000000000 -0500
-+++ validate-csv-data	2022-04-06 12:27:29.004706669 -0500
+--- a/validate-csv-data	2021-10-15 08:01:00.000000000 -0500
++++ b/validate-csv-data	2022-04-06 12:27:29.004706669 -0500
 @@ -27,6 +27,13 @@
  
  

helpers/DATA/distro-info-data/trisquel.csv

@@ -12,3 +12,4 @@ version,codename,series,created,release,eol,upstream
 9.0 LTS,Etiona,etiona,2017-10-19,2020-10-16,2023-05-31,bionic
 10.0 LTS,Nabia,nabia,2019-10-17,2021-12-16,2025-05-29,focal
 11.0 LTS,Aramo,aramo,2021-10-14,2023-03-19,2027-06-01,jammy
+12.0 LTS,Ecne,ecne,2023-10-12,2029-05-31,2029-05-31,noble

helpers/DATA/distro-info/test-trisquel-distro-info

@@ -273,10 +273,10 @@ testDays() {
     success "--devel --date=$date --days=release -r" "10.0 LTS 427"
     success "--devel --date=$date --days=release -f" "Trisquel GNU/Linux 10.0 LTS \"Nabia\" 427"
 
-    success "--devel --date=$date --days=eol" "1651"
-    success "--devel --date=$date --days=eol -c" "nabia 1651"
-    success "--devel --date=$date --days=eol -r" "10.0 LTS 1651"
-    success "--devel --date=$date --days=eol -f" "Trisquel GNU/Linux 10.0 LTS \"Nabia\" 1651"
+    success "--devel --date=$date --days=eol" "1687"
+    success "--devel --date=$date --days=eol -c" "nabia 1687"
+    success "--devel --date=$date --days=eol -r" "10.0 LTS 1687"
+    success "--devel --date=$date --days=eol -f" "Trisquel GNU/Linux 10.0 LTS \"Nabia\" 1687"
 }
 
 . shunit2

helpers/DATA/firefox/branding/content/about-wordmark.svg

-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<!-- This Source Code Form is subject to the terms of the Mozilla Public
+   - License, v. 2.0. If a copy of the MPL was not distributed with this
+   - file, You can obtain one at http://mozilla.org/MPL/2.0/. -->
 <svg
-   version="1.1"
-   id="aboutWordmark"
-   x="0px"
-   y="0px"
    width="130px"
    height="38px"
    viewBox="0 0 130 38"
-   xml:space="preserve"
-   inkscape:version="1.2 (1:1.2+202205241504+da316b6974)"
-   sodipodi:docname="about-wordmark.svg"
-   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
-   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
-   xmlns="http://www.w3.org/2000/svg"
-   xmlns:svg="http://www.w3.org/2000/svg"
-   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
-   xmlns:cc="http://creativecommons.org/ns#"
-   xmlns:dc="http://purl.org/dc/elements/1.1/"><metadata
-   id="metadata9"><rdf:RDF><cc:Work
-       rdf:about=""><dc:format>image/svg+xml</dc:format><dc:type
-         rdf:resource="http://purl.org/dc/dcmitype/StillImage" /></cc:Work></rdf:RDF></metadata><defs
-   id="defs7" /><sodipodi:namedview
-   pagecolor="#ffffff"
-   bordercolor="#666666"
-   borderopacity="1"
-   objecttolerance="10"
-   gridtolerance="10"
-   guidetolerance="10"
-   inkscape:pageopacity="0"
-   inkscape:pageshadow="2"
-   inkscape:window-width="1918"
-   inkscape:window-height="1008"
-   id="namedview5"
-   showgrid="false"
-   inkscape:zoom="4.8940365"
-   inkscape:cx="77.952014"
-   inkscape:cy="4.9039275"
-   inkscape:window-x="1366"
-   inkscape:window-y="0"
-   inkscape:window-maximized="1"
-   inkscape:current-layer="aboutWordmark"
-   inkscape:showpageshadow="2"
-   inkscape:pagecheckerboard="0"
-   inkscape:deskcolor="#d1d1d1" /><g
-   aria-label="Abrowser"
-   id="text2986"
-   style="line-height:0%;letter-spacing:0px;word-spacing:0px;fill:#6f6f6f"><path
-     d="M 10.419262,20.624147 4.9514648,37.289883 H 0.54685038 L 8.016745,17.186063 h 2.802936 z M 14.961952,37.289883 9.4803473,20.624147 9.0385051,17.186063 h 2.8305519 l 7.511317,20.10382 z M 14.713416,29.80618 v 3.244779 H 4.0953955 V 29.80618 Z"
-     style="font-weight:bold;font-size:28.2779px;line-height:1.25;-inkscape-font-specification:'Sans Bold'"
-     id="path166" /><path
-     d="m 20.995859,16.081457 h 3.97658 v 17.784149 l -0.400419,3.424277 h -3.576161 z m 13.434765,13.586648 v 0.289959 q 0,1.670715 -0.358997,3.06528 -0.345189,1.394564 -1.076991,2.416324 -0.731801,1.007953 -1.822599,1.574063 -1.07699,0.552303 -2.540592,0.552303 -1.36695,0 -2.374902,-0.552303 -0.994145,-0.552302 -1.670716,-1.560255 -0.676571,-1.007952 -1.090798,-2.361094 -0.414227,-1.353142 -0.62134,-2.95482 v -0.635148 q 0.207113,-1.601678 0.62134,-2.95482 0.414227,-1.353142 1.090798,-2.361094 0.676571,-1.007953 1.670716,-1.560255 0.994145,-0.552303 2.347287,-0.552303 1.477409,0 2.568207,0.56611 1.104606,0.552303 1.822599,1.574063 0.731802,1.007953 1.076991,2.402517 0.358997,1.380757 0.358997,3.051473 z m -3.97658,0.289959 v -0.289959 q 0,-0.9113 -0.138076,-1.712139 -0.124268,-0.814646 -0.441842,-1.422179 -0.317574,-0.621341 -0.869877,-0.980338 -0.538495,-0.358997 -1.394564,-0.358997 -0.814647,0 -1.380757,0.276152 -0.566111,0.276151 -0.938915,0.773224 -0.358997,0.497072 -0.552303,1.187451 -0.179498,0.67657 -0.207113,1.491217 v 1.808792 q 0.04142,1.090797 0.358997,1.933059 0.331381,0.828454 0.994145,1.311719 0.67657,0.469458 1.753561,0.469458 0.842262,0 1.394564,-0.331382 0.552303,-0.331382 0.85607,-0.938915 0.317574,-0.607533 0.441842,-1.422179 0.124268,-0.828455 0.124268,-1.794984 z"
-     style="font-weight:bold;font-size:28.2779px;line-height:1.25;-inkscape-font-specification:'Sans Bold'"
-     id="path168" /><path
-     d="m 40.878758,25.60868 v 11.681203 h -3.97658 v -14.93979 h 3.741851 z m 4.501267,-3.35524 -0.06904,3.686621 q -0.289959,-0.04142 -0.704186,-0.06904 -0.400419,-0.04142 -0.731801,-0.04142 -0.842262,0 -1.463602,0.220921 -0.607533,0.207113 -1.02176,0.62134 -0.40042,0.40042 -0.607533,1.007953 -0.193306,0.593725 -0.220921,1.353142 L 39.760345,28.78442 q 0,-1.449794 0.289959,-2.66486 0.289959,-1.228874 0.842261,-2.140174 0.566111,-0.911299 1.380757,-1.408372 0.814647,-0.497072 1.864022,-0.497072 0.331382,0 0.676571,0.05523 0.345189,0.04142 0.56611,0.124268 z"
-     style="font-weight:bold;font-size:28.2779px;line-height:1.25;-inkscape-font-specification:'Sans Bold'"
-     id="path170" /><path
-     d="m 46.194673,29.971871 v -0.289959 q 0,-1.6431 0.469457,-3.023857 0.469457,-1.394565 1.366949,-2.416325 0.897492,-1.02176 2.209211,-1.58787 1.311719,-0.579918 3.01005,-0.579918 1.698331,0 3.023858,0.579918 1.325526,0.56611 2.223018,1.58787 0.9113,1.02176 1.380757,2.416325 0.469458,1.380757 0.469458,3.023857 v 0.289959 q 0,1.629293 -0.469458,3.023858 -0.469457,1.380757 -1.380757,2.416324 -0.897492,1.02176 -2.209211,1.587871 -1.311719,0.56611 -3.01005,0.56611 -1.698331,0 -3.023857,-0.56611 -1.311719,-0.566111 -2.223019,-1.587871 -0.897492,-1.035567 -1.366949,-2.416324 -0.469457,-1.394565 -0.469457,-3.023858 z m 3.976579,-0.289959 v 0.289959 q 0,0.938915 0.165691,1.753561 0.165691,0.814647 0.524688,1.435988 0.372804,0.607533 0.96653,0.952722 0.593725,0.345189 1.449794,0.345189 0.828454,0 1.42218,-0.345189 0.593725,-0.345189 0.952722,-0.952722 0.358997,-0.621341 0.524688,-1.435988 0.179498,-0.814646 0.179498,-1.753561 v -0.289959 q 0,-0.911299 -0.179498,-1.712138 -0.165691,-0.814647 -0.538495,-1.435987 -0.358997,-0.635149 -0.952723,-0.994145 -0.593725,-0.358997 -1.435987,-0.358997 -0.842261,0 -1.435987,0.358997 -0.579918,0.358996 -0.952722,0.994145 -0.358997,0.62134 -0.524688,1.435987 -0.165691,0.800839 -0.165691,1.712138 z"
-     style="font-weight:bold;font-size:28.2779px;line-height:1.25;-inkscape-font-specification:'Sans Bold'"
-     id="path172" /><path
-     d="m 67.057907,33.423763 3.106703,-11.07367 h 2.526785 l -0.814646,4.349384 -3.106703,10.590406 h -2.112558 z m -1.574062,-11.07367 2.223018,11.059863 0.207114,3.879927 H 65.428614 L 61.64534,22.350093 Z m 10.05191,10.880364 2.167788,-10.880364 h 3.852311 l -3.783273,14.93979 h -2.471555 z m -2.49917,-10.880364 3.092895,10.990825 0.428035,3.948965 H 74.431149 L 71.324446,26.713285 70.537415,22.350093 Z"
-     style="font-weight:bold;font-size:28.2779px;line-height:1.25;-inkscape-font-specification:'Sans Bold'"
-     id="path174" /><path
-     d="m 91.635383,33.16142 q 0,-0.428035 -0.248537,-0.773224 -0.248536,-0.345189 -0.925107,-0.635148 -0.662763,-0.303767 -1.919252,-0.552303 -1.13222,-0.248536 -2.112558,-0.621341 -0.96653,-0.386612 -1.684523,-0.925107 -0.704186,-0.538495 -1.104606,-1.270296 -0.400419,-0.745609 -0.400419,-1.698331 0,-0.938915 0.400419,-1.767369 0.414227,-0.828454 1.173644,-1.463602 0.773224,-0.648956 1.877829,-1.007953 1.118413,-0.372804 2.512978,-0.372804 1.946867,0 3.341431,0.621341 1.408372,0.62134 2.153981,1.712138 0.759416,1.07699 0.759416,2.457747 h -3.97658 q 0,-0.579918 -0.248536,-1.035567 -0.234729,-0.469458 -0.745609,-0.731802 -0.497072,-0.276151 -1.297911,-0.276151 -0.662763,0 -1.146028,0.234729 -0.483265,0.220921 -0.745609,0.607533 -0.248536,0.372804 -0.248536,0.828454 0,0.345189 0.138075,0.621341 0.151884,0.262343 0.483265,0.483264 0.331382,0.220922 0.85607,0.414227 0.538495,0.179499 1.325526,0.331382 1.615486,0.331382 2.885782,0.869877 1.270296,0.524688 2.015905,1.435987 0.745609,0.897492 0.745609,2.361094 0,0.994145 -0.441842,1.822599 -0.441843,0.828455 -1.270297,1.449795 -0.828454,0.607533 -1.98829,0.952722 -1.146028,0.331382 -2.582015,0.331382 -2.084943,0 -3.534738,-0.745609 -1.435987,-0.745608 -2.181595,-1.891637 -0.731802,-1.159835 -0.731802,-2.374901 h 3.769467 q 0.02761,0.814646 0.414227,1.311719 0.400419,0.497072 1.007952,0.717993 0.621341,0.220921 1.339334,0.220921 0.773224,0 1.284104,-0.207113 0.51088,-0.220921 0.773224,-0.579918 0.276152,-0.372804 0.276152,-0.856069 z"
-     style="font-weight:bold;font-size:28.2779px;line-height:1.25;-inkscape-font-specification:'Sans Bold'"
-     id="path176" /><path
-     d="m 104.95968,37.566034 q -1.73975,0 -3.12051,-0.552303 -1.38075,-0.56611 -2.347285,-1.560255 -0.952722,-0.994145 -1.463602,-2.305864 -0.51088,-1.325527 -0.51088,-2.816744 v -0.552303 q 0,-1.698331 0.483265,-3.106703 0.483265,-1.408372 1.380757,-2.443939 0.911295,-1.035568 2.209215,-1.587871 1.29791,-0.56611 2.9272,-0.56611 1.58787,0 2.81674,0.524688 1.22888,0.524687 2.05733,1.491217 0.84226,0.96653 1.2703,2.319672 0.42803,1.339334 0.42803,2.982434 v 1.656909 H 99.215734 v -2.651054 h 7.966966 v -0.303766 q 0,-0.828454 -0.30377,-1.47741 -0.28995,-0.662763 -0.88368,-1.049375 -0.59373,-0.386612 -1.51883,-0.386612 -0.78703,0 -1.35314,0.345189 -0.56611,0.345189 -0.92511,0.96653 -0.34519,0.621341 -0.52469,1.463602 -0.16569,0.828454 -0.16569,1.822599 v 0.552303 q 0,0.897492 0.24854,1.656908 0.26234,0.759417 0.7318,1.311719 0.48326,0.552303 1.15983,0.85607 0.69038,0.303766 1.56026,0.303766 1.07699,0 2.0021,-0.414227 0.93891,-0.428035 1.61548,-1.284104 l 1.93306,2.098751 q -0.46946,0.67657 -1.2841,1.297911 -0.80084,0.621341 -1.93306,1.02176 -1.13222,0.386612 -2.58202,0.386612 z"
-     style="font-weight:bold;font-size:28.2779px;line-height:1.25;-inkscape-font-specification:'Sans Bold'"
-     id="path178" /><path
-     d="m 117.33126,25.60868 v 11.681203 h -3.97658 v -14.93979 h 3.74186 z m 4.50127,-3.35524 -0.069,3.686621 q -0.28995,-0.04142 -0.70418,-0.06904 -0.40042,-0.04142 -0.7318,-0.04142 -0.84226,0 -1.46361,0.220921 -0.60753,0.207113 -1.02176,0.62134 -0.40041,0.40042 -0.60753,1.007953 -0.1933,0.593725 -0.22092,1.353142 l -0.80084,-0.248537 q 0,-1.449794 0.28996,-2.66486 0.28996,-1.228874 0.84226,-2.140174 0.56611,-0.911299 1.38076,-1.408372 0.81465,-0.497072 1.86402,-0.497072 0.33138,0 0.67657,0.05523 0.34519,0.04142 0.56611,0.124268 z"
-     style="font-weight:bold;font-size:28.2779px;line-height:1.25;-inkscape-font-specification:'Sans Bold'"
-     id="path180" /></g>
+   xmlns="http://www.w3.org/2000/svg">
+<path
+     d="m 117.33126,25.60868 v 11.681203 h -3.97658 v -14.93979 h 3.74186 z m 4.50127,-3.35524 -0.069,3.686621 q -0.28995,-0.04142 -0.70418,-0.06904 -0.40042,-0.04142 -0.7318,-0.04142 -0.84226,0 -1.46361,0.220921 -0.60753,0.207113 -1.02176,0.62134 -0.40041,0.40042 -0.60753,1.007953 -0.1933,0.593725 -0.22092,1.353142 l -0.80084,-0.248537 q 0,-1.449794 0.28996,-2.66486 0.28996,-1.228874 0.84226,-2.140174 0.56611,-0.911299 1.38076,-1.408372 0.81465,-0.497072 1.86402,-0.497072 0.33138,0 0.67657,0.05523 0.34519,0.04142 0.56611,0.124268 z m -16.87285,15.312594 q -1.73975,0 -3.12051,-0.552303 -1.38075,-0.56611 -2.347285,-1.560255 -0.952722,-0.994145 -1.463602,-2.305864 -0.51088,-1.325527 -0.51088,-2.816744 v -0.552303 q 0,-1.698331 0.483265,-3.106703 0.483265,-1.408372 1.380757,-2.443939 0.911295,-1.035568 2.209215,-1.587871 1.29791,-0.56611 2.9272,-0.56611 1.58787,0 2.81674,0.524688 1.22888,0.524687 2.05733,1.491217 0.84226,0.96653 1.2703,2.319672 0.42803,1.339334 0.42803,2.982434 v 1.656909 H 99.215734 v -2.651054 h 7.966966 v -0.303766 q 0,-0.828454 -0.30377,-1.47741 -0.28995,-0.662763 -0.88368,-1.049375 -0.59373,-0.386612 -1.51883,-0.386612 -0.78703,0 -1.35314,0.345189 -0.56611,0.345189 -0.92511,0.96653 -0.34519,0.621341 -0.52469,1.463602 -0.16569,0.828454 -0.16569,1.822599 v 0.552303 q 0,0.897492 0.24854,1.656908 0.26234,0.759417 0.7318,1.311719 0.48326,0.552303 1.15983,0.85607 0.69038,0.303766 1.56026,0.303766 1.07699,0 2.0021,-0.414227 0.93891,-0.428035 1.61548,-1.284104 l 1.93306,2.098751 q -0.46946,0.67657 -1.2841,1.297911 -0.80084,0.621341 -1.93306,1.02176 -1.13222,0.386612 -2.58202,0.386612 z M 91.635383,33.16142 q 0,-0.428035 -0.248537,-0.773224 -0.248536,-0.345189 -0.925107,-0.635148 -0.662763,-0.303767 -1.919252,-0.552303 -1.13222,-0.248536 -2.112558,-0.621341 -0.96653,-0.386612 -1.684523,-0.925107 -0.704186,-0.538495 -1.104606,-1.270296 -0.400419,-0.745609 -0.400419,-1.698331 0,-0.938915 0.400419,-1.767369 0.414227,-0.828454 1.173644,-1.463602 0.773224,-0.648956 1.877829,-1.007953 1.118413,-0.372804 2.512978,-0.372804 1.946867,0 3.341431,0.621341 1.408372,0.62134 2.153981,1.712138 0.759416,1.07699 0.759416,2.457747 h -3.97658 q 0,-0.579918 -0.248536,-1.035567 -0.234729,-0.469458 -0.745609,-0.731802 -0.497072,-0.276151 -1.297911,-0.276151 -0.662763,0 -1.146028,0.234729 -0.483265,0.220921 -0.745609,0.607533 -0.248536,0.372804 -0.248536,0.828454 0,0.345189 0.138075,0.621341 0.151884,0.262343 0.483265,0.483264 0.331382,0.220922 0.85607,0.414227 0.538495,0.179499 1.325526,0.331382 1.615486,0.331382 2.885782,0.869877 1.270296,0.524688 2.015905,1.435987 0.745609,0.897492 0.745609,2.361094 0,0.994145 -0.441842,1.822599 -0.441843,0.828455 -1.270297,1.449795 -0.828454,0.607533 -1.98829,0.952722 -1.146028,0.331382 -2.582015,0.331382 -2.084943,0 -3.534738,-0.745609 -1.435987,-0.745608 -2.181595,-1.891637 -0.731802,-1.159835 -0.731802,-2.374901 h 3.769467 q 0.02761,0.814646 0.414227,1.311719 0.400419,0.497072 1.007952,0.717993 0.621341,0.220921 1.339334,0.220921 0.773224,0 1.284104,-0.207113 0.51088,-0.220921 0.773224,-0.579918 0.276152,-0.372804 0.276152,-0.856069 z m -24.577476,0.262343 3.106703,-11.07367 h 2.526785 l -0.814646,4.349384 -3.106703,10.590406 h -2.112558 z m -1.574062,-11.07367 2.223018,11.059863 0.207114,3.879927 H 65.428614 L 61.64534,22.350093 Z m 10.05191,10.880364 2.167788,-10.880364 h 3.852311 l -3.783273,14.93979 h -2.471555 z m -2.49917,-10.880364 3.092895,10.990825 0.428035,3.948965 H 74.431149 L 71.324446,26.713285 70.537415,22.350093 Z m -26.841912,7.621778 v -0.289959 q 0,-1.6431 0.469457,-3.023857 0.469457,-1.394565 1.366949,-2.416325 0.897492,-1.02176 2.209211,-1.58787 1.311719,-0.579918 3.01005,-0.579918 1.698331,0 3.023858,0.579918 1.325526,0.56611 2.223018,1.58787 0.9113,1.02176 1.380757,2.416325 0.469458,1.380757 0.469458,3.023857 v 0.289959 q 0,1.629293 -0.469458,3.023858 -0.469457,1.380757 -1.380757,2.416324 -0.897492,1.02176 -2.209211,1.587871 -1.311719,0.56611 -3.01005,0.56611 -1.698331,0 -3.023857,-0.56611 -1.311719,-0.566111 -2.223019,-1.587871 -0.897492,-1.035567 -1.366949,-2.416324 -0.469457,-1.394565 -0.469457,-3.023858 z m 3.976579,-0.289959 v 0.289959 q 0,0.938915 0.165691,1.753561 0.165691,0.814647 0.524688,1.435988 0.372804,0.607533 0.96653,0.952722 0.593725,0.345189 1.449794,0.345189 0.828454,0 1.42218,-0.345189 0.593725,-0.345189 0.952722,-0.952722 0.358997,-0.621341 0.524688,-1.435988 0.179498,-0.814646 0.179498,-1.753561 v -0.289959 q 0,-0.911299 -0.179498,-1.712138 -0.165691,-0.814647 -0.538495,-1.435987 -0.358997,-0.635149 -0.952723,-0.994145 -0.593725,-0.358997 -1.435987,-0.358997 -0.842261,0 -1.435987,0.358997 -0.579918,0.358996 -0.952722,0.994145 -0.358997,0.62134 -0.524688,1.435987 -0.165691,0.800839 -0.165691,1.712138 z M 40.878758,25.60868 v 11.681203 h -3.97658 v -14.93979 h 3.741851 z m 4.501267,-3.35524 -0.06904,3.686621 q -0.289959,-0.04142 -0.704186,-0.06904 -0.400419,-0.04142 -0.731801,-0.04142 -0.842262,0 -1.463602,0.220921 -0.607533,0.207113 -1.02176,0.62134 -0.40042,0.40042 -0.607533,1.007953 -0.193306,0.593725 -0.220921,1.353142 L 39.760345,28.78442 q 0,-1.449794 0.289959,-2.66486 0.289959,-1.228874 0.842261,-2.140174 0.566111,-0.911299 1.380757,-1.408372 0.814647,-0.497072 1.864022,-0.497072 0.331382,0 0.676571,0.05523 0.345189,0.04142 0.56611,0.124268 z M 20.995859,16.081457 h 3.97658 v 17.784149 l -0.400419,3.424277 h -3.576161 z m 13.434765,13.586648 v 0.289959 q 0,1.670715 -0.358997,3.06528 -0.345189,1.394564 -1.076991,2.416324 -0.731801,1.007953 -1.822599,1.574063 -1.07699,0.552303 -2.540592,0.552303 -1.36695,0 -2.374902,-0.552303 -0.994145,-0.552302 -1.670716,-1.560255 -0.676571,-1.007952 -1.090798,-2.361094 -0.414227,-1.353142 -0.62134,-2.95482 v -0.635148 q 0.207113,-1.601678 0.62134,-2.95482 0.414227,-1.353142 1.090798,-2.361094 0.676571,-1.007953 1.670716,-1.560255 0.994145,-0.552303 2.347287,-0.552303 1.477409,0 2.568207,0.56611 1.104606,0.552303 1.822599,1.574063 0.731802,1.007953 1.076991,2.402517 0.358997,1.380757 0.358997,3.051473 z m -3.97658,0.289959 v -0.289959 q 0,-0.9113 -0.138076,-1.712139 -0.124268,-0.814646 -0.441842,-1.422179 -0.317574,-0.621341 -0.869877,-0.980338 -0.538495,-0.358997 -1.394564,-0.358997 -0.814647,0 -1.380757,0.276152 -0.566111,0.276151 -0.938915,0.773224 -0.358997,0.497072 -0.552303,1.187451 -0.179498,0.67657 -0.207113,1.491217 v 1.808792 q 0.04142,1.090797 0.358997,1.933059 0.331381,0.828454 0.994145,1.311719 0.67657,0.469458 1.753561,0.469458 0.842262,0 1.394564,-0.331382 0.552303,-0.331382 0.85607,-0.938915 0.317574,-0.607533 0.441842,-1.422179 0.124268,-0.828455 0.124268,-1.794984 z M 10.419262,20.624147 4.9514648,37.289883 H 0.54685038 L 8.016745,17.186063 h 2.802936 z M 14.961952,37.289883 9.4803473,20.624147 9.0385051,17.186063 h 2.8305519 l 7.511317,20.10382 z M 14.713416,29.80618 v 3.244779 H 4.0953955 V 29.80618 Z" fill="white" />
 </svg>

helpers/DATA/firefox/branding/content/aboutDialog.css

@@ -40,8 +40,9 @@
 }
 
 #rightBox {
-  margin-left: 30px;
-  margin-right: 30px;
+  background-size: auto 64px;
+  margin-inline: 30px;
+  padding-top: 64px;
 }
 
 #bottomBox {

helpers/DATA/firefox/branding/content/firefox-wordmark.svg

-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<!-- This Source Code Form is subject to the terms of the Mozilla Public
+   - License, v. 2.0. If a copy of the MPL was not distributed with this
+   - file, You can obtain one at http://mozilla.org/MPL/2.0/. -->
 <svg
-   version="1.1"
-   id="aboutWordmark"
-   x="0px"
-   y="0px"
-   width="121.3271"
-   height="21.484577"
-   viewBox="0 0 121.3271 21.484577"
-   xml:space="preserve"
-   inkscape:version="1.2 (1:1.2+202205241504+da316b6974)"
-   sodipodi:docname="firefox-wordmark.svg"
-   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
-   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
-   xmlns="http://www.w3.org/2000/svg"
-   xmlns:svg="http://www.w3.org/2000/svg"
-   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
-   xmlns:cc="http://creativecommons.org/ns#"
-   xmlns:dc="http://purl.org/dc/elements/1.1/"><metadata
-   id="metadata9"><rdf:RDF><cc:Work
-       rdf:about=""><dc:format>image/svg+xml</dc:format><dc:type
-         rdf:resource="http://purl.org/dc/dcmitype/StillImage" /><dc:title /></cc:Work></rdf:RDF></metadata><defs
-   id="defs7" /><sodipodi:namedview
-   pagecolor="#ffffff"
-   bordercolor="#666666"
-   borderopacity="1"
-   objecttolerance="10"
-   gridtolerance="10"
-   guidetolerance="10"
-   inkscape:pageopacity="0"
-   inkscape:pageshadow="2"
-   inkscape:window-width="1918"
-   inkscape:window-height="1008"
-   id="namedview5"
-   showgrid="false"
-   inkscape:zoom="3.4606064"
-   inkscape:cx="27.885286"
-   inkscape:cy="-18.493869"
-   inkscape:window-x="1366"
-   inkscape:window-y="0"
-   inkscape:window-maximized="1"
-   inkscape:current-layer="aboutWordmark"
-   inkscape:document-rotation="0"
-   fit-margin-top="0"
-   fit-margin-left="0"
-   fit-margin-right="0"
-   fit-margin-bottom="0"
-   inkscape:showpageshadow="2"
-   inkscape:pagecheckerboard="0"
-   inkscape:deskcolor="#d1d1d1" /><g
-   aria-label="Abrowser"
-   id="text2986"
-   style="line-height:0%;letter-spacing:0px;word-spacing:0px;fill:#808080"><path
-     d="M 9.8724116,4.5426901 4.4046144,21.208426 H 0 L 7.4698947,1.1046055 H 10.272831 Z M 14.415102,21.208426 8.9334969,4.5426901 8.4916547,1.1046055 h 2.8305513 l 7.511318,20.1038205 z m -0.248537,-7.483703 v 3.244779 H 3.5485452 v -3.244779 z"
-     style="font-weight:bold;font-size:28.2779px;line-height:1.25;-inkscape-font-specification:'Sans Bold';fill:#808080"
-     id="path202" /><path
-     d="m 20.449009,0 h 3.97658 v 17.784148 l -0.40042,3.424278 h -3.57616 z m 13.434764,13.586648 v 0.289959 q 0,1.670715 -0.358997,3.06528 -0.345189,1.394564 -1.07699,2.416324 -0.731801,1.007953 -1.822599,1.574063 -1.07699,0.552303 -2.540593,0.552303 -1.366949,0 -2.374901,-0.552303 -0.994145,-0.552303 -1.670716,-1.560255 -0.676571,-1.007953 -1.090798,-2.361094 -0.414227,-1.353142 -0.621341,-2.95482 v -0.635148 q 0.207114,-1.601678 0.621341,-2.95482 0.414227,-1.3531417 1.090798,-2.3610942 0.676571,-1.0079525 1.670716,-1.5602552 0.994145,-0.5523028 2.347286,-0.5523028 1.47741,0 2.568208,0.5661103 1.104606,0.5523028 1.822599,1.5740629 0.731801,1.0079525 1.07699,2.402517 0.358997,1.380757 0.358997,3.051473 z m -3.97658,0.289959 v -0.289959 q 0,-0.9113 -0.138075,-1.712139 Q 29.64485,11.059863 29.327276,10.45233 29.009701,9.8309889 28.457399,9.4719921 27.918904,9.1129953 27.062834,9.1129953 q -0.814646,0 -1.380757,0.2761514 -0.56611,0.2761514 -0.938914,0.7732243 -0.358997,0.497072 -0.552303,1.18745 -0.179498,0.676571 -0.207114,1.491218 v 1.808791 q 0.04142,1.090798 0.358997,1.93306 0.331382,0.828454 0.994145,1.311719 0.676571,0.469457 1.753561,0.469457 0.842262,0 1.394565,-0.331381 0.552303,-0.331382 0.856069,-0.938915 0.317574,-0.607533 0.441842,-1.42218 0.124268,-0.828454 0.124268,-1.794983 z"
-     style="font-weight:bold;font-size:28.2779px;line-height:1.25;-inkscape-font-specification:'Sans Bold';fill:#808080"
-     id="path204" /><path
-     d="M 40.331907,9.5272224 V 21.208426 H 36.355328 V 6.2686362 h 3.741851 z m 4.501268,-3.3552392 -0.06904,3.6866209 q -0.289959,-0.041423 -0.704186,-0.069038 -0.40042,-0.041423 -0.731801,-0.041423 -0.842262,0 -1.463603,0.2209211 -0.607533,0.2071134 -1.02176,0.6213404 -0.400419,0.40042 -0.607533,1.007953 -0.193306,0.593725 -0.220921,1.353141 l -0.800839,-0.248536 q 0,-1.449795 0.289959,-2.664861 0.289959,-1.2288732 0.842262,-2.1401727 0.56611,-0.9112995 1.380757,-1.408372 0.814646,-0.4970725 1.864022,-0.4970725 0.331381,0 0.67657,0.05523 0.34519,0.041423 0.566111,0.1242681 z"
-     style="font-weight:bold;font-size:28.2779px;line-height:1.25;-inkscape-font-specification:'Sans Bold';fill:#808080"
-     id="path206" /><path
-     d="m 45.647822,13.890414 v -0.289959 q 0,-1.643101 0.469458,-3.023857 0.469457,-1.3945648 1.366949,-2.4163249 0.897492,-1.0217601 2.209211,-1.5878704 1.311719,-0.5799179 3.01005,-0.5799179 1.698331,0 3.023857,0.5799179 1.325527,0.5661103 2.223019,1.5878704 0.911299,1.0217601 1.380757,2.4163249 0.469457,1.380756 0.469457,3.023857 v 0.289959 q 0,1.629293 -0.469457,3.023858 -0.469458,1.380757 -1.380757,2.416324 -0.897492,1.02176 -2.209211,1.587871 -1.311719,0.56611 -3.01005,0.56611 -1.698331,0 -3.023858,-0.56611 -1.311719,-0.566111 -2.223018,-1.587871 -0.897492,-1.035567 -1.366949,-2.416324 -0.469458,-1.394565 -0.469458,-3.023858 z m 3.97658,-0.289959 v 0.289959 q 0,0.938915 0.165691,1.753561 0.165691,0.814647 0.524687,1.435987 0.372805,0.607534 0.96653,0.952723 0.593726,0.345189 1.449795,0.345189 0.828454,0 1.42218,-0.345189 0.593725,-0.345189 0.952722,-0.952723 0.358997,-0.62134 0.524687,-1.435987 0.179499,-0.814646 0.179499,-1.753561 v -0.289959 q 0,-0.911299 -0.179499,-1.712138 Q 55.465004,11.07367 55.092199,10.45233 54.733202,9.8171813 54.139477,9.4581846 53.545752,9.0991878 52.70349,9.0991878 q -0.842262,0 -1.435987,0.3589968 -0.579918,0.3589967 -0.952723,0.9941454 -0.358996,0.62134 -0.524687,1.435987 -0.165691,0.800839 -0.165691,1.712138 z"
-     style="font-weight:bold;font-size:28.2779px;line-height:1.25;-inkscape-font-specification:'Sans Bold';fill:#808080"
-     id="path208" /><path
-     d="M 66.511057,17.342306 69.61776,6.2686362 h 2.526785 L 71.329898,10.61802 68.223195,21.208426 H 66.110637 Z M 64.936994,6.2686362 67.160013,17.328499 67.367126,21.208426 H 64.881764 L 61.09849,6.2686362 Z M 74.988904,17.149 77.156692,6.2686362 h 3.852312 L 77.22573,21.208426 H 74.754175 Z M 72.489734,6.2686362 75.58263,17.259461 76.010664,21.208426 H 73.884299 L 70.777596,10.631828 69.990564,6.2686362 Z"
-     style="font-weight:bold;font-size:28.2779px;line-height:1.25;-inkscape-font-specification:'Sans Bold';fill:#808080"
-     id="path210" /><path
-     d="m 91.088532,17.079962 q 0,-0.428034 -0.248536,-0.773223 -0.248536,-0.34519 -0.925107,-0.635149 -0.662763,-0.303766 -1.919252,-0.552302 -1.132221,-0.248537 -2.112558,-0.621341 -0.96653,-0.386612 -1.684524,-0.925107 -0.704186,-0.538495 -1.104605,-1.270296 -0.40042,-0.745609 -0.40042,-1.698331 0,-0.9389149 0.40042,-1.767369 0.414227,-0.8284542 1.173643,-1.4636023 0.773224,-0.6489557 1.87783,-1.0079525 1.118413,-0.3728044 2.512977,-0.3728044 1.946867,0 3.341432,0.6213406 1.408372,0.6213406 2.15398,1.7121385 0.759417,1.0769904 0.759417,2.4577471 h -3.97658 q 0,-0.579918 -0.248536,-1.0355675 Q 90.453384,9.2786862 89.942504,9.0163424 89.445432,8.740191 88.644593,8.740191 q -0.662764,0 -1.146029,0.2347287 -0.483265,0.2209211 -0.745608,0.607533 -0.248537,0.3728043 -0.248537,0.8284543 0,0.345189 0.138076,0.62134 0.151883,0.262344 0.483265,0.483265 0.331382,0.220921 0.856069,0.414227 0.538495,0.179499 1.325527,0.331382 1.615485,0.331382 2.885782,0.869877 1.270296,0.524687 2.015905,1.435987 0.745608,0.897492 0.745608,2.361094 0,0.994145 -0.441842,1.822599 -0.441842,0.828454 -1.270296,1.449795 -0.828454,0.607533 -1.98829,0.952722 -1.146028,0.331382 -2.582015,0.331382 -2.084943,0 -3.534738,-0.745609 -1.435987,-0.745609 -2.181596,-1.891637 -0.731801,-1.159835 -0.731801,-2.374902 h 3.769466 q 0.02762,0.814647 0.414227,1.311719 0.40042,0.497073 1.007953,0.717994 0.621341,0.220921 1.339334,0.220921 0.773224,0 1.284104,-0.207113 0.51088,-0.220921 0.773224,-0.579918 0.276151,-0.372805 0.276151,-0.85607 z"
-     style="font-weight:bold;font-size:28.2779px;line-height:1.25;-inkscape-font-specification:'Sans Bold';fill:#808080"
-     id="path212" /><path
-     d="m 104.41283,21.484577 q -1.73975,0 -3.12051,-0.552303 -1.380755,-0.56611 -2.347285,-1.560255 -0.952722,-0.994145 -1.463602,-2.305864 -0.51088,-1.325527 -0.51088,-2.816744 v -0.552303 q 0,-1.698331 0.483265,-3.106703 0.483264,-1.4083718 1.380756,-2.4439395 0.9113,-1.0355676 2.209216,-1.5878704 1.29791,-0.5661103 2.9272,-0.5661103 1.58787,0 2.81674,0.5246876 1.22888,0.5246876 2.05733,1.4912174 0.84226,0.9665299 1.2703,2.3196712 0.42803,1.339335 0.42803,2.982435 v 1.656908 H 98.668884 v -2.651053 h 7.966966 v -0.303766 q 0,-0.828454 -0.30377,-1.47741 -0.28995,-0.6627634 -0.88368,-1.0493753 -0.59373,-0.3866119 -1.51883,-0.3866119 -0.78703,0 -1.35314,0.3451892 -0.56611,0.3451892 -0.92511,0.96653 -0.34519,0.62134 -0.52469,1.463602 -0.16569,0.828454 -0.16569,1.822599 v 0.552303 q 0,0.897492 0.24854,1.656908 0.26234,0.759416 0.7318,1.311719 0.48326,0.552303 1.15983,0.856069 0.69038,0.303767 1.56026,0.303767 1.07699,0 2.0021,-0.414227 0.93891,-0.428035 1.61548,-1.284104 l 1.93306,2.09875 q -0.46946,0.676571 -1.2841,1.297912 -0.80084,0.62134 -1.93306,1.02176 -1.13222,0.386612 -2.58202,0.386612 z"
-     style="font-weight:bold;font-size:28.2779px;line-height:1.25;-inkscape-font-specification:'Sans Bold';fill:#808080"
-     id="path214" /><path
-     d="M 116.78441,9.5272224 V 21.208426 h -3.97658 V 6.2686362 h 3.74186 z m 4.50127,-3.3552392 -0.069,3.6866209 q -0.28996,-0.041423 -0.70418,-0.069038 -0.40042,-0.041423 -0.7318,-0.041423 -0.84226,0 -1.46361,0.2209211 -0.60753,0.2071134 -1.02176,0.6213404 -0.40042,0.40042 -0.60753,1.007953 -0.1933,0.593725 -0.22092,1.353141 L 115.666,12.702963 q 0,-1.449795 0.28996,-2.664861 0.28996,-1.2288732 0.84226,-2.1401727 0.56611,-0.9112995 1.38076,-1.408372 0.81465,-0.4970725 1.86402,-0.4970725 0.33138,0 0.67657,0.05523 0.34519,0.041423 0.56611,0.1242681 z"
-     style="font-weight:bold;font-size:28.2779px;line-height:1.25;-inkscape-font-specification:'Sans Bold';fill:#808080"
-     id="path216" /></g>
+   width="232"
+   height="41"
+   viewBox="0 0 232 41"
+   xmlns="http://www.w3.org/2000/svg">
+<path d="m 222.86503,18.181234 v 22.291775 h -7.5887 V 11.962725 h 7.14077 z m 8.58998,-6.402957 -0.13168,7.035348 q -0.55334,-0.07905 -1.34382,-0.131748 -0.76413,-0.07905 -1.39653,-0.07905 -1.60731,0 -2.79307,0.421594 -1.15938,0.395244 -1.94987,1.185733 -0.76414,0.764139 -1.15938,1.923523 -0.36888,1.133032 -0.42159,2.582261 l -1.52836,-0.474293 q 0,-2.76671 0.55335,-5.085477 0.55334,-2.345114 1.60732,-4.084188 1.08034,-1.739075 2.63497,-2.687661 1.55463,-0.948587 3.5572,-0.948587 0.63238,0 1.29112,0.105398 0.65875,0.07905 1.08034,0.237147 z M 199.25577,41 q -3.32004,0 -5.95501,-1.053985 -2.63495,-1.080333 -4.47943,-2.977506 -1.81812,-1.897172 -2.79306,-4.400385 -0.97494,-2.529564 -0.97494,-5.375322 v -1.053985 q 0,-3.241003 0.92225,-5.928663 0.92223,-2.68766 2.63495,-4.663881 1.73908,-1.976222 4.21596,-3.030206 2.47685,-1.080335 5.5861,-1.080335 3.03021,0 5.37531,1.001286 2.34514,1.001285 3.9261,2.845758 1.60732,1.844474 2.42418,4.426735 0.81683,2.555914 0.81683,5.691517 v 3.161953 h -22.66067 v -5.059125 h 15.20373 v -0.579691 q 0,-1.580977 -0.5797,-2.819409 -0.55333,-1.264782 -1.68637,-2.002571 -1.13305,-0.737789 -2.89845,-0.737789 -1.50192,0 -2.58226,0.658741 -1.08033,0.65874 -1.76543,1.844473 -0.65874,1.185732 -1.00129,2.793058 -0.3162,1.580977 -0.3162,3.478149 v 1.053985 q 0,1.712726 0.47431,3.161954 0.50063,1.449228 1.39652,2.503212 0.92223,1.053986 2.21336,1.633677 1.31748,0.579692 2.97751,0.579692 2.05528,0 3.82071,-0.790488 1.79176,-0.816839 3.08289,-2.450514 l 3.68895,4.00514 q -0.89589,1.291131 -2.45051,2.476865 -1.52828,1.185731 -3.68895,1.949871 Q 202.0225,41 199.25577,41 Z m -25.42736,-8.405528 q 0,-0.816837 -0.4743,-1.475577 -0.47429,-0.658741 -1.76542,-1.212083 -1.26478,-0.579691 -3.66259,-1.053984 -2.16067,-0.474295 -4.0315,-1.185733 -1.84447,-0.73779 -3.21465,-1.765424 -1.34383,-1.027634 -2.10797,-2.424164 -0.76414,-1.422879 -0.76414,-3.241003 0,-1.791774 0.76414,-3.372751 0.79049,-1.580977 2.23972,-2.793059 1.47558,-1.238431 3.58355,-1.923522 2.13432,-0.71144 4.79563,-0.71144 3.71529,0 6.37661,1.185734 2.68765,1.185732 4.11054,3.267352 1.44922,2.055269 1.44922,4.690231 h -7.58869 q 0,-1.106684 -0.47429,-1.976222 -0.44794,-0.895886 -1.42288,-1.396529 -0.94859,-0.526992 -2.47687,-0.526992 -1.26478,0 -2.18701,0.447944 -0.92224,0.421594 -1.42288,1.159382 -0.47429,0.71144 -0.47429,1.580978 0,0.658739 0.2635,1.185732 0.28984,0.500642 0.92223,0.922236 0.63239,0.421594 1.63367,0.790488 1.02764,0.342546 2.52956,0.632392 3.08292,0.632391 5.50708,1.660026 2.42416,1.001284 3.84704,2.74036 1.42288,1.712724 1.42288,4.505782 0,1.897174 -0.84319,3.478149 -0.84319,1.580977 -2.42416,2.766711 -1.58098,1.159382 -3.79434,1.818123 Q 171.95758,41 169.21723,41 q -3.9788,0 -6.7455,-1.422879 -2.74036,-1.422881 -4.16325,-3.609898 -1.39653,-2.213365 -1.39653,-4.532134 h 7.19345 q 0.0527,1.554628 0.79049,2.503214 0.76414,0.948586 1.92352,1.370181 1.18574,0.421593 2.55591,0.421593 1.47558,0 2.45051,-0.395244 0.97494,-0.421593 1.47559,-1.106684 0.52699,-0.71144 0.52699,-1.633677 z m -46.90232,0.500643 5.92867,-21.13239 h 4.82197 l -1.55463,8.300128 -5.92866,20.210156 h -4.03149 z m -3.00386,-21.13239 4.2423,21.106042 0.39523,7.404242 h -4.74293 l -7.21979,-28.510284 z m 19.18252,20.763496 4.13689,-20.763496 h 7.35154 l -7.21979,28.510284 h -4.71658 z m -4.76928,-20.763496 5.90232,20.974294 0.81684,7.53599 h -4.05784 L 135.06812,20.289203 133.5662,11.962725 Z M 87.111825,26.507712 V 25.95437 q 0,-3.135605 0.895889,-5.770565 0.895886,-2.661311 2.60861,-4.611183 1.712725,-1.949871 4.215939,-3.030206 2.503213,-1.106684 5.744217,-1.106684 3.24101,0 5.77057,1.106684 2.52956,1.080335 4.24228,3.030206 1.73907,1.949872 2.63496,4.611183 0.89589,2.63496 0.89589,5.770565 v 0.553342 q 0,3.109254 -0.89589,5.770567 -0.89589,2.634961 -2.63496,4.611181 -1.71272,1.949871 -4.21594,3.030207 Q 103.87018,41 100.62918,41 97.388175,41 94.858612,39.919667 92.355398,38.839331 90.616324,36.88946 88.9036,34.91324 88.007714,32.278279 87.111825,29.616966 87.111825,26.507712 Z m 7.58869,-0.553342 v 0.553342 q 0,1.791774 0.316195,3.3464 0.316196,1.554628 1.001284,2.74036 0.711441,1.159386 1.844474,1.818125 1.133034,0.65874 2.766712,0.65874 1.58098,0 2.71401,-0.65874 1.13303,-0.658739 1.81812,-1.818125 0.6851,-1.185732 1.00129,-2.74036 0.34254,-1.554626 0.34254,-3.3464 V 25.95437 q 0,-1.739074 -0.34254,-3.267351 -0.31619,-1.554628 -1.02764,-2.74036 -0.68509,-1.212083 -1.81813,-1.897173 -1.13303,-0.68509 -2.74035,-0.68509 -1.607328,0 -2.740361,0.68509 -1.106684,0.68509 -1.818125,1.897173 -0.685088,1.185732 -1.001284,2.74036 -0.316195,1.528277 -0.316195,3.267351 z M 76.967222,18.181234 V 40.473009 H 69.378534 V 11.962725 h 7.140746 z m 8.589975,-6.402957 -0.131752,7.035348 q -0.553343,-0.07905 -1.343831,-0.131748 -0.76414,-0.07905 -1.396529,-0.07905 -1.607327,0 -2.79306,0.421594 -1.159383,0.395244 -1.949872,1.185733 -0.764137,0.764139 -1.159383,1.923523 -0.368894,1.133032 -0.421593,2.582261 l -1.528278,-0.474293 q 0,-2.76671 0.553342,-5.085477 0.553342,-2.345115 1.607328,-4.084189 1.080333,-1.739075 2.634961,-2.687661 1.554626,-0.948586 3.557198,-0.948586 0.63239,0 1.29113,0.105398 0.658741,0.07905 1.080335,0.237146 z M 39.023779,0 h 7.588689 v 33.938303 l -0.76414,6.534706 h -6.824549 z m 25.638173,25.928021 v 0.553342 q 0,3.188302 -0.68509,5.849614 -0.65874,2.66131 -2.055269,4.611182 -1.396529,1.923523 -3.478149,3.003856 Q 56.388175,41 53.595114,41 50.986503,41 49.062982,39.946015 47.16581,38.89203 45.874679,36.968509 44.583547,35.044986 43.793059,32.462726 43.00257,29.880463 42.607326,26.823907 v -1.212081 q 0.395244,-3.056556 1.185733,-5.638819 0.790488,-2.582262 2.08162,-4.505784 1.291131,-1.923522 3.188303,-2.977505 1.897172,-1.053986 4.479433,-1.053986 2.819409,0 4.901029,1.080335 2.10797,1.053984 3.478149,3.003856 1.396529,1.923522 2.055269,4.584833 0.68509,2.634962 0.68509,5.823265 z m -7.588689,0.553342 v -0.553342 q 0,-1.739075 -0.263495,-3.267353 -0.237146,-1.554626 -0.843187,-2.714009 -0.606043,-1.185734 -1.660025,-1.870824 -1.027635,-0.68509 -2.661313,-0.68509 -1.554626,0 -2.634961,0.526992 -1.080335,0.526993 -1.791773,1.47558 -0.68509,0.948585 -1.053985,2.266065 -0.342545,1.291132 -0.395245,2.84576 v 3.451798 q 0.07904,2.08162 0.68509,3.688947 0.632392,1.580976 1.897173,2.503213 1.291131,0.895886 3.3464,0.895886 1.607327,0 2.661312,-0.632389 1.053986,-0.632392 1.633676,-1.791774 0.606041,-1.159383 0.843187,-2.714011 0.237146,-1.580977 0.237146,-3.425449 z M 18.839974,8.6690231 8.405527,40.473009 H 0 L 14.255141,2.1079691 h 5.348971 z M 27.508998,40.473009 17.0482,8.6690231 16.205013,2.1079691 h 5.401671 L 35.940875,40.473009 Z M 27.034703,26.191516 v 6.192161 H 6.771851 v -6.192161 z" fill="context-fill" />
 </svg>

helpers/DATA/firefox/default-strict.patch

-diff -ru firefox-110.0+build1/browser/components/BrowserGlue.sys.mjs firefox-110.0+build1/browser/components/BrowserGlue.sys.mjs_fix
---- firefox-110.0+build1/browser/components/BrowserGlue.sys.mjs	2023-02-07 01:52:32.000000000 -0600
-+++ firefox-110.0+build1/browser/components/BrowserGlue.sys.mjs_fix	2023-02-07 14:52:59.465762604 -0600
-@@ -1637,6 +1637,19 @@
+diff --git a/browser/components/BrowserGlue.sys.mjs b/browser/components/BrowserGlue.sys.mjs
+index 8fa6f7a..a34ab8b 100644
+--- a/browser/components/BrowserGlue.sys.mjs
++++ b/browser/components/BrowserGlue.sys.mjs
+@@ -1860,6 +1860,19 @@ BrowserGlue.prototype = {
        }
      });
  
@@ -18,6 +19,6 @@ diff -ru firefox-110.0+build1/browser/components/BrowserGlue.sys.mjs firefox-110
 +      Services.prefs.setStringPref("browser.contentblocking.category", "strict"); this._updateCBCategory;
 +    }
 +
-     // Offer to reset a user's profile if it hasn't been used for 60 days.
-     const OFFER_PROFILE_RESET_INTERVAL_MS = 60 * 24 * 60 * 60 * 1000;
-     let lastUse = Services.appinfo.replacedLockTime;
+     this._maybeOfferProfileReset();
+ 
+     this._checkForOldBuildUpdates();

helpers/DATA/firefox/firefox_permanently_enable_new_search_engine_config.patch

+
+# HG changeset patch
+# User Mark Banner <standard8@mozilla.com>
+# Date 1717528181 0
+# Node ID bad743156b3050747ba33df8bc46518e90a1f673
+# Parent  a414b7e839e5940d7d90cc8134665b1595549605
+Bug 1900638 - Permanently enable the new search config. r=search-reviewers,daleharvey
+
+Differential Revision: https://phabricator.services.mozilla.com/D212575
+
+diff --git a/modules/libpref/init/all.js b/modules/libpref/init/all.js
+--- a/modules/libpref/init/all.js
++++ b/modules/libpref/init/all.js
+@@ -3580,26 +3580,16 @@ pref("urlclassifier.blockedTable", "mozt
+ pref("browser.search.log", false);
+ pref("browser.search.update", true);
+ pref("browser.search.suggest.enabled", true);
+ pref("browser.search.suggest.enabled.private", false);
+ pref("browser.search.separatePrivateDefault", true);
+ pref("browser.search.separatePrivateDefault.ui.enabled", false);
+ pref("browser.search.removeEngineInfobar.enabled", true);
+ 
+-// Enables a new search configuration style with no functional changes for the
+-// user. This is solely intended as a rollout button - it will go away once the
+-// new configuration has been rolled out.
+-// Whether search-config-v2 is enabled.
+-#ifdef NIGHTLY_BUILD
+-pref("browser.search.newSearchConfig.enabled", true);
+-#else
+-pref("browser.search.newSearchConfig.enabled", false);
+-#endif
+-
+ // GMPInstallManager prefs
+ 
+ // User-settable override to media.gmp-manager.url for testing purposes.
+ //pref("media.gmp-manager.url.override", "");
+ 
+ // When |media.gmp-manager.allowLocalSources| is true, we will allow falling
+ // back to using the plugin configurations distributed with Firefox to update
+ // or install plugins. This fallback is only used when we fail to get an
+diff --git a/toolkit/components/search/SearchUtils.sys.mjs b/toolkit/components/search/SearchUtils.sys.mjs
+--- a/toolkit/components/search/SearchUtils.sys.mjs
++++ b/toolkit/components/search/SearchUtils.sys.mjs
+@@ -106,16 +106,20 @@ class LoadListener {
+   }
+ 
+   // nsIProgressEventSink
+   onProgress() {}
+   onStatus() {}
+ }
+ 
+ export var SearchUtils = {
++  // Permanently enable the new search configuration until we remove the old
++  // code as part of bug 1870686.
++  newSearchConfigEnabled: true,
++
+   BROWSER_SEARCH_PREF,
+ 
+   /**
+    * This is the Remote Settings key that we use to get the ignore lists for
+    * engines.
+    */
+   SETTINGS_IGNORELIST_KEY: "hijack-blocklists",
+ 
+@@ -426,20 +430,13 @@ export var SearchUtils = {
+ 
+ XPCOMUtils.defineLazyPreferenceGetter(
+   SearchUtils,
+   "loggingEnabled",
+   BROWSER_SEARCH_PREF + "log",
+   false
+ );
+ 
+-ChromeUtils.defineLazyGetter(SearchUtils, "newSearchConfigEnabled", () => {
+-  return Services.prefs.getBoolPref(
+-    "browser.search.newSearchConfig.enabled",
+-    false
+-  );
+-});
+-
+ // Can't use defineLazyPreferenceGetter because we want the value
+ // from the default branch
+ ChromeUtils.defineLazyGetter(SearchUtils, "distroID", () => {
+   return Services.prefs.getDefaultBranch("distribution.").getCharPref("id", "");
+ });
+diff --git a/toolkit/components/search/tests/xpcshell/xpcshell.toml b/toolkit/components/search/tests/xpcshell/xpcshell.toml
+index 72020a45..6b5f63d2 100644
+--- a/toolkit/components/search/tests/xpcshell/xpcshell.toml
++++ b/toolkit/components/search/tests/xpcshell/xpcshell.toml
+@@ -119,8 +119,10 @@ support-files = [
+ ["test_engine_old_selector_application.js"]
+ 
+ ["test_engine_old_selector_application_distribution.js"]
++skip-if = ["true"] # Will be permanently removed as part of bug 1870686
+ 
+ ["test_engine_old_selector_application_name.js"]
++skip-if = ["true"] # Will be permanently removed as part of bug 1870686
+ 
+ ["test_engine_old_selector_order.js"]
+