From f204b625fbf501f27cc452206e3365b527e7142a Mon Sep 17 00:00:00 2001
From: matsuand <matsuand@d6661c75-0afd-443a-aae1-cb31083e41e8>
Date: Sun, 12 Oct 2014 00:51:27 +0000
Subject: [PATCH] =?utf8?q?[LFS-SVN]=20SVN-20141011,=20Changeset=2010777=20?=
 =?utf8?q?=E5=AF=BE=E5=BF=9C=E3=80=82?=
MIME-Version: 1.0
Content-Type: text/plain; charset=utf8
Content-Transfer-Encoding: 8bit

git-svn-id: svn+ssh://svn.osdn.net/svnroot/lfsbookja/trunk@927 d6661c75-0afd-443a-aae1-cb31083e41e8
---
 lfsbook/src/chapter01/changelog.ch  |  9 ++++++++-
 lfsbook/src/chapter01/jchangelog.ch | 14 ++++++++++++++
 2 files changed, 22 insertions(+), 1 deletion(-)

diff --git a/lfsbook/src/chapter01/changelog.ch b/lfsbook/src/chapter01/changelog.ch
index 511ddb9d..7906f4ad 100644
--- a/lfsbook/src/chapter01/changelog.ch
+++ b/lfsbook/src/chapter01/changelog.ch
@@ -48,12 +48,16 @@
 @z
 
 @x
-      <para>2014-10-08</para>
+      <para>2014-10-11</para>
       <itemizedlist>
         <listitem>
           <para>[bdubbs] - Update to file-5.20. Fixes 
           <ulink url="&lfs-ticket-root;3691">#3691</ulink>.</para>
         </listitem>
+        <listitem>
+          <para>[krejzi] - Updated bash upstream patches and added fixes for
+          CVE-2014-6278.</para>
+        </listitem>
       </itemizedlist>
 @y
       <para>2014-10-11</para>
@@ -62,6 +66,9 @@
           <para>[bdubbs] - file-5.20 へのアップデート。
           <ulink url="&lfs-ticket-root;3691">#3691</ulink> を Fix に。</para>
         </listitem>
+        <listitem>
+          <para>[krejzi] - bash のアップストリームによるパッチを更新し CVE-2014-6278 への対応を追加。</para>
+        </listitem>
       </itemizedlist>
 @z
 
diff --git a/lfsbook/src/chapter01/jchangelog.ch b/lfsbook/src/chapter01/jchangelog.ch
index 6dc21ec8..84bad56c 100644
--- a/lfsbook/src/chapter01/jchangelog.ch
+++ b/lfsbook/src/chapter01/jchangelog.ch
@@ -54,6 +54,20 @@
 -->
 
     <listitem>
+      <para>2014-10-12</para>
+      <itemizedlist>
+        <listitem>
+          <para>[matsuand] -
+          SVN-20141011,
+          Changeset
+          <ulink url="&lfs-rev-root;10777">10777</ulink>
+          対応。
+          </para>
+        </listitem>
+      </itemizedlist>
+    </listitem>
+
+    <listitem>
       <para>2014-10-11</para>
       <itemizedlist>
         <listitem>
-- 
2.11.0