Compare revisions

Luis Guzmán · Luis Guzmán · Luis Guzmán · Luis Guzmán · Luis Guzmán · Luis Guzmán
--- a/CONTRIBUTING.md
+++ b/CONTRIBUTING.md
@@ -8,7 +8,7 @@ Whether you've got a bugfix, documentation update, or new feature for us, these

 1. Install needed packages for running the helpers
 ```
-sudo apt-get install cdbs devscripts dpkg-dev git gnupg patch quilt rpl sed
+sudo apt-get install cdbs devscripts dpkg-dev git gnupg2 patch quilt rpl sed sbuild
 ```

 1. Get the Trisquel build environment and follow the [README](https://gitlab.trisquel.org/trisquel/trisquel-builder/-/blob/master/README.md) to setup your system for building

--- a/README.md
+++ b/README.md
@@ -39,7 +39,7 @@ Those are the steps done by the helpers:

 * You don't need to use sudo in order to run those scripts, but some extra packages are needed:

-     `sudo apt-get install cdbs devscripts dpkg-dev git gnupg patch quilt rpl sed python3-jsonschema python-pathlib`
+     `sudo apt-get install cdbs devscripts dpkg-dev git gnupg2 patch quilt rpl sed sbuild`

 * Take care to use the right sourcePackageName, many source packages produce
 several binary packages. `apt-cache showsrc binary-package` can help you.

--- a/helpers/DATA/accountsservice/daemon_Allow_SystemAccount-false_to_be_set_in_cache_file.patch
+++ b/helpers/DATA/accountsservice/daemon_Allow_SystemAccount-false_to_be_set_in_cache_file.patch
+From 985aed055313f968003c2515087974b2b934cf83 Mon Sep 17 00:00:00 2001
+From: Ray Strode <rstrode@redhat.com>
+Date: Wed, 8 Sep 2021 16:38:17 -0400
+Subject: [PATCH] daemon: Allow SystemAccount=false to be set in cache file
+
+At the moment we do dodgy checks based on uid to decide whether or not
+an account is a system account.
+
+For legacy reasons, sometimes normal users have really low UIDs.
+
+This commit reshuffles things, so the cache file "wins" for deciding
+whether or not a user is a system user.
+---
+ src/daemon.c | 24 ++++++++++++------------
+ 1 file changed, 12 insertions(+), 12 deletions(-)
+
+diff --git a/src/daemon.c b/src/daemon.c
+index 122b652..1760ef2 100644
+--- a/src/daemon.c
+++ b/src/daemon.c
+@@ -247,6 +247,14 @@ entry_generator_fgetpwent (Daemon       *daemon,
+                         if (shadow_entry_buffers != NULL) {
+                             *spent = &shadow_entry_buffers->spbuf;
+                         }
+
+                        /* Skip system users... */
+                        if (!user_classify_is_human (pwent->pw_uid, pwent->pw_name, pwent->pw_shell, (*spent)? (*spent)->sp_pwdp : NULL)) {
+                                g_debug ("skipping user: %s", pwent->pw_name);
+
+                                return entry_generator_fgetpwent (daemon, users, state, spent);
+                        }
+
+                         return pwent;
+                 }
+         }
+@@ -401,12 +409,6 @@ load_entries (Daemon             *daemon,
+                 if (pwent == NULL)
+                         break;
+ 
+-                /* Skip system users... */
+-                if (!explicitly_requested && !user_classify_is_human (pwent->pw_uid, pwent->pw_name, pwent->pw_shell, spent? spent->sp_pwdp : NULL)) {
+-                        g_debug ("skipping user: %s", pwent->pw_name);
+-                        continue;
+-                }
+-
+                 /* Only process users that haven't been processed yet.
+                  * We do always make sure entries get promoted
+                  * to "cached" status if they are supposed to be
+@@ -990,7 +992,6 @@ finish_list_cached_users (ListUserData *data)
+         GHashTableIter iter;
+         gpointer key, value;
+         uid_t uid;
+-        const gchar *shell;
+ 
+         object_paths = g_ptr_array_new ();
+ 
+@@ -1000,9 +1001,8 @@ finish_list_cached_users (ListUserData *data)
+                 User *user = value;
+ 
+                 uid = user_get_uid (user);
+-                shell = user_get_shell (user);
+ 
+-                if (!user_classify_is_human (uid, name, shell, NULL)) {
+                if (user_get_system_account (user)) {
+                         g_debug ("user %s %ld excluded", name, (long) uid);
+                         continue;
+                 }
+-- 
+GitLab
+
--- a/helpers/DATA/akregator/trisquel_feeds.patch
+++ b/helpers/DATA/akregator/trisquel_feeds.patch
@@ -11,22 +11,22 @@
 +
 +    QDomElement tnews = doc.createElement(QStringLiteral("outline"));
 +    tnews.setAttribute(QStringLiteral("text"), i18n("News"));
-+    tnews.setAttribute(QStringLiteral("xmlUrl"), QStringLiteral("http://trisquel.info/en/node/feed"));
+    tnews.setAttribute(QStringLiteral("xmlUrl"), QStringLiteral("https://trisquel.info/en/node/feed"));
 +    trisquelFolder.appendChild(tnews);
 +
 +    QDomElement relAnnounce = doc.createElement(QStringLiteral("outline"));
 +    relAnnounce.setAttribute(QStringLiteral("text"), i18n("Release announcements"));
-+    relAnnounce.setAttribute(QStringLiteral("xmlUrl"), QStringLiteral("http://trisquel.info/en/taxonomy/term/700/0/feed"));
+    relAnnounce.setAttribute(QStringLiteral("xmlUrl"), QStringLiteral("https://trisquel.info/en/taxonomy/term/700/0/feed"));
 +    trisquelFolder.appendChild(relAnnounce);
 +
 +    QDomElement enForum = doc.createElement(QStringLiteral("outline"));
 +    enForum.setAttribute(QStringLiteral("text"), i18n("Forum"));
-+    enForum.setAttribute(QStringLiteral("xmlUrl"), QStringLiteral("http://trisquel.info/en/taxonomy/term/50/0/feed"));
+    enForum.setAttribute(QStringLiteral("xmlUrl"), QStringLiteral("https://trisquel.info/en/taxonomy/term/50/0/feed"));
 +    trisquelFolder.appendChild(enForum);
 +
 +    QDomElement tReddit = doc.createElement(QStringLiteral("outline"));
 +    tReddit.setAttribute(QStringLiteral("text"), i18n("Trisquel at Reddit"));
-+    tReddit.setAttribute(QStringLiteral("xmlUrl"), QStringLiteral("http://www.reddit.com/r/trisquel/.rss"));
+    tReddit.setAttribute(QStringLiteral("xmlUrl"), QStringLiteral("https://www.reddit.com/r/trisquel/.rss"));
 +    trisquelFolder.appendChild(tReddit);
 +
 +// Free Software feeds
@@ -36,32 +36,32 @@
 +
 +    QDomElement newGNU = doc.createElement(QStringLiteral("outline"));
 +    newGNU.setAttribute(QStringLiteral("text"), i18n("What's New at GNU"));
-+    newGNU.setAttribute(QStringLiteral("xmlUrl"), QStringLiteral("http://www.reddit.com/r/trisquel/.rss"));
+    newGNU.setAttribute(QStringLiteral("xmlUrl"), QStringLiteral("https://www.reddit.com/r/trisquel/.rss"));
 +    fsFolder.appendChild(newGNU);
 +
 +    QDomElement fsfNews = doc.createElement(QStringLiteral("outline"));
 +    fsfNews.setAttribute(QStringLiteral("text"), i18n("FSF News"));
-+    fsfNews.setAttribute(QStringLiteral("xmlUrl"), QStringLiteral("http://static.fsf.org/fsforg/rss/news.xml"));
+    fsfNews.setAttribute(QStringLiteral("xmlUrl"), QStringLiteral("https://static.fsf.org/fsforg/rss/news.xml"));
 +    fsFolder.appendChild(fsfNews);
 +
 +    QDomElement fsfEvents = doc.createElement(QStringLiteral("outline"));
 +    fsfEvents.setAttribute(QStringLiteral("text"), i18n("FSF Events"));
-+    fsfEvents.setAttribute(QStringLiteral("xmlUrl"), QStringLiteral("http://static.fsf.org/fsforg/rss/events.xml"));
+    fsfEvents.setAttribute(QStringLiteral("xmlUrl"), QStringLiteral("https://static.fsf.org/fsforg/rss/events.xml"));
 +    fsFolder.appendChild(fsfEvents);
 +
 +    QDomElement fsfBlog = doc.createElement(QStringLiteral("outline"));
 +    fsfBlog.setAttribute(QStringLiteral("text"), i18n("FSF Blogs"));
-+    fsfBlog.setAttribute(QStringLiteral("xmlUrl"), QStringLiteral("http://static.fsf.org/fsforg/rss/blogs.xml"));
+    fsfBlog.setAttribute(QStringLiteral("xmlUrl"), QStringLiteral("https://static.fsf.org/fsforg/rss/blogs.xml"));
 +    fsFolder.appendChild(fsfBlog);
 +
 +    QDomElement fsDaily = doc.createElement(QStringLiteral("outline"));
 +    fsDaily.setAttribute(QStringLiteral("text"), i18n("fsdaily.com - Free Software News"));
-+    fsDaily.setAttribute(QStringLiteral("xmlUrl"), QStringLiteral("http://www.fsdaily.com/feed/published/All"));
+    fsDaily.setAttribute(QStringLiteral("xmlUrl"), QStringLiteral("https://www.fsdaily.com/feed/published/All"));
 +    fsFolder.appendChild(fsDaily);
 +
 +    QDomElement gnuReddit = doc.createElement(QStringLiteral("outline"));
 +    gnuReddit.setAttribute(QStringLiteral("text"), i18n("GNU at Reddit"));
-+    gnuReddit.setAttribute(QStringLiteral("xmlUrl"), QStringLiteral("http://www.reddit.com/r/gnu/.rss"));
+    gnuReddit.setAttribute(QStringLiteral("xmlUrl"), QStringLiteral("https://www.reddit.com/r/gnu/.rss"));
 +    fsFolder.appendChild(gnuReddit);
 +
     return doc;

--- a/helpers/DATA/apt-mirror/Trisquel-mirror.list
+++ b/helpers/DATA/apt-mirror/Trisquel-mirror.list
@@ -14,14 +14,14 @@ set _tilde 0
 #
 ############# end config ##############

-deb http://archive.trisquel.info/trisquel @CODENAME@ main
-deb http://archive.trisquel.info/trisquel @CODENAME@-security main 
-deb http://archive.trisquel.info/trisquel @CODENAME@-updates main 
-deb http://archive.trisquel.info/trisquel @CODENAME@-backports main 
+deb http://archive.trisquel.org/trisquel @CODENAME@ main
+deb http://archive.trisquel.org/trisquel @CODENAME@-security main 
+deb http://archive.trisquel.org/trisquel @CODENAME@-updates main 
+deb http://archive.trisquel.org/trisquel @CODENAME@-backports main 

-deb-src http://archive.trisquel.info/trisquel @CODENAME@ main 
-deb-src http://archive.trisquel.info/trisquel @CODENAME@-security main 
-deb-src http://archive.trisquel.info/trisquel @CODENAME@-updates main 
-deb-src http://archive.trisquel.info/trisquel @CODENAME@-backports main 
+deb-src http://archive.trisquel.org/trisquel @CODENAME@ main 
+deb-src http://archive.trisquel.org/trisquel @CODENAME@-security main 
+deb-src http://archive.trisquel.org/trisquel @CODENAME@-updates main 
+deb-src http://archive.trisquel.org/trisquel @CODENAME@-backports main 

-clean http://archive.trisquel.info/trisquel
+clean http://archive.trisquel.org/trisquel
--- a/helpers/DATA/birdtray/birdtray.ico
+++ b/helpers/DATA/birdtray/birdtray.ico
--- a/helpers/DATA/birdtray/birdtray.svg
+++ b/helpers/DATA/birdtray/birdtray.svg
--- a/helpers/DATA/birdtray/icons/128/com.ulduzsoft.Birdtray.png
+++ b/helpers/DATA/birdtray/icons/128/com.ulduzsoft.Birdtray.png
--- a/helpers/DATA/birdtray/icons/32/com.ulduzsoft.Birdtray.png
+++ b/helpers/DATA/birdtray/icons/32/com.ulduzsoft.Birdtray.png
--- a/helpers/DATA/birdtray/icons/48/com.ulduzsoft.Birdtray.png
+++ b/helpers/DATA/birdtray/icons/48/com.ulduzsoft.Birdtray.png
--- a/helpers/DATA/birdtray/icons/64/com.ulduzsoft.Birdtray.png
+++ b/helpers/DATA/birdtray/icons/64/com.ulduzsoft.Birdtray.png
--- a/helpers/DATA/birdtray/thunderbird.png
+++ b/helpers/DATA/birdtray/thunderbird.png
--- a/helpers/DATA/command-not-found/fix_test.patch
+++ b/helpers/DATA/command-not-found/fix_test.patch
+diff -ru source/CommandNotFound/db/tests/test_db.py source/CommandNotFound/db/tests/test_db.py_fix
+--- source/CommandNotFound/db/tests/test_db.py	2021-12-08 04:53:19.000000000 -0600
+++ source/CommandNotFound/db/tests/test_db.py_fix	2022-08-26 01:26:06.984427040 -0500
+@@ -11,7 +11,7 @@
+ from CommandNotFound.db.creator import DbCreator
+ from CommandNotFound.db.db import SqliteDatabase
+ 
+-mock_commands_bionic_backports = """suite: bionic-backports
+mock_commands_etiona_backports = """suite: etiona-backports
+ component: main
+ arch: all
+ 
+@@ -20,7 +20,7 @@
+ commands: script,wall,new-stuff-only-in-backports
+ """
+ 
+-mock_commands_bionic_proposed = """suite: bionic-proposed
+mock_commands_etiona_proposed = """suite: etiona-proposed
+ component: main
+ arch: all
+ 
+@@ -29,7 +29,7 @@
+ commands: script,wall
+ """
+ 
+-mock_commands_bionic = """suite: bionic
+mock_commands_etiona = """suite: etiona
+ component: main
+ arch: all
+ 
+@@ -65,7 +65,7 @@
+ ignore-commands: ignore-me
+ """
+ 
+-mock_commands_bionic_universe = """suite: bionic
+mock_commands_etiona_universe = """suite: etiona
+ component: universe
+ arch: all
+ 
+@@ -84,7 +84,7 @@
+         shutil.rmtree(self.tmpdir)
+ 
+     def make_mock_commands_file(self, suite, content):
+-        path = os.path.join(self.tmpdir, "var", "lib", "apt", "lists", "archive.ubuntu.com_ubuntu_dists_%s_Commands-all" % suite)
+        path = os.path.join(self.tmpdir, "var", "lib", "apt", "lists", "archive.trisquel.org_trisquel_dists_%s_Commands-all" % suite)
+         try:
+             os.makedirs(os.path.dirname(path))
+         except OSError:
+@@ -95,7 +95,7 @@
+         
+     def test_create_trivial_db(self):
+         mock_commands_file = self.make_mock_commands_file(
+-            "bionic_main", mock_commands_bionic)
+            "etiona_main", mock_commands_etiona)
+         cre = DbCreator([mock_commands_file])
+         dbpath = os.path.join(self.tmpdir, "test.db")
+         cre.create(dbpath)
+@@ -108,9 +108,9 @@
+ 
+     def test_create_multiple_dbs(self):
+         mock_commands_1 = self.make_mock_commands_file(
+-            "bionic_main", mock_commands_bionic)
+            "etiona_main", mock_commands_etiona)
+         mock_commands_2 = self.make_mock_commands_file(
+-            "bionic-proposed_main", mock_commands_bionic_proposed)
+            "etiona-proposed_main", mock_commands_etiona_proposed)
+         cre = DbCreator([mock_commands_1, mock_commands_2])
+         dbpath = os.path.join(self.tmpdir, "test.db")
+         cre.create(dbpath)
+@@ -131,9 +131,9 @@
+ 
+     def test_create_backports_excluded_dbs(self):
+         mock_commands_1 = self.make_mock_commands_file(
+-            "bionic_main", mock_commands_bionic)
+            "etiona_main", mock_commands_etiona)
+         mock_commands_2 = self.make_mock_commands_file(
+-            "bionic-backports_main", mock_commands_bionic_backports)
+            "etiona-backports_main", mock_commands_etiona_backports)
+         cre = DbCreator([mock_commands_1, mock_commands_2])
+         dbpath = os.path.join(self.tmpdir, "test.db")
+         cre.create(dbpath)
+@@ -146,7 +146,7 @@
+ 
+     def test_create_no_versions_does_not_crash(self):
+         mock_commands = self.make_mock_commands_file(
+-            "bionic_main", mock_commands_bionic.replace("version: 1.0\n", ""))
+            "etiona_main", mock_commands_etiona.replace("version: 1.0\n", ""))
+         cre = DbCreator([mock_commands])
+         dbpath = os.path.join(self.tmpdir, "test.db")
+         cre.create(dbpath)
+@@ -157,11 +157,8 @@
+         
+     def test_create_priorities_work(self):
+         mock_commands_1 = self.make_mock_commands_file(
+-            "bionic_main", mock_commands_bionic)
+-        mock_commands_2 = self.make_mock_commands_file(
+-            "bionic_universe", mock_commands_bionic_universe)
+-        self.assertNotEqual(mock_commands_1, mock_commands_2)
+-        cre = DbCreator([mock_commands_1, mock_commands_2])
+            "etiona_main", mock_commands_etiona)
+        cre = DbCreator([mock_commands_1])
+         dbpath = os.path.join(self.tmpdir, "test.db")
+         cre.create(dbpath)
+         # validate content
+@@ -173,12 +170,11 @@
+                 db.lookup("bzr"), [
+                     ("bzr1", "1.0", "main"),
+                     ("bzr2", "2.7", "main"),
+-                    ("bzr-tng", "3.0", "universe"),
+                 ])
+ 
+     def test_priorities_bonus_works(self):
+         mock_commands_1 = self.make_mock_commands_file(
+-            "bionic_main", mock_commands_bionic)
+            "etiona_main", mock_commands_etiona)
+         cre = DbCreator([mock_commands_1])
+         dbpath = os.path.join(self.tmpdir, "test.db")
+         cre.create(dbpath)
+@@ -193,7 +189,7 @@
+ 
+     def test_visible_pkgname_works(self):
+         mock_commands_1 = self.make_mock_commands_file(
+-            "bionic_main", mock_commands_bionic)
+            "etiona_main", mock_commands_etiona)
+         cre = DbCreator([mock_commands_1])
+         dbpath = os.path.join(self.tmpdir, "test.db")
+         cre.create(dbpath)
+@@ -205,9 +201,9 @@
+ 
+     def test_create_multiple_no_unneeded_creates(self):
+         mock_commands_1 = self.make_mock_commands_file(
+-            "bionic_main", mock_commands_bionic)
+            "etiona_main", mock_commands_etiona)
+         mock_commands_2 = self.make_mock_commands_file(
+-            "bionic-proposed_main", mock_commands_bionic_proposed)
+            "etiona-proposed_main", mock_commands_etiona_proposed)
+         cre = DbCreator([mock_commands_1, mock_commands_2])
+         dbpath = os.path.join(self.tmpdir, "test.db")
+         cre.create(dbpath)
+@@ -220,7 +216,7 @@
+ 
+     def test_create_honors_ignore_comamnds(self):
+         mock_commands_file = self.make_mock_commands_file(
+-            "bionic_main", mock_commands_bionic)
+            "etiona_main", mock_commands_etiona)
+         cre = DbCreator([mock_commands_file])
+         dbpath = os.path.join(self.tmpdir, "test.db")
+         cre.create(dbpath)
--- a/helpers/DATA/debootstrap/aramo
+++ b/helpers/DATA/debootstrap/aramo
+trisquel
\ No newline at end of file
--- a/helpers/DATA/debootstrap/trisquel
+++ b/helpers/DATA/debootstrap/trisquel
-case $ARCH in
-  amd64|i386)
-	default_mirror http://archive.trisquel.org/trisquel
-	;;
-  *)
-	default_mirror http://ports.trisquel.org/trisquel
-	;;
-esac
+default_mirror http://archive.trisquel.org/trisquel
+
 mirror_style release
 download_style apt
 finddebs_style from-indices

--- a/helpers/DATA/debootstrap/trisquel-common
+++ b/helpers/DATA/debootstrap/trisquel-common
-case $ARCH in
-  amd64|i386)
-	default_mirror http://archive.trisquel.org/trisquel
-	;;
-  *)
-	default_mirror http://ports.trisquel.org/trisquel
-	;;
-esac
+default_mirror http://archive.trisquel.org/trisquel
+
 mirror_style release
 download_style apt
 finddebs_style from-indices

--- a/helpers/DATA/distro-info-data/trisquel.csv
+++ b/helpers/DATA/distro-info-data/trisquel.csv
-version,codename,series,created,release,eol
-2.0 LTS,Robur,robur,2007-10-18,2008-07-24,2011-05-12
-3.0,Dwyn,dwyn,2008-10-30,2009-09-08,2010-10-23
-3.5,Awen,awen,2009-04-23,2010-03-22,2011-04-30
-4.0 LTS,Taranis,taranis,2009-10-29,2010-09-17,2013-05-09
-4.5,Slaine,slaine,2010-04-29,2011-03-24,2012-04-10
-5.0,Dagda,dagda,2010-10-10,2011-09-17,2012-10-28
-5.5,Brigantia,brigantia,2011-04-28,2012-04-16,2013-05-09
-6.0 LTS,Toutanis,toutanis,2011-10-13,2013-03-11,2017-04-28
-7.0 LTS,Belenos,belenos,2013-10-17,2014-11-03,2019-04-25
-8.0 LTS,Flidas,flidas,2015-10-22,2018-04-18,2021-04-21
-9.0 LTS,Etiona,etiona,2017-10-19,2020-10-16,2023-04-26
-10.0 LTS,Nabia,nabia,2019-10-17,2021-12-16,2025-04-23
+version,codename,series,created,release,eol,upstream
+2.0 LTS,Robur,robur,2007-10-18,2008-07-24,2011-05-12,hardy
+3.0,Dwyn,dwyn,2008-10-30,2009-09-08,2010-10-23,jaunty
+3.5,Awen,awen,2009-04-23,2010-03-22,2011-04-30,karmik
+4.0 LTS,Taranis,taranis,2009-10-29,2010-09-17,2013-05-09,lucid
+4.5,Slaine,slaine,2010-04-29,2011-03-24,2012-04-10,maverick
+5.0,Dagda,dagda,2010-10-10,2011-09-17,2012-10-28,natty
+5.5,Brigantia,brigantia,2011-04-28,2012-04-16,2013-05-09,oneiric
+6.0 LTS,Toutanis,toutanis,2011-10-13,2013-03-11,2017-04-28,precise
+7.0 LTS,Belenos,belenos,2013-10-17,2014-11-03,2019-04-25,trusty
+8.0 LTS,Flidas,flidas,2015-10-22,2018-04-18,2021-04-21,xenial
+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
--- a/helpers/DATA/distro-info/fix_csv_header.patch
+++ b/helpers/DATA/distro-info/fix_csv_header.patch
+diff -Nru source/trisquel-distro-info.c source_fix/trisquel-distro-info.c
+--- source/trisquel-distro-info.c	2023-02-16 20:40:58.429813624 -0600
+++ source_fix/trisquel-distro-info.c	2023-02-16 20:41:38.201917247 -0600
+@@ -16,7 +16,7 @@
+ 
+ #define TRISQUEL
+ #define CSV_NAME "trisquel"
+-#define CSV_HEADER "version,codename,series,created,release,eol"
+#define CSV_HEADER "version,codename,series,created,release,eol,upstream"
+ #define DISTRO_NAME "Trisquel GNU/Linux"
+ #define NAME "trisquel-distro-info"
+ 
--- 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/content/about-wordmark.svg
+++ b/helpers/DATA/firefox/branding/content/about-wordmark.svg
 <?xml version="1.0" encoding="UTF-8" standalone="no"?>
 <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"
@@ -15,40 +8,66 @@
   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
+   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>
+</svg>
No results found