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-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

@@ -18,7 +18,7 @@
 #    Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301 USA
 #
 
-VERSION=86
+VERSION=88
 
 . ./config
 
@@ -282,7 +282,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 +358,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 +368,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 '
 

helpers/make-greybird-gtk-theme

@@ -16,7 +16,7 @@
 #    along with this program; if not, write to the Free Software
 #    Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301 USA
 
-VERSION=7
+VERSION=8
 EXTERNAL='deb-src http://archive.ubuntu.com/ubuntu impish main universe'
 
 . ./config

helpers/make-linux

 #!/bin/sh
 #
 #    Copyright (C) 2021 Luis Guzman <ark@switnet.org>
-#    Copyright (C) 2008-2020  Ruben Rodriguez <ruben@trisquel.info>
+#    Copyright (C) 2008-2022  Ruben Rodriguez <ruben@trisquel.info>
 #    Copyright (C) 2019 David Trudgian <dave@trudgian.net>
 #
 #    This program is free software; you can redistribute it and/or modify
@@ -19,7 +19,7 @@
 #    Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301 USA
 #
 
-VERSION=10
+VERSION=11
 
 . ./config
 
@@ -108,6 +108,10 @@ sed 's/.unsigned//' -i debian/scripts/control-create
 line=$(grep -n ')-Ubuntu' debian/rules.d/0-common-vars.mk|cut -d: -f1)
 sed $(expr $line - 1 ),$(expr $line + 1 )d debian/rules.d/0-common-vars.mk -i
 sed s/family=ubuntu/family=trisquel/ -i debian/rules.d/0-common-vars.mk
+cat << EOF > debian.master/etc/kernelconfig
+archs="amd64 i386 armhf arm64 ppc64el"
+family='trisquel'
+EOF
 
 rename s/ubuntu/trisquel/ debian.*/config/config.common.ubuntu
 

helpers/make-linux-hwe-5.13

 #!/bin/sh
 #
 #    Copyright (C) 2008-2022  Ruben Rodriguez <ruben@trisquel.info>
-#    Copyright (C) 2021 Luis Guzman <ark@switnet.org>
+#    Copyright (C) 2022 Luis Guzman <ark@switnet.org>
 #    Copyright (C) 2021 Pablo Correa Gómez <ablocorrea@hotmail.com>
 #    Copyright (C) 2019 David Trudgian <dave@trudgian.net>
 #
@@ -20,7 +20,7 @@
 #    Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301 USA
 #
 
-VERSION=3
+VERSION=4
 
 . ./config
 

helpers/make-network-manager-applet

+#!/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=0
+
+. ./config
+
+#Remove gnome-shell and notification-daemon dependency
+sed -i 's/gnome-shell <!s390x> | //g' debian/control
+sed -i 's/notification-daemon <!s390x>/policykit-1-gnome <!s390x>/g' debian/control
+
+changelog "Remove gnome-shell and notification-daemon dependency from network-manager-gnome"
+
+compile

helpers/make-python-apt

 #!/bin/sh
 #
-#    Copyright (C) 2008-2019 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,47 +17,46 @@
 #    Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301 USA
 #
 
-VERSION=3
+VERSION=4
 COMPONENT=main
 
 . ./config
 
 cat << EOF > data/templates/Trisquel.mirrors
 #LOC:CA
-https://mirror.freemirror.org/trisquel-packages/
-#LOC:FR
-https://archive.trisquel.info/trisquel/
-#LOC:US
-https://mirror.fsf.org/trisquel/
-http://mirrors.knoesis.org/trisquel/packages
-https://mirrors.ocf.berkeley.edu/trisquel/
-#LOC:IN
-http://in.archive.trisquel.info/trisquel/
-#LOC:EC
-https://mirror.cedia.org.ec/trisquel.packages
-#LOC:RO
-http://mirrors.serverhost.ro/trisquel/packages
+https://mirror.csclub.uwaterloo.ca/trisquel/packages/
 #LOC:CN
 https://mirrors.ustc.edu.cn/trisquel
+https://mirrors.nju.edu.cn/trisquel/
+#LOC:DE
+https://mirrors.dotsrc.org/trisquel/
+#LOC:EC
+https://mirror.cedia.org.ec/trisquel.packages
+#LOC:HU
+https://quantum-mirror.hu/mirrors/pub/trisquel/packages/
 #LOC:ES
 https://ftp.caliu.cat/pub/distribucions/trisquel/packages
 https://mirror.librelabucm.org/trisquel/
-#LOC:TW
-https://ftp.yzu.edu.tw/Linux/trisquel.packages/
 #LOC:SE
 https://mirror.linux.pizza/trisquel/packages/
 https://ftp.acc.umu.se/mirror/trisquel/packages/
-#LOC:HU
-https://quantum-mirror.hu/mirrors/pub/trisquel/packages/
+https://ftpmirror1.infania.net/mirror/trisquel/packages/
+https://mirror.operationtulip.com/trisquel/packages/
+#LOC:US
+https://archive.trisquel.info/trisquel/
+https://archive.trisquel.org/trisquel/
+https://mirror.fsf.org/trisquel/
+https://mirrors.ocf.berkeley.edu/trisquel/
+https://mirror.math.princeton.edu/pub/trisquel-packages/
 EOF
 
 cat << EOF > data/templates/Trisquel.info.in
-_ChangelogURI: http://packages.trisquel.info/changelogs/pool/%s/%s/%s/%s_%s/changelog
+_ChangelogURI: https://packages.trisquel.org/changelogs/pool/%s/%s/%s/%s_%s/changelog
 
 Suite: $CODENAME
 RepositoryType: deb
-BaseURI: https://archive.trisquel.info/trisquel/
-MatchURI: archive.trisquel.info/trisquel
+BaseURI: https://archive.trisquel.org/trisquel/
+MatchURI: archive.trisquel.org/trisquel
 MirrorsFile: Trisquel.mirrors
 _Description: Trisquel $REVISION '$CODENAME'
 Component: main
@@ -67,8 +66,8 @@ _CompDescriptionLong: Officially supported
 Suite: $CODENAME-security
 ParentSuite: $CODENAME
 RepositoryType: deb
-BaseURI: https://archive.trisquel.info/trisquel/
-MatchURI: archive.trisquel.info/trisquel
+BaseURI: https://archive.trisquel.org/trisquel/
+MatchURI: archive.trisquel.org/trisquel
 _Description: Important security updates
 
 Suite: $CODENAME-updates

helpers/make-thunderbird

@@ -18,7 +18,7 @@
 #    Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301 USA
 #
 
-VERSION=13
+VERSION=14
 
 . ./config
 

helpers/make-ubiquity

 #!/bin/sh
 #
-#    Copyright (C) 2011-2021  Ruben Rodriguez <ruben@trisquel.info>
+#    Copyright (C) 2011-2022  Ruben Rodriguez <ruben@trisquel.info>
 #    Copyright (C)      2019  Mason Hock <mason@masonhock.com>
 #
 #    This program is free software; you can redistribute it and/or modify
@@ -18,7 +18,7 @@
 #    Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301 USA
 #
 
-VERSION=23
+VERSION=25
 EXTERNAL='deb-src http://archive.ubuntu.com/ubuntu impish main universe'
 #REPOKEY="871920D1991BC93C"
 
@@ -43,8 +43,11 @@ sed '/universe multiverse/d' -i bin/oem-config-remaster
 # Use standard monospaced font for console
 sed 's/Ubuntu Mono/Monospace Regular/' -i ubiquity/frontend/gtk_ui.py
 
-# Fixes issues starting orca
+# Start a11y-profile-manager-indicator only if not running already && Fixes issues starting orca
+sed "/if osextras.find_on_path..a11y-profile-manager-indicator/s/:/ and (subprocess.run(['pgrep', '-f', 'a11y-profile-manager-indicator'], capture_output=True).returncode == 0):/" -i ubiquity/frontend/gtk_ui.py
 sed "/Popen/s/'orca'/'orca', '--replace'/" -i ubiquity/frontend/gtk_ui.py
+#Fix style patch
+patch -p1 < $DATA/a11y-profile-manager-indicator__orca.patch
 
 # Kill at-spi after maybe-ubiquity, allows a11y to work on live desktop installer
 sed "/signal.alarm(0)/a\ \ \ \ \ \ \ \ subprocess.call\(['pkill', '-9', 'at-spi'], stdin=null, stdout=logfile, stderr=logfile)" -i bin/ubiquity-dm
@@ -90,20 +93,23 @@ file="\$1"
 FASTEST=https://archive.trisquel.org/trisquel/
 SPEED=1000000000000
 
-for i in \$(grep 'tp:' /usr/share/python-apt/templates/Trisquel.mirrors)
-do
-    echo Testing \$i
-    TIME=\$(date +%s%N)
-    wget -t 1 -T 5 --max-redirect=0 -o /dev/null -O /dev/null \$i/speedtest || continue
-    TIME2=\$(date +%s%N)
-    ELAPSED=\$(expr \$TIME2 - \$TIME)
-    echo Time: \$ELAPSED
-    if [ \$ELAPSED -lt \$SPEED ]
-    then
-        FASTEST=\$i
-        SPEED=\$ELAPSED
-    fi
-done
+if nm-online -xq
+then
+    for i in \$(grep 'tp:' /usr/share/python-apt/templates/Trisquel.mirrors)
+    do
+        echo Testing \$i
+        TIME=\$(date +%s%N)
+        wget -t 1 -T 5 --max-redirect=0 -o /dev/null -O /dev/null \$i/speedtest || continue
+        TIME2=\$(date +%s%N)
+        ELAPSED=\$(expr \$TIME2 - \$TIME)
+        echo Time: \$ELAPSED
+        if [ \$ELAPSED -lt \$SPEED ]
+        then
+            FASTEST=\$i
+            SPEED=\$ELAPSED
+        fi
+    done
+fi
 
 MIRROR=\$FASTEST
 RELEASE=\$(lsb_release -c | cut -f 2)
@@ -254,7 +260,7 @@ then
 fi
 
 # Hacks for accessibility
-if [ \$(gsettings get com.canonical.a11y-profile-manager active-profile) == "'blindness'" ]
+if [ \$(gsettings get org.mate.interface accessibility) = "true" ]
 then
   echo "Accessibility profile set to 'blindness', enabling screen reader by default in target system"
   echo "[org.mate.applications-at]

helpers/make-unattended-upgrades

 #!/bin/sh
 #
 #    Copyright (C) 2008-2018  Ruben Rodriguez <ruben@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
@@ -17,16 +18,20 @@
 #    Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301 USA
 #
 
-VERSION=2
+VERSION=3
 COMPONENT=main
 
 . ./config
 
-cp data/50unattended-upgrades.Ubuntu data/50unattended-upgrades.Trisquel
+sed -i '/ESM/d' data/50unattended-upgrades.Ubuntu
+mv data/50unattended-upgrades.Ubuntu data/50unattended-upgrades.Trisquel
+echo "0498b3cb348c43d20d369a7be431ea14" >> data/50unattended-upgrades.md5sum
 
 # Prevent automated connections
 sed '/Update-Package-Lists/s/1/0/' -i data/20auto-upgrades
 
+rm test/test_remove_unused.py
+
 changelog "Compiled for Trisquel"
 
 compile

helpers/make-update-notifier

 #!/bin/sh
 #
-#    Copyright (C) 2012-2018 Ruben Rodriguez <ruben@trisquel.info>
+#    Copyright (C) 2012-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,14 +17,21 @@
 #    Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301 USA
 #
 
-VERSION=3
+VERSION=5
 COMPONENT=main
 
 . ./config
 
+#Use custom apt-check to fix motd update notification by striping esm stuff.
+cp $DATA/apt_check.py data/apt_check.py
+sed -i '/test_motd.py/d' debian/rules
+sed -i '/test_package-data-downloader.py/d' debian/rules
+
 rm debian/update-notifier-hp-firmware.conf
 sed '/hp-firmware/d' -i debian/update-notifier.install
+
 sed -i "/ubuntu-drivers-common/d" debian/control
+echo "exit 0" > data/list-oem-metapackages
 
 # Prevent automated connections
 sed '/Update-Package-Lists/s/1/0/' -i debian/10periodic

helpers/make-vokoscreen

+#!/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"
+BACKPORT=true
+BUILD_UNTIL=10.0
+
+. ./config
+
+changelog "Backported from Impish"
+
+compile
+