From a181baeba36503d3867215ac0c5def8e8187039f Mon Sep 17 00:00:00 2001
From: Randy McMurchy <randy@linuxfromscratch.org>
Date: Thu, 12 Feb 2009 02:45:57 +0000
Subject: [PATCH] Updated to OpenSSL-0.9.8j

git-svn-id: svn://svn.linuxfromscratch.org/BLFS/trunk/BOOK@7756 af4574ff-66df-0310-9fd7-8a98e5e911e0
---
 general.ent                        |  4 +-
 introduction/welcome/changelog.xml |  9 ++++
 postlfs/security/openssl.xml       | 70 +++++++++++++++++++-----------
 3 files changed, 55 insertions(+), 28 deletions(-)

diff --git a/general.ent b/general.ent
index 02a4e0d3ce..58311f7402 100644
--- a/general.ent
+++ b/general.ent
@@ -3,7 +3,7 @@ $LastChangedBy$
 $Date$
 -->
 
-<!ENTITY day          "11">                   <!-- Always 2 digits -->
+<!ENTITY day          "12">                   <!-- Always 2 digits -->
 <!ENTITY month        "02">                   <!-- Always 2 digits -->
 <!ENTITY year         "2009">
 <!ENTITY copyrightdate "2001-&year;">
@@ -59,7 +59,7 @@ $Date$
 
 <!-- Chapter 4 -->
 
-<!ENTITY openssl-version              "0.9.8i">
+<!ENTITY openssl-version              "0.9.8j">
 <!ENTITY gnutls-version               "1.6.3">
 <!ENTITY cracklib-version             "2.8.13">
 <!ENTITY linux-pam-version            "0.99.10.0">
diff --git a/introduction/welcome/changelog.xml b/introduction/welcome/changelog.xml
index 24a2efb770..b71f4184b4 100644
--- a/introduction/welcome/changelog.xml
+++ b/introduction/welcome/changelog.xml
@@ -41,6 +41,15 @@
 
 -->
 
+    <listitem>
+      <para>February 12th, 2009</para>
+      <itemizedlist>
+        <listitem>
+          <para>[randy] - Updated to OpenSSL-0.9.8j.</para>
+        </listitem>
+      </itemizedlist>
+    </listitem>
+
     <listitem>
       <para>February 11th, 2009</para>
       <itemizedlist>
diff --git a/postlfs/security/openssl.xml b/postlfs/security/openssl.xml
index e10dc00bf5..a62b43183f 100644
--- a/postlfs/security/openssl.xml
+++ b/postlfs/security/openssl.xml
@@ -6,10 +6,10 @@
 
   <!ENTITY openssl-download-http "http://www.openssl.org/source/openssl-&openssl-version;.tar.gz">
   <!ENTITY openssl-download-ftp  "ftp://ftp.openssl.org/source/openssl-&openssl-version;.tar.gz">
-  <!ENTITY openssl-md5sum        "561e00f18821c74b2b86c8c7786f9d8b">
-  <!ENTITY openssl-size          "3.3 MB">
-  <!ENTITY openssl-buildsize     "39 MB">
-  <!ENTITY openssl-time          "1.3 SBU (additional 0.4 SBU to run the test suite)">
+  <!ENTITY openssl-md5sum        "a5cb5f6c3d11affb387ecf7a997cac0c">
+  <!ENTITY openssl-size          "3.7 MB">
+  <!ENTITY openssl-buildsize     "45 MB">
+  <!ENTITY openssl-time          "1.2 SBU (additional 0.3 SBU to run the test suite)">
 ]>
 
 <sect1 id="openssl" xreflabel="OpenSSL-&openssl-version;">
@@ -67,9 +67,13 @@
 
     <bridgehead renderas="sect3">OpenSSL Dependencies</bridgehead>
 
+    <bridgehead renderas="sect4">Recommended
+    (if you run the test suite during the build)</bridgehead>
+    <para role="recommended"><xref linkend="bc"/></para>
+
     <bridgehead renderas="sect4">Optional</bridgehead>
-    <para role="optional"><xref linkend="bc"/> (recommended
-    if you run the test suite during the build)</para>
+    <para role="optional"><xref linkend="mitkrb"/> or
+    <xref linkend="heimdal"/></para>
 
     <para condition="html" role="usernotes">User Notes:
     <ulink url='&blfs-wiki;/OpenSSL'/></para>
@@ -83,22 +87,29 @@
     the following commands:</para>
 
 <screen><userinput>patch -Np1 -i ../openssl-&openssl-version;-fix_manpages-1.patch &amp;&amp;
-./config --openssldir=/etc/ssl --prefix=/usr shared &amp;&amp;
-make MANDIR=/usr/share/man</userinput></screen>
+./config --prefix=/usr         \
+         --openssldir=/etc/ssl \
+         shared                \
+         zlib-dynamic          &amp;&amp;
+make</userinput></screen>
 
-    <para>To test the results, issue: <command>make test</command>.  Note that the
+    <para>To test the results, issue: <command>make test</command>.</para>
+
+    <!-- <para>To test the results, issue: <command>make test</command>.  Note that the
     test results/output depend on the availability of /etc/ssl/openssl.cnf.  If
     running the tests for the first time run the following as the 
     <systemitem class="username">root</systemitem> user before running the
     tests:</para>
 
-<screen role="root"><userinput>install -vd /etc/ssl &amp;&amp;
-install -v ./apps/openssl.cnf /etc/ssl/</userinput></screen>
+<screen role="root"><userinput>install -v -m755 d /etc/ssl &amp;&amp;
+install -v ./apps/openssl.cnf /etc/ssl/</userinput></screen> -->
 
     <para>Now, as the <systemitem class="username">root</systemitem> user:</para>
 
-<screen role="root"><userinput>make MANDIR=/usr/share/man install &amp;&amp;
-cp -v -r certs /etc/ssl &amp;&amp;
+<screen role="root"><userinput>make MANDIR=/usr/share/man install                &amp;&amp;
+
+cp -v -r certs /etc/ssl                           &amp;&amp;
+
 install -v -d -m755 /usr/share/doc/openssl-&openssl-version; &amp;&amp;
 cp -v -r doc/{HOWTO,README,*.{txt,html,gif}} \
     /usr/share/doc/openssl-&openssl-version;</userinput></screen>
@@ -108,31 +119,38 @@ cp -v -r doc/{HOWTO,README,*.{txt,html,gif}} \
   <sect2 role="commands">
     <title>Command Explanations</title>
 
+    <para><parameter>shared</parameter>: This parameter forces the creation of
+    shared libraries along with the static libraries.</para>
+
+    <para><parameter>zlib-dynamic</parameter>: This parameter adds
+    compression/decompression functionality using the
+    <filename class="libraryfile">libz</filename> library.</para>
+
     <para><option>no-rc5 no-idea</option>: When added to the
     <command>./config</command> command, this will eliminate the building
     of those encryption methods. Patent licenses may be needed for you to
     utilize either of those methods in your projects.</para>
 
-    <para><option>enable-tlsext</option>: When added to the
+    <para><command>make MANDIR=/usr/share/man install</command>: This command
+    installs <application>OpenSSL</application> with the man pages in
+    <filename class='directory'>/usr/share/man</filename> instead of
+    <filename class='directory'>/etc/ssl/man</filename>.</para>
+
+    <!-- <para><option>enable-tlsext</option>: When added to the
     <command>./config</command> command, this switch will enable TLS
     Extensions. Currently this is only RFC 3546 and 4507bis for Server Name
     Indication.  This allows the use of multiple SSL certificates with multiple
     virtual hosts in Apache, while using only one IP address and one port for
-    all virtual hosts.</para>
+    all virtual hosts.</para> -->
 
-    <para><option>zlib-dynamic</option>: When added to the
+    <!-- <para><option>zlib-dynamic</option>: When added to the
     <command>./config</command> command, this switch will enable 
-    use of <filename>libz.so</filename> for compression/decompression.
-    </para>
+    use of <filename>libz.so</filename> for compression/decompression.</para> -->
 
-    <para><command>make MANDIR=/usr/share/man; make MANDIR=/usr/share/man
-    install</command>: These commands install
-    <application>OpenSSL</application> with the man pages in
-    <filename class='directory'>/usr/share/man</filename> instead of
-    <filename class='directory'>/etc/ssl/man</filename>.</para>
-
-    <para><command>cp -v -r certs /etc/ssl</command>: The certificates must
-    be copied manually as the default installation skips this step.</para>
+    <para><command>cp -v -r certs /etc/ssl</command>: This package no longer
+    ships CA certificates. This commands installs documentation and sample
+    certificates as examples should one want to create/install their own
+    certificates.</para>
 
   </sect2>