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/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/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
@@ -11,3 +11,4 @@ version,codename,series,created,release,eol
 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
+11.0 LTS,Aramo,aramo,2021-10-14,2027-04-21,2027-04-21
--- 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>
--- a/helpers/DATA/firefox/branding/content/firefox-wordmark.svg
+++ b/helpers/DATA/firefox/branding/content/firefox-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,11 +8,18 @@
   height="21.484577"
   viewBox="0 0 121.3271 21.484577"
   xml:space="preserve"
-   inkscape:version="1.0.2 (1.0.2+r75+1)"
-   sodipodi:docname="firefox-wordmark.svg"><metadata
+   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></dc:title></cc:Work></rdf:RDF></metadata><defs
+         rdf:resource="http://purl.org/dc/dcmitype/StillImage" /><dc:title /></cc:Work></rdf:RDF></metadata><defs
   id="defs7" /><sodipodi:namedview
   pagecolor="#ffffff"
   bordercolor="#666666"
@@ -30,13 +30,13 @@
   inkscape:pageopacity="0"
   inkscape:pageshadow="2"
   inkscape:window-width="1918"
-   inkscape:window-height="1010"
+   inkscape:window-height="1008"
   id="namedview5"
   showgrid="false"
   inkscape:zoom="3.4606064"
-   inkscape:cx="27.662416"
-   inkscape:cy="-18.237972"
-   inkscape:window-x="0"
+   inkscape:cx="27.885286"
+   inkscape:cy="-18.493869"
+   inkscape:window-x="1366"
   inkscape:window-y="0"
   inkscape:window-maximized="1"
   inkscape:current-layer="aboutWordmark"
@@ -44,15 +44,35 @@
   fit-margin-top="0"
   fit-margin-left="0"
   fit-margin-right="0"
-   fit-margin-bottom="0" /><text
-   xml:space="preserve"
-   style="font-style:normal;font-weight:normal;line-height:0%;font-family:sans-serif;letter-spacing:0px;word-spacing:0px;fill:#ffffff;fill-opacity:1;stroke:none"
-   x="-0.096652985"
-   y="21.208426"
-   id="text2986"><tspan
-     sodipodi:role="line"
-     id="tspan2988"
-     x="-0.096652985"
-     y="21.208426"
-     style="font-weight:bold;font-size:28.2779px;line-height:1.25;font-family:sans-serif;-inkscape-font-specification:'Sans Bold';fill:#ffffff;fill-opacity:1">Abrowser</tspan></text>
+   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>
 </svg>
--- a/helpers/DATA/firefox/default-bookmarks.html
+++ b/helpers/DATA/firefox/default-bookmarks.html
+#filter substitution
+
+<!-- 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>
+<html>
+<head>
+    <meta charset="UTF-8">
+    <!-- These localization links are not automatically applied to any XHR
+         response body and must be applied manually as well.  They are included
+         so that viewing the file directly shows the results. -->
+    <link rel="localization" href="branding/brand.ftl"/>
+    <link rel="localization" href="browser/profile/default-bookmarks.ftl"/>
+    <title data-l10n-id="default-bookmarks-title">default-bookmarks-title</title>
+</head>
+<body>
+<h1 data-l10n-id="default-bookmarks-heading">default-bookmarks-heading</h1>
+<dl><p>
+    <dt><h3 personal_toolbar_folder="true" data-l10n-id="default-bookmarks-toolbarfolder">Bookmarks Toolbar</h3></dt>
+</dl>
+</body>
+</html>
--- a/helpers/DATA/firefox/newtab/hnode.ico
+++ b/helpers/DATA/firefox/newtab/hnode.ico
--- a/helpers/DATA/firefox/newtab/hnode.png
+++ b/helpers/DATA/firefox/newtab/hnode.png
--- a/helpers/DATA/firefox/patch_changes/Remove_moreFromMozilla_Focus_and_Klar.patch
+++ b/helpers/DATA/firefox/patch_changes/Remove_moreFromMozilla_Focus_and_Klar.patch
--- a/helpers/DATA/firefox/process-json-files.py
+++ b/helpers/DATA/firefox/process-json-files.py
@@ -51,10 +51,18 @@ class RemoteSettings:
    DUMPS_PATH_ABSOLUTE = arguments.MAIN_PATH / DUMPS_PATH_RELATIVE

    _WRAPPER_NAME = 'data'
+    _LAST_MODIFIED_KEY_NAME = 'last_modified'
+
+    @classmethod
+    def get_collection_timestamp(cls, collection):
+        return max((record[cls._LAST_MODIFIED_KEY_NAME]
+                   for record in collection.content), default=0)

    @classmethod
    def wrap(cls, processed):
-        return File(processed.path, {cls._WRAPPER_NAME: processed.content})
+        return File(processed.path,
+                    {cls._WRAPPER_NAME: processed.content,
+                     'timestamp': cls.get_collection_timestamp(processed)})

    @classmethod
    def unwrap(cls, parsed_jsons):
@@ -88,13 +96,15 @@ class RemoteSettings:
                        while timestamp in timestamps:
                            timestamp += 1
                        timestamps.append(timestamp)
-                        record['last_modified'] = timestamp
+                        record[cls._LAST_MODIFIED_KEY_NAME] = timestamp

                if parsed_schema is not None:
                    validate(record, schema=parsed_schema)

                result.append(record)

+        result.sort(
+            key=lambda record: record[cls._LAST_MODIFIED_KEY_NAME], reverse=True)
        cls.OUTPUT_PATH.parent.mkdir(parents=True, exist_ok=True)

        return File(cls.OUTPUT_PATH, result)
@@ -109,7 +119,7 @@ class RemoteSettings:

 class Changes(RemoteSettings):
    JSON_PATHS = tuple(RemoteSettings.DUMPS_PATH_ABSOLUTE.glob('*/*.json'))
-    OUTPUT_PATH = RemoteSettings.DUMPS_PATH_ABSOLUTE / 'monitor/changes.json'
+    OUTPUT_PATH = RemoteSettings.DUMPS_PATH_ABSOLUTE / 'monitor/changes'

    @classmethod
    def wrap(cls, processed):
@@ -124,8 +134,8 @@ class Changes(RemoteSettings):
        for collection in unwrapped_jsons:
            if collection.path != RemoteSettings.DUMPS_PATH_ABSOLUTE / 'main/example.json':
                latest_change = {}
-                latest_change['last_modified'] = max(
-                    (record['last_modified'] for record in collection.content), default=0)
+                latest_change[cls._LAST_MODIFIED_KEY_NAME] = cls.get_collection_timestamp(
+                    collection)
                latest_change['bucket'] = collection.path.parent.name
                latest_change['collection'] = collection.path.stem
                changes.append(latest_change)

--- a/helpers/DATA/firefox/settings.js
+++ b/helpers/DATA/firefox/settings.js
@@ -232,7 +232,7 @@ pref("browser.onboarding.updatetour", "performance,library,singlesearch,customiz
 pref("browser.onboarding.enabled", false);

 // New tab settings
-pref("browser.newtabpage.activity-stream.default.sites", "https://trisquel.info/,https://www.gnu.org/,https://www.fsf.org/,https://directory.fsf.org,https://libreplanet.org/,https://fsfe.org,https://www.wikipedia.org/wiki/,https://www.wikinews.org/wiki/");
+pref("browser.newtabpage.activity-stream.default.sites", "https://trisquel.info/,https://www.gnu.org/,https://www.fsf.org/,https://directory.fsf.org,https://libreplanet.org/,https://fsfe.org,https://www.wikipedia.org/wiki/,https://www.h-node.org/");
 pref("browser.newtabpage.activity-stream.showTopSites",true);
 pref("browser.newtabpage.activity-stream.feeds.section.topstories",false);
 pref("browser.newtabpage.activity-stream.feeds.snippets",false);

--- a/helpers/DATA/freedom-maker/0001-documentation_could-be-upstreamed.patch
+++ b/helpers/DATA/freedom-maker/0001-documentation_could-be-upstreamed.patch
+diff --git a/README.md b/README.md
+index b7931bb..3fb54f4 100644
+--- a/README.md
+++ b/README.md
+@@ -26,28 +26,29 @@ tweaks, see the *Build Images* section below.
+ 
+ Freedom-maker supports building for the following targets:
+ 
+-
+-- *a20-olinuxino-lime*: A20 OLinuXino Lime's SD card
+-- *a20-olinuxino-lime2*: A20 OLinuXino Lime2's SD card
+-- *a20-olinuxino-micro*: A20 OLinuXino MICRO's SD card
+-- *amd64*: Disk image for any machine with amd64 architecture
+-- *banana-pro*: Banana Pro's SD card
+-- *beaglebone*: BeagleBone Black's SD card
+-- *cubieboard2*: Cubieboard2's SD card
+-- *cubietruck*: Cubietruck's SD card
+-- *i386*: Disk image for any machine with i386 architecture
+-- *lamobo-r1*: Lamobo R1 aka BananaPi Router SD card
+-- *pcduino3*: pcDuino3's SD card
+-- *pine64-lts*: Pine64 LTS board's SD card
+-- *pine64-plus*: Pine64+ board's SD card
+-- *qemu-amd64*: 64-bit image for the Qemu virtualization tool
+-- *qemu-i386*: 32-bit image for the Qemu virtualization tool
+-- *raspberry2*: RasbperryPi 2's SD card
+-- *raspberry3*: RasbperryPi 3's SD card
+-- *raspberry3-b-plus*: RasbperryPi 3 Model B+'s SD card
+-- *test*: build virtualbox i386 image and run diagnostics tests on it
+-- *virtualbox-amd64*: 64-bit image for the VirtualBox virtualization tool
+-- *virtualbox-i386*: 32-bit image for the VirtualBox virtualization tool
+| target                | description |
+|-----------------------|-------------|
+| *a20-olinuxino-lime*  | A20 OLinuXino Lime's SD card |
+| *a20-olinuxino-lime2* | A20 OLinuXino Lime2's SD card |
+| *a20-olinuxino-micro* | A20 OLinuXino MICRO's SD card |
+| *amd64*               | Disk image for any machine with amd64 architecture |
+| *banana-pro*          | Banana Pro's SD card |
+| *beaglebone*          | BeagleBone Black's SD card |
+| *cubieboard2*         | Cubieboard2's SD card |
+| *cubietruck*          | Cubietruck's SD card |
+| *i386*                | Disk image for any machine with i386 architecture |
+| *lamobo-r1*           | Lamobo R1 aka BananaPi Router SD card |
+| *pcduino3*            | pcDuino3's SD card |
+| *pine64-lts*          | Pine64 LTS board's SD card |
+| *pine64-plus*         | Pine64+ board's SD card |
+| *qemu-amd64*          | 64-bit image for the Qemu virtualization tool |
+| *qemu-i386*           | 32-bit image for the Qemu virtualization tool |
+| *raspberry2*          | RasbperryPi 2's SD card |
+| *raspberry3*          | RasbperryPi 3's SD card |
+| *raspberry3-b-plus*   | RasbperryPi 3 Model B+'s SD card |
+| *test*                | build virtualbox i386 image and run diagnostics tests on it |
+| *virtualbox-amd64*    | 64-bit image for the VirtualBox virtualization tool |
+| *virtualbox-i386*     | 32-bit image for the VirtualBox virtualization tool |
+ 
+ ## Running Build
+ 
+@@ -69,10 +70,12 @@ Freedom-maker supports building for the following targets:
+     to run "parted".
+ 
+     ```
+-    $ sudo python3 -m freedommaker a20-olinuxino-lime2
+    $ sudo python3 -m freedommaker <TARGET>
+     ```
+    where: &lt;TARGET&gt; is one of the 'Supported Targets' above.
+
+     Take a break from your computer - this takes some time. :)
+-    
+
+     To see the full list of options read the help-page:
+     ```
+     $ python3 -m freedommaker --help
+@@ -91,25 +94,47 @@ for this task. Otherwise follow the steps:
+ 
+     A. Unplug your card.
+ 
+-    B. Run "lsblk -p" to show which storage devices are connected to your system.
+    B. Run `lsblk -p` to show which storage devices are connected to your system.
+    For example, if your computer has one internal SATA storage device
+    (the most common configuration), it will be identified as */dev/sda*;
+    and the result may look similar to this:
+
+        $ lsblk -p
+        NAME        MAJ:MIN RM   SIZE RO TYPE MOUNTPOINTS
+        /dev/sda      8:0    0 119.2G  0 disk
+        ├─/dev/sda1   8:1    0     2G  0 part /boot
+        ├─/dev/sda2   8:2    0  22.5G  0 part /
+        └─/dev/sda3   8:3    0  94.8G  0 part /home
+
+    C. Plug in your SDcard and run `lsblk -p` again. Find the new device and note
+    the name. For example, if the SDcard is unformatted (empty), the result may
+    look similar to this:
+
+        $ lsblk -p
+        NAME        MAJ:MIN RM   SIZE RO TYPE MOUNTPOINTS
+        /dev/sda      8:0    0 119.2G  0 disk
+        ├─/dev/sda1   8:1    0     2G  0 part /boot
+        ├─/dev/sda2   8:2    0  22.5G  0 part /
+        └─/dev/sda3   8:3    0  94.8G  0 part /home
+        /dev/sdb      8:32   1  29.7G  0 disk
+
+    Or, if the SDcard is already formatted, it may look more like this:
+ 
+-    C. Plug your card in and run "lsblk -p" again. Find the new device and note
+-    the name.
+-    
+         $ lsblk -p
+-        NAME                                   MAJ:MIN RM   SIZE RO TYPE  MOUNTPOINT
+-        /dev/sdg                                 8:0    1  14.9G  0 disk  
+-        /dev/nvme0n1                           259:0    0   477G  0 disk  
+-        ├─/dev/nvme0n1p1                       259:1    0   512M  0 part  /boot/efi
+-        ├─/dev/nvme0n1p2                       259:2    0   244M  0 part  /boot
+-        └─/dev/nvme0n1p3                       259:3    0 476.2G  0 part  
+-          └─/dev/mapper/nvme0n1p3_crypt        253:0    0 476.2G  0 crypt 
+-            ├─/dev/mapper/mjw--t470--vg-root   253:1    0 468.4G  0 lvm   /
+-            └─/dev/mapper/mjw--t470--vg-swap_1 253:2    0   7.8G  0 lvm   [SWAP]
+-
+-    D. In the above case, the disk that is newly inserted is available
+-       as */dev/sdg*. You can also verify the size (16 GB in this example).
+-       Carefully note this and use it in the copying step below.
+        NAME        MAJ:MIN RM   SIZE RO TYPE MOUNTPOINTS
+        /dev/sda      8:0    0 119.2G  0 disk
+        ├─/dev/sda1   8:1    0     2G  0 part /boot
+        ├─/dev/sda2   8:2    0  22.5G  0 part /
+        └─/dev/sda3   8:3    0  94.8G  0 part /home
+        /dev/sdb      8:32   1  29.7G  0 disk
+        ├─/dev/sdb1   8:33   1   100M  0 part
+        └─/dev/sdb2   8:36   1  29.6G  0 part
+
+    D. In the above cases, the newly inserted SDcard is identified
+       as */dev/sdb*. To be more certain, you can compare the reported sizes
+       (approximately - the SDcard is 30 GB in this example - reported 29.7G).
+       Most importantly, */dev/sda*. is usually not the SDcard.
+       Carefully note this identifier and use it in the copying step below.
+ 
+ 2. Copy the image to your card.  Double check and make sure you don't
+    write to your computer's main storage (such as /dev/sda).  Also
+diff --git a/freedommaker/__main__.py b/freedommaker/__main__.py
+index 9d29193..cb6a178 100644
+--- a/freedommaker/__main__.py
+++ b/freedommaker/__main__.py
+@@ -20,7 +20,15 @@
+ Module to provide ability to run this freedommaker package.
+ 
+ Run the package as:
+-  python3 -m freedommaker
+  $ sudo python3 -m freedommaker <TARGET>
+where:
+  <TARGET> is one of:
+  $ grep -r 'machine = ' freedommaker/builders/ | cut -d '=' -f 2
+eg:
+  $ sudo python3 -m freedommaker a20-olinuxino-lime2
+
+To see the full list of options read the help-page:
+  $ python3 -m freedommaker --help
+ """
+ 
+ from .application import Application
--- a/helpers/DATA/freedom-maker/0002-generalize-distro-fork-name_could-be-upstreamed.patch
+++ b/helpers/DATA/freedom-maker/0002-generalize-distro-fork-name_could-be-upstreamed.patch
+diff --git a/freedommaker/builder.py b/freedommaker/builder.py
+index 0f94d5c..8a13188 100644
+--- a/freedommaker/builder.py
+++ b/freedommaker/builder.py
+@@ -23,6 +23,8 @@ import os
+ 
+ from . import internal, library
+ 
+DISTRO_BRAND = 'Debian'
+
+ # initramfs-tools is a dependency for the kernel-image package. However, when
+ # kernel is not installed, as in case of Raspberry Pi image, explicit dependency
+ # is needed.
+@@ -103,10 +105,11 @@ class ImageBuilder(object):  # pylint: disable=too-many-instance-attributes
+ 
+     def _get_image_base_name(self):
+         """Return the base file name of the final image."""
+-        free_tag = 'free' if self.free else 'nonfree'
+        free_tag = 'libre' if self.free else 'nonfree'
+ 
+-        return 'freedombox-{distribution}-{free_tag}_{build_stamp}_{machine}' \
+        return '{distro}freedombox-{distribution}-{free_tag}_{build_stamp}_{machine}' \
+             '-{architecture}'.format(
+                distro=DISTRO_BRAND.lower() + '-' if DISTRO_BRAND else '',
+                 distribution=self.arguments.distribution, free_tag=free_tag,
+                 build_stamp=self.arguments.build_stamp, machine=self.machine,
+                 architecture=self.architecture)
--- a/helpers/DATA/freedom-maker/0003-trisquelize-documentation.patch
+++ b/helpers/DATA/freedom-maker/0003-trisquelize-documentation.patch
+diff --git a/README.md b/README.md
+index 3fb54f4..8b01fbd 100644
+--- a/README.md
+++ b/README.md
+@@ -1,7 +1,3 @@
+-[![pipeline status](https://salsa.debian.org/freedombox-team/freedom-maker/badges/master/pipeline.svg)](https://salsa.debian.org/freedombox-team/freedom-maker/commits/master)
+-[![Debian Unstable](https://badges.debian.net/badges/debian/unstable/freedom-maker/version.svg)](https://packages.debian.org/unstable/freedom-maker)
+-[![Debian Testing](https://badges.debian.net/badges/debian/testing/freedom-maker/version.svg)](https://packages.debian.org/testing/freedom-maker)
+-
+ # Freedom-Maker: The FreedomBox image builder
+ 
+ These scripts build FreedomBox-images for various supported hardware
+@@ -13,9 +9,9 @@ during releases and for advanced users who intend to build their own
+ images. Regular users who wish to turn their devices into
+ FreedomBoxes should instead download the pre-built images.
+ 
+-Get a pre-built image via https://freedombox.org/download/.  There
+Get a pre-built image via https://cdimage.trisquel.info/trisquel-images/. There
+ are images available for all supported target devices.  You also find
+-the setup instructions on the [Wiki](https://wiki.debian.org/FreedomBox/).
+the setup instructions on the [Wiki](https://trisquel.info/en/wiki/FreedomBox/).
+ 
+ If you wish to create your own FreedomBox image, perhaps with some
+ tweaks, see the *Build Images* section below.
+@@ -24,7 +20,7 @@ tweaks, see the *Build Images* section below.
+ 
+ ## Supported Targets
+ 
+-Freedom-maker supports building for the following targets:
+Trisquel Freedom-maker supports building for the following targets:
+ 
+ | target                | description |
+ |-----------------------|-------------|
+@@ -43,25 +39,18 @@ Freedom-maker supports building for the following targets:
+ | *pine64-plus*         | Pine64+ board's SD card |
+ | *qemu-amd64*          | 64-bit image for the Qemu virtualization tool |
+ | *qemu-i386*           | 32-bit image for the Qemu virtualization tool |
+-| *raspberry2*          | RasbperryPi 2's SD card |
+-| *raspberry3*          | RasbperryPi 3's SD card |
+-| *raspberry3-b-plus*   | RasbperryPi 3 Model B+'s SD card |
+-| *test*                | build virtualbox i386 image and run diagnostics tests on it |
+-| *virtualbox-amd64*    | 64-bit image for the VirtualBox virtualization tool |
+-| *virtualbox-i386*     | 32-bit image for the VirtualBox virtualization tool |
+ 
+ ## Running Build
+ 
+-1. Fetch the git source of freedom-maker:
+1. Fetch the 'freedom-maker' source code:
+     ```
+-    $ git clone https://salsa.debian.org/freedombox-team/freedom-maker.git
+    $ apt source freedom-maker
+     ```
+ 
+ 2. Install the required dependencies:
+     ```shell
+     $ sudo apt install btrfs-progs debootstrap kpartx parted qemu-user-static sshpass
+-    $ cd freedom-maker
+-    $ sudo apt build-dep .
+    $ sudo apt build-dep freedom-maker
+     ```
+ 
+ 3. Build images:
+@@ -70,6 +59,7 @@ Freedom-maker supports building for the following targets:
+     to run "parted".
+ 
+     ```
+    $ cd $(find -type d -name 'freedom-maker-*')
+     $ sudo python3 -m freedommaker <TARGET>
+     ```
+     where: &lt;TARGET&gt; is one of the 'Supported Targets' above.
+diff --git a/debian/freedom-maker.1 b/debian/freedom-maker.1
+index 60f3d86..820e84d 100644
+--- a/debian/freedom-maker.1
+++ b/debian/freedom-maker.1
+@@ -51,17 +51,17 @@ Size of the image to build
+ .PP
+ \fB\-\-build\-mirror\fR
+ .RS 4
+-Debian mirror to use for building
+Trisquel mirror to use for building
+ .RE
+ .PP
+ \fB\-\-mirror\fR
+ .RS 4
+-Debian mirror to use in built image
+Trisquel mirror to use in built image
+ .RE
+ .PP
+ \fB\-\-distribution\fR
+ .RS 4
+-Debian release to use in built image
+Trisquel release to use in built image
+ .RE
+ .PP
+ \fB\-\-include\-source\fR
+@@ -106,7 +106,7 @@ Force rebuild of images even when required image exists
+ .PP
+ \fBtargets\fR
+ .RS 4
+-Image targets to build\&. Choose one or more of freedommaker, dreamplug, raspberry, raspberry2, beaglebone, cubieboard2, cubietruck, a20\-olinuxino\-lime, a20\-olinuxino\-lime2, a20\-olinuxino\-micro, i386, amd64, virtualbox\-i386, virtualbox\-amd64, qemu\-i386, qemu\-amd64, pcDuino3
+Image targets to build\&. Choose one or more of freedommaker, dreamplug, beaglebone, cubieboard2, cubietruck, a20\-olinuxino\-lime, a20\-olinuxino\-lime2, a20\-olinuxino\-micro, i386, amd64, qemu\-i386, qemu\-amd64, pcDuino3
+ .RE
+ .SH "EXAMPLES"
+ .PP
+@@ -130,9 +130,9 @@ Build a FreedomBox image for the BeagleBone Single Board Computer\&.
+ .RS 4
+ .\}
+ .nf
+-$ python3 \-m freedommaker dreamplug raspberry raspberry2
+$ python3 \-m freedommaker dreamplug
+       beaglebone cubieboard2 cubietruck a20\-olinuxino\-lime a20\-olinuxino\-lime2 
+-      a20\-olinuxino\-micro i386 amd64 virtualbox\-i386 virtualbox\-amd64 
+      a20\-olinuxino\-micro i386 amd64
+       qemu\-i386 qemu\-amd64 pcDuino3
+ .fi
+ .if n \{\
+diff --git a/doc/freedom-maker.xml b/doc/freedom-maker.xml
+index 74ce990..349a136 100644
+--- a/doc/freedom-maker.xml
+++ b/doc/freedom-maker.xml
+@@ -94,7 +94,7 @@
+         <term> <option>--build-mirror</option></term>
+          <listitem>
+           <para>
+-            Debian mirror to use for building
+            Trisquel mirror to use for building
+           </para>
+         </listitem>
+       </varlistentry>
+@@ -102,7 +102,7 @@
+         <term> <option>--mirror</option></term>
+          <listitem>
+            <para>
+-             Debian mirror to use in built image
+             Trisquel mirror to use in built image
+           </para>
+         </listitem>
+       </varlistentry>
+@@ -110,7 +110,7 @@
+         <term> <option>--distribution</option></term>
+          <listitem>
+            <para>
+-             Debian release to use in built image
+             Trisquel release to use in built image
+           </para>
+         </listitem>
+       </varlistentry>
+diff --git a/freedommaker/application.py b/freedommaker/application.py
+index dbe8ca0..0bebc35 100644
+--- a/freedommaker/application.py
+++ b/freedommaker/application.py
+@@ -94,15 +94,15 @@ class Application(object):
+         parser.add_argument(
+             '--build-mirror',
+             default=BUILD_MIRROR,
+-            help='Debian mirror to use for building')
+            help='Trisquel mirror to use for building')
+         parser.add_argument(
+             '--mirror',
+             default=MIRROR,
+-            help='Debian mirror to use in built image')
+            help='Trisquel mirror to use in built image')
+         parser.add_argument(
+             '--distribution',
+             default=DISTRIBUTION,
+-            help='Debian release to use in built image')
+            help='Trisquel release to use in built image')
+         parser.add_argument(
+             '--package',
+             action='append',
+diff --git a/freedommaker/internal.py b/freedommaker/internal.py
+index acc22d8..49bd4a9 100644
+--- a/freedommaker/internal.py
+++ b/freedommaker/internal.py
+@@ -275,9 +275,7 @@ class InternalBuilderBackend():
+ 
+     def _set_freedombox_disk_image_flag(self):
+         """Set a flag to indicate that this is a FreedomBox image.
+-
+-        And that FreedomBox is not installed using a Debian package.
+-
+        And not a standard Trisquel system with the FreedomBox packages installed.
+         """
+         library.run_in_chroot(
+             self.state, ['mkdir', '-p', '-m', '755', '/var/lib/freedombox'])
No results found