helpers/make-thunderbird

 #!/bin/bash
 #
+#    Copyright (C) 2022  Luis Guzmán <ark@switnet.org>
 #    Copyright (C) 2020  Ruben Rodriguez <ruben@trisquel.info>
 #    Copyright (C) 2019  David Trudgian <dave@trudgian.net>
 #
@@ -18,7 +19,7 @@
 #    Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301 USA
 #
 
-VERSION=13
+VERSION=17
 
 . ./config
 
@@ -117,7 +118,10 @@ EOF
 #cp toolkit/components/telemetry/healthreport-prefs.js mobile/android/chrome/content/healthreport-prefs.js
 # Browser legal page
 sed 's%https://www.mozilla.org/legal/privacy/%https://trisquel.info/legal%' -i ./browser/app/profile/firefox.js ./toolkit/content/aboutRights.xhtml
-sed -i 's|https://www.mozilla.org/thunderbird/legal/privacy/|https://trisquel.info/legal|' comm/mail/components/newmailaccount/content/accountProvisioner.js comm/mail/app/profile/all-thunderbird.js
+sed -i 's|https://www.mozilla.org/thunderbird/legal/privacy/|https://trisquel.info/legal|' comm/mail/app/profile/all-thunderbird.js
+sed -i 's|https://www.mozilla.org/en-US/privacy/thunderbird/|https://trisquel.info/legal|' comm/mail/app/profile/all-thunderbird.js
+sed -i 's|https://www.mozilla.org/privacy/|https://trisquel.info/legal|' comm/mail/components/newmailaccount/content/accountProvisioner.xhtml
+grep -rl https://www.mozilla.org/privacy/thunderbird/ | xargs sed -i 's|https://www.mozilla.org/privacy/thunderbird/|https://trisquel.info/legal|g'
 # Org branding
 sed 's/com.ubuntu/org.trisquel/' -i debian/config/mozconfig.in
 # Disable DRM support, armhf has no such option.
@@ -128,7 +132,6 @@ ac_add_options --disable-eme
 %%endif
 ARCH
 ########################################################
-
 sed '/^MOZ_PKG_NAME/s/.*/MOZ_PKG_NAME=icedove/' -i debian/build/config.mk
 
 cat << EOF >> debian/build/config.mk
@@ -167,8 +170,12 @@ find . -type f -not -iregex '.*changelog.*' -not -iregex '.*copyright.*' -not -i
 
 sed 's|https://www.icedove.net/features/|https://trisquel.info/wiki/icedove|' -i comm/mail/base/content/utilityOverlay.js
 sed 's|https://www.icedove.net/get-involved/|https://trisquel.info/wiki/|' -i comm/mail/base/content/utilityOverlay.js
-sed 's|https://donate.mozilla.org/.*help-menu|https://trisquel.info/donate/|' -i comm/mail/base/content/utilityOverlay.js
-sed 's|https://give.icedove.net/.*|https://trisquel.info/donate/"|' -i comm/mailnews/base/content/msgAccountCentral.xhtml
+sed 's|https://give.icedove.net/.*"|https://trisquel.info/donate/"|' -i comm/mail/base/content/utilityOverlay.js
+sed 's|https://www.icedove.net/.*/features/|https://trisquel.info/wiki/icedove|' -i comm/mailnews/base/content/msgAccountCentral.xhtml
+sed 's|https://give.icedove.net/.*"|https://trisquel.info/donate/"|' -i comm/mailnews/base/content/msgAccountCentral.xhtml
+sed 's|https://support.mozilla.org/products/icedove|https://trisquel.info/wiki/icedove|' -i comm/mailnews/base/content/msgAccountCentral.xhtml
+sed 's|https://www.icedove.net/.*/get-involved/|https://trisquel.info/wiki/|' -i comm/mailnews/base/content/msgAccountCentral.xhtml
+sed 's|https://developer.icedove.net/|https://gitlab.trisquel.org/trisquel|' -i comm/mailnews/base/content/msgAccountCentral.xhtml
 
 replace Daily Trisquel comm/mail/branding/
 sed '/.*<description.*communityExperimentalDesc/,/\/description/d' -i ./comm/mail/base/content/aboutDialog.xhtml
@@ -180,6 +187,10 @@ sed 's/Provides: mail-reader,/Provides: mail-reader, thunderbird,/' -i debian/co
 sed "s/Provides.*/Provides: icedove-locale-@LANGCODE@/" -i debian/control.langpacks
 
 #Manual fixes to allow rebranding processed through hash checks and other changes.
+# Restore wrong replacement module name.
+grep -rl IcedoveProfileImporter.jsm | xargs sed -i 's|IcedoveProfileImporter.jsm|ThunderbirdProfileImporter.jsm|g'
+grep -rl IcedoveImport.jsm | xargs sed -i 's|IcedoveImport.jsm|ThunderbirdImport.jsm|g'
+grep -rl IcedoveProfileMigrator.jsm | xargs sed -i 's|IcedoveProfileMigrator.jsm|ThunderbirdProfileMigrator.jsm|g'
 #Fix 1 character bigger than allowed yml line (81 > 80)
 sed -i 's|Abrowser is not running.  It|Abrowser is not running. It|' toolkit/mozapps/update/pings.yaml
 
@@ -188,19 +199,19 @@ sed -i \
 third_party/dump_syms/vendor/regex/.cargo-checksum.json
 
 sed -i \
-'s|af4ff013841da9bf00cf88ad3ae468f30c122b730ed37327d965d11b8e367459|a68c2df0024ff65f43efd5f5a48fe39a35d859ac459cce8695e4b09120cc1f35|' \
+'s|bcb4b59cfc5f48fbaba954b8ae4daa9eaecf9044afc89208a78a7e995c321b81|5f33885b0cc238abc78622e32bd56e6c550d90f1de419d5d7768c8da7f53f039|' \
 third_party/dump_syms/vendor/encoding_rs/.cargo-checksum.json
 
 sed -i \
-'s|eb9f00340e0f6ba3d01f4770356062ab2142e1646c7c2556c9b35348f90980f0|af2b7e2811c649615d4726c7dc4fd9b2e8aa35c229e8225c930e8e7d8e003fa2|' \
+'s|a64116a6d46ab30ce91deabdb4c5388f03be632326e8a00110bfb0c598474a0a|5cd020aae75fdcd21aca4799d302f1720075c9dd6fb12ba19e6403a8012970b2|' \
 third_party/dump_syms/vendor/encoding_rs/.cargo-checksum.json
 
 sed -i \
-'s|04fc9b146177e7bf615156b8570fa0f97b89f68a2c02b946778711728b81e81f|16221c6c37245cd078ffdb1bd314e45334ddf60098742fc38b821e733fc4c5ca|' \
+'s|fe4881780e8cd0181748a891102b2dd54c2060546d7648ec1b6435529bd0dcc2|40588888ea0d4b7e86bc1e184be9e667bd1b0480fe00406ebb828821f5080a07|' \
 third_party/dump_syms/vendor/h2/.cargo-checksum.json
 
 sed -i \
-'s|caabd31cbcb00172bb7f31a1398dbed27a3bf36b01d69729c3d6fbd9a4008e05|080cba5e2b65e6542f364aa4703a179c58b20e41489573d941ef68b9619a2734|' \
+'s|6f3be57dae549574569b812acab6213f4136ba9c4ad60a21848043d26e6aaece|07f28083516d3660082d9c46fe2349a1099720b4f30cc7431f1cc267690d6505|' \
 third_party/dump_syms/vendor/httparse/.cargo-checksum.json
 
 sed -i \
@@ -210,8 +221,30 @@ third_party/dump_syms/vendor/openssl/.cargo-checksum.json
 sed -i \
 's|82c82f8ef547f67f3f449a0b240e2df4ed538d976a379b07e53d5ce7cde2438c|01baa5e11aa7ec74360151d379ba8b5607abcd34132e69568c816c0116958a26|' \
 third_party/dump_syms/vendor/symbolic-minidump/.cargo-checksum.json
+
+sed -i \
+'s|6018b016930c86610953a88ca35e8cebffd2dbbd92f11502c2464ab4281e7bbc|04c8d6c8a498abac61ffb2725484c2732328270e25a7e3ed452657962ce76f4e|' \
+third_party/dump_syms/vendor/bitvec/.cargo-checksum.json
 #EO Manual fixing.
 
+# about: page mods, like rights.
+## Hide extra links in about box
+find -wholename '*/brand.dtd' |xargs /bin/sed 's/trademarkInfo.part1.*/trademarkInfo.part1 "">/' -i
+
+for STRING in rights-intro-point-2 rights-intro-point-3 rights-intro-point-4 rights-intro-point-5 rights-intro-point-6 rights-webservices rights-safebrowsing
+do
+ find -name aboutRights.ftl | xargs sed -i "s/^$STRING.*/$STRING = /"
+done
+##Remove invalid policy for trisquel.
+find -name aboutRights.ftl | xargs sed -i '/rights-intro-point-5/,$d'
+find -name aboutRights.xhtml |xargs sed -i "/rights-intro-point-5/d"
+find -name aboutRights.xhtml |xargs sed -i "/rights-intro-point-6/d"
+find -name aboutRights-unbranded.xhtml |xargs sed -i "/rights-intro-point-5/d"
+
+sed -i 's/<a\ href\=\"http\:\/\/www.icedove.net\/\">Icedove\ Project<\/a>/<a\ href\=\"http\:\/\/www.trisquel.info\/\"\>Trisquel\ Project<\/a>/g' \
+    comm/mail/base/content/overrides/app-license.html
+#EO about: mods.
+
 #Debbuging tools
 sed -i 's|this-firefox|this-abrowser|g' devtools/client/framework/test/browser_about-devtools-toolbox_reload.js
 #Rebrand debug tools
@@ -220,8 +253,7 @@ devtools/client/themes/images/aboutdebugging-fenix-nightly.svg \
 devtools/client/themes/images/aboutdebugging-firefox-aurora.svg \
 devtools/client/themes/images/aboutdebugging-firefox-beta.svg \
 devtools/client/themes/images/aboutdebugging-firefox-nightly.svg \
-devtools/client/themes/images/aboutdebugging-firefox-release.svg \
-devtools/startup/aboutdevtools/images/dev-edition-logo.svg" | xargs -n1 cp $DATA/debug_brand/debuglogo.svg
+devtools/client/themes/images/aboutdebugging-firefox-release.svg" | xargs -n1 cp $DATA/debug_brand/debuglogo.svg
 cp $DATA/debug_brand/debuglogo_gray.svg devtools/client/themes/images/aboutdebugging-firefox-logo.svg
 cp $DATA/debug_brand/about-logo.svg comm/mail/branding/icedove/TB-symbolic.svg
 cp $DATA/debug_brand/about-logo.svg comm/mail/themes/shared/mail/icons/aboutdebugging-logo.svg

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=26
 EXTERNAL='deb-src http://archive.ubuntu.com/ubuntu impish main universe'
 #REPOKEY="871920D1991BC93C"
 
@@ -43,7 +43,8 @@ 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(\n                ['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
 
 # Kill at-spi after maybe-ubiquity, allows a11y to work on live desktop installer
@@ -90,20 +91,25 @@ 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 '//' /usr/share/python-apt/templates/Trisquel.mirrors | sed 's|/$||')
+    do
+        echo Testing \$i
+        TIME=\$(date +%s%N)
+        wget --no-check-certificate -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
+
+echo "Selected mirror: \$FASTEST"
 
 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-ubuntu-gnome-meta

+#!/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=1
+. ./config
+
+# Rebrand and tweak packages
+sed -i '/This package/s|Ubuntu desktop system|Trisquel GNOME desktop package|' debian/control
+sed -i 's|Ubuntu|Trisquel|g' debian/control
+sed -i '/^Package:/s|ubuntu-gnome-desktop|trisquel-gnome-desktop|' debian/control
+sed -i '/^Depends:/s|ubuntu-desktop|trisquel-gnome|' debian/control
+sed -i 's|pure GNOME experience until|pure (Trisquel) GNOME experience.|' debian/control
+sed -i '/Before.*17.10/,/\ ./d' debian/control
+sed -i '/after the 17.04 release/,/not be removed./d' debian/control
+
+# Remove deprecated packages
+grep -l ubufox desktop*| xargs sed -i '/ubufox/d'
+grep -l app-install-data-partner desktop*| xargs sed -i '/app-install-data-partner/d'
+grep -l ubuntu-drivers-common desktop*| xargs sed -i '/ubuntu-drivers-common/d'
+grep -l snapd desktop*| xargs sed -i '/snapd/d'
+replace 'ubuntu-release-upgrader-gtk' 'trisquel-release-upgrader-gtk'
+replace 'fonts-ubuntu' 'fonts-trisquel'
+
+changelog "Rebrand for trisquel."
+compile

helpers/make-ubuntu-release-upgrader

 #!/bin/sh
 #
-#    Copyright (C) 2008-2022  Ruben Rodriguez <ruben@trisquel.info>
+#    Copyright (C) 2008-2023  Ruben Rodriguez <ruben@trisquel.info>
 #    Copyright (C)      2014  Santiago Rodriguez <santi@trisquel.info>
 #    Copyright (C)      2019  Mason Hock <mason@masonhock.com>
 #
@@ -24,7 +24,7 @@
 # Also, don't forget to update the meta-release files at archive and packages.t.i
 # The "obsoletes" list from ubuntu has been removed
 
-VERSION=13
+VERSION=14
 
 . ./config
 
@@ -216,6 +216,8 @@ EOF
 rm data/mirrors.cfg
 #https://mirmon.trisquel.org/conf.txt
 cat << EOF > data/mirrors.cfg
+https://archive.trisquel.info/trisquel/
+https://archive.trisquel.org/trisquel/
 https://mirror.fsf.org/trisquel/
 https://mirror.cedia.org.ec/trisquel.packages/
 https://mirrors.ustc.edu.cn/trisquel/
@@ -231,11 +233,11 @@ https://mirrors.nju.edu.cn/trisquel/
 https://mirror.math.princeton.edu/pub/trisquel-packages/
 https://mirror.operationtulip.com/trisquel/packages/
 https://mirrors.dotsrc.org/trisquel/
-https://linkwithlinux.pw/trisquel-packages/
 EOF
 
 replace changelogs.ubuntu.com packages.trisquel.org .
 
+rpl ubuntu-archive-keyring.gpg trisquel-archive-keyring.gpg . -R
 rpl 11\.04 5\.0 DistUpgrade/*.ui
 rpl 11\.04 5\.0 po/* -R
 rpl 11\.10 5\.5 DistUpgrade/*.ui
@@ -288,7 +290,8 @@ mv kubuntu-devel-release-upgrade triskel-devel-release-upgrade
 mv tests/test-data-cdrom/ubuntu tests/test-data-cdrom/trisquel
 replace old-releases.ubuntu.com oldarchive.trisquel.org
 
-rpl "edubuntu" "trisquel-edu" . -R
+rpl "edubuntu" "trisquel-sugar" . -R
+rpl "xubuntu" "trisquel-mini" . -R
 rpl "kubuntu" "triskel" . -R
 rpl "Kubuntu" "Triskel" . -R
 rpl " Ubuntu " " Trisquel " . -R

helpers/make-unattended-upgrades

 #!/bin/sh
 #
-#    Copyright (C) 2008-2018  Ruben Rodriguez <ruben@trisquel.info>
+#    Copyright (C) 2008-2022  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,15 +18,19 @@
 #    Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301 USA
 #
 
-VERSION=2
+VERSION=4
 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
+# Disable by default
+sed '/Template: unattended-upgrades.enable_auto_updates/,/Default/s/Default: true/Default: false/' -i ./debian/templates
+
+rm test/test_remove_unused.py
 
 changelog "Compiled for Trisquel"
 

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=1
+EXTERNAL='deb-src http://archive.ubuntu.com/ubuntu impish main universe'
+REPOKEY="871920D1991BC93C"
+BACKPORT=true
+BUILD_UNTIL=10.0
+
+. ./config
+
+#Prevent advertise non-debianized packaged versions.
+replace 'https://vokoscreen.volkoh.de/3.0/version/linux/VERSION' ''
+
+#Remove one sided logo.
+cp src/pictures/space.png src/pictures/linux.png
+
+
+changelog "Backported from Impish"
+
+compile
+

helpers/make-youtube-dl

@@ -18,13 +18,20 @@
 #    Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301 USA
 #
 
-VERSION=2
-EXTERNAL='deb-src http://ftp.debian.org/debian testing main'
+VERSION=3
+EXTERNAL='deb-src http://ftp.debian.org/debian bookworm main'
 REPOKEY=648ACFD622F3D138
 
 . ./config
 
 sed -i '/debhelper/s|13|12|' debian/control
+SUPPORTED_SITES="https://ytdl-org.github.io/youtube-dl/supportedsites.html"
+LAST_SUPPORTED="$(tail -n1 debian/control|sed 's|^ ||')"
+
+sed -i "/Currently supported/s|are:|are at:|" debian/control
+/bin/sed -n -i '/Currently supported/{p;:a;N;/'$LAST_SUPPORTED'/!ba;s| .*| '$SUPPORTED_SITES'\n|};p' -i debian/control
+# Make sure it fails if we don't get the wanted output.
+[ "$SUPPORTED_SITES" != "$(tail -n2 debian/control|awk NF|sed 's|^ ||')" ] && echo -e ">>>Site replacement needs fixing, exiting...<<<\n" && exit
 
 changelog "Imported into Trisquel"
 

helpers/make-zimlib

@@ -18,13 +18,13 @@
 #
 
 VERSION=2
-EXTERNAL='deb-src http://ftp.debian.org/debian stable main'
+EXTERNAL='deb-src http://ftp.debian.org/debian bullseye main'
 REPOKEY=04EE7237B7D453EC
 BACKPORT=true
 BUILD_UNTIL=10.0
 
 . ./config
 
-changelog "Backported from debian stable as a dependency for kiwix"
+changelog "Backported from debian bullseye as a dependency for kiwix"
 
 compile