gentoo auto-resync : 20:05:2023 - 04:17:09

2 files changed, 0 insertions, 87 deletions

diff --git a/sys-apps/util-linux/files/util-linux-2.37.1-agetty_ctrl-c_erase.patch b/sys-apps/util-linux/files/util-linux-2.37.1-agetty_ctrl-c_erase.patch
deleted file mode 100644
index 4828fd449f95..000000000000
--- a/sys-apps/util-linux/files/util-linux-2.37.1-agetty_ctrl-c_erase.patch
+++ /dev/null
@@ -1,50 +0,0 @@
-From 6eb1c01e9dd25a73100f06db37190c63fd57d4d9 Mon Sep 17 00:00:00 2001
-From: Karel Zak <kzak@redhat.com>
-Date: Fri, 30 Jul 2021 11:50:46 +0200
-Subject: [PATCH] agetty: use CTRL+C to erase username
-
-aggety(8) from the beginning ignores ^C (the small exception was
-between 2.32 and 2.34 when this char has been misinterpreted).
-
-This patch forces agetty to interpret ^C like ^U, it means to
-erase the user's input and wait for a completely new username.
-The small difference is that for ^C it does not set 'kill character'.
-
-This change does not affect serial lines where ^C is still ignored like
-in previous decades. I'd like to avoid any regression as I have
-no clue if any serial lines do not send this control char in some
-context ...
-
-Fixes: https://github.com/karelzak/util-linux/issues/1399
-References: https://github.com/karelzak/util-linux/issues/1046
-Signed-off-by: Karel Zak <kzak@redhat.com>
----
- term-utils/agetty.c | 8 +++++---
- 1 file changed, 5 insertions(+), 3 deletions(-)
-
-diff --git a/term-utils/agetty.c b/term-utils/agetty.c
-index 3b3d5101a..d072d64d3 100644
---- a/term-utils/agetty.c
-+++ b/term-utils/agetty.c
-@@ -2267,6 +2267,11 @@ static char *get_logname(struct issue *ie, struct options *op, struct termios *t
- 				break;
- 			case CTL('U'):
- 				cp->kill = ascval;		/* set kill character */
-+				/* fallthrough */
-+			case CTL('C'):
-+				if (key == CTL('C') && !(op->flags & F_VCONSOLE))
-+					/* Ignore CTRL+C on serial line */
-+					break;
- 				while (bp > logname) {
- 					if ((tp->c_lflag & ECHO) == 0)
- 						write_all(1, erase[cp->parity], 3);
-@@ -2275,9 +2280,6 @@ static char *get_logname(struct issue *ie, struct options *op, struct termios *t
- 				break;
- 			case CTL('D'):
- 				exit(EXIT_SUCCESS);
--			case CTL('C'):
--				/* Ignore */
--				break;
- 			default:
- 				if ((size_t)(bp - logname) >= sizeof(logname) - 1)
- 					log_err(_("%s: input overrun"), op->tty);
diff --git a/sys-apps/util-linux/files/util-linux-2.37.2-ioctl_ns-test-hang.patch b/sys-apps/util-linux/files/util-linux-2.37.2-ioctl_ns-test-hang.patch
deleted file mode 100644
index 73dc0b40a049..000000000000
--- a/sys-apps/util-linux/files/util-linux-2.37.2-ioctl_ns-test-hang.patch
+++ /dev/null
@@ -1,37 +0,0 @@
-https://github.com/karelzak/util-linux/commit/597ccb7bf564f65bb059bfe420224cab0fba46ac.patch
-
-From 597ccb7bf564f65bb059bfe420224cab0fba46ac Mon Sep 17 00:00:00 2001
-From: Chris Hofstaedtler <zeha@debian.org>
-Date: Fri, 20 Aug 2021 10:30:50 +0000
-Subject: [PATCH] tests: Skip lsns/ioctl_ns test if unshare fails
-
-Some parts of the Debian build infrastructure uses unshare to run the
-package build, and that appears to cause a "nested" unshare in the
-lsns/ioctl_ns test to fail. Unfortunately the tests then hang at this
-point.
-
-Try running unshare before the actual test, and skip the test if unshare
-already fails.
-
-[kzak@redhat.com: - add --fork to the test
-                  - don't write to stdout/err]
-
-Signed-off-by: Chris Hofstaedtler <zeha@debian.org>
-Signed-off-by: Karel Zak <kzak@redhat.com>
----
- tests/ts/lsns/ioctl_ns | 2 ++
- 1 file changed, 2 insertions(+)
-
-diff --git a/tests/ts/lsns/ioctl_ns b/tests/ts/lsns/ioctl_ns
-index ef6360607..fa626bfda 100755
---- a/tests/ts/lsns/ioctl_ns
-+++ b/tests/ts/lsns/ioctl_ns
-@@ -34,6 +34,8 @@ ts_check_prog "mkfifo"
- ts_check_prog "touch"
- ts_check_prog "uniq"
- 
-+$TS_CMD_UNSHARE --user --pid --mount-proc --fork true &> /dev/null || ts_skip "no namespace support"
-+
- ts_cd "$TS_OUTDIR"
- 
- # The parent process receives namespaces ids via FIFO_DATA from bash