Compare revisions

1be49b69 · 1be49b69 · 1be49b69 · 1be49b69 · 1be49b69 · 1be49b69
--- a/helpers/DATA/distro-info/test_distro_info.py
+++ b/helpers/DATA/distro-info/test_distro_info.py
+# test_distro_info.py - Test suite for distro_info
+#
+# Copyright (C) 2021, Trisquel GNU/Linux developers <trisquel-devel@listas.trisquel.info>
+# Copyright (C) 2011, Benjamin Drung <bdrung@debian.org>
+#
+# Permission to use, copy, modify, and/or distribute this software for any
+# purpose with or without fee is hereby granted, provided that the above
+# copyright notice and this permission notice appear in all copies.
+#
+# THE SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL WARRANTIES
+# WITH REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF
+# MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR
+# ANY SPECIAL, DIRECT, INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES
+# WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN
+# ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF
+# OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
+
+"""Test suite for distro_info"""
+
+import datetime
+
+from distro_info_test import unittest
+from distro_info import DebianDistroInfo, TrisquelDistroInfo
+
+
+class DebianDistroInfoTestCase(unittest.TestCase):  # pylint: disable=too-many-public-methods
+    """TestCase object for distro_info.DebianDistroInfo"""
+
+    def setUp(self):  # pylint: disable=invalid-name
+        self._distro_info = DebianDistroInfo()
+        self._date = datetime.date(2011, 1, 10)
+
+    def test_all(self):
+        """Test: List all known Debian distributions."""
+        all_distros = set(["buzz", "rex", "bo", "hamm", "slink", "potato",
+                           "woody", "sarge", "etch", "lenny", "squeeze", "sid",
+                           "experimental"])
+        self.assertEqual(all_distros - set(self._distro_info.all), set())
+
+    def test_devel(self):
+        """Test: Get latest development Debian distribution."""
+        self.assertEqual(self._distro_info.devel(self._date), "sid")
+
+    def test_old(self):
+        """Test: Get old (stable) Debian distribution."""
+        self.assertEqual(self._distro_info.old(self._date), "etch")
+
+    def test_stable(self):
+        """Test: Get latest stable Debian distribution."""
+        self.assertEqual(self._distro_info.stable(self._date), "lenny")
+
+    def test_supported(self):
+        """Test: List all supported Debian distribution."""
+        self.assertEqual(self._distro_info.supported(self._date),
+                         ["lenny", "squeeze", "sid", "experimental"])
+
+    def test_testing(self):
+        """Test: Get latest testing Debian distribution."""
+        self.assertEqual(self._distro_info.testing(self._date), "squeeze")
+
+    def test_valid(self):
+        """Test: Check for valid Debian distribution."""
+        self.assertTrue(self._distro_info.valid("sid"))
+        self.assertTrue(self._distro_info.valid("stable"))
+        self.assertFalse(self._distro_info.valid("foobar"))
+
+    def test_unsupported(self):
+        """Test: List all unsupported Debian distribution."""
+        unsupported = ["buzz", "rex", "bo", "hamm", "slink", "potato", "woody",
+                       "sarge", "etch"]
+        self.assertEqual(self._distro_info.unsupported(self._date), unsupported)
+
+    def test_codename(self):
+        """Test: Codename decoding"""
+        self.assertIsNone(self._distro_info.codename('foobar'))
+        self.assertEqual(self._distro_info.codename('testing', self._date),
+                         self._distro_info.testing(self._date))
+
+    def test_codename_result(self):
+        """Test: Check result set to codename."""
+        self.assertEqual(self._distro_info.old(self._date, "codename"), "etch")
+        self.assertEqual(self._distro_info.devel(self._date, result="codename"),
+                         "sid")
+
+    def test_fullname(self):
+        """Test: Check result set to fullname."""
+        self.assertEqual(self._distro_info.stable(self._date, "fullname"),
+                         'Debian 5.0 "Lenny"')
+        result = self._distro_info.testing(self._date, result="fullname")
+        self.assertEqual(result, 'Debian 6.0 "Squeeze"')
+
+    def test_release(self):
+        """Test: Check result set to release."""
+        self.assertEqual(self._distro_info.devel(self._date, "release"), "")
+        self.assertEqual(self._distro_info.testing(self._date, "release"),
+                         "6.0")
+        self.assertEqual(self._distro_info.stable(self._date, result="release"),
+                         "5.0")
+
+
+class TrisquelDistroInfoTestCase(unittest.TestCase):  # pylint: disable=too-many-public-methods
+    """TestCase object for distro_info.TrisquelDistroInfo"""
+
+    def setUp(self):  # pylint: disable=invalid-name
+        self._distro_info = TrisquelDistroInfo()
+        self._date = datetime.date(2011, 1, 10)
+
+    def test_all(self):
+        """Test: List all known Trisquel distributions."""
+        all_distros = set(["robur",
+                           "dwyn",
+                           "awen",
+                           "taranis",
+                           "slaine",
+                           "dagda",
+                           "brigantia",
+                           "toutanis",
+                           "belenos",
+                           "flidas",
+                           "etiona",
+                           "nabia"])
+        self.assertEqual(all_distros - set(self._distro_info.all), set())
+
+    def test_devel(self):
+        """Test: Get latest development Trisquel distribution."""
+        self.assertEqual(self._distro_info.devel(self._date), "dagda")
+
+    def test_lts(self):
+        """Test: Get latest long term support (LTS) Trisquel distribution."""
+        self.assertEqual(self._distro_info.lts(self._date), "taranis")
+
+    def test_stable(self):
+        """Test: Get latest stable Trisquel distribution."""
+        self.assertEqual(self._distro_info.stable(self._date), "taranis")
+
+    def test_supported(self):
+        """Test: List all supported Trisquel distribution."""
+        supported = ["robur", "awen", "taranis", "slaine", "dagda"]
+        self.assertEqual(self._distro_info.supported(self._date), supported)
+
+    def test_unsupported(self):
+        """Test: List all unsupported Trisquel distributions."""
+        unsupported = ["dwyn"]
+        self.assertEqual(self._distro_info.unsupported(self._date), unsupported)
+
+    def test_current_unsupported(self):
+        """Test: List all unsupported Trisquel distributions today."""
+        unsupported = set(["robur",
+                           "dwyn"])
+        self.assertEqual(unsupported -
+                         set(self._distro_info.unsupported()), set())
+
+    def test_valid(self):
+        """Test: Check for valid Trisquel distribution."""
+        self.assertTrue(self._distro_info.valid("taranis"))
+        self.assertFalse(self._distro_info.valid("42"))
+
+    def test_is_lts(self):
+        """Test: Check if Trisquel distribution is an LTS."""
+        self.assertTrue(self._distro_info.is_lts("taranis"))
+        self.assertFalse(self._distro_info.is_lts("42"))
+        self.assertFalse(self._distro_info.is_lts("warty"))
+
+    def test_codename(self):
+        """Test: Check result set to codename."""
+        self.assertEqual(self._distro_info.lts(self._date, "codename"), "taranis")
+        self.assertEqual(self._distro_info.devel(self._date, result="codename"),
+                         "dagda")
+
+    def test_fullname(self):
+        """Test: Check result set to fullname."""
+        self.assertEqual(self._distro_info.stable(self._date, "fullname"),
+                         'Trisquel 4.0 LTS "Taranis"')
+        self.assertEqual(self._distro_info.lts(self._date, result="fullname"),
+                         'Trisquel 4.0 LTS "Taranis"')
+
+    def test_release(self):
+        """Test: Check result set to release."""
+        self.assertEqual(self._distro_info.devel(self._date, "release"),
+                         "5.0")
+        self.assertEqual(self._distro_info.lts(self._date, result="release"),
+                         "4.0 LTS")
--- a/helpers/DATA/dpkg/Trisquel.pm
+++ b/helpers/DATA/dpkg/Trisquel.pm
+# Copyright © 2008 Ian Jackson <ijackson@chiark.greenend.org.uk>
+# Copyright © 2008 Canonical, Ltd.
+#   written by Colin Watson <cjwatson@ubuntu.com>
+# Copyright © 2008 James Westby <jw+debian@jameswestby.net>
 # Copyright © 2009 Raphaël Hertzog <hertzog@debian.org>
+# Copyright © 2022 Ruben Rodriguez <ruben@trisquel.org>
 #
 # This program is free software; you can redistribute it and/or modify
 # it under the terms of the GNU General Public License as published by
@@ -11,59 +16,85 @@
 # GNU General Public License for more details.
 #
 # You should have received a copy of the GNU General Public License
-# along with this program.  If not, see <http://www.gnu.org/licenses/>.
+# along with this program.  If not, see <https://www.gnu.org/licenses/>.

 package Dpkg::Vendor::Trisquel;

 use strict;
 use warnings;

-our $VERSION = "0.01";
+our $VERSION = '0.01';

-use base qw(Dpkg::Vendor::Default);
+use Dpkg::ErrorHandling;
+use Dpkg::Gettext;
 use Dpkg::Control::Types;
-use Dpkg::Vendor::Ubuntu;
+
+use parent qw(Dpkg::Vendor::Debian);

 =encoding utf8

 =head1 NAME

-Dpkg::Vendor::Trisquel - Trisquel vendor object
+Dpkg::Vendor::Trisquel - Trisquel vendor class

 =head1 DESCRIPTION

-This vendor object customize the behaviour of dpkg scripts
-for Debian specific actions.
+This vendor class customizes the behaviour of dpkg scripts for Trisquel
+specific behavior and policies.

 =cut

 sub run_hook {
    my ($self, $hook, @params) = @_;

-    if ($hook eq "keyrings") {
-        return ('/usr/share/keyrings/trisquel-archive-keyring.gpg')
-    } elsif ($hook eq "register-custom-fields") {
-        return (
-            [ "register", "Dm-Upload-Allowed",
-              CTRL_INFO_SRC | CTRL_INDEX_SRC | CTRL_PKG_SRC ],
-            [ "insert_after", CTRL_INDEX_SRC, "Uploaders", "Dm-Upload-Allowed" ],
-            [ "insert_after", CTRL_PKG_SRC, "Uploaders", "Dm-Upload-Allowed" ],
-        );
-    } elsif ($hook eq "extend-patch-header") {
-        my ($textref, $ch_info) = @params;
-	if ($ch_info->{'Closes'}) {
-	    foreach my $bug (split(/\s+/, $ch_info->{'Closes'})) {
-		$$textref .= "Bug-Debian: http://bugs.debian.org/$bug\n";
-	    }
-	}
+    if ($hook eq 'package-keyrings') {
+        return ($self->SUPER::run_hook($hook),
+                '/usr/share/keyrings/trisquel-archive-keyring.gpg');
+    } elsif ($hook eq 'archive-keyrings') {
+        return ($self->SUPER::run_hook($hook),
+                '/usr/share/keyrings/trisquel-archive-keyring.gpg');
+    } elsif ($hook eq 'archive-keyrings-historic') {
+        return ($self->SUPER::run_hook($hook),
+                '/usr/share/keyrings/trisquel-archive-removed-keys.gpg');
+    } elsif ($hook eq 'update-buildflags') {
+	my $flags = shift @params;
+
+        # Run the Debian hook to add hardening flags
+        $self->SUPER::run_hook($hook, $flags);
+
+        require Dpkg::BuildOptions;
+
+	my $build_opts = Dpkg::BuildOptions->new();
+
+	if (!$build_opts->has('noopt')) {
+            require Dpkg::Arch;

-	my $b = Dpkg::Vendor::Ubuntu::find_launchpad_closes($ch_info->{'Changes'});
-	foreach my $bug (@$b) {
-	    $$textref .= "Bug-Ubuntu: https://bugs.launchpad.net/bugs/$bug\n";
+            my $arch = Dpkg::Arch::get_host_arch();
+            if (Dpkg::Arch::debarch_eq($arch, 'ppc64el')) {
+		for my $flag (qw(CFLAGS CXXFLAGS OBJCFLAGS OBJCXXFLAGS GCJFLAGS
+		                 FFLAGS FCFLAGS)) {
+                    my $value = $flags->get($flag);
+                    $value =~ s/-O[0-9]/-O3/;
+                    $flags->set($flag, $value);
+		}
+	    }
 	}
+	# Per https://wiki.ubuntu.com/DistCompilerFlags
+        $flags->prepend('LDFLAGS', '-Wl,-Bsymbolic-functions');
    } else {
        return $self->SUPER::run_hook($hook, @params);
    }
+
+    # Default return value for unknown/unimplemented hooks
+    return;
 }

+=head1 CHANGES
+
+=head2 Version 0.xx
+
+This is a private module.
+
+=cut
+
 1;
--- a/helpers/DATA/finish-install/fix_keyboard-configure-netinstall.patch
+++ b/helpers/DATA/finish-install/fix_keyboard-configure-netinstall.patch
+diff -Nru finish-install-2.104+11.0trisquel0/finish-install.d/10update-initramfs finish-install-2.104+11.0trisquel0/finish-install.d/10update-initramfs
+--- finish-install-2.104+11.0trisquel0/finish-install.d/10update-initramfs	2018-08-10 14:21:58.000000000 -0500
+++ finish-install-2.104+11.0trisquel0/finish-install.d/10update-initramfs	2022-12-18 17:56:21.817264252 -0600
+@@ -4,7 +4,11 @@
+ # update-initramfs to make sure one can type the passphrase
+ # (see #694156, workaround for #696773):
+ /bin/in-target \
+-    /bin/sh -c "dpkg-query -s cryptsetup >/dev/null 2>&1 && dpkg-query -s console-setup >/dev/null 2>&1"
+    /bin/sh -c "dpkg-query -s console-setup >/dev/null 2>&1"
+
+#Fix bug keyboard not using the selected layout.
+/bin/in-target \
+    dpkg-reconfigure -f noninteractive keyboard-configuration
+ 
+ if [ $? = 0 ]; then
+     echo "Encrypted LVM detected, refreshing initramfs"
--- a/helpers/DATA/firefox/android/res/main/drawable-hdpi/icon_home_empty_abrowser.png
+++ b/helpers/DATA/firefox/android/res/main/drawable-hdpi/icon_home_empty_abrowser.png
--- a/helpers/DATA/firefox/android/res/main/drawable-hdpi/icon_search_empty_abrowser.png
+++ b/helpers/DATA/firefox/android/res/main/drawable-hdpi/icon_search_empty_abrowser.png
--- a/helpers/DATA/firefox/android/res/main/drawable-xhdpi/icon_home_empty_abrowser.png
+++ b/helpers/DATA/firefox/android/res/main/drawable-xhdpi/icon_home_empty_abrowser.png
--- a/helpers/DATA/firefox/android/res/main/drawable-xhdpi/icon_search_empty_abrowser.png
+++ b/helpers/DATA/firefox/android/res/main/drawable-xhdpi/icon_search_empty_abrowser.png
--- a/helpers/DATA/firefox/android/res/main/drawable-xxhdpi/icon_search_empty_abrowser.png
+++ b/helpers/DATA/firefox/android/res/main/drawable-xxhdpi/icon_search_empty_abrowser.png
--- a/helpers/DATA/firefox/bookmarks.html.in
+++ b/helpers/DATA/firefox/bookmarks.html.in
-#filter substitution
-#include @BOOKMARKS_INCLUDE_PATH@
-
-<!-- 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/. -->
-<!DOCTYPE NETSCAPE-Bookmark-file-1>
-<meta charset="UTF-8">
-<title>@bookmarks_title@</title>
-<h1>@bookmarks_heading@</h1>
-
-<dl><p>
-    <dt><h3 personal_toolbar_folder="true">@bookmarks_toolbarfolder@</h3></dt>
-    <dd>@bookmarks_toolbarfolder_description@
-        <dl>
-        </dl>
-</dl>
--- a/helpers/DATA/firefox/branding/LICENSE
+++ b/helpers/DATA/firefox/branding/LICENSE
-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/.
--- a/helpers/DATA/firefox/branding/abrowser.VisualElementsManifest.xml
+++ b/helpers/DATA/firefox/branding/abrowser.VisualElementsManifest.xml
-<Application xmlns:xsi='http://www.w3.org/2001/XMLSchema-instance'>
-  <VisualElements
-      ShowNameOnSquare150x150Logo='on'
-      Square150x150Logo='browser\VisualElements\VisualElements_150.png'
-      Square70x70Logo='browser\VisualElements\VisualElements_70.png'
-      ForegroundText='light'
-      BackgroundColor='#000f40'/>
-</Application>
--- a/helpers/DATA/firefox/branding/branding.nsi
+++ b/helpers/DATA/firefox/branding/branding.nsi
-# 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/.
-
-# NSIS branding defines for official release builds.
-# The nightly build branding.nsi is located in browser/installer/windows/nsis/
-# The unofficial build branding.nsi is located in browser/branding/unofficial/
-
-# BrandFullNameInternal is used for some registry and file system values
-# instead of BrandFullName and typically should not be modified.
-!define BrandFullNameInternal "Abrowser"
-!define BrandFullName         "Abrowser"
-!define CompanyName           "Trisquel"
-!define URLInfoAbout          "http://trisquel.info/browser"
-!define URLUpdateInfo         "http://trisquel.info/wiki"
-!define HelpLink              "https://trisquel.info/en/wiki/abrowser-help"
-
-; The OFFICIAL define is a workaround to support different urls for Release and
-; Beta since they share the same branding when building with other branches that
-; set the update channel to beta.
-!define OFFICIAL
-!define URLStubDownload32 "http://trisquel.info/browser"
-!define URLStubDownload64 "http://trisquel.info/browser"
-!define URLManualDownload "http://trisquel.info/browser"
-!define URLSystemRequirements "http://trisquel.info/browser"
-!define Channel "release"
-
-# The installer's certificate name and issuer expected by the stub installer
-!define CertNameDownload   "Mozilla Corporation"
-!define CertIssuerDownload "DigiCert SHA2 Assured ID Code Signing CA"
-
-# Dialog units are used so the UI displays correctly with the system's DPI
-# settings.
-# The dialog units for the bitmap's dimensions should match exactly with the
-# bitmap's width and height in pixels.
-!define APPNAME_BMP_WIDTH_DU "134u"
-!define APPNAME_BMP_HEIGHT_DU "36u"
-!define INTRO_BLURB_WIDTH_DU "258u"
-!define INTRO_BLURB_EDGE_DU "170u"
-!define INTRO_BLURB_LTR_TOP_DU "20u"
-!define INTRO_BLURB_RTL_TOP_DU "12u"
-
-# UI Colors that can be customized for each channel
-!define FOOTER_CONTROL_TEXT_COLOR_NORMAL 0x000000
-!define FOOTER_CONTROL_TEXT_COLOR_FADED 0x666666
-!define FOOTER_BKGRD_COLOR 0xFFFFFF
-!define INTRO_BLURB_TEXT_COLOR 0x666666
-!define INSTALL_BLURB_TEXT_COLOR 0x666666
-!define INSTALL_PROGRESS_TEXT_COLOR_NORMAL 0x666666
-!define COMMON_TEXT_COLOR_NORMAL 0x000000
-!define COMMON_TEXT_COLOR_FADED 0x666666
-!define COMMON_BKGRD_COLOR 0xF0F0F0
--- a/helpers/DATA/firefox/branding/configure.sh
+++ b/helpers/DATA/firefox/branding/configure.sh
-# 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/.
-
-MOZ_APP_DISPLAYNAME=Abrowser
--- a/helpers/DATA/firefox/branding/content/about-wordmark.svg
+++ b/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
-   xmlns:dc="http://purl.org/dc/elements/1.1/"
-   xmlns:cc="http://creativecommons.org/ns#"
-   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
-   xmlns:svg="http://www.w3.org/2000/svg"
-   xmlns="http://www.w3.org/2000/svg"
-   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
-   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
-   version="1.1"
-   id="aboutWordmark"
-   x="0px"
-   y="0px"
   width="130px"
   height="38px"
   viewBox="0 0 130 38"
-   xml:space="preserve"
-   inkscape:version="0.48.4 r9939"
-   sodipodi:docname="about-wordmark.svg"><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="1364"
-     inkscape:window-height="711"
-     id="namedview5"
-     showgrid="false"
-     inkscape:zoom="9.788073"
-     inkscape:cx="48.569985"
-     inkscape:cy="11.314337"
-     inkscape:window-x="0"
-     inkscape:window-y="0"
-     inkscape:window-maximized="1"
-     inkscape:current-layer="aboutWordmark" /><text
-     xml:space="preserve"
-     style="font-size:28.27791785999999874px;font-style:normal;font-weight:normal;line-height:125%;letter-spacing:0px;word-spacing:0px;fill:#6f6f6f;fill-opacity:1;stroke:none;font-family:Sans"
-     x="0.4501974"
-     y="37.289883"
-     id="text2986"
-     sodipodi:linespacing="125%"><tspan
-       sodipodi:role="line"
-       id="tspan2988"
-       x="0.4501974"
-       y="37.289883"
-       style="font-weight:bold;-inkscape-font-specification:Sans Bold;fill:#6f6f6f;fill-opacity:1">Abrowser</tspan></text>
-</svg>
\ No newline at end of file
+   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>
--- a/helpers/DATA/firefox/branding/content/aboutDialog.css
+++ b/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 {

--- a/helpers/DATA/firefox/branding/content/firefox-wordmark.svg
+++ b/helpers/DATA/firefox/branding/content/firefox-wordmark.svg
+<!-- 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
+   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>
--- a/helpers/DATA/firefox/branding/content/jar.mn
+++ b/helpers/DATA/firefox/branding/content/jar.mn
-# 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/.
-
-browser.jar:
-% content branding %content/branding/ contentaccessible=yes
-  content/branding/about.png
-  content/branding/about-logo.png
-  content/branding/about-logo@2x.png
-  content/branding/about-wordmark.svg
-  content/branding/icon16.png                    (../default16.png)
-  content/branding/icon32.png                    (../default32.png)
-  content/branding/icon48.png                    (../default48.png)
-  content/branding/icon64.png                    (../default64.png)
-  content/branding/icon128.png                   (../default128.png)
-  content/branding/identity-icons-brand.svg
-  content/branding/aboutDialog.css
--- a/helpers/DATA/firefox/branding/content/moz.build
+++ b/helpers/DATA/firefox/branding/content/moz.build
-# -*- Mode: python; indent-tabs-mode: nil; tab-width: 40 -*-
-# vim: set filetype=python:
-# 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/.
-
-JAR_MANIFESTS += ['jar.mn']
\ No newline at end of file
--- a/helpers/DATA/firefox/branding/dsstore
+++ b/helpers/DATA/firefox/branding/dsstore
--- a/helpers/DATA/firefox/branding/abrowser.icns
+++ b/helpers/DATA/firefox/branding/abrowser.icns
No results found