helpers/DATA/linux/deblob-check

 #! /bin/sh
-# deblob-check version 2021-08-29
+# deblob-check version 2021-08-29 r18269
+#        modified with 2022-01-27 r18550
 # Inspired in gNewSense's find-firmware script.
 # Written by Alexandre Oliva <lxoliva@fsfla.org>
 # Check http://www.fsfla.org/svn/fsfla/software/linux-libre for newer
 # versions.
-# Copyright 2008-2021 Alexandre Oliva <lxoliva@fsfla.org>
+# Copyright 2008-2022 Alexandre Oliva <lxoliva@fsfla.org>
 #
 # This program is part of GNU Linux-libre, a GNU project that
 # publishes scripts to clean up Linux so as to make it suitable for
@@ -6280,6 +6281,9 @@ set_except () {
     accept 'ARM[ ]assembly[ ]source[ ]code[ ]available[ ]at[ ]https[:][/][/]linuxtv\.org[/]downloads[/]firmware[/]Boot\.S' firmware/WHENCE
+    # New in 5.16.3, 5.15.17, 5.10.94, 5.4.174, 4.19.226, 4.14.263.
+    accept 'static[ ]struct[ ]dvb_usb_device_properties[ ]\(p1100\|s660\|p7500\)_properties[ ]=[ ][{][\n]\([	]\.\(caps\|usb_ctrl\|size_of_priv\)[ ]*=[ ][^",]*,[\n]*\)*[	]\.firmware[ ]*=[ ]' drivers/media/usb/dvb-usb/dw2102.c
+
     ;;
   */*freedo*.patch | */*logo*.patch)

helpers/DATA/linux/revert_iwlwifi_clear_firmware1.patch

+reverts https://lore.kernel.org/all/iwlwifi.20211210110539.1f742f0eb58a.I1315f22f6aa632d94ae2069f85e1bca5e734dce0@changeid/
+
+--- b/drivers/net/wireless/intel/iwlwifi/iwl-drv.c
++++ a/drivers/net/wireless/intel/iwlwifi/iwl-drv.c
+@@ -1597,8 +1597,15 @@
+ 	 * else from proceeding if the module fails to load
+ 	 * or hangs loading.
+ 	 */
++	if (load_module) {
+-	if (load_module)
+ 		request_module("%s", op->name);
++#ifdef CONFIG_IWLWIFI_OPMODE_MODULAR
++		if (err)
++			IWL_ERR(drv,
++				"failed to load module %s (error %d), is dynamic loading enabled?\n",
++				op->name, err);
++#endif
++	}
+ 	failure = false;
+ 	goto free;
+ 

helpers/DATA/linux/revert_iwlwifi_clear_firmware2.patch

+reverts https://lore.kernel.org/all/iwlwifi.20211210110539.1f742f0eb58a.I1315f22f6aa632d94ae2069f85e1bca5e734dce0@changeid/
+
+--- b/drivers/net/wireless/intel/iwlwifi/iwl-drv.c
++++ a/drivers/net/wireless/intel/iwlwifi/iwl-drv.c
+@@ -130,9 +130,6 @@
+ 
+ 	for (i = 0; i < IWL_UCODE_TYPE_MAX; i++)
+ 		iwl_free_fw_img(drv, drv->fw.img + i);
+-
+-	/* clear the data for the aborted load case */
+-	memset(&drv->fw, 0, sizeof(drv->fw));
+ }
+ 
+ static int iwl_alloc_fw_desc(struct iwl_drv *drv, struct fw_desc *desc,
+@@ -1429,7 +1426,6 @@
+ 	int i;
+ 	bool load_module = false;
+ 	bool usniffer_images = false;
+-	bool failure = true;
+ 
+ 	fw->ucode_capa.max_probe_length = IWL_DEFAULT_MAX_PROBE_LENGTH;
+ 	fw->ucode_capa.standard_phy_calibration_size =
+@@ -1699,7 +1695,6 @@
+ 				op->name, err);
+ #endif
+ 	}
+-	failure = false;
+ 	goto free;
+ 
+  try_again:
+@@ -1715,9 +1710,6 @@
+ 	complete(&drv->request_firmware_complete);
+ 	device_release_driver(drv->trans->dev);
+  free:
+-	if (failure)
+-		iwl_dealloc_ucode(drv);
+-
+ 	if (pieces) {
+ 		for (i = 0; i < ARRAY_SIZE(pieces->img); i++)
+ 			kfree(pieces->img[i].sec);

helpers/DATA/linux/revert_iwlwifi_clear_firmware3.patch

+reverts https://lore.kernel.org/all/iwlwifi.20211210110539.1f742f0eb58a.I1315f22f6aa632d94ae2069f85e1bca5e734dce0@changeid/
+
+diff -ru source.orig/drivers/net/wireless/intel/iwlwifi/iwl-drv.c source/drivers/net/wireless/intel/iwlwifi/iwl-drv.c
+--- source.orig/drivers/net/wireless/intel/iwlwifi/iwl-drv.c	2022-05-13 16:10:11.883295769 -0400
++++ source/drivers/net/wireless/intel/iwlwifi/iwl-drv.c	2022-05-13 20:13:06.568151229 -0400
+@@ -1605,7 +1605,6 @@
+ 	complete(&drv->request_firmware_complete);
+ 	device_release_driver(drv->trans->dev);
+ 	/* drv has just been freed by the release */
+-	failure = false;
+  free:
+ 	if (pieces) {
+ 		for (i = 0; i < ARRAY_SIZE(pieces->img); i++)

helpers/DATA/linux/silent-accept-firmware.patch

@@ -1056,8 +1056,28 @@ diff -ur a/drivers/net/wireless/intel/iwlwifi/dvm/main.c b/drivers/net/wireless/
  	if (iwl_trans_start_hw(priv->trans))
  		goto out_free_hw;
 diff -ur a/drivers/net/wireless/intel/iwlwifi/iwl-drv.c b/drivers/net/wireless/intel/iwlwifi/iwl-drv.c
---- a/drivers/net/wireless/intel/iwlwifi/iwl-drv.c	2021-06-25 14:52:20.000000000 +0200
-+++ b/drivers/net/wireless/intel/iwlwifi/iwl-drv.c	2021-06-25 14:54:58.336092716 +0200
+--- a/drivers/net/wireless/intel/iwlwifi/iwl-drv.c	2022-05-13 15:20:06.000000000 -0400
++++ b/drivers/net/wireless/intel/iwlwifi/iwl-drv.c	2022-05-13 15:40:28.252484852 -0400
+@@ -237,19 +237,6 @@
+
+ 	if (drv->fw_index < cfg->ucode_api_min) {
+ 		IWL_ERR(drv, "no suitable firmware found!\n");
+-
+-		if (cfg->ucode_api_min == cfg->ucode_api_max) {
+-			IWL_ERR(drv, "%s%d is required\n", cfg->fw_name_pre,
+-				cfg->ucode_api_max);
+-		} else {
+-			IWL_ERR(drv, "minimum version required: %s%d\n",
+-				cfg->fw_name_pre, cfg->ucode_api_min);
+-			IWL_ERR(drv, "maximum version supported: %s%d\n",
+-				cfg->fw_name_pre, cfg->ucode_api_max);
+-		}
+-
+-		IWL_ERR(drv,
+-			"check git://git.kernel.org/pub/scm/linux/kernel/git/firmware/linux-firmware.git\n");
+ 		return -ENOENT;
+ 	}
+
 @@ -253,8 +253,7 @@
  	snprintf(drv->firmware_name, sizeof(drv->firmware_name), "%s%s.ucode",
  		 cfg->fw_name_pre, tag);

helpers/DATA/update-notifier/apt_check.py

+#!/usr/bin/python3
+
+
+# nice apt-get -s -o Debug::NoLocking=true upgrade | grep ^Inst
+
+import apt
+import apt_pkg
+import os
+import sys
+from optparse import OptionParser
+import re
+import gettext
+import distro_info
+import subprocess
+
+
+SYNAPTIC_PINFILE = "/var/lib/synaptic/preferences"
+OS_RELEASE_PATH = "/etc/os-release"
+
+
+def _get_info_from_os_release(key):
+    " get info directly from os-release file "
+    if os.path.exists(OS_RELEASE_PATH):
+        with open(OS_RELEASE_PATH) as f:
+            search_res = re.search(
+                r"{}=(?P<name>.*)".format(key),
+                f.read()
+            )
+            if search_res:
+                return search_res.group("name")
+            else:
+                raise Exception(
+                    "Could not find {} in {}".format(
+                        key, OS_RELEASE_PATH
+                    )
+                )
+    else:
+        raise Exception(
+            "File {} was not found on the system".format(
+                OS_RELEASE_PATH
+            )
+        )
+
+
+def _get_output_from_lsb_release(lsb_option):
+    " get info from lsb_release output "
+    return subprocess.check_output(
+        ["lsb_release", lsb_option, "-s"], universal_newlines=True
+    ).strip()
+
+
+def get_distro():
+    " get distro name "
+    try:
+        return _get_info_from_os_release(key="UBUNTU_CODENAME")
+    except Exception:
+        # If the system does not have os-release file or does not have the
+        # required entry in it, we will get the distro name from lsb_release
+        # command
+        return _get_output_from_lsb_release("-c")
+
+
+DISTRO = get_distro()
+
+def _(msg):
+    return gettext.dgettext("update-notifier", msg)
+
+
+def _handleException(type, value, tb):
+    sys.stderr.write("E: " + _("Unknown Error: '%s' (%s)") % (type, value))
+    sys.exit(-1)
+
+
+def get_distro_version():
+    " get distro version "
+    try:
+        return _get_info_from_os_release(key="VERSION_ID").replace('"', "")
+    except Exception:
+        # If the system does not have os-release file or does not have the
+        # required entry in it, we will get the distro name from lsb_release
+        # command
+        return _get_output_from_lsb_release("-r")
+
+
+def clean(cache, depcache):
+    " unmark (clean) all changes from the given depcache "
+    # mvo: looping is too inefficient with the new auto-mark code
+    # for pkg in cache.Packages:
+    #     depcache.MarkKeep(pkg)
+    depcache.init()
+
+
+def saveDistUpgrade(cache, depcache):
+    """ this function mimics a upgrade but will never remove anything """
+    depcache.upgrade(True)
+    if depcache.del_count > 0:
+        clean(cache, depcache)
+    depcache.upgrade()
+
+
+def isSecurityUpgrade(ver):
+    " check if the given version is a security update (or masks one) "
+    security_pockets = [("Ubuntu", "%s-security" % DISTRO),
+                        ("gNewSense", "%s-security" % DISTRO),
+                        ("Debian", "%s-updates" % DISTRO)]
+    for (file, index) in ver.file_list:
+        for origin, archive in security_pockets:
+            if (file.archive == archive and file.origin == origin):
+                return True
+    return False
+
+def write_package_names(outstream, cache, depcache):
+    " write out package names that change to outstream "
+    pkgs = [pkg for pkg in cache.packages if depcache.marked_install(pkg)
+            or depcache.marked_upgrade(pkg)]
+    outstream.write("\n".join([p.name for p in pkgs]))
+
+
+def is_lts_distro():
+    " check if the current distro is LTS or not"
+    return distro_info.TrisquelDistroInfo().is_lts(DISTRO)
+
+
+def write_human_readable_summary(outstream, upgrades, security_updates):
+    " write out human summary to outstream "
+    lts_distro = is_lts_distro()
+
+    outstream.write(
+        gettext.dngettext("update-notifier",
+                          "%i update can be applied immediately.",
+                          "%i updates can be applied immediately.",
+                          upgrades) % upgrades
+    )
+
+    if security_updates > 0:
+        outstream.write("\n")
+        outstream.write(gettext.dngettext("update-notifier",
+                                          "%i of these updates is a "
+                                          "standard security update.",
+                                          "%i of these updates are "
+                                          "standard security updates.",
+                                          security_updates) %
+                        security_updates)
+
+
+def init():
+    " init the system, be nice "
+    # FIXME: do a ionice here too?
+    os.nice(19)
+    apt_pkg.init()
+
+
+def run(options=None):
+
+    # we are run in "are security updates installed automatically?"
+    # question mode
+    if options.security_updates_unattended:
+        res = apt_pkg.config.find_i("APT::Periodic::Unattended-Upgrade", 0)
+        # print(res)
+        sys.exit(res)
+
+    # get caches
+    try:
+        cache = apt_pkg.Cache(apt.progress.base.OpProgress())
+    except SystemError as e:
+        sys.stderr.write("E: " + _("Error: Opening the cache (%s)") % e)
+        sys.exit(-1)
+    depcache = apt_pkg.DepCache(cache)
+
+    # read the synaptic pins too
+    if os.path.exists(SYNAPTIC_PINFILE):
+        depcache.read_pinfile(SYNAPTIC_PINFILE)
+        depcache.init()
+
+    if depcache.broken_count > 0:
+        sys.stderr.write("E: " + _("Error: BrokenCount > 0"))
+        sys.exit(-1)
+
+    # do the upgrade (not dist-upgrade!)
+    try:
+        saveDistUpgrade(cache, depcache)
+    except SystemError as e:
+        sys.stderr.write("E: " + _("Error: Marking the upgrade (%s)") % e)
+        sys.exit(-1)
+
+
+    # analyze the ugprade
+    upgrades = 0
+    security_updates = 0
+
+    # we need another cache that has more pkg details
+    with apt.Cache() as aptcache:
+        for pkg in cache.packages:
+
+            # skip packages that are not marked upgraded/installed
+            if not (depcache.marked_install(pkg)
+                    or depcache.marked_upgrade(pkg)):
+                continue
+            # check if this is really a upgrade or a false positive
+            # (workaround for ubuntu #7907)
+            inst_ver = pkg.current_ver
+            cand_ver = depcache.get_candidate_ver(pkg)
+            if cand_ver == inst_ver:
+                continue
+            # check for security upgrades
+            if isSecurityUpgrade(cand_ver):
+                security_updates += 1
+
+                upgrades += 1
+                continue
+
+            # check to see if the update is a phased one
+            try:
+                from UpdateManager.Core.UpdateList import UpdateList
+                ul = UpdateList(None)
+                ignored = ul._is_ignored_phased_update(
+                    aptcache[pkg.get_fullname()])
+                if ignored:
+                    depcache.mark_keep(pkg)
+                    continue
+            except ImportError:
+                pass
+
+            upgrades = upgrades + 1
+
+            # now check for security updates that are masked by a
+            # candidate version from another repo (-proposed or -updates)
+            for ver in pkg.version_list:
+                if (inst_ver
+                        and apt_pkg.version_compare(ver.ver_str,
+                                                    inst_ver.ver_str) <= 0):
+                    continue
+                if isSecurityUpgrade(ver):
+                    security_updates += 1
+                    break
+
+    # print the number of upgrades
+    if options and options.show_package_names:
+        write_package_names(sys.stderr, cache, depcache)
+    elif options and options.readable_output:
+        write_human_readable_summary(sys.stdout, upgrades, security_updates)
+    else:
+        # print the number of regular upgrades and the number of
+        # security upgrades
+        sys.stderr.write("%s;%s" % (upgrades, security_updates))
+
+    # return the number of upgrades (if its used as a module)
+    return(upgrades, security_updates)
+
+
+if __name__ == "__main__":
+    # setup a exception handler to make sure that uncaught stuff goes
+    # to the notifier
+    sys.excepthook = _handleException
+
+    # gettext
+    APP = "update-notifier"
+    DIR = "/usr/share/locale"
+    gettext.bindtextdomain(APP, DIR)
+    gettext.textdomain(APP)
+
+    # check arguments
+    parser = OptionParser()
+    parser.add_option("-p",
+                      "--package-names",
+                      action="store_true",
+                      dest="show_package_names",
+                      help=_("Show the packages that are "
+                             "going to be installed/upgraded"))
+    parser.add_option("",
+                      "--human-readable",
+                      action="store_true",
+                      dest="readable_output",
+                      help=_("Show human readable output on stdout"))
+    parser.add_option("",
+                      "--security-updates-unattended",
+                      action="store_true",
+                      help=_("Return the time in days when security updates "
+                             "are installed unattended (0 means disabled)"))
+    (options, args) = parser.parse_args()
+
+    # run it
+    init()
+    run(options)
+

helpers/config

@@ -46,7 +46,7 @@ export DOMAIN=trisquel.info
 export UPSTREAM=focal
 export UPSTREAMRELEASE=20.04
 MIRROR=http://archive.ubuntu.com/ubuntu
-LOCALMIRROR=https://archive.trisquel.org/trisquel
+LOCALMIRROR=http://archive.trisquel.org/trisquel
 LOCAL_APT=`mktemp -d` 
 
 if [ -n "$BUILD_UNTIL" ] && (( $(echo "$BUILD_UNTIL $REVISION" | awk '{print ($1 > $2)}') )); then
@@ -68,7 +68,12 @@ find ${@:3} -type f -not -iregex '.*changelog.*' -not -iregex '.*copyright.*' -e
 changelog(){
 head -n 1 debian/changelog | grep -q $UPSTREAM-security && REPO=$CODENAME-security || REPO=$CODENAME
 [ "$BACKPORT" = true ] || [ "$BACKPORTS" = true ] && REPO=${CODENAME}-backports
+#Name convention issue "+" breaking packages build like console-setup, using "-" instead.
+if [ "$NAME_CI" = true ];then
+echo | dch -D $REPO -v `pkgversion`-${REVISION}trisquel${VERSION} "$1"
+else
 echo | dch -D $REPO -v `pkgversion`+${REVISION}trisquel${VERSION} "$1"
+fi
 
 # Make sure the changelog file is identical between archs
 /bin/sed "/-- Trisquel/s/.*/ -- Trisquel GNU\/Linux developers <trisquel-devel@listas.trisquel.info>  $DATE/" -i debian/changelog
@@ -189,10 +194,8 @@ cd source
 [ -f debian/source/format ] && rm debian/source/format
 [ -f debian/source/options ] && rm debian/source/options
 
-#for i in debian.master/control.stub.in debian.master/control.stub debian.master/control debian/control.stub.in debian/control.stub debian/control
-#do
-#    [ -f $i ] && /bin/sed "s_^Maintainer.*_Maintainer: $DEBFULLNAME <$DEBEMAIL>_g" -i $i
-#done
+grep -lr 'Maintainer:' debian*/control* | \
+xargs sed -i "s_^Maintainer.*_Maintainer: $DEBFULLNAME <$DEBEMAIL>_g"
 
 compile(){
 

helpers/make-a11y-profile-manager

@@ -18,11 +18,12 @@
 #    Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301 USA
 #
 
-VERSION=4
+VERSION=5
 
 . ./config
 
 sed 's/OnlyShowIn=Unity;/OnlyShowIn=Unity;MATE;/' -i a11y-profile-manager-indicator-autostart.desktop.in
+sed 's/GSettings.*/GSettings org.mate.interface accessibility/' -i a11y-profile-manager-indicator-autostart.desktop.in
 
 cat << EOF >> profiles/blindness/profile.gsettings
 

helpers/make-abiword

+#!/bin/sh
+#
+#    Copyright (C) 2022 Luis Guzman <ark@switnet.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
+#    the Free Software Foundation; either version 2 of the License, or
+#    (at your option) any later version.
+#
+#    This program is distributed in the hope that it will be useful,
+#    but WITHOUT ANY WARRANTY; without even the implied warranty of
+#    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+#    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, write to the Free Software
+#    Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301 USA
+#
+
+VERSION=1
+
+. ./config
+
+#Remove unwanted plugin
+sed -i 's|google ||' debian/rules
+
+#Replace non-free fonts references
+replace 'Arial Unicode MS' 'Liberation Sans' .
+replace 'Times New Roman' 'Liberation Serif' .
+replace 'Arial' 'Liberation Sans' .
+
+
+changelog "Remove google-search plugin and non-free fonts references."
+
+compile

helpers/make-apt-mirror

@@ -18,13 +18,12 @@
 #    Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301 USA
 #
 
-VERSION=2
+VERSION=3
 
 . ./config
 
 cp $DATA/Trisquel-mirror.list debian/
 
-changelog "Added config for Trisquel GNU/Linux"
 
 sed 's/Debian or Ubuntu/Trisquel/' -i apt-mirror
 sed 's/Debian/Trisquel/g' -i apt-mirror
@@ -33,7 +32,7 @@ sed "s/stable/$CODENAME/g" -i apt-mirror
 sed 's/ contrib//g' -i apt-mirror
 sed 's/ non-free//g' -i apt-mirror
 
-changelog "Update manpage for Trisquel"
+changelog "Added config and update manpage for Trisquel."
 
 compile
 

helpers/make-base-files

@@ -17,11 +17,12 @@
 #    Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301 USA
 #
 
-VERSION=4
+VERSION=5
 
 . ./config
 
 CODENAMECAPS=$(echo $CODENAME | /bin/sed -e "s/\b\(.\)/\u\1/g")
+POINT_RELEASE=".1"
 
 # Disable dynamic motd
 find -name *motd-news* -delete
@@ -85,28 +86,28 @@ fi
 EOF
 
 cat > etc/issue <<EOF
-Trisquel GNU/Linux $REVISION \n \l
+Trisquel GNU/Linux $REVISION$POINT_RELEASE \n \l
 
 EOF
 
 cat > etc/issue.net <<EOF
-Trisquel GNU/Linux $REVISION
+Trisquel GNU/Linux $REVISION$POINT_RELEASE
 EOF
 
 cat > etc/lsb-release <<EOF
 DISTRIB_ID=Trisquel
-DISTRIB_RELEASE=$REVISION
+DISTRIB_RELEASE=$REVISION$POINT_RELEASE
 DISTRIB_CODENAME=$CODENAME
-DISTRIB_DESCRIPTION="Trisquel GNU/Linux $REVISION, $CODENAMECAPS"
+DISTRIB_DESCRIPTION="Trisquel GNU/Linux $REVISION$POINT_RELEASE, $CODENAMECAPS"
 EOF
 
 cat > etc/os-release <<EOF
 NAME="Trisquel GNU/Linux"
-VERSION="$REVISION, $CODENAMECAPS"
+VERSION="$REVISION$POINT_RELEASE, $CODENAMECAPS"
 ID=trisquel
 ID_LIKE=debian
-PRETTY_NAME="Trisquel GNU/Linux $CODENAMECAPS ($REVISION)"
-VERSION_ID="$REVISION"
+PRETTY_NAME="Trisquel GNU/Linux $CODENAMECAPS ($REVISION$POINT_RELEASE)"
+VERSION_ID="$REVISION$POINT_RELEASE"
 VERSION_CODENAME="$CODENAME"
 UBUNTU_CODENAME="$UPSTREAM"
 HOME_URL="https://trisquel.info/"

helpers/make-bleachbit

@@ -18,7 +18,7 @@
 #    Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301 USA
 #
 
-VERSION=2
+VERSION=3
 
 . ./config
 
@@ -38,10 +38,6 @@ replace firefox abrowser .
 
 cp $DATA/icecat.xml cleaners/icecat.xml
 
-changelog "Rename firefox to abrowser"
-
-changelog "Add icecat cleaner"
-
-changelog "Remove cleaners for non-free programs and stop advertising them"
+changelog "Rename firefox to abrowser, add icecat cleaner and remove cleaners for non-free programs and stop advertising them"
 
 compile

helpers/make-console-setup

+#!/bin/sh
+#
+#    Copyright (C) 2022 Luis Guzmán <ark@switnet.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
+#    the Free Software Foundation; either version 2 of the License, or
+#    (at your option) any later version.
+#
+#    This program is distributed in the hope that it will be useful,
+#    but WITHOUT ANY WARRANTY; without even the implied warranty of
+#    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+#    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, write to the Free Software
+#    Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301 USA
+#
+
+VERSION=0
+EXTERNAL='deb-src http://archive.ubuntu.com/ubuntu impish main universe'
+REPOKEY="871920D1991BC93C"
+COMPONENT=main
+NAME_CI=true
+BUILD_UNTIL=10.0
+
+. ./config
+
+
+changelog "Backported from Impish"
+
+compile
+

helpers/make-debian-installer

@@ -18,7 +18,7 @@
 #    Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301 USA
 #
 
-VERSION=9
+VERSION=10
 NETINST=true
 
 . ./config
@@ -63,7 +63,7 @@ open-ath9k-htc-firmware-udeb
 openfwwf-udeb
 EOF
 
-replace "2004-20.." "2004-20$(date +'%y')" . -R
+replace "2004-20.." "2004-20$(date +'%y')" .
 rpl www.ubuntu.com trisquel.info . -R
 rpl ubuntu.com trisquel.info build/boot/ -R
 rpl www.ubuntu trisquel build/boot/ -R

helpers/make-debootstrap

 #!/bin/sh
 #
-#    Copyright (C) 2008-2020  Ruben Rodriguez <ruben@trisquel.info>
+#    Copyright (C) 2008-2022  Ruben Rodriguez <ruben@trisquel.info>
 #
 #    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
@@ -17,7 +17,7 @@
 #    Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301 USA
 #
 
-VERSION=5
+VERSION=6
 NETINST=true
 
 . ./config
@@ -25,9 +25,7 @@ NETINST=true
 rm scripts/*
 cp -a $DATA/* scripts/
 
-replace ports.trisquel.org archive.trisquel.org
-
-changelog "Only include trisquel origins + armfh ports to archive"
+changelog "Only include trisquel origins"
 
 compile
 

helpers/make-distro-info-data

 #!/bin/sh
 #
-#    Copyright (C) 2021 Luis Guzman <ark@switnet.org>
+#    Copyright (C) 2022 Luis Guzman <ark@switnet.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
@@ -17,7 +17,7 @@
 #    Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301 USA
 #
 
-VERSION=2
+VERSION=3
 
 . ./config
 

helpers/make-firefox

@@ -2,6 +2,7 @@
 #
 #    Copyright (C) 2008-2021  Ruben Rodriguez <ruben@trisquel.info>
 #    Copyright (C) 2015       Santiago Rodriguez <santi@trisquel.info>
+#    Copyright (C) 2022       Luis Guzman <ark@switnet.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
@@ -18,7 +19,7 @@
 #    Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301 USA
 #
 
-VERSION=86
+VERSION=90
 
 . ./config
 
@@ -50,6 +51,7 @@ sed -i '/activity-stream.showSponsored/s|true|false|g' browser/app/profile/firef
 sed '/"browser.privatebrowsing.vpnpromourl"/s/https.*"/"/' -i browser/app/profile/firefox.js
 
 sed '/network.connectivity-service.IPv/s/http.*success.txt?ipv[46]//' -i modules/libpref/init/all.js
+sed 's/accounts-static.cdn.mozilla.net.*sync.services.mozilla.com//' -i modules/libpref/init/all.js
 
 # do not alter useragent/platform/oscpu/etc with fingerprinting countermeasure, it makes things worse
 sed '/ShouldResistFingerprinting/,/}/s/^/\/\//' -i ./netwerk/protocol/http/nsHttpHandler.cpp
@@ -58,6 +60,10 @@ sed '/If fingerprinting resistance is on/,/}/s/^/\/\//' -i ./dom/base/Navigator.
 # Replace ubufox recommendation
 sed 's/xul-ext-ubufox/xul-ext-youtube-html5-video-player/' -i debian/control.in
 
+#Remove exceptions on warnings when installing addons.
+sed -i '/addons.mozilla.org/d' browser/app/permissions
+sed -i '/fpn.firefox.com/d' browser/app/permissions
+
 # Disable healtreport
 cat << EOF > toolkit/components/telemetry/healthreport-prefs.js
 pref("datareporting.healthreport.uploadEnabled", false);
@@ -76,11 +82,19 @@ sed 's/com.ubuntu/org.trisquel/' -i debian/config/mozconfig.in
 # Disable DRM support, armhf has no such option.
 ## Add other archs that might present the same lack of disable-eme option
 cat << ARCH >> debian/config/mozconfig.in
+%%if DEB_HOST_ARCH != ppc64el
+%%if DEB_HOST_ARCH != arm64
 %%if DEB_HOST_ARCH != armhf
 ac_add_options --disable-eme
 %%endif
+%%endif
+%%endif
 ARCH
 
+cat << SIGN >> debian/config/mozconfig.in
+export MOZ_REQUIRE_SIGNING=
+SIGN
+
 sed '/gmp-clearkey/d' -i ./debian/firefox.install.in
 
 # Locale packages should provide firefox-locale-$LANG
@@ -134,13 +148,14 @@ cat << EOF >> browser/components/newtab/data/content/tippytop/top_sites.json
     "favicon_url": "favicons/wikipedia.ico"
   },
   {
-    "domains": ["wikinews.org"],
-    "image_url": "images/wikinews.png",
-    "favicon_url": "favicons/wikinews.ico"
+    "domains": ["h-node.org"],
+    "image_url": "images/hnode.png",
+    "favicon_url": "favicons/hnode.ico"
   }
 ]
 EOF
 
+#uuidgen --sha1 --namespace @dns --name "trisquel.info"
 cat << TOP_JSON > services/settings/dumps/main/top-sites.json
 {
   "data": [
@@ -148,52 +163,53 @@ cat << TOP_JSON > services/settings/dumps/main/top-sites.json
       "url": "https://trisquel.info/",
       "order": 0,
       "title": "Trisquel",
-      "id": "17aeb24c-da88-53bc-8915-c3e3d458070d",
+      "id": "ec7f4843-6be5-5e86-870a-1c8383500a4b",
       "last_modified": $(date +%s%N | cut -b1-13)
     },
     {
       "url": "https://www.gnu.org/",
       "order": 1,
       "title": "GNU",
-      "id": "2a833806-e5c1-58e9-8b7c-69d9417a1253",
+      "id": "1baee931-751c-5993-b6fe-d86fbf78f9b0",
       "last_modified": $(date +%s%N | cut -b1-13)
     },
     {
       "url": "https://www.fsf.org/",
       "order": 2,
       "title": "FSF",
-      "id": "d4e3e7e2-64d3-5bac-9c59-3c5c8e1efd8c",
+      "id": "fcc60dd8-4d97-5aca-8e5d-784652c75818",
       "last_modified": $(date +%s%N | cut -b1-13)
     },
     {
       "url": "https://directory.fsf.org/",
       "order": 3,
       "title": "FSF Directory",
-      "id": "dbff6206-2ada-57ad-8091-8a62ac37be4c",
+      "id": "abe5bfb2-9487-5697-9f27-e0b782dfe006",
       "last_modified": $(date +%s%N | cut -b1-13)
     },
     {
       "url": "https://libreplanet.org/",
       "order": 4,
       "title": "LibrePlanet",
-      "id": "6f586839-4063-58b8-95ed-62e034e1915e",
+      "id": "e3d2cf88-a4dc-5d2e-9f9a-f3ea241d17d8",
       "last_modified": $(date +%s%N | cut -b1-13)
     },
     {
       "url": "https://www.wikipedia.org/",
       "order": 5,
       "title": "Wikipedia",
-      "id": "5a18acd7-0440-5512-b3a4-20a35bdc9a1d",
+      "id": "02c295f5-54a8-5d29-8d1f-b619216b20c0",
       "last_modified": $(date +%s%N | cut -b1-13)
     },
     {
-      "url": "https://www.wikinews.org/",
+      "url": "https://h-node.org/",
       "order": 6,
-      "title": "Wikinews",
-      "id": "3bb633ba-0823-4501-b3b5-bc1b8670e3e1",
+      "title": "h-node",
+      "id": "c426481f-8c3f-53b8-b23a-431a91a1c7b4",
       "last_modified": $(date +%s%N | cut -b1-13)
     }
-  ]
+  ],
+  "timestamp": $(date +%s%N | cut -b1-13)
 }
 TOP_JSON
 
@@ -231,20 +247,24 @@ sed  "s/^MOZ_PKG_NAME\t.*/MOZ_PKG_NAME\t\t:= abrowser/;" debian/build/config.mk
 ############################################################################3
 ############################################################################3
 ############################################################################3
-sed "s_^Maintainer.*_Maintainer: $DEBFULLNAME <$DEBEMAIL>_g" -i debian/control.in
 
 # Branding files
 cp -a $DATA/branding/* browser/branding/official
 cp -a $DATA/branding/* browser/branding/unofficial
 cp -a $DATA/branding/* browser/branding/nightly
+cp -a $DATA/branding/* browser/branding/aurora
+
 sed '/about-wordmark.svg/d' -i browser/base/content/aboutDialog.css
 echo '#warningDesc, #communityExperimentalDesc, #communityDesc, #contributeDesc {display:none!important}' >> browser/base/content/aboutDialog.css
 # Disable preprocessor
 sed 's/_PP//' -i browser/branding/branding-common.mozbuild
-cat << EOF >> debian/config/branch.mk
+#Prevent duplicated values.
+cat << EOF > debian/config/branch.mk
+MOZILLA_REPO = https://hg.mozilla.org/releases/mozilla-release
+L10N_REPO = https://hg.mozilla.org/l10n-central
 CHANNEL                 = release
 MOZ_WANT_UNIT_TESTS     = 0
-MOZ_BUILD_OFFICIAL      = 0
+MOZ_OFFICIAL_BUILD      = 0
 MOZ_ENABLE_BREAKPAD     = 0
 MOZ_ENABLE_TELEMETRY    = 0
 EOF
@@ -260,8 +280,9 @@ s|www.mozilla.com/firefox/central|trisquel.info/browser|g;
 s|mozilla.com/plugincheck|trisquel.info/browser|g;
 s|www.mozilla.com/legal/privacy|trisquel.info/legal|g;
 s|Firefox Nightly|Abrowser|;
+s|Firefox Developer Edition|Abrowser|g;
 s|Nightly|Abrowser|g;
-s|brandProductName=Firefox|brandProductName=Abrowser|;
+s|brand-product-name = Firefox|brand-product-name = Abrowser|;
 s|Sign in to Firefox|Sign in to Sync|;
 s|Search addons.mozilla.org|Search|g;
 s|firefox.settings.services.mozilla.com|127.0.0.1|g;
@@ -282,7 +303,7 @@ sed "s/ubuntu_version/trisquel_version/; s/Ubuntu 10.10/Trisquel $REVISION/; s/1
 rm -rf ./browser/metro ./addon-sdk/source/doc/static-files/media ./browser/themes/osx ./b2g
 
 #Trisquel custom bookmarks
-cp $DATA/bookmarks.html.in browser/locales/generic/profile/bookmarks.html.in
+cp $DATA/default-bookmarks.html browser/base/content/default-bookmarks.html
 
 #Trisquel custom search engines
 cp -a $DATA/searchplugins/* browser/components/search/extensions/
@@ -358,16 +379,8 @@ MOZ_TELEMETRY_REPORTING=0
 MOZ_ADDON_SIGNING=0
 EOF
 
-# Fix locale
-cat << EOF >> mobile/locales/en-US/chrome/region.properties
-browser.search.defaultenginename=DuckDuckGo
-browser.search.order.1=DuckDuckGo
-browser.search.order.2=Google
-browser.search.order.3=Yahoo
-browser.suggestedsites.restricted_mozilla.url=https://www.trisquel.info
-browser.suggestedsites.webmaker.title=GNU Project
-browser.suggestedsites.webmaker.url=https://www.gnu.org
-EOF
+#Enable EGL by default
+sed -i '/gfx.x11-egl.force-enabled/,/mirror/s|false|true|' modules/libpref/init/StaticPrefList.yaml
 
 # Branding
 rm mobile/android/branding/{official,unofficial,beta,nightly} -rf
@@ -376,6 +389,10 @@ cp $DATA/android/mobile.ico mobile/android/app/
 #cp $DATA/android/images/* mobile/android/themes/core/images/
 cp -a $DATA/android/res/main/* mobile/android/geckoview/src/main/res
 
+#Fixes by patch on source.
+##Firefox v100, based on parabola 9004-FSDG-misc.patch
+patch -p1 < $DATA/patch_changes/Remove_moreFromMozilla_Focus_and_Klar.patch
+
 # Postinst script to manage profile migration and system links
 echo '