Rebase to version 6.00

Patch 22 was upstreamed

Resolves: #2134657
This commit is contained in:
Lukas Javorsky 2022-10-15 15:14:53 +00:00
parent fa16e92113
commit 109cc71b74
4 changed files with 8 additions and 50 deletions

1
.gitignore vendored
View File

@ -29,3 +29,4 @@
/man-pages-5.11.tar.xz
/man-pages-5.12.tar.xz
/man-pages-5.13.tar.xz
/man-pages-6.00.tar.xz

View File

@ -1,43 +0,0 @@
From e2e1ac46cfc92f929f9d80e00678a6d44c9c40f9 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Nikola=20Forr=C3=B3?= <nforro@redhat.com>
Date: Fri, 22 Jul 2022 14:47:43 +0200
Subject: [PATCH] nsswitch.conf.5: Mention subid database
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
shadow-utils use nsswitch.conf for configuring delegation of subordinate
uids/gids.
Reference:
https://github.com/shadow-maint/shadow/blob/3ec32f9975f262073f8fbdecd2bfaee4a1d3db48/lib/nss.c
and subuid.5/subgid.5 man pages.
Signed-off-by: Nikola Forró <nforro@redhat.com>
---
man5/nsswitch.conf.5 | 8 ++++++++
1 file changed, 8 insertions(+)
diff --git a/man5/nsswitch.conf.5 b/man5/nsswitch.conf.5
index 2a93b7d..fcedc75 100644
--- a/man5/nsswitch.conf.5
+++ b/man5/nsswitch.conf.5
@@ -110,6 +110,14 @@ For example,
consults the
.B sudoers
database.
+Delegation of subordinate user/group IDs
+can be configured using the
+.B subid
+database. Refer to
+.BR subuid (5)
+and
+.BR subgid (5)
+for more details.
.PP
Here is an example
.I /etc/nsswitch.conf
--
2.35.3

View File

@ -3,8 +3,8 @@
Summary: Linux kernel and C library user-space interface documentation
Name: man-pages
Version: 5.13
Release: 5%{?dist}
Version: 6.00
Release: 1%{?dist}
License: GPL+ and GPLv2+ and BSD and MIT and Copyright only
URL: http://www.kernel.org/doc/man-pages/
Source: http://www.kernel.org/pub/linux/docs/man-pages/man-pages-%{version}.tar.xz
@ -34,9 +34,6 @@ BuildArch: noarch
# https://bugzilla.kernel.org/show_bug.cgi?id=53781
Patch21: man-pages-3.42-close.patch
# https://lore.kernel.org/linux-man/920642e4bc7b60c19962187b266dfc0ee4ac7f27.camel@redhat.com/
Patch22: man-pages-5.13-subid.patch
%description
A large collection of manual pages from the Linux Documentation Project (LDP).
@ -44,7 +41,6 @@ A large collection of manual pages from the Linux Documentation Project (LDP).
%setup -q -a 1
%patch21 -p1
%patch22 -p1
## Remove man pages we are not going to use ##
@ -100,6 +96,10 @@ fi
%{_mandir}/man*/*
%changelog
* Fri Oct 14 2022 Lukas Javorsky <ljavorsk@redhat.com> - 6.00-1
- Rebase to version 6.00
- Patch 22 upstreamed
* Tue Aug 23 2022 Nikola Forró <nforro@redhat.com> - 5.13-5
- nsswitch.conf.5: Mention subid database

View File

@ -1,2 +1,2 @@
SHA512 (man-pages-additional-20140218.tar.xz) = c7874db32a9bdefaea6c6be6549e6e6538fa1d93260bf342dd0d9821fa05754aa79a723e701493c81b2e1f460918429eb9b5edb704b55878b1e5ed585a3ff07d
SHA512 (man-pages-5.13.tar.xz) = a68c0bd5f078aff2f13f962060863e5d30734c1c562e8e9e3d5eda5a329b18ad3e9b4ebb883d31cacfc0a476f91fccb8dd4257598acd75d09dd21351893d3499
SHA512 (man-pages-6.00.tar.xz) = c0286146fed800175316610998ea887568c168bcf3ec9a401209c6c159cedd9258c1e77e513cbe835268b563dd766b3ecc24751c6ab49ebb7ace8c84d8b83e68