Changeset cfa3be5

Timestamp:

01/21/2022 04:45:12 AM (2 years ago)

Author:

Thomas Trepl (Moody) <thomas@…>

Branches:

multilib

Children:

d960243

Parents:

c4595c3 (diff), d141d67 (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:

• chapter01/changelog.xml (modified) (1 diff)
• chapter03/patches.xml (modified) (2 diffs)
• chapter08/meson.xml (modified) (1 diff)
• chapter08/stripping.xml (modified) (1 diff)
• packages.ent (modified) (3 diffs)
• patches.ent (modified) (2 diffs)

chapter01/changelog.xml

@@ -41 +41 @@
     -->
     <listitem>
+      <para>2022-01-20</para>
+      <itemizedlist>
+        <listitem>
+          <para>[bdubbs] - Update to expat-2.4.3 (security fixes). Fixes
+          <ulink url="&lfs-ticket-root;4984">#4984</ulink>.</para>
+        </listitem>
+        <listitem>
+          <para>[pierre] - Update to meson-0.61.1. Fixes
+          <ulink url="&lfs-ticket-root;4985">#4985</ulink>.</para>
+        </listitem>
+      </itemizedlist>
+    </listitem>
+
+    <listitem>
       <para>2022-01-17</para>
       <itemizedlist>

chapter03/patches.xml

@@ -84 +84 @@
       </listitem>
     </varlistentry>
-
+<!--
     <varlistentry>
       <term>Meson Upstream Fix Patch - <token>&meson-fix-patch-size;</token>:</term>
@@ -92 +92 @@
       </listitem>
     </varlistentry>
-<!--
+
     <varlistentry>
       <term>Libpipeline Checks Patch - <token>&libpipeline-checks-patch-size;</token>:</term>

chapter08/meson.xml

@@ -48 +48 @@
   <sect2 role="installation">
     <title>Installation of Meson</title>
-
+<!--
     <para>First, apply a patch that fixes an issue identified upstream:</para>
 
 <screen><userinput remap="pre">patch -Np1 -i ../&meson-fix-patch;</userinput></screen>
+-->
     <para>Compile Meson with the following command:</para>
-
 
 <screen><userinput remap="make">python3 setup.py build</userinput></screen>

chapter08/stripping.xml

@@ -88 +88 @@
 online_usrbin="bash find strip"
 online_usrlib="libbfd-&binutils-version;.so
-               libhistory.so.&readline-version;
+               libhistory.so.&readline-soversion;
                libncursesw.so.&ncurses-version;
                libm.so.6
-               libreadline.so.&readline-version;
+               libreadline.so.&readline-soversion;
                libz.so.&zlib-version;
                $(cd /usr/lib; find libnss*.so* -type f)"

packages.ent

@@ -164 +164 @@
 <!ENTITY eudev-fin-sbu "0.2 SBU">
 
-<!ENTITY expat-version "2.4.2">
-<!ENTITY expat-size "440 KB">
+<!ENTITY expat-version "2.4.3">
+<!ENTITY expat-size "444 KB">
 <!ENTITY expat-url "&sourceforge;expat/expat-&expat-version;.tar.xz">
-<!ENTITY expat-md5 "b49e50792ddb35165bab41413238f66e">
+<!ENTITY expat-md5 "b1137f030590b3f0c41c69c6cd68fa90">
 <!ENTITY expat-home "https://libexpat.github.io/">
 <!ENTITY expat-fin-du "13 MB">
@@ -501 +501 @@
 <!ENTITY markupsafe-fin-sbu "less than 0.1 SBU">
 
-<!ENTITY meson-version "0.61.0">
-<!ENTITY meson-size "1,961 KB">
+<!ENTITY meson-version "0.61.1">
+<!ENTITY meson-size "1,963 KB">
 <!ENTITY meson-url "&github;/mesonbuild/meson/releases/download/&meson-version;/meson-&meson-version;.tar.gz">
-<!ENTITY meson-md5 "cfe9f5e8ef869ba498a6a84f291f0c74">
+<!ENTITY meson-md5 "8ed66d5537275df3defffb66d1fb897f">
 <!ENTITY meson-home "https://mesonbuild.com">
 <!ENTITY meson-fin-du "40 MB">
@@ -617 +617 @@
 
 <!ENTITY readline-version "8.1.2">
+<!ENTITY readline-soversion "8.1"><!-- used for stripping -->
 <!ENTITY readline-size "2,923 KB">
 <!ENTITY readline-url "&gnu;readline/readline-&readline-version;.tar.gz">

patches.ent

@@ -59 +59 @@
 <!ENTITY libpipeline-checks-patch-md5 "0cd71f98eadaee07647d021d2e4c8621">
 <!ENTITY libpipeline-checks-patch-size "22 KB">
--->
 
 <!ENTITY meson-fix-patch "meson-&meson-version;-upstream_fix-2.patch">
@@ -65 +64 @@
 <!ENTITY meson-fix-patch-size "5.5 KB">
 
-<!--
 <!ENTITY ninja-limit-jobs-patch "ninja-&ninja-version;-add_NINJAJOBS_var-1.patch">
 <!ENTITY ninja-limit-jobs-patch-md5 "f537a633532492e805aa342fa869ca45">