From 549e65fec07f468fc0d161ec44a2d30aa268eb7d Mon Sep 17 00:00:00 2001
From: Fernando de Oliveira <fernando@linuxfromscratch.org>
Date: Fri, 12 Dec 2014 13:34:37 +0000
Subject: [PATCH] Update to python-2.7.9.

git-svn-id: svn://svn.linuxfromscratch.org/BLFS/trunk/BOOK@15194 af4574ff-66df-0310-9fd7-8a98e5e911e0
---
 general.ent                        |  4 ++--
 general/prog/python2.xml           | 17 +++++++++--------
 introduction/welcome/changelog.xml | 10 ++++++++++
 packages.ent                       |  2 +-
 4 files changed, 22 insertions(+), 11 deletions(-)

diff --git a/general.ent b/general.ent
index 6d8053fa22..ea80cd3549 100644
--- a/general.ent
+++ b/general.ent
@@ -1,12 +1,12 @@
 <!-- $LastChangedBy$ $Date$ -->
 
-<!ENTITY day          "11">                   <!-- Always 2 digits -->
+<!ENTITY day          "12">                   <!-- Always 2 digits -->
 <!ENTITY month        "12">                   <!-- Always 2 digits -->
 <!ENTITY year         "2014">
 <!ENTITY copyrightdate "2001-&year;">
 <!ENTITY copyholder   "The BLFS Development Team">
 <!ENTITY version      "&year;-&month;-&day;">
-<!ENTITY releasedate  "December 11th, &year;">
+<!ENTITY releasedate  "December 12th, &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/general/prog/python2.xml b/general/prog/python2.xml
index 5cf36c5a2b..48af8805f0 100644
--- a/general/prog/python2.xml
+++ b/general/prog/python2.xml
@@ -5,16 +5,16 @@
   %general-entities;
 
   <!ENTITY python2-download-http
-          "http://www.python.org/ftp/python/&python2-version;/Python-&python2-version;.tar.xz">
+     "https://www.python.org/ftp/python/&python2-version;/Python-&python2-version;.tar.xz">
   <!ENTITY python2-download-ftp  " ">
-  <!ENTITY python2-md5sum        "d235bdfa75b8396942e360a70487ee00">
-  <!ENTITY python2-size          "11 MB">
-  <!ENTITY python2-buildsize     "222 MB (additional 18 MB for the tests)">
-  <!ENTITY python2-time          "1.0 SBU (additional 4.8 SBU for tests)">
+  <!ENTITY python2-md5sum        "38d530f7efc373d64a8fb1637e3baaa7">
+  <!ENTITY python2-size          "12 MB">
+  <!ENTITY python2-buildsize     "228 MB (additional 18 MB for the tests)">
+  <!ENTITY python2-time          "1.0 SBU (additional 4.6 SBU for tests)">
 
   <!ENTITY python2htmldoc-download-http
-           "http://docs.python.org/ftp/python/doc/&python2-version;/python-&python2-version;-docs-html.tar.bz2">
-  <!ENTITY python2htmldoc-md5sum        "2cf9ba96b2723a5268cd14432b15fdcf">
+     "https://docs.python.org/ftp/python/doc/&python2-version;/python-&python2-version;-docs-html.tar.bz2">
+  <!ENTITY python2htmldoc-md5sum        "8804bc888f6b7a1cc217be1acbb59ad6">
   <!ENTITY python2htmldoc-size          "4.4 MB">
 ]>
 
@@ -118,7 +118,8 @@
 
     <bridgehead renderas="sect4">Optional</bridgehead>
     <para role="optional">
-      <xref linkend="bluez"/>
+      <xref linkend="bluez"/> and
+      <xref linkend="valgrind"/>
     </para>
 
     <bridgehead renderas="sect4">Optional (For Additional Modules)</bridgehead>
diff --git a/introduction/welcome/changelog.xml b/introduction/welcome/changelog.xml
index 6c76ad85f4..5b7cf863b8 100644
--- a/introduction/welcome/changelog.xml
+++ b/introduction/welcome/changelog.xml
@@ -44,6 +44,16 @@
 
 -->
 
+    <listitem>
+      <para>December 12th, 2014</para>
+      <itemizedlist>
+         <listitem>
+          <para>[fernando] - Update to python-2.7.9. Fixes
+          <ulink url="&blfs-ticket-root;5896">#5896</ulink>.</para>
+        </listitem>
+      </itemizedlist>
+    </listitem>
+
     <listitem>
       <para>December 11th, 2014</para>
       <itemizedlist>
diff --git a/packages.ent b/packages.ent
index b678ab44b6..c32b951b4e 100644
--- a/packages.ent
+++ b/packages.ent
@@ -266,7 +266,7 @@
 <!ENTITY nasm-version                 "2.11.06">
 <!ENTITY npapi-sdk-version            "0.27.2">
 <!ENTITY php-version                  "5.6.3">
-<!ENTITY python2-version              "2.7.8">
+<!ENTITY python2-version              "2.7.9">
 <!ENTITY python3-version              "3.4.2">
 <!ENTITY ruby-version                 "2.1.5">
 <!ENTITY ruby-patch-version           "0">