helpers/DATA/base-installer/kernel_update_list.patch

+--- source/library.sh	2022-07-14 15:09:08.482389439 -0500
++++ source/library.sh_upd	2022-07-14 15:19:40.056073944 -0500
+@@ -345,9 +345,15 @@
+ 
+ kernel_update_list () {
+ 	# Use 'uniq' to avoid listing the same kernel more then once
+-	chroot /target apt-cache search "^(kernel|$KERNEL_NAME)-image" | \
+-	cut -d" " -f1 | grep -v "linux-image-2.6" | uniq > "$KERNEL_LIST.unfiltered"
+-	kernels=`sort -r "$KERNEL_LIST.unfiltered" | tr '\n' ' ' | sed -e 's/ $//'`
++	(set +e;
++	# Hack to get the metapackages in the right order; should be
++	# replaced by something better at some point.
++	chroot /target apt-cache search ^linux- | grep '^linux-\(amd64\|686\|k7\|generic\|lowlatency\|server\|virtual\|preempt\|rt\|xen\|oem-20.04\|power\|cell\|omap\|omap4\|keystone\)';
++	chroot /target apt-cache search ^linux-image- | grep -v '^linux-image-[2-9]\.';
++	chroot /target apt-cache search ^kfreebsd-image;
++	chroot /target apt-cache search ^gnumach-image) | \
++	cut -d" " -f1 | uniq > "$KERNEL_LIST.unfiltered"
++	kernels=`< "$KERNEL_LIST.unfiltered" tr '\n' ' ' | sed -e 's/ $//'`
+ 	for candidate in $kernels; do
+ 		if [ -n "$FLAVOUR" ]; then
+ 			if arch_check_usable_kernel "$candidate" "$FLAVOUR"; then

helpers/DATA/bleachbit/bleachbit-FSDG.patch

@@ -66,25 +66,25 @@ diff -ru a/doc/cleaner_markup_language.xsd b/doc/cleaner_markup_language.xsd
                              <xs:enumeration value="delete"/>
                              <xs:enumeration value="dnf.autoremove"/>
                              <xs:enumeration value="dnf.clean_all"/>
-diff -ru a/PKG-INFO b/PKG-INFO
---- a/PKG-INFO	2020-03-22 21:42:05.000000000 +0100
-+++ b/PKG-INFO	2021-06-25 23:06:33.117952276 +0200
+diff -ru source/PKG-INFO source_fix/PKG-INFO
+--- a/PKG-INFO	2021-11-13 15:05:48.000000000 -0600
++++ b/PKG-INFO	2022-04-10 16:28:47.450145458 -0500
 @@ -7,5 +7,5 @@
  Author-email: andrew@bleachbit.org
  License: GPLv3
  Download-URL: https://www.bleachbit.org/download
--Description: BleachBit frees space and maintains privacy by quickly wiping files you don't need and didn't know you had. Supported applications include Firefox, Flash, Internet Explorer, Java, Opera, Safari, GNOME, and many others.
-+Description: BleachBit frees space and maintains privacy by quickly wiping files you don't need and didn't know you had. Supported applications include Firefox, LibreOffice, Bash, Java, GNOME, and many others.
+-Description: BleachBit frees space and maintains privacy by quickly wiping files you don't need and didn't know you had. Supported applications include Edge, Firefox, Google Chrome, VLC, and many others.
++Description: BleachBit frees space and maintains privacy by quickly wiping files you don't need and didn't know you had. Supported applications include Firefox, VLC, and many others.
  Platform: Linux and Windows; Python v2.6 and 2.7; GTK v3.12+
-diff -ru a/setup.py b/setup.py
---- a/setup.py	2020-03-22 21:42:04.000000000 +0100
-+++ b/setup.py	2021-06-25 23:06:33.117952276 +0200
-@@ -253,7 +253,7 @@
-     setup(name='bleachbit',
-           version=bleachbit.APP_VERSION,
-           description="BleachBit - Free space and maintain privacy",
--          long_description="BleachBit frees space and maintains privacy by quickly wiping files you don't need and didn't know you had. Supported applications include Firefox, Flash, Internet Explorer, Java, Opera, Safari, GNOME, and many others.",
-+          long_description="BleachBit frees space and maintains privacy by quickly wiping files you don't need and didn't know you had. Supported applications include Firefox, Java, GNOME, and many others.",
-           author="Andrew Ziem",
-           author_email="andrew@bleachbit.org",
-           download_url="https://www.bleachbit.org/download",
+diff -ru source/setup.py source_fix/setup.py
+--- a/setup.py	2021-11-13 15:05:47.000000000 -0600
++++ b/setup.py	2022-04-10 16:34:51.418739031 -0500
+@@ -47,7 +47,7 @@
+ import bleachbit.FileUtilities
+ 
+ APP_NAME = "BleachBit - Free space and maintain privacy"
+-APP_DESCRIPTION = "BleachBit frees space and maintains privacy by quickly wiping files you don't need and didn't know you had. Supported applications include Edge, Firefox, Google Chrome, VLC, and many others."
++APP_DESCRIPTION = "BleachBit frees space and maintains privacy by quickly wiping files you don't need and didn't know you had. Supported applications include Firefox, VLC, and many others."
+ 
+ #
+ # begin win32com.shell workaround for py2exe

helpers/DATA/casper/set_liveuser_uid_1000.patch

+diff --git a/bin/casper-snapshot b/bin/casper-snapshot
+index ab075292..33243f63 100755
+--- a/bin/casper-snapshot
++++ b/bin/casper-snapshot
+@@ -33,7 +33,7 @@ VERSION=0.0.1
+ if [ -e /etc/casper.conf ]; then
+ 	. /etc/casper.conf
+ else
+-	USERNAME=$(cat /etc/passwd | grep "999" | cut -f1 -d ':')
++	USERNAME=$(cat /etc/passwd | grep "1000" | cut -f1 -d ':')
+ 	HOSTNAME=$(hostname)
+ 	BUILD_SYSTEM="Debian"
+ fi
+diff --git a/scripts/casper-bottom/15autologin b/scripts/casper-bottom/15autologin
+index d6c75e66..c80e2058 100755
+--- a/scripts/casper-bottom/15autologin
++++ b/scripts/casper-bottom/15autologin
+@@ -90,9 +90,6 @@ if [ -f /root/usr/bin/sddm ]; then
+         sddm_session=QLubuntu.desktop
+     fi
+     cat >>/root/etc/sddm.conf <<EOF
+-[Users]
+-MinimumUid=999
+-
+ [Autologin]
+ User=$USERNAME
+ Session=$sddm_session
+diff --git a/scripts/casper-bottom/25adduser b/scripts/casper-bottom/25adduser
+index 8320e710..efbf5677 100755
+--- a/scripts/casper-bottom/25adduser
++++ b/scripts/casper-bottom/25adduser
+@@ -57,7 +57,8 @@ db_set passwd/root-password-crypted '*'
+ db_set passwd/user-password-crypted U6aMy0wojraho
+ db_set passwd/user-fullname "$USERFULLNAME"
+ db_set passwd/username "$USERNAME"
+-db_set passwd/user-uid 999
++# Per LP: #2004092, systemd uses 995-999
++db_set passwd/user-uid 1000
+ 
+ chroot /root /usr/lib/user-setup/user-setup-apply > /dev/null
+ if [ ! -f /root/usr/bin/sddm ]; then
+@@ -93,11 +94,6 @@ for file in /usr/share/applications/ubiquity.desktop /usr/share/applications/kde
+     fi
+ done
+ 
+-# GDM
+-if [ -d /root/etc/gdm3 ]; then
+-    sed -i '/^[UG]ID_MIN/s/\<1000$/ 999/' /root/etc/login.defs
+-fi
+-
+ # Kubuntu
+ if [ -f "/root/usr/bin/plasma-desktop" ]; then
+     if [ -f "/root/usr/share/kde4/apps/khelpcenter/plugins/kubuntu/a_welcome.desktop" ]; then

helpers/DATA/casper/set_trisquel_iso_suggestion.patch

+--- a/scripts/casper    2023-02-13 23:53:18.908768968 -0600
++++ b/scripts/casper    2023-02-21 03:28:55.176581755 -0600
+@@ -376,18 +376,18 @@
+     # maybe make livecd-rootfs embed something in the casper initrd?
+     case $PRETTY_NAME in
+         *development*)
+-            server_url=http://cdimage.ubuntu.com/ubuntu-server/daily-live/current/$UBUNTU_CODENAME-live-server-$DPKG_ARCH.iso
+-            desktop_url=http://cdimage.ubuntu.com/daily-live/current/$UBUNTU_CODENAME-desktop-$DPKG_ARCH.iso
++            server_url=""
++            desktop_url=""
+             ;;
+         *)
+             case $DPKG_ARCH in
+                 amd64)
+-                    server_url=https://releases.ubuntu.com/$UBUNTU_CODENAME/ubuntu-$VERSION_ID-live-server-$DPKG_ARCH.iso
+-                    desktop_url=https://releases.ubuntu.com/$UBUNTU_CODENAME/ubuntu-$VERSION_ID-desktop-$DPKG_ARCH.iso
++                    server_url=http://cdimage.trisquel.org/trisquel-images/${ID}-netinst_${VERSION_ID}_${DPKG_ARCH}.iso
++                    desktop_url=http://cdimage.trisquel.org/trisquel-images/${ID}_${VERSION_ID}_${DPKG_ARCH}.iso
+                     ;;
+                 *)
+-                    server_url=http://cdimage.ubuntu.com/releases/$UBUNTU_CODENAME/release/ubuntu-$VERSION_ID-live-server-$DPKG_ARCH.iso
+-                    desktop_url=http://cdimage.ubuntu.com/releases/$UBUNTU_CODENAME/release/ubuntu-$VERSION_ID-desktop-$DPKG_ARCH.iso
++                    server_url=http://cdimage.trisquel.org/trisquel-images/${ID}-netinst_${VERSION_ID}_${DPKG_ARCH}.iso
++                    desktop_url=http://cdimage.trisquel.org/trisquel-images/${ID}_${VERSION_ID}_${DPKG_ARCH}.iso
+                     ;;
+             esac
+             ;;

helpers/DATA/choose-mirror/rev_Makefile.patch

+diff -ru choose-mirror-2.78ubuntu7+10.0trisquel3/Makefile choose-mirror-2.111/Makefile
+--- choose-mirror-2.78ubuntu7+10.0trisquel3/Makefile	2021-02-26 15:22:56.000000000 -0600
++++ choose-mirror-2.111/Makefile	2021-06-04 12:09:55.000000000 -0500
+@@ -33,8 +33,8 @@
+ STRIP=strip
+ 
+ # Derivative distributions may want to change these.
+-#MIRRORLISTURL=https://gitlab.trisquel.org/trisquel/trisquel-packages/-/raw/master/extra/mirrors/Mirrors.masterlist
+-MASTERLIST=Mirrors.masterlist.trisquel
++MIRRORLISTURL=https://salsa.debian.org/mirror-team/masterlist/raw/master/Mirrors.masterlist
++MASTERLIST=Mirrors.masterlist
+ 
+ ifdef DEBUG
+ CFLAGS:=$(CFLAGS) -DDODEBUG

helpers/DATA/choose-mirror/rev_choose-mirror-bin.templates-in.patch

+diff -ru choose-mirror-2.78ubuntu7+10.0trisquel3/debian/choose-mirror-bin.templates-in choose-mirror-2.111/debian/choose-mirror-bin.templates-in
+--- choose-mirror-2.78ubuntu7+10.0trisquel3/debian/choose-mirror-bin.templates-in	2021-02-26 15:22:56.000000000 -0600
++++ choose-mirror-2.111/debian/choose-mirror-bin.templates-in	2021-02-08 06:52:03.000000000 -0600
+@@ -12,10 +12,14 @@
+ Type: select
+ Choices-C: ${CHOICES-C}
+ Choices: ${CHOICES}
+-Default: _CODENAME_
+-Description: Trisquel version to install:
+- In Trisquel, this question is never asked, and is only for preseeding.
+- Caveat emptor.
++# :sl2:
++_Description: Debian version to install:
++ Debian comes in several flavors. Stable is well-tested and rarely changes.
++ Unstable is untested and frequently changing. Testing is a middle ground,
++ that receives many of the new versions from unstable if they are not too
++ buggy.
++ .
++ Only flavors available on the selected mirror are listed.
+ 
+ Template: mirror/codename
+ Type: string

helpers/DATA/command-not-found/fix_test.patch

+diff -ru source/CommandNotFound/db/tests/test_db.py source/CommandNotFound/db/tests/test_db.py_fix
+--- source/CommandNotFound/db/tests/test_db.py	2021-12-08 04:53:19.000000000 -0600
++++ source/CommandNotFound/db/tests/test_db.py_fix	2022-08-26 01:26:06.984427040 -0500
+@@ -11,7 +11,7 @@
+ from CommandNotFound.db.creator import DbCreator
+ from CommandNotFound.db.db import SqliteDatabase
+ 
+-mock_commands_bionic_backports = """suite: bionic-backports
++mock_commands_etiona_backports = """suite: etiona-backports
+ component: main
+ arch: all
+ 
+@@ -20,7 +20,7 @@
+ commands: script,wall,new-stuff-only-in-backports
+ """
+ 
+-mock_commands_bionic_proposed = """suite: bionic-proposed
++mock_commands_etiona_proposed = """suite: etiona-proposed
+ component: main
+ arch: all
+ 
+@@ -29,7 +29,7 @@
+ commands: script,wall
+ """
+ 
+-mock_commands_bionic = """suite: bionic
++mock_commands_etiona = """suite: etiona
+ component: main
+ arch: all
+ 
+@@ -65,7 +65,7 @@
+ ignore-commands: ignore-me
+ """
+ 
+-mock_commands_bionic_universe = """suite: bionic
++mock_commands_etiona_universe = """suite: etiona
+ component: universe
+ arch: all
+ 
+@@ -84,7 +84,7 @@
+         shutil.rmtree(self.tmpdir)
+ 
+     def make_mock_commands_file(self, suite, content):
+-        path = os.path.join(self.tmpdir, "var", "lib", "apt", "lists", "archive.ubuntu.com_ubuntu_dists_%s_Commands-all" % suite)
++        path = os.path.join(self.tmpdir, "var", "lib", "apt", "lists", "archive.trisquel.org_trisquel_dists_%s_Commands-all" % suite)
+         try:
+             os.makedirs(os.path.dirname(path))
+         except OSError:
+@@ -95,7 +95,7 @@
+         
+     def test_create_trivial_db(self):
+         mock_commands_file = self.make_mock_commands_file(
+-            "bionic_main", mock_commands_bionic)
++            "etiona_main", mock_commands_etiona)
+         cre = DbCreator([mock_commands_file])
+         dbpath = os.path.join(self.tmpdir, "test.db")
+         cre.create(dbpath)
+@@ -108,9 +108,9 @@
+ 
+     def test_create_multiple_dbs(self):
+         mock_commands_1 = self.make_mock_commands_file(
+-            "bionic_main", mock_commands_bionic)
++            "etiona_main", mock_commands_etiona)
+         mock_commands_2 = self.make_mock_commands_file(
+-            "bionic-proposed_main", mock_commands_bionic_proposed)
++            "etiona-proposed_main", mock_commands_etiona_proposed)
+         cre = DbCreator([mock_commands_1, mock_commands_2])
+         dbpath = os.path.join(self.tmpdir, "test.db")
+         cre.create(dbpath)
+@@ -131,9 +131,9 @@
+ 
+     def test_create_backports_excluded_dbs(self):
+         mock_commands_1 = self.make_mock_commands_file(
+-            "bionic_main", mock_commands_bionic)
++            "etiona_main", mock_commands_etiona)
+         mock_commands_2 = self.make_mock_commands_file(
+-            "bionic-backports_main", mock_commands_bionic_backports)
++            "etiona-backports_main", mock_commands_etiona_backports)
+         cre = DbCreator([mock_commands_1, mock_commands_2])
+         dbpath = os.path.join(self.tmpdir, "test.db")
+         cre.create(dbpath)
+@@ -146,7 +146,7 @@
+ 
+     def test_create_no_versions_does_not_crash(self):
+         mock_commands = self.make_mock_commands_file(
+-            "bionic_main", mock_commands_bionic.replace("version: 1.0\n", ""))
++            "etiona_main", mock_commands_etiona.replace("version: 1.0\n", ""))
+         cre = DbCreator([mock_commands])
+         dbpath = os.path.join(self.tmpdir, "test.db")
+         cre.create(dbpath)
+@@ -157,11 +157,8 @@
+         
+     def test_create_priorities_work(self):
+         mock_commands_1 = self.make_mock_commands_file(
+-            "bionic_main", mock_commands_bionic)
+-        mock_commands_2 = self.make_mock_commands_file(
+-            "bionic_universe", mock_commands_bionic_universe)
+-        self.assertNotEqual(mock_commands_1, mock_commands_2)
+-        cre = DbCreator([mock_commands_1, mock_commands_2])
++            "etiona_main", mock_commands_etiona)
++        cre = DbCreator([mock_commands_1])
+         dbpath = os.path.join(self.tmpdir, "test.db")
+         cre.create(dbpath)
+         # validate content
+@@ -173,12 +170,11 @@
+                 db.lookup("bzr"), [
+                     ("bzr1", "1.0", "main"),
+                     ("bzr2", "2.7", "main"),
+-                    ("bzr-tng", "3.0", "universe"),
+                 ])
+ 
+     def test_priorities_bonus_works(self):
+         mock_commands_1 = self.make_mock_commands_file(
+-            "bionic_main", mock_commands_bionic)
++            "etiona_main", mock_commands_etiona)
+         cre = DbCreator([mock_commands_1])
+         dbpath = os.path.join(self.tmpdir, "test.db")
+         cre.create(dbpath)
+@@ -193,7 +189,7 @@
+ 
+     def test_visible_pkgname_works(self):
+         mock_commands_1 = self.make_mock_commands_file(
+-            "bionic_main", mock_commands_bionic)
++            "etiona_main", mock_commands_etiona)
+         cre = DbCreator([mock_commands_1])
+         dbpath = os.path.join(self.tmpdir, "test.db")
+         cre.create(dbpath)
+@@ -205,9 +201,9 @@
+ 
+     def test_create_multiple_no_unneeded_creates(self):
+         mock_commands_1 = self.make_mock_commands_file(
+-            "bionic_main", mock_commands_bionic)
++            "etiona_main", mock_commands_etiona)
+         mock_commands_2 = self.make_mock_commands_file(
+-            "bionic-proposed_main", mock_commands_bionic_proposed)
++            "etiona-proposed_main", mock_commands_etiona_proposed)
+         cre = DbCreator([mock_commands_1, mock_commands_2])
+         dbpath = os.path.join(self.tmpdir, "test.db")
+         cre.create(dbpath)
+@@ -220,7 +216,7 @@
+ 
+     def test_create_honors_ignore_comamnds(self):
+         mock_commands_file = self.make_mock_commands_file(
+-            "bionic_main", mock_commands_bionic)
++            "etiona_main", mock_commands_etiona)
+         cre = DbCreator([mock_commands_file])
+         dbpath = os.path.join(self.tmpdir, "test.db")
+         cre.create(dbpath)