From 2adf351f2c8eefc38201a508e4d116ded677178e Mon Sep 17 00:00:00 2001 From: eabdullin Date: Wed, 15 May 2024 07:47:54 +0000 Subject: [PATCH] Import from AlmaLinux stable repository --- .gitignore | 2 +- .man-pages.metadata | 2 +- .../man-pages-5.10-resolv-conf-typo-fix.patch | 31 ------------- SOURCES/man-pages-5.10-subid.patch | 43 ------------------- SPECS/man-pages.spec | 30 ++++++------- 5 files changed, 16 insertions(+), 92 deletions(-) delete mode 100644 SOURCES/man-pages-5.10-resolv-conf-typo-fix.patch delete mode 100644 SOURCES/man-pages-5.10-subid.patch diff --git a/.gitignore b/.gitignore index c9d056c..8b5c83c 100644 --- a/.gitignore +++ b/.gitignore @@ -1,3 +1,3 @@ -SOURCES/man-pages-5.10.tar.xz +SOURCES/man-pages-6.04.tar.xz SOURCES/man-pages-additional-20140218.tar.xz SOURCES/man-pages-posix-2017-a.tar.xz diff --git a/.man-pages.metadata b/.man-pages.metadata index 59072a2..5052dc5 100644 --- a/.man-pages.metadata +++ b/.man-pages.metadata @@ -1,3 +1,3 @@ -07eab8e97d25899967912c1e260909511cf4e06a SOURCES/man-pages-5.10.tar.xz +35324d278c7fa756cf51455e8b7f66faefd1e3cb SOURCES/man-pages-6.04.tar.xz 315c9144f71c0edf1af823fb3f7735e93f6f17c3 SOURCES/man-pages-additional-20140218.tar.xz ee907694a6ac012adb856ce0342103311340fcec SOURCES/man-pages-posix-2017-a.tar.xz diff --git a/SOURCES/man-pages-5.10-resolv-conf-typo-fix.patch b/SOURCES/man-pages-5.10-resolv-conf-typo-fix.patch deleted file mode 100644 index 83b0439..0000000 --- a/SOURCES/man-pages-5.10-resolv-conf-typo-fix.patch +++ /dev/null @@ -1,31 +0,0 @@ -From 076fbe061333bdfecbd5765c782c477233e38e2f Mon Sep 17 00:00:00 2001 -From: John Morris -Date: Tue, 5 Jan 2021 23:30:10 -0600 -Subject: [PATCH] resolv.conf.5: tfix - -Change `RES_USE_EDNSO` to `RES_USE_EDNS0`, defined in -`resolv.h`. (This is written correctly in `man3/resolver.3` in this -same repo.) Helps with grepping and internet searches! - -Signed-off-by: John Morris -Signed-off-by: Michael Kerrisk ---- - man5/resolv.conf.5 | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/man5/resolv.conf.5 b/man5/resolv.conf.5 -index c1b3d017a..8ed958932 100644 ---- a/man5/resolv.conf.5 -+++ b/man5/resolv.conf.5 -@@ -264,7 +264,7 @@ these options were removed in glibc 2.25. - .TP - .BR edns0 " (since glibc 2.6)" - Sets --.BR RES_USE_EDNSO -+.BR RES_USE_EDNS0 - in - .IR _res.options . - This enables support for the DNS extensions described in RFC\ 2671. --- -2.37.3 - diff --git a/SOURCES/man-pages-5.10-subid.patch b/SOURCES/man-pages-5.10-subid.patch deleted file mode 100644 index 2df2178..0000000 --- a/SOURCES/man-pages-5.10-subid.patch +++ /dev/null @@ -1,43 +0,0 @@ -From 02425d9113f378c746dff7d4510d28719e8e9255 Mon Sep 17 00:00:00 2001 -From: =?UTF-8?q?Nikola=20Forr=C3=B3?= -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ó ---- - man5/nsswitch.conf.5 | 8 ++++++++ - 1 file changed, 8 insertions(+) - -diff --git a/man5/nsswitch.conf.5 b/man5/nsswitch.conf.5 -index f2eeb24..0d969c3 100644 ---- a/man5/nsswitch.conf.5 -+++ b/man5/nsswitch.conf.5 -@@ -109,6 +109,14 @@ databases. 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 - diff --git a/SPECS/man-pages.spec b/SPECS/man-pages.spec index 3ffd07a..0f4aa10 100644 --- a/SPECS/man-pages.spec +++ b/SPECS/man-pages.spec @@ -7,8 +7,8 @@ Summary: Linux kernel and C library user-space interface documentation Name: man-pages -Version: 5.10 -Release: 6%{?dist} +Version: 6.04 +Release: 1%{?dist} License: GPL+ and GPLv2+ and BSD and MIT and Copyright only and IEEE URL: http://www.kernel.org/doc/man-pages/ Source: http://www.kernel.org/pub/linux/docs/man-pages/man-pages-%{version}.tar.xz @@ -42,14 +42,6 @@ BuildArch: noarch # https://bugzilla.kernel.org/show_bug.cgi?id=53781 Patch21: man-pages-3.42-close.patch -# resolves: #2059981 -# https://lore.kernel.org/linux-man/920642e4bc7b60c19962187b266dfc0ee4ac7f27.camel@redhat.com/ -Patch22: man-pages-5.10-subid.patch - -# resolv.conf man pages typo fix -# Source: Upstream-commit 076fbe061333bdfecbd5765c782c477233e38e2f -Patch23: man-pages-5.10-resolv-conf-typo-fix.patch - %description A large collection of manual pages from the Linux Documentation Project (LDP). @@ -57,8 +49,6 @@ A large collection of manual pages from the Linux Documentation Project (LDP). %setup -q -a 1 -a 2 %patch21 -p1 -%patch22 -p1 -%patch23 -p1 # rename posix README so we don't have conflict mv %{posix_name}/README %{posix_name}/%{posix_name_rel}.README @@ -84,12 +74,12 @@ rm man3/crypt{,_r}.3 # nothing to build %install -make install DESTDIR=$RPM_BUILD_ROOT +make install prefix=/usr DESTDIR=$RPM_BUILD_ROOT pushd %{posix_name} -make install DESTDIR=$RPM_BUILD_ROOT +make install prefix=/usr DESTDIR=$RPM_BUILD_ROOT popd pushd %{additional_name} -make install DESTDIR=$RPM_BUILD_ROOT +make install prefix=/usr DESTDIR=$RPM_BUILD_ROOT popd # rename files for alternative usage @@ -118,12 +108,20 @@ if [ $1 -ge 1 ]; then fi %files -%doc README man-pages-%{version}.Announce Changes +%doc README Changes %doc %{posix_name}/POSIX-COPYRIGHT %{posix_name}/%{posix_name_rel}.{README,Announce} %ghost %{_mandir}/man7/man.7* %{_mandir}/man*/* %changelog +* Thu Jul 13 2023 Lukas Javorsky - 6.04-1 +- Rebase to 6.04 version per request from RHIVOS team +- Resolves: RHEL-683 + +* Wed May 03 2023 Lukas Javorsky - 5.10-7 +- resolv.conf.5 no-aaaa option + resolves: RHEL-454 + * Fri Nov 04 2022 Lukas Javorsky - 5.10-6 - Fix the resolv.conf typo - Source from upstream commit 076fbe061333bdfecbd5765c782c477233e38e2f