Rebase to version 6.06

Patch 22 was upstreamed
This commit is contained in:
Lukas Javorsky 2024-02-12 08:10:05 +00:00
parent 55734053e8
commit 5fcbbca994
4 changed files with 3 additions and 48 deletions

1
.gitignore vendored
View File

@ -36,3 +36,4 @@
/man-pages-6.04.tar.xz
/man-pages-6.05.tar.xz
/man-pages-6.05.01.tar.xz
/man-pages-6.06.tar.xz

View File

@ -1,41 +0,0 @@
From b34c2340657cfe467a0c2cde4933422bddf4348b Mon Sep 17 00:00:00 2001
From: Alexey Tikhonov <atikhono@redhat.com>
Date: Wed, 20 Dec 2023 18:28:34 +0100
Subject: [PATCH] unix.7: SO_PEERCRED: Mention listen(2)
In case of connected AF_UNIX stream sockets, server-side credentials are
set at the time of a call to listen(2), not when client-side calls
connect(2).
This is important if server side process changes UID/GID after listen(2)
and before connect(2).
Reproducer is available in [1].
Behavior was confirmed in the email thread [2].
Link: [1] <https://bugzilla.redhat.com/show_bug.cgi?id=2247682>
Link: [2] <https://lore.kernel.org/linux-man/CABPeg3a9L0142gmdZZ+0hoD+Q3Vgv0BQ21g8Z+gf2kznWouErA@mail.gmail.com/>
Signed-off-by: Alexey Tikhonov <atikhono@redhat.com>
Reviewed-by: Kuniyuki Iwashima <kuniyu@amazon.com>
Signed-off-by: Alejandro Colomar <alx@kernel.org>
---
man7/unix.7 | 3 ++-
1 file changed, 2 insertions(+), 1 deletion(-)
diff --git a/man7/unix.7 b/man7/unix.7
index e9edad467..71cdfc758 100644
--- a/man7/unix.7
+++ b/man7/unix.7
@@ -331,7 +331,8 @@ This read-only socket option returns the
credentials of the peer process connected to this socket.
The returned credentials are those that were in effect at the time
of the call to
-.BR connect (2)
+.BR connect (2),
+.BR listen (2),
or
.BR socketpair (2).
.IP
--
2.41.0

View File

@ -3,7 +3,7 @@
Summary: Linux kernel and C library user-space interface documentation
Name: man-pages
Version: 6.05.01
Version: 6.06
Release: %autorelease
# List of all licenses - each with an example of a man-page that uses it
# (complete list of all man-pages per license would be too long)
@ -51,10 +51,6 @@ BuildArch: noarch
# https://bugzilla.kernel.org/show_bug.cgi?id=53781
Patch21: man-pages-3.42-close.patch
# resolves: #2247682
# upstream commit b34c2340657cfe467a0c2cde4933422bddf4348b
Patch22: man-pages-6.05-unix.7-SO_PEERCRED.patch
%description
A large collection of manual pages from the Linux Documentation Project (LDP).
@ -62,7 +58,6 @@ A large collection of manual pages from the Linux Documentation Project (LDP).
%setup -q -a 1
%patch -P 21 -p1
%patch -P 22 -p1
## Remove man pages we are not going to use ##

View File

@ -1,2 +1,2 @@
SHA512 (man-pages-additional-20140218.tar.xz) = c7874db32a9bdefaea6c6be6549e6e6538fa1d93260bf342dd0d9821fa05754aa79a723e701493c81b2e1f460918429eb9b5edb704b55878b1e5ed585a3ff07d
SHA512 (man-pages-6.05.01.tar.xz) = ad3f6dc28bb83824faf8c855a5db8983dc0f5ac3b5702624033ed320a6f39a7f1f0845acf0bc62a0a10cdfe42eb66ba9596e2796ba2683cfb29e480710da3d70
SHA512 (man-pages-6.06.tar.xz) = c50b5a47cff5172e46752b61af4dd9f54ee0be88ab69bcc5914bd8ce5ddfaf7358143bea9f69bd6a45f0420eb5eb4596c2200109b23fe98a5221dd01e4a8ea15