From 1ec508822531eeeac9ec6ddd1f18ad24cfdc98ba Mon Sep 17 00:00:00 2001 From: Iker Pedrosa Date: Thu, 6 May 2021 11:41:05 +0200 Subject: [PATCH] - man: mention NSS in new[ug]idmap manpages - libsubid: move development header to shadow folder --- ...w-4.8.1-man-mention-nss-in-newuidmap.patch | 44 +++++++++++++++++++ shadow-utils.spec | 11 ++++- 2 files changed, 53 insertions(+), 2 deletions(-) create mode 100644 shadow-4.8.1-man-mention-nss-in-newuidmap.patch diff --git a/shadow-4.8.1-man-mention-nss-in-newuidmap.patch b/shadow-4.8.1-man-mention-nss-in-newuidmap.patch new file mode 100644 index 0000000..e26cfa7 --- /dev/null +++ b/shadow-4.8.1-man-mention-nss-in-newuidmap.patch @@ -0,0 +1,44 @@ +From 186b1b7ac1a68d0fcc618a22da1a99232b420911 Mon Sep 17 00:00:00 2001 +From: Serge Hallyn +Date: Tue, 4 May 2021 14:39:26 -0500 +Subject: [PATCH] manpages: mention NSS in new[ug]idmap manpages + +Closes #328 + +Signed-off-by: Serge Hallyn +--- + man/newgidmap.1.xml | 3 ++- + man/newuidmap.1.xml | 3 ++- + 2 files changed, 4 insertions(+), 2 deletions(-) + +diff --git a/man/newgidmap.1.xml b/man/newgidmap.1.xml +index 71b03e56..76fc1e30 100644 +--- a/man/newgidmap.1.xml ++++ b/man/newgidmap.1.xml +@@ -88,7 +88,8 @@ + DESCRIPTION + + The newgidmap sets /proc/[pid]/gid_map based on its +- command line arguments and the gids allowed in /etc/subgid. ++ command line arguments and the gids allowed (either in /etc/subgid or ++ through the configured NSS subid module). + Note that the root user is not exempted from the requirement for a valid + /etc/subgid entry. + +diff --git a/man/newuidmap.1.xml b/man/newuidmap.1.xml +index a6f1f085..44eca50a 100644 +--- a/man/newuidmap.1.xml ++++ b/man/newuidmap.1.xml +@@ -88,7 +88,8 @@ + DESCRIPTION + + The newuidmap sets /proc/[pid]/uid_map based on its +- command line arguments and the uids allowed in /etc/subuid. ++ command line arguments and the uids allowed (either in /etc/subuid or ++ through the configured NSS subid module). + Note that the root user is not exempted from the requirement for a valid + /etc/subuid entry. + +-- +2.30.2 + diff --git a/shadow-utils.spec b/shadow-utils.spec index 551de7a..3a8e510 100644 --- a/shadow-utils.spec +++ b/shadow-utils.spec @@ -1,7 +1,7 @@ Summary: Utilities for managing accounts and shadow password files Name: shadow-utils Version: 4.8.1 -Release: 9%{?dist} +Release: 10%{?dist} Epoch: 2 URL: https://github.com/shadow-maint/shadow Source0: https://github.com/shadow-maint/shadow/releases/download/%{version}/shadow-%{version}.tar.xz @@ -13,7 +13,7 @@ Source5: https://www.gnu.org/licenses/old-licenses/gpl-2.0.txt Source6: shadow-utils.HOME_MODE.xml ### Globals ### -%global includesubiddir %{_includedir}/subid +%global includesubiddir %{_includedir}/shadow ### Patches ### # Misc small changes - most probably non-upstreamable @@ -76,6 +76,8 @@ Patch47: shadow-4.8.1-libsubid_creation.patch # https://github.com/shadow-maint/shadow/commit/8492dee6632e340dee76eee895c3e30877bebf45 # https://github.com/shadow-maint/shadow/commit/0f4347d1483191b2142546416a9eefe0c9459600 Patch48: shadow-4.8.1-libsubid_nsswitch_support.patch +# https://github.com/shadow-maint/shadow/commit/186b1b7ac1a68d0fcc618a22da1a99232b420911 +Patch49: shadow-4.8.1-man-mention-nss-in-newuidmap.patch License: BSD and GPLv2+ BuildRequires: make @@ -149,6 +151,7 @@ Development files for shadow-utils-subid. %patch46 -p1 -b .man-include-lastlog-file-caveat %patch47 -p1 -b .libsubid_creation %patch48 -p1 -b .libsubid_nsswitch_support +%patch49 -p1 -b .man-mention-nss-in-newuidmap iconv -f ISO88591 -t utf-8 doc/HOWTO > doc/HOWTO.utf8 cp -f doc/HOWTO.utf8 doc/HOWTO @@ -317,6 +320,10 @@ rm -f $RPM_BUILD_ROOT/%{_libdir}/libsubid.la %{_libdir}/libsubid.so %changelog +* Thu May 6 2021 Iker Pedrosa - 2:4.8.1-10 +- man: mention NSS in new[ug]idmap manpages +- libsubid: move development header to shadow folder + * Fri Apr 16 2021 Iker Pedrosa - 2:4.8.1-9 - libsubid: creation and nsswitch support - Creation of subid and subid-devel subpackages