import CS man-pages-6.04-2.el9

This commit is contained in:
eabdullin 2025-03-11 07:44:32 +00:00
parent 858fa6cc7d
commit a34c3d9e9d
2 changed files with 71 additions and 2 deletions

View File

@ -0,0 +1,44 @@
From f1016b60769174da8e396e30fd25f58bb58d4232 Mon Sep 17 00:00:00 2001
From: Florian Weimer <fweimer@redhat.com>
Date: Wed, 28 Aug 2024 13:01:56 +0200
Subject: [PATCH] dlinfo.3: Document the RTLD_DI_PHDR request
First added in glibc 2.36, backported upstream to glibc 2.34,
so mention 2.34.1 for the first version.
Signed-off-by: Florian Weimer <fweimer@redhat.com>
Message-ID: <87o75chpwb.fsf@oldenburg.str.redhat.com>
Signed-off-by: Alejandro Colomar <alx@kernel.org>
---
man/man3/dlinfo.3 | 15 ++++++++++++++-
1 file changed, 14 insertions(+), 1 deletion(-)
diff --git a/man3/dlinfo.3 b/man3/dlinfo.3
index bc331dc..a77e514 100644
--- a/man3/dlinfo.3
+++ b/man3/dlinfo.3
@@ -194,10 +194,23 @@ If this object does not define a PT_TLS segment,
or if the calling thread has not allocated a block for it,
NULL is placed in
.IR *info .
+.TP
+.BR RTLD_DI_PHDR " (\fIconst ElfW(Phdr *)\fP, since glibc 2.34.1)"
+.\" glibc commit d056c212130280c0a54d9a4f72170ec621b70ce5 (2.36)
+.\" glibc commit 28ea43f8d64f0dd1f2de75525157730e1532e600 (2.35.1)
+.\" glibc commit 91c2e6c3db44297bf4cb3a2e3c40236c5b6a0b23 (2.34.1)
+Obtain the address of this shared object's program header and place it
+in
+.IR *info .
+This
+.B dlinfo
+call returns the number of program headers in the shared object.
.SH RETURN VALUE
On success,
.BR dlinfo ()
-returns 0.
+returns 0
+(if not specified explicitly),
+or a positive value corresponding to the request.
On failure, it returns \-1; the cause of the error can be diagnosed using
.BR dlerror (3).
.SH ATTRIBUTES

View File

@ -8,8 +8,24 @@
Summary: Linux kernel and C library user-space interface documentation Summary: Linux kernel and C library user-space interface documentation
Name: man-pages Name: man-pages
Version: 6.04 Version: 6.04
Release: 1%{?dist} Release: 2%{?dist}
License: GPL+ and GPLv2+ and BSD and MIT and Copyright only and IEEE # List of licenses with examples of man-pages using them
# BSD-2-Clause: man-pages/man5/elf.5
# BSD-3-Clause: man-pages/man3/list.3
# BSD-4.3TAHOE: man-pages/man5/resolv.conf.5
# BSD-4-Clause-UC: man-pages/man2/accept.2
# GPL-1.0-or-later: man-pages/man1/ldd.1
# GPL-2.0-only: man-pages/man2/fallocate.2
# GPL-2.0-or-later: man-pages/man1/getent.1
# LicenseRef-Fedora-Public-Domain: man-pages/man2/nfsservctl.2
# LicenseRef-Fedora-UltraPermissive: man-pages/man2/futex.2
# Linux-man-pages-1-para: man-pages/man2/getcpu.2
# Linux-man-pages-copyleft: man-pages/man2/chdir.2
# Linux-man-pages-copyleft-2-para: man-pages/man2/move_pages.2
# Linux-man-pages-copyleft-var: man-pages/man2/get_mempolicy.2
# MIT: man-pages/man3/program_invocation_name.3
# Spencer-94: man-pages/man7/regex.7
License: BSD-2-Clause AND BSD-3-Clause AND BSD-4.3TAHOE AND BSD-4-Clause-UC AND GPL-1.0-or-later AND GPL-2.0-only AND GPL-2.0-or-later AND LicenseRef-Fedora-Public-Domain AND LicenseRef-Fedora-UltraPermissive AND Linux-man-pages-1-para AND Linux-man-pages-copyleft AND Linux-man-pages-copyleft-2-para AND Linux-man-pages-copyleft-var AND MIT AND Spencer-94
URL: http://www.kernel.org/doc/man-pages/ URL: http://www.kernel.org/doc/man-pages/
Source: http://www.kernel.org/pub/linux/docs/man-pages/man-pages-%{version}.tar.xz Source: http://www.kernel.org/pub/linux/docs/man-pages/man-pages-%{version}.tar.xz
# POSIX man pages # POSIX man pages
@ -42,6 +58,10 @@ BuildArch: noarch
# https://bugzilla.kernel.org/show_bug.cgi?id=53781 # https://bugzilla.kernel.org/show_bug.cgi?id=53781
Patch21: man-pages-3.42-close.patch Patch21: man-pages-3.42-close.patch
# Upstream commit: https://git.kernel.org/pub/scm/docs/man-pages/man-pages.git/commit/?id=f1016b60769174da8e396e30fd25f58bb58d4232
# Resolves: RHEL-53953
Patch22: 0001-dlinfo.3-Document-the-RTLD_DI_PHDR-request.patch
%description %description
A large collection of manual pages from the Linux Documentation Project (LDP). A large collection of manual pages from the Linux Documentation Project (LDP).
@ -49,6 +69,7 @@ A large collection of manual pages from the Linux Documentation Project (LDP).
%setup -q -a 1 -a 2 %setup -q -a 1 -a 2
%patch21 -p1 %patch21 -p1
%patch22 -p1
# rename posix README so we don't have conflict # rename posix README so we don't have conflict
mv %{posix_name}/README %{posix_name}/%{posix_name_rel}.README mv %{posix_name}/README %{posix_name}/%{posix_name_rel}.README
@ -114,6 +135,10 @@ fi
%{_mandir}/man*/* %{_mandir}/man*/*
%changelog %changelog
* Fri Sep 13 2024 Lukas Javorsky <ljavorsk@redhat.com> - 6.04-2
- Add RTLD_DI_PHDR to dlinfo(3)
- Resolves: RHEL-53953
* Thu Jul 13 2023 Lukas Javorsky <ljavorsk@redhat.com> - 6.04-1 * Thu Jul 13 2023 Lukas Javorsky <ljavorsk@redhat.com> - 6.04-1
- Rebase to 6.04 version per request from RHIVOS team - Rebase to 6.04 version per request from RHIVOS team
- Resolves: RHEL-683 - Resolves: RHEL-683