From d78194f3c6cef9ad4f4f8fb809807dcaa7f992d7 Mon Sep 17 00:00:00 2001
From: Ken Moffat <ken@linuxfromscratch.org>
Date: Wed, 2 Mar 2016 02:47:59 +0000
Subject: [PATCH] openssl-1.0.2g

git-svn-id: svn://svn.linuxfromscratch.org/BLFS/trunk/BOOK@17045 af4574ff-66df-0310-9fd7-8a98e5e911e0
---
 general.ent                        |  6 +++---
 introduction/welcome/changelog.xml | 13 +++++++++++++
 packages.ent                       |  2 +-
 postlfs/security/openssl.xml       | 10 +++++-----
 4 files changed, 22 insertions(+), 9 deletions(-)

diff --git a/general.ent b/general.ent
index dae8792ceb..b73148d1f9 100644
--- a/general.ent
+++ b/general.ent
@@ -1,12 +1,12 @@
 <!-- $LastChangedBy$ $Date$ -->
 
-<!ENTITY day          "29">                   <!-- Always 2 digits -->
-<!ENTITY month        "02">                   <!-- Always 2 digits -->
+<!ENTITY day          "01">                   <!-- Always 2 digits -->
+<!ENTITY month        "03">                   <!-- Always 2 digits -->
 <!ENTITY year         "2016">
 <!ENTITY copyrightdate "2001-&year;">
 <!ENTITY copyholder   "The BLFS Development Team">
 <!ENTITY version      "&year;-&month;-&day;">
-<!ENTITY releasedate  "February 29th &year;">
+<!ENTITY releasedate  "March 1st &year;">
 <!ENTITY pubdate      "&year;-&month;-&day;"> <!-- metadata req. by TLDP -->
 <!ENTITY blfs-version "svn">                  <!-- svn|[release #] -->
 <!ENTITY lfs-version  "development">          <!-- x.y|development] -->
diff --git a/introduction/welcome/changelog.xml b/introduction/welcome/changelog.xml
index bb2da01bdc..2b47843014 100644
--- a/introduction/welcome/changelog.xml
+++ b/introduction/welcome/changelog.xml
@@ -44,6 +44,19 @@
 
 -->
 
+    <listitem>
+      <para>March 1st, 2016</para>
+      <itemizedlist>
+        <listitem>
+          <para>[ken] - Update to openssl-1.0.2g. Fixes
+          Fixes <ulink url="&blfs-ticket-root;7490">#7490</ulink>.
+          Because this disables SSLv2 code, packages which link to
+          it (such as curl and Python3, probably others) will need
+          to be recompiled.</para>
+        </listitem>
+      </itemizedlist>
+    </listitem>
+
     <listitem>
       <para>February 29th, 2016</para>
       <itemizedlist>
diff --git a/packages.ent b/packages.ent
index c4438c9387..ef572d313e 100644
--- a/packages.ent
+++ b/packages.ent
@@ -32,7 +32,7 @@
 <!-- major and minor only
 <!ENTITY nss-version                  "3.&nss-minor-version;"> -->
 <!ENTITY openssh-version              "7.1p2">
-<!ENTITY openssl-version              "1.0.2f">
+<!ENTITY openssl-version              "1.0.2g">
 <!ENTITY p11-kit-version              "0.23.2">    <!-- Even minors only -->
 <!ENTITY polkit-version               "0.113">
 <!ENTITY shadow-version               "4.2.1">
diff --git a/postlfs/security/openssl.xml b/postlfs/security/openssl.xml
index 4a57e0f87c..7dfdae50fd 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        "b3bf73f507172be9292ea2a8c28b659d">
+  <!ENTITY openssl-md5sum        "f3c710c045cdee5fd114feb69feba7aa">
   <!ENTITY openssl-size          "5.1 MB">
-  <!ENTITY openssl-buildsize     "68 MB (with tests)">
-  <!ENTITY openssl-time          "1.4 SBU (with tests)">
+  <!ENTITY openssl-buildsize     "63 MB (with tests)">
+  <!ENTITY openssl-time          "1.5 SBU (with tests)">
 ]>
 
 <sect1 id="openssl" xreflabel="OpenSSL-&openssl-version;">
@@ -293,8 +293,8 @@ cp -vfr doc/*     /usr/share/doc/openssl-&openssl-version;</userinput></screen>
         <term><filename class="libraryfile">libssl.{so,a}</filename></term>
         <listitem>
           <para>
-            implements the Secure Sockets Layer (SSL v2/v3) and Transport Layer
-            Security (TLS v1) protocols. It provides a rich API, documentation
+            implements the Transport Layer Security (TLS v1) protocol.
+            It provides a rich API, documentation
             on which can be found by running <command>man 3 ssl</command>.
           </para>
           <indexterm zone="openssl libssl">