packages/shadow
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

add soma patchs from upstream

Browse Source
This commit is contained in:
zhangxingrong 2024-10-08 17:51:49 +08:00
parent d7a470c12a
commit 037109f63c
3 changed files with 74 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

37
backport-lib-idmapping.c--Use-long-constants-in-prctl-2.patch Normal file
View File

@ -0,0 +1,37 @@
From 80efeebaf296dc4814e15d67977726b3ee93c048 Mon Sep 17 00:00:00 2001
From: Alejandro Colomar <alx@kernel.org>
Date: Fri, 31 May 2024 18:30:16 +0200
Subject: [PATCH] lib/idmapping.c: Use long constants in prctl(2), and remove
0s
The prctl(2) system-call wrapper is implemented as a variadic function.
This makes it important to pass arguments to it of the right type (and
more importantly of the right width), to avoid undefined behavior.
While at it, check errors with ==-1, not <0, which is more explicit.
Also, PR_SET_KEEPCAPS(2const) doesn't need all arguments, so it can be
called with just two of them; remove unnecessary 0s.
See-also: prctl(2), PR_SET_KEEPCAPS(2const)
Link: <https://lore.kernel.org/linux-man/ddbdyaiptesjalgfmztxideej67e3yaob7ucsmbf6qvriwxiif@dohhxrqgwhrf/T/#med306b5b003f9cc7cc2de69fcdd7ee2d056d0954>
Cc: Xi Ruoyao <xry111@xry111.site>
Cc: Lukas Slebodnik <lslebodn@fedoraproject.org>
Signed-off-by: Alejandro Colomar <alx@kernel.org>
---
lib/idmapping.c | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/lib/idmapping.c b/lib/idmapping.c
index fe3ccdfe3..5cbb6fefc 100644
--- a/lib/idmapping.c
+++ b/lib/idmapping.c
@@ -159,7 +159,7 @@ void write_mapping(int proc_dir_fd, int ranges, const struct map_range *mappings
/* Align setuid- and fscaps-based new{g,u}idmap behavior. */
if (geteuid() == 0 && geteuid() != ruid) {
- if (prctl(PR_SET_KEEPCAPS, 1, 0, 0, 0) < 0) {
+ if (prctl(PR_SET_KEEPCAPS, 1L) == -1) {
fprintf(log_get_logfd(), _("%s: Could not prctl(PR_SET_KEEPCAPS)\n"), log_get_progname());
exit(EXIT_FAILURE);
}

30
backport-man-lastlog-remove-wrong-use-of-keyword-term.patch Normal file
View File

@ -0,0 +1,30 @@
From 9f57beb31ade241aeda412a8ada4912bab83bd40 Mon Sep 17 00:00:00 2001
From: Serge Hallyn <serge@hallyn.com>
Date: Wed, 5 Jun 2024 08:02:27 -0500
Subject: [PATCH] man/lastlog: remove wrong use of keyword term
Per https://tdg.docbook.org/tdg/4.5/term, term is a word being
defined in a varlistentry. The 'high uid' description is not a
varlistentry, so <term> and </term> show up in the processed
manpage. See debian Bug#1072297.
Signed-off-by: Serge Hallyn <serge@hallyn.com>
---
man/lastlog.8.xml | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/man/lastlog.8.xml b/man/lastlog.8.xml
index 7a4ba967f..6700791c1 100644
--- a/man/lastlog.8.xml
+++ b/man/lastlog.8.xml
@@ -211,8 +211,8 @@
to hang as it processes entries with UIDs 171-799).
</para>
<para>
- Having high UIDs can create problems when handling the <term><filename>
- /var/log/lastlog</filename></term> with external tools. Although the
+ Having high UIDs can create problems when handling the <filename>
+ /var/log/lastlog</filename> with external tools. Although the
actual file is sparse and does not use too much space, certain
applications are not designed to identify sparse files by default and may
require a specific option to handle them.

8
shadow.spec
View File

@ -1,6 +1,6 @@
Name: shadow
Version: 4.14.3
Release: 2
Release: 3
Epoch: 2
License: BSD and GPLv2+
Summary: Tools for managing accounts and shadow password files
@ -20,6 +20,8 @@ Patch0: usermod-unlock.patch
Patch1: shadow-add-sm3-crypt-support.patch
Patch2: shadow-Remove-encrypted-passwd-for-useradd-gr.patch
Patch3: shadow-libsubid-Dealocate-memory-on-exit.patch
Patch4: backport-lib-idmapping.c--Use-long-constants-in-prctl-2.patch
Patch5: backport-man-lastlog-remove-wrong-use-of-keyword-term.patch
BuildRequires: gcc, libselinux-devel, audit-libs-devel, libsemanage-devel
BuildRequires: libacl-devel, libattr-devel
@ -189,6 +191,10 @@ rm -f $RPM_BUILD_ROOT/%{_libdir}/libsubid.{la,a}
%{_mandir}/*/*
%changelog
* Wed Oct 9 2024 zhangxingrong <zhangxingrong@uniontech.com> - 2:4.14.3-3
- lib/idmapping.c: Use long constants in prctl(2)
- man/lastlog: remove wrong use of keyword term
* Fri Sep 6 2024 zhangzikang <zhangzikang@kylinos.cn> - 2:4.14.3-2
- libsubid: Dealocate memory on exit