commit: a21804071faec09d7e78775bbaecf71b2133af00 Author: Michael Mair-Keimberger <mmk <AT> levelnine <DOT> at> AuthorDate: Mon Apr 19 17:23:12 2021 +0000 Commit: Lars Wendler <polynomial-c <AT> gentoo <DOT> org> CommitDate: Mon Apr 19 21:50:56 2021 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=a2180407
sys-apps/util-linux: remove unused patches Package-Manager: Portage-3.0.18, Repoman-3.0.3 Signed-off-by: Michael Mair-Keimberger <mmk <AT> levelnine.at> Closes: https://github.com/gentoo/gentoo/pull/20461 Signed-off-by: Lars Wendler <polynomial-c <AT> gentoo.org> ...til-linux-2.33.1-fix-struct_termios-check.patch | 30 ---------------- ...-linux-2.36.1-libmount_dont_use_symfollow.patch | 40 ---------------------- .../files/util-linux-2.36.1-riscv32.patch | 29 ---------------- 3 files changed, 99 deletions(-) diff --git a/sys-apps/util-linux/files/util-linux-2.33.1-fix-struct_termios-check.patch b/sys-apps/util-linux/files/util-linux-2.33.1-fix-struct_termios-check.patch deleted file mode 100644 index df52af45049..00000000000 --- a/sys-apps/util-linux/files/util-linux-2.33.1-fix-struct_termios-check.patch +++ /dev/null @@ -1,30 +0,0 @@ -From 963413a1adf6767ab17712097e288e1a346f63a7 Mon Sep 17 00:00:00 2001 -From: Khem Raj <raj.k...@gmail.com> -Date: Fri, 4 Jan 2019 22:38:25 -0800 -Subject: [PATCH] ldattach: Check for value of _HAVE_STRUCT_TERMIOS_C_ISPEED - -in glibc 2.29+ checking for just existence of _HAVE_STRUCT_TERMIOS_C_ISPEED -won't be enough, the value has to be checked - -see -https://sourceware.org/git/?p=glibc.git;a=commit;h=e5a50db36eaa6e8c6427b3a971563240b633ca85 - -Signed-off-by: Khem Raj <raj.k...@gmail.com> ---- - sys-utils/ldattach.c | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/sys-utils/ldattach.c b/sys-utils/ldattach.c -index d33d68535..fb50711eb 100644 ---- a/sys-utils/ldattach.c -+++ b/sys-utils/ldattach.c -@@ -242,7 +242,7 @@ static int my_cfsetspeed(struct termios *ts, int speed) - * -- we have to bypass glibc and set the speed manually (because glibc - * checks for speed and supports Bxxx bit rates only)... - */ --#ifdef _HAVE_STRUCT_TERMIOS_C_ISPEED -+#if _HAVE_STRUCT_TERMIOS_C_ISPEED - # define BOTHER 0010000 /* non standard rate */ - dbg("using non-standard speeds"); - ts->c_ospeed = ts->c_ispeed = speed; - diff --git a/sys-apps/util-linux/files/util-linux-2.36.1-libmount_dont_use_symfollow.patch b/sys-apps/util-linux/files/util-linux-2.36.1-libmount_dont_use_symfollow.patch deleted file mode 100644 index 7c0b73f49d7..00000000000 --- a/sys-apps/util-linux/files/util-linux-2.36.1-libmount_dont_use_symfollow.patch +++ /dev/null @@ -1,40 +0,0 @@ -From 76bb9b30cfcf54b59591a57a3d2a747e514469b2 Mon Sep 17 00:00:00 2001 -From: Karel Zak <k...@redhat.com> -Date: Thu, 19 Nov 2020 09:49:16 +0100 -Subject: [PATCH] libmount: don't use "symfollow" for helpers on user mounts - -Addresses: https://github.com/karelzak/util-linux/issues/1193 -Signed-off-by: Karel Zak <k...@redhat.com> ---- - libmount/src/context_mount.c | 6 +++--- - 1 file changed, 3 insertions(+), 3 deletions(-) - -diff --git a/libmount/src/context_mount.c b/libmount/src/context_mount.c -index 8c394c1ff..dd1786176 100644 ---- a/libmount/src/context_mount.c -+++ b/libmount/src/context_mount.c -@@ -415,6 +415,9 @@ static int generate_helper_optstr(struct libmnt_context *cxt, char **optstr) - * string, because there is nothing like MS_EXEC (we only have - * MS_NOEXEC in mount flags and we don't care about the original - * mount string in libmount for VFS options). -+ * -+ * This use-case makes sense for MS_SECURE flags only (see -+ * mnt_optstr_get_flags() and mnt_context_merge_mflags()). - */ - if (!(cxt->mountflags & MS_NOEXEC)) - mnt_optstr_append_option(optstr, "exec", NULL); -@@ -422,11 +425,8 @@ static int generate_helper_optstr(struct libmnt_context *cxt, char **optstr) - mnt_optstr_append_option(optstr, "suid", NULL); - if (!(cxt->mountflags & MS_NODEV)) - mnt_optstr_append_option(optstr, "dev", NULL); -- if (!(cxt->mountflags & MS_NOSYMFOLLOW)) -- mnt_optstr_append_option(optstr, "symfollow", NULL); - } - -- - if (cxt->flags & MNT_FL_SAVED_USER) - rc = mnt_optstr_set_option(optstr, "user", cxt->orig_user); - if (rc) --- -2.29.2 - diff --git a/sys-apps/util-linux/files/util-linux-2.36.1-riscv32.patch b/sys-apps/util-linux/files/util-linux-2.36.1-riscv32.patch deleted file mode 100644 index b18a01906eb..00000000000 --- a/sys-apps/util-linux/files/util-linux-2.36.1-riscv32.patch +++ /dev/null @@ -1,29 +0,0 @@ -From 367972fae13d170675768d63678577cae1890143 Mon Sep 17 00:00:00 2001 -From: Pino Toscano <toscano.p...@tiscali.it> -Date: Tue, 17 Nov 2020 11:32:45 +0100 -Subject: [PATCH] hwclock: do not assume __NR_settimeofday_time32 - -Check that __NR_settimeofday_time32 exists before trying to use it as -syscall number. - -Signed-off-by: Pino Toscano <toscano.p...@tiscali.it> ---- - sys-utils/hwclock.c | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/sys-utils/hwclock.c b/sys-utils/hwclock.c -index 1f7ef3317..db448687d 100644 ---- a/sys-utils/hwclock.c -+++ b/sys-utils/hwclock.c -@@ -678,7 +678,7 @@ display_time(struct timeval hwctime) - #ifndef SYS_settimeofday - # ifdef __NR_settimeofday - # define SYS_settimeofday __NR_settimeofday --# else -+# elif defined(__NR_settimeofday_time32) - # define SYS_settimeofday __NR_settimeofday_time32 - # endif - #endif --- -2.26.2 -
