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/caja-extensions/nabia_caja-extensions_fix_based_on_09268d1.patch

-From 09268d17746f7b956ae0c018f4f5b1f736c8818b Mon Sep 17 00:00:00 2001
-From: raveit65 <mate@raveit.de>
-Date: Wed, 4 Mar 2020 11:05:54 +0100
-Subject: [PATCH] Do not collect the translation for Icon
-
----
- gksu/Makefile.am            | 2 +-
- image-converter/Makefile.am | 2 +-
- open-terminal/Makefile.am   | 2 +-
- sendto/Makefile.am          | 2 +-
- share/Makefile.am           | 2 +-
- wallpaper/Makefile.am       | 2 +-
- xattr-tags/Makefile.am      | 2 +-
- 7 files changed, 7 insertions(+), 7 deletions(-)
-
-diff --git a/gksu/Makefile.am b/gksu/Makefile.am
-index 93431c8..3cf4ed8 100644
---- a/gksu/Makefile.am
-+++ b/gksu/Makefile.am
-@@ -31,6 +31,6 @@ extensiondir = $(datadir)/caja/extensions
- extension_in_files = libcaja-gksu.caja-extension.desktop.in
- extension_DATA = $(extension_in_files:.caja-extension.desktop.in=.caja-extension)
- $(extension_DATA): $(extension_in_files)
--	$(AM_V_GEN) $(MSGFMT) --desktop --keyword=Copyright --keyword=Name --keyword=Description --template $< -d $(top_srcdir)/po -o $@
-+	$(AM_V_GEN) $(MSGFMT) --desktop --keyword= --keyword=Copyright --keyword=Name --keyword=Description --template $< -d $(top_srcdir)/po -o $@
- 
- CLEANFILES = $(extension_DATA)
-diff --git a/image-converter/Makefile.am b/image-converter/Makefile.am
-index 0b8154f..df93167 100644
---- a/image-converter/Makefile.am
-+++ b/image-converter/Makefile.am
-@@ -48,7 +48,7 @@ extensiondir = $(datadir)/caja/extensions
- extension_in_files = libcaja-image-converter.caja-extension.desktop.in
- extension_DATA = $(extension_in_files:.caja-extension.desktop.in=.caja-extension)
- $(extension_DATA): $(extension_in_files)
--	$(AM_V_GEN) $(MSGFMT) --desktop --keyword=Copyright --keyword=Name --keyword=Description --template $< -d $(top_srcdir)/po -o $@
-+	$(AM_V_GEN) $(MSGFMT) --desktop --keyword= --keyword=Copyright --keyword=Name --keyword=Description --template $< -d $(top_srcdir)/po -o $@
- 
- EXTRA_DIST = $(builder_DATA)
- 
-diff --git a/open-terminal/Makefile.am b/open-terminal/Makefile.am
-index f1c77fb..d65fade 100644
---- a/open-terminal/Makefile.am
-+++ b/open-terminal/Makefile.am
-@@ -40,7 +40,7 @@ extensiondir = $(datadir)/caja/extensions
- extension_in_files = libcaja-open-terminal.caja-extension.desktop.in
- extension_DATA = $(extension_in_files:.caja-extension.desktop.in=.caja-extension)
- $(extension_DATA): $(extension_in_files)
--	$(AM_V_GEN) $(MSGFMT) --desktop --keyword=Copyright --keyword=Name --keyword=Description --template $< -d $(top_srcdir)/po -o $@
-+	$(AM_V_GEN) $(MSGFMT) --desktop --keyword= --keyword=Copyright --keyword=Name --keyword=Description --template $< -d $(top_srcdir)/po -o $@
- 
- DISTCLEANFILES = \
- 	org.mate.caja-open-terminal.gschema.xml
-diff --git a/sendto/Makefile.am b/sendto/Makefile.am
-index e23cde8..d4f056c 100644
---- a/sendto/Makefile.am
-+++ b/sendto/Makefile.am
-@@ -83,7 +83,7 @@ extensiondir = $(datadir)/caja/extensions
- extension_in_files = libcaja-sendto.caja-extension.desktop.in
- extension_DATA = $(extension_in_files:.caja-extension.desktop.in=.caja-extension)
- $(extension_DATA): $(extension_in_files)
--	$(AM_V_GEN) $(MSGFMT) --desktop --keyword=Copyright --keyword=Name --keyword=Description --template $< -d $(top_srcdir)/po -o $@
-+	$(AM_V_GEN) $(MSGFMT) --desktop --keyword= --keyword=Copyright --keyword=Name --keyword=Description --template $< -d $(top_srcdir)/po -o $@
- 
- EXTRA_DIST = \
- 	$(man_MANS) \
-diff --git a/share/Makefile.am b/share/Makefile.am
-index 8a257f3..6fc1a32 100644
---- a/share/Makefile.am
-+++ b/share/Makefile.am
-@@ -41,7 +41,7 @@ extensiondir = $(datadir)/caja/extensions
- extension_in_files = libcaja-share.caja-extension.desktop.in
- extension_DATA = $(extension_in_files:.caja-extension.desktop.in=.caja-extension)
- $(extension_DATA): $(extension_in_files)
--	$(AM_V_GEN) $(MSGFMT) --desktop --keyword=Copyright --keyword=Name --keyword=Description --template $< -d $(top_srcdir)/po -o $@
-+	$(AM_V_GEN) $(MSGFMT) --desktop --keyword= --keyword=Copyright --keyword=Name --keyword=Description --template $< -d $(top_srcdir)/po -o $@
- 
- EXTRA_DIST = share-dialog.ui
- 
-diff --git a/wallpaper/Makefile.am b/wallpaper/Makefile.am
-index 5bb905e..acc6496 100644
---- a/wallpaper/Makefile.am
-+++ b/wallpaper/Makefile.am
-@@ -33,6 +33,6 @@ extensiondir = $(datadir)/caja/extensions
- extension_in_files = libcaja-wallpaper.caja-extension.desktop.in
- extension_DATA = $(extension_in_files:.caja-extension.desktop.in=.caja-extension)
- $(extension_DATA): $(extension_in_files)
--	$(AM_V_GEN) $(MSGFMT) --desktop --keyword=Copyright --keyword=Name --keyword=Description --template $< -d $(top_srcdir)/po -o $@
-+	$(AM_V_GEN) $(MSGFMT) --desktop --keyword= --keyword=Copyright --keyword=Name --keyword=Description --template $< -d $(top_srcdir)/po -o $@
- 
- CLEANFILES = $(extension_DATA)
-diff --git a/xattr-tags/Makefile.am b/xattr-tags/Makefile.am
-index 27cd567..515d8e1 100644
---- a/xattr-tags/Makefile.am
-+++ b/xattr-tags/Makefile.am
-@@ -34,6 +34,6 @@ extensiondir = $(datadir)/caja/extensions
- extension_in_files = libcaja-xattr-tags.caja-extension.desktop.in
- extension_DATA = $(extension_in_files:.caja-extension.desktop.in=.caja-extension)
- $(extension_DATA): $(extension_in_files)
--	$(AM_V_GEN) $(MSGFMT) --desktop --keyword=Copyright --keyword=Name --keyword=Description --template $< -d $(top_srcdir)/po -o $@
-+	$(AM_V_GEN) $(MSGFMT) --desktop --keyword= --keyword=Copyright --keyword=Name --keyword=Description --template $< -d $(top_srcdir)/po -o $@
- 
- CLEANFILES = $(extension_DATA)

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