Index: postlfs/security/gnupg2-systemd.xml
===================================================================
--- postlfs/security/gnupg2-systemd.xml	(revision b71b5c8632e6fb812400f51ee3b8eba0a0766f26)
+++ postlfs/security/gnupg2-systemd.xml	(revision b71b5c8632e6fb812400f51ee3b8eba0a0766f26)
@@ -0,0 +1,431 @@
+<?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;
+
+  <!ENTITY gnupg2-download-http " ">
+  <!ENTITY gnupg2-download-ftp  "ftp://ftp.gnupg.org/gcrypt/gnupg/gnupg-&gnupg2-version;.tar.bz2">
+  <!ENTITY gnupg2-md5sum        "fa7e704aad33eb114d1840164455aec1">
+  <!ENTITY gnupg2-size          "4.2 MB">
+  <!ENTITY gnupg2-buildsize     "68 MB">
+  <!ENTITY gnupg2-time          "0.6 SBU (additional 0.5 SBU for the tests)">
+]>
+
+<sect1 id="gnupg2" xreflabel="GnuPG-&gnupg2-version;">
+  <?dbhtml filename="gnupg.html"?>
+
+  <sect1info>
+    <othername>$LastChangedBy$</othername>
+    <date>$Date$</date>
+  </sect1info>
+
+  <title>GnuPG-&gnupg2-version;</title>
+
+  <indexterm zone="gnupg2">
+    <primary sortas="a-GnuPG">GnuPG</primary>
+  </indexterm>
+
+  <sect2 role="package">
+    <title>Introduction to GnuPG</title>
+
+    <para>
+      The <application>GnuPG</application> package is GNU's tool for secure
+      communication and data storage. It can be used to encrypt data and to
+      create digital signatures. It includes an advanced key management
+      facility and is compliant with the proposed OpenPGP Internet standard
+      as described in RFC2440 and the S/MIME standard as described by several
+      RFCs. GnuPG 2 is the stable version of GnuPG integrating support for
+      OpenPGP and S/MIME.
+    </para>
+
+    &lfs76_checked;
+
+    <bridgehead renderas="sect3">Package Information</bridgehead>
+    <itemizedlist spacing="compact">
+      <listitem>
+        <para>
+          Download (HTTP): <ulink url="&gnupg2-download-http;"/>
+        </para>
+      </listitem>
+      <listitem>
+        <para>
+          Download (FTP): <ulink url="&gnupg2-download-ftp;"/>
+        </para>
+      </listitem>
+      <listitem>
+        <para>
+          Download MD5 sum: &gnupg2-md5sum;
+        </para>
+      </listitem>
+      <listitem>
+        <para>
+          Download size: &gnupg2-size;
+        </para>
+      </listitem>
+      <listitem>
+        <para>
+          Estimated disk space required: &gnupg2-buildsize;
+        </para>
+      </listitem>
+      <listitem>
+        <para>
+          Estimated build time: &gnupg2-time;
+        </para>
+      </listitem>
+    </itemizedlist>
+
+    <bridgehead renderas="sect3">GnuPG Dependencies</bridgehead>
+
+    <bridgehead renderas="sect4">Required</bridgehead>
+    <para role="required">
+      <xref linkend="libassuan"/>,
+      <xref linkend="libgcrypt"/>,
+      <xref linkend="libksba"/> and
+      <xref linkend="pth"/>
+    </para>
+
+    <bridgehead renderas="sect4">Recommended</bridgehead>
+    <para role="recommended">
+      <xref linkend="pinentry"/> (Run-time requirement for
+      most of the package's functionality)
+    </para>
+
+    <bridgehead renderas="sect4">Optional</bridgehead>
+    <para role="optional">
+      <xref linkend="curl"/>,
+      <ulink url="http://www.chiark.greenend.org.uk/~ian/adns/">GNU
+      ADNS</ulink>,
+      <xref linkend="libusb-compat"/>,
+      an <xref linkend="server-mail"/> and
+      <xref linkend="openldap"/>
+    </para>
+
+    <para condition="html" role="usernotes">User Notes:
+      <ulink url="&blfs-wiki;/gnupg2"/>
+    </para>
+  </sect2>
+
+  <sect2 role="installation">
+    <title>Installation of GnuPG</title>
+
+    <para>
+      Install <application>GnuPG</application> by running the following
+      commands:
+    </para>
+
+<screen><userinput>./configure --prefix=/usr        \
+            --sysconfdir=/etc    \
+            --enable-symcryptrun \
+            --docdir=/usr/share/doc/gnupg-&gnupg2-version; &amp;&amp;
+make &amp;&amp;
+
+makeinfo --html --no-split -o doc/gnupg_nochunks.html doc/gnupg.texi &amp;&amp;
+makeinfo --plaintext       -o doc/gnupg.txt           doc/gnupg.texi</userinput></screen>
+
+    <para>
+      If you have <xref linkend="texlive"/> installed and you wish
+      to create documentation in alternate formats, issue the
+      following commands:
+    </para>
+
+<screen><userinput>make -C doc pdf ps html</userinput></screen>
+
+    <para>
+      To test the results, issue: <command>make check</command>.
+    </para>
+
+    <para>
+      Now, as the <systemitem class="username">root</systemitem> user:
+    </para>
+
+<screen role="root"><userinput>make install               &amp;&amp;
+
+for f in gpg gpgv ; do
+ln -sfv ${f}2   /usr/bin/${f} &amp;&amp;
+ln -sfv ${f}2.1 /usr/share/man/man1/${f}.1
+done &amp;&amp;
+
+install -v -dm755 /usr/share/doc/gnupg-&gnupg2-version;/html       &amp;&amp;
+install -v -m644  doc/gnupg_nochunks.html \
+                  /usr/share/doc/gnupg-&gnupg2-version;/gnupg.html &amp;&amp;
+install -v -m644  doc/*.texi doc/gnupg.txt \
+                  /usr/share/doc/gnupg-&gnupg2-version;</userinput></screen>
+
+    <para>
+      If you created alternate formats of the documentation, install
+      it using the following command as the
+      <systemitem class="username">root</systemitem> user:
+    </para>
+
+<screen role="root"><userinput>install -v -m644 doc/gnupg.html/* \
+                 /usr/share/doc/gnupg-&gnupg2-version;/html &amp;&amp;
+install -v -m644 doc/gnupg.{pdf,dvi,ps} \
+                 /usr/share/doc/gnupg-&gnupg2-version;</userinput></screen>
+
+  </sect2>
+
+  <sect2 role="commands">
+    <title>Command Explanations</title>
+
+    <para>
+      <parameter>--enable-symcryptrun</parameter>: This switch enables
+      building the symcryptrun program.
+    </para>
+
+    <para>
+      <command>ln -sfv ...</command>: This command creates symlinks for
+      compatibility with the first version of
+      <application>GnuPG</application>.
+    </para>
+
+  </sect2>
+
+  <sect2 role="content">
+    <title>Contents</title>
+
+    <segmentedlist>
+      <segtitle>Installed Programs</segtitle>
+      <segtitle>Installed Libraries</segtitle>
+      <segtitle>Installed Directories</segtitle>
+
+      <seglistitem>
+        <seg>
+          addgnupghome, applygnupgdefaults, gpg, gpg2, gpg-agent,
+          gpgconf, gpg-connect-agent, gpgkey2ssh, gpgparsemail,
+          gpgsm, gpgsm-gencert.sh, gpgtar, gpgv, gpgv2, kbxutil,
+          scdaemon, symcryptrun and watchgnupg
+        </seg>
+        <seg>
+          None
+        </seg>
+        <seg>
+          /usr/share/doc/gnupg-&gnupg2-version; and
+          /usr/share/gnupg
+        </seg>
+      </seglistitem>
+    </segmentedlist>
+
+    <variablelist>
+      <bridgehead renderas="sect3">Short Descriptions</bridgehead>
+      <?dbfo list-presentation="list"?>
+      <?dbhtml list-presentation="table"?>
+
+      <varlistentry id="addgnupghome">
+        <term><command>addgnupghome</command></term>
+        <listitem>
+          <para>
+            is used to create and populate user's
+            <filename class="directory">~/.gnupg</filename> directories.
+          </para>
+          <indexterm zone="gnupg2 addgnupghome">
+            <primary sortas="b-addgnupghome">addgnupghome</primary>
+          </indexterm>
+        </listitem>
+      </varlistentry>
+
+      <varlistentry id="applygnupgdefaults">
+        <term><command>applygnupgdefaults</command></term>
+        <listitem>
+          <para>
+            is a wrapper script used to run <command>gpgconf</command>
+            with the <parameter>--apply-defaults</parameter> parameter
+            on all user's GnuPG home directories.
+          </para>
+          <indexterm zone="gnupg2 applygnupgdefaults">
+            <primary sortas="b-applygnupgdefaults">applygnupgdefaults</primary>
+          </indexterm>
+        </listitem>
+      </varlistentry>
+
+      <varlistentry id="gpg-agent">
+        <term><command>gpg-agent</command></term>
+        <listitem>
+          <para>
+            is a daemon used to manage secret (private) keys independently
+            from any protocol. It is used as a backend for
+            <command>gpg</command> and <command>gpgsm</command> as well as
+            for a couple of other utilities.
+          </para>
+          <indexterm zone="gnupg2 gpg-agent">
+            <primary sortas="b-gpg-agent">gpg-agent</primary>
+          </indexterm>
+        </listitem>
+      </varlistentry>
+
+      <varlistentry id="gpg-connect-agent">
+        <term><command>gpg-connect-agent</command></term>
+        <listitem>
+          <para>
+            is a utility used to communicate with a running
+            <command>gpg-agent</command>.
+          </para>
+          <indexterm zone="gnupg2 gpg-connect-agent">
+            <primary sortas="b-gpg-connect-agent">gpg-connect-agent</primary>
+          </indexterm>
+        </listitem>
+      </varlistentry>
+
+      <varlistentry id="gpg">
+        <term><command>gpg</command></term>
+        <listitem>
+          <para>
+            is a symlink to <command>gpg2</command> for compatibility
+            with the first version of <application>GnuPG</application>.
+          </para>
+          <indexterm zone="gnupg2 gpg">
+            <primary sortas="b-gpg">gpg</primary>
+          </indexterm>
+        </listitem>
+      </varlistentry>
+
+      <varlistentry id="gpg2">
+        <term><command>gpg2</command></term>
+        <listitem>
+          <para>
+            is the OpenPGP part of the GNU Privacy Guard (GnuPG). It is a
+            tool used to provide digital encryption and signing services
+            using the OpenPGP standard.
+          </para>
+          <indexterm zone="gnupg2 gpg2">
+            <primary sortas="b-gpg2">gpg2</primary>
+          </indexterm>
+        </listitem>
+      </varlistentry>
+
+      <varlistentry id="gpgconf">
+        <term><command>gpgconf</command></term>
+        <listitem>
+          <para>
+            is a utility used to automatically and reasonable safely
+            query and modify configuration files in the
+            <filename class="directory">~/.gnupg</filename> home
+            directory. It is designed not to be invoked manually by
+            the user, but automatically by graphical user interfaces.
+          </para>
+          <indexterm zone="gnupg2 gpgconf">
+            <primary sortas="b-gpgconf">gpgconf</primary>
+          </indexterm>
+        </listitem>
+      </varlistentry>
+
+      <varlistentry id="gpgparsemail">
+        <term><command>gpgparsemail</command></term>
+        <listitem>
+          <para>
+            is a utility currently only useful for debugging. Run it with
+            <parameter>--help</parameter> for usage information.
+          </para>
+          <indexterm zone="gnupg2 gpgparsemail">
+            <primary sortas="b-gpgparsemail">gpgparsemail</primary>
+          </indexterm>
+        </listitem>
+      </varlistentry>
+
+      <varlistentry id="gpgsm">
+        <term><command>gpgsm</command></term>
+        <listitem>
+          <para>
+            is a tool similar to <command>gpg</command> used to provide digital
+            encryption and signing services on X.509 certificates and the CMS
+            protocol. It is mainly used as a backend for S/MIME mail processing.
+          </para>
+          <indexterm zone="gnupg2 gpgsm">
+            <primary sortas="b-gpgsm">gpgsm</primary>
+          </indexterm>
+        </listitem>
+      </varlistentry>
+
+      <varlistentry id="gpgsm-gencert.sh">
+        <term><command>gpgsm-gencert.sh</command></term>
+        <listitem>
+          <para>
+            is a simple tool used to interactively generate a certificate
+            request which will be printed to stdout.
+          </para>
+          <indexterm zone="gnupg2 gpgsm-gencert.sh">
+            <primary sortas="b-gpgsm-gencert.sh">gpgsm-gencert.sh</primary>
+          </indexterm>
+        </listitem>
+      </varlistentry>
+
+      <varlistentry id="gpgv">
+        <term><command>gpgv</command></term>
+        <listitem>
+          <para>
+            is a symlink to <command>gpgv2</command> for compatibility
+            with the first version of <application>GnuPG</application>.
+          </para>
+          <indexterm zone="gnupg2 gpgv">
+            <primary sortas="b-gpgv">gpgv</primary>
+          </indexterm>
+        </listitem>
+      </varlistentry>
+
+      <varlistentry id="gpgv2">
+        <term><command>gpgv2</command></term>
+        <listitem>
+          <para>
+            is a verify only version of <command>gpg2</command>.
+          </para>
+          <indexterm zone="gnupg2 gpgv2">
+            <primary sortas="b-gpgv2">gpgv2</primary>
+          </indexterm>
+        </listitem>
+      </varlistentry>
+
+      <varlistentry id="kbxutil">
+        <term><command>kbxutil</command></term>
+        <listitem>
+          <para>
+            is used to list, export and import Keybox data.
+          </para>
+          <indexterm zone="gnupg2 kbxutil">
+            <primary sortas="b-kbxutil">kbxutil</primary>
+          </indexterm>
+        </listitem>
+      </varlistentry>
+
+      <varlistentry id="scdaemon">
+        <term><command>scdaemon</command></term>
+        <listitem>
+          <para>
+            is a daemon used to manage smartcards. It is usually invoked by
+            <command>gpg-agent</command> and in general not used directly.
+          </para>
+          <indexterm zone="gnupg2 scdaemon">
+            <primary sortas="b-scdaemon">scdaemon</primary>
+          </indexterm>
+        </listitem>
+      </varlistentry>
+
+      <varlistentry id="symcryptrun">
+        <term><command>symcryptrun</command></term>
+        <listitem>
+          <para>
+            is a simple symmetric encryption tool.
+          </para>
+          <indexterm zone="gnupg2 symcryptrun">
+            <primary sortas="b-symcryptrun">symcryptrun</primary>
+          </indexterm>
+        </listitem>
+      </varlistentry>
+
+      <varlistentry id="watchgnupg">
+        <term><command>watchgnupg</command></term>
+        <listitem>
+          <para>
+            is used to listen to a Unix Domain socket created by any of
+            the GnuPG tools.
+          </para>
+          <indexterm zone="gnupg2 watchgnupg">
+            <primary sortas="b-watchgnupg">watchgnupg</primary>
+          </indexterm>
+        </listitem>
+      </varlistentry>
+
+    </variablelist>
+
+  </sect2>
+
+</sect1>
Index: postlfs/security/gnupg2.xml
===================================================================
--- postlfs/security/gnupg2.xml	(revision 838cd0f72168fbe6c0ba8d85d60be538d755bfaf)
+++ 	(revision )
@@ -1,370 +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;
-
-  <!ENTITY gnupg2-download-http " ">
-  <!ENTITY gnupg2-download-ftp  "ftp://ftp.gnupg.org/gcrypt/gnupg/gnupg-&gnupg2-version;.tar.bz2">
-  <!ENTITY gnupg2-md5sum        "fa7e704aad33eb114d1840164455aec1">
-  <!ENTITY gnupg2-size          "4.2 MB">
-  <!ENTITY gnupg2-buildsize     "68 MB">
-  <!ENTITY gnupg2-time          "0.6 SBU (additional 0.5 SBU for the tests)">
-]>
-
-<sect1 id="gnupg2" xreflabel="GnuPG-&gnupg2-version;">
-  <?dbhtml filename="gnupg.html"?>
-
-  <sect1info>
-    <othername>$LastChangedBy$</othername>
-    <date>$Date$</date>
-  </sect1info>
-
-  <title>GnuPG-&gnupg2-version;</title>
-
-  <indexterm zone="gnupg2">
-    <primary sortas="a-GnuPG">GnuPG</primary>
-  </indexterm>
-
-  <sect2 role="package">
-    <title>Introduction to GnuPG</title>
-
-    <para>The <application>GnuPG</application> package is GNU's tool for
-    secure communication and data storage. It can be used to encrypt data and
-    to create digital signatures. It includes an advanced key management
-    facility and is compliant with the proposed OpenPGP Internet standard as
-    described in RFC2440 and the S/MIME standard as described by several RFCs.
-    GnuPG 2 is the stable version of GnuPG integrating support for OpenPGP and
-    S/MIME.</para>
-
-    &lfs76_checked;
-
-    <bridgehead renderas="sect3">Package Information</bridgehead>
-    <itemizedlist spacing="compact">
-      <listitem>
-        <para>Download (HTTP): <ulink url="&gnupg2-download-http;"/></para>
-      </listitem>
-      <listitem>
-        <para>Download (FTP): <ulink url="&gnupg2-download-ftp;"/></para>
-      </listitem>
-      <listitem>
-        <para>Download MD5 sum: &gnupg2-md5sum;</para>
-      </listitem>
-      <listitem>
-        <para>Download size: &gnupg2-size;</para>
-      </listitem>
-      <listitem>
-        <para>Estimated disk space required: &gnupg2-buildsize;</para>
-      </listitem>
-      <listitem>
-        <para>Estimated build time: &gnupg2-time;</para>
-      </listitem>
-    </itemizedlist>
-
-    <bridgehead renderas="sect3">GnuPG 2 Dependencies</bridgehead>
-
-    <bridgehead renderas="sect4">Required</bridgehead>
-    <para role="required"><xref linkend="pth"/>,
-    <xref linkend="libassuan"/>,
-    <xref linkend="libgcrypt"/>, and
-    <xref linkend="libksba"/></para>
-
-    <bridgehead renderas="sect4">Recommended</bridgehead>
-    <para role="recommended"><xref linkend="pinentry"/> (Run-time requirement for most of
-    the package's functionality)</para>
-
-    <bridgehead renderas="sect4">Optional</bridgehead>
-    <para role="optional"><xref linkend="openldap"/>,
-    <xref linkend="libusb-compat"/>,
-    <xref linkend="curl"/>,
-    <ulink url="http://www.chiark.greenend.org.uk/~ian/adns/">GNU
-    adns</ulink>, and an
-    <xref linkend="server-mail"/></para>
-
-    <para condition="html" role="usernotes">User Notes:
-    <ulink url="&blfs-wiki;/gnupg2"/></para>
-
-  </sect2>
-
-  <sect2 role="installation">
-    <title>Installation of GnuPG</title>
-
-    <para>Install <application>GnuPG</application> by running the following
-    commands:</para>
-
-<screen><userinput>./configure --prefix=/usr \
-            --enable-symcryptrun \
-            --docdir=/usr/share/doc/gnupg-&gnupg2-version; &amp;&amp;
-make &amp;&amp;
-
-makeinfo --html --no-split -o doc/gnupg_nochunks.html doc/gnupg.texi &amp;&amp;
-makeinfo --plaintext       -o doc/gnupg.txt           doc/gnupg.texi</userinput></screen>
-
-    <para>If you have <xref linkend="texlive"/>
-    installed and you wish to create documentation in alternate formats,
-    issue the following commands:</para>
-
-<screen><userinput>make -C doc pdf ps html</userinput></screen>
-
-    <para>To test the results, issue: <command>make check</command>.</para>
-
-    <para>Note that if you have already installed
-    <application>GnuPG</application>, the instructions below will overwrite
-    <filename>/usr/share/man/man1/gpg-zip.1</filename>. Now, as the
-    <systemitem class="username">root</systemitem> user:</para>
-
-<screen role="root"><userinput>make install &amp;&amp;
-
-install -v -m755 -d /usr/share/doc/gnupg-&gnupg2-version;/html       &amp;&amp;
-install -v -m644    doc/gnupg_nochunks.html \
-                    /usr/share/doc/gnupg-&gnupg2-version;/gnupg.html &amp;&amp;
-install -v -m644    doc/*.texi doc/gnupg.txt \
-                    /usr/share/doc/gnupg-&gnupg2-version;</userinput></screen>
-
-    <para>We recommend the creation of symlinks for compatibility with the first
-    version of GnuPG, because some programs or scripts need them. Issue, as
-    <systemitem class="username">root</systemitem> user:</para>
-
-<screen role="root"><userinput>for f in gpg gpgv
-do
-  ln -svf ${f}2.1 /usr/share/man/man1/$f.1 &amp;&amp;
-  ln -svf ${f}2   /usr/bin/$f
-done
-unset f</userinput></screen>
-
-    <para>If you created alternate formats of the documentation, install it
-    using the following command as the
-    <systemitem class="username">root</systemitem> user:</para>
-
-<screen role="root"><userinput>install -v -m644 doc/gnupg.html/* \
-                 /usr/share/doc/gnupg-&gnupg2-version;/html &amp;&amp;
-install -v -m644 doc/gnupg.{pdf,dvi,ps} \
-                 /usr/share/doc/gnupg-&gnupg2-version;</userinput></screen>
-
-  </sect2>
-
-  <sect2 role="commands">
-    <title>Command Explanations</title>
-
-    <para><parameter>--docdir=/usr/share/doc/gnupg-&gnupg2-version;</parameter>:
-    This switch changes the default docdir to <filename
-    class="directory">/usr/share/doc/gnupg-&gnupg2-version;</filename>.</para>
-
-    <para><parameter>--enable-symcryptrun</parameter>: This switch enables
-    building the symcryptrun program.</para>
-
-  </sect2>
-
-  <sect2 role="content">
-    <title>Contents</title>
-
-    <segmentedlist>
-      <segtitle>Installed Programs</segtitle>
-      <segtitle>Installed Libraries</segtitle>
-      <segtitle>Installed Directories</segtitle>
-
-      <seglistitem>
-        <seg>addgnupghome, applygnupgdefaults, gnupg-pcsc-wrapper, gpg,
-        gpg-agent, gpg-check-pattern, gpg-connect-agent, gpg-preset-passphrase,
-        gpg-protect-tool, gpg2, gpg2keys_curl, gpg2keys_finger, gpg2keys_hkp,
-        gpg2keys_ldap, gpgconf, gpgkey2ssh, gpgparsemail, gpgsm,
-        gpgsm-gencert.sh, gpgv, gpgv2, kbxutil, scdaemon, symcryptrun,
-        and watchgnupg</seg>
-        <seg>None</seg>
-        <seg>/usr/share/doc/gnupg-&gnupg2-version; and
-        /usr/share/gnupg</seg>
-      </seglistitem>
-    </segmentedlist>
-
-    <variablelist>
-      <bridgehead renderas="sect3">Short Descriptions</bridgehead>
-      <?dbfo list-presentation="list"?>
-      <?dbhtml list-presentation="table"?>
-
-      <varlistentry id="addgnupghome">
-        <term><command>addgnupghome</command></term>
-        <listitem>
-          <para>is used to create and populate user's
-          <filename class='directory'>~/.gnupg</filename> directories</para>
-          <indexterm zone="gnupg2 addgnupghome">
-            <primary sortas="b-addgnupghome">addgnupghome</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="applygnupgdefaults">
-        <term><command>applygnupgdefaults</command></term>
-        <listitem>
-          <para>is a wrapper script used to run <command>gpgconf</command>
-          with the <parameter>--apply-defaults</parameter> parameter on all
-          user's GnuPG home directories.</para>
-          <indexterm zone="gnupg2 applygnupgdefaults">
-            <primary sortas="b-applygnupgdefaults">applygnupgdefaults</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="gpg-agent">
-        <term><command>gpg-agent</command></term>
-        <listitem>
-          <para>is a daemon used to manage secret (private) keys independently
-          from any protocol. It is used as a backend for <command>gpg2</command>
-          and <command>gpgsm</command> as well as for a couple of other
-          utilities.</para>
-          <indexterm zone="gnupg2 gpg-agent">
-            <primary sortas="b-gpg-agent">gpg-agent</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="gpg-connect-agent">
-        <term><command>gpg-connect-agent</command></term>
-        <listitem>
-          <para>is a utility used to communicate with a running
-          <command>gpg-agent</command>.</para>
-          <indexterm zone="gnupg2 gpg-connect-agent">
-            <primary sortas="b-gpg-connect-agent">gpg-connect-agent</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="gpg">
-        <term><command>gpg</command></term>
-        <listitem>
-          <para>(optional) is a symlink to <command>gpg2</command> for
-          compatibility with the first version of GnuPG.</para>
-          <indexterm zone="gnupg2 gpg">
-            <primary sortas="b-gpg">gpg</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="gpg2">
-        <term><command>gpg2</command></term>
-        <listitem>
-          <para>is the OpenPGP part of the GNU Privacy Guard (GnuPG). It is a
-          tool used to provide digital encryption and signing services using
-          the OpenPGP standard.</para>
-          <indexterm zone="gnupg2 gpg2">
-            <primary sortas="b-gpg2">gpg2</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="gpgconf">
-        <term><command>gpgconf</command></term>
-        <listitem>
-          <para>is a utility used to automatically and reasonable safely
-          query and modify configuration files in the
-          <filename class='directory'>~/.gnupg</filename> home directory. It is
-          designed not to be invoked manually by the user, but automatically by
-          graphical user interfaces.</para>
-          <indexterm zone="gnupg2 gpgconf">
-            <primary sortas="b-gpgconf">gpgconf</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="gpgparsemail">
-        <term><command>gpgparsemail</command></term>
-        <listitem>
-          <para>is a utility currently only useful for debugging. Run it with
-          <parameter>--help</parameter> for usage information.</para>
-          <indexterm zone="gnupg2 gpgparsemail">
-            <primary sortas="b-gpgparsemail">gpgparsemail</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="gpgsm">
-        <term><command>gpgsm</command></term>
-        <listitem>
-          <para>is a tool similar to <command>gpg2</command> used to provide
-          digital encryption and signing services on X.509 certificates and the
-          CMS protocol. It is mainly used as a backend for S/MIME mail
-          processing.</para>
-          <indexterm zone="gnupg2 gpgsm">
-            <primary sortas="b-gpgsm">gpgsm</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="gpgsm-gencert.sh">
-        <term><command>gpgsm-gencert.sh</command></term>
-        <listitem>
-          <para>is a simple tool used to interactively generate a certificate
-          request which will be printed to stdout.</para>
-          <indexterm zone="gnupg2 gpgsm-gencert.sh">
-            <primary sortas="b-gpgsm-gencert.sh">gpgsm-gencert.sh</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="gpgv">
-        <term><command>gpgv</command></term>
-        <listitem>
-          <para>(optional) is a symlink to <command>gpgv2</command> for
-          compatibility with the first version of GnuPG.</para>
-          <indexterm zone="gnupg2 gpgv">
-            <primary sortas="b-gpgv">gpgv</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="gpgv2">
-        <term><command>gpgv2</command></term>
-        <listitem>
-          <para>is a verify only version of <command>gpg2</command>.</para>
-          <indexterm zone="gnupg2 gpgv2">
-            <primary sortas="b-gpgv2">gpgv2</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="kbxutil">
-        <term><command>kbxutil</command></term>
-        <listitem>
-          <para>is used to list, export and import Keybox data.</para>
-          <indexterm zone="gnupg2 kbxutil">
-            <primary sortas="b-kbxutil">kbxutil</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="scdaemon">
-        <term><command>scdaemon</command></term>
-        <listitem>
-          <para>is a daemon used to manage smartcards. It is usually invoked by
-          <command>gpg-agent</command> and in general not used directly.</para>
-          <indexterm zone="gnupg2 scdaemon">
-            <primary sortas="b-scdaemon">scdaemon</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="symcryptrun">
-        <term><command>symcryptrun</command></term>
-        <listitem>
-          <para>is a simple symmetric encryption tool.</para>
-          <indexterm zone="gnupg2 symcryptrun">
-            <primary sortas="b-symcryptrun">symcryptrun</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="watchgnupg">
-        <term><command>watchgnupg</command></term>
-        <listitem>
-          <para>is used to listen to a Unix Domain socket created by any of
-          the GnuPG tools.</para>
-          <indexterm zone="gnupg2 watchgnupg">
-            <primary sortas="b-watchgnupg">watchgnupg</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-    </variablelist>
-
-  </sect2>
-
-</sect1>
Index: postlfs/security/libcap-systemd.xml
===================================================================
--- postlfs/security/libcap-systemd.xml	(revision b71b5c8632e6fb812400f51ee3b8eba0a0766f26)
+++ postlfs/security/libcap-systemd.xml	(revision b71b5c8632e6fb812400f51ee3b8eba0a0766f26)
@@ -0,0 +1,106 @@
+<?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;
+
+  <!ENTITY libcap-download-http "https://www.kernel.org/pub/linux/libs/security/linux-privs/libcap2/libcap-&libcap-version;.tar.xz">
+  <!ENTITY libcap-download-ftp  "ftp://ftp.kernel.org/pub/linux/libs/security/linux-privs/libcap2/libcap-&libcap-version;.tar.xz">
+  <!ENTITY libcap-md5sum        "d43ab9f680435a7fff35b4ace8d45b80">
+  <!ENTITY libcap-size          "62 KB">
+  <!ENTITY libcap-buildsize     "1.5 MB">
+  <!ENTITY libcap-time          "0.1 SBU">
+]>
+
+<sect1 id="libcap-pam" xreflabel="libcap-&libcap-version; with PAM">
+  <?dbhtml filename="libcap.html"?>
+
+  <sect1info>
+    <othername>$LastChangedBy$</othername>
+    <date>$Date$</date>
+  </sect1info>
+
+  <title>libcap-&libcap-version; with PAM</title>
+
+  <indexterm zone="libcap-pam">
+    <primary sortas="a-libcap-pam">libcap</primary>
+  </indexterm>
+
+  <sect2 role="package">
+    <title>Introduction to libcap with PAM</title>
+
+    <para>The <application>libcap</application> package was installed in 
+    LFS, but if PAM support is desired, it needs to be reinstalled after 
+    PAM is built so the shipped PAM module can be installed.</para>
+
+    &lfs76_checked;
+
+    <bridgehead renderas="sect3">Package Information</bridgehead>
+    <itemizedlist spacing="compact">
+      <listitem>
+        <para>Download (HTTP): <ulink url="&libcap-download-http;"/></para>
+      </listitem>
+      <listitem>
+        <para>Download (FTP): <ulink url="&libcap-download-ftp;"/></para>
+      </listitem>
+      <listitem>
+        <para>Download MD5 sum: &libcap-md5sum;</para>
+      </listitem>
+      <listitem>
+        <para>Download size: &libcap-size;</para>
+      </listitem>
+      <listitem>
+        <para>Estimated disk space required: &libcap-buildsize;</para>
+      </listitem>
+      <listitem>
+        <para>Estimated build time: &libcap-time;</para>
+      </listitem>
+    </itemizedlist>
+
+    <bridgehead renderas="sect3">libcap Dependencies</bridgehead>
+
+    <bridgehead renderas="sect4">Required</bridgehead>
+    <para role="required">
+      <xref linkend="linux-pam"/>
+    </para>
+
+    <para condition="html" role="usernotes">User Notes:
+    <ulink url="&blfs-wiki;/libcap"/></para>
+
+  </sect2>
+
+  <sect2 role="installation">
+    <title>Installation of libcap</title>
+
+    <para>Install <application>libcap</application> by running the following
+    commands:</para>
+
+<screen><userinput>make -C pam_cap</userinput></screen>
+
+    <para>This package does not come with a test suite.</para>
+
+    <para>Now, as the <systemitem class="username">root</systemitem> user:</para>
+
+<screen role="root"><userinput>install -v -m755 pam_cap/pam_cap.so /lib/security/pam_cap.so &amp;&amp;
+install -v -m644 pam_cap/capability.conf /etc/security</userinput></screen>
+
+  </sect2>
+
+  <sect2 role="content">
+    <title>Contents</title>
+
+    <segmentedlist>
+      <segtitle>Installed Programs</segtitle>
+      <segtitle>Installed Library</segtitle>
+      <segtitle>Installed Directories</segtitle>
+
+      <seglistitem>
+        <seg>None</seg>
+        <seg>pam_cap.so</seg>
+        <seg>None</seg>
+      </seglistitem>
+    </segmentedlist>
+
+  </sect2>
+
+</sect1>
Index: postlfs/security/libcap.xml
===================================================================
--- postlfs/security/libcap.xml	(revision 838cd0f72168fbe6c0ba8d85d60be538d755bfaf)
+++ 	(revision )
@@ -1,192 +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;
-
-  <!ENTITY libcap-download-http "https://www.kernel.org/pub/linux/libs/security/linux-privs/libcap2/libcap-&libcap-version;.tar.xz">
-  <!ENTITY libcap-download-ftp  "ftp://ftp.kernel.org/pub/linux/libs/security/linux-privs/libcap2/libcap-&libcap-version;.tar.xz">
-  <!ENTITY libcap-md5sum        "d43ab9f680435a7fff35b4ace8d45b80">
-  <!ENTITY libcap-size          "62 KB">
-  <!ENTITY libcap-buildsize     "1.5 MB">
-  <!ENTITY libcap-time          "0.1 SBU">
-]>
-
-<sect1 id="libcap-pam" xreflabel="libcap-&libcap-version; with PAM">
-  <?dbhtml filename="libcap.html"?>
-
-  <sect1info>
-    <othername>$LastChangedBy$</othername>
-    <date>$Date$</date>
-  </sect1info>
-
-  <title>libcap-&libcap-version; with PAM</title>
-
-  <indexterm zone="libcap-pam">
-    <primary sortas="a-libcap-pam">libcap</primary>
-  </indexterm>
-
-  <sect2 role="package">
-    <title>Introduction to libcap with PAM</title>
-
-    <para>The <application>libcap</application> package was installed in 
-    LFS, but if PAM support is desired, it needs to be reinstalled after 
-    PAM is built.</para>
-    &lfs76_checked;
-
-    <bridgehead renderas="sect3">Package Information</bridgehead>
-    <itemizedlist spacing="compact">
-      <listitem>
-        <para>Download (HTTP): <ulink url="&libcap-download-http;"/></para>
-      </listitem>
-      <listitem>
-        <para>Download (FTP): <ulink url="&libcap-download-ftp;"/></para>
-      </listitem>
-      <listitem>
-        <para>Download MD5 sum: &libcap-md5sum;</para>
-      </listitem>
-      <listitem>
-        <para>Download size: &libcap-size;</para>
-      </listitem>
-      <listitem>
-        <para>Estimated disk space required: &libcap-buildsize;</para>
-      </listitem>
-      <listitem>
-        <para>Estimated build time: &libcap-time;</para>
-      </listitem>
-    </itemizedlist>
-
-    <bridgehead renderas="sect3">libcap Dependencies</bridgehead>
-
-    <bridgehead renderas="sect4">Required</bridgehead>
-    <para role="required"><xref linkend="linux-pam"/></para>
-
-    <para condition="html" role="usernotes">User Notes:
-    <ulink url="&blfs-wiki;/libcap"/></para>
-
-  </sect2>
-
-  <sect2 role="installation">
-    <title>Installation of libcap</title>
-
-    <para>Install <application>libcap</application> by running the following
-    commands:</para>
-
-<screen><userinput>sed -i 's:LIBDIR:PAM_&amp;:g' pam_cap/Makefile &amp;&amp;
-make</userinput></screen>
-
-    <para>This package does not come with a test suite.</para>
-
-    <para>
-      If you want to disable installing the static library, use this sed:
-    </para>
-
-<screen><userinput>sed -i '/install.*STALIBNAME/ s/^/#/' libcap/Makefile</userinput></screen>
-
-    <para>Now, as the <systemitem class="username">root</systemitem> user:</para>
-
-<screen role="root"><userinput>make prefix=/usr \
-     SBINDIR=/sbin \
-     PAM_LIBDIR=/lib \
-     RAISE_SETFCAP=no install</userinput></screen>
-
-   <para>
-     Still as the <systemitem class="username">root</systemitem> user, 
-     clean up some library locations and permissions:
-   </para>
-
-<screen role="root"><userinput>chmod -v 755 /usr/lib/libcap.so &amp;&amp;
-mv -v /usr/lib/libcap.so.* /lib &amp;&amp;
-ln -sfv ../../lib/libcap.so.2 /usr/lib/libcap.so</userinput></screen>
-
-  </sect2>
-
-  <sect2 role="commands">
-    <title>Command Explanations</title>
-
-    <para>
-      <command>sed -i '...'</command>, <parameter>PAM_LIBDIR=/lib</parameter>:
-      These correct PAM module install location.
-    </para>
-
-    <para><parameter>RAISE_SETFCAP=no</parameter>: This parameter skips trying
-    to use <application>setcap</application> on itself.  This avoids an installation
-    error if the kernel or file system do not support extended capabilities.</para>
-
-  </sect2>
-
-  <sect2 role="content">
-    <title>Contents</title>
-
-    <segmentedlist>
-      <segtitle>Installed Programs</segtitle>
-      <segtitle>Installed Library</segtitle>
-      <segtitle>Installed Directories</segtitle>
-
-      <seglistitem>
-        <seg>capsh, getcap, getpcaps, and setcap</seg>
-        <seg>libcap.{so,a}</seg>
-        <seg>None</seg>
-      </seglistitem>
-    </segmentedlist>
-
-    <variablelist>
-      <bridgehead renderas="sect3">Short Descriptions</bridgehead>
-      <?dbfo list-presentation="list"?>
-      <?dbhtml list-presentation="table"?>
-
-      <varlistentry id="capsh">
-        <term><command>capsh</command></term>
-        <listitem>
-          <para>is a shell wrapper to explore and constrain capability support.</para>
-          <indexterm zone="libcap-pam capsh">
-            <primary sortas="b-capsh">capsh</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="getcap">
-        <term><command>getcap</command></term>
-        <listitem>
-          <para>examines file capabilities.</para>
-          <indexterm zone="libcap-pam getcap">
-            <primary sortas="b-getcap">getcap</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="getpcaps">
-        <term><command>getpcaps</command></term>
-        <listitem>
-          <para>displays the capabilities on the queried process(es).</para>
-          <indexterm zone="libcap-pam getpcaps">
-            <primary sortas="b-getpcaps">getpcaps</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="setcap">
-        <term><command>setcap</command></term>
-        <listitem>
-          <para>sets file file capabilities.</para>
-          <indexterm zone="libcap-pam setcap">
-            <primary sortas="b-setcap">setcap</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="libcap-lib">
-        <term><filename class='libraryfile'>libcap.{so,a}</filename></term>
-        <listitem>
-          <para>contains the <application>libcap</application> API functions.</para>
-          <indexterm zone="libcap-pam libcap-lib">
-            <primary sortas="c-libcap">libcap.{so,a}</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-    </variablelist>
-
-  </sect2>
-
-</sect1>
Index: postlfs/security/security.xml
===================================================================
--- postlfs/security/security.xml	(revision 838cd0f72168fbe6c0ba8d85d60be538d755bfaf)
+++ postlfs/security/security.xml	(revision b71b5c8632e6fb812400f51ee3b8eba0a0766f26)
@@ -46,5 +46,5 @@
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="cracklib.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="cyrus-sasl.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="gnupg2.xml"/>
+  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="gnupg2-systemd.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="gnutls.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="gpgme.xml"/>
@@ -52,5 +52,5 @@
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="iptables.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="firewalling.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="libcap.xml"/>
+  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="libcap-systemd.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="linux-pam.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="mitkrb.xml"/>
