From d146ee92b0dc81e70a0084377b64c734fe96cddd Mon Sep 17 00:00:00 2001
From: Bruce Dubbs <bdubbs@linuxfromscratch.org>
Date: Wed, 7 Dec 2011 02:46:41 +0000
Subject: [PATCH] Updated to libksba-1.2.0. Updated to libassuan-2.0.2.

git-svn-id: svn://svn.linuxfromscratch.org/BLFS/trunk/BOOK@9074 af4574ff-66df-0310-9fd7-8a98e5e911e0
---
 general.ent                        |  6 +++---
 general/genlib/libassuan.xml       | 10 +++++-----
 general/genlib/libksba.xml         | 10 +++++-----
 introduction/welcome/changelog.xml |  6 ++++++
 postlfs/security/gnupg.xml         |  4 +++-
 5 files changed, 22 insertions(+), 14 deletions(-)

diff --git a/general.ent b/general.ent
index 76cc90b5cb..514966ab94 100644
--- a/general.ent
+++ b/general.ent
@@ -110,7 +110,7 @@ $Date$
 <!ENTITY shadow-version               "4.1.4.3">
 <!ENTITY iptables-version             "1.4.12">
 <!ENTITY gnupg-version                "1.4.11">
-<!ENTITY gnupg2-version               "2.0.15">
+<!ENTITY gnupg2-version               "2.0.8">
 <!ENTITY gpgme-version                "1.3.0">
 <!ENTITY libcap2-version              "2.22">
 <!ENTITY nettle-version               "2.4">
@@ -186,11 +186,11 @@ $Date$
 <!ENTITY eggdbus-version              "0.6">
 <!ENTITY libpthread-stubs-version     "0.3">
 <!ENTITY pth-version                  "2.0.7">
-<!ENTITY libassuan-version            "2.0.0">
+<!ENTITY libassuan-version            "2.0.2">
 <!ENTITY libgpg-error-version         "1.10">
 <!ENTITY libgcrypt-version            "1.5.0">
 <!ENTITY keyutils-version             "1.5.3">
-<!ENTITY libksba-version              "1.0.7">
+<!ENTITY libksba-version              "1.2.0">
 <!ENTITY libmowgli-version            "0.9.95">
 <!ENTITY libmcs-version               "0.7.1">
 <!ENTITY libtasn1-version             "2.10">
diff --git a/general/genlib/libassuan.xml b/general/genlib/libassuan.xml
index a35141fc45..5cde71bb43 100644
--- a/general/genlib/libassuan.xml
+++ b/general/genlib/libassuan.xml
@@ -6,9 +6,9 @@
 
   <!ENTITY libassuan-download-http " ">
   <!ENTITY libassuan-download-ftp  "ftp://ftp.gnupg.org/gcrypt/libassuan/libassuan-&libassuan-version;.tar.bz2">
-  <!ENTITY libassuan-md5sum        "59bc0ae7194c412d7a522029005684b2">
-  <!ENTITY libassuan-size          "291 KB">
-  <!ENTITY libassuan-buildsize     "4 MB">
+  <!ENTITY libassuan-md5sum        "3e7d00fd2ee8a0b9c51ac7616ef3f1ec">
+  <!ENTITY libassuan-size          "484 KB">
+  <!ENTITY libassuan-buildsize     "6.5 MB">
   <!ENTITY libassuan-time          "less than 0.1 SBU">
 ]>
 
@@ -38,7 +38,7 @@
     flexible enough to meet the demands of many transaction based environments
     with non-persistent servers.</para>
 
-    &lfs65_checked;
+    &lfs70_checked;
 
     <bridgehead renderas="sect3">Package Information</bridgehead>
     <itemizedlist spacing="compact">
@@ -107,7 +107,7 @@ makeinfo --plaintext       -o doc/assuan.txt           doc/assuan.texi</userinpu
 <screen role="root"><userinput>make install &amp;&amp;
 
 install -v -m755 -d /usr/share/doc/libassuan-&libassuan-version; &amp;&amp;
-install -v -m644    README doc/{assuan{_nochunks.html,.txt,.texi \
+install -v -m644    README doc/assuan{_nochunks.html,.txt,.texi} \
                     /usr/share/doc/libassuan-&libassuan-version;</userinput></screen>
 
     <para>If you built the additional documentation, install it by issuing the
diff --git a/general/genlib/libksba.xml b/general/genlib/libksba.xml
index cd2dd16487..4b41a0f9cf 100644
--- a/general/genlib/libksba.xml
+++ b/general/genlib/libksba.xml
@@ -6,10 +6,10 @@
 
   <!ENTITY libksba-download-http "&sources-anduin-http;/l/libksba-&libksba-version;.tar.bz2">
   <!ENTITY libksba-download-ftp  "ftp://ftp.gnupg.org/gcrypt/libksba/libksba-&libksba-version;.tar.bz2">
-  <!ENTITY libksba-md5sum        "eebce521a90600369c33c5fa6b9bbbd8">
-  <!ENTITY libksba-size          "557 KB">
-  <!ENTITY libksba-buildsize     "10 MB">
-  <!ENTITY libksba-time          "0.2 SBU">
+  <!ENTITY libksba-md5sum        "e797f370b69b4dc776499d6a071ae137">
+  <!ENTITY libksba-size          "580 KB">
+  <!ENTITY libksba-buildsize     "9.4 MB">
+  <!ENTITY libksba-time          "0.1 SBU">
 ]>
 
 <sect1 id="libksba" xreflabel="Libksba-&libksba-version;">
@@ -36,7 +36,7 @@
     rely on another cryptographic library but provides hooks for easy
     integration with <application>Libgcrypt</application>.</para>
 
-    &lfs65_checked;
+    &lfs70_checked;
 
     <bridgehead renderas="sect3">Package Information</bridgehead>
     <itemizedlist spacing="compact">
diff --git a/introduction/welcome/changelog.xml b/introduction/welcome/changelog.xml
index a1f00dde96..b00ad17311 100644
--- a/introduction/welcome/changelog.xml
+++ b/introduction/welcome/changelog.xml
@@ -44,6 +44,12 @@
     <listitem>
       <para>December 7th, 2011</para>
       <itemizedlist>
+        <listitem>
+          <para>[bdubbs] - Updated to libksba-1.2.0.</para>
+        </listitem>
+        <listitem>
+          <para>[bdubbs] - Updated to libassuan-2.0.2.</para>
+        </listitem>
         <listitem>
           <para>[ken] - Updated to ImageMagick-6.7.3-10.</para>
         </listitem>
diff --git a/postlfs/security/gnupg.xml b/postlfs/security/gnupg.xml
index e7128b7995..260efe8fb9 100644
--- a/postlfs/security/gnupg.xml
+++ b/postlfs/security/gnupg.xml
@@ -37,6 +37,8 @@
     GnuPG which supports S/MIME, see the <xref linkend="gnupg2"/>
     package.</para>
 
+    &lfs70_checked;
+
     <bridgehead renderas="sect3">Package Information</bridgehead>
     <itemizedlist spacing="compact">
       <listitem>
@@ -111,7 +113,7 @@ make</userinput></screen>
 <screen role="root"><userinput>make install &amp;&amp;
 
 install -v -m755 -d /usr/share/doc/gnupg-&gnupg-version; &amp;&amp;
-mv -v /usr/share/gnupg/{FAQ,faq.html} /usr/share/doc/gnupg-&gnupg-version; &amp;&amp;
+mv -v /usr/share/gnupg/FAQ /usr/share/doc/gnupg-&gnupg-version; &amp;&amp;
 install -v -m644 \
     doc/{highlights-1.4.txt,OpenPGP,samplekeys.asc,DETAILS,*.texi} \
     /usr/share/doc/gnupg-&gnupg-version;</userinput></screen>