commit: 83e6d06addde9b8beac5ab796e7429e7ab5c742c Author: Michael Mair-Keimberger <mmk <AT> levelnine <DOT> at> AuthorDate: Fri Dec 29 14:19:27 2023 +0000 Commit: Conrad Kostecki <conikost <AT> gentoo <DOT> org> CommitDate: Sun Dec 31 02:36:37 2023 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=83e6d06a
sys-apps/util-linux: remove unused patches Signed-off-by: Michael Mair-Keimberger <mmk <AT> levelnine.at> Closes: https://github.com/gentoo/gentoo/pull/34540 Signed-off-by: Conrad Kostecki <conikost <AT> gentoo.org> .../files/util-linux-2.39.1-mount-no-statx.patch | 34 ---------------------- .../files/util-linux-2.39.1-wall-no-tty.patch | 26 ----------------- 2 files changed, 60 deletions(-) diff --git a/sys-apps/util-linux/files/util-linux-2.39.1-mount-no-statx.patch b/sys-apps/util-linux/files/util-linux-2.39.1-mount-no-statx.patch deleted file mode 100644 index 02e8ef20c416..000000000000 --- a/sys-apps/util-linux/files/util-linux-2.39.1-mount-no-statx.patch +++ /dev/null @@ -1,34 +0,0 @@ -https://github.com/util-linux/util-linux/issues/2409 -https://github.com/util-linux/util-linux/commit/91c2cbdf3a04f2f3f4c4bb0d2a6053874bfa11ea - -From 91c2cbdf3a04f2f3f4c4bb0d2a6053874bfa11ea Mon Sep 17 00:00:00 2001 -From: =?UTF-8?q?Thomas=20Wei=C3=9Fschuh?= <[email protected]> -Date: Thu, 3 Aug 2023 07:13:28 +0200 -Subject: [PATCH] libmount: (utils) fix statx fallback -MIME-Version: 1.0 -Content-Type: text/plain; charset=UTF-8 -Content-Transfer-Encoding: 8bit - -If the systemcall is not available ENOSYS is returned. - -Under glibc the statx implementation also has its own fallback logic. -As AT_STATX_DONT_SYNC can't be implemented correctly in that fallback -logic the wrapper will return EINVAL in case the emulation is needed and -AT_STATX_DONT_SYNC is set. -So also use our own fallback in that case. - -Fixes: #2409 -Signed-off-by: Thomas Weißschuh <[email protected]> ---- a/libmount/src/utils.c -+++ b/libmount/src/utils.c -@@ -133,7 +133,8 @@ static int safe_stat(const char *target, struct stat *st, int nofollow) - st->st_mode = stx.stx_mode; - } - -- if (rc == 0 || errno != EOPNOTSUPP) -+ if (rc == 0 || -+ (errno != EOPNOTSUPP && errno != ENOSYS && errno != EINVAL)) - return rc; - } - #endif - diff --git a/sys-apps/util-linux/files/util-linux-2.39.1-wall-no-tty.patch b/sys-apps/util-linux/files/util-linux-2.39.1-wall-no-tty.patch deleted file mode 100644 index e95dbc358d33..000000000000 --- a/sys-apps/util-linux/files/util-linux-2.39.1-wall-no-tty.patch +++ /dev/null @@ -1,26 +0,0 @@ -https://bugs.gentoo.org/911336 -https://github.com/util-linux/util-linux/pull/2412 - -From 7d3713a6d541be0bac0bb78cc8fea1620583fd08 Mon Sep 17 00:00:00 2001 -From: Mike Gilbert <[email protected]> -Date: Sat, 29 Jul 2023 17:32:57 -0400 -Subject: [PATCH] wall: do not error for ttys that do not exist - -Some wayland display managers (GDM) put strings like "seat0" in the -ut_line field of utmp entries. These are not valid tty devices. - -Avoid writing a confusing error message for ttys that do not exist. - -Bug: https://bugs.gentoo.org/911336 -Signed-off-by: Mike Gilbert <[email protected]> ---- a/term-utils/ttymsg.c -+++ b/term-utils/ttymsg.c -@@ -100,7 +100,7 @@ ttymsg(struct iovec *iov, size_t iovcnt, char *line, int tmout) { - * if not running as root; not an error. - */ - if ((fd = open(device, O_WRONLY|O_NONBLOCK, 0)) < 0) { -- if (errno == EBUSY || errno == EACCES) -+ if (errno == EBUSY || errno == EACCES || errno == ENOENT) - return NULL; - - len = snprintf(errbuf, sizeof(errbuf), "%s: %m", device);
