From 546b04259c6281e8714812b96d4b29e60b3310c1 Mon Sep 17 00:00:00 2001
From: Bruce Dubbs <bdubbs@linuxfromscratch.org>
Date: Tue, 6 Mar 2012 00:45:51 +0000
Subject: [PATCH] Update to gnutls-3.0.15

git-svn-id: svn://svn.linuxfromscratch.org/BLFS/trunk/BOOK@9615 af4574ff-66df-0310-9fd7-8a98e5e911e0
---
 general.ent                        |  2 +-
 introduction/welcome/changelog.xml |  4 +++
 postlfs/security/gnutls.xml        | 46 +++++++++++++++++++++---------
 3 files changed, 37 insertions(+), 15 deletions(-)

diff --git a/general.ent b/general.ent
index 2fc5b7c1ee..81a5317a6d 100644
--- a/general.ent
+++ b/general.ent
@@ -130,7 +130,7 @@ $Date$
 <!ENTITY openssl-version              "1.0.0g">
 <!-- version no longer used, we take whatever mozilla is offering
 <!ENTITY ca-bundle-version            "3.12.11.0"> -->
-<!ENTITY gnutls-version               "3.0.7">
+<!ENTITY gnutls-version               "3.0.15">
 <!ENTITY linux-pam-version            "1.1.5">
 <!ENTITY p11-kit-version              "0.10">
 <!-- <!ENTITY policykit-version            "0.9"> -->
diff --git a/introduction/welcome/changelog.xml b/introduction/welcome/changelog.xml
index d5b6842dba..651e118846 100644
--- a/introduction/welcome/changelog.xml
+++ b/introduction/welcome/changelog.xml
@@ -44,6 +44,10 @@
     <listitem>
       <para>March 5th, 2012</para>
       <itemizedlist>
+        <listitem>
+          <para>[bdubbs] - Update to gnutls-3.0.15. Thanks to
+          Armin K. for creating the patch.</para>
+        </listitem>
         <listitem>
           <para>[bdubbs] - Update to cyrus-sasl-2.1.25. Thanks to
           Armin K. for creating the patches.</para>
diff --git a/postlfs/security/gnutls.xml b/postlfs/security/gnutls.xml
index 28aeb9bc1a..b148e5cc04 100644
--- a/postlfs/security/gnutls.xml
+++ b/postlfs/security/gnutls.xml
@@ -4,11 +4,10 @@
   <!ENTITY % general-entities SYSTEM "../../general.ent">
   %general-entities;
 
-  <!-- <!ENTITY gnutls-download-http "http://mirrors.kernel.org/gnu/gnutls/gnutls-&gnutls-version;.tar.bz2"> -->
-  <!ENTITY gnutls-download-http " ">
-  <!ENTITY gnutls-download-ftp  "ftp://ftp.gnutls.org/pub/gnutls/gnutls-&gnutls-version;.tar.xz">
-  <!ENTITY gnutls-md5sum        "840c96c75817c0f800a47805e275db7e">
-  <!ENTITY gnutls-size          "4.1 MB">
+  <!ENTITY gnutls-download-http "http://ftp.gnu.org/gnu/gnutls/gnutls-&gnutls-version;.tar.xz">
+  <!ENTITY gnutls-download-ftp  "ftp://ftp.gnu.org/gnu/gnutls/gnutls-&gnutls-version;.tar.xz">
+  <!ENTITY gnutls-md5sum        "37bdac12b5c039c7a8738b5d85eda968">
+  <!ENTITY gnutls-size          "4.6 MB">
   <!ENTITY gnutls-buildsize     "120 MB">
   <!ENTITY gnutls-time          "1.6 SBU (including the test suite)">
 ]>
@@ -52,9 +51,9 @@
 
     <bridgehead renderas="sect3">Package Information</bridgehead>
     <itemizedlist spacing="compact">
-      <!--<listitem>
+      <listitem>
         <para>Download (HTTP): <ulink url="&gnutls-download-http;"/></para>
-      </listitem> -->
+      </listitem>
       <listitem>
         <para>Download (FTP): <ulink url="&gnutls-download-ftp;"/></para>
       </listitem>
@@ -81,11 +80,9 @@
     <para role="optional">
       <xref linkend="gtk-doc"/>,
       <xref linkend="guile"/>,
+      <xref linkend="libidn"/>,
       <xref linkend="libtasn1"/>,
-      <ulink url="http://p11-glue.freedesktop.org/p11-kit.html">p11-kit</ulink>,
-      <ulink url="http://platon.sk/projects/main_page.php?project_id=3">libcfg+</ulink>,
-      <ulink url="http://gaa.sourceforge.net/">GAA Argument Analyzer</ulink>,
-      <ulink url="http://webscripts.softpedia.com/script/Development-Scripts-js/C-C-Library/libcfg--26570.html">libcfg+</ulink>, and
+      <xref linkend="p11-kit"/> and
       <ulink url="http://valgrind.org/">Valgrind</ulink> (used during the test suite)</para>
 
     <para>Note that if you do not install <xref linkend="libtasn1"/>, an older
@@ -147,9 +144,8 @@ cp -v -R            doc/credentials \
 
       <seglistitem>
         <seg>certtool, crywrap, gnutls-cli, gnutls-cli-debug, gnutls-serv,
-        psktool, and srptool</seg>
-        <seg>libgnutls.{so,a}, libgnutls-extra.{so,a},
-        libgnutls-openssl.{so,a}, and libgnutlsxx.{so,a}</seg>
+        ocsptool, p11tool, psktool, and srptool</seg>
+        <seg>libgnutls.{so,a}, libgnutls-openssl.{so,a}, and libgnutlsxx.{so,a}</seg>
         <seg>/usr/include/gnutls,
         /usr/share/doc/gnutls-&gnutls-version;, and
         /usr/share/gtk-doc/html/gnutls</seg>
@@ -216,6 +212,28 @@ cp -v -R            doc/credentials \
         </listitem>
       </varlistentry>
 
+      <varlistentry id="ocsptool">
+        <term><command>ocsptool</command></term>
+        <listitem>
+          <para>is a program that can parse and print information about
+          OCSP requests/responses, generate requests and verify responses.</para>
+          <indexterm zone="gnutls ocsptool">
+            <primary sortas="b-ocsptool">ocsptool</primary>
+          </indexterm>
+        </listitem>
+      </varlistentry>
+
+      <varlistentry id="p11tool">
+        <term><command>p11tool</command></term>
+        <listitem>
+          <para>is a program that allows handling data from PKCS #11 smart cards
+          and security modules.</para>
+          <indexterm zone="gnutls p11tool">
+            <primary sortas="b-p11tool">p11tool</primary>
+          </indexterm>
+        </listitem>
+      </varlistentry>
+
       <varlistentry id="psktool">
         <term><command>psktool</command></term>
         <listitem>