Changes in postlfs/security/gnupg2.xml [8bcda70c:313f9a6]

File:

• postlfs/security/gnupg2.xml (modified) (15 diffs)

postlfs/security/gnupg2.xml

@@ -7 +7 @@
   <!ENTITY gnupg2-download-http "&gnupg-http;/gnupg/gnupg-&gnupg2-version;.tar.bz2">
   <!ENTITY gnupg2-download-ftp  "&gnupg-ftp;/gnupg/gnupg-&gnupg2-version;.tar.bz2">
-  <!ENTITY gnupg2-md5sum        "1a9dd55be7a9d0a6ef34ec3ba0d674a5">
-  <!ENTITY gnupg2-size          "7.3 MB">
-  <!ENTITY gnupg2-buildsize     "164 MB (with tests)">
-  <!ENTITY gnupg2-time          "0.5 SBU (using parallelism=4; add 0.4 SBU for tests)">
+  <!ENTITY gnupg2-md5sum        "bcda14a63821435e79d4597bec229ebb">
+  <!ENTITY gnupg2-size          "6.9 MB">
+  <!ENTITY gnupg2-buildsize     "143 MB (with all tests; add 25 MB for docs)">
+  <!ENTITY gnupg2-time          "0.6 SBU (using parallelism=4; add 2.9 SBU for tests)">
 ]>
 
@@ -16 +16 @@
   <?dbhtml filename="gnupg.html"?>
 
+  <sect1info>
+    <date>$Date$</date>
+  </sect1info>
 
   <title>GnuPG-&gnupg2-version;</title>
@@ -36 +39 @@
     </para>
 
-    &lfs112_checked;
+    &lfs110a_checked;
 
     <bridgehead renderas="sect3">Package Information</bridgehead>
@@ -103 +106 @@
       <ulink url="http://mcj.sourceforge.net/">fig2dev</ulink> (for
       generating documentation),
-      and <ulink url="https://www.chiark.greenend.org.uk/~ian/adns/">GNU
+      and <ulink url="http://www.chiark.greenend.org.uk/~ian/adns/">GNU
       adns</ulink>
     </para>
@@ -114 +117 @@
   <sect2 role="installation">
     <title>Installation of GnuPG</title>
-<!--  This is useless with 2.3.x.  If we need gpg-zip we'll have to fetch
-      it somewhere.
+
     <para>
       By default GnuPG doesn't install the deprecated gpg-zip script,
@@ -123 +125 @@
 <screen><userinput>sed -e '/noinst_SCRIPTS = gpg-zip/c sbin_SCRIPTS += gpg-zip' \
     -i tools/Makefile.in</userinput></screen>
+
+<!-- Seems to be resolved in 2.2.29
+    <para>
+      Fix a issue causing build failure if
+      <application>OpenLDAP</application> is not installed:
+    </para>
+
+<screen><userinput>sed -e '737a #if USE_LDAP' \
+    -e '760a #endif' \
+    -i dirmngr/dirmngr.c</userinput></screen>
 -->
-<!-- fixed in 2.4.0
-    <para>
-      First, fix an issue causing build failure if
-      <application>OpenLDAP</application> is not installed:
-    </para>
-
-<screen><userinput>sed -e '/ks_ldap_free_state/i #if USE_LDAP' \
-    -e '/ks_get_state =/a #endif'           \
-    -i dirmngr/server.c</userinput></screen>
--->
+
     <para>
       Install <application>GnuPG</application> by running the following
@@ -139 +142 @@
     </para>
 
-<screen><userinput>mkdir build &amp;&amp;
-cd    build &amp;&amp;
-
-../configure --prefix=/usr           \
-             --localstatedir=/var    \
-             --sysconfdir=/etc       \
-             --docdir=/usr/share/doc/gnupg-&gnupg2-version; &amp;&amp;
+<screen><userinput>./configure --prefix=/usr            \
+            --localstatedir=/var     \
+            --sysconfdir=/etc        \
+            --docdir=/usr/share/doc/gnupg-&gnupg2-version; &amp;&amp;
 make &amp;&amp;
 
-makeinfo --html --no-split -I doc -o doc/gnupg_nochunks.html ../doc/gnupg.texi &amp;&amp;
-makeinfo --plaintext       -I doc -o doc/gnupg.txt           ../doc/gnupg.texi &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 &amp;&amp;
 make -C doc html</userinput></screen>
 
@@ -167 +167 @@
 
     <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:
+      <filename>/usr/share/man/man1/gpg-zip.1</filename>. Now, as the
+      <systemitem class="username">root</systemitem> user:
     </para>
 
@@ -180 +178 @@
 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 \
+install -v -m644    doc/*.texi doc/gnupg.txt \
                     /usr/share/doc/gnupg-&gnupg2-version; &amp;&amp;
 install -v -m644    doc/gnupg.html/* \
@@ -198 +196 @@
   <sect2 role="commands">
     <title>Command Explanations</title>
-<!--
+
     <para>
       <command>sed ... tools/Makefile.in</command>:
       This command is needed to build the gpg-zip program.
-    </para>
--->
-    <para>
-      <command>mkdir build &amp;&amp; cd build</command>: the Gnupg2
-      developers recommend to build the package in a dedicated directory.
     </para>
 
@@ -243 +236 @@
       <seglistitem>
         <seg>addgnupghome, applygnupgdefaults, dirmngr, dirmngr-client, g13
-        (optional), gpg-agent, gpg-card, gpg-connect-agent, gpg, gpgconf,
-        gpgparsemail, gpgscm, gpgsm, gpgsplit, gpgtar, gpgv, gpg-wks-client,
-        gpg-wks-server, kbxutil,
+        (optional), gpg-agent, gpg-connect-agent, gpg, gpgconf, gpgparsemail,
+        gpgscm, gpgsm, gpgsplit, gpgtar, gpgv, gpg-wks-server, gpg-zip, kbxutil,
         <!--symcryptrun,--> and watchgnupg</seg>
         <seg>None</seg>
@@ -338 +330 @@
       </varlistentry>
 
-      <varlistentry id="gpg-card">
-        <term><command>gpg-card</command></term>
-        <listitem>
-          <para>
-            is a tool to manage smart cards and tokens
-          </para>
-          <indexterm zone="gnupg2 gpg-card">
-            <primary sortas="b-gpg-card">gpg-card</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
       <varlistentry id="gpg-connect-agent">
         <term><command>gpg-connect-agent</command></term>
@@ -469 +449 @@
       </varlistentry>
 
-      <varlistentry id="gpg-wks-client">
-        <term><command>gpg-wks-client</command></term>
-        <listitem>
-          <para>
-            is a client for the
-            <application>Web Key Service</application> protocol
-          </para>
-          <indexterm zone="gnupg2 gpg-wks-client">
-            <primary sortas="b-gpg-wks-client">gpg-wks-client</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
       <varlistentry id="gpg-wks-server">
         <term><command>gpg-wks-server</command></term>
@@ -494 +461 @@
         </listitem>
       </varlistentry>
-<!--
+
       <varlistentry id="gpg-zip">
         <term><command>gpg-zip</command></term>
@@ -506 +473 @@
         </listitem>
       </varlistentry>
--->
+
       <varlistentry id="kbxutil">
         <term><command>kbxutil</command></term>