Changeset 118b207

Timestamp:

07/21/2021 03:48:24 AM (3 years ago)

Author:

Thomas Trepl (Moody) <thomas@…>

Branches:

ml-11.0, multilib

Children:

cfb8eea

Parents:

4d7d2c04 (diff), 2a277fb (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:

• appendices/dependencies.xml (modified) (1 diff)
• chapter01/changelog.xml (modified) (1 diff)
• chapter07/createfiles.xml (modified) (1 diff)
• chapter08/bash.xml (modified) (1 diff)
• packages.ent (modified) (1 diff)

appendices/dependencies.xml

@@ -219 +219 @@
         <segtitle>&testsuites;</segtitle>
         <seglistitem>
-          <seg>Shadow</seg>
+          <seg>Expect and Shadow</seg>
         </seglistitem>
       </segmentedlist>

chapter01/changelog.xml

@@ -46 +46 @@
     -->
     <listitem>
+      <para>2021-07-20</para>
+      <itemizedlist>
+        <listitem>
+          <para>[ken] - Update to linux-5.13.4 (security fix). Fixes
+          <ulink url="&lfs-ticket-root;4886">#4886</ulink>.</para>
+        </listitem>
+        <listitem>
+          <para>[xry111] - Use a fixed, non-zero UID for
+          <systemitem class="username">tester</systemitem> user, and spawn a
+          new pseudoterminal to satisfy bash testsuite.</para>
+        </listitem>
+      </itemizedlist>
+    </listitem>
+
+    <listitem>
       <para>2021-07-19</para>
       <itemizedlist>

chapter07/createfiles.xml

@@ -176 +176 @@
   chapter.</para>
 
-<screen><userinput>echo "tester:x:$(ls -n $(tty) | cut -d" " -f3):101::/home/tester:/bin/bash" &gt;&gt; /etc/passwd
+<screen><userinput>echo "tester:x:101:101::/home/tester:/bin/bash" &gt;&gt; /etc/passwd
 echo "tester:x:101:" &gt;&gt; /etc/group
 install -o tester -d /home/tester</userinput></screen>

chapter08/bash.xml

@@ -74 +74 @@
 <screen><userinput remap="test">chown -Rv tester .</userinput></screen>
 
-    <para>Now, run the tests as the <systemitem
+    <para>The testsuite of the package is designed to be run as a non-root
+    user that owns the terminal connected to standard input.  To satisfy the
+    requirement, spawn a new pseudo terminal using
+    <application>Expect</application> and run the tests as the <systemitem
     class="username">tester</systemitem> user:</para>
 
-<screen><userinput remap="test">su tester &lt;&lt; EOF
-PATH=$PATH make tests &lt; $(tty)
+<screen><userinput remap="test">su -s /usr/bin/expect tester &lt;&lt; EOF
+set timeout -1
+spawn make tests
+expect eof
+lassign [wait] _ _ _ value
+exit $value
 EOF</userinput></screen>
 

packages.ent

@@ -434 +434 @@
 <!ENTITY linux-major-version "5">
 <!ENTITY linux-minor-version "13">
-<!ENTITY linux-patch-version "1">
+<!ENTITY linux-patch-version "4">
 <!--<!ENTITY linux-version "&linux-major-version;.&linux-minor-version;">-->
 <!ENTITY linux-version "&linux-major-version;.&linux-minor-version;.&linux-patch-version;">
-<!ENTITY linux-size "116,496 KB">
+<!ENTITY linux-size "116,536 KB">
 <!ENTITY linux-url "&kernel;linux/kernel/v&linux-major-version;.x/linux-&linux-version;.tar.xz">
-<!ENTITY linux-md5 "6499bdaa4ee1ef873ffd6533492140e7">
+<!ENTITY linux-md5 "50aa48ae38a736b3f313a777574af3d3">
 <!ENTITY linux-home "https://www.kernel.org/">
 <!-- measured for 5.8.3 / gcc-10.2.0 on x86_64 : minimum is