From 8753635ba551c51428b67a4ef84c4a2ba19e3872 Mon Sep 17 00:00:00 2001
From: Pierre Labastie <pierre.labastie@neuf.fr>
Date: Thu, 18 Aug 2022 17:15:58 +0200
Subject: [PATCH] Partial commit for bind-9.18.6

Will be completed by Thomas
---
 networking/netutils/bind-utils.xml |  2 +-
 packages.ent                       |  2 +-
 server/major/bind.xml              | 14 +++++++++-----
 3 files changed, 11 insertions(+), 7 deletions(-)

diff --git a/networking/netutils/bind-utils.xml b/networking/netutils/bind-utils.xml
index 7574099d3b..38e8c9c127 100644
--- a/networking/netutils/bind-utils.xml
+++ b/networking/netutils/bind-utils.xml
@@ -6,7 +6,7 @@
 
   <!ENTITY bind-download-http   "https://ftp.isc.org/isc/bind9/&bind-version;/bind-&bind-version;.tar.xz">
   <!ENTITY bind-download-ftp    "ftp://ftp.isc.org/isc/bind9/&bind-version;/bind-&bind-version;.tar.xz">
-  <!ENTITY bind-md5sum          "9f4b165d38da998d8745ae88d346f109">
+  <!ENTITY bind-md5sum          "d30ac638f74a9aa5da2f54c4f16ccd81">
   <!ENTITY bind-size            "4.9 MB">
   <!ENTITY bind-utils-buildsize "101 MB">
   <!ENTITY bind-utils-time      "0.7 SBU">
diff --git a/packages.ent b/packages.ent
index fcc80c1cc7..0d12bc6d4a 100644
--- a/packages.ent
+++ b/packages.ent
@@ -616,7 +616,7 @@ to avoid building libxml2 twice, which is slow with all deps -->
 <!-- Chapter 16 -->
 <!ENTITY avahi-version                "0.8">
 <!ENTITY bind-minor-version           "9.18">
-<!ENTITY bind-version                 "&bind-minor-version;.5">
+<!ENTITY bind-version                 "&bind-minor-version;.6">
 <!ENTITY mod_dnssd-version            "0.6">
 <!ENTITY NetworkManager-minor         "1.38">
 <!ENTITY NetworkManager-version       "&NetworkManager-minor;.4">
diff --git a/server/major/bind.xml b/server/major/bind.xml
index e769fc2fc6..c859079d4a 100644
--- a/server/major/bind.xml
+++ b/server/major/bind.xml
@@ -6,7 +6,7 @@
 
   <!ENTITY bind-download-http "https://ftp.isc.org/isc/bind9/&bind-version;/bind-&bind-version;.tar.xz">
   <!ENTITY bind-download-ftp  "ftp://ftp.isc.org/isc/bind9/&bind-version;/bind-&bind-version;.tar.xz">
-  <!ENTITY bind-md5sum        "9f4b165d38da998d8745ae88d346f109">
+  <!ENTITY bind-md5sum        "d30ac638f74a9aa5da2f54c4f16ccd81">
   <!ENTITY bind-size          "4.9 MB">
   <!ENTITY bind-buildsize     "137 MB (26 MB installed)">
   <!ENTITY bind-time          "0.4 SBU (with parallelism=4; add 30+ minutes, somewhat processor independent, to run the complete test suite)">
@@ -198,13 +198,17 @@ make</userinput></screen>
       class="username">root</systemitem> user:
     </para>
 
-<screen role="root"><userinput>make install</userinput></screen>
-  </sect2>
-
 <!-- Documentation is an issue - The docs are now all in .rst format and appear
-to be sphinx based.
+to be sphinx based. install source .rst files for now...
 -->
 
+<screen role="root"><userinput>make install &amp;&amp;
+
+install -vdm 644 /usr/share/doc/bind-&bind-version;/{arm,dnssec-guide} &amp;&amp;
+install doc/arm/* /usr/share/doc/bind-&bind-version;/arm               &amp;&amp;
+install doc/dnssec-guide/* /usr/share/doc/bind-&bind-version;/dnssec-guide</userinput></screen>
+  </sect2>
+
   <sect2 role="commands">
     <title>Command Explanations</title>