Index: introduction/welcome/changelog.xml
===================================================================
--- introduction/welcome/changelog.xml	(revision bddd4e50d72493e974952c4b98b4c10ab284e424)
+++ introduction/welcome/changelog.xml	(revision a3b94fc873f2bd2d28abc0f2a2ad4c22d6775f04)
@@ -42,4 +42,14 @@
     </listitem>
     -->
+    <listitem>
+      <para>August 10th, 2021</para>
+      <itemizedlist>
+        <listitem>
+          <para>[bdubbs] - Update to net-tools-2.10. Fixes
+          <ulink url="&blfs-ticket-root;15366">#15366</ulink>.</para>
+        </listitem>
+      </itemizedlist>
+    </listitem>
+
     <listitem>
       <para>August 8th, 2021</para>
Index: networking/netprogs/net-tools.xml
===================================================================
--- networking/netprogs/net-tools.xml	(revision bddd4e50d72493e974952c4b98b4c10ab284e424)
+++ networking/netprogs/net-tools.xml	(revision a3b94fc873f2bd2d28abc0f2a2ad4c22d6775f04)
@@ -5,9 +5,9 @@
   %general-entities;
 
-  <!ENTITY net-tools-download-http "&sources-anduin-http;/net-tools/net-tools-&net-tools-version;.tar.gz">
-  <!ENTITY net-tools-download-ftp  "&sources-anduin-ftp;/net-tools/net-tools-&net-tools-version;.tar.gz">
-  <!ENTITY net-tools-md5sum        "6be14ed473cacdd68edeaa9605adc469">
-  <!ENTITY net-tools-size          "288 KB">
-  <!ENTITY net-tools-buildsize     "7.0 MB">
+  <!ENTITY net-tools-download-http "https://downloads.sourceforge.net/project/net-tools//net-tools-&net-tools-version;.tar.xz">
+  <!ENTITY net-tools-download-ftp  " ">
+  <!ENTITY net-tools-md5sum        "78aae762c95e2d731faf88d482e4cde5">
+  <!ENTITY net-tools-size          "228 KB">
+  <!ENTITY net-tools-buildsize     "7.5 MB">
   <!ENTITY net-tools-time          "less than 0.1 SBU">
 ]>
@@ -69,5 +69,5 @@
       </listitem>
     </itemizedlist>
-
+<!--
     <bridgehead renderas="sect3">Additional Downloads</bridgehead>
     <itemizedlist spacing="compact">
@@ -79,5 +79,5 @@
       </listitem>
     </itemizedlist>
-
+-->
 
     <para condition="html" role="usernotes">User Notes:
@@ -91,7 +91,7 @@
     <para id="net-tools-automate-example" xreflabel="Net-tools">
       The instructions below automate the configuration process by piping
-      <command>yes</command> to the <command>make config</command> command.
+      <command>yes</command> to the <command>make</command> command.
       If you wish to run the interactive configuration process (by changing
-      the instruction to just <command>make config</command>), but you are
+      the instruction to just <command>make</command>), but you are
       not sure how to answer all the questions, then just accept the defaults.
       This will be just fine in the majority of cases. What you're asked here
@@ -116,7 +116,7 @@
 
     <para>
-      The patch below cleans up the installation so that it does not
-      overwrite the <application>ifconfig</application> and
-      <application>hostname</application> programs that were installed in LFS.
+      For this package, we use the DESTDIR method of installation in order
+      to easily remove files from the build that overwrite those that we want
+      to keep or are not appropriate for our system.
     </para>
 
@@ -126,10 +126,11 @@
     </para>
 
-<screen><userinput>patch -Np1 -i ../net-tools-&net-tools-version;-remove_dups-1.patch &amp;&amp;
-sed -e "s;/\(s\|\)bin;/usr&amp;;g" -i Makefile &amp;&amp;
-sed -i '/#include &lt;netinet\/ip.h&gt;/d'  iptunnel.c &amp;&amp;
-
-yes "" | make config &amp;&amp;
-make</userinput></screen>
+<screen><userinput>export BINDIR='/usr/bin' SBINDIR='/usr/bin' &amp;&amp;
+yes "" | make                               &amp;&amp;
+make DESTDIR=$PWD/install install           &amp;&amp;
+rm    install/usr/bin/{nis,yp}domainname    &amp;&amp;
+rm    install/usr/bin/{hostname,dnsdomainname,domainname} &amp;&amp;
+rm -r install/usr/share/man/man1            &amp;&amp;
+unset BINDIR SBINDIR</userinput></screen>
 
     <para>
@@ -141,5 +142,6 @@
     </para>
 
-<screen role='root'><userinput>make update</userinput></screen>
+<screen role='root'><userinput>chown -R root:root install &amp;&amp;
+cp -a install/* /</userinput></screen>
 
   </sect2>
@@ -149,30 +151,16 @@
 
     <para>
-      <command>sed -i "s;/\(s\|\)bin;/usr&amp;;g" -i Makefile</command>:
-      Modifies the <filename>Makefile</filename> to get the binaries
-      installed in the <filename class="directory">/usr</filename> hierarchy.
-    </para>
-
-    <para>
-      <command>sed -i '/#include &lt;netinet\/ip.h&gt;/d' iptunnel.c</command>:
-      This fixes build breakage with linux-4.8 headers.
-    </para>
-<!--
-    <para>
-      <command>sed -i -e '/Token/s/y$/n/' config.in</command>: Change the
-      default for building obsolete token ring support to no.  This is a
-      simpler change than changing the location for the token ring headers.
-    </para>
-
-    <para>
-      <command>sed -i -e '/HAVE_HWSTRIP/s/y$/n/' config.in</command>:
-      Removes obsolete Metricom radio support that requires a header no longer
-      included in the kernel.
-    </para>
--->
-    <para>
-      <command>yes "" | make config</command>: Piping <command>yes</command>
+      <command>export BINDIR='/usr/bin' SBINDIR='/usr/bin'</command>:
+      Ensure the executables are installed in the correct location.
+    </para>
+
+    <para>
+      <command>yes "" | make </command>: Piping <command>yes</command>
       to <command>make config</command> skips the interactive configuration and
       accepts the defaults.
+    </para>
+
+    <para>
+      <command>rm ...</command>: Remove unneeded programs and man pages.
     </para>
 
@@ -188,7 +176,15 @@
 
       <seglistitem>
-        <seg>arp,
-        ipmaddr, iptunnel, mii-tool, nameif, netstat,
-        plipconfig, rarp, route, and slattach
+        <seg>arp, 
+        ipconfig
+        ipmaddr, 
+        iptunnel, 
+        mii-tool, 
+        nameif, 
+        netstat,
+        plipconfig, 
+        rarp, 
+        route, and 
+        slattach
         </seg>
         <seg>None</seg>
@@ -214,40 +210,4 @@
         </listitem>
       </varlistentry>
-<!--
-      <varlistentry id="dnsdomainname">
-        <term><command>dnsdomainname</command></term>
-        <listitem>
-          <para>
-            reports the system's DNS domain name.
-          </para>
-          <indexterm zone="net-tools dnsdomainname">
-            <primary sortas="b-dnsdomainname">dnsdomainname</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="domainname">
-        <term><command>domainname</command></term>
-        <listitem>
-          <para>
-            reports or sets the system's NIS/YP domain name.
-          </para>
-          <indexterm zone="net-tools domainname">
-            <primary sortas="b-domainname">domainname</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="hostname">
-        <term><command>hostname</command></term>
-        <listitem>
-          <para>
-            reports or sets the name of the current host system.
-          </para>
-          <indexterm zone="net-tools hostname">
-            <primary sortas="b-hostname">hostname</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
 
       <varlistentry id="ifconfig">
@@ -255,5 +215,5 @@
         <listitem>
           <para>
-            is the main utility for configuring network interfaces.
+            is a tool for configuring network interfaces.
           </para>
           <indexterm zone="net-tools ifconfig">
@@ -262,5 +222,5 @@
         </listitem>
       </varlistentry>
--->
+
       <varlistentry id="ipmaddr">
         <term><command>ipmaddr</command></term>
@@ -324,17 +284,5 @@
         </listitem>
       </varlistentry>
-<!--
-      <varlistentry id="nisdomainname">
-        <term><command>nisdomainname</command></term>
-        <listitem>
-          <para>
-            does the same as <command>domainname</command>.
-          </para>
-          <indexterm zone="net-tools nisdomainname">
-            <primary sortas="b-nisdomainname">nisdomainname</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
--->
+
       <varlistentry id="plipconfig">
         <term><command>plipconfig</command></term>
@@ -387,17 +335,4 @@
         </listitem>
       </varlistentry>
-<!--
-      <varlistentry id="ypdomainname">
-        <term><command>ypdomainname</command></term>
-        <listitem>
-          <para>
-            does the same as <command>domainname</command>.
-          </para>
-          <indexterm zone="net-tools ypdomainname">
-            <primary sortas="b-ypdomainname">ypdomainname</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
--->
     </variablelist>
 
Index: packages.ent
===================================================================
--- packages.ent	(revision bddd4e50d72493e974952c4b98b4c10ab284e424)
+++ packages.ent	(revision a3b94fc873f2bd2d28abc0f2a2ad4c22d6775f04)
@@ -596,5 +596,5 @@
 <!ENTITY iw-version                   "5.9">
 <!ENTITY ncftp-version                "3.2.6">
-<!ENTITY net-tools-version            "CVS_20101030">
+<!ENTITY net-tools-version            "2.10">
 <!ENTITY nfs-utils-version            "2.5.4">
 <!ENTITY ntp-version                  "4.2.8p15">
