From 502875383598502dcd9164c99bd3a4b71e3ac8f8 Mon Sep 17 00:00:00 2001
From: Fernando de Oliveira <fernando@linuxfromscratch.org>
Date: Thu, 19 Feb 2015 22:04:41 +0000
Subject: [PATCH] Update to BIND-9.10.1-P2 and BIND Utilities-9.10.1-P2.

git-svn-id: svn://svn.linuxfromscratch.org/BLFS/trunk/BOOK@15531 af4574ff-66df-0310-9fd7-8a98e5e911e0
---
 introduction/welcome/changelog.xml |  8 ++++++--
 networking/netutils/bind-utils.xml |  6 +++---
 packages.ent                       |  2 +-
 server/major/bind.xml              | 28 +++++++++++++---------------
 4 files changed, 23 insertions(+), 21 deletions(-)

diff --git a/introduction/welcome/changelog.xml b/introduction/welcome/changelog.xml
index bc16754370..31dabf043f 100644
--- a/introduction/welcome/changelog.xml
+++ b/introduction/welcome/changelog.xml
@@ -48,9 +48,13 @@
       <para>February 19th, 2015</para>
       <itemizedlist>
         <listitem>
-          <para>[pierre] - Update to gdk-pixbuf-2.31.2. Fixes
-          <ulink url="&blfs-ticket-root;5852">#5852.</para>
+          <para>[fernando] - Update to BIND-9.10.1-P2 and 
+          BIND Utilities-9.10.1-P2. Fixes
+          <ulink url="&blfs-ticket-root;6161">#6161</ulink>.</para>
         </listitem>
+        <listitem>
+          <para>[pierre] - Update to gdk-pixbuf-2.31.2. Fixes
+          <ulink url="&blfs-ticket-root;5852">#5852</ulink>.</para>
         </listitem>
       </itemizedlist>
     </listitem>
diff --git a/networking/netutils/bind-utils.xml b/networking/netutils/bind-utils.xml
index 4def6a0300..d829c5c0ff 100644
--- a/networking/netutils/bind-utils.xml
+++ b/networking/netutils/bind-utils.xml
@@ -3,9 +3,9 @@
    "http://www.oasis-open.org/docbook/xml/4.5/docbookx.dtd" [
   <!ENTITY % general-entities SYSTEM "../../general.ent">
   %general-entities;
-  <!ENTITY bind-download-http   " ">
-  <!ENTITY bind-download-ftp    "ftp://ftp.isc.org/isc/bind9/&bind-version;/bind-&bind-version;.tar.gz">
-  <!ENTITY bind-md5sum          "bdb9af9db9d389f8b8b3db6e0bc1bfee">
+  <!ENTITY bind-download-http " ">
+  <!ENTITY bind-download-ftp  "ftp://ftp.isc.org/isc/bind9/&bind-version;/bind-&bind-version;.tar.gz">
+  <!ENTITY bind-md5sum          "2ca3474c5cefebbbeea32710b048cd1c">
   <!ENTITY bind-size            "8.0 MB">
   <!ENTITY bind-utils-buildsize "109 MB">
   <!ENTITY bind-utils-time      "0.6 SBU">
diff --git a/packages.ent b/packages.ent
index 379d72bdf3..c47b66b961 100644
--- a/packages.ent
+++ b/packages.ent
@@ -354,7 +354,7 @@
 
 <!-- Chapter 16 -->
 <!ENTITY avahi-version                "0.6.31">
-<!ENTITY bind-version                 "9.10.1-P1">
+<!ENTITY bind-version                 "9.10.1-P2">
 <!ENTITY mod_dnssd-version            "0.6">
 <!ENTITY NetworkManager-version       "1.0.0">
 <!ENTITY nmap-version                 "6.47">
diff --git a/server/major/bind.xml b/server/major/bind.xml
index 5d6bd4c901..367f3f2629 100644
--- a/server/major/bind.xml
+++ b/server/major/bind.xml
@@ -5,12 +5,11 @@
   %general-entities;
 
   <!ENTITY bind-download-http " ">
-  <!ENTITY bind-download-ftp
-  "ftp://ftp.isc.org/isc/bind9/&bind-version;/bind-&bind-version;.tar.gz">
-  <!ENTITY bind-md5sum        "bdb9af9db9d389f8b8b3db6e0bc1bfee">
+  <!ENTITY bind-download-ftp  "ftp://ftp.isc.org/isc/bind9/&bind-version;/bind-&bind-version;.tar.gz">
+  <!ENTITY bind-md5sum        "2ca3474c5cefebbbeea32710b048cd1c">
   <!ENTITY bind-size          "8.0 MB">
-  <!ENTITY bind-buildsize     "102 MB (additional 49 MB to run the test suite)">
-  <!ENTITY bind-time          "1.0 SBU (additional 21 minutes, processor independent, to run the complete test suite)">
+  <!ENTITY bind-buildsize     "102 MB (additional 43 MB to run the test suite)">
+  <!ENTITY bind-time          "1.1 SBU (additional 16 minutes, processor independent, to run the complete test suite)">
 ]>
 
 <sect1 id="bind" xreflabel="BIND-&bind-version;">
@@ -113,13 +112,6 @@
 
 <screen><userinput>patch -Np1 -i ../bind-&bind-version;-use_iproute2-1.patch</userinput></screen>
 
-    <para>If you wish to run the test suite, remove some tests that fail:</para>
-
-<screen><userinput>sed -e 's/ecdsa //'   \
-    -e 's/tsiggss //' \
-    -e 's/xfer //'    \
-    -i bin/tests/system/conf.sh.in</userinput></screen>
-
     <para>Install <application>BIND</application> by running the
     following commands:</para>
 
@@ -143,6 +135,12 @@ make</userinput></screen>
 
 <screen role="root"><userinput>bin/tests/system/ifconfig.sh up</userinput></screen>
 
+    <para>As an unprivileged user, remove some tests that fail:</para>
+
+<screen><userinput>sed -e 's/ecdsa //'   \
+    -e 's/tsiggss //' \
+    -i bin/tests/system/conf.sh</userinput></screen>
+
     <para>Now run the test suite as an unprivileged user:</para>
 
 <screen><userinput>make check</userinput></screen>
@@ -169,8 +167,8 @@ install -v -m644 \
   <sect2 role="commands">
     <title>Command Explanations</title>
 
-    <para><command>sed ... bin/tests/system/conf.sh.in</command>:
-    This command removes tests that fail (some for unknown reasons).</para>
+    <para><command>sed ... bin/tests/system/conf.sh</command>: This command
+    removes tests that fail (some for unknown reasons).</para>
 
     <para><parameter>--sysconfdir=/etc</parameter>: This parameter forces
     <application>BIND</application> to look for configuration
@@ -279,7 +277,7 @@ sed '/conf/d;/^#/!d;s:^# ::' /etc/rndc.conf > /srv/named/etc/named.conf</userinp
 
 <screen role="root"><?dbfo keep-together="auto"?><userinput>cat &gt;&gt; /srv/named/etc/named.conf &lt;&lt; "EOF"
 <literal>options {
-    directory "/etc/namedb";
+    directory "/srv/named/etc/namedb";
     pid-file "/var/run/named.pid";
     statistics-file "/var/run/named.stats";