浏览代码

Incorporate bash security fix.

git-svn-id: http://svn.linuxfromscratch.org/LFS/branches/systemd@10764 4aa44e1e-78dd-0310-a6d2-fbcd4c07a689
Krejzi 11 年之前
父节点
当前提交
2111d7765f
共有 3 个文件被更改,包括 16 次插入5 次删除
  1. 11 0
      chapter01/changelog.xml
  2. 2 2
      general.ent
  3. 3 3
      patches.ent

+ 11 - 0
chapter01/changelog.xml

@@ -35,6 +35,17 @@
       </itemizedlist>
     </listitem>
 -->
+    <listitem>
+      <para>2014-09-26</para>
+      <itemizedlist>
+        <listitem>
+          <para>Updated bash upstream patches and added
+          fixes for CVE-2014-7169. Fixes <ulink
+          url="&lfs-ticket-root;3680">#3680</ulink>.</para>
+        </listitem>
+      </itemizedlist>
+    </listitem>
+
     <listitem>
       <para>2014-09-23</para>
       <itemizedlist>

+ 2 - 2
general.ent

@@ -1,6 +1,6 @@
-<!ENTITY version         "20140923-systemd">
+<!ENTITY version         "20140926-systemd">
 <!ENTITY short-version   "systemd">  <!-- Used in dbus chapter, change to x.y for release -->
-<!ENTITY releasedate     "September 23, 2014">
+<!ENTITY releasedate     "September 26, 2014">
 <!ENTITY copyrightdate   "1999-2014"><!-- jhalfs needs a literal dash, not &ndash; -->
 <!ENTITY milestone       "7.7">
 <!ENTITY generic-version "systemd"> <!-- Use "development", "testing", or "x.y[-pre{x}]" -->

+ 3 - 3
patches.ent

@@ -2,9 +2,9 @@
 
 <!-- Start of Common Patches -->
 
-<!ENTITY bash-fixes-patch "bash-&bash-version;-upstream_fixes-3.patch">
-<!ENTITY bash-fixes-patch-md5 "3266ce3d2f0aa647d4ef068e46899246">
-<!ENTITY bash-fixes-patch-size "28 KB">
+<!ENTITY bash-fixes-patch "bash-&bash-version;-upstream_fixes-4.patch">
+<!ENTITY bash-fixes-patch-md5 "9233ba62610d4eb3f45ed57073d4273b">
+<!ENTITY bash-fixes-patch-size "40 KB">
 
 <!ENTITY binutils-lto-patch "binutils-&binutils-version;-load_gcc_lto_plugin_by_default-1.patch">
 <!ENTITY binutils-lto-patch-md5 "48e4e96a60bfed41804aaecf4944f5d9">