[LFS-SVN] SVN-20141004, Changeset 10771 対応。

git-svn-id: svn+ssh://svn.osdn.net/svnroot/lfsbookja/trunk@924 d6661c75-0afd-443a-aae1-cb31083e41e8

diff --git a/lfsbook/configure b/lfsbook/configure
index 54c1feb..cabb768 100755 (executable)
--- a/lfsbook/configure
+++ b/lfsbook/configure
@@ -3879,7 +3879,7 @@ if test "$TIDY" = no; then
  as_fn_error $? "tidy not found in $PATH" "$LINENO" 5
 fi;
 
-TARGETVER=svn-20140929
+TARGETVER=svn-20141004
 
 SVNVER=`grep 'ENTITY version' ${bookdir}/general.ent | sed -e 's/^<!ENTITY version         \"//' -e 's/\">$//' | tr 'A-Z' 'a-z'`
 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for the original XML version" >&5

diff --git a/lfsbook/src/chapter01/changelog.ch b/lfsbook/src/chapter01/changelog.ch
index 9913167..54a3aaa 100644 (file)
--- a/lfsbook/src/chapter01/changelog.ch
+++ b/lfsbook/src/chapter01/changelog.ch
@@ -48,6 +48,33 @@
 @z
 
 @x
+      <para>2014-09-26</para>
+      <itemizedlist>
+        <listitem>
+          <para>[krejzi] - Updated bash upstream patches and added fixes for
+          CVE-2014-6277. Fixes <ulink
+          url="&lfs-ticket-root;3680">#3686</ulink>.</para>
+        </listitem>
+        <listitem>
+          <para>[krejzi] - Updated reaadline upstream patches. Fixes <ulink
+          url="&lfs-ticket-root;3680">#3687</ulink>.</para>
+        </listitem>
+      </itemizedlist>
+@y
+      <para>2014-10-04</para>
+      <itemizedlist>
+        <listitem>
+          <para>[krejzi] - bash のアップストリームによるパッチを更新し CVE-2014-6277 への対応を追加。
+          <ulink url="&lfs-ticket-root;3680">#3686</ulink> を Fix に。</para>
+        </listitem>
+        <listitem>
+          <para>[krejzi] - readline のアップストリームによるパッチへの更新。<ulink
+          url="&lfs-ticket-root;3680">#3687</ulink> を Fix に。</para>
+        </listitem>
+      </itemizedlist>
+@z
+
+@x
       <para>2014-10-02</para>
       <itemizedlist>
         <listitem>
@@ -69,18 +96,17 @@
       <para>2014-10-02</para>
       <itemizedlist>
         <listitem>
-          <para>[bdubbs] - Added perl patch to fix CVE-2014-4330.
-          to prevent infinite recursion in Data::Dumper.  Fixes
-          <ulink url="&lfs-ticket-root;3681">#3681</ulink>.</para>
+          <para>[bdubbs] - perl にて CVE-2014-4330 を解消するパッチを追加。
+          これにより Data::Dumper での無限再帰処理を回避。
+          <ulink url="&lfs-ticket-root;3681">#3681</ulink> を Fix に。</para>
         </listitem>
         <listitem>
-          <para>[bdubbs] - Update to grub-2.02~beta2.  It's been
-          in beta for over 9 months and a 'stable' does not seem
-          to be forthcoming.  Fixes 
-          <ulink url="&lfs-ticket-root;3450">#3450</ulink>.</para>
+          <para>[bdubbs] - grub-2.02~beta2 へのアップデート。
+          9ヶ月間ベータ版のままであるが "安定版" が出そうにないため。
+          <ulink url="&lfs-ticket-root;3450">#3450</ulink> を Fix に。</para>
         </listitem>
         <listitem>
-          <para>[bdubbs] - Update glibc tests known to sometimes fail.</para>
+          <para>[bdubbs] - glibc にて失敗するテストを修正。</para>
         </listitem>
       </itemizedlist>
 @z

diff --git a/lfsbook/src/chapter01/jchangelog.ch b/lfsbook/src/chapter01/jchangelog.ch
index 0cdf105..9fa87f1 100644 (file)
--- a/lfsbook/src/chapter01/jchangelog.ch
+++ b/lfsbook/src/chapter01/jchangelog.ch
@@ -54,6 +54,19 @@
 -->
 
     <listitem>
+      <para>2014-10-05</para>
+      <itemizedlist>
+        <listitem>
+          <para>[matsuand] -
+          Changeset
+          <ulink url="&lfs-rev-root;10771">10771</ulink>
+          対応。
+          </para>
+        </listitem>
+      </itemizedlist>
+    </listitem>
+
+    <listitem>
       <para>2014-10-03</para>
       <itemizedlist>
         <listitem>

diff --git a/lfsbook/src/general.ch b/lfsbook/src/general.ch
index 196cd84..12ebb28 100644 (file)
--- a/lfsbook/src/general.ch
+++ b/lfsbook/src/general.ch
@@ -8,15 +8,15 @@
 % $Date::                           $
 %
 @x
-<!ENTITY version         "SVN-20140929">
+<!ENTITY version         "SVN-20141004">
 <!ENTITY short-version   "svn">  <!-- Used in dbus chapter, change to x.y for release -->
-<!ENTITY releasedate     "September 29, 2014">
+<!ENTITY releasedate     "October 4, 2014">
 @y
 <?xml version="1.0" encoding="UTF-8"?>
-<!ENTITY version         "SVN-20140929">
+<!ENTITY version         "SVN-20141004">
 <!ENTITY short-version   "svn">  <!-- Used in dbus chapter, change to x.y for release -->
-<!ENTITY releasedate     "2014年9月29日">
-<!ENTITY jversion        "20140930">
+<!ENTITY releasedate     "2014年10月4日">
+<!ENTITY jversion        "20141005">
 @z
 
 @x

diff --git a/lfsbook/version.ac b/lfsbook/version.ac
index ff463bb..e4bc81d 100644 (file)
--- a/lfsbook/version.ac
+++ b/lfsbook/version.ac
@@ -7,4 +7,4 @@ dnl  $Date::                           $
 dnl 
 dnl
 dnl m4-include this file to define the current LFS version
-m4_define([lfs_version], [svn-20140929])
+m4_define([lfs_version], [svn-20141004])