From 0789ae493968b256bf8379664496cf068a8f25c8 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Nikola=20Forr=C3=B3?= Date: Thu, 10 Oct 2019 11:50:40 +0200 Subject: [PATCH] resolv.conf.5: update information about search list - resolves #1758515 --- man-pages-5.02-resolv.conf-search-list.patch | 39 ++++++++++++++++++++ man-pages.spec | 10 ++++- 2 files changed, 48 insertions(+), 1 deletion(-) create mode 100644 man-pages-5.02-resolv.conf-search-list.patch diff --git a/man-pages-5.02-resolv.conf-search-list.patch b/man-pages-5.02-resolv.conf-search-list.patch new file mode 100644 index 0000000..629681e --- /dev/null +++ b/man-pages-5.02-resolv.conf-search-list.patch @@ -0,0 +1,39 @@ +From c594a728b2313a41375d8e88901e5e4c64ae1ba0 Mon Sep 17 00:00:00 2001 +From: =?UTF-8?q?Nikola=20Forr=C3=B3?= +Date: Wed, 7 Aug 2019 14:17:19 +0200 +Subject: resolv.conf.5: Update information about search list +MIME-Version: 1.0 +Content-Type: text/plain; charset=UTF-8 +Content-Transfer-Encoding: 8bit + +Since glibc 2.26, the number of domains in the search list is +no longer limited. + +Reference: +https://sourceware.org/git/?p=glibc.git;a=commitdiff;h=3f853f22c87f0b671c0366eb290919719fa56c0e + +Signed-off-by: Nikola Forró +Signed-off-by: Michael Kerrisk +--- + man5/resolv.conf.5 | 4 +++- + 1 file changed, 3 insertions(+), 1 deletion(-) + +diff --git a/man5/resolv.conf.5 b/man5/resolv.conf.5 +index 57f0a13df..c500864d1 100644 +--- a/man5/resolv.conf.5 ++++ b/man5/resolv.conf.5 +@@ -104,8 +104,10 @@ traffic if the servers for the listed domains are not local, + and that queries will time out if no server is available + for one of the domains. + .IP +-The search list is currently limited to six domains ++In glibc 2.25 and earlier, the search list is limited to six domains + with a total of 256 characters. ++.\" commit 3f853f22c87f0b671c0366eb290919719fa56c0e ++Since glibc 2.26, the search list is unlimited. + .TP + \fBsortlist\fP + This option allows addresses returned by +-- +cgit 1.2-0.3.lf.el7 + diff --git a/man-pages.spec b/man-pages.spec index ea88128..d2c5bbf 100644 --- a/man-pages.spec +++ b/man-pages.spec @@ -7,7 +7,7 @@ Summary: Linux kernel and C library user-space interface documentation Name: man-pages Version: 5.02 -Release: 1%{?dist} +Release: 2%{?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 @@ -38,6 +38,9 @@ Patch0: man-pages-posix-2013-a-pthread_once.patch # https://bugzilla.kernel.org/show_bug.cgi?id=53781 Patch21: man-pages-3.42-close.patch +# https://bugzilla.redhat.com/show_bug.cgi?id=1758515 +Patch22: man-pages-5.02-resolv.conf-search-list.patch + %description A large collection of manual pages from the Linux Documentation Project (LDP). @@ -46,6 +49,7 @@ A large collection of manual pages from the Linux Documentation Project (LDP). %patch0 -p1 %patch21 -p1 +%patch22 -p1 # rename posix README so we don't have conflict %{__mv} %{posix_name}/README %{posix_name}/%{posix_name}.README @@ -85,6 +89,10 @@ popd %{_mandir}/man*/* %changelog +* Thu Oct 10 2019 Nikola Forró - 5.02-2 +- resolv.conf.5: update information about search list + resolves #1758515 + * Tue Aug 06 2019 Nikola Forró - 5.02-1 - update to 5.02