From 3b4e84844086c904ce39131db0c7fdfc98ab6c38 Mon Sep 17 00:00:00 2001
From: DJ Lucas <dj@linuxfromscratch.org>
Date: Mon, 25 Dec 2017 08:32:57 +0000
Subject: [PATCH] Update to Python-3.6.4. Fixes #4178. Add
 glibc-2.26-local_glob_exploits-2.patch. Fixes #4157.

git-svn-id: http://svn.linuxfromscratch.org/LFS/trunk/BOOK@11341 4aa44e1e-78dd-0310-a6d2-fbcd4c07a689
---
 chapter01/changelog.xml | 14 ++++++++++++++
 chapter03/patches.xml   |  8 ++++++++
 chapter06/glibc.xml     |  4 ++++
 general.ent             |  6 +++---
 packages.ent            | 12 ++++++------
 patches.ent             |  4 ++++
 6 files changed, 39 insertions(+), 9 deletions(-)

diff --git a/chapter01/changelog.xml b/chapter01/changelog.xml
index 1d7081eda..bbe09a188 100644
--- a/chapter01/changelog.xml
+++ b/chapter01/changelog.xml
@@ -42,6 +42,20 @@
     <listitem revision="sysv"> or <listitem revision="systemd"> as
     appropriate for the entry or if needed the entire day's listitem.
 -->
+    <listitem>
+      <para>2017-12-25</para>
+      <itemizedlist>
+        <listitem>
+          <para>[dj] - Update to Python-3.6.4. Fixes
+          <ulink url="&lfs-ticket-root;4178">#4178</ulink>.</para>
+        </listitem>
+        <listitem>
+          <para>[dj] - Add glibc-2.26-local_glob_exploits-2.patch. Fixes
+          <ulink url="&lfs-ticket-root;4157">#4157</ulink>.</para>
+        </listitem>
+      </itemizedlist>
+    </listitem>
+
     <listitem>
       <para>2017-12-22</para>
       <itemizedlist>
diff --git a/chapter03/patches.xml b/chapter03/patches.xml
index f0cd51584..d5262986f 100644
--- a/chapter03/patches.xml
+++ b/chapter03/patches.xml
@@ -76,6 +76,14 @@
       </listitem>
     </varlistentry>
 
+    <varlistentry>
+      <term>Glibc Glob Security Patch - <token>&glibc-glob-patch-size;</token>:</term>
+      <listitem>
+        <para>Download: <ulink url="&patches-root;&glibc-glob-patch;"/></para>
+        <para>MD5 sum: <literal>&glibc-glob-patch-md5;</literal></para>
+      </listitem>
+    </varlistentry>
+
     <varlistentry>
       <term>Kbd Backspace/Delete Fix Patch - <token>&kbd-backspace-patch-size;</token>:</term>
       <listitem>
diff --git a/chapter06/glibc.xml b/chapter06/glibc.xml
index 8f0bbbb52..8a40aee02 100644
--- a/chapter06/glibc.xml
+++ b/chapter06/glibc.xml
@@ -57,6 +57,10 @@
 
 <screen><userinput remap="pre">patch -Np1 -i ../&glibc-fhs-patch;</userinput></screen>
 
+    <para>Fix a minor security issue with glob functions:</para>
+
+<screen><userinput remap="pre">patch -Np1 -i ../&glibc-glob-patch;</userinput></screen>
+
     <para>First create a compatibility symlink to avoid references to /tools in
     our final glibc:</para>
 
diff --git a/general.ent b/general.ent
index 12ce6d1e4..bb576f5e0 100644
--- a/general.ent
+++ b/general.ent
@@ -1,13 +1,13 @@
-<!ENTITY version         "SVN-20171222">
+<!ENTITY version         "SVN-20171225">
 <!ENTITY short-version   "svn">  <!-- Used below in &blfs-book; 
                                       Change to x.y for release but not -rc releases -->
 <!ENTITY generic-version "development"> <!-- Use "development"  or "x.y[-pre{x}]" -->
 
-<!ENTITY versiond        "20171222-systemd">
+<!ENTITY versiond        "20171225-systemd">
 <!ENTITY short-versiond  "systemd">
 <!ENTITY generic-versiond "systemd"> 
 
-<!ENTITY releasedate     "December 22, 2017">
+<!ENTITY releasedate     "December 25, 2017">
 
 <!ENTITY copyrightdate   "1999-2017"><!-- jhalfs needs a literal dash, not &ndash; -->
 <!ENTITY milestone       "8.2">
diff --git a/packages.ent b/packages.ent
index 3d03100d5..76cdbb89c 100644
--- a/packages.ent
+++ b/packages.ent
@@ -548,16 +548,16 @@
 <!ENTITY psmisc-ch6-du "4.2 MB">
 <!ENTITY psmisc-ch6-sbu "less than 0.1 SBU">
 
-<!ENTITY python-version "3.6.3">
-<!ENTITY python-size "16,584 KB">
+<!ENTITY python-version "3.6.4">
+<!ENTITY python-size "16,600 KB">
 <!ENTITY python-url "https://www.python.org/ftp/python/&python-version;/Python-&python-version;.tar.xz">
-<!ENTITY python-md5 "b9c2c36c33fb89bda1fefd37ad5af9be">
+<!ENTITY python-md5 "1325134dd525b4a2c3272a1a0214dd54">
 <!ENTITY python-home "https://www.python.org/">
 <!ENTITY python-ch6-du "355 MB">
 <!ENTITY python-ch6-sbu "1.3 SBU">
-<!ENTITY python-docs-url "https://docs.python.org/ftp/python/doc/3.6.3/python-3.6.3-docs-html.tar.bz2">
-<!ENTITY python-docs-md5 "5f9668cb0cf994d265774585ba622552">
-<!ENTITY python-docs-size "5,807 MB">
+<!ENTITY python-docs-url "https://docs.python.org/ftp/python/doc/&python-version;/python-&python-version;-docs-html.tar.bz2">
+<!ENTITY python-docs-md5 "205aba4b06fd5e44598d1638a2ff81d8">
+<!ENTITY python-docs-size "5,824 KB">
 
 <!ENTITY readline-version "7.0">
 <!ENTITY readline-size "2,842 KB">
diff --git a/patches.ent b/patches.ent
index dc2a336a5..7845c01dd 100644
--- a/patches.ent
+++ b/patches.ent
@@ -34,6 +34,10 @@
 <!ENTITY glibc-fhs-patch-md5 "9a5997c3452909b1769918c759eff8a2">
 <!ENTITY glibc-fhs-patch-size "2.8 KB">
 
+<!ENTITY glibc-glob-patch "glibc-&glibc-version;-local_glob_exploits-2.patch">
+<!ENTITY glibc-glob-patch-md5 "1377e4f5422c6672ff48d430c07b245c">
+<!ENTITY glibc-glob-patch-size "2.3 KB">
+
 <!--
 <!ENTITY glibc-upstream-patch "glibc-&glibc-version;-upstream_fixes-1.patch">
 <!ENTITY glibc-upstream-patch-md5 "e602b6c3a332f4a06e2914e02ae2b295">