Changeset 0b1d238

Timestamp:

04/15/2022 01:20:26 AM (2 years ago)

Author:

Xi Ruoyao <xry111@…>

Branches:

xry111/clfs-ng

Children:

b826273

Parents:

75b35eb (diff), 62b6686 (diff)
Note: this is a merge changeset, the changes displayed below correspond to the merge itself.
Use the (diff) links above to see all the changes relative to each parent.

Message:

Merge branch 'trunk' into xry111/clfs-ng

Files:

• chapter01/changelog.xml (modified) (3 diffs)
• chapter01/whatsnew.xml (modified) (2 diffs)
• chapter03/introduction.xml (modified) (1 diff)
• chapter08/perl.xml (modified) (1 diff)
• chapter08/procps.xml (modified) (1 diff)
• chapter08/util-linux.xml (modified) (1 diff)
• packages.ent (modified) (3 diffs)

chapter01/changelog.xml

@@ -42 +42 @@
 
     <listitem>
+      <para>2022-04-15</para>
+      <itemizedlist>
+        <listitem>
+          <para>[bdubbs] - Update to libcap-2.64.  Fixes
+          <ulink url="&lfs-ticket-root;5044">#5044</ulink>.</para>
+        </listitem>
+        <listitem>
+          <para>[bdubbs] - Update to linux-5.17.3.  Fixes
+          <ulink url="&lfs-ticket-root;5043">#5043</ulink>.</para>
+        </listitem>
+        <listitem>
+          <para>[bdubbs] - Update to gzip-1.12.  Fixes
+          <ulink url="&lfs-ticket-root;5042">#5042</ulink>.</para>
+        </listitem>
+      </itemizedlist>
+    </listitem>
+
+    <listitem>
       <para>2022-03-31</para>
       <itemizedlist>
@@ -49 +67 @@
         </listitem>
         <listitem>
-          <para>[bdubbs] - Update to zlib-1.2.12.  Fixes
+          <para>[bdubbs] - Update to zlib-1.2.12 (Security Update).  Fixes
           <ulink url="&lfs-ticket-root;5040">#5040</ulink>.</para>
         </listitem>
@@ -77 +95 @@
         </listitem>
         <listitem>
-          <para>[bdubbs] - Update to linux-5.17.1.  Fixes
+          <para>[bdubbs] - Update to linux-5.17.1 (Security Update).  Fixes
           <ulink url="&lfs-ticket-root;5033">#5033</ulink>.</para>
         </listitem>

chapter01/whatsnew.xml

@@ -120 +120 @@
       <para>GRUB-&grub-version;</para>
     </listitem>-->
-    <!--<listitem>
+    <listitem>
       <para>Gzip-&gzip-version;</para>
-    </listitem>-->
+    </listitem>
    <!--<listitem>
       <para>IANA-Etc-&iana-etc-version;</para>
@@ -150 +150 @@
       <para>LFS-Bootscripts-&lfs-bootscripts-version;</para>
     </listitem>-->
-   <!--<listitem>
+    <listitem>
       <para>Libcap-&libcap-version;</para>
-    </listitem>-->
+    </listitem>
    <!--<listitem>
       <para>Libelf-&elfutils-version; (from elfutils)</para>

chapter03/introduction.xml

@@ -88 +88 @@
     The <filename>wget-list</filename> file mentioned above retrieves all
     packages for both the sysV and systemd versions of LFS.  There are a total
-    of five additional small packages not needed for the currrent book.  The
+    of five additional small packages not needed for the current book.  The
     <filename>md5sums</filename> file mentioned below is specific to the
     current book.

chapter08/perl.xml

@@ -140 +140 @@
 <screen><userinput remap="test">make test</userinput></screen>
 
-    <!--note><para>One test fails due to using the most recent version of gdbm.
-    </para></note-->
+    <note>
+       <para>Nine tests fail due to using the most recent version of zlib.</para>
+    </note>
 
     <para>Install the package and clean up:</para>

chapter08/procps.xml

@@ -25 +25 @@
 
     <para>The Procps-ng package contains programs for monitoring processes.</para>
-
-    <!-- TODO This note will probably not be needed at the next revision. -->
-    <note>
-      <para>This package extracts to the directory
-      <filename class="directory">procps-3.3.17</filename>,
-      not the expected
-      <filename class="directory">procps-ng-3.3.17</filename>.</para>
-    </note>
 
     <segmentedlist>

chapter08/util-linux.xml

@@ -98 +98 @@
     </warning>
 
-    <note><para>There is one test that fails in the chroot envronment and
+    <note><para>There is one test that fails in the chroot environment and
     causes the tests to hang forever.  The problem does not occur outside
-    of the chroot envronment.
+    of the chroot environment.
     To work around the problem, delete the test:</para>
 

packages.ent

@@ -313 +313 @@
 <!ENTITY grub-tmp-sbu "0.7 SBU">
 
-<!ENTITY gzip-version "1.11">
-<!ENTITY gzip-size "786 KB">
+<!ENTITY gzip-version "1.12">
+<!ENTITY gzip-size "807 KB">
 <!ENTITY gzip-url "&gnu;gzip/gzip-&gzip-version;.tar.xz">
-<!ENTITY gzip-md5 "d1e93996dba00cab0caa7903cd01d454">
+<!ENTITY gzip-md5 "9608e4ac5f061b2a6479dc44e917a5db">
 <!ENTITY gzip-home "&gnu-software;gzip/">
 <!ENTITY gzip-tmp-du "11 MB">
@@ -398 +398 @@
 <!ENTITY lfs-bootscripts-cfg-sbu "less than 0.1 SBU">
 
-<!ENTITY libcap-version "2.63">
-<!ENTITY libcap-size "171 KB">
+<!ENTITY libcap-version "2.64">
+<!ENTITY libcap-size "172 KB">
 <!ENTITY libcap-url "&kernel;linux/libs/security/linux-privs/libcap2/libcap-&libcap-version;.tar.xz">
-<!ENTITY libcap-md5 "18410cec436f827e698ee9ea16ada9b7">
+<!ENTITY libcap-md5 "14fb1fa596f58596bdef0bb5033d2586">
 <!ENTITY libcap-home "https://sites.google.com/site/fullycapable/">
 <!ENTITY libcap-fin-du "2.7 MB">
@@ -432 +432 @@
 <!ENTITY linux-major-version "5">
 <!ENTITY linux-minor-version "17">
-<!ENTITY linux-patch-version "1">
+<!ENTITY linux-patch-version "3">
 <!--<!ENTITY linux-version "&linux-major-version;.&linux-minor-version;">-->
 <!ENTITY linux-version "&linux-major-version;.&linux-minor-version;.&linux-patch-version;">
-<!ENTITY linux-size "125,378 KB">
+<!ENTITY linux-size "125,417 KB">
 <!ENTITY linux-url "&kernel;linux/kernel/v&linux-major-version;.x/linux-&linux-version;.tar.xz">
-<!ENTITY linux-md5 "1b96df11f2eda625c1637d3e941848ad">
+<!ENTITY linux-md5 "965ff63d08de58223d7f1717b9bb5be8">
 <!ENTITY linux-home "https://www.kernel.org/">
 <!-- measured for 5.13.4 / gcc-11.1.0 on x86_64 : minimum is