Index: general.ent
===================================================================
--- general.ent	(revision 2037ec49e67a220d08055bbe3089ff1e2e8b703c)
+++ general.ent	(revision 1e7662264795ae802018ccdf12dd814373ca996f)
@@ -1,5 +1,5 @@
 <!-- $LastChangedBy$ $Date$ -->
 
-<!ENTITY day          "27">                   <!-- Always 2 digits -->
+<!ENTITY day          "28">                   <!-- Always 2 digits -->
 <!ENTITY month        "01">                   <!-- Always 2 digits -->
 <!ENTITY year         "2016">
@@ -7,5 +7,5 @@
 <!ENTITY copyholder   "The BLFS systemd Development Team">
 <!ENTITY version      "&year;-&month;-&day;">
-<!ENTITY releasedate  "January 27th, &year;">
+<!ENTITY releasedate  "January 28th, &year;">
 <!ENTITY pubdate      "&year;-&month;-&day;"> <!-- metadata req. by TLDP -->
 <!ENTITY blfs-version "systemd">                  <!-- svn|[release #] -->
Index: introduction/welcome/changelog.xml
===================================================================
--- introduction/welcome/changelog.xml	(revision 2037ec49e67a220d08055bbe3089ff1e2e8b703c)
+++ introduction/welcome/changelog.xml	(revision 1e7662264795ae802018ccdf12dd814373ca996f)
@@ -46,4 +46,13 @@
 
     <listitem>
+      <para>January 28th, 2016</para>
+      <itemizedlist>
+        <listitem>
+          <para>[dj] - Updated to gnupg-2.1.11. Merged from trunk r16860.</para>
+        </listitem>
+      </itemizedlist>
+    </listitem>
+
+    <listitem>
       <para>January 27th, 2016</para>
       <itemizedlist>
Index: packages.ent
===================================================================
--- packages.ent	(revision 2037ec49e67a220d08055bbe3089ff1e2e8b703c)
+++ packages.ent	(revision 1e7662264795ae802018ccdf12dd814373ca996f)
@@ -13,5 +13,5 @@
 <!ENTITY cracklib-version             "2.9.6">
 <!ENTITY cyrus-sasl-version           "2.1.26">
-<!ENTITY gnupg2-version               "2.1.10">
+<!ENTITY gnupg2-version               "2.1.11">
 <!ENTITY gnutls-version               "3.4.8">
 <!ENTITY gpgme-version                "1.6.0">
Index: postlfs/security/gnupg2.xml
===================================================================
--- postlfs/security/gnupg2.xml	(revision 2037ec49e67a220d08055bbe3089ff1e2e8b703c)
+++ postlfs/security/gnupg2.xml	(revision 1e7662264795ae802018ccdf12dd814373ca996f)
@@ -5,10 +5,10 @@
   %general-entities;
 
-  <!ENTITY gnupg2-download-http " ">
+  <!ENTITY gnupg2-download-http "https://gnupg.org/ftp/gcrypt/gnupg/gnupg-&gnupg2-version;.tar.bz2">
   <!ENTITY gnupg2-download-ftp  "ftp://ftp.gnupg.org/gcrypt/gnupg/gnupg-&gnupg2-version;.tar.bz2">
-  <!ENTITY gnupg2-md5sum        "ebdf92b15b8bcd8579b643c7f41a3238">
-  <!ENTITY gnupg2-size          "4.7 MB">
-  <!ENTITY gnupg2-buildsize     "101 MB (with tests and optional documentation)">
-  <!ENTITY gnupg2-time          "1.0 SBU (with tests)">
+  <!ENTITY gnupg2-md5sum        "f0a7cb09fe119f8b82eba7efecd27dc0">
+  <!ENTITY gnupg2-size          "5 MB">
+  <!ENTITY gnupg2-buildsize     "112 MB (with tests and docs - additional 8 MB for alternate formats docs)">
+  <!ENTITY gnupg2-time          "0.9 SBU (with tests and docs)">
 ]>
 
@@ -30,51 +30,37 @@
     <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;
+    <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>
+
+    &lfs78_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>
+        <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="sect3">GnuPG 2 Dependencies</bridgehead>
 
     <bridgehead renderas="sect4">Required</bridgehead>
@@ -82,5 +68,5 @@
       <xref linkend="libassuan"/>,
       <xref linkend="libgcrypt"/>,
-      <xref linkend="libksba"/> and
+      <xref linkend="libksba"/>, and
       <xref linkend="npth"/>
     </para>
@@ -88,6 +74,6 @@
     <bridgehead renderas="sect4">Recommended</bridgehead>
     <para role="recommended">
-      <xref linkend="pinentry"/> (Run-time requirement for
-      most of the package's functionality)
+      <xref linkend="pinentry"/> (Run-time requirement for most of
+      the package's functionality)
     </para>
 
@@ -95,14 +81,16 @@
     <para role="optional">
       <xref linkend="curl"/>,
+      <xref linkend="libusb-compat"/>,
+      an <xref linkend="server-mail"/>,
+      <xref linkend="openldap"/>,
+      <xref linkend="sqlite"/>,
+      <xref linkend="texlive"/> (or <xref linkend="tl-installer"/>), and
       <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"/>
+      adns</ulink>
     </para>
 
     <para condition="html" role="usernotes">User Notes:
-      <ulink url="&blfs-wiki;/gnupg2"/>
-    </para>
+    <ulink url="&blfs-wiki;/gnupg2"/></para>
+
   </sect2>
 
@@ -110,52 +98,71 @@
     <title>Installation of GnuPG</title>
 
-    <para>
-      Install <application>GnuPG</application> by running the following
-      commands:
-    </para>
-
-<screen><userinput>./configure --prefix=/usr        \
-            --sysconfdir=/etc    \
+    <warning>
+      <para>
+        If you are upgrading from gnupg prior to version 2.1, upstream
+        developers recommend to backup
+        <filename class="directory">~/.gnupg</filename>, because some additional
+        configuration will probably be necessary, and you could lose your keys.
+        You can find instructions at
+        <ulink url="http://jo-ke.name/wp/?p=111"></ulink> and
+        <ulink url="https://wiki.archlinux.org/index.php/GnuPG#.22Lost.22_keys.2C_upgrading_to_gnupg_version_2.1"></ulink>.
+      </para>
+    </warning>
+
+    <para>If the top directory path where the source is unpacked contains
+    symbolic links, the openpgp tests might fail. If this is your case and
+    you wish to run the test suite, fix that with:</para>
+
+<screen><userinput>sed -e 's|\(GNUPGHOME\)=\$(abs_builddir)|\1=`/bin/pwd`|' \
+    -i tests/openpgp/Makefile.in</userinput></screen>
+
+    <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>
+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>
+    <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;/html/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/* \
@@ -169,14 +176,13 @@
     <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>
+    <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>
+
+    <para><option>--enable-g13</option>: This switch enables building the
+    g13 program.</para>
 
   </sect2>
@@ -191,17 +197,11 @@
 
       <seglistitem>
-        <seg>
-          addgnupghome, applygnupgdefaults, dirmngr, dirmngr-client, gpg, gpg2,
-          gpg-agent, gpgconf, gpg-connect-agent, gpgkey2ssh, gpgparsemail,
-          gpgsm, gpgsm-gencert.sh, gpgtar, gpgv, gpgv2, kbxutil,
-          symcryptrun and watchgnupg
-        </seg>
-        <seg>
-          None
-        </seg>
-        <seg>
-          /usr/share/doc/gnupg-&gnupg2-version; and
-          /usr/share/gnupg
-        </seg>
+        <seg>addgnupghome, applygnupgdefaults, dirmngr, dirmngr-client, g13,
+        gpg-agent, gpg-connect-agent, gpg, gpg2, gpgconf, gpgkey2ssh,
+        gpgparsemail, gpgsm, gpgtar, gpgv, gpgv2, kbxutil, symcryptrun, and
+        watchgnupg</seg>
+        <seg>None</seg>
+        <seg>/usr/share/doc/gnupg-&gnupg2-version; and
+        /usr/share/gnupg</seg>
       </seglistitem>
     </segmentedlist>
@@ -215,8 +215,6 @@
         <term><command>addgnupghome</command></term>
         <listitem>
-          <para>
-            is used to create and populate user's
-            <filename class="directory">~/.gnupg</filename> directories.
-          </para>
+          <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>
@@ -228,9 +226,7 @@
         <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>
+          <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>
@@ -238,5 +234,5 @@
         </listitem>
       </varlistentry>
-      
+
       <varlistentry id="dirmngr">
         <term><command>dirmngr</command></term>
@@ -261,13 +257,22 @@
       </varlistentry>
 
+      <varlistentry id="g13">
+        <term><command>g13</command></term>
+        <listitem>
+          <para>is a tool to create, mount or unmount an encrypted file system
+          container (optional).</para>
+          <indexterm zone="gnupg2 g13">
+            <primary sortas="b-g13">g13</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>
+          <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>
@@ -279,8 +284,6 @@
         <term><command>gpg-connect-agent</command></term>
         <listitem>
-          <para>
-            is a utility used to communicate with a running
-            <command>gpg-agent</command>.
-          </para>
+          <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>
@@ -289,12 +292,21 @@
       </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>
+          <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>
@@ -306,11 +318,9 @@
         <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>
+          <para>is a utility used to automatically and reasonably 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>
@@ -333,8 +343,6 @@
         <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>
+          <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>
@@ -346,9 +354,8 @@
         <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>
+          <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>
@@ -357,25 +364,29 @@
       </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="gpgtar">
+        <term><command>gpgtar</command></term>
+        <listitem>
+          <para> is a tool to encrypt or sign files into an archive.</para>
+          <indexterm zone="gnupg2 gpgtar">
+            <primary sortas="b-gpgtar">gpgtar</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>
+          <para>is a verify only version of <command>gpg2</command>.</para>
           <indexterm zone="gnupg2 gpgv2">
             <primary sortas="b-gpgv2">gpgv2</primary>
@@ -387,7 +398,5 @@
         <term><command>kbxutil</command></term>
         <listitem>
-          <para>
-            is used to list, export and import Keybox data.
-          </para>
+          <para>is used to list, export and import Keybox data.</para>
           <indexterm zone="gnupg2 kbxutil">
             <primary sortas="b-kbxutil">kbxutil</primary>
@@ -399,7 +408,5 @@
         <term><command>symcryptrun</command></term>
         <listitem>
-          <para>
-            is a simple symmetric encryption tool.
-          </para>
+          <para>is a simple symmetric encryption tool.</para>
           <indexterm zone="gnupg2 symcryptrun">
             <primary sortas="b-symcryptrun">symcryptrun</primary>
@@ -411,8 +418,6 @@
         <term><command>watchgnupg</command></term>
         <listitem>
-          <para>
-            is used to listen to a Unix Domain socket created by any of
-            the GnuPG tools.
-          </para>
+          <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>
