From e9c4b88622a8387b8d5171fba952611b27599d44 Mon Sep 17 00:00:00 2001
From: CentOS Sources <bugs@centos.org>
Date: May 09 2023 05:37:19 +0000
Subject: import man-pages-5.10-6.el9


---

diff --git a/SOURCES/man-pages-5.10-resolv-conf-typo-fix.patch b/SOURCES/man-pages-5.10-resolv-conf-typo-fix.patch
new file mode 100644
index 0000000..83b0439
--- /dev/null
+++ b/SOURCES/man-pages-5.10-resolv-conf-typo-fix.patch
@@ -0,0 +1,31 @@
+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
+
diff --git a/SPECS/man-pages.spec b/SPECS/man-pages.spec
index 6f486e3..3ffd07a 100644
--- a/SPECS/man-pages.spec
+++ b/SPECS/man-pages.spec
@@ -8,7 +8,7 @@
 Summary: Linux kernel and C library user-space interface documentation
 Name: man-pages
 Version: 5.10
-Release: 5%{?dist}
+Release: 6%{?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
@@ -46,6 +46,10 @@ Patch21: man-pages-3.42-close.patch
 # 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).
 
@@ -54,6 +58,7 @@ A large collection of manual pages from the Linux Documentation Project (LDP).
 
 %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
@@ -119,6 +124,10 @@ fi
 %{_mandir}/man*/*
 
 %changelog
+* Fri Nov 04 2022 Lukas Javorsky <ljavorsk@redhat.com> - 5.10-6
+- Fix the resolv.conf typo
+- Source from upstream commit 076fbe061333bdfecbd5765c782c477233e38e2f
+
 * Tue Aug 23 2022 Nikola Forró <nforro@redhat.com> - 5.10-5
 - nsswitch.conf.5: Mention subid database
   resolves: #2059981