[man-pages/f17] - added description of the single-request and single-request-reopen options to the resolv.conf(5)

[pschiffe]

commit cddee5b86924cbd889ba8022fe3804657b242847
Author: Peter Schiffer <pschiffe at redhat.com>
Date:   Thu Sep 20 13:35:29 2012 +0200

    - added description of the single-request and single-request-reopen options
      to the resolv.conf(5) man page (#717770)

 man-pages-3.35-resolv-conf.patch |   30 ++++++++++++++++++++++++++++++
 man-pages.spec                   |    9 ++++++++-
 2 files changed, 38 insertions(+), 1 deletions(-)
---
diff --git a/man-pages-3.35-resolv-conf.patch b/man-pages-3.35-resolv-conf.patch
new file mode 100644
index 0000000..b0ad58d
--- /dev/null
+++ b/man-pages-3.35-resolv-conf.patch
@@ -0,0 +1,30 @@
+diff -ur man-pages-3.35.orig/man5/resolv.conf.5 man-pages-3.35/man5/resolv.conf.5
+--- man-pages-3.35.orig/man5/resolv.conf.5	2011-10-04 08:34:45.000000000 +0200
++++ man-pages-3.35/man5/resolv.conf.5	2012-09-20 13:31:37.068785883 +0200
+@@ -231,6 +231,26 @@
+ in
+ .IR _res.options .
+ This enables support for the DNS extensions described in RFC\ 2671.
++.TP
++.BR single-request " (since glibc 2.10)"
++sets
++.BR RES_SNGLKUP
++in
++.IR _res.options .
++By default, glibc performs IPv4 and IPv6 lookups in parallel since
++version 2.9.
++Some appliance DNS servers
++cannot handle these queries properly and make the requests time out.
++This option disables the behavior and makes glibc perform the IPv6
++and IPv4 requests sequentially (at the cost of some slowdown of the
++resolving process).
++.TP
++.BR single-request-reopen " (since glibc 2.9)"
++The resolver uses the same socket for the A and AAAA requests.  Some hardware
++mistakenly only sends back one reply.  When that happens the client sytem will
++sit and wait for the second reply.  Turning this option on changes this behavior
++so that if two requests from the same port are not handled correctly it will
++close the  socket and open a new one before sending the second request.
+ .RE
+ .LP
+ The \fIdomain\fP and \fIsearch\fP keywords are mutually exclusive.
diff --git a/man-pages.spec b/man-pages.spec
index b678deb..35fa3fa 100644
--- a/man-pages.spec
+++ b/man-pages.spec
@@ -4,7 +4,7 @@
 Summary: Man (manual) pages from the Linux Documentation Project
 Name: man-pages
 Version: 3.35
-Release: 3%{?dist}
+Release: 4%{?dist}
 License: GPLv2+ and GPL+ and BSD and MIT and Copyright only and IEEE
 Group: Documentation
 URL: http://man7.org/linux/man-pages/
@@ -55,6 +55,8 @@ Patch84: man-pages-3.35-readlink3p.patch
 Patch85: man-pages-3.35-inet.patch
 #resolves: #751429
 Patch86: man-pages-3.35-nsswitch-conf.patch
+#resolves: #717770
+Patch87: man-pages-3.35-resolv-conf.patch
 #Resolves: #655961
 Conflicts: quota < 3.17-14
 Buildroot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
@@ -100,6 +102,7 @@ rmdir man-pages-posix-%{posix_version}-%{posix_release}
 %patch84 -p1
 %patch85 -p1
 %patch86 -p1
+%patch87 -p1
 
 ### And now remove those we are not going to use:
 
@@ -155,6 +158,10 @@ rm -rf $RPM_BUILD_ROOT
 %lang(en) %{_mandir}/en/man*/*
 
 %changelog
+* Thu Sep 20 2012 Peter Schiffer <pschiffe at redhat.com> - 3.35-4
+- added description of the single-request and single-request-reopen options
+  to the resolv.conf(5) man page (#717770)
+
 * Thu Sep 20 2012 Peter Schiffer <pschiffe at redhat.com> - 3.35-3
 - resolves: #837090
   updated example on inet(3) man page - use fprintf(stderr,..) instead of perror