From 55944f949fad6094e93efbb683c7ba661df20266 Mon Sep 17 00:00:00 2001
From: Bruce Dubbs <bdubbs@linuxfromscratch.org>
Date: Sat, 7 May 2016 23:06:59 +0000
Subject: [PATCH] Update to gnome-calculator-3.20.1. Update to talloc-2.1.7.
 Update to gnupg-2.1.12. Update to libksba-1.3.4. Update to stunnel-5.32.
 Update to OpenSSL-1.0.2h.

git-svn-id: svn://svn.linuxfromscratch.org/BLFS/trunk/BOOK@17337 af4574ff-66df-0310-9fd7-8a98e5e911e0
---
 general/genlib/libksba.xml              |  4 ++--
 general/genlib/talloc.xml               |  9 +++++----
 gnome.ent                               |  2 +-
 gnome/applications/gnome-calculator.xml |  6 +++---
 introduction/welcome/changelog.xml      | 24 ++++++++++++++++++++++++
 packages.ent                            | 10 +++++-----
 postlfs/security/gnupg2.xml             |  8 ++++----
 postlfs/security/openssl.xml            |  8 ++++----
 postlfs/security/stunnel.xml            |  4 ++--
 9 files changed, 50 insertions(+), 25 deletions(-)

diff --git a/general/genlib/libksba.xml b/general/genlib/libksba.xml
index b0126b2c23..aabf8fc4db 100644
--- a/general/genlib/libksba.xml
+++ b/general/genlib/libksba.xml
@@ -6,9 +6,9 @@
 
   <!ENTITY libksba-download-http " ">
   <!ENTITY libksba-download-ftp  "ftp://ftp.gnupg.org/gcrypt/libksba/libksba-&libksba-version;.tar.bz2">
-  <!ENTITY libksba-md5sum        "a5dd3c57fca254935f5cf8db26e39065">
+  <!ENTITY libksba-md5sum        "2bfc3d69053db7b6983b5627706033f4">
   <!ENTITY libksba-size          "608 KB">
-  <!ENTITY libksba-buildsize     "6.5 MB">
+  <!ENTITY libksba-buildsize     "9.1 MB">
   <!ENTITY libksba-time          "0.1 SBU">
 ]>
 
diff --git a/general/genlib/talloc.xml b/general/genlib/talloc.xml
index 3da06ae29c..28700a0820 100644
--- a/general/genlib/talloc.xml
+++ b/general/genlib/talloc.xml
@@ -6,10 +6,10 @@
 
   <!ENTITY talloc-download-http "https://www.samba.org/ftp/talloc/talloc-&talloc-version;.tar.gz">
   <!ENTITY talloc-download-ftp  " ">
-  <!ENTITY talloc-md5sum        "707010c6ede5821fd34397f5d9ec6ab8">
+  <!ENTITY talloc-md5sum        "d6763d65d03d627816ae1d50c74576fe">
   <!ENTITY talloc-size          "428 KB">
-  <!ENTITY talloc-buildsize     "7.1 MB (additional 0.2 MB for tests)">
-  <!ENTITY talloc-time          "0.2 SBU (additional 0.2 SBU for tests)">
+  <!ENTITY talloc-buildsize     "6.9 MB (add 0.2 MB for tests)">
+  <!ENTITY talloc-time          "0.2 SBU (add 0.2 SBU for tests)">
 ]>
 
 <sect1 id="talloc" xreflabel="Talloc-&talloc-version;">
@@ -98,7 +98,8 @@
 make</userinput></screen>
 
     <para>
-      To check the results, issue <command>make check</command>.
+      To check the results, issue <command>make check</command>. 
+      The python tests fail due to missing files.
     </para>
 
     <para>
diff --git a/gnome.ent b/gnome.ent
index 80aabc9b53..79aeccc8d4 100644
--- a/gnome.ent
+++ b/gnome.ent
@@ -48,7 +48,7 @@
 <!ENTITY evince-version                 "3.20.0">
 <!ENTITY file-roller-version            "3.20.1">
 <!ENTITY gedit-version                  "3.20.1">
-<!ENTITY gnome-calculator-version       "3.20.0">
+<!ENTITY gnome-calculator-version       "3.20.1">
 <!ENTITY gnome-nettool-version          "3.8.1">
 <!ENTITY gnome-screenshot-version       "3.18.0">
 <!ENTITY gnome-system-monitor-version   "3.20.1">
diff --git a/gnome/applications/gnome-calculator.xml b/gnome/applications/gnome-calculator.xml
index 84b70c8603..8800209f1b 100644
--- a/gnome/applications/gnome-calculator.xml
+++ b/gnome/applications/gnome-calculator.xml
@@ -8,9 +8,9 @@
            "&gnome-download-http;/gnome-calculator/&gnome-minor-20;/gnome-calculator-&gnome-calculator-version;.tar.xz">
   <!ENTITY gnome-calculator-download-ftp
            "&gnome-download-ftp;/gnome-calculator/&gnome-minor-20;/gnome-calculator-&gnome-calculator-version;.tar.xz">
-  <!ENTITY gnome-calculator-md5sum        "4a8632e1eec4024f8048f17105fbb802">
-  <!ENTITY gnome-calculator-size          "1.3 MB">
-  <!ENTITY gnome-calculator-buildsize     "27 MB (with tests)">
+  <!ENTITY gnome-calculator-md5sum        "f4288c2d33060e567e964413b55f7993">
+  <!ENTITY gnome-calculator-size          "1.4 MB">
+  <!ENTITY gnome-calculator-buildsize     "40 MB (with tests)">
   <!ENTITY gnome-calculator-time          "0.4 SBU (with tests)">
 ]>
 
diff --git a/introduction/welcome/changelog.xml b/introduction/welcome/changelog.xml
index e813762735..6330141569 100644
--- a/introduction/welcome/changelog.xml
+++ b/introduction/welcome/changelog.xml
@@ -46,6 +46,30 @@
     <listitem>
       <para>May 7th, 2016</para>
       <itemizedlist>
+        <listitem>
+          <para>[bdubbs] - Update to gnome-calculator-3.20.1.  Fixes
+          <ulink url="&blfs-ticket-root;7809">#7809</ulink>.</para>
+        </listitem>
+        <listitem>
+          <para>[bdubbs] - Update to talloc-2.1.7.  Fixes
+          <ulink url="&blfs-ticket-root;7807">#7807</ulink>.</para>
+        </listitem>
+        <listitem>
+          <para>[bdubbs] - Update to gnupg-2.1.12.  Fixes
+          <ulink url="&blfs-ticket-root;7804">#7804</ulink>.</para>
+        </listitem>
+        <listitem>
+          <para>[bdubbs] - Update to libksba-1.3.4.  Fixes
+          <ulink url="&blfs-ticket-root;7802">#7802</ulink>.</para>
+        </listitem>
+        <listitem>
+          <para>[bdubbs] - Update to stunnel-5.32.  Fixes
+          <ulink url="&blfs-ticket-root;7801">#7801</ulink>.</para>
+        </listitem>
+        <listitem>
+          <para>[bdubbs] - Update to OpenSSL-1.0.2h.  Fixes
+          <ulink url="&blfs-ticket-root;7800">#7800</ulink>.</para>
+        </listitem>
         <listitem>
           <para>[pierre] - Update to OpenJDK-1.8.0.92.  Fixes
           <ulink url="&blfs-ticket-root;7779">#7779</ulink>.</para>
diff --git a/packages.ent b/packages.ent
index 7b337104a3..80357313e0 100644
--- a/packages.ent
+++ b/packages.ent
@@ -12,7 +12,7 @@
 <!ENTITY consolekit-version           "1.0.2">
 <!ENTITY cracklib-version             "2.9.6">
 <!ENTITY cyrus-sasl-version           "2.1.26">
-<!ENTITY gnupg2-version               "2.1.11">
+<!ENTITY gnupg2-version               "2.1.12">
 <!ENTITY gnutls-version               "3.4.11">
 <!ENTITY gpgme-version                "1.6.0">
 <!ENTITY haveged-version              "1.9.1">
@@ -32,12 +32,12 @@
 \<\!\-\- major and minor only -->
 <!ENTITY nss-version                  "3.&nss-minor-version;">
 <!ENTITY openssh-version              "7.2p2">
-<!ENTITY openssl-version              "1.0.2g">
+<!ENTITY openssl-version              "1.0.2h">
 <!ENTITY p11-kit-version              "0.23.2">    <!-- Even minors only -->
 <!ENTITY polkit-version               "0.113">
 <!ENTITY shadow-version               "4.2.1">
 <!ENTITY ssh-askpass-version          "&openssh-version;">
-<!ENTITY stunnel-version              "5.31">
+<!ENTITY stunnel-version              "5.32">
 <!ENTITY sudo-version                 "1.8.16">
 <!ENTITY tripwire-version             "2.4.2.2">
 
@@ -126,7 +126,7 @@
 <!ENTITY libical-version              "2.0.0">
 <!ENTITY libidn-version               "1.32">
 <!ENTITY libiodbc-version             "3.52.10">
-<!ENTITY libksba-version              "1.3.3">
+<!ENTITY libksba-version              "1.3.4">
 <!ENTITY liblinear-version            "210">
 <!ENTITY libpaper-version             "1.1.24+nmu4">
 <!ENTITY libsigc-version              "2.8.0">
@@ -153,7 +153,7 @@
 <!ENTITY qca-version                  "2.1.1">
 <!ENTITY qjson-version                "0.8.1">
 <!ENTITY sbc-version                  "1.3">
-<!ENTITY talloc-version               "2.1.6">
+<!ENTITY talloc-version               "2.1.7">
 <!ENTITY wayland-version              "1.10.0">
 <!ENTITY wv-version                   "1.2.9">
 <!ENTITY xapian-version               "1.2.23">
diff --git a/postlfs/security/gnupg2.xml b/postlfs/security/gnupg2.xml
index 07f23bc87b..4bbf44b084 100644
--- a/postlfs/security/gnupg2.xml
+++ b/postlfs/security/gnupg2.xml
@@ -6,10 +6,10 @@
 
   <!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        "873302c475c4c90badb67daac90ebd5d">
-  <!ENTITY gnupg2-size          "5 MB">
-  <!ENTITY gnupg2-buildsize     "113 MB (with tests and docs - additional 8 MB for alternate formats docs)">
-  <!ENTITY gnupg2-time          "0.9 SBU (with tests and docs)">
+  <!ENTITY gnupg2-md5sum        "573bc2cd83934eed12f0d0db443f5bde">
+  <!ENTITY gnupg2-size          "5.3 MB">
+  <!ENTITY gnupg2-buildsize     "96 MB (with tests and docs)">
+  <!ENTITY gnupg2-time          "1.0 SBU (with tests and docs)">
 ]>
 
 <sect1 id="gnupg2" xreflabel="GnuPG-&gnupg2-version;">
diff --git a/postlfs/security/openssl.xml b/postlfs/security/openssl.xml
index 432234c026..307195b5a6 100644
--- a/postlfs/security/openssl.xml
+++ b/postlfs/security/openssl.xml
@@ -8,10 +8,10 @@
            "https://openssl.org/source/openssl-&openssl-version;.tar.gz">
   <!ENTITY openssl-download-ftp
            "ftp://openssl.org/source/openssl-&openssl-version;.tar.gz">
-  <!ENTITY openssl-md5sum        "f3c710c045cdee5fd114feb69feba7aa">
-  <!ENTITY openssl-size          "5.1 MB">
-  <!ENTITY openssl-buildsize     "63 MB (with tests)">
-  <!ENTITY openssl-time          "1.5 SBU (with tests)">
+  <!ENTITY openssl-md5sum        "9392e65072ce4b614c1392eefc1f23d0">
+  <!ENTITY openssl-size          "5.0 MB">
+  <!ENTITY openssl-buildsize     "51 MB (with tests)">
+  <!ENTITY openssl-time          "1.6 SBU (with tests)">
 ]>
 
 <sect1 id="openssl" xreflabel="OpenSSL-&openssl-version;">
diff --git a/postlfs/security/stunnel.xml b/postlfs/security/stunnel.xml
index cdd8a9cfd2..2bbb46cc4d 100644
--- a/postlfs/security/stunnel.xml
+++ b/postlfs/security/stunnel.xml
@@ -9,9 +9,9 @@
   <!ENTITY stunnel-download-ftp  "ftp://ftp.stunnel.org/stunnel/archive/5.x/stunnel-&stunnel-version;.tar.gz">
   <!-- Following ftp only has later release -->
 <!--   "ftp://ftp.stunnel.org/stunnel/stunnel-&stunnel-version;.tar.gz"> -->
-  <!ENTITY stunnel-md5sum        "a39b89624984cefc6d229a54f34b33ec">
+  <!ENTITY stunnel-md5sum        "60462f97b62e745288541089e8c0877c">
   <!ENTITY stunnel-size          "628 KB">
-  <!ENTITY stunnel-buildsize     "6.9 MB">
+  <!ENTITY stunnel-buildsize     "7.3 MB">
   <!ENTITY stunnel-time          "0.1 SBU">
 ]>