From d6decf81058e6981a51519dad62e01afaf2ca495 Mon Sep 17 00:00:00 2001 From: Ivana Hutarova Varekova Date: Fri, 22 Apr 2011 15:46:37 +0200 Subject: [PATCH] - resolves: #698149 Remove documentation for "order" keyword in /etc/host.conf manpage --- man-pages-3.32-host.patch | 32 ++++++++++++++++++++++++++++++++ man-pages.spec | 7 +++++++ 2 files changed, 39 insertions(+) create mode 100644 man-pages-3.32-host.patch diff --git a/man-pages-3.32-host.patch b/man-pages-3.32-host.patch new file mode 100644 index 0000000..0035f54 --- /dev/null +++ b/man-pages-3.32-host.patch @@ -0,0 +1,32 @@ +diff -up man-pages-3.32/man5/host.conf.5.pom man-pages-3.32/man5/host.conf.5 +--- man-pages-3.32/man5/host.conf.5.pom 2010-12-03 08:02:02.000000000 +0100 ++++ man-pages-3.32/man5/host.conf.5 2011-04-22 15:40:45.000000000 +0200 +@@ -33,15 +33,9 @@ contains configuration information speci + It should contain one configuration keyword per line, followed by + appropriate configuration information. + The keywords recognized are +-.IR order ", " trim ", " multi ", " nospoof ", " spoof ", and " reorder . ++.IR trim ", " multi ", " nospoof ", " spoof ", and " reorder . + These keywords are described below. + .TP +-.I order +-This keyword specifies how host lookups are to be performed. +-It should be followed by one or more lookup methods, separated by commas. +-Valid methods are +-.IR bind ", " hosts ", and " nis . +-.TP + .I trim + This keyword may be listed more than once. + Each time it should be +@@ -141,11 +135,6 @@ override the behavior which is configure + If set this variable points to a file that should be read instead of + .IR /etc/host.conf . + .TP +-.B RESOLV_SERV_ORDER +-Overrides the +-.I order +-command. +-.TP + .B RESOLV_SPOOF_CHECK + Overrides the + .IR nospoof ", " spoofalert " and " spoof diff --git a/man-pages.spec b/man-pages.spec index 5e17cba..2d33afd 100644 --- a/man-pages.spec +++ b/man-pages.spec @@ -46,6 +46,8 @@ Patch79: man-pages-3.32-spellch.patch Patch80: man-pages-3.32-snprintf.patch #resolves: #680214 Patch81: man-pages-3.32-fallocate.patch +#resolves: #698149 +Patch82: man-pages-3.32-host.patch #Resolves: #655961 Conflicts: quota < 3.17-14 Buildroot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) @@ -87,6 +89,7 @@ rmdir man-pages-posix-%{posix_version}-%{posix_release} %patch79 -p1 %patch80 -p1 %patch81 -p1 +%patch82 -p1 ### And now remove those we are not going to use: @@ -142,6 +145,10 @@ rm -rf $RPM_BUILD_ROOT %lang(en) %{_mandir}/en/man*/* %changelog +* Fri Apr 22 2011 Ivana Hutarova Varekova - 3.32-13 +- resolves: #698149 + Remove documentation for "order" keyword in /etc/host.conf manpage + * Fri Apr 22 2011 Ivana Hutarova Varekova - 3.32-12 - resolves: #680214 manpage for fallocate(2) is wrong