Преглед изворни кода

Update to systemd-241

was r11554.
Douglas R. Reno пре 6 година
родитељ
комит
62478377b6
7 измењених фајлова са 26 додато и 14 уклоњено
  1. 10 0
      chapter01/changelog.xml
  2. 2 2
      chapter01/whatsnew.xml
  3. 2 2
      chapter03/patches.xml
  4. 2 1
      chapter06/systemd.xml
  5. 3 3
      general-orig.ent
  6. 5 5
      packages.ent
  7. 2 1
      patches.ent

+ 10 - 0
chapter01/changelog.xml

@@ -43,6 +43,16 @@
     appropriate for the entry or if needed the entire day's listitem.
     -->
 
+    <listitem revision="systemd">
+      <para>2019-03-08</para>
+      <itemizedlist>
+        <listitem>
+          <para>[renodr] - 更新到 systemd-241。修复
+          <ulink url="&lfs-ticket-root;4424">#4424</ulink>。</para>
+        </listitem>
+      </itemizedlist>
+    </listitem>
+
     <listitem>
       <para>2019-03-05</para>
       <itemizedlist>

+ 2 - 2
chapter01/whatsnew.xml

@@ -222,9 +222,9 @@
     <!--<listitem revision="sysv">
       <para>Sysklogd-&sysklogd-version;</para>
     </listitem>-->
-    <!--<listitem revision="systemd">
+    <listitem revision="systemd">
       <para>Systemd-&systemd-version;</para>
-    </listitem>-->
+    </listitem>
     <listitem revision="sysv">
       <para>SysVinit-&sysvinit-version;</para>
     </listitem>

+ 2 - 2
chapter03/patches.xml

@@ -119,7 +119,7 @@
         <para>MD5 校验和: <literal>&sysvinit-consolidated-patch-md5;</literal></para>
       </listitem>
     </varlistentry>
-
+<!--
     <varlistentry revision="systemd">
       <term>Systemd 安全补丁 - <token>&systemd-security-patch-size;</token>:</term>
       <listitem>
@@ -127,7 +127,7 @@
         <para>MD5 校验和: <literal>&systemd-security-patch-md5;</literal></para>
       </listitem>
     </varlistentry>
-
+-->
   </variablelist>
 
   <para>以上补丁的总大小: 约 <returnvalue/></para>

+ 2 - 1
chapter06/systemd.xml

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

+ 3 - 3
general-orig.ent

@@ -1,13 +1,13 @@
-<!ENTITY version         "SVN-20190305">
+<!ENTITY version         "SVN-20190308">
 <!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        "20190305-systemd">
+<!ENTITY versiond        "20190308-systemd">
 <!ENTITY short-versiond  "systemd">
 <!ENTITY generic-versiond "systemd"> 
 
-<!ENTITY releasedate     "March 5, 2019">
+<!ENTITY releasedate     "March 8, 2019">
 
 <!ENTITY copyrightdate   "1999-2019"><!-- jhalfs needs a literal dash, not &ndash; -->
 <!ENTITY milestone       "8.5">

+ 5 - 5
packages.ent

@@ -622,19 +622,19 @@
 <!ENTITY sysklogd-ch6-du "0.6 MB">
 <!ENTITY sysklogd-ch6-sbu "less than 0.1 SBU">
 
-<!ENTITY systemd-version  "240">
+<!ENTITY systemd-version  "241">
 <!--<!ENTITY systemd-stable   "6b4878d">-->
 <!-- The above entity is used whenever we move to a stable backport branch. In the event of a critical problem or kernel
      change that is incompatible, we will switch to the backport branch until the next stable release. -->
-<!ENTITY systemd-size     "7,412 KB">
+<!ENTITY systemd-size     "7,464 KB">
 <!ENTITY systemd-url      "&github;/systemd/systemd/archive/v&systemd-version;/systemd-&systemd-version;.tar.gz">
 <!--<!ENTITY systemd-url      "&anduin-sources;/systemd-&systemd-version;-&systemd-stable;.tar.xz">-->
-<!ENTITY systemd-md5      "0e4f91b513d4b04e2c10a5173e5a87b2">
+<!ENTITY systemd-md5      "c5953c24c850b44fcf714326e567dc37">
 <!ENTITY systemd-home     "https://www.freedesktop.org/wiki/Software/systemd/">
-<!ENTITY systemd-man-size "460 KB">
+<!ENTITY systemd-man-size "456 KB">
 <!--<!ENTITY systemd-man-url  "&anduin-sources;/systemd-man-pages-&systemd-version;-&systemd-stable;.tar.xz">-->
 <!ENTITY systemd-man-url  "&anduin-sources;/systemd-man-pages-&systemd-version;.tar.xz">
-<!ENTITY systemd-man-md5  "ca49a25e1cf330b02adc07218f430dae">
+<!ENTITY systemd-man-md5  "6942e1a9032e19da6639f9705241d119">
 <!ENTITY systemd-ch6-du   "226 MB">
 <!ENTITY systemd-ch6-sbu  "2.4 SBU">
 

+ 2 - 1
patches.ent

@@ -56,7 +56,8 @@
 <!ENTITY sysvinit-consolidated-patch "sysvinit-&sysvinit-version;-consolidated-4.patch">
 <!ENTITY sysvinit-consolidated-patch-md5 "4900322141d493e74020c9cf437b2cdc">
 <!ENTITY sysvinit-consolidated-patch-size "2.4 KB">
-
+<!--
 <!ENTITY systemd-security-patch "systemd-&systemd-version;-security_fixes-2.patch">
 <!ENTITY systemd-security-patch-md5 "10abebce8ff5d9fd402623ace39b5ab8">
 <!ENTITY systemd-security-patch-size "14 KB">
+-->