Pārlūkot izejas kodu

Add systemd security patch

Please update as soon as you can.

Was r11500.
Douglas R. Reno 5 gadi atpakaļ
vecāks
revīzija
e7ce6a53e0
5 mainītis faili ar 27 papildinājumiem un 39 dzēšanām
  1. 14 0
      chapter01/changelog.xml
  2. 3 22
      chapter03/patches.xml
  3. 4 0
      chapter06/systemd.xml
  4. 3 3
      general.ent
  5. 3 14
      patches.ent

+ 14 - 0
chapter01/changelog.xml

@@ -41,6 +41,20 @@
     <listitem revision="sysv"> or <listitem revision="systemd"> as
     appropriate for the entry or if needed the entire day's listitem.
 -->
+
+    <listitem revision="systemd">
+      <para>2019-01-11</para>
+      <itemizedlist>
+        <listitem>
+          <para>[renodr] - 为 systemd-240 增加一个安全补丁。它修复
+          CVE-2018-16865 和 CVE-2018-16864 (journald
+		  中的内存破坏漏洞导致栈溢出/任意代码执行)。
+          请尽快应用该补丁。修复
+          <ulink url="&lfs-ticket-root;4408">#4408</ulink>。</para>
+        </listitem>
+      </itemizedlist>
+    </listitem>
+
     <listitem>
       <para>2019-01-10</para>
       <itemizedlist>

+ 3 - 22
chapter03/patches.xml

@@ -119,32 +119,13 @@
       </listitem>
     </varlistentry>
 
-<!-- 
     <varlistentry revision="systemd">
-      <term>Systemd security patch - <token>&systemd-security-patch-size;</token>:</term>
+      <term>Systemd 安全补丁 - <token>&systemd-security-patch-size;</token>:</term>
       <listitem>
-        <para>Download: <ulink url="&patches-root;&systemd-security-patch;"/></para>
-        <para>MD5 sum: <literal>&systemd-security-patch-md5;</literal></para>
+        <para>下载地址: <ulink url="&patches-root;&systemd-security-patch;"/></para>
+        <para>MD5 校验和: <literal>&systemd-security-patch-md5;</literal></para>
       </listitem>
     </varlistentry>
--->
-<!--
-    <varlistentry revision="systemd">
-      <term>systemd glibc 补丁 - <token>&systemd-glibc-patch-size;</token>:</term>
-      <listitem>
-        <para>Download: <ulink url="&patches-root;&systemd-glibc-patch;"/></para>
-        <para>MD5 sum: <literal>&systemd-glibc-patch-md5;</literal></para>
-      </listitem>
-    </varlistentry>
-
-    <varlistentry revision="systemd">
-      <term>systemd meson 修复补丁 - <token>&systemd-meson-patch-size;</token>:</term>
-      <listitem>
-        <para>Download: <ulink url="&patches-root;&systemd-meson-patch;"/></para>
-        <para>MD5 sum: <literal>&systemd-meson-patch-md5;</literal></para>
-      </listitem>
-    </varlistentry>
-    -->
 
   </variablelist>
 

+ 4 - 0
chapter06/systemd.xml

@@ -39,6 +39,10 @@
   <sect2 role="installation">
     <title>安装 systemd</title>
 
+    <para>应用一个补丁,修复两项致命的安全缺陷:</para>
+
+<screen><userinput remap="pre">patch -Np1 -i ../systemd-240-security_fixes-1.patch</userinput></screen>
+
     <para>创建一个符号链接,绕过不存在的 xsltproc:</para>
 
 <screen><userinput remap="pre">ln -sf /tools/bin/true /usr/bin/xsltproc</userinput></screen>

+ 3 - 3
general.ent

@@ -1,13 +1,13 @@
-<!ENTITY version         "SVN-20190109">
+<!ENTITY version         "SVN-20190111">
 <!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        "20190101-systemd">
+<!ENTITY versiond        "20190111-systemd">
 <!ENTITY short-versiond  "systemd">
 <!ENTITY generic-versiond "systemd"> 
 
-<!ENTITY releasedate     "2019 年 1 月 9 日">
+<!ENTITY releasedate     "2019 年 1 月 11 日">
 
 <!ENTITY copyrightdate   "1999-2019"><!-- jhalfs needs a literal dash, not &ndash; -->
 <!ENTITY milestone       "8.4">

+ 3 - 14
patches.ent

@@ -57,17 +57,6 @@
 <!ENTITY sysvinit-consolidated-patch-md5 "aaa84675e717504d7d3da452c8c2eaf1">
 <!ENTITY sysvinit-consolidated-patch-size "2.6 KB">
 
-<!-- 
-<!ENTITY systemd-security-patch "systemd-&systemd-version;-security_fix-1.patch">
-<!ENTITY systemd-security-patch-md5 "aa9d81fec9a3875a54e63af86904513a">
-<!ENTITY systemd-security-patch-size "4 KB">
--->
-<!--
-<!ENTITY systemd-glibc-patch "systemd-&systemd-version;-glibc_statx_fix-1.patch">
-<!ENTITY systemd-glibc-patch-md5 "a44057d6a6ca69760bafc126458d89e5">
-<!ENTITY systemd-glibc-patch-size "4 KB">
-
-<!ENTITY systemd-meson-patch "systemd-&systemd-version;-meson-0.48.0_fixes-1.patch">
-<!ENTITY systemd-meson-patch-md5 "0e12e0722bd6bb84e8a4ec4de8979722">
-<!ENTITY systemd-meson-patch-size "4 KB">
--->
+<!ENTITY systemd-security-patch "systemd-&systemd-version;-security_fixes-1.patch">
+<!ENTITY systemd-security-patch-md5 "e0e27d1e5eb527f0ce2ac55b808cb7b2">
+<!ENTITY systemd-security-patch-size "12 KB">