Merging debian version 2.40.1-1.

Signed-off-by: Daniel Baumann <daniel.baumann@progress-linux.org>

1 files changed, 0 insertions, 31 deletions

diff --git a/debian/patches/upstream/agetty-Don-t-override-TERM-passed-by-the-user.patch b/debian/patches/upstream/agetty-Don-t-override-TERM-passed-by-the-user.patch
deleted file mode 100644
index 11df871..0000000
--- a/debian/patches/upstream/agetty-Don-t-override-TERM-passed-by-the-user.patch
+++ /dev/null
@@ -1,31 +0,0 @@
-From: Daan De Meyer <daan.j.demeyer@gmail.com>
-Date: Fri, 19 Apr 2024 20:07:47 +0200
-Subject: agetty: Don't override TERM passed by the user
-
-Before 4869b259d68f65ea88df625ce8df9c0177d55a01, any TERM passed
-on the agetty command line would be used instead of the default TERM.
-After 4869b259d68f65ea88df625ce8df9c0177d55a01, the default TERM is
-used unconditionally.
-
-Fix the regression by checking if the user passed a custom TERM.
-
-Fixes: 4869b259d68f65ea88df625ce8df9c0177d55a01
-(cherry picked from commit af354e92111769d57e43eb4f1825c0d99c894ddb)
----
- term-utils/agetty.c | 3 ++-
- 1 file changed, 2 insertions(+), 1 deletion(-)
-
-diff --git a/term-utils/agetty.c b/term-utils/agetty.c
-index 0fc6f15..0b9eb8b 100644
---- a/term-utils/agetty.c
-+++ b/term-utils/agetty.c
-@@ -1196,7 +1196,8 @@ static void open_tty(const char *tty, struct termios *tp, struct options *op)
- #endif
- 	}
- 
--	op->term = get_terminal_default_type(op->tty, !(op->flags & F_VCONSOLE));
-+	if (!op->term)
-+		op->term = get_terminal_default_type(op->tty, !(op->flags & F_VCONSOLE));
- 	if (!op->term)
- 		log_err(_("failed to allocate memory: %m"));
-