Changeset 641ab9be

Timestamp:

06/28/2021 03:45:11 AM (3 years ago)

Author:

Thomas Trepl (Moody) <thomas@…>

Branches:

ml-11.0, multilib

Children:

cf65195

Parents:

c5750ecf (diff), 5809826 (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:

Automatic merge of trunk into multilib

Files:

• .gitignore (modified) (1 diff)
• chapter01/changelog.xml (modified) (1 diff)
• chapter01/whatsnew.xml (modified) (3 diffs)
• chapter08/bash.xml (modified) (1 diff)
• chapter08/libcap.xml (modified) (1 diff)
• chapter08/shadow.xml (modified) (1 diff)
• packages.ent (modified) (5 diffs)

.gitignore

@@ -1 +1 @@
 lfs-bootscripts-*.tar.xz
 version.ent
+appendices/*.script
+

chapter01/changelog.xml

@@ -46 +46 @@
     -->
     <listitem>
+      <para>2021-06-27</para>
+      <itemizedlist>
+        <listitem>
+          <para>[bdubbs] - Update to bash-5.1.8. Fixes
+          <ulink url="&lfs-ticket-root;4869">#4869</ulink>.</para>
+        </listitem>
+        <listitem>
+          <para>[bdubbs] - Update to dejagnu-1.6.3. Fixes
+          <ulink url="&lfs-ticket-root;4871">#4871</ulink>.</para>
+        </listitem>
+        <listitem>
+          <para>[bdubbs] - Update to gdbm-1.20. Fixes
+          <ulink url="&lfs-ticket-root;4872">#4872</ulink>.</para>
+        </listitem>
+        <listitem>
+          <para>[bdubbs] - Update to libcap-2.51. Fixes
+          <ulink url="&lfs-ticket-root;4874">#4874</ulink>.</para>
+        </listitem>
+        <listitem>
+          <para>[bdubbs] - Update to man-pages-5.1. Fixes
+          <ulink url="&lfs-ticket-root;4876">#4876</ulink>.</para>
+        </listitem>
+      </itemizedlist>
+    </listitem>
+
+    <listitem>
       <para>2021-06-18</para>
       <itemizedlist>

chapter01/whatsnew.xml

@@ -43 +43 @@
       <para>Automake-&automake-version;</para>
     </listitem>-->
-    <!--<listitem>
+    <listitem>
       <para>Bash &bash-version;</para>
-    </listitem>-->
+    </listitem>
     <listitem>
       <para>Bc &bc-version;</para>
@@ -64 +64 @@
       <para>Coreutils-&coreutils-version;</para>
     </listitem>-->
-    <!--<listitem>
+    <listitem>
       <para>DejaGNU-&dejagnu-version;</para>
-    </listitem>-->
+    </listitem>
     <!--<listitem revision="systemd">
       <para>D-Bus-&dbus-version;</para>
@@ -100 +100 @@
        <para>GCC-&gcc-version;</para>
     </listitem>
-    <!--<listitem>
+    <listitem>
        <para>GDBM-&gdbm-version;</para>
-    </listitem>-->
+    </listitem>
     <!--<listitem>
       <para>Gettext-&gettext-version;</para>

chapter08/bash.xml

@@ -40 +40 @@
   <sect2 role="installation">
     <title>Installation of Bash</title>
-
-    <para>First, fix a race condition if using multiple cores:</para>
-
-<screen><userinput remap="pre">sed -i  '/^bashline.o:.*shmbchar.h/a bashline.o: ${DEFDIR}/builtext.h' Makefile.in</userinput></screen>
 
     <para>Prepare Bash for compilation:</para>

chapter08/libcap.xml

@@ -44 +44 @@
     <title>Installation of Libcap</title>
 
-    <para>First, fix an upstream oversight in the latest release:</para>
-
-<screen><userinput remap="pre">sed -i 's/ $(PROGS)/&amp; capsh/' progs/Makefile</userinput></screen>
-
     <para>Prevent static libraries from being installed:</para>
 

chapter08/shadow.xml

@@ -131 +131 @@
     <para>Install the package:</para>
 
-<screen><userinput remap="install">make install</userinput></screen>
+<screen><userinput remap="install">make exec_prefix=/usr install</userinput></screen>
 
   </sect2>

packages.ent

@@ -48 +48 @@
 <!ENTITY automake-fin-sbu "less than 0.1 SBU (about 9.1 SBU with tests)">
 
-<!ENTITY bash-version "5.1">
-<!ENTITY bash-size "10,214 KB">
+<!ENTITY bash-version "5.1.8">
+<!ENTITY bash-size "10,287 KB">
 <!ENTITY bash-url "&gnu;bash/bash-&bash-version;.tar.gz">
-<!ENTITY bash-md5 "bb91a17fd6c9032c26d0b2b78b50aff5">
+<!ENTITY bash-md5 "23eee6195b47318b9fd878e590ccb38c">
 <!ENTITY bash-home "&gnu-software;bash/">
 <!ENTITY bash-tmp-du "66 MB">
@@ -122 +122 @@
 <!ENTITY dbus-fin-sbu "0.2 SBU">
 
-<!ENTITY dejagnu-version "1.6.2">
-<!ENTITY dejagnu-size "514 KB">
+<!ENTITY dejagnu-version "1.6.3">
+<!ENTITY dejagnu-size "608 KB">
 <!ENTITY dejagnu-url "&gnu;dejagnu/dejagnu-&dejagnu-version;.tar.gz">
-<!ENTITY dejagnu-md5 "e1b07516533f351b3aba3423fafeffd6">
+<!ENTITY dejagnu-md5 "68c5208c58236eba447d7d6d1326b821">
 <!ENTITY dejagnu-home "&gnu-software;dejagnu/">
 <!ENTITY dejagnu-tmp-du "4.6 MB">
@@ -239 +239 @@
 <!ENTITY libstdcpp-tmpp2-sbu "0.8 SBU">
 
-<!ENTITY gdbm-version "1.19">
-<!ENTITY gdbm-size "946 KB">
+<!ENTITY gdbm-version "1.20">
+<!ENTITY gdbm-size "965 KB">
 <!ENTITY gdbm-url "&gnu;gdbm/gdbm-&gdbm-version;.tar.gz">
-<!ENTITY gdbm-md5 "aeb29c6a90350a4c959cd1df38cd0a7e">
+<!ENTITY gdbm-md5 "006c19b8b60828fd6916a16f3496bd3c">
 <!ENTITY gdbm-home "&gnu-software;gdbm/">
 <!ENTITY gdbm-fin-du "11 MB">
@@ -392 +392 @@
 <!ENTITY lfs-bootscripts-cfg-sbu "less than 0.1 SBU">
 
-<!ENTITY libcap-version "2.50">
-<!ENTITY libcap-size "141 KB">
+<!ENTITY libcap-version "2.51">
+<!ENTITY libcap-size "143 KB">
 <!ENTITY libcap-url "&kernel;linux/libs/security/linux-privs/libcap2/libcap-&libcap-version;.tar.xz">
-<!ENTITY libcap-md5 "66a561afa81666236ff973544ff4e864">
+<!ENTITY libcap-md5 "4c9febc1bf0afca6a4d9f86fcdb6d900">
 <!ENTITY libcap-home "https://sites.google.com/site/fullycapable/">
 <!ENTITY libcap-fin-du "45 MB">
@@ -473 +473 @@
 <!ENTITY man-db-fin-sbu "0.4 SBU">
 
-<!ENTITY man-pages-version "5.11">
-<!ENTITY man-pages-size "1,720 KB">
+<!ENTITY man-pages-version "5.12">
+<!ENTITY man-pages-size "1,737 KB">
 <!ENTITY man-pages-url "&kernel;linux/docs/man-pages/man-pages-&man-pages-version;.tar.xz">
-<!ENTITY man-pages-md5 "9f40e8fff6766563837d98d7d7c6e19b">
+<!ENTITY man-pages-md5 "192132118f07369c88df267a92f3ef16">
 <!ENTITY man-pages-home "https://www.kernel.org/doc/man-pages/">
 <!ENTITY man-pages-fin-du "4.7 MB">