Index: general.ent
===================================================================
--- general.ent	(revision 27d9434bb281edc597fc54f4832b0749ce5d3d09)
+++ general.ent	(revision 0c6c35d8d356e4d176db6811c18ac9f4fcd7ac20)
@@ -4,5 +4,5 @@
 -->
 
-<!ENTITY day          "09">                   <!-- Always 2 digits -->
+<!ENTITY day          "10">                   <!-- Always 2 digits -->
 <!ENTITY month        "11">                   <!-- Always 2 digits -->
 <!ENTITY year         "2011">
@@ -10,5 +10,5 @@
 <!ENTITY copyholder   "The BLFS Development Team">
 <!ENTITY version      "&year;-&month;-&day;">
-<!ENTITY releasedate  "November 9th, &year;">
+<!ENTITY releasedate  "November 10th, &year;">
 <!-- <!ENTITY releasedate  "November &day;st, &year;"> -->
 <!ENTITY pubdate      "&year;-&month;-&day;"> <!-- metadata req. by TLDP -->
@@ -104,5 +104,5 @@
 <!-- The ca-bundle-version should be updated to match nss version -->
 <!ENTITY ca-bundle-version            "3.12.11.0">
-<!ENTITY gnutls-version               "2.10.2">
+<!ENTITY gnutls-version               "3.0.7">
 <!ENTITY cracklib-version             "2.8.18">
 <!ENTITY openssh-version              "5.9p1">
@@ -114,4 +114,5 @@
 <!ENTITY gpgme-version                "1.3.0">
 <!ENTITY libcap2-version              "2.22">
+<!ENTITY nettle-version               "2.4">
 <!ENTITY tripwire-version             "2.4.1.2">
 <!ENTITY heimdal-version              "1.4">
Index: introduction/welcome/changelog.xml
===================================================================
--- introduction/welcome/changelog.xml	(revision 27d9434bb281edc597fc54f4832b0749ce5d3d09)
+++ introduction/welcome/changelog.xml	(revision 0c6c35d8d356e4d176db6811c18ac9f4fcd7ac20)
@@ -43,12 +43,22 @@
 
     <listitem>
-      <para>November 9th, 2011</para>
+      <para>November 10th, 2011</para>
       <itemizedlist>
         <!-- <listitem>
           <para>[bdubbs] - Update to samba-3.6.1.</para>
+        </listitem>
+        -->
+        <listitem>
+          <para>[bdubbs] - Update to gnutls-3.0.7.</para>
         </listitem> 
         <listitem>
-          <para>[bdubbs] - Update to gnutls-3.0.7.</para>
-        </listitem> -->
+          <para>[bdubbs] - Add nettle-2.4.</para>
+        </listitem> 
+      </itemizedlist>
+    </listitem>
+
+    <listitem>
+      <para>November 9th, 2011</para>
+      <itemizedlist>
         <listitem>
           <para>[bdubbs] - Update to libidn-1.22.</para>
Index: postlfs/security/gnutls.xml
===================================================================
--- postlfs/security/gnutls.xml	(revision 27d9434bb281edc597fc54f4832b0749ce5d3d09)
+++ postlfs/security/gnutls.xml	(revision 0c6c35d8d356e4d176db6811c18ac9f4fcd7ac20)
@@ -8,8 +8,8 @@
   <!ENTITY gnutls-download-http " ">
   <!ENTITY gnutls-download-ftp  "ftp://ftp.gnutls.org/pub/gnutls/gnutls-&gnutls-version;.tar.xz">
-  <!ENTITY gnutls-md5sum        "777823f5746ab80cd6f7f7b5fcb2f91b">
-  <!ENTITY gnutls-size          "7.4 MB">
-  <!ENTITY gnutls-buildsize     "100 MB">
-  <!ENTITY gnutls-time          "1.3 SBU (additional 1.5 SBU to run the test suite)">
+  <!ENTITY gnutls-md5sum        "840c96c75817c0f800a47805e275db7e">
+  <!ENTITY gnutls-size          "4.1 MB">
+  <!ENTITY gnutls-buildsize     "120 MB">
+  <!ENTITY gnutls-time          "1.6 SBU (including the test suite)">
 ]>
 
@@ -76,20 +76,20 @@
 
     <bridgehead renderas="sect4">Required</bridgehead>
-    <para role="required"><xref linkend="libgcrypt"/></para>
+    <para role="required"><xref linkend="nettle"/></para>
 
     <bridgehead renderas="sect4">Optional</bridgehead>
-    <para role="optional"><xref linkend="gtk-doc"/>,
-    <xref linkend="guile"/>,
-    <xref linkend="libtasn1"/>,
-    <ulink url="http://webscripts.softpedia.com/script/Development-Scripts-js/C-C-Library/libcfg--26570.html">libcfg+</ulink>, and
-    <ulink url="http://valgrind.org/">Valgrind</ulink> (used during the test suite)</para>
+    <para role="optional">
+      <xref linkend="gtk-doc"/>,
+      <xref linkend="guile"/>,
+      <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
+      <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
     version shipped in the <application>GnuTLS</application> tarball will be
     used instead.</para>
-
-    <!-- <bridgehead renderas="sect4">Optional Debugging Libraries</bridgehead>
-    <para role="optional"><ulink url="http://dmalloc.com/">Dmalloc</ulink> and
-    <ulink url="http://perens.com/FreeSoftware/ElectricFence/">Electric Fence</ulink></para> -->
 
     <para condition="html" role="usernotes">User Notes:
@@ -121,6 +121,8 @@
     <para>If you did not pass the <option>--enable-gtk-doc</option> parameter
     to the <command>configure</command> script, install the API documentation
-    using the following command as the
-    <systemitem class="username">root</systemitem> user:</para>
+    to the <filename
+    class='directory'>/usr/share/gtk-doc/html/gnutls</filename> directory using
+    the following command as the <systemitem class="username">root</systemitem>
+    user:</para>
 
 <screen role="root"><userinput>make -C doc/reference install-data-local</userinput></screen>
@@ -145,5 +147,5 @@
 
       <seglistitem>
-        <seg>certtool, gnutls-cli, gnutls-cli-debug, gnutls-serv,
+        <seg>certtool, crywrap, gnutls-cli, gnutls-cli-debug, gnutls-serv,
         psktool, and srptool</seg>
         <seg>libgnutls.{so,a}, libgnutls-extra.{so,a},
@@ -171,4 +173,15 @@
       </varlistentry>
 
+      <varlistentry id="crywrap">
+        <term><command>crywrap</command></term>
+        <listitem>
+          <para>is a simple wrapper that waits for TLS/SSL connections, and
+          proxies them to an unencrypted location.</para>
+          <indexterm zone="gnutls crywrap">
+            <primary sortas="b-crywrap">crywrap</primary>
+          </indexterm>
+        </listitem>
+      </varlistentry>
+
       <varlistentry id="gnutls-cli">
         <term><command>gnutls-cli</command></term>
Index: postlfs/security/nettle.xml
===================================================================
--- postlfs/security/nettle.xml	(revision 0c6c35d8d356e4d176db6811c18ac9f4fcd7ac20)
+++ postlfs/security/nettle.xml	(revision 0c6c35d8d356e4d176db6811c18ac9f4fcd7ac20)
@@ -0,0 +1,152 @@
+<?xml version="1.0" encoding="ISO-8859-1"?>
+<!DOCTYPE sect1 PUBLIC "-//OASIS//DTD DocBook XML V4.5//EN"
+   "http://www.oasis-open.org/docbook/xml/4.5/docbookx.dtd" [
+  <!ENTITY % general-entities SYSTEM "../../general.ent">
+  %general-entities;
+
+  <!ENTITY nettle-download-http "http://www.lysator.liu.se/~nisse/archive/nettle-&nettle-version;.tar.gz">
+  <!ENTITY nettle-download-ftp  "ftp://ftp.lysator.liu.se/pub/security/lsh/nettle-&nettle-version;.tar.gz">
+  <!ENTITY nettle-md5sum        "450be8c4886d46c09f49f568ad6fa013">
+  <!ENTITY nettle-size          "1.0 MB">
+  <!ENTITY nettle-buildsize     "121 MB">
+  <!ENTITY nettle-time          "0.2 SBU">
+]>
+
+<sect1 id="nettle" xreflabel="nettle-&nettle-version;">
+  <?dbhtml filename="nettle.html"?>
+
+  <sect1info>
+    <othername>$LastChangedBy$</othername>
+    <date>$Date$</date>
+  </sect1info>
+
+  <title>nettle-&nettle-version;</title>
+
+  <indexterm zone="nettle">
+    <primary sortas="a-nettle">nettle</primary>
+  </indexterm>
+
+  <sect2 role="package">
+    <title>Introduction to nettle</title>
+
+    <para>The <application>nettle</application> package is a ilow-level
+    cryptographic library that is designed to fit easily in many contexts.
+    </para>
+
+    &lfs70_checked;
+
+    <bridgehead renderas="sect3">Package Information</bridgehead>
+    <itemizedlist spacing="compact">
+      <listitem>
+        <para>Download (HTTP): <ulink url="&nettle-download-http;"/></para>
+      </listitem>
+      <listitem>
+        <para>Download (FTP): <ulink url="&nettle-download-ftp;"/></para>
+      </listitem>
+      <listitem>
+        <para>Download MD5 sum: &nettle-md5sum;</para>
+      </listitem>
+      <listitem>
+        <para>Download size: &nettle-size;</para>
+      </listitem>
+      <listitem>
+        <para>Estimated disk space required: &nettle-buildsize;</para>
+      </listitem>
+      <listitem>
+        <para>Estimated build time: &nettle-time;</para>
+      </listitem>
+    </itemizedlist>
+
+    <para condition="html" role="usernotes">User Notes:
+    <ulink url="&blfs-wiki;/nettle"/></para>
+
+  </sect2>
+
+  <sect2 role="installation">
+    <title>Installation of nettle</title>
+
+    <para>Install <application>nettle</application> by running the following
+    commands:</para>
+
+<screen><userinput>./configure --prefix=/usr &amp;&amp;
+make</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;
+install -v -m755 -d /usr/share/doc/nettle-&nettle-version; &amp;&amp;
+install -v -m644 nettle.html /usr/share/doc/nettle-&nettle-version;</userinput></screen>
+
+  </sect2>
+
+  <sect2 role="content">
+    <title>Contents</title>
+
+    <segmentedlist>
+      <segtitle>Installed Programs</segtitle>
+      <segtitle>Installed Library</segtitle>
+      <segtitle>Installed Directories</segtitle>
+
+      <seglistitem>
+        <seg>nettle-hash, nettle-lfib-stream, pkcs1-conv, and sexp-conv</seg>
+        <seg>libhogweed.a  and libnettle.a</seg>
+        <seg>/usr/include/nettle</seg>
+      </seglistitem>
+    </segmentedlist>
+
+    <variablelist>
+      <bridgehead renderas="sect3">Short Descriptions</bridgehead>
+      <?dbfo list-presentation="list"?>
+      <?dbhtml list-presentation="table"?>
+
+      <varlistentry id="nettle-hash">
+        <term><command>nettle-hash</command></term>
+        <listitem>
+          <para>calulates a hash value using a specified algorithm.</para>
+          <indexterm zone="nettle nettle-hash">
+            <primary sortas="b-nettle-hash">nettle-hash</primary>
+          </indexterm>
+        </listitem>
+      </varlistentry>
+
+      <varlistentry id="nettle-lfib-stream">
+        <term><command>nettle-lfib-stream</command></term>
+        <listitem>
+          <para>outputs a sequence of pseudorandom (non-cryptographic)  bytes,  
+          using Knuth's lagged fibonacci generator. The stream is useful for 
+          testing, but should not be used to generate cryptographic keys or anything  
+          else that needs real randomness.</para>
+          <indexterm zone="nettle nettle-lfib-stream">
+            <primary sortas="b-nettle-lfib-stream">nettle-lfib-stream</primary>
+          </indexterm>
+        </listitem>
+      </varlistentry>
+
+      <varlistentry id="pkcs1-conv">
+        <term><command>pkcs1-conv</command></term>
+        <listitem>
+          <para>converts private and public RSA keys from PKCS #1 format  to
+           sexp format.</para>
+          <indexterm zone="nettle pkcs1-conv">
+            <primary sortas="b-pkcs1-conv">pkcs1-conv</primary>
+          </indexterm>
+        </listitem>
+      </varlistentry>
+
+      <varlistentry id="sexp-conv">
+        <term><command>sexp-conv</command></term>
+        <listitem>
+          <para>converts an s-expression to a different encoding.</para>
+          <indexterm zone="nettle sexp-conv">
+            <primary sortas="b-sexp-conv">sexp-conv</primary>
+          </indexterm>
+        </listitem>
+      </varlistentry>
+
+    </variablelist>
+
+  </sect2>
+
+</sect1>
Index: postlfs/security/security.xml
===================================================================
--- postlfs/security/security.xml	(revision 27d9434bb281edc597fc54f4832b0749ce5d3d09)
+++ postlfs/security/security.xml	(revision 0c6c35d8d356e4d176db6811c18ac9f4fcd7ac20)
@@ -53,4 +53,5 @@
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="libcap2.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="mitkrb.xml"/>
+  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="nettle.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="nss.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="openssh.xml"/>
