diff options
author | V3n3RiX <venerix@koprulu.sector> | 2024-03-28 07:12:54 +0000 |
---|---|---|
committer | V3n3RiX <venerix@koprulu.sector> | 2024-03-28 07:12:54 +0000 |
commit | 63a01a3024a6fa402d123768cd38f1cabe13adf6 (patch) | |
tree | 439fe2938e6178658c16e1109f895390a4786cbd /sys-apps/util-linux/files | |
parent | 5e9fc028c5219fddb410ed4e213b54cf4618a563 (diff) |
gentoo auto-resync : 28:03:2024 - 07:12:54
Diffstat (limited to 'sys-apps/util-linux/files')
-rw-r--r-- | sys-apps/util-linux/files/util-linux-2.38.1-check-for-sys-pidfd.h.patch | 52 | ||||
-rw-r--r-- | sys-apps/util-linux/files/util-linux-2.38.1-more-posix-exit-on-eof.patch | 32 |
2 files changed, 0 insertions, 84 deletions
diff --git a/sys-apps/util-linux/files/util-linux-2.38.1-check-for-sys-pidfd.h.patch b/sys-apps/util-linux/files/util-linux-2.38.1-check-for-sys-pidfd.h.patch deleted file mode 100644 index 0a1975fff685..000000000000 --- a/sys-apps/util-linux/files/util-linux-2.38.1-check-for-sys-pidfd.h.patch +++ /dev/null @@ -1,52 +0,0 @@ -https://github.com/util-linux/util-linux/pull/1769 -https://bugs.gentoo.org/893966 - -From 84732a8849a08d42a9a95dcbee9005116be78eb8 Mon Sep 17 00:00:00 2001 -From: Khem Raj <raj.khem@gmail.com> -Date: Sun, 7 Aug 2022 14:39:19 -0700 -Subject: [PATCH] check for sys/pidfd.h - -This header in newer glibc defines the signatures of functions -pidfd_send_signal() and pidfd_open() and when these functions are -defined by libc then we need to include the relevant header to get -the definitions. Clang 15+ has started to error out when function -signatures are missing. - -Fixes errors like -misc-utils/kill.c:402:6: error: call to undeclared function 'pidfd_send_signal'; ISO C99 and later do not support implicit function declarations [-Wimplicit-function-declaration] - if (pidfd_send_signal(pfd, ctl->numsig, &info, 0) < 0) - -Signed-off-by: Khem Raj <raj.khem@gmail.com> ---- - configure.ac | 1 + - include/pidfd-utils.h | 4 +++- - 2 files changed, 4 insertions(+), 1 deletion(-) - -diff --git a/configure.ac b/configure.ac -index 51deeecd4e..daa8f0dca4 100644 ---- a/configure.ac -+++ b/configure.ac -@@ -342,6 +342,7 @@ AC_CHECK_HEADERS([ \ - sys/mkdev.h \ - sys/mount.h \ - sys/param.h \ -+ sys/pidfd.h \ - sys/prctl.h \ - sys/resource.h \ - sys/sendfile.h \ -diff --git a/include/pidfd-utils.h b/include/pidfd-utils.h -index eddede9767..d9e33cbc57 100644 ---- a/include/pidfd-utils.h -+++ b/include/pidfd-utils.h -@@ -4,8 +4,10 @@ - #ifdef HAVE_SYS_SYSCALL_H - # include <sys/syscall.h> - # if defined(SYS_pidfd_send_signal) && defined(SYS_pidfd_open) -+# ifdef HAVE_SYS_PIDFD_H -+# include <sys/pidfd.h> -+# endif - # include <sys/types.h> -- - # ifndef HAVE_PIDFD_SEND_SIGNAL - static inline int pidfd_send_signal(int pidfd, int sig, siginfo_t *info, - unsigned int flags) diff --git a/sys-apps/util-linux/files/util-linux-2.38.1-more-posix-exit-on-eof.patch b/sys-apps/util-linux/files/util-linux-2.38.1-more-posix-exit-on-eof.patch deleted file mode 100644 index 07d158761c26..000000000000 --- a/sys-apps/util-linux/files/util-linux-2.38.1-more-posix-exit-on-eof.patch +++ /dev/null @@ -1,32 +0,0 @@ -https://forums.gentoo.org/viewtopic-t-1160959.html -https://github.com/util-linux/util-linux/issues/1703 -https://github.com/util-linux/util-linux/commit/28b391ce7e58f8327c092b3911c05f526d0ad586 - -From 28b391ce7e58f8327c092b3911c05f526d0ad586 Mon Sep 17 00:00:00 2001 -From: Karel Zak <kzak@redhat.com> -Date: Wed, 15 Jun 2022 10:03:44 +0200 -Subject: [PATCH] more: restore exit-on-eof if POSIXLY_CORRECT is not set - -In version 2.38, exit-on-eof has been disabled by default. This change -is annoying for users and forces many users to use 'alias more="more --e"'. It seems better to force POSIX lovers to use POSIXLY_CORRECT -env. variable and stay backwardly compatible by default. - -Addresses: https://github.com/util-linux/util-linux/issues/1703 -Addresses: https://bugzilla.redhat.com/show_bug.cgi?id=2088493 -Signed-off-by: Karel Zak <kzak@redhat.com> ---- a/text-utils/more.c -+++ b/text-utils/more.c -@@ -2052,8 +2052,11 @@ int main(int argc, char **argv) - if (!(strcmp(program_invocation_short_name, "page"))) - ctl.no_scroll++; - -+ ctl.exit_on_eof = getenv("POSIXLY_CORRECT") ? 0 : 1; -+ - if ((s = getenv("MORE")) != NULL) - env_argscan(&ctl, s); -+ - argscan(&ctl, argc, argv); - - /* clear any inherited settings */ - |