Index: archive/libnfsidmap.xml
===================================================================
--- archive/libnfsidmap.xml	(revision 1b2b8eb2b34d2fb034e35d65b5c4918cf4e21efb)
+++ archive/libnfsidmap.xml	(revision 1b2b8eb2b34d2fb034e35d65b5c4918cf4e21efb)
@@ -0,0 +1,171 @@
+<?xml version="1.0" encoding="ISO-8859-1"?>
+<!DOCTYPE sect1 PUBLIC "-//OASIS//DTD DocBook XML V4.5//EN"
+   "http://www.oasis-open.org/docbook/xml/4.5/docbookx.dtd" [
+  <!ENTITY % general-entities SYSTEM "../../general.ent">
+  %general-entities;
+
+  <!-- official upstream is at http://www.citi.umich.edu/projects/nfsv4/linux/libnfsidmap/
+       but doesn't contain 0.26. -->
+  <!ENTITY libnfsidmap-download-http "https://fedorapeople.org/~steved/libnfsidmap/&libnfsidmap-version;/libnfsidmap-&libnfsidmap-version;.tar.bz2">
+  <!ENTITY libnfsidmap-download-ftp  " ">
+  <!ENTITY libnfsidmap-md5sum        "2c0cf0e2b1665d51fa9a783679494888">
+  <!ENTITY libnfsidmap-size          "260 KB">
+  <!ENTITY libnfsidmap-buildsize     "3.3 MB">
+  <!ENTITY libnfsidmap-time          "less than 0.1 SBU">
+]>
+
+<sect1 id="libnfsidmap" xreflabel="libnfsidmap-&libnfsidmap-version;">
+  <?dbhtml filename="libnfsidmap.html"?>
+
+  <sect1info>
+    <othername>$LastChangedBy$</othername>
+    <date>$Date$</date>
+  </sect1info>
+
+  <title>libnfsidmap-&libnfsidmap-version;</title>
+
+  <indexterm zone="libnfsidmap">
+    <primary sortas="a-libnfsidmap">libnfsidmap</primary>
+  </indexterm>
+
+  <sect2 role="package">
+    <title>Introduction to libnfsidmap</title>
+
+    <para>
+      The <application>libnfsidmap</application> package contains a
+      library to help with mapping id's, mainly for NFSv4.
+    </para>
+
+    &lfs10_checked;
+
+    <bridgehead renderas="sect3">Package Information</bridgehead>
+    <itemizedlist spacing="compact">
+      <listitem>
+        <para>
+          Download (HTTP): <ulink url="&libnfsidmap-download-http;"/>
+        </para>
+      </listitem>
+      <listitem>
+        <para>
+          Download (FTP): <ulink url="&libnfsidmap-download-ftp;"/>
+        </para>
+      </listitem>
+      <listitem>
+        <para>
+          Download MD5 sum: &libnfsidmap-md5sum;
+        </para>
+      </listitem>
+      <listitem>
+        <para>
+          Download size: &libnfsidmap-size;
+        </para>
+      </listitem>
+      <listitem>
+        <para>
+          Estimated disk space required: &libnfsidmap-buildsize;
+        </para>
+      </listitem>
+      <listitem>
+        <para>
+          Estimated build time: &libnfsidmap-time;
+        </para>
+      </listitem>
+    </itemizedlist>
+
+    <bridgehead renderas="sect3">libnfsidmap Dependencies</bridgehead>
+
+    <bridgehead renderas="sect4">Optional</bridgehead>
+    <para role="optional">
+      <xref linkend="openldap"/> (client only)
+    </para>
+
+    <para condition="html" role="usernotes">User Notes:
+      <ulink url="&blfs-wiki;/libnfsidmap"/>
+    </para>
+  </sect2>
+
+  <sect2 role="installation">
+    <title>Installation of libnfsidmap</title>
+
+    <para>
+      Install <application>libnfsidmap</application> by running the following
+      commands:
+    </para>
+
+<!-- sysconfdir=/etc is used because the config file /etc/idmapd.conf
+     is installed by nfs-utils -->
+<screen><userinput>./configure --prefix=/usr     \
+            --sysconfdir=/etc \
+            --disable-static  &amp;&amp;
+make</userinput></screen>
+
+    <para>
+      This package does not come with a testsuite.
+    </para>
+
+    <para>
+      Now, as the <systemitem class="username">root</systemitem> user:
+    </para>
+
+<screen role="root"><userinput>make install                         &amp;&amp;
+mv -v /usr/lib/libnfsidmap.so.* /lib &amp;&amp;
+ln -sfv ../../lib/$(readlink /usr/lib/libnfsidmap.so) /usr/lib/libnfsidmap.so</userinput></screen>
+
+  </sect2>
+
+  <sect2 role="commands">
+    <title>Command Explanations</title>
+
+    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
+      href="../../xincludes/static-libraries.xml"/>
+
+    <para>
+      <command>mv -v /usr/lib/libnfsidmap.so.* ...</command>: Move shared
+      libraries into /lib so they are available before /usr is mounted.
+    </para>
+
+  </sect2>
+
+  <sect2 role="content">
+    <title>Contents</title>
+
+    <segmentedlist>
+      <segtitle>Installed Programs</segtitle>
+      <segtitle>Installed Libraries</segtitle>
+      <segtitle>Installed Directories</segtitle>
+
+      <seglistitem>
+        <seg>
+          None
+        </seg>
+        <seg>
+          libnfsidmap.so
+        </seg>
+        <seg>
+          /usr/lib/libnfsidmap
+        </seg>
+      </seglistitem>
+    </segmentedlist>
+
+    <variablelist>
+      <bridgehead renderas="sect3">Short Descriptions</bridgehead>
+      <?dbfo list-presentation="list"?>
+      <?dbhtml list-presentation="table"?>
+
+      <varlistentry id="libnfsidmap-lib">
+        <term><filename class="libraryfile">libnfsidmap.so</filename></term>
+        <listitem>
+          <para>
+            contains the <application>libnfsidmap</application> API functions.
+          </para>
+          <indexterm zone="libnfsidmap libnfsidmap-lib">
+            <primary sortas="c-libnfsidmap">libnfsidmap.so</primary>
+          </indexterm>
+        </listitem>
+      </varlistentry>
+
+    </variablelist>
+
+  </sect2>
+
+</sect1>
Index: general/genlib/genlib.xml
===================================================================
--- general/genlib/genlib.xml	(revision 657b29e12ffa9b6aafb8c43db1ebf7bc81125408)
+++ general/genlib/genlib.xml	(revision 1b2b8eb2b34d2fb034e35d65b5c4918cf4e21efb)
@@ -116,5 +116,5 @@
 
    <!-- systemd only -->
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="libnfsidmap.xml"/>
+  <!--<xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="libnfsidmap.xml"/>-->
 
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="libpaper.xml"/>
Index: neral/genlib/libnfsidmap.xml
===================================================================
--- general/genlib/libnfsidmap.xml	(revision 657b29e12ffa9b6aafb8c43db1ebf7bc81125408)
+++ 	(revision )
@@ -1,171 +1,0 @@
-<?xml version="1.0" encoding="ISO-8859-1"?>
-<!DOCTYPE sect1 PUBLIC "-//OASIS//DTD DocBook XML V4.5//EN"
-   "http://www.oasis-open.org/docbook/xml/4.5/docbookx.dtd" [
-  <!ENTITY % general-entities SYSTEM "../../general.ent">
-  %general-entities;
-
-  <!-- official upstream is at http://www.citi.umich.edu/projects/nfsv4/linux/libnfsidmap/
-       but doesn't contain 0.26. -->
-  <!ENTITY libnfsidmap-download-http "https://fedorapeople.org/~steved/libnfsidmap/&libnfsidmap-version;/libnfsidmap-&libnfsidmap-version;.tar.bz2">
-  <!ENTITY libnfsidmap-download-ftp  " ">
-  <!ENTITY libnfsidmap-md5sum        "2c0cf0e2b1665d51fa9a783679494888">
-  <!ENTITY libnfsidmap-size          "260 KB">
-  <!ENTITY libnfsidmap-buildsize     "3.3 MB">
-  <!ENTITY libnfsidmap-time          "less than 0.1 SBU">
-]>
-
-<sect1 id="libnfsidmap" xreflabel="libnfsidmap-&libnfsidmap-version;">
-  <?dbhtml filename="libnfsidmap.html"?>
-
-  <sect1info>
-    <othername>$LastChangedBy$</othername>
-    <date>$Date$</date>
-  </sect1info>
-
-  <title>libnfsidmap-&libnfsidmap-version;</title>
-
-  <indexterm zone="libnfsidmap">
-    <primary sortas="a-libnfsidmap">libnfsidmap</primary>
-  </indexterm>
-
-  <sect2 role="package">
-    <title>Introduction to libnfsidmap</title>
-
-    <para>
-      The <application>libnfsidmap</application> package contains a
-      library to help with mapping id's, mainly for NFSv4.
-    </para>
-
-    &lfs10_checked;
-
-    <bridgehead renderas="sect3">Package Information</bridgehead>
-    <itemizedlist spacing="compact">
-      <listitem>
-        <para>
-          Download (HTTP): <ulink url="&libnfsidmap-download-http;"/>
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Download (FTP): <ulink url="&libnfsidmap-download-ftp;"/>
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Download MD5 sum: &libnfsidmap-md5sum;
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Download size: &libnfsidmap-size;
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Estimated disk space required: &libnfsidmap-buildsize;
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Estimated build time: &libnfsidmap-time;
-        </para>
-      </listitem>
-    </itemizedlist>
-
-    <bridgehead renderas="sect3">libnfsidmap Dependencies</bridgehead>
-
-    <bridgehead renderas="sect4">Optional</bridgehead>
-    <para role="optional">
-      <xref linkend="openldap"/> (client only)
-    </para>
-
-    <para condition="html" role="usernotes">User Notes:
-      <ulink url="&blfs-wiki;/libnfsidmap"/>
-    </para>
-  </sect2>
-
-  <sect2 role="installation">
-    <title>Installation of libnfsidmap</title>
-
-    <para>
-      Install <application>libnfsidmap</application> by running the following
-      commands:
-    </para>
-
-<!-- sysconfdir=/etc is used because the config file /etc/idmapd.conf
-     is installed by nfs-utils -->
-<screen><userinput>./configure --prefix=/usr     \
-            --sysconfdir=/etc \
-            --disable-static  &amp;&amp;
-make</userinput></screen>
-
-    <para>
-      This package does not come with a testsuite.
-    </para>
-
-    <para>
-      Now, as the <systemitem class="username">root</systemitem> user:
-    </para>
-
-<screen role="root"><userinput>make install                         &amp;&amp;
-mv -v /usr/lib/libnfsidmap.so.* /lib &amp;&amp;
-ln -sfv ../../lib/$(readlink /usr/lib/libnfsidmap.so) /usr/lib/libnfsidmap.so</userinput></screen>
-
-  </sect2>
-
-  <sect2 role="commands">
-    <title>Command Explanations</title>
-
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-      href="../../xincludes/static-libraries.xml"/>
-
-    <para>
-      <command>mv -v /usr/lib/libnfsidmap.so.* ...</command>: Move shared
-      libraries into /lib so they are available before /usr is mounted.
-    </para>
-
-  </sect2>
-
-  <sect2 role="content">
-    <title>Contents</title>
-
-    <segmentedlist>
-      <segtitle>Installed Programs</segtitle>
-      <segtitle>Installed Libraries</segtitle>
-      <segtitle>Installed Directories</segtitle>
-
-      <seglistitem>
-        <seg>
-          None
-        </seg>
-        <seg>
-          libnfsidmap.so
-        </seg>
-        <seg>
-          /usr/lib/libnfsidmap
-        </seg>
-      </seglistitem>
-    </segmentedlist>
-
-    <variablelist>
-      <bridgehead renderas="sect3">Short Descriptions</bridgehead>
-      <?dbfo list-presentation="list"?>
-      <?dbhtml list-presentation="table"?>
-
-      <varlistentry id="libnfsidmap-lib">
-        <term><filename class="libraryfile">libnfsidmap.so</filename></term>
-        <listitem>
-          <para>
-            contains the <application>libnfsidmap</application> API functions.
-          </para>
-          <indexterm zone="libnfsidmap libnfsidmap-lib">
-            <primary sortas="c-libnfsidmap">libnfsidmap.so</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-    </variablelist>
-
-  </sect2>
-
-</sect1>
Index: introduction/welcome/changelog.xml
===================================================================
--- introduction/welcome/changelog.xml	(revision 657b29e12ffa9b6aafb8c43db1ebf7bc81125408)
+++ introduction/welcome/changelog.xml	(revision 1b2b8eb2b34d2fb034e35d65b5c4918cf4e21efb)
@@ -46,4 +46,8 @@
       <itemizedlist>
         <listitem>
+          <para>[renodr] - Archive libnfsidmap as nfs-utils builds its own
+          version now.</para>
+        </listitem>
+        <listitem>
           <para>[ken] - Update to mutt-2.0.5. Fixes
           <ulink url="&blfs-ticket-root;14544">#14544</ulink>.</para>
Index: networking/netprogs/nfs-utils.xml
===================================================================
--- networking/netprogs/nfs-utils.xml	(revision 657b29e12ffa9b6aafb8c43db1ebf7bc81125408)
+++ networking/netprogs/nfs-utils.xml	(revision 1b2b8eb2b34d2fb034e35d65b5c4918cf4e21efb)
@@ -86,5 +86,6 @@
       <xref linkend="cyrus-sasl"/> (for SASL authentication),
       <xref linkend="lvm2"/> (libdevmapper for NFSv4 support),
-      <xref linkend="libnfsidmap"/> (for NFSv4 support),
+      <!--<xref linkend="libnfsidmap"/> (for NFSv4 support),
+      This is now built in, as of 2.2.1-->
       <xref linkend="libnsl"/> (for NIS client support),
       <xref linkend="openldap"/> (for LDAP authentication),
@@ -242,10 +243,11 @@
       to fix a build issue with glibc-2.26 and later.
     </para>
+
+    <para>
+      <parameter>- -disable-nfsv4</parameter>: This allows the package to be
+      built when libnfsidmap has not been installed.
+    </para>
+    nfs-utils now carries libnfsidmap
 -->
-    <para>
-      <parameter>--disable-nfsv4</parameter>: This allows the package to be
-      built when libnfsidmap has not been installed.
-    </para>
-
     <para>
       <parameter>--disable-gss</parameter>: Disables support for
Index: packages.ent
===================================================================
--- packages.ent	(revision 657b29e12ffa9b6aafb8c43db1ebf7bc81125408)
+++ packages.ent	(revision 1b2b8eb2b34d2fb034e35d65b5c4918cf4e21efb)
@@ -153,5 +153,5 @@
 <!ENTITY liblinear-version            "242">
 <!ENTITY libmbim-version              "1.24.4">
-<!ENTITY libnfsidmap-version          "0.26">
+<!--<!ENTITY libnfsidmap-version          "0.26">-->
 <!ENTITY libpaper-version             "1.1.24+nmu5">
 <!ENTITY libportal-version            "0.3">
