From 13adae0769133eb650fad115d20c36e0d5892ab7 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Nikola=20Forr=C3=B3?= Date: Wed, 16 Oct 2019 12:02:55 +0200 Subject: [PATCH] update to 5.03 - resolves #1761010 --- .gitignore | 1 + man-pages-5.02-resolv.conf-search-list.patch | 39 -------------------- man-pages.spec | 12 +++--- sources | 2 +- 4 files changed, 8 insertions(+), 46 deletions(-) delete mode 100644 man-pages-5.02-resolv.conf-search-list.patch diff --git a/.gitignore b/.gitignore index 14a0329..6391df6 100644 --- a/.gitignore +++ b/.gitignore @@ -18,3 +18,4 @@ /man-pages-5.00.tar.xz /man-pages-5.01.tar.xz /man-pages-5.02.tar.xz +/man-pages-5.03.tar.xz diff --git a/man-pages-5.02-resolv.conf-search-list.patch b/man-pages-5.02-resolv.conf-search-list.patch deleted file mode 100644 index 629681e..0000000 --- a/man-pages-5.02-resolv.conf-search-list.patch +++ /dev/null @@ -1,39 +0,0 @@ -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 d2c5bbf..66924bc 100644 --- a/man-pages.spec +++ b/man-pages.spec @@ -6,8 +6,8 @@ Summary: Linux kernel and C library user-space interface documentation Name: man-pages -Version: 5.02 -Release: 2%{?dist} +Version: 5.03 +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 @@ -38,9 +38,6 @@ 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). @@ -49,7 +46,6 @@ 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 @@ -89,6 +85,10 @@ popd %{_mandir}/man*/* %changelog +* Wed Oct 16 2019 Nikola Forró - 5.03-1 +- update to 5.03 + resolves #1761010 + * Thu Oct 10 2019 Nikola Forró - 5.02-2 - resolv.conf.5: update information about search list resolves #1758515 diff --git a/sources b/sources index 81d289b..a60d5e8 100644 --- a/sources +++ b/sources @@ -1,3 +1,3 @@ SHA512 (man-pages-posix-2013-a.tar.xz) = e6ec8eb57269fadf368aeaac31b5a98b9c71723d4d5cc189f9c4642d6e865c88e44f77481dccbdb72e31526488eb531f624d455016361687a834ccfcac19fa14 SHA512 (man-pages-additional-20140218.tar.xz) = c7874db32a9bdefaea6c6be6549e6e6538fa1d93260bf342dd0d9821fa05754aa79a723e701493c81b2e1f460918429eb9b5edb704b55878b1e5ed585a3ff07d -SHA512 (man-pages-5.02.tar.xz) = 424d382f69611e29bd512ad166db7189633dea92b9d57466480a88cc69e83e6f364e16d4303efea19f2252bc9681c14158d60eef79c4cc4be41185300b67a4fd +SHA512 (man-pages-5.03.tar.xz) = e7e0d1952abe75dd2503fd7bd7fbe34532ef22b70d82f299099e38e08a92604df0f23ed83267b57ca6d9d90e697651c46f6a95c1a077e3f193ba89f6293af7be