Rebase to version 6.04

This was requested by RHIVOS team
Backport Fedora changes from commits: 245fa37 and 5d7c7d7

Resolves: RHEL-683

.gitignore

@@ -26,3 +26,4 @@
 /man-pages-5.08.tar.xz
 /man-pages-5.09.tar.xz
 /man-pages-5.10.tar.xz
+/man-pages-6.04.tar.xz

man-pages-5.10-resolv-conf-typo-fix.patch

@@ -1,31 +0,0 @@
-From 076fbe061333bdfecbd5765c782c477233e38e2f Mon Sep 17 00:00:00 2001
-From: John Morris <john@zultron.com>
-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 <john@zultron.com>
-Signed-off-by: Michael Kerrisk <mtk.manpages@gmail.com>
----
- 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
-

man-pages-5.10-resolv.conf.5-no-aaaa.patch

@@ -1,47 +0,0 @@
-From ebd8a5bc9259cc7a95460ee835df50cef0c32aae Mon Sep 17 00:00:00 2001
-From: Lukas Javorsky <ljavorsk@redhat.com>
-Date: Wed, 12 Apr 2023 17:52:14 +0000
-Subject: [PATCH] resolv.conf.5: Add option no-aaaa to the resolv.conf manual
- page
-
----
- man5/resolv.conf.5 | 23 +++++++++++++++++++++++
- 1 file changed, 23 insertions(+)
-
-diff --git a/man5/resolv.conf.5 b/man5/resolv.conf.5
-index 93c6b47..7c61783 100644
---- a/man5/resolv.conf.5
-+++ b/man5/resolv.conf.5
-@@ -189,6 +189,29 @@ which causes round-robin selection of name servers from among those listed.
- This has the effect of spreading the query load among all listed servers,
- rather than having all clients try the first listed server first every time.
- .TP
-+.B no\-aaaa
-+.\" f282cdbe7f436c75864e5640a409a10485e9abb2
-+Sets
-+.B RES_NOAAAA
-+in
-+.IR _res.options ,
-+which suppresses AAAA queries made by the stub resolver,
-+including AAAA lookups triggered by NSS-based interfaces such as
-+.BR getaddrinfo (3).
-+Only DNS lookups are affected: IPv6 data in
-+.BR hosts (5)
-+is still used,
-+.BR getaddrinfo (3)
-+with
-+.B AI_PASSIVE
-+will stillproduce IPv6 addresses,
-+and configured IPv6 name servers are still used.
-+To produce correct Name Error (NXDOMAIN) results,
-+AAAA queries are translated to A queries.
-+This option is intended preliminary for diagnostic purposes,
-+to rule out that AAAA DNS queries have adverse impact.
-+It is incompatible with EDNS0 usage and DNSSEC validation by applications.
-+.TP
- .B no\-check\-names
- .\" since glibc 2.2
- Sets
--- 
-2.39.2
-

man-pages-5.10-subid.patch

@@ -1,43 +0,0 @@
-From 02425d9113f378c746dff7d4510d28719e8e9255 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 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
-

man-pages.spec

@@ -7,8 +7,8 @@
 
 Summary: Linux kernel and C library user-space interface documentation
 Name: man-pages
-Version: 5.10
+Version: 6.04
-Release: 7%{?dist}
+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,18 +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
-
-# resolv.conf.5 no-aaaa option
-# Source: https://marc.info/?l=linux-man&m=168131276816867&w=2
-Patch24: man-pages-5.10-resolv.conf.5-no-aaaa.patch
-
 %description
 A large collection of manual pages from the Linux Documentation Project (LDP).
 
@@ -61,9 +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
-%patch24 -p1
 
 # rename posix README so we don't have conflict
 mv %{posix_name}/README %{posix_name}/%{posix_name_rel}.README
@@ -89,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
@@ -123,12 +108,16 @@ 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 <ljavorsk@redhat.com> - 6.04-1
+- Rebase to 6.04 version per request from RHIVOS team
+- Resolves: RHEL-683
+
 * Wed May 03 2023 Lukas Javorsky <ljavorsk@redhat.com> - 5.10-7
 - resolv.conf.5 no-aaaa option
   resolves: RHEL-454

sources

@@ -1,3 +1,3 @@
 SHA512 (man-pages-posix-2017-a.tar.xz) = dac6bd5bb3e1d5f8918bad3eb15e08eeb3e06ae160c04ccd5619bfb0c536139ac06faa62b6856656a1bb9a7496f3148e52a5227b83e4099be6e6b93230de211d
 SHA512 (man-pages-additional-20140218.tar.xz) = c7874db32a9bdefaea6c6be6549e6e6538fa1d93260bf342dd0d9821fa05754aa79a723e701493c81b2e1f460918429eb9b5edb704b55878b1e5ed585a3ff07d
-SHA512 (man-pages-5.10.tar.xz) = a23f90136b0bf471f5ae3917ae0e558fec0671cace8ccdd8e244f41f11fefa4ac0df84cf972cc20a1792d7b930db5e2c451881c0937edabf7d5e1ec46c4760ed
+SHA512 (man-pages-6.04.tar.xz) = 3f95d15dda419e824f902947a268d8021e9e04c5ba8503e4fe9f96a9ab8363fde8088b2712cc9c795638163ad8432bc5f8c6a3ea320293ec6aa79bb748e85b9e