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

+diff -ru source.orig/CommandNotFound/CommandNotFound.py source/CommandNotFound/CommandNotFound.py
+--- source.orig/CommandNotFound/CommandNotFound.py	2021-12-08 05:53:19.000000000 -0500
++++ source/CommandNotFound/CommandNotFound.py	2023-06-09 16:52:12.675354733 -0400
+@@ -227,8 +227,6 @@
+         else:
+             print("apt install %s" % packages[0][0], file=self.output_fd)
+             print(_("Please ask your administrator."))
+-            if not packages[0][2] in self.sources_list:
+-                print(_("You will have to enable the component called '%s'") % packages[0][2], file=self.output_fd)
+         self.output_fd.flush()
+ 
+     def sudo(self):
+@@ -246,10 +244,7 @@
+                     ver = "  # version %s, or" % (package[1])
+                 else:
+                     ver = "  # version %s" % (package[1])
+-            if package[2] in self.sources_list:
+-                print("%sapt install %-*s%s" % (self.sudo(), pad, package[0], ver), file=self.output_fd)
+-            else:
+-                print("%sapt install %-*s%s" % (self.sudo(), pad, package[0], ver) + " (" + _("You will have to enable component called '%s'") % package[2] + ")", file=self.output_fd)
++            print("%sapt install %-*s%s" % (self.sudo(), pad, package[0], ver), file=self.output_fd)
+         if self.euid != 0 and not self.user_can_sudo:
+             print(_("Ask your administrator to install one of them."), file=self.output_fd)
+         self.output_fd.flush()

helpers/DATA/console-setup/modify_20console-setup.patch

+diff -Nru console-setup/console-setup-1.205ubuntu3-11.0trisquel5.4/debian/console-setup-udeb.base-installer console-setup_diff/console-setup-1.205ubuntu3-11.0trisquel5.2/debian/console-setup-udeb.base-installer
+--- console-setup/console-setup-1.205ubuntu3-11.0trisquel5.4/debian/console-setup-udeb.base-installer	2021-07-23 22:45:19.000000000 -0500
++++ console-setup_diff/console-setup-1.205ubuntu3-11.0trisquel5.2/debian/console-setup-udeb.base-installer	2022-12-17 18:07:01.460681582 -0600
+@@ -21,9 +21,8 @@
+     if ! db_get oem-config/enable || [ "$RET" != true ]; then
+ 	# create the required templates
+ 	debconf-copydb -p "^keyboard-configuration/.*$" configdb target_configdb
+-
+-	# mark the questions as seen
+-	for template in \## SEEN TEMPLATES ## all templates of keyb-conf except alerts and ctrl_alt_bksp
++	for template in \
++## SEEN TEMPLATES ## all templates of keyb-conf except alerts and ctrl_alt_bksp
+ 	do
+ 	    echo keyboard-configuration $template seen true
+ 	done | chroot /target debconf-set-selections

helpers/DATA/cwidget/0002-Fix-cwidget-and-aptitude-FTBFS.patch

+Description: Fix FTBFS in cwidget as well as in aptitude due to missing #include <pthread.h>
+Author: Paul Wise <pabs@debian.org>
+Reviewed-By: Axel Beckert <abe@debian.org>
+Bug-Debian: https://bugs.debian.org/1015925
+Bug: https://bugs.debian.org/1015925
+
+--- a/src/cwidget/generic/threads/threads.h
++++ b/src/cwidget/generic/threads/threads.h
+@@ -26,6 +26,7 @@
+ #define THREADS_H
+ 
+ #include <errno.h>
++#include <pthread.h>
+ #include <cwidget/generic/util/exception.h>
+ 
+ namespace cwidget

helpers/DATA/debian-installer/chmod_755_ld-linux2.patch

+diff --git a/build/Makefile b/build/Makefile
+index c073a32..cace03d 100644
+--- a/build/Makefile
++++ b/build/Makefile
+@@ -431,6 +431,12 @@ endif
+ 
+ ifeq ($(DEB_HOST_ARCH_OS),linux)
+ ifdef KERNELVERSION
++ifneq ($(DEB_HOST_ARCH),ppc64el)
++	find $(TREE)/lib/$(DEB_HOST_MULTIARCH)/ -name "ld-linux*" | xargs -r chmod 755
++endif
++ifeq ($(DEB_HOST_ARCH),ppc64el)
++	chmod 755 $(TREE)/lib/$(DEB_HOST_MULTIARCH)/ld*.so*
++endif
+ 	# Set up modules.dep, ensure there is at least one standard dir (kernel
+ 	# in this case), so depmod will use its prune list for archs with no
+ 	# modules.

helpers/DATA/debian-installer/di_focal/1422_1421.diff

+=== modified file 'build/Makefile'
+--- build/Makefile	2010-11-05 16:34:29 +0000
++++ build/Makefile	2011-03-01 11:42:39 +0000
+@@ -294,6 +294,7 @@
+ 	rm -rf $(TREE)
+ 	# Set up the basic files [u]dpkg needs.
+ 	mkdir -p $(DPKGDIR)/info
++	ln -nsf . $(DPKGDIR)/info/$(shell dpkg --print-architecture)
+ 	touch $(DPKGDIR)/status
+ 	# Create a tmp tree
+ 	mkdir -p $(TREE)/tmp
+@@ -457,6 +458,7 @@
+ 
+ 	mkdir -p $(EXTRAUDEBSDIR)
+ 	mkdir -p $(EXTRAUDEBSDPKGDIR)/info $(EXTRAUDEBSDPKGDIR)/updates
++	ln -nsf . $(EXTRAUDEBSDPKGDIR)/info/$(shell dpkg --print-architecture)
+ 	touch $(EXTRAUDEBSDPKGDIR)/status $(EXTRAUDEBSDPKGDIR)/available
+ 
+ ifdef EXTRADRIVERS
+
+#=== modified file 'debian/changelog'
+#--- debian/changelog	2011-03-01 10:36:50 +0000
+#+++ debian/changelog	2011-03-01 11:42:39 +0000
+#@@ -1,3 +1,10 @@
+#+debian-installer (20101020ubuntu21) UNRELEASED; urgency=low
+#+
+#+  * Install /var/lib/dpkg/info/$(dpkg --print-architecture) -> . symlink so
+#+    that images build correctly in the presence of multiarch dpkg.
+#+
+#+ -- Colin Watson <cjwatson@ubuntu.com>  Tue, 01 Mar 2011 11:41:38 +0000
+#+
+# debian-installer (20101020ubuntu20) natty; urgency=low
+# 
+#   * Stop building the armel dove subarchitecture; it no longer has a kernel
+#

helpers/DATA/debian-installer/di_focal/1677_1676.diff

+=== modified file 'build/Makefile'
+#--- build/Makefile	2011-12-15 15:35:38 +0000
+#+++ build/Makefile	2012-04-18 05:24:59 +0000
+#@@ -493,6 +493,12 @@
+# 		`find $(TEMP) -type f -a \( -perm +0111 -o -name '*.so' -o -name '*.so.*' \) | \
+# 		 grep -v udeblibs | grep -v 'usr/lib/xorg/modules/.*\.so'`
+# 
+#+ifeq ($(DEB_HOST_ARCH),armhf)
+#+	# armhf has two linkers for now, while the world gets sorted
+#+	mkdir -p $(TREE)/lib/arm-linux-gnueabihf
+#+	ln -s /lib/ld-linux-armhf.so.3 $(TREE)/lib/arm-linux-gnueabihf/ld-linux.so.3
+#+endif
+#+
+# ifeq ($(DEB_HOST_ARCH_OS),hurd)
+# 	# On Hurd the SONAME for the dynamic linker is ld.so.1, but binaries
+# 	# have the ld.so symlink as the interpreter. Ideally mklibs should
+#
+=== modified file 'build/config/armhf.cfg'
+--- build/config/armhf.cfg	2012-04-11 08:52:18 +0000
++++ build/config/armhf.cfg	2012-04-18 05:24:59 +0000
+@@ -1,5 +1,7 @@
+ SUBARCH_SUPPORTED = omap omap4 armadaxp
+ 
++MKLIBS = mklibs --ldlib=/lib/ld-linux-armhf.so.3
++
+ KERNELMAJOR = 2.6
+ KERNELVERSION = 3.2.0-23
+ KERNEL_FLAVOUR = di
+
+#=== modified file 'debian/changelog'
+#--- debian/changelog	2012-04-13 13:14:35 +0000
+#+++ debian/changelog	2012-04-18 05:24:59 +0000
+#@@ -1,3 +1,12 @@
+#+debian-installer (20101020ubuntu134) precise; urgency=low
+#+
+#+  * Call mklibs with a hardcoded --ldlib in armhf.cfg, so we get a
+#+    deterministic result in our linker search, and then add the
+#+    symlink from the old linker path in build/Makefile (LP: #984007)
+#+  * Rebuild with latest omap4 kernels for ext2 support (LP: #984180)
+#+
+#+ -- Adam Conrad <adconrad@ubuntu.com>  Tue, 17 Apr 2012 23:20:29 -0600
+#+
+# debian-installer (20101020ubuntu133) precise; urgency=low
+# 
+#   * Move armel/omap4 and armhf/omap4 to 3.2.0-1412.
+#

helpers/DATA/debian-installer/di_focal/2144_2143.diff

+=== modified file 'build/Makefile'
+#--- build/Makefile	2015-12-09 17:32:28 +0000
+#+++ build/Makefile	2016-04-16 19:45:21 +0000
+#@@ -525,12 +525,6 @@
+# 		`find $(TEMP) -type f -a \( -perm /0111 -o -name '*.so' -o -name '*.so.*' \) | \
+# 		 grep -v udeblibs | grep -v 'usr/lib/xorg/modules/.*\.so'`
+# 
+#-ifeq ($(DEB_HOST_ARCH),armhf)
+#-	# armhf has two linkers for now, while the world gets sorted
+#-	mkdir -p $(TREE)/lib/arm-linux-gnueabihf
+#-	ln -s /lib/ld-linux-armhf.so.3 $(TREE)/lib/arm-linux-gnueabihf/ld-linux.so.3
+#-endif
+#-
+# ifeq ($(DEB_HOST_ARCH_OS),hurd)
+# 	# On Hurd the SONAME for the dynamic linker is ld.so.1, but binaries
+# 	# have the ld.so symlink as the interpreter. Ideally mklibs should
+#
+#=== modified file 'build/config/amd64.cfg'
+#--- build/config/amd64.cfg	2016-04-08 14:58:47 +0000
+#+++ build/config/amd64.cfg	2016-04-16 19:45:21 +0000
+#@@ -1,8 +1,6 @@
+# MEDIUM_SUPPORTED = cdrom cdrom-xen netboot netboot-xen hd-media # netboot-gtk
+# MEDIUM_SUPPORTED_EXTRA = monolithic
+# 
+#-MKLIBS = mklibs-copy
+#-
+# # The version of the kernel to use.
+# BASEVERSION = 4.4.0-18
+# KERNELVERSION = $(BASEVERSION)-generic
+
+#=== modified file 'build/config/amd64/netboot.cfg'
+#--- build/config/amd64/netboot.cfg	2016-03-27 03:15:58 +0000
+#+++ build/config/amd64/netboot.cfg	2016-04-16 19:45:21 +0000
+#@@ -1,7 +1,7 @@
+# MEDIA_TYPE = netboot image
+# 
+# # Not really a floppy; this is for use on USB memory sticks.
+#-FLOPPY_SIZE = 44032
+#+FLOPPY_SIZE = 45056
+# GZIPPED = .gz
+# DISK_LABEL = "bootable drive"
+ 
+
+=== modified file 'build/config/armhf.cfg'
+--- build/config/armhf.cfg	2016-04-08 14:58:47 +0000
++++ build/config/armhf.cfg	2016-04-16 19:45:21 +0000
+@@ -1,6 +1,6 @@
+ SUBARCH_SUPPORTED = generic-lpae generic
+ 
+-MKLIBS = mklibs --ldlib=/lib/ld-linux-armhf.so.3
++MKLIBS = mklibs-copy --ldlib=/lib/ld-linux-armhf.so.3
+ 
+ KERNELMAJOR = 2.6
+ KERNELVERSION = 4.4.0-18
+
+#=== modified file 'build/config/common'
+#--- build/config/common	2015-11-12 19:14:48 +0000
+#+++ build/config/common	2016-04-16 19:45:21 +0000
+#@@ -24,7 +24,7 @@
+# 
+# # The library reducer to use. Set to mklibs (to build with library reduction)
+# # or mklibs-copy (to build without library reduction).
+#-MKLIBS = mklibs
+#+MKLIBS = mklibs-copy
+# 
+# # Normally the sources.list for building d-i will be derived from your
+# # "normal" sources.list. However, you can specify a mirror here to override
+
+#=== modified file 'build/config/i386/netboot.cfg'
+#--- build/config/i386/netboot.cfg	2016-03-22 04:37:29 +0000
+#+++ build/config/i386/netboot.cfg	2016-04-16 19:45:21 +0000
+#@@ -3,7 +3,7 @@
+# MEDIA_TYPE = netboot image
+# 
+# # Not really a floppy; this is for use on USB memory sticks.
+#-FLOPPY_SIZE = 40960
+#+FLOPPY_SIZE = 41984
+# GZIPPED = .gz
+# DISK_LABEL = "bootable drive"
+ 
+
+#=== modified file 'build/config/powerpc/powerpc/netboot.cfg'
+#--- build/config/powerpc/powerpc/netboot.cfg	2016-03-22 05:15:29 +0000
+#+++ build/config/powerpc/powerpc/netboot.cfg	2016-04-16 19:45:21 +0000
+#@@ -1,7 +1,7 @@
+# MEDIA_TYPE = netboot image
+# 
+# # Not really a floppy; this is for use on USB memory sticks.
+#-FLOPPY_SIZE = 49152
+#+FLOPPY_SIZE = 50176
+# GZIPPED = .gz
+# DISK_LABEL = "bootable drive"
+ 
+
+#=== modified file 'build/config/ppc64el.cfg'
+#--- build/config/ppc64el.cfg	2016-04-08 14:58:47 +0000
+#+++ build/config/ppc64el.cfg	2016-04-16 19:45:21 +0000
+#@@ -1,7 +1,5 @@
+# MEDIUM_SUPPORTED = netboot cdrom
+# 
+#-MKLIBS = mklibs-copy
+#-
+# KERNELMAJOR = 2.6
+# BASEVERSION = 4.4.0-18
+# KERNELVERSION = $(BASEVERSION)-generic
+
+#=== modified file 'build/pkg-lists/base'
+#--- build/pkg-lists/base	2015-09-22 18:31:39 +0000
+#+++ build/pkg-lists/base	2016-04-16 19:45:21 +0000
+#@@ -10,7 +10,6 @@
+# di-utils-shell
+# libdebconfclient0-udeb
+# libdebian-installer4-udeb
+#-libnss-dns-udeb
+# lowmemcheck
+# lsb-release-udeb
+# main-menu
+
+#=== modified file 'build/pkg-lists/exclude'
+#--- build/pkg-lists/exclude	2010-05-24 15:01:07 +0000
+#+++ build/pkg-lists/exclude	2016-04-16 19:45:21 +0000
+#@@ -2,15 +2,6 @@
+# # they are currently provided not in udeb form but by the library
+# # reduction step.
+# 
+#-# libc gets reduced, so using the udeb is not a good idea
+#-libc0.1 -
+#-libc0.1-udeb -
+#-libc0.3 -
+#-libc0.3-udeb -
+#-libc6 -
+#-libc6-udeb -
+#-libc6.1 -
+#-libc6.1-udeb -
+# # slang is also reduced
+# libslang2-udeb -
+# # and newt
+
+#=== modified file 'build/pkg-lists/gtk-common'
+#--- build/pkg-lists/gtk-common	2015-05-14 17:55:41 +0000
+#+++ build/pkg-lists/gtk-common	2016-04-16 19:45:21 +0000
+#@@ -1,5 +1,4 @@
+# # udebs needed for graphical installer
+#-libnss-files-udeb
+# rootskel-gtk
+# cdebconf-gtk-udeb
+# cdebconf-gtk-terminal
+
+#=== modified file 'build/pkg-lists/network-console'
+#--- build/pkg-lists/network-console	2004-06-29 08:17:34 +0000
+#+++ build/pkg-lists/network-console	2016-04-16 19:45:21 +0000
+#@@ -1,4 +1,3 @@
+# openssh-server-udeb
+#-libnss-files-udeb
+# network-console
+ 
+
+#=== modified file 'debian/changelog'
+#--- debian/changelog	2016-04-13 12:07:03 +0000
+#+++ debian/changelog	2016-04-16 19:45:21 +0000
+#@@ -1,3 +1,16 @@
+#+debian-installer (20101020ubuntu448) xenial; urgency=medium
+#+
+#+  * Cherry-pick changes from Debian for the removal of libnss-*-udeb:
+#+    - Switch to using mklibs-copy for the reduction on all arches.
+#+    - Drop the build-dependency on glibc-pic, unneeded for above.
+#+    - Stop excluding libc-udeb to avoid dropping libnss libraries
+#+      and to avoid a useless download of libc-udeb during install.
+#+    - Drop references to libnss-*-udeb, now provided by libc-udeb.
+#+    - Drop extra armhf linker, libc-udeb provides the same symlink.
+#+  * Bump FLOPPY_SIZE by 1MB on all arches to make room for the above.
+#+
+#+ -- Adam Conrad <adconrad@ubuntu.com>  Sat, 16 Apr 2016 12:12:07 -0600
+#+
+# debian-installer (20101020ubuntu447) xenial; urgency=medium
+# 
+#   * Rebuild with updated udebs for s390x.
+
+=== modified file 'debian/control'
+#--- debian/control	2016-02-19 17:00:28 +0000
+#+++ debian/control	2016-04-16 19:45:21 +0000
+#@@ -9,7 +9,7 @@
+# Vcs-Bzr: http://bazaar.launchpad.net/~ubuntu-core-dev/debian-installer/ubuntu
+# Build-Conflicts: libnewt-pic [mipsel]
+# # NOTE: Do not edit the next line by hand. See comment below.
+#-Build-Depends: debhelper (>= 7.0.0), apt, apt-utils, gnupg, ubuntu-keyring, dctrl-tools, wget, bc, debiandoc-sgml, xsltproc, docbook-xml, docbook-xsl, libbogl-dev [!kfreebsd-i386 !kfreebsd-amd64 !hurd-i386], lsb-release, glibc-pic, libslang2-pic (>= 2.0.6-4), libnewt-pic (>= 0.52.2-11.3) [!mipsel], libnewt-dev (>= 0.52.2-11.3) [mipsel], libgcc1 [i386 amd64], cramfsprogs [powerpc ia64 mips mipsel armeb armel], genext2fs (>= 1.3-7.1), e2fsprogs, mklibs (>= 0.1.25), genisoimage (>= 9:1.1.10-1ubuntu2) [!s390 !s390x], genromfs [sparc sparc64], hfsutils [powerpc], dosfstools (>= 3.0.9-1ubuntu2) [i386 ia64 m68k amd64 armel armhf arm64], cpio, devio [armeb armel], parted [armel armhf], slugimage (>= 0.10+r58-6) [armeb armel], u-boot-tools [arm64 armel armhf], syslinux (>= 3:6) [i386 amd64], syslinux-utils (>= 3:6) [i386 amd64], pxelinux (>= 3:6) [i386 amd64], isolinux (>= 3:6) [i386 amd64], syslinux-common (>= 3:6) [i386 amd64], palo [hppa], elilo [ia64], yaboot [powerpc], aboot (>= 0.9b-2) [alpha], silo [sparc], sparc-utils [sparc sparc64], genisovh [mips], tip22 [mips], colo [mipsel], sibyl [mips mipsel], atari-bootstrap [m68k], vmelilo [m68k], m68k-vme-tftplilo [m68k], amiboot [m68k], emile [m68k], emile-bootblocks [m68k], u-boot [armel armhf], shim-signed [amd64], tofrodos [i386 amd64 kfreebsd-i386 kfreebsd-amd64], mtools [i386 ia64 m68k amd64 arm64 kfreebsd-i386 kfreebsd-amd64 hurd-i386 armel armhf], po4a [i386 amd64], python3 (>= 3.1) [i386 amd64], kmod [linux-any], bf-utf-source [!s390 !s390x], mkvmlinuz [powerpc], openssl, makefs [kfreebsd-i386 kfreebsd-amd64], grub-pc (>= 1.98~20100101-1) [kfreebsd-i386 kfreebsd-amd64 hurd-i386], xorriso [arm64 kfreebsd-i386 kfreebsd-amd64 hurd-i386 ppc64el], grub-efi-amd64-bin (>= 2.00) [amd64], grub-efi-arm64-bin [arm64], grub-common [amd64 arm64], debian-ports-archive-keyring [sh4 sparc64], grub-ieee1275-bin [ppc64el]
+#+Build-Depends: debhelper (>= 7.0.0), apt, apt-utils, gnupg, ubuntu-keyring, dctrl-tools, wget, bc, debiandoc-sgml, xsltproc, docbook-xml, docbook-xsl, libbogl-dev [!kfreebsd-i386 !kfreebsd-amd64 !hurd-i386], lsb-release, libslang2-pic (>= 2.0.6-4), libnewt-pic (>= 0.52.2-11.3) [!mipsel], libnewt-dev (>= 0.52.2-11.3) [mipsel], libgcc1 [i386 amd64], cramfsprogs [powerpc ia64 mips mipsel armeb armel], genext2fs (>= 1.3-7.1), e2fsprogs, mklibs (>= 0.1.40), mklibs-copy (>= 0.1.40), genisoimage (>= 9:1.1.10-1ubuntu2) [!s390 !s390x], genromfs [sparc sparc64], hfsutils [powerpc], dosfstools (>= 3.0.9-1ubuntu2) [i386 ia64 m68k amd64 armel armhf arm64], cpio, devio [armeb armel], parted [armel armhf], slugimage (>= 0.10+r58-6) [armeb armel], u-boot-tools [arm64 armel armhf], syslinux (>= 3:6) [i386 amd64], syslinux-utils (>= 3:6) [i386 amd64], pxelinux (>= 3:6) [i386 amd64], isolinux (>= 3:6) [i386 amd64], syslinux-common (>= 3:6) [i386 amd64], palo [hppa], elilo [ia64], yaboot [powerpc], aboot (>= 0.9b-2) [alpha], silo [sparc], sparc-utils [sparc sparc64], genisovh [mips], tip22 [mips], colo [mipsel], sibyl [mips mipsel], atari-bootstrap [m68k], vmelilo [m68k], m68k-vme-tftplilo [m68k], amiboot [m68k], emile [m68k], emile-bootblocks [m68k], u-boot [armel armhf], shim-signed [amd64], tofrodos [i386 amd64 kfreebsd-i386 kfreebsd-amd64], mtools [i386 ia64 m68k amd64 arm64 kfreebsd-i386 kfreebsd-amd64 hurd-i386 armel armhf], po4a [i386 amd64], python3 (>= 3.1) [i386 amd64], kmod [linux-any], bf-utf-source [!s390 !s390x], mkvmlinuz [powerpc], openssl, makefs [kfreebsd-i386 kfreebsd-amd64], grub-pc (>= 1.98~20100101-1) [kfreebsd-i386 kfreebsd-amd64 hurd-i386], xorriso [arm64 kfreebsd-i386 kfreebsd-amd64 hurd-i386 ppc64el], grub-efi-amd64-bin (>= 2.00) [amd64], grub-efi-arm64-bin [arm64], grub-common [amd64 arm64], debian-ports-archive-keyring [sh4 sparc64], grub-ieee1275-bin [ppc64el]
+# # This package has the worst Build-Depends in Debian, so it deserves some
+# # explanation. Note that this comment can also be used to generate a
+# # Build-Depends line, by running the debian/genbuilddeps program.
+#@@ -46,8 +46,6 @@
+# #		Provides system version information.
+# #	
+# # Library build dependencies:
+#-#	- glibc-pic
+#-#		For library reduction.
+# #	- libslang2-pic (>= 2.0.6-4)
+# #		Make dependency versioned temporarily to make sure we avoid #392942
+# #	- libnewt-pic (>= 0.52.2-11.3) [!mipsel]
+#@@ -73,7 +71,7 @@
+# #		them.
+# #		Lintian: Yes, we know it's essential. We prefer not to
+# #		count on it remaining so.
+#-#	- mklibs (>= 0.1.25)
+#+#	- mklibs (>= 0.1.40), mklibs-copy (>= 0.1.40)
+# #		We use mklibs for library reduction.
+# #	- genisoimage (>= 9:1.1.10-1ubuntu2) [!s390 !s390x]
+# #		For making mini isos.
+##Ark74's fix
+--- debian/control	2023-05-10 08:36:56.311243556 -0600
++++ debian/control	2023-05-10 12:00:07.617639516 -0600
+@@ -45,6 +45,7 @@
+ #		them.
+ #		Lintian: Yes, we know it's essential. We prefer not to
+ #		count on it remaining so.
++	mklibs (>= 0.1.40), mklibs-copy (>= 0.1.40),
+ 	genisoimage [!s390 !s390x],
+ #		For making mini isos.
+ 	genromfs [sparc sparc64],
+

helpers/DATA/debian-installer/di_focal/2273_2272.diff

+=== modified file 'build/Makefile'
+--- build/Makefile	2018-02-15 11:44:41 +0000
++++ build/Makefile	2018-07-22 10:55:51 +0000
+@@ -782,6 +782,8 @@
+ 	update-manifest $@ $(MANIFEST-BOOT) $(UDEB_LISTS)
+ 
+ $(TEMP_KERNEL): $(STAMPS)tree-unpack-$(targetstring)-stamp
++	# The kernel is shipped 600 in some cases, so fix it:
++	chmod 644 $(TEMP_KERNEL)
+ 
+ $(TEMP_BOOT): $(TEMP_INITRD) $(TEMP_KERNEL) $(TEMP_BOOT_SCREENS) arch_boot
+ 
+
+#=== modified file 'debian/changelog'
+#--- debian/changelog	2018-06-14 10:36:23 +0000
+#+++ debian/changelog	2018-07-22 10:55:51 +0000
+#@@ -1,3 +1,9 @@
+#+debian-installer (20101020ubuntu547) UNRELEASED; urgency=medium
+#+
+#+  * Fix permissions on the netboot.tar kernel (LP: #1781036)
+#+
+#+ -- Adam Conrad <adconrad@ubuntu.com>  Sun, 22 Jul 2018 04:55:01 -0600
+#+
+# debian-installer (20101020ubuntu546) cosmic; urgency=medium
+# 
+#   * Move master kernels to 4.15.0-23.
+#

helpers/DATA/debian-installer/medium_supported.patch

+diff -Nru debian-installer-20210731+deb11u8+11.0trisquel13/build/config/amd64.cfg debian-installer-20210731+deb11u8+11.0trisquel13_/build/config/amd64.cfg
+--- debian-installer-20210731+deb11u8+11.0trisquel13/build/config/amd64.cfg	2023-05-12 13:48:56.045639664 -0600
++++ debian-installer-20210731+deb11u8+11.0trisquel13_/build/config/amd64.cfg	2023-05-12 14:00:23.091630526 -0600
+@@ -1,4 +1,4 @@
+-MEDIUM_SUPPORTED = cdrom cdrom-xen netboot netboot-gtk netboot-xen hd-media
++MEDIUM_SUPPORTED = cdrom netboot
+ MEDIUM_SUPPORTED_EXTRA = monolithic
+ 
+ # The version of the kernel to use.
+diff -Nru debian-installer-20210731+deb11u8+11.0trisquel13/build/config/arm64.cfg debian-installer-20210731+deb11u8+11.0trisquel13_/build/config/arm64.cfg
+--- debian-installer-20210731+deb11u8+11.0trisquel13/build/config/arm64.cfg	2023-05-12 13:48:56.073639701 -0600
++++ debian-installer-20210731+deb11u8+11.0trisquel13_/build/config/arm64.cfg	2023-05-12 14:00:45.351718688 -0600
+@@ -1,4 +1,4 @@
+-MEDIUM_SUPPORTED = cdrom netboot netboot-gtk device-tree u-boot
++MEDIUM_SUPPORTED = cdrom netboot device-tree u-boot
+ 
+ KERNELMAJOR = 2.6
+ # The version of the kernel to use.
+diff -Nru debian-installer-20210731+deb11u8+11.0trisquel13/build/config/armhf.cfg debian-installer-20210731+deb11u8+11.0trisquel13_/build/config/armhf.cfg
+--- debian-installer-20210731+deb11u8+11.0trisquel13/build/config/armhf.cfg	2023-05-12 13:48:59.157643670 -0600
++++ debian-installer-20210731+deb11u8+11.0trisquel13_/build/config/armhf.cfg	2023-05-12 14:01:10.243818298 -0600
+@@ -1,4 +1,4 @@
+-MEDIUM_SUPPORTED = hd-media netboot network-console netboot-gtk device-tree u-boot cdrom
++MEDIUM_SUPPORTED = netboot device-tree u-boot cdrom
+ 
+ MKLIBS = mklibs-copy --ldlib=/lib/ld-linux-armhf.so.3
+ 
+diff -Nru debian-installer-20210731+deb11u8+11.0trisquel13/build/config/i386.cfg debian-installer-20210731+deb11u8+11.0trisquel13_/build/config/i386.cfg
+--- debian-installer-20210731+deb11u8+11.0trisquel13/build/config/i386.cfg	2023-01-08 16:22:52.000000000 -0600
++++ debian-installer-20210731+deb11u8+11.0trisquel13_/build/config/i386.cfg	2023-05-12 13:59:51.799508139 -0600
+@@ -1,4 +1,4 @@
+-MEDIUM_SUPPORTED = cdrom cdrom-xen netboot netboot-gtk netboot-xen hd-media
++MEDIUM_SUPPORTED = cdrom netboot 
+ MEDIUM_SUPPORTED_EXTRA = monolithic
+ 
+ # The version of the kernel to use.

helpers/DATA/debian-installer/remove-proposed-updates.patch

+diff -Nru source/build/Makefile source_no_proposed/build/Makefile
+--- source/build/Makefile	2022-10-20 08:22:18.334230755 -0500
++++ source_no_proposed/build/Makefile	2022-10-20 08:25:19.346634640 -0500
+@@ -636,7 +636,7 @@
+ 			echo "deb $(MIRROR) unreleased $(UDEB_COMPONENTS)"; \
+ 		fi \
+ 	else \
+-		gen-sources.list.udeb "$(SYSTEM_SOURCES_LIST)" $(USE_UDEBS_FROM) $(UDEB_COMPONENTS) $(USE_PROPOSED_UPDATES); \
++		gen-sources.list.udeb "$(SYSTEM_SOURCES_LIST)" $(USE_UDEBS_FROM) $(UDEB_COMPONENTS); \
+ 		if [ "$(USE_UNRELEASED)" = 1 ]; then \
+ 			gen-sources.list.udeb "$(SYSTEM_SOURCES_LIST)" unreleased $(UDEB_COMPONENTS); \
+ 		fi \
+@@ -648,10 +648,6 @@
+ 		echo "Using generated $@:"; \
+ 		sed -n "/^[^#]/ s/^/   /p" $@; \
+ 	fi
+-	@if [ "$(USE_PROPOSED_UPDATES)" = 1 ] && ! grep -q proposed-updates $@; then \
+-		echo "ERROR: no valid source for $(USE_UDEBS_FROM)-proposed-updates"; \
+-		exit 1; \
+-	fi
+ 
+ # Font generation.
+ #
+diff -Nru source/build/util/gen-sources.list.udeb source_no_proposed/build/util/gen-sources.list.udeb
+--- source/build/util/gen-sources.list.udeb	2022-09-06 15:55:12.000000000 -0500
++++ source_no_proposed/build/util/gen-sources.list.udeb	2022-10-20 08:26:32.538801725 -0500
+@@ -8,7 +8,6 @@
+ SOURCES_LIST=$1
+ SUITE=$2
+ UDEB_COMPONENTS=$3
+-USE_PROPOSED_UPDATES=$4 # optional
+ 
+ # Set to 1 or 2 to see increasing debug info about mirror tests
+ # Use 0 for quiet (normal) operation
+@@ -84,16 +83,8 @@
+ 		else
+ 			echo "WARNING: mirror '$tmirror' appears to be invalid; skipping" >&2
+ 		fi
+-		if [ "$USE_PROPOSED_UPDATES" = 1 ] &&
+-		   test_url $tmirror/dists/$SUITE-proposed-updates/Release; then
+-			echo "$mirror $SUITE-proposed-updates $UDEB_COMPONENTS"
+-			echo "INFO: using '$tmirror' for $SUITE-proposed-updates" >&2
+-		fi
+ 	else
+ 		echo "$mirror $SUITE $UDEB_COMPONENTS"
+-		if [ "$USE_PROPOSED_UPDATES" = 1 ]; then
+-			echo "$mirror $SUITE-proposed-updates $UDEB_COMPONENTS"
+-		fi
+ 	fi
+ 
+ done | perl -ne 'print unless $seen{$_}; $seen{$_}=1'
+diff -Nru source/debian/rules source_no_proposed/debian/rules
+--- source/debian/rules	2022-10-20 08:22:18.318230720 -0500
++++ source_no_proposed/debian/rules	2022-10-20 08:26:53.702850378 -0500
+@@ -13,7 +13,6 @@
+ BOOTMENU_BEEP=n
+ else
+ USE_UDEBS_FROM=aramo
+-USE_PROPOSED_UPDATES=1
+ TRANSSTATUS=translation-status
+ BOOTMENU_BEEP=y
+ endif

helpers/DATA/debootstrap/aramo

+trisquel
\ No newline at end of file

helpers/DATA/debootstrap/ecne

+trisquel
\ No newline at end of file

helpers/DATA/debootstrap/trisquel

-case $ARCH in
-  amd64|i386)
-	default_mirror http://archive.trisquel.org/trisquel
-	;;
-  *)
-	default_mirror http://ports.trisquel.org/trisquel
-	;;
-esac
+default_mirror http://archive.trisquel.org/trisquel
+
 mirror_style release
 download_style apt
 finddebs_style from-indices

helpers/DATA/debootstrap/trisquel-common

-case $ARCH in
-  amd64|i386)
-	default_mirror http://archive.trisquel.org/trisquel
-	;;
-  *)
-	default_mirror http://ports.trisquel.org/trisquel
-	;;
-esac
+default_mirror http://archive.trisquel.org/trisquel
+
 mirror_style release
 download_style apt
 finddebs_style from-indices

helpers/DATA/dino-im/cve/01_ef8fb0e94ce79d5fde2943e433ad0422eb7f70ec.patch

+From ef8fb0e94ce79d5fde2943e433ad0422eb7f70ec Mon Sep 17 00:00:00 2001
+From: Marvin W <git@larma.de>
+Date: Thu, 23 Mar 2023 10:13:30 -0600
+Subject: [PATCH] Check sender of bookmark:1 updates
+
+---
+ xmpp-vala/src/module/xep/0402_bookmarks2.vala | 10 ++++++++++
+ 1 file changed, 10 insertions(+)
+
+diff --git a/xmpp-vala/src/module/xep/0402_bookmarks2.vala b/xmpp-vala/src/module/xep/0402_bookmarks2.vala
+index 406f37f43..d1e53e6e3 100644
+--- a/xmpp-vala/src/module/xep/0402_bookmarks2.vala
++++ b/xmpp-vala/src/module/xep/0402_bookmarks2.vala
+@@ -68,6 +68,11 @@ public class Module : BookmarksProvider, XmppStreamModule {
+     }
+ 
+     private void on_pupsub_item(XmppStream stream, Jid jid, string id, StanzaNode? node) {
++        if (!jid.equals(stream.get_flag(Bind.Flag.IDENTITY).my_jid.bare_jid)) {
++            warning("Received alleged bookmarks:1 item from %s, ignoring", jid.to_string());
++            return;
++        }
++
+         Conference conference = parse_item_node(node, id);
+         Flag? flag = stream.get_flag(Flag.IDENTITY);
+         if (flag != null) {
+@@ -77,6 +82,11 @@ public class Module : BookmarksProvider, XmppStreamModule {
+     }
+ 
+     private void on_pupsub_retract(XmppStream stream, Jid jid, string id) {
++        if (!jid.equals(stream.get_flag(Bind.Flag.IDENTITY).my_jid.bare_jid)) {
++            warning("Received alleged bookmarks:1 retract from %s, ignoring", jid.to_string());
++            return;
++        }
++
+         try {
+             Jid jid_parsed = new Jid(id);
+             Flag? flag = stream.get_flag(Flag.IDENTITY);

helpers/DATA/distro-info-data/README.Debian.patch

---- debian/README.Debian	2019-10-17 15:10:30.000000000 -0500
-+++ debian/README.Debian_trisquel	2021-11-26 13:26:20.362971709 -0600
+--- a/debian/README.Debian	2019-10-17 15:10:30.000000000 -0500
++++ b/debian/README.Debian	2021-11-26 13:26:20.362971709 -0600
 @@ -2,7 +2,7 @@
  ===========