From 359633c72dbf36f9106a2544e41a130a8f5db658 Mon Sep 17 00:00:00 2001
From: "Douglas R. Reno" <renodr@linuxfromscratch.org>
Date: Fri, 23 Jun 2023 19:31:15 -0500
Subject: [PATCH] Update to bind (and bind-utils) 9.18.16

---
 introduction/welcome/changelog.xml |  4 ++++
 packages.ent                       |  4 ++--
 server/major/bind.xml              | 19 +++++++++++--------
 3 files changed, 17 insertions(+), 10 deletions(-)

diff --git a/introduction/welcome/changelog.xml b/introduction/welcome/changelog.xml
index e918caa4d1..b48b4fbf74 100644
--- a/introduction/welcome/changelog.xml
+++ b/introduction/welcome/changelog.xml
@@ -41,6 +41,10 @@
     <listitem>
       <para>June 23rd, 2023</para>
       <itemizedlist>
+        <listitem>
+          <para>[renodr] - Update to BIND-9.18.16 (Security Update). Fixes
+          <ulink url="&blfs-ticket-root;18193">#18193</ulink>.</para>
+        </listitem>
         <listitem>
           <para>[renodr] - Update to node.js-18.16.1 (Security Update). Fixes
           <ulink url="&blfs-ticket-root;18187">#18187</ulink>.</para>
diff --git a/packages.ent b/packages.ent
index e4ca6f7ef7..b8826983dc 100644
--- a/packages.ent
+++ b/packages.ent
@@ -669,8 +669,8 @@ to avoid building libxml2 twice, which is slow with all deps -->
 <!ENTITY avahi-version                "0.8">
 <!-- for Bind Utilities -->
 <!ENTITY bind-minor-version           "9.18">
-<!ENTITY bind-version                 "&bind-minor-version;.15">
-<!ENTITY bind-md5                     "705736fea0c925220986e9e405c688dc">
+<!ENTITY bind-version                 "&bind-minor-version;.16">
+<!ENTITY bind-md5                     "c75648e02db965770fdf76fb828796a0">
 <!ENTITY NetworkManager-minor         "1.42">
 <!ENTITY NetworkManager-version       "&NetworkManager-minor;.6">
 <!ENTITY network-manager-applet-minor "1.32">
diff --git a/server/major/bind.xml b/server/major/bind.xml
index 8eaaeeb5df..152faf3e41 100644
--- a/server/major/bind.xml
+++ b/server/major/bind.xml
@@ -8,8 +8,8 @@
   <!ENTITY bind-download-ftp  "ftp://ftp.isc.org/isc/bind9/&bind-version;/bind-&bind-version;.tar.xz">
   <!ENTITY bind-md5sum        "&bind-md5;">
   <!ENTITY bind-size          "5.2 MB">
-  <!ENTITY bind-buildsize     "144 MB (26 MB installed)">
-  <!ENTITY bind-time          "0.4 SBU (with parallelism=4; about 40 minutes somewhat processor independent, to run the complete test suite)">
+  <!ENTITY bind-buildsize     "145 MB (26 MB installed)">
+  <!ENTITY bind-time          "0.7 SBU (with parallelism=4; about 40 minutes somewhat processor independent, to run the complete test suite)">
 ]>
 
 <sect1 id="bind" xreflabel="BIND-&bind-version;">
@@ -600,19 +600,19 @@ dig www.&lfs-domainname;</userinput></screen>
       <seglistitem>
 
         <seg>arpaname, <!--bind9-config hardlinked to isc-config.sh,-->
-        ddns-confgen, delv, dig, dnssec-cds, dnssec-checkds, dnssec-coverage,
+        ddns-confgen, delv, dig, dnssec-cds, <!-- dnssec-checkds, dnssec-coverage,-->
         dnssec-dsfromkey, dnssec-importkey, dnssec-keyfromlabel, dnssec-keygen,
-        dnssec-keymgr, dnssec-revoke, dnssec-settime, dnssec-signzone,
+        <!--dnssec-keymgr,--> dnssec-revoke, dnssec-settime, dnssec-signzone,
         dnssec-verify, host, mdig, named, named-checkconf,
-        named-checkzone, named-compilezone (symlink), named-journalprint,
+        named-checkzone, named-compilezone, named-journalprint,
         named-nzd2nzf, named-rrchecker, nsec3hash, nslookup, nsupdate, rndc,
         rndc-confgen, and tsig-keygen (symlink)</seg>
 
         <seg>libbind9.so, libdns.so, libirs.so, libisc.so, libisccc.so,
         libisccfg.so, and libns.so</seg>
 
-        <seg>/usr/include/{bind9,dns,dst,irs,isc,isccc,isccfg,ns,pk11,pkcs11},
-        /usr/lib/named, /usr/lib/python&python3-majorver;/site-packages/isc,
+        <seg>/usr/include/{bind9,dns,dst,irs,isc,isccc,isccfg,ns},
+        /usr/lib/bind, <!--/usr/lib/python&python3-majorver;/site-packages/isc,-->
         and /srv/named</seg>
       </seglistitem>
     </segmentedlist>
@@ -698,6 +698,7 @@ dig www.&lfs-domainname;</userinput></screen>
         </listitem>
       </varlistentry>
 
+<!-- Removed in 9.18.x
       <varlistentry id="dnssec-checkds">
         <term><command>dnssec-checkds</command></term>
         <listitem>
@@ -723,7 +724,7 @@ dig www.&lfs-domainname;</userinput></screen>
           </indexterm>
         </listitem>
       </varlistentry>
-
+-->
       <varlistentry id="dnssec-dsfromkey">
         <term><command>dnssec-dsfromkey</command></term>
         <listitem>
@@ -762,6 +763,7 @@ dig www.&lfs-domainname;</userinput></screen>
         </listitem>
       </varlistentry>
 
+<!-- Removed in 9.18.x
       <varlistentry id="dnssec-keygen">
         <term><command>dnssec-keygen</command></term>
         <listitem>
@@ -773,6 +775,7 @@ dig www.&lfs-domainname;</userinput></screen>
           </indexterm>
         </listitem>
       </varlistentry>
+ -->
 
       <varlistentry id="dnssec-keymgr">
         <term><command>dnssec-keymgr</command></term>